migrate to boost::gettext

* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
  MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
  goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
  to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
  mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
  results in inserting the english original so something can be found, now the
  standard fallback of using the english original from the source key is used, so
  partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
   xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
   xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
   content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
      com::sun::star::resource::OfficeResourceLoader
      com::sun::star::resource::XResourceBundleLoader
      com::sun::star::resource::XResourceBundle
    when translating strings via uno apis
      com.sun.star.resource.StringResourceWithLocation
    can continue to be used

Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a

3781 files changed, 42966 insertions, 112054 deletions

diff --git a/Makefile.in b/Makefile.in
index e1c4c857e911..0f75925e0e49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,7 +116,6 @@ $(eval $(call gb_Top_GbuildModulesRules,$(gbuild_modules)))
 
 gbuild_TARGETS := AllLangHelp \
 	AllLangPackage \
-	AllLangResTarget \
 	AutoInstall \
 	CliLibrary \
 	CliNativeLibrary \
@@ -470,7 +469,7 @@ $(foreach ide,\
     eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide))))
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index 6329a4eac6a5..c4d89a7c19f0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	libtest \
 	lngconvex \
 	localize \
+	localestr \
 	makedepend \
 	mbsdiff \
 	mork_helper \
@@ -52,14 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	pocheck \
 	propex \
 	regsvrex \
-	rsc \
 	saxparser \
 	sp2bv \
 	svg2odf \
 	svidl \
-	transex3 \
 	treex \
-	uiex \
 	ulfex \
 	unoidl-read \
 	unoidl-write \
@@ -388,7 +386,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	pcr \
 	pdffilter \
 	$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
-	res \
 	sax \
 	sb \
 	$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
@@ -1057,60 +1054,39 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
 ))
 
 # Resources
-$(eval $(call gb_Helper_register_resources,\
-	abp \
+$(eval $(call gb_Helper_register_mos,\
 	acc \
-	analysis \
 	avmedia \
 	$(call gb_Helper_optional,SCRIPTING,basctl) \
-	$(call gb_Helper_optional,DBCONNECTIVITY,bib) \
-	chartcontroller \
+	chart \
 	cnr \
 	cui \
-	date \
-	$(call gb_Helper_optional,DBCONNECTIVITY,\
-		dba \
-		dbmm \
-		dbp \
-		dbu \
-	) \
-	dbw \
-	deployment \
-	deploymentgui \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
 	dkt \
 	editeng \
-	eps \
+	flt \
 	for \
-	forui \
-	$(call gb_Helper_optional,DESKTOP,fps_office) \
+	$(call gb_Helper_optional,DESKTOP,fps) \
 	frm \
-	fwe \
-	gal \
-	$(call gb_Helper_optional,DBCONNECTIVITY,pcr) \
-	pdffilter \
-	pricing \
+	fwk \
+	pcr \
 	rpt \
-	rptui \
 	$(call gb_Helper_optional,SCRIPTING,sb) \
 	sc \
-	scn \
+	sca \
+	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),scc) \
 	sd \
-	sdberr \
-	$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
 	sfx \
 	sm \
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \
 	svl \
 	svt \
 	svx \
 	sw \
-	t602filter \
-	upd \
 	uui \
 	vcl \
-	writerperfect \
-	$(if $(ENABLE_NSS),xmlsec) \
-	xsltdlg \
+	wiz \
+	wpt \
+	$(if $(ENABLE_NSS),xsc) \
 ))
 
 # UI configuration
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 67c078345d4d..2cd7d824fabb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3778,7 +3778,6 @@ endef
 # FIXME: the library target should be for build too
 define gb_Executable__register_gengal
 $(call gb_Executable_add_runtime_dependencies,gengal,\
-	$(call gb_AllLangResTarget_get_target,ofa) \
 	$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
 	$(call gb_Package_get_target_for_build,postprocess_images) \
 	$(call gb_Package_get_target_for_build,postprocess_registry) \
@@ -3811,7 +3810,7 @@ endef
 
 define gb_Executable__register_localize
 $(call gb_Executable_add_runtime_dependencies,localize,\
-	$(foreach exec,cfgex helpex propex transex3 treex uiex ulfex xrmex,\
+	$(foreach exec,cfgex helpex propex treex ulfex xrmex,\
 		$(call gb_Executable_get_runtime_dependencies,$(exec)) \
 	) \
 )
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 5f8cd46e68de..541940515eba 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 	registry \
 	remotebridges \
 	ridljar \
-	rsc \
 	sal \
 	salhelper \
 	sax \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 58aa6959c6b7..3b530286114e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -101,7 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	reportbuilder \
 	$(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \
 	ridljar \
-	rsc \
 	sal \
 	salhelper \
 	sax \
diff --git a/accessibility/AllLangMoTarget_acc.mk b/accessibility/AllLangMoTarget_acc.mk
new file mode 100644
index 000000000000..a45cee50ebcf
--- /dev/null
+++ b/accessibility/AllLangMoTarget_acc.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,acc))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,acc,accessibility))
+
+# vim: set noet sw=4 ts=4:
diff --git a/accessibility/AllLangResTarget_acc.mk b/accessibility/AllLangResTarget_acc.mk
deleted file mode 100644
index 450a7f2cdd86..000000000000
--- a/accessibility/AllLangResTarget_acc.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,acc))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,acc,accessibility))
-
-$(eval $(call gb_AllLangResTarget_add_srs,acc,\
-    acc/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,acc/res))
-
-$(eval $(call gb_SrsTarget_set_include,acc/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/accessibility/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,acc/res,\
-    accessibility/source/helper/accessiblestrings.src \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 1c565a5d7234..de252a36d5ea 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,accessibility,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,accessibility,\
-    AllLangResTarget_acc \
+    AllLangMoTarget_acc \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index b77173398a92..b5eaec4568b5 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -49,7 +49,7 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <rtl/ref.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <queue>
diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc
deleted file mode 100644
index 2af826891527..000000000000
--- a/accessibility/inc/helper/accessiblestrings.hrc
+++ /dev/null
@@ -1,42 +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 ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
-#define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
-
-#define RID_TK_ACC_START        1000
-
-#define STR_SVT_ACC_ACTION_EXPAND           ( RID_TK_ACC_START +    8 )
-#define STR_SVT_ACC_ACTION_COLLAPSE         ( RID_TK_ACC_START +    9 )
-#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START +   10 )
-
-#define RID_STR_ACC_ACTION_CHECK                ( RID_TK_ACC_START +   11 )
-#define RID_STR_ACC_ACTION_UNCHECK              ( RID_TK_ACC_START +   12 )
-#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL     ( RID_TK_ACC_START +   14 )
-#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL   ( RID_TK_ACC_START +   15 )
-#define RID_STR_ACC_PANEL_DESCRIPTION           ( RID_TK_ACC_START +   16 )
-
-#define RID_STR_ACC_COLUMN_NUM              ( RID_TK_ACC_START +   17 )
-#define RID_STR_ACC_ROW_NUM                 ( RID_TK_ACC_START +   18 )
-
-#define RID_STR_ACC_NAME_BROWSEBUTTON       ( RID_TK_ACC_START +  100 )
-
-#endif          // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx
index 38ceaa172abd..24fa1cfa4721 100644
--- a/accessibility/inc/helper/accresmgr.hxx
+++ b/accessibility/inc/helper/accresmgr.hxx
@@ -22,11 +22,8 @@
 
 #include <rtl/ustring.hxx>
 
-class SimpleResMgr;
-
 #define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id)
 
-
 // TkResMgr
 
 namespace accessibility
@@ -34,7 +31,7 @@ namespace accessibility
 
 class TkResMgr
 {
-    static SimpleResMgr* m_pImpl;
+    static std::locale* m_pImpl;
 
 private:
     // no instantiation allowed
@@ -56,7 +53,7 @@ protected:
 
 public:
     // loads the string with the specified resource id
-    static OUString loadString( sal_uInt16 nResId );
+    static OUString loadString(const char *pResId);
 };
 
 }
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 791b194aa1af..7377c61a4f1b 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -283,7 +283,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sot/formats.hxx>
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
@@ -317,7 +316,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc
new file mode 100644
index 000000000000..6e713e15d6b8
--- /dev/null
+++ b/accessibility/inc/strings.hrc
@@ -0,0 +1,39 @@
+/* -*- 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 ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+#define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_STR_ACC_NAME_BROWSEBUTTON           NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse")
+#define STR_SVT_ACC_ACTION_EXPAND               NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" )
+#define STR_SVT_ACC_ACTION_COLLAPSE             NC_("STR_SVT_ACC_ACTION_COLLAPSE", "Collapse")
+#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE     NC_("STR_SVT_ACC_LISTENTRY_SELCTED_STATE", "(Selected)")
+#define RID_STR_ACC_ACTION_CHECK                NC_("RID_STR_ACC_ACTION_CHECK", "Check")
+#define RID_STR_ACC_ACTION_UNCHECK              NC_("RID_STR_ACC_ACTION_UNCHECK", "Uncheck")
+#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL     NC_("RID_STR_ACC_SCROLLBAR_NAME_VERTICAL", "Vertical scroll bar")
+#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL   NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar")
+#define RID_STR_ACC_PANEL_DESCRIPTION           NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child control for more operations")
+#define RID_STR_ACC_COLUMN_NUM                  NC_("RID_STR_ACC_COLUMN_NUM", "Column %COLUMNNUMBER")
+#define RID_STR_ACC_ROW_NUM                     NC_("RID_STR_ACC_ROW_NUM", "Row %ROWNUMBER")
+
+#endif          // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 8f240b20795f..b2741e246df1 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <extended/accessibleeditbrowseboxcell.hxx>
 #include <svtools/editbrowsebox.hxx>
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 3c17f1675909..2eef354aa240 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -42,7 +42,7 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #define ACCESSIBLE_ACTION_COUNT 1
 
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
deleted file mode 100644
index 127c336ff1b8..000000000000
--- a/accessibility/source/helper/accessiblestrings.src
+++ /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 .
- */
-
-#include <helper/accessiblestrings.hrc>
-
-String RID_STR_ACC_NAME_BROWSEBUTTON
-{
-    Text [ en-US ] = "Browse";
-};
-
-String STR_SVT_ACC_ACTION_EXPAND
-{
-    Text [ en-US ] = "Expand" ;
-};
-
-String STR_SVT_ACC_ACTION_COLLAPSE
-{
-    Text [ en-US ] = "Collapse";
-};
-
-String STR_SVT_ACC_LISTENTRY_SELCTED_STATE
-{
-    Text [ en-US ] = "(Selected)";
-};
-
-String RID_STR_ACC_ACTION_CHECK
-{
-    Text [ en-US ] = "Check";
-};
-String RID_STR_ACC_ACTION_UNCHECK
-{
-    Text [ en-US ] = "Uncheck";
-};
-
-String RID_STR_ACC_SCROLLBAR_NAME_VERTICAL
-{
-    Text [ en-US ] = "Vertical scroll bar";
-};
-String RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL
-{
-    Text [ en-US ] = "Horizontal scroll bar";
-};
-
-String RID_STR_ACC_PANEL_DESCRIPTION
-{
-    Text [ en-US ] = "Please press enter to go into child control for more operations";
-};
-
-String RID_STR_ACC_COLUMN_NUM
-{
-    Text [ en-US ] = "Column %COLUMNNUMBER";
-};
-
-String RID_STR_ACC_ROW_NUM
-{
-    Text [ en-US ] = "Row %ROWNUMBER";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index ca09872bc8c3..a7d57156df95 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -19,7 +19,7 @@
 
 #include <helper/accresmgr.hxx>
 
-#include <tools/simplerm.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -27,22 +27,19 @@ using namespace accessibility;
 
 // TkResMgr
 
-
-SimpleResMgr* TkResMgr::m_pImpl = nullptr;
-
+std::locale* TkResMgr::m_pImpl = nullptr;
 
 TkResMgr::EnsureDelete::~EnsureDelete()
 {
     delete TkResMgr::m_pImpl;
 }
 
-
 void TkResMgr::ensureImplExists()
 {
     if (m_pImpl)
         return;
 
-    m_pImpl = SimpleResMgr::Create("acc", Application::GetSettings().GetUILanguageTag() );
+    m_pImpl = new std::locale(Translate::Create("acc", Application::GetSettings().GetUILanguageTag()));
 
     if (m_pImpl)
     {
@@ -51,17 +48,15 @@ void TkResMgr::ensureImplExists()
     }
 }
 
-
-OUString TkResMgr::loadString( sal_uInt16 nResId )
+OUString TkResMgr::loadString(const char *pResId)
 {
     OUString sReturn;
 
     ensureImplExists();
-    if ( m_pImpl )
-        sReturn = m_pImpl->ReadString( nResId );
+    if (m_pImpl)
+        sReturn = Translate::get(pResId, *m_pImpl);
 
     return sReturn;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 32fec8247a8c..8e6f69423af3 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -21,7 +21,7 @@
 
 
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 #include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/helper/convert.hxx>
 
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index b5a4a168ed48..c1df7719f323 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -32,7 +32,7 @@
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 #include "strings.hxx"
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 2bfa5611d2d3..f26e56d972cb 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -19,7 +19,7 @@
 
 #include <standard/vclxaccessiblebutton.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/accessiblekeybindinghelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 5e4adfc6d6c4..0e01a6680e82 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -21,7 +21,7 @@
 
 #include <toolkit/awt/vclxwindows.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/accessiblekeybindinghelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index e8aa7e599b2c..fd8a3599d48e 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -22,7 +22,7 @@
 #include <standard/vclxaccessibletextfield.hxx>
 #include <standard/vclxaccessiblelist.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index ca8ae7ee981b..c61cd74fdab3 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -21,7 +21,7 @@
 #include <standard/vclxaccessibledropdownlistbox.hxx>
 #include <standard/vclxaccessiblelistbox.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index fb4aa77132ea..005ddac8e4d6 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -22,7 +22,7 @@
 #include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 70ade57c927f..60de73778696 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -19,7 +19,7 @@
 
 #include <standard/vclxaccessiblemenuitem.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 #include <toolkit/helper/convert.hxx>
 #include <helper/characterattributeshelper.hxx>
 #include <comphelper/accessiblekeybindinghelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 576f03fb75df..9606092e92f4 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -21,7 +21,7 @@
 
 #include <toolkit/awt/vclxwindows.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 9de2f42e1477..8624de5b6c4d 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -21,7 +21,7 @@
 
 #include <toolkit/awt/vclxwindows.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 325db82a8891..2a575760dd12 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -20,7 +20,7 @@
 #include <standard/vclxaccessibletoolboxitem.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <helper/accresmgr.hxx>
-#include <helper/accessiblestrings.hrc>
+#include <strings.hrc>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/bin/count-src-resources b/avmedia/AllLangMoTarget_avmedia.mk
index 01fbdfc7e440..564b9ab94b43 100755..100644
--- a/bin/count-src-resources
+++ b/avmedia/AllLangMoTarget_avmedia.mk
@@ -1,11 +1,11 @@
-#!/bin/sh
+# -*- 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/.
-#
-# Run this from the source root dir to count the number of remaining .src resources
 
-git ls-files *.src | xargs grep -ohE '^[a-zA-Z]+[ ]+[a-zA-Z_0-9]+' | cut -f 1 -d ' ' | sort | uniq -c | sort -n
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk
deleted file mode 100644
index 3ffd6e0771c2..000000000000
--- a/avmedia/AllLangResTarget_avmedia.mk
+++ /dev/null
@@ -1,30 +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,avmedia))
-
-$(eval $(call gb_AllLangResTarget_add_srs,avmedia,\
-	avmedia/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res))
-
-$(eval $(call gb_SrsTarget_set_include,avmedia/res,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/avmedia/inc \
-	-I$(SRCDIR)/avmedia/source/framework \
-	-I$(SRCDIR)/avmedia/source/viewer \
-))
-
-$(eval $(call gb_SrsTarget_add_files,avmedia/res,\
-	avmedia/source/framework/mediacontrol.src \
-	avmedia/source/viewer/mediawindow.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index d7625c86447c..deeae3979bef 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
-	AllLangResTarget_avmedia \
+    AllLangMoTarget_avmedia \
 ))
 
 ifeq ($(ENABLE_GSTREAMER_1_0),TRUE)
diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc
new file mode 100644
index 000000000000..b4e260ad4363
--- /dev/null
+++ b/avmedia/inc/strings.hrc
@@ -0,0 +1,48 @@
+/* -*- 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_AVMEDIA_INC_STRINGS_HRC
+#define INCLUDED_AVMEDIA_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define AVMEDIA_STR_OPEN            NC_("AVMEDIA_STR_OPEN", "Open")
+#define AVMEDIA_STR_INSERT          NC_("AVMEDIA_STR_INSERT", "Apply")
+#define AVMEDIA_STR_PLAY            NC_("AVMEDIA_STR_PLAY", "Play")
+#define AVMEDIA_STR_PAUSE           NC_("AVMEDIA_STR_PAUSE", "Pause")
+#define AVMEDIA_STR_STOP            NC_("AVMEDIA_STR_STOP", "Stop")
+#define AVMEDIA_STR_LOOP            NC_("AVMEDIA_STR_LOOP", "Repeat")
+#define AVMEDIA_STR_MUTE            NC_("AVMEDIA_STR_MUTE", "Mute")
+#define AVMEDIA_STR_ZOOM            NC_("AVMEDIA_STR_ZOOM", "View")
+#define AVMEDIA_STR_ZOOM_50         NC_("AVMEDIA_STR_ZOOM_50", "50%")
+#define AVMEDIA_STR_ZOOM_100        NC_("AVMEDIA_STR_ZOOM_100", "100%")
+#define AVMEDIA_STR_ZOOM_200        NC_("AVMEDIA_STR_ZOOM_200", "200%")
+#define AVMEDIA_STR_ZOOM_FIT        NC_("AVMEDIA_STR_ZOOM_FIT", "Scaled")
+#define AVMEDIA_STR_MEDIAPLAYER     NC_("AVMEDIA_STR_MEDIAPLAYER", "Media Player")
+#define AVMEDIA_MEDIA_PATH          NC_("AVMEDIA_MEDIA_PATH", "Media Path")
+#define AVMEDIA_MEDIA_PATH_DEFAULT  NC_("AVMEDIA_MEDIA_PATH_DEFAULT", "No Media Selected")
+#define AVMEDIA_STR_INSERTMEDIA_DLG NC_("AVMEDIA_STR_INSERTMEDIA_DLG", "Insert Audio or Video")
+#define AVMEDIA_STR_OPENMEDIA_DLG   NC_("AVMEDIA_STR_OPENMEDIA_DLG", "Open Audio or Video")
+#define AVMEDIA_STR_ALL_MEDIAFILES  NC_("AVMEDIA_STR_ALL_MEDIAFILES", "All audio and video files")
+#define AVMEDIA_STR_ALL_FILES       NC_("AVMEDIA_STR_ALL_FILES", "All files")
+#define AVMEDIA_STR_ERR_URL         NC_("AVMEDIA_STR_ERR_URL", "The format of the selected file is not supported.")
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+#endif
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index 390f08ff6dbc..ba848c050915 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -27,7 +27,7 @@
 #include <tools/time.hxx>
 #include <vcl/lstbox.hxx>
 #include "bitmaps.hlst"
-#include "mediacontrol.hrc"
+#include "strings.hrc"
 #include "helpids.hrc"
 #include "mediamisc.hxx"
 
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 6c1f77ba7d43..c5695c4f185a 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "mediacontrol.hxx"
-#include "mediacontrol.hrc"
+#include "strings.hrc"
 #include "mediamisc.hxx"
 #include <avmedia/mediawindow.hxx>
 #include <avmedia/mediaplayer.hxx>
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
deleted file mode 100644
index 3086496eb214..000000000000
--- a/avmedia/source/framework/mediacontrol.hrc
+++ /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 .
- */
-
-#define AVMEDIA_STR_PLAY        1024
-#define AVMEDIA_STR_PAUSE       1025
-#define AVMEDIA_STR_STOP        1026
-#define AVMEDIA_STR_LOOP        1027
-#define AVMEDIA_STR_ZOOM        1028
-#define AVMEDIA_STR_ZOOM_50     1029
-#define AVMEDIA_STR_ZOOM_100    1030
-#define AVMEDIA_STR_ZOOM_200    1031
-#define AVMEDIA_STR_ZOOM_FIT    1032
-#define AVMEDIA_STR_MUTE        1033
-#define AVMEDIA_STR_OPEN        1034
-#define AVMEDIA_STR_INSERT      1035
-#define AVMEDIA_STR_MEDIAPLAYER 1036
-
-#define AVMEDIA_MEDIA_PATH      4076
-#define AVMEDIA_MEDIA_PATH_DEFAULT 4078
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
deleted file mode 100644
index e62c43a27b4c..000000000000
--- a/avmedia/source/framework/mediacontrol.src
+++ /dev/null
@@ -1,98 +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 "mediacontrol.hrc"
-
-String AVMEDIA_STR_OPEN
-{
-    Text[en-US] = "Open";
-};
-
-String AVMEDIA_STR_INSERT
-{
-    Text [ en-US ] = "Apply" ;
-};
-
-String AVMEDIA_STR_PLAY
-{
-    Text[en-US] = "Play";
-};
-
-String AVMEDIA_STR_PAUSE
-{
-    Text[en-US] = "Pause";
-};
-
-String AVMEDIA_STR_STOP
-{
-    Text[en-US] = "Stop";
-};
-
-String AVMEDIA_STR_LOOP
-{
-    Text[en-US] = "Repeat";
-};
-
-String AVMEDIA_STR_MUTE
-{
-    Text[en-US] = "Mute";
-};
-
-String AVMEDIA_STR_ZOOM
-{
-    Text[en-US] = "View";
-};
-
-String AVMEDIA_STR_ZOOM_50
-{
-    Text[en-US] = "50%";
-};
-
-String AVMEDIA_STR_ZOOM_100
-{
-    Text[en-US] = "100%";
-};
-
-String AVMEDIA_STR_ZOOM_200
-{
-    Text[en-US] = "200%";
-};
-
-String AVMEDIA_STR_ZOOM_FIT
-{
-    Text[en-US] = "Scaled";
-};
-
-String AVMEDIA_STR_MEDIAPLAYER
-{
-    Text[en-US] = "Media Player";
-};
-
-String AVMEDIA_MEDIA_PATH
-{
-    Text[en-US] = "Media Path";
-};
-
-String AVMEDIA_MEDIA_PATH_DEFAULT
-{
-    Text[en-US] = "No Media Selected";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index af9ce1b48b4e..50dd7687a0c0 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/resmgr.hxx>
-#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -26,16 +25,10 @@
 
 namespace avmedia {
 
-ResMgr* GetResMgr()
+const std::locale& GetResLocale()
 {
-    static ResMgr* pResMgr = nullptr;
-
-    if( !pResMgr )
-    {
-        pResMgr = ResMgr::CreateResMgr("avmedia", Application::GetSettings().GetUILanguageTag());
-    }
-
-    return pResMgr;
+    static std::locale loc = Translate::Create("avmedia", Application::GetSettings().GetUILanguageTag());
+    return loc;
 }
 
 } // namespace avmedia
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index a2e18fe50116..6cce70f2e026 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -21,7 +21,7 @@
 #include <avmedia/mediawindow.hxx>
 #include <avmedia/mediaitem.hxx>
 #include "mediamisc.hxx"
-#include "mediacontrol.hrc"
+#include "strings.hrc"
 #include "helpids.hrc"
 
 #include <svl/stritem.hxx>
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index aefc6ac49c0b..0a75833d3f92 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -21,17 +21,7 @@
 #define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
 
 #include <config_features.h>
-#include <tools/resid.hxx>
-
-namespace avmedia
-{
-    ResMgr* GetResMgr();
-}
-
-inline OUString AvmResId(sal_uInt16 nId)
-{
-    return ResId(nId, * ::avmedia::GetResMgr());
-}
+#include <tools/resmgr.hxx>
 
 #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
 #ifdef _WIN32
@@ -55,6 +45,16 @@ inline OUString AvmResId(sal_uInt16 nId)
 #define AVMEDIA_MIMETYPE_JSON             "model/vnd.gltf+json"
 #endif
 
+namespace avmedia
+{
+    const std::locale& GetResLocale();
+}
+
+inline OUString AvmResId(const char* pId)
+{
+    return Translate::get(pId, ::avmedia::GetResLocale());
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 8145cea56b32..62fd5ee9349e 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -21,7 +21,7 @@
 #include "mediawindow_impl.hxx"
 #include "mediamisc.hxx"
 #include "bitmaps.hlst"
-#include "mediawindow.hrc"
+#include "strings.hrc"
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
deleted file mode 100644
index b4ec26c6e357..000000000000
--- a/avmedia/source/viewer/mediawindow.hrc
+++ /dev/null
@@ -1,26 +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 AVMEDIA_STR_OPENMEDIA_DLG       16384
-#define AVMEDIA_STR_INSERTMEDIA_DLG     16385
-#define AVMEDIA_STR_ALL_MEDIAFILES      16386
-#define AVMEDIA_STR_ALL_FILES           16387
-#define AVMEDIA_STR_ERR_URL             16388
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
deleted file mode 100644
index 9c753a6f5b57..000000000000
--- a/avmedia/source/viewer/mediawindow.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 "mediawindow.hrc"
-
-String AVMEDIA_STR_INSERTMEDIA_DLG
-{
-    Text[en-US] = "Insert Audio or Video";
-};
-
-String AVMEDIA_STR_OPENMEDIA_DLG
-{
-    Text[en-US] = "Open Audio or Video";
-};
-
-String AVMEDIA_STR_ALL_MEDIAFILES
-{
-    Text[en-US] = "All audio and video files";
-};
-
-String AVMEDIA_STR_ALL_FILES
-{
-    Text[en-US] = "All files";
-};
-
-String AVMEDIA_STR_ERR_URL
-{
-    Text[en-US] = "The format of the selected file is not supported.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index d362a5b7e0c0..13eb6626774f 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -23,8 +23,8 @@
 #include "mediawindow_impl.hxx"
 #include "mediaevent_impl.hxx"
 #include "mediamisc.hxx"
+#include "strings.hrc"
 #include "bitmaps.hlst"
-#include "mediawindow.hrc"
 #include "helpids.hrc"
 
 #include <algorithm>
diff --git a/basctl/AllLangMoTarget_basctl.mk b/basctl/AllLangMoTarget_basctl.mk
new file mode 100644
index 000000000000..4c9a27bfdb9c
--- /dev/null
+++ b/basctl/AllLangMoTarget_basctl.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,basctl))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
deleted file mode 100644
index b2d6f0f130af..000000000000
--- a/basctl/AllLangResTarget_basctl.mk
+++ /dev/null
@@ -1,45 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,basctl))
-
-$(eval $(call gb_AllLangResTarget_add_srs,basctl,\
-	basctl/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
-
-$(eval $(call gb_SrsTarget_set_include,basctl/res,\
-	-I$(SRCDIR)/basctl/inc \
-	-I$(SRCDIR)/basctl/source/inc \
-	-I$(SRCDIR)/basctl/source/basicide \
-	-I$(SRCDIR)/basctl/source/dlged \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_SrsTarget_add_files,basctl/res,\
-	basctl/source/basicide/basicprint.src \
-	basctl/source/basicide/basidesh.src \
-	basctl/source/basicide/macrodlg.src \
-	basctl/source/basicide/moduldlg.src \
-	basctl/source/basicide/objdlg.src \
-	basctl/source/dlged/dlgresid.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 5fcc49fbec26..304a81dc9f63 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -23,14 +23,11 @@ ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Module_add_targets,basctl,\
 	Library_basctl \
+	UIConfig_basicide \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,basctl,\
-	AllLangResTarget_basctl \
-))
-
-$(eval $(call gb_Module_add_l10n_targets,basctl,\
-	UIConfig_basicide \
+	AllLangMoTarget_basctl \
 ))
 
 endif
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
deleted file mode 100644
index 1c58557dddcc..000000000000
--- a/basctl/inc/basidesh.hrc
+++ /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 .
- */
-
-#ifndef BASCTL_INC_BASIDESH_HRC
-#define BASCTL_INC_BASIDESH_HRC
-
-#include <svx/svxids.hrc>
-
-#define RID_STR_SEARCHALLMODULES        ( RID_BASICIDE_START +  1 )
-#define RID_STR_SEARCHFROMSTART         ( RID_BASICIDE_START +  2 )
-#define RID_STR_NOMODULE                ( RID_BASICIDE_START +  3 )
-#define RID_STR_FILTER_ALLFILES         ( RID_BASICIDE_START +  4 )
-// free
-#define RID_STR_CANNOTCLOSE             ( RID_BASICIDE_START + 13 )
-// free
-#define RID_STR_STACKNAME               ( RID_BASICIDE_START + 16 )
-#define RID_STR_WATCHNAME               ( RID_BASICIDE_START + 17 )
-#define RID_STR_REMOVEWATCH             ( RID_BASICIDE_START + 18 )
-#define RID_STR_CANNOTRUNMACRO          ( RID_BASICIDE_START + 19 )
-#define RID_STR_STDDIALOGNAME           ( RID_BASICIDE_START + 24 )
-
-#define RID_STR_ALL                     ( RID_BASICIDE_START + 28 )
-
-#define RID_STR_PAGE                    ( RID_BASICIDE_START + 30 )
-#define RID_STR_BADSBXNAME              ( RID_BASICIDE_START + 31 )
-#define RID_STR_NOLIBINSTORAGE          ( RID_BASICIDE_START + 34 )
-#define RID_STR_SBXNAMEALLREADYUSED     ( RID_BASICIDE_START + 35 )
-#define RID_STR_SIGNED                  ( RID_BASICIDE_START + 36 )
-#define RID_STR_WATCHVARIABLE           ( RID_BASICIDE_START + 37 )
-#define RID_STR_WATCHVALUE              ( RID_BASICIDE_START + 38 )
-#define RID_STR_WATCHTYPE               ( RID_BASICIDE_START + 39 )
-// free
-#define RID_STR_REPLACESTDLIB           ( RID_BASICIDE_START + 41 )
-#define RID_STR_SBXNAMEALLREADYUSED2    ( RID_BASICIDE_START + 42 )
-#define RID_STR_SEARCHNOTFOUND          ( RID_BASICIDE_START + 43 )
-#define RID_STR_SEARCHREPLACES          ( RID_BASICIDE_START + 44 )
-#define RID_STR_CANNOTCHANGENAMESTDLIB  ( RID_BASICIDE_START + 45 )
-#define RID_STR_GENERATESOURCE          ( RID_BASICIDE_START + 48 )
-#define RID_STR_REFNOTPOSSIBLE          ( RID_BASICIDE_START + 49 )
-// free
-#define RID_STR_NEWLIB                  ( RID_BASICIDE_START + 57 )
-#define RID_STR_NEWMOD                  ( RID_BASICIDE_START + 58 )
-#define RID_STR_NEWDLG                  ( RID_BASICIDE_START + 59 )
-#define RID_STR_LIBNAMETOLONG           ( RID_BASICIDE_START + 60 )
-#define RID_STR_ERRORCHOOSEMACRO        ( RID_BASICIDE_START + 61 )
-//free slot
-#define RID_STR_LIBISREADONLY           ( RID_BASICIDE_START + 63 )
-#define RID_STR_REPLACELIB              ( RID_BASICIDE_START + 64 )
-// free
-#define RID_STR_IMPORTNOTPOSSIBLE       ( RID_BASICIDE_START + 67 )
-#define RID_STR_NOIMPORT                ( RID_BASICIDE_START + 68 )
-#define RID_STR_ENTERPASSWORD           ( RID_BASICIDE_START + 69 )
-
-// free
-#define RID_STR_USERMACROS              ( RID_BASICIDE_START + 72 )
-#define RID_STR_USERDIALOGS             ( RID_BASICIDE_START + 73 )
-#define RID_STR_USERMACROSDIALOGS       ( RID_BASICIDE_START + 74 )
-#define RID_STR_SHAREMACROS             ( RID_BASICIDE_START + 75 )
-#define RID_STR_SHAREDIALOGS            ( RID_BASICIDE_START + 76 )
-#define RID_STR_SHAREMACROSDIALOGS      ( RID_BASICIDE_START + 77 )
-//free slot
-#define RID_STR_REMOVEWATCHTIP          ( RID_BASICIDE_START + 79 )
-#define RID_STR_QUERYREPLACEMACRO       ( RID_BASICIDE_START + 80 )
-#define RID_STR_FILENAME                ( RID_BASICIDE_START + 81 )
-#define RID_STR_APPENDLIBS              ( RID_BASICIDE_START + 82 )
-#define RID_STR_QUERYDELMACRO           ( RID_BASICIDE_START + 83 )
-#define RID_STR_QUERYDELDIALOG          ( RID_BASICIDE_START + 84 )
-#define RID_STR_QUERYDELLIB             ( RID_BASICIDE_START + 85 )
-#define RID_STR_QUERYDELLIBREF          ( RID_BASICIDE_START + 86 )
-#define RID_STR_QUERYDELMODULE          ( RID_BASICIDE_START + 87 )
-#define RID_STR_BASIC                   ( RID_BASICIDE_START + 88 )
-#define RID_STR_WILLSTOPPRG             ( RID_BASICIDE_START + 91 )
-#define RID_STR_STACK                   ( RID_BASICIDE_START + 92 )
-#define RID_STR_COULDNTREAD             ( RID_BASICIDE_START + 94 )
-#define RID_STR_COULDNTWRITE            ( RID_BASICIDE_START + 95 )
-#define RID_STR_WRONGPASSWORD           ( RID_BASICIDE_START + 96 )
-#define RID_STR_LINE                    ( RID_BASICIDE_START + 97 )
-#define RID_STR_COLUMN                  ( RID_BASICIDE_START + 98 )
-#define RID_STR_EXPORTPACKAGE           ( RID_BASICIDE_START + 100 )
-#define RID_STR_EXPORTBASIC             ( RID_BASICIDE_START + 101 )
-#define RID_STR_PACKAGE_BUNDLE          ( RID_BASICIDE_START + 102 )
-
-#define RID_STR_DLGIMP_CLASH_RENAME     ( RID_BASICIDE_START + 110 )
-#define RID_STR_DLGIMP_CLASH_REPLACE    ( RID_BASICIDE_START + 111 )
-#define RID_STR_DLGIMP_CLASH_TITLE      ( RID_BASICIDE_START + 112 )
-#define RID_STR_DLGIMP_CLASH_TEXT       ( RID_BASICIDE_START + 113 )
-#define RID_STR_DLGIMP_MISMATCH_ADD     ( RID_BASICIDE_START + 114 )
-#define RID_STR_DLGIMP_MISMATCH_OMIT    ( RID_BASICIDE_START + 115 )
-#define RID_STR_DLGIMP_MISMATCH_TITLE   ( RID_BASICIDE_START + 116 )
-#define RID_STR_DLGIMP_MISMATCH_TEXT    ( RID_BASICIDE_START + 117 )
-#define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 118 )
-#define RID_STR_USERFORMS               ( RID_BASICIDE_START + 119 )
-#define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 120 )
-#define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 121 )
-//free slots
-#define RID_STR_PRINTDLG_RANGE          ( RID_BASICIDE_START + 130 )
-#define RID_STR_PRINTDLG_ALLPAGES       ( RID_BASICIDE_START + 131 )
-#define RID_STR_PRINTDLG_PAGES          ( RID_BASICIDE_START + 132 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 393f02def886..69b2ecdd34c3 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -383,8 +383,6 @@
 #include <o3tl/enumarray.hxx>
 #include <o3tl/make_unique.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
@@ -545,8 +543,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resary.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
new file mode 100644
index 000000000000..aa9ebb37f7c5
--- /dev/null
+++ b/basctl/inc/strings.hrc
@@ -0,0 +1,122 @@
+/* -*- 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 BASCTL_INC_BASIDESH_HRC
+#define BASCTL_INC_BASIDESH_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_STR_FILTER_ALLFILES             NC_("RID_STR_FILTER_ALLFILES", "<All>")
+#define RID_STR_NOMODULE                    NC_("RID_STR_NOMODULE", "< No Module >")
+#define RID_STR_WRONGPASSWORD               NC_("RID_STR_WRONGPASSWORD", "Incorrect Password")
+#define RID_STR_NOLIBINSTORAGE              NC_("RID_STR_NOLIBINSTORAGE", "The file does not contain any BASIC libraries")
+#define RID_STR_BADSBXNAME                  NC_("RID_STR_BADSBXNAME", "Invalid Name")
+#define RID_STR_LIBNAMETOLONG               NC_("RID_STR_LIBNAMETOLONG", "A library name can have up to 30 characters.")
+#define RID_STR_ERRORCHOOSEMACRO            NC_("RID_STR_ERRORCHOOSEMACRO", "Macros from other documents are not accessible.")
+#define RID_STR_LIBISREADONLY               NC_("RID_STR_LIBISREADONLY", "This library is read-only.")
+#define RID_STR_REPLACELIB                  NC_("RID_STR_REPLACELIB", "'XX' cannot be replaced.")
+#define RID_STR_IMPORTNOTPOSSIBLE           NC_("RID_STR_IMPORTNOTPOSSIBLE", "'XX' cannot be added.")
+#define RID_STR_NOIMPORT                    NC_("RID_STR_NOIMPORT", "'XX' was not added.")
+#define RID_STR_ENTERPASSWORD               NC_("RID_STR_ENTERPASSWORD", "Enter password for 'XX'")
+#define RID_STR_SBXNAMEALLREADYUSED         NC_("RID_STR_SBXNAMEALLREADYUSED", "Name already exists")
+#define RID_STR_SIGNED                      NC_("RID_STR_SIGNED", "(Signed)")
+#define RID_STR_SBXNAMEALLREADYUSED2        NC_("RID_STR_SBXNAMEALLREADYUSED2", "Object with same name already exists")
+#define RID_STR_CANNOTRUNMACRO              NC_("RID_STR_CANNOTRUNMACRO", "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings.")
+#define RID_STR_SEARCHNOTFOUND              NC_("RID_STR_SEARCHNOTFOUND", "Search key not found")
+#define RID_STR_SEARCHFROMSTART             NC_("RID_STR_SEARCHFROMSTART", "Search to last module complete. Continue at first module?")
+#define RID_STR_SEARCHREPLACES              NC_("RID_STR_SEARCHREPLACES", "Search key replaced XX times")
+#define RID_STR_COULDNTREAD                 NC_("RID_STR_COULDNTREAD", "The file could not be read")
+#define RID_STR_COULDNTWRITE                NC_("RID_STR_COULDNTWRITE", "The file could not be saved")
+#define RID_STR_CANNOTCHANGENAMESTDLIB      NC_("RID_STR_CANNOTCHANGENAMESTDLIB", "The name of the default library cannot be changed.")
+#define RID_STR_GENERATESOURCE              NC_("RID_STR_GENERATESOURCE", "Generating source")
+#define RID_STR_FILENAME                    NC_("RID_STR_FILENAME", "File name:")
+#define RID_STR_APPENDLIBS                  NC_("RID_STR_APPENDLIBS", "Import Libraries")
+#define RID_STR_QUERYDELMACRO               NC_("RID_STR_QUERYDELMACRO", "Do you want to delete the macro XX?")
+#define RID_STR_QUERYDELDIALOG              NC_("RID_STR_QUERYDELDIALOG", "Do you want to delete the XX dialog?")
+#define RID_STR_QUERYDELLIB                 NC_("RID_STR_QUERYDELLIB", "Do you want to delete the XX library?")
+#define RID_STR_QUERYDELLIBREF              NC_("RID_STR_QUERYDELLIBREF", "Do you want to delete the reference to the XX library?")
+#define RID_STR_QUERYDELMODULE              NC_("RID_STR_QUERYDELMODULE", "Do you want to delete the XX module?")
+#define RID_STR_BASIC                       NC_("RID_STR_BASIC", "BASIC")
+// Abbreviation for 'line'
+#define RID_STR_LINE                        NC_("RID_STR_LINE", "Ln")
+// Abbreviation for 'column'
+#define RID_STR_COLUMN                      NC_("RID_STR_COLUMN", "Col")
+#define RID_STR_CANNOTCLOSE                 NC_("RID_STR_CANNOTCLOSE", "The window cannot be closed while BASIC is running.")
+#define RID_STR_REPLACESTDLIB               NC_("RID_STR_REPLACESTDLIB", "The default library cannot be replaced.")
+#define RID_STR_REFNOTPOSSIBLE              NC_("RID_STR_REFNOTPOSSIBLE", "Reference to 'XX' not possible.")
+#define RID_STR_WATCHNAME                   NC_("RID_STR_WATCHNAME", "Watch")
+#define RID_STR_WATCHVARIABLE               NC_("RID_STR_WATCHVARIABLE", "Variable")
+#define RID_STR_WATCHVALUE                  NC_("RID_STR_WATCHVALUE", "Value")
+#define RID_STR_WATCHTYPE                   NC_("RID_STR_WATCHTYPE", "Type")
+#define RID_STR_STACKNAME                   NC_("RID_STR_STACKNAME", "Call Stack")
+#define RID_STR_STDDIALOGNAME               NC_("RID_STR_STDDIALOGNAME", "Dialog")
+#define RID_STR_NEWLIB                      NC_("RID_STR_NEWLIB", "New Library")
+#define RID_STR_NEWMOD                      NC_("RID_STR_NEWMOD", "New Module")
+#define RID_STR_NEWDLG                      NC_("RID_STR_NEWDLG", "New Dialog")
+#define RID_STR_ALL                         NC_("RID_STR_ALL", "All")
+#define RID_STR_PAGE                        NC_("RID_STR_PAGE", "Page")
+#define RID_STR_WILLSTOPPRG                 NC_("RID_STR_WILLSTOPPRG", "You will have to restart the program after this edit.\nContinue?")
+#define RID_STR_SEARCHALLMODULES            NC_("RID_STR_SEARCHALLMODULES", "Do you want to replace the text in all active modules?")
+#define RID_STR_REMOVEWATCH                 NC_("RID_STR_REMOVEWATCH", "Watch:")
+#define RID_STR_STACK                       NC_("RID_STR_STACK", "Calls: ")
+#define RID_STR_USERMACROS                  NC_("RID_STR_USERMACROS", "My Macros")
+#define RID_STR_USERDIALOGS                 NC_("RID_STR_USERDIALOGS", "My Dialogs")
+#define RID_STR_USERMACROSDIALOGS           NC_("RID_STR_USERMACROSDIALOGS", "My Macros & Dialogs")
+#define RID_STR_SHAREMACROS                 NC_("RID_STR_SHAREMACROS", "%PRODUCTNAME Macros")
+#define RID_STR_SHAREDIALOGS                NC_("RID_STR_SHAREDIALOGS", "%PRODUCTNAME Dialogs")
+#define RID_STR_SHAREMACROSDIALOGS          NC_("RID_STR_SHAREMACROSDIALOGS", "%PRODUCTNAME Macros & Dialogs")
+#define RID_STR_REMOVEWATCHTIP              NC_("RID_STR_REMOVEWATCHTIP", "Remove Watch")
+#define RID_STR_QUERYREPLACEMACRO           NC_("RID_STR_QUERYREPLACEMACRO", "Do you want to overwrite the XX macro?")
+#define RID_STR_TRANSLATION_NOTLOCALIZED    NC_("RID_STR_TRANSLATION_NOTLOCALIZED", "<Not localized>")
+#define RID_STR_TRANSLATION_DEFAULT         NC_("RID_STR_TRANSLATION_DEFAULT", "[Default Language]")
+#define RID_STR_DOCUMENT_OBJECTS            NC_("RID_STR_DOCUMENT_OBJECTS", "Document Objects")
+#define RID_STR_USERFORMS                   NC_("RID_STR_USERFORMS", "Forms")
+#define RID_STR_NORMAL_MODULES              NC_("RID_STR_NORMAL_MODULES", "Modules")
+#define RID_STR_CLASS_MODULES               NC_("RID_STR_CLASS_MODULES", "Class Modules")
+#define RID_STR_DLGIMP_CLASH_RENAME         NC_("RID_STR_DLGIMP_CLASH_RENAME", "Rename")
+#define RID_STR_DLGIMP_CLASH_REPLACE        NC_("RID_STR_DLGIMP_CLASH_REPLACE", "Replace")
+#define RID_STR_DLGIMP_CLASH_TITLE          NC_("RID_STR_DLGIMP_CLASH_TITLE", "Dialog Import - Name already used")
+#define RID_STR_DLGIMP_CLASH_TEXT           NC_("RID_STR_DLGIMP_CLASH_TEXT", "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n ")
+#define RID_STR_DLGIMP_MISMATCH_ADD         NC_("RID_STR_DLGIMP_MISMATCH_ADD", "Add")
+#define RID_STR_DLGIMP_MISMATCH_OMIT        NC_("RID_STR_DLGIMP_MISMATCH_OMIT", "Omit")
+#define RID_STR_DLGIMP_MISMATCH_TITLE       NC_("RID_STR_DLGIMP_MISMATCH_TITLE", "Dialog Import - Language Mismatch")
+#define RID_STR_DLGIMP_MISMATCH_TEXT        NC_("RID_STR_DLGIMP_MISMATCH_TEXT", "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n ")
+#define RID_STR_PRINTDLG_RANGE              NC_("RID_STR_PRINTDLG_RANGE", "Print range")
+#define RID_STR_PRINTDLG_ALLPAGES           NC_("RID_STR_PRINTDLG_ALLPAGES", "All ~Pages")
+#define RID_STR_PRINTDLG_PAGES              NC_("RID_STR_PRINTDLG_PAGES", "Pa~ges")
+#define RID_STR_BTNDEL                      NC_("RID_STR_BTNDEL", "~Delete")
+#define RID_STR_BTNNEW                      NC_("RID_STR_BTNNEW", "~New")
+#define RID_STR_CHOOSE                      NC_("RID_STR_CHOOSE", "Choose")
+#define RID_STR_RUN                         NC_("RID_STR_RUN", "Run")
+#define RID_STR_RECORD                      NC_("RID_STR_RECORD", "~Save")
+#define RID_BASICIDE_OBJCAT                 NC_("RID_BASICIDE_OBJCAT", "Object Catalog")
+#define RID_STR_TLB_MACROS                  NC_("RID_STR_TLB_MACROS", "Objects Tree")
+// Property Browser Headline ----------------------------------------------------------------
+#define RID_STR_BRWTITLE_PROPERTIES         NC_("RID_STR_BRWTITLE_PROPERTIES", "Properties: ")
+#define RID_STR_BRWTITLE_NO_PROPERTIES      NC_("RID_STR_BRWTITLE_NO_PROPERTIES", "No Control marked")
+#define RID_STR_BRWTITLE_MULTISELECT        NC_("RID_STR_BRWTITLE_MULTISELECT", "Multiselection")
+#define RID_STR_DEF_LANG                    NC_("RID_STR_DEF_LANG", "[Default Language]")
+#define RID_STR_CREATE_LANG                 NC_("RID_STR_CREATE_LANG", "<Press 'Add' to create language resources>")
+#define RID_STR_EXPORTPACKAGE               NC_("RID_STR_EXPORTPACKAGE", "Export library as extension")
+#define RID_STR_EXPORTBASIC                 NC_("RID_STR_EXPORTBASIC", "Export as BASIC library")
+#define RID_STR_PACKAGE_BUNDLE              NC_("RID_STR_PACKAGE_BUNDLE", "Extension")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index b048169038a0..9ce006ac6532 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include <basidesh.hxx>
 
 #include <basicbox.hxx>
@@ -25,7 +25,6 @@
 
 #include "localizationmgr.hxx"
 #include "managelang.hxx"
-#include "dlgresid.hrc"
 
 #include <sfx2/dispatch.hxx>
 #include <svtools/langtab.hxx>
diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx
index ffc960cea598..7dcee5a16420 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -29,9 +29,10 @@ namespace basctl
 class Module : public SfxModule
 {
 public:
-    Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
-        SfxModule( pMgr, {pObjFact} )
-    { }
+    Module(const std::locale& rResLocale, SfxObjectFactory *pObjFact)
+        : SfxModule(rResLocale, {pObjFact})
+    {
+    }
 };
 
 } // namespace basctl
diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src
deleted file mode 100644
index 7eb01d2ea2cc..000000000000
--- a/basctl/source/basicide/basicprint.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 <basidesh.hrc>
-
-String RID_STR_PRINTDLG_RANGE
-{
-    Text [ en-US ] = "Print range";
-};
-String RID_STR_PRINTDLG_ALLPAGES
-{
-    Text [ en-US ] = "All ~Pages";
-};
-String RID_STR_PRINTDLG_PAGES
-{
-    Text [ en-US ] = "Pa~ges";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index f6f2b5a9649e..1e51245735b1 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -19,11 +19,10 @@
 
 #include "basicrenderable.hxx"
 #include "bastypes.hxx"
-#include "basidesh.hrc"
+#include "strings.hrc"
 
 #include <toolkit/awt/vclxdevice.hxx>
 #include <tools/multisel.hxx>
-#include <tools/resary.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/propertysequence.hxx>
 
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index e40583f82e80..b8bfd80a0970 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -26,7 +26,7 @@
 #include "officecfg/Office/BasicIDE.hxx"
 
 #include "helpid.hrc"
-#include <basidesh.hrc>
+#include <strings.hrc>
 
 #include <basic/basmgr.hxx>
 #include <basic/basrdll.hxx>
@@ -47,6 +47,7 @@
 #include <svl/srchitem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
+#include <svx/svxids.hrc>
 #include <vcl/xtextedt.hxx>
 #include <vcl/settings.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -134,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
 
         if( bOutput )
         {
-            OUString aPageStr = " [" + OUString(IDEResId(RID_STR_PAGE)) + " " + OUString::number( nCurPage ) + "]";
+            OUString aPageStr = " [" + IDEResId(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]";
             pPrinter->DrawText( aPos, aPageStr );
         }
     }
@@ -1066,11 +1067,11 @@ void ModulWindow::GetState( SfxItemSet &rSet )
                 if ( pView )
                 {
                     TextSelection aSel = pView->GetSelection();
-                    OUString aPos = OUString( IDEResId( RID_STR_LINE ) ) +
+                    OUString aPos = IDEResId( RID_STR_LINE ) +
                                    " " +
                                    OUString::number(aSel.GetEnd().GetPara()+1) +
                                    ", " +
-                                   OUString( IDEResId( RID_STR_COLUMN ) ) +
+                                   IDEResId( RID_STR_COLUMN ) +
                                    " " +
                                    OUString::number(aSel.GetEnd().GetIndex()+1);
                     SfxStringItem aItem( SID_BASICIDE_STAT_POS, aPos );
@@ -1302,7 +1303,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor()
         {
             case script::ModuleType::DOCUMENT:
             {
-                aLibSubName = OUString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) );
+                aLibSubName = IDEResId( RID_STR_DOCUMENT_OBJECTS );
                 uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
                 if( xLib.is() )
                 {
@@ -1316,13 +1317,13 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor()
                 break;
             }
             case script::ModuleType::FORM:
-                aLibSubName = OUString( IDEResId( RID_STR_USERFORMS ) );
+                aLibSubName = IDEResId( RID_STR_USERFORMS );
                 break;
             case script::ModuleType::NORMAL:
-                aLibSubName = OUString( IDEResId( RID_STR_NORMAL_MODULES ) );
+                aLibSubName = IDEResId( RID_STR_NORMAL_MODULES );
                 break;
             case script::ModuleType::CLASS:
-                aLibSubName = OUString( IDEResId( RID_STR_CLASS_MODULES ) );
+                aLibSubName = IDEResId( RID_STR_CLASS_MODULES );
                 break;
         }
     }
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index bfc655b9bb30..330feefdfd8c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -22,7 +22,7 @@
 #include <cassert>
 
 #include "helpid.hrc"
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 
 #include "baside2.hxx"
@@ -39,6 +39,7 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/urihelper.hxx>
+#include <svx/svxids.hrc>
 #include <vcl/xtextedt.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index d42b183eaa54..4fe135056e02 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "helpid.hrc"
 
 #include "accessibledialogwindow.hxx"
@@ -46,6 +46,7 @@
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svdundo.hxx>
+#include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 2a015cc7cce2..000a43cdeecc 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "helpid.hrc"
 
 #include "baside2.hxx"
@@ -41,6 +41,7 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <svx/svxids.hrc>
 #include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/srchitem.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 82c4e1a261c1..1de2e0564747 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -23,7 +23,7 @@
 
 #include <com/sun/star/frame/XTitle.hpp>
 
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include <baside2.hxx>
 #include <basdoc.hxx>
 #include <vcl/xtextedt.hxx>
@@ -108,7 +108,7 @@ void Shell::SetMDITitle()
     DocumentSignature aCurSignature( m_aCurDocument );
     if ( aCurSignature.getScriptingSignatureState() == SignatureState::OK )
     {
-        aTitle += " " + OUString(IDEResId(RID_STR_SIGNED)) + " ";
+        aTitle += " " + IDEResId(RID_STR_SIGNED) + " ";
     }
 
     SfxViewFrame* pViewFrame = GetViewFrame();
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e9d2f5b0acda..8ef3742d6222 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -21,7 +21,8 @@
 
 #include <tools/diagnose_ex.h>
 #include <basic/basmgr.hxx>
-#include <basidesh.hrc>
+#include <svx/svxids.hrc>
+#include "strings.hrc"
 #include "baside2.hxx"
 #include "baside3.hxx"
 #include <basdoc.hxx>
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
deleted file mode 100644
index 3986ae749737..000000000000
--- a/basctl/source/basicide/basidesh.src
+++ /dev/null
@@ -1,343 +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 <basidesh.hrc>
-#include <helpid.hrc>
-#include "dlgresid.hrc"
-
-String RID_STR_FILTER_ALLFILES
-{
-    Text [ en-US ] = "<All>" ;
-};
-String RID_STR_NOMODULE
-{
-    Text [ en-US ] = "< No Module >" ;
-};
-String RID_STR_WRONGPASSWORD
-{
-    Text [ en-US ] = "Incorrect Password" ;
-};
-String RID_STR_NOLIBINSTORAGE
-{
-    Text [ en-US ] = "The file does not contain any BASIC libraries" ;
-};
-String RID_STR_BADSBXNAME
-{
-    Text [ en-US ] = "Invalid Name" ;
-};
-String RID_STR_LIBNAMETOLONG
-{
-    Text [ en-US ] = "A library name can have up to 30 characters.";
-};
-String RID_STR_ERRORCHOOSEMACRO
-{
-    Text [ en-US ] = "Macros from other documents are not accessible.";
-};
-String RID_STR_LIBISREADONLY
-{
-    Text [ en-US ] = "This library is read-only.";
-};
-String RID_STR_REPLACELIB
-{
-    Text [ en-US ] = "'XX' cannot be replaced.";
-};
-String RID_STR_IMPORTNOTPOSSIBLE
-{
-    Text [ en-US ] = "'XX' cannot be added.";
-};
-String RID_STR_NOIMPORT
-{
-    Text [ en-US ] = "'XX' was not added.";
-};
-String RID_STR_ENTERPASSWORD
-{
-    Text [ en-US ] = "Enter password for 'XX'";
-};
-String RID_STR_SBXNAMEALLREADYUSED
-{
-    Text [ en-US ] = "Name already exists" ;
-};
-String RID_STR_SIGNED
-{
-    Text [ en-US ] = "(Signed)" ;
-};
-String RID_STR_SBXNAMEALLREADYUSED2
-{
-    Text [ en-US ] = "Object with same name already exists" ;
-};
-String RID_STR_CANNOTRUNMACRO
-{
-    Text [ en-US ] = "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings." ;
-};
-String RID_STR_SEARCHNOTFOUND
-{
-    Text [ en-US ] = "Search key not found" ;
-};
-String RID_STR_SEARCHFROMSTART
-{
-    Text [ en-US ] = "Search to last module complete. Continue at first module?" ;
-};
-String RID_STR_SEARCHREPLACES
-{
-    Text [ en-US ] = "Search key replaced XX times" ;
-};
-String RID_STR_COULDNTREAD
-{
-    Text [ en-US ] = "The file could not be read" ;
-};
-String RID_STR_COULDNTWRITE
-{
-    Text [ en-US ] = "The file could not be saved" ;
-};
-String RID_STR_CANNOTCHANGENAMESTDLIB
-{
-    Text [ en-US ] = "The name of the default library cannot be changed." ;
-};
-String RID_STR_GENERATESOURCE
-{
-    Text [ en-US ] = "Generating source" ;
-};
-String RID_STR_FILENAME
-{
-    Text [ en-US ] = "File name:" ;
-};
-String RID_STR_APPENDLIBS
-{
-    Text [ en-US ] = "Import Libraries" ;
-};
-String RID_STR_QUERYDELMACRO
-{
-    Text [ en-US ] = "Do you want to delete the macro XX?" ;
-};
-String RID_STR_QUERYDELDIALOG
-{
-    Text [ en-US ] = "Do you want to delete the XX dialog?" ;
-};
-String RID_STR_QUERYDELLIB
-{
-    Text [ en-US ] = "Do you want to delete the XX library?" ;
-};
-String RID_STR_QUERYDELLIBREF
-{
-    Text [ en-US ] = "Do you want to delete the reference to the XX library?" ;
-};
-String RID_STR_QUERYDELMODULE
-{
-    Text [ en-US ] = "Do you want to delete the XX module?" ;
-};
-String RID_STR_BASIC
-{
-    Text [ en-US ] = "BASIC" ;
-};
-String RID_STR_LINE
-{
-     // Abbreviation for 'line'
-    Text [ en-US ] = "Ln" ;
-};
-String RID_STR_COLUMN
-{
-     // Abbreviation for 'column'
-    Text [ en-US ] = "Col" ;
-};
-String RID_STR_CANNOTCLOSE
-{
-    Text [ en-US ] = "The window cannot be closed while BASIC is running." ;
-};
-String RID_STR_REPLACESTDLIB
-{
-    Text [ en-US ] = "The default library cannot be replaced." ;
-};
-String RID_STR_REFNOTPOSSIBLE
-{
-    Text [ en-US ] = "Reference to 'XX' not possible." ;
-};
-String RID_STR_WATCHNAME
-{
-    Text [ en-US ] = "Watch" ;
-};
-String RID_STR_WATCHVARIABLE
-{
-    Text [ en-US ] = "Variable" ;
-};
-String RID_STR_WATCHVALUE
-{
-    Text [ en-US ] = "Value" ;
-};
-String RID_STR_WATCHTYPE
-{
-    Text [ en-US ] = "Type" ;
-};
-String RID_STR_STACKNAME
-{
-    Text [ en-US ] = "Call Stack" ;
-};
-String RID_STR_STDDIALOGNAME
-{
-    Text [ en-US ] = "Dialog" ;
-};
-String RID_STR_NEWLIB
-{
-    Text [ en-US ] = "New Library" ;
-};
-String RID_STR_NEWMOD
-{
-    Text [ en-US ] = "New Module" ;
-};
-String RID_STR_NEWDLG
-{
-    Text [ en-US ] = "New Dialog" ;
-};
-String RID_STR_ALL
-{
-    Text [ en-US ] = "All" ;
-};
-String RID_STR_PAGE
-{
-    Text [ en-US ] = "Page" ;
-};
-String RID_STR_WILLSTOPPRG
-{
-    Text [ en-US ] = "You will have to restart the program after this edit.\nContinue?" ;
-};
-String RID_STR_SEARCHALLMODULES
-{
-    Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
-};
-
-String RID_STR_REMOVEWATCH
-{
-    Text [ en-US ] = "Watch:" ;
-};
-
-String RID_STR_STACK
-{
-    Text [ en-US ] = "Calls: " ;
-};
-
-String RID_STR_USERMACROS
-{
-    Text [ en-US ] = "My Macros" ;
-};
-
-String RID_STR_USERDIALOGS
-{
-    Text [ en-US ] = "My Dialogs" ;
-};
-
-String RID_STR_USERMACROSDIALOGS
-{
-    Text [ en-US ] = "My Macros & Dialogs" ;
-};
-
-String RID_STR_SHAREMACROS
-{
-    Text [ en-US ] = "%PRODUCTNAME Macros" ;
-};
-
-String RID_STR_SHAREDIALOGS
-{
-    Text [ en-US ] = "%PRODUCTNAME Dialogs" ;
-};
-
-String RID_STR_SHAREMACROSDIALOGS
-{
-    Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ;
-};
-
-String RID_STR_REMOVEWATCHTIP
-{
-    Text [ en-US ] = "Remove Watch" ;
-};
-
-String RID_STR_QUERYREPLACEMACRO
-{
-    Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
-};
-
-String RID_STR_TRANSLATION_NOTLOCALIZED
-{
-    Text [ en-US ] = "<Not localized>" ;
-};
-
-String RID_STR_TRANSLATION_DEFAULT
-{
-    Text [ en-US ] = "[Default Language]" ;
-};
-
-String RID_STR_DOCUMENT_OBJECTS
-{
-    Text [ en-US ] = "Document Objects" ;
-};
-
-String RID_STR_USERFORMS
-{
-    Text [ en-US ] = "Forms" ;
-};
-
-String RID_STR_NORMAL_MODULES
-{
-    Text [ en-US ] = "Modules" ;
-};
-
-String RID_STR_CLASS_MODULES
-{
-    Text [ en-US ] = "Class Modules" ;
-};
-
-String RID_STR_DLGIMP_CLASH_RENAME
-{
-    Text [ en-US ] = "Rename" ;
-};
-
-String RID_STR_DLGIMP_CLASH_REPLACE
-{
-    Text [ en-US ] = "Replace" ;
-};
-
-String RID_STR_DLGIMP_CLASH_TITLE
-{
-    Text [ en-US ] = "Dialog Import - Name already used" ;
-};
-
-String RID_STR_DLGIMP_CLASH_TEXT
-{
-    Text [ en-US ] = "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n " ;
-};
-
-String RID_STR_DLGIMP_MISMATCH_ADD
-{
-    Text [ en-US ] = "Add" ;
-};
-
-String RID_STR_DLGIMP_MISMATCH_OMIT
-{
-    Text [ en-US ] = "Omit" ;
-};
-
-String RID_STR_DLGIMP_MISMATCH_TITLE
-{
-    Text [ en-US ] = "Dialog Import - Language Mismatch" ;
-};
-
-String RID_STR_DLGIMP_MISMATCH_TEXT
-{
-    Text [ en-US ] = "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n " ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 13b84b029ff0..f9ee4ffb6400 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -21,7 +21,7 @@
 #include "iderdll2.hxx"
 #include "macrodlg.hxx"
 #include "moduldlg.hxx"
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "baside2.hxx"
 
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 48edafe675e4..4b4128cab931 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -25,7 +25,7 @@
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <basdoc.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 
 #include <baside2.hxx>
 #include <baside3.hxx>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 56ff853e79a2..f85b8ce5a113 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -20,7 +20,7 @@
 
 #include <bastypes.hxx>
 #include <bastype2.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <iderid.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index cf588e5d18bd..56c1ae7d2d96 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -20,7 +20,7 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <bastype2.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <bastypes.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 9750d2490b00..27f852cd7b46 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "helpid.hrc"
 
 #include "baside2.hxx"
@@ -707,13 +707,12 @@ LibInfo::Item::Item (
 LibInfo::Item::~Item ()
 { }
 
-bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )
+bool QueryDel(const OUString& rName, const OUString &rStr, vcl::Window* pParent)
 {
-    OUString aQuery(rId);
     OUStringBuffer aNameBuf( rName );
     aNameBuf.append('\'');
     aNameBuf.insert(0, '\'');
-    aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear());
+    OUString aQuery = rStr.replaceAll("XX", aNameBuf.makeStringAndClear());
     ScopedVclPtrInstance< MessageDialog > aQueryBox(pParent, aQuery, VclMessageType::Question, VclButtonsType::YesNo);
     return ( aQueryBox->Execute() == RET_YES );
 }
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index fc890c3aee0f..0773338a8537 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -25,13 +25,15 @@
 #include <iderdll2.hxx>
 #include <iderid.hxx>
 #include <basidesh.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include <basdoc.hxx>
 #include <basicmod.hxx>
 
 #include <svl/srchitem.hxx>
+#include <svx/svxids.hrc>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/make_unique.hxx>
 
@@ -103,10 +105,10 @@ ExtraData* GetExtraData()
     return nullptr;
 }
 
-
-IDEResId::IDEResId( sal_uInt16 nId ):
-    ResId(nId, *SfxApplication::GetModule(SfxToolsModule::Basic)->GetResMgr())
-{ }
+OUString IDEResId(const char *pId)
+{
+    return Translate::get(pId, SfxApplication::GetModule(SfxToolsModule::Basic)->GetResLocale());
+}
 
 namespace
 {
@@ -116,10 +118,9 @@ Dll::Dll () :
 {
     SfxObjectFactory& rFactory = DocShell::Factory();
 
-    ResMgr* pMgr = ResMgr::CreateResMgr(
-        "basctl", Application::GetSettings().GetUILanguageTag());
+    std::locale loc = Translate::Create("basctl", Application::GetSettings().GetUILanguageTag());
 
-    auto pModule = o3tl::make_unique<Module>( pMgr, &rFactory );
+    auto pModule = o3tl::make_unique<Module>(loc, &rFactory);
     SfxModule* pMod = pModule.get();
     SfxApplication::SetModule(SfxToolsModule::Basic, std::move(pModule));
 
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index f5a593b2bde9..0b02ee3b903c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -19,9 +19,8 @@
 
 
 #include <macrodlg.hxx>
-#include <macrodlg.hrc>
 #include <basidesh.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
deleted file mode 100644
index b61af05c4731..000000000000
--- a/basctl/source/basicide/macrodlg.hrc
+++ /dev/null
@@ -1,31 +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 BASCTL_MACRODLG_HRC
-#define BASCTL_MACRODLG_HRC
-
-
-#define RID_STR_BTNDEL                  ( RID_BASICIDE_START + 51 )
-#define RID_STR_BTNNEW                  ( RID_BASICIDE_START + 52 )
-#define RID_STR_CHOOSE                  ( RID_BASICIDE_START + 53 )
-#define RID_STR_RUN                     ( RID_BASICIDE_START + 54 )
-#define RID_STR_RECORD                  ( RID_BASICIDE_START + 56 )
-
-#endif // BASCTL_MACRODLG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
deleted file mode 100644
index f9ff3de552bd..000000000000
--- a/basctl/source/basicide/macrodlg.src
+++ /dev/null
@@ -1,43 +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 <macrodlg.hrc>
-#include <basidesh.hrc>
-String RID_STR_BTNDEL
-{
-    Text [ en-US ] = "~Delete" ;
-};
-String RID_STR_BTNNEW
-{
-    Text [ en-US ] = "~New" ;
-};
-String RID_STR_CHOOSE
-{
-    Text [ en-US ] = "Choose" ;
-};
-String RID_STR_RUN
-{
-    Text [ en-US ] = "Run" ;
-};
-String RID_STR_RECORD
-{
-    Text [ en-US ] = "~Save" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 897771d895ea..778c38e5e96c 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -20,7 +20,7 @@
 
 #include <moduldlg.hxx>
 #include <basidesh.hxx>
-#include <basidesh.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
@@ -883,7 +883,7 @@ void LibPage::InsertLib()
                                          ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
                                     {
                                         OUString aErrStr( IDEResId(RID_STR_REPLACELIB) );
-                                        aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_LIBISREADONLY));
+                                        aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + IDEResId(RID_STR_LIBISREADONLY);
                                         ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute();
                                         continue;
                                     }
@@ -898,7 +898,7 @@ void LibPage::InsertLib()
                                         aErrStr = IDEResId(RID_STR_REFNOTPOSSIBLE);
                                     else
                                         aErrStr = IDEResId(RID_STR_IMPORTNOTPOSSIBLE);
-                                    aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_SBXNAMEALLREADYUSED));
+                                    aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" +IDEResId(RID_STR_SBXNAMEALLREADYUSED);
                                     ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute();
                                     continue;
                                 }
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index c5e5a54380d2..81b7a6e79868 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 #include "moduldlg.hxx"
@@ -942,7 +942,7 @@ void LibDialog::dispose()
 
 void LibDialog::SetStorageName( const OUString& rName )
 {
-    OUString aName = OUString(IDEResId(RID_STR_FILENAME)) + rName;
+    OUString aName = IDEResId(RID_STR_FILENAME) + rName;
     m_pStorageFrame->set_label(aName);
 }
 
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 31fe7a1c9208..292ff3bf000c 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "objdlg.hrc"
+#include "strings.hrc"
 
 #include "objdlg.hxx"
 #include "helpid.hrc"
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
deleted file mode 100644
index 8b8a969fc165..000000000000
--- a/basctl/source/basicide/objdlg.hrc
+++ /dev/null
@@ -1,29 +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 BASCTL_OBJDLG_HRC
-#define BASCTL_OBJDLG_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
-#define RID_STR_TLB_MACROS      ( RID_BASICIDE_START + 71 )
-
-#endif // BASCTL_OBJDLG_HRR
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
deleted file mode 100644
index d66422c95a81..000000000000
--- a/basctl/source/basicide/objdlg.src
+++ /dev/null
@@ -1,32 +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 <objdlg.hrc>
-
-String RID_BASICIDE_OBJCAT
-{
-    Text [en-US] = "Object Catalog";
-};
-
-String RID_STR_TLB_MACROS
-{
-    Text [ en-US ] = "Objects Tree";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index f5fed7d1ad59..9078948e4d2b 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -20,7 +20,7 @@
 #include <memory>
 #include "scriptdocument.hxx"
 #include "basobj.hxx"
-#include "basidesh.hrc"
+#include "strings.hrc"
 #include "iderid.hxx"
 #include "dlgeddef.hxx"
 #include "doceventnotifier.hxx"
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 4d71d4070022..bead2801ebe8 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -29,9 +29,8 @@
 #include "dlgedview.hxx"
 #include "iderid.hxx"
 #include "localizationmgr.hxx"
-
-#include "dlgresid.hrc"
 #include "strings.hxx"
+#include "strings.hrc"
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
deleted file mode 100644
index 445250513f53..000000000000
--- a/basctl/source/dlged/dlgresid.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 "dlgresid.hrc"
-
-// Property Browser Headline ----------------------------------------------------------------
-
-String RID_STR_BRWTITLE_PROPERTIES
-{
-    Text [ en-US ] = "Properties: ";
-};
-String RID_STR_BRWTITLE_NO_PROPERTIES
-{
-    Text [ en-US ] = "No Control marked";
-};
-String RID_STR_BRWTITLE_MULTISELECT
-{
-    Text [ en-US ] = "Multiselection";
-};
-
-String RID_STR_DEF_LANG
-{
-    Text [ en-US ] = "[Default Language]" ;
-};
-
-String RID_STR_CREATE_LANG
-{
-    Text [ en-US ] = "<Press 'Add' to create language resources>" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 439731afaacb..ba6912605404 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -24,8 +24,8 @@
 #include "localizationmgr.hxx"
 #include "managelang.hxx"
 
-#include "dlgresid.hrc"
 #include "helpid.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/i18n/Boundary.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 0d89250911d2..9adcf984116a 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -23,8 +23,8 @@
 #include "dlgedobj.hxx"
 #include "iderid.hxx"
 #include "baside3.hxx"
+#include "strings.hrc"
 
-#include "dlgresid.hrc"
 #include "strings.hxx"
 #include <svx/svxids.hrc>
 
@@ -285,8 +285,8 @@ void PropBrw::implSetNewObjectSequence
     {
         xObjectInspector->inspect( _rObjectSeq );
 
-        OUString aText = OUString(IDEResId(RID_STR_BRWTITLE_PROPERTIES))
-                       + OUString(IDEResId(RID_STR_BRWTITLE_MULTISELECT));
+        OUString aText = IDEResId(RID_STR_BRWTITLE_PROPERTIES)
+                       + IDEResId(RID_STR_BRWTITLE_MULTISELECT);
         SetText( aText );
     }
 }
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
deleted file mode 100644
index 3dc8a184920b..000000000000
--- a/basctl/source/inc/dlgresid.hrc
+++ /dev/null
@@ -1,38 +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 BASCTL_DLGRESID_HRC
-#define BASCTL_DLGRESID_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_STR_TRANSLATION_NOTLOCALIZED    ( RID_DLG_START +  21 )
-#define RID_STR_TRANSLATION_DEFAULT         ( RID_DLG_START +  22 )
-#define RID_STR_DEF_LANG                    ( RID_DLG_START +  25 )
-#define RID_STR_CREATE_LANG                 ( RID_DLG_START +  26 )
-
-// Property Browser Headline Id's -----------------------------------------------------------
-
-#define RID_STR_BRWTITLE_PROPERTIES         ( RID_DLG_START +  60 )
-#define RID_STR_BRWTITLE_NO_PROPERTIES      ( RID_DLG_START +  61 )
-#define RID_STR_BRWTITLE_MULTISELECT        ( RID_DLG_START +  62 )
-
-#endif // BASCTL_DLGRESID_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index 2658a2585333..8724ccbb1891 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -20,16 +20,12 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_IDERID_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_IDERID_HXX
 
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
 
 namespace basctl
 {
 
-class IDEResId: public ResId
-{
-public:
-    IDEResId( sal_uInt16 nId );
-};
+OUString IDEResId(const char *pId);
 
 } // namespace basctl
 
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index a8c265e542d5..248fef505f96 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Fri Jan  3 21:01:14 2014 -->
-<interface>
+<interface domain="basctl">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="BasicMacroDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME Basic Macros</property>
+    <property name="title" translatable="yes" context="basicmacrodialog|BasicMacroDialog">%PRODUCTNAME Basic Macros</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="run">
-                <property name="label" translatable="yes">Run</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|run">Run</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="assign">
-                <property name="label" translatable="yes">Assign...</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|assign">Assign...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -49,7 +49,7 @@
             </child>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">Edit</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|edit">Edit</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -78,7 +78,7 @@
             </child>
             <child>
               <object class="GtkButton" id="organize">
-                <property name="label" translatable="yes">Organizer...</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|organize">Organizer...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -92,7 +92,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newlibrary">
-                <property name="label" translatable="yes">New Library</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|newlibrary">New Library</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -106,7 +106,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newmodule">
-                <property name="label" translatable="yes">New Module</property>
+                <property name="label" translatable="yes" context="basicmacrodialog|newmodule">New Module</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -195,7 +195,7 @@
                   <object class="GtkLabel" id="existingmacrosft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Existing Macros In:</property>
+                    <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property>
                     <property name="track_visited_links">False</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -249,7 +249,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Macro From</property>
+                        <property name="label" translatable="yes" context="basicmacrodialog|macrofromft">Macro From</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -265,7 +265,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Save Macro In</property>
+                        <property name="label" translatable="yes" context="basicmacrodialog|macrotoft">Save Macro In</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -311,7 +311,7 @@
                   <object class="GtkLabel" id="libraryft1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Macro Name</property>
+                    <property name="label" translatable="yes" context="basicmacrodialog|libraryft1">Macro Name</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/basctl/uiconfig/basicide/ui/breakpointmenus.ui b/basctl/uiconfig/basicide/ui/breakpointmenus.ui
index 710ab214ea3c..0949b5778726 100644
--- a/basctl/uiconfig/basicide/ui/breakpointmenus.ui
+++ b/basctl/uiconfig/basicide/ui/breakpointmenus.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="breaklistmenu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="manage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Manage Breakpoints...</property>
+        <property name="label" translatable="yes" context="breakpointmenus|manage">Manage Breakpoints...</property>
       </object>
     </child>
   </object>
@@ -20,7 +20,7 @@
       <object class="GtkCheckMenuItem" id="active">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Active</property>
+        <property name="label" translatable="yes" context="breakpointmenus|active">_Active</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -34,7 +34,7 @@
       <object class="GtkMenuItem" id="properties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Properties...</property>
+        <property name="label" translatable="yes" context="breakpointmenus|properties">_Properties...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/basctl/uiconfig/basicide/ui/defaultlanguage.ui b/basctl/uiconfig/basicide/ui/defaultlanguage.ui
index e1ff4ba689a2..d4a1092fd062 100644
--- a/basctl/uiconfig/basicide/ui/defaultlanguage.ui
+++ b/basctl/uiconfig/basicide/ui/defaultlanguage.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DefaultLanguageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Set Default User Interface Language</property>
+    <property name="title" translatable="yes" context="defaultlanguage|DefaultLanguageDialog">Set Default User Interface Language</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Default language:</property>
+                    <property name="label" translatable="yes" context="defaultlanguage|defaultlabel">Default language:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entries:border</property>
                   </object>
@@ -132,7 +132,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Available languages:</property>
+                    <property name="label" translatable="yes" context="defaultlanguage|checkedlabel">Available languages:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">checkedentries:border</property>
                   </object>
@@ -152,7 +152,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language.</property>
+                <property name="label" translatable="yes" context="defaultlanguage|defined">Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language.</property>
                 <property name="wrap">True</property>
                 <property name="wrap_mode">word-char</property>
                 <property name="max_width_chars">72</property>
@@ -167,7 +167,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default.</property>
+                <property name="label" translatable="yes" context="defaultlanguage|added">Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default.</property>
                 <property name="wrap">True</property>
                 <property name="wrap_mode">word-char</property>
                 <property name="max_width_chars">72</property>
@@ -181,7 +181,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Add User Interface Languages</property>
+                <property name="label" translatable="yes" context="defaultlanguage|alttitle">Add User Interface Languages</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/basctl/uiconfig/basicide/ui/deletelangdialog.ui b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
index 2aa1f4b39dfe..7b91b3014903 100644
--- a/basctl/uiconfig/basicide/ui/deletelangdialog.ui
+++ b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteLangDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Language Resources</property>
+    <property name="title" translatable="yes" context="deletelangdialog|DeleteLangDialog">Delete Language Resources</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">ok-cancel</property>
-    <property name="text" translatable="yes">Do you want to delete the resources of the selected language(s)?</property>
-    <property name="secondary_text" translatable="yes">You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted.</property>
+    <property name="text" translatable="yes" context="deletelangdialog|DeleteLangDialog">Do you want to delete the resources of the selected language(s)?</property>
+    <property name="secondary_text" translatable="yes" context="deletelangdialog|DeleteLangDialog">You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/basctl/uiconfig/basicide/ui/dialogpage.ui b/basctl/uiconfig/basicide/ui/dialogpage.ui
index 8095d81ea034..3314506b9b9f 100644
--- a/basctl/uiconfig/basicide/ui/dialogpage.ui
+++ b/basctl/uiconfig/basicide/ui/dialogpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="DialogPage">
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Dialog:</property>
+                <property name="label" translatable="yes" context="dialogpage|label1">Dialog:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">library:border</property>
               </object>
@@ -81,7 +81,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newmodule">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="dialogpage|newmodule">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newdialog">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="dialogpage|newdialog">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
             </child>
             <child>
               <object class="GtkButton" id="password">
-                <property name="label" translatable="yes">_Password...</property>
+                <property name="label" translatable="yes" context="dialogpage|password">_Password...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -141,7 +141,7 @@
             </child>
             <child>
               <object class="GtkButton" id="import">
-                <property name="label" translatable="yes">_Import...</property>
+                <property name="label" translatable="yes" context="dialogpage|import">_Import...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -155,7 +155,7 @@
             </child>
             <child>
               <object class="GtkButton" id="export">
-                <property name="label" translatable="yes">_Export...</property>
+                <property name="label" translatable="yes" context="dialogpage|export">_Export...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
diff --git a/basctl/uiconfig/basicide/ui/exportdialog.ui b/basctl/uiconfig/basicide/ui/exportdialog.ui
index 26ea224854c4..bde36452b236 100644
--- a/basctl/uiconfig/basicide/ui/exportdialog.ui
+++ b/basctl/uiconfig/basicide/ui/exportdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ExportDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Export Basic library</property>
+    <property name="title" translatable="yes" context="exportdialog|ExportDialog">Export Basic library</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -80,7 +80,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkRadioButton" id="extension">
-                <property name="label" translatable="yes">Export as _extension</property>
+                <property name="label" translatable="yes" context="exportdialog|extension">Export as _extension</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="basic">
-                <property name="label" translatable="yes">Export as BASIC library</property>
+                <property name="label" translatable="yes" context="exportdialog|basic">Export as BASIC library</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/basctl/uiconfig/basicide/ui/gotolinedialog.ui b/basctl/uiconfig/basicide/ui/gotolinedialog.ui
index dbdda2e58315..dbcaa4bb2d32 100644
--- a/basctl/uiconfig/basicide/ui/gotolinedialog.ui
+++ b/basctl/uiconfig/basicide/ui/gotolinedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GotoLineDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Go to Line</property>
+    <property name="title" translatable="yes" context="gotolinedialog|GotoLineDialog">Go to Line</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Line number:</property>
+                <property name="label" translatable="yes" context="gotolinedialog|area">_Line number:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
diff --git a/basctl/uiconfig/basicide/ui/importlibdialog.ui b/basctl/uiconfig/basicide/ui/importlibdialog.ui
index 074af3e91bc9..d042366c6533 100644
--- a/basctl/uiconfig/basicide/ui/importlibdialog.ui
+++ b/basctl/uiconfig/basicide/ui/importlibdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ImportLibDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Import Libraries</property>
+    <property name="title" translatable="yes" context="importlibdialog|ImportLibDialog">Import Libraries</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -95,7 +95,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="ref">
-                            <property name="label" translatable="yes">Insert as reference (read-only)</property>
+                            <property name="label" translatable="yes" context="importlibdialog|ref">Insert as reference (read-only)</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -110,7 +110,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="replace">
-                            <property name="label" translatable="yes">Replace existing libraries</property>
+                            <property name="label" translatable="yes" context="importlibdialog|replace">Replace existing libraries</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="importlibdialog|label1">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/basctl/uiconfig/basicide/ui/libpage.ui b/basctl/uiconfig/basicide/ui/libpage.ui
index e1579b88af58..ca3ade5a7c67 100644
--- a/basctl/uiconfig/basicide/ui/libpage.ui
+++ b/basctl/uiconfig/basicide/ui/libpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="LibPage">
@@ -28,7 +28,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">L_ocation:</property>
+                <property name="label" translatable="yes" context="libpage|label1">L_ocation:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">location</property>
               </object>
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Library:</property>
+                <property name="label" translatable="yes" context="libpage|lingudictsft">_Library:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">library:border</property>
               </object>
@@ -121,7 +121,7 @@
             </child>
             <child>
               <object class="GtkButton" id="password">
-                <property name="label" translatable="yes">_Password...</property>
+                <property name="label" translatable="yes" context="libpage|password">_Password...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -135,7 +135,7 @@
             </child>
             <child>
               <object class="GtkButton" id="new">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="libpage|new">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -150,7 +150,7 @@
             </child>
             <child>
               <object class="GtkButton" id="import">
-                <property name="label" translatable="yes">_Import...</property>
+                <property name="label" translatable="yes" context="libpage|import">_Import...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
             </child>
             <child>
               <object class="GtkButton" id="export">
-                <property name="label" translatable="yes">_Export...</property>
+                <property name="label" translatable="yes" context="libpage|export">_Export...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
index 86a7eb42338e..51171b020ea8 100644
--- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui
+++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ManageBreakpointsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Manage Breakpoints</property>
+    <property name="title" translatable="yes" context="managebreakpoints|ManageBreakpointsDialog">Manage Breakpoints</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -126,7 +126,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="active">
-                        <property name="label" translatable="yes">Active</property>
+                        <property name="label" translatable="yes" context="managebreakpoints|active">Active</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -179,7 +179,7 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Pass count:</property>
+                            <property name="label" translatable="yes" context="managebreakpoints|label2">Pass count:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">pass-nospin</property>
                           </object>
@@ -202,7 +202,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Breakpoints</property>
+                <property name="label" translatable="yes" context="managebreakpoints|label1">Breakpoints</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/basctl/uiconfig/basicide/ui/managelanguages.ui b/basctl/uiconfig/basicide/ui/managelanguages.ui
index cde60b85a9f1..004c845454a6 100644
--- a/basctl/uiconfig/basicide/ui/managelanguages.ui
+++ b/basctl/uiconfig/basicide/ui/managelanguages.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ManageLanguagesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Manage User Interface Languages [$1]</property>
+    <property name="title" translatable="yes" context="managelanguages|ManageLanguagesDialog">Manage User Interface Languages [$1]</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -66,7 +66,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Present languages:</property>
+                <property name="label" translatable="yes" context="managelanguages|label1">Present languages:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">treeview:border</property>
               </object>
@@ -80,7 +80,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages.</property>
+                <property name="label" translatable="yes" context="managelanguages|label2">The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">68</property>
               </object>
@@ -105,7 +105,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="add">
-                        <property name="label" translatable="yes">Add...</property>
+                        <property name="label" translatable="yes" context="managelanguages|add">Add...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -133,7 +133,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="default">
-                        <property name="label" translatable="yes">Default</property>
+                        <property name="label" translatable="yes" context="managelanguages|default">Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/basctl/uiconfig/basicide/ui/modulepage.ui b/basctl/uiconfig/basicide/ui/modulepage.ui
index 2e59073bdfc0..523205cc9a3c 100644
--- a/basctl/uiconfig/basicide/ui/modulepage.ui
+++ b/basctl/uiconfig/basicide/ui/modulepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="ModulePage">
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">M_odule:</property>
+                <property name="label" translatable="yes" context="modulepage|label1">M_odule:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">library:border</property>
               </object>
@@ -81,7 +81,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newmodule">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="modulepage|newmodule">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkButton" id="newdialog">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="modulepage|newdialog">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
             </child>
             <child>
               <object class="GtkButton" id="password">
-                <property name="label" translatable="yes">_Password...</property>
+                <property name="label" translatable="yes" context="modulepage|password">_Password...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -141,7 +141,7 @@
             </child>
             <child>
               <object class="GtkButton" id="import">
-                <property name="label" translatable="yes">_Import...</property>
+                <property name="label" translatable="yes" context="modulepage|import">_Import...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -155,7 +155,7 @@
             </child>
             <child>
               <object class="GtkButton" id="export">
-                <property name="label" translatable="yes">_Export...</property>
+                <property name="label" translatable="yes" context="modulepage|export">_Export...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
diff --git a/basctl/uiconfig/basicide/ui/newlibdialog.ui b/basctl/uiconfig/basicide/ui/newlibdialog.ui
index 1329bb8b3e28..bafce4555917 100644
--- a/basctl/uiconfig/basicide/ui/newlibdialog.ui
+++ b/basctl/uiconfig/basicide/ui/newlibdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="NewLibDialog">
     <property name="can_focus">False</property>
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Name:</property>
+                <property name="label" translatable="yes" context="newlibdialog|area">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
diff --git a/basctl/uiconfig/basicide/ui/organizedialog.ui b/basctl/uiconfig/basicide/ui/organizedialog.ui
index c683c49b3d0b..fcb89bac70ff 100644
--- a/basctl/uiconfig/basicide/ui/organizedialog.ui
+++ b/basctl/uiconfig/basicide/ui/organizedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="basctl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="OrganizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME Basic Macro Organizer</property>
+    <property name="title" translatable="yes" context="organizedialog|OrganizeDialog">%PRODUCTNAME Basic Macro Organizer</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -69,7 +69,7 @@
               <object class="GtkLabel" id="modules">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Modules</property>
+                <property name="label" translatable="yes" context="organizedialog|modules">Modules</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -82,7 +82,7 @@
               <object class="GtkLabel" id="dialogs">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Dialogs</property>
+                <property name="label" translatable="yes" context="organizedialog|dialogs">Dialogs</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="libraries">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Libraries</property>
+                <property name="label" translatable="yes" context="organizedialog|libraries">Libraries</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/rsc/Module_rsc.mk b/basic/AllLangMoTarget_sb.mk
index 40e7f03fbc28..90ece5be32da 100644
--- a/rsc/Module_rsc.mk
+++ b/basic/AllLangMoTarget_sb.mk
@@ -5,12 +5,9 @@
 # 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_Module_Module,rsc))
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,sb))
 
-$(eval $(call gb_Module_add_targets_for_build,rsc,\
-	Executable_rsc \
-))
+$(eval $(call gb_AllLangMoTarget_set_polocation,sb,basic))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk
deleted file mode 100644
index fa792286d626..000000000000
--- a/basic/AllLangResTarget_sb.mk
+++ /dev/null
@@ -1,39 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sb))
-
-
-$(eval $(call gb_AllLangResTarget_add_srs,sb,\
-	sb/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sb/res))
-
-$(eval $(call gb_SrsTarget_set_include,sb/res,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/basic/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sb/res,\
-	basic/source/classes/sb.src \
-	basic/source/sbx/format.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index e2ed084131f0..f866a3bbd347 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -158,7 +158,4 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 endif
 endif
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sb,sb))
-
 # vim: set noet sw=4 ts=4:
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 10fcbfd36990..a01c883268bc 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,basic))
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Module_add_l10n_targets,basic,\
-	AllLangResTarget_sb \
+       AllLangMoTarget_sb \
 ))
 
 $(eval $(call gb_Module_add_check_targets,basic,\
diff --git a/basic/inc/basic.hrc b/basic/inc/basic.hrc
new file mode 100644
index 000000000000..c0824802a979
--- /dev/null
+++ b/basic/inc/basic.hrc
@@ -0,0 +1,161 @@
+/* -*- 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 N_("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_BASIC_INC_STRINGS_HRC
+#define INCLUDED_BASIC_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+std::pair<const char*, ErrCode> RID_BASIC_START[] =
+{
+    { NC_("RID_BASIC_START", "Syntax error."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYNTAX) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Return without Gosub."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_GOSUB) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Incorrect entry; please retry."), ErrCode(sal_uInt32(ERRCODE_BASIC_REDO_FROM_START) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid procedure call."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ARGUMENT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Overflow."), ErrCode(sal_uInt32(ERRCODE_BASIC_MATH_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Not enough memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_MEMORY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Array already dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_ALREADY_DIM) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Index out of defined range."), ErrCode(sal_uInt32(ERRCODE_BASIC_OUT_OF_RANGE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Duplicate definition."), ErrCode(sal_uInt32(ERRCODE_BASIC_DUPLICATE_DEF) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Division by zero."), ErrCode(sal_uInt32(ERRCODE_BASIC_ZERODIV) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Variable not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_UNDEFINED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Data type mismatch."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONVERSION) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid parameter."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETER) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Process interrupted by user."), ErrCode(sal_uInt32(ERRCODE_BASIC_USER_ABORT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Resume without error."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RESUME) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Not enough stack memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_STACK_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Sub-procedure or function procedure not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_UNDEFINED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Error loading DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_LOAD) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Wrong DLL call convention."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_CALL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Internal error $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_INTERNAL_ERROR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid file name or file number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHANNEL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "File not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Incorrect file mode."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_FILE_MODE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "File already open."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_ALREADY_OPEN) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Device I/O error."), ErrCode(sal_uInt32(ERRCODE_BASIC_IO_ERROR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "File already exists."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_EXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Incorrect record length."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_LENGTH) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Disk or hard drive full."), ErrCode(sal_uInt32(ERRCODE_BASIC_DISK_FULL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Reading exceeds EOF."), ErrCode(sal_uInt32(ERRCODE_BASIC_READ_PAST_EOF) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Incorrect record number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_NUMBER) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Too many files."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_FILES) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Device not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_DEVICE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Access denied."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_DENIED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Disk not ready."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_READY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Not implemented."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IMPLEMENTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Renaming on different drives impossible."), ErrCode(sal_uInt32(ERRCODE_BASIC_DIFFERENT_DRIVE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Path/File access error."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_ERROR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Path not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_PATH_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object variable not set."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OBJECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid string pattern."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PATTERN) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Use of zero not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_IS_NULL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_ERROR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Awaiting response to DDE connection."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WAITINGACK) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "No DDE channels available."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_OUTOFCHANNELS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "No application responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_RESPONSE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Too many applications responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_MULT_RESPONSES) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE channel locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CHANNEL_LOCKED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "External application cannot execute DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NOTPROCESSED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Timeout while waiting for DDE response."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_TIMEOUT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "User pressed ESCAPE during DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_USER_INTERRUPT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "External application busy."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_BUSY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE operation without data."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_DATA) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Data are in wrong format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "External application has been terminated."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_PARTNER_QUIT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE connection interrupted or modified."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CONV_CLOSED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE method invoked with no channel open."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_CHANNEL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid DDE link format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_INVALID_LINK) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE message has been lost."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_QUEUE_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Paste link already performed."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_ALREADY_EST) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Link mode cannot be set due to invalid link topic."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_INV_TOPIC) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "DDE requires the DDEML.DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_DLL_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Module cannot be loaded; invalid format."), ErrCode(sal_uInt32(ERRCODE_BASIC_CANNOT_LOAD) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid object index."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_INDEX) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object is not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_ACTIVE_OBJECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Incorrect property value."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PROP_VALUE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "This property is read-only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_READONLY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "This property is write only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_WRITEONLY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid object reference."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_OBJECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Property or method not found: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_METHOD) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object required."), ErrCode(sal_uInt32(ERRCODE_BASIC_NEEDS_OBJECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid use of an object."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_USAGE_OBJECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "OLE Automation is not supported by this object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "This property or method is not supported by the object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_METHOD) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "OLE Automation Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_OLE_ERROR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "This action is not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ACTION) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Named arguments are not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_NAMED_ARGS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "The current locale setting is not supported by the given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_LOCALE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Named argument not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_NAMED_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Argument is not optional."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_OPTIONAL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_ARGS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object is not a list."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_A_COLL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid ordinal number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ORDINAL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Specified DLL function not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_DLLPROC_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid clipboard format."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CLIPBD_FORMAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object does not have this property."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROPERTY_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Object does not have this method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_NOT_FOUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Required argument lacking."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARG_MISSING) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_NUMBER_OF_ARGS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Error executing a method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_FAILED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Unable to set property."), ErrCode(sal_uInt32(ERRCODE_BASIC_SETPROP_FAILED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Unable to determine property."), ErrCode(sal_uInt32(ERRCODE_BASIC_GETPROP_FAILED) & ERRCODE_RES_MASK) },
+     // Compiler errors. These are not runtime errors.
+    { NC_("RID_BASIC_START", "Unexpected symbol: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNEXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Expected: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Symbol expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYMBOL_EXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Variable expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_EXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Label expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_EXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Value cannot be applied."), ErrCode(sal_uInt32(ERRCODE_BASIC_LVALUE_EXPECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Variable $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_DEFINED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Sub procedure or function procedure $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_DEFINED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Label $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_DEFINED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Variable $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_VAR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Array or procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_ARRAY) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_PROC) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Label $(ARG1) undefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_LABEL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Unknown data type $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_TYPE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Exit $(ARG1) expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_EXIT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Statement block still open: $(ARG1) missing."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BLOCK) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Parentheses do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BRACKETS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Symbol $(ARG1) already defined differently."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DECLARATION) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Parameters do not correspond to procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETERS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Invalid character in number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHAR_IN_NUMBER) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Array must be dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_MUST_HAVE_DIMS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Else/Endif without If."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_IF) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "$(ARG1) not allowed within a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_SUBR) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "$(ARG1) not allowed outside a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_MAIN) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Dimension specifications do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_DIMS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Unknown option: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_OPTION) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Constant $(ARG1) redefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONSTANT_REDECLARED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Program too large."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROG_TOO_LARGE) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Strings or arrays not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_STRINGS_ARRAYS) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "An exception occurred $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXCEPTION) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "This array is fixed or temporarily locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARRAY_FIX) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Out of string space."), ErrCode(sal_uInt32(ERRCODE_BASIC_STRING_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Expression Too Complex."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPR_TOO_COMPLEX) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Can't perform requested operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_OPER_NOT_PERFORM) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Too many DLL application clients."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_DLL) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "For loop not initialized."), ErrCode(sal_uInt32(ERRCODE_BASIC_LOOP_NOT_INIT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "$(ARG1)"), ErrCode(sal_uInt32(ERRCODE_BASIC_COMPAT) & ERRCODE_RES_MASK) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index 203c28162748..e6fd817afb23 100644
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
@@ -20,13 +20,7 @@
 #ifndef INCLUDED_BASIC_INC_BASRID_HXX
 #define INCLUDED_BASIC_INC_BASRID_HXX
 
-#include <tools/resid.hxx>
-
-class BasResId : public ResId
-{
-    public:
-    BasResId( sal_uInt32 nId );
-};
+OUString BasResId(const char* pId);
 
 #endif // INCLUDED_BASIC_INC_BASRID_HXX
 
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index 85d74021de78..a277651d7c50 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -59,7 +59,6 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <basrid.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/basic/inc/strings.hrc
index 59cb6136c458..deab90a91eb5 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/basic/inc/strings.hrc
@@ -17,15 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_HELP_HRC
-#define INCLUDED_DP_HELP_HRC
+#ifndef INCLUDED_BASIC_INC_STRINGS_HRC
+#define INCLUDED_BASIC_INC_STRINGS_HRC
 
-#include "deployment.hrc"
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define RID_STR_HELP                                (RID_DEPLOYMENT_HELP_START+2)
+#define STR_BASICKEY_FORMAT_ON          NC_("STR_BASICKEY_FORMAT_ON", "On")
+#define STR_BASICKEY_FORMAT_OFF         NC_("STR_BASICKEY_FORMAT_OFF", "Off")
+#define STR_BASICKEY_FORMAT_TRUE        NC_("STR_BASICKEY_FORMAT_TRUE", "True")
+#define STR_BASICKEY_FORMAT_FALSE       NC_("STR_BASICKEY_FORMAT_FALSE", "False")
+#define STR_BASICKEY_FORMAT_YES         NC_("STR_BASICKEY_FORMAT_YES", "Yes")
+#define STR_BASICKEY_FORMAT_NO          NC_("STR_BASICKEY_FORMAT_NO", "No")
+//format currency
+#define STR_BASICKEY_FORMAT_CURRENCY    NC_("STR_BASICKEY_FORMAT_CURRENCY", "@0.00 $;@(0.00 $)")
 
-#define RID_STR_HELPPROCESSING_GENERAL_ERROR        (RID_DEPLOYMENT_HELP_START+3)
-#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR     (RID_DEPLOYMENT_HELP_START+4)
+#define IDS_SBERR_TERMINATED            NC_("IDS_SBERR_TERMINATED", "The macro running has been interrupted")
 
 #endif
 
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index bedd89e5dacf..9622a2867242 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -20,7 +20,6 @@
 
 void MacroSnippet::InitSnippet()
 {
-    CPPUNIT_ASSERT_MESSAGE( "No resource manager", maDll.GetBasResMgr() != nullptr );
     mpBasic = new StarBASIC();
     StarBASIC::SetGlobalErrorHdl( LINK( this, MacroSnippet, BasicErrorHdl ) );
 }
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index cc1e3d340503..9189d7538df8 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -41,9 +41,7 @@
 #include <basic/basmgr.hxx>
 #include "global.hxx"
 #include <sbunoobj.hxx>
-#include "basrid.hxx"
 #include "sbintern.hxx"
-#include <sb.hrc>
 
 #include <memory>
 #include <vector>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index d04e6c3f0b73..45b85dc6b83a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "sb.hxx"
-#include <tools/rcid.h>
-#include <tools/resary.hxx>
 #include <tools/stream.hxx>
 #include <vcl/errinf.hxx>
 #include <comphelper/solarmutex.hxx>
@@ -36,7 +34,7 @@
 #include "sbobjmod.hxx"
 #include "stdobj.hxx"
 #include "filefmt.hxx"
-#include "sb.hrc"
+#include "basic.hrc"
 #include <basrid.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -1576,18 +1574,30 @@ void StarBASIC::SetErrorData( ErrCode nCode, sal_uInt16 nLine,
     aGlobals.nCol2 = nCol2;
 }
 
+const ErrMsgCode* getRID_BASIC_START()
+{
+    return RID_BASIC_START;
+}
+
 void StarBASIC::MakeErrorText( ErrCode nId, const OUString& aMsg )
 {
     SolarMutexGuard aSolarGuard;
     sal_uInt16 nOldID = GetVBErrorCode( nId );
 
-    // instantiate the help class
-    ResStringArray aMyStringList(BasResId(RID_BASIC_START));
-    sal_uInt32 nErrIdx = aMyStringList.FindIndex(nId.GetRest());
-    if (nErrIdx != RESARRAY_INDEX_NOTFOUND)
+    const char* pErrorMsg = nullptr;
+    for (ErrMsgCode* pItem = RID_BASIC_START; pItem->second; ++pItem)
+    {
+        if (ErrCode(nId.GetRest()) == pItem->second)
+        {
+            pErrorMsg = pItem->first;
+            break;
+        }
+    }
+
+    if (pErrorMsg)
     {
         // merge message with additional text
-        OUString sError = aMyStringList.GetString(nErrIdx);
+        OUString sError = BasResId(pErrorMsg);
         OUStringBuffer aMsg1(sError);
         // replace argument placeholder with %s
         OUString aSrgStr( "$(ARG1)" );
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
deleted file mode 100644
index 634dcab034bd..000000000000
--- a/basic/source/classes/sb.src
+++ /dev/null
@@ -1,191 +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 <vcl/errcode.hxx>
-#include <basic/sberrors.hxx>
-
-#include "sb.hrc"
-
-StringArray RID_BASIC_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Syntax error." ; ERRCODE_BASIC_SYNTAX & ERRCODE_RES_MASK ; >;
-        < "Return without Gosub." ; ERRCODE_BASIC_NO_GOSUB & ERRCODE_RES_MASK ; >;
-        < "Incorrect entry; please retry." ; ERRCODE_BASIC_REDO_FROM_START & ERRCODE_RES_MASK ; >;
-        < "Invalid procedure call." ; ERRCODE_BASIC_BAD_ARGUMENT & ERRCODE_RES_MASK ; >;
-        < "Overflow." ; ERRCODE_BASIC_MATH_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Not enough memory." ; ERRCODE_BASIC_NO_MEMORY & ERRCODE_RES_MASK ; >;
-        < "Array already dimensioned." ; ERRCODE_BASIC_ALREADY_DIM & ERRCODE_RES_MASK ; >;
-        < "Index out of defined range." ; ERRCODE_BASIC_OUT_OF_RANGE & ERRCODE_RES_MASK ; >;
-        < "Duplicate definition." ; ERRCODE_BASIC_DUPLICATE_DEF & ERRCODE_RES_MASK ; >;
-        < "Division by zero." ; ERRCODE_BASIC_ZERODIV & ERRCODE_RES_MASK ; >;
-        < "Variable not defined." ; ERRCODE_BASIC_VAR_UNDEFINED & ERRCODE_RES_MASK ; >;
-        < "Data type mismatch." ; ERRCODE_BASIC_CONVERSION & ERRCODE_RES_MASK ; >;
-        < "Invalid parameter." ; ERRCODE_BASIC_BAD_PARAMETER & ERRCODE_RES_MASK ; >;
-        < "Process interrupted by user." ; ERRCODE_BASIC_USER_ABORT & ERRCODE_RES_MASK ; >;
-        < "Resume without error." ; ERRCODE_BASIC_BAD_RESUME & ERRCODE_RES_MASK ; >;
-        < "Not enough stack memory." ; ERRCODE_BASIC_STACK_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Sub-procedure or function procedure not defined." ; ERRCODE_BASIC_PROC_UNDEFINED & ERRCODE_RES_MASK ; >;
-        < "Error loading DLL file." ; ERRCODE_BASIC_BAD_DLL_LOAD & ERRCODE_RES_MASK ; >;
-        < "Wrong DLL call convention." ; ERRCODE_BASIC_BAD_DLL_CALL & ERRCODE_RES_MASK ; >;
-        < "Internal error $(ARG1)." ; ERRCODE_BASIC_INTERNAL_ERROR & ERRCODE_RES_MASK ; >;
-        < "Invalid file name or file number." ; ERRCODE_BASIC_BAD_CHANNEL & ERRCODE_RES_MASK ; >;
-        < "File not found." ; ERRCODE_BASIC_FILE_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Incorrect file mode." ; ERRCODE_BASIC_BAD_FILE_MODE & ERRCODE_RES_MASK ; >;
-        < "File already open." ; ERRCODE_BASIC_FILE_ALREADY_OPEN & ERRCODE_RES_MASK ; >;
-        < "Device I/O error." ; ERRCODE_BASIC_IO_ERROR & ERRCODE_RES_MASK ; >;
-        < "File already exists." ; ERRCODE_BASIC_FILE_EXISTS & ERRCODE_RES_MASK ; >;
-        < "Incorrect record length." ; ERRCODE_BASIC_BAD_RECORD_LENGTH & ERRCODE_RES_MASK ; >;
-        < "Disk or hard drive full." ; ERRCODE_BASIC_DISK_FULL & ERRCODE_RES_MASK ; >;
-        < "Reading exceeds EOF." ; ERRCODE_BASIC_READ_PAST_EOF & ERRCODE_RES_MASK ; >;
-        < "Incorrect record number." ; ERRCODE_BASIC_BAD_RECORD_NUMBER & ERRCODE_RES_MASK ; >;
-        < "Too many files." ; ERRCODE_BASIC_TOO_MANY_FILES & ERRCODE_RES_MASK ; >;
-        < "Device not available." ; ERRCODE_BASIC_NO_DEVICE & ERRCODE_RES_MASK ; >;
-        < "Access denied." ; ERRCODE_BASIC_ACCESS_DENIED & ERRCODE_RES_MASK ; >;
-        < "Disk not ready." ; ERRCODE_BASIC_NOT_READY & ERRCODE_RES_MASK ; >;
-        < "Not implemented." ; ERRCODE_BASIC_NOT_IMPLEMENTED & ERRCODE_RES_MASK ; >;
-        < "Renaming on different drives impossible." ; ERRCODE_BASIC_DIFFERENT_DRIVE & ERRCODE_RES_MASK ; >;
-        < "Path/File access error." ; ERRCODE_BASIC_ACCESS_ERROR & ERRCODE_RES_MASK ; >;
-        < "Path not found." ; ERRCODE_BASIC_PATH_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Object variable not set." ; ERRCODE_BASIC_NO_OBJECT & ERRCODE_RES_MASK ; >;
-        < "Invalid string pattern." ; ERRCODE_BASIC_BAD_PATTERN & ERRCODE_RES_MASK ; >;
-        < "Use of zero not permitted." ; ERRCODE_BASIC_IS_NULL & ERRCODE_RES_MASK ; >;
-        < "DDE Error." ; ERRCODE_BASIC_DDE_ERROR & ERRCODE_RES_MASK ; >;
-        < "Awaiting response to DDE connection." ; ERRCODE_BASIC_DDE_WAITINGACK & ERRCODE_RES_MASK ; >;
-        < "No DDE channels available." ; ERRCODE_BASIC_DDE_OUTOFCHANNELS & ERRCODE_RES_MASK ; >;
-        < "No application responded to DDE connect initiation." ; ERRCODE_BASIC_DDE_NO_RESPONSE & ERRCODE_RES_MASK ; >;
-        < "Too many applications responded to DDE connect initiation." ; ERRCODE_BASIC_DDE_MULT_RESPONSES & ERRCODE_RES_MASK ; >;
-        < "DDE channel locked." ; ERRCODE_BASIC_DDE_CHANNEL_LOCKED & ERRCODE_RES_MASK ; >;
-        < "External application cannot execute DDE operation." ; ERRCODE_BASIC_DDE_NOTPROCESSED & ERRCODE_RES_MASK ; >;
-        < "Timeout while waiting for DDE response." ; ERRCODE_BASIC_DDE_TIMEOUT & ERRCODE_RES_MASK ; >;
-        < "User pressed ESCAPE during DDE operation." ; ERRCODE_BASIC_DDE_USER_INTERRUPT & ERRCODE_RES_MASK ; >;
-        < "External application busy." ; ERRCODE_BASIC_DDE_BUSY & ERRCODE_RES_MASK ; >;
-        < "DDE operation without data." ; ERRCODE_BASIC_DDE_NO_DATA & ERRCODE_RES_MASK ; >;
-        < "Data are in wrong format." ; ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT & ERRCODE_RES_MASK ; >;
-        < "External application has been terminated." ; ERRCODE_BASIC_DDE_PARTNER_QUIT & ERRCODE_RES_MASK ; >;
-        < "DDE connection interrupted or modified." ; ERRCODE_BASIC_DDE_CONV_CLOSED & ERRCODE_RES_MASK ; >;
-        < "DDE method invoked with no channel open." ; ERRCODE_BASIC_DDE_NO_CHANNEL & ERRCODE_RES_MASK ; >;
-        < "Invalid DDE link format." ; ERRCODE_BASIC_DDE_INVALID_LINK & ERRCODE_RES_MASK ; >;
-        < "DDE message has been lost." ; ERRCODE_BASIC_DDE_QUEUE_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Paste link already performed." ; ERRCODE_BASIC_DDE_LINK_ALREADY_EST & ERRCODE_RES_MASK ; >;
-        < "Link mode cannot be set due to invalid link topic." ; ERRCODE_BASIC_DDE_LINK_INV_TOPIC & ERRCODE_RES_MASK ; >;
-        < "DDE requires the DDEML.DLL file." ; ERRCODE_BASIC_DDE_DLL_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Module cannot be loaded; invalid format." ; ERRCODE_BASIC_CANNOT_LOAD & ERRCODE_RES_MASK ; >;
-        < "Invalid object index." ; ERRCODE_BASIC_BAD_INDEX & ERRCODE_RES_MASK ; >;
-        < "Object is not available." ; ERRCODE_BASIC_NO_ACTIVE_OBJECT & ERRCODE_RES_MASK ; >;
-        < "Incorrect property value." ; ERRCODE_BASIC_BAD_PROP_VALUE & ERRCODE_RES_MASK ; >;
-        < "This property is read-only." ; ERRCODE_BASIC_PROP_READONLY & ERRCODE_RES_MASK ; >;
-        < "This property is write only." ; ERRCODE_BASIC_PROP_WRITEONLY & ERRCODE_RES_MASK ; >;
-        < "Invalid object reference." ; ERRCODE_BASIC_INVALID_OBJECT & ERRCODE_RES_MASK ; >;
-        < "Property or method not found: $(ARG1)." ; ERRCODE_BASIC_NO_METHOD & ERRCODE_RES_MASK ; >;
-        < "Object required." ; ERRCODE_BASIC_NEEDS_OBJECT & ERRCODE_RES_MASK ; >;
-        < "Invalid use of an object." ; ERRCODE_BASIC_INVALID_USAGE_OBJECT & ERRCODE_RES_MASK ; >;
-        < "OLE Automation is not supported by this object." ; ERRCODE_BASIC_NO_OLE & ERRCODE_RES_MASK ; >;
-        < "This property or method is not supported by the object." ; ERRCODE_BASIC_BAD_METHOD & ERRCODE_RES_MASK ; >;
-        < "OLE Automation Error." ; ERRCODE_BASIC_OLE_ERROR & ERRCODE_RES_MASK ; >;
-        < "This action is not supported by given object." ; ERRCODE_BASIC_BAD_ACTION & ERRCODE_RES_MASK ; >;
-        < "Named arguments are not supported by given object." ; ERRCODE_BASIC_NO_NAMED_ARGS & ERRCODE_RES_MASK ; >;
-        < "The current locale setting is not supported by the given object." ; ERRCODE_BASIC_BAD_LOCALE & ERRCODE_RES_MASK ; >;
-        < "Named argument not found." ; ERRCODE_BASIC_NAMED_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Argument is not optional." ; ERRCODE_BASIC_NOT_OPTIONAL & ERRCODE_RES_MASK ; >;
-        < "Invalid number of arguments." ; ERRCODE_BASIC_WRONG_ARGS & ERRCODE_RES_MASK ; >;
-        < "Object is not a list." ; ERRCODE_BASIC_NOT_A_COLL & ERRCODE_RES_MASK ; >;
-        < "Invalid ordinal number." ; ERRCODE_BASIC_BAD_ORDINAL & ERRCODE_RES_MASK ; >;
-        < "Specified DLL function not found." ; ERRCODE_BASIC_DLLPROC_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Invalid clipboard format." ; ERRCODE_BASIC_BAD_CLIPBD_FORMAT & ERRCODE_RES_MASK ; >;
-        < "Object does not have this property." ; ERRCODE_BASIC_PROPERTY_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Object does not have this method." ; ERRCODE_BASIC_METHOD_NOT_FOUND & ERRCODE_RES_MASK ; >;
-        < "Required argument lacking." ; ERRCODE_BASIC_ARG_MISSING & ERRCODE_RES_MASK ; >;
-        < "Invalid number of arguments." ; ERRCODE_BASIC_BAD_NUMBER_OF_ARGS & ERRCODE_RES_MASK ; >;
-        < "Error executing a method." ; ERRCODE_BASIC_METHOD_FAILED & ERRCODE_RES_MASK ; >;
-        < "Unable to set property." ; ERRCODE_BASIC_SETPROP_FAILED & ERRCODE_RES_MASK ; >;
-        < "Unable to determine property." ; ERRCODE_BASIC_GETPROP_FAILED & ERRCODE_RES_MASK ; >;
-         // Compiler errors. These are not runtime errors.
-        < "Unexpected symbol: $(ARG1)." ; ERRCODE_BASIC_UNEXPECTED & ERRCODE_RES_MASK ; >;
-        < "Expected: $(ARG1)." ; ERRCODE_BASIC_EXPECTED & ERRCODE_RES_MASK ; >;
-        < "Symbol expected." ; ERRCODE_BASIC_SYMBOL_EXPECTED & ERRCODE_RES_MASK ; >;
-        < "Variable expected." ; ERRCODE_BASIC_VAR_EXPECTED & ERRCODE_RES_MASK ; >;
-        < "Label expected." ; ERRCODE_BASIC_LABEL_EXPECTED & ERRCODE_RES_MASK ; >;
-        < "Value cannot be applied." ; ERRCODE_BASIC_LVALUE_EXPECTED & ERRCODE_RES_MASK ; >;
-        < "Variable $(ARG1) already defined." ; ERRCODE_BASIC_VAR_DEFINED & ERRCODE_RES_MASK ; >;
-        < "Sub procedure or function procedure $(ARG1) already defined." ; ERRCODE_BASIC_PROC_DEFINED & ERRCODE_RES_MASK ; >;
-        < "Label $(ARG1) already defined." ; ERRCODE_BASIC_LABEL_DEFINED & ERRCODE_RES_MASK ; >;
-        < "Variable $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_VAR & ERRCODE_RES_MASK ; >;
-        < "Array or procedure $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_ARRAY & ERRCODE_RES_MASK ; >;
-        < "Procedure $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_PROC & ERRCODE_RES_MASK ; >;
-        < "Label $(ARG1) undefined." ; ERRCODE_BASIC_UNDEF_LABEL & ERRCODE_RES_MASK ; >;
-        < "Unknown data type $(ARG1)." ; ERRCODE_BASIC_UNDEF_TYPE & ERRCODE_RES_MASK ; >;
-        < "Exit $(ARG1) expected." ; ERRCODE_BASIC_BAD_EXIT & ERRCODE_RES_MASK ; >;
-        < "Statement block still open: $(ARG1) missing." ; ERRCODE_BASIC_BAD_BLOCK & ERRCODE_RES_MASK ; >;
-        < "Parentheses do not match." ; ERRCODE_BASIC_BAD_BRACKETS & ERRCODE_RES_MASK ; >;
-        < "Symbol $(ARG1) already defined differently." ; ERRCODE_BASIC_BAD_DECLARATION & ERRCODE_RES_MASK ; >;
-        < "Parameters do not correspond to procedure." ; ERRCODE_BASIC_BAD_PARAMETERS & ERRCODE_RES_MASK ; >;
-        < "Invalid character in number." ; ERRCODE_BASIC_BAD_CHAR_IN_NUMBER & ERRCODE_RES_MASK ; >;
-        < "Array must be dimensioned." ; ERRCODE_BASIC_MUST_HAVE_DIMS & ERRCODE_RES_MASK ; >;
-        < "Else/Endif without If." ; ERRCODE_BASIC_NO_IF & ERRCODE_RES_MASK ; >;
-        < "$(ARG1) not allowed within a procedure." ; ERRCODE_BASIC_NOT_IN_SUBR & ERRCODE_RES_MASK ; >;
-        < "$(ARG1) not allowed outside a procedure." ; ERRCODE_BASIC_NOT_IN_MAIN & ERRCODE_RES_MASK ; >;
-        < "Dimension specifications do not match." ; ERRCODE_BASIC_WRONG_DIMS & ERRCODE_RES_MASK ; >;
-        < "Unknown option: $(ARG1)." ; ERRCODE_BASIC_BAD_OPTION & ERRCODE_RES_MASK ; >;
-        < "Constant $(ARG1) redefined." ; ERRCODE_BASIC_CONSTANT_REDECLARED & ERRCODE_RES_MASK ; >;
-        < "Program too large." ; ERRCODE_BASIC_PROG_TOO_LARGE & ERRCODE_RES_MASK ; >;
-        < "Strings or arrays not permitted." ; ERRCODE_BASIC_NO_STRINGS_ARRAYS & ERRCODE_RES_MASK ; >;
-        < "An exception occurred $(ARG1)." ; ERRCODE_BASIC_EXCEPTION & ERRCODE_RES_MASK ; >;
-        < "This array is fixed or temporarily locked." ; ERRCODE_BASIC_ARRAY_FIX & ERRCODE_RES_MASK ; >;
-        < "Out of string space." ; ERRCODE_BASIC_STRING_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Expression Too Complex." ; ERRCODE_BASIC_EXPR_TOO_COMPLEX & ERRCODE_RES_MASK ; >;
-        < "Can't perform requested operation." ; ERRCODE_BASIC_OPER_NOT_PERFORM & ERRCODE_RES_MASK ; >;
-        < "Too many DLL application clients." ; ERRCODE_BASIC_TOO_MANY_DLL & ERRCODE_RES_MASK ; >;
-        < "For loop not initialized." ; ERRCODE_BASIC_LOOP_NOT_INIT & ERRCODE_RES_MASK ; >;
-        < "$(ARG1)" ; ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK ; >;
-    };
-};
-
- // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
-String IDS_SBERR_TERMINATED
-{
-    Text [ en-US ] = "The macro running has been interrupted" ;
-};
-String ERRCODE_BASMGR_LIBLOAD & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "Error loading library '$(ARG1)'." ;
-};
-String ERRCODE_BASMGR_LIBSAVE & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "Error saving library: '$(ARG1)'." ;
-};
-String ERRCODE_BASMGR_MGROPEN & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "The BASIC from the file '$(ARG1)' could not be initialized." ;
-};
-String ERRCODE_BASMGR_MGRSAVE & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "Error saving BASIC: '$(ARG1)'." ;
-};
-String ERRCODE_BASMGR_REMOVELIB & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "Error removing library." ;
-};
-String ERRCODE_BASMGR_UNLOADLIB & ERRCODE_RES_MASK
-{
-    Text [ en-US ] = "The library could not be removed from memory." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index c9e4a153338d..e7f228060293 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -26,8 +26,8 @@
 
 #include <basic/sbstar.hxx>
 #include <basic/basrdll.hxx>
-#include <basrid.hxx>
-#include <sb.hrc>
+#include <tools/resmgr.hxx>
+#include "strings.hrc"
 #include <sbxbase.hxx>
 
 struct BasicDLL::Impl
@@ -35,13 +35,13 @@ struct BasicDLL::Impl
     bool        bDebugMode;
     bool        bBreakEnabled;
 
-    std::unique_ptr<ResMgr> xBasResMgr;
+    std::locale aBasResLocale;
     std::unique_ptr<SbxAppData> xSbxAppData;
 
     Impl()
         : bDebugMode(false)
         , bBreakEnabled(true)
-        , xBasResMgr(ResMgr::CreateResMgr("sb", Application::GetSettings().GetUILanguageTag()))
+        , aBasResLocale(Translate::Create("sb", Application::GetSettings().GetUILanguageTag()))
         , xSbxAppData(new SbxAppData)
     { }
 };
@@ -52,9 +52,9 @@ BasicDLL * BASIC_DLL;
 
 }
 
-BasResId::BasResId( sal_uInt32 nId ) :
-    ResId( nId, *(BASIC_DLL->GetBasResMgr()) )
+OUString BasResId(const char* pId)
 {
+    return Translate::get(pId, BASIC_DLL->GetBasResLocale());
 }
 
 BasicDLL::BasicDLL()
@@ -67,7 +67,7 @@ BasicDLL::~BasicDLL()
 {
 }
 
-ResMgr* BasicDLL::GetBasResMgr() const { return m_xImpl->xBasResMgr.get(); }
+const std::locale& BasicDLL::GetBasResLocale() const { return m_xImpl->aBasResLocale; }
 
 void BasicDLL::EnableBreak( bool bEnable )
 {
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index f9f7d53597e3..56fa68c2aa52 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -72,9 +72,7 @@ using namespace com::sun::star::uno;
 #include "stdobj.hxx"
 #include "sbstdobj.hxx"
 #include "rtlproto.hxx"
-#include "basrid.hxx"
 #include "image.hxx"
-#include "sb.hrc"
 #include "iosys.hxx"
 #include "ddectrl.hxx"
 #include <sbintern.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8f7342b84aee..5d9764fa7581 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -53,7 +53,6 @@
 
 #include <basic/sbuno.hxx>
 
-#include "basrid.hxx"
 #include "codegen.hxx"
 #include "comenumwrapper.hxx"
 #include "ddectrl.hxx"
@@ -63,7 +62,6 @@
 #include "iosys.hxx"
 #include "opcodes.hxx"
 #include "runtime.hxx"
-#include "sb.hrc"
 #include "sb.hxx"
 #include "sbintern.hxx"
 #include "sbunoobj.hxx"
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
deleted file mode 100644
index 432da3ffe2cd..000000000000
--- a/basic/source/sbx/format.src
+++ /dev/null
@@ -1,51 +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 <svtools/svtools.hrc>
-
-String STR_BASICKEY_FORMAT_ON
-{
-    Text [ en-US ] = "On" ;
-};
-String STR_BASICKEY_FORMAT_OFF
-{
-    Text [ en-US ] = "Off" ;
-};
-String STR_BASICKEY_FORMAT_TRUE
-{
-    Text [ en-US ] = "True" ;
-};
-String STR_BASICKEY_FORMAT_FALSE
-{
-    Text [ en-US ] = "False" ;
-};
-String STR_BASICKEY_FORMAT_YES
-{
-    Text [ en-US ] = "Yes" ;
-};
-String STR_BASICKEY_FORMAT_NO
-{
-    Text [ en-US ] = "No" ;
-};
-String STR_BASICKEY_FORMAT_CURRENCY
-{
-    Text [ en-US ] = "@0.00 $;@(0.00 $)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index eff6720951f5..8be89826439b 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -38,11 +38,10 @@
 #include "sbxbase.hxx"
 #include <basic/sbxfac.hxx>
 #include <basic/sbxform.hxx>
-#include <svtools/svtools.hrc>
 
-#include "basrid.hxx"
 #include "date.hxx"
 #include "runtime.hxx"
+#include "strings.hrc"
 
 #include <rtl/strbuf.hxx>
 #include <rtl/character.hxx>
@@ -584,21 +583,16 @@ bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen )
 namespace
 {
 
-ResMgr& implGetResMgr()
+const std::locale& implGetResLocale()
 {
-    static ResMgr* const pResMgr( ResMgr::CreateResMgr(
-                               "sb", Application::GetSettings().GetUILanguageTag() ));
-
-    return *pResMgr;
+    static std::locale loc(Translate::Create("sb", Application::GetSettings().GetUILanguageTag()));
+    return loc;
 }
 
-class SbxValueFormatResId : public ResId
+OUString SbxValueFormatResId(const char *pId)
 {
-public:
-    explicit SbxValueFormatResId( sal_uInt32 nId )
-        : ResId( nId, implGetResMgr() )
-    {}
-};
+    return Translate::get(pId, implGetResLocale());
+}
 
 enum class VbaFormatType
 {
diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py
index a7adbf29fa20..c28fe545578a 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -14,23 +14,6 @@ exclusionSet = set([
     # List of RID constants where we compute a value using a base before calling one of the RESSTR methods
     # Found with: git grep -P 'RID_\w+\s*\+' -- :/ ':!*.hrc' ':!*.src' ':!*.java' ':!*.py' ':!*.xba'
     "RID_SVXSTR_KEY_",
-    "RID_SVXITEMS_SHADOW_",
-    "RID_SVXITEMS_BREAK_",
-    "RID_SVXITEMS_FRMDIR_",
-    "RID_SVXITEMS_COLOR",
-    "RID_SVXITEMS_HORJUST_",
-    "RID_SVXITEMS_VERJUST_",
-    "RID_SVXITEMS_JUSTMETHOD_",
-    "RID_SVXITEMS_ADJUST_",
-    "RID_SVXITEMS_WEIGHT_",
-    "RID_SVXITEMS_UL_",
-    "RID_SVXITEMS_OL_",
-    "RID_SVXITEMS_STRIKEOUT_",
-    "RID_SVXITEMS_CASEMAP_",
-    "RID_SVXITEMS_ESCAPEMENT_",
-    "RID_SVXITEMS_EMPHASIS_",
-    "RID_SVXITEMS_RELIEF_",
-    "RID_SVXITEMS_FRMDIR_",
     "RID_UPDATE_BUBBLE_TEXT_",
     "RID_UPDATE_BUBBLE_T_TEXT_",
     "RID_SVXSTR_TBLAFMT_",
@@ -42,8 +25,6 @@ exclusionSet = set([
     "RID_SVXSTR_OUTLINENUM_DESCRIPTION",
     "RID_SVXSTR_RULER_",
     "RID_GALLERYSTR_THEME_",
-    "RID_SVXITEMS_ORI_",
-    "RID_SVXITEMS_PAGE_NUM_",
     "RID_SVXSTR_BULLET_DESCRIPTION",
     "RID_SVXSTR_SINGLENUM_DESCRIPTION",
     "RID_SVXSTR_OUTLINENUM_DESCRIPTION",
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 2ed80c2523fb..88fb2cc460a1 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -98,6 +98,8 @@ def main():
     tree = ET.parse(sys.argv[1])
     root = tree.getroot()
 
+    lint_assert('domain' in root.attrib, "interface needs to specific translation domain")
+
     top_level_widgets = [element for element in root.findall('object') if element.attrib['class'] not in IGNORED_TOP_LEVEL_WIDGETS]
     assert len(top_level_widgets) == 1
 
diff --git a/bin/run b/bin/run
index 7823861d4a3b..7055ffe177b3 100755
--- a/bin/run
+++ b/bin/run
@@ -25,9 +25,9 @@ if uname | grep -i CYGWIN >/dev/null; then
     export URE_BOOTSTRAP=file:///$(cygpath -m "${dir}")/instdir/program/fundamental.ini
     export PATH=${PATH:+$PATH:}"${dir}"/instdir/program
 
-    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
-    echo "setting search path to: ${PATH}"
-    echo "execing: ${exedir}/$1"
+#    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
+#    echo "setting search path to: ${PATH}"
+#    echo "execing: ${exedir}/$1"
 
     exec ${LO_TRACE} "${exedir}/$@"
 
@@ -47,9 +47,9 @@ elif [ $(uname) = Darwin ]; then
     export URE_BOOTSTRAP=file://"${dir}"/instdir/$PRODUCTNAME.app/Contents/Resources/fundamentalrc
     export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"${dir}"/instdir/$PRODUCTNAME.app/Contents/Frameworks
 
-    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
-    echo "setting search path to: ${DYLD_LIBRARY_PATH}"
-    echo "execing: ${exedir}/$1"
+#    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
+#    echo "setting search path to: ${DYLD_LIBRARY_PATH}"
+#    echo "execing: ${exedir}/$1"
 
     exec ${LO_TRACE} "${exedir}/$@"
 
@@ -69,9 +69,9 @@ else
     export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program
 
-    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
-    echo "setting search path to: ${LD_LIBRARY_PATH}"
-    echo "execing: ${exedir}/$1"
+#    echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}"
+#    echo "setting search path to: ${LD_LIBRARY_PATH}"
+#    echo "execing: ${exedir}/$1"
 
     exec ${LO_TRACE} "${exedir}/$@"
 
diff --git a/chart2/AllLangMoTarget_chart.mk b/chart2/AllLangMoTarget_chart.mk
new file mode 100644
index 000000000000..bf3b19b3876b
--- /dev/null
+++ b/chart2/AllLangMoTarget_chart.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,chart))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,chart,chart2))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
deleted file mode 100644
index 9d9cddb3f974..000000000000
--- a/chart2/AllLangResTarget_chartcontroller.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,chartcontroller))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,chartcontroller,chart2))
-
-$(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\
-    chart2/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,chart2/res))
-
-$(eval $(call gb_SrsTarget_set_include,chart2/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/chart2/source/controller/dialogs \
-    -I$(SRCDIR)/chart2/source/controller/inc \
-    -I$(SRCDIR)/chart2/source/controller/main \
-    -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,chart2/res,\
-    chart2/source/controller/dialogs/Strings_ChartTypes.src \
-    chart2/source/controller/dialogs/Strings_Scale.src \
-    chart2/source/controller/dialogs/Strings.src \
-    chart2/source/controller/dialogs/Strings_Statistic.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index af8619454f8d..17769c6e5173 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -128,7 +128,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
 
 $(eval $(call gb_CppunitTest_use_configuration,chart2_import))
 
-$(call gb_CppunitTest_get_target,chart2_import): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index de8b20e1ec42..aa9a6d6b037e 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -127,7 +127,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
 
 $(eval $(call gb_CppunitTest_use_configuration,chart2_trendcalculators))
 
-$(call gb_CppunitTest_get_target,chart2_trendcalculators): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index ee4dc2ea5328..7c0cc90a1d14 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -201,7 +201,4 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
     chart2/source/controller/uitest/uiobject \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,chartcontroller,chartcontroller))
-
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 5e2d820bd7b9..c044d016a91a 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,chart2))
 $(eval $(call gb_Module_add_targets,chart2,\
     Library_chartcontroller \
     Library_chartcore \
+	UIConfig_chart2 \
 ))
 ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Module_add_targets,chart2,\
@@ -21,8 +22,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
 endif
 
 $(eval $(call gb_Module_add_l10n_targets,chart2,\
-    AllLangResTarget_chartcontroller \
-	UIConfig_chart2 \
+	AllLangMoTarget_chart \
 ))
 
 ifneq ($(OS),IOS)
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 337b33a35b9f..f85aafda5899 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -361,8 +361,6 @@
 #include <i18nutil/paper.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/shell.hxx>
@@ -498,7 +496,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
new file mode 100644
index 000000000000..fac728c6e4dd
--- /dev/null
+++ b/chart2/inc/strings.hrc
@@ -0,0 +1,198 @@
+/* -*- 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 CHART_STRINGS_HRC
+#define CHART_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_DLG_CHART_WIZARD                        NC_("STR_DLG_CHART_WIZARD", "Chart Wizard")
+#define STR_DLG_SMOOTH_LINE_PROPERTIES              NC_("STR_DLG_SMOOTH_LINE_PROPERTIES", "Smooth Lines")
+#define STR_DLG_STEPPED_LINE_PROPERTIES             NC_("STR_DLG_STEPPED_LINE_PROPERTIES", "Stepped Lines")
+#define STR_PAGE_CHARTTYPE                          NC_("STR_PAGE_CHARTTYPE", "Chart Type")
+#define STR_PAGE_DATA_RANGE                         NC_("STR_PAGE_DATA_RANGE", "Data Range")
+#define STR_PAGE_CHART_ELEMENTS                     NC_("STR_PAGE_CHART_ELEMENTS", "Chart Elements")
+#define STR_PAGE_LINE                               NC_("STR_PAGE_LINE", "Line")
+#define STR_PAGE_BORDER                             NC_("STR_PAGE_BORDER", "Borders")
+#define STR_PAGE_AREA                               NC_("STR_PAGE_AREA", "Area")
+#define STR_PAGE_TRANSPARENCY                       NC_("STR_PAGE_TRANSPARENCY", "Transparency")
+#define STR_PAGE_FONT                               NC_("STR_PAGE_FONT", "Font")
+#define STR_PAGE_FONT_EFFECTS                       NC_("STR_PAGE_FONT_EFFECTS", "Font Effects")
+#define STR_PAGE_NUMBERS                            NC_("STR_PAGE_NUMBERS", "Numbers")
+#define STR_PAGE_POSITION                           NC_("STR_PAGE_POSITION", "Position")
+#define STR_PAGE_LAYOUT                             NC_("STR_PAGE_LAYOUT", "Layout")
+#define STR_PAGE_OPTIONS                            NC_("STR_PAGE_OPTIONS", "Options")
+#define STR_PAGE_SCALE                              NC_("STR_PAGE_SCALE", "Scale")
+#define STR_PAGE_POSITIONING                        NC_("STR_PAGE_POSITIONING", "Positioning")
+#define STR_PAGE_TRENDLINE_TYPE                     NC_("STR_PAGE_TRENDLINE_TYPE", "Type")
+#define STR_PAGE_XERROR_BARS                        NC_("STR_PAGE_XERROR_BARS", "X Error Bars")
+#define STR_PAGE_YERROR_BARS                        NC_("STR_PAGE_YERROR_BARS", "Y Error Bars")
+#define STR_PAGE_ALIGNMENT                          NC_("STR_PAGE_ALIGNMENT", "Alignment")
+#define STR_PAGE_PERSPECTIVE                        NC_("STR_PAGE_PERSPECTIVE", "Perspective")
+#define STR_PAGE_APPEARANCE                         NC_("STR_PAGE_APPEARANCE", "Appearance")
+#define STR_PAGE_ILLUMINATION                       NC_("STR_PAGE_ILLUMINATION", "Illumination")
+#define STR_PAGE_ASIAN                              NC_("STR_PAGE_ASIAN", "Asian Typography")
+#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS     NC_("STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS", "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION")
+#define STR_OBJECT_AXIS                             NC_("STR_OBJECT_AXIS", "Axis")
+#define STR_OBJECT_AXIS_X                           NC_("STR_OBJECT_AXIS_X", "X Axis")
+#define STR_OBJECT_AXIS_Y                           NC_("STR_OBJECT_AXIS_Y", "Y Axis")
+#define STR_OBJECT_AXIS_Z                           NC_("STR_OBJECT_AXIS_Z", "Z Axis")
+#define STR_OBJECT_SECONDARY_X_AXIS                 NC_("STR_OBJECT_SECONDARY_X_AXIS", "Secondary X Axis")
+#define STR_OBJECT_SECONDARY_Y_AXIS                 NC_("STR_OBJECT_SECONDARY_Y_AXIS", "Secondary Y Axis")
+#define STR_OBJECT_AXES                             NC_("STR_OBJECT_AXES", "Axes")
+#define STR_OBJECT_GRIDS                            NC_("STR_OBJECT_GRIDS", "Grids")
+#define STR_OBJECT_GRID                             NC_("STR_OBJECT_GRID", "Grid")
+#define STR_OBJECT_GRID_MAJOR_X                     NC_("STR_OBJECT_GRID_MAJOR_X", "X Axis Major Grid")
+#define STR_OBJECT_GRID_MAJOR_Y                     NC_("STR_OBJECT_GRID_MAJOR_Y", "Y Axis Major Grid")
+#define STR_OBJECT_GRID_MAJOR_Z                     NC_("STR_OBJECT_GRID_MAJOR_Z", "Z Axis Major Grid")
+#define STR_OBJECT_GRID_MINOR_X                     NC_("STR_OBJECT_GRID_MINOR_X", "X Axis Minor Grid")
+#define STR_OBJECT_GRID_MINOR_Y                     NC_("STR_OBJECT_GRID_MINOR_Y", "Y Axis Minor Grid")
+#define STR_OBJECT_GRID_MINOR_Z                     NC_("STR_OBJECT_GRID_MINOR_Z", "Z Axis Minor Grid")
+#define STR_OBJECT_LEGEND                           NC_("STR_OBJECT_LEGEND", "Legend")
+#define STR_OBJECT_TITLE                            NC_("STR_OBJECT_TITLE", "Title")
+#define STR_OBJECT_TITLES                           NC_("STR_OBJECT_TITLES", "Titles")
+#define STR_OBJECT_TITLE_MAIN                       NC_("STR_OBJECT_TITLE_MAIN", "Main Title")
+#define STR_OBJECT_TITLE_SUB                        NC_("STR_OBJECT_TITLE_SUB", "Subtitle")
+#define STR_OBJECT_TITLE_X_AXIS                     NC_("STR_OBJECT_TITLE_X_AXIS", "X Axis Title")
+#define STR_OBJECT_TITLE_Y_AXIS                     NC_("STR_OBJECT_TITLE_Y_AXIS", "Y Axis Title")
+#define STR_OBJECT_TITLE_Z_AXIS                     NC_("STR_OBJECT_TITLE_Z_AXIS", "Z Axis Title")
+#define STR_OBJECT_TITLE_SECONDARY_X_AXIS           NC_("STR_OBJECT_TITLE_SECONDARY_X_AXIS", "Secondary X Axis Title")
+#define STR_OBJECT_TITLE_SECONDARY_Y_AXIS           NC_("STR_OBJECT_TITLE_SECONDARY_Y_AXIS", "Secondary Y Axis Title")
+#define STR_OBJECT_LABEL                            NC_("STR_OBJECT_LABEL", "Label")
+#define STR_OBJECT_DATALABELS                       NC_("STR_OBJECT_DATALABELS", "Data Labels")
+#define STR_OBJECT_DATAPOINT                        NC_("STR_OBJECT_DATAPOINT", "Data Point")
+#define STR_OBJECT_DATAPOINTS                       NC_("STR_OBJECT_DATAPOINTS", "Data Points")
+#define STR_OBJECT_LEGEND_SYMBOL                    NC_("STR_OBJECT_LEGEND_SYMBOL", "Legend Key")
+#define STR_OBJECT_DATASERIES                       NC_("STR_OBJECT_DATASERIES", "Data Series")
+#define STR_OBJECT_DATASERIES_PLURAL                NC_("STR_OBJECT_DATASERIES_PLURAL", "Data Series")
+#define STR_OBJECT_CURVE                            NC_("STR_OBJECT_CURVE", "Trend Line")
+#define STR_OBJECT_CURVES                           NC_("STR_OBJECT_CURVES", "Trend Lines")
+#define STR_OBJECT_CURVE_WITH_PARAMETERS            NC_("STR_OBJECT_CURVE_WITH_PARAMETERS", "Trend line %FORMULA with accuracy R² = %RSQUARED")
+#define STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS   NC_("STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS", "Moving average trend line with period = %PERIOD")
+#define STR_OBJECT_AVERAGE_LINE                     NC_("STR_OBJECT_AVERAGE_LINE", "Mean Value Line")
+#define STR_OBJECT_CURVE_EQUATION                   NC_("STR_OBJECT_CURVE_EQUATION", "Equation")
+#define STR_OBJECT_ERROR_BARS_X                     NC_("STR_OBJECT_ERROR_BARS_X", "X Error Bars")
+#define STR_OBJECT_ERROR_BARS_Y                     NC_("STR_OBJECT_ERROR_BARS_Y", "Y Error Bars")
+#define STR_OBJECT_ERROR_BARS_Z                     NC_("STR_OBJECT_ERROR_BARS_Z", "Z Error Bars")
+#define STR_OBJECT_STOCK_LOSS                       NC_("STR_OBJECT_STOCK_LOSS", "Stock Loss")
+#define STR_OBJECT_STOCK_GAIN                       NC_("STR_OBJECT_STOCK_GAIN", "Stock Gain")
+#define STR_OBJECT_PAGE                             NC_("STR_OBJECT_PAGE", "Chart Area")
+#define STR_OBJECT_DIAGRAM                          NC_("STR_OBJECT_DIAGRAM", "Chart")
+#define STR_OBJECT_DIAGRAM_WALL                     NC_("STR_OBJECT_DIAGRAM_WALL", "Chart Wall")
+#define STR_OBJECT_DIAGRAM_FLOOR                    NC_("STR_OBJECT_DIAGRAM_FLOOR", "Chart Floor")
+#define STR_OBJECT_SHAPE                            NC_("STR_OBJECT_SHAPE", "Drawing Object")
+#define STR_TIP_DATASERIES                          NC_("STR_TIP_DATASERIES", "Data Series '%SERIESNAME'")
+#define STR_TIP_DATAPOINT_INDEX                     NC_("STR_TIP_DATAPOINT_INDEX", "Data Point %POINTNUMBER")
+#define STR_TIP_DATAPOINT_VALUES                    NC_("STR_TIP_DATAPOINT_VALUES", "Values: %POINTVALUES")
+#define STR_TIP_DATAPOINT                           NC_("STR_TIP_DATAPOINT", "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES")
+#define STR_STATUS_DATAPOINT_MARKED                 NC_("STR_STATUS_DATAPOINT_MARKED", "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES")
+#define STR_STATUS_OBJECT_MARKED                    NC_("STR_STATUS_OBJECT_MARKED", "%OBJECTNAME selected")
+#define STR_STATUS_PIE_SEGMENT_EXPLODED             NC_("STR_STATUS_PIE_SEGMENT_EXPLODED", "Pie exploded by %PERCENTVALUE percent")
+#define STR_OBJECT_FOR_SERIES                       NC_("STR_OBJECT_FOR_SERIES", "%OBJECTNAME for Data Series '%SERIESNAME'")
+#define STR_OBJECT_FOR_ALL_SERIES                   NC_("STR_OBJECT_FOR_ALL_SERIES", "%OBJECTNAME for all Data Series")
+#define STR_ACTION_EDIT_CHARTTYPE                   NC_("STR_ACTION_EDIT_CHARTTYPE", "Edit chart type")
+#define STR_ACTION_EDIT_DATA_RANGES                 NC_("STR_ACTION_EDIT_DATA_RANGES", "Edit data ranges")
+#define STR_ACTION_EDIT_3D_VIEW                     NC_("STR_ACTION_EDIT_3D_VIEW", "Edit 3D view")
+#define STR_ACTION_EDIT_CHART_DATA                  NC_("STR_ACTION_EDIT_CHART_DATA", "Edit chart data")
+#define STR_ACTION_TOGGLE_LEGEND                    NC_("STR_ACTION_TOGGLE_LEGEND", "Legend on/off")
+#define STR_ACTION_TOGGLE_GRID_HORZ                 NC_("STR_ACTION_TOGGLE_GRID_HORZ", "Horizontal grid major/major&minor/off")
+#define STR_ACTION_TOGGLE_GRID_VERTICAL             NC_("STR_ACTION_TOGGLE_GRID_VERTICAL", "Vertical grid major/major&minor/off")
+#define STR_ACTION_SCALE_TEXT                       NC_("STR_ACTION_SCALE_TEXT", "Scale Text")
+#define STR_ACTION_REARRANGE_CHART                  NC_("STR_ACTION_REARRANGE_CHART", "Automatic Layout")
+#define STR_ACTION_NOTPOSSIBLE                      NC_("STR_ACTION_NOTPOSSIBLE", "This function cannot be completed with the selected objects.")
+#define STR_ACTION_EDIT_TEXT                        NC_("STR_ACTION_EDIT_TEXT", "Edit text")
+#define STR_COLUMN_LABEL                            NC_("STR_COLUMN_LABEL", "Column %COLUMNNUMBER")
+#define STR_ROW_LABEL                               NC_("STR_ROW_LABEL", "Row %ROWNUMBER")
+#define STR_DATA_ROLE_LABEL                         NC_("STR_DATA_ROLE_LABEL", "Name")
+#define STR_DATA_ROLE_X                             NC_("STR_DATA_ROLE_X", "X-Values")
+#define STR_DATA_ROLE_Y                             NC_("STR_DATA_ROLE_Y", "Y-Values")
+#define STR_DATA_ROLE_SIZE                          NC_("STR_DATA_ROLE_SIZE", "Bubble Sizes")
+#define STR_DATA_ROLE_X_ERROR                       NC_("STR_DATA_ROLE_X_ERROR", "X-Error-Bars")
+#define STR_DATA_ROLE_X_ERROR_POSITIVE              NC_("STR_DATA_ROLE_X_ERROR_POSITIVE", "Positive X-Error-Bars")
+#define STR_DATA_ROLE_X_ERROR_NEGATIVE              NC_("STR_DATA_ROLE_X_ERROR_NEGATIVE", "Negative X-Error-Bars")
+#define STR_DATA_ROLE_Y_ERROR                       NC_("STR_DATA_ROLE_Y_ERROR", "Y-Error-Bars")
+#define STR_DATA_ROLE_Y_ERROR_POSITIVE              NC_("STR_DATA_ROLE_Y_ERROR_POSITIVE", "Positive Y-Error-Bars")
+#define STR_DATA_ROLE_Y_ERROR_NEGATIVE              NC_("STR_DATA_ROLE_Y_ERROR_NEGATIVE", "Negative Y-Error-Bars")
+#define STR_DATA_ROLE_FIRST                         NC_("STR_DATA_ROLE_FIRST", "Open Values")
+#define STR_DATA_ROLE_LAST                          NC_("STR_DATA_ROLE_LAST", "Close Values")
+#define STR_DATA_ROLE_MIN                           NC_("STR_DATA_ROLE_MIN", "Low Values")
+#define STR_DATA_ROLE_MAX                           NC_("STR_DATA_ROLE_MAX", "High Values")
+#define STR_DATA_ROLE_CATEGORIES                    NC_("STR_DATA_ROLE_CATEGORIES", "Categories")
+#define STR_DATA_UNNAMED_SERIES                     NC_("STR_DATA_UNNAMED_SERIES", "Unnamed Series")
+#define STR_DATA_UNNAMED_SERIES_WITH_INDEX          NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Unnamed Series %NUMBER")
+#define STR_DATA_SELECT_RANGE_FOR_SERIES            NC_("STR_DATA_SELECT_RANGE_FOR_SERIES", "Select Range for %VALUETYPE of %SERIESNAME")
+#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES        NC_("STR_DATA_SELECT_RANGE_FOR_CATEGORIES", "Select Range for Categories")
+#define STR_DATA_SELECT_RANGE_FOR_DATALABELS        NC_("STR_DATA_SELECT_RANGE_FOR_DATALABELS", "Select Range for data labels")
+#define STR_DATA_EDITOR_INCORRECT_INPUT             NC_("STR_DATA_EDITOR_INCORRECT_INPUT", "Your last input is incorrect.\nIgnore this change and close the dialog?")
+#define STR_TEXT_DIRECTION_LTR                      NC_("STR_TEXT_DIRECTION_LTR", "Left-to-right")
+#define STR_TEXT_DIRECTION_RTL                      NC_("STR_TEXT_DIRECTION_RTL", "Right-to-left")
+#define STR_TEXT_DIRECTION_SUPER                    NC_("STR_TEXT_DIRECTION_SUPER", "Use superordinate object settings")
+#define STR_PROPERTY_ROLE_FILLCOLOR                 NC_("STR_PROPERTY_ROLE_FILLCOLOR", "Fill Color")
+#define STR_PROPERTY_ROLE_BORDERCOLOR               NC_("STR_PROPERTY_ROLE_BORDERCOLOR", "Border Color")
+
+#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA        NC_("STR_CONTROLTEXT_ERROR_BARS_FROM_DATA", "From Data Table")
+#define STR_REGRESSION_LINEAR                       NC_("STR_REGRESSION_LINEAR", "Linear")
+#define STR_REGRESSION_LOG                          NC_("STR_REGRESSION_LOG", "Logarithmic")
+#define STR_REGRESSION_EXP                          NC_("STR_REGRESSION_EXP", "Exponential")
+#define STR_REGRESSION_POWER                        NC_("STR_REGRESSION_POWER", "Power")
+#define STR_REGRESSION_POLYNOMIAL                   NC_("STR_REGRESSION_POLYNOMIAL", "Polynomial")
+#define STR_REGRESSION_MOVING_AVERAGE               NC_("STR_REGRESSION_MOVING_AVERAGE", "Moving average")
+#define STR_REGRESSION_MEAN                         NC_("STR_REGRESSION_MEAN", "Mean")
+
+#define STR_TYPE_COLUMN                             NC_("STR_TYPE_COLUMN", "Column")
+#define STR_TYPE_BAR                                NC_("STR_TYPE_BAR", "Bar")
+#define STR_TYPE_AREA                               NC_("STR_TYPE_AREA", "Area")
+#define STR_TYPE_PIE                                NC_("STR_TYPE_PIE", "Pie")
+#define STR_PIE_EXPLODED                            NC_("STR_PIE_EXPLODED", "Exploded Pie Chart")
+#define STR_DONUT_EXPLODED                          NC_("STR_DONUT_EXPLODED", "Exploded Donut Chart")
+#define STR_DONUT                                   NC_("STR_DONUT", "Donut")
+#define STR_TYPE_LINE                               NC_("STR_TYPE_LINE", "Line")
+#define STR_TYPE_XY                                 NC_("STR_TYPE_XY", "XY (Scatter)")
+#define STR_POINTS_AND_LINES                        NC_("STR_POINTS_AND_LINES", "Points and Lines")
+#define STR_POINTS_ONLY                             NC_("STR_POINTS_ONLY", "Points Only")
+#define STR_LINES_ONLY                              NC_("STR_LINES_ONLY", "Lines Only")
+#define STR_LINES_3D                                NC_("STR_LINES_3D", "3D Lines")
+#define STR_TYPE_COMBI_COLUMN_LINE                  NC_("STR_TYPE_COMBI_COLUMN_LINE", "Column and Line")
+#define STR_LINE_COLUMN                             NC_("STR_LINE_COLUMN", "Columns and Lines")
+#define STR_LINE_STACKEDCOLUMN                      NC_("STR_LINE_STACKEDCOLUMN", "Stacked Columns and Lines")
+#define STR_TYPE_NET                                NC_("STR_TYPE_NET", "Net")
+#define STR_TYPE_STOCK                              NC_("STR_TYPE_STOCK", "Stock")
+#define STR_STOCK_1                                 NC_("STR_STOCK_1", "Stock Chart 1")
+#define STR_STOCK_2                                 NC_("STR_STOCK_2", "Stock Chart 2")
+#define STR_STOCK_3                                 NC_("STR_STOCK_3", "Stock Chart 3")
+#define STR_STOCK_4                                 NC_("STR_STOCK_4", "Stock Chart 4")
+#define STR_NORMAL                                  NC_("STR_NORMAL", "Normal")
+#define STR_STACKED                                 NC_("STR_STACKED", "Stacked")
+#define STR_PERCENT                                 NC_("STR_PERCENT", "Percent Stacked")
+#define STR_DEEP                                    NC_("STR_DEEP", "Deep")
+#define STR_FILLED                                  NC_("STR_FILLED", "Filled")
+#define STR_TYPE_BUBBLE                             NC_("STR_TYPE_BUBBLE", "Bubble")
+#define STR_BUBBLE_1                                NC_("STR_BUBBLE_1", "Bubble Chart")
+#define STR_TYPE_GL3D_BAR                           NC_("STR_TYPE_GL3D_BAR", "GL3D Bar")
+#define STR_GL3D_BAR                                NC_("STR_GL3D_BAR", "GL3D Bar Chart")
+
+#define STR_INVALID_NUMBER                          NC_("STR_INVALID_NUMBER", "Numbers are required. Check your input.")
+#define STR_STEP_GT_ZERO                            NC_("STR_STEP_GT_ZERO", "The major interval requires a positive number. Check your input.")
+#define STR_BAD_LOGARITHM                           NC_("STR_BAD_LOGARITHM", "The logarithmic scale requires positive numbers. Check your input.")
+#define STR_MIN_GREATER_MAX                         NC_("STR_MIN_GREATER_MAX", "The minimum must be lower than the maximum. Check your input.")
+#define STR_INVALID_INTERVALS                       NC_("STR_INVALID_INTERVALS", "The major interval needs to be greater than the minor interval. Check your input.")
+#define STR_INVALID_TIME_UNIT                       NC_("STR_INVALID_TIME_UNIT", "The major and minor interval need to be greater or equal to the resolution. Check your input.")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 064384a87fe3..7e5657799227 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -24,7 +24,7 @@
 #include "ObjectHierarchy.hxx"
 #include "ObjectIdentifier.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "AccessibleViewForwarder.hxx"
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 6bf6c25ef928..9fa2399a1695 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -20,7 +20,7 @@
 #include "ChartTypeDialogController.hxx"
 #include "ResId.hxx"
 #include "HelpIds.hrc"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "macros.hxx"
 #include "ChartModelHelper.hxx"
@@ -33,7 +33,7 @@
 #include <com/sun/star/chart2/PieChartOffsetMode.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svtools/valueset.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/builder.hxx>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 3c659927f8e0..c371944f2a3f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -22,7 +22,7 @@
 
 #include "DataBrowser.hxx"
 #include "DataBrowserModel.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "DataSeriesHelper.hxx"
 #include "DiagramHelper.hxx"
 #include "ChartModelHelper.hxx"
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index ffceca3ccc00..f361a432ee64 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -24,7 +24,7 @@
 #include "DataSourceHelper.hxx"
 #include "DiagramHelper.hxx"
 #include "macros.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "ContainerHelper.hxx"
 #include "CommonFunctors.hxx"
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
index db613c24105f..a1f568ae083d 100644
--- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
@@ -8,10 +8,9 @@
  */
 
 #include "GL3DBarChartDialogController.hxx"
-#include <Strings.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <ResId.hxx>
-
 #include <svtools/valueset.hxx>
 
 namespace chart {
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 6ea99ad1f155..d61da98eab4b 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -19,7 +19,7 @@
 
 #include "ObjectNameProvider.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "macros.hxx"
 #include "AxisHelper.hxx"
 #include "ChartModelHelper.hxx"
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
deleted file mode 100644
index 4c9b40da141f..000000000000
--- a/chart2/source/controller/dialogs/Strings.src
+++ /dev/null
@@ -1,586 +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 "Strings.hrc"
-
-String STR_DLG_CHART_WIZARD
-{
-    Text [ en-US ] = "Chart Wizard" ;
-};
-
-String STR_DLG_SMOOTH_LINE_PROPERTIES
-{
-    Text [ en-US ] = "Smooth Lines" ;
-};
-
-String STR_DLG_STEPPED_LINE_PROPERTIES
-{
-    Text [ en-US ] = "Stepped Lines" ;
-};
-
-String STR_PAGE_CHARTTYPE
-{
-    Text [ en-US ] = "Chart Type" ;
-};
-
-String STR_PAGE_DATA_RANGE
-{
-    Text [ en-US ] = "Data Range";
-};
-
-String STR_PAGE_CHART_ELEMENTS
-{
-    Text [ en-US ] = "Chart Elements";
-};
-
-String STR_PAGE_LINE
-{
-    Text [ en-US ] = "Line" ;
-};
-
-String STR_PAGE_BORDER
-{
-    Text [ en-US ] = "Borders" ;
-};
-
-String STR_PAGE_AREA
-{
-    Text [ en-US ] = "Area" ;
-};
-
-String STR_PAGE_TRANSPARENCY
-{
-    Text [ en-US ] = "Transparency";
-};
-
-String STR_PAGE_FONT
-{
-    Text [ en-US ] = "Font" ;
-};
-
-String STR_PAGE_FONT_EFFECTS
-{
-    Text [ en-US ] = "Font Effects" ;
-};
-
-String STR_PAGE_NUMBERS
-{
-    Text [ en-US ] = "Numbers" ;
-};
-
-String STR_PAGE_POSITION
-{
-    Text [ en-US ] = "Position" ;
-};
-
-String STR_PAGE_LAYOUT
-{
-    Text [ en-US ] = "Layout";
-};
-
-String STR_PAGE_OPTIONS
-{
-    Text [ en-US ] = "Options";
-};
-
-String STR_PAGE_SCALE
-{
-    Text [ en-US ] = "Scale" ;
-};
-
-String STR_PAGE_POSITIONING
-{
-    Text [ en-US ] = "Positioning" ;
-};
-
-String STR_PAGE_TRENDLINE_TYPE
-{
-    Text[ en-US ] = "Type";
-};
-
-String STR_PAGE_XERROR_BARS
-{
-    Text[ en-US ] = "X Error Bars";
-};
-
-String STR_PAGE_YERROR_BARS
-{
-    Text[ en-US ] = "Y Error Bars";
-};
-
-String STR_PAGE_ALIGNMENT
-{
-    Text [ en-US ] = "Alignment" ;
-};
-
-String STR_PAGE_PERSPECTIVE
-{
-    Text [ en-US ] = "Perspective" ;
-};
-String STR_PAGE_APPEARANCE
-{
-    Text [ en-US ] = "Appearance" ;
-};
-String STR_PAGE_ILLUMINATION
-{
-    Text [ en-US ] = "Illumination" ;
-};
-
-String STR_PAGE_ASIAN
-{
-    Text [ en-US ] = "Asian Typography" ;
-};
-
-String STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS
-{
-    Text [ en-US ] = "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION";
-};
-
-String STR_OBJECT_AXIS
-{
-    Text [ en-US ] = "Axis" ;
-};
-String STR_OBJECT_AXIS_X
-{
-    Text [ en-US ] = "X Axis" ;
-};
-String STR_OBJECT_AXIS_Y
-{
-    Text [ en-US ] = "Y Axis" ;
-};
-String STR_OBJECT_AXIS_Z
-{
-    Text [ en-US ] = "Z Axis" ;
-};
-String STR_OBJECT_SECONDARY_X_AXIS
-{
-    Text [ en-US ] = "Secondary X Axis" ;
-};
-String STR_OBJECT_SECONDARY_Y_AXIS
-{
-    Text [ en-US ] = "Secondary Y Axis" ;
-};
-
-String STR_OBJECT_AXES
-{
-    Text [ en-US ] = "Axes" ;
-};
-String STR_OBJECT_GRIDS
-{
-    Text [ en-US ] = "Grids" ;
-};
-String STR_OBJECT_GRID
-{
-    Text [ en-US ] = "Grid" ;
-};
-String STR_OBJECT_GRID_MAJOR_X
-{
-    Text [ en-US ] = "X Axis Major Grid" ;
-};
-String STR_OBJECT_GRID_MAJOR_Y
-{
-    Text [ en-US ] = "Y Axis Major Grid" ;
-};
-String STR_OBJECT_GRID_MAJOR_Z
-{
-    Text [ en-US ] = "Z Axis Major Grid" ;
-};
-String STR_OBJECT_GRID_MINOR_X
-{
-    Text [ en-US ] = "X Axis Minor Grid" ;
-};
-String STR_OBJECT_GRID_MINOR_Y
-{
-    Text [ en-US ] = "Y Axis Minor Grid" ;
-};
-String STR_OBJECT_GRID_MINOR_Z
-{
-    Text [ en-US ] = "Z Axis Minor Grid" ;
-};
-
-String STR_OBJECT_LEGEND
-{
-    Text [ en-US ] = "Legend" ;
-};
-
-String STR_OBJECT_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_OBJECT_TITLES
-{
-    Text [ en-US ] = "Titles" ;
-};
-String STR_OBJECT_TITLE_MAIN
-{
-    Text [ en-US ] = "Main Title" ;
-};
-String STR_OBJECT_TITLE_SUB
-{
-    Text [ en-US ] = "Subtitle" ;
-};
-String STR_OBJECT_TITLE_X_AXIS
-{
-    Text [ en-US ] = "X Axis Title" ;
-};
-String STR_OBJECT_TITLE_Y_AXIS
-{
-    Text [ en-US ] = "Y Axis Title" ;
-};
-String STR_OBJECT_TITLE_Z_AXIS
-{
-    Text [ en-US ] = "Z Axis Title" ;
-};
-String STR_OBJECT_TITLE_SECONDARY_X_AXIS
-{
-    Text [ en-US ] = "Secondary X Axis Title" ;
-};
-String STR_OBJECT_TITLE_SECONDARY_Y_AXIS
-{
-    Text [ en-US ] = "Secondary Y Axis Title" ;
-};
-String STR_OBJECT_LABEL
-{
-    Text [ en-US ] = "Label" ;
-};
-
-String STR_OBJECT_DATALABELS
-{
-    Text [ en-US ] = "Data Labels" ;
-};
-String STR_OBJECT_DATAPOINT
-{
-    Text [ en-US ] = "Data Point" ;
-};
-String STR_OBJECT_DATAPOINTS
-{
-    Text [ en-US ] = "Data Points" ;
-};
-String STR_OBJECT_LEGEND_SYMBOL
-{
-    Text [ en-US ] = "Legend Key" ;
-};
-String STR_OBJECT_DATASERIES
-{
-    Text [ en-US ] = "Data Series" ;
-};
-String STR_OBJECT_DATASERIES_PLURAL
-{
-    Text [ en-US ] = "Data Series" ;
-};
-String STR_OBJECT_CURVE
-{
-    Text [ en-US ] = "Trend Line";
-};
-String STR_OBJECT_CURVES
-{
-    Text [ en-US ] = "Trend Lines";
-};
-String STR_OBJECT_CURVE_WITH_PARAMETERS
-{
-    Text [ en-US ] = "Trend line %FORMULA with accuracy R² = %RSQUARED";
-};
-String STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS
-{
-    Text [ en-US ] = "Moving average trend line with period = %PERIOD";
-};
-String STR_OBJECT_AVERAGE_LINE
-{
-    Text [ en-US ] = "Mean Value Line";
-};
-String STR_OBJECT_CURVE_EQUATION
-{
-    Text[ en-US ] = "Equation";
-};
-
-String STR_OBJECT_ERROR_BARS_X
-{
-    Text [ en-US ] = "X Error Bars";
-};
-
-String STR_OBJECT_ERROR_BARS_Y
-{
-    Text [ en-US ] = "Y Error Bars";
-};
-
-String STR_OBJECT_ERROR_BARS_Z
-{
-    Text [ en-US ] = "Z Error Bars";
-};
-String STR_OBJECT_STOCK_LOSS
-{
-    Text [ en-US ] = "Stock Loss";
-};
-
-String STR_OBJECT_STOCK_GAIN
-{
-    Text [ en-US ] = "Stock Gain";
-};
-
-String STR_OBJECT_PAGE
-{
-    Text [ en-US ] = "Chart Area" ;
-};
-String STR_OBJECT_DIAGRAM
-{
-    Text [ en-US ] = "Chart" ;
-};
-String STR_OBJECT_DIAGRAM_WALL
-{
-    Text [ en-US ] = "Chart Wall" ;
-};
-String STR_OBJECT_DIAGRAM_FLOOR
-{
-    Text [ en-US ] = "Chart Floor" ;
-};
-
-String STR_OBJECT_SHAPE
-{
-    Text [ en-US ] = "Drawing Object" ;
-};
-
-String STR_TIP_DATASERIES
-{
-    Text [ en-US ] = "Data Series '%SERIESNAME'" ;
-};
-
-String STR_TIP_DATAPOINT_INDEX
-{
-    Text [ en-US ] = "Data Point %POINTNUMBER";
-};
-
-String STR_TIP_DATAPOINT_VALUES
-{
-    Text [ en-US ] = "Values: %POINTVALUES";
-};
-
-String STR_TIP_DATAPOINT
-{
-    Text [ en-US ] = "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES";
-};
-
-String STR_STATUS_DATAPOINT_MARKED
-{
-    Text [ en-US ] = "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES";
-};
-
-String STR_STATUS_OBJECT_MARKED
-{
-    Text [ en-US ] = "%OBJECTNAME selected" ;
-};
-
-String STR_STATUS_PIE_SEGMENT_EXPLODED
-{
-    Text [ en-US ] = "Pie exploded by %PERCENTVALUE percent";
-};
-
-String STR_OBJECT_FOR_SERIES
-{
-    Text [ en-US ] = "%OBJECTNAME for Data Series '%SERIESNAME'" ;
-};
-
-String STR_OBJECT_FOR_ALL_SERIES
-{
-    Text [ en-US ] = "%OBJECTNAME for all Data Series" ;
-};
-
-String STR_ACTION_EDIT_CHARTTYPE
-{
-    Text [ en-US ] = "Edit chart type" ;
-};
-String STR_ACTION_EDIT_DATA_RANGES
-{
-    Text [ en-US ] = "Edit data ranges" ;
-};
-String STR_ACTION_EDIT_3D_VIEW
-{
-    Text [ en-US ] = "Edit 3D view" ;
-};
-String STR_ACTION_EDIT_CHART_DATA
-{
-    Text [ en-US ] = "Edit chart data";
-};
-String STR_ACTION_TOGGLE_LEGEND
-{
-    Text [ en-US ] = "Legend on/off" ;
-};
-String STR_ACTION_TOGGLE_GRID_HORZ
-{
-    Text [ en-US ] = "Horizontal grid major/major&minor/off" ;
-};
-String STR_ACTION_TOGGLE_GRID_VERTICAL
-{
-    Text [ en-US ] = "Vertical grid major/major&minor/off" ;
-};
-String STR_ACTION_SCALE_TEXT
-{
-    Text [ en-US ] = "Scale Text" ;
-};
-String STR_ACTION_REARRANGE_CHART
-{
-    Text [ en-US ] = "Automatic Layout" ;
-};
-String STR_ACTION_NOTPOSSIBLE
-{
-    Text [ en-US ] = "This function cannot be completed with the selected objects." ;
-};
-String STR_ACTION_EDIT_TEXT
-{
-    Text [ en-US ] = "Edit text";
-};
-
-String STR_COLUMN_LABEL
-{
-    Text [ en-US ] = "Column %COLUMNNUMBER" ;
-};
-String STR_ROW_LABEL
-{
-    Text [ en-US ] = "Row %ROWNUMBER" ;
-};
-
-//for range dialog
-String STR_DATA_ROLE_LABEL
-{
-    Text [ en-US ] = "Name" ;
-};
-
-String STR_DATA_ROLE_X
-{
-    Text [ en-US ] = "X-Values" ;
-};
-
-String STR_DATA_ROLE_Y
-{
-    Text [ en-US ] = "Y-Values" ;
-};
-
-String STR_DATA_ROLE_SIZE
-{
-    Text [ en-US ] = "Bubble Sizes" ;
-};
-
-String STR_DATA_ROLE_X_ERROR
-{
-    Text [ en-US ] = "X-Error-Bars" ;
-};
-String STR_DATA_ROLE_X_ERROR_POSITIVE
-{
-    Text [ en-US ] = "Positive X-Error-Bars" ;
-};
-String STR_DATA_ROLE_X_ERROR_NEGATIVE
-{
-    Text [ en-US ] = "Negative X-Error-Bars" ;
-};
-
-String STR_DATA_ROLE_Y_ERROR
-{
-    Text [ en-US ] = "Y-Error-Bars" ;
-};
-String STR_DATA_ROLE_Y_ERROR_POSITIVE
-{
-    Text [ en-US ] = "Positive Y-Error-Bars" ;
-};
-String STR_DATA_ROLE_Y_ERROR_NEGATIVE
-{
-    Text [ en-US ] = "Negative Y-Error-Bars" ;
-};
-
-String STR_DATA_ROLE_FIRST
-{
-    Text [ en-US ] = "Open Values" ;
-};
-
-String STR_DATA_ROLE_LAST
-{
-    Text [ en-US ] = "Close Values" ;
-};
-
-String STR_DATA_ROLE_MIN
-{
-    Text [ en-US ] = "Low Values" ;
-};
-
-String STR_DATA_ROLE_MAX
-{
-    Text [ en-US ] = "High Values" ;
-};
-
-String STR_DATA_ROLE_CATEGORIES
-{
-    Text [ en-US ] = "Categories";
-};
-
-String STR_DATA_UNNAMED_SERIES
-{
-    Text [ en-US ] = "Unnamed Series";
-};
-
-String STR_DATA_UNNAMED_SERIES_WITH_INDEX
-{
-    Text [ en-US ] = "Unnamed Series %NUMBER" ;
-};
-
-String STR_DATA_SELECT_RANGE_FOR_SERIES
-{
-    Text [ en-US ] = "Select Range for %VALUETYPE of %SERIESNAME" ;
-};
-
-String STR_DATA_SELECT_RANGE_FOR_CATEGORIES
-{
-    Text [ en-US ] = "Select Range for Categories" ;
-};
-
-String STR_DATA_SELECT_RANGE_FOR_DATALABELS
-{
-    Text [ en-US ] = "Select Range for data labels" ;
-};
-
-String STR_DATA_EDITOR_INCORRECT_INPUT
-{
-    Text [ en-US ] = "Your last input is incorrect.\nIgnore this change and close the dialog?" ;
-};
-
-// frame direction ------------------------------------------------------------
-
-String STR_TEXT_DIRECTION_LTR
-{
-    Text [ en-US ] = "Left-to-right";
-};
-
-String STR_TEXT_DIRECTION_RTL
-{
-    Text [ en-US ] = "Right-to-left";
-};
-
-String STR_TEXT_DIRECTION_SUPER
-{
-    Text [ en-US ] = "Use superordinate object settings";
-};
-
-String STR_PROPERTY_ROLE_FILLCOLOR
-{
-    Text [ en-US ] = "Fill Color";
-};
-
-String STR_PROPERTY_ROLE_BORDERCOLOR
-{
-    Text [ en-US ] = "Border Color";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src
deleted file mode 100644
index 88717805f0d8..000000000000
--- a/chart2/source/controller/dialogs/Strings_ChartTypes.src
+++ /dev/null
@@ -1,155 +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 "Strings.hrc"
-
-String STR_TYPE_COLUMN
-{
-    Text [ en-US ] = "Column" ;
-};
-String STR_TYPE_BAR
-{
-    Text [ en-US ] = "Bar" ;
-};
-String STR_TYPE_AREA
-{
-    Text [ en-US ] = "Area" ;
-};
-String STR_TYPE_PIE
-{
-    Text [ en-US ] = "Pie" ;
-};
-String STR_PIE_EXPLODED
-{
-    Text [ en-US ] = "Exploded Pie Chart" ;
-};
-String STR_DONUT_EXPLODED
-{
-    Text [ en-US ] = "Exploded Donut Chart" ;
-};
-String STR_DONUT
-{
-    Text [ en-US ] = "Donut" ;
-};
-String STR_TYPE_LINE
-{
-    Text [ en-US ] = "Line" ;
-};
-String STR_TYPE_XY
-{
-    Text [ en-US ] = "XY (Scatter)" ;
-};
-String STR_POINTS_AND_LINES
-{
-    Text [ en-US ] = "Points and Lines" ;
-};
-String STR_POINTS_ONLY
-{
-    //@todo or symbols instead of points??
-    Text [ en-US ] = "Points Only" ;
-};
-String STR_LINES_ONLY
-{
-    Text [ en-US ] = "Lines Only" ;
-};
-String STR_LINES_3D
-{
-    Text [ en-US ] = "3D Lines" ;
-};
-
-String STR_TYPE_COMBI_COLUMN_LINE
-{
-    Text [ en-US ] = "Column and Line" ;
-};
-String STR_LINE_COLUMN
-{
-    Text [ en-US ] = "Columns and Lines" ;
-};
-String STR_LINE_STACKEDCOLUMN
-{
-    Text [ en-US ] = "Stacked Columns and Lines" ;
-};
-
-String STR_TYPE_NET
-{
-    Text [ en-US ] = "Net" ;
-};
-
-String STR_TYPE_STOCK
-{
-    Text [ en-US ] = "Stock";
-};
-String STR_STOCK_1
-{
-    Text [ en-US ] = "Stock Chart 1";
-};
-String STR_STOCK_2
-{
-    Text [ en-US ] = "Stock Chart 2";
-};
-String STR_STOCK_3
-{
-    Text [ en-US ] = "Stock Chart 3";
-};
-String STR_STOCK_4
-{
-    Text [ en-US ] = "Stock Chart 4";
-};
-
-String STR_NORMAL
-{
-    Text [ en-US ] = "Normal" ;
-};
-String STR_STACKED
-{
-    Text [ en-US ] = "Stacked" ;
-};
-String STR_PERCENT
-{
-    Text [ en-US ] = "Percent Stacked" ;
-};
-
-String STR_DEEP
-{
-    Text [ en-US ] = "Deep" ;
-};
-String STR_FILLED
-{
-    Text [ en-US ] = "Filled" ;
-};
-
-String STR_TYPE_BUBBLE
-{
-    Text [ en-US ] = "Bubble" ;
-};
-String STR_BUBBLE_1
-{
-    Text [ en-US ] = "Bubble Chart" ;
-};
-
-String STR_TYPE_GL3D_BAR
-{
-    Text [ en-US ] = "GL3D Bar";
-};
-
-String STR_GL3D_BAR
-{
-    Text [ en-US ] = "GL3D Bar Chart";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src
deleted file mode 100644
index 80b1f4a8b669..000000000000
--- a/chart2/source/controller/dialogs/Strings_Scale.src
+++ /dev/null
@@ -1,46 +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 "Strings.hrc"
-
-String STR_INVALID_NUMBER
-{
-    Text [ en-US ] = "Numbers are required. Check your input." ;
-};
-String STR_STEP_GT_ZERO
-{
-    Text [ en-US ] = "The major interval requires a positive number. Check your input." ;
-};
-String STR_BAD_LOGARITHM
-{
-    Text [ en-US ] = "The logarithmic scale requires positive numbers. Check your input." ;
-};
-String STR_MIN_GREATER_MAX
-{
-    Text [ en-US ] = "The minimum must be lower than the maximum. Check your input." ;
-};
-String STR_INVALID_INTERVALS
-{
-    Text [ en-US ] = "The major interval needs to be greater than the minor interval. Check your input." ;
-};
-String STR_INVALID_TIME_UNIT
-{
-    Text [ en-US ] = "The major and minor interval need to be greater or equal to the resolution. Check your input." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src
deleted file mode 100644
index e375cb179d81..000000000000
--- a/chart2/source/controller/dialogs/Strings_Statistic.src
+++ /dev/null
@@ -1,58 +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 "Strings.hrc"
-
-// used for own data in error bar dialog
-//TODO: ohallot: String inserted into tp_ErrorBars.ui
-String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
-{
-    Text [ en-US ] = "From Data Table" ;
-};
-
-String STR_REGRESSION_LINEAR
-{
-    Text [ en-US ] = "Linear" ;
-};
-String STR_REGRESSION_LOG
-{
-    Text [ en-US ] = "Logarithmic" ;
-};
-String STR_REGRESSION_EXP
-{
-    Text [ en-US ] = "Exponential" ;
-};
-String STR_REGRESSION_POWER
-{
-    Text [ en-US ] = "Power" ;
-};
-String STR_REGRESSION_POLYNOMIAL
-{
-    Text [ en-US ] = "Polynomial" ;
-};
-String STR_REGRESSION_MOVING_AVERAGE
-{
-    Text [ en-US ] = "Moving average" ;
-};
-
-String STR_REGRESSION_MEAN
-{
-    Text [ en-US ] = "Mean" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index de52f69443c0..9a6e28bba418 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -19,7 +19,7 @@
 
 #include "TextDirectionListBox.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include <svl/languageoptions.hxx>
 #include <vcl/window.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 96c10ebc9710..95875642303a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -20,7 +20,7 @@
 #include "dlg_ChartType.hxx"
 #include "ResId.hxx"
 #include "ResourceIds.hrc"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "tp_ChartType.hxx"
 #include "macros.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 151d2c8321d2..d2198e8653e9 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -20,7 +20,7 @@
 #include "dlg_CreationWizard.hxx"
 #include "ResId.hxx"
 #include "macros.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "HelpIds.hrc"
 
 #include "tp_ChartType.hxx"
@@ -169,25 +169,27 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ )
 
 OUString CreationWizard::getStateDisplayName( WizardState nState ) const
 {
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     switch( nState )
     {
     case STATE_CHARTTYPE:
-        nResId = STR_PAGE_CHARTTYPE;
+        pResId = STR_PAGE_CHARTTYPE;
         break;
     case STATE_SIMPLE_RANGE:
-        nResId = STR_PAGE_DATA_RANGE;
+        pResId = STR_PAGE_DATA_RANGE;
         break;
     case STATE_DATA_SERIES:
-        nResId = STR_OBJECT_DATASERIES_PLURAL;
+        pResId = STR_OBJECT_DATASERIES_PLURAL;
         break;
     case STATE_OBJECTS:
-        nResId = STR_PAGE_CHART_ELEMENTS;
+        pResId = STR_PAGE_CHART_ELEMENTS;
         break;
     default:
         break;
     }
-    return SchResId(nResId);
+    if (!pResId)
+        return OUString();
+    return SchResId(pResId);
 }
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 8b7f777f6411..441b62e774ef 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dlg_DataEditor.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "DataBrowser.hxx"
 
 #include "ResId.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 8c1566310a9a..28c5383915ec 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dlg_DataSource.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "ChartTypeTemplateProvider.hxx"
 #include "DiagramHelper.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index e1fbd2aac208..ff2ca208628a 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -20,7 +20,7 @@
 #include <svl/zforlist.hxx>
 #include "dlg_ObjectProperties.hxx"
 #include "ResourceIds.hrc"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "tp_AxisLabel.hxx"
 #include "tp_DataLabel.hxx"
 #include "tp_LegendPosition.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 196a6fb17f94..a1988be2c8da 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dlg_View3D.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResourceIds.hrc"
 #include "ResId.hxx"
 #include "tp_3D_SceneGeometry.hxx"
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 433d3ce1ce21..ea48698aadb1 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -32,7 +32,7 @@
 #include <vcl/msgbox.hxx>
 #include <svx/svxids.hrc>
 #include <svl/zforlist.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 0589039c5eb3..2d9f912f007c 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -23,7 +23,7 @@
 #include "LegendHelper.hxx"
 #include "ChartModel.hxx"
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 4998e849fdc6..dae07506e76e 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -20,7 +20,7 @@
 #include "res_Titles.hxx"
 #include "ResId.hxx"
 #include "TitleDialogData.hxx"
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index e09db092fece..d25e5518794d 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -19,7 +19,7 @@
 
 #include "res_Trendline.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "chartview/ChartSfxItemIds.hxx"
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index c091fa701007..f691d7cc5f68 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -24,6 +24,7 @@
 
 #include <svx/colorbox.hxx>
 #include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include <svx/dialmgr.hxx>
 #include <rtl/math.hxx>
 #include <svtools/colrdlg.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 76d86aeb7eec..2ec01fff1e0c 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -21,7 +21,7 @@
 
 #include "ResId.hxx"
 #include "ResourceIds.hrc"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "AxisHelper.hxx"
 
@@ -32,7 +32,7 @@
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/zformat.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index d2f979596417..7228effb0e49 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tp_ChartType.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "ChartModelHelper.hxx"
 #include "DiagramHelper.hxx"
@@ -28,7 +28,7 @@
 #include "GL3DBarChartDialogController.hxx"
 #include <unonames.hxx>
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svtools/miscopt.hxx>
 
 #include <vcl/layout.hxx>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 102832e8300d..0d0e1cdef9d7 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tp_DataSource.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 69de86ab9798..0b86d2a021f2 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -23,7 +23,7 @@
 
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index b06a5fe3bdea..6879b87c34fb 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tp_RangeChooser.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
 #include "DataSourceHelper.hxx"
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index d16c5f3de50c..caaf1d7eb19b 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -20,7 +20,7 @@
 #include "tp_Scale.hxx"
 
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "AxisHelper.hxx"
 
@@ -31,7 +31,7 @@
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/zformat.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 #include <com/sun/star/chart2/AxisType.hpp>
 
@@ -430,7 +430,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         nStepFmt = 0;
 
     Control* pControl = nullptr;
-    sal_uInt16 nErrStrId = 0;
+    const char* pErrStrId = nullptr;
     double fDummy;
 
     fMax = m_pFmtFldMax->GetValue();
@@ -452,7 +452,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
              || ( !m_pCbxAutoMax->IsChecked() && fMax <= 0.0 ) ) )
     {
         pControl = m_pFmtFldMin;
-        nErrStrId = STR_BAD_LOGARITHM;
+        pErrStrId = STR_BAD_LOGARITHM;
     }
     // check for entries that cannot be parsed for the current number format
     else if ( m_pFmtFldMin->IsModified()
@@ -460,38 +460,38 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
               && !pNumFormatter->IsNumberFormat( m_pFmtFldMin->GetText(), nMinMaxOriginFmt, fDummy))
     {
         pControl = m_pFmtFldMin;
-        nErrStrId = STR_INVALID_NUMBER;
+        pErrStrId = STR_INVALID_NUMBER;
     }
     else if ( m_pFmtFldMax->IsModified()
               && !m_pCbxAutoMax->IsChecked()
               && !pNumFormatter->IsNumberFormat( m_pFmtFldMax->GetText(), nMinMaxOriginFmt, fDummy))
     {
         pControl = m_pFmtFldMax;
-        nErrStrId = STR_INVALID_NUMBER;
+        pErrStrId = STR_INVALID_NUMBER;
     }
     else if ( !bDateAxis && m_pFmtFldStepMain->IsModified()
               && !m_pCbxAutoStepMain->IsChecked()
               && !pNumFormatter->IsNumberFormat( m_pFmtFldStepMain->GetText(), nStepFmt, fDummy))
     {
         pControl = m_pFmtFldStepMain;
-        nErrStrId = STR_INVALID_NUMBER;
+        pErrStrId = STR_INVALID_NUMBER;
     }
     else if (m_pFmtFldOrigin->IsModified() && !m_pCbxAutoOrigin->IsChecked() &&
              !pNumFormatter->IsNumberFormat( m_pFmtFldOrigin->GetText(), nMinMaxOriginFmt, fDummy))
     {
         pControl = m_pFmtFldOrigin;
-        nErrStrId = STR_INVALID_NUMBER;
+        pErrStrId = STR_INVALID_NUMBER;
     }
     else if (!m_pCbxAutoStepMain->IsChecked() && fStepMain <= 0.0)
     {
         pControl = m_pFmtFldStepMain;
-        nErrStrId = STR_STEP_GT_ZERO;
+        pErrStrId = STR_STEP_GT_ZERO;
     }
     else if (!m_pCbxAutoMax->IsChecked() && !m_pCbxAutoMin->IsChecked() &&
              fMin >= fMax)
     {
         pControl = m_pFmtFldMin;
-        nErrStrId = STR_MIN_GREATER_MAX;
+        pErrStrId = STR_MIN_GREATER_MAX;
     }
     else if( bDateAxis )
     {
@@ -500,15 +500,15 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
             if( m_nHelpTimeUnit > m_nMainTimeUnit )
             {
                 pControl = m_pLB_MainTimeUnit;
-                nErrStrId = STR_INVALID_INTERVALS;
+                pErrStrId = STR_INVALID_INTERVALS;
             }
             else if( m_nHelpTimeUnit == m_nMainTimeUnit && nStepHelp > fStepMain )
             {
                 pControl = m_pLB_MainTimeUnit;
-                nErrStrId = STR_INVALID_INTERVALS;
+                pErrStrId = STR_INVALID_INTERVALS;
             }
         }
-        if( !nErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() )
+        if( !pErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() )
         {
             if( (!m_pCbxAutoStepMain->IsChecked() && m_nTimeResolution > m_nMainTimeUnit )
                 ||
@@ -516,12 +516,12 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
                 )
             {
                 pControl = m_pLB_TimeResolution;
-                nErrStrId = STR_INVALID_TIME_UNIT;
+                pErrStrId = STR_INVALID_TIME_UNIT;
             }
         }
     }
 
-    if( ShowWarning( nErrStrId, pControl ) )
+    if( ShowWarning( pErrStrId, pControl ) )
         return DeactivateRC::KeepPage;
 
     if( pItemSet )
@@ -609,12 +609,12 @@ void ScaleTabPage::ShowAxisOrigin( bool bShowOrigin )
         m_bShowAxisOrigin = true;
 }
 
-bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = NULL */ )
+bool ScaleTabPage::ShowWarning(const char* pResIdMessage, Control* pControl /* = NULL */ )
 {
-    if( nResIdMessage == 0 )
+    if (pResIdMessage == nullptr)
         return false;
 
-    ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SchResId(nResIdMessage))->Execute();
+    ScopedVclPtrInstance<WarningBox>(this, WinBits( WB_OK ), SchResId(pResIdMessage))->Execute();
     if( pControl )
     {
         pControl->GrabFocus();
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 33a58582a508..75c869d23141 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -103,9 +103,9 @@ private:
 
     /** shows a warning window due to an invalid input.
 
-        @param nResIdMessage
+        @param pResIdMessage
             The resource identifier that represents the localized warning text.
-            If this is 0, no warning is shown and false is returned.
+            If this is nullptr, no warning is shown and false is returned.
 
         @param pControl
             If non-NULL, contains a pointer to the control in which the
@@ -114,7 +114,7 @@ private:
 
         @return false, if nResIdMessage was 0, true otherwise
      */
-    bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl );
+    bool ShowWarning(const char* pResIdMessage, Control* pControl);
 
     void HideAllControls();
 };
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index bc7122cdb9d0..d022f12d6306 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -25,7 +25,7 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index be85cacf6647..beeedc457cd0 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tp_Wizard_TitlesAndObjects.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "res_Titles.hxx"
 #include "res_LegendPosition.hxx"
 #include "ResId.hxx"
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 307a2a6d27ed..2e822ceea120 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -28,7 +28,7 @@
 #include "dlg_DataSource.hxx"
 #include "ChartModelHelper.hxx"
 #include "ControllerCommandDispatch.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "chartview/ExplicitValueProvider.hxx"
 #include "ChartViewHelper.hxx"
 
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index ffab4b3a90d1..949700b82138 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -26,7 +26,7 @@
 #include "ControllerLockGuard.hxx"
 #include "UndoGuard.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 27ff61e1772b..eceb5af49d6d 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -40,7 +40,7 @@
 #include "ControllerLockGuard.hxx"
 #include "UndoGuard.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ReferenceSizeProvider.hxx"
 #include "ObjectIdentifier.hxx"
 #include "RegressionCurveHelper.hxx"
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 1e0762bdfc92..532a8cbd8c19 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -25,7 +25,7 @@
 #include "PositionAndSizeHelper.hxx"
 #include "ChartModelHelper.hxx"
 #include "UndoGuard.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ObjectNameProvider.hxx"
 #include "DiagramHelper.hxx"
 #include "chartview/ExplicitValueProvider.hxx"
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 6da7736eea60..fcbfc3073f06 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -48,7 +48,7 @@
 #include "UndoGuard.hxx"
 #include "ObjectNameProvider.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ReferenceSizeProvider.hxx"
 #include "RegressionCurveHelper.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 3fb555bace30..ab8189642b36 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -28,7 +28,7 @@
 #include "macros.hxx"
 #include "ControllerLockGuard.hxx"
 #include "AccessibleTextHelper.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "chartview/DrawModelWrapper.hxx"
 
 #include <svx/svdotext.hxx>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 240ab15f6952..38772a491eea 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -27,7 +27,7 @@
 #include "ControllerLockGuard.hxx"
 #include "macros.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ObjectIdentifier.hxx"
 #include "ReferenceSizeProvider.hxx"
 #include "chartview/ExplicitValueProvider.hxx"
@@ -62,6 +62,7 @@
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
@@ -724,20 +725,20 @@ bool ChartController::executeDispatch_Delete()
                     ObjectIdentifier::getObjectPropertySet( aCID, getModel() ));
                 if( xErrorBarProp.is())
                 {
-                    sal_Int16 nId;
+                    const char* pId;
 
                     if ( aObjectType == OBJECTTYPE_DATA_ERRORS_X )
-                        nId = STR_OBJECT_ERROR_BARS_X;
+                        pId = STR_OBJECT_ERROR_BARS_X;
                     else if ( aObjectType == OBJECTTYPE_DATA_ERRORS_Y )
-                        nId = STR_OBJECT_ERROR_BARS_Y;
+                        pId = STR_OBJECT_ERROR_BARS_Y;
                     else
-                        nId = STR_OBJECT_ERROR_BARS_Z;
+                        pId = STR_OBJECT_ERROR_BARS_Z;
 
                     uno::Reference< frame::XModel > xModel( getModel() );
                     UndoGuard aUndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::ActionType::Delete, SchResId( nId )),
-                        m_xUndoManager );
+                            ActionDescriptionProvider::ActionType::Delete, SchResId(pId)),
+                        m_xUndoManager);
                     {
                         ControllerLockGuardUNO aCtlLockGuard( xModel );
                         xErrorBarProp->setPropertyValue(
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 83e0bb7d76a8..e33db229fc59 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -29,7 +29,7 @@
 #include "UndoGuard.hxx"
 #include "ControllerLockGuard.hxx"
 #include "ObjectNameProvider.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "macros.hxx"
 #include "DragMethod_PieSegment.hxx"
 #include "DragMethod_RotateDiagram.hxx"
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index d333197f695a..dc65a7d5862e 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -19,7 +19,7 @@
 
 #include "DragMethod_Base.hxx"
 
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
 #include "ObjectNameProvider.hxx"
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 331a506a1840..8271118a2e6f 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -19,7 +19,7 @@
 
 #include "DragMethod_PieSegment.hxx"
 
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ResId.hxx"
 #include "macros.hxx"
 #include "ObjectIdentifier.hxx"
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index d990e351bbd1..b68d2b7c0737 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -29,6 +29,7 @@
 #include <svl/itempool.hxx>
 #include <editeng/adjustitem.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/gallery.hxx>
@@ -74,13 +75,13 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
     return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType );
 }
 
-::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel& rModel )
+::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel& rModel)
 {
     ::basegfx::B2DPolyPolygon aReturn;
     XLineEndListRef pLineEndList = rModel.GetLineEndList();
     if ( pLineEndList.is() )
     {
-        OUString aName( SvxResId( nResId ) );
+        OUString aName(SvxResId(pResId));
         long nCount = pLineEndList->Count();
         for ( long nIndex = 0; nIndex < nCount; ++nIndex )
         {
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 9a4436197a97..c4d1ef375c2b 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -25,7 +25,7 @@
 #include <chartview/ExplicitValueProvider.hxx>
 #include "DrawViewWrapper.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "ObjectIdentifier.hxx"
 
 #include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 459ac3eb79b8..96fd0de5e90d 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -28,7 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index 0eefc83d5362..31d96d155b91 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -25,7 +25,7 @@
 namespace chart
 {
 
-OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(sal_uInt16 nId);
+OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(const char *pId);
 
 } //  namespace chart
 
diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx
index d5c3272db684..afb1e76f9165 100644
--- a/chart2/source/inc/ResourceManager.hxx
+++ b/chart2/source/inc/ResourceManager.hxx
@@ -20,16 +20,14 @@
 #define INCLUDED_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX
 
 #include "charttoolsdllapi.hxx"
-
-// defined in <tools/resmgr.hxx>
-class ResMgr;
+#include <locale>
 
 namespace chart
 {
 
 namespace ResourceManager
 {
-    ::ResMgr &  getResourceManager();
+    const std::locale&  getResourceLocale();
 }
 
 } //  namespace chart
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
deleted file mode 100644
index d3b45f0e4907..000000000000
--- a/chart2/source/inc/Strings.hrc
+++ /dev/null
@@ -1,265 +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 CHART_STRINGS_HRC
-#define CHART_STRINGS_HRC
-
-// this includes no link dependency
-#include <svl/solar.hrc>
-
-//next free is 305
-
-//chart types
-//see Strings_ChartTypes.src
-
-#define STR_NORMAL                          (RID_APP_START + 10)
-#define STR_STACKED                         (RID_APP_START + 11)
-#define STR_PERCENT                         (RID_APP_START + 12)
-#define STR_DEEP                            (RID_APP_START + 13)
-#define STR_FILLED                          (RID_APP_START + 285)
-
-#define STR_DONUT                           (RID_APP_START + 8)
-#define STR_TYPE_PIE                        (RID_APP_START + 187)
-#define STR_PIE_EXPLODED                    (RID_APP_START + 188)
-#define STR_DONUT_EXPLODED                  (RID_APP_START + 189)
-
-#define STR_TYPE_COLUMN                     (RID_APP_START + 190)
-#define STR_TYPE_BAR                        (RID_APP_START + 191)
-#define STR_TYPE_AREA                       (RID_APP_START + 192)
-
-#define STR_LINES_3D                        (RID_APP_START + 193)
-#define STR_POINTS_ONLY                     (RID_APP_START + 194)
-#define STR_LINES_ONLY                      (RID_APP_START + 116)
-#define STR_POINTS_AND_LINES                (RID_APP_START + 124)
-#define STR_TYPE_LINE                       (RID_APP_START + 125)
-#define STR_TYPE_XY                         (RID_APP_START + 240)
-
-#define STR_LINE_COLUMN                     (RID_APP_START + 22)
-#define STR_LINE_STACKEDCOLUMN              (RID_APP_START + 23)
-#define STR_TYPE_COMBI_COLUMN_LINE          (RID_APP_START + 24)
-
-#define STR_TYPE_NET                        (RID_APP_START + 52)
-
-#define STR_TYPE_STOCK                      (RID_APP_START + 126)
-#define STR_STOCK_1                         (RID_APP_START + 143)
-#define STR_STOCK_2                         (RID_APP_START + 144)
-#define STR_STOCK_3                         (RID_APP_START + 145)
-#define STR_STOCK_4                         (RID_APP_START + 146)
-
-#define STR_TYPE_BUBBLE                     (RID_APP_START + 282)
-#define STR_BUBBLE_1                        (RID_APP_START + 283)
-
-#define STR_TYPE_GL3D_BAR                   (RID_APP_START + 127)
-#define STR_GL3D_BAR                        (RID_APP_START + 128)
-
-//SchStatisticTabPage and SchDataStatisticsDlg
-//see Strings_Statistic.src
-
-#define STR_REGRESSION_LINEAR               (RID_APP_START + 135)
-#define STR_REGRESSION_LOG                  (RID_APP_START + 136)
-#define STR_REGRESSION_EXP                  (RID_APP_START + 137)
-#define STR_REGRESSION_POWER                (RID_APP_START + 138)
-#define STR_REGRESSION_MEAN                 (RID_APP_START + 180)
-#define STR_REGRESSION_POLYNOMIAL           (RID_APP_START + 300)
-#define STR_REGRESSION_MOVING_AVERAGE       (RID_APP_START + 301)
-
-//for scale tab page
-//see Strings_Scale.src
-
-#define STR_INVALID_NUMBER                  (RID_APP_START + 100)
-#define STR_STEP_GT_ZERO                    (RID_APP_START + 102)
-#define STR_BAD_LOGARITHM                   (RID_APP_START + 111)
-#define STR_MIN_GREATER_MAX                 (RID_APP_START + 101)
-#define STR_INVALID_INTERVALS               (RID_APP_START + 291)
-#define STR_INVALID_TIME_UNIT               (RID_APP_START + 292)
-
-//for range dialog
-#define STR_DATA_ROLE_LABEL                 (RID_APP_START + 241)
-#define STR_DATA_ROLE_X                     (RID_APP_START + 242)
-#define STR_DATA_ROLE_Y                     (RID_APP_START + 243)
-#define STR_DATA_ROLE_X_ERROR               (RID_APP_START + 244)
-#define STR_DATA_ROLE_X_ERROR_POSITIVE      (RID_APP_START + 272)
-#define STR_DATA_ROLE_X_ERROR_NEGATIVE      (RID_APP_START + 273)
-#define STR_DATA_ROLE_Y_ERROR               (RID_APP_START + 245)
-#define STR_DATA_ROLE_Y_ERROR_POSITIVE      (RID_APP_START + 274)
-#define STR_DATA_ROLE_Y_ERROR_NEGATIVE      (RID_APP_START + 275)
-#define STR_DATA_ROLE_FIRST                 (RID_APP_START + 246)
-#define STR_DATA_ROLE_LAST                  (RID_APP_START + 247)
-#define STR_DATA_ROLE_MIN                   (RID_APP_START + 248)
-#define STR_DATA_ROLE_MAX                   (RID_APP_START + 249)
-#define STR_DATA_ROLE_CATEGORIES            (RID_APP_START + 260)
-#define STR_DATA_ROLE_SIZE                  (RID_APP_START + 284)
-#define STR_PROPERTY_ROLE_FILLCOLOR         (RID_APP_START + 303)
-#define STR_PROPERTY_ROLE_BORDERCOLOR       (RID_APP_START + 304)
-
-#define STR_DATA_UNNAMED_SERIES             (RID_APP_START + 250)
-#define STR_DATA_UNNAMED_SERIES_WITH_INDEX  (RID_APP_START + 251)
-
-#define STR_DATA_SELECT_RANGE_FOR_SERIES    (RID_APP_START + 252)
-#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253)
-#define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195)
-
-//chart objects
-//e.g. used as titles for insert dialogs and object properties dialog
-//also used in tip help, in status descriptions e.g. '%object% marked' or in undo action e.g. 'moved %object%'
-
-#define STR_PAGE_CHARTTYPE                  (RID_APP_START + 197)
-#define STR_PAGE_DATA_RANGE                 (RID_APP_START + 238)
-#define STR_ACTION_EDIT_CHART_DATA          (RID_APP_START + 198)
-
-#define STR_OBJECT_PAGE                     (RID_APP_START + 30)
-#define STR_OBJECT_DIAGRAM                  (RID_APP_START + 31)
-#define STR_OBJECT_DIAGRAM_WALL             (RID_APP_START + 32)
-#define STR_OBJECT_DIAGRAM_FLOOR            (RID_APP_START + 33)
-#define STR_OBJECT_LEGEND                   (RID_APP_START + 48)
-#define STR_OBJECT_LEGEND_SYMBOL            (RID_APP_START + 49)
-
-#define STR_OBJECT_DATALABELS               (RID_APP_START + 45)
-#define STR_OBJECT_LABEL                    (RID_APP_START + 199)
-
-#define STR_OBJECT_TITLE                    (RID_APP_START + 200)
-#define STR_OBJECT_TITLES                   (RID_APP_START + 201)
-
-#define STR_OBJECT_TITLE_MAIN               (RID_APP_START + 254)
-#define STR_OBJECT_TITLE_SUB                (RID_APP_START + 255)
-#define STR_OBJECT_TITLE_X_AXIS             (RID_APP_START + 256)
-#define STR_OBJECT_TITLE_Y_AXIS             (RID_APP_START + 257)
-#define STR_OBJECT_TITLE_Z_AXIS             (RID_APP_START + 258)
-#define STR_OBJECT_TITLE_SECONDARY_X_AXIS   (RID_APP_START + 87)
-#define STR_OBJECT_TITLE_SECONDARY_Y_AXIS   (RID_APP_START + 88)
-
-#define STR_OBJECT_DATAPOINT                (RID_APP_START + 202)
-#define STR_OBJECT_DATAPOINTS               (RID_APP_START + 203)
-#define STR_OBJECT_DATASERIES               (RID_APP_START + 204)
-#define STR_OBJECT_DATASERIES_PLURAL        (RID_APP_START + 205)
-
-#define STR_OBJECT_FOR_SERIES               (RID_APP_START + 288)
-#define STR_OBJECT_FOR_ALL_SERIES           (RID_APP_START + 289)
-
-#define STR_OBJECT_AVERAGE_LINE             (RID_APP_START + 174)
-#define STR_OBJECT_ERROR_BARS_X             (RID_APP_START + 175)
-#define STR_OBJECT_ERROR_BARS_Y             (RID_APP_START + 295)
-#define STR_OBJECT_ERROR_BARS_Z             (RID_APP_START + 296)
-#define STR_OBJECT_CURVE                    (RID_APP_START + 176)
-#define STR_OBJECT_CURVES                   (RID_APP_START + 130)
-
-#define STR_OBJECT_STOCK_LOSS               (RID_APP_START + 207)
-#define STR_OBJECT_STOCK_GAIN               (RID_APP_START + 208)
-
-#define STR_OBJECT_AXES                     (RID_APP_START + 209)
-#define STR_OBJECT_AXIS                     (RID_APP_START + 210)
-#define STR_OBJECT_AXIS_X                   (RID_APP_START + 211)
-#define STR_OBJECT_AXIS_Y                   (RID_APP_START + 212)
-#define STR_OBJECT_AXIS_Z                   (RID_APP_START + 213)
-
-#define STR_OBJECT_SECONDARY_X_AXIS         (RID_APP_START + 286)
-#define STR_OBJECT_SECONDARY_Y_AXIS         (RID_APP_START + 287)
-
-#define STR_OBJECT_GRID                     (RID_APP_START + 214)
-#define STR_OBJECT_GRIDS                    (RID_APP_START + 215)
-
-#define STR_OBJECT_GRID_MAJOR_X             (RID_APP_START + 37)
-#define STR_OBJECT_GRID_MAJOR_Y             (RID_APP_START + 38)
-#define STR_OBJECT_GRID_MAJOR_Z             (RID_APP_START + 39)
-#define STR_OBJECT_GRID_MINOR_X             (RID_APP_START + 40)
-#define STR_OBJECT_GRID_MINOR_Y             (RID_APP_START + 41)
-#define STR_OBJECT_GRID_MINOR_Z             (RID_APP_START + 42)
-
-#define STR_OBJECT_CURVE_WITH_PARAMETERS    (RID_APP_START + 264)
-#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265)
-#define STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS (RID_APP_START + 302)
-
-#define STR_OBJECT_CURVE_EQUATION           (RID_APP_START + 268)
-#define STR_OBJECT_SHAPE                    (RID_APP_START + 290)
-
-//Titles for tabpages and dialogs
-
-#define STR_PAGE_LINE                        (RID_APP_START + 216)
-#define STR_PAGE_BORDER                      (RID_APP_START + 217)
-#define STR_PAGE_AREA                        (RID_APP_START + 218)
-#define STR_PAGE_TRANSPARENCY                (RID_APP_START + 219)
-#define STR_PAGE_FONT                        (RID_APP_START + 220)
-#define STR_PAGE_FONT_EFFECTS                (RID_APP_START + 221)
-#define STR_PAGE_LAYOUT                      (RID_APP_START + 222)
-#define STR_PAGE_OPTIONS                     (RID_APP_START + 223)
-#define STR_PAGE_SCALE                       (RID_APP_START + 224)
-#define STR_PAGE_NUMBERS                     (RID_APP_START + 225)
-#define STR_PAGE_ALIGNMENT                   (RID_APP_START + 226)
-#define STR_PAGE_POSITION                    (RID_APP_START + 227)
-
-#define STR_PAGE_PERSPECTIVE                 (RID_APP_START + 235)
-#define STR_PAGE_APPEARANCE                  (RID_APP_START + 236)
-#define STR_PAGE_ILLUMINATION                (RID_APP_START + 237)
-
-#define STR_PAGE_TRENDLINE_TYPE              (RID_APP_START + 89)
-#define STR_PAGE_XERROR_BARS                 (RID_APP_START + 293)
-#define STR_PAGE_YERROR_BARS                 (RID_APP_START + 206)
-#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA (RID_APP_START + 276)
-
-#define STR_DLG_CHART_WIZARD                 (RID_APP_START + 228)
-#define STR_PAGE_CHART_ELEMENTS              (RID_APP_START + 229)
-
-#define STR_DLG_SMOOTH_LINE_PROPERTIES              (RID_APP_START + 239)
-#define STR_DLG_STEPPED_LINE_PROPERTIES             (RID_APP_START + 270)
-
-#define STR_PAGE_POSITIONING  (RID_APP_START + 277)
-#define STR_PAGE_ASIAN                       (RID_APP_START + 281)
-
-//strings used as description for actions on toolbar icons, as tip help or for undo
-
-#define STR_ACTION_EDIT_CHARTTYPE           (RID_APP_START + 78)
-#define STR_ACTION_EDIT_DATA_RANGES         (RID_APP_START + 64)
-#define STR_ACTION_EDIT_3D_VIEW             (RID_APP_START + 80)
-#define STR_ACTION_TOGGLE_LEGEND            (RID_APP_START + 83)
-#define STR_ACTION_TOGGLE_GRID_HORZ         (RID_APP_START + 86)
-#define STR_ACTION_TOGGLE_GRID_VERTICAL     (RID_APP_START + 139)
-#define STR_ACTION_SCALE_TEXT               (RID_APP_START + 93)
-#define STR_ACTION_REARRANGE_CHART          (RID_APP_START + 94)
-#define STR_ACTION_EDIT_TEXT                (RID_APP_START + 95)
-
-//statusbar strings and balloon help
-
-#define STR_STATUS_PIE_SEGMENT_EXPLODED     (RID_APP_START + 179)
-#define STR_STATUS_OBJECT_MARKED            (RID_APP_START + 51)
-#define STR_STATUS_DATAPOINT_MARKED         (RID_APP_START + 44)
-#define STR_TIP_DATASERIES                  (RID_APP_START + 43)
-#define STR_TIP_DATAPOINT                   (RID_APP_START + 140)
-#define STR_TIP_DATAPOINT_INDEX             (RID_APP_START + 141)
-#define STR_TIP_DATAPOINT_VALUES            (RID_APP_START + 142)
-
-//warning and info boxes
-#define STR_ACTION_NOTPOSSIBLE              (RID_APP_START + 107)
-
-#define STR_COLUMN_LABEL                    (RID_APP_START + 262)
-#define STR_ROW_LABEL                       (RID_APP_START + 263)
-
-#define STR_DATA_EDITOR_INCORRECT_INPUT     (RID_APP_START + 269)
-
-// frame direction ------------------------------------------------------------
-
-#define STR_TEXT_DIRECTION_LTR              (RID_APP_START + 278)
-#define STR_TEXT_DIRECTION_RTL              (RID_APP_START + 279)
-#define STR_TEXT_DIRECTION_SUPER            (RID_APP_START + 280)
-
-// There is a gap here due to removed strings
-// RID_APP_START + 500 and RID_APP_START + 501 are removed
-
-// CHART_STRINGS_HRC
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 59d5cb1b6dee..54d4f5c61567 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -19,7 +19,7 @@
 
 #include "InternalData.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 
 #include <osl/diagnose.h>
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 60ee6b10c0fa..3624e9d1a749 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -20,7 +20,7 @@
 #include "MovingAverageRegressionCurveCalculator.hxx"
 #include "RegressionCalculationHelper.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "macros.hxx"
 
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index da43fee9b0c6..4a3558d6a38e 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -32,7 +32,7 @@
 #include "macros.hxx"
 #include "PropertyHelper.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "DiagramHelper.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 6bff5b7efc0e..68ea0df902f7 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,13 +19,13 @@
 
 #include "ResId.hxx"
 #include "ResourceManager.hxx"
-#include <tools/resid.hxx>
+#include <tools/resmgr.hxx>
 
 namespace chart
 {
-    OUString SchResId(sal_uInt16 nId)
+    OUString SchResId(const char *pId)
     {
-        return ResId(nId, ResourceManager::getResourceManager());
+        return Translate::get(pId, ResourceManager::getResourceLocale());
     }
 } //  namespace chart
 
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
index 3f3fb615697a..3cd51d70c7a7 100644
--- a/chart2/source/tools/ResourceManager.cxx
+++ b/chart2/source/tools/ResourceManager.cxx
@@ -18,20 +18,17 @@
  */
 
 #include "ResourceManager.hxx"
-
 #include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 namespace chart
 {
 
-ResMgr & ResourceManager::getResourceManager()
+const std::locale& ResourceManager::getResourceLocale()
 {
-    // not threadsafe
-    static ResMgr * pResourceManager = nullptr;
-    if( ! pResourceManager )
-        pResourceManager = ResMgr::CreateResMgr("chartcontroller");
-    OSL_ASSERT( pResourceManager );
-    return *pResourceManager;
+    static std::locale loc = Translate::Create("chart", Application::GetSettings().GetUILanguageTag());
+    return loc;
 }
 
 } //  namespace chart
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 0cd1aa8d8896..3697f9456601 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -39,7 +39,7 @@
 #include "VLegendSymbolFactory.hxx"
 #include "FormattedStringHelper.hxx"
 #include "ResId.hxx"
-#include "Strings.hrc"
+#include "strings.hrc"
 #include "RelativePositionHelper.hxx"
 #include "DateHelper.hxx"
 #include "DiagramHelper.hxx"
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx
index be0ceb56dbc3..ca735afaec73 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -34,7 +34,7 @@ class OpenGLWindow;
 namespace chart {
 
 // Be careful here not to clash with the SYMBOL_FOO #defines in
-// <rsc/rsc-vcl-shared-types.hxx>
+// <vcl/vclenum.hxx>
 enum SymbolEnum { Symbol_Square=0
                  , Symbol_Diamond
                  , Symbol_DownArrow
diff --git a/chart2/uiconfig/ui/3dviewdialog.ui b/chart2/uiconfig/ui/3dviewdialog.ui
index a448519819e0..0410f04661e7 100644
--- a/chart2/uiconfig/ui/3dviewdialog.ui
+++ b/chart2/uiconfig/ui/3dviewdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="3DViewDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">3D View</property>
+    <property name="title" translatable="yes" context="3dviewdialog|3DViewDialog">3D View</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/chart2/uiconfig/ui/attributedialog.ui b/chart2/uiconfig/ui/attributedialog.ui
index cac251fdf5b2..c45fe71965d3 100644
--- a/chart2/uiconfig/ui/attributedialog.ui
+++ b/chart2/uiconfig/ui/attributedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AttributeDialog">
     <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/chardialog.ui b/chart2/uiconfig/ui/chardialog.ui
index 0f6b1382fda7..7461a6e8d808 100644
--- a/chart2/uiconfig/ui/chardialog.ui
+++ b/chart2/uiconfig/ui/chardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CharDialog">
     <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="chardialog|CharDialog">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="chardialog|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="chardialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="chardialog|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/chart2/uiconfig/ui/chartdatadialog.ui b/chart2/uiconfig/ui/chartdatadialog.ui
index f5c3f2b15897..c275737119fb 100644
--- a/chart2/uiconfig/ui/chartdatadialog.ui
+++ b/chart2/uiconfig/ui/chartdatadialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkDialog" id="ChartDataDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Table</property>
+    <property name="title" translatable="yes" context="chartdatadialog|ChartDataDialog">Data Table</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="action_name">InsertRow</property>
-                    <property name="label" translatable="yes">Insert Row</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|InsertRow">Insert Row</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon01.png</property>
                   </object>
@@ -99,7 +99,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">InsertColumn</property>
-                    <property name="label" translatable="yes">Insert Series</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|InsertColumn">Insert Series</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon02.png</property>
                   </object>
@@ -113,7 +113,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">InsertTextColumn</property>
-                    <property name="label" translatable="yes">Insert Text Column</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|InsertTextColumn">Insert Text Column</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon07.png</property>
                   </object>
@@ -127,7 +127,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">RemoveRow</property>
-                    <property name="label" translatable="yes">Delete Row</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|RemoveRow">Delete Row</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon03.png</property>
                   </object>
@@ -141,7 +141,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">RemoveColumn</property>
-                    <property name="label" translatable="yes">Delete Series</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|RemoveColumn">Delete Series</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon04.png</property>
                   </object>
@@ -165,7 +165,7 @@
                       <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">MoveLeftColumn</property>
-                    <property name="label" translatable="yes">Move Series Left</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|MoveLeftColumn">Move Series Left</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon08.png</property>
                   </object>
@@ -179,7 +179,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">MoveRightColumn</property>
-                    <property name="label" translatable="yes">Move Series Right</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|MoveRightColumn">Move Series Right</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon05.png</property>
                   </object>
@@ -193,7 +193,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">MoveUpRow</property>
-                    <property name="label" translatable="yes">Move Row Up</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|MoveUpRow">Move Row Up</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon09.png</property>
                   </object>
@@ -207,7 +207,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">MoveDownRow</property>
-                    <property name="label" translatable="yes">Move Row Down</property>
+                    <property name="label" translatable="yes" context="chartdatadialog|MoveDownRow">Move Row Down</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">chart2/res/dataeditor_icon06.png</property>
                   </object>
diff --git a/chart2/uiconfig/ui/charttypedialog.ui b/chart2/uiconfig/ui/charttypedialog.ui
index 6cc181c91ecd..4a5e085b9b00 100644
--- a/chart2/uiconfig/ui/charttypedialog.ui
+++ b/chart2/uiconfig/ui/charttypedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ChartTypeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Chart Type</property>
+    <property name="title" translatable="yes" context="charttypedialog|ChartTypeDialog">Chart Type</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/chart2/uiconfig/ui/datarangedialog.ui b/chart2/uiconfig/ui/datarangedialog.ui
index 184546b5737f..a977a9df6aa2 100644
--- a/chart2/uiconfig/ui/datarangedialog.ui
+++ b/chart2/uiconfig/ui/datarangedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DataRangeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Ranges</property>
+    <property name="title" translatable="yes" context="datarangedialog|DataRangeDialog">Data Ranges</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 51f38590950c..093bec57d65b 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentDEGREE">
@@ -17,55 +17,55 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Best fit</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Center</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Above</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top left</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom left</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Below</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom right</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</col>
         <col id="1">7</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</col>
         <col id="1">8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top right</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</col>
         <col id="1">9</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Inside</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</col>
         <col id="1">10</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Outside</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</col>
         <col id="1">11</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Near origin</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</col>
         <col id="1">12</col>
       </row>
     </data>
@@ -79,19 +79,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Space</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Comma</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Semicolon</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">New line</col>
+        <col id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -99,7 +99,7 @@
   <object class="GtkDialog" id="dlg_DataLabels">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Labels for all Data Series</property>
+    <property name="title" translatable="yes" context="dlg_DataLabel|dlg_DataLabels">Data Labels for all Data Series</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -191,7 +191,7 @@
                         <property name="row_homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
-                            <property name="label" translatable="yes">Show value as _number</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -206,7 +206,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
-                            <property name="label" translatable="yes">Show value as _percentage</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_CATEGORY">
-                            <property name="label" translatable="yes">Show _category</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -236,7 +236,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_SYMBOL">
-                            <property name="label" translatable="yes">Show _legend key</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -251,7 +251,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_WRAP_TEXT">
-                            <property name="label" translatable="yes">Auto text _wrap</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -266,7 +266,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="PB_NUMBERFORMAT">
-                            <property name="label" translatable="yes">Number _format...</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
@@ -280,7 +280,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
-                            <property name="label" translatable="yes">Percentage f_ormat...</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
@@ -296,7 +296,7 @@
                           <object class="GtkLabel" id="CT_LABEL_DIAL">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes">ABCD</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|CT_LABEL_DIAL">ABCD</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -316,7 +316,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Separator</property>
+                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
                               </object>
@@ -356,7 +356,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Place_ment</property>
+                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
                               </object>
@@ -389,7 +389,7 @@
                         <child>
                           <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Number Format for Percentage Value</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -405,7 +405,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Text Attributes</property>
+                    <property name="label" translatable="yes" context="dlg_DataLabel|label1">Text Attributes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -471,7 +471,7 @@
                               <object class="GtkLabel" id="FT_LABEL_DEGREES">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Degrees</property>
+                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -496,7 +496,7 @@
                               <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Te_xt direction</property>
+                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_LABEL_TEXTDIR</property>
                               </object>
@@ -533,7 +533,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Rotate Text</property>
+                    <property name="label" translatable="yes" context="dlg_DataLabel|label2">Rotate Text</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
index b39ea0cbcc0f..80115208e25f 100644
--- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
+++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentPOS_NEG">
     <property name="upper">100</property>
@@ -26,19 +26,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Standard Error</col>
+        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Standard Deviation</col>
+        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Variance</col>
+        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Error Margin</col>
+        <col id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -46,7 +46,7 @@
   <object class="GtkDialog" id="dlg_InsertErrorBars">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Legend</property>
+    <property name="title" translatable="yes" context="dlg_InsertErrorBars|dlg_InsertErrorBars">Legend</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -143,7 +143,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="RB_NONE">
-                                <property name="label" translatable="yes">_None</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="RB_CONST">
-                                <property name="label" translatable="yes">_Constant Value</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -177,7 +177,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="RB_PERCENT">
-                                <property name="label" translatable="yes">_Percentage</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -233,7 +233,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="RB_RANGE">
-                                <property name="label" translatable="yes">Cell _Range</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -256,7 +256,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Error Category</property>
+                        <property name="label" translatable="yes" context="dlg_InsertErrorBars|label1">Error Category</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -289,7 +289,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="RB_BOTH">
-                                <property name="label" translatable="yes">Positive _and Negative</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="RB_POSITIVE">
-                                <property name="label" translatable="yes">Pos_itive</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="RB_NEGATIVE">
-                                <property name="label" translatable="yes">Ne_gative</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -377,7 +377,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Error Indicator</property>
+                        <property name="label" translatable="yes" context="dlg_InsertErrorBars|label2">Error Indicator</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -424,7 +424,7 @@
                               <object class="GtkLabel" id="FT_POSITIVE">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">P_ositive (+)</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">MF_POSITIVE:0</property>
                               </object>
@@ -465,7 +465,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Select data range</property>
+                                <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
                                 <property name="image">imageRANGE_SELECT_POSITIVE</property>
                               </object>
                               <packing>
@@ -490,7 +490,7 @@
                               <object class="GtkLabel" id="FT_NEGATIVE">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Negative (-)</property>
+                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_NEGATIVE">_Negative (-)</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">MF_NEGATIVE:0</property>
                               </object>
@@ -532,7 +532,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">True</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Select data range</property>
+                                <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
                                 <property name="image">imageRANGE_SELECT_NEG</property>
                               </object>
                               <packing>
@@ -550,7 +550,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
-                            <property name="label" translatable="yes">Same value for both</property>
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|CB_SYN_POS_NEG">Same value for both</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -572,7 +572,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Parameters</property>
+                    <property name="label" translatable="yes" context="dlg_InsertErrorBars|label3">Parameters</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -588,7 +588,7 @@
             <child>
               <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select Range for Positive Error Bars</property>
+                <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS">Select Range for Positive Error Bars</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -599,7 +599,7 @@
             <child>
               <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select Range for Negative Error Bars</property>
+                <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS">Select Range for Negative Error Bars</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -610,7 +610,7 @@
             <child>
               <object class="GtkLabel" id="STR_CONTROLTEXT_ERROR_BARS_FROM_DATA">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">From Data Table</property>
+                <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA">From Data Table</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index 34364f4063bd..45463bcd8782 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="dlg_InsertLegend">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Legend</property>
+    <property name="title" translatable="yes" context="dlg_InsertLegend|dlg_InsertLegend">Legend</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="show">
-                            <property name="label" translatable="yes">_Display legend</property>
+                            <property name="label" translatable="yes" context="dlg_InsertLegend|show">_Display legend</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -119,7 +119,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="left">
-                                <property name="label" translatable="yes">_Left</property>
+                                <property name="label" translatable="yes" context="dlg_InsertLegend|left">_Left</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -135,7 +135,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="right">
-                                <property name="label" translatable="yes">_Right</property>
+                                <property name="label" translatable="yes" context="dlg_InsertLegend|right">_Right</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -151,7 +151,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="top">
-                                <property name="label" translatable="yes">_Top</property>
+                                <property name="label" translatable="yes" context="dlg_InsertLegend|top">_Top</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -167,7 +167,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="bottom">
-                                <property name="label" translatable="yes">_Bottom</property>
+                                <property name="label" translatable="yes" context="dlg_InsertLegend|bottom">_Bottom</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -197,7 +197,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="dlg_InsertLegend|TXT_POSITION">Position</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui b/chart2/uiconfig/ui/insertaxisdlg.ui
index fdbd609bbf33..563532abf41e 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertAxisDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Axes</property>
+    <property name="title" translatable="yes" context="insertaxisdlg|InsertAxisDialog">Axes</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -101,7 +101,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="primaryX">
-                            <property name="label" translatable="yes">_X axis</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|primaryX">_X axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="primaryY">
-                            <property name="label" translatable="yes">_Y axis</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|primaryY">_Y axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="primaryZ">
-                            <property name="label" translatable="yes">_Z axis</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|primaryZ">_Z axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Axes</property>
+                    <property name="label" translatable="yes" context="insertaxisdlg|label1">Axes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -191,7 +191,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="secondaryX">
-                            <property name="label" translatable="yes">X _axis</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|secondaryX">X _axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="secondaryY">
-                            <property name="label" translatable="yes">Y ax_is</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|secondaryY">Y ax_is</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="secondaryZ">
-                            <property name="label" translatable="yes">Z axi_s</property>
+                            <property name="label" translatable="yes" context="insertaxisdlg|secondaryZ">Z axi_s</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -246,7 +246,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Secondary Axes</property>
+                    <property name="label" translatable="yes" context="insertaxisdlg|label2">Secondary Axes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/insertgriddlg.ui b/chart2/uiconfig/ui/insertgriddlg.ui
index 0472f480f576..5d2a32d17c87 100644
--- a/chart2/uiconfig/ui/insertgriddlg.ui
+++ b/chart2/uiconfig/ui/insertgriddlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertGridDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Grids</property>
+    <property name="title" translatable="yes" context="insertgriddlg|InsertGridDialog">Grids</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -101,7 +101,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="primaryX">
-                            <property name="label" translatable="yes">_X axis</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|primaryX">_X axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="primaryY">
-                            <property name="label" translatable="yes">_Y axis</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|primaryY">_Y axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="primaryZ">
-                            <property name="label" translatable="yes">_Z axis</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|primaryZ">_Z axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Major Grids</property>
+                    <property name="label" translatable="yes" context="insertgriddlg|label1">Major Grids</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -191,7 +191,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="secondaryX">
-                            <property name="label" translatable="yes">X _axis</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|secondaryX">X _axis</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="secondaryY">
-                            <property name="label" translatable="yes">Y ax_is</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|secondaryY">Y ax_is</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="secondaryZ">
-                            <property name="label" translatable="yes">Z axi_s</property>
+                            <property name="label" translatable="yes" context="insertgriddlg|secondaryZ">Z axi_s</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -246,7 +246,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Minor Grids</property>
+                    <property name="label" translatable="yes" context="insertgriddlg|label2">Minor Grids</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui
index ce93162c27a5..fb94ec727a4c 100644
--- a/chart2/uiconfig/ui/inserttitledlg.ui
+++ b/chart2/uiconfig/ui/inserttitledlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertTitleDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Titles</property>
+    <property name="title" translatable="yes" context="inserttitledlg|InsertTitleDialog">Titles</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Title</property>
+                    <property name="label" translatable="yes" context="inserttitledlg|labelMainTitle">_Title</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">maintitle</property>
                   </object>
@@ -100,7 +100,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Subtitle</property>
+                    <property name="label" translatable="yes" context="inserttitledlg|labelSubTitle">_Subtitle</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">subtitle</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">_X axis</property>
+                            <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryXaxis">_X axis</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">primaryXaxis</property>
                           </object>
@@ -177,7 +177,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Y axis</property>
+                            <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryYaxis">_Y axis</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">primaryYaxis</property>
                           </object>
@@ -191,7 +191,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Z axis</property>
+                            <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryZaxis">_Z axis</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">primaryZaxis</property>
                           </object>
@@ -244,7 +244,7 @@
                   <object class="GtkLabel" id="Axe">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Axes</property>
+                    <property name="label" translatable="yes" context="inserttitledlg|Axe">Axes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -280,7 +280,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">X _axis</property>
+                            <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryXAxis">X _axis</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">secondaryXaxis</property>
                           </object>
@@ -294,7 +294,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Y ax_is</property>
+                            <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryYAxis">Y ax_is</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">secondaryYaxis</property>
                           </object>
@@ -335,7 +335,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Secondary Axes</property>
+                    <property name="label" translatable="yes" context="inserttitledlg|label2">Secondary Axes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui
index 4b1e3ca3ef75..aef016979345 100644
--- a/chart2/uiconfig/ui/paradialog.ui
+++ b/chart2/uiconfig/ui/paradialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ParagraphDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph</property>
+    <property name="title" translatable="yes" context="paradialog|ParagraphDialog">Paragraph</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="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="labelTP_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui b/chart2/uiconfig/ui/sidebaraxis.ui
index b758e317136f..cba9421b4a11 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkGrid" id="ChartAxisPanel">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkCheckButton" id="checkbutton_show_label">
-            <property name="label" translatable="yes">Show labels</property>
+            <property name="label" translatable="yes" context="sidebaraxis|checkbutton_show_label">Show labels</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -29,7 +29,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="checkbutton_reverse">
-            <property name="label" translatable="yes">Reverse direction</property>
+            <property name="label" translatable="yes" context="sidebaraxis|checkbutton_reverse">Reverse direction</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -53,7 +53,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Label position:</property>
+                <property name="label" translatable="yes" context="sidebaraxis|label1">_Label position:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">comboboxtext_label_position</property>
               </object>
@@ -67,10 +67,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <items>
-                  <item translatable="yes">Near Axis</item>
-                  <item translatable="yes">Near Axis (other side)</item>
-                  <item translatable="yes">Outside start</item>
-                  <item translatable="yes">Outside end</item>
+                  <item translatable="yes" context="sidebaraxis|comboboxtext_label_position">Near Axis</item>
+                  <item translatable="yes" context="sidebaraxis|comboboxtext_label_position">Near Axis (other side)</item>
+                  <item translatable="yes" context="sidebaraxis|comboboxtext_label_position">Outside start</item>
+                  <item translatable="yes" context="sidebaraxis|comboboxtext_label_position">Outside end</item>
                 </items>
               </object>
               <packing>
@@ -84,7 +84,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">_Text orientation:</property>
+                <property name="label" translatable="yes" context="sidebaraxis|label2">_Text orientation:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spinbutton1:0degrees</property>
               </object>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui
index 9ee199e26ba4..1c2912b4459a 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="ChartElementsPanel">
     <property name="visible">True</property>
@@ -32,7 +32,7 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_subtitle">
-                        <property name="label" translatable="yes">Subtitle</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_subtitle">Subtitle</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="GtkCheckButton" id="checkbutton_title">
-                        <property name="label" translatable="yes">Title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_title">Title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -66,7 +66,7 @@
               <object class="GtkLabel" id="l">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Titles</property>
+                <property name="label" translatable="yes" context="sidebarelements|l">Titles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -97,7 +97,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_legend">
-                        <property name="tooltip_text" translatable="yes">Show Legend</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">_Placement:</property>
+                            <property name="label" translatable="yes" context="sidebarelements|placement_label">_Placement:</property>
                             <property name="use_underline">True</property>
                             <property name="ellipsize">end</property>
                           </object>
@@ -136,11 +136,11 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Right</item>
-                              <item translatable="yes">Top</item>
-                              <item translatable="yes">Bottom</item>
-                              <item translatable="yes">Left</item>
-                              <item translatable="yes">Manual</item>
+                              <item translatable="yes" context="sidebarelements|comboboxtext_legend">Right</item>
+                              <item translatable="yes" context="sidebarelements|comboboxtext_legend">Top</item>
+                              <item translatable="yes" context="sidebarelements|comboboxtext_legend">Bottom</item>
+                              <item translatable="yes" context="sidebarelements|comboboxtext_legend">Left</item>
+                              <item translatable="yes" context="sidebarelements|comboboxtext_legend">Manual</item>
                             </items>
                           </object>
                           <packing>
@@ -163,7 +163,7 @@
               <object class="GtkLabel" id="label_legen">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Legend</property>
+                <property name="label" translatable="yes" context="sidebarelements|label_legen">Legend</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -196,7 +196,7 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_x_axis">
-                        <property name="label" translatable="yes">X axis</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_x_axis">X axis</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -210,7 +210,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_x_axis_title">
-                        <property name="label" translatable="yes">X axis title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_x_axis_title">X axis title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -224,7 +224,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_y_axis">
-                        <property name="label" translatable="yes">Y axis</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_y_axis">Y axis</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -238,7 +238,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_y_axis_title">
-                        <property name="label" translatable="yes">Y axis title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_y_axis_title">Y axis title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_z_axis">
-                        <property name="label" translatable="yes">Z axis</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_z_axis">Z axis</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -266,7 +266,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_z_axis_title">
-                        <property name="label" translatable="yes">Z axis title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_z_axis_title">Z axis title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -280,7 +280,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
-                        <property name="label" translatable="yes">2nd X axis</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_2nd_x_axis">2nd X axis</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -293,7 +293,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_2nd_x_axis_title">
-                        <property name="label" translatable="yes">2nd X axis title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_2nd_x_axis_title">2nd X axis title</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -306,7 +306,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
-                        <property name="label" translatable="yes">2nd Y axis</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_2nd_y_axis">2nd Y axis</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -319,7 +319,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_2nd_y_axis_title">
-                        <property name="label" translatable="yes">2nd Y axis title</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_2nd_y_axis_title">2nd Y axis title</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -338,7 +338,7 @@
               <object class="GtkLabel" id="label_axes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Axes</property>
+                <property name="label" translatable="yes" context="sidebarelements|label_axes">Axes</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -371,7 +371,7 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_major">
-                        <property name="label" translatable="yes">Horizontal major</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_gridline_horizontal_major">Horizontal major</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -385,7 +385,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_gridline_vertical_major">
-                        <property name="label" translatable="yes">Vertical major</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_gridline_vertical_major">Vertical major</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -399,7 +399,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_minor">
-                        <property name="label" translatable="yes">Horizontal minor</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_gridline_horizontal_minor">Horizontal minor</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -413,7 +413,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_gridline_vertical_minor">
-                        <property name="label" translatable="yes">Vertical minor</property>
+                        <property name="label" translatable="yes" context="sidebarelements|checkbutton_gridline_vertical_minor">Vertical minor</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -433,7 +433,7 @@
               <object class="GtkLabel" id="label_gri">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Gridlines</property>
+                <property name="label" translatable="yes" context="sidebarelements|label_gri">Gridlines</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -452,7 +452,7 @@
             <child>
               <object class="GtkLabel" id="text_title">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Title</property>
+                <property name="label" translatable="yes" context="sidebarelements|text_title">Title</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -462,7 +462,7 @@
             <child>
               <object class="GtkLabel" id="text_subtitle">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Subtitle</property>
+                <property name="label" translatable="yes" context="sidebarelements|text_subtitle">Subtitle</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/chart2/uiconfig/ui/sidebarerrorbar.ui b/chart2/uiconfig/ui/sidebarerrorbar.ui
index 43a7db9a3245..d71c944ec8a3 100644
--- a/chart2/uiconfig/ui/sidebarerrorbar.ui
+++ b/chart2/uiconfig/ui/sidebarerrorbar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -45,7 +45,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Category:</property>
+                    <property name="label" translatable="yes" context="sidebarerrorbar|label2">Category:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboboxtext_type</property>
                   </object>
@@ -61,13 +61,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Constant</item>
-                      <item translatable="yes">Percentage</item>
-                      <item translatable="yes">Cell Range or Data Table</item>
-                      <item translatable="yes">Standard deviation</item>
-                      <item translatable="yes">Standard error</item>
-                      <item translatable="yes">Variance</item>
-                      <item translatable="yes">Error margin</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Constant</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Percentage</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Cell Range or Data Table</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Standard deviation</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Standard error</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Variance</item>
+                      <item translatable="yes" context="sidebarerrorbar|comboboxtext_type">Error margin</item>
                     </items>
                   </object>
                   <packing>
@@ -82,7 +82,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Positive (+):</property>
+                    <property name="label" translatable="yes" context="sidebarerrorbar|label3">Positive (+):</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -96,7 +96,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Negative (-):</property>
+                    <property name="label" translatable="yes" context="sidebarerrorbar|label4">Negative (-):</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -110,7 +110,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
-                    <property name="text" translatable="yes">0.00</property>
+                    <property name="text" translatable="yes" context="sidebarerrorbar|spinbutton_pos">0.00</property>
                     <property name="climb_rate">1</property>
                     <property name="digits">2</property>
                   </object>
@@ -126,7 +126,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
-                    <property name="text" translatable="yes">0.00</property>
+                    <property name="text" translatable="yes" context="sidebarerrorbar|spinbutton_neg">0.00</property>
                     <property name="input_purpose">alpha</property>
                     <property name="climb_rate">1</property>
                     <property name="digits">2</property>
@@ -148,7 +148,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Positive and Negative</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarerrorbar|radiobutton_positive_negative|tooltip_text">Positive and Negative</property>
                         <property name="image">image2</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -164,7 +164,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Positive</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarerrorbar|radiobutton_positive|tooltip_text">Positive</property>
                         <property name="image">image1</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -180,7 +180,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Negative</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarerrorbar|radiobutton_negative|tooltip_text">Negative</property>
                         <property name="image">image3</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -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">Indicator</property>
+                    <property name="label" translatable="yes" context="sidebarerrorbar|label5">Indicator</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/chart2/uiconfig/ui/sidebarseries.ui b/chart2/uiconfig/ui/sidebarseries.ui
index 4dfee96a0649..a10820882e47 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkGrid" id="ChartSeriesPanel">
     <property name="visible">True</property>
@@ -41,7 +41,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="checkbutton_label">
-                            <property name="label" translatable="yes">Show data labels</property>
+                            <property name="label" translatable="yes" context="sidebarseries|checkbutton_label">Show data labels</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
                               <object class="GtkLabel" id="label_box">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">P_lacement:</property>
+                                <property name="label" translatable="yes" context="sidebarseries|label_box">P_lacement:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">comboboxtext_label</property>
                               </object>
@@ -79,12 +79,12 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <items>
-                                  <item translatable="yes">Above</item>
-                                  <item translatable="yes">Below</item>
-                                  <item translatable="yes">Center</item>
-                                  <item translatable="yes">Outside</item>
-                                  <item translatable="yes">Inside</item>
-                                  <item translatable="yes">Near origin</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Above</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Below</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Center</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Outside</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Inside</item>
+                                  <item translatable="yes" context="sidebarseries|comboboxtext_label">Near origin</item>
                                 </items>
                               </object>
                               <packing>
@@ -109,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_trendline">
-                        <property name="label" translatable="yes">Show trendline</property>
+                        <property name="label" translatable="yes" context="sidebarseries|checkbutton_trendline">Show trendline</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_y_error">
-                                    <property name="label" translatable="yes">Y error bars</property>
+                                    <property name="label" translatable="yes" context="sidebarseries|checkbutton_y_error">Y error bars</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton_x_error">
-                                    <property name="label" translatable="yes">X error bars</property>
+                                    <property name="label" translatable="yes" context="sidebarseries|checkbutton_x_error">X error bars</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -180,7 +180,7 @@
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Error Bars</property>
+                            <property name="label" translatable="yes" context="sidebarseries|label1">Error Bars</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -213,7 +213,7 @@
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton_primary_axis">
-                                    <property name="label" translatable="yes">Primary Y axis</property>
+                                    <property name="label" translatable="yes" context="sidebarseries|radiobutton_primary_axis">Primary Y axis</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -229,7 +229,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="radiobutton_secondary_axis">
-                                    <property name="label" translatable="yes">Secondary Y axis</property>
+                                    <property name="label" translatable="yes" context="sidebarseries|radiobutton_secondary_axis">Secondary Y axis</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -251,7 +251,7 @@
                           <object class="GtkLabel" id="axis_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Align Series to Axis</property>
+                            <property name="label" translatable="yes" context="sidebarseries|axis_label">Align Series to Axis</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -267,7 +267,7 @@
                     <child>
                       <object class="GtkLabel" id="label_series_tmpl">
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Data series '%1'</property>
+                        <property name="label" translatable="yes" context="sidebarseries|label_series_tmpl">Data series '%1'</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index a2d65da501ad..472d8be91c8f 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="PolynomialsAdjustment">
     <property name="lower">1</property>
@@ -19,7 +19,7 @@
   <object class="GtkDialog" id="SmoothLinesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Smooth Lines</property>
+    <property name="title" translatable="yes" context="smoothlinesdlg|SmoothLinesDialog">Smooth Lines</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -101,7 +101,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Line _Type:</property>
+                    <property name="label" translatable="yes" context="smoothlinesdlg|TypeLabel">Line _Type:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -116,8 +116,8 @@
                     <property name="can_focus">False</property>
                     <property name="active">0</property>
                     <items>
-                      <item translatable="yes">Cubic spline</item>
-                      <item translatable="yes">B-spline</item>
+                      <item translatable="yes" context="smoothlinesdlg|SplineTypeComboBox">Cubic spline</item>
+                      <item translatable="yes" context="smoothlinesdlg|SplineTypeComboBox">B-spline</item>
                     </items>
                   </object>
                   <packing>
@@ -150,7 +150,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Resolution:</property>
+                        <property name="label" translatable="yes" context="smoothlinesdlg|ResolutionLabel">_Resolution:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">ResolutionSpinbutton</property>
                       </object>
@@ -164,7 +164,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Degree of polynomials:</property>
+                        <property name="label" translatable="yes" context="smoothlinesdlg|PolynomialsLabel">_Degree of polynomials:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">PolynomialsSpinButton</property>
                       </object>
@@ -232,11 +232,11 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Cubic Spline</col>
+        <col id="0" translatable="yes" context="smoothlinesdlg|SplineTypeModel">Cubic Spline</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">B-Spline</col>
+        <col id="0" translatable="yes" context="smoothlinesdlg|SplineTypeModel">B-Spline</col>
         <col id="1">1</col>
       </row>
     </data>
diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui
index cf7ee627df2d..79bcc121ea9b 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-local-resource-path /home/eric/Documents/computers/libreoffice/core/icon-themes/galaxy/chart2 -->
   <object class="GtkDialog" id="SteppedLinesDialog">
@@ -122,7 +122,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="step_start_rb">
-                        <property name="label" translatable="yes">_Start with horizontal line</property>
+                        <property name="label" translatable="yes" context="steppedlinesdlg|step_start_rb">_Start with horizontal line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="step_center_x_rb">
-                        <property name="label" translatable="yes">Step at the _horizontal mean</property>
+                        <property name="label" translatable="yes" context="steppedlinesdlg|step_center_x_rb">Step at the _horizontal mean</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="step_end_rb">
-                        <property name="label" translatable="yes">_End with horizontal line</property>
+                        <property name="label" translatable="yes" context="steppedlinesdlg|step_end_rb">_End with horizontal line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -173,7 +173,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="step_center_y_rb">
-                        <property name="label" translatable="yes">Step to the _vertical mean</property>
+                        <property name="label" translatable="yes" context="steppedlinesdlg|step_center_y_rb">Step to the _vertical mean</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type of Stepping</property>
+                <property name="label" translatable="yes" context="steppedlinesdlg|label2">Type of Stepping</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui
index 6e0eb4356e5e..ee79d52aa349 100644
--- a/chart2/uiconfig/ui/titlerotationtabpage.ui
+++ b/chart2/uiconfig/ui/titlerotationtabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentSpinDegrees">
@@ -55,7 +55,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_top">40</property>
-                    <property name="label" translatable="yes">_Degrees</property>
+                    <property name="label" translatable="yes" context="titlerotationtabpage|degreeL">_Degrees</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -108,7 +108,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="stackedCB">
-                    <property name="label" translatable="yes">Ve_rtically stacked</property>
+                    <property name="label" translatable="yes" context="titlerotationtabpage|stackedCB">Ve_rtically stacked</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -127,7 +127,7 @@
                 <child>
                   <object class="GtkLabel" id="labelABCD">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">ABCD</property>
+                    <property name="label" translatable="yes" context="titlerotationtabpage|labelABCD">ABCD</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -148,7 +148,7 @@
               <object class="GtkLabel" id="textdirL">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Te_xt direction:</property>
+                <property name="label" translatable="yes" context="titlerotationtabpage|textdirL">Te_xt direction:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -178,7 +178,7 @@
       <object class="GtkLabel" id="labelTextOrient">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Text Orientation</property>
+        <property name="label" translatable="yes" context="titlerotationtabpage|labelTextOrient">Text Orientation</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
index e9347bd7f29e..93d0f6c02c3e 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststoreSCHEME">
     <columns>
@@ -10,15 +10,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Simple</col>
+        <col id="0" translatable="yes" context="tp_3D_SceneAppearance|liststoreSCHEME">Simple</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Realistic</col>
+        <col id="0" translatable="yes" context="tp_3D_SceneAppearance|liststoreSCHEME">Realistic</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Custom</col>
+        <col id="0" translatable="yes" context="tp_3D_SceneAppearance|liststoreSCHEME">Custom</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -39,7 +39,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Sche_me</property>
+            <property name="label" translatable="yes" context="tp_3D_SceneAppearance|FT_SCHEME">Sche_me</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">LB_SCHEME</property>
           </object>
@@ -87,7 +87,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_SHADING">
-            <property name="label" translatable="yes">_Shading</property>
+            <property name="label" translatable="yes" context="tp_3D_SceneAppearance|CB_SHADING">_Shading</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
@@ -103,7 +103,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_OBJECTLINES">
-            <property name="label" translatable="yes">_Object borders</property>
+            <property name="label" translatable="yes" context="tp_3D_SceneAppearance|CB_OBJECTLINES">_Object borders</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
@@ -119,7 +119,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_ROUNDEDEDGE">
-            <property name="label" translatable="yes">_Rounded edges</property>
+            <property name="label" translatable="yes" context="tp_3D_SceneAppearance|CB_ROUNDEDEDGE">_Rounded edges</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index f89fc13a726f..36ef02f1fb16 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentPERSPECTIVE">
     <property name="upper">100</property>
@@ -21,7 +21,7 @@
     <property name="column_spacing">12</property>
     <child>
       <object class="GtkCheckButton" id="CBX_RIGHT_ANGLED_AXES">
-        <property name="label" translatable="yes">_Right-angled axes</property>
+        <property name="label" translatable="yes" context="tp_3D_SceneGeometry|CBX_RIGHT_ANGLED_AXES">_Right-angled axes</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="receives_default">False</property>
@@ -39,7 +39,7 @@
       <object class="GtkLabel" id="FT_X_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_X rotation</property>
+        <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_X_ROTATION">_X rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_X_ROTATION:0degrees</property>
         <property name="xalign">0</property>
@@ -53,7 +53,7 @@
       <object class="GtkLabel" id="FT_Y_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Y rotation</property>
+        <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_Y_ROTATION">_Y rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_Y_ROTATION:0degrees</property>
         <property name="xalign">0</property>
@@ -67,7 +67,7 @@
       <object class="GtkLabel" id="FT_Z_ROTATION">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Z rotation</property>
+        <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_Z_ROTATION">_Z rotation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">MTR_FLD_Z_ROTATION:0degrees</property>
         <property name="xalign">0</property>
@@ -79,7 +79,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="CBX_PERSPECTIVE">
-        <property name="label" translatable="yes">_Perspective</property>
+        <property name="label" translatable="yes" context="tp_3D_SceneGeometry|CBX_PERSPECTIVE">_Perspective</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
         </accessibility>
         <child internal-child="accessible">
           <object class="AtkObject" id="MTR_FLD_PERSPECTIVE:0%-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Perspective</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="tp_3D_SceneGeometry|MTR_FLD_PERSPECTIVE-atkobject">Perspective</property>
           </object>
         </child>
       </object>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 626124a9c580..128472e0e2f5 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="IMG_AMBIENT_COLOR">
@@ -101,7 +101,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 1</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_1|tooltip_text">Light source 1</property>
                             <property name="image">IMG_LIGHT_1</property>
                           </object>
                           <packing>
@@ -117,7 +117,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 2</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_2|tooltip_text">Light source 2</property>
                             <property name="image">IMG_LIGHT_2</property>
                           </object>
                           <packing>
@@ -133,7 +133,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 3</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_3|tooltip_text">Light source 3</property>
                             <property name="image">IMG_LIGHT_3</property>
                           </object>
                           <packing>
@@ -149,7 +149,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 4</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_4|tooltip_text">Light source 4</property>
                             <property name="image">IMG_LIGHT_4</property>
                           </object>
                           <packing>
@@ -165,7 +165,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 5</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_5|tooltip_text">Light source 5</property>
                             <property name="image">IMG_LIGHT_5</property>
                           </object>
                           <packing>
@@ -181,7 +181,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 6</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_6|tooltip_text">Light source 6</property>
                             <property name="image">IMG_LIGHT_6</property>
                           </object>
                           <packing>
@@ -197,7 +197,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 7</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_7|tooltip_text">Light source 7</property>
                             <property name="image">IMG_LIGHT_7</property>
                           </object>
                           <packing>
@@ -213,7 +213,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Light source 8</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_8|tooltip_text">Light source 8</property>
                             <property name="image">IMG_LIGHT_8</property>
                           </object>
                           <packing>
@@ -252,7 +252,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Select a color using the color dialog</property>
+                            <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHTSOURCE_COLOR|tooltip_text">Select a color using the color dialog</property>
                             <property name="image">IMG_LIGHTSOURCE_COLOR</property>
                           </object>
                           <packing>
@@ -277,7 +277,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Light source</property>
+                <property name="label" translatable="yes" context="tp_3D_SceneIllumination|FT_LIGHTSOURCE">_Light source</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">BTN_LIGHT_1</property>
                 <attributes>
@@ -326,7 +326,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select a color using the color dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_AMBIENT_COLOR|tooltip_text">Select a color using the color dialog</property>
                         <property name="image">IMG_AMBIENT_COLOR</property>
                       </object>
                       <packing>
@@ -344,7 +344,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Ambient light</property>
+                <property name="label" translatable="yes" context="tp_3D_SceneIllumination|FT_AMBIENTLIGHT">_Ambient light</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_AMBIENTLIGHT</property>
                 <attributes>
@@ -370,7 +370,7 @@
       <object class="svxlo-SvxLightCtl3D" id="CTL_LIGHT_PREVIEW">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Light Preview</property>
+        <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|CTL_LIGHT_PREVIEW|tooltip_text">Light Preview</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
       </object>
diff --git a/chart2/uiconfig/ui/tp_AxisPositions.ui b/chart2/uiconfig/ui/tp_AxisPositions.ui
index 9d502484034a..43c48e0aa1e2 100644
--- a/chart2/uiconfig/ui/tp_AxisPositions.ui
+++ b/chart2/uiconfig/ui/tp_AxisPositions.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="tp_AxisPositions">
@@ -36,7 +36,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Cross other axis at</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT">_Cross other axis at</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_CROSSES_OTHER_AXIS_AT</property>
                       </object>
@@ -54,10 +54,10 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">Start</item>
-                          <item translatable="yes">End</item>
-                          <item translatable="yes">Value</item>
-                          <item translatable="yes">Category</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Start</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">End</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Value</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Category</item>
                         </items>
                       </object>
                       <packing>
@@ -104,7 +104,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_AXIS_BETWEEN_CATEGORIES">
-                    <property name="label" translatable="yes">Axis _between categories</property>
+                    <property name="label" translatable="yes" context="tp_AxisPositions|CB_AXIS_BETWEEN_CATEGORIES">Axis _between categories</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
@@ -126,7 +126,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Axis Line</property>
+            <property name="label" translatable="yes" context="tp_AxisPositions|TXT_AXIS_LINE">Axis Line</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -167,7 +167,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Place labels</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_LABELS">_Place labels</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_PLACE_LABELS</property>
                       </object>
@@ -184,10 +184,10 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">Near axis</item>
-                          <item translatable="yes">Near axis (other side)</item>
-                          <item translatable="yes">Outside start</item>
-                          <item translatable="yes">Outside end</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis (other side)</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside start</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside end</item>
                         </items>
                       </object>
                       <packing>
@@ -212,7 +212,7 @@
                       <object class="GtkLabel" id="FT_AXIS_LABEL_DISTANCE">
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Distance</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_AXIS_LABEL_DISTANCE">_Distance</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">EDT_AXIS_LABEL_DISTANCE</property>
                       </object>
@@ -249,7 +249,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Labels</property>
+            <property name="label" translatable="yes" context="tp_AxisPositions|TXT_FL_LABELS">Labels</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -291,7 +291,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Major:</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_MAJOR">Major:</property>
                         <accessibility>
                           <relation type="label-for" target="CB_TICKS_INNER"/>
                           <relation type="label-for" target="CB_TICKS_OUTER"/>
@@ -309,7 +309,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Minor:</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_MINOR">Minor:</property>
                         <accessibility>
                           <relation type="label-for" target="CB_MINOR_INNER"/>
                           <relation type="label-for" target="CB_MINOR_OUTER"/>
@@ -324,7 +324,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="CB_TICKS_INNER">
-                        <property name="label" translatable="yes">_Inner</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_INNER">_Inner</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -344,7 +344,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="CB_TICKS_OUTER">
-                        <property name="label" translatable="yes">_Outer</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_OUTER">_Outer</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -364,7 +364,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="CB_MINOR_INNER">
-                        <property name="label" translatable="yes">I_nner</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_INNER">I_nner</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -384,7 +384,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="CB_MINOR_OUTER">
-                        <property name="label" translatable="yes">O_uter</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_OUTER">O_uter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -419,7 +419,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Place _marks</property>
+                        <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_TICKS">Place _marks</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_PLACE_TICKS</property>
                       </object>
@@ -436,9 +436,9 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">At labels</item>
-                          <item translatable="yes">At axis</item>
-                          <item translatable="yes">At axis and labels</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At labels</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis</item>
+                          <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis and labels</item>
                         </items>
                       </object>
                       <packing>
@@ -463,7 +463,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Interval Marks</property>
+            <property name="label" translatable="yes" context="tp_AxisPositions|TXT_FL_TICKS">Interval Marks</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -495,7 +495,7 @@
                 <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="CB_MAJOR_GRID">
-                    <property name="label" translatable="yes">Show major _grid</property>
+                    <property name="label" translatable="yes" context="tp_AxisPositions|CB_MAJOR_GRID">Show major _grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -513,7 +513,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_MINOR_GRID">
-                    <property name="label" translatable="yes">_Show minor grid</property>
+                    <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_GRID">_Show minor grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -530,7 +530,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="PB_MAJOR_GRID">
-                    <property name="label" translatable="yes">Mo_re...</property>
+                    <property name="label" translatable="yes" context="tp_AxisPositions|PB_MAJOR_GRID">Mo_re...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
@@ -545,7 +545,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="PB_MINOR_GRID">
-                    <property name="label" translatable="yes">Mor_e...</property>
+                    <property name="label" translatable="yes" context="tp_AxisPositions|PB_MINOR_GRID">Mor_e...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
@@ -568,7 +568,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Grids</property>
+            <property name="label" translatable="yes" context="tp_AxisPositions|label2">Grids</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui
index 242cd629a693..72a50e8f5d08 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,16 +17,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Bar</col>
+        <col id="0" translatable="yes" context="tp_ChartType|liststore1">Bar</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cylinder</col>
+        <col id="0" translatable="yes" context="tp_ChartType|liststore1">Cylinder</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cone</col>
+        <col id="0" translatable="yes" context="tp_ChartType|liststore1">Cone</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Pyramid</col>
+        <col id="0" translatable="yes" context="tp_ChartType|liststore1">Pyramid</col>
       </row>
     </data>
   </object>
@@ -50,7 +50,7 @@
             <property name="visible">False</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Choose a Chart Type</property>
+            <property name="label" translatable="yes" context="tp_ChartType|FT_CAPTION_FOR_WIZARD">Choose a Chart Type</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -99,7 +99,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="3dlook">
-                            <property name="label" translatable="yes">_3D Look</property>
+                            <property name="label" translatable="yes" context="tp_ChartType|3dlook">_3D Look</property>
                             <property name="visible">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -122,8 +122,8 @@
                             <property name="visible">False</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Simple</item>
-                              <item translatable="yes">Realistic</item>
+                              <item translatable="yes" context="tp_ChartType|3dscheme">Simple</item>
+                              <item translatable="yes" context="tp_ChartType|3dscheme">Realistic</item>
                             </items>
                             <accessibility>
                               <relation type="labelled-by" target="3dlook"/>
@@ -149,7 +149,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Sh_ape</property>
+                        <property name="label" translatable="yes" context="tp_ChartType|shapeft">Sh_ape</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">shape:border</property>
                         <property name="angle">0.02</property>
@@ -192,7 +192,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="stack">
-                        <property name="label" translatable="yes">_Stack series</property>
+                        <property name="label" translatable="yes" context="tp_ChartType|stack">_Stack series</property>
                         <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -219,7 +219,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="ontop">
-                                <property name="label" translatable="yes">On top</property>
+                                <property name="label" translatable="yes" context="tp_ChartType|ontop">On top</property>
                                 <property name="visible">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -238,7 +238,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="percent">
-                                <property name="label" translatable="yes">Percent</property>
+                                <property name="label" translatable="yes" context="tp_ChartType|percent">Percent</property>
                                 <property name="visible">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -256,7 +256,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="deep">
-                                <property name="label" translatable="yes">Deep</property>
+                                <property name="label" translatable="yes" context="tp_ChartType|deep">Deep</property>
                                 <property name="visible">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -292,7 +292,7 @@
                             <property name="visible">False</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Line type</property>
+                            <property name="label" translatable="yes" context="tp_ChartType|linetypeft">_Line type</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">linetype</property>
                             <property name="ellipsize">end</property>
@@ -309,9 +309,9 @@
                             <property name="visible">False</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Straight</item>
-                              <item translatable="yes">Smooth</item>
-                              <item translatable="yes">Stepped</item>
+                              <item translatable="yes" context="tp_ChartType|linetype">Straight</item>
+                              <item translatable="yes" context="tp_ChartType|linetype">Smooth</item>
+                              <item translatable="yes" context="tp_ChartType|linetype">Stepped</item>
                             </items>
                           </object>
                           <packing>
@@ -323,7 +323,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="properties">
-                            <property name="label" translatable="yes">Properties...</property>
+                            <property name="label" translatable="yes" context="tp_ChartType|properties">Properties...</property>
                             <property name="visible">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -346,7 +346,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="sort">
-                        <property name="label" translatable="yes">_Sort by X values</property>
+                        <property name="label" translatable="yes" context="tp_ChartType|sort">_Sort by X values</property>
                         <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -371,7 +371,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Number of lines</property>
+                            <property name="label" translatable="yes" context="tp_ChartType|nolinesft">_Number of lines</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">nolines</property>
                             <property name="ellipsize">end</property>
@@ -418,7 +418,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckButton" id="rounded-edge">
-                        <property name="label" translatable="yes">Rounded edge</property>
+                        <property name="label" translatable="yes" context="tp_ChartType|rounded-edge">Rounded edge</property>
                         <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui
index 476a2ec3d809..76597cd9acca 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentDEGREE">
@@ -17,55 +17,55 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Best fit</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Best fit</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Center</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Center</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Above</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Above</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top left</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top left</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Left</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom left</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom left</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Below</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Below</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom right</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom right</col>
         <col id="1">7</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Right</col>
         <col id="1">8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top right</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top right</col>
         <col id="1">9</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Inside</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Inside</col>
         <col id="1">10</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Outside</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Outside</col>
         <col id="1">11</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Near origin</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Near origin</col>
         <col id="1">12</col>
       </row>
     </data>
@@ -79,19 +79,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Space</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Space</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Comma</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Comma</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Semicolon</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Semicolon</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">New line</col>
+        <col id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">New line</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -123,7 +123,7 @@
                 <property name="row_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
-                    <property name="label" translatable="yes">Show value as _number</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -140,7 +140,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
-                    <property name="label" translatable="yes">Show value as _percentage</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_CATEGORY">
-                    <property name="label" translatable="yes">Show _category</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CB_CATEGORY">Show _category</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -174,7 +174,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_SYMBOL">
-                    <property name="label" translatable="yes">Show _legend key</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CB_SYMBOL">Show _legend key</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -191,7 +191,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_WRAP_TEXT">
-                    <property name="label" translatable="yes">Auto text _wrap</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CB_WRAP_TEXT">Auto text _wrap</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -208,7 +208,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="PB_NUMBERFORMAT">
-                    <property name="label" translatable="yes">Number _format...</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
@@ -224,7 +224,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
-                    <property name="label" translatable="yes">Percentage f_ormat...</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
@@ -242,7 +242,7 @@
                   <object class="GtkLabel" id="CT_LABEL_DIAL">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">ABCD</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|CT_LABEL_DIAL">ABCD</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Separator</property>
+                        <property name="label" translatable="yes" context="tp_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
                       </object>
@@ -305,7 +305,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Place_ment</property>
+                        <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
                       </object>
@@ -339,7 +339,7 @@
                 <child>
                   <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Number Format for Percentage Value</property>
+                    <property name="label" translatable="yes" context="tp_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -357,7 +357,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Text Attributes</property>
+            <property name="label" translatable="yes" context="tp_DataLabel|label1">Text Attributes</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -423,7 +423,7 @@
                       <object class="GtkLabel" id="FT_LABEL_DEGREES">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Degrees</property>
+                        <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -448,7 +448,7 @@
                       <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Te_xt direction</property>
+                        <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_LABEL_TEXTDIR</property>
                       </object>
@@ -485,7 +485,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Rotate Text</property>
+            <property name="label" translatable="yes" context="tp_DataLabel|label2">Rotate Text</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index 55918aaab42c..71b9bbc39cce 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="imageIMB_RANGE_CAT">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Select data range</property>
+    <property name="tooltip_text" translatable="yes" context="tp_DataSource|imageIMB_RANGE_CAT|tooltip_text">Select data range</property>
     <property name="pixbuf">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkImage" id="imageIMB_RANGE_MAIN">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Select data range</property>
+    <property name="tooltip_text" translatable="yes" context="tp_DataSource|imageIMB_RANGE_MAIN|tooltip_text">Select data range</property>
     <property name="pixbuf">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkBox" id="tp_DataSource">
@@ -25,7 +25,7 @@
       <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Customize Data Ranges for Individual Data Series</property>
+        <property name="label" translatable="yes" context="tp_DataSource|FT_CAPTION_FOR_WIZARD">Customize Data Ranges for Individual Data Series</property>
         <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
@@ -55,7 +55,7 @@
               <object class="GtkLabel" id="FT_SERIES">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data _series:</property>
+                <property name="label" translatable="yes" context="tp_DataSource|FT_SERIES">Data _series:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_SERIES:border</property>
                 <property name="xalign">0</property>
@@ -92,7 +92,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkButton" id="BTN_ADD">
-                    <property name="label" translatable="yes">_Add</property>
+                    <property name="label" translatable="yes" context="tp_DataSource|BTN_ADD">_Add</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -113,7 +113,7 @@
                     <property name="always_show_image">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_UP-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Up</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tp_DataSource|BTN_UP-atkobject">Up</property>
                       </object>
                     </child>
                   </object>
@@ -124,7 +124,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="BTN_REMOVE">
-                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="label" translatable="yes" context="tp_DataSource|BTN_REMOVE">_Remove</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -145,7 +145,7 @@
                     <property name="receives_default">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_DOWN-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Down</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tp_DataSource|BTN_DOWN-atkobject">Down</property>
                       </object>
                     </child>
                   </object>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="FT_ROLE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Data ranges:</property>
+                <property name="label" translatable="yes" context="tp_DataSource|FT_ROLE">_Data ranges:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_ROLE:border</property>
                 <property name="xalign">0</property>
@@ -211,7 +211,7 @@
               <object class="GtkLabel" id="FT_RANGE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Ran_ge for %VALUETYPE</property>
+                <property name="label" translatable="yes" context="tp_DataSource|FT_RANGE">Ran_ge for %VALUETYPE</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">EDT_RANGE</property>
                 <property name="xalign">0</property>
@@ -269,7 +269,7 @@
                   <object class="GtkLabel" id="FT_CATEGORIES">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Categories</property>
+                    <property name="label" translatable="yes" context="tp_DataSource|FT_CATEGORIES">_Categories</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">EDT_CATEGORIES</property>
                     <property name="xalign">0</property>
@@ -284,7 +284,7 @@
                   <object class="GtkLabel" id="FT_DATALABELS">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Data _labels</property>
+                    <property name="label" translatable="yes" context="tp_DataSource|FT_DATALABELS">Data _labels</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui
index 9e1d058056ae..075c3719e70b 100644
--- a/chart2/uiconfig/ui/tp_ErrorBars.ui
+++ b/chart2/uiconfig/ui/tp_ErrorBars.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustmentPOS_NEG">
     <property name="upper">100</property>
@@ -25,19 +25,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Standard Error</col>
+        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Error</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Standard Deviation</col>
+        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Deviation</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Variance</col>
+        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Variance</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Error Margin</col>
+        <col id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Error Margin</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -74,7 +74,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="RB_NONE">
-                        <property name="label" translatable="yes">_None</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_NONE">_None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -92,7 +92,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_CONST">
-                        <property name="label" translatable="yes">_Constant Value</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_CONST">_Constant Value</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -110,7 +110,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_PERCENT">
-                        <property name="label" translatable="yes">_Percentage</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_PERCENT">_Percentage</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -168,7 +168,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_RANGE">
-                        <property name="label" translatable="yes">Cell _Range</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_RANGE">Cell _Range</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -192,7 +192,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Error Category</property>
+                <property name="label" translatable="yes" context="tp_ErrorBars|label1">Error Category</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -225,7 +225,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="RB_BOTH">
-                        <property name="label" translatable="yes">Positive _and Negative</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_BOTH">Positive _and Negative</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -244,7 +244,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_POSITIVE">
-                        <property name="label" translatable="yes">Pos_itive</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_POSITIVE">Pos_itive</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -263,7 +263,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_NEGATIVE">
-                        <property name="label" translatable="yes">Ne_gative</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|RB_NEGATIVE">Ne_gative</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -328,7 +328,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Error Indicator</property>
+                <property name="label" translatable="yes" context="tp_ErrorBars|label2">Error Indicator</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -375,7 +375,7 @@
                       <object class="GtkLabel" id="FT_POSITIVE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">P_ositive (+)</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|FT_POSITIVE">P_ositive (+)</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MF_POSITIVE:0</property>
                       </object>
@@ -416,7 +416,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Select data range</property>
+                        <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
                         <property name="image">imageRANGE_SELECT_POSITIVE</property>
                       </object>
                       <packing>
@@ -441,7 +441,7 @@
                       <object class="GtkLabel" id="FT_NEGATIVE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Negative (-)</property>
+                        <property name="label" translatable="yes" context="tp_ErrorBars|FT_NEGATIVE">_Negative (-)</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MF_NEGATIVE:0</property>
                       </object>
@@ -482,7 +482,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Select data range</property>
+                        <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
                         <property name="image">imageRANGE_SELECT_NEG</property>
                       </object>
                       <packing>
@@ -500,7 +500,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
-                    <property name="label" translatable="yes">Same value for both</property>
+                    <property name="label" translatable="yes" context="tp_ErrorBars|CB_SYN_POS_NEG">Same value for both</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -522,7 +522,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Parameters</property>
+            <property name="label" translatable="yes" context="tp_ErrorBars|label3">Parameters</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -538,7 +538,7 @@
     <child>
       <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS">
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Select Range for Positive Error Bars</property>
+        <property name="label" translatable="yes" context="tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS">Select Range for Positive Error Bars</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -549,7 +549,7 @@
     <child>
       <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS">
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Select Range for Negative Error Bars</property>
+        <property name="label" translatable="yes" context="tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS">Select Range for Negative Error Bars</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -560,7 +560,7 @@
     <child>
       <object class="GtkLabel" id="STR_CONTROLTEXT_ERROR_BARS_FROM_DATA">
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">From Data Table</property>
+        <property name="label" translatable="yes" context="tp_ErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA">From Data Table</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui
index 8d4d72ef3136..18db310c701d 100644
--- a/chart2/uiconfig/ui/tp_LegendPosition.ui
+++ b/chart2/uiconfig/ui/tp_LegendPosition.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="tp_LegendPosition">
@@ -27,7 +27,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="left">
-                    <property name="label" translatable="yes">_Left</property>
+                    <property name="label" translatable="yes" context="tp_LegendPosition|left">_Left</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="right">
-                    <property name="label" translatable="yes">_Right</property>
+                    <property name="label" translatable="yes" context="tp_LegendPosition|right">_Right</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="top">
-                    <property name="label" translatable="yes">_Top</property>
+                    <property name="label" translatable="yes" context="tp_LegendPosition|top">_Top</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -82,7 +82,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="bottom">
-                    <property name="label" translatable="yes">_Bottom</property>
+                    <property name="label" translatable="yes" context="tp_LegendPosition|bottom">_Bottom</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -107,7 +107,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="tp_LegendPosition|TXT_POSITION">Position</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -142,7 +142,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Te_xt direction</property>
+                    <property name="label" translatable="yes" context="tp_LegendPosition|FT_LEGEND_TEXTDIR">Te_xt direction</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -171,7 +171,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Text Orientation</property>
+            <property name="label" translatable="yes" context="tp_LegendPosition|TXT_ORIENTATION">Text Orientation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui
index 6f5d8d85ebc9..eb41d2723bf8 100644
--- a/chart2/uiconfig/ui/tp_PolarOptions.ui
+++ b/chart2/uiconfig/ui/tp_PolarOptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentDEGREE">
@@ -28,7 +28,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="CB_CLOCKWISE">
-                <property name="label" translatable="yes">_Clockwise direction</property>
+                <property name="label" translatable="yes" context="tp_PolarOptions|CB_CLOCKWISE">_Clockwise direction</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
@@ -44,7 +44,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Orientation</property>
+            <property name="label" translatable="yes" context="tp_PolarOptions|label1">Orientation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -105,7 +105,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Degrees</property>
+                    <property name="label" translatable="yes" context="tp_PolarOptions|FT_ROTATION_DEGREES">_Degrees</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">NF_STARTING_ANGLE</property>
                   </object>
@@ -124,7 +124,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Starting Angle</property>
+            <property name="label" translatable="yes" context="tp_PolarOptions|label2">Starting Angle</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -151,7 +151,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS_POLAR">
-                <property name="label" translatable="yes">Include _values from hidden cells</property>
+                <property name="label" translatable="yes" context="tp_PolarOptions|CB_INCLUDE_HIDDEN_CELLS_POLAR">Include _values from hidden cells</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
@@ -167,7 +167,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Plot Options</property>
+            <property name="label" translatable="yes" context="tp_PolarOptions|label3">Plot Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui
index ac472b67a8a5..9b2ff0bad36e 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="imageIB_RANGE">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Select data range</property>
+    <property name="tooltip_text" translatable="yes" context="tp_RangeChooser|imageIB_RANGE|tooltip_text">Select data range</property>
     <property name="pixbuf">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkBox" id="tp_RangeChooser">
@@ -25,7 +25,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Choose a Data Range</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|FT_CAPTION_FOR_WIZARD">Choose a Data Range</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -47,7 +47,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Data range:</property>
+                <property name="label" translatable="yes" context="tp_RangeChooser|FT_RANGE">_Data range:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ED_RANGE</property>
               </object>
@@ -76,7 +76,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Select data range</property>
+                <property name="tooltip_text" translatable="yes" context="tp_RangeChooser|IB_RANGE|tooltip_text">Select data range</property>
                 <property name="image">imageIB_RANGE</property>
               </object>
               <packing>
@@ -94,7 +94,7 @@
         </child>
         <child>
           <object class="GtkRadioButton" id="RB_DATAROWS">
-            <property name="label" translatable="yes">Data series in _rows</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|RB_DATAROWS">Data series in _rows</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -113,7 +113,7 @@
         </child>
         <child>
           <object class="GtkRadioButton" id="RB_DATACOLS">
-            <property name="label" translatable="yes">Data series in _columns</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|RB_DATACOLS">Data series in _columns</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -132,7 +132,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_FIRST_ROW_ASLABELS">
-            <property name="label" translatable="yes">_First row as label</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_ROW_ASLABELS">_First row as label</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -149,7 +149,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_FIRST_COLUMN_ASLABELS">
-            <property name="label" translatable="yes">F_irst column as label</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_COLUMN_ASLABELS">F_irst column as label</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -177,7 +177,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="CB_TIME_BASED">
-            <property name="label" translatable="yes">Time based charting</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|CB_TIME_BASED">Time based charting</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -232,7 +232,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xpad">4</property>
-                <property name="label" translatable="yes">Start Table Index</property>
+                <property name="label" translatable="yes" context="tp_RangeChooser|label1">Start Table Index</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ED_TIME_BASED_START</property>
               </object>
@@ -248,7 +248,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xpad">8</property>
-                <property name="label" translatable="yes">End Table Index</property>
+                <property name="label" translatable="yes" context="tp_RangeChooser|label2">End Table Index</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ED_TIME_BASED_END</property>
               </object>
@@ -269,7 +269,7 @@
         <child>
           <object class="GtkLabel" id="STR_PAGE_DATA_RANGE">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Range</property>
+            <property name="label" translatable="yes" context="tp_RangeChooser|STR_PAGE_DATA_RANGE">Data Range</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui
index 286b6df8b876..8e763accb74d 100644
--- a/chart2/uiconfig/ui/tp_Scale.ui
+++ b/chart2/uiconfig/ui/tp_Scale.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentINTERVAL">
@@ -17,15 +17,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Days</col>
+        <col id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Months</col>
+        <col id="0" translatable="yes" context="tp_Scale|liststoreDATE">Months</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Years</col>
+        <col id="0" translatable="yes" context="tp_Scale|liststoreDATE">Years</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -56,7 +56,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="CBX_REVERSE">
-                    <property name="label" translatable="yes">_Reverse direction</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_REVERSE">_Reverse direction</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -72,7 +72,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_LOGARITHM">
-                    <property name="label" translatable="yes">_Logarithmic scale</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_LOGARITHM">_Logarithmic scale</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">T_ype</property>
+                        <property name="label" translatable="yes" context="tp_Scale|TXT_AXIS_TYPE">T_ype</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">LB_AXIS_TYPE</property>
                       </object>
@@ -113,9 +113,9 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">Automatic</item>
-                          <item translatable="yes">Text</item>
-                          <item translatable="yes">Date</item>
+                          <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Automatic</item>
+                          <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Text</item>
+                          <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Date</item>
                         </items>
                       </object>
                       <packing>
@@ -149,7 +149,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Minimum</property>
+                    <property name="label" translatable="yes" context="tp_Scale|TXT_MIN">_Minimum</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">EDT_MIN</property>
                   </object>
@@ -165,7 +165,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ma_ximum</property>
+                    <property name="label" translatable="yes" context="tp_Scale|TXT_MAX">Ma_ximum</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">EDT_MAX</property>
                   </object>
@@ -178,7 +178,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_MIN">
-                    <property name="label" translatable="yes">_Automatic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MIN">_Automatic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -195,7 +195,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_MAX">
-                    <property name="label" translatable="yes">A_utomatic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MAX">A_utomatic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -253,7 +253,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">R_esolution</property>
+                    <property name="label" translatable="yes" context="tp_Scale|TXT_TIME_RESOLUTION">R_esolution</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">LB_TIME_RESOLUTION</property>
                   </object>
@@ -277,7 +277,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_TIME_RESOLUTION">
-                    <property name="label" translatable="yes">Automat_ic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_TIME_RESOLUTION">Automat_ic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -308,7 +308,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ma_jor interval</property>
+                    <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_MAIN">Ma_jor interval</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -380,7 +380,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_STEP_MAIN">
-                    <property name="label" translatable="yes">Au_tomatic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_MAIN">Au_tomatic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -416,7 +416,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Minor inter_val</property>
+                        <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP">Minor inter_val</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -430,7 +430,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Minor inter_val count</property>
+                        <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP_COUNT">Minor inter_val count</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -474,7 +474,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_STEP_HELP">
-                    <property name="label" translatable="yes">Aut_omatic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_HELP">Aut_omatic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -505,7 +505,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Re_ference value</property>
+                    <property name="label" translatable="yes" context="tp_Scale|TXT_ORIGIN">Re_ference value</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -528,7 +528,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CBX_AUTO_ORIGIN">
-                    <property name="label" translatable="yes">Automat_ic</property>
+                    <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_ORIGIN">Automat_ic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -558,7 +558,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Scale</property>
+        <property name="label" translatable="yes" context="tp_Scale|FL_SCALE">Scale</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index 4f9738840b74..f922a1a7367f 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustmentGAP">
     <property name="upper">600</property>
@@ -38,7 +38,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="RBT_OPT_AXIS_1">
-                    <property name="label" translatable="yes">Primary Y axis</property>
+                    <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_1">Primary Y axis</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -55,7 +55,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="RBT_OPT_AXIS_2">
-                    <property name="label" translatable="yes">Secondary Y axis</property>
+                    <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_2">Secondary Y axis</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -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">Align Data Series to</property>
+            <property name="label" translatable="yes" context="tp_SeriesToAxis|label1">Align Data Series to</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -120,7 +120,7 @@
                       <object class="GtkLabel" id="FT_GAP">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Spacing</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_GAP">_Spacing</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MT_GAP:0%</property>
                       </object>
@@ -135,7 +135,7 @@
                       <object class="GtkLabel" id="FT_OVERLAP">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Overlap</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_OVERLAP">_Overlap</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MT_OVERLAP:0%</property>
                       </object>
@@ -183,7 +183,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_BARS_SIDE_BY_SIDE">
-                    <property name="label" translatable="yes">Show _bars side by side</property>
+                    <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_BARS_SIDE_BY_SIDE">Show _bars side by side</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -199,7 +199,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_CONNECTOR">
-                    <property name="label" translatable="yes">Connection lines</property>
+                    <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_CONNECTOR">Connection lines</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Settings</property>
+            <property name="label" translatable="yes" context="tp_SeriesToAxis|label2">Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -263,7 +263,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Plot missing values</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_MISSING_VALUES">Plot missing values</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -274,7 +274,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_DONT_PAINT">
-                        <property name="label" translatable="yes">_Leave gap</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_DONT_PAINT">_Leave gap</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -293,7 +293,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_ASSUME_ZERO">
-                        <property name="label" translatable="yes">_Assume zero</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_ASSUME_ZERO">_Assume zero</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -312,7 +312,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RB_CONTINUE_LINE">
-                        <property name="label" translatable="yes">_Continue line</property>
+                        <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_CONTINUE_LINE">_Continue line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -344,7 +344,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS">
-                    <property name="label" translatable="yes">Include _values from hidden cells</property>
+                    <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_INCLUDE_HIDDEN_CELLS">Include _values from hidden cells</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -367,7 +367,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Plot Options</property>
+            <property name="label" translatable="yes" context="tp_SeriesToAxis|label3">Plot Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui
index fb1904b05c9c..5411a470e35e 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustmentDegree">
     <property name="lower">2</property>
@@ -49,7 +49,7 @@
                 <property name="row_homogeneous">True</property>
                 <child>
                   <object class="GtkRadioButton" id="linear">
-                    <property name="label" translatable="yes">_Linear</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|linear">_Linear</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="logarithmic">
-                    <property name="label" translatable="yes">L_ogarithmic</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|logarithmic">L_ogarithmic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -87,7 +87,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="exponential">
-                    <property name="label" translatable="yes">_Exponential</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|exponential">_Exponential</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="power">
-                    <property name="label" translatable="yes">Po_wer</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|power">Po_wer</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -125,7 +125,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="polynomial">
-                    <property name="label" translatable="yes">_Polynomial</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|polynomial">_Polynomial</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="movingAverage">
-                    <property name="label" translatable="yes">_Moving Average</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|movingAverage">_Moving Average</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -170,7 +170,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Degree</property>
+                        <property name="label" translatable="yes" context="tp_Trendline|label3">Degree</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -210,7 +210,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Period</property>
+                        <property name="label" translatable="yes" context="tp_Trendline|label4">Period</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -333,7 +333,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Regression Type</property>
+            <property name="label" translatable="yes" context="tp_Trendline|label1">Regression Type</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -370,7 +370,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Extrapolate Forward</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|label7">Extrapolate Forward</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">extrapolateForward</property>
                   </object>
@@ -386,7 +386,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Extrapolate Backward</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|label8">Extrapolate Backward</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">extrapolateBackward</property>
                   </object>
@@ -427,7 +427,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="setIntercept">
-                    <property name="label" translatable="yes">Force _Intercept</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|setIntercept">Force _Intercept</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -444,7 +444,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="showEquation">
-                    <property name="label" translatable="yes">Show E_quation</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|showEquation">Show E_quation</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -461,7 +461,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="showCorrelationCoefficient">
-                    <property name="label" translatable="yes">Show _Coefficient of Determination (R²)</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|showCorrelationCoefficient">Show _Coefficient of Determination (R²)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -481,7 +481,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Trendline _Name</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|label5">Trendline _Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_name</property>
                   </object>
@@ -526,7 +526,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_X Variable Name</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|label6">_X Variable Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_Xname</property>
                   </object>
@@ -555,7 +555,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Y Variable Name</property>
+                    <property name="label" translatable="yes" context="tp_Trendline|label9">_Y Variable Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_Yname</property>
                   </object>
@@ -587,7 +587,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="tp_Trendline|label2">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
index 74d6fa5f315c..e13fff3faa16 100644
--- a/chart2/uiconfig/ui/tp_axisLabel.ui
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="chart">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentSpinDegrees">
@@ -17,7 +17,7 @@
     <property name="spacing">12</property>
     <child>
       <object class="GtkCheckButton" id="showlabelsCB">
-        <property name="label" translatable="yes">Sho_w labels</property>
+        <property name="label" translatable="yes" context="tp_axisLabel|showlabelsCB">Sho_w labels</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -60,7 +60,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="tile">
-                        <property name="label" translatable="yes">_Tile</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|tile">_Tile</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -78,7 +78,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="odd">
-                        <property name="label" translatable="yes">St_agger odd</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|odd">St_agger odd</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -95,7 +95,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="even">
-                        <property name="label" translatable="yes">Stagger _even</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|even">Stagger _even</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -112,7 +112,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="auto">
-                        <property name="label" translatable="yes">A_utomatic</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|auto">A_utomatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="orderL">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Order</property>
+                <property name="label" translatable="yes" context="tp_axisLabel|orderL">Order</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -170,7 +170,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="overlapCB">
-                        <property name="label" translatable="yes">O_verlap</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|overlapCB">O_verlap</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -186,7 +186,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="breakCB">
-                        <property name="label" translatable="yes">_Break</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|breakCB">_Break</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -208,7 +208,7 @@
               <object class="GtkLabel" id="textflowL">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Flow</property>
+                <property name="label" translatable="yes" context="tp_axisLabel|textflowL">Text Flow</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -277,7 +277,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_top">40</property>
-                        <property name="label" translatable="yes">_Degrees</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|degreeL">_Degrees</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -330,7 +330,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="stackedCB">
-                        <property name="label" translatable="yes">Ve_rtically stacked</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|stackedCB">Ve_rtically stacked</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -349,7 +349,7 @@
                     <child>
                       <object class="GtkLabel" id="labelABCD">
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">ABCD</property>
+                        <property name="label" translatable="yes" context="tp_axisLabel|labelABCD">ABCD</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -370,7 +370,7 @@
                   <object class="GtkLabel" id="textdirL">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Te_xt direction:</property>
+                    <property name="label" translatable="yes" context="tp_axisLabel|textdirL">Te_xt direction:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -400,7 +400,7 @@
           <object class="GtkLabel" id="labelTextOrient">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Orientation</property>
+            <property name="label" translatable="yes" context="tp_axisLabel|labelTextOrient">Text Orientation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/chart2/uiconfig/ui/wizelementspage.ui b/chart2/uiconfig/ui/wizelementspage.ui
index 05450cbf439d..9fb6651f87f0 100644
--- a/chart2/uiconfig/ui/wizelementspage.ui
+++ b/chart2/uiconfig/ui/wizelementspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="chart">
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkBox" id="WizElementsPage">
     <property name="visible">True</property>
@@ -36,7 +36,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_X axis</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelPrimaryXaxis">_X axis</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">primaryXaxis</property>
                       </object>
@@ -52,7 +52,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Y axis</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelPrimaryYaxis">_Y axis</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">primaryYaxis</property>
                       </object>
@@ -68,7 +68,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Z axis</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelPrimaryZaxis">_Z axis</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">primaryZaxis</property>
                       </object>
@@ -129,7 +129,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Title</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelMainTitle">_Title</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">maintitle</property>
                       </object>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Subtitle</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelSubTitle">_Subtitle</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">subtitle</property>
                       </object>
@@ -191,7 +191,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">X _axis</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelSecondaryXAxis">X _axis</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">secondaryXaxis</property>
                       </object>
@@ -207,7 +207,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Y ax_is</property>
+                        <property name="label" translatable="yes" context="wizelementspage|labelSecondaryYAxis">Y ax_is</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">secondaryYaxis</property>
                       </object>
@@ -263,7 +263,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="show">
-                        <property name="label" translatable="yes">_Display legend</property>
+                        <property name="label" translatable="yes" context="wizelementspage|show">_Display legend</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -290,7 +290,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="left">
-                                <property name="label" translatable="yes">_Left</property>
+                                <property name="label" translatable="yes" context="wizelementspage|left">_Left</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -308,7 +308,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="right">
-                                <property name="label" translatable="yes">_Right</property>
+                                <property name="label" translatable="yes" context="wizelementspage|right">_Right</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -326,7 +326,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="top">
-                                <property name="label" translatable="yes">_Top</property>
+                                <property name="label" translatable="yes" context="wizelementspage|top">_Top</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -344,7 +344,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="bottom">
-                                <property name="label" translatable="yes">_Bottom</property>
+                                <property name="label" translatable="yes" context="wizelementspage|bottom">_Bottom</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -386,7 +386,7 @@
           <object class="GtkLabel" id="Axe">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Choose Titles, Legend, and Grid Settings</property>
+            <property name="label" translatable="yes" context="wizelementspage|Axe">Choose Titles, Legend, and Grid Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -419,7 +419,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="x">
-                    <property name="label" translatable="yes">X axis</property>
+                    <property name="label" translatable="yes" context="wizelementspage|x">X axis</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -436,7 +436,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="y">
-                    <property name="label" translatable="yes">Y ax_is</property>
+                    <property name="label" translatable="yes" context="wizelementspage|y">Y ax_is</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -453,7 +453,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="z">
-                    <property name="label" translatable="yes">Z axi_s</property>
+                    <property name="label" translatable="yes" context="wizelementspage|z">Z axi_s</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -476,7 +476,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Display Grids</property>
+            <property name="label" translatable="yes" context="wizelementspage|label2">Display Grids</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index ec5ac9d3240c..6f8b9d07a83a 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
     comphelper/source/misc/namedvaluecollection \
     comphelper/source/misc/numberedcollection \
     comphelper/source/misc/numbers \
-    comphelper/source/misc/officeresourcebundle \
     comphelper/source/misc/officerestartmanager \
     comphelper/source/misc/profilezone \
     comphelper/source/misc/proxyaggregation \
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
deleted file mode 100644
index 1e7b54433dee..000000000000
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ /dev/null
@@ -1,208 +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 <comphelper/officeresourcebundle.hxx>
-
-#include <com/sun/star/resource/MissingResourceException.hpp>
-#include <com/sun/star/resource/XResourceBundle.hpp>
-#include <com/sun/star/resource/XResourceBundleLoader.hpp>
-#include <osl/mutex.hxx>
-#include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
-
-
-namespace comphelper
-{
-
-
-    using ::com::sun::star::uno::Reference;
-    using com::sun::star::resource::XResourceBundle;
-    using com::sun::star::resource::XResourceBundleLoader;
-    using com::sun::star::resource::MissingResourceException;
-    using ::com::sun::star::uno::XComponentContext;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::Any;
-
-    class ResourceBundle_Impl
-    {
-    private:
-        Reference< XComponentContext >  m_xContext;
-        OUString                 m_sBaseName;
-        Reference< XResourceBundle >    m_xBundle;
-        bool                            m_bAttemptedCreate;
-        mutable ::osl::Mutex            m_aMutex;
-
-    public:
-        ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName )
-            :m_xContext( _context )
-            ,m_sBaseName( _baseName )
-            ,m_bAttemptedCreate( false )
-        {
-        }
-
-    public:
-        /** loads the string with the given resource id from the resource bundle
-            @param  _resourceId
-                the id of the string to load
-            @return
-                the requested resource string. If no string with the given id exists in the resource bundle,
-                an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
-                then.
-        */
-        OUString loadString( sal_Int32 _resourceId ) const;
-
-        /** determines whether the resource bundle has a string with the given id
-            @param  _resourceId
-                the id of the string whose existence is to be checked
-            @return
-                <TRUE/> if and only if a string with the given ID exists in the resource
-                bundle.
-        */
-        bool            hasString( sal_Int32 _resourceId ) const;
-
-    private:
-        /** loads the bundle represented by the instance
-
-            The method is safe against multiple calls: If a previous call succeeded or failed, the
-            previous result will be returned, without any other processing.
-
-            @precond
-                Our mutex is locked.
-        */
-        bool    impl_loadBundle_nothrow();
-
-        /** returns the resource bundle key for a string with a given resource id
-        */
-        static OUString
-                impl_getStringResourceKey( sal_Int32 _resourceId );
-    };
-
-
-    OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
-    {
-        OUStringBuffer key;
-        key.append( "string:" );
-        key.append( _resourceId );
-        return key.makeStringAndClear();
-    }
-
-
-    OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const
-    {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
-        OUString sString;
-
-        if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() )
-        {
-            try
-            {
-                OSL_VERIFY( m_xBundle->getByName( impl_getStringResourceKey( _resourceId ) ) >>= sString );
-            }
-            catch( const Exception& )
-            {
-                OSL_FAIL( "ResourceBundle_Impl::loadString: caught an exception!" );
-            }
-        }
-        return sString;
-    }
-
-
-    bool ResourceBundle_Impl::hasString( sal_Int32 _resourceId ) const
-    {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
-        bool has = false;
-
-        if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() )
-        {
-            try
-            {
-                has = m_xBundle->hasByName( impl_getStringResourceKey( _resourceId ) );
-            }
-            catch( const Exception& )
-            {
-                OSL_FAIL( "ResourceBundle_Impl::hasString: caught an exception!" );
-            }
-        }
-        return has;
-    }
-
-
-    bool ResourceBundle_Impl::impl_loadBundle_nothrow()
-    {
-        if ( m_bAttemptedCreate )
-            return m_xBundle.is();
-
-        m_bAttemptedCreate = true;
-
-        Reference< XResourceBundleLoader > xLoader;
-        try
-        {
-            Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) );
-            OSL_VERIFY( aValue >>= xLoader );
-        }
-        catch( const Exception& )
-        {
-            OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: could not create the resource loader!" );
-        }
-
-        if ( !xLoader.is() )
-            return false;
-
-        try
-        {
-            m_xBundle = xLoader->loadBundle_Default( m_sBaseName );
-        }
-        catch( const MissingResourceException& )
-        {
-            OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: missing the given resource bundle!" );
-        }
-
-        return m_xBundle.is();
-    }
-
-
-    OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName )
-        :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) )
-    {
-    }
-
-
-    OfficeResourceBundle::~OfficeResourceBundle()
-    {
-    }
-
-
-    OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const
-    {
-        return m_pImpl->loadString( _resourceId );
-    }
-
-
-    bool OfficeResourceBundle::hasString( sal_Int32 _resourceId ) const
-    {
-        return m_pImpl->hasString( _resourceId );
-    }
-
-
-} // namespace comphelper
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results
index 86ec39a2fca1..1a2dd6fc110f 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -1074,10 +1074,6 @@ include/tools/datetime.hxx:43
     void DateTime::DateTime(enum DateTime::DateTimeInitSystem)
     enum DateTime::DateTimeInitSystem 
     0
-include/tools/resid.hxx:54
-    void ResId::ImplInit(unsigned int,class ResMgr &,struct RSHEADER_TYPE *)
-    struct RSHEADER_TYPE * pRes
-    0
 include/tools/stream.hxx:583
     _Bool SvFileStream::LockRange(unsigned long,unsigned long)
     unsigned long nBytes
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 033a9e7320ff..184a3fc0d57b 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -136,7 +136,6 @@ def is_ignore(srcLoc):
          "include/svtools/htmltokn.h",
          "include/sfx2/sidebar/Theme.hxx", # ThemeItem
          "sc/source/ui/docshell/impex.cxx", # SylkVersion
-         "include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType
          "include/i18nutil/paper.hxx", # Paper
          "cppcanvas/source/mtfrenderer/emfplus.cxx", # EmfPlusCombineMode
          "cppcanvas/source/mtfrenderer/emfpbrush.hxx", # EmfPlusHatchStyle
diff --git a/config_host.mk.in b/config_host.mk.in
index 2643035f7886..674db3cd98aa 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -380,6 +380,8 @@ export MINGWSTRIP=@MINGWSTRIP@
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MPL_SUBSET=@MPL_SUBSET@
+export MSGFMT=@MSGFMT@
+export MSGUNIQ=@MSGUNIQ@
 export MSM_PATH=@MSM_PATH@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
diff --git a/configure.ac b/configure.ac
index 119cdea487ae..d0e4c9b80d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11589,7 +11589,20 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
 else
     AC_MSG_RESULT([$WITH_LANG])
     GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES"
+    if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then
+        MSGFMT="$LODE_HOME/opt/bin/msgfmt"
+        MSGUNIQ="$LODE_HOME/opt/bin/msguniq"
+    elif test -x "/opt/lo/bin/msgfmt"; then
+        MSGFMT="/opt/lo/bin/msgfmt"
+        MSGUNIQ="/opt/lo/bin/msguniq"
+    fi
+    if test -z "$MSGFMT"; then
+        AC_CHECK_PROGS(MSGFMT, [msgfmt])
+        AC_CHECK_PROGS(MSGUNIQ, [msguniq])
+    fi
 fi
+AC_SUBST(MSGFMT)
+AC_SUBST(MSGUNIQ)
 # check that the list is valid
 for lang in $WITH_LANG; do
     test "$lang" = "ALL" && continue
diff --git a/connectivity/AllLangResTarget_sdberr.mk b/connectivity/AllLangMoTarget_cnr.mk
index fffbdc88a935..a960ce0b9bb1 100644
--- a/connectivity/AllLangResTarget_sdberr.mk
+++ b/connectivity/AllLangMoTarget_cnr.mk
@@ -5,18 +5,9 @@
 # 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,sdberr))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sdberr,\
-	sdberr/res \
-))
 
-$(eval $(call gb_SrsTarget_SrsTarget,sdberr/res))
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,cnr))
 
-$(eval $(call gb_SrsTarget_add_files,sdberr/res,\
-	connectivity/source/resource/conn_error_message.src \
-))
+$(eval $(call gb_AllLangMoTarget_set_polocation,cnr,connectivity))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk
deleted file mode 100644
index df94ae27b13d..000000000000
--- a/connectivity/AllLangResTarget_cnr.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,cnr))
-
-$(eval $(call gb_AllLangResTarget_add_srs,cnr,\
-	cnr/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,cnr/res))
-
-$(eval $(call gb_SrsTarget_set_include,cnr/res,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/connectivity/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,cnr/res,\
-	connectivity/source/resource/conn_shared_res.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index fcdaf2da8ebb..3dd95356195d 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,connectivity_ado))
 
 $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	-I$(SRCDIR)/connectivity/source/drivers/ado \
 	$$(INCLUDE) \
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index d197c94b237c..80e5d1ce5277 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
     utl \
     tl \
     svt \
+    vcl \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 4289a7fe6dc3..10d1d4f5f38c 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,ado))
 $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
 
 $(eval $(call gb_Library_set_include,ado,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index eb6dda8cb157..3136a22c908b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	comphelper \
 	i18nlangtag \
 	svt \
+	vcl \
 ))
 
 ifeq ($(filter-out NETBSD MACOSX,$(OS)),)
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 504eee47f45a..ee325f4464c6 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -11,6 +11,7 @@
 $(eval $(call gb_Library_Library,evoab))
 
 $(eval $(call gb_Library_set_include,evoab,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index 3f3ddc7fce10..aa79db0693fe 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_externals,firebird_sdbc,\
 ))
 
 $(eval $(call gb_Library_set_include,firebird_sdbc,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 227d8438c43c..7c0a89b56a2c 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Library_add_defs,mork,\
 ))
 
 $(eval $(call gb_Library_set_include,mork,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 4cb33107ce3b..ac3c0c2619e8 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_sdk_api,mysql))
 
 $(eval $(call gb_Library_set_include,mysql,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 067d883a232b..3ba7ecf01d41 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,connectivity,\
-	AllLangResTarget_cnr \
-	AllLangResTarget_sdberr \
+       AllLangMoTarget_cnr \
 ))
 
 ifneq ($(ENABLE_JAVA),)
diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index 2df126b08063..a4999e5f5083 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -132,7 +132,6 @@
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/numbers.hxx>
-#include <comphelper/officeresourcebundle.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propagg.hxx>
 #include <comphelper/proparrhlp.hxx>
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
new file mode 100644
index 000000000000..dc769e1e3ee9
--- /dev/null
+++ b/connectivity/inc/strings.hrc
@@ -0,0 +1,148 @@
+/* -*- 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 CONNECTIVITY_STRINGS_HRC
+#define CONNECTIVITY_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// = the mozab driver's resource strings
+#define STR_ERR_EXECUTING_QUERY                 NC_("STR_ERR_EXECUTING_QUERY", "An error occurred while executing the query.")
+#define STR_QUERY_AT_LEAST_ONE_TABLES           NC_("STR_QUERY_AT_LEAST_ONE_TABLES", "The query can not be executed. It needs at least one table.")
+#define STR_NO_COUNT_SUPPORT                    NC_("STR_NO_COUNT_SUPPORT", "The driver does not support the 'COUNT' function.")
+#define STR_STMT_TYPE_NOT_SUPPORTED             NC_("STR_STMT_TYPE_NOT_SUPPORTED", "This statement type not supported by this database driver.")
+#define STR_UNSPECIFIED_ERROR                   NC_("STR_UNSPECIFIED_ERROR", "An unknown error occurred.")
+#define STR_ERROR_REFRESH_ROW                   NC_("STR_ERROR_REFRESH_ROW", "An error occurred while refreshing the current row.")
+#define STR_ERROR_GET_ROW                       NC_("STR_ERROR_GET_ROW", "An error occurred while getting the current row.")
+#define STR_QUERY_INVALID_IS_NULL_COLUMN        NC_("STR_QUERY_INVALID_IS_NULL_COLUMN", "The query can not be executed. The 'IS NULL' can only be used with a column name.")
+#define STR_ILLEGAL_MOVEMENT                    NC_("STR_ILLEGAL_MOVEMENT", "Illegal cursor movement occurred.")
+#define STR_COMMIT_ROW                          NC_("STR_COMMIT_ROW", "Please commit row '$position$' before update rows or insert new rows.")
+// = common strings
+#define STR_NO_CONNECTION_GIVEN                 NC_("STR_NO_CONNECTION_GIVEN", "It doesn't exist a connection to the database.")
+#define STR_WRONG_PARAM_INDEX                   NC_("STR_WRONG_PARAM_INDEX", "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.")
+#define STR_NO_INPUTSTREAM                      NC_("STR_NO_INPUTSTREAM", "The input stream was not set.")
+#define STR_NO_ELEMENT_NAME                     NC_("STR_NO_ELEMENT_NAME", "There is no element named '$name$'.")
+#define STR_INVALID_BOOKMARK                    NC_("STR_INVALID_BOOKMARK", "Invalid bookmark value")
+#define STR_PRIVILEGE_NOT_GRANTED               NC_("STR_PRIVILEGE_NOT_GRANTED", "Privilege not granted: Only table privileges can be granted.")
+#define STR_PRIVILEGE_NOT_REVOKED               NC_("STR_PRIVILEGE_NOT_REVOKED", "Privilege not revoked: Only table privileges can be revoked.")
+#define STR_ERRORMSG_SEQUENCE                   NC_("STR_ERRORMSG_SEQUENCE", "Function sequence error.")
+#define STR_INVALID_INDEX                       NC_("STR_INVALID_INDEX", "Invalid descriptor index.")
+#define STR_UNSUPPORTED_FUNCTION                NC_("STR_UNSUPPORTED_FUNCTION", "The driver does not support the function '$functionname$'.")
+#define STR_UNSUPPORTED_FEATURE                 NC_("STR_UNSUPPORTED_FEATURE", "The driver does not support the functionality for '$featurename$'. It is not implemented.")
+#define STR_FORMULA_WRONG                       NC_("STR_FORMULA_WRONG", "The formula for TypeInfoSettings is wrong!")
+#define STR_STRING_LENGTH_EXCEEDED              NC_("STR_STRING_LENGTH_EXCEEDED", "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.")
+#define STR_CANNOT_CONVERT_STRING               NC_("STR_CANNOT_CONVERT_STRING", "The string '$string$' cannot be converted using the encoding '$charset$'.")
+#define STR_URI_SYNTAX_ERROR                    NC_("STR_URI_SYNTAX_ERROR", "The connection URL is invalid.")
+#define STR_QUERY_TOO_COMPLEX                   NC_("STR_QUERY_TOO_COMPLEX", "The query can not be executed. It is too complex.")
+#define STR_OPERATOR_TOO_COMPLEX                NC_("STR_OPERATOR_TOO_COMPLEX", "The query can not be executed. The operator is too complex.")
+#define STR_QUERY_INVALID_LIKE_COLUMN           NC_("STR_QUERY_INVALID_LIKE_COLUMN", "The query can not be executed. You cannot use 'LIKE' with columns of this type.")
+#define STR_QUERY_INVALID_LIKE_STRING           NC_("STR_QUERY_INVALID_LIKE_STRING", "The query can not be executed. 'LIKE' can be used with a string argument only.")
+#define STR_QUERY_NOT_LIKE_TOO_COMPLEX          NC_("STR_QUERY_NOT_LIKE_TOO_COMPLEX", "The query can not be executed. The 'NOT LIKE' condition is too complex.")
+#define STR_QUERY_LIKE_WILDCARD                 NC_("STR_QUERY_LIKE_WILDCARD", "The query can not be executed. The 'LIKE' condition contains wildcard in the middle.")
+#define STR_QUERY_LIKE_WILDCARD_MANY            NC_("STR_QUERY_LIKE_WILDCARD_MANY", "The query can not be executed. The 'LIKE' condition contains too many wildcards.")
+#define STR_INVALID_COLUMNNAME                  NC_("STR_INVALID_COLUMNNAME", "The column name '$columnname$' is not valid.")
+#define STR_INVALID_COLUMN_SELECTION            NC_("STR_INVALID_COLUMN_SELECTION", "The statement contains an invalid selection of columns.")
+#define STR_COLUMN_NOT_UPDATEABLE               NC_("STR_COLUMN_NOT_UPDATEABLE", "The column at position '$position$' could not be updated.")
+#define STR_COULD_NOT_LOAD_FILE                 NC_("STR_COULD_NOT_LOAD_FILE", "The file $filename$ could not be loaded.")
+#define STR_LOAD_FILE_ERROR_MESSAGE             NC_("STR_LOAD_FILE_ERROR_MESSAGE", "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$")
+// = the ado driver's resource strings
+#define STR_TYPE_NOT_CONVERT                    NC_("STR_TYPE_NOT_CONVERT", "The type could not be converted.")
+#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR     NC_("STR_INVALID_COLUMN_DESCRIPTOR_ERROR", "Could not append column: invalid column descriptor.")
+#define STR_INVALID_GROUP_DESCRIPTOR_ERROR      NC_("STR_INVALID_GROUP_DESCRIPTOR_ERROR", "Could not create group: invalid object descriptor.")
+#define STR_INVALID_INDEX_DESCRIPTOR_ERROR      NC_("STR_INVALID_INDEX_DESCRIPTOR_ERROR", "Could not create index: invalid object descriptor.")
+#define STR_INVALID_KEY_DESCRIPTOR_ERROR        NC_("STR_INVALID_KEY_DESCRIPTOR_ERROR", "Could not create key: invalid object descriptor.")
+#define STR_INVALID_TABLE_DESCRIPTOR_ERROR      NC_("STR_INVALID_TABLE_DESCRIPTOR_ERROR", "Could not create table: invalid object descriptor.")
+#define STR_INVALID_USER_DESCRIPTOR_ERROR       NC_("STR_INVALID_USER_DESCRIPTOR_ERROR", "Could not create user: invalid object descriptor.")
+#define STR_INVALID_VIEW_DESCRIPTOR_ERROR       NC_("STR_INVALID_VIEW_DESCRIPTOR_ERROR", "Could not create view: invalid object descriptor.")
+#define STR_VIEW_NO_COMMAND_ERROR               NC_("STR_VIEW_NO_COMMAND_ERROR", "Could not create view: no command object.")
+#define STR_NO_CONNECTION                       NC_("STR_NO_CONNECTION", "The connection could not be created. May be the necessary data provider is not installed.")
+// dbase
+#define STR_COULD_NOT_DELETE_INDEX              NC_("STR_COULD_NOT_DELETE_INDEX", "The index could not be deleted. An unknown error while accessing the file system occurred.")
+#define STR_ONL_ONE_COLUMN_PER_INDEX            NC_("STR_ONL_ONE_COLUMN_PER_INDEX", "The index could not be created. Only one column per index is allowed.")
+#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE   NC_("STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE", "The index could not be created. The values are not unique.")
+#define STR_COULD_NOT_CREATE_INDEX              NC_("STR_COULD_NOT_CREATE_INDEX", "The index could not be created. An unknown error appeared.")
+#define STR_COULD_NOT_CREATE_INDEX_NAME         NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The file '$filename$' is used by an other index.")
+#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE      NC_("STR_COULD_NOT_CREATE_INDEX_KEYSIZE", "The index could not be created. The size of the chosen column is too big.")
+#define STR_SQL_NAME_ERROR                      NC_("STR_SQL_NAME_ERROR", "The name '$name$' doesn't match SQL naming constraints.")
+#define STR_COULD_NOT_DELETE_FILE               NC_("STR_COULD_NOT_DELETE_FILE", "The file $filename$ could not be deleted.")
+#define STR_INVALID_COLUMN_TYPE                 NC_("STR_INVALID_COLUMN_TYPE", "Invalid column type for column '$columnname$'.")
+#define STR_INVALID_COLUMN_PRECISION            NC_("STR_INVALID_COLUMN_PRECISION", "Invalid precision for column '$columnname$'.")
+#define STR_INVALID_PRECISION_SCALE             NC_("STR_INVALID_PRECISION_SCALE", "Precision is less than scale for column '$columnname$'.")
+#define STR_INVALID_COLUMN_NAME_LENGTH          NC_("STR_INVALID_COLUMN_NAME_LENGTH", "Invalid column name length for column '$columnname$'.")
+#define STR_DUPLICATE_VALUE_IN_COLUMN           NC_("STR_DUPLICATE_VALUE_IN_COLUMN", "Duplicate value found in column '$columnname$'.")
+#define STR_INVALID_COLUMN_DECIMAL_VALUE        NC_("STR_INVALID_COLUMN_DECIMAL_VALUE", "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed.")
+#define STR_COLUMN_NOT_ALTERABLE                NC_("STR_COLUMN_NOT_ALTERABLE", "The column '$columnname$' could not be altered. May be the file system is write protected.")
+#define STR_INVALID_COLUMN_VALUE                NC_("STR_INVALID_COLUMN_VALUE", "The column '$columnname$' could not be updated. The value is invalid for that column.")
+#define STR_COLUMN_NOT_ADDABLE                  NC_("STR_COLUMN_NOT_ADDABLE", "The column '$columnname$' could not be added. May be the file system is write protected.")
+#define STR_COLUMN_NOT_DROP                     NC_("STR_COLUMN_NOT_DROP", "The column at position '$position$' could not be dropped. May be the file system is write protected.")
+#define STR_TABLE_NOT_DROP                      NC_("STR_TABLE_NOT_DROP", "The table '$tablename$' could not be dropped. May be the file system is write protected.")
+#define STR_COULD_NOT_ALTER_TABLE               NC_("STR_COULD_NOT_ALTER_TABLE", "The table could not be altered.")
+#define STR_INVALID_DBASE_FILE                  NC_("STR_INVALID_DBASE_FILE", "The file '$filename$' is an invalid (or unrecognized) dBase file.")
+// Evoab2
+#define STR_CANNOT_OPEN_BOOK                    NC_("STR_CANNOT_OPEN_BOOK", "Cannot open Evolution address book.")
+#define STR_SORT_BY_COL_ONLY                    NC_("STR_SORT_BY_COL_ONLY", "Can only sort by table columns.")
+// File
+#define STR_QUERY_COMPLEX_COUNT                 NC_("STR_QUERY_COMPLEX_COUNT", "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported.")
+#define STR_QUERY_INVALID_BETWEEN               NC_("STR_QUERY_INVALID_BETWEEN", "The query can not be executed. The 'BETWEEN' arguments are not correct.")
+#define STR_QUERY_FUNCTION_NOT_SUPPORTED        NC_("STR_QUERY_FUNCTION_NOT_SUPPORTED", "The query can not be executed. The function is not supported.")
+#define STR_TABLE_READONLY                      NC_("STR_TABLE_READONLY", "The table can not be changed. It is read only.")
+#define STR_DELETE_ROW                          NC_("STR_DELETE_ROW", "The row could not be deleted. The option \"Display inactive records\" is set.")
+#define STR_ROW_ALREADY_DELETED                 NC_("STR_ROW_ALREADY_DELETED", "The row could not be deleted. It is already deleted.")
+#define STR_QUERY_MORE_TABLES                   NC_("STR_QUERY_MORE_TABLES", "The query can not be executed. It contains more than one table.")
+#define STR_QUERY_NO_TABLE                      NC_("STR_QUERY_NO_TABLE", "The query can not be executed. It contains no valid table.")
+#define STR_QUERY_NO_COLUMN                     NC_("STR_QUERY_NO_COLUMN", "The query can not be executed. It contains no valid columns.")
+#define STR_INVALID_PARA_COUNT                  NC_("STR_INVALID_PARA_COUNT", "The count of the given parameter values doesn't match the parameters.")
+#define STR_NO_VALID_FILE_URL                   NC_("STR_NO_VALID_FILE_URL", "The URL '$URL$' is not valid. A connection can not be created.")
+#define STR_NO_CLASSNAME                        NC_("STR_NO_CLASSNAME", "The driver class '$classname$' could not be loaded.")
+#define STR_NO_JAVA                             NC_("STR_NO_JAVA", "No Java installation could be found. Please check your installation.")
+#define STR_NO_RESULTSET                        NC_("STR_NO_RESULTSET", "The execution of the query doesn't return a valid result set.")
+#define STR_NO_ROWCOUNT                         NC_("STR_NO_ROWCOUNT", "The execution of the update statement doesn't effect any rows.")
+#define STR_NO_CLASSNAME_PATH                   NC_("STR_NO_CLASSNAME_PATH", "The additional driver class path is '$classpath$'.")
+#define STR_UNKNOWN_PARA_TYPE                   NC_("STR_UNKNOWN_PARA_TYPE", "The type of parameter at position '$position$' is unknown.")
+#define STR_UNKNOWN_COLUMN_TYPE                 NC_("STR_UNKNOWN_COLUMN_TYPE", "The type of column at position '$position$' is unknown.")
+// KAB
+#define STR_NO_KDE_INST                         NC_("STR_NO_KDE_INST", "No suitable KDE installation was found.")
+#define STR_KDE_VERSION_TOO_OLD                 NC_("STR_KDE_VERSION_TOO_OLD", "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.")
+#define STR_KDE_VERSION_TOO_NEW                 NC_("STR_KDE_VERSION_TOO_NEW", "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n")
+#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND     NC_("STR_KDE_VERSION_TOO_NEW_WORK_AROUND", "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n")
+#define STR_PARA_ONLY_PREPARED                  NC_("STR_PARA_ONLY_PREPARED", "Parameters can appear only in prepared statements.")
+// MACAB
+#define STR_NO_TABLE                            NC_("STR_NO_TABLE", "No such table!")
+#define STR_NO_MAC_OS_FOUND                     NC_("STR_NO_MAC_OS_FOUND", "No suitable Mac OS installation was found.")
+// hsqldb
+#define STR_NO_STORAGE                          NC_("STR_NO_STORAGE", "The connection can not be established. No storage or URL was given.")
+#define STR_INVALID_FILE_URL                    NC_("STR_INVALID_FILE_URL", "The given URL contains no valid local file system path. Please check the location of your database file.")
+#define STR_NO_TABLE_CONTAINER                  NC_("STR_NO_TABLE_CONTAINER", "An error occurred while obtaining the connection's table container.")
+#define STR_NO_TABLENAME                        NC_("STR_NO_TABLENAME", "There is no table named '$tablename$'.")
+#define STR_NO_DOCUMENTUI                       NC_("STR_NO_DOCUMENTUI", "The provided DocumentUI is not allowed to be NULL.")
+#define STR_ERROR_NEW_VERSION                   NC_("STR_ERROR_NEW_VERSION", "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.")
+
+#define STR_ROW_SET_OPERATION_VETOED            NC_("STR_ROW_SET_OPERATION_VETOED", "The record operation has been vetoed.")
+#define STR_PARSER_CYCLIC_SUB_QUERIES           NC_("STR_PARSER_CYCLIC_SUB_QUERIES", "The statement contains a cyclic reference to one or more sub queries.")
+#define STR_DB_OBJECT_NAME_WITH_SLASHES         NC_("STR_DB_OBJECT_NAME_WITH_SLASHES", "The name must not contain any slashes ('/').")
+#define STR_DB_INVALID_SQL_NAME                 NC_("STR_DB_INVALID_SQL_NAME", "$1$ is no SQL conform identifier.")
+#define STR_DB_QUERY_NAME_WITH_QUOTES           NC_("STR_DB_QUERY_NAME_WITH_QUOTES", "Query names must not contain quote characters.")
+#define STR_DB_OBJECT_NAME_IS_USED              NC_("STR_DB_OBJECT_NAME_IS_USED", "The name '$1$' is already in use in the database.")
+#define STR_DB_NOT_CONNECTED                    NC_("STR_DB_NOT_CONNECTED", "No connection to the database exists.")
+#define STR_AB_ADDRESSBOOK_NOT_FOUND            NC_("STR_AB_ADDRESSBOOK_NOT_FOUND", "No $1$ exists.")
+#define STR_DATA_CANNOT_SELECT_UNFILTERED       NC_("STR_DATA_CANNOT_SELECT_UNFILTERED", "Unable to display the complete table content. Please apply a filter.")
+
+#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx
index a514191d4488..c81b2a08b74b 100644
--- a/connectivity/inc/strings.hxx
+++ b/connectivity/inc/strings.hxx
@@ -12,62 +12,65 @@
 
 // = log messages for the JDBC driver
 
-#define STR_LOG_DRIVER_CONNECTING_URL       "jdbcBridge: connecting to URL '$1$'"
-#define STR_LOG_DRIVER_SUCCESS              "jdbcBridge: success"
-#define STR_LOG_CREATE_STATEMENT            "c$1$: creating statement"
-#define STR_LOG_CREATED_STATEMENT_ID        "c$1$: created statement, statement id: s$2$"
-#define STR_LOG_PREPARE_STATEMENT           "c$1$: preparing statement: $2$"
-#define STR_LOG_PREPARED_STATEMENT_ID       "c$1$: prepared statement, statement id: s$2$"
-#define STR_LOG_PREPARE_CALL                "c$1$: preparing call: $2$"
-#define STR_LOG_PREPARED_CALL_ID            "c$1$: prepared call, statement id: s$2$"
-#define STR_LOG_NATIVE_SQL                  "c$1$: native SQL: $2$ -> $3$"
-#define STR_LOG_LOADING_DRIVER              "c$1$: attempting to load driver class $2$"
-#define STR_LOG_NO_DRIVER_CLASS             "c$1$: no Java Driver Class was provided"
-#define STR_LOG_CONN_SUCCESS                "c$1$: success"
-#define STR_LOG_NO_SYSTEM_CONNECTION        "c$1$: JDBC driver did not provide a JDBC connection"
-#define STR_LOG_GOT_JDBC_CONNECTION         "c$1$: obtained a JDBC connection for $2$"
-#define STR_LOG_SHUTDOWN_CONNECTION         "c$1$: shutting down connection"
-#define STR_LOG_GENERATED_VALUES            "s$1$: retrieving generated values"
-#define STR_LOG_GENERATED_VALUES_FALLBACK   "s$1$: getGeneratedValues: falling back to statement: $2$"
-#define STR_LOG_EXECUTE_STATEMENT           "s$1$: going to execute: $2$"
-#define STR_LOG_EXECUTE_QUERY               "s$1$: going to execute query: $2$"
-#define STR_LOG_CLOSING_STATEMENT           "s$1$: closing/disposing statement"
-#define STR_LOG_EXECUTE_UPDATE              "s$1$: going to execute update: $2$"
-#define STR_LOG_UPDATE_COUNT                "s$1$: update count: $2$"
-#define STR_LOG_RESULT_SET_CONCURRENCY      "s$1$: going to set result set concurrency: $2$"
-#define STR_LOG_RESULT_SET_TYPE             "s$1$: going to set result set type: $2$"
-#define STR_LOG_FETCH_DIRECTION             "s$1$: fetch direction: $2$"
-#define STR_LOG_FETCH_SIZE                  "s$1$: fetch size: $2$"
-#define STR_LOG_SET_ESCAPE_PROCESSING       "s$1$: going to set escape processing: $2$"
-#define STR_LOG_EXECUTING_PREPARED          "s$1$: executing previously prepared statement"
-#define STR_LOG_EXECUTING_PREPARED_UPDATE   "s$1$: executing previously prepared update statement"
-#define STR_LOG_EXECUTING_PREPARED_QUERY    "s$1$: executing previously prepared query"
-#define STR_LOG_STRING_PARAMETER            "s$1$: parameter no. $2$: type: string; value: $3$"
-#define STR_LOG_BOOLEAN_PARAMETER           "s$1$: parameter no. $2$: type: boolean; value: $3$"
-#define STR_LOG_BYTE_PARAMETER              "s$1$: parameter no. $2$: type: byte; value: $3$"
-#define STR_LOG_DATE_PARAMETER              "s$1$: parameter no. $2$: type: date; value: $3$"
-#define STR_LOG_TIME_PARAMETER              "s$1$: parameter no. $2$: type: time; value: $3$"
-#define STR_LOG_TIMESTAMP_PARAMETER         "s$1$: parameter no. $2$: type: timestamp; value: $3$"
-#define STR_LOG_DOUBLE_PARAMETER            "s$1$: parameter no. $2$: type: double; value: $3$"
-#define STR_LOG_FLOAT_PARAMETER             "s$1$: parameter no. $2$: type: float; value: $3$"
-#define STR_LOG_INT_PARAMETER               "s$1$: parameter no. $2$: type: int; value: $3$"
-#define STR_LOG_LONG_PARAMETER              "s$1$: parameter no. $2$: type: long; value: $3$"
-#define STR_LOG_NULL_PARAMETER              "s$1$: parameter no. $2$: sql-type: $3$; value: null"
-#define STR_LOG_OBJECT_NULL_PARAMETER       "s$1$: parameter no. $2$: setting to null"
-#define STR_LOG_SHORT_PARAMETER             "s$1$: parameter no. $2$: type: short; value: $3$"
-#define STR_LOG_BYTES_PARAMETER             "s$1$: parameter no. $2$: type: byte[]"
-#define STR_LOG_CHARSTREAM_PARAMETER        "s$1$: parameter no. $2$: type: character stream"
-#define STR_LOG_BINARYSTREAM_PARAMETER      "s$1$: parameter no. $2$: type: binary stream"
-#define STR_LOG_CLEAR_PARAMETERS            "s$1$: clearing all parameters"
-#define STR_LOG_META_DATA_METHOD            "c$1$: entering XDatabaseMetaData::$2$"
-#define STR_LOG_META_DATA_METHOD_ARG1       "c$1$: entering XDatabaseMetaData::$2$( '$3$' )"
-#define STR_LOG_META_DATA_METHOD_ARG2       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )"
-#define STR_LOG_META_DATA_METHOD_ARG3       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )"
-#define STR_LOG_META_DATA_METHOD_ARG4       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )"
-#define STR_LOG_META_DATA_RESULT            "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$"
-#define STR_LOG_META_DATA_SUCCESS           "c$1$: leaving XDatabaseMetaData::$2$: success"
-#define STR_LOG_THROWING_EXCEPTION          "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$"
-#define STR_LOG_SETTING_SYSTEM_PROPERTY     "setting system property \"$1$\" to value \"$2$\""
+#define STR_LOG_DRIVER_CONNECTING_URL           "jdbcBridge: connecting to URL '$1$'"
+#define STR_LOG_DRIVER_SUCCESS                  "jdbcBridge: success"
+#define STR_LOG_CREATE_STATEMENT                "c$1$: creating statement"
+#define STR_LOG_CREATED_STATEMENT_ID            "c$1$: created statement, statement id: s$2$"
+#define STR_LOG_PREPARE_STATEMENT               "c$1$: preparing statement: $2$"
+#define STR_LOG_PREPARED_STATEMENT_ID           "c$1$: prepared statement, statement id: s$2$"
+#define STR_LOG_PREPARE_CALL                    "c$1$: preparing call: $2$"
+#define STR_LOG_PREPARED_CALL_ID                "c$1$: prepared call, statement id: s$2$"
+#define STR_LOG_NATIVE_SQL                      "c$1$: native SQL: $2$ -> $3$"
+#define STR_LOG_LOADING_DRIVER                  "c$1$: attempting to load driver class $2$"
+#define STR_LOG_NO_DRIVER_CLASS                 "c$1$: no Java Driver Class was provided"
+#define STR_LOG_CONN_SUCCESS                    "c$1$: success"
+#define STR_LOG_NO_SYSTEM_CONNECTION            "c$1$: JDBC driver did not provide a JDBC connection"
+#define STR_LOG_GOT_JDBC_CONNECTION             "c$1$: obtained a JDBC connection for $2$"
+#define STR_LOG_SHUTDOWN_CONNECTION             "c$1$: shutting down connection"
+#define STR_LOG_GENERATED_VALUES                "s$1$: retrieving generated values"
+#define STR_LOG_GENERATED_VALUES_FALLBACK       "s$1$: getGeneratedValues: falling back to statement: $2$"
+#define STR_LOG_EXECUTE_STATEMENT               "s$1$: going to execute: $2$"
+#define STR_LOG_EXECUTE_QUERY                   "s$1$: going to execute query: $2$"
+#define STR_LOG_CLOSING_STATEMENT               "s$1$: closing/disposing statement"
+#define STR_LOG_EXECUTE_UPDATE                  "s$1$: going to execute update: $2$"
+#define STR_LOG_UPDATE_COUNT                    "s$1$: update count: $2$"
+#define STR_LOG_RESULT_SET_CONCURRENCY          "s$1$: going to set result set concurrency: $2$"
+#define STR_LOG_RESULT_SET_TYPE                 "s$1$: going to set result set type: $2$"
+#define STR_LOG_FETCH_DIRECTION                 "s$1$: fetch direction: $2$"
+#define STR_LOG_FETCH_SIZE                      "s$1$: fetch size: $2$"
+#define STR_LOG_SET_ESCAPE_PROCESSING           "s$1$: going to set escape processing: $2$"
+#define STR_LOG_EXECUTING_PREPARED              "s$1$: executing previously prepared statement"
+#define STR_LOG_EXECUTING_PREPARED_UPDATE       "s$1$: executing previously prepared update statement"
+#define STR_LOG_EXECUTING_PREPARED_QUERY        "s$1$: executing previously prepared query"
+#define STR_LOG_STRING_PARAMETER                "s$1$: parameter no. $2$: type: string; value: $3$"
+#define STR_LOG_BOOLEAN_PARAMETER               "s$1$: parameter no. $2$: type: boolean; value: $3$"
+#define STR_LOG_BYTE_PARAMETER                  "s$1$: parameter no. $2$: type: byte; value: $3$"
+#define STR_LOG_DATE_PARAMETER                  "s$1$: parameter no. $2$: type: date; value: $3$"
+#define STR_LOG_TIME_PARAMETER                  "s$1$: parameter no. $2$: type: time; value: $3$"
+#define STR_LOG_TIMESTAMP_PARAMETER             "s$1$: parameter no. $2$: type: timestamp; value: $3$"
+#define STR_LOG_DOUBLE_PARAMETER                "s$1$: parameter no. $2$: type: double; value: $3$"
+#define STR_LOG_FLOAT_PARAMETER                 "s$1$: parameter no. $2$: type: float; value: $3$"
+#define STR_LOG_INT_PARAMETER                   "s$1$: parameter no. $2$: type: int; value: $3$"
+#define STR_LOG_LONG_PARAMETER                  "s$1$: parameter no. $2$: type: long; value: $3$"
+#define STR_LOG_NULL_PARAMETER                  "s$1$: parameter no. $2$: sql-type: $3$; value: null"
+#define STR_LOG_OBJECT_NULL_PARAMETER           "s$1$: parameter no. $2$: setting to null"
+#define STR_LOG_SHORT_PARAMETER                 "s$1$: parameter no. $2$: type: short; value: $3$"
+#define STR_LOG_BYTES_PARAMETER                 "s$1$: parameter no. $2$: type: byte[]"
+#define STR_LOG_CHARSTREAM_PARAMETER            "s$1$: parameter no. $2$: type: character stream"
+#define STR_LOG_BINARYSTREAM_PARAMETER          "s$1$: parameter no. $2$: type: binary stream"
+#define STR_LOG_CLEAR_PARAMETERS                "s$1$: clearing all parameters"
+#define STR_LOG_META_DATA_METHOD                "c$1$: entering XDatabaseMetaData::$2$"
+#define STR_LOG_META_DATA_METHOD_ARG1           "c$1$: entering XDatabaseMetaData::$2$( '$3$' )"
+#define STR_LOG_META_DATA_METHOD_ARG2           "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )"
+#define STR_LOG_META_DATA_METHOD_ARG3           "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )"
+#define STR_LOG_META_DATA_METHOD_ARG4           "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )"
+#define STR_LOG_META_DATA_RESULT                "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$"
+#define STR_LOG_META_DATA_SUCCESS               "c$1$: leaving XDatabaseMetaData::$2$: success"
+#define STR_LOG_THROWING_EXCEPTION              "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$"
+#define STR_LOG_SETTING_SYSTEM_PROPERTY         "setting system property \"$1$\" to value \"$2$\""
+
+#define STR_DB_NOT_CONNECTED_STATE              "08003"
+#define STR_DATA_CANNOT_SELECT_UNFILTERED_STATE "IM001"
 
 #endif
 
diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx
index 4c01fc73da1f..311ef6f11687 100644
--- a/connectivity/qa/connectivity/ado/DriverTest.cxx
+++ b/connectivity/qa/connectivity/ado/DriverTest.cxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 
 using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index d8e847711f8d..afc1a8bce50c 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "TConnection.hxx"
 
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index febc53170355..15bcf67f4929 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -21,7 +21,6 @@
 #include "TConnection.hxx"
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/types.hxx>
-#include <comphelper/officeresourcebundle.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity;
@@ -76,11 +75,11 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId()
     return s_aPropertyNameMap;
 }
 
-void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext )
+void OMetaConnection::throwGenericSQLException(const char* pErrorResourceId, const Reference< XInterface>& _xContext )
 {
     OUString sErrorMessage;
-    if ( _nErrorResourceId )
-        sErrorMessage = m_aResources.getResourceString( _nErrorResourceId );
+    if (pErrorResourceId)
+        sErrorMessage = m_aResources.getResourceString(pErrorResourceId);
     Reference< XInterface> xContext = _xContext;
     if ( !xContext.is() )
         xContext = *this;
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 92728dfc1406..599f031dbc95 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/evtlistenerhlp.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 #include <sal/macros.h>
 
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 85a9827cbc3a..e9cdce9c7ca4 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -26,14 +26,11 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
-
 namespace dbtools
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::sdbc;
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index bdb7f033debb..27acbe743234 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -21,7 +21,7 @@
 #include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/DriversConfig.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 37e69c7f9d74..16c3d9b7782e 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -79,7 +79,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <connectivity/OSubComponent.hxx>
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 6f829f4f272b..3db5b431bd35 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -23,7 +23,7 @@
 #include <connectivity/SQLStatementHelper.hxx>
 #include <unotools/confignode.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index bcb2fd2e5634..01e07b26721f 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -22,15 +22,19 @@
 #include <connectivity/sqlerror.hxx>
 
 #include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdb/ErrorCondition.hpp>
 
-#include <comphelper/officeresourcebundle.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
 
+#include <strings.hrc>
+#include <strings.hxx>
 #include <string.h>
 
-
 namespace connectivity
 {
 
@@ -69,7 +73,7 @@ namespace connectivity
                 impl_getErrorMessage( ErrorCondition _eCondition );
 
         /// returns the SQLState associated with the given error condition
-        OUString
+        static OUString
                 impl_getSQLState( ErrorCondition _eCondition );
 
         /// returns an SQLException describing the given error condition
@@ -83,13 +87,12 @@ namespace connectivity
     private:
         ::osl::Mutex                                            m_aMutex;
         Reference<XComponentContext>                            m_aContext;
-        std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
+        std::unique_ptr<std::locale>                            m_xResources;
         bool                                                    m_bAttemptedInit;
     };
 
     SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
         :m_aContext( _rxContext )
-        ,m_pResources( )
         ,m_bAttemptedInit( false )
     {
     }
@@ -120,16 +123,45 @@ namespace connectivity
                 _rMessage = _rMessage.replaceAt( nIndex, nPlaceholderLen, *rParamValue );
         }
 
+        const char* lcl_getResourceErrorID(const ErrorCondition _eCondition)
+        {
+            switch (_eCondition)
+            {
+                case css::sdb::ErrorCondition::ROW_SET_OPERATION_VETOED:
+                    return STR_ROW_SET_OPERATION_VETOED;
+                case css::sdb::ErrorCondition::PARSER_CYCLIC_SUB_QUERIES:
+                    return STR_PARSER_CYCLIC_SUB_QUERIES;
+                case css::sdb::ErrorCondition::DB_OBJECT_NAME_WITH_SLASHES:
+                    return STR_DB_OBJECT_NAME_WITH_SLASHES;
+                case css::sdb::ErrorCondition::DB_INVALID_SQL_NAME:
+                    return STR_DB_INVALID_SQL_NAME;
+                case css::sdb::ErrorCondition::DB_QUERY_NAME_WITH_QUOTES:
+                    return STR_DB_QUERY_NAME_WITH_QUOTES;
+                case css::sdb::ErrorCondition::DB_OBJECT_NAME_IS_USED:
+                    return STR_DB_OBJECT_NAME_IS_USED;
+                case css::sdb::ErrorCondition::DB_NOT_CONNECTED:
+                    return STR_DB_NOT_CONNECTED;
+                case css::sdb::ErrorCondition::AB_ADDRESSBOOK_NOT_FOUND:
+                    return STR_AB_ADDRESSBOOK_NOT_FOUND;
+                case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED:
+                    return STR_DATA_CANNOT_SELECT_UNFILTERED;
+            }
+            return nullptr;
+        }
 
-        sal_Int32   lcl_getResourceID( const ErrorCondition _eCondition, bool _bSQLState )
+        OUString lcl_getResourceState(const ErrorCondition _eCondition)
         {
-            return  256
-                +   2 * ::sal::static_int_cast< sal_Int32, ErrorCondition >( _eCondition )
-                +   ( _bSQLState ? 1 : 0 );
+            switch (_eCondition)
+            {
+                case css::sdb::ErrorCondition::DB_NOT_CONNECTED:
+                    return OUString(STR_DB_NOT_CONNECTED_STATE);
+                case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED:
+                    return OUString(STR_DATA_CANNOT_SELECT_UNFILTERED_STATE);
+            }
+            return OUString();
         }
     }
 
-
     OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         OUString sErrorMessage( impl_getErrorMessage( _eCondition ) );
@@ -173,7 +205,6 @@ namespace connectivity
         );
     }
 
-
     void SQLError_Impl::raiseTypedException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -191,14 +222,12 @@ namespace connectivity
         ::cppu::throwException( aException );
     }
 
-
     SQLException SQLError_Impl::getSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         return impl_buildSQLException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-
     SQLException SQLError_Impl::impl_buildSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -211,14 +240,13 @@ namespace connectivity
         );
     }
 
-
     OUString SQLError_Impl::impl_getErrorMessage( ErrorCondition _eCondition )
     {
         OUStringBuffer aMessage;
 
         if ( impl_initResources() )
         {
-            OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
+            OUString sResMessage(Translate::get(lcl_getResourceErrorID(_eCondition), *m_xResources));
             OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
             aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
         }
@@ -226,37 +254,26 @@ namespace connectivity
         return aMessage.makeStringAndClear();
     }
 
-
     OUString SQLError_Impl::impl_getSQLState( ErrorCondition _eCondition )
     {
-        OUString sState;
-
-        if ( impl_initResources() )
-        {
-            sal_Int32 nResourceId( lcl_getResourceID( _eCondition, true ) );
-            if ( m_pResources->hasString( nResourceId ) )
-                sState = m_pResources->loadString( nResourceId );
-        }
-
-        if ( sState.isEmpty() )
+        OUString sState = lcl_getResourceState(_eCondition);
+        if (sState.isEmpty())
             sState = OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) );
-
         return sState;
     }
 
-
     bool SQLError_Impl::impl_initResources()
     {
-        if ( m_pResources.get() )
+        if (m_xResources.get())
             return true;
-        if ( m_bAttemptedInit )
+        if (m_bAttemptedInit)
             return false;
 
         ::osl::MutexGuard aGuard( m_aMutex );
         m_bAttemptedInit = true;
 
-        m_pResources.reset( new ::comphelper::OfficeResourceBundle( m_aContext, "sdberr" ) );
-        return m_pResources.get() != nullptr;
+        m_xResources.reset(new std::locale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag())));
+        return m_xResources.get() != nullptr;
     }
 
     SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 9f5e819f022f..0361972e48a1 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -29,7 +29,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <algorithm>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::ado;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 8c1431cf6c01..b7c39c7e5550 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -31,7 +31,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace dbtools;
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index efda9a97820d..741dc13878da 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 #include <objbase.h>
 
 #include "resource/sharedresources.hxx"
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 2611ace16372..3b5df3c5e486 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -27,7 +27,7 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 5bf8937af21f..732c0a0b4ffe 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -26,7 +26,8 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
+
 using namespace ::comphelper;
 
 
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 63a45cc6d31f..e12e7379c66f 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -28,7 +28,7 @@
 #include "ado/Awrapado.hxx"
 #include <comphelper/property.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 4d8206a93508..497a721de03d 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 #include <limits>
 
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 6f0a502642fb..0c848f21de78 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -31,7 +31,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::cppu;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 74c22bd520d5..d9948573a426 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -26,7 +26,7 @@
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index d15fbf631657..a67e072cc30b 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -26,7 +26,7 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index f7ac7b5f5694..319b02ad6f52 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include "resource/sharedresources.hxx"
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
 #include <com/sun/star/bridge/oleautomation/Currency.hpp>
 #include <com/sun/star/bridge/oleautomation/SCode.hpp>
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 52177bff82ac..e82aafc6df23 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -21,7 +21,6 @@
 #include "calc/CDatabaseMetaData.hxx"
 #include "calc/CCatalog.hxx"
 #include "calc/CDriver.hxx"
-#include "resource/calc_res.hrc"
 #include "resource/sharedresources.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -33,6 +32,7 @@
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
+#include "strings.hrc"
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 4ac9899e5042..67247c1e789d 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -22,8 +22,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/calc_res.hrc"
 #include <comphelper/processfactory.hxx>
+#include "strings.hrc"
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 39a672f35840..d99efd817622 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -21,7 +21,7 @@
 #include "dbase/DConnection.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 4063c79576bb..0c80d1c82a59 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include "dbase/DResultSet.hxx"
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <unotools/sharedunocomponent.hxx>
 
 using namespace ::comphelper;
@@ -475,12 +475,12 @@ bool ODbaseIndex::DropImpl()
     return true;
 }
 
-void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile)
+void ODbaseIndex::impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile)
 {
     closeImpl();
     if(UCBContentHelper::Exists(_sFile))
         UCBContentHelper::Kill(_sFile);
-    m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
+    m_pTable->getConnection()->throwGenericSQLException(pErrorId, *this);
 }
 
 bool ODbaseIndex::CreateImpl()
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f1a722615335..aa772d66b5ab 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -22,7 +22,7 @@
 #include <connectivity/dbexception.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/types.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index af17e616f5fa..0f544ed70cca 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -26,7 +26,7 @@
 #include "dbase/DIndexIter.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 9d452e66b85b..d2a0476728f5 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -50,7 +50,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <rtl/strbuf.hxx>
 
 #include <algorithm>
@@ -1106,7 +1106,7 @@ bool ODbaseTable::CreateImpl()
     return true;
 }
 
-void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUString& _sColumnName)
+void ODbaseTable::throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName)
 {
     try
     {
@@ -1118,7 +1118,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUStr
     }
 
     const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
-            _nErrorId,
+            pErrorId,
             "$columnname$", _sColumnName
          ) );
     ::dbtools::throwGenericSQLException( sError, *this );
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 787226e2ed84..57e7abbd9878 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include "dbase/DCatalog.hxx"
 #include <comphelper/types.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 661071b3c773..2b661ac21663 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/content.hxx>
 #include <signal.h>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace osl;
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index e656737eef90..aca19f300e72 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d33c8f2a4512..83b05ef3fb18 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -22,7 +22,7 @@
 #include "NConnection.hxx"
 #include "NResultSet.hxx"
 #include "propertyids.hxx"
-#include "resource/evoab2_res.hrc"
+#include "strings.hrc"
 #include "TSortIndex.hxx"
 #include <algorithm>
 
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 8e0fda36dcbc..5f7f297bb8ca 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -21,7 +21,7 @@
 #include "NDatabaseMetaData.hxx"
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "resource/evoab2_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 361eafcfc1bf..58225437ace1 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -30,9 +30,8 @@
 #include "NConnection.hxx"
 #include "NDatabaseMetaData.hxx"
 #include "NResultSet.hxx"
-#include "resource/evoab2_res.hrc"
 #include "sqlbison.hxx"
-#include <resource/common_res.hrc>
+#include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index dfcfada4cbe8..84a56e529225 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -40,7 +40,7 @@
 #include <connectivity/dbexception.hxx>
 #include <osl/thread.h>
 #include <osl/nlsupport.h>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::file;
 using namespace dbtools;
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 2a99cb1b02ce..2fc1f1d7b1f3 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index c5382afe218d..d1d126bc8f7c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -33,7 +33,7 @@
 #include <connectivity/PColumn.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace comphelper;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 95d06a06fb3c..96ea61692aa8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -46,9 +46,8 @@
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
-#include "resource/file_res.hrc"
 #include "resource/sharedresources.hxx"
-
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -64,10 +63,10 @@ using namespace com::sun::star::container;
 
 namespace
 {
-    void lcl_throwError(sal_uInt16 _nErrorId,const css::uno::Reference< css::uno::XInterface>& _xContext)
+    void lcl_throwError(const char* pErrorId, const css::uno::Reference< css::uno::XInterface>& _xContext)
     {
         ::connectivity::SharedResources aResources;
-        const OUString sMessage = aResources.getResourceString(_nErrorId);
+        const OUString sMessage = aResources.getResourceString(pErrorId);
         ::dbtools::throwGenericSQLException(sMessage ,_xContext);
     }
 }
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 8be612d01b1e..ec86d0a28603 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -34,7 +34,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 #include <algorithm>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 6aadc6319381..4e7d5f16175d 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -24,7 +24,7 @@
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/dbexception.hxx>
 #include "file/FConnection.hxx"
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace ::connectivity;
 using namespace ::connectivity::file;
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 65d6e400e1ca..1853b8caeca7 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -29,12 +29,12 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#include "resource/file_res.hrc"
 #include "file/FStringFunctions.hxx"
 #include "file/FDateFunctions.hxx"
 #include "file/FNumericFunctions.hxx"
 #include "file/FConnection.hxx"
 #include "sqlbison.hxx"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 9ab99a1b530e..f6807cf2bbe1 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -43,8 +43,7 @@
 
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlparse.hxx>
-#include <resource/common_res.hrc>
-#include <resource/hsqldb_res.hrc>
+#include <strings.hrc>
 #include <resource/sharedresources.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 399afad3ddb5..99eafb987168 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -21,8 +21,7 @@
 #include "Driver.hxx"
 
 #include <connectivity/dbexception.hxx>
-#include <resource/common_res.hrc>
-#include <resource/hsqldb_res.hrc>
+#include <strings.hrc>
 #include <resource/sharedresources.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 8c1681a8cd26..7f5c66f6b262 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
 
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index fbb86796442f..056b888d1fea 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -41,7 +41,7 @@
 #include <tools/diagnose_ex.h>
 
 #include "resource/sharedresources.hxx"
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 
 using ::com::sun::star::util::XFlushListener;
 using ::com::sun::star::lang::EventObject;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index d86826fc6504..6acb9a6c35d9 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -49,7 +49,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index a73df49dec7a..55b636b48211 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include "TConnection.hxx"
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::hsqldb;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index d451148fc988..0f9ba8fb8f9e 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -42,7 +42,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <jni.h>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <unotools/confignode.hxx>
 #include "strings.hxx"
 
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 6bd2dd22ebd1..74513dd5ed76 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
 #include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 2dab49c56ebb..6763c985283c 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -31,7 +31,7 @@
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>
 #include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
 #include "strings.hxx"
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 9f64d1bd6680..94af450a1c2e 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
 
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 26d6dc812f1a..8b8e97c3fb20 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index e7e770d2a8fe..49d5ec92cfd8 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -23,7 +23,7 @@
 #include "propertyids.hxx"
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::macab;
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index ec72d269a7a8..eaf74c2776b0 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -31,7 +31,7 @@
 #include "TConnection.hxx"
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace cppu;
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 65ff01364635..6cdccdd9c460 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -23,7 +23,7 @@
 #include "MacabRecords.hxx"
 #include "MacabAddressBook.hxx"
 #include "macabutilities.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 208c75cc0130..53a58d4950c8 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -30,7 +30,7 @@
 #include "TConnection.hxx"
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace com::sun::star::uno;
@@ -46,10 +46,10 @@ namespace connectivity
 {
     namespace macab
     {
-    void impl_throwError(sal_uInt16 _nErrorId)
+    void impl_throwError(const char* pErrorId)
     {
         ::connectivity::SharedResources aResources;
-        const OUString sError( aResources.getResourceString(_nErrorId) );
+        const OUString sError( aResources.getResourceString(pErrorId) );
         ::dbtools::throwGenericSQLException(sError,nullptr);
     }
     }
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 6d401bc548ba..c384604e3514 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -134,7 +134,7 @@ namespace connectivity
             return dataType;
         }
 
-        void impl_throwError(sal_uInt16 _nErrorId);
+        void impl_throwError(const char* pErrorId);
     }
 }
 
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 06f21b944074..9c421095232a 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -16,8 +16,7 @@
 
 #include <connectivity/dbexception.hxx>
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 
@@ -354,7 +353,6 @@ void OConnection::disposing()
     m_xCatalog.clear();
 }
 
-
 Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -368,10 +366,9 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
     return xTab;
 }
 
-
 void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext )
 {
-    if ( _rError.getResId() != 0 )
+    if (_rError.getResId() != nullptr)
     {
         OSL_ENSURE( ( _rError.getErrorCondition() == 0 ),
             "OConnection::throwSQLException: unsupported error code combination!" );
@@ -405,12 +402,11 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
     throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext );
 }
 
-
-void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext )
+void OConnection::throwSQLException( const char* pErrorResourceId, const Reference< XInterface >& _rxContext )
 {
     ErrorDescriptor aError;
-    aError.setResId( _nErrorResourceId );
-    throwSQLException( aError, _rxContext );
+    aError.setResId(pErrorResourceId);
+    throwSQLException(aError, _rxContext);
 }
 
 } } // namespace connectivity::mork
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index d53b5671cb99..7c30b17ae098 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -97,7 +97,7 @@ namespace connectivity
             css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
 
             void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext );
-            void throwSQLException( const sal_uInt16 _nErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
+            void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 69f1fa1f9fbe..af42e314c41b 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -12,7 +12,7 @@
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <vector>
 
 #include "MDatabaseMetaDataHelper.hxx"
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx
index 6c1e6596de29..aa4c7c201572 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -27,33 +27,33 @@ namespace connectivity
         class ErrorDescriptor
         {
         private:
-            sal_uInt16      m_nErrorResourceId;
+            const char* m_pErrorResourceId;
             sal_Int32       m_nErrorCondition;
             OUString m_sParameter;
 
         public:
             ErrorDescriptor()
-                :m_nErrorResourceId(0)
+                :m_pErrorResourceId(nullptr)
                 ,m_nErrorCondition(0)
                 ,m_sParameter()
             {
             }
 
-            void setResId( const sal_uInt16 _nErrorResourceId )
+            void setResId(const char* pErrorResourceId)
             {
-                m_nErrorResourceId = _nErrorResourceId;
+                m_pErrorResourceId = pErrorResourceId;
             }
             void reset()
             {
-                m_nErrorResourceId = 0;
+                m_pErrorResourceId = nullptr;
                 m_nErrorCondition = 0;
             }
 
-            sal_uInt16 getResId() const                  { return m_nErrorResourceId; }
+            const char* getResId() const                  { return m_pErrorResourceId; }
             sal_Int32  getErrorCondition() const         { return m_nErrorCondition; }
             const OUString& getParameter() const  { return m_sParameter; }
 
-            bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); }
+            bool is() const { return ( m_pErrorResourceId != nullptr ) || ( m_nErrorCondition != 0 ); }
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 0d363249b63d..5e93429349b3 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <string.h>
 
-#include "resource/mork_res.hrc"
+#include "strings.hrc"
 
 #include <unotools/textsearch.hxx>
 
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index d6edffaac63a..b3bf3b790fc4 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -30,8 +30,7 @@
 #include "MResultSetMetaData.hxx"
 #include "FDatabaseMetaDataResultSet.hxx"
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 2a43e7b1323f..965fa5f2acc5 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -30,8 +30,7 @@
 #include "sqlbison.hxx"
 #include "MResultSet.hxx"
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 static ::osl::Mutex m_ThreadMutex;
 
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index a23b2ccd1aeb..68a29c2e7c9b 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -27,10 +27,9 @@
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
-
 namespace connectivity
 {
 
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 977b5bb0ea50..846f41ba8269 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::mysql;
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index 83b795fbbe4c..72ae9593c783 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -23,7 +23,7 @@
 #include "odbc/OTools.hxx"
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::odbc;
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index ca487c78bcef..b5e9ed498f52 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -35,7 +35,7 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/FValue.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/sqlparse.hxx>
 #include <memory>
 #include <type_traits>
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 6a038b66c1a9..795aad1c51b0 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -35,7 +35,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <algorithm>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 24963cce7f32..70fae3a0d04f 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -22,7 +22,7 @@
 #include "writer/WCatalog.hxx"
 #include "writer/WDriver.hxx"
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index 3406d8589434..ae6a08157390 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::file;
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index cc9ad49b1544..2a18da132d04 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -62,7 +62,7 @@ namespace connectivity
         rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; }
         const OUString&         getURL() const  { return m_sURL; }
         void             setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; }
-        void                    throwGenericSQLException( sal_uInt16 _nErrorResourceId,const css::uno::Reference< css::uno::XInterface>& _xContext  );
+        void                    throwGenericSQLException(const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface>& _xContext);
         const SharedResources& getResources() const { return m_aResources;}
 
         void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; }
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 9753c05a617c..47b157e21cfd 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -86,7 +86,7 @@ namespace connectivity
             OUString getCompletePath();
             void closeImpl();
             // Closes and kills the index file and throws an error
-            void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile);
+            void impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile);
         protected:
             virtual ~ODbaseIndex() override;
         public:
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 1166b691af1e..a80c0686c7d4 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -134,7 +134,7 @@ namespace connectivity
             /// @throws css::container::ElementExistException
             /// @throws css::uno::RuntimeException
             void SAL_CALL renameImpl( const OUString& newName );
-            void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName);
+            void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName);
 
         protected:
             virtual void FileClose() override;
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
deleted file mode 100644
index 8144bce7ea3d..000000000000
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ /dev/null
@@ -1,41 +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 CONNECTIVITY_RESOURCE_ADO_HRC
-#define CONNECTIVITY_RESOURCE_ADO_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the ado driver's resource strings
-
-#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR     ( STR_ADO_BASE +  1 )
-#define STR_INVALID_GROUP_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  2 )
-#define STR_INVALID_INDEX_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  3 )
-#define STR_INVALID_KEY_DESCRIPTOR_ERROR        ( STR_ADO_BASE +  4 )
-#define STR_INVALID_TABLE_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  5 )
-#define STR_INVALID_USER_DESCRIPTOR_ERROR       ( STR_ADO_BASE +  6 )
-#define STR_INVALID_VIEW_DESCRIPTOR_ERROR       ( STR_ADO_BASE +  7 )
-#define STR_VIEW_NO_COMMAND_ERROR               ( STR_ADO_BASE +  8 )
-#define STR_TYPE_NOT_CONVERT                    ( STR_ADO_BASE +  9 )
-#define STR_NO_CONNECTION                       ( STR_ADO_BASE + 10 )
-
-#endif // CONNECTIVITY_RESOURCE_ADO_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
deleted file mode 100644
index 343c983a99a7..000000000000
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ /dev/null
@@ -1,32 +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 CONNECTIVITY_RESOURCE_CALC_HRC
-#define CONNECTIVITY_RESOURCE_CALC_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE +    0 )
-
-#endif // CONNECTIVITY_RESOURCE_CALC_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
deleted file mode 100644
index 842e1cc4724a..000000000000
--- a/connectivity/source/inc/resource/common_res.hrc
+++ /dev/null
@@ -1,66 +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 CONNECTIVITY_RESOURCE_COMMON_HRC
-#define CONNECTIVITY_RESOURCE_COMMON_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-// = common strings
-
-#define STR_STRING_LENGTH_EXCEEDED              ( STR_COMMON_BASE +  1 )
-#define STR_CANNOT_CONVERT_STRING               ( STR_COMMON_BASE +  2 )
-#define STR_URI_SYNTAX_ERROR                    ( STR_COMMON_BASE +  3 )
-#define STR_COULD_NOT_LOAD_FILE                 ( STR_COMMON_BASE +  4 )
-#define STR_QUERY_TOO_COMPLEX                   ( STR_COMMON_BASE +  5 )
-#define STR_OPERATOR_TOO_COMPLEX                ( STR_COMMON_BASE +  6 )
-#define STR_QUERY_INVALID_LIKE_COLUMN           ( STR_COMMON_BASE +  7 )
-#define STR_QUERY_INVALID_LIKE_STRING           ( STR_COMMON_BASE +  8 )
-#define STR_QUERY_NOT_LIKE_TOO_COMPLEX          ( STR_COMMON_BASE +  9 )
-#define STR_QUERY_LIKE_WILDCARD                 ( STR_COMMON_BASE + 10 )
-#define STR_QUERY_LIKE_WILDCARD_MANY            ( STR_COMMON_BASE + 11 )
-#define STR_INVALID_COLUMNNAME                  ( STR_COMMON_BASE + 12 )
-#define STR_NO_CLASSNAME                        ( STR_COMMON_BASE + 13 )
-#define STR_NO_CLASSNAME_PATH                   ( STR_COMMON_BASE + 14 )
-#define STR_UNKNOWN_PARA_TYPE                   ( STR_COMMON_BASE + 15 )
-#define STR_INVALID_COLUMN_SELECTION            ( STR_COMMON_BASE + 16 )
-#define STR_PARA_ONLY_PREPARED                  ( STR_COMMON_BASE + 17 )
-#define STR_COLUMN_NOT_UPDATEABLE               ( STR_COMMON_BASE + 18 )
-#define STR_ROW_ALREADY_DELETED                 ( STR_COMMON_BASE + 19 )
-#define STR_UNKNOWN_COLUMN_TYPE                 ( STR_COMMON_BASE + 20 )
-#define STR_FORMULA_WRONG                       ( STR_COMMON_BASE + 21 )
-#define STR_NO_JAVA                             ( STR_COMMON_BASE + 22 )
-#define STR_NO_RESULTSET                        ( STR_COMMON_BASE + 23 )
-#define STR_NO_ROWCOUNT                         ( STR_COMMON_BASE + 24 )
-#define STR_ERRORMSG_SEQUENCE                   ( STR_COMMON_BASE + 25 )
-#define STR_INVALID_INDEX                       ( STR_COMMON_BASE + 26 )
-#define STR_UNSUPPORTED_FUNCTION                ( STR_COMMON_BASE + 27 )
-#define STR_UNSUPPORTED_FEATURE                 ( STR_COMMON_BASE + 28 )
-#define STR_INVALID_PARA_COUNT                  ( STR_COMMON_BASE + 30 )
-#define STR_PRIVILEGE_NOT_GRANTED               ( STR_COMMON_BASE + 31 )
-#define STR_PRIVILEGE_NOT_REVOKED               ( STR_COMMON_BASE + 32 )
-#define STR_INVALID_BOOKMARK                    ( STR_COMMON_BASE + 33 )
-#define STR_NO_ELEMENT_NAME                     ( STR_COMMON_BASE + 34 )
-#define STR_NO_INPUTSTREAM                      ( STR_COMMON_BASE + 35 )
-#define STR_WRONG_PARAM_INDEX                   ( STR_COMMON_BASE + 37 )
-#define STR_NO_CONNECTION_GIVEN                 ( STR_COMMON_BASE + 38 )
-
-#endif // CONNECTIVITY_RESOURCE_COMMON_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
deleted file mode 100644
index 54f0232825df..000000000000
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ /dev/null
@@ -1,52 +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 CONNECTIVITY_RESOURCE_DBASE_HRC
-#define CONNECTIVITY_RESOURCE_DBASE_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_COULD_NOT_DELETE_INDEX              ( STR_DBASE_BASE +    0 )
-#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE   ( STR_DBASE_BASE +    1 )
-#define STR_SQL_NAME_ERROR                      ( STR_DBASE_BASE +    2 )
-#define STR_COULD_NOT_DELETE_FILE               ( STR_DBASE_BASE +    3 )
-#define STR_INVALID_COLUMN_TYPE                 ( STR_DBASE_BASE +    4 )
-#define STR_INVALID_COLUMN_PRECISION            ( STR_DBASE_BASE +    5 )
-#define STR_INVALID_PRECISION_SCALE             ( STR_DBASE_BASE +    6 )
-#define STR_INVALID_COLUMN_NAME_LENGTH          ( STR_DBASE_BASE +    7 )
-#define STR_DUPLICATE_VALUE_IN_COLUMN           ( STR_DBASE_BASE +    8 )
-#define STR_INVALID_COLUMN_DECIMAL_VALUE        ( STR_DBASE_BASE +    9 )
-#define STR_COLUMN_NOT_ALTERABLE                ( STR_DBASE_BASE +   10 )
-#define STR_COLUMN_NOT_ADDABLE                  ( STR_DBASE_BASE +   11 )
-#define STR_COLUMN_NOT_DROP                     ( STR_DBASE_BASE +   12 )
-#define STR_COULD_NOT_ALTER_TABLE               ( STR_DBASE_BASE +   13 )
-#define STR_INVALID_DBASE_FILE                  ( STR_DBASE_BASE +   14 )
-#define STR_ONL_ONE_COLUMN_PER_INDEX            ( STR_DBASE_BASE +   15 )
-#define STR_COULD_NOT_CREATE_INDEX              ( STR_DBASE_BASE +   16 )
-#define STR_COULD_NOT_CREATE_INDEX_NAME         ( STR_DBASE_BASE +   17 )
-#define STR_INVALID_COLUMN_VALUE                ( STR_DBASE_BASE +   18 )
-#define STR_TABLE_NOT_DROP                      ( STR_DBASE_BASE +   19 )
-#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE      ( STR_DBASE_BASE +   20 )
-
-#endif // CONNECTIVITY_RESOURCE_DBASE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
deleted file mode 100644
index 6cb16db7e14f..000000000000
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ /dev/null
@@ -1,33 +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 CONNECTIVITY_RESOURCE_EVOAB2_HRC
-#define CONNECTIVITY_RESOURCE_EVOAB2_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_CANNOT_OPEN_BOOK    ( STR_EVOAB2_BASE +    0 )
-#define STR_SORT_BY_COL_ONLY    ( STR_EVOAB2_BASE +    1 )
-
-#endif // CONNECTIVITY_RESOURCE_CALC_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
deleted file mode 100644
index f7072f684974..000000000000
--- a/connectivity/source/inc/resource/file_res.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 CONNECTIVITY_RESOURCE_FILE_HRC
-#define CONNECTIVITY_RESOURCE_FILE_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the file driver's resource strings
-
-#define STR_QUERY_COMPLEX_COUNT         ( STR_FILE_BASE +    0 )
-#define STR_QUERY_INVALID_BETWEEN       ( STR_FILE_BASE +    1 )
-#define STR_TABLE_READONLY              ( STR_FILE_BASE +    2 )
-#define STR_DELETE_ROW                  ( STR_FILE_BASE +    3 )
-#define STR_NO_VALID_FILE_URL           ( STR_FILE_BASE +    4 )
-#define STR_QUERY_MORE_TABLES           ( STR_FILE_BASE +    5 )
-#define STR_QUERY_NO_TABLE              ( STR_FILE_BASE +    6 )
-#define STR_QUERY_NO_COLUMN             ( STR_FILE_BASE +    7 )
-#define STR_QUERY_FUNCTION_NOT_SUPPORTED ( STR_FILE_BASE +    8 )
-
-#endif // CONNECTIVITY_RESOURCE_FILE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
deleted file mode 100644
index 6065e6f8fb03..000000000000
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ /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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_HSQLDB_HRC
-#define CONNECTIVITY_RESOURCE_HSQLDB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the hsqldb driver's resource strings
-
-#define STR_NO_STORAGE              ( STR_HSQLDB_BASE +    0 )
-#define STR_INVALID_FILE_URL        ( STR_HSQLDB_BASE +    1 )
-#define STR_NO_TABLE_CONTAINER      ( STR_HSQLDB_BASE +    2 )
-#define STR_NO_TABLENAME            ( STR_HSQLDB_BASE +    4 )
-#define STR_NO_DOCUMENTUI           ( STR_HSQLDB_BASE +    5 )
-#define STR_ERROR_NEW_VERSION       ( STR_HSQLDB_BASE +    6 )
-
-#endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
deleted file mode 100644
index 188372b78512..000000000000
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ /dev/null
@@ -1,33 +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 CONNECTIVITY_RESOURCE_MACAB_HRC
-#define CONNECTIVITY_RESOURCE_MACAB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the macab driver's resource strings
-
-#define STR_NO_TABLE                    ( STR_MACAB_BASE +    0 )
-#define STR_NO_MAC_OS_FOUND             ( STR_MACAB_BASE +    1 )
-
-#endif // CONNECTIVITY_RESOURCE_MACAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc
deleted file mode 100644
index f69c136733be..000000000000
--- a/connectivity/source/inc/resource/mork_res.hrc
+++ /dev/null
@@ -1,41 +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 CONNECTIVITY_RESOURCE_MORK_HRC
-#define CONNECTIVITY_RESOURCE_MORK_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-// = the mozab driver's resource strings
-
-    // FREE
-#define STR_ERR_EXECUTING_QUERY             ( STR_MORK_BASE +   10 )
-#define STR_QUERY_INVALID_IS_NULL_COLUMN    ( STR_MORK_BASE +   15 )
-#define STR_ERROR_REFRESH_ROW               ( STR_MORK_BASE +   19 )
-#define STR_ILLEGAL_MOVEMENT                ( STR_MORK_BASE +   20 )
-#define STR_ERROR_GET_ROW                   ( STR_MORK_BASE +   21 )
-#define STR_COMMIT_ROW                      ( STR_MORK_BASE +   22 )
-#define STR_QUERY_AT_LEAST_ONE_TABLES       ( STR_MORK_BASE +   27 )
-#define STR_NO_COUNT_SUPPORT                ( STR_MORK_BASE +   28 )
-#define STR_STMT_TYPE_NOT_SUPPORTED         ( STR_MORK_BASE +   29 )
-#define STR_UNSPECIFIED_ERROR               ( STR_MORK_BASE +   31 )
-
-#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index f0cbaec43784..c284b4a9e59a 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -41,20 +41,20 @@ namespace connectivity
         ~SharedResources();
 
         /** loads a string from the shared resource file
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string
             @return
                 the string from the resource file
         */
         OUString
             getResourceString(
-                ResourceId _nResId
+                const char* pResId
             ) const;
 
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace
                 the ASCII string which is to search in the string. Must not be <NULL/>.
@@ -66,7 +66,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace,
                 const OUString& _rStringToSubstitute
             ) const;
@@ -74,7 +74,7 @@ namespace connectivity
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace1
                 the ASCII string (1) which is to search in the string. Must not be <NULL/>.
@@ -90,7 +90,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1,
                 const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2,
@@ -100,7 +100,7 @@ namespace connectivity
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace1
                 the ASCII string (1) which is to search in the string. Must not be <NULL/>.
@@ -120,7 +120,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1,
                 const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2,
@@ -131,7 +131,7 @@ namespace connectivity
 
         /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _aStringToSubstitutes
                 A list of substitutions.
@@ -139,7 +139,7 @@ namespace connectivity
             @return
                 the string from the resource file, with applied string substitution
         */
-        OUString getResourceStringWithSubstitution( ResourceId _nResId,
+        OUString getResourceStringWithSubstitution( const char* pResId,
                     const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const;
     };
 
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
deleted file mode 100644
index 13212649e40e..000000000000
--- a/connectivity/source/resource/conn_error_message.src
+++ /dev/null
@@ -1,92 +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 .
- */
-
-// note: the resource IDs of the strings herein *must* correspond to the
-// com::sun::star::sdb::ErrorCondition values.
-//
-// For a given error condition value n, the message string must have ID
-// <code>256 + 2*n</code>, and the SQL state string (if applicable) must
-// have ID <code>256 + 2*n + 1</code>.
-//
-// The messages must be localized, the SQL states must *not*.
-
-// ROW_SET_OPERATION_VETOED = 100
-String 256 + 2*100 + 0
-{
-    Text [ en-US ] = "The record operation has been vetoed.";
-};
-
-// PARSER_CYCLIC_SUB_QUERIES = 200
-String 256 + 2*200 + 0
-{
-    Text [ en-US ] = "The statement contains a cyclic reference to one or more sub queries.";
-};
-
-// DB_OBJECT_NAME_WITH_SLASHES = 300
-String 256 + 2*300 + 0
-{
-    Text [ en-US ] = "The name must not contain any slashes ('/').";
-};
-
-// DB_INVALID_SQL_NAME = 301
-String 256 + 2*301 + 0
-{
-    Text [ en-US ] = "$1$ is no SQL conform identifier.";
-};
-
-// DB_QUERY_NAME_WITH_QUOTES = 302
-String 256 + 2*302 + 0
-{
-    Text [ en-US ] = "Query names must not contain quote characters.";
-};
-
-// DB_OBJECT_NAME_IS_USED = 303
-String 256 + 2*303 + 0
-{
-    Text [ en-US ] = "The name '$1$' is already in use in the database.";
-};
-
-// DB_NOT_CONNECTED = 304
-String 256 + 2*304 + 0
-{
-    Text [ en-US ] = "No connection to the database exists.";
-};
-
-String 256 + 2*304 + 1
-{
-    Text = "08003";
-};
-
-String 256 + 2*500 + 0
-{
-    Text [ en-US ] = "No $1$ exists.";
-};
-
-// DATA_CANNOT_SELECT_UNFILTERED = 550
-String 256 + 2*550 + 0
-{
-    Text [ en-US ] = "Unable to display the complete table content. Please apply a filter.";
-};
-
-String 256 + 2*550 + 1
-{
-    Text = "IM001";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
deleted file mode 100644
index f199414aa1f4..000000000000
--- a/connectivity/source/resource/conn_shared_res.src
+++ /dev/null
@@ -1,493 +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 "resource/mork_res.hrc"
-#include "resource/macab_res.hrc"
-#include "resource/calc_res.hrc"
-#include "resource/ado_res.hrc"
-#include "resource/dbase_res.hrc"
-#include "resource/file_res.hrc"
-#include "resource/evoab2_res.hrc"
-#include "resource/kab_res.hrc"
-#include "resource/hsqldb_res.hrc"
-
-// = the mozab driver's resource strings
-
-String STR_ERR_EXECUTING_QUERY
-{
-    Text [ en-US ] = "An error occurred while executing the query.";
-};
-
-String STR_QUERY_AT_LEAST_ONE_TABLES
-{
-    Text [ en-US ] = "The query can not be executed. It needs at least one table.";
-};
-
-String STR_NO_COUNT_SUPPORT
-{
-    Text [ en-US ] = "The driver does not support the 'COUNT' function.";
-};
-
-String STR_STMT_TYPE_NOT_SUPPORTED
-{
-    Text [ en-US ] = "This statement type not supported by this database driver.";
-};
-
-String STR_UNSPECIFIED_ERROR
-{
-    Text [ en-US ] = "An unknown error occurred.";
-};
-
-String STR_ERROR_REFRESH_ROW
-{
-    Text [ en-US ] = "An error occurred while refreshing the current row.";
-};
-
-String STR_ERROR_GET_ROW
-{
-    Text [ en-US ] = "An error occurred while getting the current row.";
-};
-
-String STR_QUERY_INVALID_IS_NULL_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. The 'IS NULL' can only be used with a column name.";
-};
-
-String STR_ILLEGAL_MOVEMENT
-{
-    Text [ en-US ] = "Illegal cursor movement occurred.";
-};
-
-String STR_COMMIT_ROW
-{
-    Text [ en-US ] = "Please commit row '$position$' before update rows or insert new rows.";
-};
-
-// = common strings
-
-String STR_NO_CONNECTION_GIVEN
-{
-    Text [ en-US ] = "It doesn't exist a connection to the database.";
-};
-String STR_WRONG_PARAM_INDEX
-{
-    Text [ en-US ] = "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.";
-};
-String STR_NO_INPUTSTREAM
-{
-    Text [ en-US ] = "The input stream was not set.";
-};
-String STR_NO_ELEMENT_NAME
-{
-    Text [ en-US ] = "There is no element named '$name$'.";
-};
-String STR_INVALID_BOOKMARK
-{
-    Text [ en-US ] = "Invalid bookmark value";
-};
-String STR_PRIVILEGE_NOT_GRANTED
-{
-    Text [ en-US ] = "Privilege not granted: Only table privileges can be granted.";
-};
-String STR_PRIVILEGE_NOT_REVOKED
-{
-    Text [ en-US ] = "Privilege not revoked: Only table privileges can be revoked.";
-};
-
-String STR_ERRORMSG_SEQUENCE
-{
-    Text [ en-US ] = "Function sequence error.";
-};
-String STR_INVALID_INDEX
-{
-    Text [ en-US ] = "Invalid descriptor index.";
-};
-String STR_UNSUPPORTED_FUNCTION
-{
-    Text [ en-US ] = "The driver does not support the function '$functionname$'.";
-};
-String STR_UNSUPPORTED_FEATURE
-{
-    Text [ en-US ] = "The driver does not support the functionality for '$featurename$'. It is not implemented.";
-};
-String STR_FORMULA_WRONG
-{
-    Text [ en-US ] = "The formula for TypeInfoSettings is wrong!";
-};
-String STR_STRING_LENGTH_EXCEEDED
-{
-    Text [ en-US ] = "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.";
-};
-
-String STR_CANNOT_CONVERT_STRING
-{
-    Text [ en-US ] = "The string '$string$' cannot be converted using the encoding '$charset$'.";
-};
-
-String STR_URI_SYNTAX_ERROR
-{
-    Text [ en-US ] = "The connection URL is invalid.";
-};
-
-String STR_QUERY_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. It is too complex.";
-};
-String STR_OPERATOR_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. The operator is too complex.";
-};
-String STR_QUERY_INVALID_LIKE_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. You cannot use 'LIKE' with columns of this type.";
-};
-String STR_QUERY_INVALID_LIKE_STRING
-{
-    Text [ en-US ] = "The query can not be executed. 'LIKE' can be used with a string argument only.";
-};
-String STR_QUERY_NOT_LIKE_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. The 'NOT LIKE' condition is too complex.";
-};
-String STR_QUERY_LIKE_WILDCARD
-{
-    Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains wildcard in the middle.";
-};
-String STR_QUERY_LIKE_WILDCARD_MANY
-{
-    Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains too many wildcards.";
-};
-String STR_INVALID_COLUMNNAME
-{
-    Text [ en-US ] = "The column name '$columnname$' is not valid.";
-};
-String STR_INVALID_COLUMN_SELECTION
-{
-    Text [ en-US ] = "The statement contains an invalid selection of columns.";
-};
-String STR_COLUMN_NOT_UPDATEABLE
-{
-    Text [ en-US ] = "The column at position '$position$' could not be updated.";
-};
-
-String STR_COULD_NOT_LOAD_FILE
-{
-    Text [ en-US ] = "The file $filename$ could not be loaded.";
-};
-
-String STR_LOAD_FILE_ERROR_MESSAGE
-{
-    Text [ en-US ] = "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$";
-};
-
-// = the ado driver's resource strings
-
-String STR_TYPE_NOT_CONVERT
-{
-    Text [ en-US ] = "The type could not be converted.";
-};
-String STR_INVALID_COLUMN_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not append column: invalid column descriptor.";
-};
-
-String STR_INVALID_GROUP_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create group: invalid object descriptor.";
-};
-String STR_INVALID_INDEX_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create index: invalid object descriptor.";
-};
-String STR_INVALID_KEY_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create key: invalid object descriptor.";
-};
-
-String STR_INVALID_TABLE_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create table: invalid object descriptor.";
-};
-
-String STR_INVALID_USER_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create user: invalid object descriptor.";
-};
-
-String STR_INVALID_VIEW_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create view: invalid object descriptor.";
-};
-
-String STR_VIEW_NO_COMMAND_ERROR
-{
-    Text [ en-US ] = "Could not create view: no command object.";
-};
-
-String STR_NO_CONNECTION
-{
-    Text [ en-US ] = "The connection could not be created. May be the necessary data provider is not installed.";
-};
-
-// dbase
-String STR_COULD_NOT_DELETE_INDEX
-{
-    Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred.";
-};
-String STR_ONL_ONE_COLUMN_PER_INDEX
-{
-    Text [ en-US ] = "The index could not be created. Only one column per index is allowed.";
-};
-String STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE
-{
-    Text [ en-US ] = "The index could not be created. The values are not unique.";
-};
-
-String STR_COULD_NOT_CREATE_INDEX
-{
-    Text [ en-US ] = "The index could not be created. An unknown error appeared.";
-};
-String STR_COULD_NOT_CREATE_INDEX_NAME
-{
-    Text [ en-US ] = "The index could not be created. The file '$filename$' is used by an other index.";
-};
-String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
-{
-    Text [ en-US ] = "The index could not be created. The size of the chosen column is too big.";
-};
-
-String STR_SQL_NAME_ERROR
-{
-    Text [ en-US ] = "The name '$name$' doesn't match SQL naming constraints.";
-};
-
-String STR_COULD_NOT_DELETE_FILE
-{
-    Text [ en-US ] = "The file $filename$ could not be deleted.";
-};
-
-String STR_INVALID_COLUMN_TYPE
-{
-    Text [ en-US ] = "Invalid column type for column '$columnname$'.";
-};
-String STR_INVALID_COLUMN_PRECISION
-{
-    Text [ en-US ] = "Invalid precision for column '$columnname$'.";
-};
-
-String STR_INVALID_PRECISION_SCALE
-{
-    Text [ en-US ] = "Precision is less than scale for column '$columnname$'.";
-};
-
-String STR_INVALID_COLUMN_NAME_LENGTH
-{
-    Text [ en-US ] = "Invalid column name length for column '$columnname$'.";
-};
-
-String STR_DUPLICATE_VALUE_IN_COLUMN
-{
-    Text [ en-US ] = "Duplicate value found in column '$columnname$'.";
-};
-
-String STR_INVALID_COLUMN_DECIMAL_VALUE
-{
-    Text [ en-US ] = "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed.";
-};
-
-String STR_COLUMN_NOT_ALTERABLE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be altered. May be the file system is write protected.";
-};
-String STR_INVALID_COLUMN_VALUE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be updated. The value is invalid for that column.";
-};
-String STR_COLUMN_NOT_ADDABLE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be added. May be the file system is write protected.";
-};
-String STR_COLUMN_NOT_DROP
-{
-    Text [ en-US ] = "The column at position '$position$' could not be dropped. May be the file system is write protected.";
-};
-String STR_TABLE_NOT_DROP
-{
-    Text [ en-US ] = "The table '$tablename$' could not be dropped. May be the file system is write protected.";
-};
-String STR_COULD_NOT_ALTER_TABLE
-{
-    Text [ en-US ] = "The table could not be altered.";
-};
-
-String STR_INVALID_DBASE_FILE
-{
-    Text [ en-US ] = "The file '$filename$' is an invalid (or unrecognized) dBase file.";
-};
-
-// Evoab2
-
-String STR_CANNOT_OPEN_BOOK
-{
-    Text [ en-US ] = "Cannot open Evolution address book.";
-};
-
-String STR_SORT_BY_COL_ONLY
-{
-    Text [ en-US ] = "Can only sort by table columns.";
-};
-
-// File
-String STR_QUERY_COMPLEX_COUNT
-{
-    Text [ en-US ] = "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported.";
-};
-String STR_QUERY_INVALID_BETWEEN
-{
-    Text [ en-US ] = "The query can not be executed. The 'BETWEEN' arguments are not correct.";
-};
-String STR_QUERY_FUNCTION_NOT_SUPPORTED
-{
-    Text [ en-US ] = "The query can not be executed. The function is not supported.";
-};
-String STR_TABLE_READONLY
-{
-    Text [ en-US ] = "The table can not be changed. It is read only.";
-};
-String STR_DELETE_ROW
-{
-    Text [ en-US ] = "The row could not be deleted. The option \"Display inactive records\" is set.";
-};
-String STR_ROW_ALREADY_DELETED
-{
-    Text [ en-US ] = "The row could not be deleted. It is already deleted.";
-};
-String STR_QUERY_MORE_TABLES
-{
-    Text [ en-US ] = "The query can not be executed. It contains more than one table.";
-};
-String STR_QUERY_NO_TABLE
-{
-    Text [ en-US ] = "The query can not be executed. It contains no valid table.";
-};
-String STR_QUERY_NO_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. It contains no valid columns.";
-};
-String STR_INVALID_PARA_COUNT
-{
-    Text [ en-US ] = "The count of the given parameter values doesn't match the parameters.";
-};
-String STR_NO_VALID_FILE_URL
-{
-    Text [ en-US ] = "The URL '$URL$' is not valid. A connection can not be created.";
-};
-
-String STR_NO_CLASSNAME
-{
-    Text [ en-US ] = "The driver class '$classname$' could not be loaded.";
-};
-String STR_NO_JAVA
-{
-    Text [ en-US ] = "No Java installation could be found. Please check your installation.";
-};
-String STR_NO_RESULTSET
-{
-    Text [ en-US ] = "The execution of the query doesn't return a valid result set.";
-};
-String STR_NO_ROWCOUNT
-{
-    Text [ en-US ] = "The execution of the update statement doesn't effect any rows.";
-};
-
-String STR_NO_CLASSNAME_PATH
-{
-    Text [ en-US ] = "The additional driver class path is '$classpath$'.";
-};
-String STR_UNKNOWN_PARA_TYPE
-{
-    Text [ en-US ] = "The type of parameter at position '$position$' is unknown.";
-};
-String STR_UNKNOWN_COLUMN_TYPE
-{
-    Text [ en-US ] = "The type of column at position '$position$' is unknown.";
-};
-
-// KAB
-
-String STR_NO_KDE_INST
-{
-    Text [ en-US ] = "No suitable KDE installation was found.";
-};
-
-String STR_KDE_VERSION_TOO_OLD
-{
-    Text [ en-US ] = "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.";
-};
-String STR_KDE_VERSION_TOO_NEW
-{
-    Text [ en-US ] = "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n";
-};
-String STR_KDE_VERSION_TOO_NEW_WORK_AROUND
-{
-    Text [ en-US ] = "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n";
-};
-String STR_PARA_ONLY_PREPARED
-{
-    Text [ en-US ] = "Parameters can appear only in prepared statements.";
-};
-
-// MACAB
-String STR_NO_TABLE
-{
-    Text [ en-US ] = "No such table!";
-};
-
-String STR_NO_MAC_OS_FOUND
-{
-    Text [ en-US ] = "No suitable Mac OS installation was found.";
-};
-
-// hsqldb
-String STR_NO_STORAGE
-{
-    Text [ en-US ] = "The connection can not be established. No storage or URL was given.";
-};
-String STR_INVALID_FILE_URL
-{
-    Text [ en-US ] = "The given URL contains no valid local file system path. Please check the location of your database file.";
-};
-String STR_NO_TABLE_CONTAINER
-{
-    Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
-};
-String STR_NO_TABLENAME
-{
-    Text [ en-US ] = "There is no table named '$tablename$'.";
-};
-String STR_NO_DOCUMENTUI
-{
-    Text [ en-US ] = "The provided DocumentUI is not allowed to be NULL.";
-};
-String STR_ERROR_NEW_VERSION
-{
-    Text [ en-US ] = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 5f6e76e55969..1767bfaec8a0 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -20,14 +20,13 @@
 #include <memory>
 #include "resource/sharedresources.hxx"
 
-#include <comphelper/processfactory.hxx>
-#include <comphelper/officeresourcebundle.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <tools/diagnose_ex.h>
+#include <tools/resmgr.hxx>
 #include <osl/diagnose.h>
-
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 namespace connectivity
 {
@@ -44,8 +43,7 @@ namespace connectivity
         static  oslInterlockedCount     s_nClients;
 
     private:
-        std::unique_ptr< ::comphelper::OfficeResourceBundle >
-                                        m_pResourceBundle;
+        std::locale                     m_aLocale;
 
     public:
         static void     registerClient();
@@ -54,7 +52,7 @@ namespace connectivity
         static SharedResources_Impl&
                         getInstance();
 
-        OUString getResourceString( ResourceId _nId );
+        OUString getResourceString(const char* pId);
 
     private:
         SharedResources_Impl();
@@ -66,43 +64,24 @@ namespace connectivity
         }
     };
 
-
     SharedResources_Impl*   SharedResources_Impl::s_pInstance( nullptr );
     oslInterlockedCount     SharedResources_Impl::s_nClients( 0 );
 
-
     SharedResources_Impl::SharedResources_Impl()
+        : m_aLocale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag()))
     {
-        try
-        {
-            Reference< XComponentContext > xContext(
-                comphelper::getProcessComponentContext() );
-            m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) );
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
     }
 
-
-    OUString SharedResources_Impl::getResourceString( ResourceId _nId )
+    OUString SharedResources_Impl::getResourceString(const char* pId)
     {
-        if ( m_pResourceBundle.get() == nullptr )
-            // this should never happen, but we gracefully ignore it. It has been reported
-            // in the constructor in non-product builds.
-            return OUString();
-
-        return m_pResourceBundle->loadString( _nId );
+        return Translate::get(pId, m_aLocale);
     }
 
-
     void SharedResources_Impl::registerClient()
     {
         osl_atomic_increment( &s_nClients );
     }
 
-
     void SharedResources_Impl::revokeClient()
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -156,48 +135,48 @@ namespace connectivity
     }
 
 
-    OUString SharedResources::getResourceString( ResourceId _nResId ) const
+    OUString SharedResources::getResourceString(const char* pResId) const
     {
-        return SharedResources_Impl::getInstance().getResourceString( _nResId );
+        return SharedResources_Impl::getInstance().getResourceString(pResId);
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace, _rStringToSubstitute ) );
         return sString;
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) );
         return sString;
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2,
                 const sal_Char* _pAsciiPatternToReplace3, const OUString& _rStringToSubstitute3 ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace3, _rStringToSubstitute3 ) );
         return sString;
     }
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                     const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         std::list< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin();
         std::list< std::pair<const sal_Char* , OUString > >::const_iterator aEnd  = _rStringToSubstitutes.end();
         for(;aIter != aEnd; ++aIter)
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 8cf535c40cd3..4e0e3a557c22 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/property.hxx>
 #include "TConnection.hxx"
 #include <rtl/ustrbuf.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::sdbcx;
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index 18cbfc1086cb..7397af3b0610 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -61,8 +61,4 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
 
 $(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
 
-$(call gb_CppunitTest_get_target,cppcanvas_emfplus): \
-    $(call gb_AllLangResTarget_get_target,ofa) \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index c21498f19420..91a51cac250c 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -184,7 +184,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
@@ -195,7 +194,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/cui/AllLangMoTarget_cui.mk b/cui/AllLangMoTarget_cui.mk
new file mode 100644
index 000000000000..a21f043c4ffb
--- /dev/null
+++ b/cui/AllLangMoTarget_cui.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,cui))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
deleted file mode 100644
index ac6db418161b..000000000000
--- a/cui/AllLangResTarget_cui.mk
+++ /dev/null
@@ -1,55 +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,cui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,cui,svx))
-
-$(eval $(call gb_AllLangResTarget_add_srs,cui,\
-    cui/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,cui/res))
-
-$(eval $(call gb_SrsTarget_set_include,cui/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/cui/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,cui/res,\
-    cui/source/customize/cfg.src \
-    cui/source/customize/macropg.src \
-    cui/source/dialogs/cuires.src \
-    cui/source/dialogs/fmsearch.src \
-    cui/source/dialogs/gallery.src \
-    cui/source/dialogs/hyperdlg.src \
-    cui/source/dialogs/multipat.src \
-    cui/source/dialogs/passwdomdlg.src \
-    cui/source/dialogs/screenshotannotationdlg.src \
-    cui/source/dialogs/scriptdlg.src \
-    cui/source/dialogs/svuidlg.src \
-    cui/source/options/connpooloptions.src \
-    cui/source/options/dbregister.src \
-    cui/source/options/doclinkdialog.src \
-    cui/source/options/optchart.src \
-    cui/source/options/optcolor.src \
-    cui/source/options/optdict.src \
-    cui/source/options/optfltr.src \
-    cui/source/options/optinet2.src \
-    cui/source/options/optjava.src \
-    cui/source/options/optlingu.src \
-    cui/source/options/optpath.src \
-    cui/source/options/personalization.src \
-    cui/source/options/treeopt.src \
-    cui/source/tabpages/border.src \
-    cui/source/tabpages/frmdirlbox.src \
-    cui/source/tabpages/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index e308679ae69e..2f3bd0d5881b 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -211,7 +211,4 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/uno/services \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,cui,cui))
-
 # vim: set noet sw=4 ts=4:
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index c174fb27bd17..888cd2a9f3cd 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,cui))
 
 $(eval $(call gb_Module_add_targets,cui,\
 	Library_cui \
+	UIConfig_cui \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,cui,\
-	AllLangResTarget_cui \
-	UIConfig_cui \
+    AllLangMoTarget_cui \
 ))
 
 # screenshots
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index ab2431181cc1..9fb83399de3f 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -325,8 +325,6 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
@@ -459,7 +457,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/cui/source/options/personalization.src b/cui/inc/personalization.hrc
index 5886a61c7464..c7bda2bed3a8 100644
--- a/cui/source/options/personalization.src
+++ b/cui/inc/personalization.hrc
@@ -16,50 +16,26 @@
  *   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_CUI_INC_PERSONALIZATION_HRC
+#define INCLUDED_CUI_INC_PERSONALIZATION_HRC
 
-#include <cuires.hrc>
-
-String RID_SVXSTR_SELECTEDPERSONA
-{
-    Text [ en-US ] = "Selected Theme: ";
-};
-
-String RID_SVXSTR_SEARCHING
-{
-    Text [ en-US ] = "Searching, please wait...";
-};
-
-String RID_SVXSTR_SEARCHERROR
-{
-    Text [ en-US ] = "Cannot open %1, please try again later.";
-};
-
-String RID_SVXSTR_NORESULTS
-{
-    Text [ en-US ] = "No results found.";
-};
-
-String RID_SVXSTR_APPLYPERSONA
-{
-    Text [ en-US ] = "Applying Theme...";
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
 /*
  * This string array must have exactly the same content
  * and the same order as the m_vSuggestionCategories array
  * in personalization.cxx file.
  */
-StringArray RID_SVXSTR_PERSONA_CATEGORIES
+const char* RID_SVXSTR_PERSONA_CATEGORIES[] =
 {
-    ItemList [en-US]=
-    {
-        < "LibreOffice" ; > ;
-        < "Abstract" ; > ;
-        < "Color" ; > ;
-        < "Music" ; > ;
-        < "Nature" ; > ;
-        < "Solid" ; > ;
-    };
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "LibreOffice"),
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Abstract"),
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Color"),
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Music"),
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Nature"),
+    NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Solid")
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
new file mode 100644
index 000000000000..2a82447321d3
--- /dev/null
+++ b/cui/inc/strings.hrc
@@ -0,0 +1,385 @@
+/* -*- 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_CUI_INC_STRINGS_HRC
+#define INCLUDED_CUI_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_SVXSTR_KEY_CONFIG_DIR                   NC_("RID_SVXSTR_KEY_CONFIG_DIR", "Configuration")
+#define RID_SVXSTR_KEY_WORK_PATH                    NC_("RID_SVXSTR_KEY_WORK_PATH", "My Documents")
+#define RID_SVXSTR_KEY_GRAPHICS_PATH                NC_("RID_SVXSTR_KEY_GRAPHICS_PATH", "Images")
+#define RID_SVXSTR_KEY_BITMAP_PATH                  NC_("RID_SVXSTR_KEY_BITMAP_PATH", "Icons")
+#define RID_SVXSTR_KEY_PALETTE_PATH                 NC_("RID_SVXSTR_KEY_PALETTE_PATH", "Palettes")
+#define RID_SVXSTR_KEY_BACKUP_PATH                  NC_("RID_SVXSTR_KEY_BACKUP_PATH", "Backups")
+#define RID_SVXSTR_KEY_MODULES_PATH                 NC_("RID_SVXSTR_KEY_MODULES_PATH", "Modules")
+#define RID_SVXSTR_KEY_TEMPLATE_PATH                NC_("RID_SVXSTR_KEY_TEMPLATE_PATH", "Templates")
+#define RID_SVXSTR_KEY_GLOSSARY_PATH                NC_("RID_SVXSTR_KEY_GLOSSARY_PATH", "AutoText")
+#define RID_SVXSTR_KEY_DICTIONARY_PATH              NC_("RID_SVXSTR_KEY_DICTIONARY_PATH", "Dictionaries")
+#define RID_SVXSTR_KEY_HELP_DIR                     NC_("RID_SVXSTR_KEY_HELP_DIR", "Help")
+#define RID_SVXSTR_KEY_GALLERY_DIR                  NC_("RID_SVXSTR_KEY_GALLERY_DIR", "Gallery")
+#define RID_SVXSTR_KEY_STORAGE_DIR                  NC_("RID_SVXSTR_KEY_STORAGE_DIR", "Message Storage")
+#define RID_SVXSTR_KEY_TEMP_PATH                    NC_("RID_SVXSTR_KEY_TEMP_PATH", "Temporary files")
+#define RID_SVXSTR_KEY_PLUGINS_PATH                 NC_("RID_SVXSTR_KEY_PLUGINS_PATH", "Plug-ins")
+#define RID_SVXSTR_KEY_FAVORITES_DIR                NC_("RID_SVXSTR_KEY_FAVORITES_DIR", "Folder Bookmarks")
+#define RID_SVXSTR_KEY_FILTER_PATH                  NC_("RID_SVXSTR_KEY_FILTER_PATH", "Filters")
+#define RID_SVXSTR_KEY_ADDINS_PATH                  NC_("RID_SVXSTR_KEY_ADDINS_PATH", "Add-ins")
+#define RID_SVXSTR_KEY_USERCONFIG_PATH              NC_("RID_SVXSTR_KEY_USERCONFIG_PATH", "User Configuration")
+#define RID_SVXSTR_KEY_USERDICTIONARY_DIR           NC_("RID_SVXSTR_KEY_USERDICTIONARY_DIR", "User-defined dictionaries")
+#define RID_SVXSTR_KEY_CLASSIFICATION_PATH          NC_("RID_SVXSTR_KEY_CLASSIFICATION_PATH", "Classification")
+#define RID_SVXSTR_KEY_AUTOCORRECT_DIR              NC_("RID_SVXSTR_KEY_AUTOCORRECT_DIR", "AutoCorrect")
+#define RID_SVXSTR_KEY_LINGUISTIC_DIR               NC_("RID_SVXSTR_KEY_LINGUISTIC_DIR", "Writing aids")
+/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
+#define RID_SVXSTR_NEW_MENU                         NC_("RID_SVXSTR_NEW_MENU", "New Menu %n")
+/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
+#define RID_SVXSTR_NEW_TOOLBAR                      NC_("RID_SVXSTR_NEW_TOOLBAR", "New Toolbar %n")
+#define RID_SVXSTR_MOVE_MENU                        NC_("RID_SVXSTR_MOVE_MENU", "Move Menu")
+#define RID_SVXSTR_ADD_SUBMENU                      NC_("RID_SVXSTR_ADD_SUBMENU", "Add Submenu")
+#define RID_SVXSTR_SUBMENU_NAME                     NC_("RID_SVXSTR_SUBMENU_NAME", "Submenu name")
+#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION     NC_("RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION", "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.")
+#define RID_SVXSTR_DELETE_ICON_CONFIRM              NC_("RID_SVXSTR_DELETE_ICON_CONFIRM", "Are you sure to delete the image?")
+#define RID_SVXSTR_REPLACE_ICON_WARNING             NC_("RID_SVXSTR_REPLACE_ICON_WARNING", "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?")
+#define RID_SVXSTR_REPLACE_ICON_CONFIRM             NC_("RID_SVXSTR_REPLACE_ICON_CONFIRM", "Confirm Icon Replacement")
+#define RID_SVXSTR_YESTOALL                         NC_("RID_SVXSTR_YESTOALL", "Yes to All")
+#define RID_SVXSTR_PRODUCTNAME_TOOLBARS             NC_("RID_SVXSTR_PRODUCTNAME_TOOLBARS", "%PRODUCTNAME %MODULENAME Toolbars")
+#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS         NC_("RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS", "%PRODUCTNAME %MODULENAME Context Menus")
+#define RID_SVXSTR_TOOLBAR                          NC_("RID_SVXSTR_TOOLBAR", "Toolbar")
+#define RID_SVXSTR_TOOLBAR_CONTENT                  NC_("RID_SVXSTR_TOOLBAR_CONTENT", "Toolbar Content")
+#define RID_SVXSTR_COMMANDS                         NC_("RID_SVXSTR_COMMANDS", "Commands")
+#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR           NC_("RID_SXVSTR_CONFIRM_DELETE_TOOLBAR", "There are no more commands on the toolbar. Do you want to delete the toolbar?")
+/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
+   and will be replaced at runtime by the name of the selected application
+   or document.
+*/
+#define RID_SVXSTR_CONFIRM_MENU_RESET               NC_("RID_SVXSTR_CONFIRM_MENU_RESET", "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?")
+#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET            NC_("RID_SVXSTR_CONFIRM_TOOLBAR_RESET", "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?")
+#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT          NC_("RID_SVXSTR_CONFIRM_RESTORE_DEFAULT", "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?")
+#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED          NC_("RID_SVXSTR_MNUCFG_ALREADY_INCLUDED", "Function is already included in this popup.")
+#define RID_SVXSTR_LABEL_NEW_NAME                   NC_("RID_SVXSTR_LABEL_NEW_NAME", "~New name")
+#define RID_SVXSTR_RENAME_MENU                      NC_("RID_SVXSTR_RENAME_MENU", "Rename Menu")
+#define RID_SVXSTR_RENAME_TOOLBAR                   NC_("RID_SVXSTR_RENAME_TOOLBAR", "Rename Toolbar")
+
+#define RID_SVXSTR_HYPDLG_CLOSEBUT                  NC_("RID_SVXSTR_HYPDLG_CLOSEBUT", "Close")
+#define RID_SVXSTR_HYPDLG_MACROACT1                 NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object")
+#define RID_SVXSTR_HYPDLG_MACROACT2                 NC_("RID_SVXSTR_HYPDLG_MACROACT2", "Trigger hyperlink")
+#define RID_SVXSTR_HYPDLG_MACROACT3                 NC_("RID_SVXSTR_HYPDLG_MACROACT3", "Mouse leaves object")
+#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME           NC_("RID_SVXSTR_HYPDLG_NOVALIDFILENAME", "Please type in a valid file name.")
+#define RID_SVXSTR_HYPERDLG_HLINETTP                NC_("RID_SVXSTR_HYPERDLG_HLINETTP", "Internet")
+#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLINETTP_HELP", "This is where you create a hyperlink to a Web page or FTP server connection.")
+#define RID_SVXSTR_HYPERDLG_HLMAILTP                NC_("RID_SVXSTR_HYPERDLG_HLMAILTP", "Mail")
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLMAILTP_HELP", "This is where you create a hyperlink to an e-mail address.")
+#define RID_SVXSTR_HYPERDLG_HLDOCTP                 NC_("RID_SVXSTR_HYPERDLG_HLDOCTP", "Document")
+#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP            NC_("RID_SVXSTR_HYPERDLG_HLDOCTP_HELP", "This is where you create a hyperlink to an existing document or a target within a document.")
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP                NC_("RID_SVXSTR_HYPERDLG_HLDOCNTP", "New Document")
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP", "This is where you create a new document to which the new link points.")
+#define RID_SVXSTR_HYPERDLG_FORM_BUTTON             NC_("RID_SVXSTR_HYPERDLG_FORM_BUTTON", "Button")
+#define RID_SVXSTR_HYPERDLG_FROM_TEXT               NC_("RID_SVXSTR_HYPERDLG_FROM_TEXT", "Text")
+#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE          NC_("RID_SVXSTR_HYPERDLG_QUERYOVERWRITE", "The file already exists. Overwrite?")
+
+#define RID_SVXSTR_ERR_TEXTNOTFOUND                 NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
+#define RID_SVXSTR_SELECT_FILE_IFRAME               NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
+#define RID_SVXSTR_ALLFUNCTIONS                     NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_MYMACROS                         NC_("RID_SVXSTR_MYMACROS", "My Macros")
+#define RID_SVXSTR_PRODMACROS                       NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
+#define RID_SVXSTR_SELECTOR_ADD_COMMANDS            NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
+#define RID_SVXSTR_SELECTOR_RUN                     NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
+#define RID_SVXSTR_ROW                              NC_("RID_SVXSTR_ROW", "Insert Rows")
+#define RID_SVXSTR_REMOVE_FAVORITES                 NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
+#define RID_SVXSTR_ADD_FAVORITES                    NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
+// PPI is pixel per inch, %1 is a number
+#define RID_SVXSTR_PPI                              NC_("RID_SVXSTR_PPI", "(%1 PPI)")
+#define RID_SVXSTR_COL                              NC_("RID_SVXSTR_COL", "Insert Columns")
+#define RID_SVXSTR_AUTO_ENTRY                       NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic")
+#define RID_SVXSTR_EDIT_GRAPHIC                     NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
+#define RID_SVXSTR_LOADACCELCONFIG                  NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration")
+#define RID_SVXSTR_SAVEACCELCONFIG                  NC_("RID_SVXSTR_SAVEACCELCONFIG", "Save Keyboard Configuration")
+#define RID_SVXSTR_FILTERNAME_CFG                   NC_("RID_SVXSTR_FILTERNAME_CFG", "Configuration (*.cfg)")
+#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES        NC_("RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES", "Targets do not exist in the document.")
+#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN       NC_("RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN", "Couldn't open the document.")
+#define RID_SVXSTR_EDITHINT                         NC_("RID_SVXSTR_EDITHINT", "[Enter text here]")
+#define RID_SVXSTR_HANGUL                           NC_("RID_SVXSTR_HANGUL", "Hangul")
+#define RID_SVXSTR_HANJA                            NC_("RID_SVXSTR_HANJA", "Hanja")
+#define RID_SVXSTR_BASICMACROS                      NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros")
+#define RID_SVXSTR_GROUP_STYLES                     NC_("RID_SVXSTR_GROUP_STYLES", "Styles")
+
+#define RID_SVXSTR_EVENT_STARTAPP                   NC_("RID_SVXSTR_EVENT_STARTAPP", "Start Application")
+#define RID_SVXSTR_EVENT_CLOSEAPP                   NC_("RID_SVXSTR_EVENT_CLOSEAPP", "Close Application")
+#define RID_SVXSTR_EVENT_NEWDOC                     NC_("RID_SVXSTR_EVENT_NEWDOC", "New Document")
+#define RID_SVXSTR_EVENT_CLOSEDOC                   NC_("RID_SVXSTR_EVENT_CLOSEDOC", "Document closed")
+#define RID_SVXSTR_EVENT_PREPARECLOSEDOC            NC_("RID_SVXSTR_EVENT_PREPARECLOSEDOC", "Document is going to be closed")
+#define RID_SVXSTR_EVENT_OPENDOC                    NC_("RID_SVXSTR_EVENT_OPENDOC", "Open Document")
+#define RID_SVXSTR_EVENT_SAVEDOC                    NC_("RID_SVXSTR_EVENT_SAVEDOC", "Save Document")
+#define RID_SVXSTR_EVENT_SAVEASDOC                  NC_("RID_SVXSTR_EVENT_SAVEASDOC", "Save Document As")
+#define RID_SVXSTR_EVENT_SAVEDOCDONE                NC_("RID_SVXSTR_EVENT_SAVEDOCDONE", "Document has been saved")
+#define RID_SVXSTR_EVENT_SAVEASDOCDONE              NC_("RID_SVXSTR_EVENT_SAVEASDOCDONE", "Document has been saved as")
+#define RID_SVXSTR_EVENT_ACTIVATEDOC                NC_("RID_SVXSTR_EVENT_ACTIVATEDOC", "Activate Document")
+#define RID_SVXSTR_EVENT_DEACTIVATEDOC              NC_("RID_SVXSTR_EVENT_DEACTIVATEDOC", "Deactivate Document")
+#define RID_SVXSTR_EVENT_PRINTDOC                   NC_("RID_SVXSTR_EVENT_PRINTDOC", "Print Document")
+#define RID_SVXSTR_EVENT_MODIFYCHANGED              NC_("RID_SVXSTR_EVENT_MODIFYCHANGED", "'Modified' status was changed")
+#define RID_SVXSTR_EVENT_MAILMERGE                  NC_("RID_SVXSTR_EVENT_MAILMERGE", "Printing of form letters started")
+#define RID_SVXSTR_EVENT_MAILMERGE_END              NC_("RID_SVXSTR_EVENT_MAILMERGE_END", "Printing of form letters finished")
+#define RID_SVXSTR_EVENT_FIELDMERGE                 NC_("RID_SVXSTR_EVENT_FIELDMERGE", "Merging of form fields started")
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED        NC_("RID_SVXSTR_EVENT_FIELDMERGE_FINISHED", "Merging of form fields finished")
+#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE            NC_("RID_SVXSTR_EVENT_PAGECOUNTCHANGE", "Changing the page count")
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED        NC_("RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED", "Loaded a sub component")
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED        NC_("RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED", "Closed a sub component")
+#define RID_SVXSTR_EVENT_APPROVEPARAMETER           NC_("RID_SVXSTR_EVENT_APPROVEPARAMETER", "Fill parameters")
+#define RID_SVXSTR_EVENT_ACTIONPERFORMED            NC_("RID_SVXSTR_EVENT_ACTIONPERFORMED", "Execute action")
+#define RID_SVXSTR_EVENT_AFTERUPDATE                NC_("RID_SVXSTR_EVENT_AFTERUPDATE", "After updating")
+#define RID_SVXSTR_EVENT_BEFOREUPDATE               NC_("RID_SVXSTR_EVENT_BEFOREUPDATE", "Before updating")
+#define RID_SVXSTR_EVENT_APPROVEROWCHANGE           NC_("RID_SVXSTR_EVENT_APPROVEROWCHANGE", "Before record action")
+#define RID_SVXSTR_EVENT_ROWCHANGE                  NC_("RID_SVXSTR_EVENT_ROWCHANGE", "After record action")
+#define RID_SVXSTR_EVENT_CONFIRMDELETE              NC_("RID_SVXSTR_EVENT_CONFIRMDELETE", "Confirm deletion")
+#define RID_SVXSTR_EVENT_ERROROCCURRED              NC_("RID_SVXSTR_EVENT_ERROROCCURRED", "Error occurred")
+#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED     NC_("RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED", "While adjusting")
+#define RID_SVXSTR_EVENT_FOCUSGAINED                NC_("RID_SVXSTR_EVENT_FOCUSGAINED", "When receiving focus")
+#define RID_SVXSTR_EVENT_FOCUSLOST                  NC_("RID_SVXSTR_EVENT_FOCUSLOST", "When losing focus")
+#define RID_SVXSTR_EVENT_ITEMSTATECHANGED           NC_("RID_SVXSTR_EVENT_ITEMSTATECHANGED", "Item status changed")
+#define RID_SVXSTR_EVENT_KEYTYPED                   NC_("RID_SVXSTR_EVENT_KEYTYPED", "Key pressed")
+#define RID_SVXSTR_EVENT_KEYUP                      NC_("RID_SVXSTR_EVENT_KEYUP", "Key released")
+#define RID_SVXSTR_EVENT_LOADED                     NC_("RID_SVXSTR_EVENT_LOADED", "When loading")
+#define RID_SVXSTR_EVENT_RELOADING                  NC_("RID_SVXSTR_EVENT_RELOADING", "Before reloading")
+#define RID_SVXSTR_EVENT_RELOADED                   NC_("RID_SVXSTR_EVENT_RELOADED", "When reloading")
+#define RID_SVXSTR_EVENT_MOUSEDRAGGED               NC_("RID_SVXSTR_EVENT_MOUSEDRAGGED", "Mouse moved while key pressed")
+#define RID_SVXSTR_EVENT_MOUSEENTERED               NC_("RID_SVXSTR_EVENT_MOUSEENTERED", "Mouse inside")
+#define RID_SVXSTR_EVENT_MOUSEEXITED                NC_("RID_SVXSTR_EVENT_MOUSEEXITED", "Mouse outside")
+#define RID_SVXSTR_EVENT_MOUSEMOVED                 NC_("RID_SVXSTR_EVENT_MOUSEMOVED", "Mouse moved")
+#define RID_SVXSTR_EVENT_MOUSEPRESSED               NC_("RID_SVXSTR_EVENT_MOUSEPRESSED", "Mouse button pressed")
+#define RID_SVXSTR_EVENT_MOUSERELEASED              NC_("RID_SVXSTR_EVENT_MOUSERELEASED", "Mouse button released")
+#define RID_SVXSTR_EVENT_POSITIONING                NC_("RID_SVXSTR_EVENT_POSITIONING", "Before record change")
+#define RID_SVXSTR_EVENT_POSITIONED                 NC_("RID_SVXSTR_EVENT_POSITIONED", "After record change")
+#define RID_SVXSTR_EVENT_RESETTED                   NC_("RID_SVXSTR_EVENT_RESETTED", "After resetting")
+#define RID_SVXSTR_EVENT_APPROVERESETTED            NC_("RID_SVXSTR_EVENT_APPROVERESETTED", "Prior to reset")
+#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED     NC_("RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED", "Approve action")
+#define RID_SVXSTR_EVENT_SUBMITTED                  NC_("RID_SVXSTR_EVENT_SUBMITTED", "Before submitting")
+#define RID_SVXSTR_EVENT_TEXTCHANGED                NC_("RID_SVXSTR_EVENT_TEXTCHANGED", "Text modified")
+#define RID_SVXSTR_EVENT_UNLOADING                  NC_("RID_SVXSTR_EVENT_UNLOADING", "Before unloading")
+#define RID_SVXSTR_EVENT_UNLOADED                   NC_("RID_SVXSTR_EVENT_UNLOADED", "When unloading")
+#define RID_SVXSTR_EVENT_CHANGED                    NC_("RID_SVXSTR_EVENT_CHANGED", "Changed")
+#define RID_SVXSTR_EVENT_CREATEDOC                  NC_("RID_SVXSTR_EVENT_CREATEDOC", "Document created")
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED            NC_("RID_SVXSTR_EVENT_LOADDOCFINISHED", "Document loading finished")
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED              NC_("RID_SVXSTR_EVENT_SAVEDOCFAILED", "Saving of document failed")
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED            NC_("RID_SVXSTR_EVENT_SAVEASDOCFAILED", "'Save as' has failed")
+#define RID_SVXSTR_EVENT_COPYTODOC                  NC_("RID_SVXSTR_EVENT_COPYTODOC", "Storing or exporting copy of document")
+#define RID_SVXSTR_EVENT_COPYTODOCDONE              NC_("RID_SVXSTR_EVENT_COPYTODOCDONE", "Document copy has been created")
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED            NC_("RID_SVXSTR_EVENT_COPYTODOCFAILED", "Creating of document copy failed")
+#define RID_SVXSTR_EVENT_VIEWCREATED                NC_("RID_SVXSTR_EVENT_VIEWCREATED", "View created")
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW           NC_("RID_SVXSTR_EVENT_PREPARECLOSEVIEW", "View is going to be closed")
+#define RID_SVXSTR_EVENT_CLOSEVIEW                  NC_("RID_SVXSTR_EVENT_CLOSEVIEW", "View closed")
+#define RID_SVXSTR_EVENT_TITLECHANGED               NC_("RID_SVXSTR_EVENT_TITLECHANGED", "Document title changed")
+#define RID_SVXSTR_EVENT_SELECTIONCHANGED           NC_("RID_SVXSTR_EVENT_SELECTIONCHANGED", "Selection changed")
+#define RID_SVXSTR_EVENT_DOUBLECLICK                NC_("RID_SVXSTR_EVENT_DOUBLECLICK", "Double click")
+#define RID_SVXSTR_EVENT_RIGHTCLICK                 NC_("RID_SVXSTR_EVENT_RIGHTCLICK", "Right click")
+#define RID_SVXSTR_EVENT_CALCULATE                  NC_("RID_SVXSTR_EVENT_CALCULATE", "Formulas calculated")
+#define RID_SVXSTR_EVENT_CONTENTCHANGED             NC_("RID_SVXSTR_EVENT_CONTENTCHANGED", "Content changed")
+
+#define RID_STR_SEARCH_ANYWHERE                     NC_("RID_STR_SEARCH_ANYWHERE", "anywhere in the field")
+#define RID_STR_SEARCH_BEGINNING                    NC_("RID_STR_SEARCH_BEGINNING", "beginning of field")
+#define RID_STR_SEARCH_END                          NC_("RID_STR_SEARCH_END", "end of field")
+#define RID_STR_SEARCH_WHOLE                        NC_("RID_STR_SEARCH_WHOLE", "entire field")
+#define RID_STR_FROM_TOP                            NC_("RID_STR_FROM_TOP", "From top")
+#define RID_STR_FROM_BOTTOM                         NC_("RID_STR_FROM_BOTTOM", "From bottom")
+#define RID_STR_SEARCH_NORECORD                     NC_("RID_STR_SEARCH_NORECORD", "No records corresponding to your data found.")
+#define RID_STR_SEARCH_GENERAL_ERROR                NC_("RID_STR_SEARCH_GENERAL_ERROR", "An unknown error occurred. The search could not be finished.")
+#define RID_STR_OVERFLOW_FORWARD                    NC_("RID_STR_OVERFLOW_FORWARD", "Overflow, search continued at the beginning")
+#define RID_STR_OVERFLOW_BACKWARD                   NC_("RID_STR_OVERFLOW_BACKWARD", "Overflow, search continued at the end")
+#define RID_STR_SEARCH_COUNTING                     NC_("RID_STR_SEARCH_COUNTING", "counting records")
+
+#define RID_SVXSTR_GALLERY_NOFILES                  NC_("RID_SVXSTR_GALLERY_NOFILES", "<No Files>")
+#define RID_SVXSTR_GALLERYPROPS_OBJECT              NC_("RID_SVXSTR_GALLERYPROPS_OBJECT", "Object;Objects")
+#define RID_SVXSTR_GALLERY_READONLY                 NC_("RID_SVXSTR_GALLERY_READONLY", "(read-only)")
+#define RID_SVXSTR_GALLERY_ALLFILES                 NC_("RID_SVXSTR_GALLERY_ALLFILES", "<All Files>")
+#define RID_SVXSTR_GALLERY_ID_EXISTS                NC_("RID_SVXSTR_GALLERY_ID_EXISTS", "This ID already exists...")
+
+#define RID_MULTIPATH_DBL_ERR                       NC_("RID_MULTIPATH_DBL_ERR", "The path %1 already exists.")
+#define RID_SVXSTR_ARCHIVE_TITLE                    NC_("RID_SVXSTR_ARCHIVE_TITLE", "Select Archives")
+#define RID_SVXSTR_ARCHIVE_HEADLINE                 NC_("RID_SVXSTR_ARCHIVE_HEADLINE", "Archives")
+#define RID_SVXSTR_MULTIFILE_DBL_ERR                NC_("RID_SVXSTR_MULTIFILE_DBL_ERR", "The file %1 already exists.")
+#define RID_SVXSTR_ADD_IMAGE                        NC_("RID_SVXSTR_ADD_IMAGE", "Add Image")
+
+#define RID_SVXSTR_ONE_PASSWORD_MISMATCH            NC_("RID_SVXSTR_ONE_PASSWORD_MISMATCH", "The confirmation password did not match the password. Set the password again by entering the same password in both boxes.")
+#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH           NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not match the original passwords. Set the passwords again.")
+#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON      NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open or to modify, or check the open read-only option to continue.")
+#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2   NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering the same password in both boxes.")
+
+#define STR_AUTOLINK                                NC_("STR_AUTOLINK", "Automatic")
+#define STR_MANUALLINK                              NC_("STR_MANUALLINK", "Manual")
+#define STR_BROKENLINK                              NC_("STR_BROKENLINK", "Not available")
+#define STR_CLOSELINKMSG                            NC_("STR_CLOSELINKMSG", "Are you sure you want to remove the selected link?")
+#define STR_CLOSELINKMSG_MULTI                      NC_("STR_CLOSELINKMSG_MULTI", "Are you sure you want to remove the selected link?")
+#define STR_WAITINGLINK                             NC_("STR_WAITINGLINK", "Waiting")
+
+#define RID_SVXSTR_SAVE_SCREENSHOT_AS               NC_("RID_SVXSTR_SAVE_SCREENSHOT_AS", "Save Screenshot As...")
+
+// $(ROW) can be a number or the caption of the row in quotes
+#define RID_SVXSTR_DIAGRAM_ROW                      NC_("RID_SVXSTR_DIAGRAM_ROW", "Data Series $(ROW)")
+
+#define RID_SVXSTR_DRIVER_NAME                      NC_("RID_SVXSTR_DRIVER_NAME", "Driver name")
+#define RID_SVXSTR_POOLED_FLAG                      NC_("RID_SVXSTR_POOLED_FLAG", "Pool")
+#define RID_SVXSTR_POOL_TIMEOUT                     NC_("RID_SVXSTR_POOL_TIMEOUT", "Timeout")
+#define RID_SVXSTR_YES                              NC_("RID_SVXSTR_YES", "Yes")
+#define RID_SVXSTR_NO                               NC_("RID_SVXSTR_NO", "No")
+
+#define STR_LINKEDDOC_DOESNOTEXIST                  NC_("STR_LINKEDDOC_DOESNOTEXIST", "The file\n$file$\ndoes not exist.")
+#define STR_LINKEDDOC_NO_SYSTEM_FILE                NC_("STR_LINKEDDOC_NO_SYSTEM_FILE", "The file\n$file$\ndoes not exist in the local file system.")
+#define STR_NAME_CONFLICT                           NC_("STR_NAME_CONFLICT", "The name '$file$' is already used for another database.\nPlease choose a different name.")
+#define RID_SVXSTR_QUERY_DELETE_CONFIRM             NC_("RID_SVXSTR_QUERY_DELETE_CONFIRM", "Do you want to delete the entry?")
+
+#define RID_SVXSTR_DELQUERY                         NC_("RID_SVXSTR_DELQUERY", "Do you want to delete the following object?")
+#define RID_SVXSTR_DELQUERY_TITLE                   NC_("RID_SVXSTR_DELQUERY_TITLE", "Confirm Deletion")
+#define RID_SVXSTR_DELFAILED                        NC_("RID_SVXSTR_DELFAILED", "The selected object could not be deleted.")
+#define RID_SVXSTR_DELFAILED_TITLE                  NC_("RID_SVXSTR_DELFAILED_TITLE", "Error Deleting Object")
+#define RID_SVXSTR_CREATEFAILED                     NC_("RID_SVXSTR_CREATEFAILED", "The object could not be created.")
+#define RID_SVXSTR_CREATEFAILEDDUP                  NC_("RID_SVXSTR_CREATEFAILEDDUP", " Object with the same name already exists.")
+#define RID_SVXSTR_CREATEFAILED_TITLE               NC_("RID_SVXSTR_CREATEFAILED_TITLE", "Error Creating Object")
+#define RID_SVXSTR_RENAMEFAILED                     NC_("RID_SVXSTR_RENAMEFAILED", "The object could not be renamed.")
+#define RID_SVXSTR_RENAMEFAILED_TITLE               NC_("RID_SVXSTR_RENAMEFAILED_TITLE", "Error Renaming Object")
+#define RID_SVXSTR_ERROR_TITLE                      NC_("RID_SVXSTR_ERROR_TITLE", "%PRODUCTNAME Error")
+#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED         NC_("RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED", "The scripting language %LANGUAGENAME is not supported.")
+#define RID_SVXSTR_ERROR_RUNNING                    NC_("RID_SVXSTR_ERROR_RUNNING", "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME.")
+#define RID_SVXSTR_EXCEPTION_RUNNING                NC_("RID_SVXSTR_EXCEPTION_RUNNING", "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME.")
+#define RID_SVXSTR_ERROR_AT_LINE                    NC_("RID_SVXSTR_ERROR_AT_LINE", "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.")
+#define RID_SVXSTR_EXCEPTION_AT_LINE                NC_("RID_SVXSTR_EXCEPTION_AT_LINE", "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.")
+#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING          NC_("RID_SVXSTR_FRAMEWORK_ERROR_RUNNING", "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME.")
+#define RID_SVXSTR_ERROR_TYPE_LABEL                 NC_("RID_SVXSTR_ERROR_TYPE_LABEL", "Type:")
+#define RID_SVXSTR_ERROR_MESSAGE_LABEL              NC_("RID_SVXSTR_ERROR_MESSAGE_LABEL", "Message:")
+
+#define RID_SVXSTR_TYPE                             NC_("RID_SVXSTR_TYPE", "Registered name")
+#define RID_SVXSTR_PATH                             NC_("RID_SVXSTR_PATH", "Database file")
+
+//abbreviation for "[Load]"
+#define RID_SVXSTR_HEADER1                          NC_("RID_SVXSTR_HEADER1", "[L]")
+//abbreviation for "[Save]"
+#define RID_SVXSTR_HEADER2                          NC_("RID_SVXSTR_HEADER2", "[S]")
+#define RID_SVXSTR_CHG_MATH                         NC_("RID_SVXSTR_CHG_MATH", "MathType to %PRODUCTNAME Math or reverse")
+#define RID_SVXSTR_CHG_WRITER                       NC_("RID_SVXSTR_CHG_WRITER", "WinWord to %PRODUCTNAME Writer or reverse")
+#define RID_SVXSTR_CHG_CALC                         NC_("RID_SVXSTR_CHG_CALC", "Excel to %PRODUCTNAME Calc or reverse")
+#define RID_SVXSTR_CHG_IMPRESS                      NC_("RID_SVXSTR_CHG_IMPRESS", "PowerPoint to %PRODUCTNAME Impress or reverse")
+#define RID_SVXSTR_CHG_SMARTART                     NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
+
+#define RID_SVXSTR_OPT_DOUBLE_DICTS                 NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease enter a new name.")
+#define STR_MODIFY                                  NC_("STR_MODIFY", "~Replace")
+#define RID_SVXSTR_CONFIRM_SET_LANGUAGE             NC_("RID_SVXSTR_CONFIRM_SET_LANGUAGE", "Do you want to change the '%1' dictionary language?")
+
+#define RID_SVXSTR_COLOR_CONFIG_DELETE              NC_("RID_SVXSTR_COLOR_CONFIG_DELETE", "Do you really want to delete the color scheme?")
+#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE        NC_("RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE", "Color Scheme Deletion")
+#define RID_SVXSTR_COLOR_CONFIG_SAVE1               NC_("RID_SVXSTR_COLOR_CONFIG_SAVE1", "Save scheme")
+#define RID_SVXSTR_COLOR_CONFIG_SAVE2               NC_("RID_SVXSTR_COLOR_CONFIG_SAVE2", "Name of color scheme")
+
+#define RID_SVXSTR_SPELL                            NC_("RID_SVXSTR_SPELL", "Spelling")
+#define RID_SVXSTR_HYPH                             NC_("RID_SVXSTR_HYPH", "Hyphenation")
+#define RID_SVXSTR_THES                             NC_("RID_SVXSTR_THES", "Thesaurus")
+#define RID_SVXSTR_GRAMMAR                          NC_("RID_SVXSTR_GRAMMAR", "Grammar")
+#define RID_SVXSTR_CAPITAL_WORDS                    NC_("RID_SVXSTR_CAPITAL_WORDS", "Check uppercase words")
+#define RID_SVXSTR_WORDS_WITH_DIGITS                NC_("RID_SVXSTR_WORDS_WITH_DIGITS", "Check words with numbers ")
+#define RID_SVXSTR_SPELL_SPECIAL                    NC_("RID_SVXSTR_SPELL_SPECIAL", "Check special regions")
+#define RID_SVXSTR_SPELL_AUTO                       NC_("RID_SVXSTR_SPELL_AUTO", "Check spelling as you type")
+#define RID_SVXSTR_GRAMMAR_AUTO                     NC_("RID_SVXSTR_GRAMMAR_AUTO", "Check grammar as you type")
+#define RID_SVXSTR_NUM_MIN_WORDLEN                  NC_("RID_SVXSTR_NUM_MIN_WORDLEN", "Minimal number of characters for hyphenation: ")
+#define RID_SVXSTR_NUM_PRE_BREAK                    NC_("RID_SVXSTR_NUM_PRE_BREAK", "Characters before line break: ")
+#define RID_SVXSTR_NUM_POST_BREAK                   NC_("RID_SVXSTR_NUM_POST_BREAK", "Characters after line break: ")
+#define RID_SVXSTR_HYPH_AUTO                        NC_("RID_SVXSTR_HYPH_AUTO", "Hyphenate without inquiry")
+#define RID_SVXSTR_HYPH_SPECIAL                     NC_("RID_SVXSTR_HYPH_SPECIAL", "Hyphenate special regions")
+
+#define RID_SVXSTR_JRE_NOT_RECOGNIZED               NC_("RID_SVXSTR_JRE_NOT_RECOGNIZED", "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder.")
+#define RID_SVXSTR_JRE_FAILED_VERSION               NC_("RID_SVXSTR_JRE_FAILED_VERSION", "The Java runtime environment you selected is not the required version.\nPlease select a different folder.")
+#define RID_SVXSTR_OPTIONS_RESTART                  NC_("RID_SVXSTR_OPTIONS_RESTART", "Please restart %PRODUCTNAME now so the new or modified values can take effect.")
+#define RID_SVXSTR_JAVA_START_PARAM                 NC_("RID_SVXSTR_JAVA_START_PARAM", "Edit Parameter")
+
+#define RID_SVXSTR_OPT_PROXYPORTS                   NC_("RID_SVXSTR_OPT_PROXYPORTS", "Invalid value!\n\nThe maximum value for a port number is 65535.")
+
+#define RID_SVXSTR_FRAMEDIR_LTR                     NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
+#define RID_SVXSTR_FRAMEDIR_RTL                     NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
+#define RID_SVXSTR_FRAMEDIR_SUPER                   NC_("RID_SVXSTR_FRAMEDIR_SUPER", "Use superordinate object settings")
+// page direction
+#define RID_SVXSTR_PAGEDIR_LTR_HORI                 NC_("RID_SVXSTR_PAGEDIR_LTR_HORI", "Left-to-right (horizontal)")
+#define RID_SVXSTR_PAGEDIR_RTL_HORI                 NC_("RID_SVXSTR_PAGEDIR_RTL_HORI", "Right-to-left (horizontal)")
+#define RID_SVXSTR_PAGEDIR_RTL_VERT                 NC_("RID_SVXSTR_PAGEDIR_RTL_VERT", "Right-to-left (vertical)")
+#define RID_SVXSTR_PAGEDIR_LTR_VERT                 NC_("RID_SVXSTR_PAGEDIR_LTR_VERT", "Left-to-right (vertical)")
+
+#define RID_SVXSTR_DESC_GRADIENT                    NC_("RID_SVXSTR_DESC_GRADIENT", "Please enter a name for the gradient:")
+#define RID_SVXSTR_DESC_NEW_BITMAP                  NC_("RID_SVXSTR_DESC_NEW_BITMAP", "Please enter a name for the bitmap:")
+#define RID_SVXSTR_DESC_EXT_BITMAP                  NC_("RID_SVXSTR_DESC_EXT_BITMAP", "Please enter a name for the external bitmap:")
+#define RID_SVXSTR_DESC_NEW_PATTERN                 NC_("RID_SVXSTR_DESC_NEW_PATTERN", "Please enter a name for the pattern:")
+#define RID_SVXSTR_DESC_LINESTYLE                   NC_("RID_SVXSTR_DESC_LINESTYLE", "Please enter a name for the line style:")
+#define RID_SVXSTR_ASK_CHANGE_LINESTYLE             NC_("RID_SVXSTR_ASK_CHANGE_LINESTYLE", "The line style was modified without saving. \nModify the selected line style or add a new line style.")
+#define RID_SVXSTR_DESC_HATCH                       NC_("RID_SVXSTR_DESC_HATCH", "Please enter a name for the hatching:")
+#define RID_SVXSTR_CHANGE                           NC_("RID_SVXSTR_CHANGE", "Modify")
+#define RID_SVXSTR_ADD                              NC_("RID_SVXSTR_ADD", "Add")
+#define RID_SVXSTR_DESC_COLOR                       NC_("RID_SVXSTR_DESC_COLOR", "Please enter a name for the new color:")
+#define RID_SVXSTR_TABLE                            NC_("RID_SVXSTR_TABLE", "Table")
+#define RID_SVXSTR_DESC_LINEEND                     NC_("RID_SVXSTR_DESC_LINEEND", "Please enter a name for the new arrowhead:")
+#define RID_SVXSTR_CHARNAME_NOSTYLE                 NC_("RID_SVXSTR_CHARNAME_NOSTYLE", "No %1")
+#define RID_SVXSTR_CHARNAME_FAMILY                  NC_("RID_SVXSTR_CHARNAME_FAMILY", "Family")
+#define RID_SVXSTR_CHARNAME_FONT                    NC_("RID_SVXSTR_CHARNAME_FONT", "Font")
+#define RID_SVXSTR_CHARNAME_STYLE                   NC_("RID_SVXSTR_CHARNAME_STYLE", "Style")
+#define RID_SVXSTR_CHARNAME_TYPEFACE                NC_("RID_SVXSTR_CHARNAME_TYPEFACE", "Typeface")
+#define RID_SVXSTR_CHARNAME_HIGHLIGHTING            NC_("RID_SVXSTR_CHARNAME_HIGHLIGHTING", "Highlight Color")
+#define RID_SVXSTR_USE_REPLACE                      NC_("RID_SVXSTR_USE_REPLACE", "Use replacement table")
+#define RID_SVXSTR_CPTL_STT_WORD                    NC_("RID_SVXSTR_CPTL_STT_WORD", "Correct TWo INitial CApitals")
+#define RID_SVXSTR_CPTL_STT_SENT                    NC_("RID_SVXSTR_CPTL_STT_SENT", "Capitalize first letter of every sentence")
+#define RID_SVXSTR_BOLD_UNDER                       NC_("RID_SVXSTR_BOLD_UNDER", "Automatic *bold*, /italic/, -strikeout- and _underline_")
+#define RID_SVXSTR_NO_DBL_SPACES                    NC_("RID_SVXSTR_NO_DBL_SPACES", "Ignore double spaces")
+#define RID_SVXSTR_DETECT_URL                       NC_("RID_SVXSTR_DETECT_URL", "URL Recognition")
+#define RID_SVXSTR_DASH                             NC_("RID_SVXSTR_DASH", "Replace dashes")
+#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK     NC_("RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK", "Correct accidental use of cAPS LOCK key")
+#define RID_SVXSTR_NON_BREAK_SPACE                  NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific punctuation marks in French text")
+#define RID_SVXSTR_ORDINAL                          NC_("RID_SVXSTR_ORDINAL", "Format ordinal numbers suffixes (1st -> 1^st)")
+#define RID_SVXSTR_DEL_EMPTY_PARA                   NC_("RID_SVXSTR_DEL_EMPTY_PARA", "Remove blank paragraphs")
+#define RID_SVXSTR_USER_STYLE                       NC_("RID_SVXSTR_USER_STYLE", "Replace Custom Styles")
+#define RID_SVXSTR_BULLET                           NC_("RID_SVXSTR_BULLET", "Replace bullets with: ")
+#define RID_SVXSTR_RIGHT_MARGIN                     NC_("RID_SVXSTR_RIGHT_MARGIN", "Combine single line paragraphs if length greater than")
+#define RID_SVXSTR_NUM                              NC_("RID_SVXSTR_NUM", "Bulleted and numbered lists. Bullet symbol: ")
+#define RID_SVXSTR_BORDER                           NC_("RID_SVXSTR_BORDER", "Apply border")
+#define RID_SVXSTR_CREATE_TABLE                     NC_("RID_SVXSTR_CREATE_TABLE", "Create table")
+#define RID_SVXSTR_REPLACE_TEMPLATES                NC_("RID_SVXSTR_REPLACE_TEMPLATES", "Apply Styles")
+#define RID_SVXSTR_DEL_SPACES_AT_STT_END            NC_("RID_SVXSTR_DEL_SPACES_AT_STT_END", "Delete spaces and tabs at beginning and end of paragraph")
+#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES         NC_("RID_SVXSTR_DEL_SPACES_BETWEEN_LINES", "Delete spaces and tabs at end and start of line")
+#define RID_SVXSTR_CONNECTOR                        NC_("RID_SVXSTR_CONNECTOR", "Connector")
+#define RID_SVXSTR_DIMENSION_LINE                   NC_("RID_SVXSTR_DIMENSION_LINE", "Dimension line")
+#define RID_SVXSTR_LOAD_ERROR                       NC_("RID_SVXSTR_LOAD_ERROR", "The selected module could not be loaded.")
+#define RID_SVXSTR_STARTQUOTE                       NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
+#define RID_SVXSTR_ENDQUOTE                         NC_("RID_SVXSTR_ENDQUOTE", "End Quote")
+
+#define RID_SVXSTR_SELECTEDPERSONA                  NC_("RID_SVXSTR_SELECTEDPERSONA", "Selected Theme: ")
+#define RID_SVXSTR_SEARCHING                        NC_("RID_SVXSTR_SEARCHING", "Searching, please wait...")
+#define RID_SVXSTR_SEARCHERROR                      NC_("RID_SVXSTR_SEARCHERROR", "Cannot open %1, please try again later.")
+#define RID_SVXSTR_NORESULTS                        NC_("RID_SVXSTR_NORESULTS", "No results found.")
+#define RID_SVXSTR_APPLYPERSONA                     NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
+
+#define RID_SVXSTR_TABLE_PRESET_NONE                NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER           NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI           NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL            NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER          NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing Inner Lines")
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL             NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
+#define RID_SVXSTR_PARA_PRESET_ALL                  NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT            NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM            NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT             NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR               NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner Lines")
+#define RID_SVXSTR_VER_PRESET_ONLYVER               NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner Lines")
+#define RID_SVXSTR_SHADOW_STYLE_NONE                NC_("RID_SVXSTR_SHADOW_STYLE_NONE", "No Shadow")
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT         NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT", "Cast Shadow to Bottom Right")
+#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT            NC_("RID_SVXSTR_SHADOW_STYLE_TOPRIGHT", "Cast Shadow to Top Right")
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT          NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT", "Cast Shadow to Bottom Left")
+#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT             NC_("RID_SVXSTR_SHADOW_STYLE_TOPLEFT", "Cast Shadow to Top Left")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/strings.hrc b/cui/inc/strings.hxx
index 209acdc9a315..76d7f06fa0b3 100644
--- a/extensions/source/scanner/strings.hrc
+++ b/cui/inc/strings.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -7,11 +7,11 @@
  * 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
+#ifndef INCLUDED_CUI_INC_STRINGS_HXX
+#define INCLUDED_CUI_INC_STRINGS_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#define RID_SVXSTR_KEY_BASIC_PATH   "BASIC"
 
+#endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
new file mode 100644
index 000000000000..884a2543e543
--- /dev/null
+++ b/cui/inc/treeopt.hrc
@@ -0,0 +1,155 @@
+/* -*- 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_CUI_INC_TREEOPT_HRC
+#define INCLUDED_CUI_INC_TREEOPT_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, sal_uInt16> SID_GENERAL_OPTIONS_RES[] =
+{
+    { NC_("SID_GENERAL_OPTIONS_RES", "%PRODUCTNAME"), 0 },
+    { NC_("SID_GENERAL_OPTIONS_RES", "User Data"),  RID_SFXPAGE_GENERAL },
+    { NC_("SID_GENERAL_OPTIONS_RES", "General"),  OFA_TP_MISC },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Memory"), OFA_TP_MEMORY },
+    { NC_("SID_GENERAL_OPTIONS_RES", "View"), OFA_TP_VIEW  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Print"), RID_SFXPAGE_PRINTOPTIONS },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Paths"),  RID_SFXPAGE_PATH },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Fonts"), RID_SVX_FONT_SUBSTITUTION  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Security"), RID_SVXPAGE_INET_SECURITY  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Personalization"), RID_SVXPAGE_PERSONALIZATION  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Application Colors"), RID_SVXPAGE_COLORCONFIG  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Accessibility"), RID_SVXPAGE_ACCESSIBILITYCONFIG  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Advanced"), RID_SVXPAGE_OPTIONS_JAVA  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Basic IDE Options"), RID_SVXPAGE_BASICIDE_OPTIONS  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "Online Update"), RID_SVXPAGE_ONLINEUPDATE  },
+    { NC_("SID_GENERAL_OPTIONS_RES", "OpenCL"), RID_SVXPAGE_OPENCL  }
+};
+
+const std::pair<const char*, sal_uInt16> SID_LANGUAGE_OPTIONS_RES[] =
+{
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Language Settings"), 0 },
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Languages"), OFA_TP_LANGUAGES },
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Writing Aids"), RID_SFXPAGE_LINGU },
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),  RID_SVXPAGE_JSEARCH_OPTIONS },
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),  RID_SVXPAGE_ASIAN_LAYOUT },
+    { NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),  RID_SVXPAGE_OPTIONS_CTL }
+};
+
+const std::pair<const char*, sal_uInt16> SID_INET_DLG_RES[] =
+{
+    { NC_("SID_INET_DLG_RES", "Internet"), 0 },
+    { NC_("SID_INET_DLG_RES", "Proxy"),  RID_SVXPAGE_INET_PROXY },
+    { NC_("SID_INET_DLG_RES", "E-mail"),  RID_SVXPAGE_INET_MAIL }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SW_EDITOPTIONS_RES[] =
+{
+    { NC_("SID_SW_EDITOPTIONS_RES", "%PRODUCTNAME Writer"), 0 },
+    { NC_("SID_SW_EDITOPTIONS_RES", "General"),     RID_SW_TP_OPTLOAD_PAGE    },
+    { NC_("SID_SW_EDITOPTIONS_RES", "View"),       RID_SW_TP_CONTENT_OPT   },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Formatting Aids"),        RID_SW_TP_OPTSHDWCRSR     },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Grid"),        RID_SVXPAGE_GRID         },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (Western)"),RID_SW_TP_STD_FONT        },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (Asian)"),RID_SW_TP_STD_FONT_CJK        },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (CTL)"),      RID_SW_TP_STD_FONT_CTL        },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Print"),       RID_SW_TP_OPTPRINT_PAGE   },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Table"),         RID_SW_TP_OPTTABLE_PAGE   },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Changes"),    RID_SW_TP_REDLINE_OPT     },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Comparison"), RID_SW_TP_COMPARISON_OPT  },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Compatibility"), RID_SW_TP_OPTCOMPATIBILITY_PAGE     },
+    { NC_("SID_SW_EDITOPTIONS_RES", "AutoCaption"), RID_SW_TP_OPTCAPTION_PAGE  },
+    { NC_("SID_SW_EDITOPTIONS_RES", "Mail Merge E-mail"), RID_SW_TP_MAILCONFIG }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SW_ONLINEOPTIONS_RES[] =
+{
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "%PRODUCTNAME Writer/Web"), 0 },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "View"),       RID_SW_TP_HTML_CONTENT_OPT      },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "Formatting Aids"),        RID_SW_TP_HTML_OPTSHDWCRSR     },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "Grid"),        RID_SW_TP_HTML_OPTGRID_PAGE  },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "Print"),         RID_SW_TP_HTML_OPTPRINT_PAGE   },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "Table"),         RID_SW_TP_HTML_OPTTABLE_PAGE   },
+    { NC_("SID_SW_ONLINEOPTIONS_RES", "Background"),    RID_SW_TP_BACKGROUND   }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SM_EDITOPTIONS_RES[] =
+{
+    { NC_("SID_SM_EDITOPTIONS_RES", "%PRODUCTNAME Math"), 0 },
+    { NC_("SID_SM_EDITOPTIONS_RES", "Settings"), SID_SM_TP_PRINTOPTIONS },
+};
+
+const std::pair<const char*, sal_uInt16> SID_SC_EDITOPTIONS_RES[] =
+{
+    { NC_("SID_SC_EDITOPTIONS_RES", "%PRODUCTNAME Calc"), 0 },
+    { NC_("SID_SC_EDITOPTIONS_RES", "General"),           SID_SC_TP_LAYOUT            },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Defaults"),          RID_SC_TP_DEFAULTS          },
+    { NC_("SID_SC_EDITOPTIONS_RES", "View"),          SID_SC_TP_CONTENT           },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Calculate"),         SID_SC_TP_CALC              },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Formula"),       SID_SC_TP_FORMULA },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Sort Lists"),        SID_SC_TP_USERLISTS         },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Changes"),       SID_SC_TP_CHANGES           },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Compatibility"), SID_SC_TP_COMPATIBILITY },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Grid"),          SID_SC_TP_GRID              },
+    { NC_("SID_SC_EDITOPTIONS_RES", "Print"),         RID_SC_TP_PRINT             }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SD_EDITOPTIONS_RES[] =
+{
+    { NC_("SID_SD_EDITOPTIONS_RES", "%PRODUCTNAME Impress"),   0                  },
+    { NC_("SID_SD_EDITOPTIONS_RES", "General"),                SID_SI_TP_MISC     },
+    { NC_("SID_SD_EDITOPTIONS_RES", "View"),                   SID_SI_TP_CONTENTS },
+    { NC_("SID_SD_EDITOPTIONS_RES", "Grid"),                   SID_SI_TP_SNAP     },
+    { NC_("SID_SD_EDITOPTIONS_RES", "Print"),                  SID_SI_TP_PRINT    }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SD_GRAPHIC_OPTIONS_RES[] =
+{
+    { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "%PRODUCTNAME Draw"), 0 },
+    { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "General"),           SID_SD_TP_MISC               },
+    { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "View"),          SID_SD_TP_CONTENTS           },
+    { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "Grid"),          SID_SD_TP_SNAP               },
+    { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "Print"),             SID_SD_TP_PRINT              }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SCH_EDITOPTIONS_RES[] =
+{
+    { NC_("SID_SCH_EDITOPTIONS_RES", "Charts"), 0 },
+    { NC_("SID_SCH_EDITOPTIONS_RES", "Default Colors"),        RID_OPTPAGE_CHART_DEFCOLORS  }
+};
+
+const std::pair<const char*, sal_uInt16> SID_FILTER_DLG_RES[] =
+{
+    { NC_("SID_FILTER_DLG_RES", "Load/Save"), 0 },
+    { NC_("SID_FILTER_DLG_RES", "General"),  RID_SFXPAGE_SAVE },
+    { NC_("SID_FILTER_DLG_RES", "VBA Properties"),  SID_OPTFILTER_MSOFFICE },
+    { NC_("SID_FILTER_DLG_RES", "Microsoft Office"),  RID_OFAPAGE_MSFILTEROPT2 },
+    { NC_("SID_FILTER_DLG_RES", "HTML Compatibility"), RID_OFAPAGE_HTMLOPT  }
+};
+
+const std::pair<const char*, sal_uInt16> SID_SB_STARBASEOPTIONS_RES[] =
+{
+    { NC_("SID_SB_STARBASEOPTIONS_RES", "%PRODUCTNAME Base"), 0 },
+    { NC_("SID_SB_STARBASEOPTIONS_RES", "Connections"), SID_SB_CONNECTIONPOOLING },
+    { NC_("SID_SB_STARBASEOPTIONS_RES", "Databases"), SID_SB_DBREGISTEROPTIONS }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 48ab816a12aa..b51b319b5ae7 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -54,6 +54,7 @@
 
 #include <algorithm>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 
 #include "acccfg.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index c1c2104b26ee..bf83de09a634 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -36,7 +36,8 @@
 #include <vcl/builderfactory.hxx>
 
 #include "cuires.hrc"
-
+#include "strings.hrc"
+#include <sfx2/strings.hrc>
 #include <svx/svxids.hrc>
 
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 31a56d32941d..41c9cf7b6687 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -55,6 +55,7 @@
 #include <algorithm>
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include "strings.hrc"
 
 #include "acccfg.hxx"
 #include "cfg.hxx"
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
deleted file mode 100644
index 08d352625cf8..000000000000
--- a/cui/source/customize/cfg.src
+++ /dev/null
@@ -1,145 +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 <cuires.hrc>
-#include "helpid.hrc"
-
-/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
-String RID_SVXSTR_NEW_MENU
-{
-    Text [ en-US ] = "New Menu %n";
-};
-
-/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
-String RID_SVXSTR_NEW_TOOLBAR
-{
-    Text [ en-US ] = "New Toolbar %n";
-};
-
-String RID_SVXSTR_MOVE_MENU
-{
-    Text [ en-US ] = "Move Menu";
-};
-
-String RID_SVXSTR_ADD_SUBMENU
-{
-    Text [ en-US ] = "Add Submenu";
-};
-
-String RID_SVXSTR_SUBMENU_NAME
-{
-    Text [ en-US ] = "Submenu name";
-};
-
-String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
-{
-    Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.";
-};
-
-// Strings ---------------------------------------------------------------
-
-String RID_SVXSTR_DELETE_ICON_CONFIRM  //added for issue73355
-{
-    Text [ en-US ] = "Are you sure to delete the image?" ;
-};
-
-String RID_SVXSTR_REPLACE_ICON_WARNING  //added for issue73355
-{
-    Text [ en-US ] = "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?";
-};
-
-String RID_SVXSTR_REPLACE_ICON_CONFIRM //added for issue73355
-{
-    Text [ en-US ] = "Confirm Icon Replacement";
-};
-
-String RID_SVXSTR_YESTOALL //added for issue73355
-{
-    Text [ en-US ] = "Yes to All";
-};
-
-String RID_SVXSTR_PRODUCTNAME_TOOLBARS
-{
-    Text [ en-US ] = "%PRODUCTNAME %MODULENAME Toolbars" ;
-};
-
-String RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS
-{
-    Text [ en-US ] = "%PRODUCTNAME %MODULENAME Context Menus" ;
-};
-
-String RID_SVXSTR_TOOLBAR
-{
-    Text [ en-US ] = "Toolbar" ;
-};
-
-String RID_SVXSTR_TOOLBAR_CONTENT
-{
-    Text [ en-US ] = "Toolbar Content" ;
-};
-
-String RID_SVXSTR_COMMANDS
-{
-    Text [ en-US ] = "Commands" ;
-};
-
-String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
-{
-    Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
-};
-
-/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
-   and will be replaced at runtime by the name of the selected application
-   or document.
-*/
-String RID_SVXSTR_CONFIRM_MENU_RESET
-{
-    Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
-};
-
-String RID_SVXSTR_CONFIRM_TOOLBAR_RESET
-{
-    Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
-};
-
-String RID_SVXSTR_CONFIRM_RESTORE_DEFAULT
-{
-    Text [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?";
-};
-
-String RID_SVXSTR_MNUCFG_ALREADY_INCLUDED
-{
-    Text [ en-US ] = "Function is already included in this popup." ;
-};
-
-String RID_SVXSTR_LABEL_NEW_NAME
-{
-    Text [ en-US ] = "~New name";
-};
-
-String RID_SVXSTR_RENAME_MENU
-{
-    Text [ en-US ] = "Rename Menu";
-};
-
-String RID_SVXSTR_RENAME_TOOLBAR
-{
-    Text [ en-US ] = "Rename Toolbar";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 399db0ae57de..1c630c16bee1 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -45,6 +45,7 @@
 #include <basic/basmgr.hxx>
 #include <tools/urlobj.hxx>
 #include "cuires.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include <sfx2/app.hxx>
 #include <sfx2/minfitem.hxx>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index d171411c72d2..2b26eca0a0f1 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -39,6 +39,7 @@
 #include "headertablistbox.hxx"
 #include "macropg_impl.hxx"
 #include <svx/dialogs.hrc>
+#include "strings.hrc"
 #include <vcl/builderfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <o3tl/make_unique.hxx>
@@ -529,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
         }
 
         OUString eventURL = h_it->second.second;
-        OUString displayName(CuiResId(displayableEvent->nEventResourceID));
+        OUString displayName(CuiResId(displayableEvent->pEventResourceID));
 
         displayName += "\t";
 
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
deleted file mode 100644
index a57fa254be32..000000000000
--- a/cui/source/customize/macropg.src
+++ /dev/null
@@ -1,336 +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 <sfx2/sfx.hrc>
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-//DF
-String RID_SVXSTR_EVENT_STARTAPP
-{
-    Text [ en-US ] = "Start Application" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEAPP
-{
-    Text [ en-US ] = "Close Application" ;
-};
-
-String RID_SVXSTR_EVENT_NEWDOC
-{
-    Text [ en-US ] = "New Document" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEDOC
-{
-    Text [ en-US ] = "Document closed" ;
-};
-
-String RID_SVXSTR_EVENT_PREPARECLOSEDOC
-{
-    Text [ en-US ] = "Document is going to be closed" ;
-};
-
-String RID_SVXSTR_EVENT_OPENDOC
-{
-    Text [ en-US ] = "Open Document" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOC
-{
-    Text [ en-US ] = "Save Document" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOC
-{
-    Text [ en-US ] = "Save Document As" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOCDONE
-{
-    Text [ en-US ] = "Document has been saved" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOCDONE
-{
-    Text [ en-US ] = "Document has been saved as" ;
-};
-
-String RID_SVXSTR_EVENT_ACTIVATEDOC
-{
-    Text [ en-US ] = "Activate Document" ;
-};
-
-String RID_SVXSTR_EVENT_DEACTIVATEDOC
-{
-    Text [ en-US ] = "Deactivate Document" ;
-};
-
-String RID_SVXSTR_EVENT_PRINTDOC
-{
-    Text [ en-US ] = "Print Document" ;
-};
-
-String RID_SVXSTR_EVENT_MODIFYCHANGED
-{
-    Text [ en-US ] = "'Modified' status was changed" ;
-};
-String RID_SVXSTR_EVENT_MAILMERGE
-{
-    Text [ en-US ] = "Printing of form letters started" ;
-};
-String RID_SVXSTR_EVENT_MAILMERGE_END
-{
-    Text [ en-US ] = "Printing of form letters finished" ;
-};
-String RID_SVXSTR_EVENT_FIELDMERGE
-{
-    Text [ en-US ] = "Merging of form fields started" ;
-};
-String RID_SVXSTR_EVENT_FIELDMERGE_FINISHED
-{
-    Text [ en-US ] = "Merging of form fields finished" ;
-};
-String RID_SVXSTR_EVENT_PAGECOUNTCHANGE
-{
-    Text [ en-US ] = "Changing the page count" ;
-};
-String RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED
-{
-    Text [ en-US ] = "Loaded a sub component" ;
-};
-String RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED
-{
-    Text [ en-US ] = "Closed a sub component" ;
-};
-String RID_SVXSTR_EVENT_APPROVEPARAMETER
-{
-    Text [ en-US ] = "Fill parameters" ;
-};
-String RID_SVXSTR_EVENT_ACTIONPERFORMED
-{
-    Text [ en-US ] = "Execute action" ;
-};
-String RID_SVXSTR_EVENT_AFTERUPDATE
-{
-    Text [ en-US ] = "After updating" ;
-};
-String RID_SVXSTR_EVENT_BEFOREUPDATE
-{
-    Text [ en-US ] = "Before updating" ;
-};
-String RID_SVXSTR_EVENT_APPROVEROWCHANGE
-{
-    Text [ en-US ] = "Before record action" ;
-};
-String RID_SVXSTR_EVENT_ROWCHANGE
-{
-    Text [ en-US ] = "After record action" ;
-};
-String RID_SVXSTR_EVENT_CONFIRMDELETE
-{
-    Text [ en-US ] = "Confirm deletion" ;
-};
-String RID_SVXSTR_EVENT_ERROROCCURRED
-{
-    Text [ en-US ] = "Error occurred" ;
-};
-String RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED
-{
-    Text [ en-US ] = "While adjusting";
-};
-String RID_SVXSTR_EVENT_FOCUSGAINED
-{
-    Text [ en-US ] = "When receiving focus" ;
-};
-String RID_SVXSTR_EVENT_FOCUSLOST
-{
-    Text [ en-US ] = "When losing focus" ;
-};
-String RID_SVXSTR_EVENT_ITEMSTATECHANGED
-{
-    Text [ en-US ] = "Item status changed" ;
-};
-String RID_SVXSTR_EVENT_KEYTYPED
-{
-    Text [ en-US ] = "Key pressed" ;
-};
-String RID_SVXSTR_EVENT_KEYUP
-{
-    Text [ en-US ] = "Key released" ;
-};
-String RID_SVXSTR_EVENT_LOADED
-{
-    Text [ en-US ] = "When loading" ;
-};
-String RID_SVXSTR_EVENT_RELOADING
-{
-    Text [ en-US ] = "Before reloading" ;
-};
-String RID_SVXSTR_EVENT_RELOADED
-{
-    Text [ en-US ] = "When reloading" ;
-};
-String RID_SVXSTR_EVENT_MOUSEDRAGGED
-{
-    Text [ en-US ] = "Mouse moved while key pressed" ;
-};
-String RID_SVXSTR_EVENT_MOUSEENTERED
-{
-    Text [ en-US ] = "Mouse inside" ;
-};
-String RID_SVXSTR_EVENT_MOUSEEXITED
-{
-    Text [ en-US ] = "Mouse outside" ;
-};
-String RID_SVXSTR_EVENT_MOUSEMOVED
-{
-    Text [ en-US ] = "Mouse moved" ;
-};
-String RID_SVXSTR_EVENT_MOUSEPRESSED
-{
-    Text [ en-US ] = "Mouse button pressed" ;
-};
-String RID_SVXSTR_EVENT_MOUSERELEASED
-{
-    Text [ en-US ] = "Mouse button released" ;
-};
-String RID_SVXSTR_EVENT_POSITIONING
-{
-    Text [ en-US ] = "Before record change" ;
-};
-String RID_SVXSTR_EVENT_POSITIONED
-{
-    Text [ en-US ] = "After record change" ;
-};
-String RID_SVXSTR_EVENT_RESETTED
-{
-    Text [ en-US ] = "After resetting" ;
-};
-String RID_SVXSTR_EVENT_APPROVERESETTED
-{
-    Text [ en-US ] = "Prior to reset" ;
-};
-String RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED
-{
-    Text [ en-US ] = "Approve action" ;
-};
-String RID_SVXSTR_EVENT_SUBMITTED
-{
-    Text [ en-US ] = "Before submitting" ;
-};
-String RID_SVXSTR_EVENT_TEXTCHANGED
-{
-    Text [ en-US ] = "Text modified" ;
-};
-String RID_SVXSTR_EVENT_UNLOADING
-{
-    Text [ en-US ] = "Before unloading" ;
-};
-String RID_SVXSTR_EVENT_UNLOADED
-{
-    Text [ en-US ] = "When unloading" ;
-};
-String RID_SVXSTR_EVENT_CHANGED
-{
-    Text [ en-US ] = "Changed" ;
-};
-
-String RID_SVXSTR_EVENT_CREATEDOC
-{
-    Text [ en-US ] = "Document created" ;
-};
-
-String RID_SVXSTR_EVENT_LOADDOCFINISHED
-{
-    Text [ en-US ] = "Document loading finished" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEDOCFAILED
-{
-    Text [ en-US ] = "Saving of document failed" ;
-};
-
-String RID_SVXSTR_EVENT_SAVEASDOCFAILED
-{
-    Text [ en-US ] = "'Save as' has failed" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOC
-{
-    Text [ en-US ] = "Storing or exporting copy of document" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOCDONE
-{
-    Text [ en-US ] = "Document copy has been created" ;
-};
-
-String RID_SVXSTR_EVENT_COPYTODOCFAILED
-{
-    Text [ en-US ] = "Creating of document copy failed" ;
-};
-
-String RID_SVXSTR_EVENT_VIEWCREATED
-{
-    Text [ en-US ] = "View created" ;
-};
-
-String RID_SVXSTR_EVENT_PREPARECLOSEVIEW
-{
-    Text [ en-US ] = "View is going to be closed" ;
-};
-
-String RID_SVXSTR_EVENT_CLOSEVIEW
-{
-    Text [ en-US ] = "View closed" ;
-};
-
-String RID_SVXSTR_EVENT_TITLECHANGED
-{
-    Text [ en-US ] = "Document title changed" ;
-};
-
-String RID_SVXSTR_EVENT_SELECTIONCHANGED
-{
-    Text [ en-US ] = "Selection changed" ;
-};
-
-String RID_SVXSTR_EVENT_DOUBLECLICK
-{
-    Text [ en-US ] = "Double click" ;
-};
-
-String RID_SVXSTR_EVENT_RIGHTCLICK
-{
-    Text [ en-US ] = "Right click" ;
-};
-
-String RID_SVXSTR_EVENT_CALCULATE
-{
-    Text [ en-US ] = "Formulas calculated" ;
-};
-
-String RID_SVXSTR_EVENT_CONTENTCHANGED
-{
-    Text [ en-US ] = "Content changed" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6031af5d85fb..2a0e9053c819 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -45,6 +45,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
 #include <editeng/fontitem.hxx>
+#include "strings.hrc"
 #include "macroass.hxx"
 
 using namespace css;
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index fd3d9b3ba8df..b45300ef7bee 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -26,7 +26,7 @@
 #include <cuires.hrc>
 #include <svx/fmsrccfg.hxx>
 #include <svx/fmsrcimp.hxx>
-#include "fmsearch.hrc"
+#include "strings.hrc"
 #include "cuifmsearch.hxx"
 #include <svx/srchdlg.hxx>
 #include <svl/cjkoptions.hxx>
@@ -239,14 +239,14 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
 
     // fill the listboxes
     // method of field comparison
-    sal_uInt16 nResIds[] = {
+    const char* aResIds[] = {
         RID_STR_SEARCH_ANYWHERE,
         RID_STR_SEARCH_BEGINNING,
         RID_STR_SEARCH_END,
         RID_STR_SEARCH_WHOLE
     };
-    for (unsigned short nResId : nResIds)
-        m_plbPosition->InsertEntry( CuiResId( nResId ) );
+    for (auto pResId : aResIds)
+        m_plbPosition->InsertEntry(CuiResId(pResId));
     m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
 
     // the field listbox
@@ -726,10 +726,10 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
         case FmSearchProgress::State::Error:
         case FmSearchProgress::State::NothingFound:
         {
-            sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
+            const char* pErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
                 ? RID_STR_SEARCH_GENERAL_ERROR
                 : RID_STR_SEARCH_NORECORD;
-            ScopedVclPtrInstance<MessageDialog>(this, CuiResId(nErrorId))->Execute();
+            ScopedVclPtrInstance<MessageDialog>(this, CuiResId(pErrorId))->Execute();
             SAL_FALLTHROUGH;
         }
         case FmSearchProgress::State::Canceled:
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 196d8acd6c73..ebda6d05cdd8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -47,9 +47,10 @@
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <sfx2/sfxuno.hxx>
 #include "dialmgr.hxx"
-#include "gallery.hrc"
+#include "strings.hrc"
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 
 using namespace ::ucbhelper;
 using namespace ::cppu;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 04f3d29418f5..374c4b99643d 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -29,6 +29,7 @@
 #include "hldocntp.hxx"
 #include "bitmaps.hlst"
 #include <svx/svxids.hrc>
+#include "strings.hrc"
 #include <vector>
 
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
deleted file mode 100644
index 6c22063dee6b..000000000000
--- a/cui/source/dialogs/cuires.src
+++ /dev/null
@@ -1,133 +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 "cuires.hrc"
-
-String RID_SVXSTR_ERR_TEXTNOTFOUND
-{
-    Text [ en-US ] = "No alternatives found." ;
-};
-
-String RID_SVXSTR_SELECT_FILE_IFRAME
-{
-    Text [ en-US ] = "Select File for Floating Frame" ;
-};
-
-String RID_SVXSTR_ALLFUNCTIONS
-{
-    Text [ en-US ] = "All categories";
-};
-
-String RID_SVXSTR_MYMACROS
-{
-    Text [ en-US ] = "My Macros";
-};
-
-String RID_SVXSTR_PRODMACROS
-{
-    Text [ en-US ] = "%PRODUCTNAME Macros";
-};
-
-String RID_SVXSTR_SELECTOR_ADD_COMMANDS
-{
-    Text [ en-US ] = "Add Commands" ;
-};
-
-String RID_SVXSTR_SELECTOR_RUN
-{
-    Text [ en-US ] = "Run" ;
-};
-
-String RID_SVXSTR_ROW
-{
-    Text [ en-US ] = "Insert Rows" ;
-};
-
-String RID_SVXSTR_REMOVE_FAVORITES
-{
-    Text [ en-US ] = "Remove from Favorites" ;
-};
-
-String RID_SVXSTR_ADD_FAVORITES
-{
-    Text [ en-US ] = "Add to Favorites" ;
-};
-
-String RID_SVXSTR_PPI
-{
-    Text [ x-comment ] = "PPI is pixel per inch, %1 is a number" ;
-    Text [ en-US ] = "(%1 PPI)" ;
-};
-
-String RID_SVXSTR_COL
-{
-    Text [ en-US ] = "Insert Columns" ;
-};
-
-String RID_SVXSTR_AUTO_ENTRY
-{
-    Text [ en-US ] = "Automatic";
-};
-
-String RID_SVXSTR_EDIT_GRAPHIC
-{
-    Text [ en-US ] = "Link" ;
-};
-
-String RID_SVXSTR_LOADACCELCONFIG
-{
-    Text [ en-US ] = "Load Keyboard Configuration" ;
-};
-
-String RID_SVXSTR_SAVEACCELCONFIG
-{
-    Text [ en-US ] = "Save Keyboard Configuration" ;
-};
-
-String RID_SVXSTR_FILTERNAME_CFG
-{
-    Text [ en-US ] = "Configuration (*.cfg)" ;
-};
-
-String RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES
-{
-    Text [ en-US ] = "Targets do not exist in the document." ;
-};
-
-String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
-{
-    Text [ en-US ] = "Couldn't open the document." ;
-};
-
-String RID_SVXSTR_EDITHINT
-{
-    Text [ en-US ] = "[Enter text here]";
-};
-
-String RID_SVXSTR_HANGUL
-{
-    Text [ en-US ] = "Hangul";
-};
-
-String RID_SVXSTR_HANJA
-{
-    Text [ en-US ] = "Hanja";
-};
-
-String RID_SVXSTR_BASICMACROS
-{
-    Text [ en-US ] = "BASIC Macros" ;
-};
-
-String RID_SVXSTR_GROUP_STYLES
-{
-    Text [ en-US ] = "Styles" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
deleted file mode 100644
index 0b4f77a69da8..000000000000
--- a/cui/source/dialogs/fmsearch.hrc
+++ /dev/null
@@ -1,38 +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_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
-#define INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
-
-#include "svl/solar.hrc"
-
-#define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
-#define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
-#define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
-#define RID_STR_SEARCH_WHOLE                        (RID_FORMS_START +  88)
-#define RID_STR_FROM_TOP                            (RID_FORMS_START +  74)
-#define RID_STR_FROM_BOTTOM                         (RID_FORMS_START +  75)
-#define RID_STR_SEARCH_NORECORD                     (RID_FORMS_START + 8)
-#define RID_STR_SEARCH_GENERAL_ERROR                (RID_FORMS_START + 9)
-#define RID_STR_OVERFLOW_FORWARD                    (RID_FORMS_START +  34)
-#define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
-#define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
deleted file mode 100644
index 0a8cf0024a58..000000000000
--- a/cui/source/dialogs/fmsearch.src
+++ /dev/null
@@ -1,77 +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 "fmsearch.hrc"
-#include "helpid.hrc"
-
-String RID_STR_SEARCH_ANYWHERE
-{
-    Text [ en-US ] = "anywhere in the field";
-};
-
-String RID_STR_SEARCH_BEGINNING
-{
-    Text [ en-US ] = "beginning of field";
-};
-
-String RID_STR_SEARCH_END
-{
-    Text [ en-US ] = "end of field";
-};
-
-String RID_STR_SEARCH_WHOLE
-{
-    Text [ en-US ] = "entire field";
-};
-
-String RID_STR_FROM_TOP
-{
-    Text [ en-US ] = "From top";
-};
-String RID_STR_FROM_BOTTOM
-{
-    Text [ en-US ] = "From bottom";
-};
-
-String RID_STR_SEARCH_NORECORD
-{
-    Text [ en-US ] = "No records corresponding to your data found.";
-};
-
-String RID_STR_SEARCH_GENERAL_ERROR
-{
-    Text [ en-US ] = "An unknown error occurred. The search could not be finished.";
-};
-
-String RID_STR_OVERFLOW_FORWARD
-{
-    Text [ en-US ] = "Overflow, search continued at the beginning";
-};
-
-String RID_STR_OVERFLOW_BACKWARD
-{
-    Text [ en-US ] = "Overflow, search continued at the end";
-};
-
-String RID_STR_SEARCH_COUNTING
-{
-    Text [ en-US ] = "counting records";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
deleted file mode 100644
index 43d94175a970..000000000000
--- a/cui/source/dialogs/gallery.src
+++ /dev/null
@@ -1,46 +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 <sfx2/sfxsids.hrc>
-#include "helpid.hrc"
-#include "gallery.hrc"
-#include <svx/exthelpid.hrc>
-
-String RID_SVXSTR_GALLERY_NOFILES
-{
-    Text [ en-US ] = "<No Files>" ;
-};
-String RID_SVXSTR_GALLERYPROPS_OBJECT
-{
-    Text [ en-US ] = "Object;Objects" ;
-};
-String RID_SVXSTR_GALLERY_READONLY
-{
-    Text [ en-US ] = "(read-only)" ;
-};
-String RID_SVXSTR_GALLERY_ALLFILES
-{
-    Text [ en-US ] = "<All Files>" ;
-};
-String RID_SVXSTR_GALLERY_ID_EXISTS
-{
-    Text [ en-US ] = "This ID already exists..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb610a612807..d5a16bd468aa 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -22,6 +22,7 @@
 
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include "strings.hrc"
 
 #include <algorithm>
 #include <vcl/controllayout.hxx>
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 269aca763ae1..b2710554399b 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include "bitmaps.hlst"
+#include "strings.hrc"
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index a055a0a243ad..34c2d9a5fb73 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -40,6 +40,7 @@
 #include "svtools/treelistentry.hxx"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "hlmarkwn.hxx"
 #include "hltpbase.hxx"
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 2a8fcbbf763b..07277d1fed98 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -32,6 +32,7 @@
 #include "macroass.hxx"
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <vcl/builderfactory.hxx>
 
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
deleted file mode 100644
index ff3bd695ada8..000000000000
--- a/cui/source/dialogs/hyperdlg.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 <svtools/controldims.hrc>
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_HYPDLG_CLOSEBUT
-{
-    Text [ en-US ] = "Close" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT1
-{
-    Text [ en-US ] = "Mouse over object" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT2
-{
-    Text [ en-US ] = "Trigger hyperlink" ;
-};
-String RID_SVXSTR_HYPDLG_MACROACT3
-{
-    Text [ en-US ] = "Mouse leaves object" ;
-};
-
-String RID_SVXSTR_HYPDLG_NOVALIDFILENAME
-{
-    Text [ en-US ] = "Please type in a valid file name." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLINETTP
-{
-    Text [ en-US ] = "Internet" ;
-};
-String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
-{
-    Text [ en-US ] = "This is where you create a hyperlink to a Web page or FTP server connection." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLMAILTP
-{
-    Text [ en-US ] = "Mail" ;
-};
-String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
-{
-    Text [ en-US ] = "This is where you create a hyperlink to an e-mail address." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLDOCTP
-{
-    Text [ en-US ] = "Document" ;
-};
-String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP
-{
-    Text [ en-US ] = "This is where you create a hyperlink to an existing document or a target within a document." ;
-};
-
-String RID_SVXSTR_HYPERDLG_HLDOCNTP
-{
-    Text [ en-US ] = "New Document" ;
-};
-String RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP
-{
-    Text [ en-US ] = "This is where you create a new document to which the new link points." ;
-};
-
-String RID_SVXSTR_HYPERDLG_FORM_BUTTON
-{
-    Text [ en-US ] = "Button" ;
-};
-
-String RID_SVXSTR_HYPERDLG_FROM_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-
-String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
-{
-    Text [ en-US ] = "The file already exists. Overwrite?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a5f16c8f6b0d..bc68c29d278f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -35,7 +35,8 @@
 #include "insdlg.hxx"
 #include <dialmgr.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
+#include <svtools/svtresid.hxx>
 
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
@@ -54,6 +55,7 @@
 #include <comphelper/seqstream.hxx>
 
 #include "cuires.hrc"
+#include "strings.hrc"
 
 #include <osl/file.hxx>
 
@@ -67,19 +69,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ui::dialogs;
 
-
-static OUString impl_getSvtResString( sal_uInt32 nId )
-{
-    OUString aRet;
-    ResMgr* pMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() );
-    if( pMgr )
-    {
-        aRet = ResId( nId, *pMgr );
-        delete pMgr;
-    }
-    return aRet;
-}
-
 bool InsertObjectDialog_Impl::IsCreateNew() const
 {
     return false;
@@ -278,7 +267,7 @@ short SvInsertOleDlg::Execute()
                     {
                         // object couldn't be created from file
                         // global Resource from svtools (former so3 resource)
-                        OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
+                        OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE));
                         aErr = aErr.replaceFirst( "%", aFileName );
                         ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
                     }
@@ -286,7 +275,7 @@ short SvInsertOleDlg::Execute()
                     {
                         // object couldn't be created
                         // global Resource from svtools (former so3 resource)
-                        OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) );
+                        OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE));
                         aErr = aErr.replaceFirst( "%", aServerName );
                         ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
                     }
@@ -327,7 +316,7 @@ short SvInsertOleDlg::Execute()
             {
                 // object couldn't be created from file
                 // global Resource from svtools (former so3 resource)
-                OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
+                OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE));
                 aErr = aErr.replaceFirst( "%", aFileName );
                 ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute();
             }
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 1f32977a0eb1..d0a36050babb 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -20,6 +20,7 @@
 #include <dialmgr.hxx>
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "insrc.hxx"
 
 bool SvxInsRowColDlg::isInsertBefore() const
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 50d6bd047ca2..961ff4f7ad18 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -34,7 +34,7 @@
 #include <svtools/svtabbx.hxx>
 #include "svtools/treelistentry.hxx"
 
-#include <svuidlg.hrc>
+#include <strings.hrc>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/linksrc.hxx>
 #include <svtools/soerr.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c4da4b668a85..7edc03f8b2db 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -28,6 +28,7 @@
 #include <dialmgr.hxx>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 21d058f3f4ff..408613465d23 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -20,6 +20,7 @@
 #include "passwdomdlg.hxx"
 
 #include "cuires.hrc"
+#include "strings.hrc"
 #include "dialmgr.hxx"
 
 #include <sfx2/tabdlg.hxx>
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
deleted file mode 100644
index b041e741646e..000000000000
--- a/cui/source/dialogs/passwdomdlg.src
+++ /dev/null
@@ -1,42 +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 <cuires.hrc>
-
-String RID_SVXSTR_ONE_PASSWORD_MISMATCH
-{
-    Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
-};
-
-String RID_SVXSTR_TWO_PASSWORDS_MISMATCH
-{
-    Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ;
-};
-
-String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON
-{
-    Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
-};
-
-String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2
-{
-    Text [ en-US ] = "Set the password by entering the same password in both boxes." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 0b8822247d32..3a312da170ee 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -31,7 +31,8 @@
 #include <vcl/msgbox.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
+#include <svtools/svtresid.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -176,10 +177,8 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
 
         if( aTypeName.isEmpty() && aSourceName.isEmpty() )
         {
-            std::unique_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
             // global resource from svtools (former so3 resource)
-            if( pMgr )
-                aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) );
+            aSourceName = SvtResId(STR_UNKNOWN_SOURCE);
         }
     }
 
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 412ee78fd2ae..6060252b4152 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -20,6 +20,7 @@
 #include "screenshotannotationdlg.hxx"
 
 #include "cuires.hrc"
+#include "strings.hrc"
 #include "dialmgr.hxx"
 
 #include <basegfx/range/b2irange.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.src b/cui/source/dialogs/screenshotannotationdlg.src
deleted file mode 100644
index 62d0ac2ec89e..000000000000
--- a/cui/source/dialogs/screenshotannotationdlg.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 <cuires.hrc>
-
-String RID_SVXSTR_SAVE_SCREENSHOT_AS
-{
-    Text [ en-US ] = "Save Screenshot As...";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ec0f4e4c1f1e..6dcba4d31f36 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -27,6 +27,7 @@
 #include <o3tl/make_unique.hxx>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include "scriptdlg.hxx"
 #include <dialmgr.hxx>
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
deleted file mode 100644
index d1ad2824449e..000000000000
--- a/cui/source/dialogs/scriptdlg.src
+++ /dev/null
@@ -1,104 +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 <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_DELQUERY
-{
-    Text [ en-US ] = "Do you want to delete the following object?";
-};
-String RID_SVXSTR_DELQUERY_TITLE
-{
-    Text [ en-US ] = "Confirm Deletion";
-};
-String RID_SVXSTR_DELFAILED
-{
-    Text [ en-US ] = "The selected object could not be deleted.";
-};
-String RID_SVXSTR_DELFAILED_TITLE
-{
-    Text [ en-US ] = "Error Deleting Object";
-};
-String RID_SVXSTR_CREATEFAILED
-{
-    Text [ en-US ] = "The object could not be created.";
-};
-String RID_SVXSTR_CREATEFAILEDDUP
-{
-    Text [ en-US ] = " Object with the same name already exists.";
-};
-String RID_SVXSTR_CREATEFAILED_TITLE
-{
-    Text [ en-US ] = "Error Creating Object";
-};
-String RID_SVXSTR_RENAMEFAILED
-{
-    Text [ en-US ] = "The object could not be renamed.";
-};
-String RID_SVXSTR_RENAMEFAILED_TITLE
-{
-    Text [ en-US ] = "Error Renaming Object";
-};
-
-String RID_SVXSTR_ERROR_TITLE
-{
-    Text [ en-US ] = "%PRODUCTNAME Error";
-};
-
-String RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED
-{
-    Text [ en-US ] = "The scripting language %LANGUAGENAME is not supported.";
-};
-String RID_SVXSTR_ERROR_RUNNING
-{
-    Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_EXCEPTION_RUNNING
-{
-    Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_ERROR_AT_LINE
-{
-    Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.";
-};
-
-String RID_SVXSTR_EXCEPTION_AT_LINE
-{
-    Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.";
-};
-
-String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING
-{
-    Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
-};
-
-String RID_SVXSTR_ERROR_TYPE_LABEL
-{
-    Text [ en-US ] = "Type:";
-};
-
-String RID_SVXSTR_ERROR_MESSAGE_LABEL
-{
-    Text [ en-US ] = "Message:";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 0f2917fab7f5..50b35c157f6c 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "showcols.hxx"
-#include "fmsearch.hrc"
+#include "strings.hrc"
 
 #include <dialmgr.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index ea01bcb7a1cc..5ccaa5dd1101 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "srchxtra.hxx"
-#include <tools/rcid.h>
 #include <vcl/msgbox.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/whiter.hxx>
@@ -26,6 +25,7 @@
 #include <cuires.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
+#include <svx/strarray.hxx>
 #include <editeng/flstitem.hxx>
 #include "chardlg.hxx"
 #include "paragrph.hxx"
@@ -137,7 +137,6 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
     SfxObjectShell* pSh = SfxObjectShell::Current();
     DBG_ASSERT( pSh, "No DocShell" );
 
-    ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
     SfxItemPool& rPool = pSh->GetPool();
     SfxItemSet aSet( rPool, pWhRanges );
     SfxWhichIter aIter( aSet );
@@ -160,10 +159,10 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
             }
 
             // item resources are in svx
-            sal_uInt32 nId  = aAttrNames.FindIndex( nSlot );
+            sal_uInt32 nId  = SvxAttrNameTable::FindIndex(nSlot);
             SvTreeListEntry* pEntry = nullptr;
             if ( RESARRAY_INDEX_NOTFOUND != nId )
-                pEntry = m_pAttrLB->SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
+                pEntry = m_pAttrLB->SvTreeListBox::InsertEntry(SvxAttrNameTable::GetString(nId));
             else
                 SAL_WARN( "cui.dialogs", "no resource for slot id " << static_cast<sal_Int32>(nSlot) );
 
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
deleted file mode 100644
index 5322c8b0ac54..000000000000
--- a/cui/source/dialogs/svuidlg.hrc
+++ /dev/null
@@ -1,30 +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 <svl/solar.hrc>
-#include <helpid.hrc>
-
-#define STR_AUTOLINK                            32006
-#define STR_MANUALLINK                          32007
-#define STR_BROKENLINK                          32008
-#define STR_CLOSELINKMSG                        32011
-#define STR_CLOSELINKMSG_MULTI                  32024
-#define STR_WAITINGLINK                         32028
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0bed6ce6f9a2..0bf69e5329ce 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -20,6 +20,7 @@
 #include "thesdlg.hxx"
 #include "thesdlg_impl.hxx"
 #include "cuires.hrc"
+#include "strings.hrc"
 #include "dialmgr.hxx"
 
 #include <svl/lngmisc.hxx>
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 376d4962483a..c03d3dbbc476 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -18,22 +18,22 @@
  */
 
 #include <dialmgr.hxx>
-#include <svl/solar.hrc>
 #include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-// struct DialogsResMgr --------------------------------------------------
-ResMgr* CuiResMgr::GetResMgr()
+namespace
 {
-    static ResMgr* pResMgr=nullptr;
-
-    if ( !pResMgr )
+    const std::locale& GetResLocale()
     {
-        pResMgr = ResMgr::CreateResMgr("cui", Application::GetSettings().GetUILanguageTag());
+        static std::locale loc(Translate::Create("cui", Application::GetSettings().GetUILanguageTag()));
+        return loc;
     }
+}
 
-    return pResMgr;
+OUString CuiResId(const char *pKey)
+{
+    return Translate::get(pKey, GetResLocale());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 3c1287180cae..ed48d45f94ed 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -27,7 +27,6 @@
 #include <svx/dialogs.hrc>
 #include "numfmt.hxx"
 #include "splitcelldlg.hxx"
-#include "gallery.hrc"
 #include "dstribut.hxx"
 #include "cuiimapwnd.hxx"
 #include "hlmarkwn.hxx"
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index c784d2917e3d..6502549ac6d7 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -131,8 +131,8 @@ private:
     DECL_LINK( SyncHdl_Impl, Button*, void);
     DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void);
 
-    sal_uInt16              GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
-    sal_uInt16              GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
+    sal_uInt16          GetPresetImageId(sal_uInt16 nValueSetIdx) const;
+    const char*         GetPresetStringId(sal_uInt16 nValueSetIdx) const;
 
     void                FillPresetVS();
     void                FillShadowVS();
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 16cb33c8d6f2..beec430dcd7a 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -25,72 +25,12 @@
 
 // Resource-Id's ------------------------------------------------------------
 
-// RID_SVX_START + 0 unused
-#define RID_SVXSTR_OPTIONS_RESTART          (RID_SVX_START + 1)
-
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
 //      RID_CUI_GALLERY_END                 (RID_SVX_START + 410)
 
-// used in "tabpages"
-#define RID_SVXSTR_TABLE_PRESET_NONE        (RID_SVX_START + 969)
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   (RID_SVX_START + 970)
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI   (RID_SVX_START + 971)
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL    (RID_SVX_START + 972)
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER  (RID_SVX_START + 973)
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL     (RID_SVX_START + 974)
-#define RID_SVXSTR_PARA_PRESET_ALL          (RID_SVX_START + 975)
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT    (RID_SVX_START + 976)
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM    (RID_SVX_START + 977)
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT     (RID_SVX_START + 978)
-#define RID_SVXSTR_SHADOW_STYLE_NONE        (RID_SVX_START + 979)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
-#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT    (RID_SVX_START + 981)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT  (RID_SVX_START + 982)
-#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT     (RID_SVX_START + 983)
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR       (RID_SVX_START + 1113)
-#define RID_SVXSTR_VER_PRESET_ONLYVER       (RID_SVX_START + 1114)
-#define RID_SVXSTR_FRAMEDIR_LTR             (RID_SVX_START + 960)
-#define RID_SVXSTR_FRAMEDIR_RTL             (RID_SVX_START + 961)
-#define RID_SVXSTR_FRAMEDIR_SUPER           (RID_SVX_START + 962)
-#define RID_SVXSTR_PAGEDIR_LTR_HORI         (RID_SVX_START + 965)
-#define RID_SVXSTR_PAGEDIR_RTL_HORI         (RID_SVX_START + 966)
-#define RID_SVXSTR_PAGEDIR_RTL_VERT         (RID_SVX_START + 967)
-#define RID_SVXSTR_PAGEDIR_LTR_VERT         (RID_SVX_START + 968)
-#define RID_SVXSTR_EDIT_GRAPHIC             (RID_SVX_START + 509)
-
-#define RID_SVXSTR_DESC_GRADIENT            (RID_SVX_START + 163)
-#define RID_SVXSTR_DESC_NEW_BITMAP          (RID_SVX_START + 168)
-#define RID_SVXSTR_DESC_EXT_BITMAP          (RID_SVX_START + 169)
-#define RID_SVXSTR_DESC_NEW_PATTERN         (RID_SVX_START + 170)
-#define RID_SVXSTR_REMOVE_FAVORITES         (RID_SVX_START + 171)
-#define RID_SVXSTR_ADD_FAVORITES            (RID_SVX_START + 172)
-#define RID_SVXSTR_DESC_LINESTYLE           (RID_SVX_START + 174)
-
-#define RID_SVXSTR_ASK_CHANGE_LINESTYLE     (RID_SVX_START + 177)
-#define RID_SVXSTR_DESC_HATCH               (RID_SVX_START + 232)
-#define RID_SVXSTR_CHANGE                   (RID_SVX_START + 181)
-#define RID_SVXSTR_ADD                      (RID_SVX_START + 182)
-#define RID_SVXSTR_DESC_COLOR               (RID_SVX_START + 215)
-#define RID_SVXSTR_TABLE                    (RID_SVX_START + 220)
-#define RID_SVXSTR_CONNECTOR                (RID_SVX_START + 221)
-#define RID_SVXSTR_DIMENSION_LINE           (RID_SVX_START + 222)
-
-#define RID_SVXSTR_DESC_LINEEND             (RID_SVX_START + 238)
-#define RID_SVXSTR_CHARNAME_NOSTYLE         (RID_SVX_START + 239)
-#define RID_SVXSTR_CHARNAME_FAMILY          (RID_SVX_START + 240)
-#define RID_SVXSTR_CHARNAME_FONT            (RID_SVX_START + 241)
-#define RID_SVXSTR_CHARNAME_STYLE           (RID_SVX_START + 242)
-#define RID_SVXSTR_CHARNAME_TYPEFACE        (RID_SVX_START + 243)
-#define RID_SVXSTR_CHARNAME_HIGHLIGHTING    (RID_SVX_START + 244)
-
 // options
-#define RID_SVXSTR_DIAGRAM_ROW                              (RID_SVX_START + 1162)
-#define RID_SVXSTR_QUERY_DELETE_CONFIRM     (RID_SVX_START + 1110)
 #define RID_SVXPAGE_JSEARCH_OPTIONS         (RID_SVX_START +  840)
-#define STR_LINKEDDOC_DOESNOTEXIST              (RID_SVX_START + 1111)
-#define STR_LINKEDDOC_NO_SYSTEM_FILE                        (RID_SVX_START + 1169)
-#define STR_NAME_CONFLICT                       (RID_SVX_START + 1112)
 #define RID_SVX_FONT_SUBSTITUTION           (RID_SVX_START + 18)
 
 // treeopt
@@ -115,293 +55,13 @@
 #define RID_OPTPAGE_CHART_DEFCOLORS         (RID_SVX_START + 299)
 #define RID_SVXPAGE_PERSONALIZATION         (RID_SVX_START + 247)
 #define RID_SVXPAGE_COLORCONFIG             (RID_SVX_START + 249)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE      (RID_SVX_START + 324)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE1       (RID_SVX_START + 853)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE2       (RID_SVX_START + 854)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE (RID_SVX_START + 855)
-#define RID_SVXSTR_OPT_DOUBLE_DICTS         (RID_SVX_START + 320)
-#define RID_SVXSTR_OPT_PROXYPORTS           (RID_SVX_START + 224)
-#define RID_SVXSTR_JRE_NOT_RECOGNIZED       (RID_SVX_START + 256)
-#define RID_SVXSTR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
-#define RID_SVXSTR_JAVA_START_PARAM         (RID_SVX_START + 258)
-#define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
 #define RID_SVXPAGE_BASICIDE_OPTIONS        (RID_SVX_START + 209)
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)  //?
-#define RID_SVXSTR_KEY_DICTIONARY_PATH      (RID_SVX_START + 1010)//?
-#define RID_SVXSTR_KEY_LINGUISTIC_DIR       (RID_SVX_START + 1016)//?
-#define RID_SVXSTR_KEY_USERCONFIG_PATH      (RID_SVX_START + 1023)//?
-#define RID_SVXSTR_KEY_FILTER_PATH          (RID_SVX_START + 1012)//?
-#define RID_SVXSTR_KEY_ADDINS_PATH          (RID_SVX_START + 1003)//?
-#define RID_SVXSTR_KEY_FAVORITES_DIR        (RID_SVX_START + 1011)//?
-#define RID_SVXSTR_KEY_PLUGINS_PATH         (RID_SVX_START + 1019)//?
-#define RID_SVXSTR_KEY_TEMP_PATH            (RID_SVX_START + 1021)//?
-#define RID_SVXSTR_KEY_STORAGE_DIR          (RID_SVX_START + 1020)//?
-#define RID_SVXSTR_KEY_GALLERY_DIR          (RID_SVX_START + 1013)//?
-#define RID_SVXSTR_KEY_HELP_DIR             (RID_SVX_START + 1015)//?
-#define RID_SVXSTR_KEY_GLOSSARY_PATH        (RID_SVX_START + 1005)//?
-#define RID_SVXSTR_KEY_TEMPLATE_PATH        (RID_SVX_START + 1022)//?
-#define RID_SVXSTR_KEY_MODULES_PATH         (RID_SVX_START + 1017)//?
-#define RID_SVXSTR_KEY_BACKUP_PATH          (RID_SVX_START + 1006)//?
-#define RID_SVXSTR_KEY_PALETTE_PATH         (RID_SVX_START + 1018)//?
-#define RID_SVXSTR_KEY_CONFIG_DIR           (RID_SVX_START + 1009)//?
-#define RID_SVXSTR_KEY_WORK_PATH            (RID_SVX_START + 1024)//?
-#define RID_SVXSTR_KEY_GRAPHICS_PATH        (RID_SVX_START + 1014)//?
-#define RID_SVXSTR_KEY_BASIC_PATH           (RID_SVX_START + 1007)//?
-#define RID_SVXSTR_KEY_BITMAP_PATH          (RID_SVX_START + 1008)//?
-#define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)//?
-#define RID_SVXSTR_KEY_CLASSIFICATION_PATH  (RID_SVX_START + 1118)
-
-// dialogs
-#define STR_MODIFY                          (RID_SVX_START + 336)//from optdict.src
 
 // hyperlink dialog
 #define RID_SVXPAGE_HYPERLINK_INTERNET      (RID_SVX_START + 228)
 #define RID_SVXPAGE_HYPERLINK_MAIL          (RID_SVX_START + 229)
 #define RID_SVXPAGE_HYPERLINK_DOCUMENT      (RID_SVX_START + 230)
 #define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT   (RID_SVX_START + 231)
-#define RID_SVXSTR_HYPERDLG_HLINETTP        (RID_SVX_START + 581)
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP   (RID_SVX_START + 582)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP        (RID_SVX_START + 583)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP   (RID_SVX_START + 584)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP         (RID_SVX_START + 585)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP    (RID_SVX_START + 586)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP        (RID_SVX_START + 587)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP   (RID_SVX_START + 588)
-#define RID_SVXSTR_HYPDLG_CLOSEBUT          (RID_SVX_START + 549)
-#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME   (RID_SVX_START + 553)
-#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE  (RID_SVX_START +  815)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES  (RID_SVX_START + 800)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-#define RID_SVXSTR_HYPDLG_MACROACT1         (RID_SVX_START + 550)
-#define RID_SVXSTR_HYPDLG_MACROACT2         (RID_SVX_START + 551)
-#define RID_SVXSTR_HYPDLG_MACROACT3         (RID_SVX_START + 552)
-#define RID_SVXSTR_HYPERDLG_FORM_BUTTON     (RID_SVX_START +  813)
-#define RID_SVXSTR_HYPERDLG_FROM_TEXT       (RID_SVX_START +  814)
-#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED  (RID_SVX_START +  816)
-
-// multi path dialog
-#define RID_MULTIPATH_DBL_ERR               (RID_SVX_START + 207)
-#define RID_SVXSTR_ARCHIVE_TITLE            (RID_SVX_START + 484)
-#define RID_SVXSTR_ARCHIVE_HEADLINE         (RID_SVX_START + 485)
-#define RID_SVXSTR_MULTIFILE_DBL_ERR        (RID_SVX_START + 486)
-#define RID_SVXSTR_ADD_IMAGE                (RID_SVX_START + 487)
-
-// script organizer
-#define RID_SVXSTR_DELQUERY                 (RID_SVX_START + 1027)
-#define RID_SVXSTR_DELQUERY_TITLE           (RID_SVX_START + 1028)
-#define RID_SVXSTR_DELFAILED                (RID_SVX_START + 1029)
-#define RID_SVXSTR_DELFAILED_TITLE          (RID_SVX_START + 1031)
-#define RID_SVXSTR_CREATEFAILED             (RID_SVX_START + 1032)
-#define RID_SVXSTR_CREATEFAILEDDUP          (RID_SVX_START + 1034)
-#define RID_SVXSTR_CREATEFAILED_TITLE       (RID_SVX_START + 1035)
-#define RID_SVXSTR_RENAMEFAILED             (RID_SVX_START + 1036)
-#define RID_SVXSTR_RENAMEFAILED_TITLE       (RID_SVX_START + 1038)
-#define RID_SVXSTR_ERROR_TITLE                  (RID_SVX_START + 1100)
-#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED     (RID_SVX_START + 1101)
-#define RID_SVXSTR_ERROR_RUNNING                (RID_SVX_START + 1102)
-#define RID_SVXSTR_EXCEPTION_RUNNING            (RID_SVX_START + 1103)
-#define RID_SVXSTR_ERROR_AT_LINE                (RID_SVX_START + 1104)
-#define RID_SVXSTR_EXCEPTION_AT_LINE            (RID_SVX_START + 1105)
-#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING      (RID_SVX_START + 1106)
-#define RID_SVXSTR_ERROR_TYPE_LABEL             (RID_SVX_START + 1108)
-#define RID_SVXSTR_ERROR_MESSAGE_LABEL          (RID_SVX_START + 1109)
-
-#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167)
-#define RID_SVXSTR_NEW_MENU                 (RID_SVX_START + 1039)
-#define RID_SVXSTR_NEW_TOOLBAR              (RID_SVX_START + 1040)
-#define RID_SVXSTR_MOVE_MENU                (RID_SVX_START + 1041)
-#define RID_SVXSTR_ADD_SUBMENU                  (RID_SVX_START + 1048)
-#define RID_SVXSTR_SUBMENU_NAME                 (RID_SVX_START + 1049)
-#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
-#define RID_SVXSTR_DELETE_ICON_CONFIRM                      (RID_SVX_START + 1163) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_WARNING                     (RID_SVX_START + 1164) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_CONFIRM                     (RID_SVX_START + 1165) //added for issue73355
-#define RID_SVXSTR_YESTOALL                                 (RID_SVX_START + 1166) //added for issue73355
-#define RID_SVXSTR_PRODUCTNAME_TOOLBARS         (RID_SVX_START + 1042)
-#define RID_SVXSTR_TOOLBAR                      (RID_SVX_START + 1043)
-#define RID_SVXSTR_TOOLBAR_CONTENT              (RID_SVX_START + 1044)
-#define RID_SVXSTR_COMMANDS                     (RID_SVX_START + 1045)
-#define RID_SVXSTR_CONFIRM_MENU_RESET           (RID_SVX_START + 1115)
-#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET        (RID_SVX_START + 1116)
-#define RID_SVXSTR_LABEL_NEW_NAME                           (RID_SVX_START + 1135)
-#define RID_SVXSTR_RENAME_MENU                              (RID_SVX_START + 1136)
-#define RID_SVXSTR_RENAME_TOOLBAR                           (RID_SVX_START + 1137)
-#define RID_SVXSTR_EVENT_STARTAPP               (RID_SVX_START + 1051)
-#define RID_SVXSTR_EVENT_CLOSEAPP               (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_NEWDOC                 (RID_SVX_START + 1053)
-#define RID_SVXSTR_EVENT_CLOSEDOC               (RID_SVX_START + 1054)
-#define RID_SVXSTR_EVENT_PREPARECLOSEDOC        (RID_SVX_START + 1055)
-#define RID_SVXSTR_EVENT_OPENDOC                (RID_SVX_START + 1056)
-#define RID_SVXSTR_EVENT_SAVEDOC                (RID_SVX_START + 1057)
-#define RID_SVXSTR_EVENT_SAVEASDOC              (RID_SVX_START + 1058)
-#define RID_SVXSTR_EVENT_SAVEDOCDONE            (RID_SVX_START + 1059)
-#define RID_SVXSTR_EVENT_SAVEASDOCDONE          (RID_SVX_START + 1060)
-#define RID_SVXSTR_EVENT_ACTIVATEDOC            (RID_SVX_START + 1061)
-#define RID_SVXSTR_EVENT_DEACTIVATEDOC          (RID_SVX_START + 1062)
-#define RID_SVXSTR_EVENT_PRINTDOC               (RID_SVX_START + 1063)
-#define RID_SVXSTR_EVENT_MODIFYCHANGED          (RID_SVX_START + 1064)
-#define RID_SVXSTR_EVENT_MAILMERGE              (RID_SVX_START + 1065)
-#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE        (RID_SVX_START + 1066)
-#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
-#define RID_SVXSTR_EVENT_ACTIONPERFORMED        (RID_SVX_START + 1068)
-#define RID_SVXSTR_EVENT_CHANGED                (RID_SVX_START + 1069)
-#define RID_SVXSTR_EVENT_TEXTCHANGED            (RID_SVX_START + 1070)
-#define RID_SVXSTR_EVENT_ITEMSTATECHANGED       (RID_SVX_START + 1071)
-#define RID_SVXSTR_EVENT_FOCUSGAINED            (RID_SVX_START + 1072)
-#define RID_SVXSTR_EVENT_FOCUSLOST              (RID_SVX_START + 1073)
-#define RID_SVXSTR_EVENT_KEYTYPED               (RID_SVX_START + 1074)
-#define RID_SVXSTR_EVENT_KEYUP                  (RID_SVX_START + 1075)
-#define RID_SVXSTR_EVENT_MOUSEENTERED           (RID_SVX_START + 1076)
-#define RID_SVXSTR_EVENT_MOUSEDRAGGED           (RID_SVX_START + 1077)
-#define RID_SVXSTR_EVENT_MOUSEMOVED             (RID_SVX_START + 1078)
-#define RID_SVXSTR_EVENT_MOUSEPRESSED           (RID_SVX_START + 1079)
-#define RID_SVXSTR_EVENT_MOUSERELEASED          (RID_SVX_START + 1080)
-#define RID_SVXSTR_EVENT_MOUSEEXITED            (RID_SVX_START + 1081)
-#define RID_SVXSTR_EVENT_APPROVERESETTED        (RID_SVX_START + 1082)
-#define RID_SVXSTR_EVENT_SUBMITTED              (RID_SVX_START + 1083)
-#define RID_SVXSTR_EVENT_BEFOREUPDATE           (RID_SVX_START + 1084)
-#define RID_SVXSTR_EVENT_AFTERUPDATE            (RID_SVX_START + 1085)
-#define RID_SVXSTR_EVENT_LOADED                 (RID_SVX_START + 1086)
-#define RID_SVXSTR_EVENT_RELOADING              (RID_SVX_START + 1087)
-#define RID_SVXSTR_EVENT_RELOADED               (RID_SVX_START + 1088)
-#define RID_SVXSTR_EVENT_UNLOADING              (RID_SVX_START + 1089)
-#define RID_SVXSTR_EVENT_UNLOADED               (RID_SVX_START + 1090)
-#define RID_SVXSTR_EVENT_CONFIRMDELETE          (RID_SVX_START + 1091)
-#define RID_SVXSTR_EVENT_APPROVEROWCHANGE       (RID_SVX_START + 1092)
-#define RID_SVXSTR_EVENT_ROWCHANGE              (RID_SVX_START + 1093)
-#define RID_SVXSTR_EVENT_POSITIONING            (RID_SVX_START + 1094)
-#define RID_SVXSTR_EVENT_POSITIONED             (RID_SVX_START + 1095)
-#define RID_SVXSTR_EVENT_APPROVEPARAMETER       (RID_SVX_START + 1096)
-#define RID_SVXSTR_EVENT_ERROROCCURRED           (RID_SVX_START + 1097)
-#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
-#define RID_SVXSTR_EVENT_RESETTED               (RID_SVX_START + 1099)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED                (RID_SVX_START + 1170)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED                (RID_SVX_START + 1171)
-#define RID_SVXSTR_EVENT_CREATEDOC                          (RID_SVX_START + 1172)
-#define RID_SVXSTR_EVENT_LOADDOCFINISHED                    (RID_SVX_START + 1173)
-#define RID_SVXSTR_EVENT_SAVEDOCFAILED                      (RID_SVX_START + 1174)
-#define RID_SVXSTR_EVENT_SAVEASDOCFAILED                    (RID_SVX_START + 1175)
-#define RID_SVXSTR_EVENT_COPYTODOC                          (RID_SVX_START + 1176)
-#define RID_SVXSTR_EVENT_COPYTODOCDONE                      (RID_SVX_START + 1177)
-#define RID_SVXSTR_EVENT_COPYTODOCFAILED                    (RID_SVX_START + 1178)
-#define RID_SVXSTR_EVENT_VIEWCREATED                        (RID_SVX_START + 1179)
-#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW                   (RID_SVX_START + 1180)
-#define RID_SVXSTR_EVENT_CLOSEVIEW                          (RID_SVX_START + 1181)
-#define RID_SVXSTR_EVENT_TITLECHANGED                       (RID_SVX_START + 1182)
-#define RID_SVXSTR_EVENT_MAILMERGE_END                      (RID_SVX_START + 1186)
-#define RID_SVXSTR_EVENT_FIELDMERGE                         (RID_SVX_START + 1187)
-#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
-
-// For now, keep new IDs unique only within cui.
-// Later, cui should perhaps get an own range of IDs.
-#define RID_SVXSTR_EVENT_SELECTIONCHANGED                   (RID_SVX_START + 1190)
-#define RID_SVXSTR_EVENT_DOUBLECLICK                        (RID_SVX_START + 1191)
-#define RID_SVXSTR_EVENT_RIGHTCLICK                         (RID_SVX_START + 1192)
-#define RID_SVXSTR_EVENT_CALCULATE                          (RID_SVX_START + 1193)
-#define RID_SVXSTR_EVENT_CONTENTCHANGED                     (RID_SVX_START + 1194)
-
-#define RID_SVXSTR_ERR_TEXTNOTFOUND                         (RID_SVX_START + 1195)
-#define RID_SVXSTR_SELECT_FILE_IFRAME                       (RID_SVX_START + 1196)
-#define RID_SVXSTR_MYMACROS                                 (RID_SVX_START + 1197)
-#define RID_SVXSTR_PRODMACROS                               (RID_SVX_START + 1198)
-#define RID_SVXSTR_SELECTOR_ADD_COMMANDS                    (RID_SVX_START + 1199)
-#define RID_SVXSTR_SELECTOR_RUN                             (RID_SVX_START + 1200)
-#define RID_SVXSTR_ROW                                      (RID_SVX_START + 1201)
-#define RID_SVXSTR_COL                                      (RID_SVX_START + 1202)
-#define RID_SVXSTR_AUTO_ENTRY                               (RID_SVX_START + 1203)
-#define RID_SVXSTR_ALLFUNCTIONS                             (RID_SVX_START + 1204)
-
-#define RID_SVXSTR_USE_REPLACE                              (RID_SVX_START + 1205)
-#define RID_SVXSTR_CPTL_STT_WORD                            (RID_SVX_START + 1206)
-#define RID_SVXSTR_CPTL_STT_SENT                            (RID_SVX_START + 1207)
-#define RID_SVXSTR_BOLD_UNDER                               (RID_SVX_START + 1208)
-#define RID_SVXSTR_NO_DBL_SPACES                            (RID_SVX_START + 1209)
-#define RID_SVXSTR_DETECT_URL                               (RID_SVX_START + 1210)
-#define RID_SVXSTR_DASH                                     (RID_SVX_START + 1211)
-#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK             (RID_SVX_START + 1212)
-#define RID_SVXSTR_NON_BREAK_SPACE                          (RID_SVX_START + 1213)
-#define RID_SVXSTR_ORDINAL                                  (RID_SVX_START + 1214)
-#define RID_SVXSTR_DEL_EMPTY_PARA                           (RID_SVX_START + 1215)
-#define RID_SVXSTR_USER_STYLE                               (RID_SVX_START + 1216)
-#define RID_SVXSTR_BULLET                                   (RID_SVX_START + 1217)
-#define RID_SVXSTR_RIGHT_MARGIN                             (RID_SVX_START + 1218)
-#define RID_SVXSTR_NUM                                      (RID_SVX_START + 1219)
-#define RID_SVXSTR_BORDER                                   (RID_SVX_START + 1220)
-#define RID_SVXSTR_CREATE_TABLE                             (RID_SVX_START + 1221)
-#define RID_SVXSTR_REPLACE_TEMPLATES                        (RID_SVX_START + 1222)
-#define RID_SVXSTR_DEL_SPACES_AT_STT_END                    (RID_SVX_START + 1223)
-#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES                 (RID_SVX_START + 1224)
-
-#define RID_SVXSTR_CAPITAL_WORDS                            (RID_SVX_START + 1225)
-#define RID_SVXSTR_WORDS_WITH_DIGITS                        (RID_SVX_START + 1226)
-#define RID_SVXSTR_SPELL_SPECIAL                            (RID_SVX_START + 1227)
-#define RID_SVXSTR_SPELL_AUTO                               (RID_SVX_START + 1228)
-#define RID_SVXSTR_NUM_PRE_BREAK                            (RID_SVX_START + 1229)
-#define RID_SVXSTR_NUM_POST_BREAK                           (RID_SVX_START + 1230)
-#define RID_SVXSTR_HYPH_AUTO                                (RID_SVX_START + 1231)
-#define RID_SVXSTR_HYPH_SPECIAL                             (RID_SVX_START + 1232)
-#define RID_SVXSTR_NUM_MIN_WORDLEN                          (RID_SVX_START + 1233)
-#define RID_SVXSTR_GRAMMAR_AUTO                             (RID_SVX_START + 1234)
-#define RID_SVXSTR_GROUP_STYLES                             (RID_SVX_START + 1235)
-#define RID_SVXSTR_BASICMACROS                              (RID_SVX_START + 1236)
-// There is a gap here because of removed strings
-#define RID_SVXSTR_CHG_MATH                                 (RID_SVX_START + 1238)
-#define RID_SVXSTR_CHG_WRITER                               (RID_SVX_START + 1239)
-#define RID_SVXSTR_CHG_CALC                                 (RID_SVX_START + 1240)
-#define RID_SVXSTR_CHG_IMPRESS                              (RID_SVX_START + 1241)
-#define RID_SVXSTR_HEADER1                                  (RID_SVX_START + 1242)
-#define RID_SVXSTR_HEADER2                                  (RID_SVX_START + 1243)
-
-#define RID_SVXSTR_TYPE                                     (RID_SVX_START + 1244)
-#define RID_SVXSTR_PATH                                     (RID_SVX_START + 1245)
-
-#define RID_SVXSTR_DRIVER_NAME                              (RID_SVX_START + 1246)
-#define RID_SVXSTR_POOLED_FLAG                              (RID_SVX_START + 1247)
-#define RID_SVXSTR_POOL_TIMEOUT                             (RID_SVX_START + 1248)
-#define RID_SVXSTR_YES                                      (RID_SVX_START + 1249)
-#define RID_SVXSTR_NO                                       (RID_SVX_START + 1250)
-
-#define RID_SVXSTR_CHG_SMARTART                             (RID_SVX_START + 1251)
-
-#define RID_SVXSTR_PPI                                      (RID_SVX_START + 1252)
-#define RID_SVXSTR_SPELL                                    (RID_SVX_START + 1253)
-#define RID_SVXSTR_HYPH                                     (RID_SVX_START + 1254)
-#define RID_SVXSTR_THES                                     (RID_SVX_START + 1255)
-#define RID_SVXSTR_GRAMMAR                                  (RID_SVX_START + 1256)
-
-#define RID_SVXSTR_ONE_PASSWORD_MISMATCH                    (RID_SVX_START + 1258)
-#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH                   (RID_SVX_START + 1259)
-#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON              (RID_SVX_START + 1260)
-#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2           (RID_SVX_START + 1261)
-
-#define RID_SVXSTR_LOADACCELCONFIG                          (RID_SVX_START + 1262)
-#define RID_SVXSTR_SAVEACCELCONFIG                          (RID_SVX_START + 1263)
-#define RID_SVXSTR_FILTERNAME_CFG                           (RID_SVX_START + 1264)
-#define RID_SVXSTR_LOAD_ERROR                               (RID_SVX_START + 1265)
-
-#define RID_SVXSTR_EDITHINT                                 (RID_SVX_START + 1266)
-#define RID_SVXSTR_SAVE_SCREENSHOT_AS                       (RID_SVX_START + 1267)
-
-#define RID_SVXSTR_STARTQUOTE                               (RID_SVX_START + 1268)
-#define RID_SVXSTR_ENDQUOTE                                 (RID_SVX_START + 1269)
-
-// Hangul/Hanja Dialog
-#define RID_SVXSTR_HANGUL                                   (RID_SVX_START + 1270)
-#define RID_SVXSTR_HANJA                                    (RID_SVX_START + 1271)
-
-// Search Persona Dialog
-#define RID_SVXSTR_SELECTEDPERSONA                          (RID_SVX_START + 1278)
-#define RID_SVXSTR_SEARCHING                                (RID_SVX_START + 1279)
-#define RID_SVXSTR_SEARCHERROR                              (RID_SVX_START + 1280)
-#define RID_SVXSTR_NORESULTS                                (RID_SVX_START + 1281)
-#define RID_SVXSTR_APPLYPERSONA                             (RID_SVX_START + 1282)
-
-#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR                   (RID_SVX_START + 1283)
-#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT                  (RID_SVX_START + 1284)
-#define RID_SVXSTR_CONFIRM_SET_LANGUAGE                     (RID_SVX_START + 1285)
-
-// String Array for Persona Categories
-#define RID_SVXSTR_PERSONA_CATEGORIES                       (RID_SVX_START + 1286)
 
 #define RID_SVXPAGE_OPENCL                                  (RID_SVX_START + 254)
 
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index e323ba987c7e..067591a09bab 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -19,21 +19,9 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX
 #define INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX
 
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
 
-// forward ---------------------------------------------------------------
-
-#define CUI_MGR()       (*CuiResMgr::GetResMgr())
-
-struct CuiResMgr
-{
-    static ResMgr*      GetResMgr();
-};
-
-inline OUString CuiResId(sal_uInt16 nId)
-{
-    return ResId(nId, CUI_MGR());
-}
+OUString CuiResId(const char *pKey);
 
 #endif
 
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
deleted file mode 100644
index 221aa9bd5f6e..000000000000
--- a/cui/source/inc/gallery.hrc
+++ /dev/null
@@ -1,28 +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 <cuires.hrc>
-
-// Gallery-Strings
-#define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
-#define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index b2feb3c6dcdc..736c4de3cbcf 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -41,10 +41,10 @@ typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
 struct EventDisplayName
 {
     const sal_Char* pAsciiEventName;
-    sal_uInt16          nEventResourceID;
-    EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
-        : pAsciiEventName( _pAsciiName )
-        , nEventResourceID( _nResId )
+    const char*     pEventResourceID;
+    EventDisplayName(const sal_Char* pAsciiName, const char* pResId)
+        : pAsciiEventName(pAsciiName)
+        , pEventResourceID(pResId)
     {
     }
 };
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index fdd97c4566d8..ff83afe71892 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -73,9 +73,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage
 
     Link<SvxSwFrameValidation&,void> m_aValidateLink;
 
-    //'string provider'
-    SvxSwFramePosString m_aFramePosString;
-
     ::tools::Rectangle           m_aRect; //size of all selected objects
     ::tools::Rectangle           m_aWorkArea;
     Point               m_aAnchorPos;
@@ -110,7 +107,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     void            InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel,
                             sal_uInt16 nV,  sal_uInt16 nVRel,
                             long   nX,  long   nY);
-    sal_uInt16          GetMapPos(FrmMap *pMap, ListBox &rAlignLB);
+    static sal_uInt16   GetMapPos(FrmMap *pMap, ListBox &rAlignLB);
     static short        GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
     static short        GetRelation(FrmMap *pMap, ListBox &rRelationLB);
     RndStdIds           GetAnchorType(bool* pbHasChanged = nullptr);
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index a771ef0a206f..d01c1c10e2fe 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -24,7 +24,6 @@
 
 #include <memory>
 
-#include <tools/resary.hxx>
 #include <vcl/fixed.hxx>
 
 class SfxModule;
@@ -196,40 +195,6 @@ public:
     static void         ApplyLanguageOptions(const SfxItemSet& rSet);
 };
 
-// class OfaPageResource -------------------------------------------------
-
-class OfaPageResource
-{
-    ResStringArray      aGeneralDlgAry;
-    ResStringArray      aInetDlgAry;
-    ResStringArray      aLangDlgAry;
-    ResStringArray      aTextDlgAry;
-    ResStringArray      aHTMLDlgAry;
-    ResStringArray      aCalcDlgAry;
-    ResStringArray      aStarMathDlgAry;
-    ResStringArray      aImpressDlgAry;
-    ResStringArray      aDrawDlgAry;
-    ResStringArray      aChartDlgAry;
-    ResStringArray      aFilterDlgAry;
-    ResStringArray      aDatasourcesDlgAry;
-
-public:
-    OfaPageResource();
-
-    ResStringArray& GetGeneralArray()       {return aGeneralDlgAry;}
-    ResStringArray& GetInetArray()          {return aInetDlgAry;}
-    ResStringArray& GetLangArray()          {return aLangDlgAry;}
-    ResStringArray& GetTextArray()          {return aTextDlgAry;}
-    ResStringArray& GetHTMLArray()          {return aHTMLDlgAry;}
-    ResStringArray& GetCalcArray()          {return aCalcDlgAry;}
-    ResStringArray& GetStarMathArray()      {return aStarMathDlgAry;}
-    ResStringArray& GetImpressArray()       {return aImpressDlgAry;}
-    ResStringArray& GetDrawArray()          {return aDrawDlgAry;}
-    ResStringArray& GetChartArray()         {return aChartDlgAry;}
-    ResStringArray& GetFilterArray()        {return aFilterDlgAry;}
-    ResStringArray& GetDatasourcesArray()   {return aDatasourcesDlgAry;}
-};
-
 // class ExtensionsTabPage -----------------------------------------------
 
 namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 8a2e95793b16..4e8666cdac1a 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -22,6 +22,7 @@
 #include "cfgchart.hxx"
 #include <dialmgr.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 
 #define ROW_COLOR_COUNT 12
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 850a05d8d2c2..ae3a2538d386 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -25,6 +25,7 @@
 #include <svl/eitem.hxx>
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include <strings.hrc>
 #include <dialmgr.hxx>
 
 using ::svt::EditBrowseBox;
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
deleted file mode 100644
index 5f441079f37f..000000000000
--- a/cui/source/options/connpooloptions.src
+++ /dev/null
@@ -1,43 +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 <cuires.hrc>
-
-String RID_SVXSTR_DRIVER_NAME
-{
-    Text [ en-US ] = "Driver name";
-};
-String RID_SVXSTR_POOLED_FLAG
-{
-    Text [ en-US ] = "Pool";
-};
-String RID_SVXSTR_POOL_TIMEOUT
-{
-    Text [ en-US ] = "Timeout";
-};
-String RID_SVXSTR_YES
-{
-    Text [ en-US ] = "Yes";
-};
-String RID_SVXSTR_NO
-{
-    Text [ en-US ] = "No";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index ce2a4a94dd4b..df307e814396 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -25,6 +25,7 @@
 #include <svtools/editbrowsebox.hxx>
 #include "svtools/treelistentry.hxx"
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <vcl/field.hxx>
 #include <vcl/layout.hxx>
@@ -442,5 +443,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bo
 
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
deleted file mode 100644
index 7362be056d51..000000000000
--- a/cui/source/options/dbregister.src
+++ /dev/null
@@ -1,32 +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 <cuires.hrc>
-
-String RID_SVXSTR_TYPE
-{
-    Text [ en-US ] = "Registered name" ;
-};
-
-String RID_SVXSTR_PATH
-{
-    Text [ en-US ] = "Database file" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index eacfc0319f80..6bb15f5b3aae 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svl/filenotation.hxx>
 #include <vcl/layout.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
deleted file mode 100644
index 6e93f0c373fa..000000000000
--- a/cui/source/options/doclinkdialog.src
+++ /dev/null
@@ -1,42 +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 <cuires.hrc>
-
-String STR_LINKEDDOC_DOESNOTEXIST
-{
-    Text [ en-US ] = "The file\n$file$\ndoes not exist.";
-};
-
-String STR_LINKEDDOC_NO_SYSTEM_FILE
-{
-    Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system.";
-};
-
-String STR_NAME_CONFLICT
-{
-    Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name.";
-};
-
-String RID_SVXSTR_QUERY_DELETE_CONFIRM
-{
-    Text [ en-US ] = "Do you want to delete the entry?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
deleted file mode 100644
index f5ae78182f52..000000000000
--- a/cui/source/options/optchart.src
+++ /dev/null
@@ -1,32 +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 <cuires.hrc>
-#include "helpid.hrc"
-
-// tab page for setting the default colors used for new charts
-
-String RID_SVXSTR_DIAGRAM_ROW
-{
-    // $(ROW) can be a number or the caption of the row in quotes
-
-    Text [ en-US ] = "Data Series $(ROW)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 33ea45e806c0..1a64c728eddb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -39,6 +39,7 @@
 #include <dialmgr.hxx>
 #include "optcolor.hxx"
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svx/dlgutil.hxx>
 
 using namespace ::com::sun::star;
@@ -283,7 +284,6 @@ private:
 // ctor for default groups
 // rParent: parent window (ColorConfigWindow_Impl)
 // eGroup: which group is this?
-// rResMgr: resource manager
 ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
     : m_pText(pText)
 {
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
deleted file mode 100644
index 2a9af27e71b1..000000000000
--- a/cui/source/options/optcolor.src
+++ /dev/null
@@ -1,41 +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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_COLOR_CONFIG_DELETE
-{
-    Text [ en-US ] = "Do you really want to delete the color scheme?" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE
-{
-    Text [ en-US ] = "Color Scheme Deletion" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_SAVE1
-{
-    Text [ en-US ] = "Save scheme" ;
-};
-String RID_SVXSTR_COLOR_CONFIG_SAVE2
-{
-    Text [ en-US ] = "Name of color scheme" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index a8beb91cfa46..9f0f8bd434a4 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -34,6 +34,7 @@
 
 #include <linguistic/misc.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "optdict.hxx"
 #include <dialmgr.hxx>
 #include <svx/svxerr.hxx>
@@ -177,7 +178,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
         xNewDic = nullptr;
         // error: couldn't create new dictionary
         SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
-            this, RID_SVXERRCTX, &DIALOG_MGR() );
+            this, getRID_SVXERRCTX(), &SvxResLocale() );
         ErrorHandler::HandleError( *new StringErrorInfo(
                 ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
         EndDialog();
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
deleted file mode 100644
index eeae6311835a..000000000000
--- a/cui/source/options/optdict.src
+++ /dev/null
@@ -1,38 +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 "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_OPT_DOUBLE_DICTS
-{
-    Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ;
-};
-
-String STR_MODIFY
-{
-    Text [ en-US ] = "~Replace" ;
-};
-
-String RID_SVXSTR_CONFIRM_SET_LANGUAGE
-{
-    Text [ en-US ] = "Do you want to change the '%1' dictionary language?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 8723c18e77be..6964977d3a39 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -23,6 +23,7 @@
 #include "optfltr.hxx"
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include "strings.hrc"
 #include <dialmgr.hxx>
 
 #include "svtools/svlbitm.hxx"
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
deleted file mode 100644
index 41b378c05342..000000000000
--- a/cui/source/options/optfltr.src
+++ /dev/null
@@ -1,51 +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 <cuires.hrc>
-
-String RID_SVXSTR_HEADER1
-{
-    Text [ en-US ] = "[L]";
-};
-String RID_SVXSTR_HEADER2
-{
-    Text [ en-US ] = "[S]";
-};
-String RID_SVXSTR_CHG_MATH
-{
-    Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse";
-};
-String RID_SVXSTR_CHG_WRITER
-{
-    Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse";
-};
-String RID_SVXSTR_CHG_CALC
-{
-    Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse";
-};
-String RID_SVXSTR_CHG_IMPRESS
-{
-    Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse";
-};
-String RID_SVXSTR_CHG_SMARTART
-{
-    Text [ en-US ] = "SmartArt to %PRODUCTNAME shapes or reverse";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c28e7aecc901..db2ff453dbd4 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -54,6 +54,7 @@
 #include <svx/ofaitem.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/svxids.hrc>
+#include <strings.hrc>
 
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
deleted file mode 100644
index e1a9ee0f7800..000000000000
--- a/cui/source/options/optinet2.src
+++ /dev/null
@@ -1,29 +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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-String RID_SVXSTR_OPT_PROXYPORTS
-{
-    Text [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is 65535.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 732c616df0c5..8141a5b4ccc0 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -33,6 +33,7 @@
 
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include <strings.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
deleted file mode 100644
index f4e931a9fbd8..000000000000
--- a/cui/source/options/optjava.src
+++ /dev/null
@@ -1,43 +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 <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_JRE_NOT_RECOGNIZED
-{
-    Text [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ;
-};
-
-String RID_SVXSTR_JRE_FAILED_VERSION
-{
-    Text [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ;
-};
-
-String RID_SVXSTR_OPTIONS_RESTART
-{
-    Text [ en-US ] = "Please restart %PRODUCTNAME now so the new or modified values can take effect." ;
-};
-
-String RID_SVXSTR_JAVA_START_PARAM
-{
-    Text [ en-US ] = "Edit Parameter" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a67c458e43ec..1c85f8469c07 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -58,6 +58,7 @@
 #include <dialmgr.hxx>
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include <strings.hrc>
 
 #include <ucbhelper/content.hxx>
 
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
deleted file mode 100644
index 084f3a902de6..000000000000
--- a/cui/source/options/optlingu.src
+++ /dev/null
@@ -1,87 +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 "helpid.hrc"
-
-#include <svtools/controldims.hrc>
-#include <sfx2/sfx.hrc>
-#include <cuires.hrc>
-
-String RID_SVXSTR_SPELL
-{
-    Text [ en-US ] = "Spelling";
-};
-
-String RID_SVXSTR_HYPH
-{
-    Text [ en-US ] = "Hyphenation";
-};
-
-String RID_SVXSTR_THES
-{
-    Text [ en-US ] = "Thesaurus";
-};
-
-String RID_SVXSTR_GRAMMAR
-{
-    Text [ en-US ] = "Grammar";
-};
-
-String RID_SVXSTR_CAPITAL_WORDS
-{
-    Text [ en-US ] = "Check uppercase words";
-};
-String RID_SVXSTR_WORDS_WITH_DIGITS
-{
-    Text [ en-US ] = "Check words with numbers ";
-};
-String RID_SVXSTR_SPELL_SPECIAL
-{
-    Text [ en-US ] = "Check special regions";
-};
-String RID_SVXSTR_SPELL_AUTO
-{
-    Text [ en-US ] = "Check spelling as you type";
-};
-String RID_SVXSTR_GRAMMAR_AUTO
-{
-    Text [ en-US ] = "Check grammar as you type";
-};
-String RID_SVXSTR_NUM_MIN_WORDLEN
-{
-    Text [ en-US ] = "Minimal number of characters for hyphenation: ";
-};
-String RID_SVXSTR_NUM_PRE_BREAK
-{
-    Text [ en-US ] = "Characters before line break: ";
-};
-String RID_SVXSTR_NUM_POST_BREAK
-{
-    Text [ en-US ] = "Characters after line break: ";
-};
-String RID_SVXSTR_HYPH_AUTO
-{
-    Text [ en-US ] = "Hyphenate without inquiry";
-};
-String RID_SVXSTR_HYPH_SPECIAL
-{
-    Text [ en-US ] = "Hyphenate special regions";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index b99cd7f04767..0fb1e1a172ee 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/util/XChangesBatch.hpp>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <dialmgr.hxx>
 #include "optopencl.hxx"
 #include <svtools/treelistentry.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index ab292153757f..08b0243a6f02 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -36,6 +36,7 @@
 #include <dialmgr.hxx>
 #include <cuires.hrc>
 #include "helpid.hrc"
+#include "strings.hrc"
 #include <comphelper/configuration.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
@@ -276,7 +277,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* )
     return true;
 }
 
-
 void SvxPathTabPage::Reset( const SfxItemSet* )
 {
     pPathBox->Clear();
@@ -292,51 +292,74 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
             && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) )
             continue;
 
+        const char* pId = nullptr;
+
         switch (i)
         {
             case SvtPathOptions::PATH_AUTOCORRECT:
+                pId = RID_SVXSTR_KEY_AUTOCORRECT_DIR;
+                break;
             case SvtPathOptions::PATH_AUTOTEXT:
+                pId = RID_SVXSTR_KEY_GLOSSARY_PATH;
+                break;
             case SvtPathOptions::PATH_BACKUP:
+                pId = RID_SVXSTR_KEY_BACKUP_PATH;
+                break;
             case SvtPathOptions::PATH_GALLERY:
+                pId = RID_SVXSTR_KEY_GALLERY_DIR;
+                break;
             case SvtPathOptions::PATH_GRAPHIC:
+                pId = RID_SVXSTR_KEY_GRAPHICS_PATH;
+                break;
             case SvtPathOptions::PATH_TEMP:
+                pId = RID_SVXSTR_KEY_TEMP_PATH;
+                break;
             case SvtPathOptions::PATH_TEMPLATE:
+                pId = RID_SVXSTR_KEY_TEMPLATE_PATH;
+                break;
             case SvtPathOptions::PATH_DICTIONARY:
+                pId = RID_SVXSTR_KEY_DICTIONARY_PATH;
+                break;
             case SvtPathOptions::PATH_CLASSIFICATION:
+                pId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
+                break;
 #if OSL_DEBUG_LEVEL > 1
             case SvtPathOptions::PATH_LINGUISTIC:
+                pId = RID_SVXSTR_KEY_LINGUISTIC_DIR;
+                break;
 #endif
             case SvtPathOptions::PATH_WORK:
+                pId = RID_SVXSTR_KEY_WORK_PATH;
+                break;
+        }
+
+        if (pId)
+        {
+            OUString aStr(CuiResId(pId));
+
+            nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
+            aStr += "\t";
+            OUString sInternal, sUser, sWritable;
+            bool bReadOnly = false;
+            GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
+            OUString sTmpPath = sUser;
+            if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
+                sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+            sTmpPath += sWritable;
+            const OUString aValue = Convert_Impl( sTmpPath );
+            nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
+            aStr += aValue;
+            SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
+            if ( bReadOnly )
             {
-                sal_uInt32 nId = RID_SVXSTR_PATH_NAME_START + i;
-                if (i == SvtPathOptions::PATH_CLASSIFICATION)
-                    // RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly.
-                    nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
-                OUString aStr(CuiResId(nId));
-
-                nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
-                aStr += "\t";
-                OUString sInternal, sUser, sWritable;
-                bool bReadOnly = false;
-                GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
-                OUString sTmpPath = sUser;
-                if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
-                    sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
-                sTmpPath += sWritable;
-                const OUString aValue = Convert_Impl( sTmpPath );
-                nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
-                aStr += aValue;
-                SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
-                if ( bReadOnly )
-                {
-                    pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
-                }
-                PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
-                pPathImpl->sUserPath = sUser;
-                pPathImpl->sWritablePath = sWritable;
-                pEntry->SetUserData( pPathImpl );
+                pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
             }
+            PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
+            pPathImpl->sUserPath = sUser;
+            pPathImpl->sWritablePath = sWritable;
+            pEntry->SetUserData( pPathImpl );
         }
+
     }
 
     long aTabs[] = {3, 0, 0, 0};
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
deleted file mode 100644
index 8eae97173416..000000000000
--- a/cui/source/options/optpath.src
+++ /dev/null
@@ -1,120 +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 <cuires.hrc>
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_KEY_CONFIG_DIR
-{
-    Text [ en-US ] = "Configuration" ;
-};
-String RID_SVXSTR_KEY_WORK_PATH
-{
-    Text [ en-US ] = "My Documents" ;
-};
-String RID_SVXSTR_KEY_GRAPHICS_PATH
-{
-    Text [ en-US ] = "Images" ;
-};
-String RID_SVXSTR_KEY_BITMAP_PATH
-{
-    Text [ en-US ] = "Icons" ;
-};
-String RID_SVXSTR_KEY_BASIC_PATH
-{
-    Text = "BASIC" ;
-};
-String RID_SVXSTR_KEY_PALETTE_PATH
-{
-    Text [ en-US ] = "Palettes" ;
-};
-String RID_SVXSTR_KEY_BACKUP_PATH
-{
-    Text [ en-US ] = "Backups" ;
-};
-String RID_SVXSTR_KEY_MODULES_PATH
-{
-    Text [ en-US ] = "Modules" ;
-};
-String RID_SVXSTR_KEY_TEMPLATE_PATH
-{
-    Text [ en-US ] = "Templates" ;
-};
-String RID_SVXSTR_KEY_GLOSSARY_PATH
-{
-    Text [ en-US ] = "AutoText";
-};
-String RID_SVXSTR_KEY_DICTIONARY_PATH
-{
-    Text [ en-US ] = "Dictionaries" ;
-};
-String RID_SVXSTR_KEY_HELP_DIR
-{
-    Text [ en-US ] = "Help" ;
-};
-String RID_SVXSTR_KEY_GALLERY_DIR
-{
-    Text [ en-US ] = "Gallery" ;
-};
-String RID_SVXSTR_KEY_STORAGE_DIR
-{
-    Text [ en-US ] = "Message Storage" ;
-};
-String RID_SVXSTR_KEY_TEMP_PATH
-{
-    Text [ en-US ] = "Temporary files";
-};
-String RID_SVXSTR_KEY_PLUGINS_PATH
-{
-    Text [ en-US ] = "Plug-ins";
-};
-String RID_SVXSTR_KEY_FAVORITES_DIR
-{
-    Text [ en-US ] = "Folder Bookmarks";
-};
-String RID_SVXSTR_KEY_FILTER_PATH
-{
-    Text [ en-US ] = "Filters";
-};
-String RID_SVXSTR_KEY_ADDINS_PATH
-{
-    Text [ en-US ] = "Add-ins";
-};
-String RID_SVXSTR_KEY_USERCONFIG_PATH
-{
-    Text [ en-US ] = "User Configuration";
-};
-String RID_SVXSTR_KEY_USERDICTIONARY_DIR
-{
-    Text [ en-US ] = "User-defined dictionaries";
-};
-String RID_SVXSTR_KEY_CLASSIFICATION_PATH
-{
-    Text [ en-US ] = "Classification" ;
-};
-String RID_SVXSTR_KEY_AUTOCORRECT_DIR
-{
-    Text [ en-US ] = "AutoCorrect";
-};
-String RID_SVXSTR_KEY_LINGUISTIC_DIR
-{
-    Text [ en-US ] = "Writing aids";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 66f663d68fb4..9594e6c644c0 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -29,6 +29,8 @@
 #include <vcl/mnemonic.hxx>
 #include <dialmgr.hxx>
 #include "cuires.hrc"
+#include "strings.hrc"
+#include "personalization.hrc"
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
@@ -36,7 +38,6 @@
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include "ucbhelper/content.hxx"
 #include <comphelper/simplefileaccessinteraction.hxx>
-#include <tools/resary.hxx>
 
 #define MAX_RESULTS 9
 
@@ -58,11 +59,10 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
     get( m_vSearchSuggestions[4], "suggestion5" );
     get( m_vSearchSuggestions[5], "suggestion6" );
 
-    ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR()));
-    assert(aCategoriesArr.Count() >= CATEGORYCOUNT);
+    assert(SAL_N_ELEMENTS(RID_SVXSTR_PERSONA_CATEGORIES) >= CATEGORYCOUNT);
     for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i)
     {
-        m_vSearchSuggestions[i]->SetText( aCategoriesArr.GetString(i) );
+        m_vSearchSuggestions[i]->SetText(CuiResId(RID_SVXSTR_PERSONA_CATEGORIES[i]));
         m_vSearchSuggestions[i]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
     }
 
@@ -127,7 +127,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
     /*
      * English category names should be used for search.
      * These strings should be in sync with the strings of
-     * RID_SVXSTR_PERSONA_CATEGORIES in personalization.src
+     * RID_SVXSTR_PERSONA_CATEGORIES in personalization.hrc
      */
     static const OUStringLiteral vSuggestionCategories[] =
         {"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"};
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 97681f0259da..685d2a49e2a0 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -20,11 +20,13 @@
 #include <memory>
 #include <config_features.h>
 
+#include <svx/dialogs.hrc>
+
 #include "cuires.hrc"
+#include "strings.hrc"
+#include "treeopt.hrc"
 #include "helpid.hrc"
 
-#include <svx/dialogs.hrc>
-
 #include "cfgchart.hxx"
 #include "connpoolconfig.hxx"
 #include "connpooloptions.hxx"
@@ -145,8 +147,6 @@ struct ModuleToGroupNameMap_Impl
     sal_uInt16  m_nNodeId;
 };
 
-static OfaPageResource* pPageRes = nullptr;
-
 static ModuleToGroupNameMap_Impl ModuleMap[] =
 {
     { "ProductName", OUString(), SID_GENERAL_OPTIONS },
@@ -199,23 +199,20 @@ static OUString getGroupName( const OUString& rModule, bool bForced )
 
     if ( sGroupName.isEmpty() && bForced )
     {
-        if ( !pPageRes )
-            pPageRes = new OfaPageResource;
-
         if ( rModule == "Writer" )
-            sGroupName = pPageRes->GetTextArray().GetString(0);
+            sGroupName = CuiResId(SID_SW_EDITOPTIONS_RES[0].first);
         else if ( rModule == "WriterWeb" )
-            sGroupName = pPageRes->GetHTMLArray().GetString(0);
+            sGroupName = CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first);
         else if ( rModule == "Calc" )
-            sGroupName = pPageRes->GetCalcArray().GetString(0);
+            sGroupName = CuiResId(SID_SC_EDITOPTIONS_RES[0].first);
         else if ( rModule == "Impress" )
-            sGroupName = pPageRes->GetImpressArray().GetString(0);
+            sGroupName = CuiResId(SID_SD_EDITOPTIONS_RES[0].first);
         else if ( rModule == "Draw" )
-            sGroupName = pPageRes->GetDrawArray().GetString(0);
+            sGroupName = CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first);
         else if ( rModule == "Math" )
-            sGroupName = pPageRes->GetStarMathArray().GetString(0);
+            sGroupName = CuiResId(SID_SM_EDITOPTIONS_RES[0].first);
         else if ( rModule == "Base" )
-            sGroupName = pPageRes->GetDatasourcesArray().GetString(0);
+            sGroupName = CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first);
     }
     return sGroupName;
 }
@@ -337,7 +334,7 @@ struct OptionsMapping_Impl
 static OptionsMapping_Impl const OptionsMap_Impl[] =
 {
 //    GROUP                 PAGE                    PAGE-ID
-    { "ProductName",        nullptr,                   SID_GENERAL_OPTIONS },
+    { "ProductName",        nullptr,                SID_GENERAL_OPTIONS },
     { "ProductName",        "UserData",             RID_SFXPAGE_GENERAL },
     { "ProductName",        "General",              OFA_TP_MISC },
     { "ProductName",        "Memory",               OFA_TP_MEMORY },
@@ -352,21 +349,21 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
     { "ProductName",        "Java",                 RID_SVXPAGE_OPTIONS_JAVA },
     { "ProductName",        "BasicIDEOptions",      RID_SVXPAGE_BASICIDE_OPTIONS },
     { "ProductName",        "OnlineUpdate",         RID_SVXPAGE_ONLINEUPDATE },
-    { "LanguageSettings",   nullptr,                   SID_LANGUAGE_OPTIONS },
+    { "LanguageSettings",   nullptr,                SID_LANGUAGE_OPTIONS },
     { "LanguageSettings",   "Languages",            OFA_TP_LANGUAGES  },
     { "LanguageSettings",   "WritingAids",          RID_SFXPAGE_LINGU },
     { "LanguageSettings",   "SearchingInJapanese",  RID_SVXPAGE_JSEARCH_OPTIONS },
     { "LanguageSettings",   "AsianLayout",          RID_SVXPAGE_ASIAN_LAYOUT },
     { "LanguageSettings",   "ComplexTextLayout",    RID_SVXPAGE_OPTIONS_CTL },
-    { "Internet",           nullptr,                   SID_INET_DLG },
+    { "Internet",           nullptr,                SID_INET_DLG },
     { "Internet",           "Proxy",                RID_SVXPAGE_INET_PROXY },
     { "Internet",           "Email",                RID_SVXPAGE_INET_MAIL },
-    { "LoadSave",           nullptr,                   SID_FILTER_DLG },
+    { "LoadSave",           nullptr,                SID_FILTER_DLG },
     { "LoadSave",           "General",              RID_SFXPAGE_SAVE },
     { "LoadSave",           "VBAProperties",        SID_OPTFILTER_MSOFFICE },
     { "LoadSave",           "MicrosoftOffice",      RID_OFAPAGE_MSFILTEROPT2 },
     { "LoadSave",           "HTMLCompatibility",    RID_OFAPAGE_HTMLOPT },
-    { "Writer",             nullptr,                   SID_SW_EDITOPTIONS },
+    { "Writer",             nullptr,                SID_SW_EDITOPTIONS },
     { "Writer",             "General",              RID_SW_TP_OPTLOAD_PAGE },
     { "Writer",             "View",                 RID_SW_TP_CONTENT_OPT },
     { "Writer",             "FormattingAids",       RID_SW_TP_OPTSHDWCRSR },
@@ -381,16 +378,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
     { "Writer",             "Compatibility",        RID_SW_TP_OPTCOMPATIBILITY_PAGE },
     { "Writer",             "AutoCaption",          RID_SW_TP_OPTCAPTION_PAGE },
     { "Writer",             "MailMerge",            RID_SW_TP_MAILCONFIG },
-    { "WriterWeb",          nullptr,                   SID_SW_ONLINEOPTIONS },
+    { "WriterWeb",          nullptr,                SID_SW_ONLINEOPTIONS },
     { "WriterWeb",          "View",                 RID_SW_TP_HTML_CONTENT_OPT },
     { "WriterWeb",          "FormattingAids",       RID_SW_TP_HTML_OPTSHDWCRSR },
     { "WriterWeb",          "Grid",                 RID_SW_TP_HTML_OPTGRID_PAGE },
     { "WriterWeb",          "Print",                RID_SW_TP_HTML_OPTPRINT_PAGE },
     { "WriterWeb",          "Table",                RID_SW_TP_HTML_OPTTABLE_PAGE },
     { "WriterWeb",          "Background",           RID_SW_TP_BACKGROUND },
-    { "Math",               nullptr,                   SID_SM_EDITOPTIONS },
+    { "Math",               nullptr,                SID_SM_EDITOPTIONS },
     { "Math",               "Settings",             SID_SM_TP_PRINTOPTIONS },
-    { "Calc",               nullptr,                   SID_SC_EDITOPTIONS },
+    { "Calc",               nullptr,                SID_SC_EDITOPTIONS },
     { "Calc",               "General",              SID_SC_TP_LAYOUT },
     { "Calc",               "View",                 SID_SC_TP_CONTENT },
     { "Calc",               "Calculate",            SID_SC_TP_CALC },
@@ -400,22 +397,22 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
     { "Calc",               "Compatibility",        SID_SC_TP_COMPATIBILITY },
     { "Calc",               "Grid",                 SID_SC_TP_GRID },
     { "Calc",               "Print",                RID_SC_TP_PRINT },
-    { "Impress",            nullptr,                   SID_SD_EDITOPTIONS },
+    { "Impress",            nullptr,                SID_SD_EDITOPTIONS },
     { "Impress",            "General",              SID_SI_TP_MISC },
     { "Impress",            "View",                 SID_SI_TP_CONTENTS },
     { "Impress",            "Grid",                 SID_SI_TP_SNAP },
     { "Impress",            "Print",                SID_SI_TP_PRINT },
-    { "Draw",               nullptr,                   SID_SD_GRAPHIC_OPTIONS },
+    { "Draw",               nullptr,                SID_SD_GRAPHIC_OPTIONS },
     { "Draw",               "General",              SID_SD_TP_MISC },
     { "Draw",               "View",                 SID_SD_TP_CONTENTS },
     { "Draw",               "Grid",                 SID_SD_TP_SNAP },
     { "Draw",               "Print",                SID_SD_TP_PRINT },
-    { "Charts",             nullptr,                   SID_SCH_EDITOPTIONS },
+    { "Charts",             nullptr,                SID_SCH_EDITOPTIONS },
     { "Charts",             "DefaultColors",        RID_OPTPAGE_CHART_DEFCOLORS },
-    { "Base",               nullptr,                   SID_SB_STARBASEOPTIONS },
+    { "Base",               nullptr,                SID_SB_STARBASEOPTIONS },
     { "Base",               "Connections",          SID_SB_CONNECTIONPOOLING },
     { "Base",               "Databases",            SID_SB_DBREGISTEROPTIONS },
-    { nullptr,                 nullptr,                   0 }
+    { nullptr,                 nullptr,             0 }
 };
 
 static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName )
@@ -1098,22 +1095,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     pBox->SetHelpId(sHelpId);
 }
 
-OfaPageResource::OfaPageResource() :
-    aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())),
-    aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())),
-    aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())),
-    aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())),
-    aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())),
-    aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())),
-    aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())),
-    aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())),
-    aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())),
-    aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())),
-    aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())),
-    aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR()))
-{
-}
-
 std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
 {
     Reference< XLinguProperties >  xProp( LinguMgr::GetLinguPropertySet() );
@@ -1447,7 +1428,6 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
 
 void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
 {
-    OfaPageResource aDlgResource;
     sal_uInt16 nGroup = 0;
 
     SvtOptionsDialogOptions aOptionsDlgOpt;
@@ -1456,15 +1436,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     // %PRODUCTNAME options
     if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) )
     {
-        ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
-        setGroupName( "ProductName", rGeneralArray.GetString(0) );
-        nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr, SID_GENERAL_OPTIONS );
-        sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() );
+        setGroupName("ProductName", CuiResId(SID_GENERAL_OPTIONS_RES[0].first));
+        nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS );
+        const sal_uInt16 nEnd = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_GENERAL_OPTIONS_RES));
 
-        for ( sal_uInt16 i = 1; i < nEnd; ++i )
+        for (sal_uInt16 i = 1; i < nEnd; ++i)
         {
-            OUString sNewTitle = rGeneralArray.GetString(i);
-            nPageId = (sal_uInt16)rGeneralArray.GetValue(i);
+            OUString sNewTitle = CuiResId(SID_GENERAL_OPTIONS_RES[i].first);
+            nPageId = SID_GENERAL_OPTIONS_RES[i].second;
             if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                 continue;
 
@@ -1498,14 +1477,13 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     // Load and Save options
     if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) )
     {
-        ResStringArray& rFilterArray = aDlgResource.GetFilterArray();
-        setGroupName( "LoadSave", rFilterArray.GetString(0) );
-        nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr, SID_FILTER_DLG );
-        for ( sal_uInt32 i = 1; i < rFilterArray.Count(); ++i )
+        setGroupName( "LoadSave", CuiResId(SID_FILTER_DLG_RES[0].first) );
+        nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG );
+        for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_FILTER_DLG_RES); ++i )
         {
-            nPageId = (sal_uInt16)rFilterArray.GetValue(i);
+            nPageId = (sal_uInt16)SID_FILTER_DLG_RES[i].second;
             if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
-                AddTabPage( nPageId, rFilterArray.GetString(i), nGroup );
+                AddTabPage( nPageId, CuiResId(SID_FILTER_DLG_RES[i].first), nGroup );
         }
     }
 
@@ -1513,22 +1491,20 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     SvtLanguageOptions aLanguageOptions;
     if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) )
     {
-        ResStringArray& rLangArray = aDlgResource.GetLangArray();
-        setGroupName( "LanguageSettings", rLangArray.GetString(0) );
-        nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr, SID_LANGUAGE_OPTIONS );
-        for ( sal_uInt32 i = 1; i < rLangArray.Count(); ++i )
+        setGroupName("LanguageSettings", CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first));
+        nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS );
+        for (sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_LANGUAGE_OPTIONS_RES); ++i)
         {
-            nPageId = (sal_uInt16)rLangArray.GetValue(i);
+            nPageId = (sal_uInt16)SID_LANGUAGE_OPTIONS_RES[i].second;
             if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                 continue;
             if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nPageId || aLanguageOptions.IsJapaneseFindEnabled() ) &&
                  ( RID_SVXPAGE_ASIAN_LAYOUT != nPageId    || aLanguageOptions.IsAsianTypographyEnabled() ) &&
                  ( RID_SVXPAGE_OPTIONS_CTL != nPageId     || aLanguageOptions.IsCTLFontEnabled() ) )
-                AddTabPage( nPageId, rLangArray.GetString(i), nGroup );
+                AddTabPage(nPageId, CuiResId(SID_LANGUAGE_OPTIONS_RES[i].first), nGroup);
         }
     }
 
-
     OUString aFactory = getCurrentFactory_Impl( _xFrame );
     DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" );
 
@@ -1537,7 +1513,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) )
     {
         // text document
-        ResStringArray& rTextArray = aDlgResource.GetTextArray();
         if (   aFactory == "com.sun.star.text.TextDocument"
             || aFactory == "com.sun.star.text.WebDocument"
             || aFactory == "com.sun.star.text.GlobalDocument" )
@@ -1546,19 +1521,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) )
             {
                 if ( aFactory == "com.sun.star.text.WebDocument" )
-                    setGroupName( "WriterWeb", rTextArray.GetString(0) );
+                    setGroupName( "WriterWeb", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) );
                 else
-                    setGroupName( "Writer", rTextArray.GetString(0) );
-                nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS );
-                for ( sal_uInt32 i = 1; i < rTextArray.Count(); ++i )
+                    setGroupName( "Writer", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) );
+                nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS );
+                for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_EDITOPTIONS_RES); ++i )
                 {
-                    nPageId = (sal_uInt16)rTextArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SW_EDITOPTIONS_RES[i].second;
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
                     if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) &&
                          ( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) &&
                          ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
-                        AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
+                        AddTabPage( nPageId, CuiResId(SID_SW_EDITOPTIONS_RES[i].first), nGroup );
                 }
 #ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup );
@@ -1568,13 +1543,12 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             // HTML documents
             if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) )
             {
-                ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
-                nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
-                for( sal_uInt32 i = 1; i < rHTMLArray.Count(); ++i )
+                nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
+                for( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_ONLINEOPTIONS_RES); ++i )
                 {
-                    nPageId = (sal_uInt16)rHTMLArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SW_ONLINEOPTIONS_RES[i].second;
                     if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
-                        AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
+                        AddTabPage(nPageId, CuiResId(SID_SW_ONLINEOPTIONS_RES[i].first), nGroup);
                 }
 #ifdef DBG_UTIL
                 AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup );
@@ -1590,18 +1564,17 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
         {
             if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
             {
-                ResStringArray& rCalcArray = aDlgResource.GetCalcArray();
                 SfxModule* pScMod = SfxApplication::GetModule( SfxToolsModule::Calc );
-                setGroupName( "Calc", rCalcArray.GetString(0) );
-                nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS );
-                const sal_uInt16 nCount = static_cast< sal_uInt16 >( rCalcArray.Count() );
+                setGroupName( "Calc", CuiResId(SID_SC_EDITOPTIONS_RES[0].first) );
+                nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS );
+                const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SC_EDITOPTIONS_RES));
                 for ( sal_uInt16 i = 1; i < nCount; ++i )
                 {
-                    nPageId = (sal_uInt16)rCalcArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SC_EDITOPTIONS_RES[i].second;
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
 
-                    AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup );
+                    AddTabPage( nPageId, CuiResId(SID_SC_EDITOPTIONS_RES[i].first), nGroup );
                 }
             }
         }
@@ -1615,17 +1588,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
         {
             if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) )
             {
-                ResStringArray& rImpressArray = aDlgResource.GetImpressArray();
-                setGroupName( "Impress", rImpressArray.GetString(0) );
-                nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
-                const sal_uInt16 nCount = static_cast< sal_uInt16 >( rImpressArray.Count() );
+                setGroupName( "Impress", CuiResId(SID_SD_EDITOPTIONS_RES[0].first) );
+                nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
+                const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_EDITOPTIONS_RES));
                 for ( sal_uInt16 i = 1; i < nCount; ++i )
                 {
-                    nPageId = (sal_uInt16)rImpressArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SD_EDITOPTIONS_RES[0].second;
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
 
-                    AddTabPage( nPageId, rImpressArray.GetString(i), nGroup );
+                    AddTabPage( nPageId, CuiResId(SID_SD_EDITOPTIONS_RES[i].first), nGroup );
                 }
             }
         }
@@ -1638,17 +1610,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
         {
             if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) )
             {
-                ResStringArray& rDrawArray = aDlgResource.GetDrawArray();
-                setGroupName( "Draw", rDrawArray.GetString(0) );
-                nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
-                const sal_uInt16 nCount = static_cast< sal_uInt16 >( rDrawArray.Count() );
+                setGroupName( "Draw", CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first) );
+                nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
+                const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_GRAPHIC_OPTIONS_RES));
                 for ( sal_uInt16 i = 1; i < nCount; ++i )
                 {
-                    nPageId = (sal_uInt16)rDrawArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SD_GRAPHIC_OPTIONS_RES[0].second;
                     if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                         continue;
 
-                    AddTabPage( nPageId, rDrawArray.GetString(i), nGroup );
+                    AddTabPage( nPageId, CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[i].first), nGroup );
                 }
             }
         }
@@ -1661,15 +1632,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
         {
             if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) )
             {
-                ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray();
                 SfxModule* pSmMod = SfxApplication::GetModule(SfxToolsModule::Math);
-                setGroupName( "Math", rStarMathArray.GetString(0) );
-                nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
-                for ( sal_uInt32 i = 1; i < rStarMathArray.Count(); ++i )
+                setGroupName( "Math", CuiResId(SID_SM_EDITOPTIONS_RES[0].first) );
+                nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
+                for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SM_EDITOPTIONS_RES); ++i )
                 {
-                    nPageId = (sal_uInt16)rStarMathArray.GetValue(i);
+                    nPageId = (sal_uInt16)SID_SM_EDITOPTIONS_RES[0].second;
                     if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
-                        AddTabPage( nPageId, rStarMathArray.GetString(i), nGroup );
+                        AddTabPage( nPageId, CuiResId(SID_SM_EDITOPTIONS_RES[i].first), nGroup );
                 }
             }
         }
@@ -1682,41 +1652,38 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
         ||  aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC )
         ) )
     {
-        ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
-        setGroupName( "Base", rDSArray.GetString(0) );
-        nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr, SID_SB_STARBASEOPTIONS );
-        for ( sal_uInt32 i = 1; i < rDSArray.Count(); ++i )
+        setGroupName( "Base", CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first) );
+        nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS );
+        for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SB_STARBASEOPTIONS_RES); ++i )
         {
-            nPageId = (sal_uInt16)rDSArray.GetValue(i);
+            nPageId = (sal_uInt16)SID_SB_STARBASEOPTIONS_RES[i].second;
             if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
-                AddTabPage( nPageId, rDSArray.GetString(i), nGroup );
+                AddTabPage( nPageId, CuiResId(SID_SB_STARBASEOPTIONS_RES[i].first), nGroup );
         }
     }
 
     // Chart options (always installed and active)
     if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) )
     {
-        ResStringArray& rChartArray = aDlgResource.GetChartArray();
-        setGroupName( "Charts", rChartArray.GetString(0) );
-        nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr, SID_SCH_EDITOPTIONS );
-        for ( sal_uInt32 i = 1; i < rChartArray.Count(); ++i )
+        setGroupName( "Charts", CuiResId(SID_SCH_EDITOPTIONS_RES[0].first) );
+        nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS );
+        for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SCH_EDITOPTIONS_RES); ++i )
         {
-            nPageId = (sal_uInt16)rChartArray.GetValue(i);
+            nPageId = (sal_uInt16)SID_SCH_EDITOPTIONS_RES[i].second;
             if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
-               AddTabPage( nPageId, rChartArray.GetString(i), nGroup );
+               AddTabPage( nPageId, CuiResId(SID_SCH_EDITOPTIONS_RES[i].first), nGroup );
         }
     }
 
     // Internet options
     if ( !lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) )
     {
-        ResStringArray& rInetArray = aDlgResource.GetInetArray();
-        setGroupName( "Internet", rInetArray.GetString(0) );
-        nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr, SID_INET_DLG );
+        setGroupName("Internet", CuiResId(SID_INET_DLG_RES[0].first));
+        nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG );
 
-        for ( sal_uInt32 i = 1; i < rInetArray.Count(); ++i )
+        for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_INET_DLG_RES); ++i )
         {
-            nPageId = (sal_uInt16)rInetArray.GetValue(i);
+            nPageId = (sal_uInt16)SID_INET_DLG_RES[i].second;
             if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
                 continue;
 #if defined(_WIN32)
@@ -1724,13 +1691,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             if ( nPageId == RID_SVXPAGE_INET_MAIL )
                 continue;
 #endif
-            AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
+            AddTabPage( nPageId, CuiResId(SID_INET_DLG_RES[i].first), nGroup );
         }
     }
-
-/*!!!
-    ActivateLastSelection();
- */
 }
 
 bool isNodeActive( OptionsNode* pNode, Module* pModule )
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
deleted file mode 100644
index 4301f793f543..000000000000
--- a/cui/source/options/treeopt.src
+++ /dev/null
@@ -1,177 +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 <cuires.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-StringArray SID_GENERAL_OPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME" ; 0; > ;
-        < "User Data" ;  RID_SFXPAGE_GENERAL; > ;
-        < "General" ;  OFA_TP_MISC; > ;
-        < "Memory" ; OFA_TP_MEMORY; > ;
-        < "View" ; OFA_TP_VIEW ; > ;
-        < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
-        < "Paths" ;  RID_SFXPAGE_PATH; > ;
-        < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
-        < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
-        < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
-        < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
-        < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
-        < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
-        < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
-        < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
-        < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
-    };
-};
-StringArray SID_LANGUAGE_OPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "Language Settings" ; 0; > ;
-        < "Languages"; OFA_TP_LANGUAGES; > ;
-        < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
-        < "Searching in Japanese" ;  RID_SVXPAGE_JSEARCH_OPTIONS; > ;
-        < "Asian Layout" ;  RID_SVXPAGE_ASIAN_LAYOUT; > ;
-        < "Complex Text Layout" ;  RID_SVXPAGE_OPTIONS_CTL; >;
-    };
-};
-StringArray SID_INET_DLG
-{
-    ItemList [ en-US ] =
-    {
-        < "Internet" ; 0; > ;
-        < "Proxy" ;  RID_SVXPAGE_INET_PROXY; > ;
-        < "E-mail" ;  RID_SVXPAGE_INET_MAIL; > ;
-    };
-};
-StringArray SID_SW_EDITOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Writer" ; 0; > ;
-        < "General" ;     RID_SW_TP_OPTLOAD_PAGE   ; > ;
-        < "View" ;       RID_SW_TP_CONTENT_OPT   ;> ;
-        < "Formatting Aids" ;        RID_SW_TP_OPTSHDWCRSR    ; > ;
-        < "Grid" ;        RID_SVXPAGE_GRID        ; > ;
-        < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT       ; > ;
-        < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK       ; > ;
-        < "Basic Fonts (CTL)" ;      RID_SW_TP_STD_FONT_CTL       ; > ;
-        < "Print" ;       RID_SW_TP_OPTPRINT_PAGE  ; > ;
-        < "Table" ;         RID_SW_TP_OPTTABLE_PAGE  ; > ;
-        < "Changes" ;    RID_SW_TP_REDLINE_OPT    ; > ;
-        < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
-        < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE    ; > ;
-        < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
-        < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
-    };
-};
-StringArray SID_SW_ONLINEOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Writer/Web" ; 0; > ;
-        < "View" ;       RID_SW_TP_HTML_CONTENT_OPT      ;> ;
-        < "Formatting Aids" ;        RID_SW_TP_HTML_OPTSHDWCRSR    ; > ;
-        < "Grid" ;        RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
-        < "Print" ;         RID_SW_TP_HTML_OPTPRINT_PAGE  ; > ;
-        < "Table" ;         RID_SW_TP_HTML_OPTTABLE_PAGE  ; > ;
-        < "Background" ;    RID_SW_TP_BACKGROUND  ; > ;
-    };
-};
-StringArray SID_SM_EDITOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Math" ; 0; > ;
-        < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
-    };
-};
-StringArray SID_SC_EDITOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Calc" ; 0; > ;
-        < "General" ;           SID_SC_TP_LAYOUT            ;> ;
-        < "Defaults" ;          RID_SC_TP_DEFAULTS          ;> ;
-        < "View" ;          SID_SC_TP_CONTENT           ;> ;
-        < "Calculate" ;         SID_SC_TP_CALC              ;> ;
-        < "Formula" ;       SID_SC_TP_FORMULA ;> ;
-        < "Sort Lists" ;        SID_SC_TP_USERLISTS         ;> ;
-        < "Changes" ;       SID_SC_TP_CHANGES           ;> ;
-        < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
-        < "Grid" ;          SID_SC_TP_GRID              ;> ;
-        < "Print" ;         RID_SC_TP_PRINT             ;> ;
-    };
-};
-StringArray SID_SD_EDITOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Impress" ; 0; > ;
-        < "General";            SID_SI_TP_MISC                  ; > ;
-        < "View" ;          SID_SI_TP_CONTENTS              ; > ;
-        < "Grid" ;          SID_SI_TP_SNAP                  ; > ;
-        < "Print" ;         SID_SI_TP_PRINT                 ; > ;
-    };
-};
-StringArray SID_SD_GRAPHIC_OPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Draw" ; 0; > ;
-        < "General" ;           SID_SD_TP_MISC              ; > ;
-        < "View" ;          SID_SD_TP_CONTENTS          ; > ;
-        < "Grid" ;          SID_SD_TP_SNAP              ; > ;
-        < "Print" ;             SID_SD_TP_PRINT             ; > ;
-    };
-};
-StringArray SID_SCH_EDITOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "Charts" ; 0; > ;
-        < "Default Colors" ;        RID_OPTPAGE_CHART_DEFCOLORS ; > ;
-    };
-};
-StringArray SID_FILTER_DLG
-{
-    ItemList [ en-US ] =
-    {
-            < "Load/Save" ; 0; > ;
-        < "General" ;  RID_SFXPAGE_SAVE; > ;
-        < "VBA Properties" ;  SID_OPTFILTER_MSOFFICE; > ;
-        < "Microsoft Office" ;  RID_OFAPAGE_MSFILTEROPT2; > ;
-        < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
-    };
-};
-StringArray SID_SB_STARBASEOPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Base" ; 0; > ;
-        < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
-        < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 2586a454f71e..dfa4a531870d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -22,6 +22,7 @@
 #include <editeng/svxenum.hxx>
 #include <svx/dialogs.hrc>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <svx/rotmodit.hxx>
 
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 3b6a24608690..def8d3de5013 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -53,6 +53,7 @@
 #include <editeng/svxacorr.hxx>
 #include "cuicharmap.hxx"
 #include "cuires.hrc"
+#include "strings.hrc"
 #include <editeng/unolingu.hxx>
 #include <dialmgr.hxx>
 #include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index ec1775251187..343e4ff2722f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,11 +29,12 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/memberids.hrc>
-#include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
 
 #include <editeng/brushitem.hxx>
@@ -45,7 +46,7 @@
 #include <svx/drawitem.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
@@ -822,8 +823,8 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
     SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND,
                               OUString(),
                               this,
-                              RID_SVXERRCTX,
-                              &DIALOG_MGR() );
+                              getRID_SVXERRCTX(),
+                              &SvxResLocale() );
 
     ErrorHandler::HandleError(
         *new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e6848ad3bd1a..dbcb814ced3e 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,8 +22,10 @@
 #include <sfx2/module.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include "helpid.hrc"
 
@@ -970,10 +972,10 @@ sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const
     return ppnImgIds[ nLine ][ nValueSetIdx - 1 ];
 }
 
-sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
+const char* SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
 {
     // string resource IDs for each image (in order of the IID_PRE_* image IDs)
-    static const sal_uInt16 pnStrIds[] =
+    static const char* pnStrIds[] =
     {
         RID_SVXSTR_TABLE_PRESET_NONE,
         RID_SVXSTR_PARA_PRESET_ALL,
@@ -1029,7 +1031,7 @@ void SvxBorderTabPage::FillShadowVS()
     m_pWndShadows->SetColCount( SVX_BORDER_SHADOW_COUNT );
 
     // string resource IDs for each image
-    static const sal_uInt16 pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
+    static const char* pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
         { RID_SVXSTR_SHADOW_STYLE_NONE, RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT, RID_SVXSTR_SHADOW_STYLE_TOPRIGHT, RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT, RID_SVXSTR_SHADOW_STYLE_TOPLEFT };
 
     // insert images and help texts
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
deleted file mode 100644
index 2dded5a4ded3..000000000000
--- a/cui/source/tabpages/border.src
+++ /dev/null
@@ -1,95 +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 "helpid.hrc"
-#include <cuires.hrc>
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_TABLE_PRESET_NONE
-{
-    Text [ en-US ] = "Set No Borders" ;
-};
-String RID_SVXSTR_TABLE_PRESET_ONLYOUTER
-{
-    Text [ en-US ] = "Set Outer Border Only" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERHORI
-{
-    Text [ en-US ] = "Set Outer Border and Horizontal Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERALL
-{
-    Text [ en-US ] = "Set Outer Border and All Inner Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERINNER
-{
-    Text [ en-US ] = "Set Outer Border Without Changing Inner Lines" ;
-};
-String RID_SVXSTR_PARA_PRESET_DIAGONAL
-{
-    Text [ en-US ] = "Set Diagonal Lines Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ALL
-{
-    Text [ en-US ] = "Set All Four Borders" ;
-};
-String RID_SVXSTR_PARA_PRESET_LEFTRIGHT
-{
-    Text [ en-US ] = "Set Left and Right Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_TOPBOTTOM
-{
-    Text [ en-US ] = "Set Top and Bottom Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ONLYLEFT
-{
-    Text [ en-US ] = "Set Left Border Only" ;
-};
-String RID_SVXSTR_HOR_PRESET_ONLYHOR
-{
-    Text [ en-US ] = "Set Top and Bottom Borders, and All Inner Lines";
-};
-String RID_SVXSTR_VER_PRESET_ONLYVER
-{
-    Text [ en-US ] = "Set Left and Right Borders, and All Inner Lines";
-};
-String RID_SVXSTR_SHADOW_STYLE_NONE
-{
-    Text [ en-US ] = "No Shadow" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
-{
-    Text [ en-US ] = "Cast Shadow to Bottom Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
-{
-    Text [ en-US ] = "Cast Shadow to Top Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT
-{
-    Text [ en-US ] = "Cast Shadow to Bottom Left" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPLEFT
-{
-    Text [ en-US ] = "Cast Shadow to Top Left" ;
-};
-
-// **********************************************************************
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 063a9baac2c5..ef454619a8ad 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -69,6 +69,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include "svx/flagsdef.hxx"
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f4d566875385..d5df97d4c037 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
deleted file mode 100644
index e2470a6a93b0..000000000000
--- a/cui/source/tabpages/frmdirlbox.src
+++ /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 .
- */
-
-#include <cuires.hrc>
-
-// frame direction ------------------------------------------------------------
-
-String RID_SVXSTR_FRAMEDIR_LTR
-{
-    Text [ en-US ] = "Left-to-right (LTR)";
-};
-
-String RID_SVXSTR_FRAMEDIR_RTL
-{
-    Text [ en-US ] = "Right-to-left (RTL)";
-};
-
-String RID_SVXSTR_FRAMEDIR_SUPER
-{
-    Text [ en-US ] = "Use superordinate object settings";
-};
-
-// page direction -------------------------------------------------------------
-
-String RID_SVXSTR_PAGEDIR_LTR_HORI
-{
-    Text [ en-US ] = "Left-to-right (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_HORI
-{
-    Text [ en-US ] = "Right-to-left (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_VERT
-{
-    Text [ en-US ] = "Right-to-left (vertical)";
-};
-
-String RID_SVXSTR_PAGEDIR_LTR_VERT
-{
-    Text [ en-US ] = "Left-to-right (vertical)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1938f2705b91..85e2c98e8595 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
 #include <cuires.hrc>
 #include <tools/fract.hxx>
 #include <svx/dialogs.hrc>
+#include <strings.hrc>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index c502e077f08d..c41bf6b52286 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
@@ -804,17 +805,16 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
 void SvxMeasurePage::FillUnitLB()
 {
     // fill ListBox with metrics
-    SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR()));
 
-    sal_IntPtr nUnit = FUNIT_NONE;
+    FieldUnit nUnit = FUNIT_NONE;
     OUString aStrMetric( m_pFtAutomatic->GetText());
     sal_Int32 nPos = m_pLbUnit->InsertEntry( aStrMetric );
     m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
 
-    for( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+    for( sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i )
     {
-        aStrMetric = aMetricArr.GetStringByPos( i );
-        nUnit = aMetricArr.GetValue( i );
+        aStrMetric = SvxFieldUnitTable::GetString(i);
+        nUnit = SvxFieldUnitTable::GetValue(i);
         nPos = m_pLbUnit->InsertEntry( aStrMetric );
         m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
     }
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 78cae7475cf6..a4981f5d84cf 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -31,6 +31,7 @@
 #include <svtools/colorcfg.hxx>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 
 #include <svx/numinf.hxx>
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d0bf7386f770..30525c1045c6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -32,6 +32,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/colorbox.hxx>
+#include <svx/strarray.hxx>
 #include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/brushitem.hxx>
@@ -62,7 +63,6 @@
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <tools/resary.hxx>
 
 #include <algorithm>
 #include <memory>
@@ -70,6 +70,7 @@
 #include "sfx2/opengrf.hxx"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <sfx2/request.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
@@ -1179,12 +1180,11 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
 
     // Fill ListBox with predefined / translated numbering types.
-    ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
-    sal_uInt32 nCount = aNames.Count();
+    sal_uInt32 nCount = SvxNumberingTypeTable::Count();
     for (sal_uInt32 i = 0; i < nCount; ++i)
     {
-        sal_Int32 nPos = m_pFmtLB->InsertEntry( aNames.GetString(i));
-        m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(aNames.GetValue(i))));
+        sal_Int32 nPos = m_pFmtLB->InsertEntry(SvxNumberingTypeTable::GetString(i));
+        m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(SvxNumberingTypeTable::GetValue(i))));
     }
 
     // Get advanced numbering types from the component.
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 50e83e91714b..98f0d12ee183 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
-#include <tools/resary.hxx>
 #include <vcl/graph.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svl/itemiter.hxx>
@@ -32,6 +31,7 @@
 #include <sal/macros.h>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include "page.hxx"
 #include <svx/pageitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4d608a2e4147..a4f83510ae2c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -30,6 +30,7 @@
 #include <svl/cjkoptions.hxx>
 #include <editeng/pgrditem.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "paragrph.hxx"
 #include <editeng/frmdiritem.hxx>
 #include <editeng/lspcitem.hxx>
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
deleted file mode 100644
index 744aa6b60d58..000000000000
--- a/cui/source/tabpages/strings.src
+++ /dev/null
@@ -1,195 +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 <cuires.hrc>
-
-String RID_SVXSTR_DESC_GRADIENT
-{
-    Text [ en-US ] = "Please enter a name for the gradient:" ;
-};
-String RID_SVXSTR_DESC_NEW_BITMAP
-{
-    Text [ en-US ] = "Please enter a name for the bitmap:" ;
-};
-String RID_SVXSTR_DESC_EXT_BITMAP
-{
-    Text [ en-US ] = "Please enter a name for the external bitmap:" ;
-};
-String RID_SVXSTR_DESC_NEW_PATTERN
-{
-    Text [ en-US ] = "Please enter a name for the pattern:" ;
-};
-String RID_SVXSTR_DESC_LINESTYLE
-{
-    Text [ en-US ] = "Please enter a name for the line style:" ;
-};
-String RID_SVXSTR_ASK_CHANGE_LINESTYLE
-{
-    Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
-};
-String RID_SVXSTR_DESC_HATCH
-{
-    Text [ en-US ] = "Please enter a name for the hatching:" ;
-};
-String RID_SVXSTR_CHANGE
-{
-    Text [ en-US ] = "Modify" ;
-};
-String RID_SVXSTR_ADD
-{
-    Text [ en-US ] = "Add" ;
-};
-String RID_SVXSTR_DESC_COLOR
-{
-    Text [ en-US ] = "Please enter a name for the new color:" ;
-};
-String RID_SVXSTR_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-String RID_SVXSTR_DESC_LINEEND
-{
-    Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
-};
-String RID_SVXSTR_CHARNAME_NOSTYLE
-{
-    Text [ en-US ] = "No %1";
-};
-String RID_SVXSTR_CHARNAME_FAMILY
-{
-    Text [ en-US ] = "Family";
-};
-String RID_SVXSTR_CHARNAME_FONT
-{
-    Text [ en-US ] = "Font";
-};
-String RID_SVXSTR_CHARNAME_STYLE
-{
-    Text [ en-US ] = "Style";
-};
-String RID_SVXSTR_CHARNAME_TYPEFACE
-{
-    Text [ en-US ] = "Typeface";
-};
-String RID_SVXSTR_CHARNAME_HIGHLIGHTING
-{
-    Text [ en-US ] = "Highlight Color";
-};
-String RID_SVXSTR_USE_REPLACE
-{
-    Text [ en-US ] = "Use replacement table" ;
-};
-String RID_SVXSTR_CPTL_STT_WORD
-{
-    Text [ en-US ] = "Correct TWo INitial CApitals" ;
-};
-String RID_SVXSTR_CPTL_STT_SENT
-{
-    Text [ en-US ] = "Capitalize first letter of every sentence" ;
-};
-String RID_SVXSTR_BOLD_UNDER
-{
-    Text [ en-US ] = "Automatic *bold*, /italic/, -strikeout- and _underline_" ;
-};
-String RID_SVXSTR_NO_DBL_SPACES
-{
-    Text [ en-US ] = "Ignore double spaces" ;
-};
-String RID_SVXSTR_DETECT_URL
-{
-    Text [ en-US ] = "URL Recognition" ;
-};
-String RID_SVXSTR_DASH
-{
-    Text [ en-US ] = "Replace dashes" ;
-};
-String RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK
-{
-    Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ;
-};
-String RID_SVXSTR_NON_BREAK_SPACE
-{
-    Text [ en-US ] = "Add non-breaking space before specific punctuation marks in French text" ;
-};
-String RID_SVXSTR_ORDINAL
-{
-    Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ;
-};
-String RID_SVXSTR_DEL_EMPTY_PARA
-{
-    Text [ en-US ] = "Remove blank paragraphs" ;
-};
-String RID_SVXSTR_USER_STYLE
-{
-    Text [ en-US ] = "Replace Custom Styles" ;
-};
-String RID_SVXSTR_BULLET
-{
-    Text [ en-US ] = "Replace bullets with: " ;
-};
-String RID_SVXSTR_RIGHT_MARGIN
-{
-    Text [ en-US ] = "Combine single line paragraphs if length greater than" ;
-};
-String RID_SVXSTR_NUM
-{
-    Text [ en-US ] = "Bulleted and numbered lists. Bullet symbol: " ;
-};
-String RID_SVXSTR_BORDER
-{
-    Text [ en-US ] = "Apply border" ;
-};
-String RID_SVXSTR_CREATE_TABLE
-{
-    Text [ en-US ] = "Create table" ;
-};
-String RID_SVXSTR_REPLACE_TEMPLATES
-{
-    Text [ en-US ] = "Apply Styles" ;
-};
-String RID_SVXSTR_DEL_SPACES_AT_STT_END
-{
-    Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph";
-};
-String RID_SVXSTR_DEL_SPACES_BETWEEN_LINES
-{
-    Text [ en-US ] = "Delete spaces and tabs at end and start of line";
-};
-String RID_SVXSTR_CONNECTOR
-{
-    Text [en-US ] = "Connector";
-};
-String RID_SVXSTR_DIMENSION_LINE
-{
-    Text [en-US ] = "Dimension line";
-};
-String RID_SVXSTR_LOAD_ERROR
-{
-    Text [ en-US ] = "The selected module could not be loaded.";
-};
-String RID_SVXSTR_STARTQUOTE
-{
-    Text [ en-US ] = "Start Quote";
-};
-String RID_SVXSTR_ENDQUOTE
-{
-    Text [ en-US ] = "End Quote";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 3c92d5a7a8f5..9bcd7c1454e1 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -683,7 +683,7 @@ void SvxSwPosSizeTabPage::setOptimalFrmWidth()
     for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
         aI != aEnd; ++aI)
     {
-        m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+        m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
     }
 
     Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -724,7 +724,7 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
     for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
         aI != aEnd; ++aI)
     {
-        m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+        m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
     }
 
     Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -1462,7 +1462,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB)
             {
                 SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
 
-                OUString sEntry = m_aFramePosString.GetString(eResId);
+                OUString sEntry = SvxSwFramePosString::GetString(eResId);
 
                 if (sEntry == sSelEntry)
                 {
@@ -1688,7 +1688,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
                             SvxSwFramePosString::StringId sStrId1 = aAsCharRelationMap[nRelPos].eStrId;
 
                             sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
-                            OUString sEntry = m_aFramePosString.GetString(sStrId1);
+                            OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
                             sal_Int32 nPos = rLB.InsertEntry(sEntry);
                             rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]);
                             if (pMap[_nMapPos].nAlign == nAlign)
@@ -1745,7 +1745,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
                         {
                             SvxSwFramePosString::StringId sStrId1 = m_pHoriMirrorCB->IsChecked() ? aRelationMap[nRelPos].eMirrorStrId : aRelationMap[nRelPos].eStrId;
                             sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
-                            OUString sEntry = m_aFramePosString.GetString(sStrId1);
+                            OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
                             sal_Int32 nPos = rLB.InsertEntry(sEntry);
                             rLB.SetEntryData(nPos, &aRelationMap[nRelPos]);
                             if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == nRel)
@@ -1826,7 +1826,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
         {
             SvxSwFramePosString::StringId eStrId = m_pHoriMirrorCB->IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
             eStrId = lcl_ChangeResIdToVerticalOrRTL(eStrId, m_bIsVerticalFrame, m_bIsInRightToLeft);
-            OUString sEntry(m_aFramePosString.GetString(eStrId));
+            OUString sEntry(SvxSwFramePosString::GetString(eStrId));
             if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
             {
                 // don't insert duplicate entries at character wrapped borders
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 5ea3afe39b2f..bc87cf191c8c 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -26,6 +26,7 @@
 #include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svx/xflbckit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/xtable.hxx>
@@ -758,7 +759,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void)
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
 {
-    ResMgr& rMgr = CUI_MGR();
     SvxOpenGraphicDialog aDlg( "Import" );
     aDlg.EnableLink(false);
     long nCount = m_pBitmapList->Count();
@@ -773,7 +773,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
 
         if( !nError )
         {
-            OUString aDesc( ResId(RID_SVXSTR_DESC_EXT_BITMAP, rMgr) );
+            OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP));
             ScopedVclPtr<MessageDialog> pWarnBox;
 
             // convert file URL to UI name
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d9b140729036..fb2a1300696b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -33,6 +33,7 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
@@ -46,6 +47,7 @@
 #include <cuitabline.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <osl/file.hxx>
 #include <svx/Palette.hxx>
 #include <cppu/unotype.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f7f2de67e2ae..8de274563d88 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -28,6 +28,7 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include <svx/colorbox.hxx>
 #include "svx/xattr.hxx"
@@ -41,6 +42,7 @@
 #include <dialmgr.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 45b14ec5d2ca..0e78ab78089e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -29,6 +29,7 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include <svx/colorbox.hxx>
 #include "svx/xattr.hxx"
@@ -43,6 +44,7 @@
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0e6c80f070ce..de1526d4b7dc 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/module.hxx>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include <svx/colorbox.hxx>
 #include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
@@ -51,6 +52,7 @@
 #include "sfx2/opengrf.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <vcl/settings.hxx>
 #include <cuitabarea.hxx>
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index f622e18358e7..1cd1b4f61a01 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -27,6 +27,7 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 
 #include "svx/xattr.hxx"
@@ -42,6 +43,7 @@
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <o3tl/make_unique.hxx>
 #include "cuitabarea.hxx"
 
@@ -240,15 +242,14 @@ void SvxLineDefTabPage::CheckChanges_Impl()
         m_pLbType2->IsValueChangedFromSaved() ||
         m_pMtrDistance->IsValueChangedFromSaved() )
     {
-        ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();
         ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
                                                       SvxResId( RID_SVXSTR_LINESTYLE ),
-                                                      OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
+                                                      CuiResId(RID_SVXSTR_ASK_CHANGE_LINESTYLE),
                                                       &aWarningBoxImage );
         DBG_ASSERT(aMessDlg, "Dialog creation failed!");
-        aMessDlg->SetButtonText( SvxMessDialogButton::N1, OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
-        aMessDlg->SetButtonText( SvxMessDialogButton::N2, OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) );
+        aMessDlg->SetButtonText( SvxMessDialogButton::N1, CuiResId(RID_SVXSTR_CHANGE) );
+        aMessDlg->SetButtonText( SvxMessDialogButton::N2, CuiResId(RID_SVXSTR_ADD) );
 
         short nRet = aMessDlg->Execute();
 
@@ -532,9 +533,8 @@ void  SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
 {
-    ResMgr& rMgr = CUI_MGR();
-    OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) );
-    OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+    OUString aNewName(SvxResId(RID_SVXSTR_LINESTYLE));
+    OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
     OUString aName;
 
     long nCount = pDashList->Count();
@@ -618,8 +618,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = CUI_MGR();
-        OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+        OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
         OUString aName( pDashList->GetDash( nPos )->GetName() );
         OUString aOldName = aName;
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index df8309d1054c..a5a0579226b7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -26,6 +26,7 @@
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include <svx/dialmgr.hxx>
 #include <svx/svdobj.hxx>
@@ -45,6 +46,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <o3tl/make_unique.hxx>
 
@@ -310,8 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        ResMgr& rMgr = CUI_MGR();
-        OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+        OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
         OUString aName( m_pEdtName->GetText() );
         long nCount = pLineEndList->Count();
         bool bDifferent = true;
@@ -417,9 +418,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
 
         SdrObject::Free( pConvPolyObj );
 
-        ResMgr& rMgr = CUI_MGR();
-        OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) );
-        OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+        OUString aNewName(SvxResId(RID_SVXSTR_LINEEND));
+        OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
         OUString aName;
 
         long nCount = pLineEndList->Count();
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index dba1fc108066..9f57f7e5a0d5 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -33,8 +33,10 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/settings.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <cuires.hrc>
+#include <strings.hrc>
 #include "helpid.hrc"
 #include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
@@ -468,9 +470,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
     {
-        ResMgr& rMgr = CUI_MGR();
-        OUString aDesc( ResId( RID_SVXSTR_DESC_NEW_PATTERN, rMgr ) );
-        OUString aName( m_pPatternList->GetBitmap( nPos )->GetName() );
+        OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN));
+        OUString aName(m_pPatternList->GetBitmap(nPos)->GetName());
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         assert(pFact && "Dialog creation failed!");
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui
index 65cc729dc7f0..876f78a8f5f6 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AboutConfig">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Expert Configuration</property>
+    <property name="title" translatable="yes" context="aboutconfigdialog|AboutConfig">Expert Configuration</property>
     <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
     <child internal-child="vbox">
@@ -45,7 +45,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="searchButton">
-                        <property name="label" translatable="yes">_Search</property>
+                        <property name="label" translatable="yes" context="aboutconfigdialog|searchButton">_Search</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
@@ -78,7 +78,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="yalign">0.49000000953674316</property>
-                        <property name="label" translatable="yes">Preference Name</property>
+                        <property name="label" translatable="yes" context="aboutconfigdialog|preference">Preference Name</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -93,7 +93,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0.51999998092651367</property>
                         <property name="yalign">0.50999999046325684</property>
-                        <property name="label" translatable="yes">Property</property>
+                        <property name="label" translatable="yes" context="aboutconfigdialog|property">Property</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -106,7 +106,7 @@
                       <object class="GtkLabel" id="type">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Type</property>
+                        <property name="label" translatable="yes" context="aboutconfigdialog|type">Type</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -119,7 +119,7 @@
                       <object class="GtkLabel" id="value">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Value</property>
+                        <property name="label" translatable="yes" context="aboutconfigdialog|value">Value</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -166,7 +166,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">Edit</property>
+                <property name="label" translatable="yes" context="aboutconfigdialog|edit">Edit</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -179,7 +179,7 @@
             </child>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label" translatable="yes">Reset</property>
+                <property name="label" translatable="yes" context="aboutconfigdialog|reset">Reset</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 4024f45f89a0..895124080640 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AboutConfigValueDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Name</property>
+    <property name="title" translatable="yes" context="aboutconfigvaluedialog|AboutConfigValueDialog">Name</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -84,7 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Value:</property>
+                <property name="label" translatable="yes" context="aboutconfigvaluedialog|label1">Value:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index dbbb9d4faa7e..067ca0633d9f 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX</property>
+    <property name="text" translatable="yes" context="aboutdialog|textbuffer1">Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX</property>
   </object>
   <object class="GtkDialog" id="AboutDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">About %PRODUCTNAME</property>
+    <property name="title" translatable="yes" context="aboutdialog|AboutDialog">About %PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -22,7 +22,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="credits">
-                <property name="label" translatable="yes">Cre_dits</property>
+                <property name="label" translatable="yes" context="aboutdialog|credits">Cre_dits</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,7 +37,7 @@
             </child>
             <child>
               <object class="GtkButton" id="website">
-                <property name="label" translatable="yes">_Website</property>
+                <property name="label" translatable="yes" context="aboutdialog|website">_Website</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -106,7 +106,7 @@
                   <object class="GtkLabel" id="logoreplacement">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">%PRODUCTNAME</property>
+                    <property name="label" translatable="yes" context="aboutdialog|logoreplacement">%PRODUCTNAME</property>
                     <property name="justify">center</property>
                   </object>
                   <packing>
@@ -125,7 +125,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Build ID: $BUILDID</property>
+                        <property name="label" translatable="yes" context="aboutdialog|buildid">Build ID: $BUILDID</property>
                         <property name="justify">center</property>
                       </object>
                       <packing>
@@ -138,7 +138,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Locale: $LOCALE</property>
+                        <property name="label" translatable="yes" context="aboutdialog|locale">Locale: $LOCALE</property>
                         <property name="justify">center</property>
                       </object>
                       <packing>
@@ -171,7 +171,7 @@
                 </child>
                 <child>
                   <object class="GtkLinkButton" id="buildIdLink">
-                    <property name="label" translatable="yes">See Log: $GITHASH</property>
+                    <property name="label" translatable="yes" context="aboutdialog|buildIdLink">See Log: $GITHASH</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -188,7 +188,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</property>
+                    <property name="label" translatable="yes" context="aboutdialog|description">%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</property>
                     <property name="justify">center</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">62</property>
@@ -211,7 +211,7 @@
                         <property name="margin_left">12</property>
                         <property name="margin_right">12</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Copyright © 2000–2017 LibreOffice contributors.</property>
+                        <property name="label" translatable="yes" context="aboutdialog|copyright">Copyright © 2000–2017 LibreOffice contributors.</property>
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
                       </object>
@@ -225,7 +225,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">LibreOffice was based on OpenOffice.org.</property>
+                        <property name="label" translatable="yes" context="aboutdialog|libreoffice">LibreOffice was based on OpenOffice.org.</property>
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
                       </object>
@@ -239,7 +239,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org.</property>
+                        <property name="label" translatable="yes" context="aboutdialog|derived">%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org.</property>
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
                       </object>
@@ -253,7 +253,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">This release was supplied by %OOOVENDOR.</property>
+                        <property name="label" translatable="yes" context="aboutdialog|vendor">This release was supplied by %OOOVENDOR.</property>
                         <property name="justify">center</property>
                         <property name="wrap">True</property>
                       </object>
@@ -273,7 +273,7 @@
                   <object class="GtkLabel" id="link">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">https://www.libreoffice.org/about-us/credits/</property>
+                    <property name="label" translatable="yes" context="aboutdialog|link">https://www.libreoffice.org/about-us/credits/</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/accelconfigpage.ui b/cui/uiconfig/ui/accelconfigpage.ui
index 68e17b4b01c6..1296e9b01e11 100644
--- a/cui/uiconfig/ui/accelconfigpage.ui
+++ b/cui/uiconfig/ui/accelconfigpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="AccelConfigPage">
@@ -50,7 +50,7 @@
               <object class="GtkLabel" id="label21">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shortcut Keys</property>
+                <property name="label" translatable="yes" context="accelconfigpage|label21">Shortcut Keys</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -77,7 +77,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="office">
-                    <property name="label" translatable="yes">%PRODUCTNAME</property>
+                    <property name="label" translatable="yes" context="accelconfigpage|office">%PRODUCTNAME</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -94,7 +94,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="module">
-                    <property name="label" translatable="yes">$(MODULE)</property>
+                    <property name="label" translatable="yes" context="accelconfigpage|module">$(MODULE)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -126,7 +126,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="change">
-                    <property name="label" translatable="yes">_Modify</property>
+                    <property name="label" translatable="yes" context="accelconfigpage|change">_Modify</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -154,7 +154,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="load">
-                    <property name="label" translatable="yes">_Load...</property>
+                    <property name="label" translatable="yes" context="accelconfigpage|load">_Load...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -169,7 +169,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="save">
-                    <property name="label" translatable="yes">_Save...</property>
+                    <property name="label" translatable="yes" context="accelconfigpage|save">_Save...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -242,7 +242,7 @@
                   <object class="GtkEntry" id="searchEntry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="placeholder_text" translatable="yes">Type to search</property>
+                    <property name="placeholder_text" translatable="yes" context="accelconfigpage|searchEntry">Type to search</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -262,7 +262,7 @@
                       <object class="GtkLabel" id="label23">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Category</property>
+                        <property name="label" translatable="yes" context="accelconfigpage|label23">_Category</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">category:border</property>
                         <property name="xalign">0</property>
@@ -276,7 +276,7 @@
                       <object class="GtkLabel" id="label24">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Function</property>
+                        <property name="label" translatable="yes" context="accelconfigpage|label24">_Function</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">function:border</property>
                         <property name="xalign">0</property>
@@ -290,7 +290,7 @@
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Keys</property>
+                        <property name="label" translatable="yes" context="accelconfigpage|label25">_Keys</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">keys:border</property>
                         <property name="xalign">0</property>
@@ -360,7 +360,7 @@
           <object class="GtkLabel" id="label22">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Functions</property>
+            <property name="label" translatable="yes" context="accelconfigpage|label22">Functions</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/acorexceptpage.ui b/cui/uiconfig/ui/acorexceptpage.ui
index f7893aab4aef..0dab0855818e 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="AcorExceptPage">
@@ -47,7 +47,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autoabbrev">
-                    <property name="label" translatable="yes">_AutoInclude</property>
+                    <property name="label" translatable="yes" context="acorexceptpage|autoabbrev">_AutoInclude</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -80,7 +80,7 @@
                         <property name="use_stock">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="newabbrev-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes">New abbreviations</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="acorexceptpage|newabbrev-atkobject">New abbreviations</property>
                           </object>
                         </child>
                       </object>
@@ -92,7 +92,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="replace">
-                        <property name="label" translatable="yes">_Replace</property>
+                        <property name="label" translatable="yes" context="acorexceptpage|replace">_Replace</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="no_show_all">True</property>
@@ -116,7 +116,7 @@
                         <property name="use_stock">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="delabbrev-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes">Delete abbreviations</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="acorexceptpage|delabbrev-atkobject">Delete abbreviations</property>
                           </object>
                         </child>
                       </object>
@@ -164,7 +164,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Abbreviations (no Subsequent Capital)</property>
+            <property name="label" translatable="yes" context="acorexceptpage|label1">Abbreviations (no Subsequent Capital)</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -217,7 +217,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autodouble">
-                    <property name="label" translatable="yes">A_utoInclude</property>
+                    <property name="label" translatable="yes" context="acorexceptpage|autodouble">A_utoInclude</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -250,7 +250,7 @@
                         <property name="use_stock">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="newdouble-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes">New words with two initial capitals</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="acorexceptpage|newdouble-atkobject">New words with two initial capitals</property>
                           </object>
                         </child>
                       </object>
@@ -262,7 +262,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="replace1">
-                        <property name="label" translatable="yes">_Replace</property>
+                        <property name="label" translatable="yes" context="acorexceptpage|replace1">_Replace</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="no_show_all">True</property>
@@ -286,7 +286,7 @@
                         <property name="use_stock">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="deldouble-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes">Delete words with two initial capitals</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="acorexceptpage|deldouble-atkobject">Delete words with two initial capitals</property>
                           </object>
                         </child>
                       </object>
@@ -334,7 +334,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Words With TWo INitial CApitals</property>
+            <property name="label" translatable="yes" context="acorexceptpage|label2">Words With TWo INitial CApitals</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/acoroptionspage.ui b/cui/uiconfig/ui/acoroptionspage.ui
index b7f090607ae6..5d6ad7accf56 100644
--- a/cui/uiconfig/ui/acoroptionspage.ui
+++ b/cui/uiconfig/ui/acoroptionspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="AutocorrectOptionsPage">
diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui
index 2f7c6f836568..4bf945202c3f 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Wed Jan 29 10:50:29 2014 -->
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="AcorReplacePage">
@@ -35,7 +35,7 @@
         </child>
         <child>
           <object class="GtkButton" id="replace">
-            <property name="label" translatable="yes">_Replace</property>
+            <property name="label" translatable="yes" context="acorreplacepage|replace">_Replace</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="no_show_all">True</property>
@@ -118,7 +118,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Repla_ce</property>
+        <property name="label" translatable="yes" context="acorreplacepage|label1">Repla_ce</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">origtext</property>
       </object>
@@ -138,7 +138,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_With:</property>
+            <property name="label" translatable="yes" context="acorreplacepage|label2">_With:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">newtext</property>
           </object>
@@ -151,7 +151,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="textonly">
-            <property name="label" translatable="yes">_Text only</property>
+            <property name="label" translatable="yes" context="acorreplacepage|textonly">_Text only</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/cui/uiconfig/ui/agingdialog.ui b/cui/uiconfig/ui/agingdialog.ui
index a37c8460ed97..42433c4cdab5 100644
--- a/cui/uiconfig/ui/agingdialog.ui
+++ b/cui/uiconfig/ui/agingdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="AgingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Aging</property>
+    <property name="title" translatable="yes" context="agingdialog|AgingDialog">Aging</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -134,7 +134,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Aging degree:</property>
+                            <property name="label" translatable="yes" context="agingdialog|label2">Aging degree:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">value:%</property>
                           </object>
@@ -157,7 +157,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="agingdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/applyautofmtpage.ui b/cui/uiconfig/ui/applyautofmtpage.ui
index 0ed07bf64f28..c466faf60ae8 100644
--- a/cui/uiconfig/ui/applyautofmtpage.ui
+++ b/cui/uiconfig/ui/applyautofmtpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="ApplyAutoFmtPage">
@@ -24,7 +24,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">_Edit...</property>
+                <property name="label" translatable="yes" context="applyautofmtpage|edit">_Edit...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -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">[M]: Replace while modifying existing text</property>
+                <property name="label" translatable="yes" context="applyautofmtpage|label1">[M]: Replace while modifying existing text</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -57,7 +57,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">[T]: AutoCorrect while typing</property>
+                <property name="label" translatable="yes" context="applyautofmtpage|label2">[T]: AutoCorrect while typing</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -85,7 +85,7 @@
               <object class="GtkLabel" id="m">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">[M]</property>
+                <property name="label" translatable="yes" context="applyautofmtpage|m">[M]</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -98,7 +98,7 @@
               <object class="GtkLabel" id="t">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">[T]</property>
+                <property name="label" translatable="yes" context="applyautofmtpage|t">[T]</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/cui/uiconfig/ui/applylocalizedpage.ui b/cui/uiconfig/ui/applylocalizedpage.ui
index d917442473ba..a298a5b08c9b 100644
--- a/cui/uiconfig/ui/applylocalizedpage.ui
+++ b/cui/uiconfig/ui/applylocalizedpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="ApplyLocalizedPage">
@@ -27,7 +27,7 @@
               <object class="GtkLabel" id="m">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">[M]</property>
+                <property name="label" translatable="yes" context="applylocalizedpage|m">[M]</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -40,7 +40,7 @@
               <object class="GtkLabel" id="t">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">[T]</property>
+                <property name="label" translatable="yes" context="applylocalizedpage|t">[T]</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -115,7 +115,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="singlereplace">
-                            <property name="label" translatable="yes">Repla_ce</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|singlereplace">Repla_ce</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -135,7 +135,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Start quote:</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|startquoteft">_Start quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">startsingle</property>
                           </object>
@@ -159,7 +159,7 @@
                                 <property name="receives_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="startsingle-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Start quote of single quotes</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|startsingle-atkobject">Start quote of single quotes</property>
                                   </object>
                                 </child>
                               </object>
@@ -175,7 +175,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="applylocalizedpage|singlestartex">Default</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -194,7 +194,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="defaultsingle">
-                            <property name="label" translatable="yes">_Default</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|defaultsingle">_Default</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -202,7 +202,7 @@
                             <property name="use_underline">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="defaultsingle-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Single quotes default</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|defaultsingle-atkobject">Single quotes default</property>
                               </object>
                             </child>
                           </object>
@@ -218,7 +218,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_End quote:</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|endquoteft">_End quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">endsingle</property>
                           </object>
@@ -242,7 +242,7 @@
                                 <property name="receives_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="endsingle-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">End quote of single quotes</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|endsingle-atkobject">End quote of single quotes</property>
                                   </object>
                                 </child>
                               </object>
@@ -258,7 +258,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="applylocalizedpage|singleendex">Default</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -283,7 +283,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Single Quotes</property>
+                    <property name="label" translatable="yes" context="applylocalizedpage|label1">Single Quotes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -315,7 +315,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="doublereplace">
-                            <property name="label" translatable="yes">Repla_ce</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|doublereplace">Repla_ce</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -335,7 +335,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Start quote:</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|label6">_Start quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">startdouble</property>
                           </object>
@@ -359,7 +359,7 @@
                                 <property name="receives_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="startdouble-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Start quote of double quotes</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|startdouble-atkobject">Start quote of double quotes</property>
                                   </object>
                                 </child>
                               </object>
@@ -375,7 +375,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="applylocalizedpage|doublestartex">Default</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -394,7 +394,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="defaultdouble">
-                            <property name="label" translatable="yes">_Default</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|defaultdouble">_Default</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -402,7 +402,7 @@
                             <property name="use_underline">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="defaultdouble-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Double quotes default</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|defaultdouble-atkobject">Double quotes default</property>
                               </object>
                             </child>
                           </object>
@@ -418,7 +418,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_End quote:</property>
+                            <property name="label" translatable="yes" context="applylocalizedpage|label8">_End quote:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">enddouble</property>
                           </object>
@@ -442,7 +442,7 @@
                                 <property name="receives_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="enddouble-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">End quote of double quotes</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="applylocalizedpage|enddouble-atkobject">End quote of double quotes</property>
                                   </object>
                                 </child>
                               </object>
@@ -458,7 +458,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="applylocalizedpage|doubleendex">Default</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -483,7 +483,7 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Double Quotes</property>
+                    <property name="label" translatable="yes" context="applylocalizedpage|label10">Double Quotes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui
index e9c557e8bbd4..5a0c983f7c76 100644
--- a/cui/uiconfig/ui/areadialog.ui
+++ b/cui/uiconfig/ui/areadialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AreaDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Area</property>
+    <property name="title" translatable="yes" context="areadialog|AreaDialog">Area</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_AREA">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_AREA">Area</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SHADOW">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shadow</property>
+                <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_SHADOW">Shadow</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui
index 405060116ff4..11e939855fa7 100644
--- a/cui/uiconfig/ui/areatabpage.ui
+++ b/cui/uiconfig/ui/areatabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="AreaTabPage">
@@ -26,7 +26,7 @@
             <property name="layout_style">center</property>
             <child>
               <object class="GtkButton" id="btnnone">
-                <property name="label" translatable="yes">None</property>
+                <property name="label" translatable="yes" context="areatabpage|btnnone">None</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -39,7 +39,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btncolor">
-                <property name="label" translatable="yes">Color</property>
+                <property name="label" translatable="yes" context="areatabpage|btncolor">Color</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -52,7 +52,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btngradient">
-                <property name="label" translatable="yes">Gradient</property>
+                <property name="label" translatable="yes" context="areatabpage|btngradient">Gradient</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -65,7 +65,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btnhatch">
-                <property name="label" translatable="yes">Hatch</property>
+                <property name="label" translatable="yes" context="areatabpage|btnhatch">Hatch</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -78,7 +78,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btnbitmap">
-                <property name="label" translatable="yes">Bitmap</property>
+                <property name="label" translatable="yes" context="areatabpage|btnbitmap">Bitmap</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btnpattern">
-                <property name="label" translatable="yes">Pattern</property>
+                <property name="label" translatable="yes" context="areatabpage|btnpattern">Pattern</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/asiantypography.ui b/cui/uiconfig/ui/asiantypography.ui
index b25746ffe42b..6f719ea6e3f6 100644
--- a/cui/uiconfig/ui/asiantypography.ui
+++ b/cui/uiconfig/ui/asiantypography.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="AsianTypography">
     <property name="visible">True</property>
@@ -22,7 +22,7 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="checkForbidList">
-                <property name="label" translatable="yes">Apply list of forbidden characters to the beginning and end of lines</property>
+                <property name="label" translatable="yes" context="asiantypography|checkForbidList">Apply list of forbidden characters to the beginning and end of lines</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -38,7 +38,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkHangPunct">
-                <property name="label" translatable="yes">Allow hanging punctuation</property>
+                <property name="label" translatable="yes" context="asiantypography|checkHangPunct">Allow hanging punctuation</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkApplySpacing">
-                <property name="label" translatable="yes">Apply spacing between Asian, Latin and complex text</property>
+                <property name="label" translatable="yes" context="asiantypography|checkApplySpacing">Apply spacing between Asian, Latin and complex text</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -76,7 +76,7 @@
       <object class="GtkLabel" id="labelLineChange">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Line Change</property>
+        <property name="label" translatable="yes" context="asiantypography|labelLineChange">Line Change</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/assigncomponentdialog.ui b/cui/uiconfig/ui/assigncomponentdialog.ui
index 024f66e336d8..134e32f8f740 100644
--- a/cui/uiconfig/ui/assigncomponentdialog.ui
+++ b/cui/uiconfig/ui/assigncomponentdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AssignComponent">
     <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">Assign Component</property>
+    <property name="title" translatable="yes" context="assigncomponentdialog|AssignComponent">Assign Component</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Component method name:</property>
+                <property name="label" translatable="yes" context="assigncomponentdialog|label1">Component method name:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/autocorrectdialog.ui b/cui/uiconfig/ui/autocorrectdialog.ui
index 343b1d50c9ec..d8fbf1f30183 100644
--- a/cui/uiconfig/ui/autocorrectdialog.ui
+++ b/cui/uiconfig/ui/autocorrectdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AutoCorrectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">AutoCorrect</property>
+    <property name="title" translatable="yes" context="autocorrectdialog|AutoCorrectDialog">AutoCorrect</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -101,7 +101,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Replacements and exceptions for language:</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|label1">Replacements and exceptions for language:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -140,7 +140,7 @@
                   <object class="GtkLabel" id="replace">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Replace</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|replace">Replace</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -153,7 +153,7 @@
                   <object class="GtkLabel" id="exceptions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Exceptions</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|exceptions">Exceptions</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -167,7 +167,7 @@
                   <object class="GtkLabel" id="options">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|options">Options</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
@@ -181,7 +181,7 @@
                   <object class="GtkLabel" id="apply">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|apply">Options</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
@@ -195,7 +195,7 @@
                   <object class="GtkLabel" id="localized">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Localized Options</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|localized">Localized Options</property>
                   </object>
                   <packing>
                     <property name="position">4</property>
@@ -209,7 +209,7 @@
                   <object class="GtkLabel" id="wordcompletion">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Word Completion</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|wordcompletion">Word Completion</property>
                   </object>
                   <packing>
                     <property name="position">5</property>
@@ -223,7 +223,7 @@
                   <object class="GtkLabel" id="smarttags">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Smart Tags</property>
+                    <property name="label" translatable="yes" context="autocorrectdialog|smarttags">Smart Tags</property>
                   </object>
                   <packing>
                     <property name="position">6</property>
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 5125e4c066c6..c29f179da611 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,11 +17,11 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Color</col>
+        <col id="0" translatable="yes" context="backgroundpage|liststore1">Color</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Image</col>
+        <col id="0" translatable="yes" context="backgroundpage|liststore1">Image</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -42,7 +42,7 @@
           <object class="GtkLabel" id="asft">
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
-            <property name="label" translatable="yes">A_s:</property>
+            <property name="label" translatable="yes" context="backgroundpage|asft">A_s:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -68,7 +68,7 @@
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">F_or:</property>
+            <property name="label" translatable="yes" context="backgroundpage|forft">F_or:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -86,9 +86,9 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <items>
-                  <item translatable="yes">Cell</item>
-                  <item translatable="yes">Row</item>
-                  <item translatable="yes">Table</item>
+                  <item translatable="yes" context="backgroundpage|tablelb">Cell</item>
+                  <item translatable="yes" context="backgroundpage|tablelb">Row</item>
+                  <item translatable="yes" context="backgroundpage|tablelb">Table</item>
                 </items>
               </object>
               <packing>
@@ -209,7 +209,7 @@
           <object class="GtkLabel" id="background_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Background Color</property>
+            <property name="label" translatable="yes" context="backgroundpage|background_label">Background Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -272,7 +272,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Unlinked image</property>
+                            <property name="label" translatable="yes" context="backgroundpage|unlinkedft">Unlinked image</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -284,7 +284,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Find images</property>
+                            <property name="label" translatable="yes" context="backgroundpage|findgraphicsft">Find images</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -299,7 +299,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkButton" id="browse">
-                                <property name="label" translatable="yes">_Browse...</property>
+                                <property name="label" translatable="yes" context="backgroundpage|browse">_Browse...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -312,7 +312,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="link">
-                                <property name="label" translatable="yes">_Link</property>
+                                <property name="label" translatable="yes" context="backgroundpage|link">_Link</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -340,7 +340,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File</property>
+                    <property name="label" translatable="yes" context="backgroundpage|label2">File</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -398,7 +398,7 @@
                             <property name="valign">start</property>
                             <child>
                               <object class="GtkRadioButton" id="positionrb">
-                                <property name="label" translatable="yes">_Position</property>
+                                <property name="label" translatable="yes" context="backgroundpage|positionrb">_Position</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -418,7 +418,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="arearb">
-                                <property name="label" translatable="yes">Ar_ea</property>
+                                <property name="label" translatable="yes" context="backgroundpage|arearb">Ar_ea</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -434,7 +434,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="tilerb">
-                                <property name="label" translatable="yes">_Tile</property>
+                                <property name="label" translatable="yes" context="backgroundpage|tilerb">_Tile</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -462,7 +462,7 @@
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Type</property>
+                    <property name="label" translatable="yes" context="backgroundpage|label8">Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -503,7 +503,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="showpreview">
-                <property name="label" translatable="yes">Pre_view</property>
+                <property name="label" translatable="yes" context="backgroundpage|showpreview">Pre_view</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="no_show_all">True</property>
diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui
index 1d77a0a68c54..bd14fce35e68 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="BaseLinksDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Links</property>
+    <property name="title" translatable="yes" context="baselinksdialog|BaseLinksDialog">Edit Links</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -51,7 +51,7 @@
             </child>
             <child>
               <object class="GtkButton" id="UPDATE_NOW">
-                <property name="label" translatable="yes">_Update</property>
+                <property name="label" translatable="yes" context="baselinksdialog|UPDATE_NOW">_Update</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -66,7 +66,7 @@
             </child>
             <child>
               <object class="GtkButton" id="OPEN">
-                <property name="label" translatable="yes">_Open</property>
+                <property name="label" translatable="yes" context="baselinksdialog|OPEN">_Open</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -81,7 +81,7 @@
             </child>
             <child>
               <object class="GtkButton" id="CHANGE_SOURCE">
-                <property name="label" translatable="yes">_Modify...</property>
+                <property name="label" translatable="yes" context="baselinksdialog|CHANGE_SOURCE">_Modify...</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkButton" id="BREAK_LINK">
-                <property name="label" translatable="yes">_Break Link</property>
+                <property name="label" translatable="yes" context="baselinksdialog|BREAK_LINK">_Break Link</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -144,7 +144,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Source file</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|FILES">Source file</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -158,7 +158,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Element:</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|LINKS">Element:</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -172,7 +172,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Type</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|TYPE">Type</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -187,7 +187,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Status</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|STATUS">Status</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -214,7 +214,7 @@
                     </child>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="TB_LINKS:border-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Edit Links</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="baselinksdialog|TB_LINKS-atkobject">Edit Links</property>
                       </object>
                     </child>
                   </object>
@@ -243,7 +243,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Source file</property>
+                    <property name="label" translatable="yes" context="baselinksdialog|FILES2">Source file</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">TB_LINKS:border</property>
                   </object>
@@ -259,7 +259,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Element:</property>
+                    <property name="label" translatable="yes" context="baselinksdialog|SOURCE2">Element:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -273,7 +273,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Type:</property>
+                    <property name="label" translatable="yes" context="baselinksdialog|TYPE2">Type:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -287,7 +287,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Update:</property>
+                    <property name="label" translatable="yes" context="baselinksdialog|UPDATE">Update:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -342,7 +342,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="AUTOMATIC">
-                        <property name="label" translatable="yes">_Automatic</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|AUTOMATIC">_Automatic</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -362,7 +362,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="MANUAL">
-                        <property name="label" translatable="yes">Ma_nual</property>
+                        <property name="label" translatable="yes" context="baselinksdialog|MANUAL">Ma_nual</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 7b7148fd5604..a18167ed4f0d 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="BitmapTabPage">
@@ -43,7 +43,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="BTN_IMPORT">
-                    <property name="label" translatable="yes">Add / Import</property>
+                    <property name="label" translatable="yes" context="bitmaptabpage|BTN_IMPORT">Add / Import</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -63,7 +63,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Bitmap</property>
+            <property name="label" translatable="yes" context="bitmaptabpage|label1">Bitmap</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -108,7 +108,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Style:</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|label3">Style:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -121,12 +121,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Original</item>
-                          <item translatable="yes">Filled</item>
-                          <item translatable="yes">Stretched</item>
-                          <item translatable="yes">Zoomed</item>
-                          <item translatable="yes">Custom</item>
-                          <item translatable="yes">Tiled</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Original</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Filled</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Stretched</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Zoomed</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Custom</item>
+                          <item translatable="yes" context="bitmaptabpage|bitmapstyle">Tiled</item>
                         </items>
                       </object>
                       <packing>
@@ -153,7 +153,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Size:</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|label4">Size:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -170,7 +170,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">W:</property>
+                            <property name="label" translatable="yes" context="bitmaptabpage|label5">W:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -194,7 +194,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">H:</property>
+                            <property name="label" translatable="yes" context="bitmaptabpage|label6">H:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -223,7 +223,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="scaletsb">
-                        <property name="label" translatable="yes">Scale</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|scaletsb">Scale</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -254,7 +254,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Position:</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|label7">Position:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -267,15 +267,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Top Left</item>
-                          <item translatable="yes">Top Center</item>
-                          <item translatable="yes">Top Right</item>
-                          <item translatable="yes">Center Left</item>
-                          <item translatable="yes">Center</item>
-                          <item translatable="yes">Center Right</item>
-                          <item translatable="yes">Bottom Left</item>
-                          <item translatable="yes">Bottom Center</item>
-                          <item translatable="yes">Bottom Right</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Top Left</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Top Center</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Top Right</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Center Left</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Center</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Center Right</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Left</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Center</item>
+                          <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Right</item>
                         </items>
                       </object>
                       <packing>
@@ -302,7 +302,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Tiling Position:</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|label9">Tiling Position:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -320,7 +320,7 @@
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">X:</property>
+                            <property name="label" translatable="yes" context="bitmaptabpage|label10">X:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -343,7 +343,7 @@
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Y:</property>
+                            <property name="label" translatable="yes" context="bitmaptabpage|label11">Y:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -387,7 +387,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Tiling Offset:</property>
+                        <property name="label" translatable="yes" context="bitmaptabpage|label15">Tiling Offset:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -406,8 +406,8 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Row</item>
-                              <item translatable="yes">Column</item>
+                              <item translatable="yes" context="bitmaptabpage|tileofflb">Row</item>
+                              <item translatable="yes" context="bitmaptabpage|tileofflb">Column</item>
                             </items>
                           </object>
                           <packing>
@@ -450,7 +450,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="bitmaptabpage|label2">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -493,7 +493,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="bitmaptabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property>
                           </object>
                         </child>
                       </object>
@@ -511,7 +511,7 @@
           <object class="GtkLabel" id="label8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
+            <property name="label" translatable="yes" context="bitmaptabpage|label8">Preview</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
index ecd102812ea2..5649c19a16f4 100644
--- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
+++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="os-liststore">
     <columns>
@@ -11,7 +11,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Any</col>
+        <col id="0" translatable="yes" context="blackorwhitelistentrydialog|os-liststore">Any</col>
         <col id="1">0</col>
       </row>
       <row>
@@ -185,7 +185,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Operating system:</property>
+                            <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label4">Operating system:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -198,7 +198,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Version:</property>
+                            <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label5">Version:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -211,7 +211,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">OpenCL vendor:</property>
+                            <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label6">OpenCL vendor:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -224,7 +224,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Device:</property>
+                            <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label7">Device:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -237,7 +237,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Driver version:</property>
+                            <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label8">Driver version:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -255,7 +255,7 @@
                       <object class="GtkLabel" id="bledittitle">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Edit OpenCL Blacklist Entry</property>
+                        <property name="label" translatable="yes" context="blackorwhitelistentrydialog|bledittitle">Edit OpenCL Blacklist Entry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -266,7 +266,7 @@
                       <object class="GtkLabel" id="bladdtitle">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Create OpenCL Blacklist Entry</property>
+                        <property name="label" translatable="yes" context="blackorwhitelistentrydialog|bladdtitle">Create OpenCL Blacklist Entry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -277,7 +277,7 @@
                       <object class="GtkLabel" id="wledittitle">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Edit OpenCL Whitelist Entry</property>
+                        <property name="label" translatable="yes" context="blackorwhitelistentrydialog|wledittitle">Edit OpenCL Whitelist Entry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -288,7 +288,7 @@
                       <object class="GtkLabel" id="wladdtitle">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Create OpenCL Whitelist Entry</property>
+                        <property name="label" translatable="yes" context="blackorwhitelistentrydialog|wladdtitle">Create OpenCL Whitelist Entry</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -303,7 +303,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">OpenCL Information</property>
+                <property name="label" translatable="yes" context="blackorwhitelistentrydialog|label1">OpenCL Information</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/borderareatransparencydialog.ui b/cui/uiconfig/ui/borderareatransparencydialog.ui
index a996970ad2b3..a5715ef3fdd7 100644
--- a/cui/uiconfig/ui/borderareatransparencydialog.ui
+++ b/cui/uiconfig/ui/borderareatransparencydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="BorderAreaTransparencyDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Border / Background</property>
+    <property name="title" translatable="yes" context="borderareatransparencydialog|BorderAreaTransparencyDialog">Border / Background</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="borderareatransparencydialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="borderareatransparencydialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="borderareatransparencydialog|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/cui/uiconfig/ui/borderbackgrounddialog.ui b/cui/uiconfig/ui/borderbackgrounddialog.ui
index 4a2ed33258be..99b2fde564ed 100644
--- a/cui/uiconfig/ui/borderbackgrounddialog.ui
+++ b/cui/uiconfig/ui/borderbackgrounddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="BorderBackgroundDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Border / Background</property>
+    <property name="title" translatable="yes" context="borderbackgrounddialog|BorderBackgroundDialog">Border / Background</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="borderbackgrounddialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="borderbackgrounddialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index a3cb06bb068a..5fbadc551d89 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -68,7 +68,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_User-defined:</property>
+                        <property name="label" translatable="yes" context="borderpage|userdefft">_User-defined:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">framesel</property>
                       </object>
@@ -82,7 +82,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Pr_esets:</property>
+                        <property name="label" translatable="yes" context="borderpage|label14">Pr_esets:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">presets</property>
                       </object>
@@ -107,7 +107,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Adjacent Cells:</property>
+                        <property name="label" translatable="yes" context="borderpage|rmadjcellbordersft">_Adjacent Cells:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">rmadjcellborders</property>
                       </object>
@@ -118,7 +118,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rmadjcellborders">
-                        <property name="label" translatable="yes">Remove border</property>
+                        <property name="label" translatable="yes" context="borderpage|rmadjcellborders">Remove border</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line Arrangement</property>
+                <property name="label" translatable="yes" context="borderpage|label8">Line Arrangement</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -172,7 +172,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">St_yle:</property>
+                        <property name="label" translatable="yes" context="borderpage|label15">St_yle:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linestylelb</property>
                       </object>
@@ -186,7 +186,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Width:</property>
+                        <property name="label" translatable="yes" context="borderpage|label16">_Width:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linewidthmf:0.00pt</property>
                       </object>
@@ -200,7 +200,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Color:</property>
+                        <property name="label" translatable="yes" context="borderpage|label17">_Color:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linecolorlb</property>
                       </object>
@@ -250,7 +250,7 @@
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes" context="borderpage|label9">Line</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -337,7 +337,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="borderpage|leftft">_Left:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">leftmf:0.00mm</property>
                       </object>
@@ -351,7 +351,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="borderpage|rightft">Right:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">rightmf:0.00mm</property>
                       </object>
@@ -365,7 +365,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Top:</property>
+                        <property name="label" translatable="yes" context="borderpage|topft">_Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">topmf:0.00mm</property>
                       </object>
@@ -379,7 +379,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="borderpage|bottomft">_Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bottommf:0.00mm</property>
                       </object>
@@ -390,7 +390,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="sync">
-                        <property name="label" translatable="yes">Synchronize</property>
+                        <property name="label" translatable="yes" context="borderpage|sync">Synchronize</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -411,7 +411,7 @@
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spacing to Contents</property>
+                <property name="label" translatable="yes" context="borderpage|label10">Spacing to Contents</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -454,7 +454,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Position:</property>
+                    <property name="label" translatable="yes" context="borderpage|label22">_Position:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">shadows</property>
                   </object>
@@ -468,7 +468,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Distan_ce:</property>
+                    <property name="label" translatable="yes" context="borderpage|distanceft">Distan_ce:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">distancemf:0.00mm</property>
                   </object>
@@ -482,7 +482,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">C_olor:</property>
+                    <property name="label" translatable="yes" context="borderpage|shadowcolorft">C_olor:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">shadowcolorlb</property>
                   </object>
@@ -534,7 +534,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Shadow Style</property>
+            <property name="label" translatable="yes" context="borderpage|label11">Shadow Style</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -567,7 +567,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="mergewithnext">
-                    <property name="label" translatable="yes">_Merge with next paragraph</property>
+                    <property name="label" translatable="yes" context="borderpage|mergewithnext">_Merge with next paragraph</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -582,7 +582,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="mergeadjacent">
-                    <property name="label" translatable="yes">_Merge adjacent line styles</property>
+                    <property name="label" translatable="yes" context="borderpage|mergeadjacent">_Merge adjacent line styles</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -603,7 +603,7 @@
           <object class="GtkLabel" id="label12">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Properties</property>
+            <property name="label" translatable="yes" context="borderpage|label12">Properties</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui
index 34a06bfbb17c..2aac625050a3 100644
--- a/cui/uiconfig/ui/breaknumberoption.ui
+++ b/cui/uiconfig/ui/breaknumberoption.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">2</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="BreakNumberOption">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Hyphenation</property>
+    <property name="title" translatable="yes" context="breaknumberoption|BreakNumberOption">Hyphenation</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -94,7 +94,7 @@
                   <object class="GtkLabel" id="beforelabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Characters Before Break</property>
+                    <property name="label" translatable="yes" context="breaknumberoption|beforelabel">Characters Before Break</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -133,7 +133,7 @@
                   <object class="GtkLabel" id="afterlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Characters After Break</property>
+                    <property name="label" translatable="yes" context="breaknumberoption|afterlabel">Characters After Break</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -172,7 +172,7 @@
                   <object class="GtkLabel" id="minimallabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Minimal Word Length</property>
+                    <property name="label" translatable="yes" context="breaknumberoption|minimallabel">Minimal Word Length</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/calloutdialog.ui b/cui/uiconfig/ui/calloutdialog.ui
index 6208d1c4c296..d01063e819d8 100644
--- a/cui/uiconfig/ui/calloutdialog.ui
+++ b/cui/uiconfig/ui/calloutdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CalloutDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Position and Size</property>
+    <property name="title" translatable="yes" context="calloutdialog|CalloutDialog">Position and Size</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_POSITION_SIZE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Size</property>
+                <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_POSITION_SIZE">Position and Size</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SWPOSSIZE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Size</property>
+                <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_SWPOSSIZE">Position and Size</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_CAPTION">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Callout</property>
+                <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_CAPTION">Callout</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 7c2bb8caa260..56f3351ad50b 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,23 +17,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Optimal</col>
+        <col id="0" translatable="yes" context="calloutpage|liststore1">Optimal</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">From top</col>
+        <col id="0" translatable="yes" context="calloutpage|liststore1">From top</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">From left</col>
+        <col id="0" translatable="yes" context="calloutpage|liststore1">From left</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Horizontal</col>
+        <col id="0" translatable="yes" context="calloutpage|liststore1">Horizontal</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Vertical</col>
+        <col id="0" translatable="yes" context="calloutpage|liststore1">Vertical</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -71,7 +71,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Extension:</property>
+                <property name="label" translatable="yes" context="calloutpage|label2">_Extension:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">extension</property>
               </object>
@@ -120,7 +120,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Length:</property>
+                <property name="label" translatable="yes" context="calloutpage|lengthft">_Length:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">length:0.00mm</property>
               </object>
@@ -137,7 +137,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="optimal">
-            <property name="label" translatable="yes">_Optimal</property>
+            <property name="label" translatable="yes" context="calloutpage|optimal">_Optimal</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -161,7 +161,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Position:</property>
+                <property name="label" translatable="yes" context="calloutpage|positionft">_Position:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">position</property>
               </object>
@@ -175,7 +175,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_By:</property>
+                <property name="label" translatable="yes" context="calloutpage|byft">_By:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">by:0.00mm</property>
               </object>
@@ -189,12 +189,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <items>
-                  <item translatable="yes">Top</item>
-                  <item translatable="yes">Middle</item>
-                  <item translatable="yes">Bottom</item>
-                  <item translatable="yes">Left</item>
-                  <item translatable="yes">Center</item>
-                  <item translatable="yes">Right</item>
+                  <item translatable="yes" context="calloutpage|position">Top</item>
+                  <item translatable="yes" context="calloutpage|position">Middle</item>
+                  <item translatable="yes" context="calloutpage|position">Bottom</item>
+                  <item translatable="yes" context="calloutpage|position">Left</item>
+                  <item translatable="yes" context="calloutpage|position">Center</item>
+                  <item translatable="yes" context="calloutpage|position">Right</item>
                 </items>
               </object>
               <packing>
@@ -231,7 +231,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Spacing:</property>
+                <property name="label" translatable="yes" context="calloutpage|label1">_Spacing:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spacing:0.00mm</property>
               </object>
@@ -309,9 +309,9 @@
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
             <items>
-              <item translatable="yes">Straight Line</item>
-              <item translatable="yes">Angled Line</item>
-              <item translatable="yes">Angled Connector Line</item>
+              <item translatable="yes" context="calloutpage|linetypes">Straight Line</item>
+              <item translatable="yes" context="calloutpage|linetypes">Angled Line</item>
+              <item translatable="yes" context="calloutpage|linetypes">Angled Connector Line</item>
             </items>
           </object>
           <packing>
diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index d5e8b7388018..581523076bd7 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentIndent">
@@ -21,31 +21,31 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Default</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Default</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Left</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Center</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Center</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Right</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Justified</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Justified</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Filled</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Filled</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Distributed</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreHorzAlign">Distributed</col>
         <col id="1">6</col>
       </row>
     </data>
@@ -59,27 +59,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Default</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Default</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Top</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Middle</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Middle</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Bottom</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Justified</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Justified</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Distributed</col>
+        <col id="0" translatable="yes" context="cellalignment|liststoreVertAlign">Distributed</col>
         <col id="1">5</col>
       </row>
     </data>
@@ -120,7 +120,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Degrees:</property>
+                        <property name="label" translatable="yes" context="cellalignment|labelDegrees">_Degrees:</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="xalign">0</property>
-                        <property name="label" translatable="yes">_Reference edge:</property>
+                        <property name="label" translatable="yes" context="cellalignment|labelRefEdge">_Reference edge:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">references</property>
                       </object>
@@ -193,7 +193,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="checkVertStack">
-                        <property name="label" translatable="yes">Vertically s_tacked</property>
+                        <property name="label" translatable="yes" context="cellalignment|checkVertStack">Vertically s_tacked</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -209,7 +209,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkAsianMode">
-                        <property name="label" translatable="yes">Asian layout _mode</property>
+                        <property name="label" translatable="yes" context="cellalignment|checkAsianMode">Asian layout _mode</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -238,7 +238,7 @@
           <object class="GtkLabel" id="labelTextOrient">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Orientation</property>
+            <property name="label" translatable="yes" context="cellalignment|labelTextOrient">Text Orientation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -272,7 +272,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkWrapTextAuto">
-                    <property name="label" translatable="yes">_Wrap text automatically</property>
+                    <property name="label" translatable="yes" context="cellalignment|checkWrapTextAuto">_Wrap text automatically</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -289,7 +289,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkShrinkFitCellSize">
-                    <property name="label" translatable="yes">_Shrink to fit cell size</property>
+                    <property name="label" translatable="yes" context="cellalignment|checkShrinkFitCellSize">_Shrink to fit cell size</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkHyphActive">
-                    <property name="label" translatable="yes">Hyphenation _active</property>
+                    <property name="label" translatable="yes" context="cellalignment|checkHyphActive">Hyphenation _active</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -331,7 +331,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Te_xt direction:</property>
+                        <property name="label" translatable="yes" context="cellalignment|LabelTxtDir">Te_xt direction:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboTextDirBox</property>
                       </object>
@@ -366,7 +366,7 @@
           <object class="GtkLabel" id="labelProperties">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Properties</property>
+            <property name="label" translatable="yes" context="cellalignment|labelProperties">Properties</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -415,7 +415,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Hori_zontal</property>
+                    <property name="label" translatable="yes" context="cellalignment|labelHorzAlign">Hori_zontal</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboboxHorzAlign</property>
                   </object>
@@ -429,7 +429,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Vertical</property>
+                    <property name="label" translatable="yes" context="cellalignment|labelVertAlign">_Vertical</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboboxVertAlign</property>
                   </object>
@@ -443,7 +443,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">I_ndent</property>
+                    <property name="label" translatable="yes" context="cellalignment|labelIndent">I_ndent</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spinIndentFrom:0.00pt</property>
                   </object>
@@ -484,7 +484,7 @@
           <object class="GtkLabel" id="LabelTextAlig">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Alignment</property>
+            <property name="label" translatable="yes" context="cellalignment|LabelTextAlig">Text Alignment</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -504,7 +504,7 @@
         <child>
           <object class="GtkLabel" id="labelSTR_BOTTOMLOCK">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Extension From Lower Cell Border</property>
+            <property name="label" translatable="yes" context="cellalignment|labelSTR_BOTTOMLOCK">Text Extension From Lower Cell Border</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -515,7 +515,7 @@
         <child>
           <object class="GtkLabel" id="labelSTR_TOPLOCK">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Extension From Upper Cell Border</property>
+            <property name="label" translatable="yes" context="cellalignment|labelSTR_TOPLOCK">Text Extension From Upper Cell Border</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -526,7 +526,7 @@
         <child>
           <object class="GtkLabel" id="labelSTR_CELLLOCK">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Extension Inside Cell</property>
+            <property name="label" translatable="yes" context="cellalignment|labelSTR_CELLLOCK">Text Extension Inside Cell</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -537,7 +537,7 @@
         <child>
           <object class="GtkLabel" id="labelABCD">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">ABCD</property>
+            <property name="label" translatable="yes" context="cellalignment|labelABCD">ABCD</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index b8c2ec6a0f70..7cbc1c428ce9 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="CertDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Certificate Path</property>
+    <property name="title" translatable="yes" context="certdialog|CertDialog">Certificate Path</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -63,7 +63,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add">
-                <property name="label" translatable="yes">_Add...</property>
+                <property name="label" translatable="yes" context="certdialog|add">_Add...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -115,7 +115,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Select or add the correct Network Security Services Certificate directory to use for digital signatures:</property>
+                        <property name="label" translatable="yes" context="certdialog|label2">Select or add the correct Network Security Services Certificate directory to use for digital signatures:</property>
                         <property name="use_underline">True</property>
                         <property name="wrap">True</property>
                         <property name="mnemonic_widget">paths</property>
@@ -137,7 +137,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">manual</property>
+                            <property name="label" translatable="yes" context="certdialog|manual">manual</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -151,7 +151,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Profile</property>
+                            <property name="label" translatable="yes" context="certdialog|profile">Profile</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -165,7 +165,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Directory</property>
+                            <property name="label" translatable="yes" context="certdialog|dir">Directory</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -178,7 +178,7 @@
                           <object class="GtkLabel" id="certdir">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Select a Certificate directory</property>
+                            <property name="label" translatable="yes" context="certdialog|certdir">Select a Certificate directory</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -221,7 +221,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Certificate Path</property>
+                <property name="label" translatable="yes" context="certdialog|label1">Certificate Path</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 88e63b8180c7..83041dcf7fca 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="CharNamePage">
@@ -43,7 +43,7 @@
                 <property name="halign">start</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Language:</property>
+                <property name="label" translatable="yes" context="charnamepage|westlangft-nocjk">Language:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">westlanglb-nocjk</property>
               </object>
@@ -103,7 +103,7 @@
               <object class="GtkLabel" id="westfontnameft-nocjk">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Family:</property>
+                <property name="label" translatable="yes" context="charnamepage|westfontnameft-nocjk">Family:</property>
               </object>
             </child>
           </object>
@@ -142,7 +142,7 @@
               <object class="GtkLabel" id="weststyleft-nocjk">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Style:</property>
+                <property name="label" translatable="yes" context="charnamepage|weststyleft-nocjk">Style:</property>
               </object>
             </child>
           </object>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="westsizeft-nocjk">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Size:</property>
+                <property name="label" translatable="yes" context="charnamepage|westsizeft-nocjk">Size:</property>
               </object>
             </child>
           </object>
@@ -224,7 +224,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Family:</property>
+                    <property name="label" translatable="yes" context="charnamepage|westfontnameft-cjk">Family:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">westfontnamelb-cjk</property>
                   </object>
@@ -239,7 +239,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Style:</property>
+                    <property name="label" translatable="yes" context="charnamepage|weststyleft-cjk">Style:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">weststylelb-cjk</property>
                   </object>
@@ -254,7 +254,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Size:</property>
+                    <property name="label" translatable="yes" context="charnamepage|westsizeft-cjk">Size:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">westsizelb-cjk</property>
                   </object>
@@ -269,7 +269,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Language:</property>
+                    <property name="label" translatable="yes" context="charnamepage|westlangft-cjk">Language:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">westlanglb-cjk</property>
                   </object>
@@ -343,7 +343,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Western Text Font</property>
+            <property name="label" translatable="yes" context="charnamepage|label4">Western Text Font</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -382,7 +382,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Family:</property>
+                    <property name="label" translatable="yes" context="charnamepage|eastfontnameft">Family:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eastfontnamelb</property>
                   </object>
@@ -397,7 +397,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Style:</property>
+                    <property name="label" translatable="yes" context="charnamepage|eaststyleft">Style:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eaststylelb</property>
                   </object>
@@ -412,7 +412,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Size:</property>
+                    <property name="label" translatable="yes" context="charnamepage|eastsizeft">Size:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eastsizelb</property>
                   </object>
@@ -427,7 +427,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Language:</property>
+                    <property name="label" translatable="yes" context="charnamepage|eastlangft">Language:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eastlanglb</property>
                   </object>
@@ -500,7 +500,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Asian Text Font</property>
+            <property name="label" translatable="yes" context="charnamepage|label5">Asian Text Font</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -539,7 +539,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Family:</property>
+                    <property name="label" translatable="yes" context="charnamepage|ctlfontnameft">Family:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ctlfontnamelb</property>
                   </object>
@@ -554,7 +554,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Style:</property>
+                    <property name="label" translatable="yes" context="charnamepage|ctlstyleft">Style:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ctlstylelb</property>
                   </object>
@@ -569,7 +569,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Size:</property>
+                    <property name="label" translatable="yes" context="charnamepage|ctlsizeft">Size:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ctlsizelb</property>
                   </object>
@@ -584,7 +584,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Language:</property>
+                    <property name="label" translatable="yes" context="charnamepage|ctllangft">Language:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ctllanglb</property>
                   </object>
@@ -658,7 +658,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">CTL Font</property>
+            <property name="label" translatable="yes" context="charnamepage|label6">CTL Font</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -685,7 +685,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="preview:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="charnamepage|preview-atkobject">Preview</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui
index 6c8dd3f6aedb..dbcbb89dbeb0 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="ColorConfigWindow">
@@ -11,7 +11,7 @@
     <property name="row_homogeneous">True</property>
     <child>
       <object class="GtkCheckButton" id="docboundaries">
-        <property name="label" translatable="yes">Text boundaries</property>
+        <property name="label" translatable="yes" context="colorconfigwin|docboundaries">Text boundaries</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -30,7 +30,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Document background</property>
+        <property name="label" translatable="yes" context="colorconfigwin|doccolor">Document background</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -86,7 +86,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">General</property>
+        <property name="label" translatable="yes" context="colorconfigwin|general">General</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -125,7 +125,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Application background</property>
+        <property name="label" translatable="yes" context="colorconfigwin|appback">Application background</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -134,7 +134,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="objboundaries">
-        <property name="label" translatable="yes">Object boundaries</property>
+        <property name="label" translatable="yes" context="colorconfigwin|objboundaries">Object boundaries</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -171,7 +171,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="tblboundaries">
-        <property name="label" translatable="yes">Table boundaries</property>
+        <property name="label" translatable="yes" context="colorconfigwin|tblboundaries">Table boundaries</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -212,7 +212,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Font color</property>
+        <property name="label" translatable="yes" context="colorconfigwin|font">Font color</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -243,7 +243,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="unvisitedlinks">
-        <property name="label" translatable="yes">Unvisited links</property>
+        <property name="label" translatable="yes" context="colorconfigwin|unvisitedlinks">Unvisited links</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -280,7 +280,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="visitedlinks">
-        <property name="label" translatable="yes">Visited links</property>
+        <property name="label" translatable="yes" context="colorconfigwin|visitedlinks">Visited links</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">AutoSpellcheck</property>
+        <property name="label" translatable="yes" context="colorconfigwin|autospellcheck">AutoSpellcheck</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -334,7 +334,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Smart Tags</property>
+        <property name="label" translatable="yes" context="colorconfigwin|smarttags">Smart Tags</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -388,7 +388,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Text Document</property>
+        <property name="label" translatable="yes" context="colorconfigwin|writer">Text Document</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -415,7 +415,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Grid</property>
+        <property name="label" translatable="yes" context="colorconfigwin|writergrid">Grid</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -494,7 +494,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Script Indicator</property>
+        <property name="label" translatable="yes" context="colorconfigwin|script">Script Indicator</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -515,7 +515,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="field">
-        <property name="label" translatable="yes">Field shadings</property>
+        <property name="label" translatable="yes" context="colorconfigwin|field">Field shadings</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -530,7 +530,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="index">
-        <property name="label" translatable="yes">Index and table shadings</property>
+        <property name="label" translatable="yes" context="colorconfigwin|index">Index and table shadings</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -545,7 +545,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="section">
-        <property name="label" translatable="yes">Section boundaries</property>
+        <property name="label" translatable="yes" context="colorconfigwin|section">Section boundaries</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -596,7 +596,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Headers and Footer delimiter</property>
+        <property name="label" translatable="yes" context="colorconfigwin|hdft">Headers and Footer delimiter</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -631,7 +631,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Page and column breaks</property>
+        <property name="label" translatable="yes" context="colorconfigwin|pagebreak">Page and column breaks</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -666,7 +666,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Direct Cursor</property>
+        <property name="label" translatable="yes" context="colorconfigwin|direct">Direct Cursor</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -690,7 +690,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">HTML Document</property>
+        <property name="label" translatable="yes" context="colorconfigwin|html">HTML Document</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -717,7 +717,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">SGML syntax highlighting</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sgml">SGML syntax highlighting</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -752,7 +752,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Comment highlighting</property>
+        <property name="label" translatable="yes" context="colorconfigwin|htmlcomment">Comment highlighting</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -787,7 +787,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Keyword highlighting</property>
+        <property name="label" translatable="yes" context="colorconfigwin|htmlkeyword">Keyword highlighting</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -822,7 +822,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Text</property>
+        <property name="label" translatable="yes" context="colorconfigwin|unknown">Text</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -846,7 +846,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Spreadsheet</property>
+        <property name="label" translatable="yes" context="colorconfigwin|calc">Spreadsheet</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -873,7 +873,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Grid lines</property>
+        <property name="label" translatable="yes" context="colorconfigwin|calcgrid">Grid lines</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -908,7 +908,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Page breaks</property>
+        <property name="label" translatable="yes" context="colorconfigwin|brk">Page breaks</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -943,7 +943,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Manual page breaks</property>
+        <property name="label" translatable="yes" context="colorconfigwin|brkmanual">Manual page breaks</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -978,7 +978,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Automatic page breaks</property>
+        <property name="label" translatable="yes" context="colorconfigwin|brkauto">Automatic page breaks</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1013,7 +1013,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Detective</property>
+        <property name="label" translatable="yes" context="colorconfigwin|det">Detective</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1048,7 +1048,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Detective error</property>
+        <property name="label" translatable="yes" context="colorconfigwin|deterror">Detective error</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1083,7 +1083,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">References</property>
+        <property name="label" translatable="yes" context="colorconfigwin|ref">References</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1118,7 +1118,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Notes background</property>
+        <property name="label" translatable="yes" context="colorconfigwin|notes">Notes background</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1142,7 +1142,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Drawing / Presentation</property>
+        <property name="label" translatable="yes" context="colorconfigwin|draw">Drawing / Presentation</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -1169,7 +1169,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Grid</property>
+        <property name="label" translatable="yes" context="colorconfigwin|drawgrid">Grid</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1193,7 +1193,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Basic Syntax Highlighting</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basic">Basic Syntax Highlighting</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -1220,7 +1220,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Identifier</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basicid">Identifier</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1255,7 +1255,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Comment</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basiccomment">Comment</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1290,7 +1290,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Number</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basicnumber">Number</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1325,7 +1325,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">String</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basicstring">String</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1360,7 +1360,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Operator</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basicop">Operator</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1395,7 +1395,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Reserved expression</property>
+        <property name="label" translatable="yes" context="colorconfigwin|basickeyword">Reserved expression</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1430,7 +1430,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Error</property>
+        <property name="label" translatable="yes" context="colorconfigwin|error">Error</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1454,7 +1454,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">SQL Syntax Highlighting</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sql">SQL Syntax Highlighting</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -1481,7 +1481,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Identifier</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlid">Identifier</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1516,7 +1516,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Number</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlnumber">Number</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1551,7 +1551,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">String</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlstring">String</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1586,7 +1586,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Operator</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlop">Operator</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1621,7 +1621,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Keyword</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlkeyword">Keyword</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1656,7 +1656,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Parameter</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlparam">Parameter</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1691,7 +1691,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Comment</property>
+        <property name="label" translatable="yes" context="colorconfigwin|sqlcomment">Comment</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -1736,7 +1736,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="shadows">
-        <property name="label" translatable="yes">Shadows</property>
+        <property name="label" translatable="yes" context="colorconfigwin|shadows">Shadows</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index e0810b887ca3..b8b77731ec11 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -57,7 +57,7 @@
                         <property name="valign">center</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Palette:</property>
+                        <property name="label" translatable="yes" context="colorpage|label21">Palette:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">paletteselector</property>
                       </object>
@@ -98,7 +98,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Recent Colors</property>
+                        <property name="label" translatable="yes" context="colorpage|label20">Recent Colors</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">recentcolorset</property>
                       </object>
@@ -153,7 +153,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RGB">
-                        <property name="label" translatable="yes">RGB</property>
+                        <property name="label" translatable="yes" context="colorpage|RGB">RGB</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -169,7 +169,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="CMYK">
-                        <property name="label" translatable="yes">CMYK</property>
+                        <property name="label" translatable="yes" context="colorpage|CMYK">CMYK</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -185,7 +185,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="delete">
-                        <property name="label" translatable="yes">Delete</property>
+                        <property name="label" translatable="yes" context="colorpage|delete">Delete</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -203,7 +203,7 @@
                         <property name="can_focus">False</property>
                         <property name="margin_bottom">3</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Custom Palette</property>
+                        <property name="label" translatable="yes" context="colorpage|label22">Custom Palette</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -255,7 +255,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Colors</property>
+            <property name="label" translatable="yes" context="colorpage|label1">Colors</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -300,7 +300,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="oldpreview-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Old Color</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="colorpage|oldpreview-atkobject">Old Color</property>
                           </object>
                         </child>
                       </object>
@@ -330,7 +330,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">B</property>
+                        <property name="label" translatable="yes" context="colorpage|label7">B</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">B_custom</property>
                       </object>
@@ -345,7 +345,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">G</property>
+                        <property name="label" translatable="yes" context="colorpage|label8">G</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">G_custom</property>
                       </object>
@@ -360,7 +360,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">R</property>
+                        <property name="label" translatable="yes" context="colorpage|label9">R</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">R_custom</property>
                       </object>
@@ -375,7 +375,7 @@
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Hex</property>
+                        <property name="label" translatable="yes" context="colorpage|label18">Hex</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -455,7 +455,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_C</property>
+                        <property name="label" translatable="yes" context="colorpage|label10">_C</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">C_custom:0%</property>
                       </object>
@@ -470,7 +470,7 @@
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_K</property>
+                        <property name="label" translatable="yes" context="colorpage|label16">_K</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">K_custom:0%</property>
                       </object>
@@ -485,7 +485,7 @@
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Y</property>
+                        <property name="label" translatable="yes" context="colorpage|label17">_Y</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -551,7 +551,7 @@
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_M</property>
+                        <property name="label" translatable="yes" context="colorpage|label15">_M</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -576,7 +576,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Active</property>
+            <property name="label" translatable="yes" context="colorpage|label5">Active</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -622,7 +622,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="newpreview-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">New Color</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="colorpage|newpreview-atkobject">New Color</property>
                           </object>
                         </child>
                       </object>
@@ -653,7 +653,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="primary_icon_tooltip_text" translatable="yes">Blue</property>
+                        <property name="primary_icon_tooltip_text" translatable="yes" context="colorpage|B_custom">Blue</property>
                         <property name="adjustment">adjustment2</property>
                       </object>
                       <packing>
@@ -668,7 +668,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="primary_icon_tooltip_text" translatable="yes">Red</property>
+                        <property name="primary_icon_tooltip_text" translatable="yes" context="colorpage|R_custom">Red</property>
                         <property name="adjustment">adjustment2</property>
                       </object>
                       <packing>
@@ -682,7 +682,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_B</property>
+                        <property name="label" translatable="yes" context="colorpage|label4">_B</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -696,7 +696,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_G</property>
+                        <property name="label" translatable="yes" context="colorpage|label3">_G</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -710,7 +710,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_R</property>
+                        <property name="label" translatable="yes" context="colorpage|label2">_R</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -725,7 +725,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="primary_icon_tooltip_text" translatable="yes">Green</property>
+                        <property name="primary_icon_tooltip_text" translatable="yes" context="colorpage|G_custom">Green</property>
                         <property name="adjustment">adjustment2</property>
                       </object>
                       <packing>
@@ -739,7 +739,7 @@
                       <object class="GtkLabel" id="label19">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Hex</property>
+                        <property name="label" translatable="yes" context="colorpage|label19">_Hex</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">hex_custom</property>
                       </object>
@@ -783,7 +783,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_C</property>
+                        <property name="label" translatable="yes" context="colorpage|label11">_C</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">C_custom:0%</property>
                       </object>
@@ -798,7 +798,7 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_M</property>
+                        <property name="label" translatable="yes" context="colorpage|label12">_M</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -812,7 +812,7 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_K</property>
+                        <property name="label" translatable="yes" context="colorpage|label13">_K</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">K_custom:0%</property>
                       </object>
@@ -855,7 +855,7 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Y</property>
+                        <property name="label" translatable="yes" context="colorpage|label14">_Y</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -902,7 +902,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="edit">
-                    <property name="label" translatable="yes">Pick</property>
+                    <property name="label" translatable="yes" context="colorpage|edit">Pick</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -924,7 +924,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">New</property>
+            <property name="label" translatable="yes" context="colorpage|label6">New</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/colorpickerdialog.ui b/cui/uiconfig/ui/colorpickerdialog.ui
index cbc5c66fced9..b850cb7274b1 100644
--- a/cui/uiconfig/ui/colorpickerdialog.ui
+++ b/cui/uiconfig/ui/colorpickerdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -23,7 +23,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Pick a Color</property>
+    <property name="title" translatable="yes" context="colorpickerdialog|ColorPicker">Pick a Color</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -241,7 +241,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="redRadiobutton">
-                                <property name="label" translatable="yes">_Red:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|redRadiobutton">_Red:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -259,7 +259,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="greenRadiobutton">
-                                <property name="label" translatable="yes">_Green:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|greenRadiobutton">_Green:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -276,7 +276,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="blueRadiobutton">
-                                <property name="label" translatable="yes">_Blue:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|blueRadiobutton">_Blue:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -332,7 +332,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Hex _#:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|label2">Hex _#:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">hexEntry</property>
                               </object>
@@ -360,7 +360,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">RGB</property>
+                        <property name="label" translatable="yes" context="colorpickerdialog|label1">RGB</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -399,7 +399,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="hueRadiobutton">
-                                <property name="label" translatable="yes">H_ue:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|hueRadiobutton">H_ue:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -417,7 +417,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="satRadiobutton">
-                                <property name="label" translatable="yes">_Saturation:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|satRadiobutton">_Saturation:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -434,7 +434,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="brightRadiobutton">
-                                <property name="label" translatable="yes">Bright_ness:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|brightRadiobutton">Bright_ness:</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -493,7 +493,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">HSB</property>
+                        <property name="label" translatable="yes" context="colorpickerdialog|label3">HSB</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -534,7 +534,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Cyan:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|label5">_Cyan:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">cyanSpinbutton:%</property>
                               </object>
@@ -549,7 +549,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Magenta:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|label6">_Magenta:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">magSpinbutton:%</property>
                               </object>
@@ -564,7 +564,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Yellow:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|label7">_Yellow:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">yellowSpinbutton:%</property>
                               </object>
@@ -579,7 +579,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Key:</property>
+                                <property name="label" translatable="yes" context="colorpickerdialog|label8">_Key:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">keySpinbutton:%</property>
                               </object>
@@ -644,7 +644,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CMYK</property>
+                        <property name="label" translatable="yes" context="colorpickerdialog|label4">CMYK</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui
index f25f37f76812..286b2b3308d8 100644
--- a/cui/uiconfig/ui/comment.ui
+++ b/cui/uiconfig/ui/comment.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="CommentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Comment</property>
+    <property name="title" translatable="yes" context="comment|CommentDialog">Insert Comment</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -150,7 +150,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Author</property>
+                            <property name="label" translatable="yes" context="comment|label2">Author</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -182,7 +182,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Text</property>
+                        <property name="label" translatable="yes" context="comment|label4">_Text</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">edit:border</property>
                       </object>
@@ -225,7 +225,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Insert</property>
+                            <property name="label" translatable="yes" context="comment|label5">_Insert</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">author</property>
                           </object>
@@ -238,7 +238,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="author">
-                            <property name="label" translatable="yes">Author</property>
+                            <property name="label" translatable="yes" context="comment|author">Author</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -261,7 +261,7 @@
                       <object class="GtkLabel" id="alttitle">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Edit Comment</property>
+                        <property name="label" translatable="yes" context="comment|alttitle">Edit Comment</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -277,7 +277,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Contents</property>
+                <property name="label" translatable="yes" context="comment|label1">Contents</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui
index 9a3947c9e4fc..c91a899c1ff2 100644
--- a/cui/uiconfig/ui/connectortabpage.ui
+++ b/cui/uiconfig/ui/connectortabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -31,7 +31,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Type:</property>
+                <property name="label" translatable="yes" context="connectortabpage|FT_TYPE">_Type:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_TYPE</property>
               </object>
@@ -82,7 +82,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Line _1:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_LINE_1">Line _1:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_LINE_1:0.00cm</property>
                       </object>
@@ -96,7 +96,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Line _2:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_LINE_2">Line _2:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_LINE_2:0.00cm</property>
                       </object>
@@ -110,7 +110,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Line _3:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_LINE_3">Line _3:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_LINE_3:0.00cm</property>
                       </object>
@@ -167,7 +167,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Line Skew</property>
+                <property name="label" translatable="yes" context="connectortabpage|label2">Line Skew</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -203,7 +203,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Begin horizontal:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_HORZ_1">_Begin horizontal:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HORZ_1:0.00mm</property>
                       </object>
@@ -217,7 +217,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">End _horizontal:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_HORZ_2">End _horizontal:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HORZ_2:0.00mm</property>
                       </object>
@@ -231,7 +231,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Begin _vertical:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_VERT_1">Begin _vertical:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_VERT_1:0.00mm</property>
                       </object>
@@ -245,7 +245,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_End vertical:</property>
+                        <property name="label" translatable="yes" context="connectortabpage|FT_VERT_2">_End vertical:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_VERT_2:0.00mm</property>
                       </object>
@@ -315,7 +315,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Line Spacing</property>
+                <property name="label" translatable="yes" context="connectortabpage|label3">Line Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -339,12 +339,12 @@
       <object class="svxlo-SvxXConnectionPreview" id="CTL_PREVIEW:border">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Preview</property>
+        <property name="tooltip_text" translatable="yes" context="connectortabpage|CTL_PREVIEW|tooltip_text">Preview</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="CTL_PREVIEW:border-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="connectortabpage|CTL_PREVIEW-atkobject">Example</property>
           </object>
         </child>
       </object>
diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui
index d8a2d33c985b..fab025fde0e0 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="ConnPoolPage">
@@ -36,7 +36,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="connectionpooling">
-                    <property name="label" translatable="yes">Connection pooling enabled</property>
+                    <property name="label" translatable="yes" context="connpooloptions|connectionpooling">Connection pooling enabled</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -65,7 +65,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Drivers known in %PRODUCTNAME</property>
+                        <property name="label" translatable="yes" context="connpooloptions|driverslabel">Drivers known in %PRODUCTNAME</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">driverlist</property>
                       </object>
@@ -99,7 +99,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Current driver:</property>
+                            <property name="label" translatable="yes" context="connpooloptions|driverlabel">Current driver:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -130,7 +130,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="enablepooling">
-                        <property name="label" translatable="yes">Enable pooling for this driver</property>
+                        <property name="label" translatable="yes" context="connpooloptions|enablepooling">Enable pooling for this driver</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -156,7 +156,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Timeout (seconds)</property>
+                            <property name="label" translatable="yes" context="connpooloptions|timeoutlabel">_Timeout (seconds)</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">timeout</property>
                           </object>
@@ -205,7 +205,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Connection Pool</property>
+            <property name="label" translatable="yes" context="connpooloptions|label1">Connection Pool</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/croppage.ui b/cui/uiconfig/ui/croppage.ui
index 4fa005a97f74..a45ed6d41bbe 100644
--- a/cui/uiconfig/ui/croppage.ui
+++ b/cui/uiconfig/ui/croppage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -50,7 +50,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="keepscale">
-                    <property name="label" translatable="yes">Keep _scale</property>
+                    <property name="label" translatable="yes" context="croppage|keepscale">Keep _scale</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="keepsize">
-                    <property name="label" translatable="yes">Keep image si_ze</property>
+                    <property name="label" translatable="yes" context="croppage|keepsize">Keep image si_ze</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -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">_Left:</property>
+                        <property name="label" translatable="yes" context="croppage|label2">_Left:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">left:0.00cm</property>
                       </object>
@@ -121,7 +121,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="croppage|label3">_Right:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">right:0.00cm</property>
                       </object>
@@ -160,7 +160,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Top:</property>
+                        <property name="label" translatable="yes" context="croppage|label4">_Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">top:0.00cm</property>
                       </object>
@@ -174,7 +174,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="croppage|label5">_Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bottom:0.00cm</property>
                       </object>
@@ -223,7 +223,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Crop</property>
+            <property name="label" translatable="yes" context="croppage|label1">Crop</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -258,7 +258,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Width:</property>
+                    <property name="label" translatable="yes" context="croppage|label6">_Width:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">widthzoom:0%</property>
                   </object>
@@ -284,7 +284,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Height:</property>
+                    <property name="label" translatable="yes" context="croppage|label7">_Height:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">heightzoom:0%</property>
                   </object>
@@ -313,7 +313,7 @@
           <object class="GtkLabel" id="label10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Scale</property>
+            <property name="label" translatable="yes" context="croppage|label10">Scale</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -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">_Width:</property>
+                    <property name="label" translatable="yes" context="croppage|label8">_Width:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">width:0.00cm</property>
                   </object>
@@ -375,7 +375,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Height:</property>
+                    <property name="label" translatable="yes" context="croppage|label9">_Height:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">height:0.00cm</property>
                   </object>
@@ -405,7 +405,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Image Size</property>
+            <property name="label" translatable="yes" context="croppage|label11">Image Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -457,7 +457,7 @@
             </child>
             <child>
               <object class="GtkButton" id="origsize">
-                <property name="label" translatable="yes">_Original Size</property>
+                <property name="label" translatable="yes" context="croppage|origsize">_Original Size</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui
index 355db5bb8759..c9b18c4c2016 100644
--- a/cui/uiconfig/ui/cuiimapdlg.ui
+++ b/cui/uiconfig/ui/cuiimapdlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="IMapDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Properties</property>
+    <property name="title" translatable="yes" context="cuiimapdlg|IMapDialog">Properties</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -93,7 +93,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_URL:</property>
+                    <property name="label" translatable="yes" context="cuiimapdlg|label1">_URL:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">urlentry</property>
                   </object>
@@ -135,7 +135,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_rame:</property>
+                    <property name="label" translatable="yes" context="cuiimapdlg|label2">F_rame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frameCB</property>
                   </object>
@@ -183,7 +183,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Name:</property>
+                    <property name="label" translatable="yes" context="cuiimapdlg|label3">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">nameentry</property>
                   </object>
@@ -225,7 +225,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Alternative _text:</property>
+                    <property name="label" translatable="yes" context="cuiimapdlg|label4">Alternative _text:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">textentry</property>
                   </object>
@@ -267,7 +267,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Description:</property>
+                    <property name="label" translatable="yes" context="cuiimapdlg|label5">_Description:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">descTV:border</property>
                   </object>
diff --git a/cui/uiconfig/ui/customizedialog.ui b/cui/uiconfig/ui/customizedialog.ui
index 9f0d188d138e..aaa25c399643 100644
--- a/cui/uiconfig/ui/customizedialog.ui
+++ b/cui/uiconfig/ui/customizedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CustomizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Customize</property>
+    <property name="title" translatable="yes" context="customizedialog|CustomizeDialog">Customize</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="menus">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Menus</property>
+                <property name="label" translatable="yes" context="customizedialog|menus">Menus</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="contextmenus">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Context Menus</property>
+                <property name="label" translatable="yes" context="customizedialog|contextmenus">Context Menus</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="keyboard">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Keyboard</property>
+                <property name="label" translatable="yes" context="customizedialog|keyboard">Keyboard</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="toolbars">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Toolbars</property>
+                <property name="label" translatable="yes" context="customizedialog|toolbars">Toolbars</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="events">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Events</property>
+                <property name="label" translatable="yes" context="customizedialog|events">Events</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/cui/uiconfig/ui/databaselinkdialog.ui b/cui/uiconfig/ui/databaselinkdialog.ui
index 08a48af2e05e..17c49c398212 100644
--- a/cui/uiconfig/ui/databaselinkdialog.ui
+++ b/cui/uiconfig/ui/databaselinkdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DatabaseLinkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Database Link</property>
+    <property name="title" translatable="yes" context="databaselinkdialog|DatabaseLinkDialog">Create Database Link</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -85,7 +85,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkButton" id="browse">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes" context="databaselinkdialog|browse">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -101,7 +101,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Database file:</property>
+                    <property name="label" translatable="yes" context="databaselinkdialog|label1">_Database file:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">url</property>
                   </object>
@@ -145,7 +145,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Registered _name:</property>
+                    <property name="label" translatable="yes" context="databaselinkdialog|label4">Registered _name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
@@ -176,7 +176,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Edit Database Link</property>
+                <property name="label" translatable="yes" context="databaselinkdialog|alttitle">Edit Database Link</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/dbregisterpage.ui b/cui/uiconfig/ui/dbregisterpage.ui
index fad2f6246256..17101a11aa03 100644
--- a/cui/uiconfig/ui/dbregisterpage.ui
+++ b/cui/uiconfig/ui/dbregisterpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="DbRegisterPage">
@@ -59,7 +59,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="new">
-                        <property name="label" translatable="yes">_New...</property>
+                        <property name="label" translatable="yes" context="dbregisterpage|new">_New...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -73,7 +73,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="delete">
-                        <property name="label" translatable="yes">_Delete</property>
+                        <property name="label" translatable="yes" context="dbregisterpage|delete">_Delete</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -87,7 +87,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="edit">
-                        <property name="label" translatable="yes">_Edit...</property>
+                        <property name="label" translatable="yes" context="dbregisterpage|edit">_Edit...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -114,7 +114,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Registered Databases</property>
+            <property name="label" translatable="yes" context="dbregisterpage|label1">Registered Databases</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/dimensionlinestabpage.ui b/cui/uiconfig/ui/dimensionlinestabpage.ui
index b0caf9ca1ea9..d5247a622d7f 100644
--- a/cui/uiconfig/ui/dimensionlinestabpage.ui
+++ b/cui/uiconfig/ui/dimensionlinestabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -50,7 +50,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.4699999988079071</property>
-                        <property name="label" translatable="yes">Line _distance:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_LINE_DIST">Line _distance:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_LINE_DIST:0.00mm</property>
                       </object>
@@ -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">Guide _overhang:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_HELPLINE_OVERHANG">Guide _overhang:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HELPLINE_OVERHANG:0.00mm</property>
                       </object>
@@ -78,7 +78,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Guide distance:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_HELPLINE_DIST">_Guide distance:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HELPLINE_DIST:0.00mm</property>
                       </object>
@@ -92,7 +92,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Left guide:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_HELPLINE1_LEN">_Left guide:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HELPLINE1_LEN:0.00mm</property>
                       </object>
@@ -106,7 +106,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Right guide:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_HELPLINE2_LEN">_Right guide:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HELPLINE2_LEN:0.00mm</property>
                       </object>
@@ -120,7 +120,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Decimal _places:</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_DECIMALPLACES">Decimal _places:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_DECIMALPLACES:0</property>
                       </object>
@@ -131,7 +131,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_BELOW_REF_EDGE">
-                        <property name="label" translatable="yes">Measure _below object</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|TSB_BELOW_REF_EDGE">Measure _below object</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -233,7 +233,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes" context="dimensionlinestabpage|label1">Line</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -269,7 +269,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Text position</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|FT_POSITION">_Text position</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -304,7 +304,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="TSB_AUTOPOSV">
-                                <property name="label" translatable="yes">_AutoVertical</property>
+                                <property name="label" translatable="yes" context="dimensionlinestabpage|TSB_AUTOPOSV">_AutoVertical</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="TSB_AUTOPOSH">
-                                <property name="label" translatable="yes">A_utoHorizontal</property>
+                                <property name="label" translatable="yes" context="dimensionlinestabpage|TSB_AUTOPOSH">A_utoHorizontal</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -347,7 +347,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_PARALLEL">
-                        <property name="label" translatable="yes">_Parallel to line</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|TSB_PARALLEL">_Parallel to line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -364,7 +364,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_SHOW_UNIT">
-                        <property name="label" translatable="yes">Show _measurement units</property>
+                        <property name="label" translatable="yes" context="dimensionlinestabpage|TSB_SHOW_UNIT">Show _measurement units</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -401,7 +401,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Legend</property>
+                <property name="label" translatable="yes" context="dimensionlinestabpage|label2">Legend</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -424,7 +424,7 @@
     <child>
       <object class="GtkLabel" id="STR_MEASURE_AUTOMATIC">
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Automatic</property>
+        <property name="label" translatable="yes" context="dimensionlinestabpage|STR_MEASURE_AUTOMATIC">Automatic</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/distributiondialog.ui b/cui/uiconfig/ui/distributiondialog.ui
index d9245f621868..dd2b74dd5d52 100644
--- a/cui/uiconfig/ui/distributiondialog.ui
+++ b/cui/uiconfig/ui/distributiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DistributionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Distribution</property>
+    <property name="title" translatable="yes" context="distributiondialog|DistributionDialog">Distribution</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/cui/uiconfig/ui/distributionpage.ui b/cui/uiconfig/ui/distributionpage.ui
index c278b2f0f463..c07dbe02c2a1 100644
--- a/cui/uiconfig/ui/distributionpage.ui
+++ b/cui/uiconfig/ui/distributionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkGrid" id="DistributionPage">
     <property name="visible">True</property>
@@ -33,7 +33,7 @@
                     <property name="row_homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="hornone">
-                        <property name="label" translatable="yes">_None</property>
+                        <property name="label" translatable="yes" context="distributionpage|hornone">_None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -50,7 +50,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="horleft">
-                        <property name="label" translatable="yes">_Left</property>
+                        <property name="label" translatable="yes" context="distributionpage|horleft">_Left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -66,7 +66,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="horcenter">
-                        <property name="label" translatable="yes">_Center</property>
+                        <property name="label" translatable="yes" context="distributionpage|horcenter">_Center</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -82,7 +82,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="horright">
-                        <property name="label" translatable="yes">_Right</property>
+                        <property name="label" translatable="yes" context="distributionpage|horright">_Right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="hordistance">
-                        <property name="label" translatable="yes">_Spacing</property>
+                        <property name="label" translatable="yes" context="distributionpage|hordistance">_Spacing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -175,7 +175,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Horizontal</property>
+                <property name="label" translatable="yes" context="distributionpage|label">Horizontal</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -208,7 +208,7 @@
                     <property name="row_homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="vernone">
-                        <property name="label" translatable="yes">N_one</property>
+                        <property name="label" translatable="yes" context="distributionpage|vernone">N_one</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -224,7 +224,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="vertop">
-                        <property name="label" translatable="yes">_Top</property>
+                        <property name="label" translatable="yes" context="distributionpage|vertop">_Top</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -240,7 +240,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="vercenter">
-                        <property name="label" translatable="yes">C_enter</property>
+                        <property name="label" translatable="yes" context="distributionpage|vercenter">C_enter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -257,7 +257,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="verdistance">
-                        <property name="label" translatable="yes">S_pacing</property>
+                        <property name="label" translatable="yes" context="distributionpage|verdistance">S_pacing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -273,7 +273,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="verbottom">
-                        <property name="label" translatable="yes">_Bottom</property>
+                        <property name="label" translatable="yes" context="distributionpage|verbottom">_Bottom</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -350,7 +350,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Vertical</property>
+                <property name="label" translatable="yes" context="distributionpage|label1">Vertical</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/editdictionarydialog.ui b/cui/uiconfig/ui/editdictionarydialog.ui
index d50629d5ae04..5fb319aba1dc 100644
--- a/cui/uiconfig/ui/editdictionarydialog.ui
+++ b/cui/uiconfig/ui/editdictionarydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="EditDictionaryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Custom Dictionary</property>
+    <property name="title" translatable="yes" context="editdictionarydialog|EditDictionaryDialog">Edit Custom Dictionary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -92,7 +92,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Book:</property>
+                <property name="label" translatable="yes" context="editdictionarydialog|book_label">_Book:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">book</property>
               </object>
@@ -107,7 +107,7 @@
               <object class="GtkLabel" id="lang_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Language:</property>
+                <property name="label" translatable="yes" context="editdictionarydialog|lang_label">_Language:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lang</property>
               </object>
@@ -179,7 +179,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Word</property>
+                        <property name="label" translatable="yes" context="editdictionarydialog|word_label">_Word</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">word</property>
                       </object>
@@ -195,7 +195,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Replace By</property>
+                        <property name="label" translatable="yes" context="editdictionarydialog|replace_label">_Replace By</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">replace</property>
                       </object>
@@ -248,7 +248,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="newreplace">
-                    <property name="label" translatable="yes">_New</property>
+                    <property name="label" translatable="yes" context="editdictionarydialog|newreplace">_New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -262,7 +262,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="delete">
-                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="label" translatable="yes" context="editdictionarydialog|delete">_Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/editmodulesdialog.ui b/cui/uiconfig/ui/editmodulesdialog.ui
index ac0431ae7f26..5b5b77faca95 100644
--- a/cui/uiconfig/ui/editmodulesdialog.ui
+++ b/cui/uiconfig/ui/editmodulesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="EditModulesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Modules</property>
+    <property name="title" translatable="yes" context="editmodulesdialog|EditModulesDialog">Edit Modules</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
                     <property name="row_spacing">12</property>
                     <child>
                       <object class="GtkLinkButton" id="moredictslink">
-                        <property name="label" translatable="yes">Get more dictionaries online...</property>
+                        <property name="label" translatable="yes" context="editmodulesdialog|moredictslink">Get more dictionaries online...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -105,7 +105,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Language:</property>
+                            <property name="label" translatable="yes" context="editmodulesdialog|label2">Language:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">language</property>
                           </object>
@@ -150,7 +150,7 @@
                             <property name="layout_style">start</property>
                             <child>
                               <object class="GtkButton" id="up">
-                                <property name="label" translatable="yes">Move Up</property>
+                                <property name="label" translatable="yes" context="editmodulesdialog|up">Move Up</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -164,7 +164,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="down">
-                                <property name="label" translatable="yes">Move Down</property>
+                                <property name="label" translatable="yes" context="editmodulesdialog|down">Move Down</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -178,7 +178,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="back">
-                                <property name="label" translatable="yes">_Back</property>
+                                <property name="label" translatable="yes" context="editmodulesdialog|back">_Back</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -225,7 +225,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="editmodulesdialog|label1">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index bf80526b73e2..a699df24ef41 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststore1">
@@ -10,19 +10,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(Without)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore1">(Without)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Capitals</col>
+        <col id="0" translatable="yes" context="effectspage|liststore1">Capitals</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Lowercase</col>
+        <col id="0" translatable="yes" context="effectspage|liststore1">Lowercase</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Title</col>
+        <col id="0" translatable="yes" context="effectspage|liststore1">Title</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Small capitals</col>
+        <col id="0" translatable="yes" context="effectspage|liststore1">Small capitals</col>
       </row>
     </data>
   </object>
@@ -33,13 +33,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(Without)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore2">(Without)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Embossed</col>
+        <col id="0" translatable="yes" context="effectspage|liststore2">Embossed</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Engraved</col>
+        <col id="0" translatable="yes" context="effectspage|liststore2">Engraved</col>
       </row>
     </data>
   </object>
@@ -50,19 +50,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(Without)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore3">(Without)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dot</col>
+        <col id="0" translatable="yes" context="effectspage|liststore3">Dot</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Circle</col>
+        <col id="0" translatable="yes" context="effectspage|liststore3">Circle</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Disc</col>
+        <col id="0" translatable="yes" context="effectspage|liststore3">Disc</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Accent</col>
+        <col id="0" translatable="yes" context="effectspage|liststore3">Accent</col>
       </row>
     </data>
   </object>
@@ -75,11 +75,11 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Above text</col>
+        <col id="0" translatable="yes" context="effectspage|liststore4">Above text</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Below text</col>
+        <col id="0" translatable="yes" context="effectspage|liststore4">Below text</col>
         <col id="1">1</col>
       </row>
     </data>
@@ -93,27 +93,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(Without)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">(Without)</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Single</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">Single</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Double</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">Double</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bold</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">Bold</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">With /</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">With /</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">With X</col>
+        <col id="0" translatable="yes" context="effectspage|liststore5">With X</col>
         <col id="1">6</col>
       </row>
     </data>
@@ -127,71 +127,71 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(Without)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">(Without)</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Single</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Single</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Double</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Double</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bold</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Bold</col>
         <col id="1">12</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dotted</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dotted</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dotted (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dotted (Bold)</col>
         <col id="1">13</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dash</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dash</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dash (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dash (Bold)</col>
         <col id="1">14</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Long Dash</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Long Dash</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Long Dash (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Long Dash (Bold)</col>
         <col id="1">15</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dot Dash</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dot Dash</col>
         <col id="1">7</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dot Dash (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dot Dash (Bold)</col>
         <col id="1">16</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dot Dot Dash</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dot Dot Dash</col>
         <col id="1">8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dot Dot Dash (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Dot Dot Dash (Bold)</col>
         <col id="1">17</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Wave</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Wave</col>
         <col id="1">10</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Wave (Bold)</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Wave (Bold)</col>
         <col id="1">18</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Double Wave</col>
+        <col id="0" translatable="yes" context="effectspage|liststore6">Double Wave</col>
         <col id="1">11</col>
       </row>
     </data>
@@ -215,7 +215,7 @@
           <object class="GtkLabel" id="fontcolorft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Font color:</property>
+            <property name="label" translatable="yes" context="effectspage|fontcolorft">Font color:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">fontcolorlb</property>
             <property name="xalign">0</property>
@@ -229,7 +229,7 @@
           <object class="GtkLabel" id="effectsft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Effects:</property>
+            <property name="label" translatable="yes" context="effectspage|effectsft">Effects:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">effectslb</property>
             <property name="xalign">0</property>
@@ -243,7 +243,7 @@
           <object class="GtkLabel" id="reliefft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Relief:</property>
+            <property name="label" translatable="yes" context="effectspage|reliefft">Relief:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">relieflb</property>
             <property name="xalign">0</property>
@@ -257,7 +257,7 @@
           <object class="GtkLabel" id="label46">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Overlining:</property>
+            <property name="label" translatable="yes" context="effectspage|label46">Overlining:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">overlinelb</property>
             <property name="xalign">0</property>
@@ -271,7 +271,7 @@
           <object class="GtkLabel" id="label47">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Strikethrough:</property>
+            <property name="label" translatable="yes" context="effectspage|label47">Strikethrough:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">strikeoutlb</property>
             <property name="xalign">0</property>
@@ -285,7 +285,7 @@
           <object class="GtkLabel" id="label48">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Underlining:</property>
+            <property name="label" translatable="yes" context="effectspage|label48">Underlining:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">underlinelb</property>
             <property name="xalign">0</property>
@@ -299,7 +299,7 @@
           <object class="GtkLabel" id="overlinecolorft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Overline color:</property>
+            <property name="label" translatable="yes" context="effectspage|overlinecolorft">Overline color:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">overlinecolorlb</property>
             <property name="xalign">0</property>
@@ -313,7 +313,7 @@
           <object class="GtkLabel" id="underlinecolorft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Underline color:</property>
+            <property name="label" translatable="yes" context="effectspage|underlinecolorft">Underline color:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">underlinecolorlb</property>
             <property name="xalign">0</property>
@@ -410,7 +410,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="outlinecb">
-            <property name="label" translatable="yes">Outline</property>
+            <property name="label" translatable="yes" context="effectspage|outlinecb">Outline</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -425,7 +425,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="blinkingcb">
-            <property name="label" translatable="yes">Blinking</property>
+            <property name="label" translatable="yes" context="effectspage|blinkingcb">Blinking</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -440,7 +440,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="hiddencb">
-            <property name="label" translatable="yes">Hidden</property>
+            <property name="label" translatable="yes" context="effectspage|hiddencb">Hidden</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -455,7 +455,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="individualwordscb">
-            <property name="label" translatable="yes">Individual words</property>
+            <property name="label" translatable="yes" context="effectspage|individualwordscb">Individual words</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -493,7 +493,7 @@
           <object class="GtkLabel" id="positionft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position:</property>
+            <property name="label" translatable="yes" context="effectspage|positionft">Position:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">positionlb</property>
             <property name="xalign">0</property>
@@ -507,7 +507,7 @@
           <object class="GtkLabel" id="emphasisft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Emphasis mark:</property>
+            <property name="label" translatable="yes" context="effectspage|emphasisft">Emphasis mark:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">emphasislb</property>
             <property name="xalign">0</property>
@@ -519,7 +519,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="shadowcb">
-            <property name="label" translatable="yes">Shadow</property>
+            <property name="label" translatable="yes" context="effectspage|shadowcb">Shadow</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -559,7 +559,7 @@
         <child>
           <object class="GtkLabel" id="a11ywarning">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Accessibility option "Use automatic font color for screen display" is active. Font color attributes are not currently used to display text.</property>
+            <property name="label" translatable="yes" context="effectspage|a11ywarning">Accessibility option "Use automatic font color for screen display" is active. Font color attributes are not currently used to display text.</property>
             <property name="wrap">True</property>
             <property name="max_width_chars">50</property>
             <property name="xalign">0</property>
@@ -608,7 +608,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="preview:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="effectspage|preview-atkobject">Preview</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/embossdialog.ui b/cui/uiconfig/ui/embossdialog.ui
index c9a298d0a835..fe52caece92e 100644
--- a/cui/uiconfig/ui/embossdialog.ui
+++ b/cui/uiconfig/ui/embossdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="EmbossDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Emboss</property>
+    <property name="title" translatable="yes" context="embossdialog|EmbossDialog">Emboss</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -117,7 +117,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Light source:</property>
+                            <property name="label" translatable="yes" context="embossdialog|label2">_Light source:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">lightsource</property>
                           </object>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="embossdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/eventassigndialog.ui b/cui/uiconfig/ui/eventassigndialog.ui
index 5be57cc782c7..499b5a1610fd 100644
--- a/cui/uiconfig/ui/eventassigndialog.ui
+++ b/cui/uiconfig/ui/eventassigndialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="EventAssignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Assign Macro</property>
+    <property name="title" translatable="yes" context="eventassigndialog|EventAssignDialog">Assign Macro</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
diff --git a/cui/uiconfig/ui/eventassignpage.ui b/cui/uiconfig/ui/eventassignpage.ui
index 1b773857467e..ab0431dde106 100644
--- a/cui/uiconfig/ui/eventassignpage.ui
+++ b/cui/uiconfig/ui/eventassignpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="EventAssignPage">
@@ -44,7 +44,7 @@
           <object class="GtkLabel" id="existingmacrosft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Existing Macros</property>
+            <property name="label" translatable="yes" context="eventassignpage|existingmacrosft">Existing Macros</property>
             <property name="track_visited_links">False</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -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">Macro From</property>
+            <property name="label" translatable="yes" context="eventassignpage|macrotoft">Macro From</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -156,7 +156,7 @@
                       <object class="GtkLabel" id="eventft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Event</property>
+                        <property name="label" translatable="yes" context="eventassignpage|eventft">Event</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -169,7 +169,7 @@
                       <object class="GtkLabel" id="assignft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Assigned Action</property>
+                        <property name="label" translatable="yes" context="eventassignpage|assignft">Assigned Action</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -194,7 +194,7 @@
           <object class="GtkLabel" id="libraryft1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Assignments</property>
+            <property name="label" translatable="yes" context="eventassignpage|libraryft1">Assignments</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -217,7 +217,7 @@
         <property name="layout_style">start</property>
         <child>
           <object class="GtkButton" id="assign">
-            <property name="label" translatable="yes">Assign</property>
+            <property name="label" translatable="yes" context="eventassignpage|assign">Assign</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -231,7 +231,7 @@
         </child>
         <child>
           <object class="GtkButton" id="delete">
-            <property name="label" translatable="yes">Remove</property>
+            <property name="label" translatable="yes" context="eventassignpage|delete">Remove</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/eventsconfigpage.ui b/cui/uiconfig/ui/eventsconfigpage.ui
index 4adcfae890ec..938380ef5be5 100644
--- a/cui/uiconfig/ui/eventsconfigpage.ui
+++ b/cui/uiconfig/ui/eventsconfigpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="EventsConfigPage">
@@ -28,7 +28,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Assign:</property>
+                <property name="label" translatable="yes" context="eventsconfigpage|label1">Assign:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -46,7 +46,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="macro">
-                    <property name="label" translatable="yes">M_acro...</property>
+                    <property name="label" translatable="yes" context="eventsconfigpage|macro">M_acro...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -60,7 +60,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="delete">
-                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="label" translatable="yes" context="eventsconfigpage|delete">_Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">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">Save in:</property>
+                    <property name="label" translatable="yes" context="eventsconfigpage|label2">Save in:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">savein</property>
                   </object>
@@ -153,7 +153,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Event</property>
+                    <property name="label" translatable="yes" context="eventsconfigpage|eventft">Event</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -165,7 +165,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Assigned Action</property>
+                    <property name="label" translatable="yes" context="eventsconfigpage|actionft">Assigned Action</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/cui/uiconfig/ui/fmsearchdialog.ui b/cui/uiconfig/ui/fmsearchdialog.ui
index 33b2ce2bf30d..15411e39d4cc 100644
--- a/cui/uiconfig/ui/fmsearchdialog.ui
+++ b/cui/uiconfig/ui/fmsearchdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RecordSearchDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Record Search</property>
+    <property name="title" translatable="yes" context="fmsearchdialog|RecordSearchDialog">Record Search</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="pbSearchAgain">
-                <property name="label" translatable="yes">S_earch</property>
+                <property name="label" translatable="yes" context="fmsearchdialog|pbSearchAgain">S_earch</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -139,7 +139,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="rbSearchForText">
-                                        <property name="label" translatable="yes">_Text:</property>
+                                        <property name="label" translatable="yes" context="fmsearchdialog|rbSearchForText">_Text:</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -163,7 +163,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="rbSearchForNull">
-                                    <property name="label" translatable="yes">Field content is _NULL</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|rbSearchForNull">Field content is _NULL</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -182,7 +182,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="rbSearchForNotNull">
-                                    <property name="label" translatable="yes">Field content is not NU_LL</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|rbSearchForNotNull">Field content is not NU_LL</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -213,7 +213,7 @@
                       <object class="GtkLabel" id="flSearchFor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Search for</property>
+                        <property name="label" translatable="yes" context="fmsearchdialog|flSearchFor">_Search for</property>
                         <property name="use_underline">True</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -269,7 +269,7 @@
                                         <property name="spacing">12</property>
                                         <child>
                                           <object class="GtkRadioButton" id="rbSingleField">
-                                            <property name="label" translatable="yes">_Single field:</property>
+                                            <property name="label" translatable="yes" context="fmsearchdialog|rbSingleField">_Single field:</property>
                                             <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
@@ -306,7 +306,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="rbAllFields">
-                                        <property name="label" translatable="yes">_All fields</property>
+                                        <property name="label" translatable="yes" context="fmsearchdialog|rbAllFields">_All fields</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -332,7 +332,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Form:</property>
+                                            <property name="label" translatable="yes" context="fmsearchdialog|ftForm">Form:</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">lbForm</property>
                                           </object>
@@ -406,7 +406,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Where to Search</property>
+                        <property name="label" translatable="yes" context="fmsearchdialog|label2">Where to Search</property>
                         <property name="use_underline">True</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -457,7 +457,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Position:</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|ftPosition">_Position:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">lbPosition</property>
                               </object>
@@ -493,7 +493,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="HalfFullFormsCJK">
-                                <property name="label" translatable="yes">Match character wi_dth</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|HalfFullFormsCJK">Match character wi_dth</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -514,7 +514,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkCheckButton" id="SoundsLikeCJK">
-                                    <property name="label" translatable="yes">Sounds like (_Japanese)</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|SoundsLikeCJK">Sounds like (_Japanese)</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -530,7 +530,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="SoundsLikeCJKSettings">
-                                    <property name="label" translatable="yes">Similarities...</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|SoundsLikeCJKSettings">Similarities...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -555,7 +555,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkCheckButton" id="cbApprox">
-                                    <property name="label" translatable="yes">S_imilarity search</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|cbApprox">S_imilarity search</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -571,7 +571,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="pbApproxSettings">
-                                    <property name="label" translatable="yes">Similarities...</property>
+                                    <property name="label" translatable="yes" context="fmsearchdialog|pbApproxSettings">Similarities...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -592,7 +592,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cbCase">
-                                <property name="label" translatable="yes">_Match case</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbCase">_Match case</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -608,7 +608,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cbStartOver">
-                                <property name="label" translatable="yes">Fr_om top</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbStartOver">Fr_om top</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -624,7 +624,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cbRegular">
-                                <property name="label" translatable="yes">_Regular expression</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbRegular">_Regular expression</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -640,7 +640,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cbUseFormat">
-                                <property name="label" translatable="yes">Appl_y field format</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbUseFormat">Appl_y field format</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="GtkCheckButton" id="cbBackwards">
-                                <property name="label" translatable="yes">Search _backwards</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbBackwards">Search _backwards</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -672,7 +672,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cbWildCard">
-                                <property name="label" translatable="yes">_Wildcard expression</property>
+                                <property name="label" translatable="yes" context="fmsearchdialog|cbWildCard">_Wildcard expression</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -701,7 +701,7 @@
                   <object class="GtkLabel" id="flOptions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Settings</property>
+                    <property name="label" translatable="yes" context="fmsearchdialog|flOptions">Settings</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -737,7 +737,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Record:</property>
+                            <property name="label" translatable="yes" context="fmsearchdialog|ftRecordLabel">Record:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -748,7 +748,7 @@
                           <object class="GtkLabel" id="ftRecord">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">record count</property>
+                            <property name="label" translatable="yes" context="fmsearchdialog|ftRecord">record count</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -774,7 +774,7 @@
                   <object class="GtkLabel" id="flState">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">State</property>
+                    <property name="label" translatable="yes" context="fmsearchdialog|flState">State</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/formatcellsdialog.ui b/cui/uiconfig/ui/formatcellsdialog.ui
index 08449e34c7a5..7160a97016bc 100644
--- a/cui/uiconfig/ui/formatcellsdialog.ui
+++ b/cui/uiconfig/ui/formatcellsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FormatCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Table Properties</property>
+    <property name="title" translatable="yes" context="formatcellsdialog|FormatCellsDialog">Table Properties</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="name">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Font</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|name">Font</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="effects">
                 <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="formatcellsdialog|effects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="border">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|border">Borders</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|area">Background</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/cui/uiconfig/ui/formatnumberdialog.ui b/cui/uiconfig/ui/formatnumberdialog.ui
index 6bb47e1790ec..f0c1156772ac 100644
--- a/cui/uiconfig/ui/formatnumberdialog.ui
+++ b/cui/uiconfig/ui/formatnumberdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FormatNumberDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Format Number</property>
+    <property name="title" translatable="yes" context="formatnumberdialog|FormatNumberDialog">Format Number</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/cui/uiconfig/ui/galleryapplyprogress.ui b/cui/uiconfig/ui/galleryapplyprogress.ui
index b15952740b3e..ba572e0055f4 100644
--- a/cui/uiconfig/ui/galleryapplyprogress.ui
+++ b/cui/uiconfig/ui/galleryapplyprogress.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GalleryApplyProgress">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Apply</property>
+    <property name="title" translatable="yes" context="galleryapplyprogress|GalleryApplyProgress">Apply</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -70,7 +70,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File</property>
+                    <property name="label" translatable="yes" context="galleryapplyprogress|label2">File</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/galleryfilespage.ui b/cui/uiconfig/ui/galleryfilespage.ui
index 3c2d95fcde9f..4de695cdf261 100644
--- a/cui/uiconfig/ui/galleryfilespage.ui
+++ b/cui/uiconfig/ui/galleryfilespage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="GalleryFilesPage">
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_File type:</property>
+                <property name="label" translatable="yes" context="galleryfilespage|label1">_File type:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">filetype</property>
               </object>
@@ -74,7 +74,7 @@
             </child>
             <child internal-child="accessible">
               <object class="AtkObject" id="files:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Files Found</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="galleryfilespage|files-atkobject">Files Found</property>
               </object>
             </child>
           </object>
@@ -101,7 +101,7 @@
             <property name="row_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="preview">
-                <property name="label" translatable="yes">Pr_eview</property>
+                <property name="label" translatable="yes" context="galleryfilespage|preview">Pr_eview</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -122,7 +122,7 @@
                 <property name="vexpand">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="image:border-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="galleryfilespage|image-atkobject">Preview</property>
                   </object>
                 </child>
               </object>
@@ -146,7 +146,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="findfiles">
-                <property name="label" translatable="yes">_Find Files...</property>
+                <property name="label" translatable="yes" context="galleryfilespage|findfiles">_Find Files...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -174,7 +174,7 @@
             </child>
             <child>
               <object class="GtkButton" id="addall">
-                <property name="label" translatable="yes">A_dd All</property>
+                <property name="label" translatable="yes" context="galleryfilespage|addall">A_dd All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/gallerygeneralpage.ui b/cui/uiconfig/ui/gallerygeneralpage.ui
index 4d82153ef6d5..88a0a6b946a6 100644
--- a/cui/uiconfig/ui/gallerygeneralpage.ui
+++ b/cui/uiconfig/ui/gallerygeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="GalleryGeneralPage">
     <property name="visible">True</property>
@@ -19,7 +19,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Modified:</property>
+            <property name="label" translatable="yes" context="gallerygeneralpage|label1">Modified:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -60,7 +60,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Type:</property>
+            <property name="label" translatable="yes" context="gallerygeneralpage|label2">Type:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -87,7 +87,7 @@
             <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="gallerygeneralpage|label3">Location:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -101,7 +101,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Contents:</property>
+            <property name="label" translatable="yes" context="gallerygeneralpage|label4">Contents:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -159,7 +159,7 @@
             </accessibility>
             <child internal-child="accessible">
               <object class="AtkObject" id="image-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Theme Name</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="gallerygeneralpage|image-atkobject">Theme Name</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/gallerysearchprogress.ui b/cui/uiconfig/ui/gallerysearchprogress.ui
index 0e32e580667e..be956840d36b 100644
--- a/cui/uiconfig/ui/gallerysearchprogress.ui
+++ b/cui/uiconfig/ui/gallerysearchprogress.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GallerySearchProgress">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Find</property>
+    <property name="title" translatable="yes" context="gallerysearchprogress|GallerySearchProgress">Find</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -75,7 +75,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File Type</property>
+                    <property name="label" translatable="yes" context="gallerysearchprogress|label1">File Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -112,7 +112,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Directory</property>
+                    <property name="label" translatable="yes" context="gallerysearchprogress|label2">Directory</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/gallerythemedialog.ui b/cui/uiconfig/ui/gallerythemedialog.ui
index ed7631dfd2b8..c91a73b06fff 100644
--- a/cui/uiconfig/ui/gallerythemedialog.ui
+++ b/cui/uiconfig/ui/gallerythemedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GalleryThemeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Properties of </property>
+    <property name="title" translatable="yes" context="gallerythemedialog|GalleryThemeDialog">Properties of </property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General</property>
+                <property name="label" translatable="yes" context="gallerythemedialog|general">General</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="files">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Files</property>
+                <property name="label" translatable="yes" context="gallerythemedialog|files">Files</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/cui/uiconfig/ui/gallerythemeiddialog.ui b/cui/uiconfig/ui/gallerythemeiddialog.ui
index 3f3a36cf2e2b..f87ed9e04034 100644
--- a/cui/uiconfig/ui/gallerythemeiddialog.ui
+++ b/cui/uiconfig/ui/gallerythemeiddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GalleryThemeIDDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Theme ID</property>
+    <property name="title" translatable="yes" context="gallerythemeiddialog|GalleryThemeIDDialog">Theme ID</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -24,7 +24,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">ID:</property>
+                <property name="label" translatable="yes" context="gallerythemeiddialog|label2">ID:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
diff --git a/cui/uiconfig/ui/gallerytitledialog.ui b/cui/uiconfig/ui/gallerytitledialog.ui
index 14939f6a0c09..9f2c736b1f1a 100644
--- a/cui/uiconfig/ui/gallerytitledialog.ui
+++ b/cui/uiconfig/ui/gallerytitledialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GalleryTitleDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Enter Title</property>
+    <property name="title" translatable="yes" context="gallerytitledialog|GalleryTitleDialog">Enter Title</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -23,7 +23,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Title:</property>
+                <property name="label" translatable="yes" context="gallerytitledialog|label2">Title:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
diff --git a/cui/uiconfig/ui/galleryupdateprogress.ui b/cui/uiconfig/ui/galleryupdateprogress.ui
index 563089a0acfb..ca35ec78668f 100644
--- a/cui/uiconfig/ui/galleryupdateprogress.ui
+++ b/cui/uiconfig/ui/galleryupdateprogress.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GalleryUpdateProgress">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Update</property>
+    <property name="title" translatable="yes" context="galleryupdateprogress|GalleryUpdateProgress">Update</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -71,7 +71,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File</property>
+                    <property name="label" translatable="yes" context="galleryupdateprogress|label2">File</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 96bb4baa9d84..bca24795a82f 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -76,7 +76,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="modify">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="gradientpage|modify">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -103,7 +103,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Gradient</property>
+            <property name="label" translatable="yes" context="gradientpage|label1">Gradient</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -147,7 +147,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Type:</property>
+                        <property name="label" translatable="yes" context="gradientpage|typeft">_Type:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -161,12 +161,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Linear</item>
-                          <item translatable="yes">Axial</item>
-                          <item translatable="yes">Radial</item>
-                          <item translatable="yes">Ellipsoid</item>
-                          <item translatable="yes">Quadratic</item>
-                          <item translatable="yes">Square</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Linear</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Axial</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Radial</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Ellipsoid</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Quadratic</item>
+                          <item translatable="yes" context="gradientpage|gradienttypelb">Square</item>
                         </items>
                       </object>
                       <packing>
@@ -195,7 +195,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.43999999761581421</property>
-                        <property name="label" translatable="yes">Increment:</property>
+                        <property name="label" translatable="yes" context="gradientpage|incrementft">Increment:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -235,7 +235,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="autoincrement">
-                        <property name="label" translatable="yes">Automatic</property>
+                        <property name="label" translatable="yes" context="gradientpage|autoincrement">Automatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -275,7 +275,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.43999999761581421</property>
-                        <property name="label" translatable="yes">A_ngle:</property>
+                        <property name="label" translatable="yes" context="gradientpage|angleft">A_ngle:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -305,7 +305,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.43999999761581421</property>
-                        <property name="label" translatable="yes">Center ( X / Y ) :</property>
+                        <property name="label" translatable="yes" context="gradientpage|centerft">Center ( X / Y ) :</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -377,7 +377,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0.43999999761581421</property>
-                        <property name="label" translatable="yes">_Border:</property>
+                        <property name="label" translatable="yes" context="gradientpage|borderft">_Border:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -439,7 +439,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_From:</property>
+                        <property name="label" translatable="yes" context="gradientpage|colorfromft">_From:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -529,7 +529,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_To:</property>
+                        <property name="label" translatable="yes" context="gradientpage|colortoft">_To:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -557,7 +557,7 @@
           <object class="GtkLabel" id="propfl">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="gradientpage|propfl">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -601,7 +601,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="previewctl-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="gradientpage|previewctl-atkobject">Example</property>
                           </object>
                         </child>
                       </object>
@@ -619,7 +619,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="gradientpage|label2">Preview</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hangulhanjaadddialog.ui b/cui/uiconfig/ui/hangulhanjaadddialog.ui
index 9616774a5584..750b8d27a41d 100644
--- a/cui/uiconfig/ui/hangulhanjaadddialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaadddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="HangulHanjaAddDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Dictionary</property>
+    <property name="title" translatable="yes" context="hangulhanjaadddialog|HangulHanjaAddDialog">New Dictionary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -94,7 +94,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Name:</property>
+                        <property name="label" translatable="yes" context="hangulhanjaadddialog|label2">_Name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entry</property>
                       </object>
@@ -126,7 +126,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Dictionary</property>
+                <property name="label" translatable="yes" context="hangulhanjaadddialog|label1">Dictionary</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
index e48423bed503..5122a861bdf4 100644
--- a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="HangulHanjaConversionDialog">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Hangul/Hanja Conversion</property>
+    <property name="title" translatable="yes" context="hangulhanjaconversiondialog|HangulHanjaConversionDialog">Hangul/Hanja Conversion</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -93,7 +93,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">28</property>
-                        <property name="label" translatable="yes">Original</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|label1">Original</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -129,7 +129,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">42</property>
-                        <property name="label" translatable="yes">Word</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|label3">Word</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -150,7 +150,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="find">
-                        <property name="label" translatable="yes">_Find</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|find">_Find</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -178,7 +178,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Suggestions</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|label4">Suggestions</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -216,7 +216,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">28</property>
-                        <property name="label" translatable="yes">Format</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|label5">Format</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -226,7 +226,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="simpleconversion">
-                        <property name="label" translatable="yes">_Hangul/Hanja</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|simpleconversion">_Hangul/Hanja</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -244,7 +244,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="hangulbracket">
-                        <property name="label" translatable="yes">Hanja (Han_gul)</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hangulbracket">Hanja (Han_gul)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -261,7 +261,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="hanjabracket">
-                        <property name="label" translatable="yes">Hang_ul (Hanja)</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hanjabracket">Hang_ul (Hanja)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -292,7 +292,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="cuilo-RubyRadioButton" id="hanja_above:border">
-                        <property name="label" translatable="yes">Hanja</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hanja_above">Hanja</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -309,7 +309,7 @@
                     </child>
                     <child>
                       <object class="cuilo-RubyRadioButton" id="hanja_below:border">
-                        <property name="label" translatable="yes">Hanja</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hanja_below">Hanja</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -325,7 +325,7 @@
                     </child>
                     <child>
                       <object class="cuilo-RubyRadioButton" id="hangul_above:border">
-                        <property name="label" translatable="yes">Hangul</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hangul_above">Hangul</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -341,7 +341,7 @@
                     </child>
                     <child>
                       <object class="cuilo-RubyRadioButton" id="hangul_below:border">
-                        <property name="label" translatable="yes">Hangul</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hangul_below">Hangul</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -372,7 +372,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Conversion</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|label6">Conversion</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -382,7 +382,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hangulonly">
-                        <property name="label" translatable="yes">Hangul _only</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hangulonly">Hangul _only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -399,7 +399,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hanjaonly">
-                        <property name="label" translatable="yes">Hanja onl_y</property>
+                        <property name="label" translatable="yes" context="hangulhanjaconversiondialog|hanjaonly">Hanja onl_y</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -437,7 +437,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="ignore">
-                    <property name="label" translatable="yes">_Ignore</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|ignore">_Ignore</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -453,7 +453,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="ignoreall">
-                    <property name="label" translatable="yes">Always I_gnore</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|ignoreall">Always I_gnore</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -467,7 +467,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="replace">
-                    <property name="label" translatable="yes">_Replace</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|replace">_Replace</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -481,7 +481,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="replaceall">
-                    <property name="label" translatable="yes">Always R_eplace</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|replaceall">Always R_eplace</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -498,7 +498,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="replacebychar">
-                    <property name="label" translatable="yes">Replace b_y character</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|replacebychar">Replace b_y character</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -514,7 +514,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="options">
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="hangulhanjaconversiondialog|options">Options</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
index b0bfd2c3417d..163f25cd5276 100644
--- a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="HangulHanjaEditDictDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Custom Dictionary</property>
+    <property name="title" translatable="yes" context="hangulhanjaeditdictdialog|HangulHanjaEditDictDialog">Edit Custom Dictionary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -104,7 +104,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Book</property>
+                    <property name="label" translatable="yes" context="hangulhanjaeditdictdialog|label4">Book</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">book</property>
                     <attributes>
@@ -210,7 +210,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Original</property>
+                    <property name="label" translatable="yes" context="hangulhanjaeditdictdialog|label2">Original</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -323,7 +323,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Suggestions</property>
+                    <property name="label" translatable="yes" context="hangulhanjaeditdictdialog|label3">Suggestions</property>
                     <property name="use_underline">True</property>
                     <property name="ellipsize">end</property>
                     <attributes>
diff --git a/cui/uiconfig/ui/hangulhanjaoptdialog.ui b/cui/uiconfig/ui/hangulhanjaoptdialog.ui
index cd07cf864400..b658a9b7ee3a 100644
--- a/cui/uiconfig/ui/hangulhanjaoptdialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaoptdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="HangulHanjaOptDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Hangul/Hanja Options</property>
+    <property name="title" translatable="yes" context="hangulhanjaoptdialog|HangulHanjaOptDialog">Hangul/Hanja Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -104,7 +104,7 @@
                             <property name="layout_style">start</property>
                             <child>
                               <object class="GtkButton" id="new">
-                                <property name="label" translatable="yes">New...</property>
+                                <property name="label" translatable="yes" context="hangulhanjaoptdialog|new">New...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -118,7 +118,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="edit">
-                                <property name="label" translatable="yes">Edit...</property>
+                                <property name="label" translatable="yes" context="hangulhanjaoptdialog|edit">Edit...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -169,7 +169,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">User-defined Dictionaries</property>
+                    <property name="label" translatable="yes" context="hangulhanjaoptdialog|label1">User-defined Dictionaries</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -200,7 +200,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="ignorepost">
-                            <property name="label" translatable="yes">Ignore post-positional word</property>
+                            <property name="label" translatable="yes" context="hangulhanjaoptdialog|ignorepost">Ignore post-positional word</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -215,7 +215,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="showrecentfirst">
-                            <property name="label" translatable="yes">Show recently used entries first</property>
+                            <property name="label" translatable="yes" context="hangulhanjaoptdialog|showrecentfirst">Show recently used entries first</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -229,7 +229,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="autoreplaceunique">
-                            <property name="label" translatable="yes">Replace all unique entries automatically</property>
+                            <property name="label" translatable="yes" context="hangulhanjaoptdialog|autoreplaceunique">Replace all unique entries automatically</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -249,7 +249,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="hangulhanjaoptdialog|label2">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui
index 365ce1ba5927..1ecd4111f8aa 100644
--- a/cui/uiconfig/ui/hatchpage.ui
+++ b/cui/uiconfig/ui/hatchpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -78,7 +78,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="modify">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="hatchpage|modify">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -105,7 +105,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Hatch</property>
+            <property name="label" translatable="yes" context="hatchpage|label2">Hatch</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -145,7 +145,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Spacing:</property>
+                    <property name="label" translatable="yes" context="hatchpage|distanceft">_Spacing:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -172,7 +172,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">A_ngle:</property>
+                    <property name="label" translatable="yes" context="hatchpage|angleft">A_ngle:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -226,7 +226,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Line type:</property>
+                    <property name="label" translatable="yes" context="hatchpage|linetypeft">_Line type:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -240,9 +240,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Single</item>
-                      <item translatable="yes">Crossed</item>
-                      <item translatable="yes">Triple</item>
+                      <item translatable="yes" context="hatchpage|linetypelb">Single</item>
+                      <item translatable="yes" context="hatchpage|linetypelb">Crossed</item>
+                      <item translatable="yes" context="hatchpage|linetypelb">Triple</item>
                     </items>
                   </object>
                   <packing>
@@ -256,7 +256,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Line _color:</property>
+                    <property name="label" translatable="yes" context="hatchpage|linecolorft">Line _color:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -278,7 +278,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="backgroundcolor">
-                    <property name="label" translatable="yes">Background Color</property>
+                    <property name="label" translatable="yes" context="hatchpage|backgroundcolor">Background Color</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -310,7 +310,7 @@
           <object class="GtkLabel" id="propfl">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="hatchpage|propfl">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -354,7 +354,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="previewctl-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="hatchpage|previewctl-atkobject">Example</property>
                           </object>
                         </child>
                       </object>
@@ -372,7 +372,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Preview</property>
+            <property name="label" translatable="yes" context="hatchpage|label1">Preview</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui
index 4ebf47e7217d..28a4731bb8aa 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="HyperlinkDialog">
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Hyperlink</property>
+    <property name="title" translatable="yes" context="hyperlinkdialog|HyperlinkDialog">Hyperlink</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -39,7 +39,7 @@
             </child>
             <child>
               <object class="GtkButton" id="apply">
-                <property name="label" translatable="yes">Apply</property>
+                <property name="label" translatable="yes" context="hyperlinkdialog|apply">Apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -81,7 +81,7 @@
             </child>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label" translatable="yes">Reset</property>
+                <property name="label" translatable="yes" context="hyperlinkdialog|reset">Reset</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui
index d5703a303e75..1273adb78da0 100644
--- a/cui/uiconfig/ui/hyperlinkdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinkdocpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="HyperlinkDocPage">
@@ -36,7 +36,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Path:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|path_label">_Path:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">path</property>
                   </object>
@@ -59,12 +59,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="fileopen">
-                    <property name="label" translatable="yes">Open File</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|fileopen">Open File</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Open File</property>
+                    <property name="tooltip_text" translatable="yes" context="hyperlinkdocpage|fileopen|tooltip_text">Open File</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -79,7 +79,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Document</property>
+            <property name="label" translatable="yes" context="hyperlinkdocpage|label2">Document</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -116,7 +116,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Targ_et:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|target_label">Targ_et:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target</property>
                   </object>
@@ -131,7 +131,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">URL:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|url_label">URL:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -141,12 +141,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse">
-                    <property name="label" translatable="yes">Target in Document</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|browse">Target in Document</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Target in Document</property>
+                    <property name="tooltip_text" translatable="yes" context="hyperlinkdocpage|browse|tooltip_text">Target in Document</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -170,7 +170,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Test text</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|url">Test text</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -188,7 +188,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Target in Document</property>
+            <property name="label" translatable="yes" context="hyperlinkdocpage|label3">Target in Document</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -227,7 +227,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_rame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|frame_label">F_rame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frame</property>
                   </object>
@@ -242,7 +242,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Te_xt:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|indication_label">Te_xt:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">indication</property>
                   </object>
@@ -257,7 +257,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">N_ame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkdocpage|name_label">N_ame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
@@ -300,7 +300,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">F_orm:</property>
+                        <property name="label" translatable="yes" context="hyperlinkdocpage|form_label">F_orm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">form</property>
                       </object>
@@ -326,7 +326,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Events</property>
+                        <property name="tooltip_text" translatable="yes" context="hyperlinkdocpage|script|tooltip_text">Events</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -364,7 +364,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Further Settings</property>
+            <property name="label" translatable="yes" context="hyperlinkdocpage|label1">Further Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index 047799f89008..81397aa6989b 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="HyperlinkInternetPage">
@@ -39,7 +39,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="linktyp_internet">
-                        <property name="label" translatable="yes">_Web</property>
+                        <property name="label" translatable="yes" context="hyperlinkinternetpage|linktyp_internet">_Web</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -56,7 +56,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="linktyp_ftp">
-                        <property name="label" translatable="yes">_FTP</property>
+                        <property name="label" translatable="yes" context="hyperlinkinternetpage|linktyp_ftp">_FTP</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_URL:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|target_label">_URL:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target</property>
                     <property name="xalign">0</property>
@@ -110,7 +110,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Login name:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|login_label">_Login name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">login</property>
                     <property name="xalign">0</property>
@@ -125,7 +125,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Password:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|password_label">_Password:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">password</property>
                     <property name="xalign">0</property>
@@ -161,7 +161,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="anonymous">
-                    <property name="label" translatable="yes">Anonymous _user</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|anonymous">Anonymous _user</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -189,7 +189,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Hyperlink Type</property>
+            <property name="label" translatable="yes" context="hyperlinkinternetpage|label2">Hyperlink Type</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -227,7 +227,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">F_rame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|frame_label">F_rame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frame</property>
                     <property name="xalign">0</property>
@@ -242,7 +242,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Te_xt:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|indication_label">Te_xt:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">indication</property>
                     <property name="xalign">0</property>
@@ -257,7 +257,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">N_ame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkinternetpage|name_label">N_ame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                     <property name="xalign">0</property>
@@ -300,7 +300,7 @@
                       <object class="GtkLabel" id="form_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">F_orm:</property>
+                        <property name="label" translatable="yes" context="hyperlinkinternetpage|form_label">F_orm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">form</property>
                         <property name="xalign">0</property>
@@ -327,7 +327,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Events</property>
+                        <property name="tooltip_text" translatable="yes" context="hyperlinkinternetpage|script|tooltip_text">Events</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -365,7 +365,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Further Settings</property>
+            <property name="label" translatable="yes" context="hyperlinkinternetpage|label1">Further Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui
index 9496365518d4..14a60c70825f 100644
--- a/cui/uiconfig/ui/hyperlinkmailpage.ui
+++ b/cui/uiconfig/ui/hyperlinkmailpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="HyperlinkMailPage">
@@ -36,7 +36,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Re_cipient:</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|receiver_label">Re_cipient:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">receiver</property>
                   </object>
@@ -59,12 +59,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="adressbook">
-                    <property name="label" translatable="yes">Data Sources…</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|adressbook">Data Sources…</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Data Sources...</property>
+                    <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|adressbook|tooltip_text">Data Sources...</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -78,7 +78,7 @@
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
                     <property name="ypad">1</property>
-                    <property name="label" translatable="yes">_Subject:</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|subject_label">_Subject:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">subject</property>
                   </object>
@@ -116,7 +116,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Mail</property>
+            <property name="label" translatable="yes" context="hyperlinkmailpage|label2">Mail</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -155,7 +155,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_rame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|frame_label">F_rame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frame</property>
                   </object>
@@ -170,7 +170,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Te_xt:</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|indication_label">Te_xt:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">indication</property>
                   </object>
@@ -185,7 +185,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">N_ame:</property>
+                    <property name="label" translatable="yes" context="hyperlinkmailpage|name_label">N_ame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
@@ -228,7 +228,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">F_orm:</property>
+                        <property name="label" translatable="yes" context="hyperlinkmailpage|form_label">F_orm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">form</property>
                       </object>
@@ -254,7 +254,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Events</property>
+                        <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|script|tooltip_text">Events</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -292,7 +292,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Further Settings</property>
+            <property name="label" translatable="yes" context="hyperlinkmailpage|label1">Further Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hyperlinkmarkdialog.ui b/cui/uiconfig/ui/hyperlinkmarkdialog.ui
index 56c97aeb671e..2ded667f1384 100644
--- a/cui/uiconfig/ui/hyperlinkmarkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkmarkdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="HyperlinkMark">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Target in Document</property>
+    <property name="title" translatable="yes" context="hyperlinkmarkdialog|HyperlinkMark">Target in Document</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="apply">
-                <property name="label" translatable="yes">_Apply</property>
+                <property name="label" translatable="yes" context="hyperlinkmarkdialog|apply">_Apply</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label" translatable="yes">_Close</property>
+                <property name="label" translatable="yes" context="hyperlinkmarkdialog|close">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -69,7 +69,7 @@
             </child>
             <child internal-child="accessible">
               <object class="AtkObject" id="TreeListBox:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Mark Tree</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="hyperlinkmarkdialog|TreeListBox-atkobject">Mark Tree</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui
index 39f06f972168..e762e0e1cc2b 100644
--- a/cui/uiconfig/ui/hyperlinknewdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="HyperlinkNewDocPage">
@@ -41,7 +41,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="editnow">
-                        <property name="label" translatable="yes">Edit _now</property>
+                        <property name="label" translatable="yes" context="hyperlinknewdocpage|editnow">Edit _now</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -58,7 +58,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="editlater">
-                        <property name="label" translatable="yes">Edit _later</property>
+                        <property name="label" translatable="yes" context="hyperlinknewdocpage|editlater">Edit _later</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -86,7 +86,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_File:</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|file_label">_File:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">path</property>
                   </object>
@@ -109,12 +109,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="create">
-                    <property name="label" translatable="yes">Select Path</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|create">Select Path</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Select Path</property>
+                    <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|create|tooltip_text">Select Path</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -129,7 +129,7 @@
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                     <property name="ypad">1</property>
-                    <property name="label" translatable="yes">File _type:</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|types_label">File _type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">types:border</property>
                   </object>
@@ -169,7 +169,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">New Document</property>
+            <property name="label" translatable="yes" context="hyperlinknewdocpage|label2">New Document</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -208,7 +208,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_rame:</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|frame_label">F_rame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frame</property>
                   </object>
@@ -223,7 +223,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Te_xt:</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|indication_label">Te_xt:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">indication</property>
                   </object>
@@ -238,7 +238,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">N_ame:</property>
+                    <property name="label" translatable="yes" context="hyperlinknewdocpage|name_label">N_ame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
@@ -280,7 +280,7 @@
                       <object class="GtkLabel" id="form_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">F_orm:</property>
+                        <property name="label" translatable="yes" context="hyperlinknewdocpage|form_label">F_orm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">form</property>
                       </object>
@@ -306,7 +306,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Events</property>
+                        <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|script|tooltip_text">Events</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -344,7 +344,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Further Settings</property>
+            <property name="label" translatable="yes" context="hyperlinknewdocpage|label1">Further Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui
index 3239594886d3..3db83fd262e3 100644
--- a/cui/uiconfig/ui/hyphenate.ui
+++ b/cui/uiconfig/ui/hyphenate.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -16,7 +16,7 @@
   <object class="GtkDialog" id="HyphenateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Hyphenation</property>
+    <property name="title" translatable="yes" context="hyphenate|HyphenateDialog">Hyphenation</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -45,7 +45,7 @@
             </child>
             <child>
               <object class="GtkButton" id="hyphall">
-                <property name="label" translatable="yes">Hyphenate All</property>
+                <property name="label" translatable="yes" context="hyphenate|hyphall">Hyphenate All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -95,7 +95,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="ok">
-                    <property name="label" translatable="yes">Hyphenate</property>
+                    <property name="label" translatable="yes" context="hyphenate|ok">Hyphenate</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_default">True</property>
@@ -109,7 +109,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="continue">
-                    <property name="label" translatable="yes">Skip</property>
+                    <property name="label" translatable="yes" context="hyphenate|continue">Skip</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -145,7 +145,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Word:</property>
+                <property name="label" translatable="yes" context="hyphenate|label1">Word:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/iconchangedialog.ui b/cui/uiconfig/ui/iconchangedialog.ui
index 8cad637912e9..4cb96211834b 100644
--- a/cui/uiconfig/ui/iconchangedialog.ui
+++ b/cui/uiconfig/ui/iconchangedialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="IconChange">
     <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">%PRODUCTNAME %PRODUCTVERSION</property>
+    <property name="title" translatable="yes" context="iconchangedialog|IconChange">%PRODUCTNAME %PRODUCTVERSION</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -72,7 +72,7 @@
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">The files listed below could not be imported.
+                <property name="label" translatable="yes" context="iconchangedialog|label1">The files listed below could not be imported.
 The file format could not be interpreted.</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui
index 498e42ad3322..2b7e21f49eb0 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="IconSelector">
     <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">Change Icon</property>
+    <property name="title" translatable="yes" context="iconselectordialog|IconSelector">Change Icon</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -122,7 +122,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Icons</property>
+                        <property name="label" translatable="yes" context="iconselectordialog|label1">_Icons</property>
                         <property name="use_underline">True</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -145,7 +145,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="importButton">
-                        <property name="label" translatable="yes">I_mport...</property>
+                        <property name="label" translatable="yes" context="iconselectordialog|importButton">I_mport...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -160,7 +160,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="deleteButton">
-                        <property name="label" translatable="yes">_Delete...</property>
+                        <property name="label" translatable="yes" context="iconselectordialog|deleteButton">_Delete...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -194,7 +194,7 @@
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note:
+                <property name="label" translatable="yes" context="iconselectordialog|noteLabel">Note:
 The size of an icon should be 16x16 pixel to achieve best quality.
 Different sized icons will be scaled automatically.</property>
                 <property name="wrap">True</property>
diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui
index b2b617971347..fdc3e87aa74e 100644
--- a/cui/uiconfig/ui/insertfloatingframe.ui
+++ b/cui/uiconfig/ui/insertfloatingframe.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">99</property>
@@ -10,7 +10,7 @@
   <object class="GtkDialog" id="InsertFloatingFrameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Floating Frame Properties</property>
+    <property name="title" translatable="yes" context="insertfloatingframe|InsertFloatingFrameDialog">Floating Frame Properties</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -62,7 +62,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="margin_right">12</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="insertfloatingframe|label6">Name:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -75,7 +75,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="margin_right">12</property>
-                    <property name="label" translatable="yes">Contents:</property>
+                    <property name="label" translatable="yes" context="insertfloatingframe|label7">Contents:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -84,7 +84,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="buttonbrowse">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes" context="insertfloatingframe|buttonbrowse">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="scrollbaron">
-                                <property name="label" translatable="yes">On</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|scrollbaron">On</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="scrollbaroff">
-                                <property name="label" translatable="yes">Off</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|scrollbaroff">Off</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="scrollbarauto">
-                                <property name="label" translatable="yes">Automatic</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|scrollbarauto">Automatic</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -182,7 +182,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Scroll Bar</property>
+                        <property name="label" translatable="yes" context="insertfloatingframe|label1">Scroll Bar</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -215,7 +215,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="borderon">
-                                <property name="label" translatable="yes">On</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|borderon">On</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -232,7 +232,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="borderoff">
-                                <property name="label" translatable="yes">Off</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|borderoff">Off</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -257,7 +257,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Border</property>
+                        <property name="label" translatable="yes" context="insertfloatingframe|label2">Border</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -294,7 +294,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="margin_right">12</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Width:</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|widthlabel">Width:</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -307,7 +307,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="margin_right">12</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Height:</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|heightlabel">Height:</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -342,7 +342,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="defaultwidth">
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|defaultwidth">Default</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -356,7 +356,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="defaultheight">
-                                <property name="label" translatable="yes">Default</property>
+                                <property name="label" translatable="yes" context="insertfloatingframe|defaultheight">Default</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -376,7 +376,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Spacing to Contents</property>
+                        <property name="label" translatable="yes" context="insertfloatingframe|label3">Spacing to Contents</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui
index 1aaeecb9319a..a10b6e6c0375 100644
--- a/cui/uiconfig/ui/insertoleobject.ui
+++ b/cui/uiconfig/ui/insertoleobject.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertOLEObjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert OLE Object</property>
+    <property name="title" translatable="yes" context="insertoleobject|InsertOLEObjectDialog">Insert OLE Object</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -83,7 +83,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkRadioButton" id="createnew">
-                    <property name="label" translatable="yes">Create new</property>
+                    <property name="label" translatable="yes" context="insertoleobject|createnew">Create new</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -99,7 +99,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="createfromfile">
-                    <property name="label" translatable="yes">Create from file</property>
+                    <property name="label" translatable="yes" context="insertoleobject|createfromfile">Create from file</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -148,7 +148,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Object Type</property>
+                    <property name="label" translatable="yes" context="insertoleobject|label1">Object Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -194,7 +194,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="urlbtn">
-                            <property name="label" translatable="yes">Search…</property>
+                            <property name="label" translatable="yes" context="insertoleobject|urlbtn">Search…</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -207,7 +207,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="linktofile">
-                            <property name="label" translatable="yes">Link to file</property>
+                            <property name="label" translatable="yes" context="insertoleobject|linktofile">Link to file</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="asicon">
-                            <property name="label" translatable="yes">Display as icon</property>
+                            <property name="label" translatable="yes" context="insertoleobject|asicon">Display as icon</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -242,7 +242,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File</property>
+                    <property name="label" translatable="yes" context="insertoleobject|label2">File</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/insertrowcolumn.ui b/cui/uiconfig/ui/insertrowcolumn.ui
index d2d06dabee29..9ac093790916 100644
--- a/cui/uiconfig/ui/insertrowcolumn.ui
+++ b/cui/uiconfig/ui/insertrowcolumn.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="InsertRowColumnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Row</property>
+    <property name="title" translatable="yes" context="insertrowcolumn|InsertRowColumnDialog">Insert Row</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -103,7 +103,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Number:</property>
+                            <property name="label" translatable="yes" context="insertrowcolumn|label3">_Number:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">insert_number</property>
                           </object>
@@ -135,7 +135,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes" context="insertrowcolumn|label1">Insert</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -166,7 +166,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="insert_before">
-                            <property name="label" translatable="yes">_Before</property>
+                            <property name="label" translatable="yes" context="insertrowcolumn|insert_before">_Before</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -184,7 +184,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="insert_after">
-                            <property name="label" translatable="yes">A_fter</property>
+                            <property name="label" translatable="yes" context="insertrowcolumn|insert_after">A_fter</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="insertrowcolumn|label2">Position</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/javaclasspathdialog.ui b/cui/uiconfig/ui/javaclasspathdialog.ui
index a15c48bb23a0..d4b9689cda7c 100644
--- a/cui/uiconfig/ui/javaclasspathdialog.ui
+++ b/cui/uiconfig/ui/javaclasspathdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="JavaClassPath">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Class Path</property>
+    <property name="title" translatable="yes" context="javaclasspathdialog|JavaClassPath">Class Path</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">A_ssigned folders and archives</property>
+                    <property name="label" translatable="yes" context="javaclasspathdialog|label1">A_ssigned folders and archives</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">paths:border</property>
                   </object>
@@ -141,7 +141,7 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkButton" id="archive">
-                    <property name="label" translatable="yes">_Add Archive...</property>
+                    <property name="label" translatable="yes" context="javaclasspathdialog|archive">_Add Archive...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -155,7 +155,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="folder">
-                    <property name="label" translatable="yes">Add _Folder</property>
+                    <property name="label" translatable="yes" context="javaclasspathdialog|folder">Add _Folder</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -169,7 +169,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="remove">
-                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="label" translatable="yes" context="javaclasspathdialog|remove">_Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui b/cui/uiconfig/ui/javastartparametersdialog.ui
index bba3f96c4607..b8aa224c4558 100644
--- a/cui/uiconfig/ui/javastartparametersdialog.ui
+++ b/cui/uiconfig/ui/javastartparametersdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="JavaStartParameters">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Java Start Parameters</property>
+    <property name="title" translatable="yes" context="javastartparametersdialog|JavaStartParameters">Java Start Parameters</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -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">Java start _parameter</property>
+                    <property name="label" translatable="yes" context="javastartparametersdialog|label4">Java start _parameter</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">parameterfield</property>
                   </object>
@@ -117,7 +117,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Assig_ned start parameters</property>
+                    <property name="label" translatable="yes" context="javastartparametersdialog|label5">Assig_ned start parameters</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">assignlist:border</property>
                   </object>
@@ -156,7 +156,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">For example: -Dmyprop=c:\\program files\\java</property>
+                    <property name="label" translatable="yes" context="javastartparametersdialog|label6">For example: -Dmyprop=c:\\program files\\java</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -165,7 +165,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="assignbtn">
-                    <property name="label" translatable="yes">_Add</property>
+                    <property name="label" translatable="yes" context="javastartparametersdialog|assignbtn">_Add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -185,7 +185,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkButton" id="editbtn">
-                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="label" translatable="yes" context="javastartparametersdialog|editbtn">_Edit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -200,7 +200,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="removebtn">
-                        <property name="label" translatable="yes">_Remove</property>
+                        <property name="label" translatable="yes" context="javastartparametersdialog|removebtn">_Remove</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/linedialog.ui b/cui/uiconfig/ui/linedialog.ui
index 1df67bd19774..f834c37a1847 100644
--- a/cui/uiconfig/ui/linedialog.ui
+++ b/cui/uiconfig/ui/linedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LineDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Line</property>
+    <property name="title" translatable="yes" context="linedialog|LineDialog">Line</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_LINE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINE">Line</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SHADOW">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shadow</property>
+                <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_SHADOW">Shadow</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_LINE_DEF">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line Styles</property>
+                <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINE_DEF">Line Styles</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_LINEEND_DEF">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Arrow Styles</property>
+                <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINEEND_DEF">Arrow Styles</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui
index 00bcec8e924f..cda3a5af7438 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkFrame" id="LineEndPage">
@@ -46,7 +46,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Title:</property>
+                        <property name="label" translatable="yes" context="lineendstabpage|FT_TITLE">_Title:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">EDT_NAME</property>
                       </object>
@@ -62,7 +62,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Arrow _style:</property>
+                        <property name="label" translatable="yes" context="lineendstabpage|FT_LINE_END_STYLE">Arrow _style:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -108,7 +108,7 @@
                         <property name="valign">end</property>
                         <property name="vexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Add a selected object to create new arrow styles.</property>
+                        <property name="label" translatable="yes" context="lineendstabpage|FI_TIP">Add a selected object to create new arrow styles.</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -149,7 +149,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="BTN_MODIFY">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="lineendstabpage|BTN_MODIFY">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
@@ -187,7 +187,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Load arrow styles</property>
+                            <property name="tooltip_text" translatable="yes" context="lineendstabpage|BTN_LOAD|tooltip_text">Load arrow styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image1</property>
@@ -205,7 +205,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Save arrow styles</property>
+                            <property name="tooltip_text" translatable="yes" context="lineendstabpage|BTN_SAVE|tooltip_text">Save arrow styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image2</property>
@@ -273,7 +273,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Organize Arrow Styles</property>
+        <property name="label" translatable="yes" context="lineendstabpage|label1">Organize Arrow Styles</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui
index ee3e2b5029b3..4eb56a19fba0 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustmentDIST">
@@ -31,11 +31,11 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Dots</col>
+        <col id="0" translatable="yes" context="linestyletabpage|liststoreTYPE">Dots</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Dash</col>
+        <col id="0" translatable="yes" context="linestyletabpage|liststoreTYPE">Dash</col>
         <col id="1">0</col>
       </row>
     </data>
@@ -89,7 +89,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Line _style:</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|FT_LINESTYLE">Line _style:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -127,7 +127,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Type:</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|FT_TYPE">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_TYPE_1</property>
                           </object>
@@ -143,7 +143,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Number:</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|FT_NUMBER">_Number:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">NUM_FLD_1</property>
                           </object>
@@ -159,7 +159,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Length:</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|FT_LENGTH">_Length:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0.00cm</property>
                           </object>
@@ -175,7 +175,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Spacing:</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|FT_DISTANCE">_Spacing:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_FLD_DISTANCE:0.00cm</property>
                           </object>
@@ -188,7 +188,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CBX_SYNCHRONIZE">
-                            <property name="label" translatable="yes">_Fit to line width</property>
+                            <property name="label" translatable="yes" context="linestyletabpage|CBX_SYNCHRONIZE">_Fit to line width</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -351,7 +351,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="BTN_MODIFY">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="linestyletabpage|BTN_MODIFY">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
@@ -389,7 +389,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Load Line Styles</property>
+                            <property name="tooltip_text" translatable="yes" context="linestyletabpage|BTN_LOAD|tooltip_text">Load Line Styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image1</property>
@@ -407,7 +407,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Save Line Styles</property>
+                            <property name="tooltip_text" translatable="yes" context="linestyletabpage|BTN_SAVE|tooltip_text">Save Line Styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image2</property>
@@ -462,7 +462,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Properties</property>
+        <property name="label" translatable="yes" context="linestyletabpage|label1">Properties</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index 26dd4db2b166..9b7893219710 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentPERCENT">
@@ -27,15 +27,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Flat</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Flat</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Round</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Round</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Square</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Square</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -49,19 +49,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Rounded</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Rounded</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">- none -</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">- none -</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Mitered</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Mitered</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Beveled</col>
+        <col id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Beveled</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -106,7 +106,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Style:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_LINE_STYLE">_Style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_LINE_STYLE</property>
                           </object>
@@ -145,7 +145,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Colo_r:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_COLOR">Colo_r:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_COLOR</property>
                           </object>
@@ -183,7 +183,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Width:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_LINE_WIDTH">_Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_FLD_LINE_WIDTH:0cm</property>
                           </object>
@@ -225,7 +225,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Transparency:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_TRANSPARENT">_Transparency:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_LINE_TRANSPARENT:0%</property>
                           </object>
@@ -264,7 +264,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line Properties</property>
+                <property name="label" translatable="yes" context="linetabpage|label1">Line Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -312,7 +312,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Start st_yle:</property>
+                                <property name="label" translatable="yes" context="linetabpage|FT_LINE_ENDS_STYLE">Start st_yle:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_START_STYLE</property>
                               </object>
@@ -352,7 +352,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">End sty_le:</property>
+                                <property name="label" translatable="yes" context="linetabpage|label5">End sty_le:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">LB_END_STYLE</property>
                               </object>
@@ -374,7 +374,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Wi_dth:</property>
+                                    <property name="label" translatable="yes" context="linetabpage|FT_LINE_START_WIDTH">Wi_dth:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">MTR_FLD_START_WIDTH:0cm</property>
                                   </object>
@@ -401,7 +401,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="TSB_CENTER_START">
-                                    <property name="label" translatable="yes">Ce_nter</property>
+                                    <property name="label" translatable="yes" context="linetabpage|TSB_CENTER_START">Ce_nter</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="receives_default">False</property>
@@ -435,7 +435,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">W_idth:</property>
+                                    <property name="label" translatable="yes" context="linetabpage|FT_LINE_END_WIDTH">W_idth:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">MTR_FLD_END_WIDTH:0cm</property>
                                   </object>
@@ -462,7 +462,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="TSB_CENTER_END">
-                                    <property name="label" translatable="yes">C_enter</property>
+                                    <property name="label" translatable="yes" context="linetabpage|TSB_CENTER_END">C_enter</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="receives_default">False</property>
@@ -494,7 +494,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CBX_SYNCHRONIZE">
-                            <property name="label" translatable="yes">Synchroni_ze ends</property>
+                            <property name="label" translatable="yes" context="linetabpage|CBX_SYNCHRONIZE">Synchroni_ze ends</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -516,7 +516,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Arrow Styles</property>
+                    <property name="label" translatable="yes" context="linetabpage|label2">Arrow Styles</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -552,7 +552,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Corner style:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_EDGE_STYLE">_Corner style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_EDGE_STYLE</property>
                           </object>
@@ -568,7 +568,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Ca_p style:</property>
+                            <property name="label" translatable="yes" context="linetabpage|FT_CAP_STYLE">Ca_p style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_CAP_STYLE</property>
                           </object>
@@ -613,7 +613,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Corner and Cap Styles</property>
+                    <property name="label" translatable="yes" context="linetabpage|label3">Corner and Cap Styles</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -646,7 +646,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkButton" id="MB_SYMBOL_BITMAP:menuSELECT">
-                            <property name="label" translatable="yes">Select...</property>
+                            <property name="label" translatable="yes" context="linetabpage|MB_SYMBOL_BITMAP">Select...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">True</property>
@@ -668,7 +668,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Widt_h:</property>
+                                <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_WIDTH">Widt_h:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">MF_SYMBOL_WIDTH:0cm</property>
                               </object>
@@ -696,7 +696,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="CB_SYMBOL_RATIO">
-                                <property name="label" translatable="yes">_Keep ratio</property>
+                                <property name="label" translatable="yes" context="linetabpage|CB_SYMBOL_RATIO">_Keep ratio</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -716,7 +716,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Hei_ght:</property>
+                                <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_HEIGHT">Hei_ght:</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -756,7 +756,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Icon</property>
+                    <property name="label" translatable="yes" context="linetabpage|label4">Icon</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -795,7 +795,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="CTL_PREVIEW:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="linetabpage|CTL_PREVIEW-atkobject">Example</property>
               </object>
             </child>
           </object>
@@ -821,7 +821,7 @@
       <object class="GtkMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_No Symbol</property>
+        <property name="label" translatable="yes" context="linetabpage|menuitem1">_No Symbol</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -829,7 +829,7 @@
       <object class="GtkMenuItem" id="menuitem2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Automatic</property>
+        <property name="label" translatable="yes" context="linetabpage|menuitem2">_Automatic</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -837,7 +837,7 @@
       <object class="GtkMenuItem" id="menuitem3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_From file...</property>
+        <property name="label" translatable="yes" context="linetabpage|menuitem3">_From file...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -845,7 +845,7 @@
       <object class="GtkMenuItem" id="menuitem4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Gallery</property>
+        <property name="label" translatable="yes" context="linetabpage|menuitem4">_Gallery</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -853,7 +853,7 @@
       <object class="GtkMenuItem" id="menuitem5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Symbols</property>
+        <property name="label" translatable="yes" context="linetabpage|menuitem5">_Symbols</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/cui/uiconfig/ui/macroassigndialog.ui b/cui/uiconfig/ui/macroassigndialog.ui
index 5e13ca6ea559..8dcc8532bd58 100644
--- a/cui/uiconfig/ui/macroassigndialog.ui
+++ b/cui/uiconfig/ui/macroassigndialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MacroAssignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Assign Action</property>
+    <property name="title" translatable="yes" context="macroassigndialog|MacroAssignDialog">Assign Action</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/cui/uiconfig/ui/macroassignpage.ui b/cui/uiconfig/ui/macroassignpage.ui
index a7a02307130b..4bd104716608 100644
--- a/cui/uiconfig/ui/macroassignpage.ui
+++ b/cui/uiconfig/ui/macroassignpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Thu Jan 23 10:25:37 2014 -->
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="MacroAssignPage">
@@ -54,7 +54,7 @@
                       <object class="GtkLabel" id="eventft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Event</property>
+                        <property name="label" translatable="yes" context="macroassignpage|eventft">Event</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -67,7 +67,7 @@
                       <object class="GtkLabel" id="assignft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Assigned Action</property>
+                        <property name="label" translatable="yes" context="macroassignpage|assignft">Assigned Action</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -92,7 +92,7 @@
           <object class="GtkLabel" id="libraryft1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Assignments</property>
+            <property name="label" translatable="yes" context="macroassignpage|libraryft1">Assignments</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -127,7 +127,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="assign">
-                    <property name="label" translatable="yes">M_acro...</property>
+                    <property name="label" translatable="yes" context="macroassignpage|assign">M_acro...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -141,7 +141,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="component">
-                    <property name="label" translatable="yes">Com_ponent...</property>
+                    <property name="label" translatable="yes" context="macroassignpage|component">Com_ponent...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -155,7 +155,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="delete">
-                    <property name="label" translatable="yes">Remove</property>
+                    <property name="label" translatable="yes" context="macroassignpage|delete">Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -213,7 +213,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Assign</property>
+            <property name="label" translatable="yes" context="macroassignpage|label1">Assign</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui
index 476b526ffef4..0d9db625a4b1 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="MacroSelectorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Macro Selector</property>
+    <property name="title" translatable="yes" context="macroselectordialog|MacroSelectorDialog">Macro Selector</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add">
-                <property name="label" translatable="yes">Add</property>
+                <property name="label" translatable="yes" context="macroselectordialog|add">Add</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
@@ -111,7 +111,7 @@
                 <property name="no_show_all">True</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select the library that contains the macro you want. Then select the macro under 'Macro name'.</property>
+                <property name="label" translatable="yes" context="macroselectordialog|helpmacro">Select the library that contains the macro you want. Then select the macro under 'Macro name'.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">60</property>
               </object>
@@ -127,7 +127,7 @@
                 <property name="no_show_all">True</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog.</property>
+                <property name="label" translatable="yes" context="macroselectordialog|helptoolbar">To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">60</property>
               </object>
@@ -181,7 +181,7 @@
                           <object class="GtkLabel" id="libraryft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Library</property>
+                            <property name="label" translatable="yes" context="macroselectordialog|libraryft">Library</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -196,7 +196,7 @@
                           <object class="GtkLabel" id="categoryft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Category</property>
+                            <property name="label" translatable="yes" context="macroselectordialog|categoryft">Category</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -253,7 +253,7 @@
                           <object class="GtkLabel" id="macronameft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Macro Name</property>
+                            <property name="label" translatable="yes" context="macroselectordialog|macronameft">Macro Name</property>
                             <property name="track_visited_links">False</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -269,7 +269,7 @@
                           <object class="GtkLabel" id="commandsft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Commands</property>
+                            <property name="label" translatable="yes" context="macroselectordialog|commandsft">Commands</property>
                             <property name="track_visited_links">False</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -338,7 +338,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Description</property>
+                    <property name="label" translatable="yes" context="macroselectordialog|label1">Description</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui
index 435a33e9737a..1213719c2f3c 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="contentmenu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="toolrename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="menuassignpage|toolrename">Rename...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="toolrestore">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Restore Default Command</property>
+        <property name="label" translatable="yes" context="menuassignpage|toolrestore">Restore Default Command</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="toolchange">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Change Icon...</property>
+        <property name="label" translatable="yes" context="menuassignpage|toolchange">Change Icon...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="toolreset">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Reset Icon</property>
+        <property name="label" translatable="yes" context="menuassignpage|toolreset">Reset Icon</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -89,7 +89,7 @@
                       <object class="GtkLabel" id="toplevelft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Menu</property>
+                        <property name="label" translatable="yes" context="menuassignpage|toplevelft">Menu</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">toplevellist</property>
                         <property name="xalign">0</property>
@@ -117,7 +117,7 @@
                         <property name="can_focus">False</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">6</property>
-                        <property name="label" translatable="yes">Style</property>
+                        <property name="label" translatable="yes" context="menuassignpage|toolbarstyleft">Style</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">toplevellist</property>
                         <property name="xalign">0</property>
@@ -137,7 +137,7 @@
                         <property name="hexpand">True</property>
                         <child>
                           <object class="GtkRadioButton" id="iconsandtextrb">
-                            <property name="label" translatable="yes">Icons &amp; Text</property>
+                            <property name="label" translatable="yes" context="menuassignpage|iconsandtextrb">Icons &amp; Text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="iconsrb">
-                            <property name="label" translatable="yes">Icons</property>
+                            <property name="label" translatable="yes" context="menuassignpage|iconsrb">Icons</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="textrb">
-                            <property name="label" translatable="yes">Text</property>
+                            <property name="label" translatable="yes" context="menuassignpage|textrb">Text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -208,7 +208,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="toplevelbutton">
-                        <property name="label" translatable="yes">New...</property>
+                        <property name="label" translatable="yes" context="menuassignpage|toplevelbutton">New...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -222,7 +222,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="menuedit:menu">
-                        <property name="label" translatable="yes">Menu</property>
+                        <property name="label" translatable="yes" context="menuassignpage|menuedit">Menu</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -247,7 +247,7 @@
           <object class="GtkLabel" id="label26">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">%PRODUCTNAME %MODULENAME Menus</property>
+            <property name="label" translatable="yes" context="menuassignpage|label26">%PRODUCTNAME %MODULENAME Menus</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -306,7 +306,7 @@
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Save In</property>
+                        <property name="label" translatable="yes" context="menuassignpage|label33">_Save In</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">savein</property>
                         <property name="xalign">0</property>
@@ -321,7 +321,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
-                        <property name="label" translatable="yes">Entries</property>
+                        <property name="label" translatable="yes" context="menuassignpage|contentslabel">Entries</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entries</property>
                         <property name="xalign">0</property>
@@ -426,7 +426,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="resetbtn">
-                            <property name="label" translatable="yes">Reset</property>
+                            <property name="label" translatable="yes" context="menuassignpage|resetbtn">Reset</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -454,7 +454,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="modify:modmenu">
-                            <property name="label" translatable="yes">Modify</property>
+                            <property name="label" translatable="yes" context="menuassignpage|modify">Modify</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -467,7 +467,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="deletebtn">
-                            <property name="label" translatable="yes">Remove</property>
+                            <property name="label" translatable="yes" context="menuassignpage|deletebtn">Remove</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -495,7 +495,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add">
-                            <property name="label" translatable="yes">Add Command</property>
+                            <property name="label" translatable="yes" context="menuassignpage|add">Add Command</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -509,7 +509,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="addseparatorbtn">
-                            <property name="label" translatable="yes">Add Separator</property>
+                            <property name="label" translatable="yes" context="menuassignpage|addseparatorbtn">Add Separator</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -523,7 +523,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="addsubmenubtn">
-                            <property name="label" translatable="yes">Add Submenu</property>
+                            <property name="label" translatable="yes" context="menuassignpage|addsubmenubtn">Add Submenu</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -555,7 +555,7 @@
           <object class="GtkLabel" id="label27">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Menu Content</property>
+            <property name="label" translatable="yes" context="menuassignpage|label27">Menu Content</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -602,7 +602,7 @@
           <object class="GtkLabel" id="label28">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Description</property>
+            <property name="label" translatable="yes" context="menuassignpage|label28">_Description</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -642,7 +642,7 @@
       <object class="GtkMenuItem" id="move">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Move...</property>
+        <property name="label" translatable="yes" context="menuassignpage|move">Move...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -650,7 +650,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="menuassignpage|rename">Rename...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -664,7 +664,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete...</property>
+        <property name="label" translatable="yes" context="menuassignpage|delete">Delete...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -676,14 +676,14 @@
       <object class="GtkMenuItem" id="modtoolrename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="menuassignpage|modtoolrename">Rename...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="modtooldelete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes" context="menuassignpage|modtooldelete">Delete</property>
       </object>
     </child>
   </object>
@@ -694,7 +694,7 @@
       <object class="GtkMenuItem" id="modrename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="menuassignpage|modrename">Rename...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/cui/uiconfig/ui/messbox.ui b/cui/uiconfig/ui/messbox.ui
index 29913a9a2654..6e9120c4df3d 100644
--- a/cui/uiconfig/ui/messbox.ui
+++ b/cui/uiconfig/ui/messbox.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MessBox">
     <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/mosaicdialog.ui b/cui/uiconfig/ui/mosaicdialog.ui
index b29991b26590..ac7714c486eb 100644
--- a/cui/uiconfig/ui/mosaicdialog.ui
+++ b/cui/uiconfig/ui/mosaicdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="MosaicDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Mosaic</property>
+    <property name="title" translatable="yes" context="mosaicdialog|MosaicDialog">Mosaic</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -141,7 +141,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Width:</property>
+                                <property name="label" translatable="yes" context="mosaicdialog|label2">_Width:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">width:px</property>
                               </object>
@@ -165,7 +165,7 @@
                               <object class="GtkSpinButton" id="height:px">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="text" translatable="yes">2</property>
+                                <property name="text" translatable="yes" context="mosaicdialog|height">2</property>
                                 <property name="adjustment">adjustment1</property>
                                 <property name="value">2</property>
                               </object>
@@ -179,7 +179,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Height:</property>
+                                <property name="label" translatable="yes" context="mosaicdialog|label3">_Height:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">height:px</property>
                               </object>
@@ -196,7 +196,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="edges">
-                            <property name="label" translatable="yes">E_nhance edges</property>
+                            <property name="label" translatable="yes" context="mosaicdialog|edges">E_nhance edges</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="mosaicdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index d6533a42377e..dee4c288d53c 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="image1">
@@ -16,7 +16,7 @@
   <object class="GtkDialog" id="MoveMenuDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Menu</property>
+    <property name="title" translatable="yes" context="movemenu|MoveMenuDialog">New Menu</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -100,7 +100,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Menu name:</property>
+                    <property name="label" translatable="yes" context="movemenu|menunameft">Menu name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">menuname</property>
                   </object>
@@ -194,7 +194,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Menu _position:</property>
+                    <property name="label" translatable="yes" context="movemenu|label1">Menu _position:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -241,7 +241,7 @@
                             <property name="image">image1</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="up-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Up</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="movemenu|up-atkobject">Up</property>
                               </object>
                             </child>
                           </object>
@@ -259,7 +259,7 @@
                             <property name="image">image2</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="down-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Down</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="movemenu|down-atkobject">Down</property>
                               </object>
                             </child>
                           </object>
diff --git a/cui/uiconfig/ui/multipathdialog.ui b/cui/uiconfig/ui/multipathdialog.ui
index 6a0322385eea..616d37720961 100644
--- a/cui/uiconfig/ui/multipathdialog.ui
+++ b/cui/uiconfig/ui/multipathdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="MultiPathDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Paths</property>
+    <property name="title" translatable="yes" context="multipathdialog|MultiPathDialog">Select Paths</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -104,7 +104,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add">
-                            <property name="label" translatable="yes">_Add...</property>
+                            <property name="label" translatable="yes" context="multipathdialog|add">_Add...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -161,7 +161,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Path list:</property>
+                            <property name="label" translatable="yes" context="multipathdialog|pathlist">Path list:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Mark the Default Path for New Files</property>
+                <property name="label" translatable="yes" context="multipathdialog|label1">Mark the Default Path for New Files</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui
index 541b795f1a8a..7a221cef9c74 100644
--- a/cui/uiconfig/ui/namedialog.ui
+++ b/cui/uiconfig/ui/namedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="NameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Name</property>
+    <property name="title" translatable="yes" context="namedialog|NameDialog">Name</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/cui/uiconfig/ui/newlibdialog.ui b/cui/uiconfig/ui/newlibdialog.ui
index 7b284317acc4..79d42644d729 100644
--- a/cui/uiconfig/ui/newlibdialog.ui
+++ b/cui/uiconfig/ui/newlibdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Sat Jan  4 16:52:18 2014 -->
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="NewLibDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Library</property>
+    <property name="title" translatable="yes" context="newlibdialog|NewLibDialog">Create Library</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -25,7 +25,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter the name for the new library.</property>
+                <property name="label" translatable="yes" context="newlibdialog|newlibft">Enter the name for the new library.</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
@@ -54,7 +54,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter the name for the new macro.</property>
+                <property name="label" translatable="yes" context="newlibdialog|newmacroft">Enter the name for the new macro.</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
@@ -70,7 +70,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter the new name for the selected object.</property>
+                <property name="label" translatable="yes" context="newlibdialog|renameft">Enter the new name for the selected object.</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
@@ -85,7 +85,7 @@
               <object class="GtkLabel" id="altmacrotitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Create Macro</property>
+                <property name="label" translatable="yes" context="newlibdialog|altmacrotitle">Create Macro</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -99,7 +99,7 @@
               <object class="GtkLabel" id="altrenametitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Rename</property>
+                <property name="label" translatable="yes" context="newlibdialog|altrenametitle">Rename</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/newtabledialog.ui b/cui/uiconfig/ui/newtabledialog.ui
index bddbd31a3ba9..a7448651e965 100644
--- a/cui/uiconfig/ui/newtabledialog.ui
+++ b/cui/uiconfig/ui/newtabledialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="columns_value">
     <property name="lower">1</property>
@@ -19,7 +19,7 @@
   <object class="GtkDialog" id="NewTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Table</property>
+    <property name="title" translatable="yes" context="newtabledialog|NewTableDialog">Insert Table</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -96,7 +96,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Number of columns:</property>
+                <property name="label" translatable="yes" context="newtabledialog|columns_label">_Number of columns:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">columns</property>
               </object>
@@ -113,7 +113,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Number of rows:</property>
+                <property name="label" translatable="yes" context="newtabledialog|rows_label">_Number of rows:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">rows</property>
               </object>
diff --git a/cui/uiconfig/ui/newtoolbardialog.ui b/cui/uiconfig/ui/newtoolbardialog.ui
index 5c617436ed57..815776afe986 100644
--- a/cui/uiconfig/ui/newtoolbardialog.ui
+++ b/cui/uiconfig/ui/newtoolbardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="NewToolbarDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Name</property>
+    <property name="title" translatable="yes" context="newtoolbardialog|NewToolbarDialog">Name</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Toolbar name:</property>
+                    <property name="label" translatable="yes" context="newtoolbardialog|label1">_Toolbar name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">edit</property>
                   </object>
@@ -131,7 +131,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Save in:</property>
+                    <property name="label" translatable="yes" context="newtoolbardialog|label2">_Save in:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">savein</property>
                   </object>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index a6250aa4141a..90fde3e53a8e 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -35,37 +35,37 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">All</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">All</col>
       </row>
       <row>
-        <col id="0" translatable="yes">User-defined</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">User-defined</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Number</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Number</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Percent</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Percent</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Currency</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Currency</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Date</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Time</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Time</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Scientific</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Scientific</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Fraction</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Fraction</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Boolean Value</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Boolean Value</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Text</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore1">Text</col>
       </row>
     </data>
   </object>
@@ -76,7 +76,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Automatically</col>
+        <col id="0" translatable="yes" context="numberingformatpage|liststore2">Automatically</col>
       </row>
     </data>
   </object>
@@ -123,7 +123,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Add</property>
+                    <property name="tooltip_text" translatable="yes" context="numberingformatpage|add|tooltip_text">Add</property>
                     <property name="valign">center</property>
                     <property name="image">image2</property>
                   </object>
@@ -138,7 +138,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Edit Comment</property>
+                    <property name="tooltip_text" translatable="yes" context="numberingformatpage|edit|tooltip_text">Edit Comment</property>
                     <property name="valign">center</property>
                     <property name="image">image3</property>
                   </object>
@@ -153,7 +153,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Remove</property>
+                    <property name="tooltip_text" translatable="yes" context="numberingformatpage|delete|tooltip_text">Remove</property>
                     <property name="valign">center</property>
                     <property name="image">image1</property>
                   </object>
@@ -194,7 +194,7 @@
           <object class="GtkLabel" id="formatf">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Format code</property>
+            <property name="label" translatable="yes" context="numberingformatpage|formatf">_Format code</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">formatted</property>
             <attributes>
@@ -290,7 +290,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Decimal places:</property>
+                        <property name="label" translatable="yes" context="numberingformatpage|decimalsft">_Decimal places:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">decimalsed</property>
                       </object>
@@ -305,7 +305,7 @@
                         <property name="visible">False</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Den_ominator places:</property>
+                        <property name="label" translatable="yes" context="numberingformatpage|denominatorft">Den_ominator places:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">denominatored</property>
                       </object>
@@ -326,7 +326,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Leading _zeroes:</property>
+                    <property name="label" translatable="yes" context="numberingformatpage|leadzerosft">Leading _zeroes:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">leadzerosed</property>
                   </object>
@@ -337,7 +337,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="negnumred">
-                    <property name="label" translatable="yes">_Negative numbers red</property>
+                    <property name="label" translatable="yes" context="numberingformatpage|negnumred">_Negative numbers red</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -359,7 +359,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="thousands">
-                        <property name="label" translatable="yes">_Thousands separator</property>
+                        <property name="label" translatable="yes" context="numberingformatpage|thousands">_Thousands separator</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -375,7 +375,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="engineering">
-                        <property name="label" translatable="yes">_Engineering notation</property>
+                        <property name="label" translatable="yes" context="numberingformatpage|engineering">_Engineering notation</property>
                         <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -403,7 +403,7 @@
           <object class="GtkLabel" id="optionsft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="numberingformatpage|optionsft">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -460,7 +460,7 @@
               <object class="GtkLabel" id="categoryft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">C_ategory</property>
+                <property name="label" translatable="yes" context="numberingformatpage|categoryft">C_ategory</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">categorylb:border</property>
                 <attributes>
@@ -533,7 +533,7 @@
               <object class="GtkLabel" id="formatft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Fo_rmat</property>
+                <property name="label" translatable="yes" context="numberingformatpage|formatft">Fo_rmat</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">formatlb:border</property>
                 <attributes>
@@ -593,7 +593,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="sourceformat">
-                        <property name="label" translatable="yes">So_urce format</property>
+                        <property name="label" translatable="yes" context="numberingformatpage|sourceformat">So_urce format</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -614,7 +614,7 @@
               <object class="GtkLabel" id="languageft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Language</property>
+                <property name="label" translatable="yes" context="numberingformatpage|languageft">_Language</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">languagelb</property>
                 <attributes>
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index 0e18b19e74ab..36c369f46dcc 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">19.989999999999998</property>
@@ -61,7 +61,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Level</property>
+            <property name="label" translatable="yes" context="numberingoptionspage|label1">Level</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -107,7 +107,7 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Number:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|label4">Number:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numfmtlb</property>
                             <property name="xalign">1</property>
@@ -156,7 +156,7 @@
                           <object class="GtkLabel" id="startatft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Start at:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|startatft">Start at:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">startat</property>
                             <property name="xalign">1</property>
@@ -180,7 +180,7 @@
                           <object class="GtkLabel" id="bitmapft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Graphics:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|bitmapft">Graphics:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">bitmap:bitmapmenu</property>
                             <property name="xalign">1</property>
@@ -194,7 +194,7 @@
                           <object class="GtkLabel" id="widthft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Width:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|widthft">Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">widthmf:0.00cm</property>
                             <property name="xalign">1</property>
@@ -221,7 +221,7 @@
                           <object class="GtkLabel" id="heightft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Height:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|heightft">Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">heightmf:0.00cm</property>
                             <property name="ellipsize">end</property>
@@ -247,7 +247,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="keepratio">
-                            <property name="label" translatable="yes">Keep ratio</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|keepratio">Keep ratio</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -263,7 +263,7 @@
                           <object class="GtkLabel" id="orientft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Alignment:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|orientft">Alignment:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">orientlb</property>
                             <property name="xalign">1</property>
@@ -278,15 +278,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Top of baseline</item>
-                              <item translatable="yes">Center of baseline</item>
-                              <item translatable="yes">Bottom of baseline</item>
-                              <item translatable="yes">Top of character</item>
-                              <item translatable="yes">Center of character</item>
-                              <item translatable="yes">Bottom of character</item>
-                              <item translatable="yes">Top of line</item>
-                              <item translatable="yes">Center of line</item>
-                              <item translatable="yes">Bottom of line</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Top of baseline</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Center of baseline</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Bottom of baseline</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Top of character</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Center of character</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Bottom of character</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Top of line</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Center of line</item>
+                              <item translatable="yes" context="numberingoptionspage|orientlb">Bottom of line</item>
                             </items>
                           </object>
                           <packing>
@@ -296,7 +296,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="bitmap:bitmapmenu">
-                            <property name="label" translatable="yes">Select...</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|bitmap">Select...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -333,9 +333,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Left</item>
-                              <item translatable="yes">Centered</item>
-                              <item translatable="yes">Right</item>
+                              <item translatable="yes" context="numberingoptionspage|numalign">Left</item>
+                              <item translatable="yes" context="numberingoptionspage|numalign">Centered</item>
+                              <item translatable="yes" context="numberingoptionspage|numalign">Right</item>
                             </items>
                           </object>
                           <packing>
@@ -345,7 +345,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="bullet">
-                            <property name="label" translatable="yes">Select...</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|bullet">Select...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -364,7 +364,7 @@
                               <object class="GtkLabel" id="prefixft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Before:</property>
+                                <property name="label" translatable="yes" context="numberingoptionspage|prefixft">Before:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">prefix</property>
                                 <property name="xalign">1</property>
@@ -385,7 +385,7 @@
                               <object class="GtkLabel" id="separator">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Separator</property>
+                                <property name="label" translatable="yes" context="numberingoptionspage|separator">Separator</property>
                                 <property name="xalign">1</property>
                               </object>
                             </child>
@@ -421,7 +421,7 @@
                           <object class="GtkLabel" id="suffixft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">After:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|suffixft">After:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">suffix</property>
                             <property name="xalign">1</property>
@@ -435,7 +435,7 @@
                           <object class="GtkLabel" id="sublevelsft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Show sublevels:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|sublevelsft">Show sublevels:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">sublevels</property>
                             <property name="ellipsize">end</property>
@@ -450,7 +450,7 @@
                           <object class="GtkLabel" id="bulletft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Character:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|bulletft">Character:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">bullet</property>
                             <property name="xalign">1</property>
@@ -464,7 +464,7 @@
                           <object class="GtkLabel" id="relsizeft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Relative size:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|relsizeft">_Relative size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">relsize:0%</property>
                             <property name="xalign">1</property>
@@ -478,7 +478,7 @@
                           <object class="GtkLabel" id="colorft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Color:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|colorft">Color:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">color</property>
                             <property name="xalign">1</property>
@@ -492,7 +492,7 @@
                           <object class="GtkLabel" id="charstyleft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Character style:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|charstyleft">Character style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">charstyle</property>
                             <property name="xalign">1</property>
@@ -506,7 +506,7 @@
                           <object class="GtkLabel" id="numalignft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Alignment:</property>
+                            <property name="label" translatable="yes" context="numberingoptionspage|numalignft">_Alignment:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numalign</property>
                             <property name="xalign">1</property>
@@ -550,7 +550,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="numberingoptionspage|label2">Numbering</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -577,7 +577,7 @@
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkCheckButton" id="allsame">
-                    <property name="label" translatable="yes">_Consecutive numbering</property>
+                    <property name="label" translatable="yes" context="numberingoptionspage|allsame">_Consecutive numbering</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -593,7 +593,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">All Levels</property>
+                <property name="label" translatable="yes" context="numberingoptionspage|label3">All Levels</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -621,7 +621,7 @@
       <object class="GtkMenuItem" id="fromfile">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">From file...</property>
+        <property name="label" translatable="yes" context="numberingoptionspage|fromfile">From file...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -629,7 +629,7 @@
       <object class="GtkMenuItem" id="gallery">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Gallery</property>
+        <property name="label" translatable="yes" context="numberingoptionspage|gallery">Gallery</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui
index 9f08ba2e6480..aaed61012926 100644
--- a/cui/uiconfig/ui/numberingpositionpage.ui
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">19.989999999999998</property>
@@ -20,13 +20,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore1">Left</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Centered</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore1">Centered</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore1">Right</col>
       </row>
     </data>
   </object>
@@ -37,13 +37,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Tab stop</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore2">Tab stop</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Space</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore2">Space</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Nothing</col>
+        <col id="0" translatable="yes" context="numberingpositionpage|liststore2">Nothing</col>
       </row>
     </data>
   </object>
@@ -85,7 +85,7 @@
           <object class="GtkLabel" id="1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Level</property>
+            <property name="label" translatable="yes" context="numberingpositionpage|1">Level</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -136,7 +136,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Numbering followed by:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|numfollowedby">Numbering followed by:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numfollowedbylb</property>
                       </object>
@@ -150,7 +150,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">N_umbering alignment:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|num2align">N_umbering alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">num2alignlb</property>
                       </object>
@@ -164,7 +164,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Aligned at:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|alignedat">Aligned at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">alignedatmf:0.00cm</property>
                       </object>
@@ -178,7 +178,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Indent at:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|indentat">Indent at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">indentatmf:0.00cm</property>
                       </object>
@@ -214,7 +214,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Tab stop at:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|at">Tab stop at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">atmf:0.00cm</property>
                       </object>
@@ -263,7 +263,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Indent:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|indent">Indent:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">indentmf:0.00cm</property>
                       </object>
@@ -287,7 +287,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="relative">
-                        <property name="label" translatable="yes">Relati_ve</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|relative">Relati_ve</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -307,7 +307,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Width of numbering:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|numberingwidth">Width of numbering:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numberingwidthmf:0.00cm</property>
                       </object>
@@ -347,7 +347,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Minimum space between
+                        <property name="label" translatable="yes" context="numberingpositionpage|numdist">Minimum space between
 numbering and text:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">right</property>
@@ -363,7 +363,7 @@ numbering and text:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">N_umbering alignment:</property>
+                        <property name="label" translatable="yes" context="numberingpositionpage|numalign">N_umbering alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numalignlb</property>
                       </object>
@@ -391,7 +391,7 @@ numbering and text:</property>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Spacing</property>
+                <property name="label" translatable="yes" context="numberingpositionpage|label10">Position and Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -413,7 +413,7 @@ numbering and text:</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">Default</property>
+                <property name="label" translatable="yes" context="numberingpositionpage|standard">Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/objectnamedialog.ui b/cui/uiconfig/ui/objectnamedialog.ui
index d5da22a35554..dd1cb4f7a05a 100644
--- a/cui/uiconfig/ui/objectnamedialog.ui
+++ b/cui/uiconfig/ui/objectnamedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ObjectNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Name</property>
+    <property name="title" translatable="yes" context="objectnamedialog|ObjectNameDialog">Name</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -80,7 +80,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Name:</property>
+                <property name="label" translatable="yes" context="objectnamedialog|object_name_label">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">object_name_entry</property>
               </object>
diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui
index fdf781124280..797394ef6555 100644
--- a/cui/uiconfig/ui/objecttitledescdialog.ui
+++ b/cui/uiconfig/ui/objecttitledescdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text">
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="ObjectTitleDescDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Description</property>
+    <property name="title" translatable="yes" context="objecttitledescdialog|ObjectTitleDescDialog">Description</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
@@ -87,7 +87,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Title:</property>
+                <property name="label" translatable="yes" context="objecttitledescdialog|object_title_label">_Title:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">object_title_entry</property>
               </object>
@@ -115,7 +115,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Description:</property>
+                <property name="label" translatable="yes" context="objecttitledescdialog|desc_label">_Description:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui b/cui/uiconfig/ui/optaccessibilitypage.ui
index faacf845ff52..182d54d359ab 100644
--- a/cui/uiconfig/ui/optaccessibilitypage.ui
+++ b/cui/uiconfig/ui/optaccessibilitypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptAccessibilityPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="acctool">
-                    <property name="label" translatable="yes">Support _assistive technology tools (program restart required)</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|acctool">Support _assistive technology tools (program restart required)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -44,7 +44,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="textselinreadonly">
-                    <property name="label" translatable="yes">Use te_xt selection cursor in read-only text documents</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|textselinreadonly">Use te_xt selection cursor in read-only text documents</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -60,7 +60,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="animatedgraphics">
-                    <property name="label" translatable="yes">Allow animated _images</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|animatedgraphics">Allow animated _images</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -76,7 +76,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="animatedtext">
-                    <property name="label" translatable="yes">Allow animated _text</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|animatedtext">Allow animated _text</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -98,7 +98,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Miscellaneous Options</property>
+            <property name="label" translatable="yes" context="optaccessibilitypage|label1">Miscellaneous Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -131,7 +131,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="autodetecthc">
-                    <property name="label" translatable="yes">Automatically _detect high contrast mode of operating system</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|autodetecthc">Automatically _detect high contrast mode of operating system</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -147,7 +147,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autofontcolor">
-                    <property name="label" translatable="yes">Use automatic font _color for screen display</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|autofontcolor">Use automatic font _color for screen display</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -163,7 +163,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="systempagepreviewcolor">
-                    <property name="label" translatable="yes">_Use system colors for page previews</property>
+                    <property name="label" translatable="yes" context="optaccessibilitypage|systempagepreviewcolor">_Use system colors for page previews</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -185,7 +185,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options for High Contrast Appearance</property>
+            <property name="label" translatable="yes" context="optaccessibilitypage|label2">Options for High Contrast Appearance</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index eac60789eab1..c8ec75c5880f 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="OptAdvancedPage">
@@ -35,7 +35,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="javaenabled">
-                    <property name="label" translatable="yes">_Use a Java runtime environment</property>
+                    <property name="label" translatable="yes" context="optadvancedpage|javaenabled">_Use a Java runtime environment</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</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">_Java runtime environments (JRE) already installed:</property>
+                            <property name="label" translatable="yes" context="optadvancedpage|label2">_Java runtime environments (JRE) already installed:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">javas</property>
                           </object>
@@ -95,7 +95,7 @@
                                 <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="add">
-                                    <property name="label" translatable="yes">_Add...</property>
+                                    <property name="label" translatable="yes" context="optadvancedpage|add">_Add...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -109,7 +109,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="parameters">
-                                    <property name="label" translatable="yes">_Parameters...</property>
+                                    <property name="label" translatable="yes" context="optadvancedpage|parameters">_Parameters...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -123,7 +123,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="classpath">
-                                    <property name="label" translatable="yes">_Class Path...</property>
+                                    <property name="label" translatable="yes" context="optadvancedpage|classpath">_Class Path...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -156,7 +156,7 @@
                                       <object class="GtkLabel" id="vendor">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Vendor</property>
+                                        <property name="label" translatable="yes" context="optadvancedpage|vendor">Vendor</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
@@ -168,7 +168,7 @@
                                       <object class="GtkLabel" id="version">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Version</property>
+                                        <property name="label" translatable="yes" context="optadvancedpage|version">Version</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
@@ -180,7 +180,7 @@
                                       <object class="GtkLabel" id="features">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Features</property>
+                                        <property name="label" translatable="yes" context="optadvancedpage|features">Features</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
@@ -192,7 +192,7 @@
                                       <object class="GtkLabel" id="a11y">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">with accessibility support</property>
+                                        <property name="label" translatable="yes" context="optadvancedpage|a11y">with accessibility support</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -203,7 +203,7 @@
                                       <object class="GtkLabel" id="selectruntime">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Select a Java Runtime Environment</property>
+                                        <property name="label" translatable="yes" context="optadvancedpage|selectruntime">Select a Java Runtime Environment</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -251,7 +251,7 @@
                           <object class="GtkLabel" id="javapath">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Location: </property>
+                            <property name="label" translatable="yes" context="optadvancedpage|javapath">Location: </property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -277,7 +277,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Java Options</property>
+            <property name="label" translatable="yes" context="optadvancedpage|label1">Java Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -312,7 +312,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="experimental">
-                    <property name="label" translatable="yes">Enable experimental features (may be unstable)</property>
+                    <property name="label" translatable="yes" context="optadvancedpage|experimental">Enable experimental features (may be unstable)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -327,7 +327,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="macrorecording">
-                    <property name="label" translatable="yes">Enable macro recording (may be limited)</property>
+                    <property name="label" translatable="yes" context="optadvancedpage|macrorecording">Enable macro recording (may be limited)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -341,7 +341,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="expertconfig">
-                    <property name="label" translatable="yes">Open Expert Configuration</property>
+                    <property name="label" translatable="yes" context="optadvancedpage|expertconfig">Open Expert Configuration</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -361,7 +361,7 @@
           <object class="GtkLabel" id="label12">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Optional Features</property>
+            <property name="label" translatable="yes" context="optadvancedpage|label12">Optional Features</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui
index f3d602857e15..7dad23e72945 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptAppearancePage">
     <property name="visible">True</property>
@@ -32,7 +32,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Scheme:</property>
+                    <property name="label" translatable="yes" context="optappearancepage|label3">_Scheme:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">colorschemelb</property>
                   </object>
@@ -85,7 +85,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Color Scheme</property>
+            <property name="label" translatable="yes" context="optappearancepage|label1">Color Scheme</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -130,7 +130,7 @@
                         <property name="width_request">250</property>
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">User interface elements</property>
+                        <property name="label" translatable="yes" context="optappearancepage|uielements">User interface elements</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -142,7 +142,7 @@
                         <property name="width_request">150</property>
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Color setting</property>
+                        <property name="label" translatable="yes" context="optappearancepage|colorsetting">Color setting</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -154,7 +154,7 @@
                         <property name="width_request">100</property>
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Preview</property>
+                        <property name="label" translatable="yes" context="optappearancepage|preview">Preview</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -165,7 +165,7 @@
                       <object class="GtkLabel" id="on">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">On</property>
+                        <property name="label" translatable="yes" context="optappearancepage|on">On</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -198,7 +198,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom Colors</property>
+            <property name="label" translatable="yes" context="optappearancepage|label2">Custom Colors</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optasianpage.ui b/cui/uiconfig/ui/optasianpage.ui
index 79f7e4848251..3016fa00a54e 100644
--- a/cui/uiconfig/ui/optasianpage.ui
+++ b/cui/uiconfig/ui/optasianpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="OptAsianPage">
@@ -28,7 +28,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="charkerning">
-                    <property name="label" translatable="yes">_Western text only</property>
+                    <property name="label" translatable="yes" context="optasianpage|charkerning">_Western text only</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="charpunctkerning">
-                    <property name="label" translatable="yes">Western _text and Asian punctuation</property>
+                    <property name="label" translatable="yes" context="optasianpage|charpunctkerning">Western _text and Asian punctuation</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Kerning</property>
+            <property name="label" translatable="yes" context="optasianpage|label1">Kerning</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -102,7 +102,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="nocompression">
-                    <property name="label" translatable="yes">_No compression</property>
+                    <property name="label" translatable="yes" context="optasianpage|nocompression">_No compression</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="punctcompression">
-                    <property name="label" translatable="yes">_Compress punctuation only</property>
+                    <property name="label" translatable="yes" context="optasianpage|punctcompression">_Compress punctuation only</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -138,7 +138,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="punctkanacompression">
-                    <property name="label" translatable="yes">Compress punctuation and Japanese Kana</property>
+                    <property name="label" translatable="yes" context="optasianpage|punctkanacompression">Compress punctuation and Japanese Kana</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Character Spacing</property>
+            <property name="label" translatable="yes" context="optasianpage|label2">Character Spacing</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -223,7 +223,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="standard">
-                            <property name="label" translatable="yes">_Default</property>
+                            <property name="label" translatable="yes" context="optasianpage|standard">_Default</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -248,7 +248,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Language:</property>
+                        <property name="label" translatable="yes" context="optasianpage|languageft">_Language:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">language</property>
                       </object>
@@ -262,7 +262,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Not _at start of line:</property>
+                        <property name="label" translatable="yes" context="optasianpage|startft">Not _at start of line:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">start</property>
                       </object>
@@ -276,7 +276,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Not at _end of line:</property>
+                        <property name="label" translatable="yes" context="optasianpage|endft">Not at _end of line:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">end</property>
                       </object>
@@ -321,7 +321,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Without user-defined line break symbols</property>
+                    <property name="label" translatable="yes" context="optasianpage|hintft">Without user-defined line break symbols</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -337,7 +337,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">First and Last Characters</property>
+            <property name="label" translatable="yes" context="optasianpage|label3">First and Last Characters</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optbasicidepage.ui b/cui/uiconfig/ui/optbasicidepage.ui
index 90ea4c88ba55..70af9886d9dd 100644
--- a/cui/uiconfig/ui/optbasicidepage.ui
+++ b/cui/uiconfig/ui/optbasicidepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptBasicIDEPage">
     <property name="visible">True</property>
@@ -26,7 +26,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkCheckButton" id="codecomplete_enable">
-                    <property name="label" translatable="yes">Enable code completion</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|codecomplete_enable">Enable code completion</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -46,7 +46,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Code Completion</property>
+            <property name="label" translatable="yes" context="optbasicidepage|label1">Code Completion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -78,7 +78,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="autoclose_proc">
-                    <property name="label" translatable="yes">Autoclose procedures</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|autoclose_proc">Autoclose procedures</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -92,7 +92,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autoclose_paren">
-                    <property name="label" translatable="yes">Autoclose parenthesis</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|autoclose_paren">Autoclose parenthesis</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autoclose_quotes">
-                    <property name="label" translatable="yes">Autoclose quotes</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|autoclose_quotes">Autoclose quotes</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autocorrect">
-                    <property name="label" translatable="yes">Autocorrection</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|autocorrect">Autocorrection</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -141,7 +141,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Code Suggestion</property>
+            <property name="label" translatable="yes" context="optbasicidepage|label2">Code Suggestion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -173,7 +173,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="extendedtypes_enable">
-                    <property name="label" translatable="yes">Use extended types</property>
+                    <property name="label" translatable="yes" context="optbasicidepage|extendedtypes_enable">Use extended types</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -193,7 +193,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Language Features</property>
+            <property name="label" translatable="yes" context="optbasicidepage|label3">Language Features</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optchartcolorspage.ui b/cui/uiconfig/ui/optchartcolorspage.ui
index 3d1fc1a40b83..59bc5e744f36 100644
--- a/cui/uiconfig/ui/optchartcolorspage.ui
+++ b/cui/uiconfig/ui/optchartcolorspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="OptChartColorsPage">
@@ -39,7 +39,7 @@
           <object class="GtkLabel" id="label20">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Chart Colors</property>
+            <property name="label" translatable="yes" context="optchartcolorspage|label20">Chart Colors</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -125,7 +125,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="default">
-                        <property name="label" translatable="yes">_Default</property>
+                        <property name="label" translatable="yes" context="optchartcolorspage|default">_Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -153,7 +153,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Color Table</property>
+            <property name="label" translatable="yes" context="optchartcolorspage|label1">Color Table</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optctlpage.ui b/cui/uiconfig/ui/optctlpage.ui
index b7e3d9ae1937..cb04e7f1e9c9 100644
--- a/cui/uiconfig/ui/optctlpage.ui
+++ b/cui/uiconfig/ui/optctlpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptCTLPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="sequencechecking">
-                    <property name="label" translatable="yes">Use se_quence checking</property>
+                    <property name="label" translatable="yes" context="optctlpage|sequencechecking">Use se_quence checking</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -53,7 +53,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="restricted">
-                            <property name="label" translatable="yes">Restricted</property>
+                            <property name="label" translatable="yes" context="optctlpage|restricted">Restricted</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -67,7 +67,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="typeandreplace">
-                            <property name="label" translatable="yes">_Type and replace</property>
+                            <property name="label" translatable="yes" context="optctlpage|typeandreplace">_Type and replace</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sequence Checking</property>
+            <property name="label" translatable="yes" context="optctlpage|label1">Sequence Checking</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -131,7 +131,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Movement:</property>
+                    <property name="label" translatable="yes" context="optctlpage|label3">Movement:</property>
                     <property name="xalign">1</property>
                   </object>
                   <packing>
@@ -141,7 +141,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="movementlogical">
-                    <property name="label" translatable="yes">Lo_gical</property>
+                    <property name="label" translatable="yes" context="optctlpage|movementlogical">Lo_gical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="movementvisual">
-                    <property name="label" translatable="yes">_Visual</property>
+                    <property name="label" translatable="yes" context="optctlpage|movementvisual">_Visual</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Cursor Control</property>
+            <property name="label" translatable="yes" context="optctlpage|label2">Cursor Control</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -217,7 +217,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Numerals:</property>
+                    <property name="label" translatable="yes" context="optctlpage|label5">_Numerals:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">numerals</property>
                     <property name="xalign">1</property>
@@ -232,10 +232,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Arabic (1, 2, 3…)</item>
-                      <item translatable="yes">Eastern Arabic (٣ ,٢ ,١…)</item>
-                      <item translatable="yes">System</item>
-                      <item translatable="yes">Context</item>
+                      <item translatable="yes" context="optctlpage|numerals">Arabic (1, 2, 3…)</item>
+                      <item translatable="yes" context="optctlpage|numerals">Eastern Arabic (٣ ,٢ ,١…)</item>
+                      <item translatable="yes" context="optctlpage|numerals">System</item>
+                      <item translatable="yes" context="optctlpage|numerals">Context</item>
                     </items>
                   </object>
                   <packing>
@@ -251,7 +251,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">General Options</property>
+            <property name="label" translatable="yes" context="optctlpage|label4">General Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optemailpage.ui b/cui/uiconfig/ui/optemailpage.ui
index 890604488538..0f1d68ede197 100644
--- a/cui/uiconfig/ui/optemailpage.ui
+++ b/cui/uiconfig/ui/optemailpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="OptEmailPage">
     <property name="visible">True</property>
@@ -23,7 +23,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_E-mail program:</property>
+                <property name="label" translatable="yes" context="optemailpage|label2">_E-mail program:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -52,7 +52,7 @@
             </child>
             <child>
               <object class="GtkButton" id="browse">
-                <property name="label" translatable="yes">Browse...</property>
+                <property name="label" translatable="yes" context="optemailpage|browse">Browse...</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -86,7 +86,7 @@
               <object class="GtkLabel" id="browsetitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">All files</property>
+                <property name="label" translatable="yes" context="optemailpage|browsetitle">All files</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -113,7 +113,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Suppress hidden elements of documents</property>
+                <property name="label" translatable="yes" context="optemailpage|suppress">Suppress hidden elements of documents</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -168,7 +168,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sending Documents as E-mail Attachments</property>
+        <property name="label" translatable="yes" context="optemailpage|label1">Sending Documents as E-mail Attachments</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui b/cui/uiconfig/ui/optfltrembedpage.ui
index 4e882419054c..811ecdc990ff 100644
--- a/cui/uiconfig/ui/optfltrembedpage.ui
+++ b/cui/uiconfig/ui/optfltrembedpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="OptFilterPage">
@@ -49,7 +49,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">[L]: Load and convert the object</property>
+                    <property name="label" translatable="yes" context="optfltrembedpage|label2">[L]: Load and convert the object</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -62,7 +62,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">[S]: Convert and save the object</property>
+                    <property name="label" translatable="yes" context="optfltrembedpage|label3">[S]: Convert and save the object</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -78,7 +78,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Embedded Objects</property>
+            <property name="label" translatable="yes" context="optfltrembedpage|label1">Embedded Objects</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -113,7 +113,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Export as:</property>
+                    <property name="label" translatable="yes" context="optfltrembedpage|label5">Export as:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -128,7 +128,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkRadioButton" id="highlighting">
-                        <property name="label" translatable="yes">Highlighting</property>
+                        <property name="label" translatable="yes" context="optfltrembedpage|highlighting">Highlighting</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="shading">
-                        <property name="label" translatable="yes">Shading</property>
+                        <property name="label" translatable="yes" context="optfltrembedpage|shading">Shading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Character Highlighting</property>
+            <property name="label" translatable="yes" context="optfltrembedpage|label4">Character Highlighting</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optfltrpage.ui b/cui/uiconfig/ui/optfltrpage.ui
index 3e43b457f0f3..b5b614aed852 100644
--- a/cui/uiconfig/ui/optfltrpage.ui
+++ b/cui/uiconfig/ui/optfltrpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptFltrPage">
     <property name="visible">True</property>
@@ -26,7 +26,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="wo_basic">
-                    <property name="label" translatable="yes">Load Basic _code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|wo_basic">Load Basic _code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -43,7 +43,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wo_exec">
-                    <property name="label" translatable="yes">E_xecutable code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|wo_exec">E_xecutable code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wo_saveorig">
-                    <property name="label" translatable="yes">Save _original Basic code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|wo_saveorig">Save _original Basic code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -84,7 +84,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Microsoft Word 97/2000/XP</property>
+            <property name="label" translatable="yes" context="optfltrpage|label1">Microsoft Word 97/2000/XP</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -116,7 +116,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="ex_basic">
-                    <property name="label" translatable="yes">Lo_ad Basic code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|ex_basic">Lo_ad Basic code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ex_exec">
-                    <property name="label" translatable="yes">E_xecutable code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|ex_exec">E_xecutable code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -151,7 +151,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ex_saveorig">
-                    <property name="label" translatable="yes">Sa_ve original Basic code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|ex_saveorig">Sa_ve original Basic code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -174,7 +174,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Microsoft Excel 97/2000/XP</property>
+            <property name="label" translatable="yes" context="optfltrpage|label2">Microsoft Excel 97/2000/XP</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -206,7 +206,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="pp_basic">
-                    <property name="label" translatable="yes">Load Ba_sic code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|pp_basic">Load Ba_sic code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="pp_saveorig">
-                    <property name="label" translatable="yes">Sav_e original Basic code</property>
+                    <property name="label" translatable="yes" context="optfltrpage|pp_saveorig">Sav_e original Basic code</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -246,7 +246,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Microsoft PowerPoint 97/2000/XP</property>
+            <property name="label" translatable="yes" context="optfltrpage|label3">Microsoft PowerPoint 97/2000/XP</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui
index 99e94ade7879..a315e8277280 100644
--- a/cui/uiconfig/ui/optfontspage.ui
+++ b/cui/uiconfig/ui/optfontspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -56,7 +56,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Font:</property>
+                        <property name="label" translatable="yes" context="optfontspage|label2">_Font:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">font1</property>
                       </object>
@@ -70,7 +70,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Re_place with:</property>
+                        <property name="label" translatable="yes" context="optfontspage|label3">Re_place with:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">font2</property>
                       </object>
@@ -107,7 +107,7 @@
                       <object class="GtkLabel" id="always">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Always</property>
+                        <property name="label" translatable="yes" context="optfontspage|always">Always</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -118,7 +118,7 @@
                       <object class="GtkLabel" id="screenonly">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Screen only</property>
+                        <property name="label" translatable="yes" context="optfontspage|screenonly">Screen only</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -129,7 +129,7 @@
                       <object class="GtkLabel" id="font">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Font</property>
+                        <property name="label" translatable="yes" context="optfontspage|font">Font</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -140,7 +140,7 @@
                       <object class="GtkLabel" id="replacewith">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Replace with</property>
+                        <property name="label" translatable="yes" context="optfontspage|replacewith">Replace with</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -202,7 +202,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="usetable">
-                    <property name="label" translatable="yes">_Apply replacement table</property>
+                    <property name="label" translatable="yes" context="optfontspage|usetable">_Apply replacement table</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -224,7 +224,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Replacement Table</property>
+            <property name="label" translatable="yes" context="optfontspage|label4">Replacement Table</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -263,7 +263,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Fon_ts:</property>
+                    <property name="label" translatable="yes" context="optfontspage|label8">Fon_ts:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fontname</property>
                   </object>
@@ -278,7 +278,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Size:</property>
+                    <property name="label" translatable="yes" context="optfontspage|label9">_Size:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fontheight</property>
                   </object>
@@ -292,7 +292,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Automatic</item>
+                      <item translatable="yes" context="optfontspage|fontname">Automatic</item>
                     </items>
                   </object>
                   <packing>
@@ -302,7 +302,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="nonpropfontonly">
-                    <property name="label" translatable="yes">_Non-proportional fonts only</property>
+                    <property name="label" translatable="yes" context="optfontspage|nonpropfontonly">_Non-proportional fonts only</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -338,7 +338,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Font Settings for HTML, Basic and SQL Sources</property>
+            <property name="label" translatable="yes" context="optfontspage|label1">Font Settings for HTML, Basic and SQL Sources</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui
index ac98e80ba79b..49d383ec4a37 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1583</property>
@@ -28,7 +28,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="exthelp">
-                <property name="label" translatable="yes">_Extended tips</property>
+                <property name="label" translatable="yes" context="optgeneralpage|exthelp">_Extended tips</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -43,7 +43,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Help</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label1">Help</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -74,7 +74,7 @@
                 <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="filedlg">
-                    <property name="label" translatable="yes">_Use %PRODUCTNAME dialogs</property>
+                    <property name="label" translatable="yes" context="optgeneralpage|filedlg">_Use %PRODUCTNAME dialogs</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Open/Save Dialogs</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label2">Open/Save Dialogs</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -134,7 +134,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="printdlg">
-                <property name="label" translatable="yes">Use %PRODUCTNAME _dialogs</property>
+                <property name="label" translatable="yes" context="optgeneralpage|printdlg">Use %PRODUCTNAME _dialogs</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -149,7 +149,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Print Dialogs</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label3">Print Dialogs</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -175,7 +175,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="docstatus">
-                <property name="label" translatable="yes">_Printing sets "document modified" status</property>
+                <property name="label" translatable="yes" context="optgeneralpage|docstatus">_Printing sets "document modified" status</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -190,7 +190,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Document Status</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label4">Document Status</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -223,7 +223,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Interpret as years between </property>
+                    <property name="label" translatable="yes" context="optgeneralpage|label6">_Interpret as years between </property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">year</property>
                     <property name="xalign">0</property>
@@ -249,7 +249,7 @@
                   <object class="GtkLabel" id="toyear">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">and </property>
+                    <property name="label" translatable="yes" context="optgeneralpage|toyear">and </property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -264,7 +264,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Year (Two Digits)</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label5">Year (Two Digits)</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -290,7 +290,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="collectusageinfo">
-                <property name="label" translatable="yes">Collect usage data and send it to The Document Foundation</property>
+                <property name="label" translatable="yes" context="optgeneralpage|collectusageinfo">Collect usage data and send it to The Document Foundation</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
           <object class="GtkLabel" id="label7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Help Improve %PRODUCTNAME</property>
+            <property name="label" translatable="yes" context="optgeneralpage|label7">Help Improve %PRODUCTNAME</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index 7032b399c242..ef063d453fe4 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustsize1">
@@ -87,7 +87,7 @@
                       <object class="GtkLabel" id="size7FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _7:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size7FT">Size _7:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size7</property>
                       </object>
@@ -116,7 +116,7 @@
                       <object class="GtkLabel" id="size6FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _6:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size6FT">Size _6:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size6</property>
                       </object>
@@ -145,7 +145,7 @@
                       <object class="GtkLabel" id="size5FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _5:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size5FT">Size _5:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size5</property>
                       </object>
@@ -174,7 +174,7 @@
                       <object class="GtkLabel" id="size4FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _4:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size4FT">Size _4:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size4</property>
                       </object>
@@ -203,7 +203,7 @@
                       <object class="GtkLabel" id="size3FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _3:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size3FT">Size _3:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size3</property>
                       </object>
@@ -232,7 +232,7 @@
                       <object class="GtkLabel" id="size2FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _2:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size2FT">Size _2:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size2</property>
                       </object>
@@ -261,7 +261,7 @@
                       <object class="GtkLabel" id="size1FT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Size _1:</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|size1FT">Size _1:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">size1</property>
                       </object>
@@ -294,7 +294,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Font Sizes</property>
+                <property name="label" translatable="yes" context="opthtmlpage|label1">Font Sizes</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -344,7 +344,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="ignorefontnames">
-                        <property name="label" translatable="yes">Ignore _font settings</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|ignorefontnames">Ignore _font settings</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -362,7 +362,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="unknowntag">
-                        <property name="label" translatable="yes">_Import unknown HTML tags as fields</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|unknowntag">_Import unknown HTML tags as fields</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -380,7 +380,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="numbersenglishus">
-                        <property name="label" translatable="yes">_Use '%ENGLISHUSLOCALE' locale for numbers</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|numbersenglishus">_Use '%ENGLISHUSLOCALE' locale for numbers</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -404,7 +404,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Import</property>
+                <property name="label" translatable="yes" context="opthtmlpage|label2">Import</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -451,7 +451,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Character _set:</property>
+                            <property name="label" translatable="yes" context="opthtmlpage|charsetFT">Character _set:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">charset</property>
                           </object>
@@ -486,7 +486,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="savegrflocal">
-                        <property name="label" translatable="yes">_Copy local images to Internet</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|savegrflocal">_Copy local images to Internet</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -504,7 +504,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="printextension">
-                        <property name="label" translatable="yes">_Print layout</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|printextension">_Print layout</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -522,7 +522,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="starbasicwarning">
-                        <property name="label" translatable="yes">Display _warning</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|starbasicwarning">Display _warning</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -541,7 +541,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="starbasic">
-                        <property name="label" translatable="yes">LibreOffice _Basic</property>
+                        <property name="label" translatable="yes" context="opthtmlpage|starbasic">LibreOffice _Basic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -565,7 +565,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Export</property>
+                <property name="label" translatable="yes" context="opthtmlpage|label3">Export</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index e40815bef3ed..7c1465e2c7cc 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="OptionsDialog">
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Options</property>
+    <property name="title" translatable="yes" context="optionsdialog|OptionsDialog">Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/cui/uiconfig/ui/optjsearchpage.ui b/cui/uiconfig/ui/optjsearchpage.ui
index 008f2eb8c2eb..96c2773f4aaa 100644
--- a/cui/uiconfig/ui/optjsearchpage.ui
+++ b/cui/uiconfig/ui/optjsearchpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptJSearchPage">
     <property name="visible">True</property>
@@ -30,7 +30,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="matchcase">
-                    <property name="label" translatable="yes">_uppercase/lowercase</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchcase">_uppercase/lowercase</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -47,7 +47,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchfullhalfwidth">
-                    <property name="label" translatable="yes">_full-width/half-width forms</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchfullhalfwidth">_full-width/half-width forms</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchhiraganakatakana">
-                    <property name="label" translatable="yes">_hiragana/katakana</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchhiraganakatakana">_hiragana/katakana</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -81,7 +81,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchcontractions">
-                    <property name="label" translatable="yes">_contractions (yo-on, sokuon)</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchcontractions">_contractions (yo-on, sokuon)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -98,7 +98,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchminusdashchoon">
-                    <property name="label" translatable="yes">_minus/dash/cho-on</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchminusdashchoon">_minus/dash/cho-on</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchrepeatcharmarks">
-                    <property name="label" translatable="yes">'re_peat character' marks</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchrepeatcharmarks">'re_peat character' marks</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -132,7 +132,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchvariantformkanji">
-                    <property name="label" translatable="yes">_variant-form kanji (itaiji)</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchvariantformkanji">_variant-form kanji (itaiji)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -149,7 +149,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matcholdkanaforms">
-                    <property name="label" translatable="yes">_old Kana forms</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matcholdkanaforms">_old Kana forms</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchdiziduzu">
-                    <property name="label" translatable="yes">_di/zi, du/zu</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchdiziduzu">_di/zi, du/zu</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchbavahafa">
-                    <property name="label" translatable="yes">_ba/va, ha/fa</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchbavahafa">_ba/va, ha/fa</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -200,7 +200,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchtsithichidhizi">
-                    <property name="label" translatable="yes">_tsi/thi/chi, dhi/zi</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchtsithichidhizi">_tsi/thi/chi, dhi/zi</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -217,7 +217,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchhyuiyubyuvyu">
-                    <property name="label" translatable="yes">h_yu/fyu, byu/vyu</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchhyuiyubyuvyu">h_yu/fyu, byu/vyu</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchseshezeje">
-                    <property name="label" translatable="yes">_se/she, ze/je</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchseshezeje">_se/she, ze/je</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -251,7 +251,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchiaiya">
-                    <property name="label" translatable="yes">_ia/iya (piano/piyano)</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchiaiya">_ia/iya (piano/piyano)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -268,7 +268,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchkiku">
-                    <property name="label" translatable="yes">_ki/ku (tekisuto/tekusuto)</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchkiku">_ki/ku (tekisuto/tekusuto)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -285,7 +285,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="matchprolongedsoundmark">
-                    <property name="label" translatable="yes">Prolon_ged vowels (ka-/kaa)</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|matchprolongedsoundmark">Prolon_ged vowels (ka-/kaa)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -308,7 +308,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Treat as Equal</property>
+            <property name="label" translatable="yes" context="optjsearchpage|label1">Treat as Equal</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -342,7 +342,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="ignorepunctuation">
-                    <property name="label" translatable="yes">Pu_nctuation characters</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|ignorepunctuation">Pu_nctuation characters</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -359,7 +359,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ignorewhitespace">
-                    <property name="label" translatable="yes">_Whitespace characters</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|ignorewhitespace">_Whitespace characters</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -376,7 +376,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ignoremiddledot">
-                    <property name="label" translatable="yes">Midd_le dots</property>
+                    <property name="label" translatable="yes" context="optjsearchpage|ignoremiddledot">Midd_le dots</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -402,7 +402,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Ignore</property>
+            <property name="label" translatable="yes" context="optjsearchpage|label2">Ignore</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui
index f642c47f5473..20845a3231cd 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="OptLanguagesPage">
@@ -34,7 +34,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_User interface:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|label4">_User interface:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">userinterface</property>
                   </object>
@@ -48,7 +48,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Locale setting:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|localesettingFT">Locale setting:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">localesetting</property>
                   </object>
@@ -62,7 +62,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Decimal separator key:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|label6">Decimal separator key:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">decimalseparator</property>
                   </object>
@@ -76,7 +76,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Default currency:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|defaultcurrency">_Default currency:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">currencylb</property>
                   </object>
@@ -90,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Date acceptance _patterns:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|dataaccpatterns">Date acceptance _patterns:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">datepatterns</property>
                   </object>
@@ -151,7 +151,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="decimalseparator">
-                    <property name="label" translatable="yes">_Same as locale setting ( %1 )</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|decimalseparator">_Same as locale setting ( %1 )</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Language Of</property>
+            <property name="label" translatable="yes" context="optlanguagespage|label1">Language Of</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -243,7 +243,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="currentdoc">
-                    <property name="label" translatable="yes">For the current document only</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|currentdoc">For the current document only</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -259,7 +259,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ctlsupport">
-                    <property name="label" translatable="yes">Complex _text layout:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|ctlsupport">Complex _text layout:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -274,7 +274,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="asiansupport">
-                    <property name="label" translatable="yes">Asian:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|asiansupport">Asian:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -292,7 +292,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Western:</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|western">Western:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">westernlanguage</property>
                   </object>
@@ -309,7 +309,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Default Languages for Documents</property>
+            <property name="label" translatable="yes" context="optlanguagespage|label2">Default Languages for Documents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -340,7 +340,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="ignorelanguagechange">
-                    <property name="label" translatable="yes">Ignore s_ystem input language</property>
+                    <property name="label" translatable="yes" context="optlanguagespage|ignorelanguagechange">Ignore s_ystem input language</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -361,7 +361,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Enhanced Language Support</property>
+            <property name="label" translatable="yes" context="optlanguagespage|label3">Enhanced Language Support</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index 5034a5df4088..8ffee5e470b5 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="OptLinguPage">
@@ -44,7 +44,7 @@
                       <object class="GtkLabel" id="lingumodulesft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Available language modules:</property>
+                        <property name="label" translatable="yes" context="optlingupage|lingumodulesft">_Available language modules:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lingumodules:border</property>
                         <property name="xalign">0</property>
@@ -71,7 +71,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="lingumodulesedit">
-                        <property name="label" translatable="yes">_Edit...</property>
+                        <property name="label" translatable="yes" context="optlingupage|lingumodulesedit">_Edit...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -79,7 +79,7 @@
                         <property name="use_underline">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="lingumodulesedit-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Edit Available language modules</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|lingumodulesedit-atkobject">Edit Available language modules</property>
                           </object>
                         </child>
                       </object>
@@ -109,7 +109,7 @@
                       <object class="GtkLabel" id="lingudictsft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_User-defined dictionaries:</property>
+                        <property name="label" translatable="yes" context="optlingupage|lingudictsft">_User-defined dictionaries:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">lingudicts:border</property>
                         <property name="xalign">0</property>
@@ -143,7 +143,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="lingudictsnew">
-                            <property name="label" translatable="yes">_New...</property>
+                            <property name="label" translatable="yes" context="optlingupage|lingudictsnew">_New...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -157,14 +157,14 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="lingudictsedit">
-                            <property name="label" translatable="yes">Ed_it...</property>
+                            <property name="label" translatable="yes" context="optlingupage|lingudictsedit">Ed_it...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="lingudictsedit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Edit User-defined dictionaries</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|lingudictsedit-atkobject">Edit User-defined dictionaries</property>
                               </object>
                             </child>
                           </object>
@@ -176,7 +176,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="lingudictsdelete">
-                            <property name="label" translatable="yes">_Delete</property>
+                            <property name="label" translatable="yes" context="optlingupage|lingudictsdelete">_Delete</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -215,7 +215,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Options:</property>
+                        <property name="label" translatable="yes" context="optlingupage|label4">_Options:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linguoptions:border</property>
                         <property name="xalign">0</property>
@@ -227,7 +227,7 @@
                     </child>
                     <child>
                       <object class="GtkLinkButton" id="moredictslink">
-                        <property name="label" translatable="yes">Get more dictionaries online...</property>
+                        <property name="label" translatable="yes" context="optlingupage|moredictslink">Get more dictionaries online...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -259,7 +259,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="linguoptionsedit">
-                        <property name="label" translatable="yes">Edi_t...</property>
+                        <property name="label" translatable="yes" context="optlingupage|linguoptionsedit">Edi_t...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -267,7 +267,7 @@
                         <property name="use_underline">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="linguoptionsedit-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Edit Options</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="optlingupage|linguoptionsedit-atkobject">Edit Options</property>
                           </object>
                         </child>
                       </object>
@@ -293,7 +293,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Writing Aids</property>
+            <property name="label" translatable="yes" context="optlingupage|label1">Writing Aids</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index 38953cde10bb..736e25b82a58 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -51,7 +51,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Use for %PRODUCTNAME:</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label6">_Use for %PRODUCTNAME:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">graphiccache</property>
                     <property name="xalign">1</property>
@@ -65,7 +65,7 @@
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Memory per object:</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label7">_Memory per object:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">objectcache</property>
                     <property name="xalign">1</property>
@@ -79,7 +79,7 @@
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Remove _from memory after:</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label8">Remove _from memory after:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">objecttime:hh:mm</property>
                     <property name="xalign">1</property>
@@ -93,7 +93,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">MB</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label9">MB</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -105,7 +105,7 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">MB</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label10">MB</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">hh:mm</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label12">hh:mm</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -167,7 +167,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Image Cache</property>
+            <property name="label" translatable="yes" context="optmemorypage|label2">Image Cache</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -213,7 +213,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Number of objects:</property>
+                    <property name="label" translatable="yes" context="optmemorypage|label11">Number of objects:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">olecache</property>
                     <property name="xalign">1</property>
@@ -231,7 +231,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Cache for Inserted Objects</property>
+            <property name="label" translatable="yes" context="optmemorypage|label3">Cache for Inserted Objects</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -263,7 +263,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="quicklaunch">
-                    <property name="label" translatable="yes">Load %PRODUCTNAME during system start-up</property>
+                    <property name="label" translatable="yes" context="optmemorypage|quicklaunch">Load %PRODUCTNAME during system start-up</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -277,7 +277,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="systray">
-                    <property name="label" translatable="yes">Enable systray Quickstarter</property>
+                    <property name="label" translatable="yes" context="optmemorypage|systray">Enable systray Quickstarter</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -297,7 +297,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">%PRODUCTNAME Quickstarter</property>
+            <property name="label" translatable="yes" context="optmemorypage|label4">%PRODUCTNAME Quickstarter</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui b/cui/uiconfig/ui/optnewdictionarydialog.ui
index b5a78e54f7e6..ebcde4147fa1 100644
--- a/cui/uiconfig/ui/optnewdictionarydialog.ui
+++ b/cui/uiconfig/ui/optnewdictionarydialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="OptNewDictionaryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Dictionary</property>
+    <property name="title" translatable="yes" context="optnewdictionarydialog|OptNewDictionaryDialog">New Dictionary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -118,7 +118,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Name:</property>
+                        <property name="label" translatable="yes" context="optnewdictionarydialog|name_label">_Name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">nameedit</property>
                       </object>
@@ -132,7 +132,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Language:</property>
+                        <property name="label" translatable="yes" context="optnewdictionarydialog|language_label">_Language:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">language</property>
                       </object>
@@ -143,7 +143,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="except">
-                        <property name="label" translatable="yes">_Exception (-)</property>
+                        <property name="label" translatable="yes" context="optnewdictionarydialog|except">_Exception (-)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Dictionary</property>
+                <property name="label" translatable="yes" context="optnewdictionarydialog|label1">Dictionary</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
index fca1c9906b79..cd70c881f57c 100644
--- a/cui/uiconfig/ui/optonlineupdatepage.ui
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="OptOnlineUpdatePage">
     <property name="visible">True</property>
@@ -25,7 +25,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="autocheck">
-                <property name="label" translatable="yes">_Check for updates automatically</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|autocheck">_Check for updates automatically</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="everyday">
-                        <property name="label" translatable="yes">Every da_y</property>
+                        <property name="label" translatable="yes" context="optonlineupdatepage|everyday">Every da_y</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="everyweek">
-                        <property name="label" translatable="yes">Every _week</property>
+                        <property name="label" translatable="yes" context="optonlineupdatepage|everyweek">Every _week</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -84,7 +84,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="everymonth">
-                        <property name="label" translatable="yes">Every _month</property>
+                        <property name="label" translatable="yes" context="optonlineupdatepage|everymonth">Every _month</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="lastchecked">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Last checked: %DATE%, %TIME%</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|lastchecked">Last checked: %DATE%, %TIME%</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -122,7 +122,7 @@
             </child>
             <child>
               <object class="GtkButton" id="checknow">
-                <property name="label" translatable="yes">Check _Now</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|checknow">Check _Now</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -137,7 +137,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="autodownload">
-                <property name="label" translatable="yes">_Download updates automatically</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|autodownload">_Download updates automatically</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -169,7 +169,7 @@
                       <object class="GtkLabel" id="destpathlabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Download destination:</property>
+                        <property name="label" translatable="yes" context="optonlineupdatepage|destpathlabel">Download destination:</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -179,7 +179,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="changepath">
-                        <property name="label" translatable="yes">Ch_ange...</property>
+                        <property name="label" translatable="yes" context="optonlineupdatepage|changepath">Ch_ange...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -217,11 +217,11 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="extrabits">
-                <property name="label" translatable="yes">_Send OS version and basic hardware information</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|extrabits">_Send OS version and basic hardware information</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">This information lets us make optimizations for your hardware and operating system.</property>
+                <property name="tooltip_text" translatable="yes" context="optonlineupdatepage|extrabits|tooltip_text">This information lets us make optimizations for your hardware and operating system.</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -241,7 +241,7 @@
                   <object class="GtkLabel" id="useragent_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">User Agent:</property>
+                    <property name="label" translatable="yes" context="optonlineupdatepage|useragent_label">User Agent:</property>
                     <property name="yalign">0</property>
                   </object>
                   <packing>
@@ -253,7 +253,7 @@
                 <child>
                   <object class="GtkLabel" id="useragent_changed">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Hit apply to update</property>
+                    <property name="label" translatable="yes" context="optonlineupdatepage|useragent_changed">Hit apply to update</property>
                     <property name="yalign">0</property>
                   </object>
                   <packing>
@@ -285,7 +285,7 @@
               <object class="GtkLabel" id="neverchecked">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Last checked: Not yet</property>
+                <property name="label" translatable="yes" context="optonlineupdatepage|neverchecked">Last checked: Not yet</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -302,7 +302,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Online Update Options</property>
+        <property name="label" translatable="yes" context="optonlineupdatepage|label1">Online Update Options</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui
index 86eee5774d6e..3408825fd3b0 100644
--- a/cui/uiconfig/ui/optopenclpage.ui
+++ b/cui/uiconfig/ui/optopenclpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkFrame" id="OptOpenCLPage">
@@ -27,7 +27,7 @@
             <property name="spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="useswinterpreter">
-                <property name="label" translatable="yes">Allow use of Software Interpreter (even when OpenCL is not available)</property>
+                <property name="label" translatable="yes" context="optopenclpage|useswinterpreter">Allow use of Software Interpreter (even when OpenCL is not available)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -43,7 +43,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="useopencl">
-                <property name="label" translatable="yes">Allow use of OpenCL</property>
+                <property name="label" translatable="yes" context="optopenclpage|useopencl">Allow use of OpenCL</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -61,7 +61,7 @@
               <object class="GtkLabel" id="openclused">
                 <property name="visible">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">OpenCL is available for use.</property>
+                <property name="label" translatable="yes" context="optopenclpage|openclused">OpenCL is available for use.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -73,7 +73,7 @@
               <object class="GtkLabel" id="openclnotused">
                 <property name="visible">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">OpenCL is not used.</property>
+                <property name="label" translatable="yes" context="optopenclpage|openclnotused">OpenCL is not used.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -89,7 +89,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">OpenCL Options</property>
+        <property name="label" translatable="yes" context="optopenclpage|label1">OpenCL Options</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index 887904d5707d..0a24ebc201c2 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptPathsPage">
     <property name="visible">True</property>
@@ -37,7 +37,7 @@
                       <object class="GtkLabel" id="type">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Type</property>
+                        <property name="label" translatable="yes" context="optpathspage|type">Type</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -50,7 +50,7 @@
                       <object class="GtkLabel" id="path">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Path</property>
+                        <property name="label" translatable="yes" context="optpathspage|path">Path</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -63,7 +63,7 @@
                       <object class="GtkLabel" id="editpaths">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Edit Paths: %1</property>
+                        <property name="label" translatable="yes" context="optpathspage|editpaths">Edit Paths: %1</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -113,7 +113,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Paths used by %PRODUCTNAME</property>
+            <property name="label" translatable="yes" context="optpathspage|label1">Paths used by %PRODUCTNAME</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -134,7 +134,7 @@
         <property name="layout_style">end</property>
         <child>
           <object class="GtkButton" id="default">
-            <property name="label" translatable="yes">_Default</property>
+            <property name="label" translatable="yes" context="optpathspage|default">_Default</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -148,7 +148,7 @@
         </child>
         <child>
           <object class="GtkButton" id="edit">
-            <property name="label" translatable="yes">_Edit...</property>
+            <property name="label" translatable="yes" context="optpathspage|edit">_Edit...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui
index 46d0dcaef9ed..c2ea4b11d3c2 100644
--- a/cui/uiconfig/ui/optproxypage.ui
+++ b/cui/uiconfig/ui/optproxypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkFrame" id="OptProxyPage">
@@ -29,7 +29,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Proxy s_erver:</property>
+                <property name="label" translatable="yes" context="optproxypage|label2">Proxy s_erver:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">proxymode</property>
               </object>
@@ -135,9 +135,9 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <items>
-                  <item translatable="yes">None</item>
-                  <item translatable="yes">System</item>
-                  <item translatable="yes">Manual</item>
+                  <item translatable="yes" context="optproxypage|proxymode">None</item>
+                  <item translatable="yes" context="optproxypage|proxymode">System</item>
+                  <item translatable="yes" context="optproxypage|proxymode">Manual</item>
                 </items>
               </object>
               <packing>
@@ -150,7 +150,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">HT_TP proxy:</property>
+                <property name="label" translatable="yes" context="optproxypage|httpft">HT_TP proxy:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">http</property>
               </object>
@@ -163,7 +163,7 @@
               <object class="GtkLabel" id="httpportft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Port:</property>
+                <property name="label" translatable="yes" context="optproxypage|httpportft">_Port:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">httpport</property>
               </object>
@@ -177,7 +177,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">HTTP_S proxy:</property>
+                <property name="label" translatable="yes" context="optproxypage|httpsft">HTTP_S proxy:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">https</property>
               </object>
@@ -191,7 +191,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_FTP proxy:</property>
+                <property name="label" translatable="yes" context="optproxypage|ftpft">_FTP proxy:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ftp</property>
               </object>
@@ -205,7 +205,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_No proxy for:</property>
+                <property name="label" translatable="yes" context="optproxypage|noproxyft">_No proxy for:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">noproxy</property>
               </object>
@@ -218,7 +218,7 @@
               <object class="GtkLabel" id="httpsportft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">P_ort:</property>
+                <property name="label" translatable="yes" context="optproxypage|httpsportft">P_ort:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">httpsport</property>
               </object>
@@ -231,7 +231,7 @@
               <object class="GtkLabel" id="ftpportft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">P_ort:</property>
+                <property name="label" translatable="yes" context="optproxypage|ftpportft">P_ort:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ftpport</property>
               </object>
@@ -245,7 +245,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Separator ;</property>
+                <property name="label" translatable="yes" context="optproxypage|noproxydesc">Separator ;</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -267,7 +267,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Settings</property>
+        <property name="label" translatable="yes" context="optproxypage|label1">Settings</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index 9a6b81ef1416..9438d03d334c 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -33,7 +33,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="load_docprinter">
-                    <property name="label" translatable="yes">Load printer settings with the document</property>
+                    <property name="label" translatable="yes" context="optsavepage|load_docprinter">Load printer settings with the document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -49,7 +49,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="load_settings">
-                    <property name="label" translatable="yes">Load user-specific settings with the document</property>
+                    <property name="label" translatable="yes" context="optsavepage|load_settings">Load user-specific settings with the document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Load</property>
+            <property name="label" translatable="yes" context="optsavepage|label1">Load</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -108,7 +108,7 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="autosave">
-                        <property name="label" translatable="yes">Save _AutoRecovery information every:</property>
+                        <property name="label" translatable="yes" context="optsavepage|autosave">Save _AutoRecovery information every:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
                       <object class="GtkLabel" id="autosave_mins">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">minutes</property>
+                        <property name="label" translatable="yes" context="optsavepage|autosave_mins">minutes</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -152,7 +152,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="userautosave">
-                    <property name="label" translatable="yes">Automatically save the document too</property>
+                    <property name="label" translatable="yes" context="optsavepage|userautosave">Automatically save the document too</property>
                     <property name="visible">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -168,7 +168,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="relative_fsys">
-                    <property name="label" translatable="yes">Save URLs relative to file system</property>
+                    <property name="label" translatable="yes" context="optsavepage|relative_fsys">Save URLs relative to file system</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="docinfo">
-                    <property name="label" translatable="yes">_Edit document properties before saving</property>
+                    <property name="label" translatable="yes" context="optsavepage|docinfo">_Edit document properties before saving</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -198,7 +198,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="relative_inet">
-                    <property name="label" translatable="yes">Save URLs relative to internet</property>
+                    <property name="label" translatable="yes" context="optsavepage|relative_inet">Save URLs relative to internet</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -213,7 +213,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="backup">
-                    <property name="label" translatable="yes">Al_ways create backup copy</property>
+                    <property name="label" translatable="yes" context="optsavepage|backup">Al_ways create backup copy</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Save</property>
+            <property name="label" translatable="yes" context="optsavepage|label2">Save</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -266,7 +266,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="warnalienformat">
-                    <property name="label" translatable="yes">Warn when not saving in ODF or default format</property>
+                    <property name="label" translatable="yes" context="optsavepage|warnalienformat">Warn when not saving in ODF or default format</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -290,7 +290,7 @@
                       <object class="GtkLabel" id="odfwarning_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="EN-US, the term 'extended' must not be translated.">Not using ODF 1.2 Extended may cause information to be lost.</property>
+                        <property name="label" translatable="yes" context="optsavepage|odfwarning_label" comments="EN-US, the term 'extended' must not be translated.">Not using ODF 1.2 Extended may cause information to be lost.</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -320,10 +320,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">1.0/1.1</item>
-                      <item translatable="yes">1.2</item>
-                      <item translatable="yes">1.2 Extended (compatibility mode)</item>
-                      <item translatable="yes">1.2 Extended (recommended)</item>
+                      <item translatable="yes" context="optsavepage|odfversion">1.0/1.1</item>
+                      <item translatable="yes" context="optsavepage|odfversion">1.2</item>
+                      <item translatable="yes" context="optsavepage|odfversion">1.2 Extended (compatibility mode)</item>
+                      <item translatable="yes" context="optsavepage|odfversion">1.2 Extended (recommended)</item>
                     </items>
                   </object>
                   <packing>
@@ -336,7 +336,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ODF format version:</property>
+                    <property name="label" translatable="yes" context="optsavepage|label5">ODF format version:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">odfversion</property>
                   </object>
@@ -350,7 +350,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Always sa_ve as:</property>
+                    <property name="label" translatable="yes" context="optsavepage|saveas_label">Always sa_ve as:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">saveas</property>
                   </object>
@@ -364,13 +364,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Text document</item>
-                      <item translatable="yes">HTML document</item>
-                      <item translatable="yes">Master document</item>
-                      <item translatable="yes">Spreadsheet</item>
-                      <item translatable="yes">Presentation</item>
-                      <item translatable="yes">Drawing</item>
-                      <item translatable="yes">Formula</item>
+                      <item translatable="yes" context="optsavepage|doctype">Text document</item>
+                      <item translatable="yes" context="optsavepage|doctype">HTML document</item>
+                      <item translatable="yes" context="optsavepage|doctype">Master document</item>
+                      <item translatable="yes" context="optsavepage|doctype">Spreadsheet</item>
+                      <item translatable="yes" context="optsavepage|doctype">Presentation</item>
+                      <item translatable="yes" context="optsavepage|doctype">Drawing</item>
+                      <item translatable="yes" context="optsavepage|doctype">Formula</item>
                     </items>
                   </object>
                   <packing>
@@ -393,7 +393,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">D_ocument type:</property>
+                    <property name="label" translatable="yes" context="optsavepage|label6">D_ocument type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">doctype</property>
                   </object>
@@ -410,7 +410,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Default File Format and ODF Settings</property>
+            <property name="label" translatable="yes" context="optsavepage|label3">Default File Format and ODF Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui
index 121af49d8b5b..13feb26c8921 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="OptSecurityPage">
     <property name="visible">True</property>
@@ -33,7 +33,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export.</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|label9">Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">56</property>
                   </object>
@@ -46,7 +46,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="tsas">
-                    <property name="label" translatable="yes">_TSAs...</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|tsas">_TSAs...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -68,7 +68,7 @@
           <object class="GtkLabel" id="label10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">TSAs</property>
+            <property name="label" translatable="yes" context="optsecuritypage|label10">TSAs</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -108,7 +108,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Select the Network Security Services certificate directory to use for digital signatures.</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|label7">Select the Network Security Services certificate directory to use for digital signatures.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">56</property>
                   </object>
@@ -121,7 +121,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="cert">
-                    <property name="label" translatable="yes">_Certificate...</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|cert">_Certificate...</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="label8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Certificate Path</property>
+            <property name="label" translatable="yes" context="optsecuritypage|label8">Certificate Path</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -183,7 +183,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Adjust the security level for executing macros and specify trusted macro developers.</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|label5">Adjust the security level for executing macros and specify trusted macro developers.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">56</property>
                   </object>
@@ -196,7 +196,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="macro">
-                    <property name="label" translatable="yes">Macro Securit_y...</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|macro">Macro Securit_y...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -218,7 +218,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Macro Security</property>
+            <property name="label" translatable="yes" context="optsecuritypage|label3">Macro Security</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -260,7 +260,7 @@
                     <property name="row_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="savepassword:wrap">
-                        <property name="label" translatable="yes">Persistently _save passwords for web connections</property>
+                        <property name="label" translatable="yes" context="optsecuritypage|savepassword">Persistently _save passwords for web connections</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -289,7 +289,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="usemasterpassword">
-                                <property name="label" translatable="yes">Protected _by a master password (recommended)</property>
+                                <property name="label" translatable="yes" context="optsecuritypage|usemasterpassword">Protected _by a master password (recommended)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -310,7 +310,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
+                                <property name="label" translatable="yes" context="optsecuritypage|masterpasswordtext">Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
                                 <property name="wrap">True</property>
                                 <property name="max_width_chars">56</property>
                               </object>
@@ -327,7 +327,7 @@
                                 <property name="no_show_all">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.
+                                <property name="label" translatable="yes" context="optsecuritypage|nopasswordsave">Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.
 
 Do you want to delete password list and reset master password?</property>
                                 <property name="wrap">True</property>
@@ -364,7 +364,7 @@ Do you want to delete password list and reset master password?</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="connections">
-                        <property name="label" translatable="yes">Connect_ions...</property>
+                        <property name="label" translatable="yes" context="optsecuritypage|connections">Connect_ions...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -381,7 +381,7 @@ Do you want to delete password list and reset master password?</property>
                     </child>
                     <child>
                       <object class="GtkButton" id="masterpassword">
-                        <property name="label" translatable="yes">_Master Password...</property>
+                        <property name="label" translatable="yes" context="optsecuritypage|masterpassword">_Master Password...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -412,7 +412,7 @@ Do you want to delete password list and reset master password?</property>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Passwords for Web Connections</property>
+            <property name="label" translatable="yes" context="optsecuritypage|label2">Passwords for Web Connections</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -452,7 +452,7 @@ Do you want to delete password list and reset master password?</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Adjust security related options and define warnings for hidden information in documents.  </property>
+                    <property name="label" translatable="yes" context="optsecuritypage|label4">Adjust security related options and define warnings for hidden information in documents.  </property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">56</property>
                   </object>
@@ -465,7 +465,7 @@ Do you want to delete password list and reset master password?</property>
                 </child>
                 <child>
                   <object class="GtkButton" id="options">
-                    <property name="label" translatable="yes">O_ptions...</property>
+                    <property name="label" translatable="yes" context="optsecuritypage|options">O_ptions...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -487,7 +487,7 @@ Do you want to delete password list and reset master password?</property>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Security Options and Warnings</property>
+            <property name="label" translatable="yes" context="optsecuritypage|label1">Security Options and Warnings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 93a7db478f96..61245f6fb3b8 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="OptUserPage">
     <property name="visible">True</property>
@@ -25,7 +25,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Company:</property>
+                <property name="label" translatable="yes" context="optuserpage|companyft">_Company:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">company</property>
               </object>
@@ -39,7 +39,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">First/last _name/initials:</property>
+                <property name="label" translatable="yes" context="optuserpage|nameft">First/last _name/initials:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">firstname</property>
               </object>
@@ -53,7 +53,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Street:</property>
+                <property name="label" translatable="yes" context="optuserpage|streetft">_Street:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">street</property>
               </object>
@@ -67,7 +67,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">City/state/_zip:</property>
+                <property name="label" translatable="yes" context="optuserpage|cityft">City/state/_zip:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">city</property>
               </object>
@@ -81,7 +81,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Country/re_gion:</property>
+                <property name="label" translatable="yes" context="optuserpage|countryft">Country/re_gion:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">country</property>
               </object>
@@ -95,7 +95,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Title/position:</property>
+                <property name="label" translatable="yes" context="optuserpage|titleft">_Title/position:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">title</property>
               </object>
@@ -109,12 +109,12 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Telephone (home/_work):</property>
+                <property name="label" translatable="yes" context="optuserpage|phoneft">Telephone (home/_work):</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">home</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="phoneft-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+                    <property name="AtkObject::accessible-description" translatable="yes" context="optuserpage|phoneft-atkobject">Home telephone number</property>
                   </object>
                 </child>
               </object>
@@ -128,7 +128,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Fa_x/e-mail:</property>
+                <property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/e-mail:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">fax</property>
               </object>
@@ -151,7 +151,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="firstname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|firstname-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -169,7 +169,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="lastname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|lastname-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -187,7 +187,7 @@
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="shortname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|shortname-atkobject">Initials</property>
                       </object>
                     </child>
                   </object>
@@ -216,7 +216,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="city-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">City</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|city-atkobject">City</property>
                       </object>
                     </child>
                   </object>
@@ -234,7 +234,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="state-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">State</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|state-atkobject">State</property>
                       </object>
                     </child>
                   </object>
@@ -252,7 +252,7 @@
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="zip-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|zip-atkobject">Zip code</property>
                       </object>
                     </child>
                   </object>
@@ -282,7 +282,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="title-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|title-atkobject">Title</property>
                       </object>
                     </child>
                   </object>
@@ -300,7 +300,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="position-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|position-atkobject">Position</property>
                       </object>
                     </child>
                   </object>
@@ -329,7 +329,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="home-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|home-atkobject">Home telephone number</property>
                       </object>
                     </child>
                   </object>
@@ -347,7 +347,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="work-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Work telephone number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|work-atkobject">Work telephone number</property>
                       </object>
                     </child>
                   </object>
@@ -377,7 +377,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="fax-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|fax-atkobject">FAX number</property>
                       </object>
                     </child>
                   </object>
@@ -395,7 +395,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="email-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|email-atkobject">email address</property>
                       </object>
                     </child>
                   </object>
@@ -412,7 +412,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="usefordocprop">
-                <property name="label" translatable="yes">Use data for document properties</property>
+                <property name="label" translatable="yes" context="optuserpage|usefordocprop">Use data for document properties</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -429,7 +429,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Last name/first _name/father’s name/initials:</property>
+                <property name="label" translatable="yes" context="optuserpage|rusnameft">Last name/first _name/father’s name/initials:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">ruslastname</property>
               </object>
@@ -452,7 +452,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="ruslastname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|ruslastname-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -470,7 +470,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="rusfathersname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Father's name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|rusfathersname-atkobject">Father's name</property>
                       </object>
                     </child>
                   </object>
@@ -488,7 +488,7 @@
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="russhortname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|russhortname-atkobject">Initials</property>
                       </object>
                     </child>
                   </object>
@@ -506,7 +506,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="rusfirstname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|rusfirstname-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -526,7 +526,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Last/first _name/initials:</property>
+                <property name="label" translatable="yes" context="optuserpage|eastnameft">Last/first _name/initials:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">eastlastname</property>
               </object>
@@ -549,7 +549,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="eastlastname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|eastlastname-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -567,7 +567,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="eastfirstname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|eastfirstname-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -585,7 +585,7 @@
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="eastshortname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|eastshortname-atkobject">Initials</property>
                       </object>
                     </child>
                   </object>
@@ -605,7 +605,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Street/apartment number:</property>
+                <property name="label" translatable="yes" context="optuserpage|russtreetft">_Street/apartment number:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">russtreet</property>
               </object>
@@ -628,7 +628,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="russtreet-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Street</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|russtreet-atkobject">Street</property>
                       </object>
                     </child>
                   </object>
@@ -646,7 +646,7 @@
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="apartnum-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Apartment number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|apartnum-atkobject">Apartment number</property>
                       </object>
                     </child>
                   </object>
@@ -666,7 +666,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Zip/city:</property>
+                <property name="label" translatable="yes" context="optuserpage|icityft">_Zip/city:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">izip</property>
               </object>
@@ -689,7 +689,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="icity-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">City</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|icity-atkobject">City</property>
                       </object>
                     </child>
                   </object>
@@ -707,7 +707,7 @@
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="izip-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|izip-atkobject">Zip code</property>
                       </object>
                     </child>
                   </object>
@@ -805,7 +805,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Address</property>
+        <property name="label" translatable="yes" context="optuserpage|label1">Address</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index fc75fc821e9d..56d227d55b38 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">80</property>
@@ -44,11 +44,11 @@
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Requires restart</property>
+                    <property name="tooltip_text" translatable="yes" context="optviewpage|grid3|tooltip_text">Requires restart</property>
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="useaccel">
-                        <property name="label" translatable="yes">Use hard_ware acceleration</property>
+                        <property name="label" translatable="yes" context="optviewpage|useaccel">Use hard_ware acceleration</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="GtkCheckButton" id="useaa">
-                        <property name="label" translatable="yes">Use anti-a_liasing</property>
+                        <property name="label" translatable="yes" context="optviewpage|useaa">Use anti-a_liasing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -78,7 +78,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="useopengl">
-                        <property name="label" translatable="yes">Use OpenGL for all rendering</property>
+                        <property name="label" translatable="yes" context="optviewpage|useopengl">Use OpenGL for all rendering</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -92,11 +92,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="forceopengl">
-                        <property name="label" translatable="yes">Ignore OpenGL blacklist</property>
+                        <property name="label" translatable="yes" context="optviewpage|forceopengl">Ignore OpenGL blacklist</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Requires restart. Enabling this may expose driver bugs</property>
+                        <property name="tooltip_text" translatable="yes" context="optviewpage|forceopengl|tooltip_text">Requires restart. Enabling this may expose driver bugs</property>
                         <property name="margin_left">12</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -110,7 +110,7 @@
                       <object class="GtkLabel" id="openglenabled">
                         <property name="can_focus">False</property>
                         <property name="margin_left">12</property>
-                        <property name="label" translatable="yes">GL is currently enabled.</property>
+                        <property name="label" translatable="yes" context="optviewpage|openglenabled">GL is currently enabled.</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -122,7 +122,7 @@
                       <object class="GtkLabel" id="opengldisabled">
                         <property name="can_focus">False</property>
                         <property name="margin_left">12</property>
-                        <property name="label" translatable="yes">GL is currently disabled.</property>
+                        <property name="label" translatable="yes" context="optviewpage|opengldisabled">GL is currently disabled.</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Graphics Output</property>
+                <property name="label" translatable="yes" context="optviewpage|label2">Graphics Output</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -172,7 +172,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Icons in men_us:</property>
+                        <property name="label" translatable="yes" context="optviewpage|label13">Icons in men_us:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">menuicons</property>
                       </object>
@@ -186,9 +186,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Automatic</item>
-                          <item translatable="yes">Hide</item>
-                          <item translatable="yes">Show</item>
+                          <item translatable="yes" context="optviewpage|contextmenushortcuts">Automatic</item>
+                          <item translatable="yes" context="optviewpage|contextmenushortcuts">Hide</item>
+                          <item translatable="yes" context="optviewpage|contextmenushortcuts">Show</item>
                         </items>
                       </object>
                       <packing>
@@ -201,7 +201,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Shortcuts in context menus:</property>
+                        <property name="label" translatable="yes" context="optviewpage|label10">Shortcuts in context menus:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">contextmenushortcuts</property>
                       </object>
@@ -215,9 +215,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Automatic</item>
-                          <item translatable="yes">Hide</item>
-                          <item translatable="yes">Show</item>
+                          <item translatable="yes" context="optviewpage|menuicons">Automatic</item>
+                          <item translatable="yes" context="optviewpage|menuicons">Hide</item>
+                          <item translatable="yes" context="optviewpage|menuicons">Show</item>
                         </items>
                       </object>
                       <packing>
@@ -233,7 +233,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Menu</property>
+                <property name="label" translatable="yes" context="optviewpage|label3">Menu</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -264,7 +264,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="showfontpreview">
-                        <property name="label" translatable="yes">Show p_review of fonts</property>
+                        <property name="label" translatable="yes" context="optviewpage|showfontpreview">Show p_review of fonts</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -285,7 +285,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Font Lists</property>
+                <property name="label" translatable="yes" context="optviewpage|label5">Font Lists</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -340,7 +340,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Toolbar icon _size:</property>
+                            <property name="label" translatable="yes" context="optviewpage|label8">Toolbar icon _size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">iconsize</property>
                           </object>
@@ -355,16 +355,16 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Galaxy</item>
-                              <item translatable="yes">High Contrast</item>
-                              <item translatable="yes">Crystal</item>
-                              <item translatable="yes">Tango</item>
-                              <item translatable="yes">Oxygen</item>
-                              <item translatable="yes">Classic</item>
-                              <item translatable="yes">Sifr</item>
-                              <item translatable="yes">Breeze</item>
-                              <item translatable="yes">Tango Testing</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Automatic</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Galaxy</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">High Contrast</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Crystal</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Tango</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Oxygen</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Classic</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Sifr</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Breeze</item>
+                              <item translatable="yes" context="optviewpage|iconstyle">Tango Testing</item>
                             </items>
                           </object>
                           <packing>
@@ -377,10 +377,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Small</item>
-                              <item translatable="yes">Large</item>
-                              <item translatable="yes">Extra Large</item>
+                              <item translatable="yes" context="optviewpage|iconsize">Automatic</item>
+                              <item translatable="yes" context="optviewpage|iconsize">Small</item>
+                              <item translatable="yes" context="optviewpage|iconsize">Large</item>
+                              <item translatable="yes" context="optviewpage|iconsize">Extra Large</item>
                             </items>
                           </object>
                           <packing>
@@ -393,7 +393,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Icon s_tyle:</property>
+                            <property name="label" translatable="yes" context="optviewpage|label6">Icon s_tyle:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">iconstyle</property>
                           </object>
@@ -404,7 +404,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="aafont">
-                            <property name="label" translatable="yes">Screen font antialiasin_g</property>
+                            <property name="label" translatable="yes" context="optviewpage|aafont">Screen font antialiasin_g</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -422,7 +422,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Sidebar _icon size:</property>
+                            <property name="label" translatable="yes" context="optviewpage|label9">Sidebar _icon size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">iconsize</property>
                           </object>
@@ -436,9 +436,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Small</item>
-                              <item translatable="yes">Large</item>
+                              <item translatable="yes" context="optviewpage|sidebariconsize">Automatic</item>
+                              <item translatable="yes" context="optviewpage|sidebariconsize">Small</item>
+                              <item translatable="yes" context="optviewpage|sidebariconsize">Large</item>
                             </items>
                           </object>
                           <packing>
@@ -451,7 +451,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">_Notebookbar icon size:</property>
+                            <property name="label" translatable="yes" context="optviewpage|label7">_Notebookbar icon size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">iconsize</property>
                           </object>
@@ -465,9 +465,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Small</item>
-                              <item translatable="yes">Large</item>
+                              <item translatable="yes" context="optviewpage|notebookbariconsize">Automatic</item>
+                              <item translatable="yes" context="optviewpage|notebookbariconsize">Small</item>
+                              <item translatable="yes" context="optviewpage|notebookbariconsize">Large</item>
                             </items>
                           </object>
                           <packing>
@@ -486,7 +486,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
-                                <property name="label" translatable="yes">fro_m:</property>
+                                <property name="label" translatable="yes" context="optviewpage|aafrom">fro_m:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">aanf:0pixels</property>
                               </object>
@@ -527,7 +527,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">User Interface</property>
+                <property name="label" translatable="yes" context="optviewpage|label1">User Interface</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -564,7 +564,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Mouse _positioning:</property>
+                        <property name="label" translatable="yes" context="optviewpage|label11">Mouse _positioning:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mousepos</property>
                       </object>
@@ -578,7 +578,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Middle mouse _button:</property>
+                        <property name="label" translatable="yes" context="optviewpage|label12">Middle mouse _button:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mousemiddle</property>
                       </object>
@@ -594,9 +594,9 @@
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">Default button</item>
-                          <item translatable="yes">Dialog center</item>
-                          <item translatable="yes">No automatic positioning</item>
+                          <item translatable="yes" context="optviewpage|mousepos">Default button</item>
+                          <item translatable="yes" context="optviewpage|mousepos">Dialog center</item>
+                          <item translatable="yes" context="optviewpage|mousepos">No automatic positioning</item>
                         </items>
                       </object>
                       <packing>
@@ -611,9 +611,9 @@
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">No function</item>
-                          <item translatable="yes">Automatic scrolling</item>
-                          <item translatable="yes">Paste clipboard</item>
+                          <item translatable="yes" context="optviewpage|mousemiddle">No function</item>
+                          <item translatable="yes" context="optviewpage|mousemiddle">Automatic scrolling</item>
+                          <item translatable="yes" context="optviewpage|mousemiddle">Paste clipboard</item>
                         </items>
                       </object>
                       <packing>
@@ -629,7 +629,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Mouse</property>
+                <property name="label" translatable="yes" context="optviewpage|label4">Mouse</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui
index ef717c2e296e..4fccfc9f9e1c 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststorePageLayout">
@@ -12,19 +12,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Right and left</col>
+        <col id="0" translatable="yes" context="pageformatpage|liststorePageLayout">Right and left</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Mirrored</col>
+        <col id="0" translatable="yes" context="pageformatpage|liststorePageLayout">Mirrored</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Only right</col>
+        <col id="0" translatable="yes" context="pageformatpage|liststorePageLayout">Only right</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Only left</col>
+        <col id="0" translatable="yes" context="pageformatpage|liststorePageLayout">Only left</col>
         <col id="1">0</col>
       </row>
     </data>
@@ -69,7 +69,7 @@
                       <object class="GtkLabel" id="labelFormat">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Format:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelFormat">_Format:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboPageFormat</property>
                         <property name="xalign">0</property>
@@ -93,7 +93,7 @@
                       <object class="GtkLabel" id="labelWidth">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Width:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelWidth">_Width:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinWidth:0.00cm</property>
                         <property name="xalign">0</property>
@@ -120,7 +120,7 @@
                       <object class="GtkLabel" id="labelHeight">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Height:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelHeight">_Height:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinHeight:0.00cm</property>
                         <property name="xalign">0</property>
@@ -146,7 +146,7 @@
                       <object class="GtkLabel" id="labelOrientation">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Orientation:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelOrientation">_Orientation:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">radiobuttonPortrait</property>
                         <property name="xalign">0</property>
@@ -158,7 +158,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonPortrait">
-                        <property name="label" translatable="yes">_Portrait</property>
+                        <property name="label" translatable="yes" context="pageformatpage|radiobuttonPortrait">_Portrait</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -179,7 +179,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonLandscape">
-                        <property name="label" translatable="yes">L_andscape</property>
+                        <property name="label" translatable="yes" context="pageformatpage|radiobuttonLandscape">L_andscape</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -202,7 +202,7 @@
                       <object class="GtkLabel" id="labelTextFlow">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">_Text direction:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelTextFlow">_Text direction:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboTextFlowBox</property>
                         <property name="xalign">0</property>
@@ -263,7 +263,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Paper _tray:</property>
+                            <property name="label" translatable="yes" context="pageformatpage|labelPaperTray">Paper _tray:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">comboPaperTray</property>
                             <property name="xalign">0</property>
@@ -299,7 +299,7 @@
           <object class="GtkLabel" id="labelPaperFormat">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Paper Format</property>
+            <property name="label" translatable="yes" context="pageformatpage|labelPaperFormat">Paper Format</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -343,7 +343,7 @@
                       <object class="GtkLabel" id="labelTopMargin">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Top:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelTopMargin">Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinMargTop:0.00cm</property>
                         <property name="xalign">0</property>
@@ -357,7 +357,7 @@
                       <object class="GtkLabel" id="labelBottomMargin">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Bottom:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelBottomMargin">Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinMargBot:0.00cm</property>
                         <property name="xalign">0</property>
@@ -420,7 +420,7 @@
                         <child>
                           <object class="GtkLabel" id="labelRightMargin">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Right:</property>
+                            <property name="label" translatable="yes" context="pageformatpage|labelRightMargin">Right:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargRight:0.00cm</property>
                             <property name="xalign">0</property>
@@ -434,7 +434,7 @@
                         <child>
                           <object class="GtkLabel" id="labelOuter">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">O_uter:</property>
+                            <property name="label" translatable="yes" context="pageformatpage|labelOuter">O_uter:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargRight:0.00cm</property>
                             <property name="xalign">0</property>
@@ -460,7 +460,7 @@
                         <child>
                           <object class="GtkLabel" id="labelLeftMargin">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Left:</property>
+                            <property name="label" translatable="yes" context="pageformatpage|labelLeftMargin">Left:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargLeft:0.00cm</property>
                             <property name="xalign">0</property>
@@ -474,7 +474,7 @@
                         <child>
                           <object class="GtkLabel" id="labelInner">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">I_nner:</property>
+                            <property name="label" translatable="yes" context="pageformatpage|labelInner">I_nner:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargLeft:0.00cm</property>
                             <property name="xalign">0</property>
@@ -499,7 +499,7 @@
               <object class="GtkLabel" id="labelMargins">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Margins</property>
+                <property name="label" translatable="yes" context="pageformatpage|labelMargins">Margins</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -536,7 +536,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">_Page layout:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelPageLayout">_Page layout:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboPageLayout</property>
                         <property name="xalign">0</property>
@@ -551,7 +551,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Page numbers:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|label4">Page numbers:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboLayoutFormat</property>
                         <property name="xalign">0</property>
@@ -563,7 +563,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkRegisterTrue">
-                        <property name="label" translatable="yes">Register-tr_ue</property>
+                        <property name="label" translatable="yes" context="pageformatpage|checkRegisterTrue">Register-tr_ue</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -603,7 +603,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Table alignment:</property>
+                        <property name="label" translatable="yes" context="pageformatpage|labelTblAlign">Table alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">checkbuttonHorz</property>
                         <property name="xalign">0</property>
@@ -615,7 +615,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbuttonHorz">
-                        <property name="label" translatable="yes">Hori_zontal</property>
+                        <property name="label" translatable="yes" context="pageformatpage|checkbuttonHorz">Hori_zontal</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -630,7 +630,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbuttonVert">
-                        <property name="label" translatable="yes">_Vertical</property>
+                        <property name="label" translatable="yes" context="pageformatpage|checkbuttonVert">_Vertical</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -645,7 +645,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkAdaptBox">
-                        <property name="label" translatable="yes">_Fit object to paper format</property>
+                        <property name="label" translatable="yes" context="pageformatpage|checkAdaptBox">_Fit object to paper format</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -676,7 +676,7 @@
                               <object class="GtkLabel" id="labelRegisterStyle">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Reference _Style:</property>
+                                <property name="label" translatable="yes" context="pageformatpage|labelRegisterStyle">Reference _Style:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">comboRegisterStyle</property>
                                 <property name="xalign">0</property>
@@ -718,7 +718,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Layout Settings</property>
+                <property name="label" translatable="yes" context="pageformatpage|label5">Layout Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -739,7 +739,7 @@
     <child>
       <object class="GtkLabel" id="labelMsg">
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">The margin settings are out of print range.
+        <property name="label" translatable="yes" context="pageformatpage|labelMsg">The margin settings are out of print range.
 
 Do you still want to apply these settings?</property>
       </object>
diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index b94b73dcfaf3..ba90b60a3fee 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststoreLB_LASTLINE">
@@ -12,19 +12,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Default</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Default</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Left</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Centered</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Centered</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Justified</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Justified</col>
         <col id="1">3</col>
       </row>
     </data>
@@ -38,23 +38,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Automatic</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Automatic</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Base line</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Base line</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Top</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Top</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Middle</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Middle</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom</col>
+        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Bottom</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -82,7 +82,7 @@
             <property name="valign">start</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="paragalignpage|drawingareaWN_EXAMPLE-atkobject">Example</property>
               </object>
             </child>
           </object>
@@ -117,7 +117,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_LEFTALIGN">
-                        <property name="label" translatable="yes">_Left</property>
+                        <property name="label" translatable="yes" context="paragalignpage|radioBTN_LEFTALIGN">_Left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_RIGHTALIGN">
-                        <property name="label" translatable="yes">_Right</property>
+                        <property name="label" translatable="yes" context="paragalignpage|radioBTN_RIGHTALIGN">_Right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -149,7 +149,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_CENTERALIGN">
-                        <property name="label" translatable="yes">_Center</property>
+                        <property name="label" translatable="yes" context="paragalignpage|radioBTN_CENTERALIGN">_Center</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_JUSTIFYALIGN">
-                        <property name="label" translatable="yes">_Justified</property>
+                        <property name="label" translatable="yes" context="paragalignpage|radioBTN_JUSTIFYALIGN">_Justified</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -182,7 +182,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_EXPAND">
-                        <property name="label" translatable="yes">_Expand single word</property>
+                        <property name="label" translatable="yes" context="paragalignpage|checkCB_EXPAND">_Expand single word</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -199,7 +199,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_SNAP">
-                        <property name="label" translatable="yes">_Snap to text grid (if active)</property>
+                        <property name="label" translatable="yes" context="paragalignpage|checkCB_SNAP">_Snap to text grid (if active)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -230,7 +230,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="margin_left">12</property>
                                 <property name="vexpand">True</property>
-                                <property name="label" translatable="yes">_Last line:</property>
+                                <property name="label" translatable="yes" context="paragalignpage|labelLB_LASTLINE">_Last line:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">comboLB_LASTLINE</property>
                                 <property name="xalign">0</property>
@@ -274,7 +274,7 @@
                         <child>
                           <object class="GtkLabel" id="labelST_RIGHTALIGN_ASIAN">
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Righ_t/Bottom</property>
+                            <property name="label" translatable="yes" context="paragalignpage|labelST_RIGHTALIGN_ASIAN">Righ_t/Bottom</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -287,7 +287,7 @@
                           <object class="GtkLabel" id="labelST_LEFTALIGN_ASIAN">
                             <property name="can_focus">False</property>
                             <property name="xpad">5</property>
-                            <property name="label" translatable="yes">_Left/Top</property>
+                            <property name="label" translatable="yes" context="paragalignpage|labelST_LEFTALIGN_ASIAN">_Left/Top</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -310,7 +310,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="paragalignpage|label1">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -344,7 +344,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">12</property>
-                        <property name="label" translatable="yes">_Alignment:</property>
+                        <property name="label" translatable="yes" context="paragalignpage|labelFT_VERTALIGN">_Alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboLB_VERTALIGN</property>
                         <property name="xalign">0</property>
@@ -375,7 +375,7 @@
               <object class="GtkLabel" id="labelFL_VERTALIGN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text-to-text</property>
+                <property name="label" translatable="yes" context="paragalignpage|labelFL_VERTALIGN">Text-to-text</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -409,7 +409,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">12</property>
-                        <property name="label" translatable="yes">_Text direction:</property>
+                        <property name="label" translatable="yes" context="paragalignpage|label2">_Text direction:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboLB_TEXTDIRECTION</property>
                         <property name="xalign">0</property>
@@ -441,7 +441,7 @@
               <object class="GtkLabel" id="labelFL_PROPERTIES">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Properties</property>
+                <property name="label" translatable="yes" context="paragalignpage|labelFL_PROPERTIES">Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui
index 18a0dc4ff7e4..734d23f2d42e 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentED_DIST">
@@ -34,31 +34,31 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Single</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Single</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1.15 Lines</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.15 Lines</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1.5 Lines</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.5 Lines</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Double</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Double</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Proportional</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Proportional</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">At least</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">At least</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Leading</col>
+        <col id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Leading</col>
         <col id="1">6</col>
       </row>
     </data>
@@ -88,7 +88,7 @@
             <property name="vexpand">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="paraindentspacing|drawingareaWN_EXAMPLE-atkobject">Example</property>
               </object>
             </child>
           </object>
@@ -126,7 +126,7 @@
                       <object class="GtkLabel" id="labelFT_LEFTINDENT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Before text:</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|labelFT_LEFTINDENT">_Before text:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinED_LEFTINDENT:0cm</property>
                         <property name="xalign">0</property>
@@ -140,7 +140,7 @@
                       <object class="GtkLabel" id="labelFT_RIGHTINDENT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">After _text:</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|labelFT_RIGHTINDENT">After _text:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinED_RIGHTINDENT:0cm</property>
                         <property name="xalign">0</property>
@@ -154,7 +154,7 @@
                       <object class="GtkLabel" id="labelFT_FLINEINDENT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_First line:</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|labelFT_FLINEINDENT">_First line:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinED_FLINEINDENT:0cm</property>
                         <property name="xalign">0</property>
@@ -166,7 +166,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_AUTO">
-                        <property name="label" translatable="yes">_Automatic</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|checkCB_AUTO">_Automatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -218,7 +218,7 @@
                     <child>
                       <object class="GtkLabel" id="labelST_LINEDIST_ABS">
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Fixed</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|labelST_LINEDIST_ABS">Fixed</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -233,7 +233,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indent</property>
+                <property name="label" translatable="yes" context="paraindentspacing|label1">Indent</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -273,7 +273,7 @@
                           <object class="GtkLabel" id="labelFT_TOPDIST">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Ab_ove paragraph:</property>
+                            <property name="label" translatable="yes" context="paraindentspacing|labelFT_TOPDIST">Ab_ove paragraph:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_TOPDIST:0cm</property>
                             <property name="xalign">0</property>
@@ -287,7 +287,7 @@
                           <object class="GtkLabel" id="labelFT_BOTTOMDIST">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Below _paragraph:</property>
+                            <property name="label" translatable="yes" context="paraindentspacing|labelFT_BOTTOMDIST">Below _paragraph:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_BOTTOMDIST:0cm</property>
                             <property name="xalign">0</property>
@@ -330,7 +330,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_CONTEXTUALSPACING">
-                        <property name="label" translatable="yes">Don't add space between paragraphs of the same style</property>
+                        <property name="label" translatable="yes" context="paraindentspacing|checkCB_CONTEXTUALSPACING">Don't add space between paragraphs of the same style</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -351,7 +351,7 @@
               <object class="GtkLabel" id="labelFL_VERTALIGN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spacing</property>
+                <property name="label" translatable="yes" context="paraindentspacing|labelFL_VERTALIGN">Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -401,7 +401,7 @@
                           <object class="GtkLabel" id="labelFT_LINEDIST">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">of</property>
+                            <property name="label" translatable="yes" context="paraindentspacing|labelFT_LINEDIST">of</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -461,7 +461,7 @@
               <object class="GtkLabel" id="labelFL_PROPERTIES">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line Spacing</property>
+                <property name="label" translatable="yes" context="paraindentspacing|labelFL_PROPERTIES">Line Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -486,7 +486,7 @@
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_REGISTER">
-                    <property name="label" translatable="yes">A_ctivate</property>
+                    <property name="label" translatable="yes" context="paraindentspacing|checkCB_REGISTER">A_ctivate</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
@@ -500,7 +500,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Register-true</property>
+                <property name="label" translatable="yes" context="paraindentspacing|label3">Register-true</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index 74f632482eb5..56344137082e 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -46,7 +46,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="paratabspage|label1">Position</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -81,7 +81,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_DECIMAL">
-                    <property name="label" translatable="yes">Deci_mal</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_TABTYPE_DECIMAL">Deci_mal</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -154,7 +154,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_LEFT">
-                        <property name="label" translatable="yes">_Left</property>
+                        <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_TABTYPE_LEFT">_Left</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
@@ -171,7 +171,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonST_LEFTTAB_ASIAN">
-                        <property name="label" translatable="yes">_Left/Top</property>
+                        <property name="label" translatable="yes" context="paratabspage|radiobuttonST_LEFTTAB_ASIAN">_Left/Top</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
@@ -198,7 +198,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_RIGHT">
-                        <property name="label" translatable="yes">Righ_t</property>
+                        <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_TABTYPE_RIGHT">Righ_t</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
@@ -214,7 +214,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radiobuttonST_RIGHTTAB_ASIAN">
-                        <property name="label" translatable="yes">Righ_t/Bottom</property>
+                        <property name="label" translatable="yes" context="paratabspage|radiobuttonST_RIGHTTAB_ASIAN">Righ_t/Bottom</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
@@ -236,7 +236,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_CENTER">
-                    <property name="label" translatable="yes">C_entered</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_TABTYPE_CENTER">C_entered</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -260,7 +260,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="label" translatable="yes">_Character</property>
+                        <property name="label" translatable="yes" context="paratabspage|labelFT_TABTYPE_DECCHAR">_Character</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entryED_TABTYPE_DECCHAR</property>
                         <property name="xalign">0</property>
@@ -280,7 +280,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Type</property>
+            <property name="label" translatable="yes" context="paratabspage|label2">Type</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -314,7 +314,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_NO">
-                    <property name="label" translatable="yes">N_one</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_FILLCHAR_NO">N_one</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -331,7 +331,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_POINTS">
-                    <property name="label" translatable="yes">_........</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_FILLCHAR_POINTS">_........</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -348,7 +348,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_DASHLINE">
-                    <property name="label" translatable="yes">_--------</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_FILLCHAR_DASHLINE">_--------</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -365,7 +365,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_UNDERSCORE">
-                    <property name="label" translatable="yes">______</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_FILLCHAR_UNDERSCORE">______</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -382,7 +382,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_OTHER">
-                    <property name="label" translatable="yes">C_haracter</property>
+                    <property name="label" translatable="yes" context="paratabspage|radiobuttonBTN_FILLCHAR_OTHER">C_haracter</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -422,7 +422,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Fill Character</property>
+            <property name="label" translatable="yes" context="paratabspage|label3">Fill Character</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -460,7 +460,7 @@
         </child>
         <child>
           <object class="GtkButton" id="buttonBTN_DELALL">
-            <property name="label" translatable="yes">Delete _all</property>
+            <property name="label" translatable="yes" context="paratabspage|buttonBTN_DELALL">Delete _all</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">True</property>
@@ -489,7 +489,7 @@
         <child>
           <object class="GtkLabel" id="label4">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">points</property>
+            <property name="label" translatable="yes" context="paratabspage|label4">points</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">radiobuttonBTN_FILLCHAR_POINTS</property>
           </object>
@@ -502,7 +502,7 @@
         <child>
           <object class="GtkLabel" id="label5">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">dashes</property>
+            <property name="label" translatable="yes" context="paratabspage|label5">dashes</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">radiobuttonBTN_FILLCHAR_DASHLINE</property>
           </object>
@@ -515,7 +515,7 @@
         <child>
           <object class="GtkLabel" id="label6">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">underscores</property>
+            <property name="label" translatable="yes" context="paratabspage|label6">underscores</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">radiobuttonBTN_FILLCHAR_UNDERSCORE</property>
           </object>
diff --git a/cui/uiconfig/ui/password.ui b/cui/uiconfig/ui/password.ui
index f19a40e1912f..eef7168a9ed7 100644
--- a/cui/uiconfig/ui/password.ui
+++ b/cui/uiconfig/ui/password.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Set Password</property>
+    <property name="title" translatable="yes" context="password|PasswordDialog">Set Password</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Confirm password</property>
+                            <property name="label" translatable="yes" context="password|label5">Confirm password</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirmpassEntry</property>
                           </object>
@@ -103,7 +103,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Enter password to open</property>
+                            <property name="label" translatable="yes" context="password|label4">_Enter password to open</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">newpassEntry</property>
                           </object>
@@ -147,7 +147,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive.</property>
+                            <property name="label" translatable="yes" context="password|label1">Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive.</property>
                             <property name="wrap">True</property>
                             <property name="max_width_chars">60</property>
                           </object>
@@ -182,7 +182,7 @@
                                         <property name="row_spacing">6</property>
                                         <child>
                                           <object class="GtkCheckButton" id="readonly">
-                                            <property name="label" translatable="yes">Open file read-only</property>
+                                            <property name="label" translatable="yes" context="password|readonly">Open file read-only</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
@@ -201,7 +201,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Enter password to allow editing</property>
+                                            <property name="label" translatable="yes" context="password|label7">Enter password to allow editing</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">newpassroEntry</property>
                                           </object>
@@ -231,7 +231,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Confirm password</property>
+                                            <property name="label" translatable="yes" context="password|label8">Confirm password</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">confirmropassEntry</property>
                                           </object>
@@ -264,7 +264,7 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">File Sharing Password</property>
+                                    <property name="label" translatable="yes" context="password|label6">File Sharing Password</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
@@ -276,7 +276,7 @@
                               <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Options</property>
+                                <property name="label" translatable="yes" context="password|label3">_Options</property>
                                 <property name="use_underline">True</property>
                               </object>
                             </child>
@@ -296,7 +296,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File Encryption Password</property>
+                    <property name="label" translatable="yes" context="password|label2">File Encryption Password</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
index fd37b963fd7e..017e2a408dd6 100644
--- a/cui/uiconfig/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="PasteSpecialDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paste Special</property>
+    <property name="title" translatable="yes" context="pastespecial|PasteSpecialDialog">Paste Special</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -84,7 +84,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Source:</property>
+                    <property name="label" translatable="yes" context="pastespecial|label2">Source:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -154,7 +154,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Selection</property>
+                    <property name="label" translatable="yes" context="pastespecial|label1">Selection</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui
index 309608cd34ba..8f2a34fd63d7 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="PatternTabPage">
@@ -62,7 +62,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="BTN_MODIFY">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="patterntabpage|BTN_MODIFY">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
@@ -89,7 +89,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Pattern</property>
+            <property name="label" translatable="yes" context="patterntabpage|label3">Pattern</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -132,7 +132,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Pattern Editor:</property>
+                        <property name="label" translatable="yes" context="patterntabpage|label4">Pattern Editor:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -148,7 +148,7 @@
                         <property name="valign">start</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="CTL_PIXEL-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Pattern Editor</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="patterntabpage|CTL_PIXEL-atkobject">Pattern Editor</property>
                           </object>
                         </child>
                       </object>
@@ -176,7 +176,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Foreground Color:</property>
+                        <property name="label" translatable="yes" context="patterntabpage|label5">Foreground Color:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -214,7 +214,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Background Color:</property>
+                        <property name="label" translatable="yes" context="patterntabpage|label6">Background Color:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -249,7 +249,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="patterntabpage|label1">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -292,7 +292,7 @@
                         <property name="vexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="CTL_PREVIEW-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="patterntabpage|CTL_PREVIEW-atkobject">Example</property>
                           </object>
                         </child>
                       </object>
@@ -310,7 +310,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="patterntabpage|label2">Preview</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/percentdialog.ui b/cui/uiconfig/ui/percentdialog.ui
index 991cda65d690..e95f17790d6a 100644
--- a/cui/uiconfig/ui/percentdialog.ui
+++ b/cui/uiconfig/ui/percentdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -10,7 +10,7 @@
   <object class="GtkDialog" id="PercentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Combine</property>
+    <property name="title" translatable="yes" context="percentdialog|PercentDialog">Combine</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -91,7 +91,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Minimum Size</property>
+                <property name="label" translatable="yes" context="percentdialog|label1">Minimum Size</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index d240a2da1934..623d6ccdb411 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkVBox" id="PersonalizationTabPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="no_persona">
-                    <property name="label" translatable="yes">Default look, do not use Themes</property>
+                    <property name="label" translatable="yes" context="personalization_tab|no_persona">Default look, do not use Themes</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -44,7 +44,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="default_persona">
-                    <property name="label" translatable="yes">Pre-installed Theme (if available)</property>
+                    <property name="label" translatable="yes" context="personalization_tab|default_persona">Pre-installed Theme (if available)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -116,7 +116,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="own_persona">
-                        <property name="label" translatable="yes">Own Theme</property>
+                        <property name="label" translatable="yes" context="personalization_tab|own_persona">Own Theme</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="select_persona">
-                        <property name="label" translatable="yes">Select Theme</property>
+                        <property name="label" translatable="yes" context="personalization_tab|select_persona">Select Theme</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
                   <object class="GtkLabel" id="extensions_label">
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Or, select from the Themes installed via extensions:</property>
+                    <property name="label" translatable="yes" context="personalization_tab|extensions_label">Or, select from the Themes installed via extensions:</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -217,7 +217,7 @@
           <object class="GtkLabel" id="personas_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Firefox Themes</property>
+            <property name="label" translatable="yes" context="personalization_tab|personas_label">Firefox Themes</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui
index faa76e284648..da2a1dae0198 100644
--- a/cui/uiconfig/ui/pickbulletpage.ui
+++ b/cui/uiconfig/ui/pickbulletpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="PickBulletPage">
     <property name="visible">True</property>
@@ -31,7 +31,7 @@
       <object class="GtkLabel" id="label25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Selection</property>
+        <property name="label" translatable="yes" context="pickbulletpage|label25">Selection</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui
index 2979aebdcd58..8f11c574c316 100644
--- a/cui/uiconfig/ui/pickgraphicpage.ui
+++ b/cui/uiconfig/ui/pickgraphicpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="PickGraphicPage">
     <property name="visible">True</property>
@@ -42,7 +42,7 @@
               <object class="GtkLabel" id="errorft">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">The Gallery theme 'Bullets' is empty (no images).</property>
+                <property name="label" translatable="yes" context="pickgraphicpage|errorft">The Gallery theme 'Bullets' is empty (no images).</property>
                 <property name="wrap">True</property>
               </object>
               <packing>
@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkButton" id="browseBtn">
-                <property name="label" translatable="yes">Add and Resize</property>
+                <property name="label" translatable="yes" context="pickgraphicpage|browseBtn">Add and Resize</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
@@ -72,7 +72,7 @@
       <object class="GtkLabel" id="label25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Selection</property>
+        <property name="label" translatable="yes" context="pickgraphicpage|label25">Selection</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/picknumberingpage.ui b/cui/uiconfig/ui/picknumberingpage.ui
index 868e8f625d31..13eb0317c380 100644
--- a/cui/uiconfig/ui/picknumberingpage.ui
+++ b/cui/uiconfig/ui/picknumberingpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="PickNumberingPage">
     <property name="visible">True</property>
@@ -31,7 +31,7 @@
       <object class="GtkLabel" id="label25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Selection</property>
+        <property name="label" translatable="yes" context="picknumberingpage|label25">Selection</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/pickoutlinepage.ui b/cui/uiconfig/ui/pickoutlinepage.ui
index 8e1f4a332483..bfcbdf12a5d9 100644
--- a/cui/uiconfig/ui/pickoutlinepage.ui
+++ b/cui/uiconfig/ui/pickoutlinepage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="PickOutlinePage">
     <property name="visible">True</property>
@@ -31,7 +31,7 @@
       <object class="GtkLabel" id="label25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Selection</property>
+        <property name="label" translatable="yes" context="pickoutlinepage|label25">Selection</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 755835235b8d..3cefde8e549d 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -54,7 +54,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="superscript">
-                        <property name="label" translatable="yes">Superscript</property>
+                        <property name="label" translatable="yes" context="positionpage|superscript">Superscript</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="normal">
-                        <property name="label" translatable="yes">Normal</property>
+                        <property name="label" translatable="yes" context="positionpage|normal">Normal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -86,7 +86,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="subscript">
-                        <property name="label" translatable="yes">Subscript</property>
+                        <property name="label" translatable="yes" context="positionpage|subscript">Subscript</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -118,7 +118,7 @@
                       <object class="GtkLabel" id="raiselower">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Raise/lower by</property>
+                        <property name="label" translatable="yes" context="positionpage|raiselower">Raise/lower by</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">raiselowersb:0%</property>
                         <property name="xalign">0</property>
@@ -154,7 +154,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="automatic">
-                        <property name="label" translatable="yes">Automatic</property>
+                        <property name="label" translatable="yes" context="positionpage|automatic">Automatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -170,7 +170,7 @@
                       <object class="GtkLabel" id="relativefontsize">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Relative font size</property>
+                        <property name="label" translatable="yes" context="positionpage|relativefontsize">Relative font size</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">fontsizesb:0%</property>
                         <property name="xalign">0</property>
@@ -198,7 +198,7 @@
           <object class="GtkLabel" id="label20">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="positionpage|label20">Position</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -236,7 +236,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="0deg">
-                        <property name="label" translatable="yes">0 degrees</property>
+                        <property name="label" translatable="yes" context="positionpage|0deg">0 degrees</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="90deg">
-                        <property name="label" translatable="yes">90 degrees</property>
+                        <property name="label" translatable="yes" context="positionpage|90deg">90 degrees</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -268,7 +268,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="270deg">
-                        <property name="label" translatable="yes">270 degrees</property>
+                        <property name="label" translatable="yes" context="positionpage|270deg">270 degrees</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -284,7 +284,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fittoline">
-                        <property name="label" translatable="yes">Fit to line</property>
+                        <property name="label" translatable="yes" context="positionpage|fittoline">Fit to line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -313,7 +313,7 @@
                       <object class="GtkLabel" id="label24">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Scale width</property>
+                        <property name="label" translatable="yes" context="positionpage|label24">Scale width</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">scalewidthsb:0%</property>
                       </object>
@@ -356,7 +356,7 @@
               <object class="GtkLabel" id="rotateandscale">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Rotation / Scaling</property>
+                <property name="label" translatable="yes" context="positionpage|rotateandscale">Rotation / Scaling</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -372,7 +372,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Scaling</property>
+                <property name="label" translatable="yes" context="positionpage|scale">Scaling</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -425,7 +425,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="pairkerning">
-                    <property name="label" translatable="yes">Pair kerning</property>
+                    <property name="label" translatable="yes" context="positionpage|pairkerning">Pair kerning</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -446,7 +446,7 @@
           <object class="GtkLabel" id="label22">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Spacing</property>
+            <property name="label" translatable="yes" context="positionpage|label22">Spacing</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -475,7 +475,7 @@
             <property name="vexpand">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="preview:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="positionpage|preview-atkobject">Preview</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/positionsizedialog.ui b/cui/uiconfig/ui/positionsizedialog.ui
index fa8e1628ff96..9a40c10c48bc 100644
--- a/cui/uiconfig/ui/positionsizedialog.ui
+++ b/cui/uiconfig/ui/positionsizedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PositionAndSizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Position and Size</property>
+    <property name="title" translatable="yes" context="positionsizedialog|PositionAndSizeDialog">Position and Size</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -98,7 +98,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_POSITION_SIZE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Size</property>
+                <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_POSITION_SIZE">Position and Size</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SWPOSSIZE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Size</property>
+                <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_SWPOSSIZE">Position and Size</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_ANGLE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Rotation</property>
+                <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_ANGLE">Rotation</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SLANT">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Slant &amp; Corner Radius</property>
+                <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_SLANT">Slant &amp; Corner Radius</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui
index 25c48cbbe2e7..93eeaf4823c0 100644
--- a/cui/uiconfig/ui/possizetabpage.ui
+++ b/cui/uiconfig/ui/possizetabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="PositionAndSize">
@@ -37,7 +37,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Position _X:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_POS_X">Position _X:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_POS_X:0.00cm</property>
                       </object>
@@ -53,7 +53,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Position _Y:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_POS_Y">Position _Y:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_POS_Y:0.00cm</property>
                       </object>
@@ -109,7 +109,7 @@
                       <object class="GtkLabel" id="FT_POSREFERENCE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Base point:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_POSREFERENCE">_Base point:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">CTL_POSRECT</property>
                       </object>
@@ -147,7 +147,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="possizetabpage|label1">Position</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -189,7 +189,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Wi_dth:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_WIDTH">Wi_dth:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_WIDTH:0.00cm</property>
                       </object>
@@ -205,7 +205,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">H_eight:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_HEIGHT">H_eight:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_HEIGHT:0.00cm</property>
                       </object>
@@ -248,7 +248,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="CBX_SCALE">
-                        <property name="label" translatable="yes">_Keep ratio</property>
+                        <property name="label" translatable="yes" context="possizetabpage|CBX_SCALE">_Keep ratio</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -280,7 +280,7 @@
                       <object class="GtkLabel" id="FT_SIZEREFERENCE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Base _point:</property>
+                        <property name="label" translatable="yes" context="possizetabpage|FT_SIZEREFERENCE">Base _point:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">CTL_SIZERECT</property>
                       </object>
@@ -318,7 +318,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Size</property>
+            <property name="label" translatable="yes" context="possizetabpage|label2">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -357,7 +357,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_POSPROTECT">
-                        <property name="label" translatable="yes">Positio_n</property>
+                        <property name="label" translatable="yes" context="possizetabpage|TSB_POSPROTECT">Positio_n</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -374,7 +374,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_SIZEPROTECT">
-                        <property name="label" translatable="yes">_Size</property>
+                        <property name="label" translatable="yes" context="possizetabpage|TSB_SIZEPROTECT">_Size</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -398,7 +398,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Protect</property>
+                <property name="label" translatable="yes" context="possizetabpage|label3">Protect</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -431,7 +431,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTOGROW_WIDTH">
-                        <property name="label" translatable="yes">_Fit width to text</property>
+                        <property name="label" translatable="yes" context="possizetabpage|TSB_AUTOGROW_WIDTH">_Fit width to text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -448,7 +448,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTOGROW_HEIGHT">
-                        <property name="label" translatable="yes">Fit _height to text</property>
+                        <property name="label" translatable="yes" context="possizetabpage|TSB_AUTOGROW_HEIGHT">Fit _height to text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -472,7 +472,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Adapt</property>
+                <property name="label" translatable="yes" context="possizetabpage|label4">Adapt</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/posterdialog.ui b/cui/uiconfig/ui/posterdialog.ui
index 59fdcc322133..4c0658eccace 100644
--- a/cui/uiconfig/ui/posterdialog.ui
+++ b/cui/uiconfig/ui/posterdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="PosterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Posterize</property>
+    <property name="title" translatable="yes" context="posterdialog|PosterDialog">Posterize</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -133,7 +133,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Poster colors:</property>
+                            <property name="label" translatable="yes" context="posterdialog|label2">Poster colors:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">value</property>
                           </object>
@@ -156,7 +156,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="posterdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui b/cui/uiconfig/ui/querychangelineenddialog.ui
index 41dd4573b8e7..b8e5f113a203 100644
--- a/cui/uiconfig/ui/querychangelineenddialog.ui
+++ b/cui/uiconfig/ui/querychangelineenddialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="AskChangeLineEndDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save Arrowhead?</property>
+    <property name="title" translatable="yes" context="querychangelineenddialog|AskChangeLineEndDialog">Save Arrowhead?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">The arrowhead was modified without saving.</property>
-    <property name="secondary_text" translatable="yes">Would you like to save the arrowhead now?</property>
+    <property name="text" translatable="yes" context="querychangelineenddialog|AskChangeLineEndDialog">The arrowhead was modified without saving.</property>
+    <property name="secondary_text" translatable="yes" context="querychangelineenddialog|AskChangeLineEndDialog">Would you like to save the arrowhead now?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletebitmapdialog.ui b/cui/uiconfig/ui/querydeletebitmapdialog.ui
index c484fdcbe16e..a737c87ee58a 100644
--- a/cui/uiconfig/ui/querydeletebitmapdialog.ui
+++ b/cui/uiconfig/ui/querydeletebitmapdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AskDelBitmapDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Bitmap?</property>
+    <property name="title" translatable="yes" context="querydeletebitmapdialog|AskDelBitmapDialog">Delete Bitmap?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Are you sure you want to delete the bitmap?</property>
+    <property name="text" translatable="yes" context="querydeletebitmapdialog|AskDelBitmapDialog">Are you sure you want to delete the bitmap?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui b/cui/uiconfig/ui/querydeletechartcolordialog.ui
index 6b1ebb84b198..ad07c12effdb 100644
--- a/cui/uiconfig/ui/querydeletechartcolordialog.ui
+++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteChartColorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Color?</property>
+    <property name="title" translatable="yes" context="querydeletechartcolordialog|QueryDeleteChartColorDialog">Delete Color?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you really want to delete the chart color?</property>
-    <property name="secondary_text" translatable="yes">This action cannot be undone.</property>
+    <property name="text" translatable="yes" context="querydeletechartcolordialog|QueryDeleteChartColorDialog">Do you really want to delete the chart color?</property>
+    <property name="secondary_text" translatable="yes" context="querydeletechartcolordialog|QueryDeleteChartColorDialog">This action cannot be undone.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletecolordialog.ui b/cui/uiconfig/ui/querydeletecolordialog.ui
index f44ac093634f..fc142aacde96 100644
--- a/cui/uiconfig/ui/querydeletecolordialog.ui
+++ b/cui/uiconfig/ui/querydeletecolordialog.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="AskDelColorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete color?</property>
+    <property name="title" translatable="yes" context="querydeletecolordialog|AskDelColorDialog">Delete color?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to delete the color?</property>
+    <property name="text" translatable="yes" context="querydeletecolordialog|AskDelColorDialog">Do you want to delete the color?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletedictionarydialog.ui b/cui/uiconfig/ui/querydeletedictionarydialog.ui
index ef0ae5676d9f..663b917689a1 100644
--- a/cui/uiconfig/ui/querydeletedictionarydialog.ui
+++ b/cui/uiconfig/ui/querydeletedictionarydialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteDictionaryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Dictionary?</property>
+    <property name="title" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">Delete Dictionary?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you really want to delete the dictionary?</property>
-    <property name="secondary_text" translatable="yes">This action cannot be undone.</property>
+    <property name="text" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">Do you really want to delete the dictionary?</property>
+    <property name="secondary_text" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">This action cannot be undone.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletegradientdialog.ui b/cui/uiconfig/ui/querydeletegradientdialog.ui
index c6bc9646eab7..b4353a10413f 100644
--- a/cui/uiconfig/ui/querydeletegradientdialog.ui
+++ b/cui/uiconfig/ui/querydeletegradientdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AskDelGradientDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete gradient?</property>
+    <property name="title" translatable="yes" context="querydeletegradientdialog|AskDelGradientDialog">Delete gradient?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to delete the gradient?</property>
+    <property name="text" translatable="yes" context="querydeletegradientdialog|AskDelGradientDialog">Do you want to delete the gradient?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletehatchdialog.ui b/cui/uiconfig/ui/querydeletehatchdialog.ui
index 8545fbacc20e..ab22d721852e 100644
--- a/cui/uiconfig/ui/querydeletehatchdialog.ui
+++ b/cui/uiconfig/ui/querydeletehatchdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AskDelHatchDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Hatching?</property>
+    <property name="title" translatable="yes" context="querydeletehatchdialog|AskDelHatchDialog">Delete Hatching?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to delete the hatching?</property>
+    <property name="text" translatable="yes" context="querydeletehatchdialog|AskDelHatchDialog">Do you want to delete the hatching?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletelineenddialog.ui b/cui/uiconfig/ui/querydeletelineenddialog.ui
index f5a6c7120989..30355fcd662c 100644
--- a/cui/uiconfig/ui/querydeletelineenddialog.ui
+++ b/cui/uiconfig/ui/querydeletelineenddialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="AskDelLineEndDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Arrowhead?</property>
+    <property name="title" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">Delete Arrowhead?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you really want to delete the arrowhead?</property>
-    <property name="secondary_text" translatable="yes">This action cannot be undone.</property>
+    <property name="text" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">Do you really want to delete the arrowhead?</property>
+    <property name="secondary_text" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">This action cannot be undone.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querydeletelinestyledialog.ui b/cui/uiconfig/ui/querydeletelinestyledialog.ui
index b08db9802332..86aa1fdf08da 100644
--- a/cui/uiconfig/ui/querydeletelinestyledialog.ui
+++ b/cui/uiconfig/ui/querydeletelinestyledialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="AskDelLineStyleDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Line Style?</property>
+    <property name="title" translatable="yes" context="querydeletelinestyledialog|AskDelLineStyleDialog">Delete Line Style?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to delete the line style?</property>
+    <property name="text" translatable="yes" context="querydeletelinestyledialog|AskDelLineStyleDialog">Do you want to delete the line style?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/queryduplicatedialog.ui b/cui/uiconfig/ui/queryduplicatedialog.ui
index beafdb33cc1c..172e14baddef 100644
--- a/cui/uiconfig/ui/queryduplicatedialog.ui
+++ b/cui/uiconfig/ui/queryduplicatedialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="DuplicateNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Duplicate Name</property>
+    <property name="title" translatable="yes" context="queryduplicatedialog|DuplicateNameDialog">Duplicate Name</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">The name you have entered already exists.</property>
-    <property name="secondary_text" translatable="yes">Please choose another name.</property>
+    <property name="text" translatable="yes" context="queryduplicatedialog|DuplicateNameDialog">The name you have entered already exists.</property>
+    <property name="secondary_text" translatable="yes" context="queryduplicatedialog|DuplicateNameDialog">Please choose another name.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querynoloadedfiledialog.ui b/cui/uiconfig/ui/querynoloadedfiledialog.ui
index 0ac554f58d24..397919a42717 100644
--- a/cui/uiconfig/ui/querynoloadedfiledialog.ui
+++ b/cui/uiconfig/ui/querynoloadedfiledialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="NoLoadedFileDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No Loaded File</property>
+    <property name="title" translatable="yes" context="querynoloadedfiledialog|NoLoadedFileDialog">No Loaded File</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">The file could not be loaded!</property>
+    <property name="text" translatable="yes" context="querynoloadedfiledialog|NoLoadedFileDialog">The file could not be loaded!</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querynosavefiledialog.ui b/cui/uiconfig/ui/querynosavefiledialog.ui
index 0d1f71304fec..a579aba13727 100644
--- a/cui/uiconfig/ui/querynosavefiledialog.ui
+++ b/cui/uiconfig/ui/querynosavefiledialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="NoSaveFileDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No Saved File</property>
+    <property name="title" translatable="yes" context="querynosavefiledialog|NoSaveFileDialog">No Saved File</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">The file could not be saved!</property>
+    <property name="text" translatable="yes" context="querynosavefiledialog|NoSaveFileDialog">The file could not be saved!</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/querysavelistdialog.ui b/cui/uiconfig/ui/querysavelistdialog.ui
index deb85061f475..8ccf00b71b67 100644
--- a/cui/uiconfig/ui/querysavelistdialog.ui
+++ b/cui/uiconfig/ui/querysavelistdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="AskSaveList">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save List?</property>
+    <property name="title" translatable="yes" context="querysavelistdialog|AskSaveList">Save List?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">ok-cancel</property>
-    <property name="text" translatable="yes">The list was modified without saving.</property>
-    <property name="secondary_text" translatable="yes">Would you like to save the list now?</property>
+    <property name="text" translatable="yes" context="querysavelistdialog|AskSaveList">The list was modified without saving.</property>
+    <property name="secondary_text" translatable="yes" context="querysavelistdialog|AskSaveList">Would you like to save the list now?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui
index 8f26b2b81355..e41d5cca1724 100644
--- a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui
+++ b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryUpdateFileListDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Update File List?</property>
+    <property name="title" translatable="yes" context="queryupdategalleryfilelistdialog|QueryUpdateFileListDialog">Update File List?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to update the file list?</property>
+    <property name="text" translatable="yes" context="queryupdategalleryfilelistdialog|QueryUpdateFileListDialog">Do you want to update the file list?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox4">
         <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/recordnumberdialog.ui b/cui/uiconfig/ui/recordnumberdialog.ui
index 9f4824b8cea1..9e843967a654 100644
--- a/cui/uiconfig/ui/recordnumberdialog.ui
+++ b/cui/uiconfig/ui/recordnumberdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="RecordNumberDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Record Number</property>
+    <property name="title" translatable="yes" context="recordnumberdialog|RecordNumberDialog">Record Number</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -22,7 +22,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">go to record</property>
+                <property name="label" translatable="yes" context="recordnumberdialog|label2">go to record</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry-nospin</property>
               </object>
diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui
index 7c3e34d757b8..7d63bdd04b51 100644
--- a/cui/uiconfig/ui/rotationtabpage.ui
+++ b/cui/uiconfig/ui/rotationtabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentANGLE">
@@ -49,7 +49,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Position _X:</property>
+                        <property name="label" translatable="yes" context="rotationtabpage|FT_POS_X">Position _X:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_POS_X:0.00cm</property>
                       </object>
@@ -63,7 +63,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Position _Y:</property>
+                        <property name="label" translatable="yes" context="rotationtabpage|FT_POS_Y">Position _Y:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_POS_Y:0.00cm</property>
                       </object>
@@ -115,7 +115,7 @@
                       <object class="GtkLabel" id="FT_POSPRESETS">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Default settings:</property>
+                        <property name="label" translatable="yes" context="rotationtabpage|FT_POSPRESETS">_Default settings:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">CTL_RECT</property>
                       </object>
@@ -129,7 +129,7 @@
                       <object class="svxlo-SvxRectCtl" id="CTL_RECT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Rotation point</property>
+                        <property name="tooltip_text" translatable="yes" context="rotationtabpage|CTL_RECT|tooltip_text">Rotation point</property>
                         <property name="halign">center</property>
                       </object>
                       <packing>
@@ -154,7 +154,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pivot Point</property>
+            <property name="label" translatable="yes" context="rotationtabpage|label1">Pivot Point</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -196,7 +196,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Angle:</property>
+                        <property name="label" translatable="yes" context="rotationtabpage|FT_ANGLE">_Angle:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">NF_ANGLE</property>
                       </object>
@@ -238,7 +238,7 @@
                       <object class="GtkLabel" id="FT_ANGLEPRESETS">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Default _settings:</property>
+                        <property name="label" translatable="yes" context="rotationtabpage|FT_ANGLEPRESETS">Default _settings:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">CTL_ANGLE</property>
                       </object>
@@ -252,7 +252,7 @@
                       <object class="svxlo-DialControl" id="CTL_ANGLE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Rotation Angle</property>
+                        <property name="tooltip_text" translatable="yes" context="rotationtabpage|CTL_ANGLE|tooltip_text">Rotation Angle</property>
                         <property name="halign">center</property>
                       </object>
                       <packing>
@@ -277,7 +277,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Rotation Angle</property>
+            <property name="label" translatable="yes" context="rotationtabpage|label2">Rotation Angle</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui b/cui/uiconfig/ui/screenshotannotationdialog.ui
index 0da255e064cc..3e6c2f67dcea 100644
--- a/cui/uiconfig/ui/screenshotannotationdialog.ui
+++ b/cui/uiconfig/ui/screenshotannotationdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ScreenshotAnnotationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Interactive Screenshot Annotation</property>
+    <property name="title" translatable="yes" context="screenshotannotationdialog|ScreenshotAnnotationDialog">Interactive Screenshot Annotation</property>
     <property name="modal">True</property>
     <property name="default_width">600</property>
     <property name="default_height">460</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="save">
-                <property name="label" translatable="yes">Save Screenshot...</property>
+                <property name="label" translatable="yes" context="screenshotannotationdialog|save">Save Screenshot...</property>
                 <property name="name">save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -64,7 +64,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Click the widgets to add annotation:</property>
+            <property name="label" translatable="yes" context="screenshotannotationdialog|label2">Click the widgets to add annotation:</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -90,7 +90,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Paste the following markup into the help file:</property>
+            <property name="label" translatable="yes" context="screenshotannotationdialog|label1">Paste the following markup into the help file:</property>
             <property name="ellipsize">end</property>
           </object>
           <packing>
diff --git a/cui/uiconfig/ui/scriptorganizer.ui b/cui/uiconfig/ui/scriptorganizer.ui
index 4b17afa87ee6..c7a7001ad29d 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="ScriptOrganizerDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%MACROLANG Macros</property>
+    <property name="title" translatable="yes" context="scriptorganizer|ScriptOrganizerDialog">%MACROLANG Macros</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="run">
-                <property name="label" translatable="yes">Run</property>
+                <property name="label" translatable="yes" context="scriptorganizer|run">Run</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -46,7 +46,7 @@
             </child>
             <child>
               <object class="GtkButton" id="create">
-                <property name="label" translatable="yes">Create...</property>
+                <property name="label" translatable="yes" context="scriptorganizer|create">Create...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -76,7 +76,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rename">
-                <property name="label" translatable="yes">Rename...</property>
+                <property name="label" translatable="yes" context="scriptorganizer|rename">Rename...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -90,7 +90,7 @@
             </child>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">Delete...</property>
+                <property name="label" translatable="yes" context="scriptorganizer|delete">Delete...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -157,7 +157,7 @@
               <object class="GtkLabel" id="macrosft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Macros</property>
+                <property name="label" translatable="yes" context="scriptorganizer|macrosft">Macros</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/searchattrdialog.ui b/cui/uiconfig/ui/searchattrdialog.ui
index 5741e9238248..827c380f875d 100644
--- a/cui/uiconfig/ui/searchattrdialog.ui
+++ b/cui/uiconfig/ui/searchattrdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SearchAttrDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Attributes</property>
+    <property name="title" translatable="yes" context="searchattrdialog|SearchAttrDialog">Attributes</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/cui/uiconfig/ui/searchformatdialog.ui b/cui/uiconfig/ui/searchformatdialog.ui
index 4a95988a97c9..8a4f612c876b 100644
--- a/cui/uiconfig/ui/searchformatdialog.ui
+++ b/cui/uiconfig/ui/searchformatdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SearchFormatDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Text Format</property>
+    <property name="title" translatable="yes" context="searchformatdialog|SearchFormatDialog">Text Format</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,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="searchformatdialog|font">Font</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,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="searchformatdialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="searchformatdialog|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="asianlayout">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Layout</property>
+                <property name="label" translatable="yes" context="searchformatdialog|asianlayout">Asian Layout</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -167,7 +167,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -182,7 +182,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.46000000834465027</property>
-                <property name="label" translatable="yes">Text Flow</property>
+                <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_EXT">Text Flow</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="searchformatdialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="searchformatdialog|background">Highlighting</property>
               </object>
               <packing>
                 <property name="position">8</property>
diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui
index 1262e1047eb6..077fe67db1c2 100644
--- a/cui/uiconfig/ui/securityoptionsdialog.ui
+++ b/cui/uiconfig/ui/securityoptionsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SecurityOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Security Options and Warnings</property>
+    <property name="title" translatable="yes" context="securityoptionsdialog|SecurityOptionsDialog">Security Options and Warnings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -102,7 +102,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="savesenddocs">
-                                <property name="label" translatable="yes">_When saving or sending</property>
+                                <property name="label" translatable="yes" context="securityoptionsdialog|savesenddocs">_When saving or sending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="whensigning">
-                                <property name="label" translatable="yes">When _signing</property>
+                                <property name="label" translatable="yes" context="securityoptionsdialog|whensigning">When _signing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -132,7 +132,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="whenprinting">
-                                <property name="label" translatable="yes">When _printing</property>
+                                <property name="label" translatable="yes" context="securityoptionsdialog|whenprinting">When _printing</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -147,7 +147,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="whenpdf">
-                                <property name="label" translatable="yes">When creating PDF _files</property>
+                                <property name="label" translatable="yes" context="securityoptionsdialog|whenpdf">When creating PDF _files</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -224,7 +224,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Warn if document contains recorded changes, versions, hidden information or notes:</property>
+                            <property name="label" translatable="yes" context="securityoptionsdialog|label3">Warn if document contains recorded changes, versions, hidden information or notes:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -239,7 +239,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Security Warnings</property>
+                    <property name="label" translatable="yes" context="securityoptionsdialog|label1">Security Warnings</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -273,7 +273,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="removepersonal">
-                            <property name="label" translatable="yes">_Remove personal information on saving</property>
+                            <property name="label" translatable="yes" context="securityoptionsdialog|removepersonal">_Remove personal information on saving</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -289,7 +289,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="password">
-                            <property name="label" translatable="yes">Recommend password protection on sa_ving</property>
+                            <property name="label" translatable="yes" context="securityoptionsdialog|password">Recommend password protection on sa_ving</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="ctrlclick">
-                            <property name="label" translatable="yes">Ctrl-click required _to follow hyperlinks</property>
+                            <property name="label" translatable="yes" context="securityoptionsdialog|ctrlclick">Ctrl-click required _to follow hyperlinks</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="blockuntrusted">
-                            <property name="label" translatable="yes">Block any links from documents not among the trusted locations (see Macro Security)</property>
+                            <property name="label" translatable="yes" context="securityoptionsdialog|blockuntrusted">Block any links from documents not among the trusted locations (see Macro Security)</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -392,7 +392,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Security Options</property>
+                    <property name="label" translatable="yes" context="securityoptionsdialog|label2">Security Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui
index 230f3b241930..087dccdf0df9 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectPersonaDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Firefox Theme</property>
+    <property name="title" translatable="yes" context="select_persona_dialog|SelectPersonaDialog">Select Firefox Theme</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -53,7 +53,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="search_personas">
-                            <property name="label" translatable="yes">_Go</property>
+                            <property name="label" translatable="yes" context="select_persona_dialog|search_personas">_Go</property>
                             <property name="width_request">85</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Search Term or Firefox Theme URL</property>
+                <property name="label" translatable="yes" context="select_persona_dialog|label1">Search Term or Firefox Theme URL</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -225,7 +225,7 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Categories</property>
+                <property name="label" translatable="yes" context="select_persona_dialog|label6">Categories</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/selectpathdialog.ui b/cui/uiconfig/ui/selectpathdialog.ui
index 4578362f3298..0e7dfe483583 100644
--- a/cui/uiconfig/ui/selectpathdialog.ui
+++ b/cui/uiconfig/ui/selectpathdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectPathDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Paths</property>
+    <property name="title" translatable="yes" context="selectpathdialog|SelectPathDialog">Select Paths</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -103,7 +103,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add">
-                            <property name="label" translatable="yes">_Add...</property>
+                            <property name="label" translatable="yes" context="selectpathdialog|add">_Add...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Paths</property>
+                <property name="label" translatable="yes" context="selectpathdialog|label1">Paths</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui
index 98c2563b5b14..c7e2913dfb6e 100644
--- a/cui/uiconfig/ui/shadowtabpage.ui
+++ b/cui/uiconfig/ui/shadowtabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentDistance">
@@ -42,7 +42,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="TSB_SHOW_SHADOW">
-                    <property name="label" translatable="yes">_Use shadow</property>
+                    <property name="label" translatable="yes" context="shadowtabpage|TSB_SHOW_SHADOW">_Use shadow</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                           <object class="GtkLabel" id="FT_DISTANCE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Distance:</property>
+                            <property name="label" translatable="yes" context="shadowtabpage|FT_DISTANCE">_Distance:</property>
                             <property name="use_underline">True</property>
                           </object>
                         </child>
@@ -156,7 +156,7 @@
                           <object class="GtkLabel" id="FT_TRANSPARENT">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Transparency:</property>
+                            <property name="label" translatable="yes" context="shadowtabpage|FT_TRANSPARENT">_Transparency:</property>
                             <property name="use_underline">True</property>
                           </object>
                         </child>
@@ -177,7 +177,7 @@
                           <object class="GtkLabel" id="FT_SHADOW_COLOR">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Color:</property>
+                            <property name="label" translatable="yes" context="shadowtabpage|FT_SHADOW_COLOR">_Color:</property>
                             <property name="use_underline">True</property>
                           </object>
                         </child>
@@ -220,7 +220,7 @@
                     <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="CTL_COLOR_PREVIEW-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="shadowtabpage|CTL_COLOR_PREVIEW-atkobject">Example</property>
                       </object>
                     </child>
                   </object>
@@ -245,7 +245,7 @@
       <object class="GtkLabel" id="label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Properties</property>
+        <property name="label" translatable="yes" context="shadowtabpage|label">Properties</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/showcoldialog.ui b/cui/uiconfig/ui/showcoldialog.ui
index 67e8b5f6c476..b576fd6d1120 100644
--- a/cui/uiconfig/ui/showcoldialog.ui
+++ b/cui/uiconfig/ui/showcoldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ShowColDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Show Columns</property>
+    <property name="title" translatable="yes" context="showcoldialog|ShowColDialog">Show Columns</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The following columns are currently hidden. Please mark the fields you want to show and choose OK.</property>
+                <property name="label" translatable="yes" context="showcoldialog|label1">The following columns are currently hidden. Please mark the fields you want to show and choose OK.</property>
                 <property name="use_underline">True</property>
                 <property name="wrap">True</property>
                 <property name="mnemonic_widget">treeview:border</property>
diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui
index d82a62d45002..bee9ca70b722 100644
--- a/cui/uiconfig/ui/similaritysearchdialog.ui
+++ b/cui/uiconfig/ui/similaritysearchdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">30</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="SimilaritySearchDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Similarity Search</property>
+    <property name="title" translatable="yes" context="similaritysearchdialog|SimilaritySearchDialog">Similarity Search</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -92,7 +92,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Exchange characters:</property>
+                <property name="label" translatable="yes" context="similaritysearchdialog|label2">_Exchange characters:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">otherfld</property>
               </object>
@@ -106,7 +106,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Add characters:</property>
+                <property name="label" translatable="yes" context="similaritysearchdialog|label3">_Add characters:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">longerfld</property>
               </object>
@@ -120,7 +120,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Remove characters:</property>
+                <property name="label" translatable="yes" context="similaritysearchdialog|label4">_Remove characters:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">shorterfld</property>
               </object>
@@ -131,7 +131,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="relaxbox">
-                <property name="label" translatable="yes">_Combine</property>
+                <property name="label" translatable="yes" context="similaritysearchdialog|relaxbox">_Combine</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui
index 177656a712be..32573a622f85 100644
--- a/cui/uiconfig/ui/slantcornertabpage.ui
+++ b/cui/uiconfig/ui/slantcornertabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentRADIUS">
     <property name="upper">500</property>
@@ -47,7 +47,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_X:</property>
+                        <property name="label" translatable="yes" context="slantcornertabpage|label5">_X:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">controlx1:0.00cm</property>
                         <property name="xalign">0</property>
@@ -86,7 +86,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Y:</property>
+                        <property name="label" translatable="yes" context="slantcornertabpage|label6">_Y:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">controly1:0.00cm</property>
                         <property name="xalign">0</property>
@@ -124,7 +124,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Control Point 1</property>
+            <property name="label" translatable="yes" context="slantcornertabpage|label3">Control Point 1</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -158,7 +158,7 @@
                   <object class="GtkLabel" id="FT_RADIUS">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Radius:</property>
+                    <property name="label" translatable="yes" context="slantcornertabpage|FT_RADIUS">_Radius:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">MTR_FLD_RADIUS:0.00cm</property>
                     <property name="xalign">0</property>
@@ -189,7 +189,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Corner Radius</property>
+            <property name="label" translatable="yes" context="slantcornertabpage|label1">Corner Radius</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -223,7 +223,7 @@
                   <object class="GtkLabel" id="FT_ANGLE">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Angle:</property>
+                    <property name="label" translatable="yes" context="slantcornertabpage|FT_ANGLE">_Angle:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">MTR_FLD_ANGLE:0.00degrees</property>
                     <property name="xalign">0</property>
@@ -254,7 +254,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Slant</property>
+            <property name="label" translatable="yes" context="slantcornertabpage|label2">Slant</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -295,7 +295,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_X:</property>
+                        <property name="label" translatable="yes" context="slantcornertabpage|label4">_X:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">controlx2:0.00cm</property>
                         <property name="xalign">0</property>
@@ -334,7 +334,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Y:</property>
+                        <property name="label" translatable="yes" context="slantcornertabpage|label7">_Y:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">controly2:0.00cm</property>
                         <property name="xalign">0</property>
@@ -372,7 +372,7 @@
           <object class="GtkLabel" id="label8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Control Point 2</property>
+            <property name="label" translatable="yes" context="slantcornertabpage|label8">Control Point 2</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
diff --git a/cui/uiconfig/ui/smarttagoptionspage.ui b/cui/uiconfig/ui/smarttagoptionspage.ui
index 405f365701dd..31be2c46d834 100644
--- a/cui/uiconfig/ui/smarttagoptionspage.ui
+++ b/cui/uiconfig/ui/smarttagoptionspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="SmartTagOptionsPage">
@@ -18,7 +18,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkCheckButton" id="main">
-            <property name="label" translatable="yes">Label text with smart tags</property>
+            <property name="label" translatable="yes" context="smarttagoptionspage|main">Label text with smart tags</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -58,7 +58,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkButton" id="properties">
-                        <property name="label" translatable="yes">Properties...</property>
+                        <property name="label" translatable="yes" context="smarttagoptionspage|properties">Properties...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Currently Installed Smart Tags</property>
+                <property name="label" translatable="yes" context="smarttagoptionspage|label1">Currently Installed Smart Tags</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/smoothdialog.ui b/cui/uiconfig/ui/smoothdialog.ui
index a08eb9cfc2fb..8cd503f378b4 100644
--- a/cui/uiconfig/ui/smoothdialog.ui
+++ b/cui/uiconfig/ui/smoothdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="SmoothDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Smooth</property>
+    <property name="title" translatable="yes" context="smoothdialog|SmoothDialog">Smooth</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -135,7 +135,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Smooth radius:</property>
+                            <property name="label" translatable="yes" context="smoothdialog|label2">_Smooth radius:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">radius</property>
                           </object>
@@ -158,7 +158,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="smoothdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/solarizedialog.ui b/cui/uiconfig/ui/solarizedialog.ui
index 14215225dcd7..9d4c007e8e86 100644
--- a/cui/uiconfig/ui/solarizedialog.ui
+++ b/cui/uiconfig/ui/solarizedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="SolarizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Solarization</property>
+    <property name="title" translatable="yes" context="solarizedialog|SolarizeDialog">Solarization</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -132,7 +132,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Threshold _value:</property>
+                            <property name="label" translatable="yes" context="solarizedialog|label2">Threshold _value:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">value:0%</property>
                           </object>
@@ -143,7 +143,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="invert">
-                            <property name="label" translatable="yes">_Invert</property>
+                            <property name="label" translatable="yes" context="solarizedialog|invert">_Invert</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -170,7 +170,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="solarizedialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index e6429826a57b..6440b9bacac3 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="" version="3.0"/>
   <!-- interface-local-resource-path /home/akki/libreoffice/extras/source/glade -->
   <object class="GtkDialog" id="SpecialCharactersDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Special Characters</property>
+    <property name="title" translatable="yes" context="specialcharacters|SpecialCharactersDialog">Special Characters</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -20,7 +20,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="specialcharacters|ok">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
@@ -89,7 +89,7 @@
                   <object class="GtkLabel" id="fontft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Font:</property>
+                    <property name="label" translatable="yes" context="specialcharacters|fontft">Font:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fontlb</property>
                   </object>
@@ -102,7 +102,7 @@
                   <object class="GtkLabel" id="subsetft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Subset:</property>
+                    <property name="label" translatable="yes" context="specialcharacters|subsetft">Subset:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">subsetlb</property>
                   </object>
@@ -187,7 +187,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Hexadecimal:</property>
+                        <property name="label" translatable="yes" context="specialcharacters|hexlabel">Hexadecimal:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -238,7 +238,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Decimal:</property>
+                        <property name="label" translatable="yes" context="specialcharacters|decimallabel">Decimal:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -296,7 +296,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
-                    <property name="label" translatable="yes">Recent Characters:</property>
+                    <property name="label" translatable="yes" context="specialcharacters|symboltext1">Recent Characters:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui
index 94b530770678..0f576da899ac 100644
--- a/cui/uiconfig/ui/spellingdialog.ui
+++ b/cui/uiconfig/ui/spellingdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SpellingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Spelling and Grammar: $LANGUAGE ($LOCATION)</property>
+    <property name="title" translatable="yes" context="spellingdialog|SpellingDialog">Spelling and Grammar: $LANGUAGE ($LOCATION)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">_Options...</property>
+                <property name="label" translatable="yes" context="spellingdialog|options">_Options...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -107,7 +107,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ignore">
-                <property name="label" translatable="yes">_Ignore Once</property>
+                <property name="label" translatable="yes" context="spellingdialog|ignore">_Ignore Once</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -135,7 +135,7 @@
             </child>
             <child>
               <object class="GtkButton" id="change">
-                <property name="label" translatable="yes">Co_rrect</property>
+                <property name="label" translatable="yes" context="spellingdialog|change">Co_rrect</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -149,7 +149,7 @@
             </child>
             <child>
               <object class="GtkButton" id="changeall">
-                <property name="label" translatable="yes">Correct A_ll</property>
+                <property name="label" translatable="yes" context="spellingdialog|changeall">Correct A_ll</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -163,7 +163,7 @@
             </child>
             <child>
               <object class="GtkButton" id="autocorrect">
-                <property name="label" translatable="yes">Alwa_ys Correct</property>
+                <property name="label" translatable="yes" context="spellingdialog|autocorrect">Alwa_ys Correct</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -177,7 +177,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkgrammar">
-                <property name="label" translatable="yes">Chec_k grammar</property>
+                <property name="label" translatable="yes" context="spellingdialog|checkgrammar">Chec_k grammar</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -193,7 +193,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ignoreall">
-                <property name="label" translatable="yes">I_gnore All</property>
+                <property name="label" translatable="yes" context="spellingdialog|ignoreall">I_gnore All</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -207,7 +207,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ignorerule">
-                <property name="label" translatable="yes">I_gnore Rule</property>
+                <property name="label" translatable="yes" context="spellingdialog|ignorerule">I_gnore Rule</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -223,7 +223,7 @@
               <object class="GtkLabel" id="languageft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text languag_e:</property>
+                <property name="label" translatable="yes" context="spellingdialog|languageft">Text languag_e:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">languagelb</property>
                 <property name="xalign">0</property>
@@ -249,7 +249,7 @@
             </child>
             <child>
               <object class="GtkLinkButton" id="explainlink">
-                <property name="label" translatable="yes">More...</property>
+                <property name="label" translatable="yes" context="spellingdialog|explainlink">More...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -265,7 +265,7 @@
               <object class="GtkLabel" id="resumeft">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Res_ume</property>
+                <property name="label" translatable="yes" context="spellingdialog|resumeft">Res_ume</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -277,7 +277,7 @@
               <object class="GtkLabel" id="nosuggestionsft">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">(no suggestions)</property>
+                <property name="label" translatable="yes" context="spellingdialog|nosuggestionsft">(no suggestions)</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -289,7 +289,7 @@
               <object class="GtkLabel" id="alttitleft">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Spelling: $LANGUAGE ($LOCATION)</property>
+                <property name="label" translatable="yes" context="spellingdialog|alttitleft">Spelling: $LANGUAGE ($LOCATION)</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -316,7 +316,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add">
-                <property name="label" translatable="yes">_Add to Dictionary</property>
+                <property name="label" translatable="yes" context="spellingdialog|add">_Add to Dictionary</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -330,7 +330,7 @@
             </child>
             <child>
               <object class="GtkButton" id="addmb:addmenu">
-                <property name="label" translatable="yes">_Add to Dictionary</property>
+                <property name="label" translatable="yes" context="spellingdialog|addmb">_Add to Dictionary</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -346,7 +346,7 @@
               <object class="GtkLabel" id="suggestionsft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Suggestions</property>
+                <property name="label" translatable="yes" context="spellingdialog|suggestionsft">_Suggestions</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">suggestionslb</property>
                 <property name="xalign">0</property>
@@ -362,7 +362,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">_Not in dictionary</property>
+                <property name="label" translatable="yes" context="spellingdialog|notindictft">_Not in dictionary</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">sentence</property>
                 <property name="xalign">0</property>
@@ -383,7 +383,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">paste</property>
-                    <property name="label" translatable="yes">Paste</property>
+                    <property name="label" translatable="yes" context="spellingdialog|paste">Paste</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_paste.png</property>
                   </object>
@@ -397,7 +397,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">insert</property>
-                    <property name="label" translatable="yes">Special Character</property>
+                    <property name="label" translatable="yes" context="spellingdialog|insert">Special Character</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_insertsymbol.png</property>
                   </object>
diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui
index 29c6add47ad3..34bb3a66e92f 100644
--- a/cui/uiconfig/ui/spelloptionsdialog.ui
+++ b/cui/uiconfig/ui/spelloptionsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SpellOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Options</property>
+    <property name="title" translatable="yes" context="spelloptionsdialog|SpellOptionsDialog">Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/cui/uiconfig/ui/splitcellsdialog.ui b/cui/uiconfig/ui/splitcellsdialog.ui
index 89c276d7b7e2..9131178af49d 100644
--- a/cui/uiconfig/ui/splitcellsdialog.ui
+++ b/cui/uiconfig/ui/splitcellsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">2</property>
@@ -22,7 +22,7 @@
   <object class="GtkDialog" id="SplitCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Split Cells</property>
+    <property name="title" translatable="yes" context="splitcellsdialog|SplitCellsDialog">Split Cells</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -114,7 +114,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Split cell into:</property>
+                            <property name="label" translatable="yes" context="splitcellsdialog|label3">_Split cell into:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">countnf</property>
                           </object>
@@ -143,7 +143,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Split</property>
+                    <property name="label" translatable="yes" context="splitcellsdialog|label1">Split</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -175,7 +175,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="hori">
-                            <property name="label" translatable="yes">H_orizontally</property>
+                            <property name="label" translatable="yes" context="splitcellsdialog|hori">H_orizontally</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -193,7 +193,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="vert">
-                            <property name="label" translatable="yes">_Vertically</property>
+                            <property name="label" translatable="yes" context="splitcellsdialog|vert">_Vertically</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -215,7 +215,7 @@
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkCheckButton" id="prop">
-                                <property name="label" translatable="yes">_Into equal proportions</property>
+                                <property name="label" translatable="yes" context="splitcellsdialog|prop">_Into equal proportions</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -238,7 +238,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Direction</property>
+                    <property name="label" translatable="yes" context="splitcellsdialog|label2">Direction</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui
index 8e200e3201cb..b75122bb17cf 100644
--- a/cui/uiconfig/ui/storedwebconnectiondialog.ui
+++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="StoredWebConnectionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Stored Web Connection Information</property>
+    <property name="title" translatable="yes" context="storedwebconnectiondialog|StoredWebConnectionDialog">Stored Web Connection Information</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Web login information (passwords are never shown)</property>
+                <property name="label" translatable="yes" context="storedwebconnectiondialog|label1">Web login information (passwords are never shown)</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -84,7 +84,7 @@
                   <object class="GtkLabel" id="website">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Website</property>
+                    <property name="label" translatable="yes" context="storedwebconnectiondialog|website">Website</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -95,7 +95,7 @@
                   <object class="GtkLabel" id="username">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">User name</property>
+                    <property name="label" translatable="yes" context="storedwebconnectiondialog|username">User name</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -145,7 +145,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="removeall">
-                    <property name="label" translatable="yes">Remove _All</property>
+                    <property name="label" translatable="yes" context="storedwebconnectiondialog|removeall">Remove _All</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -159,7 +159,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="change">
-                    <property name="label" translatable="yes">_Change Password...</property>
+                    <property name="label" translatable="yes" context="storedwebconnectiondialog|change">_Change Password...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui
index 893607c2e9c4..9bc70c3d07b3 100644
--- a/cui/uiconfig/ui/swpossizepage.ui
+++ b/cui/uiconfig/ui/swpossizepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -72,7 +72,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Width:</property>
+                            <property name="label" translatable="yes" context="swpossizepage|widthft">_Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">width:0.00cm</property>
                           </object>
@@ -110,7 +110,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">H_eight:</property>
+                            <property name="label" translatable="yes" context="swpossizepage|heightft">H_eight:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">height:0.00cm</property>
                           </object>
@@ -127,7 +127,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="ratio">
-                        <property name="label" translatable="yes">_Keep ratio</property>
+                        <property name="label" translatable="yes" context="swpossizepage|ratio">_Keep ratio</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -148,7 +148,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Size</property>
+                <property name="label" translatable="yes" context="swpossizepage|label2">Size</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -204,7 +204,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="topage">
-                        <property name="label" translatable="yes">To _page</property>
+                        <property name="label" translatable="yes" context="swpossizepage|topage">To _page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="topara">
-                        <property name="label" translatable="yes">To paragrap_h</property>
+                        <property name="label" translatable="yes" context="swpossizepage|topara">To paragrap_h</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="tochar">
-                        <property name="label" translatable="yes">To cha_racter</property>
+                        <property name="label" translatable="yes" context="swpossizepage|tochar">To cha_racter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -253,7 +253,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="aschar">
-                        <property name="label" translatable="yes">_As character</property>
+                        <property name="label" translatable="yes" context="swpossizepage|aschar">_As character</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -269,7 +269,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="toframe">
-                        <property name="label" translatable="yes">To _frame</property>
+                        <property name="label" translatable="yes" context="swpossizepage|toframe">To _frame</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -291,7 +291,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Anchor</property>
+                <property name="label" translatable="yes" context="swpossizepage|label1">Anchor</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -332,7 +332,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Hori_zontal:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|horiposft">Hori_zontal:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">horipos</property>
                   </object>
@@ -346,7 +346,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">b_y:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|horibyft">b_y:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">byhori:0.00cm</property>
                   </object>
@@ -360,7 +360,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_by:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|vertbyft">_by:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">byvert:0.00cm</property>
                   </object>
@@ -374,7 +374,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_to:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|horitoft">_to:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">horianchor</property>
                   </object>
@@ -421,7 +421,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Vertical:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|vertposft">_Vertical:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">vertpos</property>
                   </object>
@@ -458,7 +458,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">t_o:</property>
+                    <property name="label" translatable="yes" context="swpossizepage|verttoft">t_o:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">vertanchor</property>
                   </object>
@@ -479,7 +479,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="mirror">
-                    <property name="label" translatable="yes">_Mirror on even pages</property>
+                    <property name="label" translatable="yes" context="swpossizepage|mirror">_Mirror on even pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -496,7 +496,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="followtextflow">
-                    <property name="label" translatable="yes">Follow te_xt flow</property>
+                    <property name="label" translatable="yes" context="swpossizepage|followtextflow">Follow te_xt flow</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -519,7 +519,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="swpossizepage|label11">Position</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -550,7 +550,7 @@
                 <property name="column_spacing">18</property>
                 <child>
                   <object class="GtkCheckButton" id="pos">
-                    <property name="label" translatable="yes">Positio_n</property>
+                    <property name="label" translatable="yes" context="swpossizepage|pos">Positio_n</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -566,7 +566,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="size">
-                    <property name="label" translatable="yes">_Size</property>
+                    <property name="label" translatable="yes" context="swpossizepage|size">_Size</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -588,7 +588,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Protect</property>
+            <property name="label" translatable="yes" context="swpossizepage|label3">Protect</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui
index b49480431526..1926205a52e5 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentAMOUNT">
     <property name="upper">100</property>
@@ -46,23 +46,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">No Effect</col>
+        <col id="0" translatable="yes" context="textanimtabpage|liststoreEFFECT">No Effect</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Blink</col>
+        <col id="0" translatable="yes" context="textanimtabpage|liststoreEFFECT">Blink</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Scroll Through</col>
+        <col id="0" translatable="yes" context="textanimtabpage|liststoreEFFECT">Scroll Through</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Scroll Back and Forth</col>
+        <col id="0" translatable="yes" context="textanimtabpage|liststoreEFFECT">Scroll Back and Forth</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Scroll In</col>
+        <col id="0" translatable="yes" context="textanimtabpage|liststoreEFFECT">Scroll In</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -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">E_ffect:</property>
+                <property name="label" translatable="yes" context="textanimtabpage|FT_EFFECTS">E_ffect:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_EFFECT</property>
               </object>
@@ -132,7 +132,7 @@
               <object class="GtkLabel" id="FT_DIRECTION">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Direction:</property>
+                <property name="label" translatable="yes" context="textanimtabpage|FT_DIRECTION">Direction:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">grid1</property>
               </object>
@@ -152,13 +152,13 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">To top</property>
+                    <property name="tooltip_text" translatable="yes" context="textanimtabpage|BTN_UP|tooltip_text">To top</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
                     <property name="image">imageUP</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_UP-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Up</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="textanimtabpage|BTN_UP-atkobject">Up</property>
                       </object>
                     </child>
                   </object>
@@ -173,13 +173,13 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">To right</property>
+                    <property name="tooltip_text" translatable="yes" context="textanimtabpage|BTN_RIGHT|tooltip_text">To right</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
                     <property name="image">imageRIGHT</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_RIGHT-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Right</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="textanimtabpage|BTN_RIGHT-atkobject">Right</property>
                       </object>
                     </child>
                   </object>
@@ -194,13 +194,13 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">To left</property>
+                    <property name="tooltip_text" translatable="yes" context="textanimtabpage|BTN_LEFT|tooltip_text">To left</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
                     <property name="image">imageLEFT</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_LEFT-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Left</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="textanimtabpage|BTN_LEFT-atkobject">Left</property>
                       </object>
                     </child>
                   </object>
@@ -215,13 +215,13 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">To bottom</property>
+                    <property name="tooltip_text" translatable="yes" context="textanimtabpage|BTN_DOWN|tooltip_text">To bottom</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
                     <property name="image">imageDOWN</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="BTN_DOWN-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Down</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="textanimtabpage|BTN_DOWN-atkobject">Down</property>
                       </object>
                     </child>
                   </object>
@@ -286,7 +286,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="TSB_START_INSIDE">
-                    <property name="label" translatable="yes">S_tart inside</property>
+                    <property name="label" translatable="yes" context="textanimtabpage|TSB_START_INSIDE">S_tart inside</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -303,7 +303,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="TSB_STOP_INSIDE">
-                    <property name="label" translatable="yes">Text _visible when exiting</property>
+                    <property name="label" translatable="yes" context="textanimtabpage|TSB_STOP_INSIDE">Text _visible when exiting</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
@@ -323,7 +323,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Animation cycles:</property>
+                    <property name="label" translatable="yes" context="textanimtabpage|FT_COUNT">Animation cycles:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -341,7 +341,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_ENDLESS">
-                        <property name="label" translatable="yes">_Continuous</property>
+                        <property name="label" translatable="yes" context="textanimtabpage|TSB_ENDLESS">_Continuous</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -387,7 +387,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Increment:</property>
+                    <property name="label" translatable="yes" context="textanimtabpage|FT_AMOUNT">Increment:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -405,7 +405,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_PIXEL">
-                        <property name="label" translatable="yes">_Pixels</property>
+                        <property name="label" translatable="yes" context="textanimtabpage|TSB_PIXEL">_Pixels</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -451,7 +451,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Delay:</property>
+                    <property name="label" translatable="yes" context="textanimtabpage|FT_DELAY">Delay:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -469,7 +469,7 @@
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTO">
-                        <property name="label" translatable="yes">_Automatic</property>
+                        <property name="label" translatable="yes" context="textanimtabpage|TSB_AUTO">_Automatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -519,7 +519,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Properties</property>
+            <property name="label" translatable="yes" context="textanimtabpage|label2">Properties</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui
index dc0059bb32db..6390bbefd230 100644
--- a/cui/uiconfig/ui/textattrtabpage.ui
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -40,7 +40,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTOGROW_WIDTH">
-                        <property name="label" translatable="yes">Fit wi_dth to text</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_AUTOGROW_WIDTH">Fit wi_dth to text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -56,7 +56,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTOGROW_HEIGHT">
-                        <property name="label" translatable="yes">Fit h_eight to text</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_AUTOGROW_HEIGHT">Fit h_eight to text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -72,7 +72,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_FIT_TO_SIZE">
-                        <property name="label" translatable="yes">_Fit to frame</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_FIT_TO_SIZE">_Fit to frame</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -88,7 +88,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_CONTOUR">
-                        <property name="label" translatable="yes">_Adjust to contour</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_CONTOUR">_Adjust to contour</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Drawing Object Text</property>
+                <property name="label" translatable="yes" context="textattrtabpage|label1">Drawing Object Text</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -143,7 +143,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="TSB_WORDWRAP_TEXT">
-                        <property name="label" translatable="yes">_Word wrap text in shape</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_WORDWRAP_TEXT">_Word wrap text in shape</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_AUTOGROW_SIZE">
-                        <property name="label" translatable="yes">_Resize shape to fit text</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_AUTOGROW_SIZE">_Resize shape to fit text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -187,7 +187,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Shape Text</property>
+                <property name="label" translatable="yes" context="textattrtabpage|label8">Custom Shape Text</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -234,7 +234,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Left:</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|label4">_Left:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_LEFT:0.00cm</property>
                         <property name="xalign">0</property>
@@ -248,7 +248,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Right:</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|label5">_Right:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_RIGHT:0.00cm</property>
                         <property name="xalign">0</property>
@@ -262,7 +262,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Top:</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|label6">_Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_TOP:0.00cm</property>
                         <property name="xalign">0</property>
@@ -276,7 +276,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Bottom:</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|label7">_Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">MTR_FLD_BOTTOM:0.00cm</property>
                         <property name="xalign">0</property>
@@ -346,7 +346,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spacing to Borders</property>
+                <property name="label" translatable="yes" context="textattrtabpage|label2">Spacing to Borders</property>
                 <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -395,7 +395,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="TSB_FULL_WIDTH">
-                        <property name="label" translatable="yes">Full _width</property>
+                        <property name="label" translatable="yes" context="textattrtabpage|TSB_FULL_WIDTH">Full _width</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -418,7 +418,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Anchor</property>
+                <property name="label" translatable="yes" context="textattrtabpage|label3">Text Anchor</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui
index 8c7ec8553b53..16157dce4fe2 100644
--- a/cui/uiconfig/ui/textdialog.ui
+++ b/cui/uiconfig/ui/textdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Text</property>
+    <property name="title" translatable="yes" context="textdialog|TextDialog">Text</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="textdialog|RID_SVXPAGE_TEXTATTR">Text</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TEXTANIMATION">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Animation</property>
+                <property name="label" translatable="yes" context="textdialog|RID_SVXPAGE_TEXTANIMATION">Text Animation</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index 8ce7a43b9100..6565cb8427ea 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">2</property>
@@ -50,7 +50,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkAuto">
-                    <property name="label" translatable="yes">A_utomatically</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkAuto">A_utomatically</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">C_haracters at line end</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelLineEnd">C_haracters at line end</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spinLineEnd</property>
                   </object>
@@ -129,7 +129,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Cha_racters at line begin</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelLineBegin">Cha_racters at line begin</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spinLineBegin</property>
                   </object>
@@ -143,7 +143,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Maximum number of consecutive hyphens</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelMaxNum">_Maximum number of consecutive hyphens</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spinMaxNum</property>
                   </object>
@@ -160,7 +160,7 @@
           <object class="GtkLabel" id="LabelHyphenation">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Hyphenation</property>
+            <property name="label" translatable="yes" context="textflowpage|LabelHyphenation">Hyphenation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -193,7 +193,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkInsert">
-                    <property name="label" translatable="yes">_Insert</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkInsert">_Insert</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -209,7 +209,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkPageStyle">
-                    <property name="label" translatable="yes">With page st_yle:</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkPageStyle">With page st_yle:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -228,7 +228,7 @@
                   <object class="GtkLabel" id="labelType">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Type:</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelType">_Type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboBreakType</property>
                     <property name="xalign">0</property>
@@ -257,7 +257,7 @@
                   <object class="GtkCheckButton" id="labelPageNum">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Page _number:</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelPageNum">Page _number:</property>
                     <property name="use_underline">True</property>
                     <property name="inconsistent">True</property>
                     <property name="justify">right</property>
@@ -272,7 +272,7 @@
                   <object class="GtkLabel" id="labelPosition">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position:</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelPosition">Position:</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">comboBreakPosition</property>
@@ -292,7 +292,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="comboPageStyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Page Style</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="textflowpage|comboPageStyle-atkobject">Page Style</property>
                       </object>
                     </child>
                   </object>
@@ -306,8 +306,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Page</item>
-                      <item translatable="yes">Column</item>
+                      <item translatable="yes" context="textflowpage|comboBreakType">Page</item>
+                      <item translatable="yes" context="textflowpage|comboBreakType">Column</item>
                     </items>
                   </object>
                   <packing>
@@ -320,8 +320,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Before</item>
-                      <item translatable="yes">After</item>
+                      <item translatable="yes" context="textflowpage|comboBreakPosition">Before</item>
+                      <item translatable="yes" context="textflowpage|comboBreakPosition">After</item>
                     </items>
                   </object>
                   <packing>
@@ -340,7 +340,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Breaks</property>
+            <property name="label" translatable="yes" context="textflowpage|label3">Breaks</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -372,7 +372,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkSplitPara">
-                    <property name="label" translatable="yes">_Do not split paragraph</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkSplitPara">_Do not split paragraph</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -388,7 +388,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkKeepPara">
-                    <property name="label" translatable="yes">_Keep with next paragraph</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkKeepPara">_Keep with next paragraph</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -404,7 +404,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkOrphan">
-                    <property name="label" translatable="yes">_Orphan control</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkOrphan">_Orphan control</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -420,7 +420,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkWidow">
-                    <property name="label" translatable="yes">_Widow control</property>
+                    <property name="label" translatable="yes" context="textflowpage|checkWidow">_Widow control</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -470,7 +470,7 @@
                   <object class="GtkLabel" id="labelOrphan">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">lines</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelOrphan">lines</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -482,7 +482,7 @@
                   <object class="GtkLabel" id="labelWidow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">lines</property>
+                    <property name="label" translatable="yes" context="textflowpage|labelWidow">lines</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -510,7 +510,7 @@
           <object class="GtkLabel" id="labelOptions">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="textflowpage|labelOptions">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui
index 61ea65fe977d..c2c1cc17dc4f 100644
--- a/cui/uiconfig/ui/thesaurus.ui
+++ b/cui/uiconfig/ui/thesaurus.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="ThesaurusDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Thesaurus</property>
+    <property name="title" translatable="yes" context="thesaurus|ThesaurusDialog">Thesaurus</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -40,7 +40,7 @@
             </child>
             <child>
               <object class="GtkButton" id="replace">
-                <property name="label" translatable="yes">_Replace</property>
+                <property name="label" translatable="yes" context="thesaurus|replace">_Replace</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
@@ -86,7 +86,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Current word:</property>
+                <property name="label" translatable="yes" context="thesaurus|label1">Current word:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">wordcb</property>
               </object>
@@ -101,7 +101,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Alternatives:</property>
+                <property name="label" translatable="yes" context="thesaurus|label2">Alternatives:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">alternatives</property>
               </object>
@@ -116,7 +116,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Replace with:</property>
+                <property name="label" translatable="yes" context="thesaurus|label3">Replace with:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">replaceed</property>
               </object>
diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui
index 4e6d244313fa..544b86e44f34 100644
--- a/cui/uiconfig/ui/transparencytabpage.ui
+++ b/cui/uiconfig/ui/transparencytabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentDegrees">
@@ -22,27 +22,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Linear</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Linear</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Axial</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Axial</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Radial</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Radial</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Ellipsoid</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Ellipsoid</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Quadratic</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Quadratic</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Square</col>
+        <col id="0" translatable="yes" context="transparencytabpage|liststoreTYPE">Square</col>
         <col id="1">0</col>
       </row>
     </data>
@@ -82,7 +82,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="RBT_TRANS_OFF">
-                        <property name="label" translatable="yes">_No transparency</property>
+                        <property name="label" translatable="yes" context="transparencytabpage|RBT_TRANS_OFF">_No transparency</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -100,7 +100,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RBT_TRANS_LINEAR">
-                        <property name="label" translatable="yes">_Transparency:</property>
+                        <property name="label" translatable="yes" context="transparencytabpage|RBT_TRANS_LINEAR">_Transparency:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -121,7 +121,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="RBT_TRANS_GRADIENT">
-                        <property name="label" translatable="yes">_Gradient</property>
+                        <property name="label" translatable="yes" context="transparencytabpage|RBT_TRANS_GRADIENT">_Gradient</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -263,7 +263,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Ty_pe:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_TYPE">Ty_pe:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_TRGR_GRADIENT_TYPES</property>
                           </object>
@@ -284,7 +284,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Center _X:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_CENTER_X">Center _X:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_CENTER_X:0%</property>
                           </object>
@@ -305,7 +305,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Center _Y:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_CENTER_Y">Center _Y:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_CENTER_Y:0%</property>
                           </object>
@@ -326,7 +326,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Angle:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_ANGLE">_Angle:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_ANGLE:0degree</property>
                           </object>
@@ -347,7 +347,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Border:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_BORDER">_Border:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_BORDER:0%</property>
                           </object>
@@ -368,7 +368,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Start value:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_START_VALUE">_Start value:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_START_VALUE:0%</property>
                           </object>
@@ -389,7 +389,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_End value:</property>
+                            <property name="label" translatable="yes" context="transparencytabpage|FT_TRGR_END_VALUE">_End value:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">MTR_TRGR_END_VALUE:0%</property>
                           </object>
@@ -432,7 +432,7 @@
                     <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="transparencytabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property>
                       </object>
                     </child>
                   </object>
@@ -450,7 +450,7 @@
                     <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="CTL_TRANS_PREVIEW-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="transparencytabpage|CTL_TRANS_PREVIEW-atkobject">Example</property>
                       </object>
                     </child>
                   </object>
@@ -491,7 +491,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Area Transparency Mode</property>
+        <property name="label" translatable="yes" context="transparencytabpage|FL_PROP">Area Transparency Mode</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui
index 172970d3d9e1..4b5b137b738a 100644
--- a/cui/uiconfig/ui/tsaurldialog.ui
+++ b/cui/uiconfig/ui/tsaurldialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="TSAURLDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Time Stamping Authority URLs</property>
+    <property name="title" translatable="yes" context="tsaurldialog|TSAURLDialog">Time Stamping Authority URLs</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -32,7 +32,7 @@
             </child>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">_Delete...</property>
+                <property name="label" translatable="yes" context="tsaurldialog|delete">_Delete...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -48,7 +48,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add">
-                <property name="label" translatable="yes">_Add...</property>
+                <property name="label" translatable="yes" context="tsaurldialog|add">_Add...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -128,7 +128,7 @@
                         <property name="margin_bottom">6</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Add or delete Time Stamp Authority URLs</property>
+                        <property name="label" translatable="yes" context="tsaurldialog|label2">Add or delete Time Stamp Authority URLs</property>
                         <property name="use_underline">True</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">60</property>
@@ -164,7 +164,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Enter a Time Stamp Authority URL</property>
+                            <property name="label" translatable="yes" context="tsaurldialog|enteraurl">Enter a Time Stamp Authority URL</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">TSA URL</property>
+                <property name="label" translatable="yes" context="tsaurldialog|label1">TSA URL</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index 2adca53b0187..57a4b6f1d5c4 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="cui">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkListStore" id="liststore1">
@@ -11,27 +11,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(None)</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">(None)</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">(</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">(</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">[</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">[</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">&lt;</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">&lt;</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">{</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">{</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Other Characters...</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore1">Other Characters...</col>
         <col id="1">5</col>
       </row>
     </data>
@@ -45,27 +45,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">(None)</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">(None)</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">)</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">)</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">]</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">]</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">&gt;</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">&gt;</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">}</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">}</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Other Characters...</col>
+        <col id="0" translatable="yes" context="twolinespage|liststore2">Other Characters...</col>
         <col id="1">5</col>
       </row>
     </data>
@@ -90,7 +90,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="twolines">
-                <property name="label" translatable="yes">Write in double lines</property>
+                <property name="label" translatable="yes" context="twolinespage|twolines">Write in double lines</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -104,7 +104,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Double-lined</property>
+            <property name="label" translatable="yes" context="twolinespage|label2">Double-lined</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -139,7 +139,7 @@
                   <object class="GtkLabel" id="label29">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Initial character</property>
+                    <property name="label" translatable="yes" context="twolinespage|label29">Initial character</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label30">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Final character</property>
+                    <property name="label" translatable="yes" context="twolinespage|label30">Final character</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -203,7 +203,7 @@
           <object class="GtkLabel" id="label28">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Enclosing Character</property>
+            <property name="label" translatable="yes" context="twolinespage|label28">Enclosing Character</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -230,7 +230,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="preview:border-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="twolinespage|preview-atkobject">Preview</property>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/wordcompletionpage.ui b/cui/uiconfig/ui/wordcompletionpage.ui
index 0ab7df972b9c..48a981b5b288 100644
--- a/cui/uiconfig/ui/wordcompletionpage.ui
+++ b/cui/uiconfig/ui/wordcompletionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -40,7 +40,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">_Delete Entry</property>
+                <property name="label" translatable="yes" context="wordcompletionpage|delete">_Delete Entry</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -84,7 +84,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Max. entries:</property>
+                    <property name="label" translatable="yes" context="wordcompletionpage|label1">_Max. entries:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">maxentries</property>
                   </object>
@@ -123,7 +123,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Mi_n. word length:</property>
+                    <property name="label" translatable="yes" context="wordcompletionpage|label2">Mi_n. word length:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">maxentries</property>
                   </object>
@@ -169,7 +169,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="appendspace">
-                            <property name="label" translatable="yes">_Append space</property>
+                            <property name="label" translatable="yes" context="wordcompletionpage|appendspace">_Append space</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -184,7 +184,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="showastip">
-                            <property name="label" translatable="yes">_Show as tip</property>
+                            <property name="label" translatable="yes" context="wordcompletionpage|showastip">_Show as tip</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="enablewordcomplete">
-                    <property name="label" translatable="yes">Enable word _completion</property>
+                    <property name="label" translatable="yes" context="wordcompletionpage|enablewordcomplete">Enable word _completion</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -243,7 +243,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="whenclosing:wrap">
-                            <property name="label" translatable="yes">_When closing a document, remove the words collected from it from the list</property>
+                            <property name="label" translatable="yes" context="wordcompletionpage|whenclosing">_When closing a document, remove the words collected from it from the list</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -266,7 +266,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="collectwords">
-                    <property name="label" translatable="yes">C_ollect words</property>
+                    <property name="label" translatable="yes" context="wordcompletionpage|collectwords">C_ollect words</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -296,7 +296,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Acc_ept with:</property>
+                    <property name="label" translatable="yes" context="wordcompletionpage|label3">Acc_ept with:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">acceptwith</property>
                   </object>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index 5d5df219b7f5..40fa13f6b3fb 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="cui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="ZoomDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Zoom &amp; View Layout</property>
+    <property name="title" translatable="yes" context="zoomdialog|ZoomDialog">Zoom &amp; View Layout</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -100,7 +100,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="optimal">
-                            <property name="label" translatable="yes">Optimal</property>
+                            <property name="label" translatable="yes" context="zoomdialog|optimal">Optimal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="fitwandh">
-                            <property name="label" translatable="yes">Fit width and height</property>
+                            <property name="label" translatable="yes" context="zoomdialog|fitwandh">Fit width and height</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -134,7 +134,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="fitw">
-                            <property name="label" translatable="yes">Fit width</property>
+                            <property name="label" translatable="yes" context="zoomdialog|fitw">Fit width</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -151,7 +151,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="100pc">
-                            <property name="label" translatable="yes">100%</property>
+                            <property name="label" translatable="yes" context="zoomdialog|100pc">100%</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -173,7 +173,7 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="variable">
-                                <property name="label" translatable="yes">Variable:</property>
+                                <property name="label" translatable="yes" context="zoomdialog|variable">Variable:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -201,7 +201,7 @@
                                 </accessibility>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="zoomsb:0%-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Variable</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="zoomdialog|zoomsb-atkobject">Variable</property>
                                   </object>
                                 </child>
                               </object>
@@ -226,7 +226,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Zoom Factor</property>
+                    <property name="label" translatable="yes" context="zoomdialog|label2">Zoom Factor</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -259,7 +259,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="automatic">
-                            <property name="label" translatable="yes">Automatic</property>
+                            <property name="label" translatable="yes" context="zoomdialog|automatic">Automatic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -276,7 +276,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="singlepage">
-                            <property name="label" translatable="yes">Single page</property>
+                            <property name="label" translatable="yes" context="zoomdialog|singlepage">Single page</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -298,7 +298,7 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="columns">
-                                <property name="label" translatable="yes">Columns:</property>
+                                <property name="label" translatable="yes" context="zoomdialog|columns">Columns:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -329,7 +329,7 @@
                                 </accessibility>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="columnssb-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Columns</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="zoomdialog|columnssb-atkobject">Columns</property>
                                   </object>
                                 </child>
                               </object>
@@ -353,7 +353,7 @@
                             <property name="left_padding">12</property>
                             <child>
                               <object class="GtkCheckButton" id="bookmode">
-                                <property name="label" translatable="yes">Book mode</property>
+                                <property name="label" translatable="yes" context="zoomdialog|bookmode">Book mode</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -380,7 +380,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">View Layout</property>
+                    <property name="label" translatable="yes" context="zoomdialog|label1">View Layout</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/dbaccess/AllLangMoTarget_dba.mk b/dbaccess/AllLangMoTarget_dba.mk
new file mode 100644
index 000000000000..5c57ae6a8425
--- /dev/null
+++ b/dbaccess/AllLangMoTarget_dba.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,dba))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,dba,dbaccess))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
deleted file mode 100644
index 4892ba492704..000000000000
--- a/dbaccess/AllLangResTarget_dba.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,dba))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dba,\
-    dbaccess/dba \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
-    $$(INCLUDE) \
-	-I$(SRCDIR)/dbaccess/source/core/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
-    dbaccess/source/core/resource/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
deleted file mode 100644
index 7004c1126222..000000000000
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ /dev/null
@@ -1,24 +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,dbmm))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dbmm,\
-    dbaccess/dbmm \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
-    dbaccess/source/ext/macromigration/macromigration.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
deleted file mode 100644
index 6cb9ced4ddc3..000000000000
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ /dev/null
@@ -1,52 +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,dbu))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbu,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dbu,\
-    dbaccess/dbu \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/dbaccess/inc \
-    -I$(SRCDIR)/dbaccess/source/ui/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
-    dbaccess/source/ui/app/app.src \
-    dbaccess/source/ui/browser/sbabrw.src \
-    dbaccess/source/ui/browser/sbagrid.src \
-    dbaccess/source/ui/control/TableGrantCtrl.src \
-    dbaccess/source/ui/control/tabletree.src \
-    dbaccess/source/ui/control/undosqledit.src \
-    dbaccess/source/ui/dlg/AutoControls.src \
-    dbaccess/source/ui/dlg/ConnectionPage.src \
-    dbaccess/source/ui/dlg/dbadmin2.src \
-    dbaccess/source/ui/dlg/dbadminsetup.src \
-    dbaccess/source/ui/dlg/dbadmin.src \
-    dbaccess/source/ui/dlg/directsql.src \
-    dbaccess/source/ui/dlg/indexdialog.src \
-    dbaccess/source/ui/dlg/paramdialog.src \
-    dbaccess/source/ui/dlg/sqlmessage.src \
-    dbaccess/source/ui/dlg/UserAdmin.src \
-    dbaccess/source/ui/misc/dbumiscres.src \
-    dbaccess/source/ui/misc/WizardPages.src \
-    dbaccess/source/ui/querydesign/querydlg.src \
-    dbaccess/source/ui/querydesign/query.src \
-    dbaccess/source/ui/relationdesign/relation.src \
-    dbaccess/source/ui/tabledesign/table.src \
-    dbaccess/source/ui/uno/copytablewizard.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
deleted file mode 100644
index 8b18e2f6c768..000000000000
--- a/dbaccess/AllLangResTarget_sdbt.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,sdbt))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sdbt,\
-    dbaccess/sdbt \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/dbaccess/source/sdbtools/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
-    dbaccess/source/sdbtools/resource/sdbt_strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index de5b2a8ff0ab..0bc9c77d46dd 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -112,7 +112,4 @@ $(WORKDIR)/CppunitTest/RowSetClones.odb : $(SRCDIR)/dbaccess/qa/extras/testdocum
 	cp -P -f "$<" "$@"
 .PHONY: $(WORKDIR)/CppunitTest/RowSetClones.odb
 
-$(call gb_CppunitTest_get_target,dbaccess_RowSetClones): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 68cfeb6eb808..408366ecb445 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testDialogSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdoc
 	cp -P -f "$<" "$@"
 .PHONY: $(WORKDIR)/CppunitTest/testDialogSave.odb
 
-$(call gb_CppunitTest_get_target,dbaccess_dialog_save): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
index 268ebf8439ac..6d1e47df4a30 100644
--- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb : $(SRCDIR)/dbaccess/qa/extras/te
 	cp -P -f "$<" "$@"
 .PHONY: $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb
 
-$(call gb_CppunitTest_get_target,dbaccess_empty_stdlib_save): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 41c54b05d85a..071f05c5e34a 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -78,7 +78,4 @@ $(eval $(call gb_CppunitTest_use_jars,dbaccess_hsqldb_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test))
 
-$(call gb_CppunitTest_get_target,dbaccess_hsqldb_test): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 82829acd1ec7..8d8672e882fe 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -98,7 +98,4 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
 
-$(call gb_CppunitTest_get_target,dbaccess_macros_test): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
index 71e517c2e31a..1490c024aeb2 100644
--- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testNolibSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdocu
 	cp -P -f "$<" "$@"
 .PHONY: $(WORKDIR)/CppunitTest/testNolibSave.odb
 
-$(call gb_CppunitTest_get_target,dbaccess_nolib_save): \
-    $(call gb_AllLangResTarget_get_target,ofa)
-
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index ed92df704917..9af43f75c3de 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,dba))
 
 $(eval $(call gb_Library_set_include,dba,\
     $$(INCLUDE) \
+	-I$(SRCDIR)/dbaccess/inc \
 	-I$(SRCDIR)/dbaccess/source/inc \
 	-I$(SRCDIR)/dbaccess/source/core/inc \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index ae92553677af..0bfcfe9b7e16 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,dbaxml))
 
 $(eval $(call gb_Library_set_include,dbaxml,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/dbaccess/inc \
     -I$(SRCDIR)/dbaccess/source/inc \
 ))
 
@@ -68,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\
     dbaccess/source/filter/xml/xmlTableFilterList \
     dbaccess/source/filter/xml/xmlTableFilterPattern \
     dbaccess/source/shared/flt_reghelper \
-    dbaccess/source/shared/xmlstrings \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 3fb6dde2c7b5..95aa4502645c 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
     comphelper \
     cppu \
     cppuhelper \
+    dba \
     sal \
     svl \
     svt \
@@ -39,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
 $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
 
 $(eval $(call gb_Library_add_exception_objects,dbmm,\
-    dbaccess/source/ext/macromigration/dbmm_module \
     dbaccess/source/ext/macromigration/dbmm_services \
     dbaccess/source/ext/macromigration/dbmm_types \
     dbaccess/source/ext/macromigration/docinteraction \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 2192c77e4ebe..0ea52842317c 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -166,7 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/misc/imageprovider \
     dbaccess/source/ui/misc/indexcollection \
     dbaccess/source/ui/misc/linkeddocuments \
-    dbaccess/source/ui/misc/moduledbu \
     dbaccess/source/ui/misc/propertysetitem \
     dbaccess/source/ui/misc/propertystorage \
     dbaccess/source/ui/misc/RowSetDrop \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 50c67d364dc2..7af89f68911e 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,sdbt))
 
 $(eval $(call gb_Library_set_include,sdbt,\
     $$(INCLUDE) \
+	-I$(SRCDIR)/dbaccess/inc/ \
 	-I$(SRCDIR)/dbaccess/source/inc/ \
 	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
 ))
@@ -25,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
     comphelper \
     cppu \
     cppuhelper \
+    dba \
     dbtools \
     sal \
     salhelper \
@@ -39,9 +41,7 @@ $(eval $(call gb_Library_add_exception_objects,sdbt,\
     dbaccess/source/sdbtools/connection/datasourcemetadata \
     dbaccess/source/sdbtools/connection/objectnames \
     dbaccess/source/sdbtools/connection/tablename \
-    dbaccess/source/sdbtools/misc/module_sdbt \
     dbaccess/source/sdbtools/misc/sdbt_services \
-    dbaccess/source/shared/sdbtstrings \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index f7bd82efd669..d9f80fc11540 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -18,13 +18,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
 	Library_dbmm \
 	Library_dbu \
 	Library_sdbt \
-))
-
-$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
-    AllLangResTarget_dba \
-    AllLangResTarget_dbmm \
-    AllLangResTarget_dbu \
-    AllLangResTarget_sdbt \
 	UIConfig_dbaccess \
 	UIConfig_dbapp \
 	UIConfig_dbbrowser \
@@ -34,6 +27,10 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
 	UIConfig_dbtdata \
 ))
 
+$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
+	AllLangMoTarget_dba \
+))
+
 ifneq ($(OS),IOS)
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/inc/core_resource.hxx
index 2c52c7a41872..ecbdcdde5bf4 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/inc/core_resource.hxx
@@ -21,22 +21,20 @@
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 #include <rtl/ustring.hxx>
+#include "dbadllapi.hxx"
 
-class ResMgr;
+#define DBA_RES( id )                       ::dbaccess::ResourceManager::loadString( id )
+#define DBA_RES_PARAM( id, ascii, replace ) ::dbaccess::ResourceManager::loadString( id, ascii, replace )
 
 namespace dbaccess
 {
-
-#define DBA_RES( id )                       ResourceManager::loadString( id )
-#define DBA_RES_PARAM( id, ascii, replace ) ResourceManager::loadString( id, ascii, replace )
-
     // ResourceManager
     // handling resources within the DBA-Core library
-    class ResourceManager
+    class OOO_DLLPUBLIC_DBA ResourceManager
     {
         friend class OModuleClient;
         static sal_Int32    s_nClients;     /// number of registered clients
-        static ResMgr*  m_pImpl;
+        static std::locale*  m_pImpl;
 
     private:
         // no instantiation allowed
@@ -53,11 +51,11 @@ namespace dbaccess
     public:
         /** loads the string with the specified resource id
         */
-        static OUString  loadString(sal_uInt16 _nResId);
+        static OUString  loadString(const char* pResId);
 
         /** loads a string from the resource file, substituting a placeholder with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pPlaceholderAscii
                 the ASCII representation of the placeholder string
@@ -65,14 +63,14 @@ namespace dbaccess
                 the string which should substitute the placeholder
         */
         static OUString  loadString(
-                sal_uInt16              _nResId,
-                const sal_Char*         _pPlaceholderAscii,
+                const char* pResId,
+                const sal_Char* _pPlaceholderAscii,
                 const OUString&  _rReplace
         );
 
         /** loads a string from the resource file, substituting two placeholders with given strings
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pPlaceholderAscii1
                 the ASCII representation of the first placeholder string
@@ -84,11 +82,11 @@ namespace dbaccess
                 the string which should substitute the second placeholder
         */
         static OUString  loadString(
-                sal_uInt16              _nResId,
-                const sal_Char*         _pPlaceholderAscii1,
-                const OUString&  _rReplace1,
-                const sal_Char*         _pPlaceholderAscii2,
-                const OUString&  _rReplace2
+                const char* pResId,
+                const sal_Char* _pPlaceholderAscii1,
+                const OUString& _rReplace1,
+                const sal_Char* _pPlaceholderAscii2,
+                const OUString& _rReplace2
         );
     };
 
diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/inc/dbadllapi.hxx
index 901263bdcf86..901263bdcf86 100644
--- a/dbaccess/source/inc/dbadllapi.hxx
+++ b/dbaccess/inc/dbadllapi.hxx
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 5e0f6e33eb85..592f0f7acb1e 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -264,7 +264,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <svl/svldllapi.h>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
@@ -277,7 +276,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx
index da594a547c78..d566e6f5f39e 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx
@@ -91,14 +91,12 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sax/tools/converter.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/filenotation.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/wintypes.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index 02ec793771e7..5280bb6c3ba2 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -192,7 +192,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
@@ -203,7 +202,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index c572c0098654..3adbf7daef0c 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -121,7 +121,6 @@
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sfx2/dllapi.h>
 #include <sot/formats.hxx>
 #include <svl/eitem.hxx>
@@ -140,7 +139,6 @@
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
 #include <typelib/typedescription.h>
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/dbaccess/inc/query.hrc
index d9c86575cb6e..00a17a34aeef 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/dbaccess/inc/query.hrc
@@ -16,25 +16,18 @@
  *   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_VCL_INC_PRINTACCESSORYVIEW_HRC
+#define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
-#include "dialmgr.hxx"
-#include "swtypes.hxx"
-#include <tools/resmgr.hxx>
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#ifndef DISABLE_DYNLOADING
-ResMgr* pSwResMgr=nullptr;
-#else
-static ResMgr *pSwResMgr;
-#endif
-
-ResMgr* SwDialogsResMgr::GetResMgr()
+const char* RSC_QUERY_OBJECT_TYPE[] =
 {
-    if ( !pSwResMgr )
-    {
-        pSwResMgr = ResMgr::CreateResMgr( "sw" );
-    }
+    NC_("RSC_QUERY_OBJECT_TYPE", "The table view"),
+    NC_("RSC_QUERY_OBJECT_TYPE", "The query"),
+    NC_("RSC_QUERY_OBJECT_TYPE", "The SQL statement")
+};
 
-    return pSwResMgr;
-}
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
new file mode 100644
index 000000000000..47068f43d09e
--- /dev/null
+++ b/dbaccess/inc/strings.hrc
@@ -0,0 +1,495 @@
+/* -*- 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_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_STR_CONNECTION_INVALID                  NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.")
+#define RID_STR_TABLE_IS_FILTERED                   NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.")
+#define RID_STR_COULDNOTCONNECT_UNSPECIFIED         NC_("RID_STR_COULDNOTCONNECT_UNSPECIFIED", "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.")
+#define RID_STR_COULDNOTCONNECT_NODRIVER            NC_("RID_STR_COULDNOTCONNECT_NODRIVER", "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'.")
+#define RID_STR_COULDNOTLOAD_MANAGER                NC_("RID_STR_COULDNOTLOAD_MANAGER", "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.")
+#define RID_STR_FORM                                NC_("RID_STR_FORM", "Form")
+#define RID_STR_REPORT                              NC_("RID_STR_REPORT", "Report")
+#define RID_STR_DATASOURCE_NOT_STORED               NC_("RID_STR_DATASOURCE_NOT_STORED", "The data source was not saved. Please use the interface XStorable to save the data source.")
+#define RID_STR_ONLY_QUERY                          NC_("RID_STR_ONLY_QUERY", "The given command is not a SELECT statement.\nOnly queries are allowed.")
+#define RID_STR_NO_VALUE_CHANGED                    NC_("RID_STR_NO_VALUE_CHANGED", "No values were modified.")
+#define RID_STR_NO_XROWUPDATE                       NC_("RID_STR_NO_XROWUPDATE", "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet.")
+#define RID_STR_NO_XRESULTSETUPDATE                 NC_("RID_STR_NO_XRESULTSETUPDATE", "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet.")
+#define RID_STR_NO_UPDATE_MISSING_CONDITION         NC_("RID_STR_NO_UPDATE_MISSING_CONDITION", "Values could not be modified, due to a missing condition statement.")
+#define RID_STR_NO_COLUMN_ADD                       NC_("RID_STR_NO_COLUMN_ADD", "The adding of columns is not supported.")
+#define RID_STR_NO_COLUMN_DROP                      NC_("RID_STR_NO_COLUMN_DROP", "The dropping of columns is not supported.")
+#define RID_STR_NO_CONDITION_FOR_PK                 NC_("RID_STR_NO_CONDITION_FOR_PK", "The WHERE condition could not be created for the primary key.")
+#define RID_STR_COLUMN_UNKNOWN_PROP                 NC_("RID_STR_COLUMN_UNKNOWN_PROP", "The column does not support the property '%value'.")
+#define RID_STR_COLUMN_NOT_SEARCHABLE               NC_("RID_STR_COLUMN_NOT_SEARCHABLE", "The column is not searchable!")
+#define RID_STR_NOT_SEQUENCE_INT8                   NC_("RID_STR_NOT_SEQUENCE_INT8", "The value of the columns is not of the type Sequence<sal_Int8>.")
+#define RID_STR_COLUMN_NOT_VALID                    NC_("RID_STR_COLUMN_NOT_VALID", "The column is not valid.")
+#define RID_STR_COLUMN_MUST_VISIBLE                 NC_("RID_STR_COLUMN_MUST_VISIBLE", "The column '%name' must be visible as a column.")
+#define RID_STR_NO_XQUERIESSUPPLIER                 NC_("RID_STR_NO_XQUERIESSUPPLIER", "The interface XQueriesSupplier is not available.")
+#define RID_STR_NO_ABS_ZERO                         NC_("RID_STR_NO_ABS_ZERO", "An 'absolute(0)' call is not allowed.")
+#define RID_STR_NO_RELATIVE                         NC_("RID_STR_NO_RELATIVE", "Relative positioning is not allowed in this state.")
+#define RID_STR_NO_REFESH_AFTERLAST                 NC_("RID_STR_NO_REFESH_AFTERLAST", "A row cannot be refreshed when the ResultSet is positioned after the last row.")
+#define RID_STR_NO_MOVETOINSERTROW_CALLED           NC_("RID_STR_NO_MOVETOINSERTROW_CALLED", "A new row cannot be inserted when the ResultSet is not first moved to the insert row.")
+#define RID_STR_NO_UPDATEROW                        NC_("RID_STR_NO_UPDATEROW", "A row cannot be modified in this state")
+#define RID_STR_NO_DELETEROW                        NC_("RID_STR_NO_DELETEROW", "A row cannot be deleted in this state.")
+#define RID_STR_NO_TABLE_RENAME                     NC_("RID_STR_NO_TABLE_RENAME", "The driver does not support table renaming.")
+#define RID_STR_COLUMN_ALTER_BY_NAME                NC_("RID_STR_COLUMN_ALTER_BY_NAME", "The driver does not support the modification of column descriptions by changing the name.")
+#define RID_STR_COLUMN_ALTER_BY_INDEX               NC_("RID_STR_COLUMN_ALTER_BY_INDEX", "The driver does not support the modification of column descriptions by changing the index.")
+#define RID_STR_FILE_DOES_NOT_EXIST                 NC_("RID_STR_FILE_DOES_NOT_EXIST", "The file \"$file$\" does not exist.")
+#define RID_STR_TABLE_DOES_NOT_EXIST                NC_("RID_STR_TABLE_DOES_NOT_EXIST", "There exists no table named \"$table$\".")
+#define RID_STR_QUERY_DOES_NOT_EXIST                NC_("RID_STR_QUERY_DOES_NOT_EXIST", "There exists no query named \"$table$\".")
+#define RID_STR_CONFLICTING_NAMES                   NC_("RID_STR_CONFLICTING_NAMES", "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names.")
+#define RID_STR_COMMAND_LEADING_TO_ERROR            NC_("RID_STR_COMMAND_LEADING_TO_ERROR", "The SQL command leading to this error is:\n\n$command$")
+#define RID_STR_STATEMENT_WITHOUT_RESULT_SET        NC_("RID_STR_STATEMENT_WITHOUT_RESULT_SET", "The SQL command does not describe a result set.")
+#define RID_STR_NAME_MUST_NOT_BE_EMPTY              NC_("RID_STR_NAME_MUST_NOT_BE_EMPTY", "The name must not be empty.")
+#define RID_STR_NO_NULL_OBJECTS_IN_CONTAINER        NC_("RID_STR_NO_NULL_OBJECTS_IN_CONTAINER", "The container cannot contain NULL objects.")
+#define RID_STR_NAME_ALREADY_USED                   NC_("RID_STR_NAME_ALREADY_USED", "There already is an object with the given name.")
+#define RID_STR_OBJECT_CONTAINER_MISMATCH           NC_("RID_STR_OBJECT_CONTAINER_MISMATCH", "This object cannot be part of this container.")
+#define RID_STR_OBJECT_ALREADY_CONTAINED            NC_("RID_STR_OBJECT_ALREADY_CONTAINED", "The object already is, with a different name, part of the container.")
+#define RID_STR_NAME_NOT_FOUND                      NC_("RID_STR_NAME_NOT_FOUND", "Unable to find the document '$name$'.")
+#define RID_STR_ERROR_WHILE_SAVING                  NC_("RID_STR_ERROR_WHILE_SAVING", "Could not save the document to $location$:\n$message$")
+#define RID_NO_SUCH_DATA_SOURCE                     NC_("RID_NO_SUCH_DATA_SOURCE", "Error accessing data source '$name$':\n$error$")
+#define RID_STR_NO_SUB_FOLDER                       NC_("RID_STR_NO_SUB_FOLDER", "There exists no folder named \"$folder$\".")
+#define RID_STR_NO_DELETE_BEFORE_AFTER              NC_("RID_STR_NO_DELETE_BEFORE_AFTER", "Cannot delete the before-first or after-last row.")
+#define RID_STR_NO_DELETE_INSERT_ROW                NC_("RID_STR_NO_DELETE_INSERT_ROW", "Cannot delete the insert-row.")
+#define RID_STR_RESULT_IS_READONLY                  NC_("RID_STR_RESULT_IS_READONLY", "Result set is read only.")
+#define RID_STR_NO_DELETE_PRIVILEGE                 NC_("RID_STR_NO_DELETE_PRIVILEGE", "DELETE privilege not available.")
+#define RID_STR_ROW_ALREADY_DELETED                 NC_("RID_STR_ROW_ALREADY_DELETED", "Current row is already deleted.")
+#define RID_STR_UPDATE_FAILED                       NC_("RID_STR_UPDATE_FAILED", "Current row could not be updated.")
+#define RID_STR_NO_INSERT_PRIVILEGE                 NC_("RID_STR_NO_INSERT_PRIVILEGE", "INSERT privilege not available.")
+#define RID_STR_INTERNAL_ERROR                      NC_("RID_STR_INTERNAL_ERROR", "Internal error: no statement object provided by the database driver.")
+#define RID_STR_EXPRESSION1                         NC_("RID_STR_EXPRESSION1", "Expression1")
+#define RID_STR_NO_SQL_COMMAND                      NC_("RID_STR_NO_SQL_COMMAND", "No SQL command was provided.")
+#define RID_STR_INVALID_INDEX                       NC_("RID_STR_INVALID_INDEX", "Invalid column index.")
+#define RID_STR_INVALID_CURSOR_STATE                NC_("RID_STR_INVALID_CURSOR_STATE", "Invalid cursor state.")
+#define RID_STR_CURSOR_BEFORE_OR_AFTER              NC_("RID_STR_CURSOR_BEFORE_OR_AFTER", "The cursor points to before the first or after the last row.")
+#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER         NC_("RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER", "The rows before the first and after the last row don't have a bookmark.")
+#define RID_STR_NO_BOOKMARK_DELETED                 NC_("RID_STR_NO_BOOKMARK_DELETED", "The current row is deleted, and thus doesn't have a bookmark.")
+#define RID_STR_CONNECTION_REQUEST                  NC_("RID_STR_CONNECTION_REQUEST", "A connection for the following URL was requested \"$name$\".")
+#define RID_STR_MISSING_EXTENSION                   NC_("RID_STR_MISSING_EXTENSION", "The extension is not installed.")
+
+#define STR_QUERY_AND_TABLE_DISTINCT_NAMES          NC_("STR_QUERY_AND_TABLE_DISTINCT_NAMES", "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table.")
+#define STR_BASENAME_TABLE                          NC_("STR_BASENAME_TABLE", "Table")
+#define STR_BASENAME_QUERY                          NC_("STR_BASENAME_QUERY", "Query")
+#define STR_CONN_WITHOUT_QUERIES_OR_TABLES          NC_("STR_CONN_WITHOUT_QUERIES_OR_TABLES", "The given connection is no valid query and/or tables supplier.")
+#define STR_NO_TABLE_OBJECT                         NC_("STR_NO_TABLE_OBJECT", "The given object is no table object.")
+#define STR_INVALID_COMPOSITION_TYPE                NC_("STR_INVALID_COMPOSITION_TYPE", "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType.")
+#define STR_INVALID_COMMAND_TYPE                    NC_("STR_INVALID_COMMAND_TYPE", "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed.")
+
+#define STR_STATE_CLOSE_SUB_DOCS                    NC_("STR_STATE_CLOSE_SUB_DOCS", "Prepare")
+#define STR_STATE_BACKUP_DBDOC                      NC_("STR_STATE_BACKUP_DBDOC", "Backup Document")
+#define STR_STATE_MIGRATE                           NC_("STR_STATE_MIGRATE", "Migrate")
+#define STR_STATE_SUMMARY                           NC_("STR_STATE_SUMMARY", "Summary")
+// To translators: This refers to a form documen    t inside a database document.
+#define STR_FORM                                    NC_("STR_FORM", "Form '$name$'")
+// To translators: This refers to a report docum    ent inside a database document.
+#define STR_REPORT                                  NC_("STR_REPORT", "Report '$name$'")
+#define STR_OVERALL_PROGRESS                        NC_("STR_OVERALL_PROGRESS", "document $current$ of $overall$")
+#define STR_DATABASE_DOCUMENT                       NC_("STR_DATABASE_DOCUMENT", "Database Document")
+#define STR_SAVED_COPY_TO                           NC_("STR_SAVED_COPY_TO", "saved copy to $location$")
+#define STR_MOVED_LIBRARY                           NC_("STR_MOVED_LIBRARY", "migrated $type$ library '$old$' to '$new$'")
+#define STR_LIBRARY_TYPE_AND_NAME                   NC_("STR_LIBRARY_TYPE_AND_NAME", "$type$ library '$library$'")
+#define STR_MIGRATING_LIBS                          NC_("STR_MIGRATING_LIBS", "migrating libraries ...")
+#define STR_OOO_BASIC                               NC_("STR_OOO_BASIC", "%PRODUCTNAME Basic")
+#define STR_JAVA_SCRIPT                             NC_("STR_JAVA_SCRIPT", "JavaScript")
+#define STR_BEAN_SHELL                              NC_("STR_BEAN_SHELL", "BeanShell")
+#define STR_JAVA                                    NC_("STR_JAVA", "Java")
+#define STR_PYTHON                                  NC_("STR_PYTHON", "Python")
+#define STR_DIALOG                                  NC_("STR_DIALOG", "dialog")
+#define STR_ERRORS                                  NC_("STR_ERRORS", "Error(s)")
+#define STR_WARNINGS                                NC_("STR_WARNINGS", "Warnings")
+#define STR_EXCEPTION                               NC_("STR_EXCEPTION", "caught exception:")
+#define STR_INVALID_BACKUP_LOCATION                 NC_("STR_INVALID_BACKUP_LOCATION", "You need to choose a backup location other than the document location itself.")
+#define STR_INVALID_NUMBER_ARGS                     NC_("STR_INVALID_NUMBER_ARGS", "Invalid number of initialization arguments. Expected 1.")
+#define STR_NO_DATABASE                             NC_("STR_NO_DATABASE", "No database document found in the initialization arguments.")
+#define STR_NOT_READONLY                            NC_("STR_NOT_READONLY", "Not applicable to read-only documents.")
+
+#define STR_QUERY_UNDO_TABWINSHOW                   NC_("STR_QUERY_UNDO_TABWINSHOW", "Add Table Window" )
+#define STR_QUERY_UNDO_MOVETABWIN                   NC_("STR_QUERY_UNDO_MOVETABWIN", "Move table window" )
+#define STR_QUERY_UNDO_INSERTCONNECTION             NC_("STR_QUERY_UNDO_INSERTCONNECTION", "Insert Join" )
+#define STR_QUERY_UNDO_REMOVECONNECTION             NC_("STR_QUERY_UNDO_REMOVECONNECTION", "Delete Join" )
+#define STR_QUERY_UNDO_SIZETABWIN                   NC_("STR_QUERY_UNDO_SIZETABWIN", "Resize table window" )
+#define STR_QUERY_UNDO_TABFIELDDELETE               NC_("STR_QUERY_UNDO_TABFIELDDELETE", "Delete Column" )
+#define STR_QUERY_UNDO_TABFIELDMOVED                NC_("STR_QUERY_UNDO_TABFIELDMOVED", "Move column")
+#define STR_QUERY_UNDO_TABFIELDCREATE               NC_("STR_QUERY_UNDO_TABFIELDCREATE", "Add Column" )
+#define RID_STR_FIELD_DOESNT_EXIST                  NC_("RID_STR_FIELD_DOESNT_EXIST", "Invalid expression, field name '$name$' does not exist.")
+#define STR_QUERY_UNDO_TABWINDELETE                 NC_("STR_QUERY_UNDO_TABWINDELETE", "Delete Table Window" )
+#define STR_QUERY_UNDO_MODIFY_CELL                  NC_("STR_QUERY_UNDO_MODIFY_CELL", "Edit Column Description")
+#define STR_QUERY_UNDO_SIZE_COLUMN                  NC_("STR_QUERY_UNDO_SIZE_COLUMN", "Adjust column width")
+#define STR_QUERY_SORTTEXT                          NC_("STR_QUERY_SORTTEXT", "(not sorted);ascending;descending" )
+#define STR_QUERY_FUNCTIONS                         NC_("STR_QUERY_FUNCTIONS", "(no function);Group")
+#define STR_QUERY_NOTABLE                           NC_("STR_QUERY_NOTABLE", "(no table)")
+#define STR_QRY_ORDERBY_UNRELATED                   NC_("STR_QRY_ORDERBY_UNRELATED", "The database only supports sorting for visible fields.")
+#define STR_QUERY_HANDLETEXT                        NC_("STR_QUERY_HANDLETEXT", "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or")
+#define STR_QUERY_LIMIT_ALL                         NC_("STR_QUERY_LIMIT_ALL", "All")
+#define STR_QRY_TOO_MANY_COLUMNS                    NC_("STR_QRY_TOO_MANY_COLUMNS", "There are too many columns.")
+#define STR_QRY_CRITERIA_ON_ASTERISK                NC_("STR_QRY_CRITERIA_ON_ASTERISK", "A condition cannot be applied to field [*]" )
+#define STR_QRY_TOO_LONG_STATEMENT                  NC_("STR_QRY_TOO_LONG_STATEMENT", "The SQL statement created is too long.")
+#define STR_QRY_TOOCOMPLEX                          NC_("STR_QRY_TOOCOMPLEX", "Query is too complex" )
+#define STR_QRY_NOSELECT                            NC_("STR_QRY_NOSELECT", "Nothing has been selected." )
+#define STR_QRY_SYNTAX                              NC_("STR_QRY_SYNTAX", "SQL syntax error" )
+#define STR_QRY_ORDERBY_ON_ASTERISK                 NC_("STR_QRY_ORDERBY_ON_ASTERISK", "[*] cannot be used as a sort criterion.")
+#define STR_QRY_TOO_MANY_TABLES                     NC_("STR_QRY_TOO_MANY_TABLES", "There are too many tables.")
+#define STR_QRY_NATIVE                              NC_("STR_QRY_NATIVE", "The statement will not be applied when querying in the SQL dialect of the database." )
+#define STR_QRY_ILLEGAL_JOIN                        NC_("STR_QRY_ILLEGAL_JOIN", "Join could not be processed" )
+#define STR_SVT_SQL_SYNTAX_ERROR                    NC_("STR_SVT_SQL_SYNTAX_ERROR", "Syntax error in SQL statement" )
+#define STR_QUERYDESIGN_NO_VIEW_SUPPORT             NC_("STR_QUERYDESIGN_NO_VIEW_SUPPORT", "This database does not support table views.")
+#define STR_NO_ALTER_VIEW_SUPPORT                   NC_("STR_NO_ALTER_VIEW_SUPPORT", "This database does not support altering of existing table views.")
+#define STR_QUERYDESIGN_NO_VIEW_ASK                 NC_("STR_QUERYDESIGN_NO_VIEW_ASK", "Do you want to create a query instead?")
+#define STR_DATASOURCE_DELETED                      NC_("STR_DATASOURCE_DELETED", "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved.")
+#define STR_QRY_COLUMN_NOT_FOUND                    NC_("STR_QRY_COLUMN_NOT_FOUND", "The column '$name$' is unknown.")
+#define STR_QRY_JOIN_COLUMN_COMPARE                 NC_("STR_QRY_JOIN_COLUMN_COMPARE", "Columns can only be compared using '='.")
+#define STR_QRY_LIKE_LEFT_NO_COLUMN                 NC_("STR_QRY_LIKE_LEFT_NO_COLUMN", "You must use a column name before 'LIKE'.")
+#define STR_QRY_CHECK_CASESENSITIVE                 NC_("STR_QRY_CHECK_CASESENSITIVE", "The column could not be found. Please note that the database is case-sensitive.")
+// To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource will be inserted.
+#define STR_QUERY_SAVEMODIFIED                      NC_("STR_QUERY_SAVEMODIFIED", "$object$ has been changed.\nDo you want to save the changes?" )
+// To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
+#define STR_ERROR_PARSING_STATEMENT                 NC_("STR_ERROR_PARSING_STATEMENT", "$object$ is based on an SQL command which could not be parsed.")
+// To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
+#define STR_INFO_OPENING_IN_SQL_VIEW                NC_("STR_INFO_OPENING_IN_SQL_VIEW", "$object$ will be opened in SQL view.")
+#define STR_STATEMENT_WITHOUT_RESULT_SET            NC_("STR_STATEMENT_WITHOUT_RESULT_SET", "The query does not create a result set, and thus cannot be part of another query.")
+
+#define RID_STR_COLUMN_FORMAT                       NC_("RID_STR_COLUMN_FORMAT", "Column ~Format...")
+#define RID_STR_COLUMN_WIDTH                        NC_("RID_STR_COLUMN_WIDTH", "Column ~Width...")
+#define RID_STR_TABLE_FORMAT                        NC_("RID_STR_TABLE_FORMAT", "Table Format...")
+#define RID_STR_ROW_HEIGHT                          NC_("RID_STR_ROW_HEIGHT", "Row Height...")
+#define RID_STR_COPY                                NC_("RID_STR_COPY", "~Copy")
+#define RID_STR_UNDO_MODIFY_RECORD                  NC_("RID_STR_UNDO_MODIFY_RECORD", "Undo: Data Input")
+#define RID_STR_SAVE_CURRENT_RECORD                 NC_("RID_STR_SAVE_CURRENT_RECORD", "Save current record")
+#define STR_QRY_TITLE                               NC_("STR_QRY_TITLE", "Query #" )
+#define STR_TBL_TITLE                               NC_("STR_TBL_TITLE", "Table #" )
+#define STR_VIEW_TITLE                              NC_("STR_VIEW_TITLE", "View #" )
+#define STR_NAME_ALREADY_EXISTS                     NC_("STR_NAME_ALREADY_EXISTS", "The name \"#\" already exists.")
+#define STR_NO_COLUMNNAME_MATCHING                  NC_("STR_NO_COLUMNNAME_MATCHING", "No matching column names were found.")
+#define STR_ERROR_OCCURRED_WHILE_COPYING            NC_("STR_ERROR_OCCURRED_WHILE_COPYING", "An error occurred. Do you want to continue copying?")
+#define STR_DATASOURCE_GRIDCONTROL_NAME             NC_("STR_DATASOURCE_GRIDCONTROL_NAME", "Data source table view")
+#define STR_DATASOURCE_GRIDCONTROL_DESC             NC_("STR_DATASOURCE_GRIDCONTROL_DESC", "Shows the selected table or query.")
+
+#define STR_QUERY_UNDO_MODIFYSQLEDIT                NC_("STR_QUERY_UNDO_MODIFYSQLEDIT", "Modify SQL statement(s)" )
+
+#define RID_STR_NEW_FORM                            NC_("RID_STR_NEW_FORM", "Create Form in Design View..." )
+#define RID_STR_NEW_FORM_AUTO                       NC_("RID_STR_NEW_FORM_AUTO", "Use Wizard to Create Form..." )
+#define RID_STR_NEW_REPORT_AUTO                     NC_("RID_STR_NEW_REPORT_AUTO", "Use Wizard to Create Report..." )
+#define RID_STR_NEW_REPORT                          NC_("RID_STR_NEW_REPORT", "Create Report in Design View..." )
+#define RID_STR_NEW_QUERY                           NC_("RID_STR_NEW_QUERY", "Create Query in Design View..." )
+#define RID_STR_NEW_QUERY_SQL                       NC_("RID_STR_NEW_QUERY_SQL", "Create Query in SQL View..." )
+#define RID_STR_NEW_QUERY_AUTO                      NC_("RID_STR_NEW_QUERY_AUTO", "Use Wizard to Create Query..." )
+#define RID_STR_NEW_TABLE                           NC_("RID_STR_NEW_TABLE", "Create Table in Design View..." )
+#define RID_STR_NEW_TABLE_AUTO                      NC_("RID_STR_NEW_TABLE_AUTO", "Use Wizard to Create Table..." )
+#define RID_STR_NEW_VIEW                            NC_("RID_STR_NEW_VIEW", "Create View..." )
+#define RID_STR_FORMS_CONTAINER                     NC_("RID_STR_FORMS_CONTAINER", "Forms" )
+#define RID_STR_REPORTS_CONTAINER                   NC_("RID_STR_REPORTS_CONTAINER", "Reports" )
+#define RID_STR_REPORTS_HELP_TEXT_WIZARD            NC_("RID_STR_REPORTS_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a report." )
+#define RID_STR_FORMS_HELP_TEXT                     NC_("RID_STR_FORMS_HELP_TEXT", "Create a form by specifying the record source, controls, and control properties." )
+#define RID_STR_REPORT_HELP_TEXT                    NC_("RID_STR_REPORT_HELP_TEXT", "Create a report by specifying the record source, controls, and control properties." )
+#define RID_STR_FORMS_HELP_TEXT_WIZARD              NC_("RID_STR_FORMS_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a form." )
+#define RID_STR_QUERIES_HELP_TEXT                   NC_("RID_STR_QUERIES_HELP_TEXT", "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." )
+#define RID_STR_QUERIES_HELP_TEXT_SQL               NC_("RID_STR_QUERIES_HELP_TEXT_SQL", "Create a query by entering an SQL statement directly." )
+#define RID_STR_QUERIES_HELP_TEXT_WIZARD            NC_("RID_STR_QUERIES_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a query." )
+#define RID_STR_TABLES_HELP_TEXT_DESIGN             NC_("RID_STR_TABLES_HELP_TEXT_DESIGN", "Create a table by specifying the field names and properties, as well as the data types." )
+#define RID_STR_TABLES_HELP_TEXT_WIZARD             NC_("RID_STR_TABLES_HELP_TEXT_WIZARD", "Choose from a selection of business and personal table samples, which you customize to create a table." )
+#define RID_STR_VIEWS_HELP_TEXT_DESIGN              NC_("RID_STR_VIEWS_HELP_TEXT_DESIGN", "Create a view by specifying the tables and field names you would like to have visible." )
+#define STR_DATABASE                                NC_("STR_DATABASE", "Database" )
+#define STR_TASKS                                   NC_("STR_TASKS", "Tasks" )
+#define STR_DESCRIPTION                             NC_("STR_DESCRIPTION", "Description" )
+#define STR_PREVIEW                                 NC_("STR_PREVIEW", "Preview" )
+#define STR_QUERY_CLOSEDOCUMENTS                    NC_("STR_QUERY_CLOSEDOCUMENTS", "The connection type has been altered.\n" \
+                                                       "For the changes to take effect, all forms, reports, queries and tables must be closed.\n\n" \
+                                                       "Do you want to close all documents now?")
+#define STR_FRM_LABEL                               NC_("STR_FRM_LABEL", "F~orm name" )
+#define STR_RPT_LABEL                               NC_("STR_RPT_LABEL", "~Report name" )
+#define STR_FOLDER_LABEL                            NC_("STR_FOLDER_LABEL", "F~older name" )
+#define STR_SUB_DOCS_WITH_SCRIPTS                   NC_("STR_SUB_DOCS_WITH_SCRIPTS", "The document contains forms or reports with embedded macros.")
+#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL            NC_("STR_SUB_DOCS_WITH_SCRIPTS_DETAIL", "Macros should be embedded into the database document itself.\n\n" \
+                                                       "You can continue to use your document as before, however, you are encouraged to migrate " \
+                                                       "your macros. The menu item 'Tools / Migrate Macros ...' will assist you with this.\n\n" \
+                                                       "Note that you won't be able to embed macros into the database document itself until " \
+                                                       "this migration is done. ")
+#define RID_STR_EMBEDDED_DATABASE                   NC_("RID_STR_EMBEDDED_DATABASE", "Embedded database")
+#define RID_STR_NO_DIFF_CAT                         NC_("RID_STR_NO_DIFF_CAT", "You cannot select different categories.")
+#define RID_STR_UNSUPPORTED_OBJECT_TYPE             NC_("RID_STR_UNSUPPORTED_OBJECT_TYPE", "Unsupported object type found ($type$).")
+#define STR_PAGETITLE_GENERAL                       NC_("STR_PAGETITLE_GENERAL", "Advanced Properties")
+#define STR_PAGETITLE_ADVANCED                      NC_("STR_PAGETITLE_ADVANCED", "Additional Settings")
+#define STR_PAGETITLE_CONNECTION                    NC_("STR_PAGETITLE_CONNECTION", "Connection settings")
+#define STR_TBL_LABEL                               NC_("STR_TBL_LABEL", "~Table Name")
+#define STR_QRY_LABEL                               NC_("STR_QRY_LABEL", "~Query name")
+#define STR_TITLE_RENAME                            NC_("STR_TITLE_RENAME", "Rename to")
+#define STR_TITLE_PASTE_AS                          NC_("STR_TITLE_PASTE_AS", "Insert as")
+
+#define STR_QUERY_BRW_DELETE_ROWS                   NC_("STR_QUERY_BRW_DELETE_ROWS", "Do you want to delete the selected data?" )
+#define SBA_BROWSER_SETTING_ORDER                   NC_("SBA_BROWSER_SETTING_ORDER", "Error setting the sort criteria")
+#define SBA_BROWSER_SETTING_FILTER                  NC_("SBA_BROWSER_SETTING_FILTER", "Error setting the filter criteria")
+#define RID_STR_CONNECTION_LOST                     NC_("RID_STR_CONNECTION_LOST", "Connection lost")
+#define RID_STR_QUERIES_CONTAINER                   NC_("RID_STR_QUERIES_CONTAINER", "Queries")
+#define RID_STR_TABLES_CONTAINER                    NC_("RID_STR_TABLES_CONTAINER", "Tables")
+#define STR_TITLE_CONFIRM_DELETION                  NC_("STR_TITLE_CONFIRM_DELETION", "Confirm Deletion" )
+#define STR_QUERY_DELETE_TABLE                      NC_("STR_QUERY_DELETE_TABLE", "Do you want to delete the table '%1'?" )
+#define STR_QUERY_CONNECTION_LOST                   NC_("STR_QUERY_CONNECTION_LOST", "The connection to the database has been lost. Do you want to reconnect?" )
+#define STR_OPENTABLES_WARNINGS                     NC_("STR_OPENTABLES_WARNINGS", "Warnings encountered")
+#define STR_OPENTABLES_WARNINGS_DETAILS             NC_("STR_OPENTABLES_WARNINGS_DETAILS", "While retrieving the tables, warnings were reported by the database connection.")
+#define STR_CONNECTING_DATASOURCE                   NC_("STR_CONNECTING_DATASOURCE", "Connecting to \"$name$\" ...")
+#define STR_LOADING_QUERY                           NC_("STR_LOADING_QUERY", "Loading query $name$ ...")
+#define STR_LOADING_TABLE                           NC_("STR_LOADING_TABLE", "Loading table $name$ ...")
+#define STR_NO_TABLE_FORMAT_INSIDE                  NC_("STR_NO_TABLE_FORMAT_INSIDE", "No table format could be found." )
+#define STR_COULDNOTCONNECT_DATASOURCE              NC_("STR_COULDNOTCONNECT_DATASOURCE", "The connection to the data source \"$name$\" could not be established.")
+
+#define STR_TABLEDESIGN_DBFIELDTYPES                NC_("STR_TABLEDESIGN_DBFIELDTYPES", "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)")
+#define STR_TABLEDESIGN_UNDO_PRIMKEY                NC_("STR_TABLEDESIGN_UNDO_PRIMKEY", "Insert/remove primary key" )
+#define STR_VALUE_YES                               NC_("STR_VALUE_YES", "Yes" )
+#define STR_VALUE_NO                                NC_("STR_VALUE_NO", "No" )
+// Note: should somehow fit to the word "value" in other languages as well: value - none ....
+#define STR_VALUE_NONE                              NC_("STR_VALUE_NONE", "<none>")
+#define STR_TAB_FIELD_NAME                          NC_("STR_TAB_FIELD_NAME", "Field name" )
+#define STR_TAB_FIELD_COLUMN_NAME                   NC_("STR_TAB_FIELD_COLUMN_NAME", "Field Name" )
+#define STR_TAB_FIELD_DATATYPE                      NC_("STR_TAB_FIELD_DATATYPE", "Field ~type" )
+#define STR_TAB_FIELD_COLUMN_DATATYPE               NC_("STR_TAB_FIELD_COLUMN_DATATYPE", "Field Type" )
+#define STR_TAB_HELP_TEXT                           NC_("STR_TAB_HELP_TEXT", "Description" )
+#define STR_COLUMN_DESCRIPTION                      NC_("STR_COLUMN_DESCRIPTION", "Column Description" )
+#define STR_FIELD_AUTOINCREMENT                     NC_("STR_FIELD_AUTOINCREMENT", "~AutoValue")
+#define STR_TAB_PROPERTIES                          NC_("STR_TAB_PROPERTIES", "Field Properties" )
+#define STR_TABED_UNDO_CELLMODIFIED                 NC_("STR_TABED_UNDO_CELLMODIFIED", "Modify cell" )
+#define STR_TABED_UNDO_ROWDELETED                   NC_("STR_TABED_UNDO_ROWDELETED", "Delete row" )
+#define STR_TABED_UNDO_TYPE_CHANGED                 NC_("STR_TABED_UNDO_TYPE_CHANGED", "Modify field type")
+#define STR_TABED_UNDO_ROWINSERTED                  NC_("STR_TABED_UNDO_ROWINSERTED", "Insert row" )
+#define STR_TABED_UNDO_NEWROWINSERTED               NC_("STR_TABED_UNDO_NEWROWINSERTED", "Insert new row" )
+#define STR_DEFAULT_VALUE                           NC_("STR_DEFAULT_VALUE", "~Default value" )
+#define STR_FIELD_REQUIRED                          NC_("STR_FIELD_REQUIRED", "~Entry required" )
+#define STR_TEXT_LENGTH                             NC_("STR_TEXT_LENGTH", "~Length" )
+#define STR_NUMERIC_TYPE                            NC_("STR_NUMERIC_TYPE", "~Type" )
+#define STR_LENGTH                                  NC_("STR_LENGTH", "~Length" )
+#define STR_SCALE                                   NC_("STR_SCALE", "Decimal ~places" )
+#define STR_FORMAT                                  NC_("STR_FORMAT", "Format example")
+#define STR_HELP_BOOL_DEFAULT                       NC_("STR_HELP_BOOL_DEFAULT", "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.")
+#define STR_HELP_DEFAULT_VALUE                      NC_("STR_HELP_DEFAULT_VALUE", "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." )
+#define STR_HELP_FIELD_REQUIRED                     NC_("STR_HELP_FIELD_REQUIRED", "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." )
+#define STR_HELP_TEXT_LENGTH                        NC_("STR_HELP_TEXT_LENGTH", "Enter the maximum text length permitted." )
+#define STR_HELP_NUMERIC_TYPE                       NC_("STR_HELP_NUMERIC_TYPE", "Enter the number format." )
+#define STR_HELP_LENGTH                             NC_("STR_HELP_LENGTH", "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." )
+#define STR_HELP_SCALE                              NC_("STR_HELP_SCALE", "Specify the number of decimal places permitted in this field." )
+#define STR_HELP_FORMAT_CODE                        NC_("STR_HELP_FORMAT_CODE", "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).")
+#define STR_HELP_FORMAT_BUTTON                      NC_("STR_HELP_FORMAT_BUTTON", "This is where you determine the output format of the data.")
+#define STR_HELP_AUTOINCREMENT                      NC_("STR_HELP_AUTOINCREMENT", "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." )
+#define STR_BUTTON_FORMAT                           NC_("STR_BUTTON_FORMAT", "~...")
+#define STR_TABLEDESIGN_DUPLICATE_NAME              NC_("STR_TABLEDESIGN_DUPLICATE_NAME", "The table cannot be saved because column name \"$column$\" was assigned twice.")
+#define STR_TBL_COLUMN_IS_KEYCOLUMN                 NC_("STR_TBL_COLUMN_IS_KEYCOLUMN", "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?")
+#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE           NC_("STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE", "Primary Key Affected")
+#define STR_COLUMN_NAME                             NC_("STR_COLUMN_NAME", "Column")
+#define STR_QRY_CONTINUE                            NC_("STR_QRY_CONTINUE", "Continue anyway?" )
+#define STR_TABLEDESIGN_CONNECTION_MISSING          NC_("STR_TABLEDESIGN_CONNECTION_MISSING", "The table could not be saved due to problems connecting to the database.")
+#define STR_TABLEDESIGN_DATASOURCE_DELETED          NC_("STR_TABLEDESIGN_DATASOURCE_DELETED", "The table filter could not be adjusted because the data source has been deleted.")
+#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES           NC_("STR_QUERY_SAVE_TABLE_EDIT_INDEXES", "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?")
+#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD            NC_("STR_TABLEDESIGN_NO_PRIM_KEY_HEAD", "No primary key" )
+#define STR_TABLEDESIGN_NO_PRIM_KEY                 NC_("STR_TABLEDESIGN_NO_PRIM_KEY", "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" )
+#define STR_TABLEDESIGN_ALTER_ERROR                 NC_("STR_TABLEDESIGN_ALTER_ERROR", "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" )
+#define STR_TABLEDESIGN_SAVE_ERROR                  NC_("STR_TABLEDESIGN_SAVE_ERROR", "Error while saving the table design")
+#define STR_TABLEDESIGN_COULD_NOT_DROP_COL          NC_("STR_TABLEDESIGN_COULD_NOT_DROP_COL", "The column $column$ could not be deleted.")
+#define STR_AUTOINCREMENT_VALUE                     NC_("STR_AUTOINCREMENT_VALUE", "A~uto-increment statement")
+#define STR_HELP_AUTOINCREMENT_VALUE                NC_("STR_HELP_AUTOINCREMENT_VALUE", "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.")
+#define STR_NO_TYPE_INFO_AVAILABLE                  NC_("STR_NO_TYPE_INFO_AVAILABLE", "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.")
+#define STR_CHANGE_COLUMN_NAME                      NC_("STR_CHANGE_COLUMN_NAME", "change field name")
+#define STR_CHANGE_COLUMN_TYPE                      NC_("STR_CHANGE_COLUMN_TYPE", "change field type")
+#define STR_CHANGE_COLUMN_DESCRIPTION               NC_("STR_CHANGE_COLUMN_DESCRIPTION", "change field description")
+#define STR_CHANGE_COLUMN_ATTRIBUTE                 NC_("STR_CHANGE_COLUMN_ATTRIBUTE", "change field attribute")
+
+#define STR_ENTER_CONNECTION_PASSWORD               NC_("STR_ENTER_CONNECTION_PASSWORD", "A password is needed to connect to the data source \"$name$\".")
+#define STR_ASK_FOR_DIRECTORY_CREATION              NC_("STR_ASK_FOR_DIRECTORY_CREATION", "The directory\n\n$path$\n\ndoes not exist. Should it be created?")
+#define STR_COULD_NOT_CREATE_DIRECTORY              NC_("STR_COULD_NOT_CREATE_DIRECTORY", "The directory $name$ could not be created.")
+#define STR_ALREADYEXISTOVERWRITE                   NC_("STR_ALREADYEXISTOVERWRITE", "The file already exists. Overwrite?" )
+#define STR_NEW_FOLDER                              NC_("STR_NEW_FOLDER", "Folder" )
+
+#define STR_DATABASE_TYPE_CHANGE                    NC_("STR_DATABASE_TYPE_CHANGE", "Database properties" )
+#define STR_PARENTTITLE_GENERAL                     NC_("STR_PARENTTITLE_GENERAL", "Data Source Properties: #" )
+#define STR_ERR_USE_CONNECT_TO                      NC_("STR_ERR_USE_CONNECT_TO", "Please choose 'Connect to an existing database' to connect to an existing database instead.")
+#define STR_COULD_NOT_LOAD_ODBC_LIB                 NC_("STR_COULD_NOT_LOAD_ODBC_LIB", "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available.")
+#define STR_UNSUPPORTED_DATASOURCE_TYPE             NC_("STR_UNSUPPORTED_DATASOURCE_TYPE", "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database.")
+#define STR_AUTOTEXT_FIELD_SEP_NONE                 NC_("STR_AUTOTEXT_FIELD_SEP_NONE", "{None}")
+// To translators: EM Dec 2002: 'Space' refers t    o what you get when you hit the space bar on your keyboard.
+#define STR_AUTOFIELDSEPARATORLIST                  NC_("STR_AUTOFIELDSEPARATORLIST", ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" )
+#define STR_AUTODELIMITER_MISSING                   NC_("STR_AUTODELIMITER_MISSING", "#1 must be set." )
+#define STR_AUTODELIMITER_MUST_DIFFER               NC_("STR_AUTODELIMITER_MUST_DIFFER", "#1 and #2 must be different." )
+#define STR_AUTONO_WILDCARDS                        NC_("STR_AUTONO_WILDCARDS", "Wildcards such as ?,* are not allowed in #1." )
+
+#define STR_CONNECTION_TEST                         NC_("STR_CONNECTION_TEST", "Connection Test")
+#define STR_CONNECTION_SUCCESS                      NC_("STR_CONNECTION_SUCCESS", "The connection was established successfully.")
+#define STR_CONNECTION_NO_SUCCESS                   NC_("STR_CONNECTION_NO_SUCCESS", "The connection could not be established.")
+#define STR_JDBCDRIVER_SUCCESS                      NC_("STR_JDBCDRIVER_SUCCESS", "The JDBC driver was loaded successfully.")
+#define STR_JDBCDRIVER_NO_SUCCESS                   NC_("STR_JDBCDRIVER_NO_SUCCESS", "The JDBC driver could not be loaded.")
+#define STR_MSACCESS_FILTERNAME                     NC_("STR_MSACCESS_FILTERNAME", "MS Access file")
+#define STR_MSACCESS_2007_FILTERNAME                NC_("STR_MSACCESS_2007_FILTERNAME", "MS Access 2007 file")
+#define STR_FIREBIRD_FILTERNAME                     NC_("STR_FIREBIRD_FILTERNAME", "Firebird Database")
+
+#define STR_RSC_CHARSETS                            NC_("STR_RSC_CHARSETS", "System")
+#define STR_ERROR_DURING_CREATION                   NC_("STR_ERROR_DURING_CREATION", "Error during creation")
+#define STR_UNEXPECTED_ERROR                        NC_("STR_UNEXPECTED_ERROR", "An unexpected error occurred. The operation could not be performed.")
+#define STR_COULDNOTOPEN_LINKEDDOC                  NC_("STR_COULDNOTOPEN_LINKEDDOC", "The document \"$file$\" could not be opened.")
+#define STR_MISSING_TABLES_XDROP                    NC_("STR_MISSING_TABLES_XDROP", "The table cannot be deleted because the database connection does not support this.")
+#define STR_BUTTON_TEXT_ALL                         NC_("STR_BUTTON_TEXT_ALL", "~All")
+#define STR_UNDO_COLON                              NC_("STR_UNDO_COLON", "Undo:")
+#define STR_REDO_COLON                              NC_("STR_REDO_COLON", "Redo:")
+#define STR_UNKNOWN_TYPE_FOUND                      NC_("STR_UNKNOWN_TYPE_FOUND", "No corresponding column type could be found for column '#1'." )
+#define STR_FILE_DOES_NOT_EXIST                     NC_("STR_FILE_DOES_NOT_EXIST", "The file \"$file$\" does not exist.")
+#define STR_WARNINGS_DURING_CONNECT                 NC_("STR_WARNINGS_DURING_CONNECT", "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.")
+#define STR_NAMED_OBJECT_ALREADY_EXISTS             NC_("STR_NAMED_OBJECT_ALREADY_EXISTS", "The name '$#$' already exists.\nPlease enter another name." )
+// #i96130# use hard coded name
+#define RID_STR_EXTENSION_NOT_PRESENT               NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Oracle Report Builder feature.")
+
+#define STR_COULDNOTCREATE_DRIVERMANAGER            NC_("STR_COULDNOTCREATE_DRIVERMANAGER", "Cannot connect to the SDBC driver manager (#servicename#).")
+#define STR_NOREGISTEREDDRIVER                      NC_("STR_NOREGISTEREDDRIVER", "A driver is not registered for the URL #connurl#.")
+#define STR_NOTABLEINFO                             NC_("STR_NOTABLEINFO", "Successfully connected, but information about database tables is not available.")
+#define STR_ALL_TABLES                              NC_("STR_ALL_TABLES", "All tables")
+#define STR_ALL_VIEWS                               NC_("STR_ALL_VIEWS", "All views")
+#define STR_ALL_TABLES_AND_VIEWS                    NC_("STR_ALL_TABLES_AND_VIEWS", "All tables and views")
+
+#define STR_TABLE_PRIV_NAME                         NC_("STR_TABLE_PRIV_NAME", "Table name")
+#define STR_TABLE_PRIV_INSERT                       NC_("STR_TABLE_PRIV_INSERT", "Insert data")
+#define STR_TABLE_PRIV_DELETE                       NC_("STR_TABLE_PRIV_DELETE", "Delete data")
+#define STR_TABLE_PRIV_UPDATE                       NC_("STR_TABLE_PRIV_UPDATE", "Modify data")
+#define STR_TABLE_PRIV_ALTER                        NC_("STR_TABLE_PRIV_ALTER", "Alter structure")
+#define STR_TABLE_PRIV_SELECT                       NC_("STR_TABLE_PRIV_SELECT", "Read data")
+#define STR_TABLE_PRIV_REFERENCE                    NC_("STR_TABLE_PRIV_REFERENCE", "Modify references")
+#define STR_TABLE_PRIV_DROP                         NC_("STR_TABLE_PRIV_DROP", "Drop structure")
+
+#define STR_DBASE_PATH_OR_FILE                      NC_("STR_DBASE_PATH_OR_FILE", "Path to the dBASE files")
+#define STR_FLAT_PATH_OR_FILE                       NC_("STR_FLAT_PATH_OR_FILE", "Path to the text files")
+#define STR_CALC_PATH_OR_FILE                       NC_("STR_CALC_PATH_OR_FILE", "Path to the spreadsheet document")
+#define STR_NAME_OF_ODBC_DATASOURCE                 NC_("STR_NAME_OF_ODBC_DATASOURCE", "Name of the ODBC data source on your system")
+#define STR_WRITER_PATH_OR_FILE                     NC_("STR_WRITER_PATH_OR_FILE", "Path to the Writer document")
+#define STR_MYSQL_DATABASE_NAME                     NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL database")
+#define STR_ORACLE_DATABASE_NAME                    NC_("STR_ORACLE_DATABASE_NAME", "Name of the Oracle database")
+#define STR_MSACCESS_MDB_FILE                       NC_("STR_MSACCESS_MDB_FILE", "Microsoft Access database file")
+#define STR_NO_ADDITIONAL_SETTINGS                  NC_("STR_NO_ADDITIONAL_SETTINGS", "No more settings are necessary. To verify that the connection is working, click the '%test' button.")
+#define STR_COMMONURL                               NC_("STR_COMMONURL", "Datasource URL (e.g. postgresql://host:port/database)" )
+#define STR_HOSTNAME                                NC_("STR_HOSTNAME", "~Host name")
+#define STR_MOZILLA_PROFILE_NAME                    NC_("STR_MOZILLA_PROFILE_NAME", "~Mozilla profile name")
+#define STR_THUNDERBIRD_PROFILE_NAME                NC_("STR_THUNDERBIRD_PROFILE_NAME", "~Thunderbird profile name")
+#define STR_ADD_TABLES                              NC_("STR_ADD_TABLES", "Add Tables")
+#define STR_ADD_TABLE_OR_QUERY                      NC_("STR_ADD_TABLE_OR_QUERY", "Add Table or Query" )
+
+#define STR_WIZ_COLUMN_SELECT_TITEL                 NC_("STR_WIZ_COLUMN_SELECT_TITEL", "Apply columns")
+#define STR_WIZ_TYPE_SELECT_TITEL                   NC_("STR_WIZ_TYPE_SELECT_TITEL", "Type formatting")
+#define STR_WIZ_NAME_ALREADY_DEFINED                NC_("STR_WIZ_NAME_ALREADY_DEFINED", "Enter a unique name for the new primary key data field.\nThe following name is already in use:")
+#define STR_WIZ_NAME_MATCHING_TITEL                 NC_("STR_WIZ_NAME_MATCHING_TITEL", "Assign columns" )
+#define STR_WIZ_PB_PREV                             NC_("STR_WIZ_PB_PREV", "< ~Back")
+#define STR_WIZ_PB_NEXT                             NC_("STR_WIZ_PB_NEXT", "~Next>")
+#define STR_WIZ_PB_OK                               NC_("STR_WIZ_PB_OK", "C~reate")
+#define STR_WIZ_TABLE_COPY                          NC_("STR_WIZ_TABLE_COPY", "Copy table" )
+#define STR_COPYTABLE_TITLE_COPY                    NC_("STR_COPYTABLE_TITLE_COPY", "Copy table" )
+#define STR_INVALID_TABLE_NAME                      NC_("STR_INVALID_TABLE_NAME", "This table name is not valid in the current database.")
+#define STR_SUGGEST_APPEND_TABLE_DATA               NC_("STR_SUGGEST_APPEND_TABLE_DATA", "Choose the option 'Append data' on the first page to append data to an existing table.")
+#define STR_INVALID_TABLE_NAME_LENGTH               NC_("STR_INVALID_TABLE_NAME_LENGTH", "Please change the table name. It is too long.")
+
+#define STR_DBWIZARDTITLE                           NC_("STR_DBWIZARDTITLE", "Database Wizard" )
+#define STR_PAGETITLE_INTROPAGE                     NC_("STR_PAGETITLE_INTROPAGE", "Select database" )
+#define STR_PAGETITLE_DBASE                         NC_("STR_PAGETITLE_DBASE", "Set up dBASE connection" )
+#define STR_PAGETITLE_TEXT                          NC_("STR_PAGETITLE_TEXT", "Set up a connection to text files" )
+#define STR_PAGETITLE_MSACCESS                      NC_("STR_PAGETITLE_MSACCESS", "Set up Microsoft Access connection" )
+#define STR_PAGETITLE_LDAP                          NC_("STR_PAGETITLE_LDAP", "Set up LDAP connection" )
+#define STR_PAGETITLE_ADO                           NC_("STR_PAGETITLE_ADO", "Set up ADO connection" )
+#define STR_PAGETITLE_JDBC                          NC_("STR_PAGETITLE_JDBC", "Set up JDBC connection" )
+#define STR_PAGETITLE_ORACLE                        NC_("STR_PAGETITLE_ORACLE", "Set up Oracle database connection" )
+#define STR_PAGETITLE_MYSQL                         NC_("STR_PAGETITLE_MYSQL", "Set up MySQL connection" )
+#define STR_PAGETITLE_ODBC                          NC_("STR_PAGETITLE_ODBC", "Set up ODBC connection" )
+#define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET       NC_("STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET", "Set up Writer Document or Spreadsheet connection" )
+#define STR_PAGETITLE_AUTHENTIFICATION              NC_("STR_PAGETITLE_AUTHENTIFICATION", "Set up user authentication" )
+#define STR_PAGETITLE_MYSQL_NATIVE                  NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL server data")
+#define STR_PAGETITLE_FINAL                         NC_("STR_PAGETITLE_FINAL", "Save and proceed" )
+#define STR_DATABASEDEFAULTNAME                     NC_("STR_DATABASEDEFAULTNAME", "New Database" )
+#define STR_MYSQLJDBC_HEADERTEXT                    NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL database using JDBC" )
+#define STR_MYSQLJDBC_HELPTEXT                      NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.")
+#define STR_MYSQL_DRIVERCLASSTEXT                   NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL JDBC d~river class:")
+#define STR_MYSQL_DEFAULT                           NC_("STR_MYSQL_DEFAULT", "Default: 3306")
+#define STR_DBASE_HEADERTEXT                        NC_("STR_DBASE_HEADERTEXT", "Set up a connection to dBASE files" )
+#define STR_DBASE_HELPTEXT                          NC_("STR_DBASE_HELPTEXT", "Select the folder where the dBASE files are stored." )
+#define STR_TEXT_HEADERTEXT                         NC_("STR_TEXT_HEADERTEXT", "Set up a connection to text files" )
+#define STR_TEXT_HELPTEXT                           NC_("STR_TEXT_HELPTEXT", "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." )
+#define STR_TEXT_PATH_OR_FILE                       NC_("STR_TEXT_PATH_OR_FILE", "Path to text files")
+#define STR_MSACCESS_HEADERTEXT                     NC_("STR_MSACCESS_HEADERTEXT", "Set up a connection to a Microsoft Access database" )
+#define STR_MSACCESS_HELPTEXT                       NC_("STR_MSACCESS_HELPTEXT", "Please select the Microsoft Access file you want to access.")
+#define STR_ADO_HEADERTEXT                          NC_("STR_ADO_HEADERTEXT", "Set up a connection to an ADO database" )
+#define STR_ADO_HELPTEXT                            NC_("STR_ADO_HELPTEXT", "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." )
+#define STR_ODBC_HEADERTEXT                         NC_("STR_ODBC_HEADERTEXT", "Set up a connection to an ODBC database" )
+#define STR_ODBC_HELPTEXT                           NC_("STR_ODBC_HELPTEXT", "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." )
+#define STR_JDBC_HEADERTEXT                         NC_("STR_JDBC_HEADERTEXT", "Set up a connection to a JDBC database" )
+#define STR_JDBC_HELPTEXT                           NC_("STR_JDBC_HELPTEXT", "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." )
+#define STR_ORACLE_HEADERTEXT                       NC_("STR_ORACLE_HEADERTEXT", "Set up a connection to an Oracle database")
+#define STR_ORACLE_DEFAULT                          NC_("STR_ORACLE_DEFAULT", "Default: 1521" )
+#define STR_ORACLE_DRIVERCLASSTEXT                  NC_("STR_ORACLE_DRIVERCLASSTEXT", "Oracle JDBC ~driver class")
+#define STR_ORACLE_HELPTEXT                         NC_("STR_ORACLE_HELPTEXT", "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." )
+#define STR_SPREADSHEET_HEADERTEXT                  NC_("STR_SPREADSHEET_HEADERTEXT", "Set up a connection to spreadsheets")
+#define STR_SPREADSHEET_HELPTEXT                    NC_("STR_SPREADSHEET_HELPTEXT", "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." )
+#define STR_SPREADSHEETPATH                         NC_("STR_SPREADSHEETPATH", "~Location and file name" )
+
+#define STR_COMMAND_EXECUTED_SUCCESSFULLY           NC_("STR_COMMAND_EXECUTED_SUCCESSFULLY", "Command successfully executed." )
+#define STR_DIRECTSQL_CONNECTIONLOST                NC_("STR_DIRECTSQL_CONNECTIONLOST", "The connection to the database has been lost. This dialog will be closed.")
+
+#define STR_TAB_INDEX_SORTORDER                     NC_("STR_TAB_INDEX_SORTORDER", "Sort order" )
+#define STR_TAB_INDEX_FIELD                         NC_("STR_TAB_INDEX_FIELD", "Index field" )
+#define STR_ORDER_ASCENDING                         NC_("STR_ORDER_ASCENDING", "Ascending" )
+#define STR_ORDER_DESCENDING                        NC_("STR_ORDER_DESCENDING", "Descending" )
+#define STR_CONFIRM_DROP_INDEX                      NC_("STR_CONFIRM_DROP_INDEX", "Do you really want to delete the index '$name$'?")
+#define STR_LOGICAL_INDEX_NAME                      NC_("STR_LOGICAL_INDEX_NAME", "index")
+#define STR_NEED_INDEX_FIELDS                       NC_("STR_NEED_INDEX_FIELDS", "The index must contain at least one field.")
+#define STR_INDEX_NAME_ALREADY_USED                 NC_("STR_INDEX_NAME_ALREADY_USED", "There is already another index named \"$name$\".")
+#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME          NC_("STR_INDEXDESIGN_DOUBLE_COLUMN_NAME", "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice.")
+
+#define STR_COULD_NOT_CONVERT_PARAM                 NC_("STR_COULD_NOT_CONVERT_PARAM", "The entry could not be converted to a valid value for the \"$name$\" parameter")
+
+#define STR_EXCEPTION_STATUS                        NC_("STR_EXCEPTION_STATUS", "SQL Status")
+#define STR_EXCEPTION_ERRORCODE                     NC_("STR_EXCEPTION_ERRORCODE", "Error code")
+#define STR_EXPLAN_STRINGCONVERSION_ERROR           NC_("STR_EXPLAN_STRINGCONVERSION_ERROR", "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties.")
+#define STR_EXCEPTION_ERROR                         NC_("STR_EXCEPTION_ERROR", "Error")
+#define STR_EXCEPTION_WARNING                       NC_("STR_EXCEPTION_WARNING", "Warning")
+#define STR_EXCEPTION_INFO                          NC_("STR_EXCEPTION_INFO", "Information")
+#define STR_EXCEPTION_DETAILS                       NC_("STR_EXCEPTION_DETAILS", "Details")
+
+#define STR_QUERY_USERADMIN_DELETE_USER             NC_("STR_QUERY_USERADMIN_DELETE_USER", "Do you really want to delete the user?")
+#define STR_USERADMIN_NOT_AVAILABLE                 NC_("STR_USERADMIN_NOT_AVAILABLE", "The database does not support user administration." )
+#define STR_ERROR_PASSWORDS_NOT_IDENTICAL           NC_("STR_ERROR_PASSWORDS_NOT_IDENTICAL", "The passwords do not match. Please enter the password again.")
+
+#define STR_JOIN_TYPE_HINT                          NC_("STR_JOIN_TYPE_HINT", "Please note that some databases may not support this join type.")
+#define STR_QUERY_INNER_JOIN                        NC_("STR_QUERY_INNER_JOIN", "Includes only records for which the contents of the related fields of both tables are identical.")
+#define STR_QUERY_LEFTRIGHT_JOIN                    NC_("STR_QUERY_LEFTRIGHT_JOIN", "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching.")
+#define STR_QUERY_FULL_JOIN                         NC_("STR_QUERY_FULL_JOIN", "Contains ALL records from '%1' and from '%2'.")
+#define STR_QUERY_CROSS_JOIN                        NC_("STR_QUERY_CROSS_JOIN", "Contains the Cartesian product of ALL records from '%1' and from '%2'.")
+
+#define STR_CTW_NO_VIEWS_SUPPORT                    NC_("STR_CTW_NO_VIEWS_SUPPORT", "The destination database does not support views.")
+#define STR_CTW_NO_PRIMARY_KEY_SUPPORT              NC_("STR_CTW_NO_PRIMARY_KEY_SUPPORT", "The destination database does not support primary keys.")
+#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR      NC_("STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR", "no data access descriptor found, or no data access descriptor able to provide all necessary information")
+#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT     NC_("STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT", "Only tables and queries are supported at the moment.")
+#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS         NC_("STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS", "The copy source's result set must support bookmarks.")
+#define STR_CTW_UNSUPPORTED_COLUMN_TYPE             NC_("STR_CTW_UNSUPPORTED_COLUMN_TYPE", "Unsupported source column type ($type$) at column position $pos$.")
+#define STR_CTW_ILLEGAL_PARAMETER_COUNT             NC_("STR_CTW_ILLEGAL_PARAMETER_COUNT", "Illegal number of initialization parameters.")
+#define STR_CTW_ERROR_DURING_INITIALIZATION         NC_("STR_CTW_ERROR_DURING_INITIALIZATION", "An error occurred during initialization.")
+#define STR_CTW_ERROR_UNSUPPORTED_SETTING           NC_("STR_CTW_ERROR_UNSUPPORTED_SETTING", "Unsupported setting in the copy source descriptor: $name$.")
+#define STR_CTW_ERROR_NO_QUERY                      NC_("STR_CTW_ERROR_NO_QUERY", "To copy a query, your connection must be able to provide queries.")
+#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER    NC_("STR_CTW_ERROR_INVALID_INTERACTIONHANDLER", "The given interaction handler is invalid.")
+
+#define STR_QUERY_REL_EDIT_RELATION                 NC_("STR_QUERY_REL_EDIT_RELATION", "This relation already exists. Do you want to edit it or create a new one?" )
+#define STR_QUERY_REL_EDIT                          NC_("STR_QUERY_REL_EDIT", "Edit..." )
+#define STR_QUERY_REL_CREATE                        NC_("STR_QUERY_REL_CREATE", "Create..." )
+#define STR_RELATIONDESIGN                          NC_("STR_RELATIONDESIGN", " - %PRODUCTNAME Base: Relation design" )
+#define STR_RELATIONDESIGN_NOT_AVAILABLE            NC_("STR_RELATIONDESIGN_NOT_AVAILABLE", "The database does not support relations." )
+#define STR_QUERY_REL_DELETE_WINDOW                 NC_("STR_QUERY_REL_DELETE_WINDOW", "When you delete this table all corresponding relations will be deleted as well. Continue?")
+#define STR_QUERY_REL_COULD_NOT_CREATE              NC_("STR_QUERY_REL_COULD_NOT_CREATE", "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database.")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/inc/strings.hxx
index acaf156546ec..a0909f00c639 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/inc/strings.hxx
@@ -1,23 +1,14 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * 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 .
  */
 
-// be included itself
-
+#ifndef INCLUDED_DBACCESS_INC_STRINGS_HXX
+#define INCLUDED_DBACCESS_INC_STRINGS_HXX
 
 // property names
 
@@ -90,7 +81,7 @@
 #define PROPERTY_FILTER "Filter"
 #define PROPERTY_APPLYFILTER "ApplyFilter"
 #define PROPERTY_ORDER "Order"
-#define PROPERTY_APPLYORDER "ApplyOrder" 
+#define PROPERTY_APPLYORDER "ApplyOrder"
 #define PROPERTY_ISMODIFIED "IsModified"
 #define PROPERTY_ISNEW "IsNew"
 #define PROPERTY_ROWCOUNT "RowCount"
@@ -124,10 +115,10 @@
 #define PROPERTY_SQLEXCEPTION "SQLException"
 #define PROPERTY_BORDER "Border"
 #define PROPERTY_THREADSAFE "ThreadSafe"
-#define PROPERTY_HELPTEXT	 "HelpText"
-#define PROPERTY_CONTROLDEFAULT	 "ControlDefault"
-#define PROPERTY_HIDDEN	 "Hidden"
-#define PROPERTY_DEFAULTSTATE	 "DefaultState"
+#define PROPERTY_HELPTEXT "HelpText"
+#define PROPERTY_CONTROLDEFAULT "ControlDefault"
+#define PROPERTY_HIDDEN "Hidden"
+#define PROPERTY_DEFAULTSTATE "DefaultState"
 #define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns"
 #define PROPERTY_SHOW_BROWSER "ShowBrowser"
 #define PROPERTY_ENABLE_BROWSER "EnableBrowser"
@@ -151,7 +142,7 @@
 #define PROPERTY_FONTFAMILY "FontFamily"
 #define PROPERTY_FONTHEIGHT "FontHeight"
 #define PROPERTY_FONTKERNING "FontKerning"
-#define PROPERTY_FONTNAME 	"FontName"
+#define PROPERTY_FONTNAME "FontName"
 #define PROPERTY_FONTORIENTATION "FontOrientation"
 #define PROPERTY_FONTPITCH "FontPitch"
 #define PROPERTY_FONTSLANT "FontSlant"
@@ -161,16 +152,16 @@
 #define PROPERTY_FONTWEIGHT "FontWeight"
 #define PROPERTY_FONTWIDTH "FontWidth"
 #define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
-#define PROPERTY_FONTTYPE "FontType" 
-#define PROPERTY_PERSISTENT_NAME "PersistentName" 
-#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject" 
+#define PROPERTY_FONTTYPE "FontType"
+#define PROPERTY_PERSISTENT_NAME "PersistentName"
+#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject"
 #define PROPERTY_ORIGINAL "Original"
 #define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect"
 #define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect"
 #define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape"
 #define PROPERTY_AS_TEMPLATE "AsTemplate"
 #define PROPERTY_HAVING_CLAUSE "HavingClause"
-#define PROPERTY_GROUP_BY 	"GroupBy"
+#define PROPERTY_GROUP_BY "GroupBy"
 #define PROPERTY_EDIT_WIDTH "EditWidth"
 #define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer"
 #define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled"
@@ -208,7 +199,7 @@
 #define SERVICE_SDBCX_INDEXCOLUMN "com.sun.star.sdbcx.IndexColumn"
 #define SERVICE_SDBCX_KEYCOLUMN "com.sun.star.sdbcx.KeyColumn"
 #define SERVICE_SDB_DOCUMENTDEFINITION "com.sun.star.sdb.DocumentDefinition"
-#define SERVICE_NAME_FORM 	"com.sun.star.sdb.Form"
+#define SERVICE_NAME_FORM "com.sun.star.sdb.Form"
 #define SERVICE_NAME_FORM_COLLECTION "com.sun.star.sdb.Forms"
 #define SERVICE_NAME_REPORT "com.sun.star.sdb.Report"
 #define SERVICE_NAME_REPORT_COLLECTION "com.sun.star.sdb.Reports"
@@ -232,8 +223,8 @@
 #define INFO_AUTORETRIEVEVALUE "AutoRetrievingStatement"
 #define INFO_AUTORETRIEVEENABLED "IsAutoRetrievingEnabled"
 #define INFO_APPEND_TABLE_ALIAS "AppendTableAliasName"
-#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName" 
-#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields" 
+#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName"
+#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields"
 #define INFO_PARAMETERNAMESUBST "ParameterNameSubstitution"
 #define INFO_IGNOREDRIVER_PRIV "IgnoreDriverPrivileges"
 #define INFO_USECATALOG "UseCatalog"
@@ -246,3 +237,47 @@
 // other
 #define INFO_POOLURL "PoolURL"
 #define URL_INTERACTIVE "Interactive"
+
+// URLs
+
+#define URL_COMPONENT_QUERYDESIGN         ".component:DB/QueryDesign"
+#define URL_COMPONENT_VIEWDESIGN          ".component:DB/ViewDesign"
+#define URL_COMPONENT_TABLEDESIGN         ".component:DB/TableDesign"
+#define URL_COMPONENT_FORMGRIDVIEW        ".component:DB/FormGridView"
+#define URL_COMPONENT_DATASOURCEBROWSER   ".component:DB/DataSourceBrowser"
+#define URL_COMPONENT_RELATIONDESIGN      ".component:DB/RelationDesign"
+#define URL_COMPONENT_APPLICATION         ".component:DB/Application"
+#define URL_COMPONENT_REPORTDESIGN        ".component:DB/ReportDesign"
+
+// service names
+
+#define SERVICE_SDB_DIRECTSQLDIALOG       "org.openoffice.comp.dbu.DirectSqlDialog"
+
+// other DBU relevant strings
+
+#define FRAME_NAME_QUERY_PREVIEW          "QueryPreview"
+#define SERVICE_CONTROLDEFAULT            "com.sun.star.comp.dbu.OColumnControl"
+#define PROPERTY_QUERYDESIGNVIEW          "QueryDesignView"
+#define PROPERTY_GRAPHICAL_DESIGN         "GraphicalDesign"
+#define PROPERTY_HELP_URL                 "HelpURL"
+
+// other DBU properties
+
+#define PROPERTY_TRISTATE         "TriState"
+#define PROPERTY_ENABLEOUTERJOIN  "EnableOuterJoinEscape"
+#define PROPERTY_TABSTOP "TabStop"
+#define PROPERTY_DEFAULTCONTROL "DefaultControl"
+#define PROPERTY_ENABLED "Enabled"
+#define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
+
+#define SQLSTATE_GENERAL "01000"
+
+#define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode"
+#define PROPERTY_IS_FORM             "IsForm"
+#define PROPERTY_PERSISTENT_PATH     "PersistentPath"
+
+#define STR_AUTOTEXTSEPARATORLIST "\"\t34\t'\t39"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 3b5f5f79801d..31a89bc615dd 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -19,7 +19,7 @@
 
 #include "BookmarkSet.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <connectivity/dbexception.hxx>
 
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index f51a1d845ac6..b29ca36c16f6 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/IndexType.hpp>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 3912b16181ce..1e01dab55917 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include "CRowSetColumn.hxx"
 
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 680be37f9b75..0a681e9642be 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -19,7 +19,7 @@
 
 
 #include "CRowSetDataColumn.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 8e6f5c9837b5..184a749c2964 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -19,7 +19,8 @@
 
 #include "CacheSet.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -27,7 +28,7 @@
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
 
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index af261a6d2a0f..43038b7274a7 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "FilteredContainer.hxx"
 #include "RefreshListener.hxx"
 #include "sdbcoretools.hxx"
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index b62b70eeb5fb..98b263f21570 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -19,7 +19,8 @@
 
 #include "HelperCollections.hxx"
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 04ab330a3ba3..bab0851063d3 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -20,7 +20,7 @@
 #include <memory>
 #include "KeySet.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -29,7 +29,7 @@
 #include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 79c2a05d4f59..7d4558390688 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -21,7 +21,7 @@
 #include <memory>
 #include "OptimisticSet.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -32,7 +32,7 @@
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 8f191ed318be..68da787a81dc 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -24,13 +24,13 @@
 
 #include <string.h>
 #include "RowSet.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "sdbcoretools.hxx"
 #include "SingleSelectQueryComposer.hxx"
 #include "CRowSetColumn.hxx"
 #include "CRowSetDataColumn.hxx"
 #include "RowSetCache.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "tablecontainer.hxx"
 
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index c4b7fdb65a1e..a0a680e9113b 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -21,8 +21,9 @@
 #include "CRowSetDataColumn.hxx"
 #include <connectivity/sdbcx/VCollection.hxx>
 #include "RowSetCache.hxx"
-#include "dbastrings.hrc"
-#include "core_resource.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index e51d87ac2458..8bd299112e1c 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -27,9 +27,10 @@
 #include "RowSetCache.hxx"
 #include "StaticSet.hxx"
 #include "WrappedResultSet.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "core_resource.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 0558b34dcf13..d284a3e21e21 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -19,9 +19,9 @@
 
 #include <string.h>
 #include "composertools.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "HelperCollections.hxx"
 #include "SingleSelectQueryComposer.hxx"
 #include "sqlbison.hxx"
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 5fc3a9276d32..e9d3af392ae8 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index cf8c115bf028..dd167c116d3e 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -21,9 +21,9 @@
 
 #include "TableDeco.hxx"
 #include <definitioncolumn.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <osl/diagnose.h>
 
 #include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 883346bb2693..42dca2256cf8 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "View.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 #include "connectivity/dbexception.hxx"
 #include "connectivity/dbtools.hxx"
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 77836d7746e2..a29463544475 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -19,7 +19,7 @@
 
 #include "WrappedResultSet.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <connectivity/dbexception.hxx>
 
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 050931dc76a6..bd2209a7fd92 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -22,7 +22,8 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/property.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 using namespace dbaccess;
 using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 1c431420a34e..0ad8d09324a0 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -20,9 +20,9 @@
 #include "ContainerMediator.hxx"
 #include "apitools.hxx"
 #include "column.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "sdbcoretools.hxx"
 
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 860ed7d36617..4d8857f5ec07 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "columnsettings.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index 34604e602c9f..8d22401fdcea 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -24,7 +24,8 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "apitools.hxx"
 
 using namespace dbaccess;
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index f381b40fbb82..33683266da8d 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -19,7 +19,7 @@
 
 #include "datasettings.hxx"
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index a3ef15206420..f8b56a649b7c 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -20,7 +20,7 @@
 #include <bitset>
 
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "definitioncolumn.hxx"
 #include "sdbcoretools.hxx"
 
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 7a79ae4415f3..619eacfab8ca 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 9016d2bfba34..0a127bf448dd 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "query.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <connectivity/warningscontainer.hxx>
 #include "HelperCollections.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 
 #include <cppuhelper/queryinterface.hxx>
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index a390a614057a..c6221be76c7e 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <comphelper/processfactory.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 0add2d493d5e..1641f6445d47 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "querycontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "query.hxx"
 #include "objectnameapproval.hxx"
 #include "veto.hxx"
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 019f2d238c9d..7ae594f98928 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -21,7 +21,7 @@
 
 #include "querydescriptor.hxx"
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 2970dc00c231..96ce95ad646c 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 320e2fc4f596..9a6eb24824da 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <resultset.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 813fa8a450f1..978552f36b6f 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -19,7 +19,7 @@
 
 #include <statement.hxx>
 #include <resultset.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 291f597fb7db..c192b10117bc 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -21,9 +21,9 @@
 
 #include "table.hxx"
 #include <definitioncolumn.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "CIndexes.hxx"
 
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 925552954ff3..cd03ff639e2a 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -18,14 +18,14 @@
  */
 
 #include "tablecontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "table.hxx"
 #include <comphelper/property.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/enumhelper.hxx>
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 3ca37659ed55..111089ebac9a 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "viewcontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "View.hxx"
 
 #include <comphelper/enumhelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index a0e760891d55..5d442e62c30b 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -19,7 +19,7 @@
 
 #include "ComponentDefinition.hxx"
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 47c71bcef2e2..e365e94d6367 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -34,7 +34,7 @@
 #include "myucp_resultset.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "sdbcoretools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 3608a06e9ffe..f05eda723b83 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -19,12 +19,12 @@
 
 #include "commandcontainer.hxx"
 #include "connection.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "databasecontext.hxx"
 #include "databasedocument.hxx"
 #include "datasource.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "ModelImpl.hxx"
 #include "userinformation.hxx"
 #include "sdbcoretools.hxx"
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 4ee378e7d8ed..fb550264a0f0 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "bookmarkcontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 9513600459df..22ad03474d1f 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -20,7 +20,7 @@
 #include "commandcontainer.hxx"
 #include "commanddefinition.hxx"
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdb/TableDefinition.hpp>
 #include <com/sun/star/sdb/CommandDefinition.hpp>
 
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 111d535f2796..fd87605ca4e4 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -19,7 +19,7 @@
 
 #include "commanddefinition.hxx"
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 2390bcf467e1..30166707664d 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -22,9 +22,9 @@
 #include <iterator>
 
 #include "connection.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "datasource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "statement.hxx"
 #include "preparedstatement.hxx"
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index a3fc0f66a7db..ce1c40b08968 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 237db1fce2fe..e023806270b2 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -20,13 +20,13 @@
 #include <config_features.h>
 
 #include "apitools.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "databasecontext.hxx"
 #include "databasedocument.hxx"
 #include "databaseregistrations.hxx"
 #include "datasource.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index cadc240f1ffe..e06b56310d7a 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "datasource.hxx"
 #include "databasedocument.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "documenteventexecutor.hxx"
 #include "databasecontext.hxx"
 #include "documentcontainer.hxx"
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 68c8d140ddcf..5f5aa0a4cede 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -20,9 +20,9 @@
 #include "datasource.hxx"
 #include "userinformation.hxx"
 #include "commandcontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "connection.hxx"
 #include "SharedConnection.hxx"
 #include "databasedocument.hxx"
@@ -594,7 +594,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
             sPwd = m_pImpl->m_aPassword;
     }
 
-    sal_uInt16 nExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED;
+    const char* pExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED;
     if (xManager.is())
     {
         sal_Int32 nAdditionalArgs(0);
@@ -630,7 +630,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
             // Nowadays, it's allowed for a driver to be registered for a given URL, but actually not to accept it.
             // This is because registration nowadays happens at compile time (by adding respective configuration data),
             // but acceptance is decided at runtime.
-            nExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER;
+            pExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER;
         }
         else
         {
@@ -672,11 +672,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
         }
     }
     else
-        nExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER;
+        pExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER;
 
     if ( !xReturn.is() )
     {
-        OUString sMessage = DBA_RES(nExceptionMessageId)
+        OUString sMessage = DBA_RES(pExceptionMessageId)
             .replaceAll("$name$", m_pImpl->m_sConnectURL);
 
         SQLContext aContext;
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 3c3f3089365a..6270c92385d6 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "definitioncontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "apitools.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index b30ee9adef0d..9674fe45ba61 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "documentcontainer.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "documentdefinition.hxx"
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -35,7 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <connectivity/sqlerror.hxx>
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <comphelper/namedvaluecollection.hxx>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d117a3fc0ca6..744ca5464122 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "documentdefinition.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "sdbcoretools.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -83,7 +83,7 @@
 #include <sal/macros.h>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "datasource.hxx"
 #include <com/sun/star/embed/XStateChangeBroadcaster.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index b1f55958ffe1..b7011dce3b32 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -19,7 +19,7 @@
 
 
 #include "intercept.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
deleted file mode 100644
index 64bbb69efdb9..000000000000
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ /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 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
-#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_CORE_STRINGS_START                  RID_DBACCESS_START
-
-//- String-IDs
-#define RID_STR_CONNECTION_INVALID              ( RID_CORE_STRINGS_START +  1 )
-#define RID_STR_TABLE_IS_FILTERED               ( RID_CORE_STRINGS_START +  2 )
-#define RID_STR_COULDNOTCONNECT_NODRIVER        ( RID_CORE_STRINGS_START +  4 )
-#define RID_STR_COULDNOTCONNECT_UNSPECIFIED     ( RID_CORE_STRINGS_START +  5 )
-#define RID_STR_COULDNOTLOAD_MANAGER            ( RID_CORE_STRINGS_START +  6 )
-#define RID_STR_ONLY_QUERY                      ( RID_CORE_STRINGS_START +  7 )
-#define RID_STR_NO_VALUE_CHANGED                ( RID_CORE_STRINGS_START +  8 )
-#define RID_STR_NO_XROWUPDATE                   ( RID_CORE_STRINGS_START +  9 )
-#define RID_STR_NO_XRESULTSETUPDATE             ( RID_CORE_STRINGS_START + 10 )
-#define RID_STR_NO_UPDATE_MISSING_CONDITION     ( RID_CORE_STRINGS_START + 11 )
-#define RID_STR_NO_COLUMN_ADD                   ( RID_CORE_STRINGS_START + 12 )
-#define RID_STR_NO_COLUMN_DROP                  ( RID_CORE_STRINGS_START + 13 )
-#define RID_STR_NO_CONDITION_FOR_PK             ( RID_CORE_STRINGS_START + 14 )
-#define RID_STR_NO_XQUERIESSUPPLIER             ( RID_CORE_STRINGS_START + 15 )
-#define RID_STR_NO_ABS_ZERO                     ( RID_CORE_STRINGS_START + 16 )
-#define RID_STR_NO_RELATIVE                     ( RID_CORE_STRINGS_START + 17 )
-#define RID_STR_NO_REFESH_AFTERLAST             ( RID_CORE_STRINGS_START + 18 )
-#define RID_STR_NO_MOVETOINSERTROW_CALLED       ( RID_CORE_STRINGS_START + 19 )
-#define RID_STR_NO_UPDATEROW                    ( RID_CORE_STRINGS_START + 20 )
-#define RID_STR_NO_DELETEROW                    ( RID_CORE_STRINGS_START + 21 )
-#define RID_STR_COLUMN_MUST_VISIBLE             ( RID_CORE_STRINGS_START + 22 )
-#define RID_STR_COLUMN_NOT_VALID                ( RID_CORE_STRINGS_START + 23 )
-#define RID_STR_COLUMN_NOT_SEARCHABLE           ( RID_CORE_STRINGS_START + 24 )
-#define RID_STR_NOT_SEQUENCE_INT8               ( RID_CORE_STRINGS_START + 25 )
-#define RID_STR_NO_TABLE_RENAME                 ( RID_CORE_STRINGS_START + 27 )
-#define RID_STR_COLUMN_ALTER_BY_NAME            ( RID_CORE_STRINGS_START + 28 )
-#define RID_STR_COLUMN_ALTER_BY_INDEX           ( RID_CORE_STRINGS_START + 29 )
-#define RID_STR_COLUMN_UNKNOWN_PROP             ( RID_CORE_STRINGS_START + 31 )
-#define RID_STR_FORM                            ( RID_CORE_STRINGS_START + 32 )
-#define RID_STR_REPORT                          ( RID_CORE_STRINGS_START + 33 )
-#define RID_STR_DATASOURCE_NOT_STORED           ( RID_CORE_STRINGS_START + 34 )
-#define RID_STR_FILE_DOES_NOT_EXIST             ( RID_CORE_STRINGS_START + 35 )
-#define RID_STR_TABLE_DOES_NOT_EXIST            ( RID_CORE_STRINGS_START + 36 )
-#define RID_STR_CONFLICTING_NAMES               ( RID_CORE_STRINGS_START + 37 )
-#define RID_STR_COMMAND_LEADING_TO_ERROR        ( RID_CORE_STRINGS_START + 38 )
-#define RID_STR_STATEMENT_WITHOUT_RESULT_SET    ( RID_CORE_STRINGS_START + 39 )
-#define RID_STR_NAME_MUST_NOT_BE_EMPTY          ( RID_CORE_STRINGS_START + 40 )
-#define RID_STR_NO_NULL_OBJECTS_IN_CONTAINER    ( RID_CORE_STRINGS_START + 41 )
-#define RID_STR_NAME_ALREADY_USED               ( RID_CORE_STRINGS_START + 42 )
-#define RID_STR_OBJECT_CONTAINER_MISMATCH       ( RID_CORE_STRINGS_START + 43 )
-#define RID_STR_OBJECT_ALREADY_CONTAINED        ( RID_CORE_STRINGS_START + 44 )
-#define RID_STR_NAME_NOT_FOUND                  ( RID_CORE_STRINGS_START + 45 )
-#define RID_STR_QUERY_DOES_NOT_EXIST            ( RID_CORE_STRINGS_START + 46 )
-#define RID_STR_ERROR_WHILE_SAVING              ( RID_CORE_STRINGS_START + 47 )
-#define RID_STR_NO_SUB_FOLDER                   ( RID_CORE_STRINGS_START + 48 )
-
-#define RID_STR_NO_DELETE_BEFORE_AFTER          ( RID_CORE_STRINGS_START + 49 )
-#define RID_STR_NO_DELETE_INSERT_ROW            ( RID_CORE_STRINGS_START + 50 )
-#define RID_STR_RESULT_IS_READONLY              ( RID_CORE_STRINGS_START + 51 )
-#define RID_STR_NO_DELETE_PRIVILEGE             ( RID_CORE_STRINGS_START + 52 )
-#define RID_STR_ROW_ALREADY_DELETED             ( RID_CORE_STRINGS_START + 53 )
-#define RID_STR_UPDATE_FAILED                   ( RID_CORE_STRINGS_START + 54 )
-
-#define RID_STR_INVALID_INDEX                   ( RID_CORE_STRINGS_START + 55 )
-#define RID_STR_NO_INSERT_PRIVILEGE             ( RID_CORE_STRINGS_START + 56 )
-#define RID_STR_INTERNAL_ERROR                  ( RID_CORE_STRINGS_START + 57 )
-#define RID_STR_EXPRESSION1                     ( RID_CORE_STRINGS_START + 58 )
-#define RID_STR_NO_SQL_COMMAND                  ( RID_CORE_STRINGS_START + 59 )
-#define RID_STR_INVALID_CURSOR_STATE            ( RID_CORE_STRINGS_START + 60 )
-#define RID_STR_CURSOR_BEFORE_OR_AFTER          ( RID_CORE_STRINGS_START + 61 )
-#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER     ( RID_CORE_STRINGS_START + 62 )
-#define RID_STR_NO_BOOKMARK_DELETED             ( RID_CORE_STRINGS_START + 63 )
-#define RID_STR_CONNECTION_REQUEST              ( RID_CORE_STRINGS_START + 65 )
-#define RID_STR_MISSING_EXTENSION               ( RID_CORE_STRINGS_START + 66 )
-
-#define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 67 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index adde1ade5b3a..6b42cc2047b9 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "ContainerMediator.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "PropertyForward.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index aaca4ecd9cd3..0d8b9805c033 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "DatabaseDataProvider.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 95cabf09220c..827bee9b9e43 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "PropertyForward.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index 879f86516e6a..1b8bc07a1206 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "apitools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 2bef7806208e..f568942272da 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -18,14 +18,13 @@
  */
 
 #include "dsntypes.hxx"
-#include "dbamiscres.hrc"
 #include <unotools/confignode.hxx>
 #include <osl/diagnose.h>
 #include <tools/wldcrd.hxx>
 #include <osl/file.hxx>
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/string.hxx>
 
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index c97a0a609c04..0f8ddc705d6a 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "sdbcoretools.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 62407e4df00f..7e848865a7e3 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -22,7 +22,7 @@
 #include "storagetextstream.hxx"
 #include "subcomponentrecovery.hxx"
 #include "subcomponents.hxx"
-#include "dbastrings.hrc"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index f2a7ea3b0f81..ad52b1638f90 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -38,37 +38,37 @@ namespace dbaccess
     }
 
     sal_Int32       ResourceManager::s_nClients = 0;
-    ResMgr*         ResourceManager::m_pImpl = nullptr;
+    std::locale*    ResourceManager::m_pImpl = nullptr;
 
     void ResourceManager::ensureImplExists()
     {
         if (m_pImpl)
             return;
 
-        m_pImpl = ResMgr::CreateResMgr("dba", Application::GetSettings().GetUILanguageTag());
+        m_pImpl = new std::locale(Translate::Create("dba", Application::GetSettings().GetUILanguageTag()));
     }
 
-    OUString ResourceManager::loadString(sal_uInt16 _nResId)
+    OUString ResourceManager::loadString(const char* pResId)
     {
         OUString sReturn;
 
         ensureImplExists();
         if (m_pImpl)
-            sReturn = OUString(ResId(_nResId,*m_pImpl));
+            sReturn = Translate::get(pResId, *m_pImpl);
 
         return sReturn;
     }
 
-    OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace )
+    OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace)
     {
-        OUString sString( loadString( _nResId ) );
+        OUString sString(loadString(pResId));
         return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace );
     }
 
-    OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1,
-        const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2 )
+    OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1,
+        const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2)
     {
-        OUString sString( loadString( _nResId ) );
+        OUString sString(loadString(pResId));
         sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii1), _rReplace1 );
         sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii2), _rReplace2 );
         return sString;
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
deleted file mode 100644
index f81344328458..000000000000
--- a/dbaccess/source/core/resource/strings.src
+++ /dev/null
@@ -1,338 +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 "core_resource.hrc"
-#include "dbamiscres.hrc"
-
-String RID_STR_CONNECTION_INVALID
-{
-    Text [ en-US ] = "No connection could be established.";
-};
-
-String RID_STR_TABLE_IS_FILTERED
-{
-    Text [ en-US ] = "The table $name$ already exists. It is not visible because it has been filtered out.";
-};
-
-String RID_STR_COULDNOTCONNECT_UNSPECIFIED
-{
-    Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.";
-};
-
-String RID_STR_COULDNOTCONNECT_NODRIVER
-{
-    Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'.";
-};
-
-String RID_STR_COULDNOTLOAD_MANAGER
-{
-    Text [ en-US ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.";
-};
-
-String RID_STR_FORM
-{
-    Text [ en-US ] = "Form";
-};
-
-String RID_STR_REPORT
-{
-    Text [ en-US ] = "Report";
-};
-
-String RID_STR_DATASOURCE_NOT_STORED
-{
-    Text [ en-US ] = "The data source was not saved. Please use the interface XStorable to save the data source.";
-};
-
-String RID_STR_ONLY_QUERY
-{
-    Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed.";
-};
-
-String RID_STR_NO_VALUE_CHANGED
-{
-    Text [ en-US ] = "No values were modified.";
-};
-
-String RID_STR_NO_XROWUPDATE
-{
-    Text [ en-US ] = "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet.";
-};
-
-String RID_STR_NO_XRESULTSETUPDATE
-{
-    Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet.";
-};
-
-String RID_STR_NO_UPDATE_MISSING_CONDITION
-{
-    Text [ en-US ] = "Values could not be modified, due to a missing condition statement.";
-};
-
-String RID_STR_NO_COLUMN_ADD
-{
-    Text [ en-US ] = "The adding of columns is not supported.";
-};
-
-String RID_STR_NO_COLUMN_DROP
-{
-    Text [ en-US ] = "The dropping of columns is not supported.";
-};
-
-String RID_STR_NO_CONDITION_FOR_PK
-{
-    Text [ en-US ] = "The WHERE condition could not be created for the primary key.";
-};
-
-String RID_STR_COLUMN_UNKNOWN_PROP
-{
-    Text [ en-US ] = "The column does not support the property '%value'.";
-};
-
-String RID_STR_COLUMN_NOT_SEARCHABLE
-{
-    Text [ en-US ] = "The column is not searchable!";
-};
-
-String RID_STR_NOT_SEQUENCE_INT8
-{
-    Text [ en-US ] = "The value of the columns is not of the type Sequence<sal_Int8>.";
-};
-
-String RID_STR_COLUMN_NOT_VALID
-{
-    Text [ en-US ] = "The column is not valid.";
-};
-
-String RID_STR_COLUMN_MUST_VISIBLE
-{
-    Text [ en-US ] = "The column '%name' must be visible as a column.";
-};
-
-String RID_STR_NO_XQUERIESSUPPLIER
-{
-    Text [ en-US ] = "The interface XQueriesSupplier is not available.";
-};
-
-String RID_STR_NO_ABS_ZERO
-{
-    Text [ en-US ] = "An 'absolute(0)' call is not allowed.";
-};
-
-String RID_STR_NO_RELATIVE
-{
-    Text [ en-US ] = "Relative positioning is not allowed in this state.";
-};
-
-String RID_STR_NO_REFESH_AFTERLAST
-{
-    Text [ en-US ] = "A row cannot be refreshed when the ResultSet is positioned after the last row.";
-};
-
-String RID_STR_NO_MOVETOINSERTROW_CALLED
-{
-    Text [ en-US ] = "A new row cannot be inserted when the ResultSet is not first moved to the insert row.";
-};
-
-String RID_STR_NO_UPDATEROW
-{
-    Text [ en-US ] = "A row cannot be modified in this state";
-};
-
-String RID_STR_NO_DELETEROW
-{
-    Text [ en-US ] = "A row cannot be deleted in this state.";
-};
-
-String RID_STR_NO_TABLE_RENAME
-{
-    Text [ en-US ] = "The driver does not support table renaming.";
-};
-
-String RID_STR_COLUMN_ALTER_BY_NAME
-{
-    Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name.";
-};
-
-String RID_STR_COLUMN_ALTER_BY_INDEX
-{
-    Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the index.";
-};
-
-String RID_STR_FILE_DOES_NOT_EXIST
-{
-    Text[ en-US ] = "The file \"$file$\" does not exist.";
-};
-
-String RID_STR_TABLE_DOES_NOT_EXIST
-{
-    Text [ en-US ] = "There exists no table named \"$table$\".";
-};
-
-String RID_STR_QUERY_DOES_NOT_EXIST
-{
-    Text [ en-US ] = "There exists no query named \"$table$\".";
-};
-
-String RID_STR_CONFLICTING_NAMES
-{
-    Text [ en-US ] = "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names.";
-};
-
-String RID_STR_COMMAND_LEADING_TO_ERROR
-{
-    Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$";
-};
-
-String RID_STR_STATEMENT_WITHOUT_RESULT_SET
-{
-    Text [ en-US ] = "The SQL command does not describe a result set.";
-};
-
-String RID_STR_NAME_MUST_NOT_BE_EMPTY
-{
-    Text [ en-US ] = "The name must not be empty.";
-};
-
-String RID_STR_NO_NULL_OBJECTS_IN_CONTAINER
-{
-    Text [ en-US ] = "The container cannot contain NULL objects.";
-};
-
-String RID_STR_NAME_ALREADY_USED
-{
-    Text [ en-US ] = "There already is an object with the given name.";
-};
-
-String RID_STR_OBJECT_CONTAINER_MISMATCH
-{
-    Text [ en-US ] = "This object cannot be part of this container.";
-};
-
-String RID_STR_OBJECT_ALREADY_CONTAINED
-{
-    Text [ en-US ] = "The object already is, with a different name, part of the container.";
-};
-
-String RID_STR_NAME_NOT_FOUND
-{
-    Text [ en-US ] = "Unable to find the document '$name$'.";
-};
-
-String RID_STR_ERROR_WHILE_SAVING
-{
-    Text [ en-US ] = "Could not save the document to $location$:\n$message$";
-};
-
-String RID_NO_SUCH_DATA_SOURCE
-{
-    Text [ en-US ] = "Error accessing data source '$name$':\n$error$";
-};
-
-String RID_STR_NO_SUB_FOLDER
-{
-    Text [ en-US ] = "There exists no folder named \"$folder$\".";
-};
-
-String RID_STR_NO_DELETE_BEFORE_AFTER
-{
-    Text [ en-US ] = "Cannot delete the before-first or after-last row.";
-};
-
-String RID_STR_NO_DELETE_INSERT_ROW
-{
-    Text [ en-US ] = "Cannot delete the insert-row.";
-};
-
-String RID_STR_RESULT_IS_READONLY
-{
-    Text [ en-US ] = "Result set is read only.";
-};
-
-String RID_STR_NO_DELETE_PRIVILEGE
-{
-    Text [ en-US ] = "DELETE privilege not available.";
-};
-
-String RID_STR_ROW_ALREADY_DELETED
-{
-    Text [ en-US ] = "Current row is already deleted.";
-};
-
-String RID_STR_UPDATE_FAILED
-{
-    Text [ en-US ] = "Current row could not be updated.";
-};
-
-String RID_STR_NO_INSERT_PRIVILEGE
-{
-    Text [ en-US ] = "INSERT privilege not available.";
-};
-
-String RID_STR_INTERNAL_ERROR
-{
-    Text [ en-US ] = "Internal error: no statement object provided by the database driver.";
-};
-
-String RID_STR_EXPRESSION1
-{
-    Text [ en-US ] = "Expression1";
-};
-
-String RID_STR_NO_SQL_COMMAND
-{
-    Text [ en-US ] = "No SQL command was provided.";
-};
-
-String RID_STR_INVALID_INDEX
-{
-    Text [ en-US ] = "Invalid column index.";
-};
-
-String RID_STR_INVALID_CURSOR_STATE
-{
-    Text [ en-US ] = "Invalid cursor state.";
-};
-
-String RID_STR_CURSOR_BEFORE_OR_AFTER
-{
-    Text [ en-US ] = "The cursor points to before the first or after the last row.";
-};
-
-String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER
-{
-    Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark.";
-};
-
-String RID_STR_NO_BOOKMARK_DELETED
-{
-    Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark.";
-};
-
-String RID_STR_CONNECTION_REQUEST
-{
-    Text [ en-US ] = "A connection for the following URL was requested \"$name$\".";
-};
-
-String RID_STR_MISSING_EXTENSION
-{
-    Text [ en-US ] = "The extension is not installed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
deleted file mode 100644
index 9105d11721dc..000000000000
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ /dev/null
@@ -1,55 +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 DBACCESS_DBMM_GLOBAL_HRC
-#define DBACCESS_DBMM_GLOBAL_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_DBMM_STRING_START       RID_DBACCESS_START + 0
-
-#define STR_FORM                    ( RID_DBMM_STRING_START +  0 )
-#define STR_REPORT                  ( RID_DBMM_STRING_START +  1 )
-#define STR_OVERALL_PROGRESS        ( RID_DBMM_STRING_START +  2 )
-#define STR_DATABASE_DOCUMENT       ( RID_DBMM_STRING_START +  3 )
-#define STR_SAVED_COPY_TO           ( RID_DBMM_STRING_START +  4 )
-#define STR_MOVED_LIBRARY           ( RID_DBMM_STRING_START +  5 )
-#define STR_OOO_BASIC               ( RID_DBMM_STRING_START +  6 )
-#define STR_JAVA_SCRIPT             ( RID_DBMM_STRING_START +  7 )
-#define STR_BEAN_SHELL              ( RID_DBMM_STRING_START +  8 )
-#define STR_JAVA                    ( RID_DBMM_STRING_START +  9 )
-#define STR_PYTHON                  ( RID_DBMM_STRING_START + 10 )
-#define STR_DIALOG                  ( RID_DBMM_STRING_START + 11 )
-#define STR_MIGRATING_LIBS          ( RID_DBMM_STRING_START + 12 )
-#define STR_ERRORS                  ( RID_DBMM_STRING_START + 13 )
-#define STR_WARNINGS                ( RID_DBMM_STRING_START + 14 )
-#define STR_EXCEPTION               ( RID_DBMM_STRING_START + 15 )
-#define STR_LIBRARY_TYPE_AND_NAME   ( RID_DBMM_STRING_START + 16 )
-#define STR_INVALID_NUMBER_ARGS     ( RID_DBMM_STRING_START + 17 )
-#define STR_NO_DATABASE             ( RID_DBMM_STRING_START + 18 )
-#define STR_NOT_READONLY            ( RID_DBMM_STRING_START + 19 )
-#define STR_STATE_CLOSE_SUB_DOCS    ( RID_DBMM_STRING_START + 20 )
-#define STR_STATE_BACKUP_DBDOC      ( RID_DBMM_STRING_START + 21 )
-#define STR_STATE_MIGRATE           ( RID_DBMM_STRING_START + 22 )
-#define STR_STATE_SUMMARY           ( RID_DBMM_STRING_START + 23 )
-#define STR_INVALID_BACKUP_LOCATION ( RID_DBMM_STRING_START + 25 )
-
-#endif // DBACCESS_DBMM_GLOBAL_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx
deleted file mode 100644
index 826e945ae167..000000000000
--- a/dbaccess/source/ext/macromigration/dbmm_module.cxx
+++ /dev/null
@@ -1,31 +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 "dbmm_module.hxx"
-
-#include <rtl/instance.hxx>
-
-namespace dbmm
-{
-
-    IMPLEMENT_MODULE( MacroMigrationModule, "dbmm" );
-
-} // namespace dbmm
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx
deleted file mode 100644
index ff171823703f..000000000000
--- a/dbaccess/source/ext/macromigration/dbmm_module.hxx
+++ /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/.
- *
- * 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_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
-#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
-
-#include <unotools/componentresmodule.hxx>
-
-namespace dbmm
-{
-
-    DEFINE_MODULE( MacroMigrationModule, MacroMigrationModuleClient, MacroMigrationResId )
-
-} // namespace dbmm
-
-#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 332d82987d20..1ced4c105042 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -17,26 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmm_module.hxx"
+#include <cppuhelper/factory.hxx>
 #include "macromigrationwizard.hxx"
 
-namespace dbmm
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
+    const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
+    SAL_UNUSED_PARAMETER void* )
 {
+    css::uno::Reference<css::uno::XInterface> xRet;
 
-    static void initializeModule()
+    if (dbmm::MacroMigrationDialogService::getImplementationName_static() == OUString::createFromAscii(pImplementationName))
     {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        createRegistryInfo_MacroMigrationDialogService();
+        xRet = ::cppu::createSingleComponentFactory(dbmm::MacroMigrationDialogService::Create,
+                    dbmm::MacroMigrationDialogService::getImplementationName_static(),
+                    dbmm::MacroMigrationDialogService::getSupportedServiceNames_static(), nullptr);
     }
 
-} // namespace dbmm
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
-    const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
-    SAL_UNUSED_PARAMETER void* )
-{
-    ::dbmm::initializeModule();
-    return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName );
+    if (xRet.is())
+        xRet->acquire();
+    return xRet.get();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index 87f7311ec952..554945c068a3 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -17,30 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
+#include "core_resource.hxx"
 #include "dbmm_types.hxx"
-
-#include "dbmm_global.hrc"
-#include "dbmm_module.hxx"
+#include "strings.hrc"
 
 namespace dbmm
 {
-
     // helper
     OUString getScriptTypeDisplayName( const ScriptType _eType )
     {
-        sal_uInt16 nResId( 0 );
+        const char *pResId = nullptr;
 
         switch ( _eType )
         {
-        case eBasic:        nResId = STR_OOO_BASIC;     break;
-        case eBeanShell:    nResId = STR_BEAN_SHELL;    break;
-        case eJavaScript:   nResId = STR_JAVA_SCRIPT;   break;
-        case ePython:       nResId = STR_PYTHON;        break;
-        case eJava:         nResId = STR_JAVA;          break;
-        case eDialog:       nResId = STR_DIALOG;        break;
+            case eBasic:        pResId = STR_OOO_BASIC;     break;
+            case eBeanShell:    pResId = STR_BEAN_SHELL;    break;
+            case eJavaScript:   pResId = STR_JAVA_SCRIPT;   break;
+            case ePython:       pResId = STR_PYTHON;        break;
+            case eJava:         pResId = STR_JAVA;          break;
+            case eDialog:       pResId = STR_DIALOG;        break;
         }
-        OSL_ENSURE( nResId != 0, "getScriptTypeDisplayName: illegal script type!" );
-        return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString();
+        OSL_ENSURE( pResId != nullptr, "getScriptTypeDisplayName: illegal script type!" );
+
+        return pResId ? DBA_RES(pResId) : OUString();
     }
 
 } // namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc
deleted file mode 100644
index e4bc293c6803..000000000000
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ /dev/null
@@ -1,29 +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 DBACCESS_MACROMIGRATION_HRC
-#define DBACCESS_MACROMIGRATION_HRC
-
-// height and width of tab pages
-#define TAB_PAGE_WIDTH  280
-#define TAB_PAGE_HEIGHT 185
-
-#endif // DBACCESS_MACROMIGRATION_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
deleted file mode 100644
index fe5812bfc50c..000000000000
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ /dev/null
@@ -1,149 +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 "dbmm_global.hrc"
-
-String STR_STATE_CLOSE_SUB_DOCS
-{
-    Text [ en-US ] = "Prepare";
-};
-
-String STR_STATE_BACKUP_DBDOC
-{
-    Text [ en-US ] = "Backup Document";
-};
-
-String STR_STATE_MIGRATE
-{
-    Text [ en-US ] = "Migrate";
-};
-
-String STR_STATE_SUMMARY
-{
-    Text [ en-US ] = "Summary";
-};
-
-String STR_FORM
-{
-    Text [ en-US ] = "Form '$name$'";
-    Text [ x-comment ] = "This refers to a form document inside a database document.";
-};
-
-String STR_REPORT
-{
-    Text [ en-US ] = "Report '$name$'";
-    Text [ x-comment ] = "This refers to a report document inside a database document.";
-};
-
-String STR_OVERALL_PROGRESS
-{
-    Text [ en-US ] = "document $current$ of $overall$";
-};
-
-String STR_DATABASE_DOCUMENT
-{
-    Text[ en-US ] = "Database Document";
-};
-
-String STR_SAVED_COPY_TO
-{
-    Text[ en-US ] = "saved copy to $location$";
-};
-
-String STR_MOVED_LIBRARY
-{
-    Text[ en-US ] = "migrated $type$ library '$old$' to '$new$'";
-};
-
-String STR_LIBRARY_TYPE_AND_NAME
-{
-    Text [ en-US ] = "$type$ library '$library$'";
-};
-
-String STR_MIGRATING_LIBS
-{
-    Text [ en-US ] = "migrating libraries ...";
-};
-
-String STR_OOO_BASIC
-{
-    Text[ en-US ] = "%PRODUCTNAME Basic";
-};
-
-String STR_JAVA_SCRIPT
-{
-    Text[ en-US ] = "JavaScript";
-};
-
-String STR_BEAN_SHELL
-{
-    Text[ en-US ] = "BeanShell";
-};
-
-String STR_JAVA
-{
-    Text[ en-US ] = "Java";
-};
-
-String STR_PYTHON
-{
-    Text[ en-US ] = "Python";
-};
-
-String STR_DIALOG
-{
-    Text[ en-US ] = "dialog";
-};
-
-String STR_ERRORS
-{
-    Text [ en-US ] = "Error(s)";
-};
-
-String STR_WARNINGS
-{
-    Text [ en-US ] = "Warnings";
-};
-
-String STR_EXCEPTION
-{
-    Text [ en-US ] = "caught exception:";
-};
-
-String STR_INVALID_BACKUP_LOCATION
-{
-    Text [ en-US ] = "You need to choose a backup location other than the document location itself.";
-};
-
-String STR_INVALID_NUMBER_ARGS
-{
-    Text [ en-US ] = "Invalid number of initialization arguments. Expected 1.";
-};
-
-String STR_NO_DATABASE
-{
-    Text [ en-US ] = "No database document found in the initialization arguments.";
-};
-
-String STR_NOT_READONLY
-{
-    Text [ en-US ] = "Not applicable to read-only documents.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 6637bb32f49c..349c95d2b35d 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmm_global.hrc"
-#include "dbmm_module.hxx"
 #include "docinteraction.hxx"
-#include "macromigration.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
 #include "macromigrationdialog.hxx"
 #include "macromigrationpages.hxx"
 #include "migrationengine.hxx"
@@ -57,6 +56,10 @@ namespace dbmm
 
 #define PATH_DEFAULT            1
 
+// height and width of tab pages
+#define TAB_PAGE_WIDTH  280
+#define TAB_PAGE_HEIGHT 185
+
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::uno::XInterface;
@@ -125,10 +128,10 @@ namespace dbmm
         : MacroMigrationDialog_Base(_pParent)
         , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
     {
-        OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) );
-        OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) );
-        OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) );
-        OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) );
+        OUString sTitlePrepare( DBA_RES( STR_STATE_CLOSE_SUB_DOCS ) );
+        OUString sTitleStoreAs( DBA_RES( STR_STATE_BACKUP_DBDOC ) );
+        OUString sTitleMigrate( DBA_RES( STR_STATE_MIGRATE ) );
+        OUString sTitleSummary( DBA_RES( STR_STATE_SUMMARY ) );
 
         describeState( STATE_CLOSE_SUB_DOCS,    sTitlePrepare, &PreparationPage::Create   );
         describeState( STATE_BACKUP_DBDOC,      sTitleStoreAs, &SaveDBDocPage::Create     );
@@ -382,7 +385,7 @@ namespace dbmm
             // check that the backup location isn't the same as the document itself
             if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) )
             {
-                ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) );
+                ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), DBA_RES( STR_INVALID_BACKUP_LOCATION ) );
                 aErrorBox->Execute();
                 rBackupPage.grabLocationFocus();
                 return false;
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index dd1f49942698..e2e134d5ac52 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -18,9 +18,7 @@
  */
 
 #include "dbaccess_helpid.hrc"
-#include "dbmm_module.hxx"
-#include "dbmm_global.hrc"
-#include "macromigration.hrc"
+#include "strings.hrc"
 #include "macromigrationpages.hxx"
 #include "macromigrationdialog.hxx"
 
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 96201b2f801f..4cb72dce82df 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -17,83 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmm_module.hxx"
-#include "dbmm_global.hrc"
-#include "macromigrationdialog.hxx"
 #include "macromigrationwizard.hxx"
 
-#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
-#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-
-#include <svtools/genericunodialog.hxx>
-
 namespace dbmm
 {
-
-    using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::UNO_QUERY;
-    using ::com::sun::star::uno::UNO_QUERY_THROW;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
-    using ::com::sun::star::uno::Any;
-    using ::com::sun::star::uno::XComponentContext;
-    using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::beans::XPropertySetInfo;
-    using ::com::sun::star::beans::Property;
-    using ::com::sun::star::ucb::AlreadyInitializedException;
-    using ::com::sun::star::sdb::XOfficeDatabaseDocument;
-    using ::com::sun::star::lang::IllegalArgumentException;
-    using ::com::sun::star::frame::XStorable;
-
-    // MacroMigrationDialogService
-    class MacroMigrationDialogService;
-    typedef ::svt::OGenericUnoDialog                                                MacroMigrationDialogService_Base;
-    typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService >  MacroMigrationDialogService_PBase;
-
-    class MacroMigrationDialogService
-                :public MacroMigrationDialogService_Base
-                ,public MacroMigrationDialogService_PBase
-                ,public MacroMigrationModuleClient
-    {
-    public:
-        explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext );
-
-        // XTypeProvider
-        virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
-
-        // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-        // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
-
-        // XPropertySet
-        virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
-        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-
-        // OPropertyArrayUsageHelper
-        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
-
-        // helper for factories
-        static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
-        /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_static();
-        /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
-
-    protected:
-        virtual ~MacroMigrationDialogService() override;
-
-    protected:
-        virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
-
-    private:
-        Reference< XOfficeDatabaseDocument >    m_xDocument;
-    };
-
     // MacroMigrationDialogService
     MacroMigrationDialogService::MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext )
         :MacroMigrationDialogService_Base( _rxContext )
@@ -157,7 +84,7 @@ namespace dbmm
 
         if ( _rArguments.getLength() != 1 )
             throw IllegalArgumentException(
-                MacroMigrationResId(STR_INVALID_NUMBER_ARGS),
+                DBA_RES(STR_INVALID_NUMBER_ARGS),
                 *this,
                 1
             );
@@ -165,7 +92,7 @@ namespace dbmm
         m_xDocument.set( _rArguments[0], UNO_QUERY );
         if ( !m_xDocument.is() )
             throw IllegalArgumentException(
-                MacroMigrationResId(STR_NO_DATABASE),
+                DBA_RES(STR_NO_DATABASE),
                 *this,
                 1
             );
@@ -173,7 +100,7 @@ namespace dbmm
         Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW );
         if ( xDocStor->isReadonly() )
             throw IllegalArgumentException(
-                MacroMigrationResId(STR_NOT_READONLY),
+                DBA_RES(STR_NOT_READONLY),
                 *this,
                 1
             );
@@ -197,12 +124,6 @@ namespace dbmm
         describeProperties( aProps );
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
-
-    void createRegistryInfo_MacroMigrationDialogService()
-    {
-        static OAutoRegistration< MacroMigrationDialogService > aAutoRegistration;
-    }
-
 } // namespace dbmm
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
index 3c0bb6c37bbc..ebe1634c8bf6 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
@@ -17,17 +17,82 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX
-#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX
+#include "macromigrationdialog.hxx"
 
-#include <sal/config.h>
+#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
+#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
 
-namespace dbmm {
+#include <svtools/genericunodialog.hxx>
 
-void createRegistryInfo_MacroMigrationDialogService();
+#include "core_resource.hxx"
+#include "strings.hrc"
 
-}
+namespace dbmm
+{
 
-#endif
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::XComponentContext;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::beans::XPropertySetInfo;
+    using ::com::sun::star::beans::Property;
+    using ::com::sun::star::ucb::AlreadyInitializedException;
+    using ::com::sun::star::sdb::XOfficeDatabaseDocument;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::frame::XStorable;
+
+    // MacroMigrationDialogService
+    class MacroMigrationDialogService;
+    typedef ::svt::OGenericUnoDialog                                                MacroMigrationDialogService_Base;
+    typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService >  MacroMigrationDialogService_PBase;
+
+    class MacroMigrationDialogService
+                :public MacroMigrationDialogService_Base
+                ,public MacroMigrationDialogService_PBase
+    {
+    public:
+        explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext );
+
+        // XTypeProvider
+        virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XInitialization
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+
+        // XPropertySet
+        virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
+
+        // OPropertyArrayUsageHelper
+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
+
+        // helper for factories
+        static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
+        /// @throws RuntimeException
+        static OUString SAL_CALL getImplementationName_static();
+        /// @throws RuntimeException
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
+
+    protected:
+        virtual ~MacroMigrationDialogService() override;
+
+    protected:
+        virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
+
+    private:
+        Reference< XOfficeDatabaseDocument >    m_xDocument;
+    };
+
+} // namespace dbmm
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 8b0b7a3c8a5f..ebfe416d28e5 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmm_global.hrc"
-#include "dbmm_module.hxx"
 #include "dbmm_types.hxx"
 #include "docinteraction.hxx"
 #include "migrationengine.hxx"
@@ -27,6 +25,8 @@
 #include "migrationlog.hxx"
 #include "progresscapture.hxx"
 #include "progressmixer.hxx"
+#include "core_resource.hxx"
+#include "strings.hrc"
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
@@ -209,8 +209,8 @@ namespace dbmm
         OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument )
         {
             OUString sObjectName(
-                    OUString(MacroMigrationResId(
-                        _rDocument.eType == eForm ? STR_FORM : STR_REPORT)).
+                    DBA_RES(
+                        _rDocument.eType == eForm ? STR_FORM : STR_REPORT).
                 replaceFirst("$name$", _rDocument.sHierarchicalName));
             return sObjectName;
         }
@@ -924,7 +924,7 @@ namespace dbmm
         // initialize global progress
         sal_Int32 nOverallRange( m_aSubDocs.size() );
         OUString sProgressSkeleton(
-            OUString(MacroMigrationResId(STR_OVERALL_PROGRESS)).
+            DBA_RES( STR_OVERALL_PROGRESS).
             replaceFirst("$overall$", OUString::number(nOverallRange)));
 
         m_rProgress.start( nOverallRange );
@@ -1045,7 +1045,7 @@ namespace dbmm
         }
 
         // migrate the libraries
-        ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS));
+        ProgressDelegator aDelegator(m_rProgress, sObjectName, DBA_RES(STR_MIGRATING_LIBS));
         ProgressMixer aProgressMixer( aDelegator );
         aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 );
         aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 );
@@ -1773,7 +1773,7 @@ namespace dbmm
     {
         // a human-readable description of the affected library
         OUString sLibraryDescription(
-            OUString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)).
+            DBA_RES(STR_LIBRARY_TYPE_AND_NAME).
             replaceFirst("$type$",
                 getScriptTypeDisplayName(_eScriptType)).
             replaceFirst("$library$", _rLibraryName));
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 6c82391b8197..1346999440fe 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -17,12 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbmm_module.hxx"
-#include "dbmm_global.hrc"
+#include "core_resource.hxx"
 #include "migrationerror.hxx"
 #include "migrationlog.hxx"
+#include "strings.hrc"
 
 #include <comphelper/anytostring.hxx>
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 
 #include <vector>
@@ -340,13 +341,13 @@ namespace dbmm
             }
         }
 
-        void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
+        void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const char* pHeadingResId )
         {
             _rBuffer.append( "=== " );
-            _rBuffer.append     ( OUString( MacroMigrationResId( _nHeadingResId ) ) );
+            _rBuffer.append( DBA_RES(pHeadingResId) );
             _rBuffer.append( " ===\n" );
 
-            OUString sException( MacroMigrationResId( STR_EXCEPTION ) );
+            OUString sException( DBA_RES( STR_EXCEPTION ) );
 
             for (   ErrorLog::const_iterator error = _rErrors.begin();
                     error != _rErrors.end();
@@ -386,10 +387,10 @@ namespace dbmm
 
         if ( !m_pData->sBackupLocation.isEmpty() )
         {
-            OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
+            OUString sBackedUp( DBA_RES( STR_SAVED_COPY_TO ) );
             sBackedUp = sBackedUp.replaceAll( "$location$", m_pData->sBackupLocation );
 
-            aBuffer.append( "=== " + OUString( MacroMigrationResId( STR_DATABASE_DOCUMENT ) )
+            aBuffer.append( "=== " + DBA_RES( STR_DATABASE_DOCUMENT )
                     + " ===\n" + sBackedUp + "\n\n");
         }
 
@@ -400,7 +401,7 @@ namespace dbmm
         }
         else
         {
-            OUString sMovedLibTemplate( MacroMigrationResId( STR_MOVED_LIBRARY ) );
+            OUString sMovedLibTemplate( DBA_RES( STR_MOVED_LIBRARY ) );
 
             for (   DocumentLogs::const_iterator doc = m_pData->aDocumentLogs.begin();
                     doc != m_pData->aDocumentLogs.end();
@@ -412,7 +413,7 @@ namespace dbmm
                 if ( rDoc.aMovedLibraries.empty() )
                     continue;
 
-                OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) );
+                OUString sDocTitle( DBA_RES( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) );
                 sDocTitle = sDocTitle.replaceAll( "$name$", rDoc.sName );
 
                 aBuffer.append( "=== " + sDocTitle + " ===\n" );
diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index 55087bfc7756..49feb9af9181 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX
 #define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX
 
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+
 namespace dbmm
 {
 
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index aff11ddd5376..a20c299e8caf 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -19,7 +19,8 @@
 
 #include "flt_reghelper.hxx"
 #include "xmlservices.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index fbb75beadd0c..db8a81e0a987 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -24,7 +24,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index 9d0bfd65f25d..f1ceb62e3797 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index 20b562697383..c3be7fedaf49 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -27,7 +27,7 @@
 #include "xmlEnums.hxx"
 #include "xmlDatabaseDescription.hxx"
 #include "xmlConnectionResource.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 #include <tools/diagnose_ex.h>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index 8905cfe44564..09d330d5a4a3 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 80d2377d3e77..e57ba90947d7 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -28,7 +28,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "xmlConnectionData.hxx"
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 3416ee256838..b5c53aabb580 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -24,7 +24,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vector>
 
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index a7f25caec522..fe0b336a74a5 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -29,7 +29,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 #include <rtl/strbuf.hxx>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index e9b4f23ba3e4..e9378590dd1d 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -24,7 +24,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <vector>
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index af7d1d61ba70..e79c57efe3e0 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -28,7 +28,8 @@
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <connectivity/dbtools.hxx>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index 579325c57fbe..bc6b1eb1c72a 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -26,7 +26,7 @@
 #include "xmlEnums.hxx"
 #include "xmlFileBasedDatabase.hxx"
 #include "xmlServerDatabase.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 #include <tools/diagnose_ex.h>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 97b0c6ce41b3..b8137f2233a4 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -26,7 +26,7 @@
 #include "xmlComponent.hxx"
 #include "xmlHierarchyCollection.hxx"
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 
 namespace dbaxml
 {
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 707a8b778d8d..0644db8ac6e8 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -31,7 +31,8 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "xmlEnums.hxx"
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 458a26b57161..8ddd10face62 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 5bcb2906eea0..d7e24a8fb5d0 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -27,7 +27,8 @@
 #include <xmloff/maptype.hxx>
 
 #include <com/sun/star/awt/TextAlign.hpp>
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "xmlEnums.hxx"
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 44197f555ed4..d7a10a735814 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -26,7 +26,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index bad2b885b03b..3c44f3cfbee3 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/sdbc/XDataSource.hpp>
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index d37fd226947a..e93d411df2af 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 06502559eec2..63718920070b 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 2450c8b9c875..ceb86414d249 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -25,7 +25,8 @@
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
 #include "xmlHierarchyCollection.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 2cd959e5cfb5..20427c2a0df6 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -23,7 +23,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmlimp.hxx>
 #include "xmlfilter.hxx"
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 41973b5efd6c..0f9007c379a6 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -43,7 +43,8 @@
 #include <com/sun/star/uno/XNamingService.hpp>
 #include "xmlDatabase.hxx"
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <xmloff/DocumentSettingsContext.hxx>
 #include "xmlStyleImport.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index d03fdb0d453b..015d8c14b4a1 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -30,6 +30,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/CommonTools.hxx>
+#include "strings.hxx"
 
 // OSubComponent - a component which holds a hard ref to its parent
 //                 and is been hold itself (by the parent) with a weak ref
diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc
deleted file mode 100644
index a4ccd46649d4..000000000000
--- a/dbaccess/source/inc/dbastrings.hrc
+++ /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 .
- */
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
-#define DBACCESS_SHARED_DBASTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.inc"
-
-    #define SQLSTATE_GENERAL "01000"
-
-    #define  PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode"
-    #define  PROPERTY_IS_FORM             "IsForm"
-    #define  PROPERTY_PERSISTENT_PATH     "PersistentPath"
-
-#endif // DBACCESS_SHARED_DBASTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc
deleted file mode 100644
index 9911441257c6..000000000000
--- a/dbaccess/source/inc/dbustrings.hrc
+++ /dev/null
@@ -1,63 +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 DBACCESS_SHARED_DBUSTRINGS_HRC
-#define DBACCESS_SHARED_DBUSTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.inc"
-
-    // URLs
-
-    #define URL_COMPONENT_QUERYDESIGN         ".component:DB/QueryDesign"
-    #define URL_COMPONENT_VIEWDESIGN          ".component:DB/ViewDesign"
-    #define URL_COMPONENT_TABLEDESIGN         ".component:DB/TableDesign"
-    #define URL_COMPONENT_FORMGRIDVIEW        ".component:DB/FormGridView"
-    #define URL_COMPONENT_DATASOURCEBROWSER   ".component:DB/DataSourceBrowser"
-    #define URL_COMPONENT_RELATIONDESIGN      ".component:DB/RelationDesign"
-    #define URL_COMPONENT_APPLICATION         ".component:DB/Application"
-    #define URL_COMPONENT_REPORTDESIGN        ".component:DB/ReportDesign"
-
-    // service names
-
-    #define SERVICE_SDB_DIRECTSQLDIALOG       "org.openoffice.comp.dbu.DirectSqlDialog"
-
-    // other DBU relevant strings
-
-    #define FRAME_NAME_QUERY_PREVIEW          "QueryPreview"
-    #define SERVICE_CONTROLDEFAULT            "com.sun.star.comp.dbu.OColumnControl"
-    #define PROPERTY_QUERYDESIGNVIEW          "QueryDesignView"
-    #define PROPERTY_GRAPHICAL_DESIGN         "GraphicalDesign"
-    #define PROPERTY_HELP_URL                 "HelpURL"
-
-    // other DBU properties
-
-    #define PROPERTY_TRISTATE         "TriState"
-    #define PROPERTY_ENABLEOUTERJOIN  "EnableOuterJoinEscape"
-    #define PROPERTY_TABSTOP "TabStop"
-    #define PROPERTY_DEFAULTCONTROL "DefaultControl"
-    #define PROPERTY_ENABLED "Enabled"
-    #define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
-
-#endif // DBACCESS_SHARED_DBUSTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hxx
index d05fbf775e44..197a9c95de9d 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hxx
@@ -20,10 +20,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
 #define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
 
-#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
-#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
-#endif
-
 // property ids
 
 #define PROPERTY_ID_TITLE                   1
diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc
deleted file mode 100644
index b896a924b4ab..000000000000
--- a/dbaccess/source/inc/xmlstrings.hrc
+++ /dev/null
@@ -1,31 +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 DBACCESS_SHARED_XMLSTRINGS_HRC
-#define DBACCESS_SHARED_XMLSTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.inc"
-
-#endif // DBACCESS_SHARED_XMLSTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index cbc269aa6305..15cb2be4f883 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "connectiontools.hxx"
-#include "sdbt_services.hxx"
 #include "tablename.hxx"
 #include "objectnames.hxx"
 #include "datasourcemetadata.hxx"
@@ -30,11 +29,6 @@
 
 #include <algorithm>
 
-extern "C" void SAL_CALL createRegistryInfo_ConnectionTools()
-{
-    ::sdbtools::OAutoRegistration< ::sdbtools::ConnectionTools > aRegistration;
-}
-
 namespace sdbtools
 {
 
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index d2026b579fff..9bc0e42b5c90 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -18,8 +18,9 @@
  */
 
 #include "objectnames.hxx"
+#include "core_resource.hxx"
 
-#include "sdbt_resource.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -99,7 +100,7 @@ namespace sdbtools
             ::dbtools::DatabaseMetaData aMeta( m_xConnection );
             if ( aMeta.supportsSubqueriesInFrom() )
             {
-                OUString sNeedDistinctNames( SdbtRes( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) );
+                OUString sNeedDistinctNames( DBA_RES( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) );
                 aError.NextException <<= SQLException( sNeedDistinctNames, m_xConnection, OUString(), 0, Any() );
             }
 
@@ -282,7 +283,7 @@ namespace sdbtools
             &&  ( _nCommandType != CommandType::QUERY )
             )
             throw IllegalArgumentException(
-                SdbtRes( STR_INVALID_COMMAND_TYPE ),
+                DBA_RES( STR_INVALID_COMMAND_TYPE ),
                 nullptr,
                 0
             );
@@ -305,7 +306,7 @@ namespace sdbtools
         catch( const Exception& )
         {
             throw IllegalArgumentException(
-                SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ),
+                DBA_RES( STR_CONN_WITHOUT_QUERIES_OR_TABLES ),
                 nullptr,
                 0
             );
@@ -368,9 +369,9 @@ namespace sdbtools
         if ( sBaseName.isEmpty() )
         {
             if ( CommandType == CommandType::TABLE )
-                sBaseName = OUString( SdbtRes( STR_BASENAME_TABLE ) );
+                sBaseName = DBA_RES(STR_BASENAME_TABLE);
             else
-                sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) );
+                sBaseName = DBA_RES(STR_BASENAME_QUERY);
         }
         else if( CommandType == CommandType::QUERY )
         {
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 6a74c457aadc..433f75b72742 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX
 
 #include "connectiondependent.hxx"
-#include "module_sdbt.hxx"
 
 #include <com/sun/star/sdb/tools/XObjectNames.hpp>
 
@@ -40,9 +39,6 @@ namespace sdbtools
     class ObjectNames   :public ObjectNames_Base
                         ,public ConnectionDependentComponent
     {
-    private:
-        SdbtClient  m_aModuleClient;    // keep the module alive as long as this instance lives
-
     public:
         /** constructs the instance
 
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index e51e997c13e0..0e78a9cb7d35 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -18,9 +18,10 @@
  */
 
 #include "tablename.hxx"
-#include "sdbt_resource.hrc"
-#include "module_sdbt.hxx"
-#include "sdbtstrings.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
 
 #include <com/sun/star/sdb/tools/CompositionType.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -53,8 +54,6 @@ namespace sdbtools
     // TableName
     struct TableName_Impl
     {
-        SdbtClient      m_aModuleClient;    // keep the module alive as long as this instance lives
-
         OUString sCatalog;
         OUString sSchema;
         OUString sName;
@@ -152,7 +151,7 @@ namespace sdbtools
             ||  !xPSI->hasPropertyByName( PROPERTY_NAME )
             )
             throw IllegalArgumentException(
-                SdbtRes( STR_NO_TABLE_OBJECT ),
+                DBA_RES( STR_NO_TABLE_OBJECT ),
                 *this,
                 0
             );
@@ -199,7 +198,7 @@ namespace sdbtools
                     found = true;
             if ( !found )
                 throw IllegalArgumentException(
-                    SdbtRes( STR_INVALID_COMPOSITION_TYPE ),
+                    DBA_RES( STR_INVALID_COMPOSITION_TYPE ),
                     nullptr,
                     0
                 );
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/inc/connectiondependent.hxx
index 37fb95b16588..37fb95b16588 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/inc/connectiondependent.hxx
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/inc/connectiontools.hxx
index 4eb9ed23354b..b4b6b727a8cf 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX
 #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX
 
-#include "module_sdbt.hxx"
-
 #include "connectiondependent.hxx"
 
 #include <com/sun/star/sdb/tools/XConnectionTools.hpp>
@@ -44,9 +42,6 @@ namespace sdbtools
     class ConnectionTools   :public ConnectionTools_Base
                             ,public ConnectionDependentComponent
     {
-    private:
-        SdbtClient                      m_aModuleClient;
-
     public:
         /** constructs a ConnectionTools instance
 
diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
deleted file mode 100644
index ae0dbe3ef783..000000000000
--- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
+++ /dev/null
@@ -1,38 +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 DBACCESS_SDBT_RESOURCE_HRC
-#define DBACCESS_SDBT_RESOURCE_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_SDBT_STRINGS_START                  RID_DBACCESS_START
-
-//- String-IDs
-#define STR_QUERY_AND_TABLE_DISTINCT_NAMES  RID_SDBT_STRINGS_START +  0
-#define STR_BASENAME_TABLE                  RID_SDBT_STRINGS_START +  1
-#define STR_BASENAME_QUERY                  RID_SDBT_STRINGS_START +  2
-#define STR_CONN_WITHOUT_QUERIES_OR_TABLES  RID_SDBT_STRINGS_START +  3
-#define STR_NO_TABLE_OBJECT                 RID_SDBT_STRINGS_START +  4
-#define STR_INVALID_COMPOSITION_TYPE        RID_SDBT_STRINGS_START +  5
-#define STR_INVALID_COMMAND_TYPE            RID_SDBT_STRINGS_START +  6
-
-#endif // DBACCESS_SDBT_RESOURCE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx
deleted file mode 100644
index d40ef6b96aff..000000000000
--- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx
+++ /dev/null
@@ -1,29 +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 "module_sdbt.hxx"
-
-namespace sdbtools
-{
-
-    IMPLEMENT_MODULE( SdbtModule, "sdbt" )
-
-} // namespace sdbtools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 65d438cc6b22..0f2edc74ab9b 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -17,34 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "module_sdbt.hxx"
-#include "sdbt_services.hxx"
+#include "connectiontools.hxx"
+#include <comphelper/componentmodule.hxx>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
 
-extern "C" void SAL_CALL sdbt_initializeModule()
-{
-    static bool s_bInit = false;
-    if (!s_bInit)
-    {
-        createRegistryInfo_ConnectionTools();
-        s_bInit = true;
-    }
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory(
-                    const sal_Char* pImplementationName,
-                    void* pServiceManager,
-                    void* /*pRegistryKey*/)
+                    const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*)
 {
-    sdbt_initializeModule();
-
     Reference< XInterface > xRet;
-    if (pServiceManager && pImplementationName)
+
+    if (sdbtools::ConnectionTools::getImplementationName_static() == OUString::createFromAscii(pImplementationName))
     {
-        xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory(
-            OUString::createFromAscii(pImplementationName));
+        xRet = ::cppu::createSingleComponentFactory(sdbtools::ConnectionTools::Create,
+                    sdbtools::ConnectionTools::getImplementationName_static(),
+                    sdbtools::ConnectionTools::getSupportedServiceNames_static(), nullptr);
     }
 
     if (xRet.is())
diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src
deleted file mode 100644
index 858c0d70633e..000000000000
--- a/dbaccess/source/sdbtools/resource/sdbt_strings.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 "sdbt_resource.hrc"
-
-String STR_QUERY_AND_TABLE_DISTINCT_NAMES
-{
-    Text [ en-US ] = "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table.";
-};
-
-String STR_BASENAME_TABLE
-{
-    Text [ en-US ] = "Table";
-};
-
-String STR_BASENAME_QUERY
-{
-    Text [ en-US ] = "Query";
-};
-
-String STR_CONN_WITHOUT_QUERIES_OR_TABLES
-{
-    Text [ en-US ] = "The given connection is no valid query and/or tables supplier.";
-};
-
-String STR_NO_TABLE_OBJECT
-{
-    Text [ en-US ] = "The given object is no table object.";
-};
-
-String STR_INVALID_COMPOSITION_TYPE
-{
-    Text [ en-US ] = "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType.";
-};
-
-String STR_INVALID_COMMAND_TYPE
-{
-    Text [ en-US ] = "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx
deleted file mode 100644
index d0fb5ead3a40..000000000000
--- a/dbaccess/source/shared/sdbtstrings.cxx
+++ /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 "sdbtstrings.hrc"
-
-namespace sdbtools
-{
-    #include "stringconstants.inc"
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx
deleted file mode 100644
index a6074fd5b0ae..000000000000
--- a/dbaccess/source/shared/xmlstrings.cxx
+++ /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 "xmlstrings.hrc"
-
-namespace dbaxml
-{
-#include "stringconstants.inc"
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index ef7070e2b720..402998f35920 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -19,7 +19,8 @@
 
 #include <memory>
 #include "AppController.hxx"
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include "advancedsettingsdlg.hxx"
 #include "subcomponentmanager.hxx"
 #include "uiservices.hxx"
@@ -109,7 +110,7 @@
 #include "AppView.hxx"
 #include "browserids.hxx"
 #include "dbu_reghelper.hxx"
-#include "dbu_app.hrc"
+#include "strings.hrc"
 #include "defaultobjectnamecheck.hxx"
 #include "databaseobjectview.hxx"
 #include "listviewitems.hxx"
@@ -864,7 +865,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
                     OUString sDSTypeName;
                     if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURL ) )
                     {
-                        sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) );
+                        sDSTypeName = DBA_RES(RID_STR_EMBEDDED_DATABASE);
                     }
                     else
                     {
@@ -2035,9 +2036,9 @@ void OApplicationController::renameEntry()
                         {
                             OUString sLabel;
                             if ( eType == E_FORM )
-                                sLabel = OUString(ModuleRes( STR_FRM_LABEL ));
+                                sLabel = DBA_RES(STR_FRM_LABEL);
                             else
-                                sLabel = OUString(ModuleRes( STR_RPT_LABEL ));
+                                sLabel = DBA_RES(STR_RPT_LABEL);
 
                             OUString sName = *aList.begin();
                             if ( xHNames->hasByHierarchicalName(sName) )
@@ -2134,7 +2135,7 @@ void OApplicationController::renameEntry()
                         }
                         catch(const ElementExistException& e)
                         {
-                            OUString sMsg( ModuleRes( STR_NAME_ALREADY_EXISTS ) );
+                            OUString sMsg(DBA_RES(STR_NAME_ALREADY_EXISTS));
                             showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, "S1000", 0, Any())));
                         }
                         catch(const Exception& )
@@ -2528,9 +2529,9 @@ void OApplicationController::OnFirstControllerConnected()
             return;
 
         SQLWarning aWarning;
-        aWarning.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS ) );
+        aWarning.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS);
         SQLException aDetail;
-        aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) );
+        aDetail.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS_DETAIL);
         aWarning.NextException <<= aDetail;
 
         Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) );
@@ -2767,7 +2768,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection )
             case DatabaseObjectContainer::REPORTS:
                 if ( eSelectedCategory != E_NONE )
                     throw IllegalArgumentException(
-                        ModuleRes(RID_STR_NO_DIFF_CAT),
+                        DBA_RES(RID_STR_NO_DIFF_CAT),
                         *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) );
                 eSelectedCategory =
                         ( pObject->Type == DatabaseObjectContainer::TABLES )  ? E_TABLE
@@ -2781,7 +2782,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection )
             case DatabaseObjectContainer::DATA_SOURCE:
             {
                 OUString sMessage(
-                        OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE)).
+                        DBA_RES(RID_STR_UNSUPPORTED_OBJECT_TYPE).
                     replaceFirst("$type$", OUString::number(pObject->Type)));
                 throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
             }
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 81323fd6e5e9..654f0c238c6a 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -26,7 +26,7 @@
 #include "dsntypes.hxx"
 #include <dbaccess/genericcontroller.hxx>
 #include "linkeddocuments.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "TableCopyHelper.hxx"
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -94,7 +94,7 @@ namespace dbaui
         css::uno::Reference< css::sdbc::XDatabaseMetaData >
                                 m_xMetaData;
 
-        OModuleClient           m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         TransferableDataHelper  m_aSystemClipboard;     // content of the clipboard
         css::uno::Reference< css::beans::XPropertySet >
                                 m_xDataSource;
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 14c12d0848bc..bf23714399c3 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -22,7 +22,8 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/processfactory.hxx>
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -55,7 +56,7 @@
 #include <svx/dbaobjectex.hxx>
 #include "browserids.hxx"
 #include "dbu_reghelper.hxx"
-#include "dbu_app.hrc"
+#include "strings.hrc"
 #include <vcl/menu.hxx>
 #include <comphelper/uno3.hxx>
 #include <vcl/svapp.hxx>
@@ -176,7 +177,7 @@ void OApplicationController::deleteTables(const std::vector< OUString>& _rList)
         }
         else
         {
-            OUString sMessage(ModuleRes(STR_MISSING_TABLES_XDROP));
+            OUString sMessage(DBA_RES(STR_MISSING_TABLES_XDROP));
             ScopedVclPtrInstance< MessageDialog > aError(getView(), sMessage);
             aError->Execute();
         }
@@ -345,7 +346,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL
     {
         SolarMutexGuard aSolarGuard;
 
-        OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+        OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE));
         sConnectingContext = sConnectingContext.replaceFirst("$name$", getStrippedDatabaseName());
 
         // do the connection *without* holding getMutex() to avoid deadlock
@@ -621,7 +622,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe
 
                     if ( sTargetName.isEmpty() )
                     {
-                        OUString sDefaultName = OUString( ModuleRes( STR_QRY_TITLE ) );
+                        OUString sDefaultName = DBA_RES(STR_QRY_TITLE);
                         sDefaultName = sDefaultName.getToken( 0, ' ' );
 
                         Reference< XNameAccess > xQueries( getQueryDefinitions(), UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index f1100dbb1c0e..28e0860c3b51 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -20,9 +20,10 @@
 #include "AppController.hxx"
 #include "AppDetailView.hxx"
 #include "AppView.hxx"
+#include "core_resource.hxx"
 #include "dbaccess_slotid.hrc"
-#include "dbu_app.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "stringconstants.hxx"
 #include "defaultobjectnamecheck.hxx"
 #include "dlgsave.hxx"
 #include "UITools.hxx"
@@ -104,7 +105,7 @@ void OApplicationController::convertToView(const OUString& _sName)
 
         Reference< XDatabaseMetaData  > xMeta = xConnection->getMetaData();
 
-        OUString aName = OUString(ModuleRes(STR_TBL_TITLE));
+        OUString aName = DBA_RES(STR_TBL_TITLE);
         aName = aName.getToken(0,' ');
         OUString aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName);
 
@@ -119,7 +120,7 @@ void OApplicationController::convertToView(const OUString& _sName)
                 ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) );
             Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
             if ( !xView.is() )
-                throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any());
+                throw SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any());
             getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
         }
     }
@@ -329,7 +330,7 @@ void SAL_CALL OApplicationController::connect(  )
             aError.doThrow();
 
         // no particular error, but nonetheless could not connect -> throw a generic exception
-        OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+        OUString sConnectingContext( DBA_RES( STR_COULDNOTCONNECT_DATASOURCE ) );
         ::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( "$name$", getStrippedDatabaseName() ), *this );
     }
 }
@@ -517,7 +518,7 @@ void OApplicationController::askToReconnect()
         bool bClear = true;
         if ( !m_pSubComponentManager->empty() )
         {
-            ScopedVclPtrInstance< MessageDialog > aQry(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo);
+            ScopedVclPtrInstance< MessageDialog > aQry(getView(), DBA_RES(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo);
             switch (aQry->Execute())
             {
                 case RET_YES:
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index f797da66b562..4f06cfc6a519 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "AppDetailPageHelper.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/dbtools.hxx>
@@ -52,10 +52,11 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include "AppView.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_app.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "callbacks.hxx"
 #include <dbaccess/IController.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "dbaccess_slotid.hrc"
 #include "databaseobjectview.hxx"
 #include "imageprovider.hxx"
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index eecaa2a59cdd..24a44f4411aa 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -20,7 +20,7 @@
 #include "AppDetailView.hxx"
 #include <osl/diagnose.h>
 #include "dbaccess_helpid.hrc"
-#include "dbu_app.hrc"
+#include "strings.hrc"
 #include "AppView.hxx"
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
@@ -29,6 +29,7 @@
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/util/URL.hpp>
+#include "core_resource.hxx"
 #include "listviewitems.hxx"
 #include <vcl/image.hxx>
 #include <vcl/mnemonic.hxx>
@@ -38,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include "callbacks.hxx"
 #include <dbaccess/IController.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "svtools/treelistentry.hxx"
 #include "svtools/viewdataentry.hxx"
 #include <algorithm>
@@ -62,10 +63,10 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
 #define SPACEBETWEENENTRIES     4
 
-TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled )
+TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* _pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled )
     :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
-    ,nHelpID( _nHelpID )
-    ,sTitle( ModuleRes( _nTitleResourceID ) )
+    ,pHelpID( _pHelpID )
+    ,sTitle( DBA_RES(pTitleResourceID) )
     ,bHideWhenDisabled( _bHideWhenDisabled )
 {
 }
@@ -295,10 +296,10 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry )
 
 void OCreationList::updateHelpText()
 {
-    sal_uInt16 nHelpTextId = 0;
+    const char* pHelpTextId = nullptr;
     if ( GetCurEntry() )
-        nHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
-    m_rTaskWindow.setHelpText( nHelpTextId );
+        pHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->pHelpID;
+    m_rTaskWindow.setHelpText(pHelpTextId);
 }
 
 void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const
@@ -351,7 +352,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai
     m_aCreation->SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
     m_aHelpText->SetHelpId(HID_APP_HELP_TEXT);
     m_aDescription->SetHelpId(HID_APP_DESCRIPTION_TEXT);
-    m_aDescription->SetText(ModuleRes(STR_DESCRIPTION));
+    m_aDescription->SetText(DBA_RES(STR_DESCRIPTION));
 
     Image aFolderImage = ImageProvider::getFolderImage( css::sdb::application::DatabaseObject::FORM );
     m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage );
@@ -414,11 +415,11 @@ void OTasksWindow::ImplInitSettings()
     m_aDescription->SetControlFont(aFont);
 }
 
-void OTasksWindow::setHelpText(sal_uInt16 _nId)
+void OTasksWindow::setHelpText(const char* pId)
 {
-    if ( _nId )
+    if (pId)
     {
-        OUString sText = ModuleRes(_nId);
+        OUString sText = DBA_RES(pId);
         m_aHelpText->SetText(sText);
     }
     else
@@ -432,7 +433,7 @@ IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry();
     if ( pEntry )
-        m_aHelpText->SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
+        m_aHelpText->SetText(DBA_RES(static_cast<TaskEntry*>(pEntry->GetUserData())->pHelpID));
 }
 
 void OTasksWindow::Resize()
@@ -522,8 +523,8 @@ void OTasksWindow::Clear()
 
 OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent )
     ,m_aHorzSplitter(VclPtr<Splitter>::Create(this))
-    ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL) )
-    ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this,0,WB_BORDER | WB_DIALOGCONTROL) )
+    ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this, STR_TASKS, WB_BORDER | WB_DIALOGCONTROL))
+    ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this, nullptr, WB_BORDER | WB_DIALOGCONTROL))
     ,m_rBorderWin(_rParent)
 {
     ImplInitSettings();
@@ -636,7 +637,7 @@ void OApplicationDetailView::impl_createPage( ElementType _eType, const Referenc
     bool bEnabled = !rData.aTasks.empty()
                 && getBorderWin().getView()->getCommandController().isCommandEnabled( rData.aTasks[0].sUNOCommand );
     getTasksWindow().Enable( bEnabled );
-    m_aContainer->setTitle( rData.nTitleId );
+    m_aContainer->setTitle(rData.pTitleId);
 
     // let our helper create the object list
     if ( _eType == E_TABLE )
@@ -672,26 +673,26 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane
         rList.push_back( TaskEntry( ".uno:DBNewTable", RID_STR_TABLES_HELP_TEXT_DESIGN, RID_STR_NEW_TABLE ) );
         rList.push_back( TaskEntry( ".uno:DBNewTableAutoPilot", RID_STR_TABLES_HELP_TEXT_WIZARD, RID_STR_NEW_TABLE_AUTO ) );
         rList.push_back( TaskEntry( ".uno:DBNewView", RID_STR_VIEWS_HELP_TEXT_DESIGN, RID_STR_NEW_VIEW, true ) );
-        _rData.nTitleId = RID_STR_TABLES_CONTAINER;
+        _rData.pTitleId = RID_STR_TABLES_CONTAINER;
         break;
 
     case E_FORM:
         rList.push_back( TaskEntry( ".uno:DBNewForm", RID_STR_FORMS_HELP_TEXT, RID_STR_NEW_FORM ) );
         rList.push_back( TaskEntry( ".uno:DBNewFormAutoPilot", RID_STR_FORMS_HELP_TEXT_WIZARD, RID_STR_NEW_FORM_AUTO ) );
-        _rData.nTitleId = RID_STR_FORMS_CONTAINER;
+        _rData.pTitleId = RID_STR_FORMS_CONTAINER;
         break;
 
     case E_REPORT:
         rList.push_back( TaskEntry( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT, RID_STR_NEW_REPORT, true ) );
         rList.push_back( TaskEntry( ".uno:DBNewReportAutoPilot", RID_STR_REPORTS_HELP_TEXT_WIZARD, RID_STR_NEW_REPORT_AUTO ) );
-        _rData.nTitleId = RID_STR_REPORTS_CONTAINER;
+        _rData.pTitleId = RID_STR_REPORTS_CONTAINER;
         break;
 
     case E_QUERY:
         rList.push_back( TaskEntry( ".uno:DBNewQuery", RID_STR_QUERIES_HELP_TEXT, RID_STR_NEW_QUERY ) );
         rList.push_back( TaskEntry( ".uno:DBNewQueryAutoPilot", RID_STR_QUERIES_HELP_TEXT_WIZARD, RID_STR_NEW_QUERY_AUTO ) );
         rList.push_back( TaskEntry( ".uno:DBNewQuerySql", RID_STR_QUERIES_HELP_TEXT_SQL, RID_STR_NEW_QUERY_SQL ) );
-        _rData.nTitleId = RID_STR_QUERIES_CONTAINER;
+        _rData.pTitleId = RID_STR_QUERIES_CONTAINER;
         break;
 
     default:
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 634ebadfabbd..09093e2d2d5d 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -89,14 +89,14 @@ namespace dbaui
     struct TaskEntry
     {
         OUString        sUNOCommand;
-        sal_uInt16      nHelpID;
+        const char*     pHelpID;
         OUString        sTitle;
         bool            bHideWhenDisabled;
             // TODO: we should be consistent in the task pane and the menus/toolbars:
             // If an entry is disabled in the latter, it should also be disabled in the former.
             // If an entry is *hidden* in the former, it should also be hidden in the latter.
 
-        TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false );
+        TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled = false );
     };
     typedef std::vector< TaskEntry >  TaskEntryList;
 
@@ -105,7 +105,7 @@ namespace dbaui
         /// the tasks available in the pane
         TaskEntryList   aTasks;
         /// the resource ID for the title of the pane
-        sal_uInt16          nTitleId;
+        const char*     pTitleId;
     };
 
     class OTasksWindow : public vcl::Window
@@ -139,7 +139,7 @@ namespace dbaui
         }
 
         void Clear();
-        void setHelpText(sal_uInt16 _nId);
+        void setHelpText(const char* pId);
     };
     class OApplicationDetailView : public OSplitterView
                                  , public IClipboardTest
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 23b9c3f28227..3fe62cb57912 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -19,8 +19,8 @@
 
 #include "AppIconControl.hxx"
 #include "dbaccess_helpid.hrc"
-#include "moduledbu.hxx"
-#include "dbu_app.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include <vcl/image.hxx>
 #include "callbacks.hxx"
@@ -38,7 +38,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
 
     const struct CategoryDescriptor
     {
-        sal_uInt16 nLabelResId;
+        const char* pLabelResId;
         ElementType eType;
         const char* aImageResId;
     }   aCategories[] = {
@@ -50,7 +50,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
     for (const CategoryDescriptor& aCategorie : aCategories)
     {
         SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
-            OUString( ModuleRes( aCategorie.nLabelResId ) ) ,
+            DBA_RES(aCategorie.pLabelResId) ,
             Image(BitmapEx(OUString::createFromAscii(aCategorie.aImageResId))));
         if ( pEntry )
             pEntry->SetUserData( new ElementType( aCategorie.eType ) );
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index f9953b6fcae2..96d546084358 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -19,7 +19,7 @@
 
 #include "AppSwapWindow.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_app.hrc"
+#include "strings.hrc"
 #include "AppView.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 2bdcea9299bf..f3769cb0f509 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -18,14 +18,14 @@
  */
 
 #include "AppTitleWindow.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
 namespace dbaui
 {
 
-OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift)
+OTitleWindow::OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift)
 : Window(_pParent,_nBits | WB_DIALOGCONTROL)
 , m_aSpace1(VclPtr<FixedText>::Create(this))
 , m_aSpace2(VclPtr<FixedText>::Create(this))
@@ -33,8 +33,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n
 , m_pChild(nullptr)
 , m_bShift(_bShift)
 {
-
-    setTitle(_nTitleId);
+    setTitle(pTitleId);
     SetBorderStyle(WindowBorderStyle::MONO);
     ImplInitSettings();
 
@@ -100,11 +99,11 @@ void OTitleWindow::Resize()
     }
 }
 
-void OTitleWindow::setTitle(sal_uInt16 _nTitleId)
+void OTitleWindow::setTitle(const char* pTitleId)
 {
-    if ( _nTitleId != 0 )
+    if (pTitleId)
     {
-        m_aTitle->SetText(ModuleRes(_nTitleId));
+        m_aTitle->SetText(DBA_RES(pTitleId));
     }
 }
 
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 491ebfd56912..c6a8d417df7f 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -34,7 +34,7 @@ namespace dbaui
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
     public:
-        OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
+        OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift = true);
         virtual ~OTitleWindow() override;
         virtual void dispose() override;
 
@@ -58,10 +58,10 @@ namespace dbaui
         vcl::Window* getChildWindow() const { return m_pChild; }
 
         /** sets the title text out of the resource
-            @param  _nTitleId
+            @param  pTitleId
                 The resource id of the title text.
         */
-        void setTitle(sal_uInt16 _nTitleId);
+        void setTitle(const char* pTitleId);
 
         /** Gets the min Width in Pixel which is needed to display the whole
 
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index c57c414464ba..6920cc05614f 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "AppView.hxx"
-#include "dbu_app.hrc"
+#include "strings.hrc"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "dbaccess_helpid.hrc"
@@ -39,7 +39,7 @@
 #include <vcl/settings.hxx>
 #include "AppTitleWindow.hxx"
 #include "dsntypes.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <dbaccess/IController.hxx>
 #include "browserids.hxx"
 #include <unotools/pathoptions.hxx>
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
deleted file mode 100644
index 82b118b0e801..000000000000
--- a/dbaccess/source/ui/app/app.src
+++ /dev/null
@@ -1,247 +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 "dbu_app.hrc"
-#include "browserids.hxx"
-#include "dbaccess_helpid.hrc"
-
-String RID_STR_NEW_FORM
-{
-    Text [ en-US ] = "Create Form in Design View..." ;
-};
-
-String RID_STR_NEW_FORM_AUTO
-{
-    Text [ en-US ] = "Use Wizard to Create Form..." ;
-};
-
-String RID_STR_NEW_REPORT_AUTO
-{
-    Text [ en-US ] = "Use Wizard to Create Report..." ;
-};
-
-String RID_STR_NEW_REPORT
-{
-    Text [ en-US ] = "Create Report in Design View..." ;
-};
-
-String RID_STR_NEW_QUERY
-{
-    Text [ en-US ] = "Create Query in Design View..." ;
-};
-
-String RID_STR_NEW_QUERY_SQL
-{
-    Text [ en-US ] = "Create Query in SQL View..." ;
-};
-
-String RID_STR_NEW_QUERY_AUTO
-{
-    Text [ en-US ] = "Use Wizard to Create Query..." ;
-};
-String RID_STR_NEW_TABLE
-{
-    Text [ en-US ] = "Create Table in Design View..." ;
-};
-
-String RID_STR_NEW_TABLE_AUTO
-{
-    Text [ en-US ] = "Use Wizard to Create Table..." ;
-};
-String RID_STR_NEW_VIEW
-{
-    Text [ en-US ] = "Create View..." ;
-};
-
-String RID_STR_FORMS_CONTAINER
-{
-    Text [ en-US ] = "Forms" ;
-};
-
-String RID_STR_REPORTS_CONTAINER
-{
-    Text [ en-US ] = "Reports" ;
-};
-
-String RID_STR_REPORTS_HELP_TEXT_WIZARD
-{
-    Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ;
-};
-
-String RID_STR_FORMS_HELP_TEXT
-{
-    Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ;
-};
-
-String RID_STR_REPORT_HELP_TEXT
-{
-    Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ;
-};
-
-String RID_STR_FORMS_HELP_TEXT_WIZARD
-{
-    Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ;
-};
-
-String RID_STR_QUERIES_HELP_TEXT
-{
-    Text [ en-US ] = "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." ;
-};
-
-String RID_STR_QUERIES_HELP_TEXT_SQL
-{
-    Text [ en-US ] = "Create a query by entering an SQL statement directly." ;
-};
-
-String RID_STR_QUERIES_HELP_TEXT_WIZARD
-{
-    Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ;
-};
-
-String RID_STR_TABLES_HELP_TEXT_DESIGN
-{
-    Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ;
-};
-
-String RID_STR_TABLES_HELP_TEXT_WIZARD
-{
-    Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ;
-};
-
-String RID_STR_VIEWS_HELP_TEXT_DESIGN
-{
-    Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ;
-};
-
-String STR_DATABASE
-{
-    Text [ en-US ] = "Database" ;
-};
-
-String STR_TASKS
-{
-    Text [ en-US ] = "Tasks" ;
-};
-
-String STR_DESCRIPTION
-{
-    Text [ en-US ] = "Description" ;
-};
-
-String STR_PREVIEW
-{
-    Text [ en-US ] = "Preview" ;
-};
-
-String STR_QUERY_CLOSEDOCUMENTS
-{
-    Text [ en-US ] = "The connection type has been altered.\nFor the changes to take effect, all forms, reports, queries and tables must be closed.\n\nDo you want to close all documents now?" ;
-};
-
-String RID_STR_FORM
-{
-    Text [ en-US ] = "Form";
-};
-
-String RID_STR_REPORT
-{
-    Text [ en-US ] = "Report";
-};
-
-String STR_FRM_LABEL
-{
-    Text [ en-US ] = "F~orm name" ;
-};
-
-String STR_RPT_LABEL
-{
-    Text [ en-US ] = "~Report name" ;
-};
-
-String STR_FOLDER_LABEL
-{
-    Text [ en-US ] = "F~older name" ;
-};
-
-String STR_SUB_DOCS_WITH_SCRIPTS
-{
-    Text [ en-US ] = "The document contains forms or reports with embedded macros.";
-};
-
-String STR_SUB_DOCS_WITH_SCRIPTS_DETAIL
-{
-    Text [ en-US ] = "Macros should be embedded into the database document itself.\n\n"
-
-                    "You can continue to use your document as before, however, you are encouraged to migrate "
-                    "your macros. The menu item 'Tools / Migrate Macros ...' will assist you with this.\n\n"
-
-                    "Note that you won't be able to embed macros into the database document itself until "
-                    "this migration is done. ";
-};
-
-String RID_STR_EMBEDDED_DATABASE
-{
-    Text [ en-US ] = "Embedded database";
-};
-
-String RID_STR_NO_DIFF_CAT
-{
-    Text [ en-US ] = "You cannot select different categories.";
-};
-
-String RID_STR_UNSUPPORTED_OBJECT_TYPE
-{
-    Text [ en-US ] = "Unsupported object type found ($type$).";
-};
-
-String STR_PAGETITLE_GENERAL
-{
-    Text [ en-US ] = "Advanced Properties" ;
-};
-
-String STR_PAGETITLE_ADVANCED
-{
-    Text [ en-US ] = "Additional Settings" ;
-};
-
-String STR_PAGETITLE_CONNECTION
-{
-    Text [ en-US ] = "Connection settings" ;
-};
-
-String STR_TBL_LABEL
-{
-    Text [ en-US ] = "~Table Name" ;
-};
-
-String STR_QRY_LABEL
-{
-    Text [ en-US ] = "~Query name" ;
-};
-
-String STR_TITLE_RENAME
-{
-    Text [ en-US ] = "Rename to";
-};
-
-String STR_TITLE_PASTE_AS
-{
-    Text [ en-US ] = "Insert as";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
deleted file mode 100644
index e0a894a3331f..000000000000
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ /dev/null
@@ -1,62 +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_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
-
-#include "dbu_resource.hrc"
-
-#define RID_STR_NEW_FORM                    RID_STR_APP_START
-#define RID_STR_NEW_FORM_AUTO               RID_STR_APP_START + 1
-#define RID_STR_NEW_REPORT                  RID_STR_APP_START + 2
-#define RID_STR_NEW_REPORT_AUTO             RID_STR_APP_START + 3
-#define RID_STR_NEW_TABLE                   RID_STR_APP_START + 4
-#define RID_STR_NEW_TABLE_AUTO              RID_STR_APP_START + 5
-#define RID_STR_NEW_VIEW                    RID_STR_APP_START + 6
-#define RID_STR_NEW_QUERY                   RID_STR_APP_START + 8
-#define RID_STR_NEW_QUERY_AUTO              RID_STR_APP_START + 9
-#define RID_STR_NEW_QUERY_SQL               RID_STR_APP_START + 12
-#define RID_STR_REPORTS_CONTAINER           RID_STR_APP_START + 13
-#define RID_STR_FORMS_CONTAINER             RID_STR_APP_START + 14
-#define RID_STR_REPORTS_HELP_TEXT_WIZARD    RID_STR_APP_START + 15
-#define RID_STR_FORMS_HELP_TEXT             RID_STR_APP_START + 16
-#define RID_STR_QUERIES_HELP_TEXT           RID_STR_APP_START + 17
-#define RID_STR_QUERIES_HELP_TEXT_SQL       RID_STR_APP_START + 18
-#define RID_STR_VIEWS_HELP_TEXT_DESIGN      RID_STR_APP_START + 19
-#define STR_DATABASE                        RID_STR_APP_START + 21
-#define STR_TASKS                           RID_STR_APP_START + 22
-#define STR_DESCRIPTION                     RID_STR_APP_START + 23
-#define STR_PREVIEW                         RID_STR_APP_START + 24
-#define RID_STR_QUERIES_HELP_TEXT_WIZARD    RID_STR_APP_START + 26
-#define RID_STR_TABLES_HELP_TEXT_DESIGN     RID_STR_APP_START + 27
-#define RID_STR_TABLES_HELP_TEXT_WIZARD     RID_STR_APP_START + 28
-#define RID_STR_FORMS_HELP_TEXT_WIZARD      RID_STR_APP_START + 29
-#define RID_STR_REPORT_HELP_TEXT            RID_STR_APP_START + 30
-#define RID_STR_EMBEDDED_DATABASE           RID_STR_APP_START + 31
-#define RID_STR_NO_DIFF_CAT                 RID_STR_APP_START + 32
-#define RID_STR_UNSUPPORTED_OBJECT_TYPE     RID_STR_APP_START + 33
-
-// please adjust checking before insert new strings
-
-#if RID_STR_UNSUPPORTED_OBJECT_TYPE > RID_STR_APP_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index bb66c221b918..d74ea7192273 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -19,7 +19,8 @@
 
 #include "subcomponentmanager.hxx"
 #include "AppController.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 4256ff2f36c1..b3e7ba256657 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -20,8 +20,10 @@
 #include "browserids.hxx"
 #include "brwctrlr.hxx"
 #include "brwview.hxx"
-#include "dbu_brw.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include "queryfilter.hxx"
 #include "queryorder.hxx"
 #include "sqlmessage.hxx"
@@ -536,8 +538,8 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::
     ,m_nRowSetPrivileges(0)
     ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus))
     ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) )
-    ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD))
-    ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD))
+    ,m_sStateSaveRecord(DBA_RES(RID_STR_SAVE_CURRENT_RECORD))
+    ,m_sStateUndoRecord(DBA_RES(RID_STR_UNDO_MODIFY_RECORD))
     ,m_sModuleIdentifier( OUString( "com.sun.star.sdb.DataSourceBrowser" ) )
     ,m_pFormControllerImpl(nullptr)
     ,m_nFormActionNestingLevel(0)
@@ -751,7 +753,7 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent)
     // marry them
     Reference< css::container::XNameContainer >  xNameCont(m_xRowSet, UNO_QUERY);
     {
-        OUString sText(ModuleRes(STR_DATASOURCE_GRIDCONTROL_NAME));
+        OUString sText(DBA_RES(STR_DATASOURCE_GRIDCONTROL_NAME));
         xNameCont->insertByName(sText, makeAny(m_xGridModel));
     }
 
@@ -1371,7 +1373,7 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent)
 
 sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/)
 {
-    if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES)
+    if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), DBA_RES(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES)
         return false;
 
     return true;
@@ -1983,7 +1985,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
             HANDLE_SQL_ERRORS(
                 xParser->setOrder(OUString()); xParser->appendOrderByColumn(xField, bSortUp),
                 bParserSuccess,
-                ModuleRes(SBA_BROWSER_SETTING_ORDER),
+                DBA_RES(SBA_BROWSER_SETTING_ORDER),
                 "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
             )
 
@@ -2040,7 +2042,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
                 HANDLE_SQL_ERRORS(
                     xParser->appendHavingClauseByColumn(xField,true,nOp),
                     bParserSuccess,
-                    ModuleRes(SBA_BROWSER_SETTING_FILTER),
+                    DBA_RES(SBA_BROWSER_SETTING_FILTER),
                     "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
                 )
             }
@@ -2049,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
                 HANDLE_SQL_ERRORS(
                     xParser->appendFilterByColumn(xField,true,nOp),
                     bParserSuccess,
-                    ModuleRes(SBA_BROWSER_SETTING_FILTER),
+                    DBA_RES(SBA_BROWSER_SETTING_FILTER),
                     "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
                 )
             }
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index fee1b1ab6932..1be565799a11 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -24,8 +24,9 @@
 #include <comphelper/types.hxx>
 #include <vcl/split.hxx>
 #include "dbtreeview.hxx"
-#include "dbustrings.hrc"
-#include "dbu_brw.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index e744a20b6a07..e8cf07c36eb1 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
 #include "TokenWriter.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/uno3.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 7415e3a10698..b56ecf9318c3 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "dbu_reghelper.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "uiservices.hxx"
 #include "UITools.hxx"
 
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index f955010eaff9..a81d475b0a98 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dbtreemodel.hxx"
-#include "dbu_resource.hrc"
+#include "dbu_pageids.hxx"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 367023fa4be6..f65391f910b9 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -28,7 +28,7 @@
 #include <osl/diagnose.h>
 #include "dbtreeview.hxx"
 #include "dbtreelistbox.hxx"
-#include "dbu_brw.hrc"
+#include "strings.hrc"
 #include "dbtreemodel.hxx"
 #include "svtools/treelistentry.hxx"
 
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index bcdb8cb216e8..850d514d2157 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -21,8 +21,8 @@
 #include "dbtreelistbox.hxx"
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
-#include "dbu_brw.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "stringconstants.hxx"
 #include "QEnumTypes.hxx"
 #include "UITools.hxx"
 #include "unodatbr.hxx"
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 19832f26930a..8bbd503f2293 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -26,7 +26,8 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include "formadapter.hxx"
 #include <comphelper/processfactory.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "dbu_reghelper.hxx"
 #include <o3tl/any.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index d3cd39a7e1ed..8122b7cef908 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -23,8 +23,9 @@
 #include <comphelper/enumhelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "dbu_brw.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d95fd67d0fae..576289f3fb42 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -26,7 +26,7 @@
 #include <dbaccess/dataview.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <vcl/stdtext.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
deleted file mode 100644
index 2171873f2bd8..000000000000
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ /dev/null
@@ -1,103 +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 "dbaccess_helpid.hrc"
-#include "dbu_brw.hrc"
-#include "browserids.hxx"
-
-String STR_QUERY_BRW_DELETE_ROWS
-{
-    Text[ en-US ] = "Do you want to delete the selected data?" ;
-};
-
-String SBA_BROWSER_SETTING_ORDER
-{
-    Text [ en-US ] = "Error setting the sort criteria";
-};
-
-String SBA_BROWSER_SETTING_FILTER
-{
-    Text [ en-US ] = "Error setting the filter criteria";
-};
-
-String RID_STR_CONNECTION_LOST
-{
-    Text [ en-US ] = "Connection lost";
-};
-
-String RID_STR_QUERIES_CONTAINER
-{
-    Text [ en-US ] = "Queries";
-};
-
-String RID_STR_TABLES_CONTAINER
-{
-    Text [ en-US ] = "Tables";
-};
-
-String STR_TITLE_CONFIRM_DELETION
-{
-    Text [ en-US ] = "Confirm Deletion" ;
-};
-
-String STR_QUERY_DELETE_TABLE
-{
-    Text [ en-US ] = "Do you want to delete the table '%1'?" ;
-};
-
-String STR_QUERY_CONNECTION_LOST
-{
-    Text [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ;
-};
-
-String STR_OPENTABLES_WARNINGS
-{
-    Text [ en-US ] = "Warnings encountered";
-};
-
-String STR_OPENTABLES_WARNINGS_DETAILS
-{
-    Text [ en-US ] = "While retrieving the tables, warnings were reported by the database connection.";
-};
-
-String STR_CONNECTING_DATASOURCE
-{
-    Text [ en-US ] = "Connecting to \"$name$\" ...";
-};
-
-String STR_LOADING_QUERY
-{
-    Text [ en-US ] = "Loading query $name$ ...";
-};
-
-String STR_LOADING_TABLE
-{
-    Text [ en-US ] = "Loading table $name$ ...";
-};
-
-String STR_NO_TABLE_FORMAT_INSIDE
-{
-    Text [ en-US ] = "No table format could be found." ;
-};
-
-String STR_COULDNOTCONNECT_DATASOURCE
-{
-    Text [ en-US ] = "The connection to the data source \"$name$\" could not be established.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index f40df7404bdd..3aa1b9237f56 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "sbagrid.hrc"
+#include "core_resource.hxx"
 #include "dbaccess_helpid.hrc"
 #include "uiservices.hxx"
 
@@ -70,9 +71,10 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <vcl/msgbox.hxx>
-#include "dbu_brw.hrc"
 #include "browserids.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "dbu_reghelper.hxx"
 #include "dbexchange.hxx"
 #include "TableRowExchange.hxx"
@@ -666,13 +668,13 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
             case DataType::REF:
                 break;
             default:
-                rMenu.InsertItem(ID_BROWSER_COLATTRSET, ModuleRes(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++);
+                rMenu.InsertItem(ID_BROWSER_COLATTRSET, DBA_RES(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++);
                 rMenu.SetHelpId(ID_BROWSER_COLATTRSET, HID_BROWSER_COLUMNFORMAT);
                 rMenu.InsertSeparator(OString(), nPos++);
             }
         }
 
-        rMenu.InsertItem(ID_BROWSER_COLWIDTH, ModuleRes(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++);
+        rMenu.InsertItem(ID_BROWSER_COLWIDTH, DBA_RES(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++);
         rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH);
         rMenu.InsertSeparator(OString(), nPos++);
     }
@@ -751,17 +753,17 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu)
 
     if (!IsReadOnlyDB())
     {
-        rMenu.InsertItem(ID_BROWSER_TABLEATTR, ModuleRes(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++);
+        rMenu.InsertItem(ID_BROWSER_TABLEATTR, DBA_RES(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++);
         rMenu.SetHelpId(ID_BROWSER_TABLEATTR, HID_BROWSER_TABLEFORMAT);
 
-        rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, ModuleRes(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++);
+        rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, DBA_RES(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++);
         rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, HID_BROWSER_ROWHEIGHT);
         rMenu.InsertSeparator(OString(), nPos++);
     }
 
     if ( GetSelectRowCount() > 0 )
     {
-        rMenu.InsertItem(ID_BROWSER_COPY, ModuleRes(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++);
+        rMenu.InsertItem(ID_BROWSER_COPY, DBA_RES(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++);
         rMenu.InsertSeparator(OString(), nPos++);
     }
 }
@@ -1425,7 +1427,7 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void)
                 m_pMasterListener->BeforeDrop();
             if(!pImExport->Read())
             {
-                OUString sError = OUString(ModuleRes(STR_NO_COLUMNNAME_MATCHING));
+                OUString sError = DBA_RES(STR_NO_COLUMNNAME_MATCHING);
                 throwGenericSQLException(sError,nullptr);
             }
             if (m_pMasterListener)
@@ -1458,7 +1460,7 @@ OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowse
     if ( ::svt::BBTYPE_BROWSEBOX == eObjType )
     {
         SolarMutexGuard aGuard;
-        sRet = OUString(ModuleRes(STR_DATASOURCE_GRIDCONTROL_DESC));
+        sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC);
     }
     else
         sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition);
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
deleted file mode 100644
index a54584007f4e..000000000000
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ /dev/null
@@ -1,98 +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 "dbu_brw.hrc"
-#include "dbaccess_helpid.hrc"
-#include "browserids.hxx"
-
-String RID_STR_COLUMN_FORMAT
-{
-    Text [ en-US ] = "Column ~Format...";
-};
-
-String RID_STR_COLUMN_WIDTH
-{
-    Text [ en-US ] = "Column ~Width...";
-};
-
-String RID_STR_TABLE_FORMAT
-{
-    Text [ en-US ] = "Table Format...";
-};
-
-String RID_STR_ROW_HEIGHT
-{
-    Text [ en-US ] = "Row Height...";
-};
-
-String RID_STR_COPY
-{
-    Text [ en-US ] = "~Copy";
-};
-
-String RID_STR_UNDO_MODIFY_RECORD
-{
-    Text [ en-US ] = "Undo: Data Input";
-};
-
-String RID_STR_SAVE_CURRENT_RECORD
-{
-    Text [ en-US ] = "Save current record";
-};
-
-String STR_QRY_TITLE
-{
-    Text [ en-US ] = "Query #" ;
-};
-
-String STR_TBL_TITLE
-{
-    Text [ en-US ] = "Table #" ;
-};
-
-String STR_VIEW_TITLE
-{
-    Text [ en-US ] = "View #" ;
-};
-
-String STR_NAME_ALREADY_EXISTS
-{
-    Text [ en-US ] = "The name \"#\" already exists.";
-};
-
-String STR_NO_COLUMNNAME_MATCHING
-{
-    Text [ en-US ] = "No matching column names were found.";
-};
-
-String STR_ERROR_OCCURRED_WHILE_COPYING
-{
-    Text [ en-US ] = "An error occurred. Do you want to continue copying?";
-};
-
-String STR_DATASOURCE_GRIDCONTROL_NAME
-{
-    Text [ en-US ] = "Data source table view";
-};
-
-String STR_DATASOURCE_GRIDCONTROL_DESC
-{
-    Text [ en-US ] = "Shows the selected table or query.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9d456cc11204..68cecb3f0cd5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -18,14 +18,15 @@
  */
 
 #include "browserids.hxx"
+#include "core_resource.hxx"
 #include "dbaccess_helpid.hrc"
 #include "dbexchange.hxx"
 #include "dbtreelistbox.hxx"
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
-#include "dbu_brw.hrc"
 #include "dbu_reghelper.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
 #include "dlgsave.hxx"
 #include "uiservices.hxx"
 #include "HtmlReader.hxx"
@@ -1776,10 +1777,10 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
                     switch (nCommandType)
                     {
                         case CommandType::TABLE:
-                            sTitle = OUString(ModuleRes(STR_TBL_TITLE)); break;
+                            sTitle = DBA_RES(STR_TBL_TITLE); break;
                         case CommandType::QUERY:
                         case CommandType::COMMAND:
-                            sTitle = OUString(ModuleRes(STR_QRY_TITLE)); break;
+                            sTitle = DBA_RES(STR_QRY_TITLE); break;
                         default:
                             SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: unknown command type!");
                     }
@@ -2026,9 +2027,9 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r
     SolarMutexGuard aGuard;
     // initialize the names/images if necessary
     if (_rQueryName.isEmpty())
-        _rQueryName = OUString(ModuleRes(RID_STR_QUERIES_CONTAINER));
+        _rQueryName = DBA_RES(RID_STR_QUERIES_CONTAINER);
     if (_rTableName.isEmpty())
-        _rTableName = OUString(ModuleRes(RID_STR_TABLES_CONTAINER));
+        _rTableName = DBA_RES(RID_STR_TABLES_CONTAINER);
 
     ImageProvider aImageProvider;
     if (!_rQueryImage)
@@ -2202,8 +2203,8 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool)
                     if (aWarnings.isValid() && sal_False)
                     {
                         SQLContext aContext;
-                        aContext.Message = String(ModuleRes(STR_OPENTABLES_WARNINGS));
-                        aContext.Details = String(ModuleRes(STR_OPENTABLES_WARNINGS_DETAILS));
+                        aContext.Message = DBA_RES(STR_OPENTABLES_WARNINGS);
+                        aContext.Details = DBA_RES(STR_OPENTABLES_WARNINGS_DETAILS);
                         aContext.NextException = aWarnings.get();
                         aWarnings = aContext;
                         showError(aWarnings);
@@ -2613,7 +2614,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
                     }
                     break;
             }
-            OUString sStatus(ModuleRes( CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY ));
+            OUString sStatus(DBA_RES(CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY));
             sStatus = sStatus.replaceFirst("$name$", aName);
             BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sStatus);
 
@@ -3316,12 +3317,12 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p
         if ( !_rConnection.is() && pTreeListData )
         {
             // show the "connecting to ..." status
-            OUString sConnecting(ModuleRes(STR_CONNECTING_DATASOURCE));
+            OUString sConnecting(DBA_RES(STR_CONNECTING_DATASOURCE));
             sConnecting = sConnecting.replaceFirst("$name$", aDSName);
             BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sConnecting);
 
             // build a string showing context information in case of error
-            OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+            OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE));
             sConnectingContext = sConnectingContext.replaceFirst("$name$", aDSName);
 
             // connect
@@ -3358,9 +3359,9 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortDa
         const OUString sLeft = m_pTreeView->getListBox().GetEntryText(const_cast<SvTreeListEntry*>(pLHS));
 
         EntryType eLeft = etTableContainer;
-        if (OUString(ModuleRes(RID_STR_TABLES_CONTAINER)) == sLeft)
+        if (DBA_RES(RID_STR_TABLES_CONTAINER) == sLeft)
             eLeft = etTableContainer;
-        else if (OUString(ModuleRes(RID_STR_QUERIES_CONTAINER)) == sLeft)
+        else if (DBA_RES(RID_STR_QUERIES_CONTAINER) == sLeft)
             eLeft = etQueryContainer;
 
         if ( eLeft == eRight )
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index c3a1bb3af524..5c7599bc3ccf 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -22,7 +22,9 @@
 #include <unotools/syslocale.hxx>
 #include <connectivity/dbtools.hxx>
 #include "UITools.hxx"
-#include "dbu_resource.hrc"
+#include "core_resource.hxx"
+#include "dbu_pageids.hxx"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/util/NumberFormatter.hpp>
 
@@ -39,7 +41,7 @@ OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
                                            ,const Reference<XComponentContext>& _rxContext)
             : OFieldDescControl(pParent,nullptr)
             , m_xContext(_rxContext)
-            , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
+            , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
             , m_bAutoIncrementEnabled(true)
 {
 
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
index e827fccdda3a..c2b8ee260375 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -19,6 +19,7 @@
 
 #include "FieldControls.hxx"
 #include "SqlNameEdit.hxx"
+#include "core_resource.hxx"
 
 #include <vcl/settings.hxx>
 
@@ -38,20 +39,20 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin )
 
 OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent,
                                                 rtl::OUString& _rAllowedChars,
-                                                sal_uInt16 nHelpId,
+                                                const char* pHelpId,
                                                 short nPosition,
                                                 WinBits nWinStyle)
     :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars)
     ,m_nPos(nPosition)
 {
-    m_strHelpText = ModuleRes(nHelpId);
+    m_strHelpText = DBA_RES(pHelpId);
 }
 
-OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle)
     :Edit(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
-    m_strHelpText = ModuleRes(nHelpId);
+    m_strHelpText = DBA_RES(pHelpId);
 }
 
 void
@@ -62,18 +63,18 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
 }
 
 
-OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle)
     :NumericField(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
-    m_strHelpText = ModuleRes(nHelpId);
+    m_strHelpText = DBA_RES(pHelpId);
 }
 
-OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle)
     :ListBox(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
-    m_strHelpText = ModuleRes(nHelpId);
+    m_strHelpText = DBA_RES(pHelpId);
 }
 
 } // end namespace dbaui
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index f8ef35fb9650..2a984fa65bae 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "FieldDescControl.hxx"
 #include "FieldControls.hxx"
 #include <tools/diagnose_ex.h>
@@ -50,8 +51,7 @@
 #include <comphelper/numbers.hxx>
 #include <comphelper/string.hxx>
 #include "UITools.hxx"
-#include "dbu_control.hrc"
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
 #include <osl/diagnose.h>
 
 using namespace dbaui;
@@ -124,8 +124,8 @@ OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar*
     ,m_pHorzScroll( nullptr )
     ,m_pPreviousType()
     ,m_nPos(-1)
-    ,aYes(ModuleRes(STR_VALUE_YES))
-    ,aNo(ModuleRes(STR_VALUE_NO))
+    ,aYes(DBA_RES(STR_VALUE_YES))
+    ,aNo(DBA_RES(STR_VALUE_NO))
     ,m_nOldVThumb( 0 )
     ,m_nOldHThumb( 0 )
     ,m_nWidth(50)
@@ -232,7 +232,7 @@ OUString OFieldDescControl::BoolStringUI(const OUString& rPersistentString) cons
     if (rPersistentString == "1")
         return aYes;
 
-    return ModuleRes(STR_VALUE_NONE);
+    return DBA_RES(STR_VALUE_NONE);
 }
 
 void OFieldDescControl::Init()
@@ -581,7 +581,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void )
 
         if(pRequired->GetSelectEntryPos() == 0) // Yes
         {
-            pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE)));
+            pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE));
             if (sDef != aYes && sDef != aNo)
                 pBoolDefault->SelectEntryPos(1);  // No as a default
             else
@@ -589,7 +589,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void )
         }
         else if(pBoolDefault->GetEntryCount() < 3)
         {
-            pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE)));
+            pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE));
             pBoolDefault->SelectEntry(sDef);
         }
     }
@@ -869,7 +869,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
             InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false);
 
             pFormat = VclPtr<PushButton>::Create(this, WB_TABSTOP);
-            pFormat->SetText(ModuleRes(STR_BUTTON_FORMAT));
+            pFormat->SetText(DBA_RES(STR_BUTTON_FORMAT));
             const sal_Int32 nControlHeight = GetMaxControlHeight();
             pFormat->SetSizePixel(Size(nControlHeight, nControlHeight));
             pFormat->SetClickHdl( LINK( this, OFieldDescControl, FormatClickHdl ) );
@@ -887,7 +887,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
         pBoolDefaultText = CreateText(STR_DEFAULT_VALUE);
         pBoolDefault = VclPtr<OPropListBoxCtrl>::Create( this, STR_HELP_BOOL_DEFAULT, FIELD_PROPERTY_BOOL_DEFAULT, WB_DROPDOWN );
         pBoolDefault->SetDropDownLineCount(3);
-        pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE)));
+        pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE));
         pBoolDefault->InsertEntry(aYes);
         pBoolDefault->InsertEntry(aNo);
 
@@ -907,17 +907,17 @@ void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHe
     _pControl->EnableClipSiblings();
 }
 
-VclPtr<FixedText> OFieldDescControl::CreateText(sal_uInt16 _nTextRes)
+VclPtr<FixedText> OFieldDescControl::CreateText(const char* pTextRes)
 {
     VclPtrInstance<FixedText> pFixedText( this );
-    pFixedText->SetText( ModuleRes(_nTextRes) );
+    pFixedText->SetText(DBA_RES(pTextRes));
     pFixedText->EnableClipSiblings();
     return pFixedText;
 }
 
-VclPtr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId)
+VclPtr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId)
 {
-    VclPtrInstance<OPropNumericEditCtrl> pControl( this, _nHelpStr, _nProperty, WB_BORDER );
+    VclPtrInstance<OPropNumericEditCtrl> pControl(this, pHelpId, _nProperty, WB_BORDER);
     pControl->SetDecimalDigits(0);
     pControl->SetMin(0);
     pControl->SetMax(0x7FFFFFFF);   // Should be changed outside, if needed
@@ -1296,7 +1296,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         {
             pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // The type says so
 
-            pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE)));
+            pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE));
             if ( sDef != aYes && sDef != aNo )
                 pBoolDefault->SelectEntryPos(1);  // No as a default
             else
@@ -1306,7 +1306,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
         }
         else if(pBoolDefault->GetEntryCount() < 3)
         {
-            pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE)));
+            pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE));
             pBoolDefault->SelectEntry(sDef);
         }
         else
@@ -1413,7 +1413,7 @@ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control&, rControl, void )
     }
 
     if (&rControl == pFormat)
-        strHelpText = ModuleRes(STR_HELP_FORMAT_BUTTON);
+        strHelpText = DBA_RES(STR_HELP_FORMAT_BUTTON);
 
     if (!strHelpText.isEmpty() && (pHelp != nullptr))
         pHelp->SetHelpText(strHelpText);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 0874d383086c..15c1ce6a6ab2 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "RelControliFace.hxx"
-#include "dbu_control.hrc"
+#include "strings.hrc"
 #include "dbaccess_helpid.hrc"
 #include <osl/diagnose.h>
 
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 91cd2b3c64b3..00b15258a9e6 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -18,12 +18,13 @@
  */
 
 #include "TableGrantCtrl.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
-#include "dbu_control.hrc"
+#include "strings.hrc"
 #include "UITools.hxx"
 
 using namespace ::com::sun::star::accessibility;
@@ -54,15 +55,15 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)
 {
     // insert columns
     sal_uInt16 i=1;
-    InsertDataColumn( i, OUString(ModuleRes(STR_TABLE_PRIV_NAME)  ), 75);
+    InsertDataColumn( i, DBA_RES(STR_TABLE_PRIV_NAME), 75);
     FreezeColumn(i++);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_SELECT)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_INSERT)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DELETE)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_UPDATE)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_ALTER)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_REFERENCE)), 75);
-    InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DROP)), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_SELECT), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_INSERT), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DELETE), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_UPDATE), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_ALTER), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_REFERENCE), 75);
+    InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DROP), 75);
 
     while(--i)
         SetColumnWidth(i,GetAutoColumnWidth(i));
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
deleted file mode 100644
index 5073d49b94e1..000000000000
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ /dev/null
@@ -1,62 +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 "dbu_control.hrc"
-
-String STR_TABLE_PRIV_NAME
-{
-    Text [ en-US ] = "Table name";
-};
-
-String STR_TABLE_PRIV_INSERT
-{
-    Text [ en-US ] = "Insert data";
-};
-
-String STR_TABLE_PRIV_DELETE
-{
-    Text [ en-US ] = "Delete data";
-};
-
-String STR_TABLE_PRIV_UPDATE
-{
-    Text [ en-US ] = "Modify data";
-};
-
-String STR_TABLE_PRIV_ALTER
-{
-    Text [ en-US ] = "Alter structure";
-};
-
-String STR_TABLE_PRIV_SELECT
-{
-    Text [ en-US ] = "Read data";
-};
-
-String STR_TABLE_PRIV_REFERENCE
-{
-    Text [ en-US ] = "Modify references";
-};
-
-String STR_TABLE_PRIV_DROP
-{
-    Text [ en-US ] = "Drop structure";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 2553ed8c9aed..1d0b31fc5601 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dbtreelistbox.hxx"
-#include "dbu_resource.hrc"
+#include "dbu_pageids.hxx"
 #include "browserids.hxx"
 #include "listviewitems.hxx"
 #include "callbacks.hxx"
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 5f4abcd8261c..b9827df00949 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "marktree.hxx"
-#include "dbu_control.hrc"
+#include "strings.hrc"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 6cdab2604fde..2033702c67d9 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "tabletree.hxx"
 #include "imageprovider.hxx"
-#include "moduledbu.hxx"
-#include "dbu_control.hrc"
+#include "strings.hrc"
 #include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/builderfactory.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
@@ -141,7 +141,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
     try
     {
         Reference< XTablesSupplier > xTableSupp( _rxConnection, UNO_QUERY_THROW );
-        sCurrentActionError = ModuleRes(STR_NOTABLEINFO);
+        sCurrentActionError = DBA_RES(STR_NOTABLEINFO);
 
         Reference< XNameAccess > xTables,xViews;
 
@@ -251,12 +251,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
             OUString sRootEntryText;
             if ( std::none_of(_rTables.begin(),_rTables.end(),
                                 [] (const TNames::value_type& name) { return !name.second; }) )
-                sRootEntryText  = ModuleRes(STR_ALL_TABLES);
+                sRootEntryText  = DBA_RES(STR_ALL_TABLES);
             else if ( std::none_of(_rTables.begin(),_rTables.end(),
                                      [] (const TNames::value_type& name) { return name.second; }) )
-                sRootEntryText  = ModuleRes(STR_ALL_VIEWS);
+                sRootEntryText  = DBA_RES(STR_ALL_VIEWS);
             else
-                sRootEntryText  = ModuleRes(STR_ALL_TABLES_AND_VIEWS);
+                sRootEntryText  = DBA_RES(STR_ALL_TABLES_AND_VIEWS);
             InsertEntry( sRootEntryText, nullptr, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
         }
 
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
deleted file mode 100644
index 6657dd0ef9c9..000000000000
--- a/dbaccess/source/ui/control/tabletree.src
+++ /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/.
- *
- * 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 "dbu_control.hrc"
-#include "browserids.hxx"
-
-String STR_COULDNOTCREATE_DRIVERMANAGER
-{
-    Text [ en-US ] = "Cannot connect to the SDBC driver manager (#servicename#).";
-};
-
-String STR_NOREGISTEREDDRIVER
-{
-    Text [ en-US ] = "A driver is not registered for the URL #connurl#.";
-};
-
-String STR_NOTABLEINFO
-{
-    Text [ en-US ] = "Successfully connected, but information about database tables is not available.";
-};
-
-String STR_ALL_TABLES
-{
-    Text [ en-US ] = "All tables";
-};
-
-String STR_ALL_VIEWS
-{
-    Text [ en-US ] = "All views";
-};
-
-String STR_ALL_TABLES_AND_VIEWS
-{
-    Text [ en-US ] = "All tables and views";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
deleted file mode 100644
index f63ff3275705..000000000000
--- a/dbaccess/source/ui/control/undosqledit.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 "dbu_control.hrc"
-
-String STR_QUERY_UNDO_MODIFYSQLEDIT
-{
-    Text [ en-US ] = "Modify SQL statement(s)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
deleted file mode 100644
index c6539edc6f66..000000000000
--- a/dbaccess/source/ui/dlg/AutoControls.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 "dbu_dlg.hrc"
-
-String STR_DBASE_PATH_OR_FILE
-{
-    Text[ en-US ] = "Path to the dBASE files";
-};
-
-String STR_FLAT_PATH_OR_FILE
-{
-    Text[ en-US ] = "Path to the text files";
-};
-
-String STR_CALC_PATH_OR_FILE
-{
-    Text[ en-US ] = "Path to the spreadsheet document";
-};
-
-String STR_WRITER_PATH_OR_FILE
-{
-    Text[ en-US ] = "Path to the Writer document";
-};
-
-String STR_NAME_OF_ODBC_DATASOURCE
-{
-    Text[ en-US ] = "Name of the ODBC data source on your system";
-};
-
-String STR_MYSQL_DATABASE_NAME
-{
-    Text[ en-US ] = "Name of the MySQL database";
-};
-
-String STR_ORACLE_DATABASE_NAME
-{
-    Text[ en-US ] = "Name of the Oracle database";
-};
-
-String STR_MSACCESS_MDB_FILE
-{
-    Text[ en-US ] = "Microsoft Access database file";
-};
-
-String STR_NO_ADDITIONAL_SETTINGS
-{
-    Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button.";
-};
-
-String STR_COMMONURL
-{
-    Text [ en-US ] = "Datasource URL (e.g. postgresql://host:port/database)" ;
-};
-
-String STR_HOSTNAME
-{
-    Text[ en-US ] = "~Host name";
-};
-
-String STR_MOZILLA_PROFILE_NAME
-{
-    Text[ en-US ] = "~Mozilla profile name";
-};
-
-String STR_THUNDERBIRD_PROFILE_NAME
-{
-    Text[ en-US ] = "~Thunderbird profile name";
-};
-
-String STR_ADD_TABLES
-{
-    Text [ en-US ] = "Add Tables";
-};
-
-String STR_ADD_TABLE_OR_QUERY
-{
-    Text [ en-US ] = "Add Table or Query" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 019cb59cabf7..0d92a221646a 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -20,18 +20,20 @@
 #include "CollectionView.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "moduledbu.hxx"
-#include "dbu_dlg.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 #include <comphelper/interaction.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include "core_resource.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/msgbox.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "bitmaps.hlst"
 #include "UITools.hxx"
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
@@ -179,7 +181,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void)
         {
             if ( xNameContainer->hasByName(sName) )
             {
-                ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
+                ScopedVclPtrInstance< QueryBox > aBox(this, WB_YES_NO, DBA_RES(STR_ALREADYEXISTOVERWRITE));
                 if ( aBox->Execute() != RET_YES )
                     return;
             }
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index d6b535a0cd13..5e83545acfda 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -17,10 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "dsnItem.hxx"
 #include "ConnectionHelper.hxx"
-#include "dbu_dlg.hrc"
-#include "dbu_misc.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <sfx2/fcontnr.hxx>
@@ -30,7 +31,7 @@
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
 #include "dbaccess_helpid.hrc"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
@@ -42,7 +43,7 @@
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -238,7 +239,7 @@ namespace dbaui
             case  ::dbaccess::DST_MSACCESS:
             {
                 const OUString sExt("*.mdb;*.mde");
-                OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
+                OUString sFilterName(DBA_RES (STR_MSACCESS_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
                 aFileDlg.AddFilter(sFilterName,sExt);
@@ -249,7 +250,7 @@ namespace dbaui
             case  ::dbaccess::DST_MSACCESS_2007:
             {
                 const OUString sAccdb("*.accdb;*.accde");
-                OUString sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
+                OUString sFilterName2(DBA_RES (STR_MSACCESS_2007_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
                 aFileDlg.AddFilter(sFilterName2,sAccdb);
@@ -329,7 +330,7 @@ namespace dbaui
             case ::dbaccess::DST_FIREBIRD:
             {
                 const OUString sExt("*.fdb");
-                OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME));
+                OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE);
                 aFileDlg.AddFilter(sFilterName,sExt);
@@ -353,7 +354,7 @@ namespace dbaui
         case ::dbaccess::DST_FIREBIRD:
             {
                 const OUString sExt("*.fdb");
-                OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME));
+                OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
                 aFileDlg.AddFilter(sFilterName,sExt);
@@ -467,7 +468,7 @@ namespace dbaui
         if (!m_pCollection->supportsDBCreation(m_eType) &&
             (( e_exists == PATH_NOT_EXIST) || ( e_exists == PATH_NOT_KNOWN)))
         {
-            OUString sQuery(ModuleRes(STR_ASK_FOR_DIRECTORY_CREATION));
+            OUString sQuery(DBA_RES(STR_ASK_FOR_DIRECTORY_CREATION));
             OFileNotation aTransformer(_rURL);
             sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM));
 
@@ -485,7 +486,7 @@ namespace dbaui
                     {
                         if ( !createDirectoryDeep(_rURL) )
                         {   // could not create the directory
-                            sQuery = ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY);
+                            sQuery = DBA_RES(STR_COULD_NOT_CREATE_DIRECTORY);
                             sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM));
 
                             m_bUserGrabFocus = false;
@@ -679,7 +680,7 @@ namespace dbaui
                 {
                     if( pathExists(sURL, true) == PATH_NOT_EXIST )
                     {
-                        OUString sFile = ModuleRes( STR_FILE_DOES_NOT_EXIST );
+                        OUString sFile = DBA_RES( STR_FILE_DOES_NOT_EXIST );
                         sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM));
                         ScopedVclPtrInstance<OSQLWarningBox>(this, sFile)->Execute();
                         setURLNoPrefix(sOldPath);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 7ca9c7096900..a2abf4eb718a 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -19,7 +19,9 @@
 
 #include <config_features.h>
 #include "ConnectionPage.hxx"
-#include "dbu_dlg.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include "dsmeta.hxx"
 #if HAVE_FEATURE_JAVA
 #include <jvmaccess/virtualmachine.hxx>
@@ -38,11 +40,11 @@
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
 #include "sqlmessage.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -138,53 +140,53 @@ namespace dbaui
         switch( eType )
         {
             case  ::dbaccess::DST_DBASE:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_DBASE_PATH_OR_FILE)));
+                m_pFT_Connection->SetText(DBA_RES(STR_DBASE_PATH_OR_FILE));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_DBASE_PATH);
                 break;
             case  ::dbaccess::DST_FLAT:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_FLAT_PATH_OR_FILE)));
+                m_pFT_Connection->SetText(DBA_RES(STR_FLAT_PATH_OR_FILE));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_FLAT_PATH);
                 break;
             case  ::dbaccess::DST_CALC:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_CALC_PATH_OR_FILE)));
+                m_pFT_Connection->SetText(DBA_RES(STR_CALC_PATH_OR_FILE));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_CALC_PATH);
                 break;
             case  ::dbaccess::DST_WRITER:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_WRITER_PATH_OR_FILE)));
+                m_pFT_Connection->SetText((DBA_RES(STR_WRITER_PATH_OR_FILE)));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_WRITER_PATH);
                 break;
             case  ::dbaccess::DST_ADO:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL)));
+                m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL));
                 break;
             case  ::dbaccess::DST_MSACCESS:
             case  ::dbaccess::DST_MSACCESS_2007:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_MSACCESS_MDB_FILE)));
+                m_pFT_Connection->SetText(DBA_RES(STR_MSACCESS_MDB_FILE));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE);
                 break;
             case  ::dbaccess::DST_MYSQL_NATIVE:
             case  ::dbaccess::DST_MYSQL_JDBC:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_MYSQL_DATABASE_NAME)));
+                m_pFT_Connection->SetText(DBA_RES(STR_MYSQL_DATABASE_NAME));
                 m_pConnectionURL->SetHelpId( HID_DSADMIN_MYSQL_DATABASE );
                 break;
             case  ::dbaccess::DST_ORACLE_JDBC:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_ORACLE_DATABASE_NAME)));
+                m_pFT_Connection->SetText(DBA_RES(STR_ORACLE_DATABASE_NAME));
                 m_pConnectionURL->SetHelpId(HID_DSADMIN_ORACLE_DATABASE);
                 break;
             case  ::dbaccess::DST_MYSQL_ODBC:
             case  ::dbaccess::DST_ODBC:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE)));
+                m_pFT_Connection->SetText(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE));
                 m_pConnectionURL->SetHelpId( eType ==  ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE);
                 break;
             case  ::dbaccess::DST_LDAP:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_HOSTNAME)));
+                m_pFT_Connection->SetText(DBA_RES(STR_HOSTNAME));
                 m_pConnectionURL->SetHelpId( HID_DSADMIN_LDAP_HOSTNAME );
                 break;
             case  ::dbaccess::DST_MOZILLA:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_MOZILLA_PROFILE_NAME)));
+                m_pFT_Connection->SetText(DBA_RES(STR_MOZILLA_PROFILE_NAME));
                 m_pConnectionURL->SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME );
                 break;
             case  ::dbaccess::DST_THUNDERBIRD:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME)));
+                m_pFT_Connection->SetText(DBA_RES(STR_THUNDERBIRD_PROFILE_NAME));
                 m_pConnectionURL->SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME );
                 break;
             case  ::dbaccess::DST_OUTLOOK:
@@ -194,7 +196,7 @@ namespace dbaui
             case  ::dbaccess::DST_EVOLUTION_LDAP:
             case  ::dbaccess::DST_KAB:
             case  ::dbaccess::DST_MACAB:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_NO_ADDITIONAL_SETTINGS)));
+                m_pFT_Connection->SetText(DBA_RES(STR_NO_ADDITIONAL_SETTINGS));
                 {
                     OUString sText = m_pFT_Connection->GetText();
                     sText = sText.replaceAll("%test",m_pTestConnection->GetText());
@@ -205,7 +207,7 @@ namespace dbaui
                 break;
             case  ::dbaccess::DST_JDBC:
             default:
-                m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL)));
+                m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL));
                 break;
         }
 
@@ -305,9 +307,9 @@ namespace dbaui
         }
 #endif
 
-        const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
-        ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
+        ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt );
         aMsg->Execute();
     }
     bool OConnectionTabPage::checkTestConnection()
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
deleted file mode 100644
index 77078c5cc3d5..000000000000
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ /dev/null
@@ -1,63 +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 "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-
-String STR_CONNECTION_TEST
-{
-    Text [ en-US ] = "Connection Test";
-};
-
-String STR_CONNECTION_SUCCESS
-{
-    Text [ en-US ] = "The connection was established successfully.";
-};
-
-String STR_CONNECTION_NO_SUCCESS
-{
-    Text [ en-US ] = "The connection could not be established.";
-};
-
-String STR_JDBCDRIVER_SUCCESS
-{
-    Text [ en-US ] = "The JDBC driver was loaded successfully.";
-};
-
-String STR_JDBCDRIVER_NO_SUCCESS
-{
-    Text [ en-US ] = "The JDBC driver could not be loaded.";
-};
-
-String STR_MSACCESS_FILTERNAME
-{
-    Text [ en-US ] = "MS Access file";
-};
-
-String STR_MSACCESS_2007_FILTERNAME
-{
-    Text [ en-US ] = "MS Access 2007 file";
-};
-
-String STR_FIREBIRD_FILTERNAME
-{
-    Text [ en-US ] = "Firebird Database";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index e6a067c5cb9c..4305a4c3c5af 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -18,7 +18,9 @@
  */
 
 #include "ConnectionPageSetup.hxx"
-#include "dbu_dlg.hrc"
+#include "strings.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
 #include <svl/itemset.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
@@ -32,11 +34,11 @@
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
 #include "sqlmessage.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -85,29 +87,29 @@ namespace dbaui
 
     VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        return VclPtr<OConnectionTabPageSetup>::Create( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL );
+        return VclPtr<OConnectionTabPageSetup>::Create(pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, nullptr, nullptr, STR_COMMONURL);
     }
 
-    OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
+    OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId)
         :OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs)
     {
         get(m_pHelpText, "helptext");
         get(m_pHeaderText, "header");
 
-        if ( USHRT_MAX != _nHelpTextResId )
+        if (pHelpTextResId != nullptr)
         {
-            OUString sHelpText = ModuleRes(_nHelpTextResId);
+            OUString sHelpText = DBA_RES(pHelpTextResId);
             m_pHelpText->SetText(sHelpText);
         }
         else
             m_pHelpText->Hide();
 
-        if ( USHRT_MAX != _nHeaderResId )
-            m_pHeaderText->SetText(ModuleRes(_nHeaderResId));
+        if (pHeaderResId != nullptr)
+            m_pHeaderText->SetText(DBA_RES(pHeaderResId));
 
-        if ( USHRT_MAX != _nUrlResId )
+        if (pUrlResId != nullptr)
         {
-            OUString sLabelText = ModuleRes(_nUrlResId);
+            OUString sLabelText = DBA_RES(pUrlResId);
             m_pFT_Connection->SetText(sLabelText);
         }
         else
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 3a34c73f4b8d..b9bf054bf79c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -60,7 +60,7 @@ namespace dbaui
         virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override;
 
     protected:
-        OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
+        OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
         virtual bool checkTestConnection() override;
             // nControlFlags is a combination of the CBTP_xxx-constants
     };
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 24c5794b6968..b642e5d568f1 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -20,9 +20,11 @@
 #include <config_features.h>
 
 #include "DBSetupConnectionPages.hxx"
+#include "core_resource.hxx"
 #include "sqlmessage.hxx"
-#include "dbu_dlg.hrc"
-#include "dbu_resource.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
+#include "dbu_pageids.hxx"
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
@@ -43,14 +45,14 @@
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <svl/filenotation.hxx>
 
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <unotools/pathoptions.hxx>
 #include <svtools/roadmapwizard.hxx>
 #include "TextConnectionHelper.hxx"
@@ -378,7 +380,7 @@ using namespace ::com::sun::star;
     }
 
     // OMySQLJDBCConnectionPageSetup
-    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
+    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId)
         :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs)
         ,m_nPortId(_nPortId)
     {
@@ -396,13 +398,13 @@ using namespace ::com::sun::star;
         get(m_pETDriverClass, "jdbcDriverEntry");
         get(m_pPBTestJavaDriver, "testDriverButton");
 
-        m_pFTDriverClass->SetText(OUString(ModuleRes(_nDriverClassId)));
+        m_pFTDriverClass->SetText(DBA_RES(pDriverClassId));
 
-        m_pFTDefaultPortNumber->SetText(OUString(ModuleRes(_nDefaultPortResId)));
-        OUString sHelpText = OUString(ModuleRes(_nHelpTextResId));
+        m_pFTDefaultPortNumber->SetText(DBA_RES(pDefaultPortResId));
+        OUString sHelpText = DBA_RES(pHelpTextResId);
         m_pFTHelpText->SetText(sHelpText);
         //TODO this code snippet is redundant
-        m_pHeaderText->SetText(ModuleRes(_nHeaderTextResId));
+        m_pHeaderText->SetText(DBA_RES(pHeaderTextResId));
 
         m_pETDatabasename->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl));
         m_pETHostname->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl));
@@ -552,9 +554,9 @@ using namespace ::com::sun::star;
         {
         }
 #endif
-        const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        const char *pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
-        ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
+        ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt);
         aMsg->Execute();
     }
 
@@ -675,8 +677,8 @@ using namespace ::com::sun::star;
 #else
         (void) bSuccess;
 #endif
-        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
-        ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() );
+        const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString());
         aMsg->Execute();
     }
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 6c64ee8bd664..4dc43616001f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -133,10 +133,10 @@ namespace dbaui
         OGeneralSpecialJDBCConnectionPageSetup(   vcl::Window* pParent
                                         , const SfxItemSet& _rCoreAttrs
                                         , sal_uInt16 _nPortId
-                                        , sal_uInt16 _nDefaultPortResId
-                                        , sal_uInt16 _nHelpTextResId
-                                        , sal_uInt16 _nHeaderTextResId
-                                        , sal_uInt16 _nDriverClassId );
+                                        , const char* pDefaultPortResId
+                                        , const char* pHelpTextResId
+                                        , const char* pHeaderTextResId
+                                        , const char* pDriverClassId );
         virtual ~OGeneralSpecialJDBCConnectionPageSetup() override;
         virtual void dispose() override;
     static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 848f07bbfaeb..7ef15fe23176 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -28,11 +28,14 @@
 #include "DriverSettings.hxx"
 #include "IItemSetHelper.hxx"
 #include "UITools.hxx"
-#include "dbu_dlg.hrc"
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "optionalboolitem.hxx"
 #include "propertysetitem.hxx"
 #include "stringlistitem.hxx"
@@ -245,7 +248,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal
             }
 
             OUString sName = pName ? pName->GetValue() : OUString();
-            OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD));
+            OUString sLoginRequest(DBA_RES(STR_ENTER_CONNECTION_PASSWORD));
             OUString sTemp = sName;
             sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp);
             if ( !sName.isEmpty() )
@@ -381,7 +384,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
     // get the global DriverManager
     Reference< XConnectionPool > xDriverManager;
 
-    OUString sCurrentActionError = ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER);
+    OUString sCurrentActionError = DBA_RES(STR_COULDNOTCREATE_DRIVERMANAGER);
     sCurrentActionError = sCurrentActionError.replaceFirst("#servicename#", "com.sun.star.sdbc.ConnectionPool");
 
     try
@@ -398,7 +401,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString
     Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL);
     if (!xDriver.is())
     {
-        sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER);
+        sCurrentActionError = DBA_RES(STR_NOREGISTEREDDRIVER);
         sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL);
         // will be caught and translated into an SQLContext exception
         throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any());
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index de032266f634..398a3926566b 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -22,7 +22,7 @@
 #include <vcl/wrkwin.hxx>
 
 #include <vcl/svapp.hxx>
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include "dbaccess_helpid.hrc"
 #include <com/sun/star/sdbc/KeyRule.hpp>
 
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 8c36806c5e24..c22b06489fff 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -26,7 +26,7 @@
 
 #include "propertysetitem.hxx"
 
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 67a8ce11f480..80b7833ea4c3 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -19,11 +19,14 @@
 
 #include <config_features.h>
 
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 #include "TextConnectionHelper.hxx"
 #include "sqlmessage.hxx"
-#include "dbu_dlg.hrc"
-#include "dbu_resource.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "dbu_pageids.hxx"
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
@@ -57,9 +60,9 @@ namespace dbaui
 
     OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections )
         :TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui")
-        ,m_aFieldSeparatorList      (ModuleRes(STR_AUTOFIELDSEPARATORLIST))
-        ,m_aTextSeparatorList       (ModuleRes(STR_AUTOTEXTSEPARATORLIST))
-        ,m_aTextNone                (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE))
+        ,m_aFieldSeparatorList      (DBA_RES(STR_AUTOFIELDSEPARATORLIST))
+        ,m_aTextSeparatorList       (STR_AUTOTEXTSEPARATORLIST)
+        ,m_aTextNone                (DBA_RES(STR_AUTOTEXT_FIELD_SEP_NONE))
         ,m_nAvailableSections( _nAvailableSections )
     {
         get(m_pExtensionHeader, "extensionheader");
@@ -248,61 +251,61 @@ namespace dbaui
         OUString aDelText(m_pFieldSeparator->GetText());
         if(aDelText.isEmpty())
         {   // No FieldSeparator
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING);
             aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText());
             pErrorWin = m_pFieldSeparator;
         }
         else if (m_pDecimalSeparator->GetText().isEmpty())
         {   // No DecimalSeparator
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING);
             aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText());
             pErrorWin = m_pDecimalSeparator;
         }
         else if (m_pTextSeparator->GetText() == m_pFieldSeparator->GetText())
         {   // Field and TextSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pFieldSeparatorLabel->GetText());
             pErrorWin = m_pTextSeparator;
         }
         else if (m_pDecimalSeparator->GetText() == m_pThousandsSeparator->GetText())
         {   // Thousands and DecimalSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText());
             pErrorWin = m_pDecimalSeparator;
         }
         else if (m_pFieldSeparator->GetText() == m_pThousandsSeparator->GetText())
         {   // Thousands and FieldSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText());
             pErrorWin = m_pFieldSeparator;
         }
         else if (m_pFieldSeparator->GetText() == m_pDecimalSeparator->GetText())
         {   // Tenner and FieldSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText());
             pErrorWin = m_pFieldSeparator;
         }
         else if (m_pTextSeparator->GetText() == m_pThousandsSeparator->GetText())
         {   // Thousands and TextSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText());
             pErrorWin = m_pTextSeparator;
         }
         else if (m_pTextSeparator->GetText() == m_pDecimalSeparator->GetText())
         {   // Tenner and TextSeparator must not be the same
-            aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER);
+            aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER);
             aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText());
             aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText());
             pErrorWin = m_pTextSeparator;
         }
         else if ((sExtension.indexOf('*') != -1) || (sExtension.indexOf('?') != -1))
         {
-            aErrorText = ModuleRes(STR_AUTONO_WILDCARDS);
+            aErrorText = DBA_RES(STR_AUTONO_WILDCARDS);
             aErrorText = aErrorText.replaceFirst("#1",sExtension);
             pErrorWin = m_pOwnExtension;
         }
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 0ebc917a1db7..62d4c3e31edc 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -19,7 +19,7 @@
 
 #include "UserAdmin.hxx"
 #include "UITools.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -32,9 +32,12 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
 #include "dbadmin.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <vcl/layout.hxx>
 #include <sfx2/passwd.hxx>
 
@@ -100,7 +103,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, Button*, void)
         EndDialog( RET_OK );
     else
     {
-        OUString aErrorMsg( ModuleRes( STR_ERROR_PASSWORDS_NOT_IDENTICAL));
+        OUString aErrorMsg( DBA_RES( STR_ERROR_PASSWORDS_NOT_IDENTICAL));
         ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg);
         aErrorBox->Execute();
         m_pEDPassword->SetText( OUString() );
@@ -256,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
                 Reference<XDrop> xDrop(m_xUsers,UNO_QUERY);
                 if(xDrop.is())
                 {
-                    ScopedVclPtrInstance< MessageDialog > aQry(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo);
+                    ScopedVclPtrInstance< MessageDialog > aQry(this, DBA_RES(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo);
                     if(aQry->Execute() == RET_YES)
                         xDrop->dropByName(GetUser());
                 }
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
deleted file mode 100644
index a5a3695b053c..000000000000
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ /dev/null
@@ -1,38 +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 "dbu_dlg.hrc"
-#include "dbaccess_helpid.hrc"
-
-String STR_QUERY_USERADMIN_DELETE_USER
-{
-    Text[ en-US ] = "Do you really want to delete the user?";
-};
-
-String STR_USERADMIN_NOT_AVAILABLE
-{
-    Text [ en-US ] = "The database does not support user administration." ;
-};
-
-String STR_ERROR_PASSWORDS_NOT_IDENTICAL
-{
-    Text [ en-US ] = "The passwords do not match. Please enter the password again.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 9e5b19611f16..e09ad9360c3c 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -17,9 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "adminpages.hxx"
 #include "DbAdminImpl.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include "DriverSettings.hxx"
 #include "dsitems.hxx"
 #include "propertysetitem.hxx"
@@ -101,8 +103,8 @@ namespace dbaui
             ::dbtools::DatabaseMetaData aMetaData( createConnection().first );
             if ( !aMetaData.supportsUserAdministration( getORB() ) )
             {
-                OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE));
-                throw SQLException(sError,nullptr, "S1000" ,0,Any());
+                OUString sError(DBA_RES(STR_USERADMIN_NOT_AVAILABLE));
+                throw SQLException(sError, nullptr, "S1000", 0, Any());
             }
         }
         catch(const SQLException&)
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 082d45b810e7..d6d4b1b091f6 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "admincontrols.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include "dsitems.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index ec0ab9518dc9..f13a88ff9f9b 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -18,15 +18,17 @@
  */
 
 #include "adminpages.hxx"
+#include "core_resource.hxx"
 #include "dbadmin.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "dsitems.hxx"
 #include "dsselect.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "odbcconfig.hxx"
 #include "optionalboolitem.hxx"
 #include "sqlmessage.hxx"
@@ -126,7 +128,7 @@ namespace dbaui
         if (!aEnumeration.isLoaded())
         {
             // show an error message
-            OUString sError( ModuleRes( STR_COULD_NOT_LOAD_ODBC_LIB ) );
+            OUString sError(DBA_RES(STR_COULD_NOT_LOAD_ODBC_LIB));
             sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName());
             ScopedVclPtrInstance< MessageDialog > aDialog(this, sError);
             aDialog->Execute();
@@ -252,15 +254,15 @@ namespace dbaui
             {
                 OSQLMessageBox::MessageType eImage = OSQLMessageBox::Info;
                 OUString aMessage,sTitle;
-                sTitle = ModuleRes(STR_CONNECTION_TEST);
+                sTitle = DBA_RES(STR_CONNECTION_TEST);
                 if ( bSuccess )
                 {
-                    aMessage = ModuleRes(STR_CONNECTION_SUCCESS);
+                    aMessage = DBA_RES(STR_CONNECTION_SUCCESS);
                 }
                 else
                 {
                     eImage = OSQLMessageBox::Error;
-                    aMessage = ModuleRes(STR_CONNECTION_NO_SUCCESS);
+                    aMessage = DBA_RES(STR_CONNECTION_NO_SUCCESS);
                 }
                 ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, sTitle, aMessage, WB_OK, eImage );
                 aMsg->Execute();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 8415d002f48e..76b7d7e117cc 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -21,9 +21,11 @@
 #include "sqlmessage.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include "core_resource.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_resource.hrc"
-#include "dbu_dlg.hrc"
+#include "dbu_pageids.hxx"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <sfx2/sfxsids.hrc>
 #include "QueryTableView.hxx"
 #include "QueryDesignView.hxx"
@@ -464,9 +466,9 @@ OUString OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rConte
     OUString sTitle;
 
     if ( _rContext.allowQueries() )
-        sTitle = ModuleRes( STR_ADD_TABLE_OR_QUERY );
+        sTitle = DBA_RES( STR_ADD_TABLE_OR_QUERY );
     else
-        sTitle = ModuleRes( STR_ADD_TABLES );
+        sTitle = DBA_RES( STR_ADD_TABLES );
 
     return sTitle;
 }
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 4e741c7b8d42..6b9a5d7371b6 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -23,13 +23,13 @@
 
 #include "advancedsettings.hxx"
 #include "advancedsettingsdlg.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "dsitems.hxx"
 #include "DbAdminImpl.hxx"
 #include "DriverSettings.hxx"
 #include "optionalboolitem.hxx"
-#include "dbu_resource.hrc"
-#include "dbu_dlg.hrc"
+#include "dbu_pageids.hxx"
+#include "dbu_dlg.hxx"
 
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 209bb50a5c72..016f973c10a5 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -22,14 +22,16 @@
 #include "DriverSettings.hxx"
 #include "adminpages.hxx"
 #include "dbadmin.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
+#include "strings.hrc"
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "optionalboolitem.hxx"
 #include "propertysetitem.hxx"
 #include "stringlistitem.hxx"
@@ -96,9 +98,9 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
     SfxTabDialog::PageCreated(_nId, _rPage);
 }
 
-void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc)
+void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage _pCreateFunc)
 {
-    AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, nullptr);
+    AddTabPage(_nPageId, DBA_RES(pTextId), _pCreateFunc, nullptr);
     m_aCurrentDetailPages.push(_nPageId);
 }
 
@@ -157,7 +159,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName
         case  ::dbaccess::DST_USERDEFINE9:
         case  ::dbaccess::DST_USERDEFINE10:
             {
-                OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED));
+                OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED));
                 AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, nullptr, 1);
                 m_aCurrentDetailPages.push(PAGE_USERDRIVER);
             }
@@ -203,7 +205,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection();
     if ( pCollection->determineType(getDatasourceType( *m_pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
     {
-        AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr );
+        AddTabPage( PAGE_MYSQL_NATIVE, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE, nullptr );
         RemoveTabPage("advanced");
         m_nMainPageID = PAGE_MYSQL_NATIVE;
     }
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
deleted file mode 100644
index 9762e7271348..000000000000
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ /dev/null
@@ -1,80 +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 "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-#include "browserids.hxx"
-
-String STR_DATABASE_TYPE_CHANGE
-{
-    Text [ en-US ] = "Database properties" ;
-};
-
-String STR_PARENTTITLE_GENERAL
-{
-    Text [ en-US ] = "Data Source Properties: #" ;
-};
-
-String STR_ERR_USE_CONNECT_TO
-{
-    Text [ en-US ] = "Please choose 'Connect to an existing database' to connect to an existing database instead.";
-};
-
-String STR_COULD_NOT_LOAD_ODBC_LIB
-{
-    Text [ en-US ] = "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available.";
-};
-
-String STR_UNSUPPORTED_DATASOURCE_TYPE
-{
-    Text [ en-US ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database.";
-};
-
-String STR_AUTOTEXT_FIELD_SEP_NONE
-{
-    Text[ en-US ]  = "{None}";
-};
-
-String STR_AUTOTEXTSEPARATORLIST
-{
-    Text  = "\"\t34\t'\t39" ;
-};
-
-String STR_AUTOFIELDSEPARATORLIST
-{
-    Text [ x-comment ] = "EM Dec 2002: 'Space' refers to what you get when you hit the space bar on your keyboard.";
-    Text [ en-US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ;
-};
-
-String STR_AUTODELIMITER_MISSING
-{
-    Text[ en-US ]  = "#1 must be set." ;
-};
-
-String STR_AUTODELIMITER_MUST_DIFFER
-{
-    Text[ en-US ]  = "#1 and #2 must be different." ;
-};
-
-String STR_AUTONO_WILDCARDS
-{
-    Text[ en-US ]  = "Wildcards such as ?,* are not allowed in #1." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
deleted file mode 100644
index 4d09f3b74f0f..000000000000
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ /dev/null
@@ -1,49 +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 "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-#include "browserids.hxx"
-
-String STR_ENTER_CONNECTION_PASSWORD
-{
-    Text [ en-US ] = "A password is needed to connect to the data source \"$name$\".";
-};
-
-String STR_ASK_FOR_DIRECTORY_CREATION
-{
-    Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?";
-};
-
-String STR_COULD_NOT_CREATE_DIRECTORY
-{
-    Text [ en-US ] = "The directory $name$ could not be created.";
-};
-
-String STR_ALREADYEXISTOVERWRITE
-{
-    Text [ en-US ] = "The file already exists. Overwrite?" ;
-};
-
-String STR_NEW_FOLDER
-{
-    Text [ en-US ] = "Folder" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
deleted file mode 100644
index a4903c5dc4d1..000000000000
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ /dev/null
@@ -1,218 +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 "dbu_dlg.hrc"
-
-String STR_DBWIZARDTITLE
-{
-    Text[ en-US ]  = "Database Wizard" ;
-};
-
-String STR_PAGETITLE_INTROPAGE
-{
-    Text[ en-US ]  = "Select database" ;
-};
-
-String STR_PAGETITLE_DBASE
-{
-    Text[ en-US ]  = "Set up dBASE connection" ;
-};
-
-String STR_PAGETITLE_TEXT
-{
-    Text[ en-US ]  = "Set up a connection to text files" ;
-};
-
-String STR_PAGETITLE_MSACCESS
-{
-    Text[ en-US ]  = "Set up Microsoft Access connection" ;
-};
-
-String STR_PAGETITLE_LDAP
-{
-    Text[ en-US ]  = "Set up LDAP connection" ;
-};
-
-String STR_PAGETITLE_ADO
-{
-    Text[ en-US ]  = "Set up ADO connection" ;
-};
-
-String STR_PAGETITLE_JDBC
-{
-    Text[ en-US ]  = "Set up JDBC connection" ;
-};
-
-String STR_PAGETITLE_ORACLE
-{
-    Text[ en-US ] = "Set up Oracle database connection" ;
-};
-
-String STR_PAGETITLE_MYSQL
-{
-    Text[ en-US ] = "Set up MySQL connection" ;
-};
-
-String STR_PAGETITLE_ODBC
-{
-    Text[ en-US ] = "Set up ODBC connection" ;
-};
-
-String STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET
-{
-    Text[ en-US ] = "Set up Writer Document or Spreadsheet connection" ;
-};
-
-String STR_PAGETITLE_AUTHENTIFICATION
-{
-    Text[ en-US ] = "Set up user authentication" ;
-};
-
-String STR_PAGETITLE_MYSQL_NATIVE
-{
-    Text [ en-US ] = "Set up MySQL server data";
-};
-
-String STR_PAGETITLE_FINAL
-{
-    Text[ en-US ] = "Save and proceed" ;
-};
-
-String STR_DATABASEDEFAULTNAME
-{
-    Text[ en-US ]  = "New Database" ;
-};
-
-
-String STR_MYSQLJDBC_HEADERTEXT
-{
-    Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
-};
-
-String STR_MYSQLJDBC_HELPTEXT
-{
-    Text[ en-US ] = "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.";
-};
-
-String STR_MYSQL_DRIVERCLASSTEXT
-{
-    Text [  en-US  ] = "MySQL JDBC d~river class:";
-};
-
-String STR_MYSQL_DEFAULT
-{
-    Text[ en-US ] = "Default: 3306";
-};
-
-String STR_DBASE_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to dBASE files" ;
-};
-
-String STR_DBASE_HELPTEXT
-{
-    Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
-};
-
-String STR_TEXT_HEADERTEXT
-{
-    Text[ en-US ]   = "Set up a connection to text files" ;
-};
-
-String STR_TEXT_HELPTEXT
-{
-    Text[ en-US ]   = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ;
-};
-
-String STR_TEXT_PATH_OR_FILE
-{
-    Text[ en-US ]  = "Path to text files";
-};
-
-String STR_MSACCESS_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
-};
-
-String STR_MSACCESS_HELPTEXT
-{
-    Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
-};
-
-String STR_ADO_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to an ADO database" ;
-};
-
-String STR_ADO_HELPTEXT
-{
-    Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
-};
-
-String STR_ODBC_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to an ODBC database" ;
-};
-
-String STR_ODBC_HELPTEXT{
-    Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
-};
-
-String STR_JDBC_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to a JDBC database" ;
-};
-
-String STR_JDBC_HELPTEXT{
-    Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
-};
-
-String STR_ORACLE_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to an Oracle database";
-};
-
-String STR_ORACLE_DEFAULT
-{
-    Text[ en-US ] = "Default: 1521" ;
-};
-
-String STR_ORACLE_DRIVERCLASSTEXT
-{
-    Text [ en-US ] = "Oracle JDBC ~driver class";
-};
-
-String STR_ORACLE_HELPTEXT{
-    Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
-};
-
-String STR_SPREADSHEET_HEADERTEXT
-{
-    Text[ en-US ] = "Set up a connection to spreadsheets";
-};
-
-String STR_SPREADSHEET_HELPTEXT{
-    Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
-};
-
-String STR_SPREADSHEETPATH{
-    Text[ en-US ] = "~Location and file name" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 9754342c4bff..7e909b93176e 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -22,8 +22,8 @@
 #include <osl/file.hxx>
 #include <tools/config.hxx>
 #include <sfx2/app.hxx>
-#include "moduledbu.hxx"
-#include "dbu_dlg.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
 #include <osl/diagnose.h>
 #include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index f9fabf950e11..20d103cce4ab 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -17,15 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "dbwiz.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "adminpages.hxx"
 #include "generalpage.hxx"
 #include "stringlistitem.hxx"
@@ -92,7 +95,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
     m_pCollection = rCollectionItem.getCollection();
 
     ActivatePage();
-    setTitleBase(ModuleRes(STR_DATABASE_TYPE_CHANGE));
+    setTitleBase(DBA_RES(STR_DATABASE_TYPE_CHANGE));
 }
 
 ODbTypeWizDialog::~ODbTypeWizDialog()
@@ -230,7 +233,7 @@ void ODbTypeWizDialog::clearPassword()
 
 VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState)
 {
-    sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED;
+    const char* pStringId = STR_PAGETITLE_ADVANCED;
     VclPtr<TabPage> pPage;
     switch(_nState)
     {
@@ -239,12 +242,12 @@ VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState)
             pPage = VclPtr<OGeneralPageDialog>::Create(this,*m_pOutSet);
             OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage.get() );
             pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected));
-            nStringId = STR_PAGETITLE_GENERAL;
+            pStringId = STR_PAGETITLE_GENERAL;
         }
         break;
         case CONNECTION_PAGE:
             pPage = OConnectionTabPage::Create(this,m_pOutSet);
-            nStringId = STR_PAGETITLE_CONNECTION;
+            pStringId = STR_PAGETITLE_CONNECTION;
             break;
 
         case ADDITIONAL_PAGE_DBASE:
@@ -287,7 +290,7 @@ VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState)
     {
         static_cast<OGenericAdministrationPage*>(pPage.get())->SetServiceFactory( m_pImpl->getORB() );
         static_cast<OGenericAdministrationPage*>(pPage.get())->SetAdminDialog(this,this);
-        pPage->SetText(ModuleRes(nStringId));
+        pPage->SetText(DBA_RES(pStringId));
         defaultButton( _nState == START_PAGE ? WizardButtonFlags::NEXT : WizardButtonFlags::FINISH );
         enableButtons( WizardButtonFlags::FINISH, _nState != START_PAGE);
         pPage->Show();
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index deb931d51327..20b4c4575ada 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -17,10 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "dbwizsetup.hxx"
 #include "dsmeta.hxx"
 #include "DBSetupConnectionPages.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
 
@@ -29,7 +32,7 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "adminpages.hxx"
 #include <sfx2/docfilt.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -109,20 +112,20 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
 
     , m_pOutSet(nullptr)
     , m_bIsConnectable( false)
-    , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) )
-    , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) )
-    , m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) )
-    , m_sRM_MSAccessText( ModuleRes( STR_PAGETITLE_MSACCESS ) )
-    , m_sRM_LDAPText( ModuleRes( STR_PAGETITLE_LDAP ) )
-    , m_sRM_ADOText( ModuleRes( STR_PAGETITLE_ADO ) )
-    , m_sRM_JDBCText( ModuleRes( STR_PAGETITLE_JDBC ) )
-    , m_sRM_MySQLNativePageTitle( ModuleRes( STR_PAGETITLE_MYSQL_NATIVE ) )
-    , m_sRM_OracleText( ModuleRes( STR_PAGETITLE_ORACLE ) )
-    , m_sRM_MySQLText( ModuleRes( STR_PAGETITLE_MYSQL ) )
-    , m_sRM_ODBCText( ModuleRes( STR_PAGETITLE_ODBC ) )
-    , m_sRM_DocumentOrSpreadSheetText( ModuleRes( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) )
-    , m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) )
-    , m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) )
+    , m_sRM_IntroText( DBA_RES( STR_PAGETITLE_INTROPAGE ) )
+    , m_sRM_dBaseText( DBA_RES( STR_PAGETITLE_DBASE ) )
+    , m_sRM_TextText( DBA_RES( STR_PAGETITLE_TEXT ) )
+    , m_sRM_MSAccessText( DBA_RES( STR_PAGETITLE_MSACCESS ) )
+    , m_sRM_LDAPText( DBA_RES( STR_PAGETITLE_LDAP ) )
+    , m_sRM_ADOText( DBA_RES( STR_PAGETITLE_ADO ) )
+    , m_sRM_JDBCText( DBA_RES( STR_PAGETITLE_JDBC ) )
+    , m_sRM_MySQLNativePageTitle( DBA_RES( STR_PAGETITLE_MYSQL_NATIVE ) )
+    , m_sRM_OracleText( DBA_RES( STR_PAGETITLE_ORACLE ) )
+    , m_sRM_MySQLText( DBA_RES( STR_PAGETITLE_MYSQL ) )
+    , m_sRM_ODBCText( DBA_RES( STR_PAGETITLE_ODBC ) )
+    , m_sRM_DocumentOrSpreadSheetText( DBA_RES( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) )
+    , m_sRM_AuthentificationText( DBA_RES( STR_PAGETITLE_AUTHENTIFICATION ) )
+    , m_sRM_FinalText( DBA_RES( STR_PAGETITLE_FINAL ) )
     , m_sWorkPath( SvtPathOptions().GetWorkPath() )
     , m_pGeneralPage( nullptr )
     , m_pMySQLIntroPage( nullptr )
@@ -173,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
     m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
     SetRoadmapInteractive( true );
     ActivatePage();
-    setTitleBase(ModuleRes(STR_DBWIZARDTITLE));
+    setTitleBase(DBA_RES(STR_DBWIZARDTITLE));
 }
 
 void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths)
@@ -247,7 +250,7 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
             sRoadmapItem = m_sRM_AuthentificationText;
             break;
         case PAGE_DBSETUPWIZARD_USERDEFINED:
-            sRoadmapItem = ModuleRes(STR_PAGETITLE_CONNECTION);
+            sRoadmapItem = DBA_RES(STR_PAGETITLE_CONNECTION);
             break;
         case PAGE_DBSETUPWIZARD_FINAL:
             sRoadmapItem = m_sRM_FinalText;
@@ -793,7 +796,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             INetURLObject aWorkURL( m_sWorkPath );
             aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ));
 
-            OUString sDefaultName = ModuleRes( STR_DATABASEDEFAULTNAME );
+            OUString sDefaultName = DBA_RES( STR_DATABASEDEFAULTNAME );
             OUString sExtension = pFilter->GetDefaultExtension();
             sDefaultName += sExtension.replaceAt( 0, 1, OUString() );
             aWorkURL.Append( sDefaultName );
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 6cdc6efde692..47620a341e5d 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <config_features.h>
+#include "core_resource.hxx"
 #include "detailpages.hxx"
 #include "sqlmessage.hxx"
 #include "dsmeta.hxx"
@@ -26,10 +27,11 @@
 #include "dsitems.hxx"
 #include "dbfindex.hxx"
 #include "dsnItem.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
@@ -540,9 +542,9 @@ namespace dbaui
         {
         }
 #endif
-        const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
-        ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
+        ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt);
         aMsg->Execute();
     }
     void OGeneralSpecialJDBCDetailsPage::callModifiedHdl(void* pControl)
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 72d9cc276b55..ceaee42f1f62 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -17,8 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "directsql.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <vcl/layout.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/svapp.hxx>
@@ -105,7 +107,7 @@ namespace dbaui
             "DirectSQLDialog::_disposing: where does this come from?");
 
         {
-            OUString sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST));
+            OUString sMessage(DBA_RES(STR_DIRECTSQL_CONNECTIONLOST));
             ScopedVclPtrInstance< MessageDialog > aError(this, sMessage);
             aError->Execute();
         }
@@ -228,7 +230,7 @@ namespace dbaui
             }
 
             // successful
-            sStatus = ModuleRes(STR_COMMAND_EXECUTED_SUCCESSFULLY);
+            sStatus = DBA_RES(STR_COMMAND_EXECUTED_SUCCESSFULLY);
 
             // dispose the statement
             ::comphelper::disposeComponent(xStatement);
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
deleted file mode 100644
index 8bb0ed1633c0..000000000000
--- a/dbaccess/source/ui/dlg/directsql.src
+++ /dev/null
@@ -1,32 +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 "dbu_dlg.hrc"
-
-String STR_COMMAND_EXECUTED_SUCCESSFULLY
-{
-    Text [ en-US ] = "Command successfully executed." ;
-};
-
-String STR_DIRECTSQL_CONNECTIONLOST
-{
-    Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index af6113372c5b..b72eabe3c239 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -24,13 +24,13 @@
 #include <svx/numinf.hxx>
 
 #include <svx/dialogs.hrc>
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include <svl/itemset.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 using namespace dbaui;
 
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 680766a3006a..ec7ab3babded 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -19,7 +19,9 @@
 
 #include "dlgsave.hxx"
 #include <vcl/msgbox.hxx>
-#include "dbu_dlg.hrc"
+#include "core_resource.hxx"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include "sqlmessage.hxx"
@@ -33,7 +35,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "objectnamecheck.hxx"
 #include <tools/diagnose_ex.h>
 
@@ -83,8 +85,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
                                const OUString& rDefault,
                                const IObjectNameCheck& _rObjectNameCheck,
                                SADFlags _nFlags)
-    : m_aQryLabel(ModuleRes(STR_QRY_LABEL))
-    , m_sTblLabel(ModuleRes(STR_TBL_LABEL))
+    : m_aQryLabel(DBA_RES(STR_QRY_LABEL))
+    , m_sTblLabel(DBA_RES(STR_TBL_LABEL))
     , m_aName(rDefault)
     , m_rObjectNameCheck( _rObjectNameCheck )
     , m_nType(_rType)
@@ -117,8 +119,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
                                const OUString& rDefault,
                                const IObjectNameCheck& _rObjectNameCheck,
                                SADFlags _nFlags)
-    : m_aQryLabel(ModuleRes(STR_QRY_LABEL))
-    , m_sTblLabel(ModuleRes(STR_TBL_LABEL))
+    : m_aQryLabel(DBA_RES(STR_QRY_LABEL))
+    , m_sTblLabel(DBA_RES(STR_TBL_LABEL))
     , m_aName(rDefault)
     , m_rObjectNameCheck( _rObjectNameCheck )
     , m_nType(CommandType::COMMAND)
@@ -330,9 +332,9 @@ void OSaveAsDlg::implInit()
     }
 
     if ( SADFlags::TitlePasteAs == ( m_pImpl->m_nFlags & SADFlags::TitlePasteAs ) )
-        SetText( ModuleRes( STR_TITLE_PASTE_AS ) );
+        SetText( DBA_RES( STR_TITLE_PASTE_AS ) );
     else if ( SADFlags::TitleRename == ( m_pImpl->m_nFlags & SADFlags::TitleRename ) )
-        SetText( ModuleRes( STR_TITLE_RENAME ) );
+        SetText( DBA_RES( STR_TITLE_RENAME ) );
 
     m_pImpl->m_pPB_OK->SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl));
     m_pImpl->m_pTitle->SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl));
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 6c2293bf44b2..f34a03e1b202 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "dlgsize.hxx"
-#include "dbu_dlg.hrc"
-#include "moduledbu.hxx"
+#include "dbu_dlg.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 29c5a9314ef8..4e84f26691df 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -18,16 +18,15 @@
  */
 
 #include "dsselect.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include <vcl/msgbox.hxx>
-#include <tools/rcid.h>
 
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 8493190d4d56..a90c3842f7bc 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -17,14 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "dsnItem.hxx"
 #include "generalpage.hxx"
 #include <connectivity/dbexception.hxx>
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include "dsitems.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "dbadmin.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <vcl/stdtext.hxx>
@@ -195,12 +197,12 @@ namespace dbaui
 
         if ( eMessage != m_eLastMessage )
         {
-            sal_uInt16 nResId = 0;
+            const char* pResId = nullptr;
             if ( smUnsupportedType == eMessage )
-                nResId = STR_UNSUPPORTED_DATASOURCE_TYPE;
+                pResId = STR_UNSUPPORTED_DATASOURCE_TYPE;
             OUString sMessage;
-            if ( nResId )
-                sMessage = ModuleRes( nResId );
+            if ( pResId )
+                sMessage = DBA_RES(pResId);
 
             m_pSpecialMessage->SetText( sMessage );
             m_eLastMessage = eMessage;
@@ -440,7 +442,7 @@ namespace dbaui
         const OUString sName = m_pCollection->getTypeDisplayName( _sURLPrefix );
         if ( m_pAdminDialog )
         {
-            OUString sMessage = OUString( ModuleRes( STR_PARENTTITLE_GENERAL ) );
+            OUString sMessage = DBA_RES(STR_PARENTTITLE_GENERAL);
             m_pAdminDialog->setTitle( sMessage.replaceAll( "#", sName ) );
         }
     }
@@ -715,7 +717,7 @@ namespace dbaui
             OUString sPath = aFileDlg.GetPath();
             if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) )
             {
-                OUString sMessage(ModuleRes(STR_ERR_USE_CONNECT_TO));
+                OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO));
                 ScopedVclPtrInstance< InfoBox > aError(this, sMessage);
                 aError->Execute();
                 m_pRB_ConnectDatabase->Check();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 0c287c3ee20a..dbf55cd4501d 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -21,8 +21,10 @@
 
 #include <set>
 
+#include "core_resource.hxx"
 #include "indexdialog.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "dbaccess_helpid.hrc"
 #include "indexfieldscontrol.hxx"
@@ -366,7 +368,7 @@ namespace dbaui
 
         // get a new unique name for the new index
         OUString sNewIndexName;
-        const OUString sNewIndexNameBase(ModuleRes(STR_LOGICAL_INDEX_NAME));
+        const OUString sNewIndexNameBase(DBA_RES(STR_LOGICAL_INDEX_NAME));
         sal_Int32 i;
 
         for ( i = 1; i < 0x7FFFFFFF; ++i )
@@ -411,7 +413,7 @@ namespace dbaui
             // let the user confirm the drop
             if (_bConfirm)
             {
-                OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX));
+                OUString sConfirm(DBA_RES(STR_CONFIRM_DROP_INDEX));
                 sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected));
                 ScopedVclPtrInstance< MessageDialog > aConfirm(this, sConfirm, VclMessageType::Question, VclButtonsType::YesNo);
                 if (RET_YES != aConfirm->Execute())
@@ -615,7 +617,7 @@ namespace dbaui
         Indexes::const_iterator aSameName = m_pIndexes->find(sNewName);
         if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName))
         {
-            OUString sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED));
+            OUString sError(DBA_RES(STR_INDEX_NAME_ALREADY_USED));
             sError = sError.replaceFirst("$name$", sNewName);
             ScopedVclPtrInstance< MessageDialog > aError(this, sError);
             aError->Execute();
@@ -678,7 +680,7 @@ namespace dbaui
         // need at least one field
         if (0 == _rPos->aFields.size())
         {
-            ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(STR_NEED_INDEX_FIELDS));
+            ScopedVclPtrInstance< MessageDialog > aError(this, DBA_RES(STR_NEED_INDEX_FIELDS));
             aError->Execute();
             m_pFields->GrabFocus();
             return false;
@@ -694,7 +696,7 @@ namespace dbaui
             if (aExistentFields.end() != aExistentFields.find(aFieldCheck->sFieldName))
             {
                 // a column is specified twice ... won't work anyway, so prevent this here and now
-                OUString sMessage(ModuleRes(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME));
+                OUString sMessage(DBA_RES(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME));
                 sMessage = sMessage.replaceFirst("$name$", aFieldCheck->sFieldName);
                 ScopedVclPtrInstance< MessageDialog > aError(this, sMessage);
                 aError->Execute();
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
deleted file mode 100644
index 2a9291883a9b..000000000000
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ /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 .
- */
-
-#include "dbu_dlg.hrc"
-#include "browserids.hxx"
-#include "dbaccess_helpid.hrc"
-
-
-String STR_TAB_INDEX_SORTORDER
-{
-    Text [ en-US ] = "Sort order" ;
-};
-
-String STR_TAB_INDEX_FIELD
-{
-    Text [ en-US ] = "Index field" ;
-};
-
-String STR_ORDER_ASCENDING
-{
-    Text [ en-US ] = "Ascending" ;
-};
-
-String STR_ORDER_DESCENDING
-{
-    Text [ en-US ] = "Descending" ;
-};
-
-String STR_CONFIRM_DROP_INDEX
-{
-    Text [ en-US ] = "Do you really want to delete the index '$name$'?";
-};
-
-String STR_LOGICAL_INDEX_NAME
-{
-    Text [ en-US ] = "index";
-};
-
-String STR_NEED_INDEX_FIELDS
-{
-    Text [ en-US ] = "The index must contain at least one field.";
-};
-
-String STR_INDEX_NAME_ALREADY_USED
-{
-    Text [ en-US ] = "There is already another index named \"$name$\".";
-};
-
-String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
-{
-    Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index b04ed9814cba..990621d212d8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -17,8 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "indexfieldscontrol.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include <osl/diagnose.h>
 #include "dbaccess_helpid.hrc"
 #include <vcl/settings.hxx>
@@ -199,11 +201,11 @@ namespace dbaui
 
         if ( m_bAddIndexAppendix )
         {
-            m_sAscendingText = ModuleRes(STR_ORDER_ASCENDING);
-            m_sDescendingText = ModuleRes(STR_ORDER_DESCENDING);
+            m_sAscendingText = DBA_RES(STR_ORDER_ASCENDING);
+            m_sDescendingText = DBA_RES(STR_ORDER_DESCENDING);
 
             // the "sort order" column
-            OUString sColumnName = ModuleRes(STR_TAB_INDEX_SORTORDER);
+            OUString sColumnName = DBA_RES(STR_TAB_INDEX_SORTORDER);
             // the width of the order column is the maximum widths of the texts used
             // (the title of the column)
             sal_Int32 nSortOrderColumnWidth = GetTextWidth(sColumnName);
@@ -228,7 +230,7 @@ namespace dbaui
         nFieldNameWidth -= aSystemStyle.GetScrollBarSize();
         nFieldNameWidth -= 8;
         // the "field name" column
-        OUString sColumnName = ModuleRes(STR_TAB_INDEX_FIELD);
+        OUString sColumnName = DBA_RES(STR_TAB_INDEX_FIELD);
         InsertDataColumn(COLUMN_ID_FIELDNAME, sColumnName, nFieldNameWidth, HeaderBarItemBits::STDSTYLE, 0);
 
         // create the cell controllers
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index c42e3d70d192..aa230db58365 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -17,15 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "paramdialog.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "commontypes.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/util/NumberFormatter.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbtools.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/layout.hxx>
 #include <osl/diagnose.h>
@@ -197,7 +200,7 @@ namespace dbaui
                         DBG_UNHANDLED_EXCEPTION();
                     }
 
-                    OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
+                    OUString sMessage(DBA_RES(STR_COULD_NOT_CONVERT_PARAM));
                     sMessage = sMessage.replaceAll( "$name$", sName );
                     ScopedVclPtrInstance<MessageDialog>(nullptr, sMessage)->Execute();
                     m_pParam->GrabFocus();
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
deleted file mode 100644
index bd0bf0be883a..000000000000
--- a/dbaccess/source/ui/dlg/paramdialog.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 "dbu_dlg.hrc"
-
-String STR_COULD_NOT_CONVERT_PARAM
-{
-    Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\" parameter";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index a2f7c04fdd24..c9678ac2bfda 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "queryfilter.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -35,7 +35,8 @@
 #include <osl/diagnose.h>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 5e3c1205a07c..cdf545f7fd98 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -17,14 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
 #include "queryorder.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <tools/debug.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
@@ -49,7 +51,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent,
     const Reference< XSingleSelectQueryComposer >& _rxComposer,
     const Reference< XNameAccess>& _rxCols)
     : ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui")
-    , aSTR_NOENTRY(ModuleRes(STR_VALUE_NONE))
+    , aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE))
     , m_xQueryComposer(_rxComposer)
     , m_xColumns(_rxCols)
     , m_xConnection(_rxConnection)
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index b4a95c461dd4..0a8fa07cfd46 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -17,8 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "sqlmessage.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
@@ -34,7 +36,7 @@
 #include <sfx2/sfxuno.hxx>
 #include "dbaccess_helpid.hrc"
 #include "UITools.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <tools/urlobj.hxx>
 
@@ -82,8 +84,8 @@ namespace
     private:
         OUString  m_label;
     public:
-        explicit LabelProvider( sal_uInt16 _labelResourceID )
-            :m_label( ModuleRes( _labelResourceID ) )
+        explicit LabelProvider(const char* labelResourceID)
+            : m_label(DBA_RES(labelResourceID))
         {
         }
 
@@ -137,25 +139,25 @@ namespace
         std::shared_ptr< LabelProvider > const & getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
         {
             std::shared_ptr< LabelProvider >* ppProvider( &m_pErrorLabel );
-            sal_uInt16 nLabelID( STR_EXCEPTION_ERROR );
+            const char* pLabelID( STR_EXCEPTION_ERROR );
 
             switch ( _eType )
             {
             case SQLExceptionInfo::TYPE::SQLWarning:
                 ppProvider = &m_pWarningsLabel;
-                nLabelID = STR_EXCEPTION_WARNING;
+                pLabelID = STR_EXCEPTION_WARNING;
                 break;
 
             case SQLExceptionInfo::TYPE::SQLContext:
                 ppProvider = &m_pInfoLabel;
-                nLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO;
+                pLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO;
                 break;
             default:
                 break;
             }
 
             if ( !ppProvider->get() )
-                ppProvider->reset( new LabelProvider( nLabelID ) );
+                ppProvider->reset( new LabelProvider( pLabelID ) );
             return *ppProvider;
         }
 
@@ -312,8 +314,8 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
     m_pExceptionText->set_width_request(aTextSize.Width());
     m_pExceptionText->set_height_request(aTextSize.Height());
 
-    m_sStatusLabel = ModuleRes( STR_EXCEPTION_STATUS );
-    m_sErrorCodeLabel = ModuleRes( STR_EXCEPTION_ERRORCODE );
+    m_sStatusLabel = DBA_RES( STR_EXCEPTION_STATUS );
+    m_sErrorCodeLabel = DBA_RES( STR_EXCEPTION_ERRORCODE );
 
     m_pExceptionList->SetSelectionMode(SelectionMode::Single);
     m_pExceptionList->SetDragDropMode(DragDropMode::NONE);
@@ -342,7 +344,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
         ProviderFactory aProviderFactory;
 
         ExceptionDisplayInfo aInfo22018;
-        aInfo22018.sMessage = ModuleRes( STR_EXPLAN_STRINGCONVERSION_ERROR );
+        aInfo22018.sMessage = DBA_RES( STR_EXPLAN_STRINGCONVERSION_ERROR );
         aInfo22018.pLabelProvider = aProviderFactory.getLabelProvider( SQLExceptionInfo::TYPE::SQLContext, false );
         aInfo22018.pImageProvider = aProviderFactory.getImageProvider( SQLExceptionInfo::TYPE::SQLContext );
         m_aExceptions.push_back( aInfo22018 );
@@ -690,13 +692,13 @@ IMPL_LINK_NOARG( OSQLMessageBox, ButtonClickHdl, Button *, void )
 // OSQLWarningBox
 OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
     const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
-    :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo )
+    :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo )
 {
 }
 
 // OSQLErrorBox
 OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage )
-    :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr )
+    :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr )
 {
 }
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
deleted file mode 100644
index 7a288b5e7f87..000000000000
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ /dev/null
@@ -1,58 +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 "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-
-String STR_EXCEPTION_STATUS
-{
-    Text [ en-US ] = "SQL Status";
-};
-
-String STR_EXCEPTION_ERRORCODE
-{
-    Text [ en-US ] = "Error code";
-};
-
-String STR_EXPLAN_STRINGCONVERSION_ERROR
-{
-    Text [ en-US ] = "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties.";
-};
-
-String STR_EXCEPTION_ERROR
-{
-    Text [ en-US ] = "Error";
-};
-
-String STR_EXCEPTION_WARNING
-{
-    Text [ en-US ] = "Warning";
-};
-
-String STR_EXCEPTION_INFO
-{
-    Text [ en-US ] = "Information";
-};
-
-String STR_EXCEPTION_DETAILS
-{
-    Text [ en-US ] = "Details";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 36be59392b21..88bd74ebb347 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "tablespage.hxx"
-#include "dbu_dlg.hrc"
+#include "dbu_dlg.hxx"
 #include "dsitems.hxx"
 #include "browserids.hxx"
 #include "datasourceconnector.hxx"
@@ -28,7 +28,8 @@
 #include "stringlistitem.hxx"
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/waitobj.hxx>
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 6c741ad71424..f2e0d8b8718a 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -19,10 +19,10 @@
 
 #include "textconnectionsettings.hxx"
 #include "TextConnectionHelper.hxx"
-#include "dbu_resource.hrc"
-#include "moduledbu.hxx"
+#include "dbu_pageids.hxx"
+#include "core_resource.hxx"
 #include "dsitems.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 
 #include <vcl/msgbox.hxx>
 
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 0603efee7195..6691a05c897a 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -23,18 +23,18 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include "SqlNameEdit.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
 
     class OPropColumnEditCtrl : public OSQLNameEdit
     {
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         short                m_nPos;
         OUString             m_strHelpText;
     public:
-        OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
@@ -44,12 +44,12 @@ namespace dbaui
 
     class OPropEditCtrl :   public Edit
     {
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         short                m_nPos;
         OUString             m_strHelpText;
 
     public:
-        OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
@@ -63,7 +63,7 @@ namespace dbaui
         OUString  m_strHelpText;
 
     public:
-        OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
@@ -79,7 +79,7 @@ namespace dbaui
         OUString  m_strHelpText;
 
     public:
-        OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
         bool IsModified() const { return IsValueChangedFromSaved(); }
 
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 495a1e6428c7..7abbda015b36 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -133,8 +133,8 @@ namespace dbaui
 
         bool                isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
         void                Contruct();
-        VclPtr<OPropNumericEditCtrl> CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId);
-        VclPtr<FixedText>   CreateText(sal_uInt16 _nTextRes);
+        VclPtr<OPropNumericEditCtrl> CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId);
+        VclPtr<FixedText>   CreateText(const char* pTextRes);
         void                InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler);
 
     protected:
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 18f90fcc300a..cbea8346b2b0 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX
 
 #include <svl/undo.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
@@ -29,13 +29,13 @@ namespace dbaui
 
     class OCommentUndoAction : public SfxUndoAction
     {
-        OModuleClient    m_aModuleClient;
+        dbaccess::OModuleClient    m_aModuleClient;
 
     protected:
         OUString         m_strComment; // undo, redo comment
 
     public:
-        OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); }
+        OCommentUndoAction(const char* pCommentID) { m_strComment = DBA_RES(pCommentID); }
 
         virtual OUString GetComment() const override { return m_strComment; }
     };
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index ffe027d59f54..4af8a9846100 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -21,7 +21,7 @@
 
 #include "singledoccontroller.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "JoinTableView.hxx"
 #include "JoinDesignView.hxx"
 #include "TableConnectionData.hxx"
@@ -43,7 +43,7 @@ namespace dbaui
 
     class OJoinController : public OJoinController_BASE
     {
-        OModuleClient                    m_aModuleClient;
+        dbaccess::OModuleClient                    m_aModuleClient;
     protected:
         TTableConnectionData m_vTableConnectionData;
         TTableWindowData     m_vTableData;
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 469b5636c33e..46749fc1e3ec 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -26,7 +26,7 @@
 #include <vcl/msgbox.hxx>
 #include "JoinTableView.hxx"
 #include "RelControliFace.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "RelationControl.hxx"
 
 namespace dbaui
@@ -35,7 +35,7 @@ namespace dbaui
     class ORelationDialog : public ModalDialog
                             ,public IRelationControlInterface
     {
-        OModuleClient                           m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<OTableListBoxControl> m_xTableControl;
         OJoinTableView::OTableWindowMap*        m_pTableMap;
 
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 4629155ca21c..613b8422ca7e 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX
 
 #include "singledoccontroller.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
@@ -38,7 +38,7 @@ namespace dbaui
     class OTableController : public OTableController_BASE
     {
     private:
-        OModuleClient                                   m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         std::vector< std::shared_ptr<OTableRow> > m_vRowList;
         OTypeInfoMap                                    m_aTypeInfo;
         std::vector<OTypeInfoMap::iterator>           m_aTypeInfoIndex;
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ed0fd74deb74..ee4850107f43 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 class Edit;
 namespace dbaui
@@ -43,7 +43,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox
 
     typedef std::map<OUString, TPrivileges> TTablePrivilegeMap;
 
-    OModuleClient        m_aModuleClient;
+    dbaccess::OModuleClient        m_aModuleClient;
 
     css::uno::Reference< css::container::XNameAccess >    m_xUsers;
     css::uno::Reference< css::container::XNameAccess >    m_xTables;
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index a9bb0effd649..1ef136e58abf 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX
 
 #include "DExport.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "commontypes.hxx"
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -183,7 +183,7 @@ namespace dbaui
 
     class ORowSetImportExport : public ODatabaseImportExport
     {
-        OModuleClient               m_aModuleClient;
+        dbaccess::OModuleClient   m_aModuleClient;
         std::vector<sal_Int32>    m_aColumnMapping;
         std::vector<sal_Int32>    m_aColumnTypes;
         css::uno::Reference< css::sdbc::XResultSetUpdate >    m_xTargetResultSetUpdate;
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 91d116c3b685..4dae7caf265f 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -309,9 +309,9 @@ namespace dbaui
     /** returns the result of the user action when view the query dialog.
         @param  _pParent
             The parent of the dialog
-        @param  _nTitle
+        @param  pTitle
             A string resource id for the text which will be displayed as title.
-        @param  _nText
+        @param  pText
             A string resource id for the text which will be displayed above the buttons.
             When the string contains a #1. This will be replaced by the name.
         @param  _bAll
@@ -321,7 +321,7 @@ namespace dbaui
         @return
             RET_YES, RET_NO, RET_ALL
     */
-    sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName);
+    sal_Int32 askForUserAction(vcl::Window* _pParent, const char* pTitle, const char* pText, bool _bAll, const OUString& _sName);
 
     /** creates a new view from a query or table
         @param  _sName
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 81cafa3360b2..5c1ced4d136a 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -24,7 +24,7 @@
 #include "dsntypes.hxx"
 #include "IItemSetHelper.hxx"
 #include <comphelper/uno3.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <memory>
 
 namespace com { namespace sun { namespace star {
@@ -43,9 +43,9 @@ namespace dbaui
 
     /** implements the user admin dialog
     */
-    class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
+    class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
     {
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
         SfxItemSet*   m_pItemSet;
         css::uno::Reference< css::sdbc::XConnection>          m_xConnection;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 3e94b4f41cb1..5ac918089a28 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX
 
 #include "IItemSetHelper.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <sfx2/tabdlg.hxx>
 
@@ -38,7 +38,7 @@ namespace dbaui
                                     ,public IItemSetHelper
                                     ,public IDatabaseSettingsDialog
     {
-        OModuleClient                                       m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
     protected:
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index ae53e8ee88a6..f0f5160ae75b 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX
 
 #include <dbaccess/genericcontroller.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "brwview.hxx"
 #include "sbagrid.hxx"
 
@@ -76,7 +76,7 @@ namespace dbaui
         // for implementing the XFormController
         class FormControllerImpl;
         friend class FormControllerImpl;
-        OModuleClient                                         m_aModuleClient;
+        dbaccess::OModuleClient                               m_aModuleClient;
 
         css::uno::Reference< css::sdbc::XRowSet >             m_xRowSet;      // our rowset
         css::uno::Reference< css::sdbcx::XColumnsSupplier >   m_xColumnsSupplier; // queried from the rowset member
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 5b51cf707a1a..f8701058b4e6 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -22,8 +22,6 @@
 
 #include <vcl/window.hxx>
 
-#include <tools/resid.hxx>
-
 #include <com/sun/star/awt/PosSize.hpp>
 #include <dbaccess/dataview.hxx>
 #include <unotools/eventlisteneradapter.hxx>
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 8d6771ad6039..5bce762d0c68 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -29,9 +29,7 @@ namespace dbaui
 
     // OCharsetDisplay
     typedef ::dbtools::OCharsetMap OCharsetDisplay_Base;
-    class OCharsetDisplay
-            :protected OCharsetDisplay_Base
-            ,protected SvxTextEncodingTable
+    class OCharsetDisplay : protected OCharsetDisplay_Base
     {
     protected:
         OUString m_aSystemDisplayName;
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 39d664240dc2..215b6c760d22 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -97,7 +97,7 @@ public:
 
 protected:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(sal_uInt16 _nPageId,sal_uInt16 _nTextId,CreateTabPage pCreateFunc);
+    void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc);
 
     virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override;
     virtual short Ok() override;
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 100e21839e95..695a6a3e2734 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
 
 #include "ScrollHelper.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -51,7 +51,7 @@ namespace dbaui
     class IContextMenuProvider;
     class DBTreeListBox     :public SvTreeListBox
     {
-        OModuleClient               m_aModuleClient;
+        dbaccess::OModuleClient     m_aModuleClient;
         OScrollHelper               m_aScrollHelper;
         Timer                       m_aTimer; // is needed for table updates
         Point                       m_aMousePos;
diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc
deleted file mode 100644
index e9db2315c125..000000000000
--- a/dbaccess/source/ui/inc/dbu_brw.hrc
+++ /dev/null
@@ -1,46 +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_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
-
-#include "dbu_resource.hrc"
-
-    // FREE                                 RID_STR_BRW_START +  0
-#define SBA_BROWSER_SETTING_ORDER           RID_STR_BRW_START +  2
-#define SBA_BROWSER_SETTING_FILTER          RID_STR_BRW_START +  3
-#define STR_DATASOURCE_GRIDCONTROL_DESC     RID_STR_BRW_START +  4
-#define RID_STR_UNDO_MODIFY_RECORD          RID_STR_BRW_START +  5
-#define STR_NO_COLUMNNAME_MATCHING          RID_STR_BRW_START +  6
-#define RID_STR_SAVE_CURRENT_RECORD         RID_STR_BRW_START +  7
-#define STR_DATASOURCE_GRIDCONTROL_NAME     RID_STR_BRW_START +  8
-#define STR_OPENTABLES_WARNINGS             RID_STR_BRW_START +  9
-#define STR_OPENTABLES_WARNINGS_DETAILS     RID_STR_BRW_START + 10
-#define STR_CONNECTING_DATASOURCE           RID_STR_BRW_START + 11
-#define STR_LOADING_QUERY                   RID_STR_BRW_START + 12
-#define STR_LOADING_TABLE                   RID_STR_BRW_START + 13
-
-// please adjust checking before insert new strings
-
-#if STR_LOADING_TABLE > RID_STR_BRW_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc
deleted file mode 100644
index 8ae4595b628e..000000000000
--- a/dbaccess/source/ui/inc/dbu_control.hrc
+++ /dev/null
@@ -1,45 +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_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_TABLE_PRIV_NAME                 RID_STR_CONTROL_START
-#define STR_TABLE_PRIV_INSERT               RID_STR_CONTROL_START +  1
-#define STR_TABLE_PRIV_DELETE               RID_STR_CONTROL_START +  2
-#define STR_TABLE_PRIV_UPDATE               RID_STR_CONTROL_START +  3
-#define STR_TABLE_PRIV_ALTER                RID_STR_CONTROL_START +  4
-#define STR_TABLE_PRIV_REFERENCE            RID_STR_CONTROL_START +  5
-#define STR_TABLE_PRIV_DROP                 RID_STR_CONTROL_START +  6
-#define STR_TABLE_PRIV_SELECT               RID_STR_CONTROL_START +  7
-#define STR_ALL_TABLES_AND_VIEWS            RID_STR_CONTROL_START +  8
-#define STR_NOTABLEINFO                     RID_STR_CONTROL_START + 11
-#define STR_ALL_TABLES                      RID_STR_CONTROL_START + 12
-#define STR_ALL_VIEWS                       RID_STR_CONTROL_START + 13
-
-// please adjust checking before insert new strings
-
-#if STR_ALL_VIEWS > RID_STR_CONTROL_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
deleted file mode 100644
index 960c175a3ff6..000000000000
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ /dev/null
@@ -1,155 +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_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
-
-#include "dbu_resource.hrc"
-
-#define PAGE_X              281
-#define PAGE_Y              215
-#define WIZARD_PAGE_X       225
-#define WIZARD_PAGE_Y       240
-
-//constants for the wizards
-#define INDENT_BELOW_RADIO   10
-
-#define STR_PARENTTITLE_GENERAL             RID_STR_DLG_START + 0
-    // FREE
-    // FREE
-    // FREE
-    // FREE
-    // FREE
-    // FREE
-#define STR_ERROR_PASSWORDS_NOT_IDENTICAL   RID_STR_DLG_START + 7
-#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME  RID_STR_DLG_START + 8
-    // FREE
-    // FREE
-#define STR_ERR_USE_CONNECT_TO              RID_STR_DLG_START + 11
-#define STR_ALREADYEXISTOVERWRITE           RID_STR_DLG_START + 12
-#define STR_COULD_NOT_LOAD_ODBC_LIB         RID_STR_DLG_START + 13
-#define STR_INDEX_NAME_ALREADY_USED         RID_STR_DLG_START + 14
-#define STR_ASK_FOR_DIRECTORY_CREATION      RID_STR_DLG_START + 15
-#define STR_COULD_NOT_CREATE_DIRECTORY      RID_STR_DLG_START + 16
-#define STR_UNSUPPORTED_DATASOURCE_TYPE     RID_STR_DLG_START + 17
-    // FREE
-    // FREE
-    // FREE
-    // FREE
-    // FREE
-#define STR_COMMAND_EXECUTED_SUCCESSFULLY   RID_STR_DLG_START + 23
-#define STR_DIRECTSQL_CONNECTIONLOST        RID_STR_DLG_START + 24
-#define STR_ADD_TABLES                      RID_STR_DLG_START + 25
-#define STR_ADD_TABLE_OR_QUERY              RID_STR_DLG_START + 26
-#define STR_USERADMIN_NOT_AVAILABLE         RID_STR_DLG_START + 27
-#define STR_TAB_INDEX_SORTORDER             RID_STR_DLG_START + 28
-#define STR_TAB_INDEX_FIELD                 RID_STR_DLG_START + 29
-#define STR_ORDER_ASCENDING                 RID_STR_DLG_START + 30
-#define STR_ORDER_DESCENDING                RID_STR_DLG_START + 31
-#define STR_CONFIRM_DROP_INDEX              RID_STR_DLG_START + 32
-#define STR_LOGICAL_INDEX_NAME              RID_STR_DLG_START + 33
-#define STR_CONNECTION_TEST                 RID_STR_DLG_START + 34
-#define STR_CONNECTION_SUCCESS              RID_STR_DLG_START + 35
-    // FREE
-#define STR_JDBCDRIVER_SUCCESS              RID_STR_DLG_START + 37
-#define STR_JDBCDRIVER_NO_SUCCESS           RID_STR_DLG_START + 38
-#define STR_MSACCESS_FILTERNAME             RID_STR_DLG_START + 39
-#define STR_CONNECTION_NO_SUCCESS           RID_STR_DLG_START + 40
-#define STR_DBASE_PATH_OR_FILE              RID_STR_DLG_START + 41
-#define STR_TEXT_HEADERTEXT                 RID_STR_DLG_START + 42
-#define STR_TEXT_HELPTEXT                   RID_STR_DLG_START + 43
-#define STR_TEXT_PATH_OR_FILE               RID_STR_DLG_START + 45
-#define STR_FLAT_PATH_OR_FILE               RID_STR_DLG_START + 46
-#define STR_CALC_PATH_OR_FILE               RID_STR_DLG_START + 47
-#define STR_NAME_OF_ODBC_DATASOURCE         RID_STR_DLG_START + 48
-#define STR_MYSQL_DATABASE_NAME             RID_STR_DLG_START + 49
-#define STR_ORACLE_DATABASE_NAME            RID_STR_DLG_START + 50
-#define STR_WRITER_PATH_OR_FILE             RID_STR_DLG_START + 51
-#define STR_MSACCESS_MDB_FILE               RID_STR_DLG_START + 52
-#define STR_COMMONURL                       RID_STR_DLG_START + 53
-#define STR_DATABASEDEFAULTNAME             RID_STR_DLG_START + 54
-#define STR_EXCEPTION_ERRORCODE             RID_STR_DLG_START + 55
-#define STR_NO_ADDITIONAL_SETTINGS          RID_STR_DLG_START + 56
-#define STR_HOSTNAME                        RID_STR_DLG_START + 57
-#define STR_EXCEPTION_STATUS                RID_STR_DLG_START + 58
-#define STR_MOZILLA_PROFILE_NAME            RID_STR_DLG_START + 59
-#define STR_THUNDERBIRD_PROFILE_NAME        RID_STR_DLG_START + 60
-#define STR_EXPLAN_STRINGCONVERSION_ERROR   RID_STR_DLG_START + 61
-#define STR_EXCEPTION_ERROR                 RID_STR_DLG_START + 62
-#define STR_EXCEPTION_WARNING               RID_STR_DLG_START + 63
-#define STR_EXCEPTION_INFO                  RID_STR_DLG_START + 64
-#define STR_EXCEPTION_DETAILS               RID_STR_DLG_START + 65
-#define STR_MSACCESS_2007_FILTERNAME        RID_STR_DLG_START + 66
-#define STR_FIREBIRD_FILTERNAME             RID_STR_DLG_START + 67
-
-#define STR_DBWIZARDTITLE                   RID_STR_DLG_START + 68
-#define STR_PAGETITLE_INTROPAGE             RID_STR_DLG_START + 69
-#define STR_PAGETITLE_DBASE                 RID_STR_DLG_START + 70
-#define STR_PAGETITLE_TEXT                  RID_STR_DLG_START + 71
-#define STR_PAGETITLE_MSACCESS              RID_STR_DLG_START + 72
-#define STR_PAGETITLE_LDAP                  RID_STR_DLG_START + 73
-#define STR_PAGETITLE_ADO                   RID_STR_DLG_START + 74
-#define STR_PAGETITLE_JDBC                  RID_STR_DLG_START + 75
-#define STR_PAGETITLE_ORACLE                RID_STR_DLG_START + 76
-#define STR_PAGETITLE_MYSQL                 RID_STR_DLG_START + 77
-#define STR_PAGETITLE_ODBC                  RID_STR_DLG_START + 78
-#define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET RID_STR_DLG_START + 79
-#define STR_PAGETITLE_AUTHENTIFICATION      RID_STR_DLG_START + 80
-#define STR_PAGETITLE_MYSQL_NATIVE          RID_STR_DLG_START + 81
-#define STR_PAGETITLE_FINAL                 RID_STR_DLG_START + 82
-
-#define STR_DBASE_HEADERTEXT                RID_STR_DLG_START + 83
-#define STR_DBASE_HELPTEXT                  RID_STR_DLG_START + 84
-
-#define STR_MSACCESS_HEADERTEXT             RID_STR_DLG_START + 85
-#define STR_MSACCESS_HELPTEXT               RID_STR_DLG_START + 86
-
-#define STR_ADO_HEADERTEXT                  RID_STR_DLG_START + 87
-#define STR_ADO_HELPTEXT                    RID_STR_DLG_START + 88
-
-#define STR_ODBC_HEADERTEXT                 RID_STR_DLG_START + 89
-#define STR_ODBC_HELPTEXT                   RID_STR_DLG_START + 90
-
-#define STR_JDBC_HEADERTEXT                 RID_STR_DLG_START + 91
-#define STR_JDBC_HELPTEXT                   RID_STR_DLG_START + 92
-
-#define STR_MYSQLJDBC_HEADERTEXT            RID_STR_DLG_START + 93
-#define STR_MYSQLJDBC_HELPTEXT              RID_STR_DLG_START + 94
-#define STR_MYSQL_DRIVERCLASSTEXT           RID_STR_DLG_START + 95
-#define STR_MYSQL_DEFAULT                   RID_STR_DLG_START + 96
-
-#define STR_ORACLE_HEADERTEXT               RID_STR_DLG_START + 97
-#define STR_ORACLE_DEFAULT                  RID_STR_DLG_START + 98
-#define STR_ORACLE_DRIVERCLASSTEXT          RID_STR_DLG_START + 99
-#define STR_ORACLE_HELPTEXT                 RID_STR_DLG_START + 100
-
-#define STR_DATABASE_TYPE_CHANGE            RID_STR_DLG_START + 101
-
-#define STR_COULD_NOT_CONVERT_PARAM         RID_STR_DLG_START + 102
-
-// please adjust checking before insert new strings
-
-#define LAST_STR_HERE                       RID_STR_DLG_START + 103
-
-#if LAST_STR_HERE > RID_STR_DLG_END
-#error Resource-Id Overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/ui/inc/dbu_dlg.hxx
index 5d9b36fc4f28..2990728ff047 100644
--- a/dbaccess/source/core/inc/dbamiscres.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hxx
@@ -16,13 +16,18 @@
  *   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_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
 
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
-#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
+#include "dbu_pageids.hxx"
 
-#define STR_MYSQL_NATIVE        24
+#define PAGE_X              281
+#define PAGE_Y              215
+#define WIZARD_PAGE_X       225
+#define WIZARD_PAGE_Y       240
 
-#define STR_END                 STR_MYSQL_NATIVE + 1
+//constants for the wizards
+#define INDENT_BELOW_RADIO   10
 
 #endif
 
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
deleted file mode 100644
index ae37b93478f1..000000000000
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ /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/.
- *
- * 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_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_WIZ_COLUMN_SELECT_TITEL         RID_STR_MISC_START +  2
-#define STR_WIZ_TYPE_SELECT_TITEL           RID_STR_MISC_START +  3
-#define STR_WIZ_NAME_ALREADY_DEFINED        RID_STR_MISC_START +  4
-#define STR_WIZ_NAME_MATCHING_TITEL         RID_STR_MISC_START +  5
-#define STR_WIZ_TABLE_COPY                  RID_STR_MISC_START +  6
-#define STR_COPYTABLE_TITLE_COPY            RID_STR_MISC_START +  7
-#define STR_COULDNOTOPEN_LINKEDDOC          RID_STR_MISC_START +  8
-#define STR_SUGGEST_APPEND_TABLE_DATA       RID_STR_MISC_START +  9
-#define STR_UNDO_COLON                      RID_STR_MISC_START + 10
-#define STR_REDO_COLON                      RID_STR_MISC_START + 11
-#define STR_UNKNOWN_TYPE_FOUND              RID_STR_MISC_START + 12
-#define STR_FILE_DOES_NOT_EXIST             RID_STR_MISC_START + 13
-#define STR_WARNINGS_DURING_CONNECT         RID_STR_MISC_START + 14
-#define STR_NAMED_OBJECT_ALREADY_EXISTS     RID_STR_MISC_START + 15
-#define STR_INVALID_TABLE_NAME              RID_STR_MISC_START + 16
-#define STR_INVALID_TABLE_NAME_LENGTH       RID_STR_MISC_START + 17
-
-#define STR_WIZ_PB_PREV                     RID_STR_MISC_START + 18
-#define STR_WIZ_PB_NEXT                     RID_STR_MISC_START + 19
-#define STR_WIZ_PB_OK                       RID_STR_MISC_START + 20
-
-// please adjust checking before insert new strings
-
-#if STR_INVALID_TABLE_NAME_LENGTH > RID_STR_MISC_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_pageids.hxx b/dbaccess/source/ui/inc/dbu_pageids.hxx
new file mode 100644
index 000000000000..710a582d933a
--- /dev/null
+++ b/dbaccess/source/ui/inc/dbu_pageids.hxx
@@ -0,0 +1,38 @@
+/* -*- 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_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
+
+// tab pages
+
+#define PAGE_DBASE           1001
+#define PAGE_ODBC            1003
+#define PAGE_TEXT            1004
+#define PAGE_ADO             1007
+#define PAGE_LDAP            1015
+#define PAGE_MYSQL_ODBC      1017
+#define PAGE_USERDRIVER      1019
+#define PAGE_MYSQL_JDBC      1020
+#define PAGE_MYSQL_NATIVE    1024
+#define PAGE_ORACLE_JDBC     1027
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc
deleted file mode 100644
index 306fd9fb6057..000000000000
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ /dev/null
@@ -1,78 +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_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_QUERY_UNDO_MOVETABWIN           RID_STR_QRY_START + 2
-#define STR_QUERY_UNDO_SIZETABWIN           RID_STR_QRY_START + 3
-#define STR_QUERY_UNDO_INSERTCONNECTION     RID_STR_QRY_START + 4
-#define STR_QUERY_UNDO_REMOVECONNECTION     RID_STR_QRY_START + 5
-#define STR_QUERY_UNDO_TABWINSHOW           RID_STR_QRY_START + 6
-#define STR_QUERY_UNDO_TABWINDELETE         RID_STR_QRY_START + 7
-#define STR_QUERY_UNDO_MODIFY_CELL          RID_STR_QRY_START + 8
-#define STR_QUERY_UNDO_SIZE_COLUMN          RID_STR_QRY_START + 9
-#define STR_QUERY_UNDO_TABFIELDDELETE       RID_STR_QRY_START + 10
-#define STR_QUERY_UNDO_TABFIELDCREATE       RID_STR_QRY_START + 11
-#define STR_QRY_TOOCOMPLEX                  RID_STR_QRY_START + 12
-#define RID_STR_FIELD_DOESNT_EXIST          RID_STR_QRY_START + 14
-#define STR_QUERY_INNER_JOIN                RID_STR_QRY_START + 16
-#define STR_QUERY_LEFTRIGHT_JOIN            RID_STR_QRY_START + 17
-#define STR_QUERY_FULL_JOIN                 RID_STR_QRY_START + 18
-#define STR_QUERY_SORTTEXT                  RID_STR_QRY_START + 19
-#define STR_QUERY_FUNCTIONS                 RID_STR_QRY_START + 20
-#define STR_QUERY_NOTABLE                   RID_STR_QRY_START + 21
-#define STR_QRY_ORDERBY_UNRELATED           RID_STR_QRY_START + 22
-#define STR_QUERY_HANDLETEXT                RID_STR_QRY_START + 23
-#define STR_QUERY_LIMIT_ALL                 RID_STR_QRY_START + 24
-// free
-#define STR_QRY_TOO_MANY_COLUMNS            RID_STR_QRY_START + 26
-#define STR_SVT_SQL_SYNTAX_ERROR            RID_STR_QRY_START + 27
-#define STR_QUERYDESIGN_NO_VIEW_SUPPORT     RID_STR_QRY_START + 28
-#define STR_QUERYDESIGN_NO_VIEW_ASK         RID_STR_QRY_START + 29
-#define STR_QRY_NOSELECT                    RID_STR_QRY_START + 30
-#define STR_QRY_COLUMN_NOT_FOUND            RID_STR_QRY_START + 31
-#define STR_QRY_JOIN_COLUMN_COMPARE         RID_STR_QRY_START + 32
-#define STR_QRY_LIKE_LEFT_NO_COLUMN         RID_STR_QRY_START + 33
-#define STR_QRY_CHECK_CASESENSITIVE         RID_STR_QRY_START + 34
-#define STR_QUERY_UNDO_TABFIELDMOVED        RID_STR_QRY_START + 35
-#define STR_QRY_ILLEGAL_JOIN                RID_STR_QRY_START + 36
-#define STR_QRY_TOO_LONG_STATEMENT          RID_STR_QRY_START + 37
-#define STR_QRY_SYNTAX                      RID_STR_QRY_START + 38
-#define STR_QRY_NATIVE                      RID_STR_QRY_START + 39
-#define STR_QRY_TOO_MANY_TABLES             RID_STR_QRY_START + 40
-// empty
-#define STR_JOIN_TYPE_HINT                  RID_STR_QRY_START + 44
-#define STR_QUERY_SAVEMODIFIED              RID_STR_QRY_START + 45
-#define STR_ERROR_PARSING_STATEMENT         RID_STR_QRY_START + 46
-#define STR_INFO_OPENING_IN_SQL_VIEW        RID_STR_QRY_START + 47
-#define STR_STATEMENT_WITHOUT_RESULT_SET    RID_STR_QRY_START + 48
-// empty
-#define STR_NO_ALTER_VIEW_SUPPORT           RID_STR_QRY_START + 50
-#define STR_QUERY_CROSS_JOIN                RID_STR_QRY_START + 51
-    // please adjust checking when inserting new strings
-
-#if STR_QUERY_CROSS_JOIN > RID_STR_QRY_END
-#error resource id overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc
deleted file mode 100644
index f8586e40f8cd..000000000000
--- a/dbaccess/source/ui/inc/dbu_rel.hrc
+++ /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/.
- *
- * 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_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_QUERY_REL_EDIT_RELATION         RID_STR_REL_START
-#define STR_RELATIONDESIGN                  RID_STR_REL_START + 1
-#define STR_RELATIONDESIGN_NOT_AVAILABLE    RID_STR_REL_START + 2
-#define STR_QUERY_REL_DELETE_WINDOW         RID_STR_REL_START + 3
-#define STR_QUERY_REL_EDIT                  RID_STR_REL_START + 4
-#define STR_QUERY_REL_CREATE                RID_STR_REL_START + 5
-#define STR_QUERY_REL_COULD_NOT_CREATE      RID_STR_REL_START + 6
-// please adjust checking before insert new strings
-
-#if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
deleted file mode 100644
index d339c94cf65f..000000000000
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ /dev/null
@@ -1,172 +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_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_PAGE_START                  RID_DBACCESS_START
-#define RID_ERRORBOX_START              RID_DBACCESS_START
-#define RID_QUERYBOX_START              RID_DBACCESS_START
-#define RID_TOOLBOX_START               RID_DBACCESS_START
-#define RID_BITMAP_START                RID_DBACCESS_START
-#define RID_IMAGE_START                 RID_DBACCESS_START
-#define RID_IMAGELIST_START             RID_DBACCESS_START
-#define RID_MENU_START                  RID_DBACCESS_START
-#define RID_STRING_START                RID_DBACCESS_START
-#define RID_UNTYPED_START               RID_DBACCESS_START
-#define RID_WARN_START                  RID_DBACCESS_START
-#define RID_CONTROL_START               RID_DBACCESS_START
-#define RID_MISC_START                  RID_DBACCESS_START
-
-// new defines to make the strings folder specific
-#define RID_STR_BRW_START               RID_DBACCESS_START
-#define RID_STR_BRW_END                 RID_STR_BRW_START       + 40    //   0 -  39
-
-#define RID_STR_CONTROL_START           RID_STR_BRW_END
-#define RID_STR_CONTROL_END             RID_STR_CONTROL_START   + 30    //  40 -  69
-
-#define RID_STR_DLG_START               RID_STR_CONTROL_END
-#define RID_STR_DLG_END                 RID_STR_DLG_START       + 144    //  70 - 183 + 30 free
-
-#define RID_STR_MISC_START              RID_STR_DLG_END
-#define RID_STR_MISC_END                RID_STR_MISC_START      + 20    // 214 - 233
-
-#define RID_STR_QRY_START               RID_STR_MISC_END
-#define RID_STR_QRY_END                 RID_STR_QRY_START       + 80    // 234 - 313
-
-#define RID_STR_TBL_START               RID_STR_QRY_END
-#define RID_STR_TBL_END                 RID_STR_TBL_START       + 80    // 314 - 393
-
-#define RID_STR_REL_START               RID_STR_TBL_END
-#define RID_STR_REL_END                 RID_STR_REL_START       + 10    // 394 - 413
-
-#define RID_STR_UNO_START               RID_STR_REL_END
-#define RID_STR_UNO_END                 RID_STR_UNO_START       + 20    // 414 - 433
-
-#define RID_STR_GEN_START               RID_STR_UNO_END
-#define RID_STR_GEN_END                 RID_STR_GEN_START       + 75    // 434 - 503
-
-#define RID_STR_APP_START               RID_STR_GEN_END
-#define RID_STR_APP_END                 RID_STR_APP_START       + 50    // 504 - 543
-
-#if RID_STR_GEN_END > RID_DBACCESS_END
-#error Resource ID overflow in #file, #line
-#endif
-
-// tab pages
-
-    // FREE
-#define PAGE_DBASE                      RID_PAGE_START +  1
-#define PAGE_ODBC                       RID_PAGE_START +  3
-#define PAGE_TEXT                       RID_PAGE_START +  4
-    // FREE
-#define PAGE_ADO                        RID_PAGE_START +  7
-    // FREE
-    // FREE
-    // FREE
-#define PAGE_LDAP                       RID_PAGE_START + 15
-#define PAGE_MYSQL_ODBC                 RID_PAGE_START + 17
-#define PAGE_USERDRIVER                 RID_PAGE_START + 19
-#define PAGE_MYSQL_JDBC                 RID_PAGE_START + 20
-    // FREE
-    // FREE
-#define PAGE_MYSQL_NATIVE               RID_PAGE_START + 24
-    // FREE
-#define PAGE_ORACLE_JDBC                RID_PAGE_START + 27
-
-    // FREE
-
-// strings
-#define STR_TBL_TITLE                       RID_STR_GEN_START
-#define STR_ERROR_DURING_CREATION           RID_STR_GEN_START + 1
-#define RID_STR_CONNECTION_LOST             RID_STR_GEN_START + 2
-#define STR_NAME_ALREADY_EXISTS             RID_STR_GEN_START + 3
-#define STR_PAGETITLE_GENERAL               RID_STR_GEN_START + 4
-#define STR_TITLE_CONFIRM_DELETION          RID_STR_GEN_START + 5
-#define STR_TABLEDESIGN_DATASOURCE_DELETED  RID_STR_GEN_START + 7
-#define STR_TABLEDESIGN_DBFIELDTYPES        RID_STR_GEN_START + 8
-#define STR_QRY_CONTINUE                    RID_STR_GEN_START + 9
-#define STR_COLUMN_NAME                     RID_STR_GEN_START + 10
-#define STR_ERROR_OCCURRED_WHILE_COPYING    RID_STR_GEN_START + 11
-#define STR_MISSING_TABLES_XDROP            RID_STR_GEN_START + 12
-#define STR_QUERY_DELETE_TABLE              RID_STR_GEN_START + 13
-#define STR_BUTTON_TEXT_ALL                 RID_STR_GEN_START + 14
-#define STR_COULDNOTCREATE_DRIVERMANAGER    RID_STR_GEN_START + 15
-#define STR_UNEXPECTED_ERROR                RID_STR_GEN_START + 16
-#define STR_ENTER_CONNECTION_PASSWORD       RID_STR_GEN_START + 18
-#define STR_NOREGISTEREDDRIVER              RID_STR_GEN_START + 19
-#define STR_DATASOURCE_DELETED              RID_STR_GEN_START + 20
-#define STR_QUERY_UNDO_MODIFYSQLEDIT        RID_STR_GEN_START + 21
-#define STR_QRY_TITLE                       RID_STR_GEN_START + 22
-#define STR_VIEW_TITLE                      RID_STR_GEN_START + 23
-#define STR_SUB_DOCS_WITH_SCRIPTS           RID_STR_GEN_START + 24
-#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL    RID_STR_GEN_START + 25
-#define STR_TABLEDESIGN_DUPLICATE_NAME      RID_STR_GEN_START + 26
-#define STR_COULDNOTCONNECT_DATASOURCE      RID_STR_GEN_START + 27
-#define STR_NO_TABLE_FORMAT_INSIDE          RID_STR_GEN_START + 28
-#define RID_STR_QUERIES_CONTAINER           RID_STR_GEN_START + 29
-#define RID_STR_TABLES_CONTAINER            RID_STR_GEN_START + 30
-#define STR_NEW_FOLDER                      RID_STR_GEN_START + 31
-#define RID_STR_FORM                        RID_STR_GEN_START + 32
-#define RID_STR_REPORT                      RID_STR_GEN_START + 33
-#define STR_FRM_LABEL                       RID_STR_GEN_START + 34
-#define STR_RPT_LABEL                       RID_STR_GEN_START + 35
-#define STR_FOLDER_LABEL                    RID_STR_GEN_START + 36
-#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD    RID_STR_GEN_START + 37
-#define STR_TABLEDESIGN_NO_PRIM_KEY         RID_STR_GEN_START + 38
-#define STR_PAGETITLE_ADVANCED              RID_STR_GEN_START + 39
-#define RID_STR_EXTENSION_NOT_PRESENT       RID_STR_GEN_START + 40
-#define STR_PAGETITLE_CONNECTION            RID_STR_GEN_START + 41
-#define STR_TBL_LABEL                       RID_STR_GEN_START + 42
-#define STR_QRY_LABEL                       RID_STR_GEN_START + 44
-#define STR_TITLE_RENAME                    RID_STR_GEN_START + 45
-#define STR_TITLE_PASTE_AS                  RID_STR_GEN_START + 46
-#define STR_AUTOFIELDSEPARATORLIST          RID_STR_GEN_START + 47
-#define STR_AUTOTEXTSEPARATORLIST           RID_STR_GEN_START + 48
-#define STR_AUTOTEXT_FIELD_SEP_NONE         RID_STR_GEN_START + 49
-#define STR_AUTODELIMITER_MISSING           RID_STR_GEN_START + 50
-#define STR_AUTODELIMITER_MUST_DIFFER       RID_STR_GEN_START + 51
-#define STR_AUTONO_WILDCARDS                RID_STR_GEN_START + 52
-#define STR_SPREADSHEET_HEADERTEXT          RID_STR_GEN_START + 53
-#define STR_SPREADSHEET_HELPTEXT            RID_STR_GEN_START + 54
-#define STR_SPREADSHEETPATH                 RID_STR_GEN_START + 55
-#define STR_RSC_CHARSETS                    RID_STR_GEN_START + 56
-#define STR_QRY_CRITERIA_ON_ASTERISK        RID_STR_GEN_START + 57
-#define STR_QRY_ORDERBY_ON_ASTERISK         RID_STR_GEN_START + 58
-#define STR_NEED_INDEX_FIELDS               RID_STR_GEN_START + 59
-#define STR_QUERY_CLOSEDOCUMENTS            RID_STR_GEN_START + 60
-#define STR_QUERY_BRW_DELETE_ROWS           RID_STR_GEN_START + 61
-#define STR_QUERY_CONNECTION_LOST           RID_STR_GEN_START + 62
-#define STR_QUERY_USERADMIN_DELETE_USER     RID_STR_GEN_START + 63
-#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES   RID_STR_GEN_START + 64
-#define RID_STR_TABLE_FORMAT                RID_STR_GEN_START + 65
-#define RID_STR_ROW_HEIGHT                  RID_STR_GEN_START + 66
-#define RID_STR_COPY                        RID_STR_GEN_START + 67
-#define RID_STR_COLUMN_FORMAT               RID_STR_GEN_START + 68
-#define RID_STR_COLUMN_WIDTH                RID_STR_GEN_START + 69
-
-// untyped resources
-
-#define RSC_QUERY_OBJECT_TYPE           RID_UNTYPED_START +  4
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc
deleted file mode 100644
index 88821d2df8ef..000000000000
--- a/dbaccess/source/ui/inc/dbu_tbl.hrc
+++ /dev/null
@@ -1,81 +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_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_HELP_AUTOINCREMENT_VALUE        RID_STR_TBL_START
-#define STR_TABLEDESIGN_UNDO_PRIMKEY        RID_STR_TBL_START + 1
-#define STR_VALUE_YES                       RID_STR_TBL_START + 2
-#define STR_VALUE_NO                        RID_STR_TBL_START + 3
-#define STR_VALUE_NONE                      RID_STR_TBL_START + 6
-#define STR_TAB_FIELD_NAME                  RID_STR_TBL_START + 7
-#define STR_TAB_FIELD_DATATYPE              RID_STR_TBL_START + 8
-#define STR_TAB_HELP_TEXT                   RID_STR_TBL_START + 10
-#define STR_FIELD_AUTOINCREMENT             RID_STR_TBL_START + 12
-#define STR_TAB_PROPERTIES                  RID_STR_TBL_START + 13
-#define STR_TABED_UNDO_TYPE_CHANGED         RID_STR_TBL_START + 17
-#define STR_TABED_UNDO_ROWDELETED           RID_STR_TBL_START + 18
-#define STR_TABED_UNDO_ROWINSERTED          RID_STR_TBL_START + 19
-#define STR_TABED_UNDO_NEWROWINSERTED       RID_STR_TBL_START + 20
-#define STR_HELP_AUTOINCREMENT              RID_STR_TBL_START + 22
-#define STR_HELP_FORMAT_CODE                RID_STR_TBL_START + 23
-#define STR_HELP_SCALE                      RID_STR_TBL_START + 24
-#define STR_HELP_LENGTH                     RID_STR_TBL_START + 25
-#define STR_HELP_NUMERIC_TYPE               RID_STR_TBL_START + 26
-#define STR_HELP_TEXT_LENGTH                RID_STR_TBL_START + 27
-#define STR_HELP_FIELD_REQUIRED             RID_STR_TBL_START + 28
-#define STR_HELP_DEFAULT_VALUE              RID_STR_TBL_START + 29
-#define STR_HELP_BOOL_DEFAULT               RID_STR_TBL_START + 30
-#define STR_FORMAT                          RID_STR_TBL_START + 31
-#define STR_SCALE                           RID_STR_TBL_START + 32
-#define STR_LENGTH                          RID_STR_TBL_START + 33
-#define STR_NUMERIC_TYPE                    RID_STR_TBL_START + 34
-#define STR_TEXT_LENGTH                     RID_STR_TBL_START + 35
-#define STR_FIELD_REQUIRED                  RID_STR_TBL_START + 36
-#define STR_DEFAULT_VALUE                   RID_STR_TBL_START + 37
-#define STR_TABED_UNDO_CELLMODIFIED         RID_STR_TBL_START + 38
-#define STR_TAB_FIELD_COLUMN_NAME           RID_STR_TBL_START + 39
-#define STR_TBL_COLUMN_IS_KEYCOLUMN         RID_STR_TBL_START + 40
-#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE   RID_STR_TBL_START + 41
-#define STR_TABLEDESIGN_ALTER_ERROR         RID_STR_TBL_START + 42
-#define STR_AUTOINCREMENT_VALUE             RID_STR_TBL_START + 43
-#define STR_HELP_FORMAT_BUTTON              RID_STR_TBL_START + 44
-#define STR_TABLEDESIGN_CONNECTION_MISSING  RID_STR_TBL_START + 45
-#define STR_TAB_FIELD_COLUMN_DATATYPE       RID_STR_TBL_START + 46
-#define STR_NO_TYPE_INFO_AVAILABLE          RID_STR_TBL_START + 48
-#define STR_CHANGE_COLUMN_NAME              RID_STR_TBL_START + 49
-#define STR_CHANGE_COLUMN_TYPE              RID_STR_TBL_START + 50
-#define STR_CHANGE_COLUMN_DESCRIPTION       RID_STR_TBL_START + 51
-#define STR_CHANGE_COLUMN_ATTRIBUTE         RID_STR_TBL_START + 52
-#define STR_TABLEDESIGN_SAVE_ERROR          RID_STR_TBL_START + 53
-#define STR_TABLEDESIGN_COULD_NOT_DROP_COL  RID_STR_TBL_START + 54
-#define STR_COLUMN_DESCRIPTION              RID_STR_TBL_START + 55
-#define STR_BUTTON_FORMAT                   RID_STR_TBL_START + 56
-
-// please adjust checking before insert new strings
-
-#if STR_BUTTON_FORMAT > RID_STR_TBL_END
-#error Resource ID overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc
deleted file mode 100644
index 923828ac871d..000000000000
--- a/dbaccess/source/ui/inc/dbu_uno.hrc
+++ /dev/null
@@ -1,45 +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_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
-
-#include "dbu_resource.hrc"
-
-#define STR_CTW_NO_VIEWS_SUPPORT                ( RID_STR_UNO_START +  1 )
-#define STR_CTW_NO_PRIMARY_KEY_SUPPORT          ( RID_STR_UNO_START +  2 )
-#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR  ( RID_STR_UNO_START +  3 )
-#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ( RID_STR_UNO_START +  4 )
-#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS     ( RID_STR_UNO_START +  5 )
-#define STR_CTW_UNSUPPORTED_COLUMN_TYPE         ( RID_STR_UNO_START +  6 )
-#define STR_CTW_ILLEGAL_PARAMETER_COUNT         ( RID_STR_UNO_START +  7 )
-#define STR_CTW_ERROR_DURING_INITIALIZATION     ( RID_STR_UNO_START +  8 )
-#define STR_CTW_ERROR_UNSUPPORTED_SETTING       ( RID_STR_UNO_START +  9 )
-#define STR_CTW_ERROR_NO_QUERY                  ( RID_STR_UNO_START + 10 )
-#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER        ( RID_STR_UNO_START + 11 )
-
-// please adjust when inserting new strings:
-#define RID_STR_UNO_LAST_USED                   STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
-
-#if RID_STR_UNO_LAST_USED >= RID_STR_UNO_END
-#error too many resources in uno ....
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 956158f40e3f..29280e01c897 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -25,7 +25,7 @@
 #include "IItemSetHelper.hxx"
 #include <comphelper/uno3.hxx>
 #include <svtools/wizardmachine.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <memory>
 
 namespace com { namespace sun { namespace star {
@@ -52,10 +52,10 @@ class OGeneralPage;
 class ODbDataSourceAdministrationHelper;
 /** tab dialog for administrating the office wide registered data sources
 */
-class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
+class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
 {
 private:
-    OModuleClient           m_aModuleClient;
+    dbaccess::OModuleClient m_aModuleClient;
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
     ::dbaccess::ODsnTypeCollection*
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index b02986503b0d..ec4fe02bca21 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -28,7 +28,7 @@
 #include <memory>
 #include <svtools/roadmapwizard.hxx>
 #include <connectivity/dbtools.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace beans {
@@ -56,11 +56,10 @@ class ODbDataSourceAdministrationHelper;
 class OMySQLIntroPageSetup;
 class OFinalDBPageSetup;
 
-class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
+class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
 {
-
 private:
-    OModuleClient           m_aModuleClient;
+    dbaccess::OModuleClient m_aModuleClient;
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
     OUString                m_sURL;
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 21c2f083cb10..88cf84be00c0 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -32,7 +32,7 @@
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <unotools/eventlisteneradapter.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <osl/mutex.hxx>
 
 #include <svtools/editbrowsebox.hxx>
@@ -46,7 +46,7 @@ namespace dbaui
             ,public ::utl::OEventListenerAdapter
     {
     protected:
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         ::osl::Mutex    m_aMutex;
 
         VclPtr<MultiLineEditSyntaxHighlight>    m_pSQL;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 20aaf70cac7d..2ceea1f294e6 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -58,7 +58,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/implbase10.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
@@ -120,7 +120,7 @@ namespace dbaui
         ,public SbaXFormAdapter_BASE3
     {
     private:
-        OModuleClient                m_aModuleClient;
+        dbaccess::OModuleClient             m_aModuleClient;
         css::uno::Reference< css::sdbc::XRowSet >                             m_xMainForm;
         ::osl::Mutex                        m_aMutex;
 
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 39f7bd96fd80..034e28bb0856 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <svtools/editbrowsebox.hxx>
 #include "indexcollection.hxx"
 #include <com/sun/star/uno/Sequence.hxx>
@@ -33,7 +33,7 @@ namespace dbaui
     // IndexFieldsControl
     class IndexFieldsControl : public ::svt::EditBrowseBox
     {
-        OModuleClient               m_aModuleClient;
+        dbaccess::OModuleClient     m_aModuleClient;
     protected:
         IndexFields                 m_aSavedValue;
 
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
deleted file mode 100644
index d4e7463eb301..000000000000
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ /dev/null
@@ -1,85 +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_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
-
-#include <osl/mutex.hxx>
-#include <tools/resid.hxx>
-
-class ResMgr;
-
-namespace dbaui
-{
-
-// OModule
-class OModuleImpl;
-class OModule
-{
-    friend class OModuleClient;
-
-private:
-    OModule() = delete; //TODO: get rid of this class
-
-protected:
-    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
-
-public:
-    /// get the vcl res manager of the module
-    static ResMgr*  getResManager();
-
-protected:
-    /// register a client for the module
-    static void registerClient();
-    /// revoke a client for the module
-    static void revokeClient();
-
-private:
-    /** ensure that the impl class exists
-        @precond m_aMutex is guarded when this method gets called
-    */
-    static void ensureImpl();
-};
-
-// OModuleClient
-/** base class for objects which uses any global module-specific resources
-*/
-class OModuleClient
-{
-public:
-    OModuleClient()     { OModule::registerClient(); }
-    ~OModuleClient()    { OModule::revokeClient(); }
-};
-
-// ModuleRes
-/** specialized ResId, using the resource manager provided by the global module
-*/
-class ModuleRes : public ::ResId
-{
-public:
-    ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
-};
-
-}   // namespace dbaui
-
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx
index 2309ba1176a2..6fb2ef9c915f 100644
--- a/dbaccess/source/ui/inc/undosqledit.hxx
+++ b/dbaccess/source/ui/inc/undosqledit.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX
 
 #include "GeneralUndo.hxx"
-#include "dbu_control.hrc"
 #include <vcl/vclptr.hxx>
+#include "strings.hrc"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index 4629cb6419d0..d4d75f32b720 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -23,7 +23,7 @@
 #include <svtools/genericunodialog.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include "dsntypes.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 class SfxItemSet;
 class SfxItemPool;
@@ -37,7 +37,7 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase;
 class ODatabaseAdministrationDialog
         :public ODatabaseAdministrationDialogBase
 {
-    OModuleClient           m_aModuleClient;
+    dbaccess::OModuleClient m_aModuleClient;
 protected:
     SfxItemSet*             m_pDatasourceItems;     // item set for the dialog
     SfxItemPool*            m_pItemPool;            // item pool for the item set for the dialog
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 44e6250748ca..0731c1405b43 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/genericunodialog.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
@@ -32,7 +32,7 @@ class OSQLMessageDialog
         :public OSQLMessageDialogBase
         ,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog >
 {
-    OModuleClient        m_aModuleClient;
+    dbaccess::OModuleClient m_aModuleClient;
 protected:
     // <properties>
     css::uno::Any        m_aException;
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 1e8cc8d585e7..7851fc23e46f 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "DExport.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
@@ -33,8 +33,10 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include "dbustrings.hrc"
-#include "dbu_misc.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <connectivity/dbconversion.hxx>
 #include <osl/thread.h>
 #include <sfx2/sfxhtml.hxx>
@@ -746,7 +748,7 @@ void ODatabaseExport::showErrorDialog(const css::sdbc::SQLException& e)
     {
         OUString aMsg = e.Message
                       + "\n"
-                      + OUString(ModuleRes( STR_QRY_CONTINUE ));
+                      + DBA_RES( STR_QRY_CONTINUE );
         ScopedVclPtrInstance< OSQLWarningBox > aBox( nullptr, aMsg, WB_YES_NO | WB_DEF_NO );
 
         if (aBox->Execute() == RET_YES)
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index fc14c73d3775..e7fa222acbe8 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -25,11 +25,11 @@
 #include <tools/tenccvt.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/string.hxx>
-#include "dbu_misc.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "stringconstants.hxx"
 #include <sfx2/sfxhtml.hxx>
 #include <osl/diagnose.h>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
@@ -52,6 +52,7 @@
 #include "QEnumTypes.hxx"
 #include "WCPage.hxx"
 #include <rtl/tencinfo.h>
+#include "core_resource.hxx"
 #include "UITools.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -390,7 +391,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
 
 bool OHTMLReader::CreateTable(HtmlTokenId nToken)
 {
-    OUString aTempName(ModuleRes(STR_TBL_TITLE));
+    OUString aTempName(DBA_RES(STR_TBL_TITLE));
     aTempName = aTempName.getToken(0,' ');
     aTempName = ::dbtools::createUniqueName(m_xTables, aTempName);
 
@@ -429,7 +430,7 @@ bool OHTMLReader::CreateTable(HtmlTokenId nToken)
                 {
                     aColumnName = comphelper::string::strip(aColumnName, ' ' );
                     if (aColumnName.isEmpty() || m_bAppendFirstLine )
-                        aColumnName = ModuleRes(STR_COLUMN_NAME);
+                        aColumnName = DBA_RES(STR_COLUMN_NAME);
                     else if ( !m_sCurrent.isEmpty() )
                         aColumnName = m_sCurrent;
 
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 10915243142d..94f6b2182b35 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -21,10 +21,12 @@
 #include "TokenWriter.hxx"
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include "dbu_misc.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "sqlmessage.hxx"
 #include <vcl/msgbox.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <functional>
 
@@ -61,7 +63,7 @@ void ORowSetImportExport::initialize()
 
     m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData();
     if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() )
-        throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any());
+        throw SQLException(DBA_RES(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any());
 
     sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount();
     m_aColumnMapping.reserve(nCount);
@@ -236,7 +238,7 @@ bool ORowSetImportExport::insertNewRow()
     {
         if(!m_bAlreadyAsked)
         {
-            OUString sAskIfContinue = ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING);
+            OUString sAskIfContinue = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING);
             ScopedVclPtrInstance< OSQLWarningBox > aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES );
             if(aDlg->Execute() == RET_YES)
                 m_bAlreadyAsked = true;
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 613af226b697..1cf32f7846f5 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -31,10 +31,11 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include <svtools/rtftoken.h>
 #include <toolkit/helper/vclunohelper.hxx>
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 #include <vcl/msgbox.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbtools.hxx>
@@ -42,7 +43,7 @@
 #include <comphelper/string.hxx>
 #include <tools/color.hxx>
 #include "WExtendPages.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "QEnumTypes.hxx"
 #include "UITools.hxx"
 #include <vcl/svapp.hxx>
@@ -243,7 +244,7 @@ void ORTFReader::NextToken( int nToken )
 
 bool ORTFReader::CreateTable(int nToken)
 {
-    OUString aTableName(ModuleRes(STR_TBL_TITLE));
+    OUString aTableName(DBA_RES(STR_TBL_TITLE));
     aTableName = aTableName.getToken(0,' ');
     aTableName = ::dbtools::createUniqueName(m_xTables, aTableName);
 
@@ -274,7 +275,7 @@ bool ORTFReader::CreateTable(int nToken)
                 {
                     aColumnName = comphelper::string::strip(aColumnName, ' ');
                     if (aColumnName.isEmpty() || m_bAppendFirstLine )
-                        aColumnName = ModuleRes(STR_COLUMN_NAME);
+                        aColumnName = DBA_RES(STR_COLUMN_NAME);
 
                     CreateDefaultColumn(aColumnName);
                     aColumnName.clear();
@@ -305,7 +306,7 @@ bool ORTFReader::CreateTable(int nToken)
         if ( !aColumnName.isEmpty() )
         {
             if ( m_bAppendFirstLine )
-                aColumnName = ModuleRes(STR_COLUMN_NAME);
+                aColumnName = DBA_RES(STR_COLUMN_NAME);
             CreateDefaultColumn(aColumnName);
         }
 
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index a52e7c8176ab..9fc346f5440e 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -18,7 +18,10 @@
  */
 
 #include "TableCopyHelper.hxx"
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "sqlmessage.hxx"
 #include <vcl/msgbox.hxx>
 #include "WCopyTable.hxx"
@@ -35,7 +38,7 @@
 #include "TokenWriter.hxx"
 #include "UITools.hxx"
 #include <dbaccess/dataview.hxx>
-#include "dbu_resource.hrc"
+#include "dbu_pageids.hxx"
 #include <unotools/ucbhelper.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
@@ -204,7 +207,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId
             aTrans.bHtml            = SotClipboardFormatId::HTML == _nFormatId;
             aTrans.sDefaultTableName = GetTableNameForAppend();
             if ( !bOk || !copyTagTable(aTrans,false,_xConnection) )
-                m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
+                m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
         }
         catch(const SQLException&)
         {
@@ -216,7 +219,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId
         }
     }
     else
-        m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
+        m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
 }
 
 void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData
@@ -313,7 +316,7 @@ void OTableCopyHelper::asyncCopyTagTable(  DropDescriptor& _rDesc
     else if ( !_rDesc.bError )
         pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection);
     else
-        m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
+        m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any()));
 }
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 83da3ae851a0..8bbf60e1eb56 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -24,7 +24,8 @@
 #include <osl/diagnose.h>
 #include "RtfReader.hxx"
 #include "HtmlReader.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 7881de2c27df..671be050b77c 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -20,8 +20,9 @@
 #include "UITools.hxx"
 #include <sfx2/docfilt.hxx>
 #include "callbacks.hxx"
-#include "dbustrings.hrc"
-#include "dbu_resource.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
+#include "dbu_pageids.hxx"
 #include "dlgsave.hxx"
 #include "dbtreelistbox.hxx"
 #include "defaultobjectnamecheck.hxx"
@@ -87,7 +88,7 @@
 #include <com/sun/star/util/NumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 #include "sqlmessage.hxx"
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/URL.hpp>
@@ -227,7 +228,7 @@ Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName,
                 )
             )
         {
-            OUString sErrorMessage( ModuleRes( STR_FILE_DOES_NOT_EXIST ) );
+            OUString sErrorMessage( DBA_RES( STR_FILE_DOES_NOT_EXIST ) );
             OFileNotation aTransformer( e.Message );
             sErrorMessage = sErrorMessage.replaceFirst( "$file$", aTransformer.get( OFileNotation::N_SYSTEM ) );
             aSQLError = SQLExceptionInfo( sErrorMessage ).get();
@@ -933,7 +934,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection,
             {
                 if(! ::dbaui::checkDataSourceAvailable(::comphelper::getString(xProp->getPropertyValue(PROPERTY_NAME)),_rxContext))
                 {
-                    OUString aMessage(ModuleRes(STR_TABLEDESIGN_DATASOURCE_DELETED));
+                    OUString aMessage(DBA_RES(STR_TABLEDESIGN_DATASOURCE_DELETED));
                     ScopedVclPtrInstance<OSQLWarningBox>(_pParent, aMessage)->Execute();
                     bRet = false;
                 }
@@ -1204,15 +1205,15 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
     return pTypeInfo;
 }
 
-sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName)
+sal_Int32 askForUserAction(vcl::Window* _pParent, const char* pTitle, const char* pText, bool _bAll, const OUString& _sName)
 {
     SolarMutexGuard aGuard;
-    OUString aMsg = ModuleRes(_nText);
+    OUString aMsg = DBA_RES(pText);
     aMsg = aMsg.replaceFirst("%1", _sName);
-    ScopedVclPtrInstance< OSQLMessageBox > aAsk(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query);
+    ScopedVclPtrInstance<OSQLMessageBox> aAsk(_pParent, DBA_RES(pTitle), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query);
     if ( _bAll )
     {
-        aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL);
+        aAsk->AddButton(DBA_RES(STR_BUTTON_TEXT_ALL), RET_ALL);
         aAsk->GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL);
     }
     return aAsk->Execute();
@@ -1346,8 +1347,8 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo
             if ( !sNewName.isEmpty() )
                 sTargetName = sNewName;
             else
-                sTargetName = ModuleRes( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT));
-            sLabel = ModuleRes( _bCollection ? STR_FOLDER_LABEL  : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL));
+                sTargetName = DBA_RES( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT));
+            sLabel = DBA_RES( _bCollection ? STR_FOLDER_LABEL  : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL));
             sTargetName = ::dbtools::createUniqueName(xNameAccess,sTargetName);
 
             // here we have everything needed to create a new query object ...
@@ -1369,7 +1370,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo
     }
     else if ( xNameAccess->hasByName(sNewName) )
     {
-        OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS));
+        OUString sError(DBA_RES(STR_NAME_ALREADY_EXISTS));
         sError = sError.replaceFirst("#",sNewName);
         throw SQLException(sError,nullptr,"S1000",0,Any());
     }
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 14918971caaf..e76ba60e5c64 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -24,7 +24,8 @@
 
 #include "defaultobjectnamecheck.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_misc.hrc"
+#include "strings.hrc"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -35,7 +36,7 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include "UITools.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <cppuhelper/exc_hlp.hxx>
 
 using namespace ::dbaui;
@@ -95,7 +96,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent)
         m_pEdKeyName->SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
     }
 
-    SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY));
+    SetText(DBA_RES(STR_COPYTABLE_TITLE_COPY));
 }
 
 OCopyTable::~OCopyTable()
@@ -169,7 +170,7 @@ bool OCopyTable::LeavePage()
         SQLExceptionInfo aErrorInfo;
         if ( !aNameCheck.isNameValid( m_pEdTableName->GetText(), aErrorInfo ) )
         {
-            aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) );
+            aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, DBA_RES( STR_SUGGEST_APPEND_TABLE_DATA ) );
             m_pParent->showError(aErrorInfo.get());
 
             return false;
@@ -189,7 +190,7 @@ bool OCopyTable::LeavePage()
         sal_Int32 nMaxLength = xMeta->getMaxTableNameLength();
         if ( nMaxLength && sTable.getLength() > nMaxLength )
         {
-            m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME_LENGTH));
+            m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME_LENGTH));
             return false;
         }
 
@@ -197,7 +198,7 @@ bool OCopyTable::LeavePage()
         if (    m_pParent->m_bCreatePrimaryKeyColumn
             &&  m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) )
         {
-            m_pParent->showError(OUString(ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED)) + " " + m_pParent->m_aKeyName);
+            m_pParent->showError(DBA_RES(STR_WIZ_NAME_ALREADY_DEFINED) + " " + m_pParent->m_aKeyName);
             return false;
         }
     }
@@ -228,7 +229,7 @@ bool OCopyTable::LeavePage()
 
     if(m_pParent->m_sName.isEmpty())
     {
-        m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME));
+        m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME));
         return false;
     }
 
@@ -245,7 +246,7 @@ void OCopyTable::ActivatePage()
 
 OUString OCopyTable::GetTitle() const
 {
-    return ModuleRes(STR_WIZ_TABLE_COPY);
+    return DBA_RES(STR_WIZ_TABLE_COPY);
 }
 
 void OCopyTable::Reset()
@@ -301,7 +302,7 @@ bool OCopyTable::checkAppendData()
 
     if ( !xTable.is() )
     {
-        m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME));
+        m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME));
         return false;
     }
     return true;
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 127d6ffee4ef..f9fcff3e4f1f 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -18,17 +18,18 @@
  */
 
 #include "WColumnSelect.hxx"
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 #include <osl/diagnose.h>
 #include "WCopyTable.hxx"
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include <functional>
 
 using namespace ::com::sun::star::uno;
@@ -40,7 +41,7 @@ using namespace dbaui;
 
 namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
 
-OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); }
+OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); }
 
 OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
     : TabPage(pParent, rID, rUIXMLDescription)
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 196da5dfbd3f..40c7b42119ba 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -17,9 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbu_misc.hrc"
-#include "dbustrings.hrc"
-#include "moduledbu.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 #include "sqlmessage.hxx"
 #include "UITools.hxx"
 #include "WColumnSelect.hxx"
@@ -509,7 +511,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDef
     ,m_xFormatter( getNumberFormatter( _xConnection, _rxContext ) )
     ,m_xContext(_rxContext)
     ,m_xInteractionHandler(_xInteractionHandler)
-    ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
+    ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
     ,m_nPageCount(0)
     ,m_bDeleteSourceColumns(true)
     ,m_bInterConnectionCopy( _xSourceConnection != _xConnection )
@@ -601,7 +603,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefa
     ,m_rSourceObject( DummyCopySource::Instance() )
     ,m_xFormatter(_xFormatter)
     ,m_xContext(_rxContext)
-    ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
+    ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
     ,m_nPageCount(0)
     ,m_bDeleteSourceColumns(false)
     ,m_bInterConnectionCopy( false )
@@ -651,9 +653,9 @@ void OCopyTableWizard::construct()
     m_pbNext->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
     m_pbFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) );
 
-    m_pbPrev->SetText(ModuleRes(STR_WIZ_PB_PREV));
-    m_pbNext->SetText(ModuleRes(STR_WIZ_PB_NEXT));
-    m_pbFinish->SetText(ModuleRes(STR_WIZ_PB_OK));
+    m_pbPrev->SetText(DBA_RES(STR_WIZ_PB_PREV));
+    m_pbNext->SetText(DBA_RES(STR_WIZ_PB_NEXT));
+    m_pbFinish->SetText(DBA_RES(STR_WIZ_PB_OK));
 
     m_pbHelp->Show();
     m_pbCancel->Show();
@@ -878,7 +880,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void)
                         if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() )
                         {
 
-                            OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
+                            OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY));
                             SQLContext aError;
                             aError.Message = sMsg;
                             ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) );
@@ -1543,7 +1545,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
 
 void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName)
 {
-    OUString sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) );
+    OUString sMessage( DBA_RES( STR_UNKNOWN_TYPE_FOUND ) );
     sMessage = sMessage.replaceFirst("#1",_rColumnName);
     showError(sMessage);
 }
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 1a5938d3914e..f06388a5e9a9 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -22,7 +22,8 @@
 #include "FieldDescriptions.hxx"
 #include "WCopyTable.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_misc.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
@@ -201,7 +202,7 @@ bool OWizNameMatching::LeavePage()
     return true;
 }
 
-OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); }
+OUString OWizNameMatching::GetTitle() const { return DBA_RES(STR_WIZ_NAME_MATCHING_TITEL); }
 
 IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton, void )
 {
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 31c58ed4a6c7..f10fcd592d62 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -18,17 +18,18 @@
  */
 
 #include "WTypeSelect.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "bitmaps.hlst"
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include "FieldDescriptions.hxx"
 #include "WCopyTable.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 #include <tools/stream.hxx>
 #include <svtools/svparser.hxx>
 #include "UITools.hxx"
+#include "core_resource.hxx"
 #include "sqlmessage.hxx"
 #include "FieldControls.hxx"
 #include <vcl/layout.hxx>
@@ -138,7 +139,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
 
                 if ( bDoubleName )
                 {
-                    OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME);
+                    OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME);
                     strMessage = strMessage.replaceFirst("$column$", sNewName);
                     pWiz->showError(strMessage);
                     pCurFieldDescr->SetName(sName);
@@ -274,7 +275,7 @@ void OWizTypeSelect::dispose()
 
 OUString OWizTypeSelect::GetTitle() const
 {
-    return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL);
+    return DBA_RES(STR_WIZ_TYPE_SELECT_TITEL);
 }
 
 IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
deleted file mode 100644
index 5f1b15426ee4..000000000000
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ /dev/null
@@ -1,83 +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 "dbu_misc.hrc"
-#include "dbaccess_helpid.hrc"
-#include "dbaccess_slotid.hrc"
-
-String STR_WIZ_COLUMN_SELECT_TITEL
-{
-    Text [ en-US ] = "Apply columns";
-};
-
-String STR_WIZ_TYPE_SELECT_TITEL
-{
-    Text [ en-US ] = "Type formatting";
-};
-
-String STR_WIZ_NAME_ALREADY_DEFINED
-{
-    Text [ en-US ] = "Enter a unique name for the new primary key data field.\nThe following name is already in use:";
-};
-
-String STR_WIZ_NAME_MATCHING_TITEL
-{
-    Text [ en-US ]  = "Assign columns" ;
-};
-
-String STR_WIZ_PB_PREV
-{
-    Text [ en-US ] = "< ~Back";
-};
-
-String STR_WIZ_PB_NEXT
-{
-    Text [ en-US ] = "~Next>";
-};
-
-String STR_WIZ_PB_OK
-{
-    Text [ en-US ] = "C~reate";
-};
-
-String STR_WIZ_TABLE_COPY
-{
-    Text [ en-US ] = "Copy table" ;
-};
-
-String STR_COPYTABLE_TITLE_COPY
-{
-    Text [ en-US ] = "Copy table" ;
-};
-
-String STR_INVALID_TABLE_NAME
-{
-    Text [ en-US ] = "This table name is not valid in the current database.";
-};
-String STR_SUGGEST_APPEND_TABLE_DATA
-{
-    Text [ en-US ] = "Choose the option 'Append data' on the first page to append data to an existing table.";
-};
-
-String STR_INVALID_TABLE_NAME_LENGTH
-{
-    Text [ en-US ] = "Please change the table name. It is too long.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index fd5801a5cad7..78f60be945bd 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "charsets.hxx"
+#include "core_resource.hxx"
 #include <osl/diagnose.h>
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 #include <rtl/tencinfo.h>
-#include <tools/rcid.h>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
@@ -30,9 +30,8 @@ namespace dbaui
 
     // OCharsetDisplay
     OCharsetDisplay::OCharsetDisplay()
-        :OCharsetMap()
-        ,SvxTextEncodingTable()
-        , m_aSystemDisplayName(ModuleRes( STR_RSC_CHARSETS ))
+        : OCharsetMap()
+        , m_aSystemDisplayName(DBA_RES( STR_RSC_CHARSETS ))
     {
     }
 
@@ -44,7 +43,7 @@ namespace dbaui
         if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding )
             return true;
 
-        return !GetTextString(_eEncoding).isEmpty();
+        return !SvxTextEncodingTable::GetTextString(_eEncoding).isEmpty();
     }
 
     OCharsetDisplay::const_iterator OCharsetDisplay::begin() const
@@ -74,7 +73,7 @@ namespace dbaui
         rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW;
         if ( _rDisplayName != m_aSystemDisplayName )
         {
-            eEncoding = GetTextEncoding( _rDisplayName );
+            eEncoding = SvxTextEncodingTable::GetTextEncoding(_rDisplayName);
             OSL_ENSURE( RTL_TEXTENCODING_DONTKNOW != eEncoding,
                 "OCharsetDisplay::find: non-empty display name, but DONTKNOW!" );
         }
@@ -116,7 +115,7 @@ namespace dbaui
         rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding();
         return CharsetDisplayDerefHelper(
             *m_aPosition,
-            RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : m_pContainer->GetTextString( eEncoding )
+            RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : SvxTextEncodingTable::GetTextString(eEncoding)
         );
     }
 
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index d92e9b244a81..745d31adc9a5 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -18,7 +18,8 @@
  */
 
 #include "databaseobjectview.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "asyncmodaldialog.hxx"
 
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 174e92c72d86..e0992eb01a15 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -17,9 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "datasourceconnector.hxx"
 #include <osl/diagnose.h>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
@@ -39,8 +40,9 @@
 #include <svl/filenotation.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/exc_hlp.hxx>
-#include "dbu_misc.hrc"
-#include "moduledbu.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
 
 namespace dbaui
 {
@@ -159,7 +161,7 @@ namespace dbaui
                     Any aWarnings( xConnectionWarnings->getWarnings() );
                     if ( aWarnings.hasValue() )
                     {
-                        OUString sMessage( ModuleRes( STR_WARNINGS_DURING_CONNECT ) );
+                        OUString sMessage( DBA_RES( STR_WARNINGS_DURING_CONNECT ) );
                         sMessage = sMessage.replaceFirst( "$buttontext$", Button::GetStandardText( StandardButtonType::More ) );
                         sMessage = OutputDevice::GetNonMnemonicString( sMessage );
 
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 2e780c7a0b2a..6ef9d424d536 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -19,10 +19,12 @@
 
 #include "browserids.hxx"
 #include "commontypes.hxx"
+#include "core_resource.hxx"
 #include <dbaccess/dataview.hxx>
-#include "dbu_misc.hrc"
-#include "dbustrings.hrc"
-#include "moduledbu.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
+#include "core_resource.hxx"
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
@@ -124,7 +126,7 @@ namespace dbaui
         ::boost::optional< bool >       m_aDocScriptSupport;
 
     public:
-        OModuleClient                   m_aModuleClient;
+        dbaccess::OModuleClient         m_aModuleClient;
         ::dbtools::SQLExceptionInfo     m_aCurrentError;
 
         ::comphelper::OInterfaceContainerHelper2
@@ -303,7 +305,7 @@ namespace dbaui
         bool bReConnect = true;
         if ( _bUI )
         {
-            ScopedVclPtrInstance< MessageDialog > aQuery(getView(), ModuleRes(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo);
+            ScopedVclPtrInstance< MessageDialog > aQuery(getView(), DBA_RES(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo);
             bReConnect = ( RET_YES == aQuery->Execute() );
         }
 
@@ -444,7 +446,7 @@ namespace dbaui
     }
     void DBSubComponentController::connectionLostMessage() const
     {
-        OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST));
+        OUString aMessage(DBA_RES(RID_STR_CONNECTION_LOST));
         Reference< XWindow > xWindow = getTopMostContainerWindow();
         vcl::Window* pWin = nullptr;
         if ( xWindow.is() )
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
deleted file mode 100644
index 5a4e1c9dd688..000000000000
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ /dev/null
@@ -1,88 +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 "dbu_misc.hrc"
-
-String STR_RSC_CHARSETS
-{
-    Text [ en-US ] = "System";
-};
-
-String STR_ERROR_DURING_CREATION
-{
-    Text [ en-US ] = "Error during creation";
-};
-
-String STR_UNEXPECTED_ERROR
-{
-    Text [ en-US ] = "An unexpected error occurred. The operation could not be performed.";
-};
-
-String STR_COULDNOTOPEN_LINKEDDOC
-{
-    Text [ en-US ] = "The document \"$file$\" could not be opened.";
-};
-
-String STR_MISSING_TABLES_XDROP
-{
-    Text [ en-US ] = "The table cannot be deleted because the database connection does not support this.";
-};
-
-String STR_BUTTON_TEXT_ALL
-{
-    Text [ en-US ] = "~All";
-};
-
-String STR_UNDO_COLON
-{
-    Text [ en-US ] = "Undo:";
-};
-
-String STR_REDO_COLON
-{
-    Text [ en-US ] = "Redo:";
-};
-
-String STR_UNKNOWN_TYPE_FOUND
-{
-    Text [ en-US ] = "No corresponding column type could be found for column '#1'." ;
-};
-
-String STR_FILE_DOES_NOT_EXIST
-{
-    Text[ en-US ] = "The file \"$file$\" does not exist.";
-};
-
-String STR_WARNINGS_DURING_CONNECT
-{
-    Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.";
-};
-
-String STR_NAMED_OBJECT_ALREADY_EXISTS
-{
-    Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ;
-};
-
-String RID_STR_EXTENSION_NOT_PRESENT
-{
-    // #i96130# use hard coded name
-    Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index 59f10c042cba..d4325e99090a 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -17,11 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "defaultobjectnamecheck.hxx"
 
-#include "dbu_misc.hrc"
+#include "strings.hrc"
 
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -61,7 +62,7 @@ namespace dbaui
         void lcl_fillNameExistsError( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay )
         {
             SQLException aError;
-            OUString sErrorMessage = ModuleRes(STR_NAMED_OBJECT_ALREADY_EXISTS);
+            OUString sErrorMessage = DBA_RES(STR_NAMED_OBJECT_ALREADY_EXISTS);
             aError.Message = sErrorMessage.replaceAll("$#$", _rObjectName);
             _out_rErrorToDisplay = aError;
         }
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 80ceaa47f7e5..cc9de382e17d 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "imageprovider.hxx"
-#include "dbu_resource.hrc"
-#include "moduledbu.hxx"
-#include "dbustrings.hrc"
+#include "dbu_pageids.hxx"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include "bitmaps.hlst"
 
 #include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 0e006a5a95ef..3c70c3f10c8d 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -17,11 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "core_resource.hxx"
 #include "linkeddocuments.hxx"
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <unotools/confignode.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/classids.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -36,11 +37,12 @@
 #include <comphelper/types.hxx>
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/content.hxx>
-#include "dbu_misc.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <svl/filenotation.hxx>
 #include "browserids.hxx"
 #include <sfx2/new.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <sfx2/app.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbuno.hxx>
@@ -319,7 +321,7 @@ namespace dbaui
             xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs );
             if ( !xRet.is() )
             {
-                OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC);
+                OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC);
                 sMessage = sMessage.replaceFirst("$file$",_rLinkName);
 
                 css::sdbc::SQLException aSQLException;
@@ -336,11 +338,11 @@ namespace dbaui
             aInfo = dbtools::SQLExceptionInfo(aSQLException);
 
             // more like a hack, insert an empty message
-            OUString sText( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) );
+            OUString sText( DBA_RES( RID_STR_EXTENSION_NOT_PRESENT ) );
             sText = sText.replaceFirst("$file$",_rLinkName);
             aInfo.prepend(sText);
 
-            OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC);
+            OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC);
             sMessage = sMessage.replaceFirst("$file$",_rLinkName);
             aInfo.prepend(sMessage);
         }
@@ -358,7 +360,7 @@ namespace dbaui
                 // more like a hack, insert an empty message
                 aInfo.prepend(" \n");
 
-                OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC);
+                OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC);
                 sMessage = sMessage.replaceFirst("$file$",_rLinkName);
                 aInfo.prepend(sMessage);
             }
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
deleted file mode 100644
index 340990a2c39e..000000000000
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ /dev/null
@@ -1,101 +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 <memory>
-#include "moduledbu.hxx"
-
-#include <tools/resmgr.hxx>
-#include <svl/solar.hrc>
-
-#define ENTER_MOD_METHOD()  \
-    ::osl::MutexGuard aGuard(s_aMutex); \
-    ensureImpl()
-
-namespace dbaui
-{
-
-// OModuleImpl
-/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner
-*/
-class OModuleImpl
-{
-    std::unique_ptr<ResMgr> m_pResources;
-
-public:
-    /// ctor
-    OModuleImpl();
-
-    /// get the manager for the resources of the module
-    ResMgr* getResManager();
-};
-
-OModuleImpl::OModuleImpl()
-    :m_pResources(nullptr)
-{
-
-}
-
-ResMgr* OModuleImpl::getResManager()
-{
-    // note that this method is not threadsafe, which counts for the whole class !
-
-    if (!m_pResources)
-    {
-        // create a manager with a fixed prefix
-        m_pResources.reset( ResMgr::CreateResMgr("dbu") );
-    }
-    return m_pResources.get();
-}
-
-// OModule
-::osl::Mutex    OModule::s_aMutex;
-sal_Int32       OModule::s_nClients = 0;
-OModuleImpl*    OModule::s_pImpl = nullptr;
-ResMgr* OModule::getResManager()
-{
-    ENTER_MOD_METHOD();
-    return s_pImpl->getResManager();
-}
-
-void OModule::registerClient()
-{
-    ::osl::MutexGuard aGuard(s_aMutex);
-    ++s_nClients;
-}
-
-void OModule::revokeClient()
-{
-    ::osl::MutexGuard aGuard(s_aMutex);
-    if (!--s_nClients && s_pImpl)
-    {
-        delete s_pImpl;
-        s_pImpl = nullptr;
-    }
-}
-
-void OModule::ensureImpl()
-{
-    if (s_pImpl)
-        return;
-    s_pImpl = new OModuleImpl();
-}
-
-}   // namespace dbaui
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index a76c75343ada..4575f44872fe 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -19,11 +19,12 @@
 
 #include <dbaccess/dbaundomanager.hxx>
 #include <dbaccess/dataview.hxx>
+#include "core_resource.hxx"
 #include "singledoccontroller.hxx"
 #include "browserids.hxx"
-#include "dbu_misc.hrc"
-#include "dbustrings.hrc"
-#include "moduledbu.hxx"
+#include "strings.hrc"
+#include "stringconstants.hxx"
+#include "core_resource.hxx"
 
 #include <svl/undo.hxx>
 
@@ -104,7 +105,7 @@ namespace dbaui
                 aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0;
                 if ( aReturn.bEnabled )
                 {
-                    OUString sUndo(ModuleRes(STR_UNDO_COLON));
+                    OUString sUndo(DBA_RES(STR_UNDO_COLON));
                     sUndo += " ";
                     sUndo += GetUndoManager().GetUndoActionComment();
                     aReturn.sTitle = sUndo;
@@ -115,7 +116,7 @@ namespace dbaui
                 aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0;
                 if ( aReturn.bEnabled )
                 {
-                    OUString sRedo(ModuleRes(STR_REDO_COLON));
+                    OUString sRedo(DBA_RES(STR_REDO_COLON));
                     sRedo += " ";
                     sRedo += GetUndoManager().GetRedoActionComment();
                     aReturn.sTitle = sRedo;
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 7241301b61c5..bd74faf16769 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <sfx2/sfxsids.hrc>
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include "browserids.hxx"
 #include <comphelper/types.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index f8573dcec78b..1661a3a6aad1 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -25,7 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include "browserids.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -34,7 +34,7 @@
 #include "ConnectionLine.hxx"
 #include "ConnectionLineData.hxx"
 #include "TableConnectionData.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
 #include <vcl/settings.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index cf51c60fee1f..9061365658c5 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 #include "querycontroller.hxx"
 #include "JoinDesignView.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include "TableWindow.hxx"
 #include "TableWindowListBox.hxx"
 #include "TableConnection.hxx"
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 83661aa0eb12..7c2a991db627 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -9,10 +9,11 @@
 
 #include <vcl/builderfactory.hxx>
 #include "LimitBox.hxx"
-#include "dbu_qry.hrc"
-#include "moduledbu.hxx"
+#include "strings.hrc"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 
-#define ALL_STRING ModuleRes(STR_QUERY_LIMIT_ALL)
+#define ALL_STRING DBA_RES(STR_QUERY_LIMIT_ALL)
 #define ALL_INT -1
 
 namespace global{
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index c45b2f11a33a..30f98e857eab 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -19,7 +19,7 @@
 
 #include "QTableWindow.hxx"
 #include "QueryTableView.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <osl/diagnose.h>
 #include "dbaccess_helpid.hrc"
 #include "QueryDesignView.hxx"
@@ -27,7 +27,8 @@
 #include "querycontroller.hxx"
 #include <vcl/image.hxx>
 #include "TableWindowListBox.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index 543e6a7ca9b6..582ca7912a32 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
 
 #include "GeneralUndo.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include "SelectionBrowseBox.hxx"
 
 namespace dbaui
@@ -37,7 +37,7 @@ namespace dbaui
         virtual void    Redo() override = 0;
 
     public:
-        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID);
+        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID);
         virtual ~OQueryDesignFieldUndoAct() override;
 
         void SetColumnPosition(sal_uInt16 _nColumnPosition)
@@ -92,7 +92,7 @@ namespace dbaui
         OTableFieldDescRef      pDescr;     // the deleted column description
 
     public:
-        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
+        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, pCommentID) { }
 
         void SetTabFieldDescr(OTableFieldDescRef const & pDescription) { pDescr = pDescription; }
     };
diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
index 9166a2e782c4..f5ab95bd49d1 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
@@ -32,7 +32,7 @@ namespace dbaui
         VclPtr<OJoinTableView> m_pOwner;       // in this container it all happens
 
     public:
-        OQueryDesignUndoAction(OJoinTableView* pOwner, sal_uInt16 nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { }
+        OQueryDesignUndoAction(OJoinTableView* pOwner, const char* pCommentID) : OCommentUndoAction(pCommentID), m_pOwner(pOwner) { }
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 6cce6ebd7c9a..add95f7cac3a 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -34,7 +34,8 @@
 #include <vcl/layout.hxx>
 #include "browserids.hxx"
 #include "SelectionBrowseBox.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <unotools/configmgr.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/string.hxx>
@@ -50,7 +51,8 @@
 #include "ConnectionLine.hxx"
 #include "ConnectionLineData.hxx"
 #include "QTableConnectionData.hxx"
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include "UITools.hxx"
 #include "querycontainerwindow.hxx"
 #include "sqlmessage.hxx"
@@ -265,7 +267,7 @@ namespace
         if ( !bErg )
         {
             eErrorCode = eColumnNotFound;
-            OUString sError(ModuleRes(STR_QRY_COLUMN_NOT_FOUND));
+            OUString sError(DBA_RES(STR_QRY_COLUMN_NOT_FOUND));
             sError = sError.replaceFirst("$name$",aColumnName);
             _pView->getController().appendError( sError );
 
@@ -273,7 +275,7 @@ namespace
             {
                 Reference<XDatabaseMetaData> xMeta = _pView->getController().getConnection()->getMetaData();
                 if ( xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() )
-                    _pView->getController().appendError( OUString( ModuleRes( STR_QRY_CHECK_CASESENSITIVE ) ) );
+                    _pView->getController().appendError(DBA_RES(STR_QRY_CHECK_CASESENSITIVE));
             }
             catch(Exception&)
             {
@@ -565,7 +567,7 @@ namespace
                   SQL_ISRULE(pNode->getChild(2),column_ref) &&
                    pNode->getChild(1)->getNodeType() == SQLNodeType::Equal))
             {
-                OUString sError(ModuleRes(STR_QRY_JOIN_COLUMN_COMPARE));
+                OUString sError(DBA_RES(STR_QRY_JOIN_COLUMN_COMPARE));
                 _pView->getController().appendError( sError );
                 return eIllegalJoin;
             }
@@ -749,7 +751,7 @@ namespace
                         {
                             // only show the messagebox the first time
                             if (!bCritsOnAsterikWarning)
-                                ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK))->Execute();
+                                ScopedVclPtrInstance<MessageDialog>(_pView, DBA_RES(STR_QRY_CRITERIA_ON_ASTERISK))->Execute();
                             bCritsOnAsterikWarning = true;
                             continue;
                         }
@@ -903,7 +905,7 @@ namespace
                     {
                         // only show the  MessageBox the first time
                         if (!bCritsOnAsterikWarning)
-                            ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK))->Execute();
+                            ScopedVclPtrInstance<MessageDialog>(_pView, DBA_RES(STR_QRY_ORDERBY_ON_ASTERISK))->Execute();
                         bCritsOnAsterikWarning = true;
                         continue;
                     }
@@ -1396,7 +1398,7 @@ namespace
             else
             {
                 eErrorCode = eNoColumnInLike;
-                OUString sError(ModuleRes(STR_QRY_LIKE_LEFT_NO_COLUMN));
+                OUString sError(DBA_RES(STR_QRY_LIKE_LEFT_NO_COLUMN));
                 _pView->getController().appendError( sError );
             }
         }
@@ -2403,47 +2405,46 @@ namespace
 
     OUString getParseErrorMessage( SqlParseError _eErrorCode )
     {
-        sal_uInt16 nResId;
-        switch(_eErrorCode)
+        const char* pResId;
+        switch (_eErrorCode)
         {
             case eIllegalJoin:
-                nResId = STR_QRY_ILLEGAL_JOIN;
+                pResId = STR_QRY_ILLEGAL_JOIN;
                 break;
             case eStatementTooLong:
-                nResId = STR_QRY_TOO_LONG_STATEMENT;
+                pResId = STR_QRY_TOO_LONG_STATEMENT;
                 break;
             case eNoConnection:
-                nResId = STR_QRY_SYNTAX;
+                pResId = STR_QRY_SYNTAX;
                 break;
             case eNoSelectStatement:
-                nResId = STR_QRY_NOSELECT;
+                pResId = STR_QRY_NOSELECT;
                 break;
             case eNoColumnInLike:
-                nResId = STR_QRY_SYNTAX;
+                pResId = STR_QRY_SYNTAX;
                 break;
             case eColumnNotFound:
-                nResId = STR_QRY_SYNTAX;
+                pResId = STR_QRY_SYNTAX;
                 break;
             case eNativeMode:
-                nResId = STR_QRY_NATIVE;
+                pResId = STR_QRY_NATIVE;
                 break;
             case eTooManyTables:
-                nResId = STR_QRY_TOO_MANY_TABLES;
+                pResId = STR_QRY_TOO_MANY_TABLES;
                 break;
             case eTooManyColumns:
-                nResId = STR_QRY_TOO_MANY_COLUMNS;
+                pResId = STR_QRY_TOO_MANY_COLUMNS;
                 break;
             case eStatementTooComplex:
-                nResId = STR_QRY_TOOCOMPLEX;
+                pResId = STR_QRY_TOOCOMPLEX;
                 break;
             default:
-                nResId = STR_QRY_SYNTAX;
+                pResId = STR_QRY_SYNTAX;
                 break;
         }
         ;
-        return OUString( ModuleRes( nResId ) );
+        return DBA_RES(pResId);
     }
-
 }
 
 // end of anonymouse namespace
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index a1790f977a6c..b97ae8b42e10 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include <tools/gen.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index 7cc039a01343..4ea75f11e4bc 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index 4ce5d3eb75a3..6f7eeec54f96 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -23,7 +23,7 @@
 #include "QueryTableView.hxx"
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 
 using namespace dbaui;
 
@@ -36,8 +36,8 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction()
     }
 }
 
-OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID)
-    :OQueryDesignUndoAction(pOwner, nCommentID)
+OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID)
+    :OQueryDesignUndoAction(pOwner, pCommentID)
     ,m_pConnection(nullptr)
     ,m_bOwnerOfConn(false)
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
index 729153968588..d71068b24ba2 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
@@ -33,7 +33,7 @@ namespace dbaui
         // am I the only owner of the connection? (changes with every redo and undo)
 
     public:
-        OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID);
+        OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID);
         virtual ~OQueryTabConnUndoAction() override;
 
         virtual void Undo() override = 0;
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index 079d7a392bae..8b7ec538d769 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -27,8 +27,8 @@
 #include "QueryTableView.hxx"
 
 using namespace dbaui;
-OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID)
-    : OCommentUndoAction(nCommentID)
+OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID)
+    : OCommentUndoAction(pCommentID)
     , pOwner(pSelBrwBox)
     , m_nColumnPosition(BROWSER_INVALIDID)
 {
@@ -39,8 +39,8 @@ OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct()
     pOwner = nullptr;
 }
 
-OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID)
-    : OQueryDesignUndoAction(pOwner, nCommentID)
+OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID)
+    : OQueryDesignUndoAction(pOwner, pCommentID)
     , m_pTabWin(nullptr)
     , m_bOwnerOfObjects(false)
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index e0bfd9658a19..3b637c62d6ce 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
@@ -39,7 +39,7 @@ namespace dbaui
         // am I the only owner of the managed objects? (changes with every redo or undo)
 
     public:
-        OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID);
+        OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID);
         virtual ~OQueryTabWinUndoAct() override;
 
         void SetOwnership(bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; }
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 4d84cd288de2..330acaa7a626 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -40,13 +40,14 @@
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include "querydlg.hxx"
 #include "JoinExchange.hxx"
 #include <comphelper/extract.hxx>
-#include "dbu_qry.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <vcl/msgbox.hxx>
 #include "svtools/treelistentry.hxx"
 
@@ -696,7 +697,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
         OQueryDesignView* pParent = static_cast<OQueryDesignView*>(getDesignView());
 
         SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager();
-        rUndoMgr.EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) );
+        rUndoMgr.EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE) , OUString(), 0, ViewShellId(-1));
 
         // add the Undo-Action
         OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this);
@@ -902,7 +903,7 @@ bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const
 
 void OQueryTableView::onNoColumns_throw()
 {
-    OUString sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) );
+    OUString sError(DBA_RES(STR_STATEMENT_WITHOUT_RESULT_SET));
     ::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr );
 }
 
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index c92eeaf1dfb6..0ce7d09ab064 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -24,8 +24,8 @@
 #include "undosqledit.hxx"
 #include "browserids.hxx"
 #include "querycontroller.hxx"
-#include "dbu_qry.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "stringconstants.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 15763e629518..d5463f10415a 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -21,7 +21,7 @@
 #include "QueryDesignView.hxx"
 #include "QueryTextView.hxx"
 #include "querycontainerwindow.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include "browserids.hxx"
 #include "adtabdlg.hxx"
 #include "querycontroller.hxx"
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 3d9f49ec3a7c..4c66586c9a8e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -30,10 +30,11 @@
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include "TableFieldInfo.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "dbaccess_helpid.hrc"
 #include <com/sun/star/container/XNameAccess.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "QTableWindow.hxx"
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
@@ -98,7 +99,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
                                   BrowserMode::HIDECURSOR | BrowserMode::HLINES | BrowserMode::VLINES )
                    ,m_nSeekRow(0)
                    ,m_nMaxColumns(0)
-                   ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS))
+                   ,m_aFunctionStrings(DBA_RES(STR_QUERY_FUNCTIONS))
                    ,m_nVisibleCount(0)
                    ,m_nLastSortColumn(SORT_COLUMN_NONE)
                    ,m_bOrderByUnRelated(true)
@@ -135,7 +136,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
     aTitleFont.SetFontSize(Size(0, 6));
     SetTitleFont(aTitleFont);
 
-    OUString aTxt(ModuleRes(STR_QUERY_SORTTEXT));
+    OUString aTxt(DBA_RES(STR_QUERY_SORTTEXT));
     sal_Int32 nCount = comphelper::string::getTokenCount(aTxt, ';');
     for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++)
         m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';'));
@@ -498,11 +499,11 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
                 for(;aIter != aEnd;++aIter)
                     m_pTableCell->InsertEntry(static_cast<OQueryTableWindow*>(aIter->second.get())->GetAliasName());
 
-                m_pTableCell->InsertEntry(OUString(ModuleRes(STR_QUERY_NOTABLE)), 0);
+                m_pTableCell->InsertEntry(DBA_RES(STR_QUERY_NOTABLE), 0);
                 if (!pEntry->GetAlias().isEmpty())
                     m_pTableCell->SelectEntry(pEntry->GetAlias());
                 else
-                    m_pTableCell->SelectEntry(OUString(ModuleRes(STR_QUERY_NOTABLE)));
+                    m_pTableCell->SelectEntry(DBA_RES(STR_QUERY_NOTABLE));
             }
         }   break;
         case BROW_VIS_ROW:
@@ -520,7 +521,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
                 m_pVisibleCell->GetBox().SaveValue();
                 m_pVisibleCell->GetBox().Disable();
                 m_pVisibleCell->GetBox().EnableInput(false);
-                OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED));
+                OUString aMessage(DBA_RES(STR_QRY_ORDERBY_UNRELATED));
                 OQueryDesignView* paDView = getDesignView();
                 ScopedVclPtrInstance<InfoBox>(paDView, aMessage)->Execute();
             }
@@ -610,7 +611,7 @@ bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName, const OUSt
         sal_uInt16 nTabCount = 0;
         if ( !static_cast<OQueryTableView*>(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occurred: column not in table window
         {
-            OUString sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST));
+            OUString sErrorMsg(DBA_RES(RID_STR_FIELD_DOESNT_EXIST));
             sErrorMsg = sErrorMsg.replaceFirst("$name$",_sColumnName);
             ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMsg)->Execute();
             bError = true;
@@ -714,7 +715,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _
     if ( pParseNode == nullptr )
     {
         // something different which we have to check
-        OUString sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) );
+        OUString sErrorMessage( DBA_RES( STR_QRY_COLUMN_NOT_FOUND ) );
         sErrorMessage = sErrorMessage.replaceFirst("$name$",_sFieldName);
         ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute();
 
@@ -870,7 +871,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _
 
             if ( i > 0 && !InsertField(aSelEntry,BROWSER_INVALIDID,true,false).is() ) // may we have to append more than one field
             { // the field could not be inserted
-                OUString sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) );
+                OUString sErrorMessage( DBA_RES( RID_STR_FIELD_DOESNT_EXIST ) );
                 sErrorMessage = sErrorMessage.replaceFirst("$name$",aSelEntry->GetField());
                 ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute();
                 bError = true;
@@ -1231,7 +1232,7 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Recta
 {
     tools::Rectangle aRect(rRect);
     aRect.TopLeft().Y() -= 2;
-    OUString  aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
+    OUString  aLabel(DBA_RES(STR_QUERY_HANDLETEXT));
 
    // from BROW_CRIT2_ROW onwards all rows are shown "or"
     sal_Int32 nToken = (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW))
@@ -2127,7 +2128,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
         }   break;
         case BROW_ORDER_ROW:
             if (pEntry->GetOrderDir() != ORDER_NONE)
-                aText = OUString(ModuleRes(STR_QUERY_SORTTEXT)).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';');
+                aText = DBA_RES(STR_QUERY_SORTTEXT).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';');
             break;
         case BROW_VIS_ROW:
             break;
@@ -2560,7 +2561,7 @@ void OSelectionBrowseBox::DeactivateCell(bool _bUpdate)
 
 OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const
 {
-    OUString  aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
+    OUString  aLabel(DBA_RES(STR_QUERY_HANDLETEXT));
 
     // from BROW_CRIT2_ROW onwards all rows are shown as "or"
     sal_Int32 nToken = (_nRow >= GetBrowseRow(BROW_CRIT2_ROW))
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 01c7c45465fd..e821efc8b5f6 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -35,8 +35,8 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include "querycontroller.hxx"
-#include "dbu_qry.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "stringconstants.hxx"
 #include "bitmaps.hlst"
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 1998abcf86c7..121807118f94 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <comphelper/sequence.hxx>
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 06e67b7f7c9b..231952f62f65 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -24,10 +24,10 @@
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "TableWindowListBox.hxx"
 #include "TableConnection.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include "QueryDesignView.hxx"
 #include "JoinController.hxx"
 
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 4ad0049a1eef..e1a8517e3d35 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -21,7 +21,7 @@
 
 #include "LimitBox.hxx"
 #include "dbu_reghelper.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 
 
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
deleted file mode 100644
index 6dfe7c0aa48d..000000000000
--- a/dbaccess/source/ui/querydesign/query.src
+++ /dev/null
@@ -1,241 +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 "dbu_qry.hrc"
-#include "browserids.hxx"
-#include "dbaccess_helpid.hrc"
-
-String STR_QUERY_UNDO_TABWINSHOW
-{
-    Text [ en-US ] = "Add Table Window" ;
-};
-
-String STR_QUERY_UNDO_MOVETABWIN
-{
-    Text [ en-US ] = "Move table window" ;
-};
-String STR_QUERY_UNDO_INSERTCONNECTION
-{
-    Text [ en-US ] = "Insert Join" ;
-};
-
-String STR_QUERY_UNDO_REMOVECONNECTION
-{
-    Text [ en-US ] = "Delete Join" ;
-};
-
-String STR_QUERY_UNDO_SIZETABWIN
-{
-    Text [ en-US ] = "Resize table window" ;
-};
-String STR_QUERY_UNDO_TABFIELDDELETE
-{
-    Text [ en-US ] = "Delete Column" ;
-};
-
-String STR_QUERY_UNDO_TABFIELDMOVED
-{
-    Text [ en-US ] = "Move column";
-};
-
-String STR_QUERY_UNDO_TABFIELDCREATE
-{
-    Text [ en-US ] = "Add Column" ;
-};
-
-String RID_STR_FIELD_DOESNT_EXIST
-{
-    Text [ en-US ] = "Invalid expression, field name '$name$' does not exist.";
-};
-
-String STR_QUERY_UNDO_TABWINDELETE
-{
-    Text [ en-US ] = "Delete Table Window" ;
-};
-
-String STR_QUERY_UNDO_MODIFY_CELL
-{
-    Text [ en-US ] = "Edit Column Description";
-};
-
-String STR_QUERY_UNDO_SIZE_COLUMN
-{
-    Text [ en-US ] = "Adjust column width";
-};
-
-String STR_QUERY_SORTTEXT
-{
-    Text [ en-US ] = "(not sorted);ascending;descending" ;
-};
-
-String STR_QUERY_FUNCTIONS
-{
-    Text [ en-US ] = "(no function);Group";
-};
-
-String STR_QUERY_NOTABLE
-{
-    Text [ en-US ] = "(no table)";
-};
-
-String STR_QRY_ORDERBY_UNRELATED
-{
-    Text [ en-US ] = "The database only supports sorting for visible fields.";
-};
-
-String STR_QUERY_HANDLETEXT
-{
-    Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or";
-};
-
-String STR_QUERY_LIMIT_ALL
-{
-    Text [ en-US ] = "All";
-};
-
-String STR_QRY_TOO_MANY_COLUMNS
-{
-    Text [ en-US ] = "There are too many columns.";
-};
-
-String STR_QRY_CRITERIA_ON_ASTERISK
-{
-    Text [ en-US ] = "A condition cannot be applied to field [*]" ;
-};
-
-String STR_QRY_TOO_LONG_STATEMENT
-{
-    Text [ en-US ] = "The SQL statement created is too long.";
-};
-
-String STR_QRY_TOOCOMPLEX
-{
-    Text [ en-US ] = "Query is too complex" ;
-};
-
-String STR_QRY_NOSELECT
-{
-    Text [ en-US ] = "Nothing has been selected." ;
-};
-
-String STR_QRY_SYNTAX
-{
-    Text [ en-US ] = "SQL syntax error" ;
-};
-
-String STR_QRY_ORDERBY_ON_ASTERISK
-{
-    Text [ en-US ] = "[*] cannot be used as a sort criterion.";
-};
-
-String STR_QRY_TOO_MANY_TABLES
-{
-    Text [ en-US ] = "There are too many tables.";
-};
-
-String STR_QRY_NATIVE
-{
-    Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ;
-};
-
-String STR_QRY_ILLEGAL_JOIN
-{
-    Text [ en-US ] = "Join could not be processed" ;
-};
-
-String STR_SVT_SQL_SYNTAX_ERROR
-{
-    Text [ en-US ] = "Syntax error in SQL statement" ;
-};
-
-String STR_QUERYDESIGN_NO_VIEW_SUPPORT
-{
-    Text [ en-US ] = "This database does not support table views.";
-};
-
-String STR_NO_ALTER_VIEW_SUPPORT
-{
-    Text [ en-US ] = "This database does not support altering of existing table views.";
-};
-
-String STR_QUERYDESIGN_NO_VIEW_ASK
-{
-    Text [ en-US ] = "Do you want to create a query instead?";
-};
-
-String STR_DATASOURCE_DELETED
-{
-    Text [ en-US ] = "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved.";
-};
-
-String STR_QRY_COLUMN_NOT_FOUND
-{
-    Text [ en-US ] = "The column '$name$' is unknown.";
-};
-
-String STR_QRY_JOIN_COLUMN_COMPARE
-{
-    Text [ en-US ] = "Columns can only be compared using '='.";
-};
-
-String STR_QRY_LIKE_LEFT_NO_COLUMN
-{
-    Text [ en-US ] = "You must use a column name before 'LIKE'.";
-};
-
-String STR_QRY_CHECK_CASESENSITIVE
-{
-    Text [ en-US ] = "The column could not be found. Please note that the database is case-sensitive.";
-};
-
-String STR_QUERY_SAVEMODIFIED
-{
-    Text [ en-US ] = "$object$ has been changed.\nDo you want to save the changes?" ;
-    Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource will be inserted.";
-};
-
-String STR_ERROR_PARSING_STATEMENT
-{
-    Text [ en-US ] = "$object$ is based on an SQL command which could not be parsed.";
-    Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource "
-        "(except \"SQL command\", which doesn't make sense here) will be inserted.";
-};
-
-String STR_INFO_OPENING_IN_SQL_VIEW
-{
-    Text [ en-US ] = "$object$ will be opened in SQL view.";
-    Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource "
-        "(except \"SQL command\", which doesn't make sense here) will be inserted.";
-};
-
-StringArray RSC_QUERY_OBJECT_TYPE
-{
-    ItemList [ en-US ] =
-    {
-        < "The table view"; >;
-        < "The query"; >;
-        < "The SQL statement"; >;
-    };
-};
-
-String STR_STATEMENT_WITHOUT_RESULT_SET
-{
-    Text [ en-US ] = "The query does not create a result set, and thus cannot be part of another query.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index f6d30e1e3c32..03b504faaa51 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -23,7 +23,8 @@
 #include <vcl/settings.hxx>
 #include "JoinController.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <sfx2/sfxsids.hrc>
 #include <vcl/fixed.hxx>
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index f2a3300374e0..4472d9375441 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -19,9 +19,12 @@
 
 #include "adtabdlg.hxx"
 #include "browserids.hxx"
-#include "dbu_qry.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
+#include "query.hrc"
 #include "dbu_reghelper.hxx"
-#include "dbustrings.hrc"
+#include "dbu_pageids.hxx"
+#include "stringconstants.hxx"
 #include "defaultobjectnamecheck.hxx"
 #include "dlgsave.hxx"
 #include "uiservices.hxx"
@@ -72,7 +75,6 @@
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <tools/resary.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@@ -209,12 +211,10 @@ namespace dbaui
 
     namespace
     {
-        OUString lcl_getObjectResourceString( sal_uInt16 _nResId, sal_Int32 _nCommandType )
+        OUString lcl_getObjectResourceString(const char* pResId, sal_Int32 _nCommandType)
         {
-            OUString sMessageText = ModuleRes( _nResId );
-            ModuleRes aResId(RSC_QUERY_OBJECT_TYPE);
-            ResStringArray aResList(aResId);
-            OUString sObjectType = aResList.GetString(_nCommandType);
+            OUString sMessageText = DBA_RES(pResId);
+            OUString sObjectType = DBA_RES(RSC_QUERY_OBJECT_TYPE[_nCommandType]);
             sMessageText = sMessageText.replaceFirst( "$object$", sObjectType );
             return sMessageText;
         }
@@ -601,7 +601,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                             if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() )
                             {
                                 aError = SQLException(
-                                    ModuleRes( STR_QRY_NOSELECT ),
+                                    DBA_RES(STR_QRY_NOSELECT),
                                     nullptr,
                                     "S1000",
                                     1000,
@@ -624,7 +624,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                     else
                     {
                         aError = SQLException(
-                            ModuleRes( STR_QRY_SYNTAX ),
+                            DBA_RES(STR_QRY_SYNTAX),
                             nullptr,
                             "S1000",
                             1000,
@@ -654,7 +654,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
         break;
         case SID_BROWSER_CLEAR_QUERY:
             {
-                GetUndoManager().EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) );
+                GetUndoManager().EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE), OUString(), 0, ViewShellId(-1) );
                 getContainer()->clear();
                 GetUndoManager().LeaveListAction();
 
@@ -938,8 +938,8 @@ void OQueryController::impl_initialize()
             m_nCommandType = CommandType::QUERY;
             bool bClose = false;
             {
-                OUString aTitle( ModuleRes( STR_QUERYDESIGN_NO_VIEW_SUPPORT ) );
-                OUString aMessage( ModuleRes( STR_QUERYDESIGN_NO_VIEW_ASK ) );
+                OUString aTitle(DBA_RES(STR_QUERYDESIGN_NO_VIEW_SUPPORT));
+                OUString aMessage(DBA_RES(STR_QUERYDESIGN_NO_VIEW_ASK));
                 ODataView* pWindow = getView();
                 ScopedVclPtrInstance< OSQLMessageBox > aDlg( pWindow, aTitle, aMessage, WB_YES_NO | WB_DEF_YES, OSQLMessageBox::Query );
                 bClose = aDlg->Execute() == RET_NO;
@@ -956,7 +956,7 @@ void OQueryController::impl_initialize()
             if ( !( aView >>= m_xAlterView ) )
             {
                 throw IllegalArgumentException(
-                    ModuleRes( STR_NO_ALTER_VIEW_SUPPORT ),
+                    DBA_RES(STR_NO_ALTER_VIEW_SUPPORT),
                     *this,
                     1
                 );
@@ -1034,7 +1034,7 @@ OUString OQueryController::getPrivateTitle( ) const
         {
             SolarMutexGuard aSolarGuard;
             ::osl::MutexGuard aGuard( getMutex() );
-            OUString aDefaultName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE );
+            OUString aDefaultName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE);
             sName = aDefaultName.getToken(0,' ');
             sName += OUString::number(getCurrentStartNumber());
         }
@@ -1331,7 +1331,7 @@ bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElements, b
             aDefaultName = m_sName;
         else
         {
-            OUString sName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE );
+            OUString sName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE);
             aDefaultName = sName.getToken(0,' ');
             aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName);
         }
@@ -1365,7 +1365,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs)
     OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!");
     if ( !editingCommand() && !haveDataSource() )
     {
-        OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED));
+        OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED));
         ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute();
         return false;
     }
@@ -1715,9 +1715,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange )
     }
     else if(m_sStatement.isEmpty())
     {
-        ModuleRes aModuleRes(STR_QRY_NOSELECT);
-        OUString sTmpStr(aModuleRes);
-        showError(SQLException(sTmpStr,nullptr,"S1000",1000,Any()));
+        showError(SQLException(DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, Any()));
     }
     else
         sTranslatedStmt = m_sStatement;
@@ -1851,7 +1849,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings
                 {
                     if ( !i_bForceCurrentControllerSettings && !editingView() )
                     {
-                        OUString aTitle(ModuleRes(STR_SVT_SQL_SYNTAX_ERROR));
+                        OUString aTitle(DBA_RES(STR_SVT_SQL_SYNTAX_ERROR));
                         ScopedVclPtrInstance< OSQLMessageBox > aDlg(getView(),aTitle,aErrorMsg);
                         aDlg->Execute();
                     }
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 3906b93061f0..9880cfa59349 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -18,10 +18,11 @@
  */
 
 #include "querydlg.hxx"
-#include "dbu_qry.hrc"
+#include "strings.hrc"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "QTableConnectionData.hxx"
+#include "core_resource.hxx"
 #include "querycontroller.hxx"
 #include "QueryTableView.hxx"
 #include "QueryDesignView.hxx"
@@ -165,7 +166,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
     OUString sFirstWinName    = m_pConnData->getReferencingTable()->GetWinName();
     OUString sSecondWinName   = m_pConnData->getReferencedTable()->GetWinName();
     const EJoinType eOldJoinType = eJoinType;
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos();
     const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(nPos));
     bool bAddHint = true;
@@ -173,17 +174,17 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
     {
         default:
         case ID_INNER_JOIN:
-            nResId = STR_QUERY_INNER_JOIN;
+            pResId = STR_QUERY_INNER_JOIN;
             bAddHint = false;
             eJoinType = INNER_JOIN;
             break;
         case ID_LEFT_JOIN:
-            nResId = STR_QUERY_LEFTRIGHT_JOIN;
+            pResId = STR_QUERY_LEFTRIGHT_JOIN;
             eJoinType = LEFT_JOIN;
             break;
         case ID_RIGHT_JOIN:
             {
-                nResId = STR_QUERY_LEFTRIGHT_JOIN;
+                pResId = STR_QUERY_LEFTRIGHT_JOIN;
                 eJoinType = RIGHT_JOIN;
                 OUString sTemp = sFirstWinName;
                 sFirstWinName = sSecondWinName;
@@ -191,12 +192,12 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
             }
             break;
         case ID_FULL_JOIN:
-            nResId = STR_QUERY_FULL_JOIN;
+            pResId = STR_QUERY_FULL_JOIN;
             eJoinType = FULL_JOIN;
             break;
         case ID_CROSS_JOIN:
             {
-                nResId = STR_QUERY_CROSS_JOIN;
+                pResId = STR_QUERY_CROSS_JOIN;
                 eJoinType = CROSS_JOIN;
 
                 m_pConnData->ResetConnLines();
@@ -223,7 +224,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
 
     m_pTableControl->Invalidate();
 
-    OUString sHelpText = ModuleRes( nResId );
+    OUString sHelpText = DBA_RES(pResId);
     if( nPos )
     {
         sHelpText = sHelpText.replaceFirst( "%1", sFirstWinName );
@@ -232,7 +233,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void )
     if ( bAddHint )
     {
         sHelpText += "\n";
-        sHelpText += ModuleRes( STR_JOIN_TYPE_HINT );
+        sHelpText += DBA_RES( STR_JOIN_TYPE_HINT );
     }
 
     m_pML_HelpText->SetText( sHelpText );
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
deleted file mode 100644
index a7ff1bd957a5..000000000000
--- a/dbaccess/source/ui/querydesign/querydlg.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 "dbu_qry.hrc"
-#include "dbaccess_helpid.hrc"
-
-String STR_JOIN_TYPE_HINT
-{
-    Text [ en-US ] = "Please note that some databases may not support this join type.";
-};
-
-String STR_QUERY_INNER_JOIN
-{
-    Text [ en-US ] = "Includes only records for which the contents of the related fields of both tables are identical.";
-};
-
-String STR_QUERY_LEFTRIGHT_JOIN
-{
-    Text [ en-US ] = "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching.";
-};
-
-String STR_QUERY_FULL_JOIN
-{
-    Text [ en-US ] = "Contains ALL records from '%1' and from '%2'.";
-};
-
-String STR_QUERY_CROSS_JOIN
-{
-    Text [ en-US ] = "Contains the Cartesian product of ALL records from '%1' and from '%2'.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 1cdcc075e11d..18edc5813369 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -26,10 +26,12 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include "dbustrings.hrc"
-#include "dbu_rel.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "UITools.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 
@@ -373,7 +375,7 @@ xKey.clear();
     if ( bDropRelation )
     {
         DropRelation();
-        OUString sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE));
+        OUString sError(DBA_RES(STR_QUERY_REL_COULD_NOT_CREATE));
         ::dbtools::throwGenericSQLException(sError,nullptr);
     }
 
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 0f171ef16410..5c9d57ff2cb9 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -25,11 +25,13 @@
 #include "dbu_reghelper.hxx"
 #include "uiservices.hxx"
 #include <sfx2/sfxsids.hrc>
-#include "dbu_rel.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <vcl/svapp.hxx>
 #include "browserids.hxx"
 #include <comphelper/types.hxx>
-#include "dbustrings.hrc"
+#include "core_resource.hxx"
+#include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
@@ -158,7 +160,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
                 OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!");
                 if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)), getORB()))
                 {
-                    OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED));
+                    OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED));
                     ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute();
                 }
                 else
@@ -202,9 +204,9 @@ void ORelationController::impl_initialize()
         setEditable(false);
         m_bRelationsPossible    = false;
         {
-            OUString sTitle(ModuleRes(STR_RELATIONDESIGN));
+            OUString sTitle(DBA_RES(STR_RELATIONDESIGN));
             sTitle = sTitle.copy(3);
-            ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE));
+            ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,DBA_RES(STR_RELATIONDESIGN_NOT_AVAILABLE));
             aDlg->Execute();
         }
         disconnect();
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 377687dae9e8..56759e745b81 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -24,7 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include "browserids.hxx"
-#include "dbu_rel.hrc"
+#include "strings.hrc"
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -33,7 +33,7 @@
 #include "ConnectionLine.hxx"
 #include "ConnectionLineData.hxx"
 #include "RTableConnectionData.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
 
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 9a898328d11c..988347f399cf 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -20,6 +20,7 @@
 #include "RelationTableView.hxx"
 #include "JoinExchange.hxx"
 #include <comphelper/extract.hxx>
+#include "core_resource.hxx"
 #include "browserids.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -29,7 +30,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include "dbaccess_helpid.hrc"
@@ -41,7 +42,7 @@
 #include "RTableConnectionData.hxx"
 #include "RelationDlg.hxx"
 #include "sqlmessage.hxx"
-#include "dbu_rel.hrc"
+#include "strings.hrc"
 #include "UITools.hxx"
 #include <connectivity/dbexception.hxx>
 #include "RTableWindow.hxx"
@@ -322,7 +323,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
 
 void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin )
 {
-    ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES );
+    ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, DBA_RES( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES );
     if ( m_bInRemove || aDlg->Execute() == RET_YES )
     {
         m_pView->getController().ClearUndoManager();
@@ -338,13 +339,13 @@ void ORelationTableView::lookForUiActivities()
 {
     if(m_pExistingConnection)
     {
-        OUString sTitle(ModuleRes(STR_RELATIONDESIGN));
+        OUString sTitle(DBA_RES(STR_RELATIONDESIGN));
         sTitle = sTitle.copy(3);
-        ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0);
+        ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,DBA_RES(STR_QUERY_REL_EDIT_RELATION),OUString(),0);
         aDlg->SetText(sTitle);
         aDlg->RemoveButton(aDlg->GetButtonId(0));
-        aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus);
-        aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES);
+        aDlg->AddButton( DBA_RES(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus);
+        aDlg->AddButton( DBA_RES(STR_QUERY_REL_CREATE), RET_YES);
         aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL);
         sal_uInt16 nRet = aDlg->Execute();
         if( nRet == RET_CANCEL)
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
deleted file mode 100644
index d40689dc433c..000000000000
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ /dev/null
@@ -1,58 +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 "dbu_rel.hrc"
-#include "browserids.hxx"
-#include "dbaccess_helpid.hrc"
-
-String STR_QUERY_REL_EDIT_RELATION
-{
-    Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ;
-};
-
-String STR_QUERY_REL_EDIT
-{
-    Text [ en-US ] = "Edit..." ;
-};
-
-String STR_QUERY_REL_CREATE
-{
-    Text [ en-US ] = "Create..." ;
-};
-
-String STR_RELATIONDESIGN
-{
-    Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ;
-};
-
-String STR_RELATIONDESIGN_NOT_AVAILABLE
-{
-    Text [ en-US ] = "The database does not support relations." ;
-};
-
-String STR_QUERY_REL_DELETE_WINDOW
-{
-    Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?";
-};
-
-String STR_QUERY_REL_COULD_NOT_CREATE
-{
-    Text [ en-US ] = "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 24b50f0a04c0..13feb588adb2 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -20,9 +20,10 @@
 #include "FieldDescriptions.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 7dc3db669f73..d9f35d6a4a2a 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -26,8 +26,9 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include "dbu_tbl.hrc"
-#include "dbustrings.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
 #include <comphelper/types.hxx>
@@ -107,17 +108,17 @@ void OTableEditorCtrl::Init()
     SetReadOnly( bRead );
 
     // Insert the columns
-    InsertDataColumn( FIELD_NAME, ModuleRes(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH );
+    InsertDataColumn( FIELD_NAME, DBA_RES(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH );
 
-    InsertDataColumn( FIELD_TYPE, ModuleRes(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH );
+    InsertDataColumn( FIELD_TYPE, DBA_RES(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH );
 
     ::dbaccess::ODsnTypeCollection aDsnTypes(GetView()->getController().getORB());
     bool bShowColumnDescription = aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL)));
-    InsertDataColumn( HELP_TEXT, ModuleRes(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH );
+    InsertDataColumn( HELP_TEXT, DBA_RES(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH );
 
     if ( bShowColumnDescription )
     {
-        InsertDataColumn( COLUMN_DESCRIPTION, ModuleRes(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH );
+        InsertDataColumn( COLUMN_DESCRIPTION, DBA_RES(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH );
     }
 
     InitCellController();
@@ -638,11 +639,11 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
     OUString sActionDescription;
     switch ( nColId )
     {
-    case FIELD_NAME:    sActionDescription = ModuleRes( STR_CHANGE_COLUMN_NAME ); break;
-    case FIELD_TYPE:    sActionDescription = ModuleRes( STR_CHANGE_COLUMN_TYPE ); break;
+    case FIELD_NAME:    sActionDescription = DBA_RES( STR_CHANGE_COLUMN_NAME ); break;
+    case FIELD_TYPE:    sActionDescription = DBA_RES( STR_CHANGE_COLUMN_TYPE ); break;
     case HELP_TEXT:
-    case COLUMN_DESCRIPTION:   sActionDescription = ModuleRes( STR_CHANGE_COLUMN_DESCRIPTION ); break;
-    default:            sActionDescription = ModuleRes( STR_CHANGE_COLUMN_ATTRIBUTE ); break;
+    case COLUMN_DESCRIPTION:   sActionDescription = DBA_RES( STR_CHANGE_COLUMN_DESCRIPTION ); break;
+    default:            sActionDescription = DBA_RES( STR_CHANGE_COLUMN_ATTRIBUTE ); break;
     }
 
     GetUndoManager().EnterListAction( sActionDescription, OUString(), 0, ViewShellId(-1) );
@@ -954,7 +955,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const css::uno
         case FIELD_PROPERTY_AUTOINC:
             {
                 sValue = ::comphelper::getString(_rNewData);
-                pFieldDescr->SetAutoIncrement(sValue == ModuleRes(STR_VALUE_YES));
+                pFieldDescr->SetAutoIncrement(sValue == DBA_RES(STR_VALUE_YES));
             }
             break;
         case FIELD_PROPERTY_SCALE:
@@ -991,8 +992,8 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
         nRow = GetCurRow();
     SetDataPtr( nRow );
 
-    static const OUString strYes(ModuleRes(STR_VALUE_YES));
-    static const OUString strNo(ModuleRes(STR_VALUE_NO));
+    static const OUString strYes(DBA_RES(STR_VALUE_YES));
+    static const OUString strNo(DBA_RES(STR_VALUE_NO));
     OUString sValue;
     // Read out the fields
     switch( nColId )
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 4e7865fe1a98..41982efe4631 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -25,9 +25,10 @@
 #include "TypeInfo.hxx"
 #include "UITools.hxx"
 #include "browserids.hxx"
+#include "core_resource.hxx"
 #include "dbu_reghelper.hxx"
-#include "dbu_tbl.hrc"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hrc"
 #include "defaultobjectnamecheck.hxx"
 #include "dlgsave.hxx"
 #include "dsmeta.hxx"
@@ -133,7 +134,7 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMulti
 }
 
 OTableController::OTableController(const Reference< XComponentContext >& _rM) : OTableController_BASE(_rM)
-    ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
+    ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
     ,m_pTypeInfo()
     ,m_bAllowAutoIncrementValue(false)
     ,m_bNew(true)
@@ -271,7 +272,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs)
 
     if (!xTablesSup.is())
     {
-        OUString aMessage(ModuleRes(STR_TABLEDESIGN_CONNECTION_MISSING));
+        OUString aMessage(DBA_RES(STR_TABLEDESIGN_CONNECTION_MISSING));
         ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage )->Execute();
         return false;
     }
@@ -299,7 +300,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs)
                  aDefaultName = m_sName;
             else
             {
-                OUString aName = ModuleRes(STR_TBL_TITLE);
+                OUString aName = DBA_RES(STR_TBL_TITLE);
                 aDefaultName = aName.getToken(0,' ');
                 aDefaultName = ::dbtools::createUniqueName(xTables,aDefaultName);
             }
@@ -400,9 +401,9 @@ bool OTableController::doSaveDoc(bool _bSaveAs)
     }
     catch(const ElementExistException& )
     {
-        OUString sText( ModuleRes( STR_NAME_ALREADY_EXISTS ) );
+        OUString sText( DBA_RES( STR_NAME_ALREADY_EXISTS ) );
         sText = sText.replaceFirst( "#" , m_sName);
-        ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), OUString( ModuleRes( STR_ERROR_DURING_CREATION ) ), sText, WB_OK, OSQLMessageBox::Error );
+        ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), DBA_RES( STR_ERROR_DURING_CREATION ), sText, WB_OK, OSQLMessageBox::Error );
 
         aDlg->Execute();
         bError = true;
@@ -414,7 +415,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs)
     }
 
     if ( aInfo.isValid() )
-        aInfo.prepend( OUString( ModuleRes( STR_TABLEDESIGN_SAVE_ERROR ) ) );
+        aInfo.prepend( DBA_RES( STR_TABLEDESIGN_SAVE_ERROR ) );
     showError(aInfo);
 
     if (aInfo.isValid() || bError)
@@ -434,7 +435,7 @@ void OTableController::doEditIndexes()
     // table needs to be saved before editing indexes
     if (m_bNew || isModified())
     {
-        ScopedVclPtrInstance< MessageDialog > aAsk(getView(), ModuleRes(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo);
+        ScopedVclPtrInstance< MessageDialog > aAsk(getView(), DBA_RES(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo);
         if (RET_YES != aAsk->Execute())
             return;
 
@@ -509,7 +510,7 @@ void OTableController::impl_initialize()
     }
     catch(const SQLException&)
     {
-        ScopedVclPtrInstance<OSQLWarningBox>(getView(), ModuleRes( STR_NO_TYPE_INFO_AVAILABLE ))->Execute();
+        ScopedVclPtrInstance<OSQLWarningBox>(getView(), DBA_RES( STR_NO_TYPE_INFO_AVAILABLE ))->Execute();
         throw;
     }
     try
@@ -920,7 +921,7 @@ bool OTableController::checkColumns(bool _bNew)
                 OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr();
                 if (pCompareDesc && bCase(pCompareDesc->GetName(),pFieldDesc->GetName()))
                 {
-                    OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME);
+                    OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME);
                     strMessage = strMessage.replaceFirst("$column$", pFieldDesc->GetName());
                     ScopedVclPtrInstance<OSQLWarningBox>(getView(), strMessage)->Execute();
                     return false;
@@ -930,8 +931,8 @@ bool OTableController::checkColumns(bool _bNew)
     }
     if ( _bNew && !bFoundPKey && aMetaData.supportsPrimaryKeys() )
     {
-        OUString sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
-        OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
+        OUString sTitle(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
+        OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY));
         ScopedVclPtrInstance< OSQLMessageBox > aBox(getView(), sTitle,sMsg, WB_YES_NO_CANCEL | WB_DEF_YES);
 
         switch ( aBox->Execute() )
@@ -1060,7 +1061,7 @@ void OTableController::alterColumns()
                 {
                     if(xDrop.is() && xAppend.is())
                     {
-                        OUString aMessage( ModuleRes( STR_TABLEDESIGN_ALTER_ERROR ) );
+                        OUString aMessage( DBA_RES( STR_TABLEDESIGN_ALTER_ERROR ) );
                         aMessage = aMessage.replaceFirst( "$column$", pField->GetName() );
 
                         SQLExceptionInfo aError( ::cppu::getCaughtException() );
@@ -1119,7 +1120,7 @@ void OTableController::alterColumns()
                 bReload = true;
                 if(xDrop.is() && xAppend.is())
                 {
-                    OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR));
+                    OUString aMessage(DBA_RES(STR_TABLEDESIGN_ALTER_ERROR));
                     aMessage = aMessage.replaceFirst("$column$",pField->GetName());
                     ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES, &aError);
                     if ( aMsg->Execute() != RET_YES )
@@ -1185,9 +1186,9 @@ void OTableController::alterColumns()
             {
                 if(xKeyColumns.is() && xKeyColumns->hasByName(*pIter)) // check if this column is a member of the primary key
                 {
-                    OUString aMsgT(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN));
+                    OUString aMsgT(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN));
                     aMsgT = aMsgT.replaceFirst("$column$",*pIter);
-                    OUString aTitle(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE));
+                    OUString aTitle(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE));
                     ScopedVclPtrInstance< OSQLMessageBox > aMsg(getView(),aTitle,aMsgT,WB_YES_NO| WB_DEF_YES);
                     if(aMsg->Execute() == RET_YES)
                     {
@@ -1206,7 +1207,7 @@ void OTableController::alterColumns()
                 }
                 catch (const SQLException&)
                 {
-                    OUString sError( ModuleRes( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) );
+                    OUString sError( DBA_RES( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) );
                     sError = sError.replaceFirst( "$column$", *pIter );
 
                     SQLException aNewException;
@@ -1489,7 +1490,7 @@ OUString OTableController::getPrivateTitle() const
         }
         if ( sTitle.isEmpty() )
         {
-            OUString aName = ModuleRes(STR_TBL_TITLE);
+            OUString aName = DBA_RES(STR_TBL_TITLE);
             sTitle = aName.getToken(0,' ') + OUString::number(getCurrentStartNumber());
         }
     }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 604314e1a6f2..317ebe73a6e2 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "TableDesignControl.hxx"
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
 #include "TableDesignView.hxx"
 #include "TableController.hxx"
 #include "browserids.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index c013589cd796..1ebbccea3b15 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -21,7 +21,8 @@
 #include "TableController.hxx"
 #include "TableDesignView.hxx"
 #include "TEditControl.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 2b674638efd4..dced4032fc46 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -20,12 +20,13 @@
 #include "TableFieldDescWin.hxx"
 #include <osl/diagnose.h>
 #include "FieldDescriptions.hxx"
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
 #include "TableDesignHelpBar.hxx"
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 #include "dbaccess_helpid.hrc"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 
 #define STANDARD_MARGIN                  6
 #define DETAILS_HEADER_HEIGHT           25
@@ -50,7 +51,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent)
 {
     // Header
     m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER );
-    m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) );
+    m_pHeader->SetText(DBA_RES(STR_TAB_PROPERTIES));
     m_pHeader->Show();
 
     // HelpBar
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index d6aff9b08216..4c121fb6b2d3 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "TableUndo.hxx"
-#include "dbu_tbl.hrc"
+#include "strings.hrc"
 #include "TEditControl.hxx"
 #include "TableRow.hxx"
 #include "browserids.hxx"
@@ -31,8 +31,9 @@ using namespace ::svt;
 
 
 // class OTableDesignUndoAct
-OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID)
-    ,m_pTabDgnCtrl(  pOwner )
+OTableDesignUndoAct::OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID)
+    : OCommentUndoAction(pCommentID)
+    , m_pTabDgnCtrl(pOwner)
 {
     m_pTabDgnCtrl->m_nCurUndoActId++;
 }
@@ -108,9 +109,9 @@ void OTableDesignCellUndoAct::Redo()
 }
 
 // class OTableEditorUndoAct
-OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) :
-     OTableDesignUndoAct(  pOwner ,_nCommentID)
-    ,pTabEdCtrl(pOwner)
+OTableEditorUndoAct::OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID)
+    : OTableDesignUndoAct(pOwner, pCommentID)
+    , pTabEdCtrl(pOwner)
 {
 }
 
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 37b990a586f8..3f8abc23a78f 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -40,7 +40,7 @@ namespace dbaui
         virtual void    Undo() override;
         virtual void    Redo() override;
     public:
-        OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID);
+        OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID);
         virtual ~OTableDesignUndoAct() override;
     };
 
@@ -51,7 +51,7 @@ namespace dbaui
         VclPtr<OTableEditorCtrl> pTabEdCtrl;
 
     public:
-        OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID );
+        OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID);
         virtual ~OTableEditorUndoAct() override;
     };
 
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
deleted file mode 100644
index 0d3375196f9f..000000000000
--- a/dbaccess/source/ui/tabledesign/table.src
+++ /dev/null
@@ -1,306 +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 "dbu_tbl.hrc"
-#include "dbaccess_helpid.hrc"
-#include "dbaccess_slotid.hrc"
-#include "browserids.hxx"
-
-String STR_TABLEDESIGN_DBFIELDTYPES
-{
-    Text [ en-US ] = "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)";
-};
-
-String STR_TABLEDESIGN_UNDO_PRIMKEY
-{
-    Text [ en-US ] = "Insert/remove primary key" ;
-};
-
-String STR_VALUE_YES
-{
-    Text [ en-US ] = "Yes" ;
-};
-
-String STR_VALUE_NO
-{
-    Text [ en-US ] = "No" ;
-};
-
-String STR_VALUE_NONE
-{
-    // Note: should somehow fit to the word "value" in other languages as well: value - none ....
-    Text [ en-US ] = "<none>";
-};
-
-String STR_TAB_FIELD_NAME
-{
-    Text [ en-US ] = "Field name" ;
-};
-
-String STR_TAB_FIELD_COLUMN_NAME
-{
-    Text [ en-US ] = "Field Name" ;
-};
-
-String STR_TAB_FIELD_DATATYPE
-{
-    Text [ en-US ] = "Field ~type" ;
-};
-
-String STR_TAB_FIELD_COLUMN_DATATYPE
-{
-    Text [ en-US ] = "Field Type" ;
-};
-
-String STR_TAB_HELP_TEXT
-{
-    Text [ en-US ] = "Description" ;
-};
-
-String STR_COLUMN_DESCRIPTION
-{
-    Text [ en-US ] = "Column Description" ;
-};
-
-String STR_FIELD_AUTOINCREMENT
-{
-    Text [ en-US ] = "~AutoValue";
-};
-
-String STR_TAB_PROPERTIES
-{
-    Text [ en-US ] = "Field Properties" ;
-};
-
-String STR_TABED_UNDO_CELLMODIFIED
-{
-    Text [ en-US ] = "Modify cell" ;
-};
-
-String STR_TABED_UNDO_ROWDELETED
-{
-    Text [ en-US ] = "Delete row" ;
-};
-
-String STR_TABED_UNDO_TYPE_CHANGED
-{
-    Text [ en-US ] = "Modify field type";
-};
-
-String STR_TABED_UNDO_ROWINSERTED
-{
-    Text [ en-US ] = "Insert row" ;
-};
-
-String STR_TABED_UNDO_NEWROWINSERTED
-{
-    Text [ en-US ] = "Insert new row" ;
-};
-
-String STR_DEFAULT_VALUE
-{
-    Text [ en-US ] = "~Default value" ;
-};
-
-String STR_FIELD_REQUIRED
-{
-    Text [ en-US ] = "~Entry required" ;
-};
-
-String STR_TEXT_LENGTH
-{
-    Text [ en-US ] = "~Length" ;
-};
-
-String STR_NUMERIC_TYPE
-{
-    Text [ en-US ] = "~Type" ;
-};
-
-String STR_LENGTH
-{
-    Text [ en-US ] = "~Length" ;
-};
-
-String STR_SCALE
-{
-    Text [ en-US ] = "Decimal ~places" ;
-};
-
-String STR_FORMAT
-{
-    Text [ en-US ] = "Format example";
-};
-
-String STR_HELP_BOOL_DEFAULT
-{
-    Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.";
-};
-
-String STR_HELP_DEFAULT_VALUE
-{
-    Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ;
-};
-
-String STR_HELP_FIELD_REQUIRED
-{
-    Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ;
-};
-
-String STR_HELP_TEXT_LENGTH
-{
-    Text [ en-US ] = "Enter the maximum text length permitted." ;
-};
-
-String STR_HELP_NUMERIC_TYPE
-{
-    Text [ en-US ] = "Enter the number format." ;
-};
-
-String STR_HELP_LENGTH
-{
-    Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ;
-};
-
-String STR_HELP_SCALE
-{
-    Text [ en-US ] = "Specify the number of decimal places permitted in this field." ;
-};
-
-String STR_HELP_FORMAT_CODE
-{
-    Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).";
-};
-
-String STR_HELP_FORMAT_BUTTON
-{
-    Text [ en-US ] = "This is where you determine the output format of the data.";
-};
-
-String STR_HELP_AUTOINCREMENT
-{
-    Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ;
-};
-
-String STR_BUTTON_FORMAT
-{
-    Text [ en-US ] = "~...";
-};
-
-String STR_TABLEDESIGN_DUPLICATE_NAME
-{
-    Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice.";
-};
-
-String STR_TBL_COLUMN_IS_KEYCOLUMN
-{
-    Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?";
-};
-
-String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE
-{
-    Text [ en-US ] = "Primary Key Affected";
-};
-
-String STR_COLUMN_NAME
-{
-    Text [ en-US ] = "Column";
-};
-
-String STR_QRY_CONTINUE
-{
-    Text [ en-US ] = "Continue anyway?" ;
-};
-
-String STR_TABLEDESIGN_CONNECTION_MISSING
-{
-    Text [ en-US ] = "The table could not be saved due to problems connecting to the database.";
-};
-
-String STR_TABLEDESIGN_DATASOURCE_DELETED
-{
-    Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted.";
-};
-
-String STR_QUERY_SAVE_TABLE_EDIT_INDEXES
-{
-    Text [ en-US ] = "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?";
-};
-
-String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD
-{
-    Text [ en-US ] = "No primary key" ;
-};
-
-String STR_TABLEDESIGN_NO_PRIM_KEY
-{
-    Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ;
-};
-
-String STR_TABLEDESIGN_ALTER_ERROR
-{
-    Text [ en-US ] = "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ;
-};
-
-String STR_TABLEDESIGN_SAVE_ERROR
-{
-    Text [ en-US ] = "Error while saving the table design";
-};
-
-String STR_TABLEDESIGN_COULD_NOT_DROP_COL
-{
-    Text [ en-US ] = "The column $column$ could not be deleted.";
-};
-
-String STR_AUTOINCREMENT_VALUE
-{
-    Text [ en-US ] = "A~uto-increment statement";
-};
-
-String STR_HELP_AUTOINCREMENT_VALUE
-{
-    Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
-};
-
-String STR_NO_TYPE_INFO_AVAILABLE
-{
-    Text [ en-US ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
-};
-
-String STR_CHANGE_COLUMN_NAME
-{
-    Text [ en-US ] = "change field name";
-};
-
-String STR_CHANGE_COLUMN_TYPE
-{
-    Text [ en-US ] = "change field type";
-};
-
-String STR_CHANGE_COLUMN_DESCRIPTION
-{
-    Text [ en-US ] = "change field description";
-};
-
-String STR_CHANGE_COLUMN_ATTRIBUTE
-{
-    Text [ en-US ] = "change field attribute";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index e5b94f995e51..deb5184edf53 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -19,7 +19,7 @@
 
 #include "ColumnControl.hxx"
 #include "ColumnPeer.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "uiservices.hxx"
 #include "apitools.hxx"
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index c42af2059b46..0556c0e6b61a 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -25,7 +25,7 @@
 
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/extract.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "dbu_reghelper.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/property.hxx>
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 1e7bae1ca536..7ae3187fb240 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -20,7 +20,8 @@
 #include "ColumnPeer.hxx"
 #include "ColumnControlWindow.hxx"
 #include <vcl/svapp.hxx>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include "FieldDescriptions.hxx"
 
 namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 1cdc2984e090..42d71cea3199 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -22,7 +22,7 @@
 
 #include "dbu_reghelper.hxx"
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "queryfilter.hxx"
 #include "queryorder.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 4d59b432f596..c274edca67b7 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 
 #include <svtools/genericunodialog.hxx>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "apitools.hxx"
 
 namespace dbaui
@@ -41,7 +41,7 @@ namespace dbaui
             :public svt::OGenericUnoDialog
             ,public ComposerDialog_PBASE
     {
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
     protected:
         // <properties>
         css::uno::Reference< css::sdb::XSingleSelectQueryComposer >
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index f1f81c6d3991..60462ff3781c 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -19,10 +19,12 @@
 
 #include <memory>
 #include "dbu_reghelper.hxx"
-#include "dbu_resource.hrc"
-#include "dbu_uno.hrc"
-#include "dbustrings.hrc"
-#include "moduledbu.hxx"
+#include "dbu_pageids.hxx"
+#include "strings.hrc"
+#include "strings.hxx"
+#include "stringconstants.hxx"
+#include "core_resource.hxx"
+#include "core_resource.hxx"
 #include "sqlmessage.hxx"
 #include "uiservices.hxx"
 #include "WCopyTable.hxx"
@@ -460,7 +462,7 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation )
         &&  !OCopyTableWizard::supportsViews( m_xDestConnection )
         )
         throw IllegalArgumentException(
-            ModuleRes( STR_CTW_NO_VIEWS_SUPPORT ),
+            DBA_RES( STR_CTW_NO_VIEWS_SUPPORT ),
             *this,
             1
         );
@@ -492,7 +494,7 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >&
 
     if ( _newPrimaryKey.IsPresent && !OCopyTableWizard::supportsPrimaryKey( m_xDestConnection ) )
         throw IllegalArgumentException(
-            ModuleRes( STR_CTW_NO_PRIMARY_KEY_SUPPORT ),
+            DBA_RES( STR_CTW_NO_PRIMARY_KEY_SUPPORT ),
             *this,
             1
         );
@@ -657,7 +659,7 @@ Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw
     if ( !bIsValid )
     {
         throw IllegalArgumentException(
-            ModuleRes( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ),
+            DBA_RES( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ),
             *const_cast< CopyTableWizard* >( this ),
             _nArgPos + 1
         );
@@ -701,7 +703,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
     if ( !sUnsupportedSetting.isEmpty() )
     {
         OUString sMessage(
-            OUString(ModuleRes(STR_CTW_ERROR_UNSUPPORTED_SETTING)).
+            DBA_RES(STR_CTW_ERROR_UNSUPPORTED_SETTING).
             replaceFirst("$name$", sUnsupportedSetting));
         throw IllegalArgumentException(
             sMessage,
@@ -749,7 +751,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj
     break;
     default:
         throw IllegalArgumentException(
-            ModuleRes( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ),
+            DBA_RES( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ),
             *const_cast< CopyTableWizard* >( this ),
             1
         );
@@ -768,7 +770,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj
         if ( _out_rCommandType == CommandType::QUERY )
             // we cannot copy a query if the connection cannot provide it ...
             throw IllegalArgumentException(
-                ModuleRes( STR_CTW_ERROR_NO_QUERY ),
+                DBA_RES( STR_CTW_ERROR_NO_QUERY ),
                 *const_cast< CopyTableWizard* >( this ),
                 1
             );
@@ -806,7 +808,7 @@ void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPrope
         if ( !xRowLocate.is() )
         {
             ::dbtools::throwGenericSQLException(
-                OUString( ModuleRes( STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ) ),
+                DBA_RES(STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS),
                 *this
             );
         }
@@ -1045,7 +1047,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r
     {
         SQLContext aError;
         aError.Context = *this;
-        aError.Message = OUString( ModuleRes( STR_ERROR_OCCURRED_WHILE_COPYING ) );
+        aError.Message = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING);
 
         ::dbtools::SQLExceptionInfo aInfo( _rEvent.Error );
         if ( aInfo.isValid() )
@@ -1276,7 +1278,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
 
                     default:
                     {
-                        OUString aMessage( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) );
+                        OUString aMessage( DBA_RES( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) );
 
                         aMessage = aMessage.replaceFirst( "$type$", OUString::number( aSourceColTypes[ nSourceColumn ] ) );
                         aMessage = aMessage.replaceFirst( "$pos$", OUString::number( nSourceColumn ) );
@@ -1458,7 +1460,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
     sal_Int32 nArgCount( _rArguments.getLength() );
     if ( ( nArgCount != 2 ) && ( nArgCount != 3 ) )
         throw IllegalArgumentException(
-            ModuleRes( STR_CTW_ILLEGAL_PARAMETER_COUNT ),
+            DBA_RES( STR_CTW_ILLEGAL_PARAMETER_COUNT ),
             *this,
             1
         );
@@ -1469,7 +1471,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
         {   // ->createWithInteractionHandler
             if ( !( _rArguments[2] >>= m_xInteractionHandler ) )
                 throw IllegalArgumentException(
-                    ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ),
+                    DBA_RES( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ),
                     *this,
                     3
                 );
@@ -1494,7 +1496,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
     catch( const Exception& )
     {
         throw WrappedTargetException(
-            ModuleRes( STR_CTW_ERROR_DURING_INITIALIZATION ),
+            DBA_RES( STR_CTW_ERROR_DURING_INITIALIZATION ),
             *this,
             ::cppu::getCaughtException()
         );
diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src
deleted file mode 100644
index 4d5a09b6cf01..000000000000
--- a/dbaccess/source/ui/uno/copytablewizard.src
+++ /dev/null
@@ -1,77 +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 "dbu_uno.hrc"
-
-String STR_CTW_NO_VIEWS_SUPPORT
-{
-    Text [ en-US ] = "The destination database does not support views.";
-};
-
-String STR_CTW_NO_PRIMARY_KEY_SUPPORT
-{
-    Text [ en-US ] = "The destination database does not support primary keys.";
-};
-
-String STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR
-{
-    Text [ en-US ] = "no data access descriptor found, or no data access descriptor able to provide all necessary information";
-};
-
-String STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT
-{
-    Text [ en-US ] = "Only tables and queries are supported at the moment.";
-};
-
-String STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS
-{
-    Text [ en-US ] = "The copy source's result set must support bookmarks.";
-};
-
-String STR_CTW_UNSUPPORTED_COLUMN_TYPE
-{
-    Text [ en-US ] = "Unsupported source column type ($type$) at column position $pos$.";
-};
-
-String STR_CTW_ILLEGAL_PARAMETER_COUNT
-{
-    Text [ en-US ] = "Illegal number of initialization parameters.";
-};
-
-String STR_CTW_ERROR_DURING_INITIALIZATION
-{
-    Text [ en-US ] = "An error occurred during initialization.";
-};
-
-String STR_CTW_ERROR_UNSUPPORTED_SETTING
-{
-    Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$.";
-};
-
-String STR_CTW_ERROR_NO_QUERY
-{
-    Text [ en-US ] = "To copy a query, your connection must be able to provide queries.";
-};
-
-String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
-{
-    Text [ en-US ] = "The given interaction handler is invalid.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index f4e413fd1273..119a729f699b 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <com/sun/star/sdb/XInteractionDocumentSave.hpp>
 #include <sfx2/QuerySaveDocument.hxx>
-#include "dbu_uno.hrc"
+#include "strings.hrc"
 #include "paramdialog.hxx"
 #include <vcl/svapp.hxx>
 #include "CollectionView.hxx"
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 5166a6bde184..a3ebfeb8100b 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -22,7 +22,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "apitools.hxx"
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -62,7 +62,7 @@ namespace dbaui
     class BasicInteractionHandler
                 :public BasicInteractionHandler_Base
     {
-        const OModuleClient m_aModuleClient;
+        const dbaccess::OModuleClient m_aModuleClient;
         const css::uno::Reference< css::uno::XComponentContext >
                             m_xContext;
         const bool          m_bFallbackToGeneric;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 7f6c4a6eb5e8..7ad3241312f1 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -20,10 +20,10 @@
 #include "textconnectionsettings.hxx"
 #include "uiservices.hxx"
 #include "dbu_reghelper.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include "apitools.hxx"
 #include "unoadmin.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "propertystorage.hxx"
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -63,7 +63,7 @@ namespace dbaui
             ,public OTextConnectionSettingsDialog_PBASE
             ,public ::cppu::WeakImplHelper< css::sdb::XTextConnectionSettings >
     {
-        OModuleClient   m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         PropertyValues  m_aPropertyValues;
 
     protected:
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 1858bf9de2ce..3c3360d82268 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/connection/XConnection.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include "directsql.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include "datasourceconnector.hxx"
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 96e198e8a34a..5b1e9d126ff0 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdb/XSQLQueryComposer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 namespace dbaui
@@ -40,7 +40,7 @@ namespace dbaui
             :public ODirectSQLDialog_BASE
             ,public ODirectSQLDialog_PBASE
     {
-        OModuleClient m_aModuleClient;
+        dbaccess::OModuleClient m_aModuleClient;
         OUString      m_sInitialSelection;
         css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection;
     protected:
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index fde168b9fa21..59e2647324c6 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
 #include <toolkit/awt/vclxwindow.hxx>
 #include "dbu_reghelper.hxx"
 #include "unoadmin.hxx"
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 4494a2eedda3..7d7f003a5f57 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -21,7 +21,8 @@
 #include "uiservices.hxx"
 #include "unosqlmessage.hxx"
 #include "dbu_reghelper.hxx"
-#include "dbustrings.hrc"
+#include "stringconstants.hxx"
+#include "strings.hxx"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui
index 72040da64410..c08b37610ebf 100644
--- a/dbaccess/uiconfig/ui/admindialog.ui
+++ b/dbaccess/uiconfig/ui/admindialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AdminDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Database Properties</property>
+    <property name="title" translatable="yes" context="admindialog|AdminDialog">Database Properties</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -84,7 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Advanced Properties</property>
+                <property name="label" translatable="yes" context="admindialog|advanced">Advanced Properties</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui
index 8a49dd6d1048..35eb669b99cb 100644
--- a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui
+++ b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AdvancedSettingsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Advanced Settings</property>
+    <property name="title" translatable="yes" context="advancedsettingsdialog|AdvancedSettingsDialog">Advanced Settings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="generated">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Generated Values</property>
+                <property name="label" translatable="yes" context="advancedsettingsdialog|generated">Generated Values</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -97,7 +97,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Special Settings</property>
+                <property name="label" translatable="yes" context="advancedsettingsdialog|special">Special Settings</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/dbaccess/uiconfig/ui/applycolpage.ui b/dbaccess/uiconfig/ui/applycolpage.ui
index 8ea2520ee504..a4d11991122e 100644
--- a/dbaccess/uiconfig/ui/applycolpage.ui
+++ b/dbaccess/uiconfig/ui/applycolpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -159,7 +159,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Existing Columns</property>
+            <property name="label" translatable="yes" context="applycolpage|label1">Existing Columns</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/authentificationpage.ui b/dbaccess/uiconfig/ui/authentificationpage.ui
index dfee010e87e1..86faa208e262 100644
--- a/dbaccess/uiconfig/ui/authentificationpage.ui
+++ b/dbaccess/uiconfig/ui/authentificationpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="AuthentificationPage">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">12</property>
-        <property name="label" translatable="yes">Set up the user authentication</property>
+        <property name="label" translatable="yes" context="authentificationpage|header">Set up the user authentication</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -32,7 +32,7 @@
         <property name="can_focus">False</property>
         <property name="margin_bottom">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Some databases require you to enter a user name.</property>
+        <property name="label" translatable="yes" context="authentificationpage|helptext">Some databases require you to enter a user name.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">60</property>
       </object>
@@ -57,7 +57,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">_User name</property>
+            <property name="label" translatable="yes" context="authentificationpage|generalUserNameLabel">_User name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">generalUserNameEntry</property>
           </object>
@@ -83,7 +83,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="passRequiredCheckbutton">
-            <property name="label" translatable="yes">Password re_quired</property>
+            <property name="label" translatable="yes" context="authentificationpage|passRequiredCheckbutton">Password re_quired</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -108,7 +108,7 @@
     </child>
     <child>
       <object class="GtkButton" id="testConnectionButton">
-        <property name="label" translatable="yes">_Test Connection</property>
+        <property name="label" translatable="yes" context="authentificationpage|testConnectionButton">_Test Connection</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui b/dbaccess/uiconfig/ui/autocharsetpage.ui
index 327e1153e849..3987b3e7e7b2 100644
--- a/dbaccess/uiconfig/ui/autocharsetpage.ui
+++ b/dbaccess/uiconfig/ui/autocharsetpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="AutoCharset">
@@ -35,7 +35,7 @@
                   <object class="GtkLabel" id="charsetlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="autocharsetpage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -65,7 +65,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="autocharsetpage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/backuppage.ui b/dbaccess/uiconfig/ui/backuppage.ui
index f76b1f71d766..562b965013aa 100644
--- a/dbaccess/uiconfig/ui/backuppage.ui
+++ b/dbaccess/uiconfig/ui/backuppage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="BackupPage">
@@ -15,7 +15,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Backup Your Document</property>
+        <property name="label" translatable="yes" context="backuppage|label1">Backup Your Document</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -32,7 +32,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched.</property>
+        <property name="label" translatable="yes" context="backuppage|label2">To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
@@ -48,7 +48,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">Press 'Next' to save a copy of your document, and to begin the migration.</property>
+        <property name="label" translatable="yes" context="backuppage|startmigrate">Press 'Next' to save a copy of your document, and to begin the migration.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
@@ -73,7 +73,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Save to:</property>
+                <property name="label" translatable="yes" context="backuppage|label3">Save to:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">location</property>
               </object>
@@ -107,7 +107,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browse">
-            <property name="label" translatable="yes">Browse...</property>
+            <property name="label" translatable="yes" context="backuppage|browse">Browse...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
index db9ebc386c3a..844aaffbef27 100644
--- a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
+++ b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <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">Data Source</property>
+    <property name="title" translatable="yes" context="choosedatasourcedialog|ChooseDataSourceDialog">Data Source</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -64,7 +64,7 @@
             </child>
             <child>
               <object class="GtkButton" id="organize">
-                <property name="label" translatable="yes">Or_ganize...</property>
+                <property name="label" translatable="yes" context="choosedatasourcedialog|organize">Or_ganize...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -97,7 +97,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Choose a data source:</property>
+                <property name="label" translatable="yes" context="choosedatasourcedialog|label1">Choose a data source:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">treeview:border</property>
               </object>
diff --git a/dbaccess/uiconfig/ui/collectionviewdialog.ui b/dbaccess/uiconfig/ui/collectionviewdialog.ui
index d51688aeb4a3..7ffd69952459 100644
--- a/dbaccess/uiconfig/ui/collectionviewdialog.ui
+++ b/dbaccess/uiconfig/ui/collectionviewdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CollectionView">
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save</property>
+    <property name="title" translatable="yes" context="collectionviewdialog|CollectionView">Save</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -23,7 +23,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Save</property>
+                <property name="label" translatable="yes" context="collectionviewdialog|ok">_Save</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -116,7 +116,7 @@
                     <property name="can_default">True</property>
                     <property name="has_default">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Create New Directory</property>
+                    <property name="tooltip_text" translatable="yes" context="collectionviewdialog|newFolderButton|tooltip_text">Create New Directory</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -132,7 +132,7 @@
                     <property name="can_default">True</property>
                     <property name="has_default">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Up One Level</property>
+                    <property name="tooltip_text" translatable="yes" context="collectionviewdialog|upButton|tooltip_text">Up One Level</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -173,7 +173,7 @@
                   <object class="GtkLabel" id="fileNameLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">File _name:</property>
+                    <property name="label" translatable="yes" context="collectionviewdialog|fileNameLabel">File _name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fileNameEntry</property>
                   </object>
diff --git a/dbaccess/uiconfig/ui/colwidthdialog.ui b/dbaccess/uiconfig/ui/colwidthdialog.ui
index 86dd9b3b9c9a..0e8f07fd6145 100644
--- a/dbaccess/uiconfig/ui/colwidthdialog.ui
+++ b/dbaccess/uiconfig/ui/colwidthdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.10000000000000001</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="ColWidthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Column Width</property>
+    <property name="title" translatable="yes" context="colwidthdialog|ColWidthDialog">Column Width</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -91,7 +91,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Width:</property>
+                <property name="label" translatable="yes" context="colwidthdialog|label1">_Width:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -116,7 +116,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="automatic">
-                <property name="label" translatable="yes">_Automatic</property>
+                <property name="label" translatable="yes" context="colwidthdialog|automatic">_Automatic</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/dbaccess/uiconfig/ui/connectionpage.ui b/dbaccess/uiconfig/ui/connectionpage.ui
index e8ef60d53ecc..619a99842287 100644
--- a/dbaccess/uiconfig/ui/connectionpage.ui
+++ b/dbaccess/uiconfig/ui/connectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="ConnectionPage">
@@ -38,7 +38,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Path to the dBASE files:</property>
+                    <property name="label" translatable="yes" context="connectionpage|browseurllabel">Path to the dBASE files:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">browseurl</property>
                   </object>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="create">
-                    <property name="label" translatable="yes">_Create New</property>
+                    <property name="label" translatable="yes" context="connectionpage|create">_Create New</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -75,7 +75,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse">
-                    <property name="label" translatable="yes">_Browse…</property>
+                    <property name="label" translatable="yes" context="connectionpage|browse">_Browse…</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -95,7 +95,7 @@
           <object class="GtkLabel" id="generalLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">General</property>
+            <property name="label" translatable="yes" context="connectionpage|generalLabel">General</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -137,7 +137,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_User name:</property>
+                    <property name="label" translatable="yes" context="connectionpage|userNameLabel">_User name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">userNameEntry</property>
                   </object>
@@ -159,7 +159,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="passCheckbutton">
-                    <property name="label" translatable="yes">Password required</property>
+                    <property name="label" translatable="yes" context="connectionpage|passCheckbutton">Password required</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -183,7 +183,7 @@
           <object class="GtkLabel" id="userlabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">User Authentication</property>
+            <property name="label" translatable="yes" context="connectionpage|userlabel">User Authentication</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -224,7 +224,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_JDBC driver class:</property>
+                    <property name="label" translatable="yes" context="connectionpage|javaDriverLabel">_JDBC driver class:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">driverEntry</property>
                   </object>
@@ -249,7 +249,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="driverButton">
-                    <property name="label" translatable="yes">Test Class</property>
+                    <property name="label" translatable="yes" context="connectionpage|driverButton">Test Class</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -269,7 +269,7 @@
           <object class="GtkLabel" id="JDBCLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">JDBC Properties</property>
+            <property name="label" translatable="yes" context="connectionpage|JDBCLabel">JDBC Properties</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -284,7 +284,7 @@
     </child>
     <child>
       <object class="GtkButton" id="connectionButton">
-        <property name="label" translatable="yes">Test Connection</property>
+        <property name="label" translatable="yes" context="connectionpage|connectionButton">Test Connection</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/copytablepage.ui b/dbaccess/uiconfig/ui/copytablepage.ui
index dd082b499998..cb245ff021f8 100644
--- a/dbaccess/uiconfig/ui/copytablepage.ui
+++ b/dbaccess/uiconfig/ui/copytablepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="CopyTablePage">
     <property name="visible">True</property>
@@ -32,7 +32,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="defdata">
-                    <property name="label" translatable="yes">De_finition and data</property>
+                    <property name="label" translatable="yes" context="copytablepage|defdata">De_finition and data</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -49,7 +49,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="def">
-                    <property name="label" translatable="yes">Def_inition</property>
+                    <property name="label" translatable="yes" context="copytablepage|def">Def_inition</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -65,7 +65,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="view">
-                    <property name="label" translatable="yes">A_s table view</property>
+                    <property name="label" translatable="yes" context="copytablepage|view">A_s table view</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -81,7 +81,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="data">
-                    <property name="label" translatable="yes">Append _data</property>
+                    <property name="label" translatable="yes" context="copytablepage|data">Append _data</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="GtkCheckButton" id="firstline">
-                    <property name="label" translatable="yes">Use first _line as column names</property>
+                    <property name="label" translatable="yes" context="copytablepage|firstline">Use first _line as column names</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -112,7 +112,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="primarykey">
-                    <property name="label" translatable="yes">Crea_te new field as primary key</property>
+                    <property name="label" translatable="yes" context="copytablepage|primarykey">Crea_te new field as primary key</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -140,7 +140,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Name:</property>
+                            <property name="label" translatable="yes" context="copytablepage|keynamelabel">Name:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">keyname</property>
                           </object>
@@ -172,7 +172,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Existing data fields can be set as primary key on the type formatting step (third page) of the wizard.</property>
+                    <property name="label" translatable="yes" context="copytablepage|infoLabel">Existing data fields can be set as primary key on the type formatting step (third page) of the wizard.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">72</property>
                   </object>
@@ -189,7 +189,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="copytablepage|label1">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -212,7 +212,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Ta_ble name:</property>
+            <property name="label" translatable="yes" context="copytablepage|label2">Ta_ble name:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">name</property>
           </object>
diff --git a/dbaccess/uiconfig/ui/dbaseindexdialog.ui b/dbaccess/uiconfig/ui/dbaseindexdialog.ui
index 1fd8fa59db74..b49681c93e4c 100644
--- a/dbaccess/uiconfig/ui/dbaseindexdialog.ui
+++ b/dbaccess/uiconfig/ui/dbaseindexdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -25,7 +25,7 @@
   <object class="GtkDialog" id="DBaseIndexDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Indexes</property>
+    <property name="title" translatable="yes" context="dbaseindexdialog|DBaseIndexDialog">Indexes</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -104,7 +104,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Table:</property>
+                    <property name="label" translatable="yes" context="dbaseindexdialog|label1">_Table:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">table</property>
                   </object>
@@ -159,7 +159,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">T_able indexes</property>
+                            <property name="label" translatable="yes" context="dbaseindexdialog|label3">T_able indexes</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">tableindex:border</property>
                           </object>
@@ -173,7 +173,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Free indexes</property>
+                            <property name="label" translatable="yes" context="dbaseindexdialog|label4">_Free indexes</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">freeindex:border</property>
                           </object>
@@ -291,7 +291,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Assignment</property>
+                    <property name="label" translatable="yes" context="dbaseindexdialog|label2">Assignment</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/dbaccess/uiconfig/ui/dbasepage.ui b/dbaccess/uiconfig/ui/dbasepage.ui
index 1d45b963129b..3a1fb14676c8 100644
--- a/dbaccess/uiconfig/ui/dbasepage.ui
+++ b/dbaccess/uiconfig/ui/dbasepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="DbasePage">
@@ -35,7 +35,7 @@
                   <object class="GtkLabel" id="charsetlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="dbasepage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -65,7 +65,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="dbasepage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -101,7 +101,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="showDelRowsCheckbutton">
-                    <property name="label" translatable="yes">Display deleted records as well</property>
+                    <property name="label" translatable="yes" context="dbasepage|showDelRowsCheckbutton">Display deleted records as well</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -120,7 +120,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source.</property>
+                    <property name="label" translatable="yes" context="dbasepage|specMessageLabel">Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">60</property>
                   </object>
@@ -138,7 +138,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Optional Settings</property>
+            <property name="label" translatable="yes" context="dbasepage|label1">Optional Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -153,7 +153,7 @@
     </child>
     <child>
       <object class="GtkButton" id="indiciesButton">
-        <property name="label" translatable="yes">Indexes...</property>
+        <property name="label" translatable="yes" context="dbasepage|indiciesButton">Indexes...</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
index 5b3916d424f8..25fe3afe3fdf 100644
--- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="ConnectionPage">
@@ -33,7 +33,7 @@
         <property name="can_focus">False</property>
         <property name="margin_bottom">6</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">label</property>
+        <property name="label" translatable="yes" context="dbwizconnectionpage|helptext">label</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">60</property>
       </object>
@@ -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">Path to the dBASE files:</property>
+            <property name="label" translatable="yes" context="dbwizconnectionpage|browseurllabel">Path to the dBASE files:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">browseurl</property>
           </object>
@@ -77,7 +77,7 @@
         </child>
         <child>
           <object class="GtkButton" id="create">
-            <property name="label" translatable="yes">_Create New</property>
+            <property name="label" translatable="yes" context="dbwizconnectionpage|create">_Create New</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -91,7 +91,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browse">
-            <property name="label" translatable="yes">_Browse…</property>
+            <property name="label" translatable="yes" context="dbwizconnectionpage|browse">_Browse…</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
index 3d9d43f6a11c..344d99206937 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="DBWizMysqlIntroPage">
     <property name="visible">True</property>
@@ -35,7 +35,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">You can connect to a MySQL database using either ODBC or JDBC.
+                    <property name="label" translatable="yes" context="dbwizmysqlintropage|label2">You can connect to a MySQL database using either ODBC or JDBC.
 Please contact your system administrator if you are unsure about the following settings.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">100</property>
@@ -66,7 +66,7 @@ Please contact your system administrator if you are unsure about the following s
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="odbc">
-                                <property name="label" translatable="yes">Connect using ODBC (Open Database Connectivity)</property>
+                                <property name="label" translatable="yes" context="dbwizmysqlintropage|odbc">Connect using ODBC (Open Database Connectivity)</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -82,7 +82,7 @@ Please contact your system administrator if you are unsure about the following s
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="jdbc">
-                                <property name="label" translatable="yes">Connect using JDBC (Java Database Connectivity)</property>
+                                <property name="label" translatable="yes" context="dbwizmysqlintropage|jdbc">Connect using JDBC (Java Database Connectivity)</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -100,7 +100,7 @@ Please contact your system administrator if you are unsure about the following s
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="directly">
-                                <property name="label" translatable="yes">Connect directly</property>
+                                <property name="label" translatable="yes" context="dbwizmysqlintropage|directly">Connect directly</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -122,7 +122,7 @@ Please contact your system administrator if you are unsure about the following s
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">How do you want to connect to your MySQL database?</property>
+                        <property name="label" translatable="yes" context="dbwizmysqlintropage|label1">How do you want to connect to your MySQL database?</property>
                       </object>
                     </child>
                   </object>
@@ -140,7 +140,7 @@ Please contact your system administrator if you are unsure about the following s
           <object class="GtkLabel" id="header">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Set Up a Connection to a MySQL Database</property>
+            <property name="label" translatable="yes" context="dbwizmysqlintropage|header">Set Up a Connection to a MySQL Database</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
index 4e8a2895c376..6320d321a33b 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="DBWizMysqlNativePage">
     <property name="visible">True</property>
@@ -38,7 +38,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Please enter the required information to connect to a MySQL database.</property>
+                    <property name="label" translatable="yes" context="dbwizmysqlnativepage|helptext">Please enter the required information to connect to a MySQL database.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">100</property>
                   </object>
@@ -73,7 +73,7 @@
           <object class="GtkLabel" id="header">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Set Up a Connection to a MySQL Database</property>
+            <property name="label" translatable="yes" context="dbwizmysqlnativepage|header">Set Up a Connection to a MySQL Database</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
index f66783b100e4..8fe4fe8d0041 100644
--- a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="DBWizSpreadsheetPage">
@@ -71,7 +71,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="browse">
-                        <property name="label" translatable="yes">Browse</property>
+                        <property name="label" translatable="yes" context="dbwizspreadsheetpage|browse">Browse</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -87,7 +87,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="create">
-                        <property name="label" translatable="yes">Create New</property>
+                        <property name="label" translatable="yes" context="dbwizspreadsheetpage|create">Create New</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -145,7 +145,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="passwordrequired">
-        <property name="label" translatable="yes">_Password required</property>
+        <property name="label" translatable="yes" context="dbwizspreadsheetpage|passwordrequired">_Password required</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/dbwiztextpage.ui b/dbaccess/uiconfig/ui/dbwiztextpage.ui
index d266b35374d5..5f53c07f5f9a 100644
--- a/dbaccess/uiconfig/ui/dbwiztextpage.ui
+++ b/dbaccess/uiconfig/ui/dbwiztextpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="DBWizTextPage">
@@ -71,7 +71,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="browse">
-                        <property name="label" translatable="yes">Browse</property>
+                        <property name="label" translatable="yes" context="dbwiztextpage|browse">Browse</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -87,7 +87,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="create">
-                        <property name="label" translatable="yes">Create New</property>
+                        <property name="label" translatable="yes" context="dbwiztextpage|create">Create New</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
index 9b263be4b01c..1d4ccc4ad04a 100644
--- a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
+++ b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteAllRowsDialog">
     <property name="can_focus">False</property>
@@ -9,7 +9,7 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.</property>
+    <property name="text" translatable="yes" context="deleteallrowsdialog|DeleteAllRowsDialog">You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui
index a3bb08e5eaa9..7719a809c283 100644
--- a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui
+++ b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DesignSaveModifiedDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes">The relation design has been changed.</property>
+    <property name="text" translatable="yes" context="designsavemodifieddialog|DesignSaveModifiedDialog">Do you want to save the changes?</property>
+    <property name="secondary_text" translatable="yes" context="designsavemodifieddialog|DesignSaveModifiedDialog">The relation design has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/dbaccess/uiconfig/ui/directsqldialog.ui b/dbaccess/uiconfig/ui/directsqldialog.ui
index 96979d66ff93..ec973ae33211 100644
--- a/dbaccess/uiconfig/ui/directsqldialog.ui
+++ b/dbaccess/uiconfig/ui/directsqldialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DirectSQLDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Execute SQL Statement</property>
+    <property name="title" translatable="yes" context="directsqldialog|DirectSQLDialog">Execute SQL Statement</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Command to execute:</property>
+                        <property name="label" translatable="yes" context="directsqldialog|sql_label">_Command to execute:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sql:border</property>
                       </object>
@@ -105,7 +105,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="showoutput">
-                            <property name="label" translatable="yes">_Show output of "select" statements</property>
+                            <property name="label" translatable="yes" context="directsqldialog|showoutput">_Show output of "select" statements</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="execute">
-                            <property name="label" translatable="yes">_Execute</property>
+                            <property name="label" translatable="yes" context="directsqldialog|execute">_Execute</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
@@ -155,7 +155,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Previous commands:</property>
+                        <property name="label" translatable="yes" context="directsqldialog|sqlhistory_label">_Previous commands:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sqlhistory</property>
                       </object>
@@ -172,7 +172,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">SQL Command</property>
+                <property name="label" translatable="yes" context="directsqldialog|label1">SQL Command</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -217,7 +217,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Status</property>
+                <property name="label" translatable="yes" context="directsqldialog|label2">Status</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -262,7 +262,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Output</property>
+                <property name="label" translatable="yes" context="directsqldialog|label3">Output</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/dbaccess/uiconfig/ui/emptypage.ui b/dbaccess/uiconfig/ui/emptypage.ui
index 1d6294e8a8c2..6f522155fbda 100644
--- a/dbaccess/uiconfig/ui/emptypage.ui
+++ b/dbaccess/uiconfig/ui/emptypage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="EmptyPage">
     <property name="visible">True</property>
diff --git a/dbaccess/uiconfig/ui/fielddialog.ui b/dbaccess/uiconfig/ui/fielddialog.ui
index dd47d82a8fd0..c903fa498d4b 100644
--- a/dbaccess/uiconfig/ui/fielddialog.ui
+++ b/dbaccess/uiconfig/ui/fielddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Field Format</property>
+    <property name="title" translatable="yes" context="fielddialog|FieldDialog">Field Format</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -102,7 +102,7 @@
                   <object class="GtkLabel" id="format">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="fielddialog|format">Format</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -116,7 +116,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0.4699999988079071</property>
-                    <property name="label" translatable="yes">Alignment</property>
+                    <property name="label" translatable="yes" context="fielddialog|alignment">Alignment</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -134,7 +134,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Table Format</property>
+                <property name="label" translatable="yes" context="fielddialog|alttitle">Table Format</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui
index 765d165f0a46..3e3c45585cb9 100644
--- a/dbaccess/uiconfig/ui/finalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/finalpagewizard.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="PageFinal">
     <property name="width_request">400</property>
@@ -14,7 +14,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Decide How to Proceed After Saving the Database</property>
+        <property name="label" translatable="yes" context="finalpagewizard|headerText">Decide How to Proceed After Saving the Database</property>
         <property name="wrap">True</property>
         <attributes>
           <attribute name="weight" value="bold"/>
@@ -41,7 +41,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Do you want the wizard to register the database in %PRODUCTNAME?</property>
+                <property name="label" translatable="yes" context="finalpagewizard|helpText">Do you want the wizard to register the database in %PRODUCTNAME?</property>
                 <property name="wrap">True</property>
                 <property name="wrap_mode">word-char</property>
                 <property name="max_width_chars">72</property>
@@ -53,7 +53,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="yesregister">
-                <property name="label" translatable="yes">_Yes, register the database for me</property>
+                <property name="label" translatable="yes" context="finalpagewizard|yesregister">_Yes, register the database for me</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="noregister">
-                <property name="label" translatable="yes">N_o, do not register the database</property>
+                <property name="label" translatable="yes" context="finalpagewizard|noregister">N_o, do not register the database</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</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">After the database file has been saved, what do you want to do?</property>
+                <property name="label" translatable="yes" context="finalpagewizard|additionalText">After the database file has been saved, what do you want to do?</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">72</property>
               </object>
@@ -113,7 +113,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="openediting">
-                <property name="label" translatable="yes">Open the database for editing</property>
+                <property name="label" translatable="yes" context="finalpagewizard|openediting">Open the database for editing</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="usewizard">
-                <property name="label" translatable="yes">Create tables using the table wizard</property>
+                <property name="label" translatable="yes" context="finalpagewizard|usewizard">Create tables using the table wizard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -153,7 +153,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Click 'Finish' to save the database.</property>
+            <property name="label" translatable="yes" context="finalpagewizard|finishText">Click 'Finish' to save the database.</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/dbaccess/uiconfig/ui/generalpagedialog.ui b/dbaccess/uiconfig/ui/generalpagedialog.ui
index 12578f72435e..40705b0a1a6a 100644
--- a/dbaccess/uiconfig/ui/generalpagedialog.ui
+++ b/dbaccess/uiconfig/ui/generalpagedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="PageGeneral">
     <property name="visible">True</property>
@@ -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">Select the type of database to which you want to establish a connection.</property>
+        <property name="label" translatable="yes" context="generalpagedialog|datasourceTypePre">Select the type of database to which you want to establish a connection.</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -28,7 +28,7 @@
         <property name="can_focus">False</property>
         <property name="margin_left">48</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Database _type:</property>
+        <property name="label" translatable="yes" context="generalpagedialog|datasourceTypeLabel">Database _type:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">datasourceType</property>
       </object>
@@ -56,7 +56,7 @@
         <property name="margin_top">6</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">On the following pages, you can make detailed settings for the connection.
+        <property name="label" translatable="yes" context="generalpagedialog|datasourceTypeHelp">On the following pages, you can make detailed settings for the connection.
 
 The new settings you make will overwrite your existing settings.</property>
       </object>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index ea43f35d5d38..c23594bf0b44 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="PageGeneral">
@@ -15,7 +15,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Welcome to the %PRODUCTNAME Database Wizard</property>
+        <property name="label" translatable="yes" context="generalpagewizard|headerText">Welcome to the %PRODUCTNAME Database Wizard</property>
         <property name="wrap">True</property>
         <attributes>
           <attribute name="weight" value="bold"/>
@@ -32,7 +32,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server.</property>
+        <property name="label" translatable="yes" context="generalpagewizard|helpText">Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">72</property>
       </object>
@@ -47,7 +47,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">What do you want to do?</property>
+        <property name="label" translatable="yes" context="generalpagewizard|sourceTypeHeader">What do you want to do?</property>
         <property name="wrap">True</property>
       </object>
       <packing>
@@ -58,7 +58,7 @@
     </child>
     <child>
       <object class="GtkRadioButton" id="createDatabase">
-        <property name="label" translatable="yes">Create a n_ew database</property>
+        <property name="label" translatable="yes" context="generalpagewizard|createDatabase">Create a n_ew database</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -85,7 +85,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Embedded database:</property>
+            <property name="label" translatable="yes" context="generalpagewizard|embeddeddbLabel">_Embedded database:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">embeddeddbList</property>
           </object>
@@ -115,7 +115,7 @@
     </child>
     <child>
       <object class="GtkRadioButton" id="openExistingDatabase">
-        <property name="label" translatable="yes">Open an existing database _file</property>
+        <property name="label" translatable="yes" context="generalpagewizard|openExistingDatabase">Open an existing database _file</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Recently used:</property>
+            <property name="label" translatable="yes" context="generalpagewizard|docListLabel">_Recently used:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">documentList</property>
           </object>
@@ -176,7 +176,7 @@
     </child>
     <child>
       <object class="dbulo-OpenDocumentButton" id="openDatabase">
-        <property name="label" translatable="yes">Open</property>
+        <property name="label" translatable="yes" context="generalpagewizard|openDatabase">Open</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
@@ -192,7 +192,7 @@
     </child>
     <child>
       <object class="GtkRadioButton" id="connectDatabase">
-        <property name="label" translatable="yes">Connect to an e_xisting database</property>
+        <property name="label" translatable="yes" context="generalpagewizard|connectDatabase">Connect to an e_xisting database</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
index d4655620df6c..e81362cc8388 100644
--- a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
+++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="GeneralSpecialJDBCDetails">
@@ -36,7 +36,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Host name:</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|label2">_Host name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">hostNameEntry</property>
                   </object>
@@ -50,7 +50,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Port number:</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|label3">_Port number:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">portNumberSpinbutton</property>
                   </object>
@@ -75,7 +75,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Socket:</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|socketLabel">Socket:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -87,7 +87,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">MySQL JDBC d_river class:</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|driverClassLabel">MySQL JDBC d_river class:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">jdbcDriverClassEntry</property>
                   </object>
@@ -109,7 +109,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="testDriverClassButton">
-                    <property name="label" translatable="yes">Test Class</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|testDriverClassButton">Test Class</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -159,7 +159,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Connection Settings</property>
+            <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|label1">Connection Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -196,7 +196,7 @@
                   <object class="GtkLabel" id="charsetlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -226,7 +226,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="generalspecialjdbcdetailspage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/generatedvaluespage.ui b/dbaccess/uiconfig/ui/generatedvaluespage.ui
index 88cefb1e7a8c..d5ae90eff699 100644
--- a/dbaccess/uiconfig/ui/generatedvaluespage.ui
+++ b/dbaccess/uiconfig/ui/generatedvaluespage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="GeneratedValuesPage">
     <property name="visible">True</property>
@@ -26,7 +26,7 @@
             <property name="row_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="autoretrieve">
-                <property name="label" translatable="yes">Re_trieve generated values</property>
+                <property name="label" translatable="yes" context="generatedvaluespage|autoretrieve">Re_trieve generated values</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -62,7 +62,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Auto-increment statement:</property>
+                            <property name="label" translatable="yes" context="generatedvaluespage|statementft">_Auto-increment statement:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">statement</property>
                           </object>
@@ -100,7 +100,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Query of generated values:</property>
+                            <property name="label" translatable="yes" context="generatedvaluespage|queryft">_Query of generated values:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">query</property>
                           </object>
@@ -143,7 +143,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Settings</property>
+        <property name="label" translatable="yes" context="generatedvaluespage|label1">Settings</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui b/dbaccess/uiconfig/ui/indexdesigndialog.ui
index a0d34a83f70e..e607195ddcca 100644
--- a/dbaccess/uiconfig/ui/indexdesigndialog.ui
+++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.4"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="IndexDesignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Indexes</property>
+    <property name="title" translatable="yes" context="indexdesigndialog|IndexDesignDialog">Indexes</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -77,7 +77,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="action_name">.index:createNew</property>
-                        <property name="label" translatable="yes">New Index</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|ID_INDEX_NEW">New Index</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">dbaccess/res/sc036.png</property>
                       </object>
@@ -92,7 +92,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="action_name">.index:dropCurrent</property>
-                        <property name="label" translatable="yes">Delete Current Index</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|ID_INDEX_DROP">Delete Current Index</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">dbaccess/res/sc037.png</property>
                       </object>
@@ -107,7 +107,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="action_name">.index:renameCurrent</property>
-                        <property name="label" translatable="yes">Rename Current Index</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|ID_INDEX_RENAME">Rename Current Index</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">dbaccess/res/sc038.png</property>
                       </object>
@@ -122,7 +122,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="action_name">.index:saveCurrent</property>
-                        <property name="label" translatable="yes">Save Current Index</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|ID_INDEX_SAVE">Save Current Index</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">dbaccess/res/sc039.png</property>
                       </object>
@@ -137,7 +137,7 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="action_name">.index:resetCurrent</property>
-                        <property name="label" translatable="yes">Reset Current Index</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|ID_INDEX_RESET">Reset Current Index</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">dbaccess/res/sc040.png</property>
                       </object>
@@ -273,7 +273,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Index identifier:</property>
+                                <property name="label" translatable="yes" context="indexdesigndialog|DESC_LABEL">Index identifier:</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -294,7 +294,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="UNIQUE">
-                                <property name="label" translatable="yes">_Unique</property>
+                                <property name="label" translatable="yes" context="indexdesigndialog|UNIQUE">_Unique</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -316,7 +316,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="halign">start</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Fields:</property>
+                                <property name="label" translatable="yes" context="indexdesigndialog|FIELDS_LABEL">Fields:</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -349,7 +349,7 @@
                       <object class="GtkLabel" id="INDEX_DETAILS">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Index Details</property>
+                        <property name="label" translatable="yes" context="indexdesigndialog|INDEX_DETAILS">Index Details</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
index 945bae1895b8..740671b2701e 100644
--- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="JDBCConnectionPage">
@@ -17,7 +17,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">6</property>
-        <property name="label" translatable="yes">Set Up a Connection to a JDBC Database</property>
+        <property name="label" translatable="yes" context="jdbcconnectionpage|header">Set Up a Connection to a JDBC Database</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -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">Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings.</property>
+        <property name="label" translatable="yes" context="jdbcconnectionpage|helptext">Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">60</property>
       </object>
@@ -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">Path to the dBASE files:</property>
+            <property name="label" translatable="yes" context="jdbcconnectionpage|browseurllabel">Path to the dBASE files:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">browseurl</property>
           </object>
@@ -77,7 +77,7 @@
         </child>
         <child>
           <object class="GtkButton" id="create">
-            <property name="label" translatable="yes">_Create New</property>
+            <property name="label" translatable="yes" context="jdbcconnectionpage|create">_Create New</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -91,7 +91,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browse">
-            <property name="label" translatable="yes">_Browse…</property>
+            <property name="label" translatable="yes" context="jdbcconnectionpage|browse">_Browse…</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -123,7 +123,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">JDBC d_river class:</property>
+            <property name="label" translatable="yes" context="jdbcconnectionpage|jdbcLabel">JDBC d_river class:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">jdbcEntry</property>
           </object>
@@ -153,7 +153,7 @@
             </child>
             <child>
               <object class="GtkButton" id="jdbcButton">
-                <property name="label" translatable="yes">_Test Class</property>
+                <property name="label" translatable="yes" context="jdbcconnectionpage|jdbcButton">_Test Class</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/joindialog.ui b/dbaccess/uiconfig/ui/joindialog.ui
index c2695e7f5c07..7a1057385039 100644
--- a/dbaccess/uiconfig/ui/joindialog.ui
+++ b/dbaccess/uiconfig/ui/joindialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststore1">
@@ -12,23 +12,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Inner join</col>
+        <col id="0" translatable="yes" context="joindialog|liststore1">Inner join</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left join</col>
+        <col id="0" translatable="yes" context="joindialog|liststore1">Left join</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right join</col>
+        <col id="0" translatable="yes" context="joindialog|liststore1">Right join</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Full (outer) join</col>
+        <col id="0" translatable="yes" context="joindialog|liststore1">Full (outer) join</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cross join</col>
+        <col id="0" translatable="yes" context="joindialog|liststore1">Cross join</col>
         <col id="1">5</col>
       </row>
     </data>
@@ -36,7 +36,7 @@
   <object class="GtkDialog" id="JoinDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Join Properties</property>
+    <property name="title" translatable="yes" context="joindialog|JoinDialog">Join Properties</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -159,7 +159,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tables Involved</property>
+                    <property name="label" translatable="yes" context="joindialog|label1">Tables Involved</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -225,7 +225,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Fields Involved</property>
+                    <property name="label" translatable="yes" context="joindialog|label2">Fields Involved</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -261,7 +261,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Type:</property>
+                            <property name="label" translatable="yes" context="joindialog|label5">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">type</property>
                           </object>
@@ -284,7 +284,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="natural">
-                            <property name="label" translatable="yes">Natural</property>
+                            <property name="label" translatable="yes" context="joindialog|natural">Natural</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -308,7 +308,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="joindialog|label6">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/dbaccess/uiconfig/ui/jointablemenu.ui b/dbaccess/uiconfig/ui/jointablemenu.ui
index b9df6f291084..9096f879ad46 100644
--- a/dbaccess/uiconfig/ui/jointablemenu.ui
+++ b/dbaccess/uiconfig/ui/jointablemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="jointablemenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/dbaccess/uiconfig/ui/joinviewmenu.ui b/dbaccess/uiconfig/ui/joinviewmenu.ui
index 6c1e88d76353..07ecae3fb9dc 100644
--- a/dbaccess/uiconfig/ui/joinviewmenu.ui
+++ b/dbaccess/uiconfig/ui/joinviewmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="joinviewmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit...</property>
+        <property name="label" translatable="yes" context="joinviewmenu|edit">Edit...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/dbaccess/uiconfig/ui/keymenu.ui b/dbaccess/uiconfig/ui/keymenu.ui
index 301ad667518a..8836c57b1ceb 100644
--- a/dbaccess/uiconfig/ui/keymenu.ui
+++ b/dbaccess/uiconfig/ui/keymenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkCheckMenuItem" id="primarykey">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Primary Key</property>
+        <property name="label" translatable="yes" context="keymenu|primarykey">Primary Key</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
index 43763f251d17..8415169a8ffe 100644
--- a/dbaccess/uiconfig/ui/ldapconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="LDAPConnectionPage">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">6</property>
-        <property name="label" translatable="yes">Set Up a Connection to an LDAP Directory</property>
+        <property name="label" translatable="yes" context="ldapconnectionpage|header">Set Up a Connection to an LDAP Directory</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -31,7 +31,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings.</property>
+        <property name="label" translatable="yes" context="ldapconnectionpage|helpLabel">Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">80</property>
       </object>
@@ -54,7 +54,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Server:</property>
+            <property name="label" translatable="yes" context="ldapconnectionpage|hostNameLabel">_Server:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">hostNameEntry</property>
           </object>
@@ -68,7 +68,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Port number:</property>
+            <property name="label" translatable="yes" context="ldapconnectionpage|portNumLabel">_Port number:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">portNumEntry</property>
           </object>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="portNumDefLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Default: 389</property>
+                <property name="label" translatable="yes" context="ldapconnectionpage|portNumDefLabel">Default: 389</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -129,7 +129,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Base _DN:</property>
+            <property name="label" translatable="yes" context="ldapconnectionpage|baseDNLabel">Base _DN:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">baseDNEntry</property>
           </object>
@@ -158,7 +158,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="useSSLCheckbutton">
-        <property name="label" translatable="yes">Use _secure connection (SSL)</property>
+        <property name="label" translatable="yes" context="ldapconnectionpage|useSSLCheckbutton">Use _secure connection (SSL)</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/ldappage.ui b/dbaccess/uiconfig/ui/ldappage.ui
index 686faf8061b6..de4f4de7739c 100644
--- a/dbaccess/uiconfig/ui/ldappage.ui
+++ b/dbaccess/uiconfig/ui/ldappage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="LDAP">
     <property name="visible">True</property>
@@ -36,7 +36,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Base DN:</property>
+                    <property name="label" translatable="yes" context="ldappage|label1">_Base DN:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">baseDNEntry</property>
                   </object>
@@ -58,7 +58,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="useSSLCheckbutton">
-                    <property name="label" translatable="yes">Use secure connection (SSL)</property>
+                    <property name="label" translatable="yes" context="ldappage|useSSLCheckbutton">Use secure connection (SSL)</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -77,7 +77,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Port number:</property>
+                    <property name="label" translatable="yes" context="ldappage|label2">_Port number:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">portNumberSpinbutton</property>
                   </object>
@@ -102,7 +102,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Maximum number of _records:</property>
+                    <property name="label" translatable="yes" context="ldappage|label3">Maximum number of _records:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">LDAPRowCountspinbutton</property>
                   </object>
@@ -130,7 +130,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Connection Settings</property>
+            <property name="label" translatable="yes" context="ldappage|charsetheader">Connection Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/migratepage.ui b/dbaccess/uiconfig/ui/migratepage.ui
index a4f47ee23759..e74c8e79e13e 100644
--- a/dbaccess/uiconfig/ui/migratepage.ui
+++ b/dbaccess/uiconfig/ui/migratepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="MigratePage">
     <property name="visible">True</property>
@@ -14,7 +14,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Migration Progress</property>
+        <property name="label" translatable="yes" context="migratepage|label1">Migration Progress</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -31,7 +31,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:</property>
+        <property name="label" translatable="yes" context="migratepage|count">The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
@@ -47,7 +47,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">All forms and reports have been successfully processed. Press 'Next' to show a detailed summary.</property>
+        <property name="label" translatable="yes" context="migratepage|done">All forms and reports have been successfully processed. Press 'Next' to show a detailed summary.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
@@ -68,7 +68,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Overall progress:</property>
+            <property name="label" translatable="yes" context="migratepage|label4">Overall progress:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -80,7 +80,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">document $current$ of $overall$</property>
+            <property name="label" translatable="yes" context="migratepage|overall">document $current$ of $overall$</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -120,7 +120,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Current progress:</property>
+            <property name="label" translatable="yes" context="migratepage|label6">Current progress:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -171,7 +171,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Current object:</property>
+            <property name="label" translatable="yes" context="migratepage|label5">Current object:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/dbaccess/uiconfig/ui/mysqlnativepage.ui b/dbaccess/uiconfig/ui/mysqlnativepage.ui
index d124b52c7f1f..bd27b83382b4 100644
--- a/dbaccess/uiconfig/ui/mysqlnativepage.ui
+++ b/dbaccess/uiconfig/ui/mysqlnativepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="MysqlNativePage">
@@ -45,7 +45,7 @@
           <object class="GtkLabel" id="connectionheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Connection Settings</property>
+            <property name="label" translatable="yes" context="mysqlnativepage|connectionheader">Connection Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -87,7 +87,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_User name:</property>
+                    <property name="label" translatable="yes" context="mysqlnativepage|usernamelabel">_User name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">username</property>
                   </object>
@@ -110,7 +110,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="passwordrequired">
-                    <property name="label" translatable="yes">Password required</property>
+                    <property name="label" translatable="yes" context="mysqlnativepage|passwordrequired">Password required</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -134,7 +134,7 @@
           <object class="GtkLabel" id="userheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">User Authentication</property>
+            <property name="label" translatable="yes" context="mysqlnativepage|userheader">User Authentication</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -173,7 +173,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="mysqlnativepage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -203,7 +203,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="mysqlnativepage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/mysqlnativesettings.ui b/dbaccess/uiconfig/ui/mysqlnativesettings.ui
index 4e7dff50fab6..a4574f879641 100644
--- a/dbaccess/uiconfig/ui/mysqlnativesettings.ui
+++ b/dbaccess/uiconfig/ui/mysqlnativesettings.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="MysqlNativeSettings">
     <property name="visible">True</property>
@@ -22,7 +22,7 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Database name:</property>
+            <property name="label" translatable="yes" context="mysqlnativesettings|dbnamelabel">_Database name:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">dbname</property>
           </object>
@@ -60,7 +60,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkRadioButton" id="hostport">
-            <property name="label" translatable="yes">Se_rver/port</property>
+            <property name="label" translatable="yes" context="mysqlnativesettings|hostport">Se_rver/port</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -93,7 +93,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Server:</property>
+                    <property name="label" translatable="yes" context="mysqlnativesettings|serverlabel">_Server:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">server</property>
                   </object>
@@ -107,7 +107,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Port:</property>
+                    <property name="label" translatable="yes" context="mysqlnativesettings|portlabel">_Port:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">port</property>
                   </object>
@@ -135,7 +135,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Default: 3306</property>
+                    <property name="label" translatable="yes" context="mysqlnativesettings|defaultport">Default: 3306</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -179,7 +179,7 @@
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkRadioButton" id="socketlabel">
-            <property name="label" translatable="yes">So_cket:</property>
+            <property name="label" translatable="yes" context="mysqlnativesettings|socketlabel">So_cket:</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -222,7 +222,7 @@
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkRadioButton" id="namedpipelabel">
-            <property name="label" translatable="yes">Named p_ipe:</property>
+            <property name="label" translatable="yes" context="mysqlnativesettings|namedpipelabel">Named p_ipe:</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/namematchingpage.ui b/dbaccess/uiconfig/ui/namematchingpage.ui
index 259511daca8a..caffe5e4ab85 100644
--- a/dbaccess/uiconfig/ui/namematchingpage.ui
+++ b/dbaccess/uiconfig/ui/namematchingpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="NameMatching">
     <property name="visible">True</property>
@@ -45,7 +45,7 @@
         </child>
         <child>
           <object class="GtkButton" id="all">
-            <property name="label" translatable="yes">_All</property>
+            <property name="label" translatable="yes" context="namematchingpage|all">_All</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -62,7 +62,7 @@
         </child>
         <child>
           <object class="GtkButton" id="none">
-            <property name="label" translatable="yes">Non_e</property>
+            <property name="label" translatable="yes" context="namematchingpage|none">Non_e</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -98,7 +98,7 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Source table: </property>
+            <property name="label" translatable="yes" context="namematchingpage|leftlabel">Source table: </property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -143,7 +143,7 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Destination table: </property>
+            <property name="label" translatable="yes" context="namematchingpage|rightlabel">Destination table: </property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/dbaccess/uiconfig/ui/odbcpage.ui b/dbaccess/uiconfig/ui/odbcpage.ui
index d399cf792201..5365d776176d 100644
--- a/dbaccess/uiconfig/ui/odbcpage.ui
+++ b/dbaccess/uiconfig/ui/odbcpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="ODBC">
@@ -35,7 +35,7 @@
                   <object class="GtkLabel" id="charsetlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="odbcpage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -65,7 +65,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="odbcpage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -109,7 +109,7 @@
                       <object class="GtkLabel" id="optionslabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">ODBC _options:</property>
+                        <property name="label" translatable="yes" context="odbcpage|optionslabel">ODBC _options:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">options</property>
                       </object>
@@ -140,7 +140,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="useCatalogCheckbutton">
-                    <property name="label" translatable="yes">Use catalog for file-based databases</property>
+                    <property name="label" translatable="yes" context="odbcpage|useCatalogCheckbutton">Use catalog for file-based databases</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -162,7 +162,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Optional Settings</property>
+            <property name="label" translatable="yes" context="odbcpage|label1">Optional Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui b/dbaccess/uiconfig/ui/parametersdialog.ui
index 51dcd61402ab..e9460dacce22 100644
--- a/dbaccess/uiconfig/ui/parametersdialog.ui
+++ b/dbaccess/uiconfig/ui/parametersdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="Parameters">
     <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">Parameter Input</property>
+    <property name="title" translatable="yes" context="parametersdialog|Parameters">Parameter Input</property>
     <property name="type_hint">dialog</property>
     <property name="gravity">north</property>
     <child internal-child="vbox">
@@ -119,7 +119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Value:</property>
+                        <property name="label" translatable="yes" context="parametersdialog|label2">_Value:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">paramEntry</property>
                       </object>
@@ -150,7 +150,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="next">
-                            <property name="label" translatable="yes">_Next</property>
+                            <property name="label" translatable="yes" context="parametersdialog|next">_Next</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -178,7 +178,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Parameters</property>
+                <property name="label" translatable="yes" context="parametersdialog|label1">_Parameters</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">allParamTreeview</property>
                 <attributes>
diff --git a/dbaccess/uiconfig/ui/password.ui b/dbaccess/uiconfig/ui/password.ui
index aedf72255f94..6ee159306ce0 100644
--- a/dbaccess/uiconfig/ui/password.ui
+++ b/dbaccess/uiconfig/ui/password.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Change Password</property>
+    <property name="title" translatable="yes" context="password|PasswordDialog">Change Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -117,7 +117,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Old p_assword:</property>
+                        <property name="label" translatable="yes" context="password|label2">Old p_assword:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldpassword</property>
                       </object>
@@ -131,7 +131,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Password:</property>
+                        <property name="label" translatable="yes" context="password|label3">_Password:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">newpassword</property>
                       </object>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Confirm password:</property>
+                        <property name="label" translatable="yes" context="password|label4">_Confirm password:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">confirmpassword</property>
                       </object>
@@ -174,7 +174,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">User “$name$:  $”</property>
+                <property name="label" translatable="yes" context="password|label1">User “$name$:  $”</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/dbaccess/uiconfig/ui/preparepage.ui b/dbaccess/uiconfig/ui/preparepage.ui
index b8fc6261ab76..2c31af455881 100644
--- a/dbaccess/uiconfig/ui/preparepage.ui
+++ b/dbaccess/uiconfig/ui/preparepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="PreparePage">
     <property name="visible">True</property>
@@ -14,7 +14,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Welcome to the Database Macro Migration Wizard</property>
+        <property name="label" translatable="yes" context="preparepage|label1">Welcome to the Database Macro Migration Wizard</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -31,7 +31,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">This wizard will guide you through the task of migrating your macros.
+        <property name="label" translatable="yes" context="preparepage|label2">This wizard will guide you through the task of migrating your macros.
 
 After you finished it, all macros which were formerly embedded into the forms and reports of the current database document will have been moved to the document itself. In this course, libraries will be renamed as needed.
 
@@ -53,7 +53,7 @@ Before the migration can start, all forms, reports, queries and tables belonging
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">Not all objects could be closed. Please close them manually, and re-start the wizard.</property>
+        <property name="label" translatable="yes" context="preparepage|closedocerror">Not all objects could be closed. Please close them manually, and re-start the wizard.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
diff --git a/dbaccess/uiconfig/ui/querycolmenu.ui b/dbaccess/uiconfig/ui/querycolmenu.ui
index 8044db9e1d95..ba4eef9b5188 100644
--- a/dbaccess/uiconfig/ui/querycolmenu.ui
+++ b/dbaccess/uiconfig/ui/querycolmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="width">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Column _Width...</property>
+        <property name="label" translatable="yes" context="querycolmenu|width">Column _Width...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="querycolmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui
index 5497b1ff3d4a..7f713ac445f3 100644
--- a/dbaccess/uiconfig/ui/queryfilterdialog.ui
+++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="QueryFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Standard Filter</property>
+    <property name="title" translatable="yes" context="queryfilterdialog|QueryFilterDialog">Standard Filter</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -93,7 +93,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Operator</property>
+                        <property name="label" translatable="yes" context="queryfilterdialog|label2">Operator</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -105,7 +105,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Field name</property>
+                        <property name="label" translatable="yes" context="queryfilterdialog|label5">Field name</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -117,7 +117,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="queryfilterdialog|label6">Condition</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -131,7 +131,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">- none -</item>
+                          <item translatable="yes" context="queryfilterdialog|field1">- none -</item>
                         </items>
                       </object>
                       <packing>
@@ -145,16 +145,16 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">=</item>
-                          <item translatable="yes">&lt;&gt;</item>
-                          <item translatable="yes">&lt;</item>
-                          <item translatable="yes">&lt;=</item>
-                          <item translatable="yes">&gt;</item>
-                          <item translatable="yes">&gt;=</item>
-                          <item translatable="yes">like</item>
-                          <item translatable="yes">not like</item>
-                          <item translatable="yes">null</item>
-                          <item translatable="yes">not null</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">=</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">&lt;&gt;</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">&lt;</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">&lt;=</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">&gt;</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">&gt;=</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">like</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">not like</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">null</item>
+                          <item translatable="yes" context="queryfilterdialog|cond1">not null</item>
                         </items>
                       </object>
                       <packing>
@@ -168,7 +168,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">- none -</item>
+                          <item translatable="yes" context="queryfilterdialog|field2">- none -</item>
                         </items>
                       </object>
                       <packing>
@@ -182,7 +182,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">- none -</item>
+                          <item translatable="yes" context="queryfilterdialog|field3">- none -</item>
                         </items>
                       </object>
                       <packing>
@@ -216,7 +216,7 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Value</property>
+                        <property name="label" translatable="yes" context="queryfilterdialog|label7">Value</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -260,8 +260,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="queryfilterdialog|op2">AND</item>
+                          <item translatable="yes" context="queryfilterdialog|op2">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -275,8 +275,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="queryfilterdialog|op3">AND</item>
+                          <item translatable="yes" context="queryfilterdialog|op3">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -295,7 +295,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Criteria</property>
+                <property name="label" translatable="yes" context="queryfilterdialog|label1">Criteria</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/dbaccess/uiconfig/ui/queryfuncmenu.ui b/dbaccess/uiconfig/ui/queryfuncmenu.ui
index dc8793f312d7..0da36d211a60 100644
--- a/dbaccess/uiconfig/ui/queryfuncmenu.ui
+++ b/dbaccess/uiconfig/ui/queryfuncmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="functions">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Functions</property>
+        <property name="label" translatable="yes" context="queryfuncmenu|functions">Functions</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="tablename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Table Name</property>
+        <property name="label" translatable="yes" context="queryfuncmenu|tablename">Table Name</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="alias">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Alias</property>
+        <property name="label" translatable="yes" context="queryfuncmenu|alias">Alias</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -45,7 +45,7 @@
       <object class="GtkMenuItem" id="distinct">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Distinct Values</property>
+        <property name="label" translatable="yes" context="queryfuncmenu|distinct">Distinct Values</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index 03f6a3a47e01..d0d03462b501 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="QueryPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Query Properties</property>
+    <property name="title" translatable="yes" context="querypropertiesdialog|QueryPropertiesDialog">Query Properties</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -98,7 +98,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Limit:</property>
+                <property name="label" translatable="yes" context="querypropertiesdialog|limit-label">Limit:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -114,7 +114,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkRadioButton" id="distinct">
-                    <property name="label" translatable="yes">Yes</property>
+                    <property name="label" translatable="yes" context="querypropertiesdialog|distinct">Yes</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -130,7 +130,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="nondistinct">
-                    <property name="label" translatable="yes">No</property>
+                    <property name="label" translatable="yes" context="querypropertiesdialog|nondistinct">No</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -157,7 +157,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Distinct values:</property>
+                <property name="label" translatable="yes" context="querypropertiesdialog|distinctvalues">Distinct values:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui
index 1ff9948b965e..d7f2f2c65c0c 100644
--- a/dbaccess/uiconfig/ui/relationdialog.ui
+++ b/dbaccess/uiconfig/ui/relationdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="RelationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Relations</property>
+    <property name="title" translatable="yes" context="relationdialog|RelationDialog">Relations</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -129,7 +129,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Tables Involved</property>
+                    <property name="label" translatable="yes" context="relationdialog|label1">Tables Involved</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -170,7 +170,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Fields Involved</property>
+                    <property name="label" translatable="yes" context="relationdialog|label2">Fields Involved</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -208,7 +208,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="addaction">
-                                <property name="label" translatable="yes">_No action</property>
+                                <property name="label" translatable="yes" context="relationdialog|addaction">_No action</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -225,7 +225,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="addcascade">
-                                <property name="label" translatable="yes">_Update cascade</property>
+                                <property name="label" translatable="yes" context="relationdialog|addcascade">_Update cascade</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -241,7 +241,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="addnull">
-                                <property name="label" translatable="yes">_Set null</property>
+                                <property name="label" translatable="yes" context="relationdialog|addnull">_Set null</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -257,7 +257,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="adddefault">
-                                <property name="label" translatable="yes">Set _default</property>
+                                <property name="label" translatable="yes" context="relationdialog|adddefault">Set _default</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -279,7 +279,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Update Options</property>
+                        <property name="label" translatable="yes" context="relationdialog|label3">Update Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -312,7 +312,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="delaction">
-                                <property name="label" translatable="yes">_No action</property>
+                                <property name="label" translatable="yes" context="relationdialog|delaction">_No action</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -328,7 +328,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="delcascade">
-                                <property name="label" translatable="yes">Delete _cascade</property>
+                                <property name="label" translatable="yes" context="relationdialog|delcascade">Delete _cascade</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -343,7 +343,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="delnull">
-                                <property name="label" translatable="yes">_Set null</property>
+                                <property name="label" translatable="yes" context="relationdialog|delnull">_Set null</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -358,7 +358,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="deldefault">
-                                <property name="label" translatable="yes">Set _default</property>
+                                <property name="label" translatable="yes" context="relationdialog|deldefault">Set _default</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -379,7 +379,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Delete Options</property>
+                        <property name="label" translatable="yes" context="relationdialog|label4">Delete Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -432,23 +432,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Inner join</col>
+        <col id="0" translatable="yes" context="relationdialog|liststore1">Inner join</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left join</col>
+        <col id="0" translatable="yes" context="relationdialog|liststore1">Left join</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right join</col>
+        <col id="0" translatable="yes" context="relationdialog|liststore1">Right join</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Full (outer) join</col>
+        <col id="0" translatable="yes" context="relationdialog|liststore1">Full (outer) join</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cross join</col>
+        <col id="0" translatable="yes" context="relationdialog|liststore1">Cross join</col>
         <col id="1">5</col>
       </row>
     </data>
diff --git a/dbaccess/uiconfig/ui/rowheightdialog.ui b/dbaccess/uiconfig/ui/rowheightdialog.ui
index a7dd46b4a9fe..f96f4b4cd846 100644
--- a/dbaccess/uiconfig/ui/rowheightdialog.ui
+++ b/dbaccess/uiconfig/ui/rowheightdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.10000000000000001</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="RowHeightDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Row Height</property>
+    <property name="title" translatable="yes" context="rowheightdialog|RowHeightDialog">Row Height</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -91,7 +91,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Height:</property>
+                <property name="label" translatable="yes" context="rowheightdialog|label1">_Height:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -116,7 +116,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="automatic">
-                <property name="label" translatable="yes">_Automatic</property>
+                <property name="label" translatable="yes" context="rowheightdialog|automatic">_Automatic</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/dbaccess/uiconfig/ui/rtfcopytabledialog.ui b/dbaccess/uiconfig/ui/rtfcopytabledialog.ui
index 7a6a17fbdc96..4822640f46f9 100644
--- a/dbaccess/uiconfig/ui/rtfcopytabledialog.ui
+++ b/dbaccess/uiconfig/ui/rtfcopytabledialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="RTFCopyTable">
     <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">Copy RTF Table</property>
+    <property name="title" translatable="yes" context="rtfcopytabledialog|RTFCopyTable">Copy RTF Table</property>
     <property name="type_hint">dialog</property>
   </object>
 </interface>
diff --git a/dbaccess/uiconfig/ui/savedialog.ui b/dbaccess/uiconfig/ui/savedialog.ui
index 86f95ca061b5..71cf1092560d 100644
--- a/dbaccess/uiconfig/ui/savedialog.ui
+++ b/dbaccess/uiconfig/ui/savedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SaveDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save As</property>
+    <property name="title" translatable="yes" context="savedialog|SaveDialog">Save As</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -82,7 +82,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Please enter a name for the object to be created:</property>
+                <property name="label" translatable="yes" context="savedialog|descriptionft">Please enter a name for the object to be created:</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">52</property>
               </object>
@@ -97,7 +97,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Catalog:</property>
+                <property name="label" translatable="yes" context="savedialog|catalogft">_Catalog:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">catalog</property>
               </object>
@@ -111,7 +111,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Schema:</property>
+                <property name="label" translatable="yes" context="savedialog|schemaft">_Schema:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">schema</property>
               </object>
diff --git a/dbaccess/uiconfig/ui/saveindexdialog.ui b/dbaccess/uiconfig/ui/saveindexdialog.ui
index 6e198346243a..55b4aa026e54 100644
--- a/dbaccess/uiconfig/ui/saveindexdialog.ui
+++ b/dbaccess/uiconfig/ui/saveindexdialog.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveIndexDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Exit Index Design</property>
+    <property name="title" translatable="yes" context="saveindexdialog|SaveIndexDialog">Exit Index Design</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Do you want to save the changes made to the current index?</property>
+    <property name="text" translatable="yes" context="saveindexdialog|SaveIndexDialog">Do you want to save the changes made to the current index?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/dbaccess/uiconfig/ui/savemodifieddialog.ui b/dbaccess/uiconfig/ui/savemodifieddialog.ui
index e33b1530fd5a..9683244795cd 100644
--- a/dbaccess/uiconfig/ui/savemodifieddialog.ui
+++ b/dbaccess/uiconfig/ui/savemodifieddialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveModifiedDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes">The current record has been changed.</property>
+    <property name="text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">Do you want to save the changes?</property>
+    <property name="secondary_text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">The current record has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/dbaccess/uiconfig/ui/sortdialog.ui b/dbaccess/uiconfig/ui/sortdialog.ui
index 202910e65013..f742ae4ca18b 100644
--- a/dbaccess/uiconfig/ui/sortdialog.ui
+++ b/dbaccess/uiconfig/ui/sortdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SortDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sort Order</property>
+    <property name="title" translatable="yes" context="sortdialog|SortDialog">Sort Order</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -93,7 +93,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Operator</property>
+                        <property name="label" translatable="yes" context="sortdialog|label2">Operator</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -106,7 +106,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">and then</property>
+                        <property name="label" translatable="yes" context="sortdialog|label3">and then</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -119,7 +119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">and then</property>
+                        <property name="label" translatable="yes" context="sortdialog|label4">and then</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -131,7 +131,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Field name</property>
+                        <property name="label" translatable="yes" context="sortdialog|label5">Field name</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -143,7 +143,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Order</property>
+                        <property name="label" translatable="yes" context="sortdialog|label6">Order</property>
                         <property name="ellipsize">end</property>
                       </object>
                       <packing>
@@ -168,8 +168,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">ascending</item>
-                          <item translatable="yes">descending</item>
+                          <item translatable="yes" context="sortdialog|value1">ascending</item>
+                          <item translatable="yes" context="sortdialog|value1">descending</item>
                         </items>
                       </object>
                       <packing>
@@ -205,8 +205,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">ascending</item>
-                          <item translatable="yes">descending</item>
+                          <item translatable="yes" context="sortdialog|value2">ascending</item>
+                          <item translatable="yes" context="sortdialog|value2">descending</item>
                         </items>
                       </object>
                       <packing>
@@ -220,8 +220,8 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">ascending</item>
-                          <item translatable="yes">descending</item>
+                          <item translatable="yes" context="sortdialog|value3">ascending</item>
+                          <item translatable="yes" context="sortdialog|value3">descending</item>
                         </items>
                       </object>
                       <packing>
@@ -240,7 +240,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sort Order</property>
+                <property name="label" translatable="yes" context="sortdialog|label1">Sort Order</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
index a5c73cc4453c..b34c7576ebdb 100644
--- a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="SpecialJDBCConnectionPage">
     <property name="visible">True</property>
@@ -16,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">6</property>
-        <property name="label" translatable="yes">Set up connection to a MySQL database using JDBC</property>
+        <property name="label" translatable="yes" context="specialjdbcconnectionpage|header">Set up connection to a MySQL database using JDBC</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -32,7 +32,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. </property>
+        <property name="label" translatable="yes" context="specialjdbcconnectionpage|helpLabel">Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. </property>
         <property name="wrap">True</property>
         <property name="max_width_chars">80</property>
       </object>
@@ -55,7 +55,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Database name:</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|dbNameLabel">_Database name:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">dbNameEntry</property>
           </object>
@@ -69,7 +69,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Server:</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|hostNameLabel">_Server:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">hostNameEntry</property>
           </object>
@@ -83,7 +83,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Port number:</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|portNumLabel">_Port number:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">portNumEntry</property>
           </object>
@@ -136,7 +136,7 @@
               <object class="GtkLabel" id="portNumDefLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Default: 3306</property>
+                <property name="label" translatable="yes" context="specialjdbcconnectionpage|portNumDefLabel">Default: 3306</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -170,7 +170,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">MySQL JDBC d_river class:</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|jdbcDriverLabel">MySQL JDBC d_river class:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">jdbcDriverEntry</property>
           </object>
@@ -192,7 +192,7 @@
         </child>
         <child>
           <object class="GtkButton" id="testDriverButton">
-            <property name="label" translatable="yes">_Test Class</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|testDriverButton">_Test Class</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui b/dbaccess/uiconfig/ui/specialsettingspage.ui
index b6ef198c38ca..5594f5b11019 100644
--- a/dbaccess/uiconfig/ui/specialsettingspage.ui
+++ b/dbaccess/uiconfig/ui/specialsettingspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="SpecialSettingsPage">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkCheckButton" id="usesql92">
-            <property name="label" translatable="yes">Use SQL92 naming constraints</property>
+            <property name="label" translatable="yes" context="specialsettingspage|usesql92">Use SQL92 naming constraints</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -32,7 +32,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="append">
-            <property name="label" translatable="yes">Append the table alias name on SELECT statements</property>
+            <property name="label" translatable="yes" context="specialsettingspage|append">Append the table alias name on SELECT statements</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -49,7 +49,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="useas">
-            <property name="label" translatable="yes">Use keyword AS before table alias names</property>
+            <property name="label" translatable="yes" context="specialsettingspage|useas">Use keyword AS before table alias names</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -66,7 +66,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="useoj">
-            <property name="label" translatable="yes">Use Outer Join syntax '{oj }'</property>
+            <property name="label" translatable="yes" context="specialsettingspage|useoj">Use Outer Join syntax '{oj }'</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -83,7 +83,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="ignoreprivs">
-            <property name="label" translatable="yes">Ignore the privileges from the database driver</property>
+            <property name="label" translatable="yes" context="specialsettingspage|ignoreprivs">Ignore the privileges from the database driver</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -100,7 +100,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="replaceparams">
-            <property name="label" translatable="yes">Replace named parameters with '?'</property>
+            <property name="label" translatable="yes" context="specialsettingspage|replaceparams">Replace named parameters with '?'</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -117,7 +117,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="displayver">
-            <property name="label" translatable="yes">Display version columns (when available)</property>
+            <property name="label" translatable="yes" context="specialsettingspage|displayver">Display version columns (when available)</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -134,7 +134,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="usecatalogname">
-            <property name="label" translatable="yes">Use catalog name in SELECT statements</property>
+            <property name="label" translatable="yes" context="specialsettingspage|usecatalogname">Use catalog name in SELECT statements</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -151,7 +151,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="useschemaname">
-            <property name="label" translatable="yes">Use schema name in SELECT statements</property>
+            <property name="label" translatable="yes" context="specialsettingspage|useschemaname">Use schema name in SELECT statements</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -168,7 +168,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="createindex">
-            <property name="label" translatable="yes">Create index with ASC or DESC statement</property>
+            <property name="label" translatable="yes" context="specialsettingspage|createindex">Create index with ASC or DESC statement</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -185,7 +185,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="eol">
-            <property name="label" translatable="yes">End text lines with CR+LF</property>
+            <property name="label" translatable="yes" context="specialsettingspage|eol">End text lines with CR+LF</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -202,7 +202,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="ignorecurrency">
-            <property name="label" translatable="yes">Ignore currency field information</property>
+            <property name="label" translatable="yes" context="specialsettingspage|ignorecurrency">Ignore currency field information</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -219,7 +219,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="inputchecks">
-            <property name="label" translatable="yes">Form data input checks for required fields</property>
+            <property name="label" translatable="yes" context="specialsettingspage|inputchecks">Form data input checks for required fields</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -236,7 +236,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="useodbcliterals">
-            <property name="label" translatable="yes">Use ODBC conformant date/time literals</property>
+            <property name="label" translatable="yes" context="specialsettingspage|useodbcliterals">Use ODBC conformant date/time literals</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -253,7 +253,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="primarykeys">
-            <property name="label" translatable="yes">Supports primary keys</property>
+            <property name="label" translatable="yes" context="specialsettingspage|primarykeys">Supports primary keys</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -270,7 +270,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="resulttype">
-            <property name="label" translatable="yes">Respect the result set type from the database driver</property>
+            <property name="label" translatable="yes" context="specialsettingspage|resulttype">Respect the result set type from the database driver</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="no_show_all">True</property>
@@ -296,7 +296,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Comparison of Boolean values:</property>
+                <property name="label" translatable="yes" context="specialsettingspage|comparisonft">Comparison of Boolean values:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">comparison</property>
               </object>
@@ -312,10 +312,10 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <items>
-                  <item translatable="yes">Default</item>
-                  <item translatable="yes">SQL</item>
-                  <item translatable="yes">Mixed</item>
-                  <item translatable="yes">MS Access</item>
+                  <item translatable="yes" context="specialsettingspage|comparison">Default</item>
+                  <item translatable="yes" context="specialsettingspage|comparison">SQL</item>
+                  <item translatable="yes" context="specialsettingspage|comparison">Mixed</item>
+                  <item translatable="yes" context="specialsettingspage|comparison">MS Access</item>
                 </items>
               </object>
               <packing>
@@ -330,7 +330,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Rows to scan column types:</property>
+                <property name="label" translatable="yes" context="specialsettingspage|rowsft">Rows to scan column types:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">rows</property>
               </object>
diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui
index 8c7dfa4a26e3..d89c28e1bff3 100644
--- a/dbaccess/uiconfig/ui/sqlexception.ui
+++ b/dbaccess/uiconfig/ui/sqlexception.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SQLExceptionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Error Details</property>
+    <property name="title" translatable="yes" context="sqlexception|SQLExceptionDialog">Error Details</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -55,7 +55,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Error _list:</property>
+                <property name="label" translatable="yes" context="sqlexception|label2">Error _list:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">list:border</property>
               </object>
@@ -69,7 +69,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Description:</property>
+                <property name="label" translatable="yes" context="sqlexception|label3">_Description:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">description:border</property>
               </object>
diff --git a/dbaccess/uiconfig/ui/summarypage.ui b/dbaccess/uiconfig/ui/summarypage.ui
index d0e9461a8574..ac03bfdaccda 100644
--- a/dbaccess/uiconfig/ui/summarypage.ui
+++ b/dbaccess/uiconfig/ui/summarypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="SummaryPage">
     <property name="visible">True</property>
@@ -14,7 +14,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Summary</property>
+        <property name="label" translatable="yes" context="summarypage|label1">Summary</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -31,7 +31,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">The migration was successful. Below is a log of the actions which have been taken to your document.</property>
+        <property name="label" translatable="yes" context="summarypage|success">The migration was successful. Below is a log of the actions which have been taken to your document.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
@@ -47,7 +47,7 @@
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">The migration was not successful. Examine the migration log below for details.</property>
+        <property name="label" translatable="yes" context="summarypage|failure">The migration was not successful. Examine the migration log below for details.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">64</property>
       </object>
diff --git a/dbaccess/uiconfig/ui/tabledesignrowmenu.ui b/dbaccess/uiconfig/ui/tabledesignrowmenu.ui
index 37bc014058c2..0ff43e2db4f4 100644
--- a/dbaccess/uiconfig/ui/tabledesignrowmenu.ui
+++ b/dbaccess/uiconfig/ui/tabledesignrowmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="cut">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Cu_t</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|cut">Cu_t</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,21 +25,21 @@
       <object class="GtkMenuItem" id="paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Paste</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|paste">_Paste</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|delete">_Delete</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="insert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert Rows</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|insert">Insert Rows</property>
       </object>
     </child>
     <child>
@@ -52,7 +52,7 @@
       <object class="GtkCheckMenuItem" id="primarykey">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Primary Key</property>
+        <property name="label" translatable="yes" context="tabledesignrowmenu|primarykey">Primary Key</property>
       </object>
     </child>
   </object>
diff --git a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui
index 9c5129757bc3..066ebe2e22d5 100644
--- a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui
+++ b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="TableDesignSaveModifiedDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes">The table has been changed.</property>
+    <property name="text" translatable="yes" context="tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog">Do you want to save the changes?</property>
+    <property name="secondary_text" translatable="yes" context="tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog">The table has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/dbaccess/uiconfig/ui/tablesfilterdialog.ui b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
index 7d7f93a31a99..3e9f1f6a4eb8 100644
--- a/dbaccess/uiconfig/ui/tablesfilterdialog.ui
+++ b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TablesFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Tables Filter</property>
+    <property name="title" translatable="yes" context="tablesfilterdialog|TablesFilterDialog">Tables Filter</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/dbaccess/uiconfig/ui/tablesfilterpage.ui b/dbaccess/uiconfig/ui/tablesfilterpage.ui
index 8478940376a4..f8b795e31d52 100644
--- a/dbaccess/uiconfig/ui/tablesfilterpage.ui
+++ b/dbaccess/uiconfig/ui/tablesfilterpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Tue Jan 21 15:00:47 2014 -->
-<interface>
+<interface domain="dba">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkFrame" id="TablesFilterPage">
@@ -31,7 +31,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Mark the tables that should be visible for the applications.</property>
+                <property name="label" translatable="yes" context="tablesfilterpage|label2">Mark the tables that should be visible for the applications.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">56</property>
               </object>
@@ -67,7 +67,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Tables and Table Filter</property>
+        <property name="label" translatable="yes" context="tablesfilterpage|label1">Tables and Table Filter</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui b/dbaccess/uiconfig/ui/tablesjoindialog.ui
index e074c563e5d2..c3544601cc8d 100644
--- a/dbaccess/uiconfig/ui/tablesjoindialog.ui
+++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="TablesJoinDialog">
@@ -79,7 +79,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkRadioButton" id="tables">
-                <property name="label" translatable="yes">Tables</property>
+                <property name="label" translatable="yes" context="tablesjoindialog|tables">Tables</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="queries">
-                <property name="label" translatable="yes">Queries</property>
+                <property name="label" translatable="yes" context="tablesjoindialog|queries">Queries</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
               <object class="GtkLabel" id="title">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Add Tables</property>
+                <property name="label" translatable="yes" context="tablesjoindialog|title">Add Tables</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Add Table or Query</property>
+                <property name="label" translatable="yes" context="tablesjoindialog|alttitle">Add Table or Query</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/dbaccess/uiconfig/ui/textconnectionsettings.ui b/dbaccess/uiconfig/ui/textconnectionsettings.ui
index b8fb81fe4129..31f9f35f6101 100644
--- a/dbaccess/uiconfig/ui/textconnectionsettings.ui
+++ b/dbaccess/uiconfig/ui/textconnectionsettings.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TextConnectionSettingsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Text Connection Settings</property>
+    <property name="title" translatable="yes" context="textconnectionsettings|TextConnectionSettingsDialog">Text Connection Settings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/dbaccess/uiconfig/ui/textpage.ui b/dbaccess/uiconfig/ui/textpage.ui
index d4a5bd6e8c6b..7c43df5ff7c7 100644
--- a/dbaccess/uiconfig/ui/textpage.ui
+++ b/dbaccess/uiconfig/ui/textpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="TextPage">
@@ -36,7 +36,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="textfile">
-                    <property name="label" translatable="yes">Plain text files (*.txt)</property>
+                    <property name="label" translatable="yes" context="textpage|textfile">Plain text files (*.txt)</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -53,7 +53,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="csvfile">
-                    <property name="label" translatable="yes">Comma-separated value files (*.csv)</property>
+                    <property name="label" translatable="yes" context="textpage|csvfile">Comma-separated value files (*.csv)</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="custom">
-                    <property name="label" translatable="yes">Custom:</property>
+                    <property name="label" translatable="yes" context="textpage|custom">Custom:</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -103,7 +103,7 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Custom: *.abc</property>
+                    <property name="label" translatable="yes" context="textpage|example">Custom: *.abc</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -118,7 +118,7 @@
           <object class="GtkLabel" id="extensionheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Specify the Type of Files You Want to Access</property>
+            <property name="label" translatable="yes" context="textpage|extensionheader">Specify the Type of Files You Want to Access</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -156,7 +156,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="containsheaders">
-                    <property name="label" translatable="yes">_Text contains headers</property>
+                    <property name="label" translatable="yes" context="textpage|containsheaders">_Text contains headers</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -178,7 +178,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Field separator:</property>
+                    <property name="label" translatable="yes" context="textpage|fieldlabel">Field separator:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fieldseparator</property>
                   </object>
@@ -192,7 +192,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Text separator:</property>
+                    <property name="label" translatable="yes" context="textpage|textlabel">Text separator:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">textseparator</property>
                   </object>
@@ -206,7 +206,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Decimal separator:</property>
+                    <property name="label" translatable="yes" context="textpage|decimallabel">Decimal separator:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">decimalseparator</property>
                   </object>
@@ -220,7 +220,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Thousands separator:</property>
+                    <property name="label" translatable="yes" context="textpage|thousandslabel">Thousands separator:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">thousandsseparator</property>
                   </object>
@@ -270,10 +270,10 @@
                     <property name="hexpand">True</property>
                     <property name="has_entry">True</property>
                     <items>
-                      <item translatable="yes">.</item>
-                      <item translatable="yes">,</item>
-                      <item translatable="yes">;</item>
-                      <item translatable="yes">:</item>
+                      <item translatable="yes" context="textpage|decimalseparator">.</item>
+                      <item translatable="yes" context="textpage|decimalseparator">,</item>
+                      <item translatable="yes" context="textpage|decimalseparator">;</item>
+                      <item translatable="yes" context="textpage|decimalseparator">:</item>
                     </items>
                     <child internal-child="entry">
                       <object class="GtkEntry" id="comboboxtext-entry6">
@@ -293,8 +293,8 @@
                     <property name="hexpand">True</property>
                     <property name="has_entry">True</property>
                     <items>
-                      <item translatable="yes">.</item>
-                      <item translatable="yes">,</item>
+                      <item translatable="yes" context="textpage|thousandsseparator">.</item>
+                      <item translatable="yes" context="textpage|thousandsseparator">,</item>
                     </items>
                     <child internal-child="entry">
                       <object class="GtkEntry" id="comboboxtext-entry8">
@@ -315,7 +315,7 @@
           <object class="GtkLabel" id="formatlabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Row Format</property>
+            <property name="label" translatable="yes" context="textpage|formatlabel">Row Format</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -356,7 +356,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="textpage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -386,7 +386,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data Conversion</property>
+            <property name="label" translatable="yes" context="textpage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/typeselectpage.ui b/dbaccess/uiconfig/ui/typeselectpage.ui
index 0b4ef073b34f..7d7ba2f06d17 100644
--- a/dbaccess/uiconfig/ui/typeselectpage.ui
+++ b/dbaccess/uiconfig/ui/typeselectpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="TypeSelect">
@@ -68,7 +68,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Column Information</property>
+                <property name="label" translatable="yes" context="typeselectpage|columns">Column Information</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -107,7 +107,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Lines (ma_x.):</property>
+                        <property name="label" translatable="yes" context="typeselectpage|autolabel">Lines (ma_x.):</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">auto</property>
                       </object>
@@ -118,7 +118,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="autobutton">
-                        <property name="label" translatable="yes">_Auto</property>
+                        <property name="label" translatable="yes" context="typeselectpage|autobutton">_Auto</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -150,7 +150,7 @@
               <object class="GtkLabel" id="autotype">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Automatic Type Recognition</property>
+                <property name="label" translatable="yes" context="typeselectpage|autotype">Automatic Type Recognition</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/dbaccess/uiconfig/ui/useradmindialog.ui b/dbaccess/uiconfig/ui/useradmindialog.ui
index 2538acc2a361..d46db29c5351 100644
--- a/dbaccess/uiconfig/ui/useradmindialog.ui
+++ b/dbaccess/uiconfig/ui/useradmindialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="UserAdminDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">User Administration</property>
+    <property name="title" translatable="yes" context="useradmindialog|UserAdminDialog">User Administration</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -84,7 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">User Settings</property>
+                <property name="label" translatable="yes" context="useradmindialog|settings">User Settings</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/dbaccess/uiconfig/ui/useradminpage.ui b/dbaccess/uiconfig/ui/useradminpage.ui
index 6962482e14d5..0bd5b2737587 100644
--- a/dbaccess/uiconfig/ui/useradminpage.ui
+++ b/dbaccess/uiconfig/ui/useradminpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="UserAdminPage">
     <property name="visible">True</property>
@@ -44,7 +44,7 @@
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Us_er:</property>
+                        <property name="label" translatable="yes" context="useradminpage|label3">Us_er:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -80,7 +80,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkButton" id="add">
-                        <property name="label" translatable="yes">_Add User...</property>
+                        <property name="label" translatable="yes" context="useradminpage|add">_Add User...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -95,7 +95,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="changepass">
-                        <property name="label" translatable="yes">Change _Password...</property>
+                        <property name="label" translatable="yes" context="useradminpage|changepass">Change _Password...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -110,7 +110,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="delete">
-                        <property name="label" translatable="yes">_Delete User...</property>
+                        <property name="label" translatable="yes" context="useradminpage|delete">_Delete User...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -138,7 +138,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">User Selection</property>
+            <property name="label" translatable="yes" context="useradminpage|label1">User Selection</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -177,7 +177,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Access Rights for Selected User</property>
+            <property name="label" translatable="yes" context="useradminpage|label2">Access Rights for Selected User</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/userdetailspage.ui b/dbaccess/uiconfig/ui/userdetailspage.ui
index e4edec5cbde2..5e0b81393f97 100644
--- a/dbaccess/uiconfig/ui/userdetailspage.ui
+++ b/dbaccess/uiconfig/ui/userdetailspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dba">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="UserDetailsPage">
@@ -37,7 +37,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Host name:</property>
+                    <property name="label" translatable="yes" context="userdetailspage|hostnameft">_Host name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">hostname</property>
                     <property name="ellipsize">end</property>
@@ -53,7 +53,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Port number:</property>
+                    <property name="label" translatable="yes" context="userdetailspage|portnumberft">_Port number:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">portnumber</property>
                   </object>
@@ -86,7 +86,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="usecatalog">
-                    <property name="label" translatable="yes">_Use catalog</property>
+                    <property name="label" translatable="yes" context="userdetailspage|usecatalog">_Use catalog</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Driver settings:</property>
+                    <property name="label" translatable="yes" context="userdetailspage|optionslabel">_Driver settings:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">options</property>
                   </object>
@@ -134,7 +134,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Connection Settings</property>
+            <property name="label" translatable="yes" context="userdetailspage|label1">Connection Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -172,7 +172,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Character set:</property>
+                    <property name="label" translatable="yes" context="userdetailspage|charsetlabel">_Character set:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">charset</property>
                   </object>
@@ -202,7 +202,7 @@
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data conversion</property>
+            <property name="label" translatable="yes" context="userdetailspage|charsetheader">Data conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/desktop/AllLangMoTarget_dkt.mk b/desktop/AllLangMoTarget_dkt.mk
new file mode 100644
index 000000000000..b951648dbd8c
--- /dev/null
+++ b/desktop/AllLangMoTarget_dkt.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,dkt))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,dkt,desktop))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk
deleted file mode 100644
index 2b7832799177..000000000000
--- a/desktop/AllLangResTarget_deployment.mk
+++ /dev/null
@@ -1,40 +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,deployment))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,deployment,desktop))
-
-$(eval $(call gb_AllLangResTarget_add_srs,deployment,\
-    deployment/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,deployment/res))
-
-$(eval $(call gb_SrsTarget_set_include,deployment/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/desktop/inc \
-    -I$(SRCDIR)/desktop/source/deployment/registry/inc \
-    -I$(SRCDIR)/desktop/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,deployment/res,\
-    desktop/source/deployment/manager/dp_manager.src \
-    desktop/source/deployment/misc/dp_misc.src \
-    desktop/source/deployment/registry/component/dp_component.src \
-    desktop/source/deployment/registry/configuration/dp_configuration.src \
-    desktop/source/deployment/registry/dp_registry.src \
-    desktop/source/deployment/registry/help/dp_help.src \
-    desktop/source/deployment/registry/package/dp_package.src \
-    desktop/source/deployment/registry/script/dp_script.src \
-    desktop/source/deployment/registry/sfwk/dp_sfwk.src \
-    desktop/source/deployment/unopkg/unopkg.src \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
deleted file mode 100644
index d5296e845a60..000000000000
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ /dev/null
@@ -1,34 +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,deploymentgui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,deploymentgui,desktop))
-
-$(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\
-    deploymentgui/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res))
-
-$(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/desktop/inc \
-    -I$(SRCDIR)/desktop/source/deployment/registry/inc \
-    -I$(SRCDIR)/desktop/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
-    desktop/source/deployment/gui/dp_gui_dialog.src \
-    desktop/source/deployment/gui/dp_gui_updatedialog.src \
-    desktop/source/deployment/gui/dp_gui_updateinstalldialog.src \
-    desktop/source/deployment/gui/dp_gui_versionboxes.src \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk
deleted file mode 100644
index f44a6e017b9d..000000000000
--- a/desktop/AllLangResTarget_dkt.mk
+++ /dev/null
@@ -1,24 +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,dkt))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dkt,desktop))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dkt,\
-    dkt/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dkt/res))
-
-$(eval $(call gb_SrsTarget_add_files,dkt/res,\
-    desktop/source/app/desktop.src \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index dbc55a700e04..8095676d3d79 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
     tl \
     ucbhelper \
     utl \
+    vcl \
     xmlscript \
     i18nlangtag \
 ))
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index b3754912f54c..8624f47ac6e4 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
     tl \
     ucbhelper \
     utl \
+    vcl \
     xmlscript \
     i18nlangtag \
 ))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 7b76aedc4d33..1c88d4e1a421 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
     desktop/source/app/cmdlineargs \
     desktop/source/app/cmdlinehelp \
     desktop/source/app/desktopcontext \
-    desktop/source/app/desktopresid \
     desktop/source/app/dispatchwatcher \
     desktop/source/app/langselect \
     desktop/source/app/lockfile2 \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a5a688394947..e18b23126dff 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -23,13 +23,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
     $(if $(ENABLE_HEADLESS),,Library_spl) \
     Package_branding \
     $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
+    UIConfig_deployment \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,desktop,\
-    AllLangResTarget_deployment \
-    AllLangResTarget_deploymentgui \
-    AllLangResTarget_dkt \
-    UIConfig_deployment \
+    AllLangMoTarget_dkt \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 974d0ef3fac0..f4af4bcecc9d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -90,7 +90,6 @@ class Desktop : public Application
         DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void);
 
         static void             HandleAppEvent( const ApplicationEvent& rAppEvent );
-        static ResMgr*          GetDesktopResManager();
         static CommandLineArgs& GetCommandLineArgs();
 
         static void             HandleBootstrapErrors(
@@ -176,8 +175,6 @@ class Desktop : public Application
         std::unique_ptr<Lockfile> m_xLockfile;
         Timer                   m_firstRunTimer;
         std::thread             m_aUpdateThread;
-
-        static ResMgr*          pResMgr;
 };
 
 OUString GetURL_Impl(
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
deleted file mode 100644
index 42ca22890f16..000000000000
--- a/desktop/inc/deployment.hrc
+++ /dev/null
@@ -1,63 +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_DEPLOYMENT_HRC
-#define INCLUDED_DEPLOYMENT_HRC
-
-#define RID_DEPLOYMENT_START                 2000
-
-#define RID_DEPLOYMENT_GUI_START             RID_DEPLOYMENT_START
-//      RID_DEPLOYMENT_MISC_START            (RID_DEPLOYMENT_START+500)
-#define RID_DEPLOYMENT_MANAGER_START         (RID_DEPLOYMENT_START+1000)
-#define RID_DEPLOYMENT_REGISTRY_START        (RID_DEPLOYMENT_START+1500)
-
-#define RID_DEPLOYMENT_BUNDLE_START          (RID_DEPLOYMENT_START+2000)
-
-#define RID_DEPLOYMENT_SCRIPT_START          (RID_DEPLOYMENT_START+2500)
-
-#define RID_DEPLOYMENT_CONF_START            (RID_DEPLOYMENT_START+3000)
-
-#define RID_DEPLOYMENT_COMPONENT_START       (RID_DEPLOYMENT_START+3500)
-
-#define RID_DEPLOYMENT_UNOPKG_START          (RID_DEPLOYMENT_START+4000)
-#define RID_STR_UNOPKG_ACCEPT_LIC_1          (RID_DEPLOYMENT_UNOPKG_START+1)
-#define RID_STR_UNOPKG_ACCEPT_LIC_2          (RID_DEPLOYMENT_UNOPKG_START+2)
-#define RID_STR_UNOPKG_ACCEPT_LIC_3          (RID_DEPLOYMENT_UNOPKG_START+3)
-#define RID_STR_UNOPKG_ACCEPT_LIC_4          (RID_DEPLOYMENT_UNOPKG_START+4)
-#define RID_STR_UNOPKG_ACCEPT_LIC_YES        (RID_DEPLOYMENT_UNOPKG_START+5)
-#define RID_STR_UNOPKG_ACCEPT_LIC_Y          (RID_DEPLOYMENT_UNOPKG_START+6)
-#define RID_STR_UNOPKG_ACCEPT_LIC_NO         (RID_DEPLOYMENT_UNOPKG_START+7)
-#define RID_STR_UNOPKG_ACCEPT_LIC_N          (RID_DEPLOYMENT_UNOPKG_START+8)
-#define RID_STR_UNOPKG_ERROR                 (RID_DEPLOYMENT_UNOPKG_START+9)
-#define RID_STR_CONCURRENTINSTANCE           (RID_DEPLOYMENT_UNOPKG_START+10)
-
-#define RID_DEPLOYMENT_DEPENDENCIES_START    (RID_DEPLOYMENT_START + 4400)
-#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN  RID_DEPLOYMENT_DEPENDENCIES_START
-#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN \
-    (RID_DEPLOYMENT_DEPENDENCIES_START+1)
-#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX \
-    (RID_DEPLOYMENT_DEPENDENCIES_START+2)
-#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN (RID_DEPLOYMENT_DEPENDENCIES_START+3)
-
-#define RID_DEPLOYMENT_LICENSE_START        (RID_DEPLOYMENT_START+4500)
-
-#define RID_DEPLOYMENT_HELP_START           (RID_DEPLOYMENT_START+5000)
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc
deleted file mode 100644
index a22629cb1e7a..000000000000
--- a/desktop/inc/dp_gui.hrc
+++ /dev/null
@@ -1,90 +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_DP_GUI_HRC
-#define INCLUDED_DP_GUI_HRC
-
-#include "deployment.hrc"
-#include "helpid.hrc"
-
-#define RID_STR_WARNING_VERSION_LESS                              (RID_DEPLOYMENT_GUI_START + 3)
-#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES           (RID_DEPLOYMENT_GUI_START + 4)
-#define RID_STR_WARNING_VERSION_EQUAL                             (RID_DEPLOYMENT_GUI_START + 5)
-#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES          (RID_DEPLOYMENT_GUI_START + 6)
-#define RID_STR_WARNING_VERSION_GREATER                           (RID_DEPLOYMENT_GUI_START + 7)
-#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
-#define RID_STR_WARNING_INSTALL_EXTENSION                         (RID_DEPLOYMENT_GUI_START + 9)
-#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED                (RID_DEPLOYMENT_GUI_START + 10)
-#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED                 (RID_DEPLOYMENT_GUI_START + 11)
-
-#define RID_DLG_UPDATE_NONE                 (RID_DEPLOYMENT_GUI_START + 13)
-#define RID_DLG_UPDATE_NOINSTALLABLE        (RID_DEPLOYMENT_GUI_START + 14)
-#define RID_DLG_UPDATE_FAILURE              (RID_DEPLOYMENT_GUI_START + 15)
-#define RID_DLG_UPDATE_UNKNOWNERROR         (RID_DEPLOYMENT_GUI_START + 16)
-#define RID_DLG_UPDATE_NODESCRIPTION        (RID_DEPLOYMENT_GUI_START + 17)
-#define RID_DLG_UPDATE_NOINSTALL            (RID_DEPLOYMENT_GUI_START + 18)
-#define RID_DLG_UPDATE_NODEPENDENCY         (RID_DEPLOYMENT_GUI_START + 19)
-#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20)
-#define RID_DLG_UPDATE_BROWSERBASED         (RID_DEPLOYMENT_GUI_START + 21)
-#define RID_DLG_UPDATE_VERSION              (RID_DEPLOYMENT_GUI_START + 22)
-#define RID_DLG_UPDATE_IGNORE               (RID_DEPLOYMENT_GUI_START + 23)
-#define RID_DLG_UPDATE_ENABLE               (RID_DEPLOYMENT_GUI_START + 24)
-#define RID_DLG_UPDATE_IGNORE_ALL           (RID_DEPLOYMENT_GUI_START + 25)
-#define RID_DLG_UPDATE_IGNORED_UPDATE       (RID_DEPLOYMENT_GUI_START + 36)
-
-#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37)
-#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38)
-#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39)
-#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40)
-#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41)
-#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42)
-#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43)
-#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44)
-
-#define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
-
-#define RID_CTX_ITEM_REMOVE                    (RID_DEPLOYMENT_GUI_START+80)
-#define RID_CTX_ITEM_ENABLE                    (RID_DEPLOYMENT_GUI_START+81)
-#define RID_CTX_ITEM_DISABLE                   (RID_DEPLOYMENT_GUI_START+82)
-#define RID_CTX_ITEM_CHECK_UPDATE              (RID_DEPLOYMENT_GUI_START+83)
-//There is a gap here
-
-#define RID_STR_ADDING_PACKAGES                (RID_DEPLOYMENT_GUI_START+85)
-#define RID_STR_REMOVING_PACKAGES              (RID_DEPLOYMENT_GUI_START+86)
-#define RID_STR_ENABLING_PACKAGES              (RID_DEPLOYMENT_GUI_START+87)
-#define RID_STR_DISABLING_PACKAGES             (RID_DEPLOYMENT_GUI_START+88)
-#define RID_STR_ACCEPT_LICENSE                 (RID_DEPLOYMENT_GUI_START+89)
-
-#define RID_STR_ERROR_UNKNOWN_STATUS           (RID_DEPLOYMENT_GUI_START+92)
-#define RID_STR_CLOSE_BTN                      (RID_DEPLOYMENT_GUI_START+93)
-#define RID_STR_EXIT_BTN                       (RID_DEPLOYMENT_GUI_START+94)
-#define RID_STR_NO_ADMIN_PRIVILEGE             (RID_DEPLOYMENT_GUI_START+95)
-#define RID_STR_ERROR_MISSING_DEPENDENCIES     (RID_DEPLOYMENT_GUI_START+96)
-#define RID_STR_ERROR_MISSING_LICENSE          (RID_DEPLOYMENT_GUI_START+97)
-#define RID_STR_SHOW_LICENSE_CMD               (RID_DEPLOYMENT_GUI_START+98)
-
-#define RID_STR_UNSUPPORTED_PLATFORM             (RID_DEPLOYMENT_GUI_START+101)
-#define RID_STR_WARNING_REMOVE_EXTENSION         (RID_DEPLOYMENT_GUI_START+103)
-#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+104)
-#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+105)
-#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_shared.hxx
index 63496c860867..425cda8ea906 100644
--- a/desktop/inc/dp_gui_shared.hxx
+++ b/desktop/inc/dp_shared.hxx
@@ -20,26 +20,28 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX
 
+#include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
+namespace dp {
 
-namespace dp_gui {
-
-struct DeploymentGuiResMgr :
-    public ::rtl::StaticWithInit< ResMgr *, DeploymentGuiResMgr > {
-        ResMgr * operator () () {
-            return ResMgr::CreateResMgr( "deploymentgui" );
+struct DeploymentLocale :
+    public ::rtl::StaticWithInit<std::locale, DeploymentLocale > {
+        std::locale operator () () {
+            return Translate::Create("dkt", Application::GetSettings().GetUILanguageTag());
     }
 };
 
-inline OUString DpGuiResId(sal_uInt16 nId)
+} // namespace dp
+
+inline OUString DpResId(const char* pId)
 {
-    return ResId(nId, *DeploymentGuiResMgr::get());
+    return Translate::get(pId, dp::DeploymentLocale::get());
 }
 
-} // namespace dp_gui
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 9a18b5e1186b..0227276894c8 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -108,7 +108,6 @@
 #include <tools/contnr.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
 #include <typelib/typedescription.h>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index f7b322eb66fb..95e6c6fa7892 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -229,7 +229,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sfx2/dllapi.h>
 #include <svl/hint.hxx>
 #include <svl/lstner.hxx>
@@ -247,7 +246,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc
new file mode 100644
index 000000000000..40504ce36815
--- /dev/null
+++ b/desktop/inc/strings.hrc
@@ -0,0 +1,197 @@
+/* -*- 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_STR_COPYING_PACKAGE                             NC_("RID_STR_COPYING_PACKAGE", "Copying: ")
+#define RID_STR_ERROR_WHILE_ADDING                          NC_("RID_STR_ERROR_WHILE_ADDING", "Error while adding: ")
+#define RID_STR_ERROR_WHILE_REMOVING                        NC_("RID_STR_ERROR_WHILE_REMOVING", "Error while removing: ")
+#define RID_STR_PACKAGE_ALREADY_ADDED                       NC_("RID_STR_PACKAGE_ALREADY_ADDED", "Extension has already been added: ")
+#define RID_STR_NO_SUCH_PACKAGE                             NC_("RID_STR_NO_SUCH_PACKAGE", "There is no such extension deployed: ")
+#define RID_STR_SYNCHRONIZING_REPOSITORY                    NC_("RID_STR_SYNCHRONIZING_REPOSITORY", "Synchronizing repository for %NAME extensions")
+
+#define RID_STR_REGISTERING_PACKAGE                         NC_("RID_STR_REGISTERING_PACKAGE", "Enabling: ")
+#define RID_STR_REVOKING_PACKAGE                            NC_("RID_STR_REVOKING_PACKAGE", "Disabling: ")
+#define RID_STR_CANNOT_DETECT_MEDIA_TYPE                    NC_("RID_STR_CANNOT_DETECT_MEDIA_TYPE", "Cannot detect media-type: ")
+#define RID_STR_UNSUPPORTED_MEDIA_TYPE                      NC_("RID_STR_UNSUPPORTED_MEDIA_TYPE", "This media-type is not supported: ")
+#define RID_STR_ERROR_WHILE_REGISTERING                     NC_("RID_STR_ERROR_WHILE_REGISTERING", "An error occurred while enabling: ")
+#define RID_STR_ERROR_WHILE_REVOKING                        NC_("RID_STR_ERROR_WHILE_REVOKING", "An error occurred while disabling: ")
+
+#define RID_STR_CONF_SCHEMA                                 NC_("RID_STR_CONF_SCHEMA", "Configuration Schema")
+#define RID_STR_CONF_DATA                                   NC_("RID_STR_CONF_DATA", "Configuration Data")
+
+#define RID_STR_BASIC_LIB                                   NC_("RID_STR_BASIC_LIB", "%PRODUCTNAME Basic Library")
+#define RID_STR_DIALOG_LIB                                  NC_("RID_STR_DIALOG_LIB", "Dialog Library")
+#define RID_STR_CANNOT_DETERMINE_LIBNAME                    NC_("RID_STR_CANNOT_DETERMINE_LIBNAME", "The library name could not be determined.")
+
+#define RID_STR_PACKAGE_BUNDLE                              NC_("RID_STR_PACKAGE_BUNDLE", "Extension")
+
+#define RID_STR_DYN_COMPONENT                               NC_("RID_STR_DYN_COMPONENT", "UNO Dynamic Library Component")
+#define RID_STR_JAVA_COMPONENT                              NC_("RID_STR_JAVA_COMPONENT", "UNO Java Component")
+#define RID_STR_PYTHON_COMPONENT                            NC_("RID_STR_PYTHON_COMPONENT", "UNO Python Component")
+#define RID_STR_COMPONENTS                                  NC_("RID_STR_COMPONENTS", "UNO Components")
+#define RID_STR_RDB_TYPELIB                                 NC_("RID_STR_RDB_TYPELIB", "UNO RDB Type Library")
+#define RID_STR_JAVA_TYPELIB                                NC_("RID_STR_JAVA_TYPELIB", "UNO Java Type Library")
+
+#define RID_STR_SFWK_LIB                                    NC_("RID_STR_SFWK_LIB", "%MACROLANG Library")
+
+#define RID_STR_HELP                                        NC_("RID_STR_HELP", "Help")
+#define RID_STR_HELPPROCESSING_GENERAL_ERROR                NC_("RID_STR_HELPPROCESSING_GENERAL_ERROR", "The extension cannot be installed because:\n")
+#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR             NC_("RID_STR_HELPPROCESSING_XMLPARSING_ERROR", "The extension will not be installed because an error occurred in the Help files:\n")
+
+#define RID_STR_ADD_PACKAGES                                NC_("RID_STR_ADD_PACKAGES", "Add Extension(s)")
+#define RID_CTX_ITEM_REMOVE                                 NC_("RID_CTX_ITEM_REMOVE", "~Remove")
+#define RID_CTX_ITEM_ENABLE                                 NC_("RID_CTX_ITEM_ENABLE", "~Enable")
+#define RID_CTX_ITEM_DISABLE                                NC_("RID_CTX_ITEM_DISABLE", "~Disable")
+#define RID_CTX_ITEM_CHECK_UPDATE                           NC_("RID_CTX_ITEM_CHECK_UPDATE", "~Update...")
+#define RID_STR_ADDING_PACKAGES                             NC_("RID_STR_ADDING_PACKAGES", "Adding %EXTENSION_NAME")
+#define RID_STR_REMOVING_PACKAGES                           NC_("RID_STR_REMOVING_PACKAGES", "Removing %EXTENSION_NAME")
+#define RID_STR_ENABLING_PACKAGES                           NC_("RID_STR_ENABLING_PACKAGES", "Enabling %EXTENSION_NAME")
+#define RID_STR_DISABLING_PACKAGES                          NC_("RID_STR_DISABLING_PACKAGES", "Disabling %EXTENSION_NAME")
+#define RID_STR_ACCEPT_LICENSE                              NC_("RID_STR_ACCEPT_LICENSE", "Accept license for %EXTENSION_NAME")
+#define RID_STR_ERROR_UNKNOWN_STATUS                        NC_("RID_STR_ERROR_UNKNOWN_STATUS", "Error: The status of this extension is unknown")
+#define RID_STR_CLOSE_BTN                                   NC_("RID_STR_CLOSE_BTN", "Close")
+#define RID_STR_EXIT_BTN                                    NC_("RID_STR_EXIT_BTN", "Quit")
+#define RID_STR_NO_ADMIN_PRIVILEGE                          NC_("RID_STR_NO_ADMIN_PRIVILEGE", "%PRODUCTNAME has been updated to a new version. " \
+                                                               "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n" \
+                                                               "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:")
+#define RID_STR_ERROR_MISSING_DEPENDENCIES                  NC_("RID_STR_ERROR_MISSING_DEPENDENCIES", "The extension cannot be enabled as the following system dependencies are not fulfilled:")
+#define RID_STR_ERROR_MISSING_LICENSE                       NC_("RID_STR_ERROR_MISSING_LICENSE", "This extension is disabled because you haven't accepted the license yet.\n")
+#define RID_STR_SHOW_LICENSE_CMD                            NC_("RID_STR_SHOW_LICENSE_CMD", "Show license")
+#define RID_STR_WARNING_INSTALL_EXTENSION                   NC_("RID_STR_WARNING_INSTALL_EXTENSION", "You are about to install the extension '%NAME'.\n" \
+                                                               "Click 'OK' to proceed with the installation.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED          NC_("RID_STR_WARNING_INSTALL_EXTENSION_DISABLED", "Extension installation is currently disabled. " \
+                                                               "Please consult your system administrator for more information.")
+#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED           NC_("RID_STR_WARNING_REMOVE_EXTENSION_DISABLED", "Extension removal is currently disabled. " \
+                                                               "Please consult your system administrator for more information.")
+#define RID_STR_WARNING_REMOVE_EXTENSION                    NC_("RID_STR_WARNING_REMOVE_EXTENSION", "You are about to remove the extension '%NAME'.\n" \
+                                                               "Click 'OK' to remove the extension.\n" \
+                                                               "Click 'Cancel' to stop removing the extension.")
+#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION             NC_("RID_STR_WARNING_REMOVE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \
+                                                               "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \
+                                                               "Click 'OK' to remove the extension.\n" \
+                                                               "Click 'Cancel' to stop removing the extension.")
+#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION             NC_("RID_STR_WARNING_ENABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \
+                                                               "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \
+                                                               "Click 'OK' to enable the extension.\n" \
+                                                               "Click 'Cancel' to stop enabling the extension.")
+#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION            NC_("RID_STR_WARNING_DISABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \
+                                                               "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \
+                                                               "Click 'OK' to disable the extension.\n" \
+                                                               "Click 'Cancel' to stop disabling the extension.")
+#define RID_STR_UNSUPPORTED_PLATFORM                        NC_("RID_STR_UNSUPPORTED_PLATFORM", "The extension '%Name' does not work on this computer.")
+
+#define RID_DLG_UPDATE_INSTALL_INSTALLING                   NC_("RID_DLG_UPDATE_INSTALL_INSTALLING", "Installing extensions...")
+#define RID_DLG_UPDATE_INSTALL_FINISHED                     NC_("RID_DLG_UPDATE_INSTALL_FINISHED", "Installation finished")
+#define RID_DLG_UPDATE_INSTALL_NO_ERRORS                    NC_("RID_DLG_UPDATE_INSTALL_NO_ERRORS", "No errors.")
+#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD               NC_("RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD", "Error while downloading extension %NAME. ")
+#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED          NC_("RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED", "The error message is: ")
+#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION           NC_("RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION", "Error while installing extension %NAME. ")
+#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED           NC_("RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED", "The license agreement for extension %NAME was refused. ")
+#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL          NC_("RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL", "The extension will not be installed.")
+
+#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN                 NC_("RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN", "Unknown")
+#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN                 NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN", "Extension requires at least OpenOffice.org reference version %VERSION")
+#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX                 NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX", "Extension does not support OpenOffice.org reference versions greater than %VERSION")
+#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN                  NC_("RID_DEPLOYMENT_DEPENDENCIES_LO_MIN", "Extension requires at least %PRODUCTNAME version %VERSION")
+
+#define RID_STR_WARNING_VERSION_LESS                        NC_("RID_STR_WARNING_VERSION_LESS", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "The newer version $DEPLOYED is already installed.\n"\
+                                                               "Click 'OK' to replace the installed extension.\n"\
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES     NC_("RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n" \
+                                                               "Click 'OK' to replace the installed extension.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNING_VERSION_EQUAL                       NC_("RID_STR_WARNING_VERSION_EQUAL", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "That version is already installed.\n" \
+                                                               "Click 'OK' to replace the installed extension.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES    NC_("RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "That version, named '$OLDNAME', is already installed.\n" \
+                                                               "Click 'OK' to replace the installed extension.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNING_VERSION_GREATER                     NC_("RID_STR_WARNING_VERSION_GREATER", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "The older version $DEPLOYED is already installed.\n" \
+                                                               "Click 'OK' to replace the installed extension.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES  NC_("RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \
+                                                               "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n" \
+                                                               "Click 'OK' to replace the installed extension.\n" \
+                                                               "Click 'Cancel' to stop the installation.")
+
+#define RID_DLG_UPDATE_NONE                                 NC_("RID_DLG_UPDATE_NONE", "No new updates are available.")
+#define RID_DLG_UPDATE_NOINSTALLABLE                        NC_("RID_DLG_UPDATE_NOINSTALLABLE", "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.")
+#define RID_DLG_UPDATE_FAILURE                              NC_("RID_DLG_UPDATE_FAILURE", "An error occurred:")
+#define RID_DLG_UPDATE_UNKNOWNERROR                         NC_("RID_DLG_UPDATE_UNKNOWNERROR", "Unknown error.")
+#define RID_DLG_UPDATE_NODESCRIPTION                        NC_("RID_DLG_UPDATE_NODESCRIPTION", "No more details are available for this update.")
+#define RID_DLG_UPDATE_NOINSTALL                            NC_("RID_DLG_UPDATE_NOINSTALL", "The extension cannot be updated because:")
+#define RID_DLG_UPDATE_NODEPENDENCY                         NC_("RID_DLG_UPDATE_NODEPENDENCY", "Required %PRODUCTNAME version doesn't match:")
+#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER                 NC_("RID_DLG_UPDATE_NODEPENDENCY_CUR_VER", "You have %PRODUCTNAME %VERSION")
+#define RID_DLG_UPDATE_BROWSERBASED                         NC_("RID_DLG_UPDATE_BROWSERBASED", "browser based update")
+#define RID_DLG_UPDATE_VERSION                              NC_("RID_DLG_UPDATE_VERSION", "Version")
+#define RID_DLG_UPDATE_IGNORE                               NC_("RID_DLG_UPDATE_IGNORE", "Ignore this Update")
+#define RID_DLG_UPDATE_IGNORE_ALL                           NC_("RID_DLG_UPDATE_IGNORE_ALL", "Ignore all Updates")
+#define RID_DLG_UPDATE_ENABLE                               NC_("RID_DLG_UPDATE_ENABLE", "Enable Updates")
+#define RID_DLG_UPDATE_IGNORED_UPDATE                       NC_("RID_DLG_UPDATE_IGNORED_UPDATE", "This update will be ignored.\n")
+
+#define STR_BOOTSTRAP_ERR_CANNOT_START                      NC_("STR_BOOTSTRAP_ERR_CANNOT_START", "The application cannot be started. ")
+#define STR_BOOTSTRAP_ERR_DIR_MISSING                       NC_("STR_BOOTSTRAP_ERR_DIR_MISSING", "The configuration directory \"$1\" could not be found.")
+#define STR_BOOTSTRAP_ERR_PATH_INVALID                      NC_("STR_BOOTSTRAP_ERR_PATH_INVALID", "The installation path is invalid.")
+#define STR_BOOTSTRAP_ERR_INTERNAL                          NC_("STR_BOOTSTRAP_ERR_INTERNAL", "An internal error occurred.")
+#define STR_BOOTSTRAP_ERR_FILE_CORRUPT                      NC_("STR_BOOTSTRAP_ERR_FILE_CORRUPT", "The configuration file \"$1\" is corrupt.")
+#define STR_BOOTSTRAP_ERR_FILE_MISSING                      NC_("STR_BOOTSTRAP_ERR_FILE_MISSING", "The configuration file \"$1\" was not found.")
+#define STR_BOOTSTRAP_ERR_NO_SUPPORT                        NC_("STR_BOOTSTRAP_ERR_NO_SUPPORT", "The configuration file \"$1\" does not support the current version.")
+#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING                  NC_("STR_BOOTSTRAP_ERR_LANGUAGE_MISSING", "The user interface language cannot be determined.")
+#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED                NC_("STR_BOOTSTRAP_ERR_USERINSTALL_FAILED", "User installation could not be completed. ")
+#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE                    NC_("STR_BOOTSTRAP_ERR_NO_CFG_SERVICE", "The configuration service is not available.")
+#define STR_ASK_START_SETUP_MANUALLY                        NC_("STR_ASK_START_SETUP_MANUALLY", "Start the setup application to repair the installation from the CD or the folder containing the installation packages.")
+#define STR_CONFIG_ERR_ACCESS_GENERAL                       NC_("STR_CONFIG_ERR_ACCESS_GENERAL", "A general error occurred while accessing your central configuration. ")
+#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS                    NC_("STR_BOOTSTRAP_ERR_CFG_DATAACCESS", "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." )
+#define STR_INTERNAL_ERRMSG                                 NC_("STR_INTERNAL_ERRMSG", "The following internal error has occurred: " )
+#define STR_LO_MUST_BE_RESTARTED                            NC_("STR_LO_MUST_BE_RESTARTED", "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." )
+#define STR_QUERY_USERDATALOCKED                            NC_("STR_QUERY_USERDATALOCKED", "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?")
+#define STR_TITLE_USERDATALOCKED                            NC_("STR_TITLE_USERDATALOCKED", "%PRODUCTNAME %PRODUCTVERSION")
+#define STR_ERR_PRINTDISABLED                               NC_("STR_ERR_PRINTDISABLED", "Printing is disabled. No documents can be printed.")
+#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE                NC_("STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE", "The path manager is not available.\n")
+#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE                 NC_("STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n")
+#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS                     NC_("STR_BOOSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n")
+
+#define RID_STR_UNOPKG_ACCEPT_LIC_1                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_1", "Extension Software License Agreement of $NAME:")
+#define RID_STR_UNOPKG_ACCEPT_LIC_2                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_2", "Read the complete License Agreement displayed above. " \
+                                                               "Accept the License Agreement by typing \"yes\" on the console " \
+                                                               "then press the Return key. Type \"no\" to decline and to abort the " \
+                                                               "extension setup.")
+#define RID_STR_UNOPKG_ACCEPT_LIC_3                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_3", "[Enter \"yes\" or \"no\"]:")
+#define RID_STR_UNOPKG_ACCEPT_LIC_4                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_4", "Your input was not correct. Please enter \"yes\" or \"no\":")
+#define RID_STR_UNOPKG_ACCEPT_LIC_YES                       NC_("RID_STR_UNOPKG_ACCEPT_LIC_YES", "YES")
+#define RID_STR_UNOPKG_ACCEPT_LIC_Y                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_Y", "Y")
+#define RID_STR_UNOPKG_ACCEPT_LIC_NO                        NC_("RID_STR_UNOPKG_ACCEPT_LIC_NO", "NO")
+#define RID_STR_UNOPKG_ACCEPT_LIC_N                         NC_("RID_STR_UNOPKG_ACCEPT_LIC_N", "N")
+#define RID_STR_CONCURRENTINSTANCE                          NC_("RID_STR_CONCURRENTINSTANCE", "unopkg cannot be started. The lock file indicates it is already running. " \
+                                                               "If this does not apply, delete the lock file at:")
+#define RID_STR_UNOPKG_ERROR                                NC_("RID_STR_UNOPKG_ERROR", "ERROR: ")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d39a8564366b..927912fcdc67 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -30,7 +30,8 @@
 #endif
 
 #include "app.hxx"
-#include "desktop.hrc"
+#include "dp_shared.hxx"
+#include "strings.hrc"
 #include "cmdlineargs.hxx"
 #include "cmdlinehelp.hxx"
 #include "dispatchwatcher.hxx"
@@ -164,8 +165,6 @@ using namespace ::com::sun::star::ui;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::container;
 
-ResMgr* desktop::Desktop::pResMgr = nullptr;
-
 namespace desktop
 {
 
@@ -333,59 +332,14 @@ void DoRestartActionsIfNecessary(bool quickstart) {
 
 }
 
-
-ResMgr* Desktop::GetDesktopResManager()
-{
-    if ( !Desktop::pResMgr )
-    {
-        // Create desktop resource manager and bootstrap process
-        // was successful. Use default way to get language specific message.
-        if ( Application::IsInExecute() )
-            Desktop::pResMgr = ResMgr::CreateResMgr("dkt");
-
-        if ( !Desktop::pResMgr )
-        {
-            // Use VCL to get the correct language specific message as we
-            // are in the bootstrap process and not able to get the installed
-            // language!!
-            OUString aUILocaleString = langselect::getEmergencyLocale();
-            LanguageTag aLanguageTag( aUILocaleString);
-            //! ResMgr may modify the Locale for fallback!
-            Desktop::pResMgr = ResMgr::SearchCreateResMgr( "dkt", aLanguageTag);
-        }
-    }
-
-    return Desktop::pResMgr;
-}
-
 namespace {
 
 
-// Get a message string securely. There is a fallback string if the resource
-// is not available.
-
-OUString GetMsgString(
-    sal_uInt16 nId, const OUString& aFallbackMsg,
-    bool bAlwaysUseFallbackMsg = false )
-{
-    if ( !bAlwaysUseFallbackMsg )
-    {
-        ResMgr* resMgr = Desktop::GetDesktopResManager();
-        if ( resMgr )
-            return ResId(nId, *resMgr);
-    }
-    return aFallbackMsg;
-}
-
-OUString MakeStartupErrorMessage(
-    OUString const & aErrorMessage, bool bAlwaysUseFallbackMsg = false )
+OUString MakeStartupErrorMessage(OUString const & aErrorMessage)
 {
     OUStringBuffer    aDiagnosticMessage( 100 );
 
-    aDiagnosticMessage.append(
-        GetMsgString(
-            STR_BOOTSTRAP_ERR_CANNOT_START, "The program cannot be started.",
-            bAlwaysUseFallbackMsg ) );
+    aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CANNOT_START));
 
     aDiagnosticMessage.append( "\n" );
 
@@ -398,20 +352,13 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
 {
     OUStringBuffer aDiagnosticMessage( 200 );
 
-    ResMgr* pResMgr = Desktop::GetDesktopResManager();
-    if ( pResMgr )
-        aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr) );
-    else
-        aDiagnosticMessage.append( "The program cannot be started." );
+    aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS));
 
     if ( !aInternalErrMsg.isEmpty() )
     {
-        aDiagnosticMessage.append( "\n\n" );
-        if ( pResMgr )
-            aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr) );
-        else
-            aDiagnosticMessage.append( "The following internal error has occurred:\n\n" );
-        aDiagnosticMessage.append( aInternalErrMsg );
+        aDiagnosticMessage.append("\n\n");
+        aDiagnosticMessage.append(DpResId(STR_INTERNAL_ERRMSG));
+        aDiagnosticMessage.append(aInternalErrMsg);
     }
 
     return aDiagnosticMessage.makeStringAndClear();
@@ -731,8 +678,7 @@ OUString    Desktop::CreateErrorMsgString(
         /// the shared installation directory could not be located
         case ::utl::Bootstrap::MISSING_INSTALL_DIRECTORY:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID,
-                        "The installation path is not available." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_PATH_INVALID);
             bFileInfo = false;
         }
         break;
@@ -740,8 +686,7 @@ OUString    Desktop::CreateErrorMsgString(
         /// the bootstrap INI file could not be found or read
         case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING,
-                        "The configuration file \"$1\" is missing." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
         }
         break;
 
@@ -750,40 +695,35 @@ OUString    Desktop::CreateErrorMsgString(
          case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE_ENTRY:
          case ::utl::Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_CORRUPT,
-                        "The configuration file \"$1\" is corrupt." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_CORRUPT);
         }
         break;
 
         /// the version locator INI file could not be found or read
         case ::utl::Bootstrap::MISSING_VERSION_FILE:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING,
-                        "The configuration file \"$1\" is missing." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING);
         }
         break;
 
         /// the version locator INI has no entry for this version
-         case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY:
+        case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_SUPPORT,
-                        "The main configuration file \"$1\" does not support the current version." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_SUPPORT);
         }
         break;
 
         /// the user installation directory does not exist
-           case ::utl::Bootstrap::MISSING_USER_DIRECTORY:
+        case ::utl::Bootstrap::MISSING_USER_DIRECTORY:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_DIR_MISSING,
-                        "The configuration directory \"$1\" is missing." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_DIR_MISSING);
         }
         break;
 
         /// some bootstrap data was invalid in unexpected ways
         case ::utl::Bootstrap::INVALID_BOOTSTRAP_DATA:
         {
-            aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
-                        "An internal failure occurred." );
+            aMsg = DpResId(STR_BOOTSTRAP_ERR_INTERNAL);
             bFileInfo = false;
         }
         break;
@@ -892,10 +832,7 @@ void Desktop::HandleBootstrapErrors(
         // Currently we are not able to display a message box with a service manager due to this limitations inside VCL.
 
         // When UNO is not properly initialized, all kinds of things can fail
-        // and cause the process to crash (e.g., a call to GetMsgString may
-        // crash when somewhere deep within that call Any::operator <= is used
-        // with a PropertyValue, and no binary UNO type description for
-        // PropertyValue is available).  To give the user a hint even if
+        // and cause the process to crash. To give the user a hint even if
         // generating and displaying a message box below crashes, print a
         // hard-coded message on stderr first:
         std::cerr
@@ -915,13 +852,7 @@ void Desktop::HandleBootstrapErrors(
         OUString            aMessage;
         OUStringBuffer        aDiagnosticMessage( 100 );
 
-        OUString aErrorMsg;
-
-        if ( aBootstrapError == BE_UNO_SERVICEMANAGER )
-            aErrorMsg = "The service manager is not available.";
-        else
-            aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_CFG_SERVICE,
-                            "The configuration service is not available." );
+        OUString aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_NO_CFG_SERVICE);
 
         aDiagnosticMessage.append( aErrorMsg );
         aDiagnosticMessage.append( "\n" );
@@ -935,15 +866,10 @@ void Desktop::HandleBootstrapErrors(
         // Due to the fact the we haven't a backup applicat.rdb file anymore it is not possible to
         // repair the installation with the setup executable besides the office executable. Now
         // we have to ask the user to start the setup on CD/installation directory manually!!
-        OUString aStartSetupManually( GetMsgString(
-            STR_ASK_START_SETUP_MANUALLY,
-            "Start setup application to repair the installation from CD, or the folder containing the installation packages.",
-            aBootstrapError == BE_UNO_SERVICEMANAGER ) );
+        OUString aStartSetupManually(DpResId(STR_ASK_START_SETUP_MANUALLY));
 
-        aDiagnosticMessage.append( aStartSetupManually );
-        aMessage = MakeStartupErrorMessage(
-            aDiagnosticMessage.makeStringAndClear(),
-            aBootstrapError == BE_UNO_SERVICEMANAGER );
+        aDiagnosticMessage.append(aStartSetupManually);
+        aMessage = MakeStartupErrorMessage(aDiagnosticMessage.makeStringAndClear());
 
         FatalError( aMessage);
     }
@@ -957,11 +883,7 @@ void Desktop::HandleBootstrapErrors(
         // enter safe mode, too
         sfx2::SafeMode::putFlag();
 
-        OUString msg(
-            GetMsgString(
-            STR_CONFIG_ERR_ACCESS_GENERAL,
-            ("A general error occurred while accessing your central"
-            " configuration. SafeMode is initiated.")));
+        OUString msg(DpResId(STR_CONFIG_ERR_ACCESS_GENERAL));
         if (!aErrorMessage.isEmpty()) {
             msg += "\n(\"" + aErrorMessage + "\")";
         }
@@ -972,8 +894,7 @@ void Desktop::HandleBootstrapErrors(
         OUString aMessage;
         OUStringBuffer aDiagnosticMessage( 100 );
         OUString aErrorMsg;
-        aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_USERINSTALL_FAILED,
-            "User installation could not be completed" );
+        aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_USERINSTALL_FAILED);
         aDiagnosticMessage.append( aErrorMsg );
         aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
         FatalError(aMessage);
@@ -983,10 +904,9 @@ void Desktop::HandleBootstrapErrors(
         OUString aMessage;
         OUStringBuffer aDiagnosticMessage( 100 );
         OUString aErrorMsg;
-        aErrorMsg = GetMsgString(
+        aErrorMsg = DpResId(
             //@@@ FIXME: should use an own resource string => #i36213#
-            STR_BOOTSTRAP_ERR_LANGUAGE_MISSING,
-            "Language could not be determined." );
+            STR_BOOTSTRAP_ERR_LANGUAGE_MISSING);
         aDiagnosticMessage.append( aErrorMsg );
         aMessage = MakeStartupErrorMessage(
             aDiagnosticMessage.makeStringAndClear() );
@@ -1004,13 +924,9 @@ void Desktop::HandleBootstrapErrors(
         utl::Bootstrap::locateUserInstallation( aUserInstallationURL );
 
         if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE )
-            aErrorMsg = GetMsgString(
-                STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE,
-                "User installation could not be completed due to insufficient free disk space." );
+            aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE);
         else
-            aErrorMsg = GetMsgString(
-                STR_BOOSTRAP_ERR_NOACCESSRIGHTS,
-                "User installation could not be processed due to missing access rights." );
+            aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOACCESSRIGHTS);
 
         osl::File::getSystemPathFromFileURL( aUserInstallationURL, aUserInstallationPath );
 
@@ -1158,8 +1074,7 @@ void restartOnMac(bool passArguments) {
     RequestHandler::Disable();
 #if HAVE_FEATURE_MACOSX_SANDBOX
     (void) passArguments; // avoid warnings
-    ResMgr *resMgr = Desktop::GetDesktopResManager();
-    OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr);
+    OUString aMessage = DpResId(STR_LO_MUST_BE_RESTARTED);
 
     MessageDialog aRestartBox(NULL, aMessage);
     aRestartBox.Execute();
@@ -1399,7 +1314,7 @@ int Desktop::Main()
     }
 #endif
 
-    ResMgr::SetReadStringHook( ReplaceStringHookProc );
+    Translate::SetReadStringHook(ReplaceStringHookProc);
 
     // Startup screen
     OpenSplashScreen();
@@ -1792,8 +1707,6 @@ int Desktop::doShutdown()
         pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent);
     }
 
-    delete pResMgr;
-    pResMgr = nullptr;
     // Restore old value
     const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
     if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() )
@@ -2272,12 +2185,8 @@ void Desktop::OpenClients()
         {
             aRequest.aPrintList.clear();
             aRequest.aPrintToList.clear();
-            ResMgr* pDtResMgr = GetDesktopResManager();
-            if( pDtResMgr )
-            {
-                ScopedVclPtrInstance< MessageDialog > aBox(nullptr, ResId(STR_ERR_PRINTDISABLED, *pDtResMgr));
-                aBox->Execute();
-            }
+            ScopedVclPtrInstance< MessageDialog > aBox(nullptr, DpResId(STR_ERR_PRINTDISABLED));
+            aBox->Execute();
         }
 
         // Process request
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 83bace868f04..5571b9460646 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -23,9 +23,9 @@
 #include <config_vclplug.h>
 
 #include "app.hxx"
+#include "dp_shared.hxx"
 #include "cmdlineargs.hxx"
-#include "desktopresid.hxx"
-#include "desktop.hrc"
+#include "strings.hrc"
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -45,8 +45,6 @@
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 
-#include <tools/rcid.h>
-
 #include <rtl/instance.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -238,13 +236,7 @@ void Desktop::CreateTemporaryDirectory()
     {
         // Catch runtime exception here: We have to add language dependent info
         // to the exception message. Fallback solution uses hard coded string.
-        OUString aMsg;
-        DesktopResId aResId( STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE );
-        aResId.SetRT( RSC_STRING );
-        if ( aResId.GetResMgr()->IsAvailable( aResId ))
-            aMsg = aResId;
-        else
-            aMsg = "The path manager is not available.\n";
+        OUString aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE);
         e.Message = aMsg + e.Message;
         throw;
     }
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
deleted file mode 100644
index 6863b1b6ed2c..000000000000
--- a/desktop/source/app/desktop.hrc
+++ /dev/null
@@ -1,60 +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_DESKTOP_SOURCE_APP_DESKTOP_HRC
-#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC
-
-#include <svl/solar.hrc>
-
-//      RID_FIRSTSTSTART_START              3000
-#define RID_DESKTOP_STRING_START            10000
-
-#define STR_QUERY_USERDATALOCKED            (RID_DESKTOP_STRING_START+2)
-
-#define STR_BOOTSTRAP_ERR_CANNOT_START      (RID_DESKTOP_STRING_START+100)
-#define STR_BOOTSTRAP_ERR_DIR_MISSING       (RID_DESKTOP_STRING_START+101)
-#define STR_BOOTSTRAP_ERR_PATH_INVALID      (RID_DESKTOP_STRING_START+102)
-#define STR_BOOTSTRAP_ERR_INTERNAL          (RID_DESKTOP_STRING_START+104)
-#define STR_BOOTSTRAP_ERR_FILE_CORRUPT      (RID_DESKTOP_STRING_START+105)
-#define STR_BOOTSTRAP_ERR_FILE_MISSING      (RID_DESKTOP_STRING_START+106)
-#define STR_BOOTSTRAP_ERR_NO_SUPPORT        (RID_DESKTOP_STRING_START+107)
-#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING  (RID_DESKTOP_STRING_START+108)
-#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED (RID_DESKTOP_STRING_START+109)
-
-#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE    (RID_DESKTOP_STRING_START+121)
-#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS    (RID_DESKTOP_STRING_START+122)
-#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123)
-
-#define STR_ASK_START_SETUP_MANUALLY        (RID_DESKTOP_STRING_START+152)
-
-#define STR_ERR_PRINTDISABLED               (RID_DESKTOP_STRING_START+153)
-
-#define STR_INTERNAL_ERRMSG                 (RID_DESKTOP_STRING_START+161)
-#define STR_LO_MUST_BE_RESTARTED            (RID_DESKTOP_STRING_START+162)
-
-#define STR_CONFIG_ERR_ACCESS_GENERAL       (RID_DESKTOP_STRING_START+187)
-
-#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189)
-#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS     (RID_DESKTOP_STRING_START+190)
-
-#define STR_TITLE_USERDATALOCKED            (RID_DESKTOP_STRING_START+206)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
deleted file mode 100644
index a4dd5da46f85..000000000000
--- a/desktop/source/app/desktop.src
+++ /dev/null
@@ -1,127 +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 "desktop.hrc"
-
-String STR_BOOTSTRAP_ERR_CANNOT_START
-{
-    Text [ en-US ] = "The application cannot be started. ";
-};
-
-String STR_BOOTSTRAP_ERR_DIR_MISSING
-{
-    Text [ en-US ] = "The configuration directory \"$1\" could not be found.";
-};
-
-String STR_BOOTSTRAP_ERR_PATH_INVALID
-{
-    Text [ en-US ] = "The installation path is invalid.";
-};
-
-String STR_BOOTSTRAP_ERR_INTERNAL
-{
-    Text [ en-US ] = "An internal error occurred.";
-};
-
-String STR_BOOTSTRAP_ERR_FILE_CORRUPT
-{
-    Text [ en-US ] = "The configuration file \"$1\" is corrupt.";
-};
-
-String STR_BOOTSTRAP_ERR_FILE_MISSING
-{
-    Text [ en-US ] = "The configuration file \"$1\" was not found.";
-};
-
-String STR_BOOTSTRAP_ERR_NO_SUPPORT
-{
-    Text [ en-US ] = "The configuration file \"$1\" does not support the current version.";
-};
-
-String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING
-{
-    Text [ en-US ] = "The user interface language cannot be determined.";
-};
-
-String STR_BOOTSTRAP_ERR_USERINSTALL_FAILED
-{
-    Text [ en-US ] = "User installation could not be completed. ";
-};
-
-String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE
-{
-    Text [ en-US ] = "The configuration service is not available.";
-};
-
-String STR_ASK_START_SETUP_MANUALLY
-{
-    Text [ en-US ] = "Start the setup application to repair the installation from the CD or the folder containing the installation packages.";
-};
-
-String STR_CONFIG_ERR_ACCESS_GENERAL
-{
-    Text [ en-US ] = "A general error occurred while accessing your central configuration. ";
-};
-
-String STR_BOOTSTRAP_ERR_CFG_DATAACCESS
-{
-    Text [ en-US ] = "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ;
-};
-
-String STR_INTERNAL_ERRMSG
-{
-    Text [ en-US ] = "The following internal error has occurred: " ;
-};
-
-String STR_LO_MUST_BE_RESTARTED
-{
-    Text [ en-US ] = "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ;
-};
-
-String STR_QUERY_USERDATALOCKED
-{
-    Text [ en-US ] = "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?";
-};
-
-String STR_TITLE_USERDATALOCKED
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
-};
-
-String STR_ERR_PRINTDISABLED
-{
-    Text [ en-US ] = "Printing is disabled. No documents can be printed.";
-};
-
-String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE
-{
-    Text [ en-US ] = "The path manager is not available.\n";
-};
-
-String STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE
-{
-    Text [ en-US ] = "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n";
-};
-
-String STR_BOOSTRAP_ERR_NOACCESSRIGHTS
-{
-    Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
deleted file mode 100644
index 87784a83cbe5..000000000000
--- a/desktop/source/app/desktopresid.cxx
+++ /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/.
- *
- * 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 "desktopresid.hxx"
-#include "app.hxx"
-
-
-namespace desktop
-{
-
-DesktopResId::DesktopResId( sal_uInt16 nId ) :
-    ResId( nId, *Desktop::GetDesktopResManager() )
-{
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index fbcd5633f524..42f3081fb7d5 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -19,8 +19,8 @@
 
 
 #include <vcl/layout.hxx>
-#include "desktopresid.hxx"
-#include "desktop.hrc"
+#include "dp_shared.hxx"
+#include "strings.hrc"
 #include <tools/config.hxx>
 #include "lockfile.hxx"
 
@@ -38,10 +38,10 @@ bool Lockfile_execWarning( Lockfile const * that )
     OString aTime  = aConfig.ReadKey( LOCKFILE_TIMEKEY );
 
     // display warning and return response
-    ScopedVclPtrInstance<MessageDialog> aBox(nullptr, DesktopResId(STR_QUERY_USERDATALOCKED),
+    ScopedVclPtrInstance<MessageDialog> aBox(nullptr, DpResId(STR_QUERY_USERDATALOCKED),
                                              VclMessageType::Question, VclButtonsType::YesNo);
     // set box title
-    OUString aTitle = OUString( DesktopResId( STR_TITLE_USERDATALOCKED ));
+    OUString aTitle = DpResId(STR_TITLE_USERDATALOCKED);
     aBox->SetText( aTitle );
     // insert values...
     OUString aMsgText = aBox->get_primary_text();
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 8ab6ee063825..8f1820387c5c 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -22,7 +22,7 @@
 
 #include "dp_gui_updatedata.hxx"
 #include "dp_misc.h"
-#include "dp_gui.hrc"
+#include "strings.hrc"
 #include <rtl/ref.hxx>
 #include <rtl/instance.hxx>
 #include <osl/thread.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 56db76bd1b64..a5720c7532a2 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -24,12 +24,11 @@
 #include <vector>
 
 #include <rtl/ustring.hxx>
-#include <tools/resid.hxx>
 #include <vcl/dialog.hxx>
 
-#include "dp_gui.hrc"
+#include "strings.hrc"
 #include "dp_gui_dependencydialog.hxx"
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 
 namespace vcl { class Window; }
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
deleted file mode 100644
index 27ebb4b7f6f1..000000000000
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ /dev/null
@@ -1,164 +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 <svtools/controldims.hrc>
-#include "dp_gui.hrc"
-
-String RID_STR_ADD_PACKAGES
-{
-    Text [ en-US ] = "Add Extension(s)";
-};
-
-String RID_CTX_ITEM_REMOVE
-{
-    Text [ en-US ] = "~Remove";
-};
-
-String RID_CTX_ITEM_ENABLE
-{
-    Text [ en-US ] = "~Enable";
-};
-
-String RID_CTX_ITEM_DISABLE
-{
-    Text [ en-US ] = "~Disable";
-};
-
-String RID_CTX_ITEM_CHECK_UPDATE
-{
-    Text [ en-US ] = "~Update...";
-};
-
-String RID_STR_ADDING_PACKAGES
-{
-    Text [ en-US ] = "Adding %EXTENSION_NAME";
-};
-
-String RID_STR_REMOVING_PACKAGES
-{
-    Text [ en-US ] = "Removing %EXTENSION_NAME";
-};
-
-String RID_STR_ENABLING_PACKAGES
-{
-    Text [ en-US ] = "Enabling %EXTENSION_NAME";
-};
-
-String RID_STR_DISABLING_PACKAGES
-{
-    Text [ en-US ] = "Disabling %EXTENSION_NAME";
-};
-
-String RID_STR_ACCEPT_LICENSE
-{
-    Text [ en-US ] = "Accept license for %EXTENSION_NAME";
-};
-
-String RID_STR_ERROR_UNKNOWN_STATUS
-{
-    Text [ en-US ] = "Error: The status of this extension is unknown";
-};
-
-String RID_STR_CLOSE_BTN
-{
-    Text [ en-US ] = "Close";
-};
-
-String RID_STR_EXIT_BTN
-{
-    Text [ en-US ] = "Quit";
-};
-
-String RID_STR_NO_ADMIN_PRIVILEGE
-{
-    Text [ en-US ] = "%PRODUCTNAME has been updated to a new version. "
-                     "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n"
-                     "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:";
-};
-
-String RID_STR_ERROR_MISSING_DEPENDENCIES
-{
-    Text [ en-US ] = "The extension cannot be enabled as the following system dependencies are not fulfilled:";
-};
-
-String RID_STR_ERROR_MISSING_LICENSE
-{
-    Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n";
-};
-
-String RID_STR_SHOW_LICENSE_CMD
-{
-    Text [ en-US ] = "Show license";
-};
-
-String RID_STR_WARNING_INSTALL_EXTENSION
-{
-    Text [en-US] = "You are about to install the extension '%NAME'.\n"
-    "Click 'OK' to proceed with the installation.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNING_INSTALL_EXTENSION_DISABLED
-{
-    Text [en-US] = "Extension installation is currently disabled. "
-    "Please consult your system administrator for more information.";
-};
-
-String RID_STR_WARNING_REMOVE_EXTENSION
-{
-    Text [en-US] = "You are about to remove the extension '%NAME'.\n"
-    "Click 'OK' to remove the extension.\n"
-    "Click 'Cancel' to stop removing the extension.";
-};
-
-String RID_STR_WARNING_REMOVE_EXTENSION_DISABLED
-{
-    Text [en-US] = "Extension removal is currently disabled. "
-    "Please consult your system administrator for more information.";
-};
-
-String RID_STR_WARNING_REMOVE_SHARED_EXTENSION
-{
-    Text [en-US] = "Make sure that no further users are working with the same "
-    "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click 'OK' to remove the extension.\n"
-    "Click 'Cancel' to stop removing the extension.";
-};
-
-String RID_STR_WARNING_ENABLE_SHARED_EXTENSION
-{
-    Text [en-US] = "Make sure that no further users are working with the same "
-    "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click 'OK' to enable the extension.\n"
-    "Click 'Cancel' to stop enabling the extension.";
-};
-
-String RID_STR_WARNING_DISABLE_SHARED_EXTENSION
-{
-    Text [en-US] = "Make sure that no further users are working with the same "
-    "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
-    "Click 'OK' to disable the extension.\n"
-    "Click 'Cancel' to stop disabling the extension.";
-};
-
-String RID_STR_UNSUPPORTED_PLATFORM
-{
-    Text [ en-US ] = "The extension '%Name' does not work on this computer.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index f5c1f5f07c1c..04bd0a2354f7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -17,14 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dp_gui.hrc"
-#include <svtools/controldims.hrc>
-#include <svtools/svtools.hrc>
+#include "strings.hrc"
+#include "helpid.hrc"
+#include <svtools/controldims.hxx>
+#include <svtools/strings.hrc>
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extlistbox.hxx"
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_misc.h"
@@ -33,6 +34,8 @@
 #include "dp_identifier.hxx"
 #include "dp_descriptioninfoset.hxx"
 
+#include "fpicker/fpicker.hrc"
+
 #include <vcl/ctrl.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/layout.hxx>
@@ -92,16 +95,13 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
 {
     const OUString operator () () {
         const SolarMutexGuard guard;
-        std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
-        OSL_ASSERT( resmgr.get() != nullptr );
-        return ResId(STR_FILTERNAME_ALL, *resmgr.get());
+        std::locale loc = Translate::Create("fps", Application::GetSettings().GetUILanguageTag());
+        return Translate::get(STR_FILTERNAME_ALL, loc);
     }
 };
 
-
 //                            ExtBoxWithBtns_Impl
 
-
 enum MENU_COMMAND
 {
     CMD_NONE    = 0,
@@ -250,7 +250,7 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long
     ScopedVclPtrInstance<PopupMenu> aPopup;
 
 #if ENABLE_EXTENSION_UPDATE
-    aPopup->InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+    aPopup->InsertItem( CMD_UPDATE, DpResId( RID_CTX_ITEM_CHECK_UPDATE ) );
 #endif
 
     if ( ! GetEntryData( nPos )->m_bLocked )
@@ -258,18 +258,18 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long
         if ( GetEntryData( nPos )->m_bUser )
         {
             if ( GetEntryData( nPos )->m_eState == REGISTERED )
-                aPopup->InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+                aPopup->InsertItem( CMD_DISABLE, DpResId( RID_CTX_ITEM_DISABLE ) );
             else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
-                aPopup->InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
+                aPopup->InsertItem( CMD_ENABLE, DpResId( RID_CTX_ITEM_ENABLE ) );
         }
         if (!officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get())
         {
-            aPopup->InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
+            aPopup->InsertItem( CMD_REMOVE, DpResId( RID_CTX_ITEM_REMOVE ) );
         }
     }
 
     if ( !GetEntryData( nPos )->m_sLicenseText.isEmpty() )
-        aPopup->InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) );
+        aPopup->InsertItem( CMD_SHOW_LICENSE, DpResId( RID_STR_SHOW_LICENSE_CMD ) );
 
     return (MENU_COMMAND) aPopup->Execute( this, rPos );
 }
@@ -352,25 +352,6 @@ DialogHelper::~DialogHelper()
 }
 
 
-ResId DialogHelper::getResId( sal_uInt16 nId )
-{
-    const SolarMutexGuard guard;
-    return ResId( nId, *DeploymentGuiResMgr::get() );
-}
-
-
-OUString DialogHelper::getResourceString(sal_uInt16 id)
-{
-    const SolarMutexGuard guard;
-    OUString ret(ResId(id, *DeploymentGuiResMgr::get()));
-    if (ret.indexOf("%PRODUCTNAME" ) != -1)
-    {
-        ret = ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName());
-    }
-    return ret;
-}
-
-
 bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > &xPackage )
 {
     return xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER;
@@ -379,13 +360,13 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
 
 bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
                                               vcl::Window *pParent,
-                                              const sal_uInt16 nResID,
+                                              const char* pResID,
                                               bool &bHadWarning )
 {
     if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
     {
         const SolarMutexGuard guard;
-        ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, getResId(nResID),
+        ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, DpResId(pResID),
                                                      VclMessageType::Warning, VclButtonsType::OkCancel);
         bHadWarning = true;
 
@@ -427,14 +408,14 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
     // Check if extension installation is disabled in the expert configurations
     if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get())
     {
-        ScopedVclPtrInstance<MessageDialog> aWarn(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED),
+        ScopedVclPtrInstance<MessageDialog> aWarn(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED),
                                                   VclMessageType::Warning, VclButtonsType::Ok);
         aWarn->Execute();
 
         return false;
     }
 
-    ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION),
+    ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION),
                                               VclMessageType::Warning, VclButtonsType::OkCancel);
 
     OUString sText(aInfo->get_primary_text());
@@ -470,7 +451,7 @@ void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller )
 ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag)
     : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui", eFlag)
     , DialogHelper(pManager->getContext(), static_cast<Dialog*>(this))
-    , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
+    , m_sAddPackages(DpResId(RID_STR_ADD_PACKAGES))
     , m_bHasProgress(false)
     , m_bProgressChanged(false)
     , m_bStartProgress(false)
@@ -529,12 +510,12 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager,
     if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get())
     {
         m_pAddBtn->Disable();
-        m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED));
+        m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED));
     }
     if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get())
     {
         m_pRemoveBtn->Disable();
-        m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED));
+        m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED));
     }
 
     m_aIdle.SetPriority(TaskPriority::LOWEST);
@@ -607,7 +588,7 @@ void ExtMgrDialog::checkEntries()
 bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
 {
     const SolarMutexGuard guard;
-    ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), getResId(RID_STR_WARNING_REMOVE_EXTENSION),
+    ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), DpResId(RID_STR_WARNING_REMOVE_EXTENSION),
                                               VclMessageType::Warning, VclButtonsType::OkCancel);
 
     OUString sText(aInfo->get_primary_text());
@@ -767,7 +748,7 @@ void ExtMgrDialog::enableRemoveButton( bool bEnable )
 
     if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get())
     {
-        m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED));
+        m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED));
     }
     else
     {
@@ -784,12 +765,12 @@ void ExtMgrDialog::enableButtontoEnable( bool bEnable )
 {
     if (bEnable)
     {
-        m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
+        m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_ENABLE ) );
         m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE );
     }
     else
     {
-        m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+        m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_DISABLE ) );
         m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE );
     }
 }
@@ -840,7 +821,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
     m_pAddBtn->Enable( !bLockInterface && !officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get());
     if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get())
     {
-        m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED));
+        m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED));
     }
     else
     {
@@ -1066,7 +1047,7 @@ bool ExtMgrDialog::Close()
 UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager)
     : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui")
     , DialogHelper(pManager->getContext(), static_cast<Dialog*>(this))
-    , m_sCloseText(getResourceString(RID_STR_CLOSE_BTN))
+    , m_sCloseText(DpResId(RID_STR_CLOSE_BTN))
     , m_bHasProgress(false)
     , m_bProgressChanged(false)
     , m_bStartProgress(false)
@@ -1338,8 +1319,8 @@ short UpdateRequiredDialog::Execute()
     if ( m_bHasLockedEntries )
     {
         // Set other text, disable update btn, remove not shared entries from list;
-        m_pUpdateNeeded->SetText( DialogHelper::getResourceString( RID_STR_NO_ADMIN_PRIVILEGE ) );
-        m_pCloseBtn->SetText( DialogHelper::getResourceString( RID_STR_EXIT_BTN ) );
+        m_pUpdateNeeded->SetText( DpResId( RID_STR_NO_ADMIN_PRIVILEGE ) );
+        m_pCloseBtn->SetText( DpResId( RID_STR_EXIT_BTN ) );
         m_pUpdateBtn->Enable( false );
         m_pExtensionBox->RemoveUnlocked();
         Resize();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 5b9a8cc403e3..60a87d75b6e5 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -83,12 +83,10 @@ public:
     virtual void    prepareChecking() = 0;
     virtual void    checkEntries() = 0;
 
-    static ResId    getResId( sal_uInt16 nId );
-    static OUString getResourceString( sal_uInt16 id );
     static bool     IsSharedPkgMgr( const css::uno::Reference< css::deployment::XPackage > &);
     static bool     continueOnSharedExtension( const css::uno::Reference< css::deployment::XPackage > &,
                                                vcl::Window *pParent,
-                                               const sal_uInt16 nResID,
+                                               const char* pResID,
                                                bool &bHadWarning );
 
     void            setBusy( const bool bBusy ) { m_bIsBusy = bBusy; }
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 65b8053306ef..d6b620e1e69b 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -69,7 +69,7 @@
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_gui_dependencydialog.hxx"
 #include "dp_gui_dialog2.hxx"
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_updatedialog.hxx"
 #include "dp_gui_updateinstalldialog.hxx"
@@ -405,7 +405,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
     }
     else if (request >>= verExc)
     {
-        sal_uInt32 id;
+        const char* id;
         switch (dp_misc::compareVersions(
                     verExc.NewVersion, verExc.Deployed->getVersion() ))
         {
@@ -425,26 +425,26 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
         {
             SolarMutexGuard guard;
             ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr,
-                                                    ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VclButtonsType::OkCancel);
+                                                    DpResId(id), VclMessageType::Warning, VclButtonsType::OkCancel);
             OUString s;
             if (bEqualNames)
             {
                 s = box->get_primary_text();
             }
-            else if (id == RID_STR_WARNING_VERSION_EQUAL)
+            else if (!strcmp(id, RID_STR_WARNING_VERSION_EQUAL))
             {
                 //hypothetical: requires two instances of an extension with the same
                 //version to have different display names. Probably the developer forgot
                 //to change the version.
-                s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
+                s = DpResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES);
             }
-            else if (id == RID_STR_WARNING_VERSION_LESS)
+            else if (!strcmp(id, RID_STR_WARNING_VERSION_LESS))
             {
-                s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
+                s = DpResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES);
             }
-            else if (id == RID_STR_WARNING_VERSION_GREATER)
+            else if (!strcmp(id, RID_STR_WARNING_VERSION_GREATER))
             {
-               s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
+               s = DpResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES);
             }
             s = s.replaceAll("$NAME", verExc.NewDisplayName);
             s = s.replaceAll("$OLDNAME", verExc.Deployed->getDisplayName());
@@ -477,7 +477,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
     else if (request >>= platExc)
     {
         SolarMutexGuard guard;
-        OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get()));
+        OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM));
         sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName());
         ScopedVclPtrInstance< MessageDialog > box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, sMsg);
         box->Execute();
@@ -569,12 +569,12 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper,
     m_xContext( rContext ),
     m_pDialogHelper( pDialogHelper ),
     m_pManager( pManager ),
-    m_sEnablingPackages( DialogHelper::getResourceString( RID_STR_ENABLING_PACKAGES ) ),
-    m_sDisablingPackages( DialogHelper::getResourceString( RID_STR_DISABLING_PACKAGES ) ),
-    m_sAddingPackages( DialogHelper::getResourceString( RID_STR_ADDING_PACKAGES ) ),
-    m_sRemovingPackages( DialogHelper::getResourceString( RID_STR_REMOVING_PACKAGES ) ),
-    m_sDefaultCmd( DialogHelper::getResourceString( RID_STR_ADD_PACKAGES ) ),
-    m_sAcceptLicense( DialogHelper::getResourceString( RID_STR_ACCEPT_LICENSE ) ),
+    m_sEnablingPackages( DpResId( RID_STR_ENABLING_PACKAGES ) ),
+    m_sDisablingPackages( DpResId( RID_STR_DISABLING_PACKAGES ) ),
+    m_sAddingPackages( DpResId( RID_STR_ADDING_PACKAGES ) ),
+    m_sRemovingPackages( DpResId( RID_STR_REMOVING_PACKAGES ) ),
+    m_sDefaultCmd( DpResId( RID_STR_ADD_PACKAGES ) ),
+    m_sAcceptLicense( DpResId( RID_STR_ACCEPT_LICENSE ) ),
     m_eInput( NONE ),
     m_bStopped( false ),
     m_bWorking( false )
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 38db5652b192..49f27bb49669 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -17,8 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 
+#include "dp_shared.hxx"
 #include "dp_gui.h"
 #include "dp_gui_extlistbox.hxx"
 #include "dp_gui_theextmgr.hxx"
@@ -96,7 +97,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
             m_aIcon = Image( xGraphic );
 
         if ( eState == AMBIGUOUS )
-            m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+            m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS );
         else if ( eState == NOT_REGISTERED )
             checkDependencies();
     }
@@ -138,7 +139,7 @@ void Entry_Impl::checkDependencies()
         deployment::DependencyException depExc;
         if ( e.Cause >>= depExc )
         {
-            OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) );
+            OUString aMissingDep( DpResId( RID_STR_ERROR_MISSING_DEPENDENCIES ) );
             for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i )
             {
                 aMissingDep += "\n";
@@ -951,7 +952,7 @@ void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
     pEntry->m_bMissingLic = bLicenseMissing;
 
     if ( bLicenseMissing )
-        pEntry->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_MISSING_LICENSE );
+        pEntry->m_sErrorText = DpResId( RID_STR_ERROR_MISSING_LICENSE );
 
     //access to m_nActive must be guarded
     if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) )
@@ -982,7 +983,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage
                 (*iIndex)->m_bMissingLic = false;
 
             if ( eState == AMBIGUOUS )
-                (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+                (*iIndex)->m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS );
             else if ( ! (*iIndex)->m_bMissingLic )
                 (*iIndex)->m_sErrorText.clear();
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 1673d46ef63f..bf6061634d17 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -19,7 +19,7 @@
 
 
 #include <memory>
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 #include "dp_gui.h"
 #include "dp_gui_theextmgr.hxx"
 #include <cppuhelper/implbase.hxx>
@@ -175,9 +175,9 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
     } catch ( const css::lang::IllegalArgumentException & ) {
     }
 
-    ResHookProc pProc = ResMgr::GetReadStringHook();
+    ResHookProc pProc = Translate::GetReadStringHook();
     if ( !pProc )
-        ResMgr::SetReadStringHook( ReplaceProductNameHookProc );
+        Translate::SetReadStringHook(ReplaceProductNameHookProc);
 }
 
 // XAsynchronousExecutableDialog
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 31ac8641f60b..16bcc0b5e687 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -82,11 +82,10 @@
 #include <salhelper/thread.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svx/checklbx.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <unotools/configmgr.hxx>
 #include <vcl/button.hxx>
@@ -106,11 +105,11 @@
 #include "dp_update.hxx"
 
 #include "dp_gui.h"
-#include "dp_gui.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "dp_gui_updatedata.hxx"
 #include "dp_gui_updatedialog.hxx"
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 
 class KeyEvent;
 class MouseEvent;
@@ -479,17 +478,17 @@ UpdateDialog::UpdateDialog(
     std::vector< dp_gui::UpdateData > * updateData):
     ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
     m_context(context),
-    m_none(DpGuiResId(RID_DLG_UPDATE_NONE)),
-    m_noInstallable(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE)),
-    m_failure(DpGuiResId(RID_DLG_UPDATE_FAILURE)),
-    m_unknownError(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR)),
-    m_noDescription(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION)),
-    m_noInstall(DpGuiResId(RID_DLG_UPDATE_NOINSTALL)),
-    m_noDependency(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY)),
-    m_noDependencyCurVer(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)),
-    m_browserbased(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED)),
-    m_version(DpGuiResId(RID_DLG_UPDATE_VERSION)),
-    m_ignoredUpdate(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE)),
+    m_none(DpResId(RID_DLG_UPDATE_NONE)),
+    m_noInstallable(DpResId(RID_DLG_UPDATE_NOINSTALLABLE)),
+    m_failure(DpResId(RID_DLG_UPDATE_FAILURE)),
+    m_unknownError(DpResId(RID_DLG_UPDATE_UNKNOWNERROR)),
+    m_noDescription(DpResId(RID_DLG_UPDATE_NODESCRIPTION)),
+    m_noInstall(DpResId(RID_DLG_UPDATE_NOINSTALL)),
+    m_noDependency(DpResId(RID_DLG_UPDATE_NODEPENDENCY)),
+    m_noDependencyCurVer(DpResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)),
+    m_browserbased(DpResId(RID_DLG_UPDATE_BROWSERBASED)),
+    m_version(DpResId(RID_DLG_UPDATE_VERSION)),
+    m_ignoredUpdate(DpResId(RID_DLG_UPDATE_IGNORED_UPDATE)),
     m_updateData(*updateData),
     m_thread(
         new UpdateDialog::Thread(
@@ -594,9 +593,9 @@ short UpdateDialog::Execute() {
 
 UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog):
     SvxCheckListBox( pParent, WinBits(WB_BORDER) ),
-    m_ignoreUpdate( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ),
-    m_ignoreAllUpdates( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ),
-    m_enableUpdate( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ),
+    m_ignoreUpdate( DpResId( RID_DLG_UPDATE_IGNORE ) ),
+    m_ignoreAllUpdates( DpResId( RID_DLG_UPDATE_IGNORE_ALL ) ),
+    m_enableUpdate( DpResId( RID_DLG_UPDATE_ENABLE ) ),
     m_dialog(dialog)
 {
     SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT)));
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
deleted file mode 100644
index 7100eb4cfff2..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ /dev/null
@@ -1,80 +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 <svtools/controldims.hrc>
-
-#include "dp_gui.hrc"
-
-String RID_DLG_UPDATE_NONE {
-    Text[en-US] = "No new updates are available.";
-};
-
-String RID_DLG_UPDATE_NOINSTALLABLE {
-    Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.";
-};
-
-String RID_DLG_UPDATE_FAILURE {
-    Text[en-US] = "An error occurred:";
-};
-
-String RID_DLG_UPDATE_UNKNOWNERROR {
-    Text[en-US] = "Unknown error.";
-};
-
-String RID_DLG_UPDATE_NODESCRIPTION {
-    Text[en-US] = "No more details are available for this update.";
-};
-
-String RID_DLG_UPDATE_NOINSTALL {
-    Text[en-US] = "The extension cannot be updated because:";
-};
-
-String RID_DLG_UPDATE_NODEPENDENCY {
-    Text[en-US] = "Required %PRODUCTNAME version doesn't match:";
-};
-
-String RID_DLG_UPDATE_NODEPENDENCY_CUR_VER {
-    Text[en-US] = "You have %PRODUCTNAME %VERSION";
-};
-
-String RID_DLG_UPDATE_BROWSERBASED {
-    Text[en-US] = "browser based update";
-};
-
-String RID_DLG_UPDATE_VERSION {
-    Text[en-US] = "Version";
-};
-
-String RID_DLG_UPDATE_IGNORE {
-    Text[en-US] = "Ignore this Update";
-};
-
-String RID_DLG_UPDATE_IGNORE_ALL {
-    Text[en-US] = "Ignore all Updates";
-};
-
-String RID_DLG_UPDATE_ENABLE {
-    Text[en-US] = "Enable Updates";
-};
-
-String RID_DLG_UPDATE_IGNORED_UPDATE {
-    Text[en-US] = "This update will be ignored.\n";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index e112cd38d389..c433384da5e5 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -24,7 +24,6 @@
 #include <osl/file.hxx>
 #include <osl/conditn.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <tools/resid.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
@@ -54,9 +53,9 @@
 #include <com/sun/star/task/XInteractionApprove.hpp>
 
 #include "dp_descriptioninfoset.hxx"
-#include "dp_gui.hrc"
+#include "strings.hrc"
 #include "dp_gui_updateinstalldialog.hxx"
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 #include "dp_ucb.h"
 #include "dp_misc.h"
 #include "dp_version.hxx"
@@ -204,14 +203,14 @@ UpdateInstallDialog::UpdateInstallDialog(
         m_thread(new Thread(xCtx, *this, aVecUpdateData)),
         m_bError(false),
         m_bNoEntry(true),
-        m_sInstalling(DpGuiResId(RID_DLG_UPDATE_INSTALL_INSTALLING)),
-        m_sFinished(DpGuiResId(RID_DLG_UPDATE_INSTALL_FINISHED)),
-        m_sNoErrors(DpGuiResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)),
-        m_sErrorDownload(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)),
-        m_sErrorInstallation(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)),
-        m_sErrorLicenseDeclined(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)),
-        m_sNoInstall(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)),
-        m_sThisErrorOccurred(DpGuiResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED))
+        m_sInstalling(DpResId(RID_DLG_UPDATE_INSTALL_INSTALLING)),
+        m_sFinished(DpResId(RID_DLG_UPDATE_INSTALL_FINISHED)),
+        m_sNoErrors(DpResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)),
+        m_sErrorDownload(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)),
+        m_sErrorInstallation(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)),
+        m_sErrorLicenseDeclined(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)),
+        m_sNoInstall(DpResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)),
+        m_sThisErrorOccurred(DpResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED))
 {
     get(m_pFt_action, "DOWNLOADING");
     get(m_pStatusbar, "STATUSBAR");
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
deleted file mode 100644
index e8d52761777d..000000000000
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ /dev/null
@@ -1,54 +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 "dp_gui.hrc"
-
-String RID_DLG_UPDATE_INSTALL_INSTALLING {
-    Text[en-US] = "Installing extensions...";
-};
-
-String RID_DLG_UPDATE_INSTALL_FINISHED {
-    Text[en-US] = "Installation finished";
-};
-
-String RID_DLG_UPDATE_INSTALL_NO_ERRORS {
-    Text[en-US] = "No errors.";
-};
-
-String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD {
-    Text[en-US] = "Error while downloading extension %NAME. ";
-};
-
-String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED {
-    Text[en-US] = "The error message is: ";
-};
-
-String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION {
-    Text[en-US] = "Error while installing extension %NAME. ";
-};
-
-String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED {
-    Text[en-US] = "The license agreement for extension %NAME was refused. ";
-};
-
-String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{
-    Text[en-US] = "The extension will not be installed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
deleted file mode 100644
index 7e18fa6ae53d..000000000000
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ /dev/null
@@ -1,67 +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 "dp_gui.hrc"
-
-String RID_STR_WARNING_VERSION_LESS
-{
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "The newer version $DEPLOYED is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES {
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNING_VERSION_EQUAL
-{
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "That version is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES {
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "That version, named '$OLDNAME', is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNING_VERSION_GREATER
-{
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "The older version $DEPLOYED is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-
-String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES
-{
-    Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n"
-    "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n"
-    "Click 'OK' to replace the installed extension.\n"
-    "Click 'Cancel' to stop the installation.";
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 8d97f786fd60..f3e741324aff 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -34,9 +34,9 @@
 #include <vcl/threadex.hxx>
 #include <vcl/builderfactory.hxx>
 
-#include "dp_gui_shared.hxx"
+#include "dp_shared.hxx"
 #include "license_dialog.hxx"
-#include "dp_gui.hrc"
+#include "strings.hrc"
 
 #include <functional>
 
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index c6ecfcdee645..b1aacd579de9 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -20,28 +20,13 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H
 
-#include <tools/resid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include "dp_misc.h"
 #include "dp_misc_api.hxx"
 
 namespace dp_misc {
 
-
-ResId getResId( sal_uInt16 id );
-
-
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getResourceString( sal_uInt16 id );
-
-template <typename Unique, sal_uInt16 id>
-struct StaticResourceString :
-        public ::rtl::StaticWithInit< OUString, Unique > {
-    const OUString operator () () { return getResourceString(id); }
-};
-
-
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-const LanguageTag & getOfficeLanguageTag();
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag & getOfficeLanguageTag();
 
 }
 
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 34f862c8f6f6..e770bad31ef9 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1229,13 +1229,13 @@ sal_Bool ExtensionManager::synchronize(
     try
     {
         ::osl::MutexGuard guard(getMutex());
-        OUString sSynchronizingShared(StrSyncRepository::get());
+        OUString sSynchronizingShared(StrSyncRepository());
         sSynchronizingShared = sSynchronizingShared.replaceAll("%NAME", "shared");
         dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
         bool bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv);
         progressShared.update("\n\n");
 
-        OUString sSynchronizingBundled(StrSyncRepository::get());
+        OUString sSynchronizingBundled(StrSyncRepository());
         sSynchronizingBundled = sSynchronizingBundled.replaceAll("%NAME", "bundled");
         dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
         bModified |= (bool)getBundledRepository()->synchronize(xAbortChannel, xCmdEnv);
@@ -1314,12 +1314,12 @@ void ExtensionManager::checkInstall(
         {
             OSL_ASSERT( !approve && !abort );
             throw css::deployment::DeploymentException(
-                dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName,
+                DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName,
                 static_cast<OWeakObject *>(this), request );
         }
         if (abort || !approve)
             throw ucb::CommandFailedException(
-                dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName,
+                DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName,
                 static_cast<OWeakObject *>(this), request );
 }
 
@@ -1336,7 +1336,7 @@ void ExtensionManager::checkUpdate(
     // package already deployed, interact --force:
     uno::Any request(
         (css::deployment::VersionException(
-            dp_misc::getResourceString(
+            DpResId(
                 RID_STR_PACKAGE_ALREADY_ADDED ) + newDisplayName,
             static_cast<OWeakObject *>(this), newVersion, newDisplayName,
             oldExtension ) ) );
@@ -1346,13 +1346,13 @@ void ExtensionManager::checkUpdate(
             xCmdEnv, &replace, &abort )) {
         OSL_ASSERT( !replace && !abort );
         throw css::deployment::DeploymentException(
-            dp_misc::getResourceString(
+            DpResId(
                 RID_STR_ERROR_WHILE_ADDING) + newDisplayName,
             static_cast<OWeakObject *>(this), request );
     }
     if (abort || !replace)
         throw ucb::CommandFailedException(
-            dp_misc::getResourceString(
+            DpResId(
                 RID_STR_PACKAGE_ALREADY_ADDED) + newDisplayName,
             static_cast<OWeakObject *>(this), request );
 }
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index fd060446a9a2..a31172e55b83 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX
 
-#include "dp_manager.hrc"
+#include "strings.hrc"
 #include "dp_misc.h"
+#include "dp_shared.hxx"
 #include "dp_interact.h"
 #include "dp_activepackages.hxx"
 #include <rtl/ref.hxx>
@@ -137,8 +138,7 @@ public:
 
 private:
 
-    struct StrSyncRepository : public ::dp_misc::StaticResourceString<
-        StrSyncRepository, RID_STR_SYNCHRONIZING_REPOSITORY> {};
+    static OUString StrSyncRepository() { return DpResId(RID_STR_SYNCHRONIZING_REPOSITORY); }
 
     css::uno::Reference< css::uno::XComponentContext> m_xContext;
     css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index a0eb96fdcc02..8244d4f88ee3 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include "dp_registry.hxx"
+#include "dp_shared.hxx"
 #include "dp_ucb.h"
 #include "dp_resource.h"
 #include "dp_platform.hxx"
@@ -738,7 +739,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
         Reference<deployment::XPackage> xPackage;
         // copy file:
         progressUpdate(
-            getResourceString(RID_STR_COPYING_PACKAGE) + title, xCmdEnv );
+            DpResId(RID_STR_COPYING_PACKAGE) + title, xCmdEnv );
         if (m_activePackages.isEmpty())
         {
             ::ucbhelper::Content docFolderContent;
@@ -829,7 +830,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
         Any exc( ::cppu::getCaughtException() );
         logIntern( exc );
         throw deployment::DeploymentException(
-            getResourceString(RID_STR_ERROR_WHILE_ADDING) + url,
+            DpResId(RID_STR_ERROR_WHILE_ADDING) + url,
             static_cast<OWeakObject *>(this), exc );
     }
 }
@@ -928,7 +929,7 @@ void PackageManagerImpl::removePackage(
         Any exc( ::cppu::getCaughtException() );
         logIntern( exc );
         throw deployment::DeploymentException(
-            getResourceString(RID_STR_ERROR_WHILE_REMOVING) + id,
+            DpResId(RID_STR_ERROR_WHILE_REMOVING) + id,
             static_cast<OWeakObject *>(this), exc );
     }
 }
@@ -962,7 +963,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
         return getDeployedPackage_( id, val, xCmdEnv );
     }
     throw lang::IllegalArgumentException(
-        getResourceString(RID_STR_NO_SUCH_PACKAGE) + id,
+        DpResId(RID_STR_NO_SUCH_PACKAGE) + id,
         static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
 }
 
@@ -980,7 +981,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
             auto const iter = params.find(OString("platform"));
             if (iter != params.end() && !platform_fits(iter->second.m_sValue))
                 throw lang::IllegalArgumentException(
-                    getResourceString(RID_STR_NO_SUCH_PACKAGE) + id,
+                    DpResId(RID_STR_NO_SUCH_PACKAGE) + id,
                     static_cast<OWeakObject *>(this),
                     static_cast<sal_Int16>(-1) );
         }
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index c10122454ea3..4e584a6e1d14 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
 #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H
 
-#include "dp_manager.hrc"
+#include "strings.hrc"
 #include "dp_misc.h"
 #include "dp_interact.h"
 #include "dp_activepackages.hxx"
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
deleted file mode 100644
index ef0945b483b6..000000000000
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ /dev/null
@@ -1,33 +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_DP_MANAGER_HRC
-#define INCLUDED_DP_MANAGER_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_ERROR_WHILE_ADDING          (RID_DEPLOYMENT_MANAGER_START+0)
-#define RID_STR_ERROR_WHILE_REMOVING        (RID_DEPLOYMENT_MANAGER_START+1)
-#define RID_STR_PACKAGE_ALREADY_ADDED       (RID_DEPLOYMENT_MANAGER_START+2)
-#define RID_STR_COPYING_PACKAGE             (RID_DEPLOYMENT_MANAGER_START+3)
-#define RID_STR_NO_SUCH_PACKAGE             (RID_DEPLOYMENT_MANAGER_START+4)
-#define RID_STR_SYNCHRONIZING_REPOSITORY    (RID_DEPLOYMENT_MANAGER_START+5)
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
deleted file mode 100644
index e01a160d26dd..000000000000
--- a/desktop/source/deployment/manager/dp_manager.src
+++ /dev/null
@@ -1,52 +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 "dp_manager.hrc"
-
-String RID_STR_COPYING_PACKAGE
-{
-    Text [ en-US ] = "Copying: ";
-};
-
-String RID_STR_ERROR_WHILE_ADDING
-{
-    Text [ en-US ] = "Error while adding: ";
-};
-
-String RID_STR_ERROR_WHILE_REMOVING
-{
-    Text [ en-US ] = "Error while removing: ";
-};
-
-String RID_STR_PACKAGE_ALREADY_ADDED
-{
-    Text [ en-US ] = "Extension has already been added: ";
-};
-
-String RID_STR_NO_SUCH_PACKAGE
-{
-    Text [ en-US ] = "There is no such extension deployed: ";
-};
-
-String RID_STR_SYNCHRONIZING_REPOSITORY
-{
-    Text [ en-US ] = "Synchronizing repository for %NAME extensions";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 6112ad114593..1b858319f894 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -30,11 +30,11 @@
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <tools/resid.hxx>
 #include <unotools/configmgr.hxx>
 
-#include "deployment.hrc"
+#include "strings.hrc"
 #include "dp_resource.h"
+#include "dp_shared.hxx"
 
 #include "dp_dependencies.hxx"
 #include "dp_descriptioninfoset.hxx"
@@ -85,7 +85,7 @@ OUString produceErrorText(
 {
     return reason.replaceFirst("%VERSION",
         (version.isEmpty()
-         ?  dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)
+         ?  DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)
          : version));
 }
 
@@ -156,27 +156,27 @@ OUString getErrorText(
     if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg )
     {
         return produceErrorText(
-                dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
+                DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
             dependency->getAttribute("value"));
     } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg )
     {
         return produceErrorText(
-                dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX),
+                DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX),
             dependency->getAttribute("value"));
     } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice )
     {
         return produceErrorText(
-                dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN),
+                DpResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN),
             dependency->getAttribute("value"));
     } else if (dependency->hasAttributeNS(namespaceOpenOfficeOrg,
                    minimalVersionOpenOfficeOrg))
     {
         return produceErrorText(
-                dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
+                DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
             dependency->getAttributeNS(namespaceOpenOfficeOrg,
                 minimalVersionOpenOfficeOrg));
     } else {
-        return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN);
+        return DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN);
     }
 }
 
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
deleted file mode 100644
index 498e042009dd..000000000000
--- a/desktop/source/deployment/misc/dp_misc.src
+++ /dev/null
@@ -1,38 +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 "deployment.hrc"
-
-String RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN {
-    Text[en-US] = "Unknown";
-};
-
-String RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN {
-    Text[en-US] = "Extension requires at least OpenOffice.org reference version %VERSION";
-};
-
-String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX {
-    Text[en-US] = "Extension does not support OpenOffice.org reference versions greater than %VERSION";
-};
-
-String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN {
-    Text[en-US] = "Extension requires at least %PRODUCTNAME version %VERSION";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index b7f3739c85a2..2d37cd6685b5 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -46,32 +46,8 @@ struct OfficeLocale :
     }
 };
 
-struct DeploymentResMgr : public rtl::StaticWithInit<
-    ResMgr *, DeploymentResMgr> {
-    ResMgr * operator () () {
-        return ResMgr::CreateResMgr( "deployment", OfficeLocale::get() );
-    }
-};
-
-class theResourceMutex : public rtl::Static<osl::Mutex, theResourceMutex> {};
-
 } // anon namespace
 
-
-ResId getResId( sal_uInt16 id )
-{
-    const osl::MutexGuard guard( theResourceMutex::get() );
-    return ResId( id, *DeploymentResMgr::get() );
-}
-
-
-OUString getResourceString( sal_uInt16 id )
-{
-    const osl::MutexGuard guard(theResourceMutex::get());
-    OUString ret(ResId(id, *DeploymentResMgr::get()));
-    return ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName());
-}
-
 const LanguageTag & getOfficeLanguageTag()
 {
     return OfficeLocale::get();
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 2028d18c2192..d74bfc5e3f3d 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "deployment.hrc"
+#include "strings.hrc"
 #include "dp_misc.h"
 #include "dp_ucb.h"
 #include <rtl/uri.hxx>
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 60a2686ca99a..24949b8e9586 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -18,7 +18,8 @@
  */
 
 
-#include "dp_component.hrc"
+#include "strings.hrc"
+#include "dp_shared.hxx"
 #include "dp_backend.h"
 #include "dp_platform.hxx"
 #include "dp_services.hxx"
@@ -495,33 +496,33 @@ BackendImpl::BackendImpl(
              "application/vnd.sun.star.uno-component;type=native;platform=" +
                                    getPlatformString(),
                                    "*" SAL_DLLEXTENSION,
-                                   getResourceString(RID_STR_DYN_COMPONENT)
+                                   DpResId(RID_STR_DYN_COMPONENT)
                                    ) ),
       m_xJavaComponentTypeInfo( new Package::TypeInfo(
              "application/vnd.sun.star.uno-component;type=Java",
                                     "*.jar",
-                                    getResourceString(RID_STR_JAVA_COMPONENT)
+                                    DpResId(RID_STR_JAVA_COMPONENT)
                                     ) ),
       m_xPythonComponentTypeInfo( new Package::TypeInfo(
              "application/vnd.sun.star.uno-component;type=Python",
                                       "*.py",
-                                      getResourceString(
+                                      DpResId(
                                           RID_STR_PYTHON_COMPONENT)
                                       ) ),
       m_xComponentsTypeInfo( new Package::TypeInfo(
                                  "application/vnd.sun.star.uno-components",
                                  "*.components",
-                                 getResourceString(RID_STR_COMPONENTS)
+                                 DpResId(RID_STR_COMPONENTS)
                                  ) ),
       m_xRDBTypelibTypeInfo( new Package::TypeInfo(
              "application/vnd.sun.star.uno-typelibrary;type=RDB",
                                  "*.rdb",
-                                 getResourceString(RID_STR_RDB_TYPELIB)
+                                 DpResId(RID_STR_RDB_TYPELIB)
                                  ) ),
       m_xJavaTypelibTypeInfo( new Package::TypeInfo(
              "application/vnd.sun.star.uno-typelibrary;type=Java",
                                   "*.jar",
-                                  getResourceString(RID_STR_JAVA_TYPELIB)
+                                  DpResId(RID_STR_JAVA_TYPELIB)
                                   ) ),
       m_typeInfos( 6 )
 {
@@ -629,7 +630,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
         if (mediaType.isEmpty())
             throw lang::IllegalArgumentException(
-                StrCannotDetectMediaType::get() + url,
+                StrCannotDetectMediaType() + url,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
@@ -721,7 +722,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType,
+        StrUnsupportedMediaType() + mediaType,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
deleted file mode 100644
index 91caa2082402..000000000000
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ /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/.
- *
- * 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_DP_COMPONENT_HRC
-#define INCLUDED_DP_COMPONENT_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_DYN_COMPONENT                (RID_DEPLOYMENT_COMPONENT_START+10)
-#define RID_STR_JAVA_COMPONENT               (RID_DEPLOYMENT_COMPONENT_START+11)
-#define RID_STR_PYTHON_COMPONENT             (RID_DEPLOYMENT_COMPONENT_START+12)
-#define RID_STR_COMPONENTS                   (RID_DEPLOYMENT_COMPONENT_START+13)
-#define RID_STR_RDB_TYPELIB                  (RID_DEPLOYMENT_COMPONENT_START+20)
-#define RID_STR_JAVA_TYPELIB                 (RID_DEPLOYMENT_COMPONENT_START+21)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
deleted file mode 100644
index fea67f326600..000000000000
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ /dev/null
@@ -1,52 +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 "dp_component.hrc"
-
-String RID_STR_DYN_COMPONENT
-{
-    Text [ en-US ] = "UNO Dynamic Library Component";
-};
-
-String RID_STR_JAVA_COMPONENT
-{
-    Text [ en-US ] = "UNO Java Component";
-};
-
-String RID_STR_PYTHON_COMPONENT
-{
-    Text [ en-US ] = "UNO Python Component";
-};
-
-String RID_STR_COMPONENTS
-{
-    Text [ en-US ] = "UNO Components";
-};
-
-String RID_STR_RDB_TYPELIB
-{
-    Text [ en-US ] = "UNO RDB Type Library";
-};
-
-String RID_STR_JAVA_TYPELIB
-{
-    Text [ en-US ] = "UNO Java Type Library";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index ad372fa73297..cdf61b289ec7 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -22,7 +22,6 @@
 
 #include <config_features.h>
 
-#include "dp_configuration.hrc"
 #include "dp_backend.h"
 #if HAVE_FEATURE_EXTENSIONS
 #include "dp_persmap.h"
@@ -186,12 +185,12 @@ BackendImpl::BackendImpl(
       m_xConfDataTypeInfo( new Package::TypeInfo(
                                "application/vnd.sun.star.configuration-data",
                                "*.xcu",
-                               getResourceString(RID_STR_CONF_DATA)
+                               DpResId(RID_STR_CONF_DATA)
                                ) ),
       m_xConfSchemaTypeInfo( new Package::TypeInfo(
                                  "application/vnd.sun.star.configuration-schema",
                                  "*.xcs",
-                                 getResourceString(RID_STR_CONF_SCHEMA)
+                                 DpResId(RID_STR_CONF_SCHEMA)
                                  ) ),
       m_typeInfos( 2 )
 {
@@ -317,7 +316,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
         if (mediaType.isEmpty())
             throw lang::IllegalArgumentException(
-                StrCannotDetectMediaType::get() + url,
+                StrCannotDetectMediaType() + url,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
@@ -349,7 +348,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType,
+        StrUnsupportedMediaType() + mediaType,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src
deleted file mode 100644
index be4ae80eebf1..000000000000
--- a/desktop/source/deployment/registry/configuration/dp_configuration.src
+++ /dev/null
@@ -1,32 +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 "dp_configuration.hrc"
-
-String RID_STR_CONF_SCHEMA
-{
-    Text [ en-US ] = "Configuration Schema";
-};
-
-String RID_STR_CONF_DATA
-{
-    Text [ en-US ] = "Configuration Data";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 9078d61b8f79..bbd752f3d07c 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -628,8 +628,8 @@ void Package::processPackage_impl(
                 ProgressLevel progress(
                     xCmdEnv,
                     (doRegisterPackage
-                     ? PackageRegistryBackend::StrRegisteringPackage::get()
-                     : PackageRegistryBackend::StrRevokingPackage::get())
+                     ? PackageRegistryBackend::StrRegisteringPackage()
+                     : PackageRegistryBackend::StrRevokingPackage())
                     + displayName );
                 processPackage_( guard,
                                  doRegisterPackage,
@@ -642,8 +642,8 @@ void Package::processPackage_impl(
             Any e(cppu::getCaughtException());
             throw deployment::DeploymentException(
                 ((doRegisterPackage
-                  ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING)
-                  : getResourceString(RID_STR_ERROR_WHILE_REVOKING))
+                  ? DpResId(RID_STR_ERROR_WHILE_REGISTERING)
+                  : DpResId(RID_STR_ERROR_WHILE_REVOKING))
                  + getDisplayName()),
                 static_cast< OWeakObject * >(this), e);
         }
@@ -666,8 +666,8 @@ void Package::processPackage_impl(
             Any exc( ::cppu::getCaughtException() );
             throw deployment::DeploymentException(
                 (doRegisterPackage
-                 ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING)
-                 : getResourceString(RID_STR_ERROR_WHILE_REVOKING))
+                 ? DpResId(RID_STR_ERROR_WHILE_REGISTERING)
+                 : DpResId(RID_STR_ERROR_WHILE_REVOKING))
                 + getDisplayName(), static_cast<OWeakObject *>(this), exc );
         }
     }
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index da6c96195158..745dc66a8717 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -19,8 +19,9 @@
 
 #include <sal/config.h>
 
+#include "dp_shared.hxx"
 #include "dp_package.hxx"
-#include "dp_registry.hrc"
+#include "strings.hrc"
 #include "dp_registry.hxx"
 #include "dp_misc.h"
 #include "dp_resource.h"
@@ -494,7 +495,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
             }
         }
         throw lang::IllegalArgumentException(
-            getResourceString(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url,
+            DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url,
             static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
     else
@@ -514,7 +515,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
         }
         if (iFind == m_mediaType2backend.end()) {
             throw lang::IllegalArgumentException(
-                getResourceString(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType,
+                DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
         }
         return iFind->second->bindPackage( url, mediaType, bRemoved,
diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src
deleted file mode 100644
index a8cf5d2deb15..000000000000
--- a/desktop/source/deployment/registry/dp_registry.src
+++ /dev/null
@@ -1,52 +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 "dp_registry.hrc"
-
-String RID_STR_REGISTERING_PACKAGE
-{
-    Text [ en-US ] = "Enabling: ";
-};
-
-String RID_STR_REVOKING_PACKAGE
-{
-    Text [ en-US ] = "Disabling: ";
-};
-
-String RID_STR_CANNOT_DETECT_MEDIA_TYPE
-{
-    Text [ en-US ] = "Cannot detect media-type: ";
-};
-
-String RID_STR_UNSUPPORTED_MEDIA_TYPE
-{
-    Text [ en-US ] = "This media-type is not supported: ";
-};
-
-String RID_STR_ERROR_WHILE_REGISTERING
-{
-    Text [ en-US ] = "An error occurred while enabling: ";
-};
-
-String RID_STR_ERROR_WHILE_REVOKING
-{
-    Text [ en-US ] = "An error occurred while disabling: ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index a5bac639d480..fbdb4614455e 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -159,7 +159,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
     if (mediaType.isEmpty())
     {
         throw lang::IllegalArgumentException(
-            StrCannotDetectMediaType::get() + url,
+            StrCannotDetectMediaType() + url,
             static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index f7b64bb3a59d..88b9e59f24c6 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -20,7 +20,7 @@
 #include <memory>
 #include <config_features.h>
 
-#include "dp_help.hrc"
+#include "strings.hrc"
 #include "dp_backend.h"
 #include "dp_helpbackenddb.hxx"
 #include "dp_services.hxx"
@@ -128,7 +128,7 @@ BackendImpl::BackendImpl(
     : PackageRegistryBackend( args, xComponentContext ),
       m_xHelpTypeInfo( new Package::TypeInfo("application/vnd.sun.star.help",
                                OUString(),
-                               getResourceString(RID_STR_HELP)
+                               DpResId(RID_STR_HELP)
                                ) ),
       m_typeInfos( 1 )
 {
@@ -173,7 +173,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
     // we don't support auto detection:
     if (mediaType_.isEmpty())
         throw lang::IllegalArgumentException(
-            StrCannotDetectMediaType::get() + url,
+            StrCannotDetectMediaType() + url,
             static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
 
     OUString type, subType;
@@ -199,7 +199,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType_,
+        StrUnsupportedMediaType() + mediaType_,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
@@ -370,7 +370,7 @@ void BackendImpl::implProcessHelp(
                 OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
                 if( !xSFA->isFolder( aExpandedHelpURL ) )
                 {
-                    OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
+                    OUString aErrStr = DpResId( RID_STR_HELPPROCESSING_GENERAL_ERROR );
                     aErrStr += "No help folder";
                     OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
                     throw deployment::DeploymentException( OUString(), oWeakThis,
@@ -475,18 +475,18 @@ void BackendImpl::implProcessHelp(
 
                         if( !bSuccess )
                         {
-                            sal_uInt16 nErrStrId = 0;
+                            const char* pErrStrId = nullptr;
                             switch( aErrorInfo.m_eErrorClass )
                             {
-                            case HelpProcessingErrorClass::General:      nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
-                            case HelpProcessingErrorClass::XmlParsing:   nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
+                            case HelpProcessingErrorClass::General:      pErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
+                            case HelpProcessingErrorClass::XmlParsing:   pErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
                             default: ;
                             };
 
                             OUString aErrStr;
-                            if( nErrStrId != 0 )
+                            if (pErrStrId)
                             {
-                                aErrStr = getResourceString( nErrStrId );
+                                aErrStr = DpResId(pErrStrId);
 
                                 // Remove CR/LF
                                 OUString aErrMsg( aErrorInfo.m_aErrorMsg );
@@ -506,7 +506,7 @@ void BackendImpl::implProcessHelp(
                                     aErrMsg = aErrMsg.copy( 0, nCopy );
                                 }
                                 aErrStr += aErrMsg;
-                                if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() )
+                                if (!strcmp(pErrStrId, RID_STR_HELPPROCESSING_XMLPARSING_ERROR) && !aErrorInfo.m_aXMLParsingFile.isEmpty() )
                                 {
                                     aErrStr += " in ";
 
diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src
deleted file mode 100644
index 0d8d663c4107..000000000000
--- a/desktop/source/deployment/registry/help/dp_help.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 "dp_help.hrc"
-
-String RID_STR_HELP
-{
-    Text [ en-US ] = "Help";
-};
-
-String RID_STR_HELPPROCESSING_GENERAL_ERROR
-{
-    Text [ en-US ] = "The extension cannot be installed because:\n";
-};
-
-String RID_STR_HELPPROCESSING_XMLPARSING_ERROR
-{
-    Text [ en-US ] = "The extension will not be installed because an error occurred in the Help files:\n";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 33ea1e5a7a37..6aebe1124026 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -22,6 +22,7 @@
 
 #include "dp_misc.h"
 #include "dp_resource.h"
+#include "dp_shared.hxx"
 #include "dp_interact.h"
 #include <rtl/ref.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -33,7 +34,7 @@
 #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
 #include <list>
 #include <unordered_map>
-#include "dp_registry.hrc"
+#include "strings.hrc"
 
 namespace dp_registry
 {
@@ -221,10 +222,8 @@ protected:
         Unknown, User, Shared, Bundled, Tmp, Document
     } m_eContext;
 
-    struct StrCannotDetectMediaType : public ::dp_misc::StaticResourceString<
-        StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {};
-    struct StrUnsupportedMediaType : public ::dp_misc::StaticResourceString<
-        StrUnsupportedMediaType, RID_STR_UNSUPPORTED_MEDIA_TYPE> {};
+    static OUString StrCannotDetectMediaType() { return DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE); }
+    static OUString StrUnsupportedMediaType() { return DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE); }
 
     // @@@ to be implemented by specific backend:
     virtual css::uno::Reference<css::deployment::XPackage> bindPackage_(
@@ -261,10 +260,8 @@ protected:
         OUString const & folderUrl);
 
 public:
-    struct StrRegisteringPackage : public ::dp_misc::StaticResourceString<
-        StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {};
-    struct StrRevokingPackage : public ::dp_misc::StaticResourceString<
-        StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {};
+    static OUString StrRegisteringPackage() { return DpResId(RID_STR_REGISTERING_PACKAGE); }
+    static OUString StrRevokingPackage() { return DpResId(RID_STR_REVOKING_PACKAGE); }
 
     css::uno::Reference<css::uno::XComponentContext> const &
     getComponentContext() const { return m_xComponentContext; }
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
deleted file mode 100644
index c6a8d67ea77a..000000000000
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ /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/.
- *
- * 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_DP_REGISTRY_HRC
-#define INCLUDED_DP_REGISTRY_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_CANNOT_DETECT_MEDIA_TYPE    (RID_DEPLOYMENT_REGISTRY_START+0)
-#define RID_STR_UNSUPPORTED_MEDIA_TYPE      (RID_DEPLOYMENT_REGISTRY_START+1)
-#define RID_STR_ERROR_WHILE_REGISTERING     (RID_DEPLOYMENT_REGISTRY_START+2)
-#define RID_STR_ERROR_WHILE_REVOKING        (RID_DEPLOYMENT_REGISTRY_START+3)
-#define RID_STR_REGISTERING_PACKAGE         (RID_DEPLOYMENT_REGISTRY_START+4)
-#define RID_STR_REVOKING_PACKAGE            (RID_DEPLOYMENT_REGISTRY_START+5)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 8d051bc2ee45..e5c061d021f9 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "dp_package.hrc"
+#include "strings.hrc"
 #include "dp_package.hxx"
 #include "dp_backend.h"
 #include "dp_ucb.h"
@@ -270,7 +270,7 @@ BackendImpl::BackendImpl(
       m_xBundleTypeInfo( new Package::TypeInfo(
                              "application/vnd.sun.star.package-bundle",
                              "*.oxt;*.uno.pkg",
-                             getResourceString(RID_STR_PACKAGE_BUNDLE)
+                             DpResId(RID_STR_PACKAGE_BUNDLE)
                              ) ),
       m_xLegacyBundleTypeInfo( new Package::TypeInfo(
                                    "application/vnd.sun.star.legacy-package-bundle",
@@ -375,7 +375,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
         if (mediaType.isEmpty())
             throw lang::IllegalArgumentException(
-                StrCannotDetectMediaType::get() + url,
+                StrCannotDetectMediaType() + url,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
@@ -410,7 +410,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType,
+        StrUnsupportedMediaType() + mediaType,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
deleted file mode 100644
index 253dccb9e3a2..000000000000
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ /dev/null
@@ -1,29 +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_DP_PACKAGE_HRC
-#define INCLUDED_DP_PACKAGE_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_PACKAGE_BUNDLE                 (RID_DEPLOYMENT_BUNDLE_START+10)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src
deleted file mode 100644
index c091c1b14acb..000000000000
--- a/desktop/source/deployment/registry/package/dp_package.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 "dp_package.hrc"
-
-String RID_STR_PACKAGE_BUNDLE
-{
-    Text [ en-US ] = "Extension";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index b743ad2f1eed..8843b04b6b0c 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -21,8 +21,9 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
-#include "dp_script.hrc"
+#include "strings.hrc"
 #include "dp_resource.h"
+#include "dp_shared.hxx"
 #include "dp_xml.h"
 #include "dp_lib_container.h"
 
@@ -41,11 +42,9 @@ namespace backend {
 namespace script {
 
 namespace {
-struct StrCannotDetermineLibName : public StaticResourceString<
-    StrCannotDetermineLibName, RID_STR_CANNOT_DETERMINE_LIBNAME> {};
+    OUString StrCannotDetermineLibName() { return DpResId(RID_STR_CANNOT_DETERMINE_LIBNAME); }
 }
 
-
 OUString LibraryContainer::get_libname(
     OUString const & url,
     Reference<XCommandEnvironment> const & xCmdEnv,
@@ -56,7 +55,7 @@ OUString LibraryContainer::get_libname(
     xml_parse( ::xmlscript::importLibrary( import ), ucb_content, xContext );
 
     if (import.aName.isEmpty()) {
-        throw Exception( StrCannotDetermineLibName::get(),
+        throw Exception( StrCannotDetermineLibName(),
                          Reference<XInterface>() );
     }
     return import.aName;
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 332a6057a01e..e806617845f2 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "dp_script.hrc"
+#include "strings.hrc"
 #include "dp_services.hxx"
 #include "dp_lib_container.h"
 #include "dp_backend.h"
@@ -144,12 +144,12 @@ BackendImpl::BackendImpl(
       m_xBasicLibTypeInfo( new Package::TypeInfo(
                                "application/vnd.sun.star.basic-library",
                                OUString() /* no file filter */,
-                               getResourceString(RID_STR_BASIC_LIB)
+                               DpResId(RID_STR_BASIC_LIB)
                                ) ),
       m_xDialogLibTypeInfo( new Package::TypeInfo(
                                 "application/vnd.sun.star.dialog-library",
                                 OUString() /* no file filter */,
-                                getResourceString(RID_STR_DIALOG_LIB)
+                                DpResId(RID_STR_DIALOG_LIB)
                                 ) ),
       m_typeInfos( 2 )
 {
@@ -233,7 +233,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
         if (mediaType.isEmpty())
             throw lang::IllegalArgumentException(
-                StrCannotDetectMediaType::get() + url,
+                StrCannotDetectMediaType() + url,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
@@ -272,7 +272,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType,
+        StrUnsupportedMediaType() + mediaType,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
deleted file mode 100644
index 7f75edb38ac0..000000000000
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ /dev/null
@@ -1,32 +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_DP_SCRIPT_HRC
-#define INCLUDED_DP_SCRIPT_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_BASIC_LIB                      (RID_DEPLOYMENT_SCRIPT_START+10)
-#define RID_STR_DIALOG_LIB                     (RID_DEPLOYMENT_SCRIPT_START+11)
-
-#define RID_STR_CANNOT_DETERMINE_LIBNAME       (RID_DEPLOYMENT_SCRIPT_START+16)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
deleted file mode 100644
index f3162f8f86e3..000000000000
--- a/desktop/source/deployment/registry/script/dp_script.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 "dp_script.hrc"
-
-String RID_STR_BASIC_LIB
-{
-    Text [ en-US ] = "%PRODUCTNAME Basic Library";
-};
-
-String RID_STR_DIALOG_LIB
-{
-    Text [ en-US ] = "Dialog Library";
-};
-
-String RID_STR_CANNOT_DETERMINE_LIBNAME
-{
-    Text [ en-US ] = "The library name could not be determined.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 274ee2f827c2..d5a8a5df2843 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -20,7 +20,7 @@
 #include <sal/config.h>
 
 #include "dp_services.hxx"
-#include "dp_sfwk.hrc"
+#include "strings.hrc"
 #include "dp_backend.h"
 #include "dp_ucb.h"
 #include "dp_parceldesc.hxx"
@@ -208,7 +208,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
         if (mediaType.isEmpty())
             throw lang::IllegalArgumentException(
-                StrCannotDetectMediaType::get() + url,
+                StrCannotDetectMediaType() + url,
                 static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
     }
 
@@ -251,7 +251,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                     }
                 }
 
-                OUString sfwkLibType = getResourceString( RID_STR_SFWK_LIB );
+                OUString sfwkLibType = DpResId( RID_STR_SFWK_LIB );
                 // replace %MACRONAME placeholder with language name
                 OUString MACRONAME( "%MACROLANG" );
                 sal_Int32 startOfReplace = sfwkLibType.indexOf( MACRONAME );
@@ -266,7 +266,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         }
     }
     throw lang::IllegalArgumentException(
-        StrUnsupportedMediaType::get() + mediaType,
+        StrUnsupportedMediaType() + mediaType,
         static_cast<OWeakObject *>(this),
         static_cast<sal_Int16>(-1) );
 }
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
deleted file mode 100644
index 505c54015b95..000000000000
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ /dev/null
@@ -1,29 +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_DP_SFWK_HRC
-#define INCLUDED_DP_SFWK_HRC
-
-#include "deployment.hrc"
-
-#define RID_STR_SFWK_LIB                       (RID_DEPLOYMENT_SCRIPT_START+20)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
deleted file mode 100644
index 23cd3197eabe..000000000000
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.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 "dp_sfwk.hrc"
-
-String RID_STR_SFWK_LIB
-{
-    Text [ en-US ] = "%MACROLANG Library";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
deleted file mode 100644
index d000036f6481..000000000000
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ /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 .
- */
-
-#include "deployment.hrc"
-
-String RID_STR_UNOPKG_ACCEPT_LIC_1
-{
-    Text [ en-US ] = "Extension Software License Agreement of $NAME:";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_2
-{
-    Text [ en-US ] = "Read the complete License Agreement displayed above. "
-        "Accept the License Agreement by typing \"yes\" on the console "
-        "then press the Return key. Type \"no\" to decline and to abort the "
-        "extension setup.";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_3
-{
-    Text [ en-US ] = "[Enter \"yes\" or \"no\"]:";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_4
-{
-    Text [ en-US ] = "Your input was not correct. Please enter \"yes\" or \"no\":";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_YES
-{
-    Text [ en-US ] = "YES";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_Y
-{
-    Text [ en-US ] = "Y";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_NO
-{
-    Text [ en-US ] = "NO";
-};
-
-String RID_STR_UNOPKG_ACCEPT_LIC_N
-{
-    Text [ en-US ] = "N";
-};
-
-String RID_STR_CONCURRENTINSTANCE
-{
-    Text [ en-US ] = "unopkg cannot be started. The lock file indicates it is already running. "
-        "If this does not apply, delete the lock file at:";
-};
-
-String RID_STR_UNOPKG_ERROR
-{
-    Text [ en-US ] = "ERROR: ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fd62da29d704..36aca9643248 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -64,6 +64,7 @@
 #include <sfx2/lokhelper.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/ucsubset.hxx>
 #include <vcl/svapp.hxx>
@@ -2997,8 +2998,6 @@ static void force_c_locale()
 {
     // force locale (and resource files loaded) to en-US
     OUString aLangISO("en-US");
-    LanguageTag aLocale(aLangISO);
-    ResMgr::SetDefaultLocale(aLocale);
     SvtSysLocaleOptions aLocalOptions;
     aLocalOptions.SetLocaleConfigString(aLangISO);
     aLocalOptions.SetUILocaleConfigString(aLangISO);
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index d501c1954c64..9bb354d7db70 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "dp_gui.hrc"
-#include "dp_gui_shared.hxx"
+#include "strings.hrc"
+#include "dp_shared.hxx"
 #include "unopkg_shared.h"
 #include <osl/thread.h>
 #include <tools/resmgr.hxx>
@@ -40,7 +40,8 @@
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 
 #include <stdio.h>
-#include "deployment.hrc"
+#include "strings.hrc"
+#include "dp_shared.hxx"
 #include "dp_version.hxx"
 
 using namespace ::com::sun::star;
@@ -134,16 +135,15 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl()
 void CommandEnvironmentImpl::printLicense(
     const OUString & sName, const OUString& sLicense, bool & accept, bool &decline)
 {
-    ResMgr * pResMgr = DeploymentResMgr::get();
-    OUString s1tmp(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, *pResMgr));
+    OUString s1tmp(DpResId(RID_STR_UNOPKG_ACCEPT_LIC_1));
     OUString s1(s1tmp.replaceAll("$NAME", sName));
-    OUString s2 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, *pResMgr);
-    OUString s3 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, *pResMgr);
-    OUString s4 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, *pResMgr);
-    OUString sYES = ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, *pResMgr);
-    OUString sY = ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr);
-    OUString sNO = ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr);
-    OUString sN = ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr);
+    OUString s2 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_2);
+    OUString s3 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_3);
+    OUString s4 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_4);
+    OUString sYES = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_YES);
+    OUString sY = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_Y);
+    OUString sNO = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_NO);
+    OUString sN = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_N);
 
     OUString sNewLine("\n");
 
@@ -262,7 +262,7 @@ void CommandEnvironmentImpl::handle(
     }
     else if (request >>= platExc)
     {
-        OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *dp_gui::DeploymentGuiResMgr::get()));
+        OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM));
         sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName());
         dp_misc::writeConsole("\n" + sMsg + "\n\n");
         approve = true;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 8e692cdf2fc8..2e9fdda4dadb 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -38,10 +38,11 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 
-#include "deployment.hrc"
+#include "strings.hrc"
 #include "unopkg_shared.h"
 #include "dp_identifier.hxx"
-#include "dp_gui.hrc"
+#include "dp_shared.hxx"
+#include "strings.hrc"
 #include "lockfile.hxx"
 
 using namespace ::com::sun::star;
@@ -441,10 +442,8 @@ Reference<XComponentContext> getUNO(
     {
         if (! s_lockfile.check( nullptr ))
         {
-            OUString sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get()));
-            //Create this string before we call DeInitVCL, because this will kill
-            //the ResMgr
-            OUString sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get()));
+            OUString sMsg(DpResId(RID_STR_CONCURRENTINSTANCE));
+            OUString sError(DpResId(RID_STR_UNOPKG_ERROR));
 
             sMsg += "\n" + getLockFilePath();
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 1bd6a04b46bd..20ade0b5e4fd 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -22,6 +22,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
+#include <osl/diagnose.h>
 #include <tools/resmgr.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/configmgr.hxx>
@@ -31,14 +32,6 @@
 
 namespace unopkg {
 
-struct DeploymentResMgr :  public rtl::StaticWithInit< ResMgr *, DeploymentResMgr >
-{
-    ResMgr * operator () () {
-        return ResMgr::CreateResMgr(
-            "deployment", LanguageTag( utl::ConfigManager::getLocale() ) );
-    }
-};
-
 struct OptionInfo
 {
     char const * m_name;
diff --git a/desktop/uiconfig/ui/dependenciesdialog.ui b/desktop/uiconfig/ui/dependenciesdialog.ui
index cdc6bf35362f..d810db078d54 100644
--- a/desktop/uiconfig/ui/dependenciesdialog.ui
+++ b/desktop/uiconfig/ui/dependenciesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dkt">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="Dependencies">
     <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">System dependencies check</property>
+    <property name="title" translatable="yes" context="dependenciesdialog|Dependencies">System dependencies check</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -57,7 +57,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The extension cannot be installed as the following system dependencies are not fulfilled:</property>
+                <property name="label" translatable="yes" context="dependenciesdialog|label1">The extension cannot be installed as the following system dependencies are not fulfilled:</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">60</property>
               </object>
diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui
index f40b38679134..d4aa71991655 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="dkt">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ExtensionManagerDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Extension Manager</property>
+    <property name="title" translatable="yes" context="extensionmanager|ExtensionManagerDialog">Extension Manager</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -79,7 +79,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="optionsbtn">
-                    <property name="label" translatable="yes">_Options</property>
+                    <property name="label" translatable="yes" context="extensionmanager|optionsbtn">_Options</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -93,7 +93,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="updatebtn">
-                    <property name="label" translatable="yes">Check for _Updates</property>
+                    <property name="label" translatable="yes" context="extensionmanager|updatebtn">Check for _Updates</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -108,7 +108,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="addbtn">
-                    <property name="label" translatable="yes">_Add</property>
+                    <property name="label" translatable="yes" context="extensionmanager|addbtn">_Add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
@@ -125,7 +125,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="removebtn">
-                    <property name="label" translatable="yes">_Remove</property>
+                    <property name="label" translatable="yes" context="extensionmanager|removebtn">_Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -140,7 +140,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="enablebtn">
-                    <property name="label" translatable="yes">_Enable</property>
+                    <property name="label" translatable="yes" context="extensionmanager|enablebtn">_Enable</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -184,7 +184,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="shared">
-                            <property name="label" translatable="yes">Installed for all users</property>
+                            <property name="label" translatable="yes" context="extensionmanager|shared">Installed for all users</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -200,7 +200,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="user">
-                            <property name="label" translatable="yes">Installed for current user</property>
+                            <property name="label" translatable="yes" context="extensionmanager|user">Installed for current user</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="bundled">
-                            <property name="label" translatable="yes">Bundled with %PRODUCTNAME</property>
+                            <property name="label" translatable="yes" context="extensionmanager|bundled">Bundled with %PRODUCTNAME</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -238,7 +238,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Display Extensions</property>
+                    <property name="label" translatable="yes" context="extensionmanager|label1">Display Extensions</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -260,7 +260,7 @@
                   <object class="GtkLabel" id="progressft">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Adding %EXTENSION_NAME</property>
+                    <property name="label" translatable="yes" context="extensionmanager|progressft">Adding %EXTENSION_NAME</property>
                     <property name="justify">right</property>
                   </object>
                   <packing>
@@ -295,7 +295,7 @@
                 </child>
                 <child>
                   <object class="GtkLinkButton" id="getextensions">
-                    <property name="label" translatable="yes">Get more extensions online...</property>
+                    <property name="label" translatable="yes" context="extensionmanager|getextensions">Get more extensions online...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/desktop/uiconfig/ui/installforalldialog.ui b/desktop/uiconfig/ui/installforalldialog.ui
index 354afcf280cb..c3d3576db024 100644
--- a/desktop/uiconfig/ui/installforalldialog.ui
+++ b/desktop/uiconfig/ui/installforalldialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="dkt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="InstallForAllDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">For whom do you want to install the extension?</property>
-    <property name="secondary_text" translatable="yes">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property>
+    <property name="text" translatable="yes" context="installforalldialog|InstallForAllDialog">For whom do you want to install the extension?</property>
+    <property name="secondary_text" translatable="yes" context="installforalldialog|InstallForAllDialog">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -22,7 +22,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="no">
-                <property name="label" translatable="yes">_For all users</property>
+                <property name="label" translatable="yes" context="installforalldialog|no">_For all users</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="yes">
-                <property name="label" translatable="yes">_Only for me</property>
+                <property name="label" translatable="yes" context="installforalldialog|yes">_Only for me</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/desktop/uiconfig/ui/licensedialog.ui b/desktop/uiconfig/ui/licensedialog.ui
index bc357838da06..3dac862f09ff 100644
--- a/desktop/uiconfig/ui/licensedialog.ui
+++ b/desktop/uiconfig/ui/licensedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dkt">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="LicenseDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Extension Software License Agreement</property>
+    <property name="title" translatable="yes" context="licensedialog|LicenseDialog">Extension Software License Agreement</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="accept">
-                <property name="label" translatable="yes">Accept</property>
+                <property name="label" translatable="yes" context="licensedialog|accept">Accept</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -33,7 +33,7 @@
             </child>
             <child>
               <object class="GtkButton" id="decline">
-                <property name="label" translatable="yes">Decline</property>
+                <property name="label" translatable="yes" context="licensedialog|decline">Decline</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -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">Please follow these steps to proceed with the installation of the extension:</property>
+                <property name="label" translatable="yes" context="licensedialog|head">Please follow these steps to proceed with the installation of the extension:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -87,7 +87,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">1.</property>
+                    <property name="label" translatable="yes" context="licensedialog|label2">1.</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -102,7 +102,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">2.</property>
+                    <property name="label" translatable="yes" context="licensedialog|label3">2.</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -146,7 +146,7 @@
                     <property name="valign">start</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text.</property>
+                    <property name="label" translatable="yes" context="licensedialog|label4">Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">55</property>
                   </object>
@@ -164,7 +164,7 @@
                     <property name="valign">start</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Accept the License Agreement for the extension by pressing the 'Accept' button.</property>
+                    <property name="label" translatable="yes" context="licensedialog|label5">Accept the License Agreement for the extension by pressing the 'Accept' button.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">55</property>
                   </object>
@@ -177,7 +177,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="down">
-                    <property name="label" translatable="yes">_Scroll Down</property>
+                    <property name="label" translatable="yes" context="licensedialog|down">_Scroll Down</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/desktop/uiconfig/ui/showlicensedialog.ui b/desktop/uiconfig/ui/showlicensedialog.ui
index e6dc728f9c40..eef638282720 100644
--- a/desktop/uiconfig/ui/showlicensedialog.ui
+++ b/desktop/uiconfig/ui/showlicensedialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="dkt">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="ShowLicenseDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Extension Software License Agreement</property>
+    <property name="title" translatable="yes" context="showlicensedialog|ShowLicenseDialog">Extension Software License Agreement</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui
index 9fb3b6bcefdc..ee9a1b16fa57 100644
--- a/desktop/uiconfig/ui/updatedialog.ui
+++ b/desktop/uiconfig/ui/updatedialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dkt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="UpdateDialog">
     <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">Extension Update</property>
+    <property name="title" translatable="yes" context="updatedialog|UpdateDialog">Extension Update</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="INSTALL">
-                <property name="label" translatable="yes">_Install</property>
+                <property name="label" translatable="yes" context="updatedialog|INSTALL">_Install</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -101,7 +101,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">_Available extension updates</property>
+                        <property name="label" translatable="yes" context="updatedialog|UPDATE_LABEL">_Available extension updates</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -114,7 +114,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">Checking...</property>
+                        <property name="label" translatable="yes" context="updatedialog|UPDATE_CHECKING">Checking...</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="UPDATE_ALL">
-                    <property name="label" translatable="yes">_Show all updates</property>
+                    <property name="label" translatable="yes" context="updatedialog|UPDATE_ALL">_Show all updates</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
@@ -193,7 +193,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Description</property>
+                    <property name="label" translatable="yes" context="updatedialog|DESCRIPTION_LABEL">Description</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -211,7 +211,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Publisher:</property>
+                        <property name="label" translatable="yes" context="updatedialog|PUBLISHER_LABEL">Publisher:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">PUBLISHER_LINK</property>
                       </object>
@@ -222,7 +222,7 @@
                     </child>
                     <child>
                       <object class="GtkLinkButton" id="PUBLISHER_LINK">
-                        <property name="label" translatable="yes">button</property>
+                        <property name="label" translatable="yes" context="updatedialog|PUBLISHER_LINK">button</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">What is new:</property>
+                        <property name="label" translatable="yes" context="updatedialog|RELEASE_NOTES_LABEL">What is new:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">RELEASE_NOTES_LINK</property>
                       </object>
@@ -250,7 +250,7 @@
                     </child>
                     <child>
                       <object class="GtkLinkButton" id="RELEASE_NOTES_LINK">
-                        <property name="label" translatable="yes">Release notes</property>
+                        <property name="label" translatable="yes" context="updatedialog|RELEASE_NOTES_LINK">Release notes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui
index 42dc29937624..d96a85edef67 100644
--- a/desktop/uiconfig/ui/updateinstalldialog.ui
+++ b/desktop/uiconfig/ui/updateinstalldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="dkt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="UpdateInstallDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Download and Installation</property>
+    <property name="title" translatable="yes" context="updateinstalldialog|UpdateInstallDialog">Download and Installation</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -84,7 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Downloading extensions...</property>
+                <property name="label" translatable="yes" context="updateinstalldialog|DOWNLOADING">Downloading extensions...</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">STATUSBAR</property>
               </object>
@@ -122,7 +122,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Result</property>
+                <property name="label" translatable="yes" context="updateinstalldialog|RESULTS">Result</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">INFO</property>
               </object>
diff --git a/desktop/uiconfig/ui/updaterequireddialog.ui b/desktop/uiconfig/ui/updaterequireddialog.ui
index b1c82d62657e..58e9ced957b9 100644
--- a/desktop/uiconfig/ui/updaterequireddialog.ui
+++ b/desktop/uiconfig/ui/updaterequireddialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="dkt">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="UpdateRequiredDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Extension Update Required</property>
+    <property name="title" translatable="yes" context="updaterequireddialog|UpdateRequiredDialog">Extension Update Required</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -23,7 +23,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">%PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used.</property>
+                <property name="label" translatable="yes" context="updaterequireddialog|updatelabel">%PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">95</property>
               </object>
@@ -59,7 +59,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Adding %EXTENSION_NAME</property>
+                    <property name="label" translatable="yes" context="updaterequireddialog|progresslabel">Adding %EXTENSION_NAME</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -103,7 +103,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="check">
-                <property name="label" translatable="yes">Check for _Updates...</property>
+                <property name="label" translatable="yes" context="updaterequireddialog|check">Check for _Updates...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -119,7 +119,7 @@
             </child>
             <child>
               <object class="GtkButton" id="disable">
-                <property name="label" translatable="yes">Disable all</property>
+                <property name="label" translatable="yes" context="updaterequireddialog|disable">Disable all</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index 7eaa2c729a20..ea4fe9578815 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -119,13 +119,11 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/svtdllapi.h>
 #include <tools/color.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
 #include <tools/wintypes.hxx>
diff --git a/editeng/AllLangMoTarget_editeng.mk b/editeng/AllLangMoTarget_editeng.mk
new file mode 100644
index 000000000000..b2e00ba32c6c
--- /dev/null
+++ b/editeng/AllLangMoTarget_editeng.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,editeng))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk
deleted file mode 100644
index 881579cffe01..000000000000
--- a/editeng/AllLangResTarget_editeng.mk
+++ /dev/null
@@ -1,42 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,editeng))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx))
-
-$(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res))
-$(eval $(call gb_SrsTarget_SrsTarget,editeng/res))
-
-$(eval $(call gb_SrsTarget_set_include,editeng/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/editeng/inc \
-))
-
-# add src files here (complete path relative to repository root)
-$(eval $(call gb_SrsTarget_add_files,editeng/res,\
-    editeng/source/accessibility/accessibility.src \
-    editeng/source/editeng/editeng.src \
-    editeng/source/items/page.src \
-    editeng/source/items/svxitems.src \
-    editeng/source/misc/lingu.src \
-    editeng/source/outliner/outliner.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 81cbf9332255..7e5790e81339 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -157,7 +157,4 @@ $(eval $(call gb_Library_use_externals,editeng,\
 	libxml2 \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,editeng,editeng))
-
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 4bed89d70b1b..6fedbcb6043e 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -22,11 +22,11 @@ $(eval $(call gb_Module_Module,editeng))
 $(eval $(call gb_Module_add_targets,editeng,\
 	CustomTarget_generated \
 	Library_editeng \
+	UIConfig_editeng \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,editeng,\
-	AllLangResTarget_editeng \
-	UIConfig_editeng \
+	AllLangMoTarget_editeng \
 ))
 
 $(eval $(call gb_Module_add_check_targets,editeng,\
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hxx
index 18c62082623e..6c59982d679e 100644
--- a/editeng/inc/editeng.hrc
+++ b/editeng/inc/editeng.hxx
@@ -16,10 +16,8 @@
  *   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_EDITENG_INC_EDITENG_HRC
-#define INCLUDED_EDITENG_INC_EDITENG_HRC
-
-#include <editeng/editrids.hrc>
+#ifndef INCLUDED_EDITENG_INC_EDITENG_HXX
+#define INCLUDED_EDITENG_INC_EDITENG_HXX
 
 #define MN_WORDLANGUAGE  998
 #define MN_PARALANGUAGE  999
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 7386631bfac4..a30afe4d008c 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -249,8 +249,6 @@
 #include <linguistic/lngprops.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sot/formats.hxx>
 #include <sot/sotdllapi.h>
 #include <svl/cenumitm.hxx>
@@ -275,7 +273,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index c1a5a5265c22..a23dfecff852 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -66,7 +66,7 @@
 
 #include <svtools/colorcfg.hxx>
 using namespace std;
-#include "editeng.hrc"
+#include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
 #include <editeng/numitem.hxx>
 #include <memory>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 2a6c50de1eaf..fe88afb6f37d 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -40,7 +40,7 @@
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/outliner.hxx>
-#include "editeng.hrc"
+#include <editeng/editrids.hrc>
 #include <svtools/colorcfg.hxx>
 
 
@@ -136,7 +136,7 @@ namespace accessibility
         SolarMutexGuard aGuard;
 
         // Get the string from the resource for the specified id.
-        return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
+        return EditResId(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
     }
 
     OUString SAL_CALL  AccessibleImageBullet::getAccessibleName()
@@ -145,7 +145,7 @@ namespace accessibility
         SolarMutexGuard aGuard;
 
         // Get the string from the resource for the specified id.
-        return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_NAME);
+        return EditResId(RID_SVXSTR_A11Y_IMAGEBULLET_NAME);
     }
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet()
diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src
deleted file mode 100644
index f1ff0daff47f..000000000000
--- a/editeng/source/accessibility/accessibility.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 "editeng.hrc"
-
-String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
-{
-    Text [ en-US ] = "Image bullet in paragraph" ;
-};
-
-String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
-{
-    Text [ en-US ] = "Image bullet" ;
-};
-
-String RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION
-{
-    Text [ en-US ] = "Paragraph: $(ARG) " ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index e5727ee0ba9b..7828eb843b45 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -34,7 +34,8 @@
 #include <editdbg.hxx>
 #include <eerdll2.hxx>
 #include <editeng/eerdll.hxx>
-#include <editeng.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng.hxx>
 #include <editeng/acorrcfg.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/txtrange.hxx>
@@ -2513,12 +2514,12 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_DELCONTENT:
         case EDITUNDO_DELETE:
         case EDITUNDO_CUT:
-            aComment = EditResId::GetString(RID_EDITUNDO_DEL);
+            aComment = EditResId(RID_EDITUNDO_DEL);
         break;
         case EDITUNDO_MOVEPARAGRAPHS:
         case EDITUNDO_MOVEPARAS:
         case EDITUNDO_DRAGANDDROP:
-            aComment = EditResId::GetString(RID_EDITUNDO_MOVE);
+            aComment = EditResId(RID_EDITUNDO_MOVE);
         break;
         case EDITUNDO_INSERTFEATURE:
         case EDITUNDO_SPLITPARA:
@@ -2526,27 +2527,27 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const
         case EDITUNDO_PASTE:
         case EDITUNDO_INSERT:
         case EDITUNDO_READ:
-            aComment = EditResId::GetString(RID_EDITUNDO_INSERT);
+            aComment = EditResId(RID_EDITUNDO_INSERT);
         break;
         case EDITUNDO_REPLACEALL:
-            aComment = EditResId::GetString(RID_EDITUNDO_REPLACE);
+            aComment = EditResId(RID_EDITUNDO_REPLACE);
         break;
         case EDITUNDO_ATTRIBS:
         case EDITUNDO_PARAATTRIBS:
-            aComment = EditResId::GetString(RID_EDITUNDO_SETATTRIBS);
+            aComment = EditResId(RID_EDITUNDO_SETATTRIBS);
         break;
         case EDITUNDO_RESETATTRIBS:
-            aComment = EditResId::GetString(RID_EDITUNDO_RESETATTRIBS);
+            aComment = EditResId(RID_EDITUNDO_RESETATTRIBS);
         break;
         case EDITUNDO_STYLESHEET:
-            aComment = EditResId::GetString(RID_EDITUNDO_SETSTYLE);
+            aComment = EditResId(RID_EDITUNDO_SETSTYLE);
         break;
         case EDITUNDO_TRANSLITERATE:
-            aComment = EditResId::GetString(RID_EDITUNDO_TRANSLITERATE);
+            aComment = EditResId(RID_EDITUNDO_TRANSLITERATE);
         break;
         case EDITUNDO_INDENTBLOCK:
         case EDITUNDO_UNINDENTBLOCK:
-            aComment = EditResId::GetString(RID_EDITUNDO_INDENT);
+            aComment = EditResId(RID_EDITUNDO_INDENT);
         break;
     }
     return aComment;
diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
deleted file mode 100644
index bcf45d9b8abc..000000000000
--- a/editeng/source/editeng/editeng.src
+++ /dev/null
@@ -1,83 +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 <editeng.hrc>
-#include <helpid.hrc>
-
-String RID_EDITUNDO_DEL
-{
-    Text [ en-US ] = "Delete" ;
-};
-
-String RID_EDITUNDO_MOVE
-{
-    Text [ en-US ] = "Move" ;
-};
-
-String RID_EDITUNDO_INSERT
-{
-    Text [ en-US ] = "Insert" ;
-};
-
-String RID_EDITUNDO_REPLACE
-{
-    Text [ en-US ] = "Replace" ;
-};
-
-String RID_EDITUNDO_SETATTRIBS
-{
-    Text [ en-US ] = "Apply attributes" ;
-};
-
-String RID_EDITUNDO_RESETATTRIBS
-{
-    Text [ en-US ] = "Reset attributes" ;
-};
-
-String RID_EDITUNDO_INDENT
-{
-    Text [ en-US ] = "Indent" ;
-};
-
-String RID_EDITUNDO_SETSTYLE
-{
-    Text [ en-US ] = "Apply Styles" ;
-};
-
-String RID_EDITUNDO_TRANSLITERATE
-{
-    Text [ en-US ] = "Change Case";
-};
-
-String RID_STR_WORD
-{
-    Text [ en-US ] = "Word is %x";
-};
-
-String RID_STR_PARAGRAPH
-{
-    Text [ en-US ] = "Paragraph is %x";
-};
-
-String RID_SVXSTR_AUTOMATIC
-{
-    Text [ en-US ] = "Automatic";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 77cabbec1123..11697dc95edd 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -47,7 +47,8 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
-#include <editeng.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng.hxx>
 #include <helpid.hrc>
 #include <i18nlangtag/lang.h>
 #include <vcl/menu.hxx>
@@ -887,9 +888,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
             aPopupMenu->InsertSeparator();
             OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
             OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
-            OUString aWordStr( EditResId::GetString( RID_STR_WORD ) );
+            OUString aWordStr( EditResId( RID_STR_WORD ) );
             aWordStr = aWordStr.replaceFirst( "%x", aTmpWord );
-            OUString aParaStr( EditResId::GetString( RID_STR_PARAGRAPH ) );
+            OUString aParaStr( EditResId( RID_STR_PARAGRAPH ) );
             aParaStr = aParaStr.replaceFirst( "%x", aTmpPara );
             aPopupMenu->InsertItem( MN_WORDLANGUAGE, aWordStr );
             aPopupMenu->SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 2027cab81a50..d23885ea1fec 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <tools/resmgr.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
@@ -192,9 +193,9 @@ uno::Reference< linguistic2::XLanguageGuessing > const & GlobalEditData::GetLang
     return xLanguageGuesser;
 }
 
-EditResId::EditResId(sal_uInt16 nId)
-    : ResId(nId, *EditDLL::GetResMgr())
+OUString EditResId(const char *pId)
 {
+    return Translate::get(pId, EditDLL::GetResLocale());
 }
 
 EditDLL::EditDLL()
@@ -206,13 +207,10 @@ EditDLL::~EditDLL()
 {
 }
 
-static ResMgr* pResMgr=nullptr;
-
-ResMgr* EditDLL::GetResMgr()
+std::locale& EditDLL::GetResLocale()
 {
-    if (!pResMgr)
-        pResMgr = ResMgr::CreateResMgr("editeng", Application::GetSettings().GetUILanguageTag());
-    return pResMgr;
+    static std::locale loc = Translate::Create("editeng", Application::GetSettings().GetUILanguageTag());
+    return loc;
 }
 
 
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 0cb38a0f445e..caa86bcce036 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -637,7 +637,7 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit,
                                        const IntlWrapper* pIntl,
                                        bool bMetricStr) const
 {
-    static const sal_uInt16 aStyleIds[] =
+    static const char* aStyleIds[] =
     {
         RID_SOLID,
         RID_DOTTED,
@@ -662,12 +662,12 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit,
 
     if ( (int)m_nStyle < int(SAL_N_ELEMENTS(aStyleIds)) )
     {
-        sal_uInt16 nResId = aStyleIds[(int)m_nStyle];
-        aStr += EditResId::GetString(nResId);
+        const char* pResId = aStyleIds[(int)m_nStyle];
+        aStr += EditResId(pResId);
     }
     else
     {
-        OUString sMetric = EditResId::GetString(GetMetricId( eDestUnit ));
+        OUString sMetric = EditResId(GetMetricId( eDestUnit ));
         aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl );
         if ( bMetricStr )
             aStr += sMetric;
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 41e8e9b479d9..c27a188af5aa 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -41,11 +41,11 @@ bool SvxCharHiddenItem::GetPresentation
     const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
+    const char* pId = RID_SVXITEMS_CHARHIDDEN_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_CHARHIDDEN_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d14afbbcbe1b..0178499d1020 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -196,10 +196,10 @@ bool SvxPaperBinItem::GetPresentation
             sal_uInt8 nValue = GetValue();
 
             if ( PAPERBIN_PRINTER_SETTINGS == nValue )
-                rText = EditResId::GetString(RID_SVXSTR_PAPERBIN_SETTINGS);
+                rText = EditResId(RID_SVXSTR_PAPERBIN_SETTINGS);
             else
             {
-                rText = EditResId::GetString(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue );
+                rText = EditResId(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue );
             }
             return true;
         }
@@ -333,13 +333,13 @@ bool SvxSizeItem::GetPresentation
             return true;
 
         case SfxItemPresentation::Complete:
-            rText = EditResId::GetString(RID_SVXITEMS_SIZE_WIDTH) +
+            rText = EditResId(RID_SVXITEMS_SIZE_WIDTH) +
                     GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) +
-                    " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                    " " + EditResId(GetMetricId(ePresUnit)) +
                     cpDelimTmp +
-                    EditResId::GetString(RID_SVXITEMS_SIZE_HEIGHT) +
+                    EditResId(RID_SVXITEMS_SIZE_HEIGHT) +
                     GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) +
-                    " " + EditResId::GetString(GetMetricId(ePresUnit));
+                    " " + EditResId(GetMetricId(ePresUnit));
             return true;
         // no break necessary
         default: ; // prevent warning
@@ -631,7 +631,7 @@ bool SvxLRSpaceItem::GetPresentation
         }
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_LRSPACE_LEFT);
+            rText = EditResId(RID_SVXITEMS_LRSPACE_LEFT);
             if ( 100 != nPropLeftMargin )
                 rText += unicode::formatPercent(nPropLeftMargin,
                     Application::GetSettings().GetUILanguageTag());
@@ -639,12 +639,12 @@ bool SvxLRSpaceItem::GetPresentation
             {
                 rText = rText +
                         GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
             rText += OUString(cpDelim);
             if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
             {
-                rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_FLINE);
+                rText += EditResId(RID_SVXITEMS_LRSPACE_FLINE);
                 if ( 100 != nPropFirstLineOfst )
                     rText = rText + unicode::formatPercent(nPropFirstLineOfst,
                     Application::GetSettings().GetUILanguageTag());
@@ -653,11 +653,11 @@ bool SvxLRSpaceItem::GetPresentation
                     rText = rText +
                             GetMetricText( (long)nFirstLineOfst,
                                             eCoreUnit, ePresUnit, pIntl ) +
-                            " " + EditResId::GetString(GetMetricId(ePresUnit));
+                            " " + EditResId(GetMetricId(ePresUnit));
                 }
                 rText += OUString(cpDelim);
             }
-            rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_RIGHT);
+            rText += EditResId(RID_SVXITEMS_LRSPACE_RIGHT);
             if ( 100 != nPropRightMargin )
                 rText = rText + unicode::formatPercent(nPropRightMargin,
                     Application::GetSettings().GetUILanguageTag());
@@ -666,7 +666,7 @@ bool SvxLRSpaceItem::GetPresentation
                 rText = rText +
                         GetMetricText( (long)nRightMargin,
                                        eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
         }
@@ -998,7 +998,7 @@ bool SvxULSpaceItem::GetPresentation
         }
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_ULSPACE_UPPER);
+            rText = EditResId(RID_SVXITEMS_ULSPACE_UPPER);
             if ( 100 != nPropUpper )
             {
                 rText += unicode::formatPercent(nPropUpper,
@@ -1008,9 +1008,9 @@ bool SvxULSpaceItem::GetPresentation
             {
                 rText = rText +
                         GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
-            rText = rText + OUString(cpDelim) + EditResId::GetString(RID_SVXITEMS_ULSPACE_LOWER);
+            rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER);
             if ( 100 != nPropLower )
             {
                 rText += unicode::formatPercent(nPropLower,
@@ -1020,7 +1020,7 @@ bool SvxULSpaceItem::GetPresentation
             {
                 rText = rText +
                         GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
         }
@@ -1124,11 +1124,11 @@ bool SvxPrintItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_PRINT_FALSE;
+    const char* pId = RID_SVXITEMS_PRINT_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_PRINT_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_PRINT_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1162,11 +1162,11 @@ bool SvxOpaqueItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_OPAQUE_FALSE;
+    const char* pId = RID_SVXITEMS_OPAQUE_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_OPAQUE_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_OPAQUE_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1232,21 +1232,21 @@ bool SvxProtectItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_PROT_CONTENT_FALSE;
+    const char* pId = RID_SVXITEMS_PROT_CONTENT_FALSE;
 
     if ( bCntnt )
-        nId = RID_SVXITEMS_PROT_CONTENT_TRUE;
-    rText = EditResId::GetString(nId) + OUString(cpDelim);
-    nId = RID_SVXITEMS_PROT_SIZE_FALSE;
+        pId = RID_SVXITEMS_PROT_CONTENT_TRUE;
+    rText = EditResId(pId) + OUString(cpDelim);
+    pId = RID_SVXITEMS_PROT_SIZE_FALSE;
 
     if ( bSize )
-        nId = RID_SVXITEMS_PROT_SIZE_TRUE;
-    rText = rText + EditResId::GetString(nId) + OUString(cpDelim);
-    nId = RID_SVXITEMS_PROT_POS_FALSE;
+        pId = RID_SVXITEMS_PROT_SIZE_TRUE;
+    rText = rText + EditResId(pId) + OUString(cpDelim);
+    pId = RID_SVXITEMS_PROT_POS_FALSE;
 
     if ( bPos )
-        nId = RID_SVXITEMS_PROT_POS_TRUE;
-    rText += EditResId::GetString(nId);
+        pId = RID_SVXITEMS_PROT_POS_TRUE;
+    rText += EditResId(pId);
     return true;
 }
 
@@ -1449,6 +1449,14 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const
     return nSpace;
 }
 
+static const char* RID_SVXITEMS_SHADOW[] =
+{
+    RID_SVXITEMS_SHADOW_NONE,
+    RID_SVXITEMS_SHADOW_TOPLEFT,
+    RID_SVXITEMS_SHADOW_TOPRIGHT,
+    RID_SVXITEMS_SHADOW_BOTTOMLEFT,
+    RID_SVXITEMS_SHADOW_BOTTOMRIGHT
+};
 
 bool SvxShadowItem::GetPresentation
 (
@@ -1463,34 +1471,34 @@ bool SvxShadowItem::GetPresentation
         case SfxItemPresentation::Nameless:
         {
             rText = ::GetColorString( aShadowColor ) + OUString(cpDelim);
-            sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
+            const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE;
 
             if ( aShadowColor.GetTransparency() )
-                nId = RID_SVXITEMS_TRANSPARENT_TRUE;
+                pId = RID_SVXITEMS_TRANSPARENT_TRUE;
             rText = rText +
-                    EditResId::GetString(nId) +
+                    EditResId(pId) +
                     OUString(cpDelim) +
                     GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
                     OUString(cpDelim) +
-                    EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation);
+                    EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]);
             return true;
         }
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_SHADOW_COMPLETE) +
+            rText = EditResId(RID_SVXITEMS_SHADOW_COMPLETE) +
                     ::GetColorString( aShadowColor ) +
                     OUString(cpDelim);
 
-            sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
+            const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE;
             if ( aShadowColor.GetTransparency() )
-                nId = RID_SVXITEMS_TRANSPARENT_TRUE;
+                pId = RID_SVXITEMS_TRANSPARENT_TRUE;
             rText = rText +
-                    EditResId::GetString(nId) +
+                    EditResId(pId) +
                     OUString(cpDelim) +
                     GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) +
-                    " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                    " " + EditResId(GetMetricId(ePresUnit)) +
                     OUString(cpDelim) +
-                    EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation);
+                    EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]);
             return true;
         }
         default: ; // prevent warning
@@ -1545,14 +1553,13 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
     return (sal_uInt16)SvxShadowLocation::End;  // SvxShadowLocation::BottomRight + 1
 }
 
-
 OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (sal_uInt16)SvxShadowLocation::End, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + nPos );
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_SHADOW) == (size_t)SvxShadowLocation::End, "unexpected size");
+    assert(nPos < (sal_uInt16)SvxShadowLocation::End && "enum overflow!");
+    return EditResId(RID_SVXITEMS_SHADOW[nPos]);
 }
 
-
 sal_uInt16 SvxShadowItem::GetEnumValue() const
 {
     return (sal_uInt16)GetLocation();
@@ -1571,7 +1578,7 @@ void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aShadowColor"), BAD_CAST(aShadowColor.AsRGBHexString().toUtf8().getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidth"), BAD_CAST(OString::number(nWidth).getStr()));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number((int)eLocation).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation).toUtf8().getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]).toUtf8().getStr()));
     xmlTextWriterEndElement(pWriter);
 }
 
@@ -2106,11 +2113,11 @@ bool SvxBoxItem::GetPresentation
         {
             if( !(pTop || pBottom || pLeft || pRight) )
             {
-                rText = EditResId::GetString(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp;
+                rText = EditResId(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp;
             }
             else
             {
-                rText = EditResId::GetString(RID_SVXITEMS_BORDER_COMPLETE);
+                rText = EditResId(RID_SVXITEMS_BORDER_COMPLETE);
                 if( pTop && pBottom && pLeft && pRight &&
                     *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
                 {
@@ -2121,65 +2128,65 @@ bool SvxBoxItem::GetPresentation
                     if ( pTop )
                     {
                         rText = rText +
-                                EditResId::GetString(RID_SVXITEMS_BORDER_TOP) +
+                                EditResId(RID_SVXITEMS_BORDER_TOP) +
                                 pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pBottom )
                     {
                         rText = rText +
-                                EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) +
+                                EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
                                 pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pLeft )
                     {
                         rText = rText +
-                                EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) +
+                                EditResId(RID_SVXITEMS_BORDER_LEFT) +
                                 pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
                                 cpDelimTmp;
                     }
                     if ( pRight )
                     {
                         rText = rText +
-                                EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) +
+                                EditResId(RID_SVXITEMS_BORDER_RIGHT) +
                                 pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) +
                                 cpDelimTmp;
                     }
                 }
             }
 
-            rText += EditResId::GetString(RID_SVXITEMS_BORDER_DISTANCE);
+            rText += EditResId(RID_SVXITEMS_BORDER_DISTANCE);
             if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
                 nTopDist == nRightDist )
             {
                 rText = rText +
                         GetMetricText( (long)nTopDist, eCoreUnit,
                                             ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
             else
             {
                 rText = rText +
-                        EditResId::GetString(RID_SVXITEMS_BORDER_TOP) +
+                        EditResId(RID_SVXITEMS_BORDER_TOP) +
                         GetMetricText( (long)nTopDist, eCoreUnit,
                                         ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
-                        EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) +
+                        EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
                         GetMetricText( (long)nBottomDist, eCoreUnit,
                                         ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
-                        EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) +
+                        EditResId(RID_SVXITEMS_BORDER_LEFT) +
                         GetMetricText( (long)nLeftDist, eCoreUnit,
                                         ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
-                        EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) +
+                        EditResId(RID_SVXITEMS_BORDER_RIGHT) +
                         GetMetricText( (long)nRightDist, eCoreUnit,
                                         ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             }
             return true;
         }
@@ -2933,14 +2940,23 @@ bool SvxFormatBreakItem::GetPresentation
     return true;
 }
 
-
 OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (sal_uInt16)SvxBreak::End, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_BREAK_BEGIN + nPos);
+    static const char* RID_SVXITEMS_BREAK[] =
+    {
+        RID_SVXITEMS_BREAK_NONE,
+        RID_SVXITEMS_BREAK_COLUMN_BEFORE,
+        RID_SVXITEMS_BREAK_COLUMN_AFTER,
+        RID_SVXITEMS_BREAK_COLUMN_BOTH,
+        RID_SVXITEMS_BREAK_PAGE_BEFORE,
+        RID_SVXITEMS_BREAK_PAGE_AFTER,
+        RID_SVXITEMS_BREAK_PAGE_BOTH
+    };
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_BREAK) == (size_t)SvxBreak::End, "unexpected size");
+    assert(nPos < (sal_uInt16)SvxBreak::End && "enum overflow!");
+    return EditResId(RID_SVXITEMS_BREAK[nPos]);
 }
 
-
 bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
@@ -3059,11 +3075,11 @@ bool SvxFormatKeepItem::GetPresentation
     OUString&           rText, const IntlWrapper *
     ) const
 {
-    sal_uInt16 nId = RID_SVXITEMS_FMTKEEP_FALSE;
+    const char* pId = RID_SVXITEMS_FMTKEEP_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_FMTKEEP_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_FMTKEEP_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -3662,15 +3678,15 @@ bool SvxBrushItem::GetPresentation
     if ( GPOS_NONE  == eGraphicPos )
     {
         rText = ::GetColorString( aColor ) + OUString(cpDelim);
-        sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
+        const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE;
 
         if ( aColor.GetTransparency() )
-            nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-        rText += EditResId::GetString(nId);
+            pId = RID_SVXITEMS_TRANSPARENT_TRUE;
+        rText += EditResId(pId);
     }
     else
     {
-        rText = EditResId::GetString(RID_SVXITEMS_GRAPHIC);
+        rText = EditResId(RID_SVXITEMS_GRAPHIC);
     }
 
     return true;
@@ -4010,6 +4026,18 @@ sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
     return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
 }
 
+const char* getFrmDirResId(size_t nIndex)
+{
+    const char* RID_SVXITEMS_FRMDIR[] =
+    {
+        RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP,
+        RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP,
+        RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT,
+        RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT,
+        RID_SVXITEMS_FRMDIR_ENVIRONMENT
+    };
+    return RID_SVXITEMS_FRMDIR[nIndex];
+}
 
 bool SvxFrameDirectionItem::GetPresentation(
     SfxItemPresentation /*ePres*/,
@@ -4017,11 +4045,10 @@ bool SvxFrameDirectionItem::GetPresentation(
     MapUnit             /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *) const
 {
-    rText = EditResId::GetString( RID_SVXITEMS_FRMDIR_BEGIN + GetEnumValue() );
+    rText = EditResId(getFrmDirResId(GetEnumValue()));
     return true;
 }
 
-
 bool SvxFrameDirectionItem::PutValue( const css::uno::Any& rVal,
                                              sal_uInt8 )
 {
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 620cdadd8b7e..39126f065f1d 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -125,17 +125,15 @@ OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const In
     return sRet.makeStringAndClear();
 }
 
-
-OUString GetSvxString( sal_uInt16 nId )
+OUString GetSvxString(const char* pId)
 {
-    return EditResId::GetString( nId );
+    return EditResId(pId);
 }
 
-
 OUString GetColorString( const Color& rCol )
 {
     if (rCol.GetColor() == COL_AUTO)
-        return EditResId::GetString(RID_SVXSTR_AUTOMATIC);
+        return EditResId(RID_SVXSTR_AUTOMATIC);
 
     OUString sStr;
 
@@ -155,8 +153,30 @@ OUString GetColorString( const Color& rCol )
         nColor += 1;
     }
 
+    static const char* RID_SVXITEMS_COLORS[] =
+    {
+        RID_SVXITEMS_COLOR_BLACK,
+        RID_SVXITEMS_COLOR_BLUE,
+        RID_SVXITEMS_COLOR_GREEN,
+        RID_SVXITEMS_COLOR_CYAN,
+        RID_SVXITEMS_COLOR_RED,
+        RID_SVXITEMS_COLOR_MAGENTA,
+        RID_SVXITEMS_COLOR_BROWN,
+        RID_SVXITEMS_COLOR_GRAY,
+        RID_SVXITEMS_COLOR_LIGHTGRAY,
+        RID_SVXITEMS_COLOR_LIGHTBLUE,
+        RID_SVXITEMS_COLOR_LIGHTGREEN,
+        RID_SVXITEMS_COLOR_LIGHTCYAN,
+        RID_SVXITEMS_COLOR_LIGHTRED,
+        RID_SVXITEMS_COLOR_LIGHTMAGENTA,
+        RID_SVXITEMS_COLOR_YELLOW,
+        RID_SVXITEMS_COLOR_WHITE
+    };
+
+    static_assert(SAL_N_ELEMENTS(aColAry) == SAL_N_ELEMENTS(RID_SVXITEMS_COLORS), "must match");
+
     if ( nColor < SAL_N_ELEMENTS(aColAry) )
-        sStr = EditResId::GetString( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
+        sStr = EditResId(RID_SVXITEMS_COLORS[nColor]);
 
     if ( sStr.isEmpty() )
     {
@@ -168,47 +188,45 @@ OUString GetColorString( const Color& rCol )
     return sStr;
 }
 
-
-sal_uInt16 GetMetricId( MapUnit eUnit )
+const char* GetMetricId( MapUnit eUnit )
 {
-    sal_uInt16 nId = RID_SVXITEMS_METRIC_MM;
+    const char* pId = RID_SVXITEMS_METRIC_MM;
 
     switch ( eUnit )
     {
         case MapUnit::Map100thMM:
         case MapUnit::Map10thMM:
         case MapUnit::MapMM:
-            nId = RID_SVXITEMS_METRIC_MM;
+            pId = RID_SVXITEMS_METRIC_MM;
             break;
 
         case MapUnit::MapCM:
-            nId = RID_SVXITEMS_METRIC_CM;
+            pId = RID_SVXITEMS_METRIC_CM;
             break;
 
         case MapUnit::Map1000thInch:
         case MapUnit::Map100thInch:
         case MapUnit::Map10thInch:
         case MapUnit::MapInch:
-            nId = RID_SVXITEMS_METRIC_INCH;
+            pId = RID_SVXITEMS_METRIC_INCH;
             break;
 
         case MapUnit::MapPoint:
-            nId = RID_SVXITEMS_METRIC_POINT;
+            pId = RID_SVXITEMS_METRIC_POINT;
             break;
 
         case MapUnit::MapTwip:
-            nId = RID_SVXITEMS_METRIC_TWIP;
+            pId = RID_SVXITEMS_METRIC_TWIP;
             break;
 
         case MapUnit::MapPixel:
-            nId = RID_SVXITEMS_METRIC_PIXEL;
+            pId = RID_SVXITEMS_METRIC_PIXEL;
             break;
 
         default:
             OSL_FAIL( "not supported mapunit" );
     }
-    return nId;
+    return pId;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index b897fc5860d5..9d073ebda5c7 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -161,7 +161,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal )
 {
     DBG_ASSERT( nVal <= (sal_uInt16)SvxCellHorJustify::Repeat, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_HORJUST_STANDARD + nVal);
+    return EditResId(RID_SVXITEMS_HORJUST_STANDARD + nVal);
 }
 
 
@@ -297,7 +297,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal )
 {
     DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_VERJUST_STANDARD + nVal);
+    return EditResId(RID_SVXITEMS_VERJUST_STANDARD + nVal);
 }
 
 
@@ -379,7 +379,7 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId
 OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal )
 {
     DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal);
+    return EditResId(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal);
 }
 
 
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 819f1aed7454..1736b80e741c 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 
@@ -120,9 +119,9 @@ bool SfxHyphenRegionItem::GetPresentation
 )   const
 {
     rText = rText +
-            EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
+            EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
             "," +
-            EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
+            EditResId(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
     return true;
 }
 
diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src
deleted file mode 100644
index e58a618e753d..000000000000
--- a/editeng/source/items/page.src
+++ /dev/null
@@ -1,31 +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 <editeng/editrids.hrc>
-
-String RID_SVXSTR_PAPERBIN
-{
-    Text [ en-US ] = "Paper tray" ;
-};
-String RID_SVXSTR_PAPERBIN_SETTINGS
-{
-    Text [ en-US ] = "[From printer settings]" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 164b00a2d92c..eab2588de236 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -428,14 +428,21 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
     return (sal_uInt16)SvxAdjust::End;  // SvxAdjust::BlockLine + 1
 }
 
-
 OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)SvxAdjust::BlockLine, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_ADJUST_BEGIN + nPos);
+    static const char* RID_SVXITEMS_ADJUST[] =
+    {
+        RID_SVXITEMS_ADJUST_LEFT,
+        RID_SVXITEMS_ADJUST_RIGHT,
+        RID_SVXITEMS_ADJUST_BLOCK,
+        RID_SVXITEMS_ADJUST_CENTER,
+        RID_SVXITEMS_ADJUST_BLOCKLINE
+    };
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ADJUST) - 1 == (size_t)SvxAdjust::BlockLine, "unexpected size");
+    assert(nPos <= (sal_uInt16)SvxAdjust::BlockLine && "enum overflow!");
+    return EditResId(RID_SVXITEMS_ADJUST[nPos]);
 }
 
-
 sal_uInt16 SvxAdjustItem::GetEnumValue() const
 {
     return (sal_uInt16)GetAdjust();
@@ -530,13 +537,13 @@ bool SvxWidowsItem::GetPresentation
     {
         case SfxItemPresentation::Nameless:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_LINES);
+            rText = EditResId(RID_SVXITEMS_LINES);
             break;
         }
 
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES);
+            rText = EditResId(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES);
             break;
         }
 
@@ -591,13 +598,13 @@ bool SvxOrphansItem::GetPresentation
     {
         case SfxItemPresentation::Nameless:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_LINES);
+            rText = EditResId(RID_SVXITEMS_LINES);
             break;
         }
 
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES);
+            rText = EditResId(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES);
             break;
         }
 
@@ -704,16 +711,16 @@ bool SvxHyphenZoneItem::GetPresentation
     {
         case SfxItemPresentation::Nameless:
         {
-            sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE;
+            const char* pId = RID_SVXITEMS_HYPHEN_FALSE;
 
             if ( bHyphen )
-                nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = EditResId::GetString(nId) + cpDelimTmp;
-            nId = RID_SVXITEMS_PAGE_END_FALSE;
+                pId = RID_SVXITEMS_HYPHEN_TRUE;
+            rText = EditResId(pId) + cpDelimTmp;
+            pId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
-                nId = RID_SVXITEMS_PAGE_END_TRUE;
-            rText = rText + EditResId::GetString(nId) + cpDelimTmp +
+                pId = RID_SVXITEMS_PAGE_END_TRUE;
+            rText = rText + EditResId(pId) + cpDelimTmp +
                     OUString::number( nMinLead ) + cpDelimTmp +
                     OUString::number( nMinTrail ) + cpDelimTmp +
                     OUString::number( nMaxHyphens );
@@ -721,23 +728,23 @@ bool SvxHyphenZoneItem::GetPresentation
         }
         case SfxItemPresentation::Complete:
         {
-            sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE;
+            const char* pId = RID_SVXITEMS_HYPHEN_FALSE;
 
             if ( bHyphen )
-                nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = EditResId::GetString(nId) + cpDelimTmp;
-            nId = RID_SVXITEMS_PAGE_END_FALSE;
+                pId = RID_SVXITEMS_HYPHEN_TRUE;
+            rText = EditResId(pId) + cpDelimTmp;
+            pId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
-                nId = RID_SVXITEMS_PAGE_END_TRUE;
+                pId = RID_SVXITEMS_PAGE_END_TRUE;
             rText = rText +
-                    EditResId::GetString(nId) +
+                    EditResId(pId) +
                     cpDelimTmp +
-                    EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
+                    EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
                     cpDelimTmp +
-                    EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) +
+                    EditResId(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) +
                     cpDelimTmp +
-                    EditResId::GetString(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens));
+                    EditResId(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens));
             return true;
         }
         default: ;//prevent warning
@@ -1038,7 +1045,7 @@ bool SvxTabStopItem::GetPresentation
                 ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
             if ( SfxItemPresentation::Complete == ePres )
             {
-                rText += " " + EditResId::GetString(GetMetricId(ePresUnit));
+                rText += " " + EditResId(GetMetricId(ePresUnit));
             }
             bComma = true;
         }
@@ -1182,11 +1189,11 @@ bool SvxFormatSplitItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_FMTSPLIT_FALSE;
+    const char* pId = RID_SVXITEMS_FMTSPLIT_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_FMTSPLIT_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_FMTSPLIT_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1255,7 +1262,7 @@ bool SvxPageModelItem::GetPresentation
         case SfxItemPresentation::Complete:
             if ( bSet )
             {
-                rText = EditResId::GetString(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue();
+                rText = EditResId(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue();
             }
             return true;
         default: ;//prevent warning
@@ -1296,7 +1303,7 @@ bool SvxScriptSpaceItem::GetPresentation(
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
         OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
-    rText = EditResId::GetString( !GetValue()
+    rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_SCRPTSPC_OFF
                             : RID_SVXITEMS_SCRPTSPC_ON );
     return true;
@@ -1336,7 +1343,7 @@ bool SvxHangingPunctuationItem::GetPresentation(
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
         OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
-    rText = EditResId::GetString( !GetValue()
+    rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_HNGPNCT_OFF
                             : RID_SVXITEMS_HNGPNCT_ON );
     return true;
@@ -1376,7 +1383,7 @@ bool SvxForbiddenRuleItem::GetPresentation(
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
         OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
-    rText = EditResId::GetString( !GetValue()
+    rText = EditResId( !GetValue()
                             ? RID_SVXITEMS_FORBIDDEN_RULE_OFF
                             : RID_SVXITEMS_FORBIDDEN_RULE_ON );
     return true;
@@ -1420,16 +1427,16 @@ bool SvxParaVertAlignItem::GetPresentation(
         MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
         OUString &rText, const IntlWrapper*  ) const
 {
-    sal_uInt16 nTmp;
+    const char* pTmp;
     switch( GetValue() )
     {
-        case Align::Automatic: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
-        case Align::Top:       nTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break;
-        case Align::Center:    nTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break;
-        case Align::Bottom:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
-        default:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break;
+        case Align::Automatic: pTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
+        case Align::Top:       pTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break;
+        case Align::Center:    pTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break;
+        case Align::Bottom:    pTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
+        default:    pTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break;
     }
-    rText = EditResId::GetString( nTmp );
+    rText = EditResId(pTmp);
     return true;
 }
 
@@ -1493,8 +1500,8 @@ bool SvxParaGridItem::GetPresentation(
         OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
     rText = GetValue() ?
-            EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
-            EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_OFF );
+            EditResId( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
+            EditResId( RID_SVXITEMS_PARASNAPTOGRID_OFF );
 
     return true;
 }
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
deleted file mode 100644
index 3cb496325d97..000000000000
--- a/editeng/source/items/svxitems.src
+++ /dev/null
@@ -1,1028 +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 <editeng/editrids.hrc>
-
- // enum SvxBreak ------------------------------------------------------------
-String RID_SVXITEMS_BREAK_NONE
-{
-    Text [ en-US ] = "No break" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_BEFORE
-{
-    Text [ en-US ] = "Break before new column" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_AFTER
-{
-    Text [ en-US ] = "Break after new column" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_BOTH
-{
-    Text [ en-US ] = "Break before and after new column" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_BEFORE
-{
-    Text [ en-US ] = "Break before new page" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_AFTER
-{
-    Text [ en-US ] = "Break after new page" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_BOTH
-{
-    Text [ en-US ] = "Break before and after new page" ;
-};
- // enum SvxShadowLocation ---------------------------------------------------
-String RID_SVXITEMS_SHADOW_NONE
-{
-    Text [ en-US ] = "No Shadow" ;
-};
-String RID_SVXITEMS_SHADOW_TOPLEFT
-{
-    Text [ en-US ] = "Shadow top left" ;
-};
-String RID_SVXITEMS_SHADOW_TOPRIGHT
-{
-    Text [ en-US ] = "Shadow top right" ;
-};
-String RID_SVXITEMS_SHADOW_BOTTOMLEFT
-{
-    Text [ en-US ] = "Shadow bottom left" ;
-};
-String RID_SVXITEMS_SHADOW_BOTTOMRIGHT
-{
-    Text [ en-US ] = "Shadow bottom right" ;
-};
- // enum ColorName -----------------------------------------------------------
-String RID_SVXITEMS_COLOR
-{
-    Text [ en-US ] = "Color " ;
-};
-String RID_SVXITEMS_COLOR_BLACK
-{
-    Text [ en-US ] = "Black" ;
-};
-String RID_SVXITEMS_COLOR_BLUE
-{
-    Text [ en-US ] = "Blue" ;
-};
-String RID_SVXITEMS_COLOR_GREEN
-{
-    Text [ en-US ] = "Green" ;
-};
-String RID_SVXITEMS_COLOR_CYAN
-{
-    Text [ en-US ] = "Cyan" ;
-};
-String RID_SVXITEMS_COLOR_RED
-{
-    Text [ en-US ] = "Red" ;
-};
-String RID_SVXITEMS_COLOR_MAGENTA
-{
-    Text [ en-US ] = "Magenta" ;
-};
-String RID_SVXITEMS_COLOR_BROWN
-{
-    Text [ en-US ] = "Brown" ;
-};
-String RID_SVXITEMS_COLOR_GRAY
-{
-    Text [ en-US ] = "Gray" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTGRAY
-{
-    Text [ en-US ] = "Light Gray" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTBLUE
-{
-    Text [ en-US ] = "Light Blue" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTGREEN
-{
-    Text [ en-US ] = "Light Green" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTCYAN
-{
-    Text [ en-US ] = "Light Cyan" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTRED
-{
-    Text [ en-US ] = "Light Red" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTMAGENTA
-{
-    Text [ en-US ] = "Light Magenta" ;
-};
-String RID_SVXITEMS_COLOR_YELLOW
-{
-    Text [ en-US ] = "Yellow" ;
-};
-String RID_SVXITEMS_COLOR_WHITE
-{
-    Text [ en-US ] = "White" ;
-};
-String RID_SVXITEMS_COLOR_MENUBAR
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_MENUBARTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_POPUPMENU
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_POPUPMENUTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_WINDOWTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_WINDOWWORKSPACE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_HIGHLIGHT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DFACE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DLIGHT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DSHADOW
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_SCROLLBAR
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_FIELD
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_FIELDTEXT
-{
-    Text = "?" ;
-};
- // enum FontItalic -------------------------------------------------------
-String RID_SVXITEMS_ITALIC_NONE
-{
-    Text [ en-US ] = "Not Italic" ;
-};
-String RID_SVXITEMS_ITALIC_OBLIQUE
-{
-    Text [ en-US ] = "Oblique italic" ;
-};
-String RID_SVXITEMS_ITALIC_NORMAL
-{
-    Text [ en-US ] = "Italic" ;
-};
- // enum FontWeight -------------------------------------------------------
-String RID_SVXITEMS_WEIGHT_DONTKNOW
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_WEIGHT_THIN
-{
-    Text [ en-US ] = "thin" ;
-};
-String RID_SVXITEMS_WEIGHT_ULTRALIGHT
-{
-    Text [ en-US ] = "ultra thin" ;
-};
-String RID_SVXITEMS_WEIGHT_LIGHT
-{
-    Text [ en-US ] = "light" ;
-};
-String RID_SVXITEMS_WEIGHT_SEMILIGHT
-{
-    Text [ en-US ] = "semi light" ;
-};
-String RID_SVXITEMS_WEIGHT_NORMAL
-{
-    Text [ en-US ] = "normal" ;
-};
-String RID_SVXITEMS_WEIGHT_MEDIUM
-{
-    Text [ en-US ] = "medium" ;
-};
-String RID_SVXITEMS_WEIGHT_SEMIBOLD
-{
-    Text [ en-US ] = "semi bold" ;
-};
-String RID_SVXITEMS_WEIGHT_BOLD
-{
-    Text [ en-US ] = "bold" ;
-};
-String RID_SVXITEMS_WEIGHT_ULTRABOLD
-{
-    Text [ en-US ] = "ultra bold" ;
-};
-String RID_SVXITEMS_WEIGHT_BLACK
-{
-    Text [ en-US ] = "black" ;
-};
- // enum FontUnderline - used for underline ------------------------------
-String RID_SVXITEMS_UL_NONE
-{
-    Text [ en-US ] = "No underline" ;
-};
-String RID_SVXITEMS_UL_SINGLE
-{
-    Text [ en-US ] = "Single underline" ;
-};
-String RID_SVXITEMS_UL_DOUBLE
-{
-    Text [ en-US ] = "Double underline" ;
-};
-String RID_SVXITEMS_UL_DOTTED
-{
-    Text [ en-US ] = "Dotted underline" ;
-};
-String RID_SVXITEMS_UL_DONTKNOW
-{
-    Text [ en-US ] = "Underline";
-};
-String RID_SVXITEMS_UL_DASH
-{
-    Text [ en-US ] = "Underline (dashes)";
-};
-String RID_SVXITEMS_UL_LONGDASH
-{
-    Text [ en-US ] = "Underline (long dashes)";
-};
-String RID_SVXITEMS_UL_DASHDOT
-{
-    Text [ en-US ] = "Underline (dot dash)";
-};
-String RID_SVXITEMS_UL_DASHDOTDOT
-{
-    Text [ en-US ] = "Underline (dot dot dash)";
-};
-String RID_SVXITEMS_UL_SMALLWAVE
-{
-    Text [ en-US ] = "Underline (small wave)";
-};
-String RID_SVXITEMS_UL_WAVE
-{
-    Text [ en-US ] = "Underline (Wave)";
-};
-String RID_SVXITEMS_UL_DOUBLEWAVE
-{
-    Text [ en-US ] = "Underline (Double wave)";
-};
-String RID_SVXITEMS_UL_BOLD
-{
-    Text [ en-US ] = "Underlined (Bold)";
-};
-String RID_SVXITEMS_UL_BOLDDOTTED
-{
-    Text [ en-US ] = "Dotted underline (Bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASH
-{
-    Text [ en-US ] = "Underline (Dash bold)";
-};
-String RID_SVXITEMS_UL_BOLDLONGDASH
-{
-    Text [ en-US ] = "Underline (long dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASHDOT
-{
-    Text [ en-US ] = "Underline (dot dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASHDOTDOT
-{
-    Text [ en-US ] = "Underline (dot dot dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDWAVE
-{
-    Text [ en-US ] = "Underline (wave, bold)";
-};
- // enum FontUnderline - used for overline -------------------------------
-String RID_SVXITEMS_OL_NONE
-{
-    Text [ en-US ] = "No overline" ;
-};
-String RID_SVXITEMS_OL_SINGLE
-{
-    Text [ en-US ] = "Single overline" ;
-};
-String RID_SVXITEMS_OL_DOUBLE
-{
-    Text [ en-US ] = "Double overline" ;
-};
-String RID_SVXITEMS_OL_DOTTED
-{
-    Text [ en-US ] = "Dotted overline" ;
-};
-String RID_SVXITEMS_OL_DONTKNOW
-{
-    Text [ en-US ] = "Overline";
-};
-String RID_SVXITEMS_OL_DASH
-{
-    Text [ en-US ] = "Overline (dashes)";
-};
-String RID_SVXITEMS_OL_LONGDASH
-{
-    Text [ en-US ] = "Overline (long dashes)";
-};
-String RID_SVXITEMS_OL_DASHDOT
-{
-    Text [ en-US ] = "Overline (dot dash)";
-};
-String RID_SVXITEMS_OL_DASHDOTDOT
-{
-    Text [ en-US ] = "Overline (dot dot dash)";
-};
-String RID_SVXITEMS_OL_SMALLWAVE
-{
-    Text [ en-US ] = "Overline (small wave)";
-};
-String RID_SVXITEMS_OL_WAVE
-{
-    Text [ en-US ] = "Overline (Wave)";
-};
-String RID_SVXITEMS_OL_DOUBLEWAVE
-{
-    Text [ en-US ] = "Overline (Double wave)";
-};
-String RID_SVXITEMS_OL_BOLD
-{
-    Text [ en-US ] = "Overlined (Bold)";
-};
-String RID_SVXITEMS_OL_BOLDDOTTED
-{
-    Text [ en-US ] = "Dotted overline (Bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASH
-{
-    Text [ en-US ] = "Overline (Dash bold)";
-};
-String RID_SVXITEMS_OL_BOLDLONGDASH
-{
-    Text [ en-US ] = "Overline (long dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASHDOT
-{
-    Text [ en-US ] = "Overline (dot dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASHDOTDOT
-{
-    Text [ en-US ] = "Overline (dot dot dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDWAVE
-{
-    Text [ en-US ] = "Overline (wave, bold)";
-};
- // enum FontStrikeout ----------------------------------------------------
-String RID_SVXITEMS_STRIKEOUT_NONE
-{
-    Text [ en-US ] = "No strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_SINGLE
-{
-    Text [ en-US ] = "Single strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_DOUBLE
-{
-    Text [ en-US ] = "Double strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_BOLD
-{
-    Text [ en-US ] = "Bold strikethrough";
-};
-String RID_SVXITEMS_STRIKEOUT_SLASH
-{
-    Text [ en-US ] = "Strike through with slash";
-};
-String RID_SVXITEMS_STRIKEOUT_X
-{
-    Text [ en-US ] = "Strike through with Xes";
-};
- // enum CASEMAP ----------------------------------------------------------
-String RID_SVXITEMS_CASEMAP_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXITEMS_CASEMAP_VERSALIEN
-{
-    Text [ en-US ] = "Caps" ;
-};
-String RID_SVXITEMS_CASEMAP_GEMEINE
-{
-    Text [ en-US ] = "Lowercase" ;
-};
-String RID_SVXITEMS_CASEMAP_TITEL
-{
-    Text [ en-US ] = "Title" ;
-};
-String RID_SVXITEMS_CASEMAP_KAPITAELCHEN
-{
-    Text [ en-US ] = "Small caps" ;
-};
- // enum ESCAPEMENT -------------------------------------------------------
-String RID_SVXITEMS_ESCAPEMENT_OFF
-{
-    Text [ en-US ] = "Normal position" ;
-};
-String RID_SVXITEMS_ESCAPEMENT_SUPER
-{
-    Text [ en-US ] = "Superscript " ;
-};
-String RID_SVXITEMS_ESCAPEMENT_SUB
-{
-    Text [ en-US ] = "Subscript " ;
-};
-String RID_SVXITEMS_ESCAPEMENT_AUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
- // enum SvxAdjust -----------------------------------------------------------
-String RID_SVXITEMS_ADJUST_LEFT
-{
-    Text [ en-US ] = "Align left" ;
-};
-String RID_SVXITEMS_ADJUST_RIGHT
-{
-    Text [ en-US ] = "Align right" ;
-};
-String RID_SVXITEMS_ADJUST_BLOCK
-{
-    Text [ en-US ] = "Justify" ;
-};
-String RID_SVXITEMS_ADJUST_CENTER
-{
-    Text [ en-US ] = "Centered" ;
-};
-String RID_SVXITEMS_ADJUST_BLOCKLINE
-{
-    Text [ en-US ] = "Justify" ;
-};
-String RID_SOLID
-{
-    Text [ en-US ] = "Single, solid" ;
-};
-String RID_DOTTED
-{
-    Text [ en-US ] = "Single, dotted" ;
-};
-String RID_DASHED
-{
-    Text [ en-US ] = "Single, dashed" ;
-};
-String RID_DOUBLE
-{
-    Text [ en-US ] = "Double" ;
-};
-String RID_THINTHICK_SMALLGAP
-{
-    Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: small";
-};
-String RID_THINTHICK_MEDIUMGAP
-{
-    Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: medium";
-};
-String RID_THINTHICK_LARGEGAP
-{
-    Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: large";
-};
-String RID_THICKTHIN_SMALLGAP
-{
-    Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: small";
-};
-String RID_THICKTHIN_MEDIUMGAP
-{
-    Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: medium";
-};
-String RID_THICKTHIN_LARGEGAP
-{
-    Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: large";
-};
-String RID_EMBOSSED
-{
-    Text [ en-US ] = "3D embossed" ;
-};
-String RID_ENGRAVED
-{
-    Text [ en-US ] = "3D engraved" ;
-};
-String RID_INSET
-{
-    Text [ en-US ] = "Inset" ;
-};
-String RID_OUTSET
-{
-    Text [ en-US ] = "Outset" ;
-};
-String RID_FINE_DASHED
-{
-    Text [ en-US ] = "Single, fine dashed";
-};
-String RID_DOUBLE_THIN
-{
-    Text [ en-US ] = "Double, fixed thin lines";
-};
-String RID_DASH_DOT
-{
-    Text [ en-US ] = "Single, dash-dot";
-};
-String RID_DASH_DOT_DOT
-{
-    Text [ en-US ] = "Single, dash-dot-dot";
-};
-String RID_SVXITEMS_METRIC_MM
-{
-    Text [ en-US ] = "mm" ;
-};
-String RID_SVXITEMS_METRIC_CM
-{
-    Text [ en-US ] = "cm" ;
-};
-String RID_SVXITEMS_METRIC_INCH
-{
-    Text [ en-US ] = "inch" ;
-};
-String RID_SVXITEMS_METRIC_POINT
-{
-    Text [ en-US ] = "pt" ;
-};
-String RID_SVXITEMS_METRIC_TWIP
-{
-    Text [ en-US ] = "twip" ;
-};
-String RID_SVXITEMS_METRIC_PIXEL
-{
-    Text [ en-US ] = "pixel" ;
-};
- // GetValueText of BoolItems
-String RID_SVXITEMS_SHADOWED_TRUE
-{
-    Text [ en-US ] = "Shadowed" ;
-};
-String RID_SVXITEMS_SHADOWED_FALSE
-{
-    Text [ en-US ] = "Not Shadowed" ;
-};
-String RID_SVXITEMS_BLINK_TRUE
-{
-    Text [ en-US ] = "Blinking" ;
-};
-String RID_SVXITEMS_BLINK_FALSE
-{
-    Text [ en-US ] = "Not Blinking" ;
-};
-String RID_SVXITEMS_AUTOKERN_TRUE
-{
-    Text [ en-US ] = "Pair Kerning" ;
-};
-String RID_SVXITEMS_AUTOKERN_FALSE
-{
-    Text [ en-US ] = "No pair kerning" ;
-};
-String RID_SVXITEMS_WORDLINE_TRUE
-{
-    Text [ en-US ] = "Individual words" ;
-};
-String RID_SVXITEMS_WORDLINE_FALSE
-{
-    Text [ en-US ] = "Not Words Only" ;
-};
-String RID_SVXITEMS_CONTOUR_TRUE
-{
-    Text [ en-US ] = "Outline" ;
-};
-String RID_SVXITEMS_CONTOUR_FALSE
-{
-    Text [ en-US ] = "No Outline" ;
-};
-String RID_SVXITEMS_PRINT_TRUE
-{
-    Text [ en-US ] = "Print" ;
-};
-String RID_SVXITEMS_PRINT_FALSE
-{
-    Text [ en-US ] = "Don't print" ;
-};
-String RID_SVXITEMS_OPAQUE_TRUE
-{
-    Text [ en-US ] = "Opaque" ;
-};
-String RID_SVXITEMS_OPAQUE_FALSE
-{
-    Text [ en-US ] = "Not Opaque" ;
-};
-String RID_SVXITEMS_FMTKEEP_TRUE
-{
-    Text [ en-US ] = "Keep with next paragraph" ;
-};
-String RID_SVXITEMS_FMTKEEP_FALSE
-{
-    Text [ en-US ] = "Don't Keep Paragraphs Together" ;
-};
-String RID_SVXITEMS_FMTSPLIT_TRUE
-{
-    Text [ en-US ] = "Split paragraph" ;
-};
-String RID_SVXITEMS_FMTSPLIT_FALSE
-{
-    Text [ en-US ] = "Don't split paragraph" ;
-};
-String RID_SVXITEMS_PROT_CONTENT_TRUE
-{
-    Text [ en-US ] = "Contents protected" ;
-};
-String RID_SVXITEMS_PROT_CONTENT_FALSE
-{
-    Text [ en-US ] = "Contents not protected" ;
-};
-String RID_SVXITEMS_PROT_SIZE_TRUE
-{
-    Text [ en-US ] = "Size protected" ;
-};
-String RID_SVXITEMS_PROT_SIZE_FALSE
-{
-    Text [ en-US ] = "Size not protected" ;
-};
-String RID_SVXITEMS_PROT_POS_TRUE
-{
-    Text [ en-US ] = "Position protected" ;
-};
-String RID_SVXITEMS_PROT_POS_FALSE
-{
-    Text [ en-US ] = "Position not protected" ;
-};
-String RID_SVXITEMS_TRANSPARENT_TRUE
-{
-    Text [ en-US ] = "Transparent" ;
-};
-String RID_SVXITEMS_TRANSPARENT_FALSE
-{
-    Text [ en-US ] = "Not Transparent" ;
-};
-String RID_SVXITEMS_HYPHEN_TRUE
-{
-    Text [ en-US ] = "Hyphenation" ;
-};
-String RID_SVXITEMS_HYPHEN_FALSE
-{
-    Text [ en-US ] = "No hyphenation" ;
-};
-String RID_SVXITEMS_PAGE_END_TRUE
-{
-    Text [ en-US ] = "Page End" ;
-};
-String RID_SVXITEMS_PAGE_END_FALSE
-{
-    Text [ en-US ] = "No Page End" ;
-};
-String RID_SVXITEMS_SIZE_WIDTH
-{
-    Text [ en-US ] = "Width: " ;
-};
-String RID_SVXITEMS_SIZE_HEIGHT
-{
-    Text [ en-US ] = "Height: " ;
-};
-String RID_SVXITEMS_LRSPACE_LEFT
-{
-    Text [ en-US ] = "Indent left " ;
-};
-String RID_SVXITEMS_LRSPACE_FLINE
-{
-    Text [ en-US ] = "First Line " ;
-};
-String RID_SVXITEMS_LRSPACE_RIGHT
-{
-    Text [ en-US ] = "Indent right " ;
-};
-String RID_SVXITEMS_SHADOW_COMPLETE
-{
-    Text [ en-US ] = "Shadow: " ;
-};
-String RID_SVXITEMS_BORDER_COMPLETE
-{
-    Text [ en-US ] = "Borders " ;
-};
-String RID_SVXITEMS_BORDER_NONE
-{
-    Text [ en-US ] = "No border";
-};
-String RID_SVXITEMS_BORDER_TOP
-{
-    Text [ en-US ] = "top " ;
-};
-String RID_SVXITEMS_BORDER_BOTTOM
-{
-    Text [ en-US ] = "bottom " ;
-};
-String RID_SVXITEMS_BORDER_LEFT
-{
-    Text [ en-US ] = "left " ;
-};
-String RID_SVXITEMS_BORDER_RIGHT
-{
-    Text [ en-US ] = "right " ;
-};
-String RID_SVXITEMS_BORDER_DISTANCE
-{
-    Text [ en-US ] = "Spacing " ;
-};
-String RID_SVXITEMS_ULSPACE_UPPER
-{
-    Text [ en-US ] = "From top " ;
-};
-String RID_SVXITEMS_ULSPACE_LOWER
-{
-    Text [ en-US ] = "From bottom " ;
-};
-String RID_SVXITEMS_LINES
-{
-    Text [ en-US ] = "%1 Lines" ;
-    Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines";
-};
-String RID_SVXITEMS_WIDOWS_COMPLETE
-{
-    Text [ en-US ] = "Widow control" ;
-};
-String RID_SVXITEMS_ORPHANS_COMPLETE
-{
-    Text [ en-US ] = "Orphan control" ;
-};
-String RID_SVXITEMS_HYPHEN_MINLEAD
-{
-    Text [ en-US ] = "%1 characters at end of line" ;
-};
-String RID_SVXITEMS_HYPHEN_MINTRAIL
-{
-    Text [ en-US ] = "%1 characters at beginning of line" ;
-};
-String RID_SVXITEMS_HYPHEN_MAX
-{
-    Text [ en-US ] = "%1 hyphens" ;
-};
-String RID_SVXITEMS_PAGEMODEL_COMPLETE
-{
-    Text [ en-US ] = "Page Style: " ;
-};
-String RID_SVXITEMS_KERNING_COMPLETE
-{
-    Text [ en-US ] = "Kerning " ;
-};
-String RID_SVXITEMS_KERNING_EXPANDED
-{
-    Text [ en-US ] = "locked " ;
-};
-String RID_SVXITEMS_KERNING_CONDENSED
-{
-    Text [ en-US ] = "Condensed " ;
-};
-String RID_SVXITEMS_GRAPHIC
-{
-    Text [ en-US ] = "Graphic" ;
-};
-String RID_SVXITEMS_EMPHASIS_NONE_STYLE
-{
-    Text [ en-US ] = "none";
-};
-String RID_SVXITEMS_EMPHASIS_DOT_STYLE
-{
-    Text [ en-US ] = "Dots ";
-};
-String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
-{
-    Text [ en-US ] = "Circle ";
-};
-String RID_SVXITEMS_EMPHASIS_DISC_STYLE
-{
-// ??? disc == filled ring
-    Text [ en-US ] = "Filled circle ";
-};
-String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
-{
-    Text [ en-US ] = "Accent ";
-};
-String RID_SVXITEMS_EMPHASIS_ABOVE_POS
-{
-    Text [ en-US ] = "Above";
-};
-String RID_SVXITEMS_EMPHASIS_BELOW_POS
-{
-    Text [ en-US ] = "Below";
-};
-String RID_SVXITEMS_TWOLINES_OFF
-{
-    Text [ en-US ] = "Double-lined off";
-};
-String RID_SVXITEMS_TWOLINES
-{
-    Text [ en-US ] = "Double-lined";
-};
-String RID_SVXITEMS_SCRPTSPC_OFF
-{
-    Text [ en-US ] = "No automatic character spacing";
-};
-String RID_SVXITEMS_SCRPTSPC_ON
-{
-    Text [ en-US ] = "No automatic character spacing";
-};
-String RID_SVXITEMS_HNGPNCT_OFF
-{
-    Text [ en-US ] = "No hanging punctuation at line end";
-};
-String RID_SVXITEMS_HNGPNCT_ON
-{
-    Text [ en-US ] = "Hanging punctuation at line end";
-};
-String RID_SVXITEMS_FORBIDDEN_RULE_OFF
-{
-    Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines";
-};
-String RID_SVXITEMS_FORBIDDEN_RULE_ON
-{
-    Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines";
-};
-String RID_SVXITEMS_CHARROTATE_OFF
-{
-    Text [ en-US ] = "No rotated characters";
-};
-String RID_SVXITEMS_CHARROTATE
-{
-    Text [ en-US ] = "Character rotated by $(ARG1)°";
-};
-String RID_SVXITEMS_CHARROTATE_FITLINE
-{
-    Text [ en-US ] = "Fit to line";
-};
-String RID_SVXITEMS_TEXTROTATE_OFF
-{
-    Text [ en-US ] = "Text is not rotated";
-};
-String RID_SVXITEMS_TEXTROTATE
-{
-    Text [ en-US ] = "Text is rotated by $(ARG1)°";
-};
-String RID_SVXITEMS_CHARSCALE
-{
-    Text [ en-US ] = "Characters scaled $(ARG1)%";
-};
-String RID_SVXITEMS_CHARSCALE_OFF
-{
-    Text [ en-US ] = "No scaled characters";
-};
-String RID_SVXITEMS_RELIEF_NONE
-{
-    Text [ en-US ] = "No relief";
-};
-String RID_SVXITEMS_RELIEF_EMBOSSED
-{
-    Text [ en-US ] = "Relief";
-};
-String RID_SVXITEMS_RELIEF_ENGRAVED
-{
-    Text [ en-US ] = "Engraved";
-};
-String RID_SVXITEMS_PARAVERTALIGN_AUTO
-{
-    Text [ en-US ] = "Automatic text alignment";
-};
-String RID_SVXITEMS_PARAVERTALIGN_BASELINE
-{
-    Text [ en-US ] = "Text aligned to base line";
-};
-String RID_SVXITEMS_PARAVERTALIGN_TOP
-{
-    Text [ en-US ] = "Text aligned top";
-};
-String RID_SVXITEMS_PARAVERTALIGN_CENTER
-{
-    Text [ en-US ] = "Text aligned middle";
-};
-String RID_SVXITEMS_PARAVERTALIGN_BOTTOM
-{
-    Text [ en-US ] = "Text aligned bottom";
-};
-String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP
-{
-    Text [ en-US ] = "Text direction left-to-right (horizontal)";
-};
-String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP
-{
-    Text [ en-US ] = "Text direction right-to-left (horizontal)";
-};
-String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
-{
-    Text [ en-US ] = "Text direction right-to-left (vertical)";
-};
-String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
-{
-    Text [ en-US ] = "Text direction left-to-right (vertical)";
-};
-String RID_SVXITEMS_FRMDIR_ENVIRONMENT
-{
-    Text [ en-US ] = "Use superordinate object text direction setting";
-};
-String RID_SVXITEMS_PARASNAPTOGRID_ON
-{
-    Text[ en-US ] = "Paragraph snaps to text grid (if active)";
-};
-String RID_SVXITEMS_PARASNAPTOGRID_OFF
-{
-    Text[ en-US ] = "Paragraph does not snap to text grid";
-};
-String RID_SVXITEMS_CHARHIDDEN_FALSE
-{
-    Text [ en-US ] = "Not hidden";
-};
-String RID_SVXITEMS_CHARHIDDEN_TRUE
-{
-    Text [ en-US ] = "Hidden";
-};
- // enum SvxCellHorJustify ----------------------------------------------------
-String RID_SVXITEMS_HORJUST_STANDARD
-{
-    Text [ en-US ] = "Horizontal alignment default" ;
-};
-String RID_SVXITEMS_HORJUST_LEFT
-{
-    Text [ en-US ] = "Align left" ;
-};
-String RID_SVXITEMS_HORJUST_CENTER
-{
-    Text [ en-US ] = "Centered horizontally" ;
-};
-String RID_SVXITEMS_HORJUST_RIGHT
-{
-    Text [ en-US ] = "Align right" ;
-};
-String RID_SVXITEMS_HORJUST_BLOCK
-{
-    Text [ en-US ] = "Justify" ;
-};
-String RID_SVXITEMS_HORJUST_REPEAT
-{
-    Text [ en-US ] = "Repeat alignment" ;
-};
- // enum SvxCellVerJustify ----------------------------------------------------
-String RID_SVXITEMS_VERJUST_STANDARD
-{
-    Text [ en-US ] = "Vertical alignment default" ;
-};
-String RID_SVXITEMS_VERJUST_TOP
-{
-    Text [ en-US ] = "Align to top" ;
-};
-String RID_SVXITEMS_VERJUST_CENTER
-{
-    Text [ en-US ] = "Centered vertically" ;
-};
-String RID_SVXITEMS_VERJUST_BOTTOM
-{
-    Text [ en-US ] = "Align to bottom" ;
-};
- // enum SvxCellJustifyMethod ----------------------------------------------------
-String RID_SVXITEMS_JUSTMETHOD_AUTO
-{
-    Text [ en-US ] = "Automatic" ;
-};
-String RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE
-{
-    Text [ en-US ] = "Distributed" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index aa1a478e887d..5821900f3902 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -490,17 +490,17 @@ OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
     DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
 
     FontItalic eItalic = (FontItalic)nPos;
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch ( eItalic )
     {
-        case ITALIC_NONE:       nId = RID_SVXITEMS_ITALIC_NONE;     break;
-        case ITALIC_OBLIQUE:    nId = RID_SVXITEMS_ITALIC_OBLIQUE;  break;
-        case ITALIC_NORMAL:     nId = RID_SVXITEMS_ITALIC_NORMAL;   break;
+        case ITALIC_NONE:       pId = RID_SVXITEMS_ITALIC_NONE;     break;
+        case ITALIC_OBLIQUE:    pId = RID_SVXITEMS_ITALIC_OBLIQUE;  break;
+        case ITALIC_NORMAL:     pId = RID_SVXITEMS_ITALIC_NORMAL;   break;
         default: ;//prevent warning
     }
 
-    return nId ? EditResId::GetString(nId) : OUString();
+    return pId ? EditResId(pId) : OUString();
 }
 
 bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -619,7 +619,6 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxWeightItem( (FontWeight)nWeight, Which() );
 }
 
-
 bool SvxWeightItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
@@ -632,11 +631,26 @@ bool SvxWeightItem::GetPresentation
     return true;
 }
 
-
 OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_WEIGHT_BEGIN + nPos);
+    static const char* RID_SVXITEMS_WEIGHTS[] =
+    {
+        RID_SVXITEMS_WEIGHT_DONTKNOW,
+        RID_SVXITEMS_WEIGHT_THIN,
+        RID_SVXITEMS_WEIGHT_ULTRALIGHT,
+        RID_SVXITEMS_WEIGHT_LIGHT,
+        RID_SVXITEMS_WEIGHT_SEMILIGHT,
+        RID_SVXITEMS_WEIGHT_NORMAL,
+        RID_SVXITEMS_WEIGHT_MEDIUM,
+        RID_SVXITEMS_WEIGHT_SEMIBOLD,
+        RID_SVXITEMS_WEIGHT_BOLD,
+        RID_SVXITEMS_WEIGHT_ULTRABOLD,
+        RID_SVXITEMS_WEIGHT_BLACK
+    };
+
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, "must match");
+    assert(nPos <= (sal_uInt16)WEIGHT_BLACK && "enum overflow!" );
+    return EditResId(RID_SVXITEMS_WEIGHTS[nPos]);
 }
 
 bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -999,7 +1013,7 @@ bool SvxFontHeightItem::GetPresentation
     if( MapUnit::MapRelative != ePropUnit )
     {
         rText = OUString::number( (short)nProp ) +
-                " " + EditResId::GetString( GetMetricId( ePropUnit ) );
+                " " + EditResId( GetMetricId( ePropUnit ) );
         if( 0 <= (short)nProp )
             rText = "+" + rText;
     }
@@ -1007,7 +1021,7 @@ bool SvxFontHeightItem::GetPresentation
     {
         rText = GetMetricText( (long)nHeight,
                                 eCoreUnit, MapUnit::MapPoint, pIntl ) +
-                " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint));
+                " " + EditResId(GetMetricId(MapUnit::MapPoint));
     }
     else
         rText = OUString::number( nProp ) + "%";
@@ -1185,7 +1199,7 @@ bool SvxFontWidthItem::GetPresentation
     {
         rText = GetMetricText( (long)nWidth,
                                 eCoreUnit, MapUnit::MapPoint, pIntl ) +
-                " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint));
+                " " + EditResId(GetMetricId(MapUnit::MapPoint));
     }
     else
         rText = OUString::number( nProp ) + "%";
@@ -1363,8 +1377,31 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 
 OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_UL_BEGIN + nPos);
+    static const char* RID_SVXITEMS_UL[] =
+    {
+        RID_SVXITEMS_UL_NONE,
+        RID_SVXITEMS_UL_SINGLE,
+        RID_SVXITEMS_UL_DOUBLE,
+        RID_SVXITEMS_UL_DOTTED,
+        RID_SVXITEMS_UL_DONTKNOW,
+        RID_SVXITEMS_UL_DASH,
+        RID_SVXITEMS_UL_LONGDASH,
+        RID_SVXITEMS_UL_DASHDOT,
+        RID_SVXITEMS_UL_DASHDOTDOT,
+        RID_SVXITEMS_UL_SMALLWAVE,
+        RID_SVXITEMS_UL_WAVE,
+        RID_SVXITEMS_UL_DOUBLEWAVE,
+        RID_SVXITEMS_UL_BOLD,
+        RID_SVXITEMS_UL_BOLDDOTTED,
+        RID_SVXITEMS_UL_BOLDDASH,
+        RID_SVXITEMS_UL_BOLDLONGDASH,
+        RID_SVXITEMS_UL_BOLDDASHDOT,
+        RID_SVXITEMS_UL_BOLDDASHDOTDOT,
+        RID_SVXITEMS_UL_BOLDWAVE
+    };
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, "must match");
+    assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!");
+    return EditResId(RID_SVXITEMS_UL[nPos]);
 }
 
 // class SvxOverlineItem ------------------------------------------------
@@ -1393,8 +1430,31 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 
 OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_OL_BEGIN + nPos);
+    static const char* RID_SVXITEMS_OL[] =
+    {
+        RID_SVXITEMS_OL_NONE,
+        RID_SVXITEMS_OL_SINGLE,
+        RID_SVXITEMS_OL_DOUBLE,
+        RID_SVXITEMS_OL_DOTTED,
+        RID_SVXITEMS_OL_DONTKNOW,
+        RID_SVXITEMS_OL_DASH,
+        RID_SVXITEMS_OL_LONGDASH,
+        RID_SVXITEMS_OL_DASHDOT,
+        RID_SVXITEMS_OL_DASHDOTDOT,
+        RID_SVXITEMS_OL_SMALLWAVE,
+        RID_SVXITEMS_OL_WAVE,
+        RID_SVXITEMS_OL_DOUBLEWAVE,
+        RID_SVXITEMS_OL_BOLD,
+        RID_SVXITEMS_OL_BOLDDOTTED,
+        RID_SVXITEMS_OL_BOLDDASH,
+        RID_SVXITEMS_OL_BOLDLONGDASH,
+        RID_SVXITEMS_OL_BOLDDASHDOT,
+        RID_SVXITEMS_OL_BOLDDASHDOTDOT,
+        RID_SVXITEMS_OL_BOLDWAVE
+    };
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, "must match");
+    assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!");
+    return EditResId(RID_SVXITEMS_OL[nPos]);
 }
 
 // class SvxCrossedOutItem -----------------------------------------------
@@ -1462,11 +1522,21 @@ bool SvxCrossedOutItem::GetPresentation
     return true;
 }
 
-
 OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos);
+    static const char* RID_SVXITEMS_STRIKEOUT[] =
+    {
+        RID_SVXITEMS_STRIKEOUT_NONE,
+        RID_SVXITEMS_STRIKEOUT_SINGLE,
+        RID_SVXITEMS_STRIKEOUT_DOUBLE,
+        RID_SVXITEMS_STRIKEOUT_DONTKNOW,
+        RID_SVXITEMS_STRIKEOUT_BOLD,
+        RID_SVXITEMS_STRIKEOUT_SLASH,
+        RID_SVXITEMS_STRIKEOUT_X
+    };
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, "must match");
+    assert(nPos <= (sal_uInt16)STRIKEOUT_X && "enum overflow!");
+    return EditResId(RID_SVXITEMS_STRIKEOUT[nPos]);
 }
 
 bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1540,11 +1610,11 @@ bool SvxShadowedItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_SHADOWED_FALSE;
+    const char* pId = RID_SVXITEMS_SHADOWED_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_SHADOWED_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_SHADOWED_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1585,11 +1655,11 @@ bool SvxAutoKernItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_AUTOKERN_FALSE;
+    const char* pId = RID_SVXITEMS_AUTOKERN_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_AUTOKERN_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_AUTOKERN_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1631,11 +1701,11 @@ bool SvxWordLineModeItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_WORDLINE_FALSE;
+    const char* pId = RID_SVXITEMS_WORDLINE_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_WORDLINE_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_WORDLINE_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -1676,11 +1746,11 @@ bool SvxContourItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_CONTOUR_FALSE;
+    const char* pId = RID_SVXITEMS_CONTOUR_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_CONTOUR_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_CONTOUR_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -2024,23 +2094,23 @@ bool SvxKerningItem::GetPresentation
     {
         case SfxItemPresentation::Nameless:
             rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) +
-                    " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint));
+                    " " + EditResId(GetMetricId(MapUnit::MapPoint));
             return true;
         case SfxItemPresentation::Complete:
         {
-            rText = EditResId::GetString(RID_SVXITEMS_KERNING_COMPLETE);
-            sal_uInt16 nId = 0;
+            rText = EditResId(RID_SVXITEMS_KERNING_COMPLETE);
+            const char* pId = nullptr;
 
             if ( GetValue() > 0 )
-                nId = RID_SVXITEMS_KERNING_EXPANDED;
+                pId = RID_SVXITEMS_KERNING_EXPANDED;
             else if ( GetValue() < 0 )
-                nId = RID_SVXITEMS_KERNING_CONDENSED;
+                pId = RID_SVXITEMS_KERNING_CONDENSED;
 
-            if ( nId )
-                rText += EditResId::GetString(nId);
+            if (pId)
+                rText += EditResId(pId);
             rText = rText +
                     GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) +
-                    " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint));
+                    " " + EditResId(GetMetricId(MapUnit::MapPoint));
             return true;
         }
         default: ; //prevent warning
@@ -2115,11 +2185,20 @@ bool SvxCaseMapItem::GetPresentation
     return true;
 }
 
-
 OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (sal_uInt16)SvxCaseMap::End, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_CASEMAP_BEGIN + nPos);
+    static const char* RID_SVXITEMS_CASEMAP[] =
+    {
+        RID_SVXITEMS_CASEMAP_NONE,
+        RID_SVXITEMS_CASEMAP_VERSALIEN,
+        RID_SVXITEMS_CASEMAP_GEMEINE,
+        RID_SVXITEMS_CASEMAP_TITEL,
+        RID_SVXITEMS_CASEMAP_KAPITAELCHEN
+    };
+
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == (size_t)SvxCaseMap::End, "must match");
+    assert(nPos < (sal_uInt16)SvxCaseMap::End && "enum overflow!");
+    return EditResId(RID_SVXITEMS_CASEMAP[nPos]);
 }
 
 bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
@@ -2248,20 +2327,26 @@ bool SvxEscapementItem::GetPresentation
     if ( nEsc != 0 )
     {
         if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc )
-            rText += EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_AUTO);
+            rText += EditResId(RID_SVXITEMS_ESCAPEMENT_AUTO);
         else
             rText = rText + OUString::number( nEsc ) + "%";
     }
     return true;
 }
 
-
 OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (sal_uInt16)SvxEscapement::End, "enum overflow!" );
-    return EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
-}
+    static const char* RID_SVXITEMS_ESCAPEMENT[] =
+    {
+        RID_SVXITEMS_ESCAPEMENT_OFF,
+        RID_SVXITEMS_ESCAPEMENT_SUPER,
+        RID_SVXITEMS_ESCAPEMENT_SUB
+    };
 
+    static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == (size_t)SvxEscapement::End, "must match");
+    assert(nPos < (sal_uInt16)SvxEscapement::End && "enum overflow!");
+    return EditResId(RID_SVXITEMS_ESCAPEMENT[nPos]);
+}
 
 sal_uInt16 SvxEscapementItem::GetEnumValue() const
 {
@@ -2559,11 +2644,11 @@ bool SvxBlinkItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = RID_SVXITEMS_BLINK_FALSE;
+    const char* pId = RID_SVXITEMS_BLINK_FALSE;
 
     if ( GetValue() )
-        nId = RID_SVXITEMS_BLINK_TRUE;
-    rText = EditResId::GetString(nId);
+        pId = RID_SVXITEMS_BLINK_TRUE;
+    rText = EditResId(pId);
     return true;
 }
 
@@ -2607,20 +2692,28 @@ bool SvxEmphasisMarkItem::GetPresentation
     const IntlWrapper * /*pIntl*/
 )   const
 {
+    static const char* RID_SVXITEMS_EMPHASIS[] =
+    {
+        RID_SVXITEMS_EMPHASIS_NONE_STYLE,
+        RID_SVXITEMS_EMPHASIS_DOT_STYLE,
+        RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE,
+        RID_SVXITEMS_EMPHASIS_DISC_STYLE,
+        RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
+    };
+
     FontEmphasisMark nVal = GetEmphasisMark();
-    rText = EditResId::GetString( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
-                            (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style ));
-    sal_uInt16 nId = ( FontEmphasisMark::PosAbove & nVal )
+    rText = EditResId(RID_SVXITEMS_EMPHASIS[
+                           (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )]);
+    const char* pId = ( FontEmphasisMark::PosAbove & nVal )
                     ? RID_SVXITEMS_EMPHASIS_ABOVE_POS
                     : ( FontEmphasisMark::PosBelow & nVal )
                         ? RID_SVXITEMS_EMPHASIS_BELOW_POS
-                        : 0;
-    if( nId )
-        rText += EditResId::GetString( nId );
+                        : nullptr;
+    if( pId )
+        rText += EditResId( pId );
     return true;
 }
 
-
 bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
@@ -2793,10 +2886,10 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
                             OUString &rText, const IntlWrapper* /*pIntl*/ ) const
 {
     if( !GetValue() )
-        rText = EditResId::GetString( RID_SVXITEMS_TWOLINES_OFF );
+        rText = EditResId( RID_SVXITEMS_TWOLINES_OFF );
     else
     {
-        rText = EditResId::GetString( RID_SVXITEMS_TWOLINES );
+        rText = EditResId( RID_SVXITEMS_TWOLINES );
         if( GetStartBracket() )
             rText = OUStringLiteral1(GetStartBracket()) + rText;
         if( GetEndBracket() )
@@ -2869,10 +2962,10 @@ bool SvxTextRotateItem::GetPresentation(
     OUString &rText, const IntlWrapper*) const
 {
     if (!GetValue())
-        rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE_OFF);
+        rText = EditResId(RID_SVXITEMS_TEXTROTATE_OFF);
     else
     {
-        rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE);
+        rText = EditResId(RID_SVXITEMS_TEXTROTATE);
         rText = rText.replaceFirst("$(ARG1)",
             OUString::number(GetValue() / 10));
     }
@@ -2974,14 +3067,14 @@ bool SvxCharRotateItem::GetPresentation(
         OUString &rText, const IntlWrapper*  ) const
 {
     if( !GetValue() )
-        rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE_OFF );
+        rText = EditResId( RID_SVXITEMS_CHARROTATE_OFF );
     else
     {
-        rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE );
+        rText = EditResId( RID_SVXITEMS_CHARROTATE );
         rText = rText.replaceFirst( "$(ARG1)",
                     OUString::number( GetValue() / 10 ));
         if( IsFitToLine() )
-            rText += EditResId::GetString( RID_SVXITEMS_CHARROTATE_FITLINE );
+            rText += EditResId( RID_SVXITEMS_CHARROTATE_FITLINE );
     }
     return true;
 }
@@ -3107,10 +3200,10 @@ bool SvxCharScaleWidthItem::GetPresentation(
         OUString &rText, const IntlWrapper*  ) const
 {
     if( !GetValue() )
-        rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE_OFF );
+        rText = EditResId( RID_SVXITEMS_CHARSCALE_OFF );
     else
     {
-        rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE );
+        rText = EditResId( RID_SVXITEMS_CHARSCALE );
         rText = rText.replaceFirst( "$(ARG1)",
                     OUString::number( GetValue() ));
     }
@@ -3174,16 +3267,22 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
 
-OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
+static const char* RID_SVXITEMS_RELIEF[] =
+{
+    RID_SVXITEMS_RELIEF_NONE,
+    RID_SVXITEMS_RELIEF_EMBOSSED,
+    RID_SVXITEMS_RELIEF_ENGRAVED
+};
+
+OUString SvxCharReliefItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
-    DBG_ASSERT( nPos < RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
-                    "enum overflow" );
-    return EditResId::GetString(RID_SVXITEMS_RELIEF_BEGIN + nPos);
+    assert(nPos < SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) && "enum overflow");
+    return EditResId(RID_SVXITEMS_RELIEF[nPos]);
 }
 
 sal_uInt16 SvxCharReliefItem::GetValueCount() const
 {
-    return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE;
+    return SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) - 1;
 }
 
 bool SvxCharReliefItem::GetPresentation
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 57347f9dece7..fbac64aaba46 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -18,8 +18,10 @@
  */
 
 #include <editeng/writingmodeitem.hxx>
+#include <editeng/frmdir.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
@@ -69,7 +71,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/,
         OUString &rText,
         const IntlWrapper *  ) const
 {
-    rText = EditResId::GetString(RID_SVXITEMS_FRMDIR_BEGIN + (int)GetValue());
+    rText = EditResId(getFrmDirResId((int)GetValue()));
     return true;
 }
 
diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src
deleted file mode 100644
index f21f75f0dd66..000000000000
--- a/editeng/source/misc/lingu.src
+++ /dev/null
@@ -1,43 +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 <editeng/editrids.hrc>
-
-String RID_SVXSTR_QUERY_CONTINUE
-{
-    Text [ en-US ] = "Continue checking at beginning of document?" ;
-};
-String RID_SVXSTR_QUERY_BW_CONTINUE
-{
-    Text [ en-US ] = "Continue checking at end of document?" ;
-};
-String RID_SVXSTR_DIC_ERR_UNKNOWN
-{
-    Text [ en-US ] = "Word cannot be added to dictionary\ndue to unknown reason.";
-};
-String RID_SVXSTR_DIC_ERR_FULL
-{
-    Text [ en-US ] = "The dictionary is already full.";
-};
-String RID_SVXSTR_DIC_ERR_READONLY
-{
-    Text [ en-US ] = "The dictionary is read-only.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index ca006a885549..a4db40002037 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -362,8 +362,8 @@ bool SvxSpellWrapper::SpellNext( )
         // a BODY_area done, ask for the other BODY_area
         WAIT_OFF();
 
-        sal_uInt16 nResId = bReverse ? RID_SVXSTR_QUERY_BW_CONTINUE : RID_SVXSTR_QUERY_CONTINUE;
-        ScopedVclPtrInstance< MessageDialog > aBox(pWin, EditResId(nResId), VclMessageType::Question, VclButtonsType::YesNo);
+        const char* pResId = bReverse ? RID_SVXSTR_QUERY_BW_CONTINUE : RID_SVXSTR_QUERY_CONTINUE;
+        ScopedVclPtrInstance< MessageDialog > aBox(pWin, EditResId(pResId), VclMessageType::Question, VclButtonsType::YesNo);
         if ( aBox->Execute() != RET_YES )
         {
             // sacrifice the other area if necessary ask for special area
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index e21de08007d1..7cf530d78aed 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -732,16 +732,16 @@ short SvxDicError( vcl::Window *pParent, linguistic::DictionaryError nError )
     short nRes = 0;
     if (linguistic::DictionaryError::NONE != nError)
     {
-        int nRid;
+        const char* pRid;
         switch (nError)
         {
-            case linguistic::DictionaryError::FULL     : nRid = RID_SVXSTR_DIC_ERR_FULL;  break;
-            case linguistic::DictionaryError::READONLY : nRid = RID_SVXSTR_DIC_ERR_READONLY;  break;
+            case linguistic::DictionaryError::FULL     : pRid = RID_SVXSTR_DIC_ERR_FULL;  break;
+            case linguistic::DictionaryError::READONLY : pRid = RID_SVXSTR_DIC_ERR_READONLY;  break;
             default:
-                nRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
+                pRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
                 SAL_WARN("editeng", "unexpected case");
         }
-        nRes = ScopedVclPtrInstance<InfoBox>(pParent, EditResId::GetString(nRid))->Execute();
+        nRes = ScopedVclPtrInstance<InfoBox>(pParent, EditResId(pRid))->Execute();
     }
     return nRes;
 }
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index f9333e0c6857..185bef339690 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -127,19 +127,19 @@ OUString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
     switch( nUndoId )
     {
         case OLUNDO_DEPTH:
-            return EditResId::GetString(RID_OUTLUNDO_DEPTH);
+            return EditResId(RID_OUTLUNDO_DEPTH);
 
         case OLUNDO_EXPAND:
-            return EditResId::GetString(RID_OUTLUNDO_EXPAND);
+            return EditResId(RID_OUTLUNDO_EXPAND);
 
         case OLUNDO_COLLAPSE:
-            return EditResId::GetString(RID_OUTLUNDO_COLLAPSE);
+            return EditResId(RID_OUTLUNDO_COLLAPSE);
 
         case OLUNDO_ATTR:
-            return EditResId::GetString(RID_OUTLUNDO_ATTR);
+            return EditResId(RID_OUTLUNDO_ATTR);
 
         case OLUNDO_INSERT:
-            return EditResId::GetString(RID_OUTLUNDO_INSERT);
+            return EditResId(RID_OUTLUNDO_INSERT);
 
         default:
             return EditEngine::GetUndoComment( nUndoId );
diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src
deleted file mode 100644
index b01b3828c230..000000000000
--- a/editeng/source/outliner/outliner.src
+++ /dev/null
@@ -1,43 +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 <editeng/editrids.hrc>
-
-String RID_OUTLUNDO_DEPTH
-{
-    Text [ en-US ] = "Indent" ;
-};
-String RID_OUTLUNDO_EXPAND
-{
-    Text [ en-US ] = "Show subpoints" ;
-};
-String RID_OUTLUNDO_COLLAPSE
-{
-    Text [ en-US ] = "Collapse" ;
-};
-String RID_OUTLUNDO_ATTR
-{
-    Text [ en-US ] = "Apply attributes" ;
-};
-String RID_OUTLUNDO_INSERT
-{
-    Text [ en-US ] = "Insert" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/uiconfig/ui/spellmenu.ui b/editeng/uiconfig/ui/spellmenu.ui
index 365de28b512f..07e964f42523 100644
--- a/editeng/uiconfig/ui/spellmenu.ui
+++ b/editeng/uiconfig/ui/spellmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="editeng">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,14 +9,14 @@
       <object class="GtkMenuItem" id="ignore">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">I_gnore All</property>
+        <property name="label" translatable="yes" context="spellmenu|ignore">I_gnore All</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="insert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add to Dictionary</property>
+        <property name="label" translatable="yes" context="spellmenu|insert">_Add to Dictionary</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -30,7 +30,7 @@
       <object class="GtkMenuItem" id="add">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add to Dictionary</property>
+        <property name="label" translatable="yes" context="spellmenu|add">_Add to Dictionary</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -38,7 +38,7 @@
       <object class="GtkMenuItem" id="check">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Spellcheck...</property>
+        <property name="label" translatable="yes" context="spellmenu|check">_Spellcheck...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -52,7 +52,7 @@
       <object class="GtkMenuItem" id="autocorrect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">AutoCorrect _To</property>
+        <property name="label" translatable="yes" context="spellmenu|autocorrect">AutoCorrect _To</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -66,7 +66,7 @@
       <object class="GtkMenuItem" id="autocorrectdlg">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Auto_Correct Options...</property>
+        <property name="label" translatable="yes" context="spellmenu|autocorrectdlg">Auto_Correct Options...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index f85414f7c43b..751c7c0fff5a 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -68,7 +68,7 @@
 #include <svtools/embedhlp.hxx>
 #include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
-#include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -972,8 +972,8 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
             if( xModelTitle.is() )
             {
                 LanguageTag aLocale( Application::GetSettings().GetUILanguageTag() );
-                ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "sfx", aLocale );
-                OUString sEmbedded = ResId( STR_EMBEDDED_TITLE, *pResMgr );
+                std::locale aResLoc = Translate::Create("sfx", aLocale);
+                OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc);
                 xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded);
                 m_aContainerName = m_pEmbedObj->getContainerName();
                 // TODO: get real m_aDocumentNamePart
diff --git a/extensions/AllLangMoTarget_pcr.mk b/extensions/AllLangMoTarget_pcr.mk
new file mode 100644
index 000000000000..d826748f7d65
--- /dev/null
+++ b/extensions/AllLangMoTarget_pcr.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,pcr))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,pcr,extensions))
+
+# 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/desktop/source/app/desktopresid.hxx b/extensions/inc/command.hrc
index 43114219f626..be373257e202 100644
--- a/desktop/source/app/desktopresid.hxx
+++ b/extensions/inc/command.hrc
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
-#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
+#ifndef INCLUDED_EXTENSIONS_INC_COMMAND_HRC
+#define INCLUDED_EXTENSIONS_INC_COMMAND_HRC
 
-#include <tools/resid.hxx>
+#define NC_(Context, String) (Context "\004" u8##String)
 
-namespace desktop
-{
+namespace {
 
-class DesktopResId : public ResId
+const char* RID_RSC_ENUM_COMMAND_TYPE[] =
 {
-    public:
-        explicit DesktopResId( sal_uInt16 nId );
+    NC_("RID_RSC_ENUM_COMMAND_TYPE", "Table"),
+    NC_("RID_RSC_ENUM_COMMAND_TYPE", "Query"),
+    NC_("RID_RSC_ENUM_COMMAND_TYPE", "SQL command")
 };
 
 }
 
-#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/inc/sdbt_services.hxx b/extensions/inc/showhide.hrc
index a6491e2f5cfc..6081f7d5c39a 100644
--- a/dbaccess/source/sdbtools/inc/sdbt_services.hxx
+++ b/extensions/inc/showhide.hrc
@@ -17,14 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX
-#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX
+#ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
+#define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
 
-#include <sal/config.h>
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#include <sal/types.h>
+namespace {
 
-extern "C" void SAL_CALL createRegistryInfo_ConnectionTools();
+const char* RID_RSC_ENUM_SHOWHIDE[] =
+{
+    NC_("RID_RSC_ENUM_SHOWHIDE", "Hide"),
+    NC_("RID_RSC_ENUM_SHOWHIDE", "Show")
+};
+
+}
 
 #endif
 
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/sw/source/uibase/inc/dialmgr.hxx b/extensions/inc/yesno.hrc
index 91695bdeb4a7..8c6df7b537ae 100644
--- a/sw/source/uibase/inc/dialmgr.hxx
+++ b/extensions/inc/yesno.hrc
@@ -16,16 +16,22 @@
  *   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_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
 
-#include <tools/resid.hxx>
+#ifndef INCLUDED_EXTENSIONS_INC_YESNO_HRC
+#define INCLUDED_EXTENSIONS_INC_YESNO_HRC
 
-struct SwDialogsResMgr
+#define NC_(Context, String) (Context "\004" u8##String)
+
+namespace {
+
+const char* RID_RSC_ENUM_YESNO[] =
 {
-    static ResMgr*      GetResMgr();
+    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/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
deleted file mode 100644
index 723e972684c6..000000000000
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ /dev/null
@@ -1,42 +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_OPTION_DB_FIELD_TITLE
-{
-    Text [ en-US ] = "Database Field";
-};
-
-String RID_STR_TYPE_TABLE
-{
-    Text [ en-US ] = "Table";
-};
-
-String RID_STR_TYPE_QUERY
-{
-    Text [ en-US ] = "Query";
-};
-
-String RID_STR_TYPE_COMMAND
-{
-    Text [ en-US ] = "SQL command";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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/gridpages.src b/extensions/source/dbpilots/gridpages.src
deleted file mode 100644
index bdcb8004c0af..000000000000
--- a/extensions/source/dbpilots/gridpages.src
+++ /dev/null
@@ -1,32 +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_DATEPOSTFIX
-{
-    Text [ en-US ] = " (Date)";
-};
-
-String RID_STR_TIMEPOSTFIX
-{
-    Text [ en-US ] = " (Time)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src
deleted file mode 100644
index 4584a8272703..000000000000
--- a/extensions/source/propctrlr/formlinkdialog.src
+++ /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/.
- *
- * 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"
-#include "propctrlr.hrc"
-
-String STR_DETAIL_FORM
-{
-    Text [ en-US ] = "Sub Form";
-};
-
-String STR_MASTER_FORM
-{
-    Text [ en-US ] = "Master Form";
-};
-
-String STR_ERROR_RETRIEVING_COLUMNS
-{
-    Text [ en-US ] = "The columns of '#' could not be retrieved.";
-    Text [ x-comment ] ="# will be replace with a name.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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.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">-&gt;</property>
+                            <property name="label" translatable="yes" context="gridfieldsselectionpage|fieldright">-&gt;</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">=&gt;&gt;</property>
+                            <property name="label" translatable="yes" context="gridfieldsselectionpage|allfieldsright">=&gt;&gt;</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">&lt;-</property>
+                            <property name="label" translatable="yes" context="gridfieldsselectionpage|fieldleft">&lt;-</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">&lt;&lt;=</property>
+                            <property name="label" translatable="yes" context="gridfieldsselectionpage|allfieldsleft">&lt;&lt;=</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">_&gt;&gt;</property>
+                        <property name="label" translatable="yes" context="groupradioselectionpage|toright">_&gt;&gt;</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">_&lt;&lt;</property>
+                        <property name="label" translatable="yes" context="groupradioselectionpage|toleft">_&lt;&lt;</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>
diff --git a/filter/AllLangMoTarget_flt.mk b/filter/AllLangMoTarget_flt.mk
new file mode 100644
index 000000000000..3c491bc95728
--- /dev/null
+++ b/filter/AllLangMoTarget_flt.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,flt))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,flt,filter))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_eps.mk b/filter/AllLangResTarget_eps.mk
deleted file mode 100644
index ea1d21a0a6e4..000000000000
--- a/filter/AllLangResTarget_eps.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,eps))
-
-$(eval $(call gb_AllLangResTarget_add_srs,eps,\
-	filter/eps \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,filter/eps))
-
-$(eval $(call gb_SrsTarget_add_files,filter/eps,\
-	filter/source/graphicfilter/eps/epsstr.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk
deleted file mode 100644
index fddc6ff8323d..000000000000
--- a/filter/AllLangResTarget_pdffilter.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,pdffilter))
-
-# this is ugly; why is it necessary to set this manually?
-$(eval $(call gb_AllLangResTarget_set_reslocation,pdffilter,res))
-
-$(eval $(call gb_AllLangResTarget_add_srs,pdffilter,\
-	filter/pdffilter \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter))
-
-$(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/filter/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,filter/pdffilter,\
-	filter/source/pdf/impdialog.src \
-	filter/source/pdf/pdf.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_t602filter.mk b/filter/AllLangResTarget_t602filter.mk
deleted file mode 100644
index 43cf03db6ffd..000000000000
--- a/filter/AllLangResTarget_t602filter.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,t602filter))
-
-$(eval $(call gb_AllLangResTarget_add_srs,t602filter,\
-	filter/t602filter \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,filter/t602filter))
-
-$(eval $(call gb_SrsTarget_add_files,filter/t602filter,\
-	filter/source/t602/t602filter.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk
deleted file mode 100644
index 34262e21926e..000000000000
--- a/filter/AllLangResTarget_xsltdlg.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,xsltdlg))
-
-$(eval $(call gb_AllLangResTarget_add_srs,xsltdlg,\
-	filter/xsltdlg \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg))
-
-$(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/filter/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\
-	filter/source/xsltdialog/xmlfilterdialogstrings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index 167f6c758b34..d1513b25aed6 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -19,6 +19,11 @@
 
 $(eval $(call gb_Library_Library,gie))
 
+$(eval $(call gb_Library_set_include,gie,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/filter/inc \
+))
+
 $(eval $(call gb_Library_use_external,gie,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,gie))
diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk
index 60b20eb2491d..e0e60357cb13 100644
--- a/filter/Library_graphicfilter.mk
+++ b/filter/Library_graphicfilter.mk
@@ -26,8 +26,8 @@ $(eval $(call gb_Library_use_external,graphicfilter,boost_headers))
 $(eval $(call gb_Library_use_sdk_api,graphicfilter))
 
 $(eval $(call gb_Library_set_include,graphicfilter,\
-	-I$(SRCDIR)/filter/inc \
 	$$(INCLUDE) \
+	-I$(SRCDIR)/filter/inc \
 ))
 
 $(eval $(call gb_Library_use_libraries,graphicfilter,\
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index 1b2d3ed6fa89..82b616434e47 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -19,6 +19,11 @@
 
 $(eval $(call gb_Library_Library,t602filter))
 
+$(eval $(call gb_Library_set_include,t602filter,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/filter/inc \
+))
+
 $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter))
 
 $(eval $(call gb_Library_use_external,t602filter,boost_headers))
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 45cd54501c03..a7834b6dc631 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -40,14 +40,11 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Package_docbook \
 	Package_xhtml \
 	Package_xslt \
+	UIConfig_filter \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,filter,\
-	AllLangResTarget_eps \
-	AllLangResTarget_pdffilter \
-	AllLangResTarget_t602filter \
-	AllLangResTarget_xsltdlg \
-	UIConfig_filter \
+	AllLangMoTarget_flt \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/filter/inc/strings.hrc b/filter/inc/strings.hrc
new file mode 100644
index 000000000000..279fee3eedbf
--- /dev/null
+++ b/filter/inc/strings.hrc
@@ -0,0 +1,83 @@
+/* -*- 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_FILTER_INC_STRINGS_HRC
+#define INCLUDED_FILTER_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_COLUMN_HEADER_NAME                  NC_("STR_COLUMN_HEADER_NAME", "Name")
+#define STR_COLUMN_HEADER_TYPE                  NC_("STR_COLUMN_HEADER_TYPE", "Type")
+#define STR_UNKNOWN_APPLICATION                 NC_("STR_UNKNOWN_APPLICATION", "Unknown")
+#define STR_IMPORT_ONLY                         NC_("STR_IMPORT_ONLY", "import filter")
+#define STR_IMPORT_EXPORT                       NC_("STR_IMPORT_EXPORT", "import/export filter")
+#define STR_EXPORT_ONLY                         NC_("STR_EXPORT_ONLY", "export filter")
+#define STR_WARN_DELETE                         NC_("STR_WARN_DELETE", "Do you really want to delete the XML Filter '%s'? This action cannot be undone.")
+#define STR_ERROR_FILTER_NAME_EXISTS            NC_("STR_ERROR_FILTER_NAME_EXISTS", "An XML filter with the name '%s' already exists. Please enter a different name.")
+#define STR_ERROR_TYPE_NAME_EXISTS              NC_("STR_ERROR_TYPE_NAME_EXISTS", "The name for the user interface '%s1' is already used by the XML filter '%s2'. Please enter a different name.")
+#define STR_ERROR_EXPORT_XSLT_NOT_FOUND         NC_("STR_ERROR_EXPORT_XSLT_NOT_FOUND", "The XSLT for export cannot be found. Please enter a valid path.")
+#define STR_ERROR_IMPORT_XSLT_NOT_FOUND         NC_("STR_ERROR_IMPORT_XSLT_NOT_FOUND", "The XSLT for import cannot be found. Please enter a valid path.")
+#define STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND     NC_("STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND", "The given import template cannot be found. Please enter a valid path.")
+#define STR_DEFAULT_FILTER_NAME                 NC_("STR_DEFAULT_FILTER_NAME", "New Filter")
+#define STR_DEFAULT_UI_NAME                     NC_("STR_DEFAULT_UI_NAME", "Untitled")
+#define STR_UNDEFINED_FILTER                    NC_("STR_UNDEFINED_FILTER", "undefined filter")
+#define STR_FILTER_HAS_BEEN_SAVED               NC_("STR_FILTER_HAS_BEEN_SAVED", "The XML filter '%s' has been saved as package '%s'. ")
+#define STR_FILTERS_HAVE_BEEN_SAVED             NC_("STR_FILTERS_HAVE_BEEN_SAVED", "%s XML filters have been saved in the package '%s'.")
+#define STR_FILTER_PACKAGE                      NC_("STR_FILTER_PACKAGE", "XSLT filter package")
+#define STR_FILTER_INSTALLED                    NC_("STR_FILTER_INSTALLED", "The XML filter '%s' has been installed successfully.")
+#define STR_FILTERS_INSTALLED                   NC_("STR_FILTERS_INSTALLED", "%s XML filters have been installed successfully.")
+#define STR_NO_FILTERS_FOUND                    NC_("STR_NO_FILTERS_FOUND", "No XML filter could be installed because the package '%s' does not contain any XML filters.")
+#define STR_XML_FILTER_LISTBOX                  NC_("STR_XML_FILTER_LISTBOX", "XML Filter List")
+
+#define T602FILTER_STR_IMPORT_DIALOG_TITLE      NC_("T602FILTER_STR_IMPORT_DIALOG_TITLE", "Settings for T602 import")
+#define T602FILTER_STR_ENCODING_LABEL           NC_("T602FILTER_STR_ENCODING_LABEL", "Encoding")
+#define T602FILTER_STR_ENCODING_AUTO            NC_("T602FILTER_STR_ENCODING_AUTO", "Automatic")
+#define T602FILTER_STR_ENCODING_CP852           NC_("T602FILTER_STR_ENCODING_CP852", "CP852 (Latin2)")
+#define T602FILTER_STR_ENCODING_CP895           NC_("T602FILTER_STR_ENCODING_CP895", "CP895 (KEYB2CS, Kamenicky)")
+#define T602FILTER_STR_ENCODING_KOI8CS2         NC_("T602FILTER_STR_ENCODING_KOI8CS2", "KOI8 CS2")
+#define T602FILTER_STR_CYRILLIC_MODE            NC_("T602FILTER_STR_CYRILLIC_MODE", "Mode for Russian language (Cyrillic)")
+#define T602FILTER_STR_REFORMAT_TEXT            NC_("T602FILTER_STR_REFORMAT_TEXT", "Reformat the text")
+#define T602FILTER_STR_DOT_COMMANDS             NC_("T602FILTER_STR_DOT_COMMANDS", "Display dot commands")
+#define T602FILTER_STR_CANCEL_BUTTON            NC_("T602FILTER_STR_CANCEL_BUTTON", "Cancel")
+#define T602FILTER_STR_OK_BUTTON                NC_("T602FILTER_STR_OK_BUTTON", "OK")
+
+#define KEY_VERSION_CHECK                       NC_("KEY_VERSION_CHECK", "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!")
+
+#define PDF_PROGRESS_BAR                        NC_("PDF_PROGRESS_BAR", "Export as PDF")
+
+//strings used in encryption UI
+//password dialog title
+#define STR_PDF_EXPORT_UDPWD                    NC_("STR_PDF_EXPORT_UDPWD", "Set open password")
+//password dialog title
+#define STR_PDF_EXPORT_ODPWD                    NC_("STR_PDF_EXPORT_ODPWD", "Set permission password")
+#define STR_WARN_PASSWORD_PDFA                  NC_("STR_WARN_PASSWORD_PDFA", "PDF/A does not allow encryption. The exported PDF file will not be password protected.")
+#define STR_WARN_TRANSP_PDFA_SHORT              NC_("STR_WARN_TRANSP_PDFA_SHORT", "PDF/A transparency")
+#define STR_WARN_TRANSP_PDFA                    NC_("STR_WARN_TRANSP_PDFA", "PDF/A forbids transparency. A transparent object was painted opaque instead.")
+#define STR_WARN_TRANSP_VERSION_SHORT           NC_("STR_WARN_TRANSP_VERSION_SHORT", "PDF version conflict")
+#define STR_WARN_TRANSP_VERSION                 NC_("STR_WARN_TRANSP_VERSION", "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead")
+#define STR_WARN_FORMACTION_PDFA_SHORT          NC_("STR_WARN_FORMACTION_PDFA_SHORT", "PDF/A form action")
+#define STR_WARN_FORMACTION_PDFA                NC_("STR_WARN_FORMACTION_PDFA", "A form control contained an action not supported by the PDF/A standard. The action was skipped")
+#define STR_WARN_TRANSP_CONVERTED               NC_("STR_WARN_TRANSP_CONVERTED", "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting.")
+#define STR_WARN_TRANSP_CONVERTED_SHORT         NC_("STR_WARN_TRANSP_CONVERTED_SHORT", "Transparencies removed")
+#define STR_ERR_SIGNATURE_FAILED                NC_("STR_ERR_SIGNATURE_FAILED", "Signature generation failed")
+#define STR_ERR_PDF_EXPORT_ABORTED              NC_("STR_ERR_PDF_EXPORT_ABORTED", "PDF export aborted")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/inc/strings.hxx b/filter/inc/strings.hxx
index 3a25ef921b31..c405e61121ab 100644
--- a/filter/inc/strings.hxx
+++ b/filter/inc/strings.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_FILTER_INC_STRINGS_HRC
-#define INCLUDED_FILTER_INC_STRINGS_HRC
+#ifndef INCLUDED_FILTER_INC_STRINGS_HXX
+#define INCLUDED_FILTER_INC_STRINGS_HXX
 
 #define STR_APPL_NAME_WRITER        "%PRODUCTNAME Writer (.sxw)"
 #define STR_APPL_NAME_CALC          "%PRODUCTNAME Calc (.sxc)"
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index adf3a349f715..5dfe84de0d13 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -31,7 +31,6 @@
 #include <vcl/FilterConfigItem.hxx>
 
 
-class ResMgr;
 namespace vcl { class Window; }
 
 
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index c659b51750cd..e75d8ba08a87 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -27,7 +27,6 @@
 
 
 namespace vcl { class Window; }
-class ResMgr;
 
 
 class SWFDialog final:
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index a8bfd98c4410..f84093afa558 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -21,6 +21,7 @@
 #include <tools/stream.hxx>
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graph.hxx>
@@ -436,14 +437,9 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
 
     if ( mbStatus && mnLevelWarning && pFilterConfigItem )
     {
-        ResMgr* pResMgr;
-        pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() );
-        if( pResMgr )
-        {
-            ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, ResId(KEY_VERSION_CHECK, *pResMgr) );
-            aInfoBox->Execute();
-            delete pResMgr;
-        }
+        std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag());
+        ScopedVclPtrInstance< InfoBox > aInfoBox(nullptr, Translate::get(KEY_VERSION_CHECK, loc));
+        aInfoBox->Execute();
     }
 
     if ( xStatusIndicator.is() )
diff --git a/filter/source/graphicfilter/eps/epsstr.src b/filter/source/graphicfilter/eps/epsstr.src
deleted file mode 100644
index 2a1139514450..000000000000
--- a/filter/source/graphicfilter/eps/epsstr.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 "strings.hrc"
-
-String KEY_VERSION_CHECK
-{
-    Text [ en-US ] = "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/eps/strings.hrc b/filter/source/graphicfilter/eps/strings.hrc
deleted file mode 100644
index 531cc7d7c4cb..000000000000
--- a/filter/source/graphicfilter/eps/strings.hrc
+++ /dev/null
@@ -1,22 +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 KEY_VERSION_CHECK               260
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e509e43e867a..56e3370158e0 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "impdialog.hxx"
-#include "impdialog.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include <officecfg/Office/Common.hxx>
 #include <vcl/layout.hxx>
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include "sfx2/passwd.hxx"
 #include "svtools/miscopt.hxx"
+#include "tools/resmgr.hxx"
 
 #include "comphelper/propertyvalue.hxx"
 #include "comphelper/sequence.hxx"
@@ -41,17 +42,17 @@
 #include "com/sun/star/security/DocumentDigitalSignatures.hpp"
 #include "com/sun/star/security/XCertificate.hpp"
 
-static ResMgr& getPDFFilterResMgr()
+static std::locale& getPDFFilterResLocale()
 {
-    static ResMgr *pRes = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag());
-    return *pRes;
+    static std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag());
+    return loc;
 }
 
-PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMgr() )
+OUString PDFFilterResId(const char* pId)
 {
+    return Translate::get(pId, getPDFFilterResLocale());
 }
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -1613,35 +1614,35 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE
         {
         case vcl::PDFWriter::Warning_Transparency_Omitted_PDFA:
         {
-            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ),
                                                 aWarnImg );
             m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_Transparency_Omitted_PDF13:
         {
-            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ),
                                                 aWarnImg );
             m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_FormAction_Omitted_PDFA:
         {
-            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ),
                                                 aWarnImg );
             m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_Transparency_Converted:
         {
-            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ),
                                                 aWarnImg );
             m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED ) ) );
         }
         break;
         case vcl::PDFWriter::Error_Signature_Failed:
         {
-            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_ERR_SIGNATURE_FAILED ),
                                                 aErrImg );
             m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_ERR_PDF_EXPORT_ABORTED ) ) );
         }
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
deleted file mode 100644
index cd9f7772cb8b..000000000000
--- a/filter/source/pdf/impdialog.hrc
+++ /dev/null
@@ -1,45 +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 <filter.hrc>
-
-#define STR_ERR_SIGNATURE_FAILED        (RID_PDF_DIALOG_START + 0)
-#define STR_ERR_PDF_EXPORT_ABORTED      (RID_PDF_DIALOG_START + 1)
-
-#define STR_WARN_PASSWORD_PDFA          (RID_PDF_DIALOG_START + 6)
-
-//strings for PDF security, user password management
-#define STR_PDF_EXPORT_UDPWD            (RID_PDF_DIALOG_START + 7)
-
-//strings for PDF security, owner password management
-#define STR_PDF_EXPORT_ODPWD            (RID_PDF_DIALOG_START + 8)
-
-#define STR_WARN_TRANSP_PDFA            (RID_PDF_DIALOG_START + 9)
-#define STR_WARN_TRANSP_PDFA_SHORT      (RID_PDF_DIALOG_START + 10)
-#define STR_WARN_TRANSP_VERSION         (RID_PDF_DIALOG_START + 11)
-#define STR_WARN_TRANSP_VERSION_SHORT   (RID_PDF_DIALOG_START + 12)
-#define STR_WARN_FORMACTION_PDFA        (RID_PDF_DIALOG_START + 13)
-#define STR_WARN_FORMACTION_PDFA_SHORT  (RID_PDF_DIALOG_START + 14)
-#define STR_WARN_TRANSP_CONVERTED       (RID_PDF_DIALOG_START + 15)
-#define STR_WARN_TRANSP_CONVERTED_SHORT (RID_PDF_DIALOG_START + 16)
-
-//ATTENTION: maximum allowed value is   (RID_PDF_DIALOG_START + 19)
-//(see filter/inc/filter.hrc)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 2def0c7ffd83..526fa0cdf96f 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -38,20 +38,11 @@
 
 #include <com/sun/star/beans/NamedValue.hpp>
 
-
 class ImpPDFTabGeneralPage;
 class ImpPDFTabViewerPage;
 class ImpPDFTabOpnFtrPage;
 class ImpPDFTabLinksPage;
 
-
-class PDFFilterResId : public ResId
-{
-public:
-    explicit                    PDFFilterResId( sal_uInt32 nId );
-};
-
-
 class ImplErrorDialog : public MessageDialog
 {
 private:
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
deleted file mode 100644
index cb5b68a61ae8..000000000000
--- a/filter/source/pdf/impdialog.src
+++ /dev/null
@@ -1,91 +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 "impdialog.hrc"
-
-//strings used in encryption UI
-
-//password dialog title
-String STR_PDF_EXPORT_UDPWD
-{
-    Text[ en-US ] = "Set open password";
-};
-
-//password dialog title
-String STR_PDF_EXPORT_ODPWD
-{
-    Text[ en-US ] = "Set permission password";
-};
-
-String STR_WARN_PASSWORD_PDFA
-{
-    Text [ en-US ] = "PDF/A does not allow encryption. The exported PDF file will not be password protected.";
-};
-
-String STR_WARN_TRANSP_PDFA_SHORT
-{
-    Text [en-US] = "PDF/A transparency";
-};
-
-String STR_WARN_TRANSP_PDFA
-{
-    Text [en-US] = "PDF/A forbids transparency. A transparent object was painted opaque instead.";
-};
-
-String STR_WARN_TRANSP_VERSION_SHORT
-{
-    Text [en-US] = "PDF version conflict";
-};
-
-String STR_WARN_TRANSP_VERSION
-{
-    Text [en-US] = "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead";
-};
-
-String STR_WARN_FORMACTION_PDFA_SHORT
-{
-    Text [en-US] = "PDF/A form action";
-};
-
-String STR_WARN_FORMACTION_PDFA
-{
-    Text [en-US] = "A form control contained an action not supported by the PDF/A standard. The action was skipped";
-};
-
-String STR_WARN_TRANSP_CONVERTED
-{
-    Text [en-US] = "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting.";
-};
-
-String STR_WARN_TRANSP_CONVERTED_SHORT
-{
-    Text [en-US] = "Transparencies removed";
-};
-
-String STR_ERR_SIGNATURE_FAILED
-{
-    Text [en-US] = "Signature generation failed";
-};
-
-String STR_ERR_PDF_EXPORT_ABORTED
-{
-    Text [en-US] = "PDF export aborted";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdf.hrc b/filter/source/pdf/pdf.hrc
deleted file mode 100644
index 64b4dab38afc..000000000000
--- a/filter/source/pdf/pdf.hrc
+++ /dev/null
@@ -1,22 +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 PDF_PROGRESS_BAR    260
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdf.src b/filter/source/pdf/pdf.src
deleted file mode 100644
index bf491d31856c..000000000000
--- a/filter/source/pdf/pdf.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 "pdf.hrc"
-
-String PDF_PROGRESS_BAR
-{
-    Text [ en-US ] = "Export as PDF";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 1d24b3e0bf5e..d260e0308d59 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -22,6 +22,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/fract.hxx>
 #include <tools/poly.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/metaact.hxx>
@@ -50,7 +51,7 @@
 
 #include "pdfexport.hxx"
 #include "impdialog.hxx"
-#include "pdf.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -883,14 +884,11 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
 
                 if ( mxStatusIndicator.is() )
                 {
-                    std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() ));
-                    if ( pResMgr )
-                    {
-                        sal_Int32 nTotalPageCount = aRangeEnum.size();
-                        if ( bExportPages && bExportNotesPages )
-                            nTotalPageCount *= 2;
-                        mxStatusIndicator->start( ResId( PDF_PROGRESS_BAR, *pResMgr ), nTotalPageCount );
-                    }
+                    std::locale loc(Translate::Create("flt", Application::GetSettings().GetUILanguageTag()));
+                    sal_Int32 nTotalPageCount = aRangeEnum.size();
+                    if ( bExportPages && bExportNotesPages )
+                        nTotalPageCount *= 2;
+                    mxStatusIndicator->start(Translate::get(PDF_PROGRESS_BAR, loc), nTotalPageCount);
                 }
 
                 bRet = nPageCount > 0;
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index 205a3417e118..0e31fc33bef1 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -37,7 +37,6 @@
 #define SVG_PROP_POSITIONED_CHARACTERS      "UsePositionedCharacters"
 
 
-class ResMgr;
 namespace vcl { class Window; }
 
 
@@ -61,7 +60,7 @@ private:
 
 public:
 
-    ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/
+    ImpSVGDialog( vcl::Window* pParent,
                   css::uno::Sequence< css::beans::PropertyValue >& rFilterData );
     virtual ~ImpSVGDialog() override;
     virtual void dispose() override;
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 812e6efa9a5f..92d3d0432938 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -28,8 +28,6 @@
 #include <memory>
 
 
-class ResMgr;
-
 class SVGDialog final:
     public ::svt::OGenericUnoDialog,
     public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >,
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index b5cebf5ec5fd..ea20785d4995 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "t602filter.hxx"
-#include "t602filter.hrc"
+#include "strings.hrc"
 
 #include <stdio.h>
 
@@ -35,8 +35,10 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <rtl/character.hxx>
+#include <tools/resmgr.hxx>
 #include <unotools/streamwrap.hxx>
 
 using namespace ::cppu;
@@ -883,8 +885,10 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc
     return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr ));
 }
 
-T602ImportFilterDialog::T602ImportFilterDialog() :
-    mpResMgr( nullptr ) {}
+T602ImportFilterDialog::T602ImportFilterDialog()
+    : mpResLocale(nullptr)
+{
+}
 
 T602ImportFilterDialog::~T602ImportFilterDialog()
 {
@@ -1086,14 +1090,14 @@ bool T602ImportFilterDialog::OptionsDlg()
 
 void T602ImportFilterDialog::initLocale()
 {
-    mpResMgr.reset( ResMgr::CreateResMgr( "t602filter", LanguageTag( meLocale) ) );
+    mpResLocale.reset(new std::locale(Translate::Create("flt", LanguageTag(meLocale))));
 }
 
-ResMgr* T602ImportFilterDialog::getResMgr()
+const std::locale* T602ImportFilterDialog::getResLocale()
 {
-    if( !mpResMgr )
+    if (!mpResLocale)
         initLocale();
-    return mpResMgr.get();
+    return mpResLocale.get();
 }
 
 void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& )
@@ -1108,10 +1112,9 @@ sal_Int16 SAL_CALL T602ImportFilterDialog::execute()
         return css::ui::dialogs::ExecutableDialogResults::CANCEL;
 }
 
-OUString T602ImportFilterDialog::getResStr( sal_Int16 resid )
+OUString T602ImportFilterDialog::getResStr(const char* resid)
 {
-    OUString sStr( ResId( resid, *getResMgr() ) );
-    return sStr;
+    return Translate::get(resid, *getResLocale());
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues()
diff --git a/filter/source/t602/t602filter.hrc b/filter/source/t602/t602filter.hrc
deleted file mode 100644
index 7cb9a9d1f712..000000000000
--- a/filter/source/t602/t602filter.hrc
+++ /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/.
- *
- * 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 T602FILTER_HRC
-#define T602FILTER_HRC
-
-#define T602FILTER_RES_START 1000
-
-#define T602FILTER_STR_IMPORT_DIALOG_TITLE      (T602FILTER_RES_START)
-#define T602FILTER_STR_ENCODING_LABEL           (T602FILTER_RES_START+1)
-#define T602FILTER_STR_ENCODING_AUTO            (T602FILTER_RES_START+2)
-#define T602FILTER_STR_ENCODING_CP852           (T602FILTER_RES_START+3)
-#define T602FILTER_STR_ENCODING_CP895           (T602FILTER_RES_START+4)
-#define T602FILTER_STR_ENCODING_KOI8CS2         (T602FILTER_RES_START+5)
-#define T602FILTER_STR_CYRILLIC_MODE            (T602FILTER_RES_START+6)
-#define T602FILTER_STR_REFORMAT_TEXT            (T602FILTER_RES_START+7)
-#define T602FILTER_STR_DOT_COMMANDS             (T602FILTER_RES_START+8)
-#define T602FILTER_STR_CANCEL_BUTTON            (T602FILTER_RES_START+9)
-#define T602FILTER_STR_OK_BUTTON                (T602FILTER_RES_START+10)
-
-#endif // T602FILTER_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index e7b0c452b64c..8d81fb1b476a 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <xmloff/attrlist.hxx>
-#include <tools/resmgr.hxx>
 
 namespace T602ImportFilter {
 
@@ -84,10 +83,10 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper <
 >
 {
     css::lang::Locale meLocale;
-    std::unique_ptr<ResMgr> mpResMgr;
+    std::unique_ptr<std::locale> mpResLocale;
     bool OptionsDlg();
-    ResMgr* getResMgr();
-    OUString getResStr( sal_Int16 resid );
+    const std::locale* getResLocale();
+    OUString getResStr(const char* resid);
     void initLocale();
 
     virtual ~T602ImportFilterDialog() override;
diff --git a/filter/source/t602/t602filter.src b/filter/source/t602/t602filter.src
deleted file mode 100644
index 6771ee28ff20..000000000000
--- a/filter/source/t602/t602filter.src
+++ /dev/null
@@ -1,77 +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 "t602filter.hrc"
-
-String T602FILTER_STR_IMPORT_DIALOG_TITLE
-{
-    Text [ en-US ] = "Settings for T602 import";
-};
-
-String T602FILTER_STR_ENCODING_LABEL
-{
-    Text [ en-US ] = "Encoding";
-};
-
-String T602FILTER_STR_ENCODING_AUTO
-{
-    Text [ en-US ] = "Automatic";
-};
-
-String T602FILTER_STR_ENCODING_CP852
-{
-    Text [ en-US ] = "CP852 (Latin2)";
-};
-
-String T602FILTER_STR_ENCODING_CP895
-{
-    Text [ en-US ] = "CP895 (KEYB2CS, Kamenicky)";
-};
-
-String T602FILTER_STR_ENCODING_KOI8CS2
-{
-    Text [ en-US ] = "KOI8 CS2";
-};
-
-String T602FILTER_STR_CYRILLIC_MODE
-{
-    Text [ en-US ] = "Mode for Russian language (Cyrillic)";
-};
-
-String T602FILTER_STR_REFORMAT_TEXT
-{
-    Text [ en-US ] = "Reformat the text";
-};
-
-String T602FILTER_STR_DOT_COMMANDS
-{
-    Text [ en-US ] = "Display dot commands";
-};
-
-String T602FILTER_STR_CANCEL_BUTTON
-{
-    Text [ en-US ] = "Cancel";
-};
-
-String T602FILTER_STR_OK_BUTTON
-{
-    Text [ en-US ] = "OK";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
deleted file mode 100644
index 8db23c2ad6bc..000000000000
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ /dev/null
@@ -1,55 +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_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC
-#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC
-
-#include "filter.hrc"
-
-#define STR_COLUMN_HEADER_NAME                  (RID_XSLT_DIALOG_START + 0)
-#define STR_COLUMN_HEADER_TYPE                  (RID_XSLT_DIALOG_START + 1)
-#define STR_UNKNOWN_APPLICATION                 (RID_XSLT_DIALOG_START + 2)
-#define STR_IMPORT_ONLY                         (RID_XSLT_DIALOG_START + 3)
-#define STR_IMPORT_EXPORT                       (RID_XSLT_DIALOG_START + 4)
-#define STR_EXPORT_ONLY                         (RID_XSLT_DIALOG_START + 5)
-
-#define STR_WARN_DELETE                         (RID_XSLT_DIALOG_START + 10)
-
-#define STR_DEFAULT_FILTER_NAME                 (RID_XSLT_DIALOG_START + 13)
-
-#define STR_ERROR_FILTER_NAME_EXISTS            (RID_XSLT_DIALOG_START + 15)
-#define STR_ERROR_TYPE_NAME_EXISTS              (RID_XSLT_DIALOG_START + 16)
-#define STR_ERROR_EXPORT_XSLT_NOT_FOUND         (RID_XSLT_DIALOG_START + 18)
-#define STR_ERROR_IMPORT_XSLT_NOT_FOUND         (RID_XSLT_DIALOG_START + 19)
-#define STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND     (RID_XSLT_DIALOG_START + 20)
-#define STR_DEFAULT_UI_NAME                     (RID_XSLT_DIALOG_START + 21)
-#define STR_UNDEFINED_FILTER                    (RID_XSLT_DIALOG_START + 22)
-
-#define STR_FILTER_HAS_BEEN_SAVED               (RID_XSLT_DIALOG_START + 23)
-#define STR_FILTERS_HAVE_BEEN_SAVED             (RID_XSLT_DIALOG_START + 24)
-#define STR_FILTER_PACKAGE                      (RID_XSLT_DIALOG_START + 25)
-#define STR_FILTER_INSTALLED                    (RID_XSLT_DIALOG_START + 26)
-#define STR_FILTERS_INSTALLED                   (RID_XSLT_DIALOG_START + 27)
-#define STR_NO_FILTERS_FOUND                    (RID_XSLT_DIALOG_START + 28)
-
-#define STR_XML_FILTER_LISTBOX                  (RID_XSLT_DIALOG_START + 38)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src b/filter/source/xsltdialog/xmlfilterdialogstrings.src
deleted file mode 100644
index ea7a693a2257..000000000000
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.src
+++ /dev/null
@@ -1,132 +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 "xmlfilterdialogstrings.hrc"
-
-String STR_COLUMN_HEADER_NAME
-{
-    Text [ en-US ]      = "Name";
-};
-
-String STR_COLUMN_HEADER_TYPE
-{
-    Text [ en-US ]      = "Type";
-};
-
-String STR_UNKNOWN_APPLICATION
-{
-    Text [ en-US ]      = "Unknown";
-};
-
-String STR_IMPORT_ONLY
-{
-    Text [ en-US ]      = "import filter";
-};
-
-String STR_IMPORT_EXPORT
-{
-    Text [ en-US ]      = "import/export filter";
-};
-
-String STR_EXPORT_ONLY
-{
-    Text [ en-US ]      = "export filter";
-};
-
-String STR_WARN_DELETE
-{
-    Text [ en-US ]      = "Do you really want to delete the XML Filter '%s'? This action cannot be undone.";
-};
-
-String STR_ERROR_FILTER_NAME_EXISTS
-{
-    Text [ en-US ]  = "An XML filter with the name '%s' already exists. Please enter a different name.";
-};
-
-String STR_ERROR_TYPE_NAME_EXISTS
-{
-    Text [ en-US ]  = "The name for the user interface '%s1' is already used by the XML filter '%s2'. Please enter a different name.";
-};
-
-String STR_ERROR_EXPORT_XSLT_NOT_FOUND
-{
-    Text [ en-US ]  = "The XSLT for export cannot be found. Please enter a valid path.";
-};
-
-String STR_ERROR_IMPORT_XSLT_NOT_FOUND
-{
-    Text [ en-US ]  = "The XSLT for import cannot be found. Please enter a valid path.";
-};
-
-String STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND
-{
-    Text [ en-US ]  = "The given import template cannot be found. Please enter a valid path.";
-};
-
-String STR_DEFAULT_FILTER_NAME
-{
-    Text [ en-US ]  = "New Filter";
-};
-
-String STR_DEFAULT_UI_NAME
-{
-    Text [ en-US ]  = "Untitled";
-};
-
-String STR_UNDEFINED_FILTER
-{
-    Text [ en-US ]  = "undefined filter";
-};
-
-String STR_FILTER_HAS_BEEN_SAVED
-{
-    Text [ en-US ]  = "The XML filter '%s' has been saved as package '%s'. ";
-};
-
-String STR_FILTERS_HAVE_BEEN_SAVED
-{
-    Text [ en-US ]  = "%s XML filters have been saved in the package '%s'.";
-};
-
-String STR_FILTER_PACKAGE
-{
-    Text [ en-US ]  = "XSLT filter package";
-};
-
-String STR_FILTER_INSTALLED
-{
-    Text [ en-US ]  = "The XML filter '%s' has been installed successfully.";
-};
-
-String STR_FILTERS_INSTALLED
-{
-    Text [ en-US ]  = "%s XML filters have been installed successfully.";
-};
-
-String STR_NO_FILTERS_FOUND
-{
-    Text [ en-US ]  = "No XML filter could be installed because the package '%s' does not contain any XML filters.";
-};
-
-String STR_XML_FILTER_LISTBOX
-{
-    Text [ en-US ]  = "XML Filter List";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index f80e8f8a5820..388235716aef 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -42,7 +42,7 @@
 #include <rtl/uri.hxx>
 
 #include "xmlfilterjar.hxx"
-#include "xmlfilterdialogstrings.hrc"
+#include "strings.hrc"
 #include "xmlfiltersettingsdialog.hxx"
 #include "typedetectionexport.hxx"
 #include "typedetectionimport.hxx"
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 1abaf3c1b3ac..5d26460f1a00 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -41,7 +41,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "xmlfilterdialogstrings.hrc"
+#include "strings.hrc"
 #include "xmlfiltersettingsdialog.hxx"
 #include "xmlfiltertabdialog.hxx"
 #include "xmlfiltertestdialog.hxx"
@@ -59,34 +59,34 @@ using namespace com::sun::star::util;
 using ::rtl::Uri;
 
 namespace {
-    static ResMgr* pXSLTResMgr = nullptr;
+    static std::locale* pXSLTResLocale = nullptr;
 
-    ResMgr* getXSLTDialogResMgr()
+    const std::locale* getXSLTDialogResLocale()
     {
-        return pXSLTResMgr;
+        return pXSLTResLocale;
     }
 }
 
-EnsureResMgr::EnsureResMgr()
+EnsureResLocale::EnsureResLocale()
 {
-    if (!pXSLTResMgr)
+    if (!pXSLTResLocale)
     {
-        m_xResMgr.reset(ResMgr::CreateResMgr("xsltdlg", Application::GetSettings().GetUILanguageTag()));
-        pXSLTResMgr = m_xResMgr.get();
+        m_xResLocale.reset(new std::locale(Translate::Create("flt", Application::GetSettings().GetUILanguageTag())));
+        pXSLTResLocale = m_xResLocale.get();
     }
 }
 
-EnsureResMgr::~EnsureResMgr()
+EnsureResLocale::~EnsureResLocale()
 {
-    if (m_xResMgr)
-        pXSLTResMgr = nullptr;
+    if (m_xResLocale)
+        pXSLTResLocale = nullptr;
 }
 
 namespace
 {
-    OUString XsltResId(sal_uInt16 nId)
+    OUString XsltResId(const char* pId)
     {
-        return ResId(nId, *getXSLTDialogResMgr());
+        return Translate::get(pId, *getXSLTDialogResLocale());
     }
 }
 
@@ -263,7 +263,7 @@ void XMLFilterSettingsDialog::onNew()
     aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
 
     // execute XML Filter Dialog
-    ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo );
+    ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, &aTempInfo );
     if ( aDlg->Execute() == RET_OK )
     {
         // insert the new filter
@@ -282,7 +282,7 @@ void XMLFilterSettingsDialog::onEdit()
         filter_info_impl* pOldInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
 
         // execute XML Filter Dialog
-        ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo );
+        ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, pOldInfo );
         if ( aDlg->Execute() == RET_OK )
         {
             filter_info_impl* pNewInfo = aDlg->getNewFilterInfo();
@@ -1209,7 +1209,7 @@ void XMLFilterSettingsDialog::initFilterList()
 
 application_info_impl::application_info_impl( const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter )
 :   maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ),
-    maDocumentUIName(ResMgr::ExpandVariables(rUINameRes)),
+    maDocumentUIName(Translate::ExpandVariables(rUINameRes)),
     maXMLImporter( mpXMLImporter, strlen( mpXMLImporter ), RTL_TEXTENCODING_ASCII_US ),
     maXMLExporter( mpXMLExporter, strlen( mpXMLExporter ), RTL_TEXTENCODING_ASCII_US )
 {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 5105c67936c2..7dfc307ce057 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -55,12 +55,12 @@ public:
     virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 };
 
-class EnsureResMgr
+class EnsureResLocale
 {
-    std::unique_ptr<ResMgr> m_xResMgr;
+    std::unique_ptr<std::locale> m_xResLocale;
 public:
-    EnsureResMgr();
-    ~EnsureResMgr();
+    EnsureResLocale();
+    ~EnsureResLocale();
 };
 
 class HeaderBar;
@@ -68,7 +68,7 @@ class HeaderBar;
 class XMLFilterListBox : public SvTabListBox
 {
 private:
-    EnsureResMgr       m_aEnsureResMgr;
+    EnsureResLocale    m_aEnsureResLocale;
     VclPtr<HeaderBar>  m_pHeaderBar;
 
     DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void );
@@ -127,7 +127,7 @@ private:
     OUString createUniqueInterfaceName( const OUString& rInterfaceName );
 
 private:
-    EnsureResMgr                                          maEnsureResMgr;
+    EnsureResLocale                                       maEnsureResLocale;
     css::uno::Reference< css::uno::XComponentContext >    mxContext;
     css::uno::Reference< css::container::XNameContainer > mxFilterContainer;
     css::uno::Reference< css::container::XNameContainer > mxTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 7da2fdee4bbd..2db0f6a08707 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -21,11 +21,11 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/fileurl.hxx>
-#include <tools/resid.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/layout.hxx>
 #include <osl/file.hxx>
 
-#include "xmlfilterdialogstrings.hrc"
+#include "strings.hrc"
 #include "xmlfiltertabdialog.hxx"
 #include "xmlfiltertabpagebasic.hxx"
 #include "xmlfiltertabpagexslt.hxx"
@@ -36,11 +36,11 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
-XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr,
+XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale,
     const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo)
     : TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui")
     , mxContext(rxContext)
-    , mrResMgr(rResMgr)
+    , mrResLocale(rResLocale)
 {
     get(m_pOKBtn, "ok");
     get(m_pTabCtrl, "tabcontrol");
@@ -94,7 +94,7 @@ bool XMLFilterTabDialog::onOk()
     mpBasicPage->FillInfo( mpNewInfo );
 
     sal_uInt16 nErrorPage = 0;
-    sal_uInt16 nErrorId = 0;
+    const char* pErrorId = nullptr;
     vcl::Window* pFocusWindow = nullptr;
     OUString aReplace1;
     OUString aReplace2;
@@ -117,7 +117,7 @@ bool XMLFilterTabDialog::onOk()
                     if( xFilterContainer->hasByName( mpNewInfo->maFilterName ) )
                     {
                         nErrorPage = m_nBasicPageId;
-                        nErrorId = STR_ERROR_FILTER_NAME_EXISTS;
+                        pErrorId = STR_ERROR_FILTER_NAME_EXISTS;
                         pFocusWindow = (mpBasicPage->m_pEDFilterName);
                         aReplace1 = mpNewInfo->maFilterName;
                     }
@@ -153,7 +153,7 @@ bool XMLFilterTabDialog::onOk()
                     sal_Int32 nFilter;
 
                     Sequence< PropertyValue > aValues;
-                    for( nFilter = 0; (nFilter < nCount) && (nErrorId == 0); nFilter++, pFilterName++ )
+                    for( nFilter = 0; (nFilter < nCount) && (pErrorId == nullptr); nFilter++, pFilterName++ )
                     {
                         Any aAny( xFilterContainer->getByName( *pFilterName ) );
                         if( !(aAny >>= aValues) )
@@ -163,7 +163,7 @@ bool XMLFilterTabDialog::onOk()
                         PropertyValue* pValues = aValues.getArray();
                         sal_Int32 nValue;
 
-                        for( nValue = 0; (nValue < nValueCount) && (nErrorId == 0); nValue++, pValues++ )
+                        for( nValue = 0; (nValue < nValueCount) && (pErrorId == nullptr); nValue++, pValues++ )
                         {
                             if ( pValues->Name == "UIName" )
                             {
@@ -172,7 +172,7 @@ bool XMLFilterTabDialog::onOk()
                                 if( aInterfaceName == mpNewInfo->maInterfaceName )
                                 {
                                     nErrorPage = m_nBasicPageId;
-                                    nErrorId = STR_ERROR_TYPE_NAME_EXISTS;
+                                    pErrorId = STR_ERROR_TYPE_NAME_EXISTS;
                                     pFocusWindow = (mpBasicPage->m_pEDInterfaceName);
                                     aReplace1 = mpNewInfo->maInterfaceName;
                                     aReplace2 = *pFilterName;
@@ -189,7 +189,7 @@ bool XMLFilterTabDialog::onOk()
         }
     }
 
-    if( 0 == nErrorId )
+    if (!pErrorId)
     {
         // 4. see if the export xslt is valid
         if( (mpNewInfo->maExportXSLT != mpOldInfo->maExportXSLT) && comphelper::isFileUrl( mpNewInfo->maExportXSLT ) )
@@ -198,14 +198,14 @@ bool XMLFilterTabDialog::onOk()
             osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
             if( aRC != osl::File::E_None )
             {
-                nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
+                pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
                 nErrorPage = m_nXSLTPageId;
                 pFocusWindow = (mpXSLTPage->m_pEDExportXSLT);
             }
         }
     }
 
-    if( 0 == nErrorId )
+    if (!pErrorId)
     {
         // 5. see if the import xslt is valid
         if( (mpNewInfo->maImportXSLT != mpOldInfo->maImportXSLT) && comphelper::isFileUrl( mpNewInfo->maImportXSLT ) )
@@ -214,7 +214,7 @@ bool XMLFilterTabDialog::onOk()
             osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
             if( aRC != osl::File::E_None )
             {
-                nErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND;
+                pErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND;
                 nErrorPage = m_nXSLTPageId;
                 pFocusWindow = (mpXSLTPage->m_pEDImportTemplate);
             }
@@ -224,12 +224,12 @@ bool XMLFilterTabDialog::onOk()
     // see if we have at least an import or an export xslt
     if((mpNewInfo->maImportXSLT.isEmpty()) && (mpNewInfo->maExportXSLT.isEmpty()) )
     {
-        nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
+        pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
         nErrorPage = m_nXSLTPageId;
         pFocusWindow = (mpXSLTPage->m_pEDExportXSLT);
     }
 
-    if( 0 == nErrorId )
+    if (!pErrorId)
     {
         // 6. see if the import template is valid
         if( (mpNewInfo->maImportTemplate != mpOldInfo->maImportTemplate) && comphelper::isFileUrl( mpNewInfo->maImportTemplate ) )
@@ -238,20 +238,19 @@ bool XMLFilterTabDialog::onOk()
             osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
             if( aRC != osl::File::E_None )
             {
-                nErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND;
+                pErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND;
                 nErrorPage = m_nXSLTPageId;
                 pFocusWindow = (mpXSLTPage->m_pEDImportTemplate);
             }
         }
     }
 
-    if( 0 != nErrorId )
+    if (pErrorId)
     {
         m_pTabCtrl->SetCurPageId(nErrorPage);
         ActivatePageHdl(nullptr, m_pTabCtrl);
 
-        ResId aResId( nErrorId, mrResMgr );
-        OUString aMessage( aResId );
+        OUString aMessage(Translate::get(pErrorId, mrResLocale));
 
         if( aReplace2.getLength() )
         {
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 4602af7907b9..c51656b84742 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -25,7 +25,6 @@
 #include <vcl/button.hxx>
 
 namespace vcl { class Window; }
-class ResMgr;
 
 class filter_info_impl;
 class XMLFilterTabPageBasic;
@@ -34,7 +33,7 @@ class XMLFilterTabPageXSLT;
 class XMLFilterTabDialog: public TabDialog
 {
 public:
-    XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
+    XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
     virtual ~XMLFilterTabDialog() override;
     virtual void dispose() override;
 
@@ -48,7 +47,7 @@ private:
     DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void );
     DECL_LINK(OkHdl, Button*, void);
 
-    ResMgr& mrResMgr;
+    const std::locale& mrResLocale;
 
     const filter_info_impl* mpOldInfo;
     filter_info_impl* mpNewInfo;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index fe6a2b7f449c..a868fb244b06 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -19,7 +19,7 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include "xmlfilterdialogstrings.hrc"
+#include "strings.hrc"
 #include "xmlfiltertabpagebasic.hxx"
 #include "xmlfiltersettingsdialog.hxx"
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index ce6e9fc20d48..e366703e8a0c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -26,7 +26,6 @@
 #include <svtools/svmedit.hxx>
 
 namespace vcl { class Window; }
-class ResMgr;
 class filter_info_impl;
 
 class XMLFilterTabPageBasic : public TabPage
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 9d88183cdf96..c5e84aa0072e 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -27,7 +27,6 @@
 #include <svtools/inettbc.hxx>
 
 namespace vcl { class Window; }
-class ResMgr;
 class filter_info_impl;
 
 class XMLFilterTabPageXSLT : public TabPage
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 3cf1f5abd618..65c150db33b2 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -44,7 +44,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "xmlfilterdialogstrings.hrc"
+#include "strings.hrc"
 #include "xmlfiltersettingsdialog.hxx"
 #include "xmlfiltertestdialog.hxx"
 
diff --git a/filter/uiconfig/ui/impswfdialog.ui b/filter/uiconfig/ui/impswfdialog.ui
index 756fbe65eb41..c32d4c936c27 100644
--- a/filter/uiconfig/ui/impswfdialog.ui
+++ b/filter/uiconfig/ui/impswfdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentquality">
     <property name="lower">1</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="ImpSWFDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Flash (SWF) Options</property>
+    <property name="title" translatable="yes" context="impswfdialog|ImpSWFDialog">Flash (SWF) Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -92,7 +92,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">1: min. quality
+                    <property name="label" translatable="yes" context="impswfdialog|label1">1: min. quality
 100: max. quality</property>
                     <property name="use_underline">True</property>
                     <property name="justify">fill</property>
@@ -133,7 +133,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="exportall">
-                <property name="label" translatable="yes">Export _all slides (uncheck to export current slide)</property>
+                <property name="label" translatable="yes" context="impswfdialog|exportall">Export _all slides (uncheck to export current slide)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -155,7 +155,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="exportmultiplefiles">
-                    <property name="label" translatable="yes">Export as _multiple files</property>
+                    <property name="label" translatable="yes" context="impswfdialog|exportmultiplefiles">Export as _multiple files</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -178,7 +178,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="exportbackgrounds">
-                        <property name="label" translatable="yes">Export _backgrounds</property>
+                        <property name="label" translatable="yes" context="impswfdialog|exportbackgrounds">Export _backgrounds</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -195,7 +195,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="exportbackgroundobjects">
-                        <property name="label" translatable="yes">Export back_ground objects</property>
+                        <property name="label" translatable="yes" context="impswfdialog|exportbackgroundobjects">Export back_ground objects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -212,7 +212,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="exportslidecontents">
-                        <property name="label" translatable="yes">Export _slide contents</property>
+                        <property name="label" translatable="yes" context="impswfdialog|exportslidecontents">Export _slide contents</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -245,7 +245,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="exportsound">
-                <property name="label" translatable="yes">Export _Verilogix Slide Annotations</property>
+                <property name="label" translatable="yes" context="impswfdialog|exportsound">Export _Verilogix Slide Annotations</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -262,7 +262,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="exportoleasjpeg">
-                <property name="label" translatable="yes">Export OLE objects as _JPEG images</property>
+                <property name="label" translatable="yes" context="impswfdialog|exportoleasjpeg">Export OLE objects as _JPEG images</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui
index 67612f59c197..554d736523af 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -40,7 +40,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="all">
-                        <property name="label" translatable="yes">_All</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|all">_All</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -58,7 +58,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="range">
-                        <property name="label" translatable="yes">_Pages:</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|range">_Pages:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -77,7 +77,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="selection">
-                        <property name="label" translatable="yes">_Selection</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|selection">_Selection</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
                       <object class="GtkLabel" id="slides">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Slides:</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|slides">Slides:</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -123,7 +123,7 @@
                       <object class="GtkLabel" id="selectedsheets">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">_Selection/Selected sheet(s)</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|selectedsheets">_Selection/Selected sheet(s)</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Range</property>
+                <property name="label" translatable="yes" context="pdfgeneralpage|label1">Range</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -200,7 +200,7 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Quality:</property>
+                                    <property name="label" translatable="yes" context="pdfgeneralpage|label6">_Quality:</property>
                                     <property name="use_underline">True</property>
                                     <property name="xalign">0</property>
                                   </object>
@@ -225,7 +225,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="reduceresolution">
-                                <property name="label" translatable="yes">_Reduce image resolution</property>
+                                <property name="label" translatable="yes" context="pdfgeneralpage|reduceresolution">_Reduce image resolution</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -247,17 +247,17 @@
                                 <property name="can_focus">False</property>
                                 <property name="has_entry">True</property>
                                 <items>
-                                  <item translatable="yes">75 DPI</item>
-                                  <item translatable="yes">150 DPI</item>
-                                  <item translatable="yes">300 DPI</item>
-                                  <item translatable="yes">600 DPI</item>
-                                  <item translatable="yes">1200 DPI</item>
+                                  <item translatable="yes" context="pdfgeneralpage|resolution">75 DPI</item>
+                                  <item translatable="yes" context="pdfgeneralpage|resolution">150 DPI</item>
+                                  <item translatable="yes" context="pdfgeneralpage|resolution">300 DPI</item>
+                                  <item translatable="yes" context="pdfgeneralpage|resolution">600 DPI</item>
+                                  <item translatable="yes" context="pdfgeneralpage|resolution">1200 DPI</item>
                                 </items>
                                 <child internal-child="entry">
                                   <object class="GtkEntry" id="comboboxtext-entry">
                                     <property name="can_focus">False</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="text" translatable="yes">75 DPI</property>
+                                    <property name="text" translatable="yes" context="pdfgeneralpage|comboboxtext-entry">75 DPI</property>
                                   </object>
                                 </child>
                               </object>
@@ -281,7 +281,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="losslesscompress">
-                        <property name="label" translatable="yes">_Lossless compression</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|losslesscompress">_Lossless compression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -298,7 +298,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="jpegcompress">
-                        <property name="label" translatable="yes">_JPEG compression</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|jpegcompress">_JPEG compression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -320,7 +320,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Images</property>
+                <property name="label" translatable="yes" context="pdfgeneralpage|label2">Images</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -352,7 +352,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="watermark">
-                        <property name="label" translatable="yes">Sign with _watermark</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|watermark">Sign with _watermark</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -387,7 +387,7 @@
                           <object class="GtkLabel" id="watermarklabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Text:</property>
+                            <property name="label" translatable="yes" context="pdfgeneralpage|watermarklabel">Text:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">watermarkentry</property>
                             <property name="xalign">0</property>
@@ -407,7 +407,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Watermark</property>
+                <property name="label" translatable="yes" context="pdfgeneralpage|label3">Watermark</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -444,11 +444,11 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="embed">
-                    <property name="label" translatable="yes">Hybrid PDF (em_bed ODF file)</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|embed">Hybrid PDF (em_bed ODF file)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Creates a PDF that is easily editable in %PRODUCTNAME</property>
+                    <property name="tooltip_text" translatable="yes" context="pdfgeneralpage|embed|tooltip_text">Creates a PDF that is easily editable in %PRODUCTNAME</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -460,11 +460,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="pdfa">
-                    <property name="label" translatable="yes">Archive P_DF/A-1a (ISO 19005-1)</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|pdfa">Archive P_DF/A-1a (ISO 19005-1)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation</property>
+                    <property name="tooltip_text" translatable="yes" context="pdfgeneralpage|pdfa|tooltip_text">Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -476,11 +476,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="tagged">
-                    <property name="label" translatable="yes">_Tagged PDF (add document structure)</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|tagged">_Tagged PDF (add document structure)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Includes a document's content structure information in a PDF</property>
+                    <property name="tooltip_text" translatable="yes" context="pdfgeneralpage|tagged|tooltip_text">Includes a document's content structure information in a PDF</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -492,11 +492,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="forms">
-                    <property name="label" translatable="yes">_Create PDF form</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|forms">_Create PDF form</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Creates a PDF with fields that can be filled out</property>
+                    <property name="tooltip_text" translatable="yes" context="pdfgeneralpage|forms|tooltip_text">Creates a PDF with fields that can be filled out</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -521,7 +521,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Submit _format:</property>
+                            <property name="label" translatable="yes" context="pdfgeneralpage|label7">Submit _format:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">format</property>
                             <property name="xalign">0</property>
@@ -536,10 +536,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">FDF</item>
-                              <item translatable="yes">PDF</item>
-                              <item translatable="yes">HTML</item>
-                              <item translatable="yes">XML</item>
+                              <item translatable="yes" context="pdfgeneralpage|format">FDF</item>
+                              <item translatable="yes" context="pdfgeneralpage|format">PDF</item>
+                              <item translatable="yes" context="pdfgeneralpage|format">HTML</item>
+                              <item translatable="yes" context="pdfgeneralpage|format">XML</item>
                             </items>
                           </object>
                           <packing>
@@ -549,7 +549,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="allowdups">
-                            <property name="label" translatable="yes">Allow duplicate field _names</property>
+                            <property name="label" translatable="yes" context="pdfgeneralpage|allowdups">Allow duplicate field _names</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -573,7 +573,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="bookmarks">
-                    <property name="label" translatable="yes">Export _bookmarks</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|bookmarks">Export _bookmarks</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -588,7 +588,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="exportplaceholders">
-                    <property name="label" translatable="yes">Expo_rt placeholders</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|exportplaceholders">Expo_rt placeholders</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -603,7 +603,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="comments">
-                    <property name="label" translatable="yes">_Export comments</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|comments">_Export comments</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -618,7 +618,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="emptypages">
-                    <property name="label" translatable="yes">Exp_ort automatically inserted blank pages</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|emptypages">Exp_ort automatically inserted blank pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -633,7 +633,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="viewpdf">
-                    <property name="label" translatable="yes">_View PDF after export</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|viewpdf">_View PDF after export</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -648,7 +648,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="usereferencexobject">
-                    <property name="label" translatable="yes">Use reference XObjects</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|usereferencexobject">Use reference XObjects</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -663,7 +663,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="hiddenpages">
-                    <property name="label" translatable="yes">Export _hidden pages</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|hiddenpages">Export _hidden pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -678,7 +678,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="notes">
-                    <property name="label" translatable="yes">Export _notes pages</property>
+                    <property name="label" translatable="yes" context="pdfgeneralpage|notes">Export _notes pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -698,7 +698,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="onlynotes">
-                        <property name="label" translatable="yes">Export onl_y notes pages</property>
+                        <property name="label" translatable="yes" context="pdfgeneralpage|onlynotes">Export onl_y notes pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -721,7 +721,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">General</property>
+            <property name="label" translatable="yes" context="pdfgeneralpage|label4">General</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/filter/uiconfig/ui/pdflinkspage.ui b/filter/uiconfig/ui/pdflinkspage.ui
index f7a5d2e755d1..ba3562afc3df 100644
--- a/filter/uiconfig/ui/pdflinkspage.ui
+++ b/filter/uiconfig/ui/pdflinkspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="flt">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="PdfLinksPage">
     <property name="visible">True</property>
@@ -26,7 +26,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="export">
-                    <property name="label" translatable="yes">Export bookmarks as named destinations</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|export">Export bookmarks as named destinations</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -44,7 +44,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="convert">
-                    <property name="label" translatable="yes">_Convert document references to PDF targets</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|convert">_Convert document references to PDF targets</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -62,7 +62,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="exporturl">
-                    <property name="label" translatable="yes">Export _URLs relative to file system</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|exporturl">Export _URLs relative to file system</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -86,7 +86,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">General</property>
+            <property name="label" translatable="yes" context="pdflinkspage|label1">General</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -118,7 +118,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="default">
-                    <property name="label" translatable="yes">Default mode</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|default">Default mode</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="openpdf">
-                    <property name="label" translatable="yes">Open with PDF reader application</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|openpdf">Open with PDF reader application</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -155,7 +155,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="openinternet">
-                    <property name="label" translatable="yes">Open _with Internet browser</property>
+                    <property name="label" translatable="yes" context="pdflinkspage|openinternet">Open _with Internet browser</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -179,7 +179,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Cross-document Links</property>
+            <property name="label" translatable="yes" context="pdflinkspage|label5">Cross-document Links</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/filter/uiconfig/ui/pdfoptionsdialog.ui b/filter/uiconfig/ui/pdfoptionsdialog.ui
index f8a7a409e63b..632ccec0df25 100644
--- a/filter/uiconfig/ui/pdfoptionsdialog.ui
+++ b/filter/uiconfig/ui/pdfoptionsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="PdfOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">PDF Options</property>
+    <property name="title" translatable="yes" context="pdfoptionsdialog|PdfOptionsDialog">PDF Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">E_xport</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|ok">E_xport</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|general">General</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="initialview">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Initial View</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|initialview">Initial View</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="userinterface">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">User Interface</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|userinterface">User Interface</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="links">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Links</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|links">Links</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="security">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Security</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|security">Security</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="digitalsignatures">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Digital Signatures</property>
+                <property name="label" translatable="yes" context="pdfoptionsdialog|digitalsignatures">Digital Signatures</property>
               </object>
               <packing>
                 <property name="position">5</property>
diff --git a/filter/uiconfig/ui/pdfsecuritypage.ui b/filter/uiconfig/ui/pdfsecuritypage.ui
index 6d2658dbbe9a..4d9f73f5a5bc 100644
--- a/filter/uiconfig/ui/pdfsecuritypage.ui
+++ b/filter/uiconfig/ui/pdfsecuritypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkBox" id="PdfSecurityPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkButton" id="setpassword">
-                    <property name="label" translatable="yes">Set _Passwords…</property>
+                    <property name="label" translatable="yes" context="pdfsecuritypage|setpassword">Set _Passwords…</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
@@ -51,7 +51,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Open password set</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label5">Open password set</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -63,7 +63,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will be encrypted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label6">PDF document will be encrypted</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -86,7 +86,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">No open password set</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label7">No open password set</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -98,7 +98,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will not be encrypted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label8">PDF document will not be encrypted</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -121,7 +121,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will not be encrypted due to PDF/A export.</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label30">PDF document will not be encrypted due to PDF/A export.</property>
                         <property name="wrap">True</property>
                       </object>
                       <packing>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Permission password set</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label9">Permission password set</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -157,7 +157,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will be restricted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label11">PDF document will be restricted</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -180,7 +180,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">No permission password set</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label12">No permission password set</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -192,7 +192,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will be unrestricted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label13">PDF document will be unrestricted</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -215,7 +215,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PDF document will not be restricted due to PDF/A export.</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|label14">PDF document will not be restricted due to PDF/A export.</property>
                         <property name="wrap">True</property>
                       </object>
                       <packing>
@@ -235,7 +235,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Set Passwords</property>
+                    <property name="label" translatable="yes" context="pdfsecuritypage|setpasswordstitle">Set Passwords</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -251,7 +251,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">File Encryption and Permission</property>
+            <property name="label" translatable="yes" context="pdfsecuritypage|label2">File Encryption and Permission</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -289,7 +289,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="printnone">
-                        <property name="label" translatable="yes">_Not permitted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|printnone">_Not permitted</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="printlow">
-                        <property name="label" translatable="yes">_Low resolution (150 dpi)</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|printlow">_Low resolution (150 dpi)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="printhigh">
-                        <property name="label" translatable="yes">_High resolution</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|printhigh">_High resolution</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -344,7 +344,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Printing</property>
+                <property name="label" translatable="yes" context="pdfsecuritypage|label1">Printing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -376,7 +376,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="changenone">
-                        <property name="label" translatable="yes">No_t permitted</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|changenone">No_t permitted</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -392,7 +392,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="changeinsdel">
-                        <property name="label" translatable="yes">_Inserting, deleting, and rotating pages</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|changeinsdel">_Inserting, deleting, and rotating pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -408,7 +408,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="changeform">
-                        <property name="label" translatable="yes">_Filling in form fields</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|changeform">_Filling in form fields</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -424,7 +424,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="changecomment">
-                        <property name="label" translatable="yes">_Commenting, filling in form fields</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|changecomment">_Commenting, filling in form fields</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -440,7 +440,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="changeany">
-                        <property name="label" translatable="yes">_Any except extracting pages</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|changeany">_Any except extracting pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -463,7 +463,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Changes</property>
+                <property name="label" translatable="yes" context="pdfsecuritypage|label3">Changes</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -495,7 +495,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="enablecopy">
-                        <property name="label" translatable="yes">Ena_ble copying of content</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|enablecopy">Ena_ble copying of content</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -511,7 +511,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="enablea11y">
-                        <property name="label" translatable="yes">Enable text access for acce_ssibility tools</property>
+                        <property name="label" translatable="yes" context="pdfsecuritypage|enablea11y">Enable text access for acce_ssibility tools</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -533,7 +533,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Content</property>
+                <property name="label" translatable="yes" context="pdfsecuritypage|label4">Content</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/filter/uiconfig/ui/pdfsignpage.ui b/filter/uiconfig/ui/pdfsignpage.ui
index fe10e299496a..542bc5eb7dc7 100644
--- a/filter/uiconfig/ui/pdfsignpage.ui
+++ b/filter/uiconfig/ui/pdfsignpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="PdfSignPage">
     <property name="visible">True</property>
@@ -34,7 +34,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Use this certificate to digitally sign PDF documents:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label2">Use this certificate to digitally sign PDF documents:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">cert</property>
                   </object>
@@ -57,7 +57,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="select">
-                    <property name="label" translatable="yes">Select...</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|select">Select...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -156,7 +156,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_entry">False</property>
                     <items>
-                      <item translatable="yes">None</item>
+                      <item translatable="yes" context="pdfsignpage|tsa">None</item>
                     </items>
                   </object>
                   <packing>
@@ -169,7 +169,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Certificate password:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label7">Certificate password:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">password</property>
                   </object>
@@ -183,7 +183,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Location:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label12">Location:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">location</property>
                   </object>
@@ -197,7 +197,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Contact information:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label13">Contact information:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">contact</property>
                   </object>
@@ -211,7 +211,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Reason:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label14">Reason:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">reason</property>
                   </object>
@@ -225,7 +225,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Time Stamp Authority:</property>
+                    <property name="label" translatable="yes" context="pdfsignpage|label15">Time Stamp Authority:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">reason</property>
                   </object>
@@ -248,7 +248,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Certificate</property>
+        <property name="label" translatable="yes" context="pdfsignpage|label1">Certificate</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui b/filter/uiconfig/ui/pdfuserinterfacepage.ui
index ab359c815277..199cf8e55d20 100644
--- a/filter/uiconfig/ui/pdfuserinterfacepage.ui
+++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -41,7 +41,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="center">
-                        <property name="label" translatable="yes">_Center window on screen</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|center">_Center window on screen</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -57,7 +57,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="resize">
-                        <property name="label" translatable="yes">_Resize window to initial page</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|resize">_Resize window to initial page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -73,7 +73,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="open">
-                        <property name="label" translatable="yes">_Open in full screen mode</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|open">_Open in full screen mode</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -89,7 +89,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="display">
-                        <property name="label" translatable="yes">_Display document title</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|display">_Display document title</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Window Options</property>
+                <property name="label" translatable="yes" context="pdfuserinterfacepage|label1">Window Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -142,7 +142,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="toolbar">
-                        <property name="label" translatable="yes">Hide _toolbar</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|toolbar">Hide _toolbar</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="menubar">
-                        <property name="label" translatable="yes">Hide _menubar</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|menubar">Hide _menubar</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -174,7 +174,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="window">
-                        <property name="label" translatable="yes">Hide _window controls</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|window">Hide _window controls</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">User Interface Options</property>
+                <property name="label" translatable="yes" context="pdfuserinterfacepage|label2">User Interface Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -226,7 +226,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckButton" id="effects">
-                        <property name="label" translatable="yes">_Use transition effects</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|effects">_Use transition effects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -248,7 +248,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transitions</property>
+                <property name="label" translatable="yes" context="pdfuserinterfacepage|label3">Transitions</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -280,7 +280,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="allbookmarks">
-                        <property name="label" translatable="yes">_All bookmark levels</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|allbookmarks">_All bookmark levels</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -297,7 +297,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="visiblebookmark">
-                        <property name="label" translatable="yes">_Visible bookmark levels:</property>
+                        <property name="label" translatable="yes" context="pdfuserinterfacepage|visiblebookmark">_Visible bookmark levels:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -341,7 +341,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bookmarks</property>
+                <property name="label" translatable="yes" context="pdfuserinterfacepage|label4">Bookmarks</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/filter/uiconfig/ui/pdfviewpage.ui b/filter/uiconfig/ui/pdfviewpage.ui
index 4640de4438aa..d6f6f24834b1 100644
--- a/filter/uiconfig/ui/pdfviewpage.ui
+++ b/filter/uiconfig/ui/pdfviewpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -47,7 +47,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="pageonly">
-                        <property name="label" translatable="yes">_Page only</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|pageonly">_Page only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="outline">
-                        <property name="label" translatable="yes">_Bookmarks and page</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|outline">_Bookmarks and page</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="thumbs">
-                        <property name="label" translatable="yes">_Thumbnails and page</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|thumbs">_Thumbnails and page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -104,7 +104,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Open on pa_ge:</property>
+                            <property name="label" translatable="yes" context="pdfviewpage|label4">Open on pa_ge:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">page</property>
                           </object>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Panes</property>
+                <property name="label" translatable="yes" context="pdfviewpage|label2">Panes</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -171,7 +171,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="fitdefault">
-                        <property name="label" translatable="yes">_Default</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|fitdefault">_Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -188,7 +188,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fitwin">
-                        <property name="label" translatable="yes">_Fit in window</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|fitwin">_Fit in window</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -204,7 +204,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fitwidth">
-                        <property name="label" translatable="yes">Fit _width</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|fitwidth">Fit _width</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -220,7 +220,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fitvis">
-                        <property name="label" translatable="yes">Fit _visible</property>
+                        <property name="label" translatable="yes" context="pdfviewpage|fitvis">Fit _visible</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -241,7 +241,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="fitzoom">
-                            <property name="label" translatable="yes">_Zoom factor:</property>
+                            <property name="label" translatable="yes" context="pdfviewpage|fitzoom">_Zoom factor:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -287,7 +287,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Magnification</property>
+                <property name="label" translatable="yes" context="pdfviewpage|label3">Magnification</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -326,7 +326,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="defaultlayout">
-                    <property name="label" translatable="yes">D_efault</property>
+                    <property name="label" translatable="yes" context="pdfviewpage|defaultlayout">D_efault</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -343,7 +343,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="singlelayout">
-                    <property name="label" translatable="yes">_Single page</property>
+                    <property name="label" translatable="yes" context="pdfviewpage|singlelayout">_Single page</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -359,7 +359,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="contlayout">
-                    <property name="label" translatable="yes">_Continuous</property>
+                    <property name="label" translatable="yes" context="pdfviewpage|contlayout">_Continuous</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -375,7 +375,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="contfacinglayout">
-                    <property name="label" translatable="yes">C_ontinuous facing</property>
+                    <property name="label" translatable="yes" context="pdfviewpage|contfacinglayout">C_ontinuous facing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -391,7 +391,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="firstonleft">
-                    <property name="label" translatable="yes">First page is _left</property>
+                    <property name="label" translatable="yes" context="pdfviewpage|firstonleft">First page is _left</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -413,7 +413,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page Layout</property>
+            <property name="label" translatable="yes" context="pdfviewpage|label1">Page Layout</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/filter/uiconfig/ui/testxmlfilter.ui b/filter/uiconfig/ui/testxmlfilter.ui
index fcc3b951192a..c23502c7f29f 100644
--- a/filter/uiconfig/ui/testxmlfilter.ui
+++ b/filter/uiconfig/ui/testxmlfilter.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TestXMLFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Test XML Filter: %s</property>
+    <property name="title" translatable="yes" context="testxmlfilter|TestXMLFilterDialog">Test XML Filter: %s</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -86,7 +86,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">XSLT for export</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|label3">XSLT for export</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -99,7 +99,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Transform document</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|label4">Transform document</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -108,7 +108,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="exportbrowse">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|exportbrowse">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -120,7 +120,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="currentdocument">
-                            <property name="label" translatable="yes">Current Document</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|currentdocument">Current Document</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Export</property>
+                    <property name="label" translatable="yes" context="testxmlfilter|label1">Export</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -202,7 +202,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">XSLT for import</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|label5">XSLT for import</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -211,7 +211,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="importbrowse">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|importbrowse">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -223,7 +223,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="recentfile">
-                            <property name="label" translatable="yes">Recent File</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|recentfile">Recent File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Template for import</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|templateimport">Template for import</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -259,7 +259,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="displaysource">
-                            <property name="label" translatable="yes">Display source</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|displaysource">Display source</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -278,7 +278,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Transform file</property>
+                            <property name="label" translatable="yes" context="testxmlfilter|label6">Transform file</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -323,7 +323,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Import</property>
+                    <property name="label" translatable="yes" context="testxmlfilter|label2">Import</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui
index 1860e84e99d9..0eda449ff96d 100644
--- a/filter/uiconfig/ui/warnpdfdialog.ui
+++ b/filter/uiconfig/ui/warnpdfdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="WarnPDFDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="type">popup</property>
-    <property name="title" translatable="yes">Problems During PDF Export</property>
+    <property name="title" translatable="yes" context="warnpdfdialog|WarnPDFDialog">Problems During PDF Export</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">During PDF export the following problems occurred:</property>
+    <property name="text" translatable="yes" context="warnpdfdialog|WarnPDFDialog">During PDF export the following problems occurred:</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/filter/uiconfig/ui/xmlfiltersettings.ui b/filter/uiconfig/ui/xmlfiltersettings.ui
index 79de962e1205..bacfeebdaebb 100644
--- a/filter/uiconfig/ui/xmlfiltersettings.ui
+++ b/filter/uiconfig/ui/xmlfiltersettings.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="XMLFilterSettingsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">XML Filter Settings</property>
+    <property name="title" translatable="yes" context="xmlfiltersettings|XMLFilterSettingsDialog">XML Filter Settings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -21,7 +21,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="new">
-                <property name="label" translatable="yes">_New...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|new">_New...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">_Edit...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|edit">_Edit...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -49,7 +49,7 @@
             </child>
             <child>
               <object class="GtkButton" id="test">
-                <property name="label" translatable="yes">_Test XSLTs...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|test">_Test XSLTs...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -63,7 +63,7 @@
             </child>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">_Delete...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|delete">_Delete...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -77,7 +77,7 @@
             </child>
             <child>
               <object class="GtkButton" id="save">
-                <property name="label" translatable="yes">_Save as Package...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|save">_Save as Package...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="open">
-                <property name="label" translatable="yes">_Open Package...</property>
+                <property name="label" translatable="yes" context="xmlfiltersettings|open">_Open Package...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -148,7 +148,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="filterlist-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">XML Filter List</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="xmlfiltersettings|filterlist-atkobject">XML Filter List</property>
               </object>
             </child>
           </object>
diff --git a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
index 9b0f4773bf25..7d0a00304eb8 100644
--- a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
+++ b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="XmlFilterTabPageGeneral">
     <property name="visible">True</property>
@@ -20,7 +20,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Filter name:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagegeneral|label2">_Filter name:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">filtername</property>
           </object>
@@ -34,7 +34,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Application:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagegeneral|label3">_Application:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">application</property>
           </object>
@@ -48,7 +48,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Name of file type:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagegeneral|label4">_Name of file type:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">interfacename</property>
           </object>
@@ -62,7 +62,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">File _extension:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagegeneral|label5">File _extension:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">extension</property>
           </object>
@@ -77,7 +77,7 @@
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">Comment_s:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagegeneral|label6">Comment_s:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">description:border</property>
           </object>
diff --git a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
index 44d0e77e9983..9dc0724d7b49 100644
--- a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
+++ b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="XmlFilterTabPageTransformation">
@@ -22,7 +22,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_DocType:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label2">_DocType:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">doc</property>
           </object>
@@ -49,7 +49,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_XSLT for export:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label4">_XSLT for export:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">xsltexport</property>
           </object>
@@ -60,7 +60,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browseexport">
-            <property name="label" translatable="yes">Brows_e...</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browseexport">Brows_e...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -76,7 +76,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">XSLT _for import:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label5">XSLT _for import:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">xsltimport</property>
           </object>
@@ -87,7 +87,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browseimport">
-            <property name="label" translatable="yes">B_rowse...</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browseimport">B_rowse...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -103,7 +103,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Template for _import:</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label6">Template for _import:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">tempimport</property>
           </object>
@@ -114,7 +114,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browsetemp">
-            <property name="label" translatable="yes">Browse...</property>
+            <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browsetemp">Browse...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -172,7 +172,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="filtercb">
-        <property name="label" translatable="yes">The filter needs XSLT 2.0 processor</property>
+        <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|filtercb">The filter needs XSLT 2.0 processor</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
diff --git a/filter/uiconfig/ui/xsltfilterdialog.ui b/filter/uiconfig/ui/xsltfilterdialog.ui
index 8c68701e9697..baa2b3918292 100644
--- a/filter/uiconfig/ui/xsltfilterdialog.ui
+++ b/filter/uiconfig/ui/xsltfilterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="flt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="XSLTFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">XML Filter: %s</property>
+    <property name="title" translatable="yes" context="xsltfilterdialog|XSLTFilterDialog">XML Filter: %s</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General</property>
+                <property name="label" translatable="yes" context="xsltfilterdialog|general">General</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="transformation">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transformation</property>
+                <property name="label" translatable="yes" context="xsltfilterdialog|transformation">Transformation</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/forms/AllLangMoTarget_frm.mk b/forms/AllLangMoTarget_frm.mk
new file mode 100644
index 000000000000..daca0e06d15e
--- /dev/null
+++ b/forms/AllLangMoTarget_frm.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,frm))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,frm,forms))
+
+# vim: set noet sw=4 ts=4:
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
deleted file mode 100644
index cf9f501ee970..000000000000
--- a/forms/AllLangResTarget_frm.mk
+++ /dev/null
@@ -1,30 +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,frm))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,frm,forms))
-
-$(eval $(call gb_AllLangResTarget_add_srs,frm,\
-    frm/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,frm/res))
-
-$(eval $(call gb_SrsTarget_set_include,frm/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/forms/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,frm/res,\
-    forms/source/resource/strings.src \
-    forms/source/resource/xforms.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index cae705c85c8c..b27b99fa48dd 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,frm))
 
 $(eval $(call gb_Library_set_include,frm,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/forms/inc \
     -I$(SRCDIR)/forms/source/inc \
     -I$(SRCDIR)/forms/source/solar/inc \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
index 266f6a3c2aec..7ba484b81d3a 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,forms,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,forms,\
-    AllLangResTarget_frm \
+    AllLangMoTarget_frm \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 332168179df9..a8f5e5efcb2d 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -229,7 +229,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/functional.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/signaturestate.hxx>
@@ -257,7 +256,6 @@
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
diff --git a/forms/inc/strings.hrc b/forms/inc/strings.hrc
new file mode 100644
index 000000000000..50a5a19504f1
--- /dev/null
+++ b/forms/inc/strings.hrc
@@ -0,0 +1,87 @@
+/* -*- 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_BASELISTBOX_ERROR_FILLLIST              NC_("RID_BASELISTBOX_ERROR_FILLLIST", "The contents of a combo box or list field could not be determined.")
+#define RID_STR_IMPORT_GRAPHIC                      NC_("RID_STR_IMPORT_GRAPHIC", "Insert Image" )
+#define RID_STR_CONTROL_SUBSTITUTED_NAME            NC_("RID_STR_CONTROL_SUBSTITUTED_NAME", "substituted")
+#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN        NC_("RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN", "An error occurred while this control was being loaded. It was therefore replaced with a placeholder.")
+#define RID_STR_READERROR                           NC_("RID_STR_READERROR", "Error reading data from database" )
+#define RID_STR_CONNECTERROR                        NC_("RID_STR_CONNECTERROR", "Connection failed" )
+#define RID_ERR_LOADING_FORM                        NC_("RID_ERR_LOADING_FORM", "The data content could not be loaded.")
+#define RID_ERR_REFRESHING_FORM                     NC_("RID_ERR_REFRESHING_FORM", "The data content could not be updated")
+#define RID_STR_ERR_INSERTRECORD                    NC_("RID_STR_ERR_INSERTRECORD", "Error inserting the new record")
+#define RID_STR_ERR_UPDATERECORD                    NC_("RID_STR_ERR_UPDATERECORD", "Error updating the current record")
+#define RID_STR_ERR_DELETERECORD                    NC_("RID_STR_ERR_DELETERECORD", "Error deleting the current record")
+#define RID_STR_ERR_DELETERECORDS                   NC_("RID_STR_ERR_DELETERECORDS", "Error deleting the specified records")
+#define RID_STR_NEED_NON_NULL_OBJECT                NC_("RID_STR_NEED_NON_NULL_OBJECT", "The object cannot be NULL.")
+#define RID_STR_OPEN_GRAPHICS                       NC_("RID_STR_OPEN_GRAPHICS", "Insert Image from...")
+#define RID_STR_CLEAR_GRAPHICS                      NC_("RID_STR_CLEAR_GRAPHICS", "Remove Image")
+#define RID_STR_INVALIDSTREAM                       NC_("RID_STR_INVALIDSTREAM", "The given stream is invalid.")
+#define RID_STR_SYNTAXERROR                         NC_("RID_STR_SYNTAXERROR", "Syntax error in query expression" )
+#define RID_STR_INCOMPATIBLE_TYPES                  NC_("RID_STR_INCOMPATIBLE_TYPES", "The value types supported by the binding cannot be used for exchanging data with this control.")
+#define RID_STR_LABEL_RECORD                        NC_("RID_STR_LABEL_RECORD", "Record")
+#define RID_STR_INVALID_VALIDATOR                   NC_("RID_STR_INVALID_VALIDATOR", "The control is connected to an external value binding, which at the same time acts as validator. You need to revoke the value binding, before you can set a new validator.")
+#define RID_STR_LABEL_OF                            NC_("RID_STR_LABEL_OF", "of")
+#define RID_STR_QUERY_SAVE_MODIFIED_ROW             NC_("RID_STR_QUERY_SAVE_MODIFIED_ROW", "The content of the current form has been modified.\nDo you want to save your changes?")
+#define RID_STR_COULD_NOT_SET_ORDER                 NC_("RID_STR_COULD_NOT_SET_ORDER", "Error setting the sort criteria")
+#define RID_STR_COULD_NOT_SET_FILTER                NC_("RID_STR_COULD_NOT_SET_FILTER", "Error setting the filter criteria")
+#define RID_STR_FEATURE_REQUIRES_PARAMETERS         NC_("RID_STR_FEATURE_REQUIRES_PARAMETERS", "To execute this function, parameters are needed.")
+#define RID_STR_FEATURE_NOT_EXECUTABLE              NC_("RID_STR_FEATURE_NOT_EXECUTABLE", "This function cannot be executed, but is only for status queries.")
+#define RID_STR_FEATURE_UNKNOWN                     NC_("RID_STR_FEATURE_UNKNOWN", "Unknown function.")
+
+#define RID_STR_XFORMS_NO_BINDING_EXPRESSION        NC_("RID_STR_XFORMS_NO_BINDING_EXPRESSION", "Please enter a binding expression.")
+#define RID_STR_XFORMS_INVALID_BINDING_EXPRESSION   NC_("RID_STR_XFORMS_INVALID_BINDING_EXPRESSION", "This is an invalid binding expression.")
+#define RID_STR_XFORMS_INVALID_VALUE                NC_("RID_STR_XFORMS_INVALID_VALUE", "Value is invalid.")
+#define RID_STR_XFORMS_REQUIRED                     NC_("RID_STR_XFORMS_REQUIRED", "A value is required.")
+#define RID_STR_XFORMS_INVALID_CONSTRAINT           NC_("RID_STR_XFORMS_INVALID_CONSTRAINT", "The constraint '$1' not validated.")
+#define RID_STR_XFORMS_VALUE_IS_NOT_A               NC_("RID_STR_XFORMS_VALUE_IS_NOT_A", "The value is not of the type '$2'.")
+#define RID_STR_XFORMS_VALUE_MAX_INCL               NC_("RID_STR_XFORMS_VALUE_MAX_INCL", "The value must be smaller than or equal to $2.")
+#define RID_STR_XFORMS_VALUE_MAX_EXCL               NC_("RID_STR_XFORMS_VALUE_MAX_EXCL", "The value must be smaller than $2.")
+#define RID_STR_XFORMS_VALUE_MIN_INCL               NC_("RID_STR_XFORMS_VALUE_MIN_INCL", "The value must be greater than or equal to $2.")
+#define RID_STR_XFORMS_VALUE_MIN_EXCL               NC_("RID_STR_XFORMS_VALUE_MIN_EXCL", "The value must be greater than $2.")
+#define RID_STR_XFORMS_VALUE_TOTAL_DIGITS           NC_("RID_STR_XFORMS_VALUE_TOTAL_DIGITS", "$2 digits allowed at most.")
+#define RID_STR_XFORMS_VALUE_FRACTION_DIGITS        NC_("RID_STR_XFORMS_VALUE_FRACTION_DIGITS", "$2 fraction digits allowed at most.")
+#define RID_STR_XFORMS_VALUE_LENGTH                 NC_("RID_STR_XFORMS_VALUE_LENGTH", "The string must be $2 characters long.")
+#define RID_STR_XFORMS_VALUE_MIN_LENGTH             NC_("RID_STR_XFORMS_VALUE_MIN_LENGTH", "The string must be at least $2 characters long.")
+#define RID_STR_XFORMS_VALUE_MAX_LENGTH             NC_("RID_STR_XFORMS_VALUE_MAX_LENGTH", "The string can only be $2 characters long at most.")
+#define RID_STR_DATATYPE_STRING                     NC_("RID_STR_DATATYPE_STRING", "String")
+#define RID_STR_DATATYPE_URL                        NC_("RID_STR_DATATYPE_URL", "Hyperlink")
+#define RID_STR_DATATYPE_BOOLEAN                    NC_("RID_STR_DATATYPE_BOOLEAN", "True/False (Boolean)")
+#define RID_STR_DATATYPE_DECIMAL                    NC_("RID_STR_DATATYPE_DECIMAL", "Decimal")
+#define RID_STR_DATATYPE_FLOAT                      NC_("RID_STR_DATATYPE_FLOAT", "Floating point")
+#define RID_STR_DATATYPE_DOUBLE                     NC_("RID_STR_DATATYPE_DOUBLE", "Double")
+#define RID_STR_DATATYPE_DATE                       NC_("RID_STR_DATATYPE_DATE", "Date")
+#define RID_STR_DATATYPE_TIME                       NC_("RID_STR_DATATYPE_TIME", "Time")
+#define RID_STR_DATATYPE_DATETIME                   NC_("RID_STR_DATATYPE_DATETIME", "Date and Time")
+#define RID_STR_DATATYPE_YEAR                       NC_("RID_STR_DATATYPE_YEAR", "Year")
+#define RID_STR_DATATYPE_MONTH                      NC_("RID_STR_DATATYPE_MONTH", "Month")
+#define RID_STR_DATATYPE_DAY                        NC_("RID_STR_DATATYPE_DAY", "Day")
+#define RID_STR_XFORMS_CANT_EVALUATE                NC_("RID_STR_XFORMS_CANT_EVALUATE", "Error during evaluation")
+#define RID_STR_XFORMS_PATTERN_DOESNT_MATCH         NC_("RID_STR_XFORMS_PATTERN_DOESNT_MATCH", "The string '$1' does not match the required regular expression '$2'.")
+#define RID_STR_XFORMS_BINDING_UI_NAME              NC_("RID_STR_XFORMS_BINDING_UI_NAME", "Binding" )
+#define RID_STR_XFORMS_CANT_REMOVE_TYPE             NC_("RID_STR_XFORMS_CANT_REMOVE_TYPE", "This is a built-in type and cannot be removed." )
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 3c8690321704..e8bdea30e299 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -38,7 +38,7 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/servicehelper.hxx>
 #include "services.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include <tools/debug.hxx>
 
 
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index c99cf8a1808e..cac09c9d5099 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -24,7 +24,7 @@
 #include "services.hxx"
 
 #include "frm_resource.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "BaseListBox.hxx"
 
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index d56659fcec70..e4ba7f24fa4b 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -21,7 +21,7 @@
 #include "componenttools.hxx"
 #include "DatabaseForm.hxx"
 #include "EventThread.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "GroupManager.hxx"
 #include "property.hrc"
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 99ecfdb316d1..eef46ef2bbb9 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -25,7 +25,7 @@
 #include <comphelper/basicio.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include "frm_resource.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <com/sun/star/util/Time.hpp>
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 96225e6cba06..eee60278e94f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -19,7 +19,7 @@
 
 #include "Filter.hxx"
 #include "FormComponent.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "property.hrc"
 #include "property.hxx"
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 296b06ca3d68..fae24966a626 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -18,7 +18,7 @@
  */
 #include "componenttools.hxx"
 #include "FormComponent.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "property.hrc"
 #include "services.hxx"
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 096b2bcf9351..cbae77c3211c 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -21,7 +21,7 @@
 #include "property.hrc"
 #include "property.hxx"
 #include "frm_resource.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "propertybaghelper.hxx"
 #include <comphelper/sequence.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 33e66450f2f7..c72c211ce2b0 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -20,7 +20,7 @@
 #include "ImageControl.hxx"
 
 #include "property.hrc"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "services.hxx"
 #include "componenttools.hxx"
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index dd53979ebbc1..7d1f39ca8e14 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -24,7 +24,7 @@
 #include "property.hrc"
 #include "services.hxx"
 #include "frm_resource.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "BaseListBox.hxx"
 #include "listenercontainers.hxx"
 #include "componenttools.hxx"
diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
deleted file mode 100644
index e3a4eb04af90..000000000000
--- a/forms/source/inc/frm_resource.hrc
+++ /dev/null
@@ -1,94 +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_FORMS_SOURCE_INC_FRM_RESOURCE_HRC
-#define INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_FRM_STRINGS_START       RID_FORMLAYER_START
-
-//- String-IDs
-#define RID_BASELISTBOX_ERROR_FILLLIST          ( RID_FRM_STRINGS_START +  0 )
-#define RID_STR_IMPORT_GRAPHIC                  ( RID_FRM_STRINGS_START +  1 )
-#define RID_STR_CONTROL_SUBSTITUTED_NAME        ( RID_FRM_STRINGS_START +  2 )
-#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN    ( RID_FRM_STRINGS_START +  3 )
-#define RID_STR_READERROR                       ( RID_FRM_STRINGS_START +  4 )
-#define RID_STR_CONNECTERROR                    ( RID_FRM_STRINGS_START +  5 )
-#define RID_ERR_LOADING_FORM                    ( RID_FRM_STRINGS_START +  6 )
-#define RID_ERR_REFRESHING_FORM                 ( RID_FRM_STRINGS_START +  7 )
-#define RID_STR_ERR_INSERTRECORD                ( RID_FRM_STRINGS_START +  8 )
-#define RID_STR_ERR_UPDATERECORD                ( RID_FRM_STRINGS_START +  9 )
-#define RID_STR_ERR_DELETERECORD                ( RID_FRM_STRINGS_START + 10 )
-#define RID_STR_ERR_DELETERECORDS               ( RID_FRM_STRINGS_START + 11 )
-#define RID_STR_NEED_NON_NULL_OBJECT            ( RID_FRM_STRINGS_START + 12 )
-#define RID_STR_OPEN_GRAPHICS                   ( RID_FRM_STRINGS_START + 13 )
-#define RID_STR_CLEAR_GRAPHICS                  ( RID_FRM_STRINGS_START + 14 )
-#define RID_STR_INVALIDSTREAM                   ( RID_FRM_STRINGS_START + 15 )
-#define RID_STR_SYNTAXERROR                     ( RID_FRM_STRINGS_START + 16 )
-#define RID_STR_INCOMPATIBLE_TYPES              ( RID_FRM_STRINGS_START + 17 )
-#define RID_STR_INVALID_VALIDATOR               ( RID_FRM_STRINGS_START + 18 )
-#define RID_STR_LABEL_RECORD                    ( RID_FRM_STRINGS_START + 19 )
-#define RID_STR_LABEL_OF                        ( RID_FRM_STRINGS_START + 20 )
-
-#define RID_STR_XFORMS_NO_BINDING_EXPRESSION    ( RID_FRM_STRINGS_START + 21 )
-#define RID_STR_XFORMS_INVALID_BINDING_EXPRESSION (RID_FRM_STRINGS_START + 22)
-#define RID_STR_XFORMS_INVALID_VALUE            ( RID_FRM_STRINGS_START + 23 )
-#define RID_STR_XFORMS_REQUIRED                 ( RID_FRM_STRINGS_START + 24 )
-#define RID_STR_XFORMS_INVALID_CONSTRAINT       ( RID_FRM_STRINGS_START + 25 )
-#define RID_STR_XFORMS_VALUE_IS_NOT_A           ( RID_FRM_STRINGS_START + 26 )
-#define RID_STR_XFORMS_VALUE_MAX_INCL           ( RID_FRM_STRINGS_START + 27 )
-#define RID_STR_XFORMS_VALUE_MAX_EXCL           ( RID_FRM_STRINGS_START + 28 )
-#define RID_STR_XFORMS_VALUE_MIN_INCL           ( RID_FRM_STRINGS_START + 29 )
-#define RID_STR_XFORMS_VALUE_MIN_EXCL           ( RID_FRM_STRINGS_START + 30 )
-#define RID_STR_XFORMS_VALUE_TOTAL_DIGITS       ( RID_FRM_STRINGS_START + 32 )
-#define RID_STR_XFORMS_VALUE_FRACTION_DIGITS    ( RID_FRM_STRINGS_START + 33 )
-#define RID_STR_XFORMS_VALUE_LENGTH             ( RID_FRM_STRINGS_START + 34 )
-#define RID_STR_XFORMS_VALUE_MIN_LENGTH         ( RID_FRM_STRINGS_START + 35 )
-#define RID_STR_XFORMS_VALUE_MAX_LENGTH         ( RID_FRM_STRINGS_START + 36 )
-
-#define RID_STR_DATATYPE_STRING                 ( RID_FRM_STRINGS_START + 37 )
-#define RID_STR_DATATYPE_URL                    ( RID_FRM_STRINGS_START + 38 )
-#define RID_STR_DATATYPE_BOOLEAN                ( RID_FRM_STRINGS_START + 39 )
-#define RID_STR_DATATYPE_DECIMAL                ( RID_FRM_STRINGS_START + 40 )
-#define RID_STR_DATATYPE_FLOAT                  ( RID_FRM_STRINGS_START + 41 )
-#define RID_STR_DATATYPE_DOUBLE                 ( RID_FRM_STRINGS_START + 42 )
-#define RID_STR_DATATYPE_DATE                   ( RID_FRM_STRINGS_START + 43 )
-#define RID_STR_DATATYPE_TIME                   ( RID_FRM_STRINGS_START + 44 )
-#define RID_STR_DATATYPE_DATETIME               ( RID_FRM_STRINGS_START + 45 )
-#define RID_STR_DATATYPE_YEAR                   ( RID_FRM_STRINGS_START + 47 )
-#define RID_STR_DATATYPE_MONTH                  ( RID_FRM_STRINGS_START + 49 )
-#define RID_STR_DATATYPE_DAY                    ( RID_FRM_STRINGS_START + 50 )
-
-#define RID_STR_XFORMS_CANT_EVALUATE            ( RID_FRM_STRINGS_START + 51 )
-#define RID_STR_XFORMS_PATTERN_DOESNT_MATCH     ( RID_FRM_STRINGS_START + 52 )
-#define RID_STR_XFORMS_BINDING_UI_NAME          ( RID_FRM_STRINGS_START + 53 )
-
-#define RID_STR_QUERY_SAVE_MODIFIED_ROW         ( RID_FRM_STRINGS_START + 54 )
-#define RID_STR_COULD_NOT_SET_ORDER             ( RID_FRM_STRINGS_START + 55 )
-#define RID_STR_COULD_NOT_SET_FILTER            ( RID_FRM_STRINGS_START + 56 )
-#define RID_STR_FEATURE_REQUIRES_PARAMETERS     ( RID_FRM_STRINGS_START + 57 )
-#define RID_STR_FEATURE_NOT_EXECUTABLE          ( RID_FRM_STRINGS_START + 58 )
-#define RID_STR_FEATURE_UNKNOWN                 ( RID_FRM_STRINGS_START + 59 )
-
-#define RID_STR_XFORMS_CANT_REMOVE_TYPE         ( RID_FRM_STRINGS_START + 60 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index 6597893ab384..529d0f43b391 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -22,42 +22,18 @@
 
 #include <rtl/ustring.hxx>
 
-class SimpleResMgr;
-
 namespace frm
 {
 
 #define FRM_RES_STRING(id) ResourceManager::loadString(id)
 
     // handling resources within the FormLayer library
-    class ResourceManager
+    namespace ResourceManager
     {
-        static SimpleResMgr*    m_pImpl;
-    private:
-        // no instantiation allowed
-        ResourceManager() = delete;
-        ~ResourceManager() { }
-
-        // we'll instantiate one static member of the following class, which, in its dtor,
-        // ensures that m_pImpl will be deleted
-        class EnsureDelete
-        {
-        public:
-            EnsureDelete() { }
-            ~EnsureDelete();
-        };
-        friend class EnsureDelete;
-
-    protected:
-        static void ensureImplExists();
-
-    public:
-        /** loads the string with the specified resource id from the FormLayer resource file
+        /** loads the string with the specified resource id from the FormLayer mo file
         */
-        static OUString loadString(sal_uInt16 _nResId);
+        OUString loadString(const char* pResId);
     };
-
-
 }
 
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 2d7430ed6cfb..5c2facc6505f 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "InterfaceContainer.hxx"
 #include "componenttools.hxx"
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index 3ae6805694c3..4a3ff363abf6 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -18,58 +18,21 @@
  */
 
 #include "frm_resource.hxx"
-#include <tools/simplerm.hxx>
+#include <tools/resmgr.hxx>
 
-// needed as long as we have no contexts for components
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <svl/solar.hrc>
-
-
 namespace frm
 {
-
-
-    //= ResourceManager
-
-    SimpleResMgr* ResourceManager::m_pImpl = nullptr;
-
-
-    ResourceManager::EnsureDelete::~EnsureDelete()
-    {
-        delete ResourceManager::m_pImpl;
-    }
-
-
-    void ResourceManager::ensureImplExists()
+    namespace ResourceManager
     {
-        if (m_pImpl)
-            return;
-
-        m_pImpl = SimpleResMgr::Create("frm", Application::GetSettings().GetUILanguageTag());
-
-        if (m_pImpl)
+        OUString loadString(const char* pResId)
         {
-            // no that we have a impl class make sure it's deleted on unloading the library
-            static ResourceManager::EnsureDelete    s_aDeleteTheImplClas;
+            static std::locale loc = Translate::Create("frm", Application::GetSettings().GetUILanguageTag());
+            return Translate::get(pResId, loc);
         }
     }
-
-
-    OUString ResourceManager::loadString(sal_uInt16 _nResId)
-    {
-        OUString sReturn;
-
-        ensureImplExists();
-        if (m_pImpl)
-            sReturn = m_pImpl->ReadString(_nResId);
-
-        return sReturn;
-    }
-
-
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src
deleted file mode 100644
index 3a252c7d78ab..000000000000
--- a/forms/source/resource/strings.src
+++ /dev/null
@@ -1,152 +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 "frm_resource.hrc"
-
-String RID_BASELISTBOX_ERROR_FILLLIST
-{
-    Text [ en-US ] = "The contents of a combo box or list field could not be determined.";
-};
-
-String RID_STR_IMPORT_GRAPHIC
-{
-    Text [ en-US ] = "Insert Image" ;
-};
-
-String RID_STR_CONTROL_SUBSTITUTED_NAME
-{
-    Text [ en-US ] = "substituted";
-};
-
-String RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN
-{
-    Text [ en-US ] = "An error occurred while this control was being loaded. It was therefore replaced with a placeholder.";
-};
-
-String RID_STR_READERROR
-{
-    Text [ en-US ] = "Error reading data from database" ;
-};
-
-String RID_STR_CONNECTERROR
-{
-    Text [ en-US ] = "Connection failed" ;
-};
-
-String RID_ERR_LOADING_FORM
-{
-    Text [ en-US ] = "The data content could not be loaded.";
-};
-
-String RID_ERR_REFRESHING_FORM
-{
-    Text [ en-US ] = "The data content could not be updated";
-};
-
-String RID_STR_ERR_INSERTRECORD
-{
-    Text [ en-US ] = "Error inserting the new record";
-};
-
-String RID_STR_ERR_UPDATERECORD
-{
-    Text [ en-US ] = "Error updating the current record";
-};
-
-String RID_STR_ERR_DELETERECORD
-{
-    Text [ en-US ] = "Error deleting the current record";
-};
-
-String RID_STR_ERR_DELETERECORDS
-{
-    Text [ en-US ] = "Error deleting the specified records";
-};
-
-String RID_STR_NEED_NON_NULL_OBJECT
-{
-    Text [ en-US ] = "The object cannot be NULL.";
-};
-
-String RID_STR_OPEN_GRAPHICS
-{
-    Text [ en-US ] = "Insert Image from...";
-};
-
-String RID_STR_CLEAR_GRAPHICS
-{
-    Text [ en-US ] = "Remove Image";
-};
-
-String RID_STR_INVALIDSTREAM
-{
-    Text [ en-US ] = "The given stream is invalid.";
-};
-
-String RID_STR_SYNTAXERROR
-{
-    Text [ en-US ] = "Syntax error in query expression" ;
-};
-
-String RID_STR_INCOMPATIBLE_TYPES
-{
-    Text [ en-US ] = "The value types supported by the binding cannot be used for exchanging data with this control.";
-};
-
-String RID_STR_LABEL_RECORD
-{
-    Text [ en-US ] = "Record";
-};
-
-String RID_STR_INVALID_VALIDATOR
-{
-    Text [ en-US ] = "The control is connected to an external value binding, which at the same time acts as validator. You need to revoke the value binding, before you can set a new validator.";
-};
-
-String RID_STR_LABEL_OF
-{
-    Text [ en-US ] = "of";
-};
-
-String RID_STR_QUERY_SAVE_MODIFIED_ROW
-{
-    Text [ en-US ] = "The content of the current form has been modified.\nDo you want to save your changes?";
-};
-String RID_STR_COULD_NOT_SET_ORDER
-{
-    Text [ en-US ] = "Error setting the sort criteria";
-};
-String RID_STR_COULD_NOT_SET_FILTER
-{
-    Text [ en-US ] = "Error setting the filter criteria";
-};
-String RID_STR_FEATURE_REQUIRES_PARAMETERS
-{
-    Text [ en-US ] = "To execute this function, parameters are needed.";
-};
-String RID_STR_FEATURE_NOT_EXECUTABLE
-{
-    Text [ en-US ] = "This function cannot be executed, but is only for status queries.";
-};
-String RID_STR_FEATURE_UNKNOWN
-{
-    Text [ en-US ] = "Unknown function.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src
deleted file mode 100644
index 8c47e872c49c..000000000000
--- a/forms/source/resource/xforms.src
+++ /dev/null
@@ -1,177 +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 "frm_resource.hrc"
-
-String RID_STR_XFORMS_NO_BINDING_EXPRESSION
-{
-    Text [ en-US ] = "Please enter a binding expression.";
-};
-
-String RID_STR_XFORMS_INVALID_BINDING_EXPRESSION
-{
-    Text [ en-US ] = "This is an invalid binding expression.";
-};
-
-String RID_STR_XFORMS_INVALID_VALUE
-{
-    Text [ en-US ] = "Value is invalid.";
-};
-
-String RID_STR_XFORMS_REQUIRED
-{
-    Text [ en-US ] = "A value is required.";
-};
-
-String RID_STR_XFORMS_INVALID_CONSTRAINT
-{
-    Text [ en-US ] = "The constraint '$1' not validated.";
-};
-
-String RID_STR_XFORMS_VALUE_IS_NOT_A
-{
-    Text [ en-US ] = "The value is not of the type '$2'.";
-};
-
-String RID_STR_XFORMS_VALUE_MAX_INCL
-{
-    Text [ en-US ] = "The value must be smaller than or equal to $2.";
-};
-
-String RID_STR_XFORMS_VALUE_MAX_EXCL
-{
-    Text [ en-US ] = "The value must be smaller than $2.";
-};
-
-String RID_STR_XFORMS_VALUE_MIN_INCL
-{
-    Text [ en-US ] = "The value must be greater than or equal to $2.";
-};
-
-String RID_STR_XFORMS_VALUE_MIN_EXCL
-{
-    Text [ en-US ] = "The value must be greater than $2.";
-};
-
-String RID_STR_XFORMS_VALUE_TOTAL_DIGITS
-{
-    Text [ en-US ] = "$2 digits allowed at most.";
-};
-
-String RID_STR_XFORMS_VALUE_FRACTION_DIGITS
-{
-    Text [ en-US ] = "$2 fraction digits allowed at most.";
-};
-
-String RID_STR_XFORMS_VALUE_LENGTH
-{
-    Text [ en-US ] = "The string must be $2 characters long.";
-};
-
-String RID_STR_XFORMS_VALUE_MIN_LENGTH
-{
-    Text [ en-US ] = "The string must be at least $2 characters long.";
-};
-
-String RID_STR_XFORMS_VALUE_MAX_LENGTH
-{
-    Text [ en-US ] = "The string can only be $2 characters long at most.";
-};
-
-String RID_STR_DATATYPE_STRING
-{
-    Text [ en-US ] = "String";
-};
-
-String RID_STR_DATATYPE_URL
-{
-    Text [ en-US ] = "Hyperlink";
-};
-
-String RID_STR_DATATYPE_BOOLEAN
-{
-    Text [ en-US ] = "True/False (Boolean)";
-};
-
-String RID_STR_DATATYPE_DECIMAL
-{
-    Text [ en-US ] = "Decimal";
-};
-
-String RID_STR_DATATYPE_FLOAT
-{
-    Text [ en-US ] = "Floating point";
-};
-
-String RID_STR_DATATYPE_DOUBLE
-{
-    Text [ en-US ] = "Double";
-};
-
-String RID_STR_DATATYPE_DATE
-{
-    Text [ en-US ] = "Date";
-};
-
-String RID_STR_DATATYPE_TIME
-{
-    Text [ en-US ] = "Time";
-};
-
-String RID_STR_DATATYPE_DATETIME
-{
-    Text [ en-US ] = "Date and Time";
-};
-
-String RID_STR_DATATYPE_YEAR
-{
-    Text [ en-US ] = "Year";
-};
-
-String RID_STR_DATATYPE_MONTH
-{
-    Text [ en-US ] = "Month";
-};
-
-String RID_STR_DATATYPE_DAY
-{
-    Text [ en-US ] = "Day";
-};
-
-String RID_STR_XFORMS_CANT_EVALUATE
-{
-    Text [ en-US ] = "Error during evaluation";
-};
-
-String RID_STR_XFORMS_PATTERN_DOESNT_MATCH
-{
-    Text [ en-US ] = "The string '$1' does not match the required regular expression '$2'.";
-};
-
-String RID_STR_XFORMS_BINDING_UI_NAME
-{
-    Text [ en-US ] = "Binding" ;
-};
-
-String RID_STR_XFORMS_CANT_REMOVE_TYPE
-{
-    Text [ en-US ] = "This is a built-in type and cannot be removed." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index d291bfb4649d..340b4518f7d9 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -22,7 +22,7 @@
 #include "formoperations.hxx"
 #include "frm_strings.hxx"
 #include "frm_resource.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "services.hxx"
 
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
@@ -771,12 +771,12 @@ namespace frm
 
             default:
             {
-                sal_uInt16 nErrorResourceId = RID_STR_FEATURE_UNKNOWN;
+                const char* pErrorResourceId = RID_STR_FEATURE_UNKNOWN;
                 if ( lcl_requiresArguments( _nFeature ) )
-                    nErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS;
+                    pErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS;
                 else if ( !lcl_isExecutableFeature( _nFeature ) )
-                    nErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE;
-                throw IllegalArgumentException( FRM_RES_STRING( nErrorResourceId ), *this, 1 );
+                    pErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE;
+                throw IllegalArgumentException( FRM_RES_STRING( pErrorResourceId ), *this, 1 );
             }
             }   // switch
         }
@@ -1695,7 +1695,7 @@ namespace frm
 
 
     template < typename FunctObj >
-    void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const
+    void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const
     {
         try
         {
@@ -1704,12 +1704,11 @@ namespace frm
 #if HAVE_FEATURE_DBCONNECTIVITY
         catch( const SQLException& )
         {
-            if ( !_nErrorResourceId )
-                // no information to prepend
+            if (!pErrorResourceId) // no information to prepend
                 throw;
 
             SQLExceptionInfo aInfo( ::cppu::getCaughtException() );
-            OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
+            OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) );
             aInfo.prepend( sAdditionalError );
             aInfo.doThrow();
         }
@@ -1717,7 +1716,7 @@ namespace frm
         catch( const RuntimeException& ) { throw; }
         catch( const Exception& )
         {
-            OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
+            OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) );
             throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
         }
     }
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index db76e57f7df8..425e789f8419 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -290,11 +290,11 @@ namespace frm
 
             @param f
                 a functionoid with no arguments to do the work
-            @param _nErrorResourceId
+            @param pErrorResourceId
                 the id of the resources string to use as error message
         */
         template < typename FunctObj >
-        void        impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const;
+        void        impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const;
 
         // functionoid to call appendOrderByColumn
         class impl_appendOrderByColumn_throw
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index dd183941eb61..981a711d085e 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -21,7 +21,7 @@
 #include "navtoolbar.hxx"
 #include "frm_resource.hxx"
 #include "featuredispatcher.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "commandimageprovider.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
@@ -52,10 +52,10 @@ namespace frm
                 || ( _nFeatureId == LID_RECORD_FILLER );
         }
 
-        OUString getLabelString( sal_uInt16 _nResId )
+        OUString getLabelString(const char* pResId)
         {
             OUString sLabel( " " );
-            sLabel += FRM_RES_STRING( _nResId );
+            sLabel += FRM_RES_STRING(pResId);
             sLabel += " ";
             return sLabel;
         }
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 6d622a1ea8c7..cafdd5ce07b3 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -20,7 +20,7 @@
 
 #include "datatyperepository.hxx"
 #include "datatypes.hxx"
-#include "frm_resource.hrc"
+#include "strings.hrc"
 #include "frm_resource.hxx"
 #include "frm_strings.hxx"
 #include "property.hrc"
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 3bd0fb0537a6..5b8373223389 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -159,26 +159,25 @@ namespace xforms
 
     sal_Bool OXSDDataType::validate( const OUString& sValue )
     {
-        return ( _validate( sValue ) == 0 );
+        return ( _validate( sValue ) == nullptr );
     }
 
 
   OUString OXSDDataType::explainInvalid( const OUString& sValue )
     {
         // get reason
-        sal_uInt16 nReason = _validate( sValue );
+        const char* pReason = _validate( sValue );
 
         // get resource and return localized string
-        return ( nReason == 0 )
+        return (!pReason)
             ? OUString()
-            : getResource( nReason, sValue,
-                                   _explainInvalid( nReason ) );
+            : getResource( pReason, sValue,
+                                   _explainInvalid( pReason ) );
     }
 
-
-    OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason )
+    OUString OXSDDataType::_explainInvalid(const OString& rReason)
     {
-        if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == nReason )
+        if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == rReason )
         {
             OSL_ENSURE( !m_sPattern.isEmpty(), "OXSDDataType::_explainInvalid: how can this error occur without a regular expression?" );
             return m_sPattern;
@@ -186,7 +185,6 @@ namespace xforms
         return OUString();
     }
 
-
     namespace
     {
         void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
@@ -215,8 +213,7 @@ namespace xforms
         }
     }
 
-
-    sal_uInt16 OXSDDataType::_validate( const OUString& _rValue )
+    const char* OXSDDataType::_validate( const OUString& _rValue )
     {
         // care for the regular expression
         if ( !m_sPattern.isEmpty() )
@@ -233,7 +230,7 @@ namespace xforms
                 return RID_STR_XFORMS_PATTERN_DOESNT_MATCH;
         }
 
-        return 0;
+        return nullptr;
     }
 
 
@@ -422,66 +419,43 @@ namespace xforms
         return bReturn;
     }
 
-
-    sal_uInt16 OValueLimitedType_Base::_validate( const OUString& rValue )
+    const char* OValueLimitedType_Base::_validate( const OUString& rValue )
     {
-        sal_uInt16 nReason = OXSDDataType::_validate( rValue );
-        if( nReason == 0 )
+        const char* pReason = OXSDDataType::_validate( rValue );
+        if (!pReason)
         {
 
             // convert value and check format
             double f;
             if( ! _getValue( rValue, f ) )
-                nReason = RID_STR_XFORMS_VALUE_IS_NOT_A;
+                pReason = RID_STR_XFORMS_VALUE_IS_NOT_A;
 
             // check range
             else if( ( m_aMaxInclusive.hasValue() ) && f > m_fCachedMaxInclusive )
-                nReason = RID_STR_XFORMS_VALUE_MAX_INCL;
+                pReason = RID_STR_XFORMS_VALUE_MAX_INCL;
             else if( ( m_aMaxExclusive.hasValue() ) && f >= m_fCachedMaxExclusive )
-                nReason = RID_STR_XFORMS_VALUE_MAX_EXCL;
+                pReason = RID_STR_XFORMS_VALUE_MAX_EXCL;
             else if( ( m_aMinInclusive.hasValue() ) && f < m_fCachedMinInclusive )
-                nReason = RID_STR_XFORMS_VALUE_MIN_INCL;
+                pReason = RID_STR_XFORMS_VALUE_MIN_INCL;
             else if( ( m_aMinExclusive.hasValue() ) && f <= m_fCachedMinExclusive )
-                nReason = RID_STR_XFORMS_VALUE_MIN_EXCL;
+                pReason = RID_STR_XFORMS_VALUE_MIN_EXCL;
         }
-        return nReason;
+        return pReason;
     }
 
-
-    OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason )
+    OUString OValueLimitedType_Base::_explainInvalid(const OString& rReason)
     {
         OUStringBuffer sInfo;
-        switch( nReason )
-        {
-        case 0:
-            // nothing to do!
-            break;
-
-        case RID_STR_XFORMS_VALUE_IS_NOT_A:
+        if (rReason == RID_STR_XFORMS_VALUE_IS_NOT_A)
             sInfo.append( getName() );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MAX_INCL:
+        else if (rReason == RID_STR_XFORMS_VALUE_MAX_INCL)
             sInfo.append( typedValueAsHumanReadableString( m_aMaxInclusive ) );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MAX_EXCL:
+        else if (rReason == RID_STR_XFORMS_VALUE_MAX_EXCL)
             sInfo.append( typedValueAsHumanReadableString( m_aMaxExclusive ) );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MIN_INCL:
+        else if (rReason == RID_STR_XFORMS_VALUE_MIN_INCL)
             sInfo.append( typedValueAsHumanReadableString( m_aMinInclusive ) );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MIN_EXCL:
+        else if (rReason == RID_STR_XFORMS_VALUE_MIN_EXCL)
             sInfo.append( typedValueAsHumanReadableString( m_aMinExclusive ) );
-            break;
-
-        default:
-            OSL_FAIL( "OValueLimitedType::_explainInvalid: unknown reason!" );
-            break;
-        }
-
         return sInfo.makeStringAndClear();
     }
 
@@ -538,12 +512,12 @@ namespace xforms
     }
 
 
-    sal_uInt16 OStringType::_validate( const OUString& rValue )
+    const char* OStringType::_validate( const OUString& rValue )
     {
         // check regexp, whitespace etc. in parent class
-        sal_uInt16 nReason = OStringType_Base::_validate( rValue );
+        const char* pReason = OStringType_Base::_validate( rValue );
 
-        if( nReason == 0 )
+        if (!pReason)
         {
             // check string constraints
             sal_Int32 nLength = rValue.getLength();
@@ -551,48 +525,41 @@ namespace xforms
             if ( m_aLength >>= nLimit )
             {
                 if ( nLimit != nLength )
-                    nReason = RID_STR_XFORMS_VALUE_LENGTH;
+                    pReason = RID_STR_XFORMS_VALUE_LENGTH;
             }
             else
             {
                 if ( ( m_aMaxLength >>= nLimit ) && ( nLength > nLimit ) )
-                    nReason = RID_STR_XFORMS_VALUE_MAX_LENGTH;
+                    pReason = RID_STR_XFORMS_VALUE_MAX_LENGTH;
                 else if ( ( m_aMinLength >>= nLimit ) && ( nLength < nLimit ) )
-                    nReason = RID_STR_XFORMS_VALUE_MIN_LENGTH;
+                    pReason = RID_STR_XFORMS_VALUE_MIN_LENGTH;
             }
         }
-        return nReason;
+        return pReason;
     }
 
-
-    OUString OStringType::_explainInvalid( sal_uInt16 nReason )
+    OUString OStringType::_explainInvalid(const OString& rReason)
     {
         sal_Int32 nValue = 0;
         OUStringBuffer sInfo;
-        switch( nReason )
+        if (rReason == RID_STR_XFORMS_VALUE_LENGTH)
         {
-        case 0:
-            // nothing to do!
-            break;
-
-        case RID_STR_XFORMS_VALUE_LENGTH:
             if( m_aLength >>= nValue )
                 sInfo.append( nValue );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MAX_LENGTH:
+        }
+        else if (rReason == RID_STR_XFORMS_VALUE_MAX_LENGTH)
+        {
             if( m_aMaxLength >>= nValue )
                 sInfo.append( nValue );
-            break;
-
-        case RID_STR_XFORMS_VALUE_MIN_LENGTH:
+        }
+        else if (rReason == RID_STR_XFORMS_VALUE_MIN_LENGTH)
+        {
             if( m_aMinLength >>= nValue )
                 sInfo.append( nValue );
-            break;
-
-        default:
-            sInfo.append( OStringType_Base::_explainInvalid( nReason ) );
-            break;
+        }
+        else if (!rReason.isEmpty())
+        {
+            sInfo.append(OStringType_Base::_explainInvalid(rReason));
         }
         return sInfo.makeStringAndClear();
     }
@@ -612,20 +579,19 @@ namespace xforms
         OBooleanType_Base::initializeClone( _rCloneSource );
     }
 
-    sal_uInt16 OBooleanType::_validate( const OUString& sValue )
+    const char* OBooleanType::_validate( const OUString& sValue )
     {
-        sal_uInt16 nInvalidityReason = OBooleanType_Base::_validate( sValue );
-        if ( nInvalidityReason )
-            return nInvalidityReason;
+        const char* pInvalidityReason = OBooleanType_Base::_validate( sValue );
+        if ( pInvalidityReason )
+            return pInvalidityReason;
 
         bool bValid = sValue == "0" || sValue == "1" || sValue == "true" || sValue == "false";
-        return bValid ? 0 : RID_STR_XFORMS_INVALID_VALUE;
+        return bValid ? nullptr : RID_STR_XFORMS_INVALID_VALUE;
     }
 
-
-    OUString OBooleanType::_explainInvalid( sal_uInt16 nReason )
+    OUString OBooleanType::_explainInvalid(const OString& rReason)
     {
-        return ( nReason == 0 ) ? OUString() : getName();
+        return rReason.isEmpty() ? OUString() : getName();
     }
 
     ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass )
@@ -655,12 +621,12 @@ namespace xforms
 
     // validate decimals and return code for which facets failed
     // to be used by: ODecimalType::validate and ODecimalType::explainInvalid
-    sal_uInt16 ODecimalType::_validate( const OUString& rValue )
+    const char* ODecimalType::_validate( const OUString& rValue )
     {
-        sal_Int16 nReason = ODecimalType_Base::_validate( rValue );
+        const char* pReason = ODecimalType_Base::_validate( rValue );
 
         // check digits (if no other cause is available so far)
-        if( nReason == 0 )
+        if (!pReason)
         {
             sal_Int32 nLength = rValue.getLength();
             sal_Int32 n = 0;
@@ -679,40 +645,36 @@ namespace xforms
 
             sal_Int32 nValue = 0;
             if( ( m_aTotalDigits >>= nValue ) &&  nTotalDigits > nValue )
-                nReason = RID_STR_XFORMS_VALUE_TOTAL_DIGITS;
+                pReason = RID_STR_XFORMS_VALUE_TOTAL_DIGITS;
             else if( ( m_aFractionDigits >>= nValue ) &&
                      ( nFractionDigits > nValue ) )
-                nReason = RID_STR_XFORMS_VALUE_FRACTION_DIGITS;
+                pReason = RID_STR_XFORMS_VALUE_FRACTION_DIGITS;
         }
 
-        return nReason;
+        return pReason;
     }
 
-
-    OUString ODecimalType::_explainInvalid( sal_uInt16 nReason )
+    OUString ODecimalType::_explainInvalid(const OString& rReason)
     {
         sal_Int32 nValue = 0;
         OUStringBuffer sInfo;
-        switch( nReason )
+        if (rReason == RID_STR_XFORMS_VALUE_TOTAL_DIGITS)
         {
-        case RID_STR_XFORMS_VALUE_TOTAL_DIGITS:
             if( m_aTotalDigits >>= nValue )
                 sInfo.append( nValue );
-            break;
-
-        case RID_STR_XFORMS_VALUE_FRACTION_DIGITS:
+        }
+        else if (rReason == RID_STR_XFORMS_VALUE_FRACTION_DIGITS)
+        {
             if( m_aFractionDigits >>= nValue )
                 sInfo.append( nValue );
-            break;
-
-        default:
-            sInfo.append( ODecimalType_Base::_explainInvalid( nReason ) );
-            break;
+        }
+        else
+        {
+            sInfo.append(ODecimalType_Base::_explainInvalid(rReason));
         }
         return sInfo.makeStringAndClear();
     }
 
-
     OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         double fValue( 0 );
@@ -751,7 +713,7 @@ namespace xforms
     DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE )
 
 
-    sal_uInt16 ODateType::_validate( const OUString& _rValue )
+    const char* ODateType::_validate( const OUString& _rValue )
     {
         return ODateType_Base::_validate( _rValue );
     }
@@ -793,7 +755,7 @@ namespace xforms
     DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME )
 
 
-    sal_uInt16 OTimeType::_validate( const OUString& _rValue )
+    const char* OTimeType::_validate( const OUString& _rValue )
     {
         return OTimeType_Base::_validate( _rValue );
     }
@@ -841,13 +803,11 @@ namespace xforms
 
     DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME )
 
-
-    sal_uInt16 ODateTimeType::_validate( const OUString& _rValue )
+    const char* ODateTimeType::_validate( const OUString& _rValue )
     {
         return ODateTimeType_Base::_validate( _rValue );
     }
 
-
     namespace
     {
         double lcl_normalizeDateTime( const DateTime& _rValue )
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 7c84694eabcc..ee00452e5b94 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -118,8 +118,8 @@ namespace xforms
         virtual void            initializeClone( const OXSDDataType& _rCloneSource );
 
         // helper method for validate and explainInvalid
-        virtual sal_uInt16  _validate( const OUString& value );
-        virtual OUString _explainInvalid( sal_uInt16 nReason );
+        virtual const char* _validate( const OUString& value );
+        virtual OUString _explainInvalid( const OString& rReason );
 
         // helper method for checking properties values which are to be set
         virtual bool        checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage );
@@ -177,8 +177,8 @@ namespace xforms
 
         // OXSDDataType overridables
         virtual bool            _getValue( const OUString& value, double& fValue );
-        virtual sal_uInt16      _validate( const OUString& value ) override;
-        virtual OUString _explainInvalid( sal_uInt16 nReason ) override;
+        virtual const char*     _validate( const OUString& value ) override;
+        virtual OUString _explainInvalid( const OString& rReason ) override;
 
         // own overridables
         /** translate a given value into a human-readable string
@@ -249,8 +249,8 @@ namespace xforms
         DECLARE_DEFAULT_CLONING( OBooleanType )
 
         // OXSDDataType overridables
-        virtual sal_uInt16      _validate( const OUString& value ) override;
-        virtual OUString _explainInvalid( sal_uInt16 nReason ) override;
+        virtual const char* _validate( const OUString& value ) override;
+        virtual OUString _explainInvalid( const OString& rReason ) override;
     };
 
     class OStringType;
@@ -272,8 +272,8 @@ namespace xforms
         void       initializeTypedClone( const OStringType& _rCloneSource );
 
         // OXSDDataType overridables
-        virtual sal_uInt16      _validate( const OUString& value ) override;
-        virtual OUString _explainInvalid( sal_uInt16 nReason ) override;
+        virtual const char*     _validate( const OUString& value ) override;
+        virtual OUString _explainInvalid( const OString& rReason ) override;
         virtual bool            checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ) override;
         virtual void            registerProperties() override;
     };
@@ -294,8 +294,8 @@ namespace xforms
         void       initializeTypedClone( const ODecimalType& _rCloneSource );
 
         // OXSDDataType overridables
-        virtual sal_uInt16      _validate( const OUString& value ) override;
-        virtual OUString _explainInvalid( sal_uInt16 nReason ) override;
+        virtual const char*     _validate( const OUString& value ) override;
+        virtual OUString _explainInvalid( const OString& rReason ) override;
         virtual void            registerProperties() override;
 
         // OValueLimitedType overridables
@@ -321,7 +321,7 @@ namespace xforms
         DECLARE_DEFAULT_CLONING( classname )                    \
                                                                 \
         /* OXSDDataType overridables */                         \
-        virtual sal_uInt16          _validate( const OUString& value ) override;  \
+        virtual const char*         _validate( const OUString& value ) override;  \
         virtual bool                _getValue( const OUString& value, double& fValue ) override;  \
                                                                 \
         /* OValueLimitedType overridables */                    \
diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx
index a0614572db5f..49ecdb5b6140 100644
--- a/forms/source/xforms/resourcehelper.cxx
+++ b/forms/source/xforms/resourcehelper.cxx
@@ -28,30 +28,30 @@
 namespace xforms
 {
 
-OUString getResource( sal_uInt16 nResourceId )
+OUString getResource(const char* pResourceId)
 {
-    return getResource( nResourceId, OUString(), OUString(), OUString() );
+    return getResource(pResourceId, OUString(), OUString(), OUString());
 }
 
-OUString getResource( sal_uInt16 nResourceId,
-                      const OUString& rInfo1 )
+OUString getResource(const char* pResourceId,
+                     const OUString& rInfo1)
 {
-    return getResource( nResourceId, rInfo1, OUString(), OUString() );
+    return getResource(pResourceId, rInfo1, OUString(), OUString());
 }
 
-OUString getResource( sal_uInt16 nResourceId,
-                      const OUString& rInfo1,
-                      const OUString& rInfo2 )
+OUString getResource(const char* pResourceId,
+                     const OUString& rInfo1,
+                     const OUString& rInfo2)
 {
-    return getResource( nResourceId, rInfo1, rInfo2, OUString() );
+    return getResource(pResourceId, rInfo1, rInfo2, OUString());
 }
 
-OUString getResource( sal_uInt16 nResourceId,
-                      const OUString& rInfo1,
-                      const OUString& rInfo2,
-                      const OUString& rInfo3 )
+OUString getResource(const char* pResourceId,
+                     const OUString& rInfo1,
+                     const OUString& rInfo2,
+                     const OUString& rInfo3)
 {
-    OUString sResource = frm::ResourceManager::loadString( nResourceId );
+    OUString sResource = frm::ResourceManager::loadString(pResourceId);
     OSL_ENSURE( !sResource.isEmpty(), "resource not found?" );
 
     OUString sString( sResource );
diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx
index ef166dae3ad7..85a01cc74737 100644
--- a/forms/source/xforms/resourcehelper.hxx
+++ b/forms/source/xforms/resourcehelper.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX
 
 // include resource IDs
-#include <frm_resource.hrc>
+#include <strings.hrc>
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -28,15 +28,15 @@
 namespace xforms
 {
     /// get a resource string for the current language
-    OUString getResource( sal_uInt16 );
+    OUString getResource(const char*);
 
     // overloaded: get a resource string, and substitute parameters
-    OUString getResource( sal_uInt16, const OUString& );
-    OUString getResource( sal_uInt16, const OUString&,
-                                           const OUString& );
-    OUString getResource( sal_uInt16, const OUString&,
+    OUString getResource(const char*, const OUString&);
+    OUString getResource(const char*, const OUString&,
+                                           const OUString&);
+    OUString getResource(const char*, const OUString&,
                                            const OUString&,
-                                           const OUString& );
+                                           const OUString&);
 
 } // namespace
 
diff --git a/formula/AllLangMoTarget_for.mk b/formula/AllLangMoTarget_for.mk
new file mode 100644
index 000000000000..6d674ac11314
--- /dev/null
+++ b/formula/AllLangMoTarget_for.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,for))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,for,formula))
+
+# vim: set noet sw=4 ts=4:
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
deleted file mode 100644
index 8f7821b46815..000000000000
--- a/formula/AllLangResTarget_for.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,for))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula))
-
-$(eval $(call gb_AllLangResTarget_add_srs,for,\
-    formula/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,formula/res))
-
-$(eval $(call gb_SrsTarget_set_include,formula/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/formula/source/core/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,formula/res,\
-    formula/source/core/resource/core_resource.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
deleted file mode 100644
index ba4b106b0142..000000000000
--- a/formula/AllLangResTarget_forui.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,forui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula))
-
-$(eval $(call gb_AllLangResTarget_add_srs,forui,\
-    formula/ui \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,formula/ui))
-
-$(eval $(call gb_SrsTarget_set_include,formula/ui,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/formula/inc \
-    -I$(SRCDIR)/formula/source/ui/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,formula/ui,\
-    formula/source/ui/dlg/formdlgs.src \
-    formula/source/ui/dlg/parawin.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index dcac26d4a12b..297a6dc2ca3a 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,for))
 
 $(eval $(call gb_Library_set_include,for,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/formula/inc \
     -I$(SRCDIR)/formula/source/core/inc \
 ))
 
@@ -47,7 +48,4 @@ $(eval $(call gb_Library_add_exception_objects,for,\
     formula/source/core/resource/core_resource \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,for,for))
-
 # vim: set noet sw=4 ts=4:
diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk
index 8b39e98aad9f..eac8702bf5ff 100644
--- a/formula/Module_formula.mk
+++ b/formula/Module_formula.mk
@@ -12,12 +12,11 @@ $(eval $(call gb_Module_Module,formula))
 $(eval $(call gb_Module_add_targets,formula,\
     Library_for \
     Library_forui \
+    UIConfig_formula \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,formula,\
-    AllLangResTarget_for \
-    AllLangResTarget_forui \
-    UIConfig_formula \
+    AllLangMoTarget_for \
 ))
 
 # screenshots
diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc
new file mode 100644
index 000000000000..57aa4644e30b
--- /dev/null
+++ b/formula/inc/core_resource.hrc
@@ -0,0 +1,2702 @@
+/* -*- 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_FORMULA_INC_CORE_RESOURCE_HRC
+#define INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC
+
+#include "formula/compiler.hrc"
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+/** These English names are used to store/load ODFF as of ODF v1.2. */
+// NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY
+// such that at least two releases can already read the new name to be
+// introduced by a later release.
+// If there is a reason for another name for some function then add an
+// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
+// ScCompiler::IsOpCode() in the if (mxSymbols->isODFF()) block.
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF[] =
+{
+    { "IF" , SC_OPCODE_IF },
+    { "IFERROR" , SC_OPCODE_IF_ERROR },
+    { "IFNA" , SC_OPCODE_IF_NA },
+    { "CHOOSE" , SC_OPCODE_CHOOSE },
+    { "(" , SC_OPCODE_OPEN },
+    { ")" , SC_OPCODE_CLOSE },
+    // SC_OPCODE_TABLE_REF_... not supported in ODFF
+    { "{" , SC_OPCODE_ARRAY_OPEN },
+    { "}" , SC_OPCODE_ARRAY_CLOSE },
+    { "|" , SC_OPCODE_ARRAY_ROW_SEP },
+    { ";" , SC_OPCODE_ARRAY_COL_SEP },
+    { ";" , SC_OPCODE_SEP },
+    { "%" , SC_OPCODE_PERCENT_SIGN },
+    { "+" , SC_OPCODE_ADD },
+    { "-" , SC_OPCODE_SUB },
+    { "*" , SC_OPCODE_MUL },
+    { "/" , SC_OPCODE_DIV },
+    { "&" , SC_OPCODE_AMPERSAND },
+    { "^" , SC_OPCODE_POW },
+    { "=" , SC_OPCODE_EQUAL },
+    { "<>" , SC_OPCODE_NOT_EQUAL },
+    { "<" , SC_OPCODE_LESS },
+    { ">" , SC_OPCODE_GREATER },
+    { "<=" , SC_OPCODE_LESS_EQUAL },
+    { ">=" , SC_OPCODE_GREATER_EQUAL },
+    { "AND" , SC_OPCODE_AND },
+    { "OR" , SC_OPCODE_OR },
+    { "XOR" , SC_OPCODE_XOR },
+    { "!" , SC_OPCODE_INTERSECT },
+    { "~" , SC_OPCODE_UNION },
+    { ":" , SC_OPCODE_RANGE },
+    { "NOT" , SC_OPCODE_NOT },
+    { "NEG" , SC_OPCODE_NEG },
+    { "-" , SC_OPCODE_NEG_SUB },
+    { "PI" , SC_OPCODE_PI },
+    { "RAND" , SC_OPCODE_RANDOM },
+    { "TRUE" , SC_OPCODE_TRUE },
+    { "FALSE" , SC_OPCODE_FALSE },
+    { "TODAY" , SC_OPCODE_GET_ACT_DATE },
+    { "NOW" , SC_OPCODE_GET_ACT_TIME },
+    { "NA" , SC_OPCODE_NO_VALUE },
+    { "ORG.OPENOFFICE.CURRENT" , SC_OPCODE_CURRENT },
+    { "DEGREES" , SC_OPCODE_DEG },
+    { "RADIANS" , SC_OPCODE_RAD },
+    { "SIN" , SC_OPCODE_SIN },
+    { "COS" , SC_OPCODE_COS },
+    { "TAN" , SC_OPCODE_TAN },
+    { "COT" , SC_OPCODE_COT },
+    { "ASIN" , SC_OPCODE_ARC_SIN },
+    { "ACOS" , SC_OPCODE_ARC_COS },
+    { "ATAN" , SC_OPCODE_ARC_TAN },
+    { "ACOT" , SC_OPCODE_ARC_COT },
+    { "SINH" , SC_OPCODE_SIN_HYP },
+    { "COSH" , SC_OPCODE_COS_HYP },
+    { "TANH" , SC_OPCODE_TAN_HYP },
+    { "COTH" , SC_OPCODE_COT_HYP },
+    { "ASINH" , SC_OPCODE_ARC_SIN_HYP },
+    { "ACOSH" , SC_OPCODE_ARC_COS_HYP },
+    { "ATANH" , SC_OPCODE_ARC_TAN_HYP },
+    { "ACOTH" , SC_OPCODE_ARC_COT_HYP },
+    { "CSC" , SC_OPCODE_COSECANT },
+    { "SEC" , SC_OPCODE_SECANT },
+    { "CSCH" , SC_OPCODE_COSECANT_HYP },
+    { "SECH" , SC_OPCODE_SECANT_HYP },
+    { "EXP" , SC_OPCODE_EXP },
+    { "LN" , SC_OPCODE_LN },
+    { "SQRT" , SC_OPCODE_SQRT },
+    { "FACT" , SC_OPCODE_FACT },
+    { "YEAR" , SC_OPCODE_GET_YEAR },
+    { "MONTH" , SC_OPCODE_GET_MONTH },
+    { "DAY" , SC_OPCODE_GET_DAY },
+    { "HOUR" , SC_OPCODE_GET_HOUR },
+    { "MINUTE" , SC_OPCODE_GET_MIN },
+    { "SECOND" , SC_OPCODE_GET_SEC },
+    { "SIGN" , SC_OPCODE_PLUS_MINUS },
+    { "ABS" , SC_OPCODE_ABS },
+    { "INT" , SC_OPCODE_INT },
+    { "PHI" , SC_OPCODE_PHI },
+    { "GAUSS" , SC_OPCODE_GAUSS },
+    { "ISBLANK" , SC_OPCODE_IS_EMPTY },
+    { "ISTEXT" , SC_OPCODE_IS_STRING },
+    { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING },
+    { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL },
+    { "TYPE" , SC_OPCODE_TYPE },
+    { "CELL" , SC_OPCODE_CELL },
+    { "ISREF" , SC_OPCODE_IS_REF },
+    { "ISNUMBER" , SC_OPCODE_IS_VALUE },
+    { "ISFORMULA" , SC_OPCODE_IS_FORMULA },
+    { "ISNA" , SC_OPCODE_IS_NV },
+    { "ISERR" , SC_OPCODE_IS_ERR },
+    { "ISERROR" , SC_OPCODE_IS_ERROR },
+    { "ISEVEN" , SC_OPCODE_IS_EVEN },
+    { "ISODD" , SC_OPCODE_IS_ODD },
+    { "N" , SC_OPCODE_N },
+    { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE },
+    { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE },
+    { "CODE" , SC_OPCODE_CODE },
+    { "TRIM" , SC_OPCODE_TRIM },
+    { "UPPER" , SC_OPCODE_UPPER },
+    { "PROPER" , SC_OPCODE_PROPER },
+    { "LOWER" , SC_OPCODE_LOWER },
+    { "LEN" , SC_OPCODE_LEN },
+    { "T" , SC_OPCODE_T },
+    { "VALUE" , SC_OPCODE_VALUE },
+    { "CLEAN" , SC_OPCODE_CLEAN },
+    { "CHAR" , SC_OPCODE_CHAR },
+    { "JIS" , SC_OPCODE_JIS },
+    { "ASC" , SC_OPCODE_ASC },
+    { "UNICODE" , SC_OPCODE_UNICODE },
+    { "UNICHAR" , SC_OPCODE_UNICHAR },
+    { "LOG10" , SC_OPCODE_LOG10 },
+    { "EVEN" , SC_OPCODE_EVEN },
+    { "ODD" , SC_OPCODE_ODD },
+    { "LEGACY.NORMSDIST" , SC_OPCODE_STD_NORM_DIST },
+    { "COM.MICROSOFT.NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS },
+    { "FISHER" , SC_OPCODE_FISHER },
+    { "FISHERINV" , SC_OPCODE_FISHER_INV },
+    { "LEGACY.NORMSINV" , SC_OPCODE_S_NORM_INV },
+    { "COM.MICROSOFT.NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS },
+    { "GAMMALN" , SC_OPCODE_GAMMA_LN },
+    { "COM.MICROSOFT.GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS },
+    { "ORG.OPENOFFICE.ERRORTYPE" , SC_OPCODE_ERROR_TYPE },
+    { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF },
+    { "FORMULA" , SC_OPCODE_FORMULA },
+    { "ATAN2" , SC_OPCODE_ARC_TAN_2 },
+    { "COM.MICROSOFT.CEILING.MATH" , SC_OPCODE_CEIL_MATH },
+    { "CEILING" , SC_OPCODE_CEIL },
+    { "COM.MICROSOFT.CEILING" , SC_OPCODE_CEIL_MS },
+    { "COM.MICROSOFT.CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE },
+    { "COM.MICROSOFT.ISO.CEILING" , SC_OPCODE_CEIL_ISO },
+    { "FLOOR" , SC_OPCODE_FLOOR },
+    { "COM.MICROSOFT.FLOOR" , SC_OPCODE_FLOOR_MS },
+    { "COM.MICROSOFT.FLOOR.MATH" , SC_OPCODE_FLOOR_MATH },
+    { "COM.MICROSOFT.FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE },
+    { "ROUND" , SC_OPCODE_ROUND },
+    { "ROUNDUP" , SC_OPCODE_ROUND_UP },
+    { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN },
+    { "TRUNC" , SC_OPCODE_TRUNC },
+    { "LOG" , SC_OPCODE_LOG },
+    { "POWER" , SC_OPCODE_POWER },
+    { "GCD" , SC_OPCODE_GCD },
+    { "LCM" , SC_OPCODE_LCM },
+    { "MOD" , SC_OPCODE_MOD },
+    { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT },
+    { "SUMSQ" , SC_OPCODE_SUM_SQ },
+    { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 },
+    { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 },
+    { "SUMXMY2" , SC_OPCODE_SUM_XMY2 },
+    { "DATE" , SC_OPCODE_GET_DATE },
+    { "TIME" , SC_OPCODE_GET_TIME },
+    { "DAYS" , SC_OPCODE_GET_DIFF_DATE },
+    { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 },
+    { "DATEDIF" , SC_OPCODE_GET_DATEDIF },
+    { "MIN" , SC_OPCODE_MIN },
+    { "MINA" , SC_OPCODE_MIN_A },
+    { "MAX" , SC_OPCODE_MAX },
+    { "MAXA" , SC_OPCODE_MAX_A },
+    { "SUM" , SC_OPCODE_SUM },
+    { "PRODUCT" , SC_OPCODE_PRODUCT },
+    { "AVERAGE" , SC_OPCODE_AVERAGE },
+    { "AVERAGEA" , SC_OPCODE_AVERAGE_A },
+    { "COUNT" , SC_OPCODE_COUNT },
+    { "COUNTA" , SC_OPCODE_COUNT_2 },
+    { "NPV" , SC_OPCODE_NPV },
+    { "IRR" , SC_OPCODE_IRR },
+    { "MIRR" , SC_OPCODE_MIRR },
+    { "ISPMT" , SC_OPCODE_ISPMT },
+    { "VAR" , SC_OPCODE_VAR },
+    { "VARA" , SC_OPCODE_VAR_A },
+    { "VARP" , SC_OPCODE_VAR_P },
+    { "VARPA" , SC_OPCODE_VAR_P_A },
+    { "COM.MICROSOFT.VAR.P" , SC_OPCODE_VAR_P_MS },
+    { "COM.MICROSOFT.VAR.S" , SC_OPCODE_VAR_S },
+    { "STDEV" , SC_OPCODE_ST_DEV },
+    { "STDEVA" , SC_OPCODE_ST_DEV_A },
+    { "STDEVP" , SC_OPCODE_ST_DEV_P },
+    { "STDEVPA" , SC_OPCODE_ST_DEV_P_A },
+    { "COM.MICROSOFT.STDEV.P" , SC_OPCODE_ST_DEV_P_MS },
+    { "COM.MICROSOFT.STDEV.S" , SC_OPCODE_ST_DEV_S },
+    { "BINOM.DIST.RANGE" , SC_OPCODE_B },
+    { "NORMDIST" , SC_OPCODE_NORM_DIST },
+    { "COM.MICROSOFT.NORM.DIST" , SC_OPCODE_NORM_DIST_MS },
+    { "EXPONDIST" , SC_OPCODE_EXP_DIST },
+    { "COM.MICROSOFT.EXPON.DIST" , SC_OPCODE_EXP_DIST_MS },
+    { "BINOMDIST" , SC_OPCODE_BINOM_DIST },
+    { "COM.MICROSOFT.BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS },
+    { "POISSON" , SC_OPCODE_POISSON_DIST },
+    { "COM.MICROSOFT.POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS },
+    { "COMBIN" , SC_OPCODE_COMBIN },
+    { "COMBINA" , SC_OPCODE_COMBIN_A },
+    { "PERMUT" , SC_OPCODE_PERMUT },
+    { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A },
+    { "PV" , SC_OPCODE_PV },
+    { "SYD" , SC_OPCODE_SYD },
+    { "DDB" , SC_OPCODE_DDB },
+    { "DB" , SC_OPCODE_DB },
+    { "VDB" , SC_OPCODE_VBD },
+    { "PDURATION" , SC_OPCODE_PDURATION },
+    { "SLN" , SC_OPCODE_SLN },
+    { "PMT" , SC_OPCODE_PMT },
+    { "COLUMNS" , SC_OPCODE_COLUMNS },
+    { "ROWS" , SC_OPCODE_ROWS },
+    { "SHEETS" , SC_OPCODE_SHEETS },
+    { "COLUMN" , SC_OPCODE_COLUMN },
+    { "ROW" , SC_OPCODE_ROW },
+    { "SHEET" , SC_OPCODE_SHEET },
+    { "RRI" , SC_OPCODE_RRI },
+    { "FV" , SC_OPCODE_FV },
+    { "NPER" , SC_OPCODE_NPER },
+    { "RATE" , SC_OPCODE_RATE },
+    { "IPMT" , SC_OPCODE_IPMT },
+    { "PPMT" , SC_OPCODE_PPMT },
+    { "CUMIPMT" , SC_OPCODE_CUM_IPMT },
+    { "CUMPRINC" , SC_OPCODE_CUM_PRINC },
+    { "EFFECT" , SC_OPCODE_EFFECT },
+    { "NOMINAL" , SC_OPCODE_NOMINAL },
+    { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL },
+    { "DSUM" , SC_OPCODE_DB_SUM },
+    { "DCOUNT" , SC_OPCODE_DB_COUNT },
+    { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 },
+    { "DAVERAGE" , SC_OPCODE_DB_AVERAGE },
+    { "DGET" , SC_OPCODE_DB_GET },
+    { "DMAX" , SC_OPCODE_DB_MAX },
+    { "DMIN" , SC_OPCODE_DB_MIN },
+    { "DPRODUCT" , SC_OPCODE_DB_PRODUCT },
+    { "DSTDEV" , SC_OPCODE_DB_STD_DEV },
+    { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P },
+    { "DVAR" , SC_OPCODE_DB_VAR },
+    { "DVARP" , SC_OPCODE_DB_VAR_P },
+    { "INDIRECT" , SC_OPCODE_INDIRECT },
+    { "ADDRESS" , SC_OPCODE_ADDRESS },
+    { "MATCH" , SC_OPCODE_MATCH },
+    { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { "COUNTIF" , SC_OPCODE_COUNT_IF },
+    { "SUMIF" , SC_OPCODE_SUM_IF },
+    { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF },
+    { "SUMIFS" , SC_OPCODE_SUM_IFS },
+    { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS },
+    { "COUNTIFS" , SC_OPCODE_COUNT_IFS },
+    { "LOOKUP" , SC_OPCODE_LOOKUP },
+    { "VLOOKUP" , SC_OPCODE_V_LOOKUP },
+    { "HLOOKUP" , SC_OPCODE_H_LOOKUP },
+    { "ORG.OPENOFFICE.MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union)
+    { "OFFSET" , SC_OPCODE_OFFSET },
+    { "INDEX" , SC_OPCODE_INDEX },
+    { "AREAS" , SC_OPCODE_AREAS },
+    { "DOLLAR" , SC_OPCODE_CURRENCY },
+    { "REPLACE" , SC_OPCODE_REPLACE },
+    { "FIXED" , SC_OPCODE_FIXED },
+    { "FIND" , SC_OPCODE_FIND },
+    { "EXACT" , SC_OPCODE_EXACT },
+    { "LEFT" , SC_OPCODE_LEFT },
+    { "RIGHT" , SC_OPCODE_RIGHT },
+    { "SEARCH" , SC_OPCODE_SEARCH },
+    { "MID" , SC_OPCODE_MID },
+    { "LENB" , SC_OPCODE_LENB },
+    { "RIGHTB" , SC_OPCODE_RIGHTB },
+    { "LEFTB" , SC_OPCODE_LEFTB },
+    { "REPLACEB" , SC_OPCODE_REPLACEB },
+    { "MIDB" , SC_OPCODE_MIDB },
+    { "TEXT" , SC_OPCODE_TEXT },
+    { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE },
+    { "REPT" , SC_OPCODE_REPT },
+    { "CONCATENATE" , SC_OPCODE_CONCAT },
+    { "COM.MICROSOFT.CONCAT" , SC_OPCODE_CONCAT_MS },
+    { "COM.MICROSOFT.TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS },
+    { "COM.MICROSOFT.IFS" , SC_OPCODE_IFS_MS },
+    { "COM.MICROSOFT.SWITCH" , SC_OPCODE_SWITCH_MS },
+    { "COM.MICROSOFT.MINIFS" , SC_OPCODE_MINIFS_MS },
+    { "COM.MICROSOFT.MAXIFS" , SC_OPCODE_MAXIFS_MS },
+    { "MVALUE" , SC_OPCODE_MAT_VALUE },
+    { "MDETERM" , SC_OPCODE_MAT_DET },
+    { "MINVERSE" , SC_OPCODE_MAT_INV },
+    { "MMULT" , SC_OPCODE_MAT_MULT },
+    { "TRANSPOSE" , SC_OPCODE_MAT_TRANS },
+    { "MUNIT" , SC_OPCODE_MATRIX_UNIT },
+    { "ORG.OPENOFFICE.GOALSEEK" , SC_OPCODE_BACK_SOLVER },
+    { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST },
+    { "COM.MICROSOFT.HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST },
+    { "COM.MICROSOFT.LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS },
+    { "LEGACY.TDIST" , SC_OPCODE_T_DIST },
+    { "COM.MICROSOFT.T.DIST.2T" , SC_OPCODE_T_DIST_2T },
+    { "COM.MICROSOFT.T.DIST" , SC_OPCODE_T_DIST_MS },
+    { "COM.MICROSOFT.T.DIST.RT" , SC_OPCODE_T_DIST_RT },
+    { "LEGACY.FDIST" , SC_OPCODE_F_DIST },
+    { "FDIST" , SC_OPCODE_F_DIST_LT },
+    { "COM.MICROSOFT.F.DIST.RT" , SC_OPCODE_F_DIST_RT },
+    { "LEGACY.CHIDIST" , SC_OPCODE_CHI_DIST },
+    { "COM.MICROSOFT.CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS },
+    { "WEIBULL" , SC_OPCODE_WEIBULL },
+    { "COM.MICROSOFT.WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS },
+    { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT },
+    { "COM.MICROSOFT.NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { "CRITBINOM" , SC_OPCODE_CRIT_BINOM },
+    { "COM.MICROSOFT.BINOM.INV" , SC_OPCODE_BINOM_INV },
+    { "KURT" , SC_OPCODE_KURT },
+    { "HARMEAN" , SC_OPCODE_HAR_MEAN },
+    { "GEOMEAN" , SC_OPCODE_GEO_MEAN },
+    { "STANDARDIZE" , SC_OPCODE_STANDARD },
+    { "AVEDEV" , SC_OPCODE_AVE_DEV },
+    { "SKEW" , SC_OPCODE_SKEW },
+    { "SKEWP" , SC_OPCODE_SKEWP },
+    { "DEVSQ" , SC_OPCODE_DEV_SQ },
+    { "MEDIAN" , SC_OPCODE_MEDIAN },
+    { "MODE" , SC_OPCODE_MODAL_VALUE },
+    { "COM.MICROSOFT.MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS },
+    { "COM.MICROSOFT.MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI },
+    { "ZTEST" , SC_OPCODE_Z_TEST },
+    { "COM.MICROSOFT.Z.TEST" , SC_OPCODE_Z_TEST_MS },
+    { "COM.MICROSOFT.AGGREGATE" , SC_OPCODE_AGGREGATE },
+    { "TTEST" , SC_OPCODE_T_TEST },
+    { "COM.MICROSOFT.T.TEST" , SC_OPCODE_T_TEST_MS },
+    { "RANK" , SC_OPCODE_RANK },
+    { "PERCENTILE" , SC_OPCODE_PERCENTILE },
+    { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK },
+    { "COM.MICROSOFT.PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC },
+    { "COM.MICROSOFT.PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC },
+    { "COM.MICROSOFT.QUARTILE.INC" , SC_OPCODE_QUARTILE_INC },
+    { "COM.MICROSOFT.RANK.EQ" , SC_OPCODE_RANK_EQ },
+    { "COM.MICROSOFT.PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC },
+    { "COM.MICROSOFT.PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC },
+    { "COM.MICROSOFT.QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC },
+    { "COM.MICROSOFT.RANK.AVG" , SC_OPCODE_RANK_AVG },
+    { "LARGE" , SC_OPCODE_LARGE },
+    { "SMALL" , SC_OPCODE_SMALL },
+    { "FREQUENCY" , SC_OPCODE_FREQUENCY },
+    { "QUARTILE" , SC_OPCODE_QUARTILE },
+    { "NORMINV" , SC_OPCODE_NORM_INV },
+    { "COM.MICROSOFT.NORM.INV" , SC_OPCODE_NORM_INV_MS },
+    { "CONFIDENCE" , SC_OPCODE_CONFIDENCE },
+    { "COM.MICROSOFT.CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N },
+    { "COM.MICROSOFT.CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T },
+    { "FTEST" , SC_OPCODE_F_TEST },
+    { "COM.MICROSOFT.F.TEST" , SC_OPCODE_F_TEST_MS },
+    { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN },
+    { "PROB" , SC_OPCODE_PROB },
+    { "CORREL" , SC_OPCODE_CORREL },
+    { "COVAR" , SC_OPCODE_COVAR },
+    { "COM.MICROSOFT.COVARIANCE.P" , SC_OPCODE_COVARIANCE_P },
+    { "COM.MICROSOFT.COVARIANCE.S" , SC_OPCODE_COVARIANCE_S },
+    { "PEARSON" , SC_OPCODE_PEARSON },
+    { "RSQ" , SC_OPCODE_RSQ },
+    { "STEYX" , SC_OPCODE_STEYX },
+    { "SLOPE" , SC_OPCODE_SLOPE },
+    { "INTERCEPT" , SC_OPCODE_INTERCEPT },
+    { "TREND" , SC_OPCODE_TREND },
+    { "GROWTH" , SC_OPCODE_GROWTH },
+    { "LINEST" , SC_OPCODE_LINEST },
+    { "LOGEST" , SC_OPCODE_LOGEST },
+    { "FORECAST" , SC_OPCODE_FORECAST },
+    { "COM.MICROSOFT.FORECAST.ETS" , SC_OPCODE_FORECAST_ETS_ADD },
+    { "COM.MICROSOFT.FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA },
+    { "ORG.LIBREOFFICE.FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL },
+    { "COM.MICROSOFT.FORECAST.ETS.CONFINT" , SC_OPCODE_FORECAST_ETS_PIA },
+    { "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM },
+    { "COM.MICROSOFT.FORECAST.ETS.STAT" , SC_OPCODE_FORECAST_ETS_STA },
+    { "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM },
+    { "COM.MICROSOFT.FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN },
+    { "LEGACY.CHIINV" , SC_OPCODE_CHI_INV },
+    { "COM.MICROSOFT.CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS },
+    { "GAMMADIST" , SC_OPCODE_GAMMA_DIST },
+    { "COM.MICROSOFT.GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS },
+    { "GAMMAINV" , SC_OPCODE_GAMMA_INV },
+    { "COM.MICROSOFT.GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS },
+    { "TINV" , SC_OPCODE_T_INV },
+    { "COM.MICROSOFT.T.INV.2T" , SC_OPCODE_T_INV_2T },
+    { "COM.MICROSOFT.T.INV" , SC_OPCODE_T_INV_MS },
+    { "LEGACY.FINV" , SC_OPCODE_F_INV },
+    { "FINV" , SC_OPCODE_F_INV_LT },
+    { "COM.MICROSOFT.F.INV.RT" , SC_OPCODE_F_INV_RT },
+    { "LEGACY.CHITEST" , SC_OPCODE_CHI_TEST },
+    { "COM.MICROSOFT.CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS },
+    { "LOGINV" , SC_OPCODE_LOG_INV },
+    { "COM.MICROSOFT.LOGNORM.INV" , SC_OPCODE_LOG_INV_MS },
+    { "MULTIPLE.OPERATIONS" , SC_OPCODE_TABLE_OP },
+    { "BETADIST" , SC_OPCODE_BETA_DIST },
+    { "BETAINV" , SC_OPCODE_BETA_INV },
+    { "COM.MICROSOFT.BETA.DIST" , SC_OPCODE_BETA_DIST_MS },
+    { "COM.MICROSOFT.BETA.INV" , SC_OPCODE_BETA_INV_MS },
+    { "WEEKNUM" , SC_OPCODE_WEEK },
+    { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
+    { "ORG.LIBREOFFICE.WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
+    { "ORG.OPENOFFICE.EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+    { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
+    { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
+    { "COM.MICROSOFT.NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
+    { "COM.MICROSOFT.WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS },
+    { "#NAME!" , SC_OPCODE_NO_NAME },
+    { "ORG.OPENOFFICE.STYLE" , SC_OPCODE_STYLE },
+    { "DDE" , SC_OPCODE_DDE },
+    { "BASE" , SC_OPCODE_BASE },
+    { "DECIMAL" , SC_OPCODE_DECIMAL },
+    { "ORG.OPENOFFICE.CONVERT" , SC_OPCODE_CONVERT_OOO },
+    { "ROMAN" , SC_OPCODE_ROMAN },
+    { "ARABIC" , SC_OPCODE_ARABIC },
+    { "HYPERLINK" , SC_OPCODE_HYPERLINK },
+    { "INFO" , SC_OPCODE_INFO },
+    { "COM.MICROSOFT.BAHTTEXT" , SC_OPCODE_BAHTTEXT },
+    { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA },
+    { "EUROCONVERT" , SC_OPCODE_EUROCONVERT },
+    { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE },
+    { "GAMMA" , SC_OPCODE_GAMMA },
+    { "CHISQDIST" , SC_OPCODE_CHISQ_DIST },
+    { "COM.MICROSOFT.CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS },
+    { "CHISQINV" , SC_OPCODE_CHISQ_INV },
+    { "COM.MICROSOFT.CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS },
+    { "BITAND" , SC_OPCODE_BITAND },
+    { "BITOR" , SC_OPCODE_BITOR },
+    { "BITXOR" , SC_OPCODE_BITXOR },
+    { "BITRSHIFT" , SC_OPCODE_BITRSHIFT },
+    { "BITLSHIFT" , SC_OPCODE_BITLSHIFT },
+    /* BEGIN defined ERROR.TYPE() values. */
+    { "#NULL!" , SC_OPCODE_ERROR_NULL },
+    { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO },
+    { "#VALUE!" , SC_OPCODE_ERROR_VALUE },
+    { "#REF!" , SC_OPCODE_ERROR_REF },
+    { "#NAME?" , SC_OPCODE_ERROR_NAME },
+    { "#NUM!" , SC_OPCODE_ERROR_NUM },
+    { "#N/A" , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+    { "COM.MICROSOFT.FILTERXML" , SC_OPCODE_FILTERXML },
+    { "COM.MICROSOFT.WEBSERVICE" , SC_OPCODE_WEBSERVICE },
+    { "ORG.LIBREOFFICE.COLOR" , SC_OPCODE_COLOR },
+    { "COM.MICROSOFT.ERF.PRECISE" , SC_OPCODE_ERF_MS },
+    { "COM.MICROSOFT.ERFC.PRECISE" , SC_OPCODE_ERFC_MS },
+    { "COM.MICROSOFT.ENCODEURL" , SC_OPCODE_ENCODEURL },
+    { "ORG.LIBREOFFICE.RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT },
+    { "ORG.LIBREOFFICE.ROUNDSIG" , SC_OPCODE_ROUNDSIG },
+    { nullptr,  -1 }
+};
+
+/** These function names are used in the OOXML XLSX import/export. */
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML[] =
+{
+    { "IF" , SC_OPCODE_IF },
+    { "IFERROR" , SC_OPCODE_IF_ERROR },
+    { "_xlfn.IFNA" , SC_OPCODE_IF_NA },
+    { "CHOOSE" , SC_OPCODE_CHOOSE },
+    { "(" , SC_OPCODE_OPEN },
+    { ")" , SC_OPCODE_CLOSE },
+    { "[" , SC_OPCODE_TABLE_REF_OPEN },
+    { "]" , SC_OPCODE_TABLE_REF_CLOSE },
+    { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL },
+    { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS },
+    { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA },
+    { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS },
+    { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW },
+    { "{" , SC_OPCODE_ARRAY_OPEN },
+    { "}" , SC_OPCODE_ARRAY_CLOSE },
+    { ";" , SC_OPCODE_ARRAY_ROW_SEP },
+    { "," , SC_OPCODE_ARRAY_COL_SEP },
+    { "," , SC_OPCODE_SEP },
+    { "%" , SC_OPCODE_PERCENT_SIGN },
+    { "+" , SC_OPCODE_ADD },
+    { "-" , SC_OPCODE_SUB },
+    { "*" , SC_OPCODE_MUL },
+    { "/" , SC_OPCODE_DIV },
+    { "&" , SC_OPCODE_AMPERSAND },
+    { "^" , SC_OPCODE_POW },
+    { "=" , SC_OPCODE_EQUAL },
+    { "<>" , SC_OPCODE_NOT_EQUAL },
+    { "<" , SC_OPCODE_LESS },
+    { ">" , SC_OPCODE_GREATER },
+    { "<=" , SC_OPCODE_LESS_EQUAL },
+    { ">=" , SC_OPCODE_GREATER_EQUAL },
+    { "AND" , SC_OPCODE_AND },
+    { "OR" , SC_OPCODE_OR },
+    { "_xlfn.XOR" , SC_OPCODE_XOR },
+    { " " , SC_OPCODE_INTERSECT },
+    { "~" , SC_OPCODE_UNION },
+    { ":" , SC_OPCODE_RANGE },
+    { "NOT" , SC_OPCODE_NOT },
+    { "NEG" , SC_OPCODE_NEG },
+    { "-" , SC_OPCODE_NEG_SUB },
+    { "PI" , SC_OPCODE_PI },
+    { "RAND" , SC_OPCODE_RANDOM },
+    { "TRUE" , SC_OPCODE_TRUE },
+    { "FALSE" , SC_OPCODE_FALSE },
+    { "TODAY" , SC_OPCODE_GET_ACT_DATE },
+    { "NOW" , SC_OPCODE_GET_ACT_TIME },
+    { "NA" , SC_OPCODE_NO_VALUE },
+    { "_xlfn.ORG.OPENOFFICE.CURRENT" , SC_OPCODE_CURRENT },
+    { "DEGREES" , SC_OPCODE_DEG },
+    { "RADIANS" , SC_OPCODE_RAD },
+    { "SIN" , SC_OPCODE_SIN },
+    { "COS" , SC_OPCODE_COS },
+    { "TAN" , SC_OPCODE_TAN },
+    { "_xlfn.COT" , SC_OPCODE_COT },
+    { "ASIN" , SC_OPCODE_ARC_SIN },
+    { "ACOS" , SC_OPCODE_ARC_COS },
+    { "ATAN" , SC_OPCODE_ARC_TAN },
+    { "_xlfn.ACOT" , SC_OPCODE_ARC_COT },
+    { "SINH" , SC_OPCODE_SIN_HYP },
+    { "COSH" , SC_OPCODE_COS_HYP },
+    { "TANH" , SC_OPCODE_TAN_HYP },
+    { "_xlfn.COTH" , SC_OPCODE_COT_HYP },
+    { "ASINH" , SC_OPCODE_ARC_SIN_HYP },
+    { "ACOSH" , SC_OPCODE_ARC_COS_HYP },
+    { "ATANH" , SC_OPCODE_ARC_TAN_HYP },
+    { "_xlfn.ACOTH" , SC_OPCODE_ARC_COT_HYP },
+    { "_xlfn.CSC" , SC_OPCODE_COSECANT },
+    { "_xlfn.SEC" , SC_OPCODE_SECANT },
+    { "_xlfn.CSCH" , SC_OPCODE_COSECANT_HYP },
+    { "_xlfn.SECH" , SC_OPCODE_SECANT_HYP },
+    { "EXP" , SC_OPCODE_EXP },
+    { "LN" , SC_OPCODE_LN },
+    { "SQRT" , SC_OPCODE_SQRT },
+    { "FACT" , SC_OPCODE_FACT },
+    { "YEAR" , SC_OPCODE_GET_YEAR },
+    { "MONTH" , SC_OPCODE_GET_MONTH },
+    { "DAY" , SC_OPCODE_GET_DAY },
+    { "HOUR" , SC_OPCODE_GET_HOUR },
+    { "MINUTE" , SC_OPCODE_GET_MIN },
+    { "SECOND" , SC_OPCODE_GET_SEC },
+    { "SIGN" , SC_OPCODE_PLUS_MINUS },
+    { "ABS" , SC_OPCODE_ABS },
+    { "INT" , SC_OPCODE_INT },
+    { "_xlfn.PHI" , SC_OPCODE_PHI },
+    { "_xlfn.GAUSS" , SC_OPCODE_GAUSS },
+    { "ISBLANK" , SC_OPCODE_IS_EMPTY },
+    { "ISTEXT" , SC_OPCODE_IS_STRING },
+    { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING },
+    { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL },
+    { "TYPE" , SC_OPCODE_TYPE },
+    { "CELL" , SC_OPCODE_CELL },
+    { "ISREF" , SC_OPCODE_IS_REF },
+    { "ISNUMBER" , SC_OPCODE_IS_VALUE },
+    { "_xlfn.ISFORMULA" , SC_OPCODE_IS_FORMULA },
+    { "ISNA" , SC_OPCODE_IS_NV },
+    { "ISERR" , SC_OPCODE_IS_ERR },
+    { "ISERROR" , SC_OPCODE_IS_ERROR },
+    { "ISEVEN" , SC_OPCODE_IS_EVEN },
+    { "ISODD" , SC_OPCODE_IS_ODD },
+    { "N" , SC_OPCODE_N },
+    { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE },
+    { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE },
+    { "CODE" , SC_OPCODE_CODE },
+    { "TRIM" , SC_OPCODE_TRIM },
+    { "UPPER" , SC_OPCODE_UPPER },
+    { "PROPER" , SC_OPCODE_PROPER },
+    { "LOWER" , SC_OPCODE_LOWER },
+    { "LEN" , SC_OPCODE_LEN },
+    { "T" , SC_OPCODE_T },
+    { "VALUE" , SC_OPCODE_VALUE },
+    { "CLEAN" , SC_OPCODE_CLEAN },
+    { "CHAR" , SC_OPCODE_CHAR },
+    { "JIS" , SC_OPCODE_JIS },
+    { "ASC" , SC_OPCODE_ASC },
+    { "_xlfn.UNICODE" , SC_OPCODE_UNICODE },
+    { "_xlfn.UNICHAR" , SC_OPCODE_UNICHAR },
+    { "LOG10" , SC_OPCODE_LOG10 },
+    { "EVEN" , SC_OPCODE_EVEN },
+    { "ODD" , SC_OPCODE_ODD },
+    { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST },
+    { "_xlfn.NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS },
+    { "FISHER" , SC_OPCODE_FISHER },
+    { "FISHERINV" , SC_OPCODE_FISHER_INV },
+    { "NORMSINV" , SC_OPCODE_S_NORM_INV },
+    { "_xlfn.NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS },
+    { "GAMMALN" , SC_OPCODE_GAMMA_LN },
+    { "_xlfn.GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS },
+    { "_xlfn.ORG.OPENOFFICE.ERRORTYPE" , SC_OPCODE_ERROR_TYPE },
+    { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF },
+    { "_xlfn.FORMULATEXT" , SC_OPCODE_FORMULA },
+    { "ATAN2" , SC_OPCODE_ARC_TAN_2 },
+    { "_xlfn.CEILING.MATH" , SC_OPCODE_CEIL_MATH },
+    { "_xlfn.CEILING.MATH" , SC_OPCODE_CEIL },
+    { "CEILING" , SC_OPCODE_CEIL_MS },
+    { "_xlfn.CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE },
+    { "ISO.CEILING" , SC_OPCODE_CEIL_ISO },
+    { "FLOOR" , SC_OPCODE_FLOOR_MS },
+    { "_xlfn.FLOOR.MATH" , SC_OPCODE_FLOOR_MATH },
+    { "_xlfn.FLOOR.MATH" , SC_OPCODE_FLOOR },
+    { "_xlfn.FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE },
+    { "ROUND" , SC_OPCODE_ROUND },
+    { "ROUNDUP" , SC_OPCODE_ROUND_UP },
+    { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN },
+    { "TRUNC" , SC_OPCODE_TRUNC },
+    { "LOG" , SC_OPCODE_LOG },
+    { "POWER" , SC_OPCODE_POWER },
+    { "GCD" , SC_OPCODE_GCD },
+    { "LCM" , SC_OPCODE_LCM },
+    { "MOD" , SC_OPCODE_MOD },
+    { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT },
+    { "SUMSQ" , SC_OPCODE_SUM_SQ },
+    { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 },
+    { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 },
+    { "SUMXMY2" , SC_OPCODE_SUM_XMY2 },
+    { "DATE" , SC_OPCODE_GET_DATE },
+    { "TIME" , SC_OPCODE_GET_TIME },
+    { "_xlfn.DAYS" , SC_OPCODE_GET_DIFF_DATE },
+    { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 },
+    { "DATEDIF" , SC_OPCODE_GET_DATEDIF },
+    { "MIN" , SC_OPCODE_MIN },
+    { "MINA" , SC_OPCODE_MIN_A },
+    { "MAX" , SC_OPCODE_MAX },
+    { "MAXA" , SC_OPCODE_MAX_A },
+    { "SUM" , SC_OPCODE_SUM },
+    { "PRODUCT" , SC_OPCODE_PRODUCT },
+    { "AVERAGE" , SC_OPCODE_AVERAGE },
+    { "AVERAGEA" , SC_OPCODE_AVERAGE_A },
+    { "COUNT" , SC_OPCODE_COUNT },
+    { "COUNTA" , SC_OPCODE_COUNT_2 },
+    { "NPV" , SC_OPCODE_NPV },
+    { "IRR" , SC_OPCODE_IRR },
+    { "MIRR" , SC_OPCODE_MIRR },
+    { "ISPMT" , SC_OPCODE_ISPMT },
+    { "VAR" , SC_OPCODE_VAR },
+    { "VARA" , SC_OPCODE_VAR_A },
+    { "VARP" , SC_OPCODE_VAR_P },
+    { "VARPA" , SC_OPCODE_VAR_P_A },
+    { "_xlfn.VAR.P" , SC_OPCODE_VAR_P_MS },
+    { "_xlfn.VAR.S" , SC_OPCODE_VAR_S },
+    { "STDEV" , SC_OPCODE_ST_DEV },
+    { "STDEVA" , SC_OPCODE_ST_DEV_A },
+    { "STDEVP" , SC_OPCODE_ST_DEV_P },
+    { "STDEVPA" , SC_OPCODE_ST_DEV_P_A },
+    { "_xlfn.STDEV.P" , SC_OPCODE_ST_DEV_P_MS },
+    { "_xlfn.STDEV.S" , SC_OPCODE_ST_DEV_S },
+    { "B" , SC_OPCODE_B },
+    { "NORMDIST" , SC_OPCODE_NORM_DIST },
+    { "_xlfn.NORM.DIST" , SC_OPCODE_NORM_DIST_MS },
+    { "EXPONDIST" , SC_OPCODE_EXP_DIST },
+    { "_xlfn.EXPON.DIST" , SC_OPCODE_EXP_DIST_MS },
+    { "BINOMDIST" , SC_OPCODE_BINOM_DIST },
+    { "_xlfn.BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS },
+    { "POISSON" , SC_OPCODE_POISSON_DIST },
+    { "_xlfn.POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS },
+    { "COMBIN" , SC_OPCODE_COMBIN },
+    { "_xlfn.COMBINA" , SC_OPCODE_COMBIN_A },
+    { "PERMUT" , SC_OPCODE_PERMUT },
+    { "_xlfn.PERMUTATIONA" , SC_OPCODE_PERMUTATION_A },
+    { "PV" , SC_OPCODE_PV },
+    { "SYD" , SC_OPCODE_SYD },
+    { "DDB" , SC_OPCODE_DDB },
+    { "DB" , SC_OPCODE_DB },
+    { "VDB" , SC_OPCODE_VBD },
+    { "_xlfn.PDURATION" , SC_OPCODE_PDURATION },
+    { "SLN" , SC_OPCODE_SLN },
+    { "PMT" , SC_OPCODE_PMT },
+    { "COLUMNS" , SC_OPCODE_COLUMNS },
+    { "ROWS" , SC_OPCODE_ROWS },
+    { "_xlfn.SHEETS" , SC_OPCODE_SHEETS },
+    { "COLUMN" , SC_OPCODE_COLUMN },
+    { "ROW" , SC_OPCODE_ROW },
+    { "_xlfn.SHEET" , SC_OPCODE_SHEET },
+    { "_xlfn.RRI" , SC_OPCODE_RRI },
+    { "FV" , SC_OPCODE_FV },
+    { "NPER" , SC_OPCODE_NPER },
+    { "RATE" , SC_OPCODE_RATE },
+    { "IPMT" , SC_OPCODE_IPMT },
+    { "PPMT" , SC_OPCODE_PPMT },
+    { "CUMIPMT" , SC_OPCODE_CUM_IPMT },
+    { "CUMPRINC" , SC_OPCODE_CUM_PRINC },
+    { "EFFECT" , SC_OPCODE_EFFECT },
+    { "NOMINAL" , SC_OPCODE_NOMINAL },
+    { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL },
+    { "DSUM" , SC_OPCODE_DB_SUM },
+    { "DCOUNT" , SC_OPCODE_DB_COUNT },
+    { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 },
+    { "DAVERAGE" , SC_OPCODE_DB_AVERAGE },
+    { "DGET" , SC_OPCODE_DB_GET },
+    { "DMAX" , SC_OPCODE_DB_MAX },
+    { "DMIN" , SC_OPCODE_DB_MIN },
+    { "DPRODUCT" , SC_OPCODE_DB_PRODUCT },
+    { "DSTDEV" , SC_OPCODE_DB_STD_DEV },
+    { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P },
+    { "DVAR" , SC_OPCODE_DB_VAR },
+    { "DVARP" , SC_OPCODE_DB_VAR_P },
+    { "INDIRECT" , SC_OPCODE_INDIRECT },
+    { "ADDRESS" , SC_OPCODE_ADDRESS },
+    { "MATCH" , SC_OPCODE_MATCH },
+    { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { "COUNTIF" , SC_OPCODE_COUNT_IF },
+    { "SUMIF" , SC_OPCODE_SUM_IF },
+    { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF },
+    { "SUMIFS" , SC_OPCODE_SUM_IFS },
+    { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS },
+    { "COUNTIFS" , SC_OPCODE_COUNT_IFS },
+    { "LOOKUP" , SC_OPCODE_LOOKUP },
+    { "VLOOKUP" , SC_OPCODE_V_LOOKUP },
+    { "HLOOKUP" , SC_OPCODE_H_LOOKUP },
+    { "_xlfn.ORG.OPENOFFICE.MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union)
+    { "OFFSET" , SC_OPCODE_OFFSET },
+    { "INDEX" , SC_OPCODE_INDEX },
+    { "AREAS" , SC_OPCODE_AREAS },
+    { "DOLLAR" , SC_OPCODE_CURRENCY },
+    { "REPLACE" , SC_OPCODE_REPLACE },
+    { "FIXED" , SC_OPCODE_FIXED },
+    { "FIND" , SC_OPCODE_FIND },
+    { "EXACT" , SC_OPCODE_EXACT },
+    { "LEFT" , SC_OPCODE_LEFT },
+    { "RIGHT" , SC_OPCODE_RIGHT },
+    { "SEARCH" , SC_OPCODE_SEARCH },
+    { "MID" , SC_OPCODE_MID },
+    { "LENB" , SC_OPCODE_LENB },
+    { "RIGHTB" , SC_OPCODE_RIGHTB },
+    { "LEFTB" , SC_OPCODE_LEFTB },
+    { "REPLACEB" , SC_OPCODE_REPLACEB },
+    { "MIDB" , SC_OPCODE_MIDB },
+    { "TEXT" , SC_OPCODE_TEXT },
+    { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE },
+    { "REPT" , SC_OPCODE_REPT },
+    { "CONCATENATE" , SC_OPCODE_CONCAT },
+    { "_xlfn.CONCAT" , SC_OPCODE_CONCAT_MS },
+    { "_xlfn.TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS },
+    { "_xlfn.IFS" , SC_OPCODE_IFS_MS },
+    { "_xlfn.SWITCH" , SC_OPCODE_SWITCH_MS },
+    { "_xlfn.MINIFS" , SC_OPCODE_MINIFS_MS },
+    { "_xlfn.MAXIFS" , SC_OPCODE_MAXIFS_MS },
+    { "MVALUE" , SC_OPCODE_MAT_VALUE },
+    { "MDETERM" , SC_OPCODE_MAT_DET },
+    { "MINVERSE" , SC_OPCODE_MAT_INV },
+    { "MMULT" , SC_OPCODE_MAT_MULT },
+    { "TRANSPOSE" , SC_OPCODE_MAT_TRANS },
+    { "_xlfn.MUNIT" , SC_OPCODE_MATRIX_UNIT },
+    { "_xlfn.ORG.OPENOFFICE.GOALSEEK" , SC_OPCODE_BACK_SOLVER },
+    { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST },
+    { "_xlfn.HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST },
+    { "_xlfn.LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS },
+    { "TDIST" , SC_OPCODE_T_DIST },
+    { "_xlfn.T.DIST.2T" , SC_OPCODE_T_DIST_2T },
+    { "_xlfn.T.DIST" , SC_OPCODE_T_DIST_MS },
+    { "_xlfn.T.DIST.RT" , SC_OPCODE_T_DIST_RT },
+    { "FDIST" , SC_OPCODE_F_DIST },
+    { "_xlfn.F.DIST" , SC_OPCODE_F_DIST_LT },
+    { "_xlfn.F.DIST.RT" , SC_OPCODE_F_DIST_RT },
+    { "CHIDIST" , SC_OPCODE_CHI_DIST },
+    { "_xlfn.CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS },
+    { "WEIBULL" , SC_OPCODE_WEIBULL },
+    { "_xlfn.WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS },
+    { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT },
+    { "_xlfn.NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { "CRITBINOM" , SC_OPCODE_CRIT_BINOM },
+    { "_xlfn.BINOM.INV" , SC_OPCODE_BINOM_INV },
+    { "KURT" , SC_OPCODE_KURT },
+    { "HARMEAN" , SC_OPCODE_HAR_MEAN },
+    { "GEOMEAN" , SC_OPCODE_GEO_MEAN },
+    { "STANDARDIZE" , SC_OPCODE_STANDARD },
+    { "AVEDEV" , SC_OPCODE_AVE_DEV },
+    { "SKEW" , SC_OPCODE_SKEW },
+    { "_xlfn.SKEW.P" , SC_OPCODE_SKEWP },
+    { "DEVSQ" , SC_OPCODE_DEV_SQ },
+    { "MEDIAN" , SC_OPCODE_MEDIAN },
+    { "MODE" , SC_OPCODE_MODAL_VALUE },
+    { "_xlfn.MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS },
+    { "_xlfn.MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI },
+    { "ZTEST" , SC_OPCODE_Z_TEST },
+    { "_xlfn.Z.TEST" , SC_OPCODE_Z_TEST_MS },
+    { "_xlfn.AGGREGATE" , SC_OPCODE_AGGREGATE },
+    { "TTEST" , SC_OPCODE_T_TEST },
+    { "_xlfn.T.TEST" , SC_OPCODE_T_TEST_MS },
+    { "RANK" , SC_OPCODE_RANK },
+    { "PERCENTILE" , SC_OPCODE_PERCENTILE },
+    { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK },
+    { "_xlfn.PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC },
+    { "_xlfn.PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC },
+    { "_xlfn.QUARTILE.INC" , SC_OPCODE_QUARTILE_INC },
+    { "_xlfn.RANK.EQ" , SC_OPCODE_RANK_EQ },
+    { "_xlfn.PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC },
+    { "_xlfn.PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC },
+    { "_xlfn.QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC },
+    { "_xlfn.RANK.AVG" , SC_OPCODE_RANK_AVG },
+    { "LARGE" , SC_OPCODE_LARGE },
+    { "SMALL" , SC_OPCODE_SMALL },
+    { "FREQUENCY" , SC_OPCODE_FREQUENCY },
+    { "QUARTILE" , SC_OPCODE_QUARTILE },
+    { "NORMINV" , SC_OPCODE_NORM_INV },
+    { "_xlfn.NORM.INV" , SC_OPCODE_NORM_INV_MS },
+    { "CONFIDENCE" , SC_OPCODE_CONFIDENCE },
+    { "_xlfn.CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N },
+    { "_xlfn.CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T },
+    { "FTEST" , SC_OPCODE_F_TEST },
+    { "_xlfn.F.TEST" , SC_OPCODE_F_TEST_MS },
+    { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN },
+    { "PROB" , SC_OPCODE_PROB },
+    { "CORREL" , SC_OPCODE_CORREL },
+    { "COVAR" , SC_OPCODE_COVAR },
+    { "_xlfn.COVARIANCE.P" , SC_OPCODE_COVARIANCE_P },
+    { "_xlfn.COVARIANCE.S" , SC_OPCODE_COVARIANCE_S },
+    { "PEARSON" , SC_OPCODE_PEARSON },
+    { "RSQ" , SC_OPCODE_RSQ },
+    { "STEYX" , SC_OPCODE_STEYX },
+    { "SLOPE" , SC_OPCODE_SLOPE },
+    { "INTERCEPT" , SC_OPCODE_INTERCEPT },
+    { "TREND" , SC_OPCODE_TREND },
+    { "GROWTH" , SC_OPCODE_GROWTH },
+    { "LINEST" , SC_OPCODE_LINEST },
+    { "LOGEST" , SC_OPCODE_LOGEST },
+    { "FORECAST" , SC_OPCODE_FORECAST },
+    { "_xlfn.FORECAST.ETS" , SC_OPCODE_FORECAST_ETS_ADD },
+    { "_xlfn.FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA },
+    { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL },
+    { "_xlfn.FORECAST.ETS.CONFINT" , SC_OPCODE_FORECAST_ETS_PIA },
+    { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM },
+    { "_xlfn.FORECAST.ETS.STAT" , SC_OPCODE_FORECAST_ETS_STA },
+    { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM },
+    { "_xlfn.FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN },
+    { "CHIINV" , SC_OPCODE_CHI_INV },
+    { "_xlfn.CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS },
+    { "GAMMADIST" , SC_OPCODE_GAMMA_DIST },
+    { "_xlfn.GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS },
+    { "GAMMAINV" , SC_OPCODE_GAMMA_INV },
+    { "_xlfn.GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS },
+    { "TINV" , SC_OPCODE_T_INV },
+    { "_xlfn.T.INV.2T" , SC_OPCODE_T_INV_2T },
+    { "_xlfn.T.INV" , SC_OPCODE_T_INV_MS },
+    { "FINV" , SC_OPCODE_F_INV },
+    { "_xlfn.F.INV" , SC_OPCODE_F_INV_LT },
+    { "_xlfn.F.INV.RT" , SC_OPCODE_F_INV_RT },
+    { "CHITEST" , SC_OPCODE_CHI_TEST },
+    { "_xlfn.CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS },
+    { "LOGINV" , SC_OPCODE_LOG_INV },
+    { "_xlfn.LOGNORM.INV" , SC_OPCODE_LOG_INV_MS },
+    { "TABLE" , SC_OPCODE_TABLE_OP },
+    { "BETADIST" , SC_OPCODE_BETA_DIST },
+    { "BETAINV" , SC_OPCODE_BETA_INV },
+    { "_xlfn.BETA.DIST" , SC_OPCODE_BETA_DIST_MS },
+    { "_xlfn.BETA.INV" , SC_OPCODE_BETA_INV_MS },
+    { "WEEKNUM" , SC_OPCODE_WEEK },
+    { "_xlfn.ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
+    { "_xlfn.ORG.LIBREOFFICE.WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
+    { "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+    { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
+    { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
+    { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
+    { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS },
+    { "#NAME!" , SC_OPCODE_NO_NAME },
+    { "_xlfn.ORG.OPENOFFICE.STYLE" , SC_OPCODE_STYLE },
+    { "DDE" , SC_OPCODE_DDE },
+    { "_xlfn.BASE" , SC_OPCODE_BASE },
+    { "_xlfn.DECIMAL" , SC_OPCODE_DECIMAL },
+    { "_xlfn.ORG.OPENOFFICE.CONVERT" , SC_OPCODE_CONVERT_OOO },
+    { "ROMAN" , SC_OPCODE_ROMAN },
+    { "_xlfn.ARABIC" , SC_OPCODE_ARABIC },
+    { "HYPERLINK" , SC_OPCODE_HYPERLINK },
+    { "INFO" , SC_OPCODE_INFO },
+    { "_xlfn.BAHTTEXT" , SC_OPCODE_BAHTTEXT },
+    { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA },
+    { "EUROCONVERT" , SC_OPCODE_EUROCONVERT },
+    { "_xlfn.NUMBERVALUE" , SC_OPCODE_NUMBERVALUE },
+    { "_xlfn.GAMMA" , SC_OPCODE_GAMMA },
+    { "CHISQDIST" , SC_OPCODE_CHISQ_DIST },
+    { "_xlfn.CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS },
+    { "CHISQINV" , SC_OPCODE_CHISQ_INV },
+    { "_xlfn.CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS },
+    { "_xlfn.BITAND" , SC_OPCODE_BITAND },
+    { "_xlfn.BITOR" , SC_OPCODE_BITOR },
+    { "_xlfn.BITXOR" , SC_OPCODE_BITXOR },
+    { "_xlfn.BITRSHIFT" , SC_OPCODE_BITRSHIFT },
+    { "_xlfn.BITLSHIFT" , SC_OPCODE_BITLSHIFT },
+    { "#NULL!" , SC_OPCODE_ERROR_NULL },
+    { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO },
+    { "#VALUE!" , SC_OPCODE_ERROR_VALUE },
+    { "#REF!" , SC_OPCODE_ERROR_REF },
+    { "#NAME?" , SC_OPCODE_ERROR_NAME },
+    { "#NUM!" , SC_OPCODE_ERROR_NUM },
+    { "#N/A" , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+    { "_xlfn.FILTERXML" , SC_OPCODE_FILTERXML },
+    { "_xlfn.WEBSERVICE" , SC_OPCODE_WEBSERVICE },
+    { "_xlfn.ORG.LIBREOFFICE.COLOR" , SC_OPCODE_COLOR },
+    { "_xlfn.ERF.PRECISE" , SC_OPCODE_ERF_MS },
+    { "_xlfn.ERFC.PRECISE" , SC_OPCODE_ERFC_MS },
+    { "_xlfn.ENCODEURL" , SC_OPCODE_ENCODEURL },
+    { "_xlfn.ORG.LIBREOFFICE.RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT },
+    { "_xlfn.ORG.LIBREOFFICE.ROUNDSIG" , SC_OPCODE_ROUNDSIG },
+    { nullptr,  -1 }
+};
+
+/** These English names are used to store/load ODF v1.0/v1.1. */
+// DO NOT CHANGE NAMES! Only add functions.
+// If there is a reason for another name for some function then add an
+// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
+// ScCompiler::IsOpCode() in the else if (mxSymbols->isPODF()) block.
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF[] =
+{
+    { "IF" , SC_OPCODE_IF },
+    { "IFERROR" , SC_OPCODE_IF_ERROR },
+    { "IFNA" , SC_OPCODE_IF_NA },
+    { "CHOOSE" , SC_OPCODE_CHOOSE },
+    { "(" , SC_OPCODE_OPEN },
+    { ")" , SC_OPCODE_CLOSE },
+    { "[" , SC_OPCODE_TABLE_REF_OPEN },
+    { "]" , SC_OPCODE_TABLE_REF_CLOSE },
+    { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL },
+    { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS },
+    { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA },
+    { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS },
+    { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW },
+    { "{" , SC_OPCODE_ARRAY_OPEN },
+    { "}" , SC_OPCODE_ARRAY_CLOSE },
+    { "|" , SC_OPCODE_ARRAY_ROW_SEP },
+    { ";" , SC_OPCODE_ARRAY_COL_SEP },
+    { ";" , SC_OPCODE_SEP },
+    { "%" , SC_OPCODE_PERCENT_SIGN },
+    { "+" , SC_OPCODE_ADD },
+    { "-" , SC_OPCODE_SUB },
+    { "*" , SC_OPCODE_MUL },
+    { "/" , SC_OPCODE_DIV },
+    { "&" , SC_OPCODE_AMPERSAND },
+    { "^" , SC_OPCODE_POW },
+    { "=" , SC_OPCODE_EQUAL },
+    { "<>" , SC_OPCODE_NOT_EQUAL },
+    { "<" , SC_OPCODE_LESS },
+    { ">" , SC_OPCODE_GREATER },
+    { "<=" , SC_OPCODE_LESS_EQUAL },
+    { ">=" , SC_OPCODE_GREATER_EQUAL },
+    { "AND" , SC_OPCODE_AND },
+    { "OR" , SC_OPCODE_OR },
+    { "XOR" , SC_OPCODE_XOR },
+    { "!" , SC_OPCODE_INTERSECT },
+    { "~" , SC_OPCODE_UNION },
+    { ":" , SC_OPCODE_RANGE },
+    { "NOT" , SC_OPCODE_NOT },
+    { "NEG" , SC_OPCODE_NEG },
+    { "-" , SC_OPCODE_NEG_SUB },
+    { "PI" , SC_OPCODE_PI },
+    { "RAND" , SC_OPCODE_RANDOM },
+    { "TRUE" , SC_OPCODE_TRUE },
+    { "FALSE" , SC_OPCODE_FALSE },
+    { "TODAY" , SC_OPCODE_GET_ACT_DATE },
+    { "NOW" , SC_OPCODE_GET_ACT_TIME },
+    { "NA" , SC_OPCODE_NO_VALUE },
+    { "CURRENT" , SC_OPCODE_CURRENT },
+    { "DEGREES" , SC_OPCODE_DEG },
+    { "RADIANS" , SC_OPCODE_RAD },
+    { "SIN" , SC_OPCODE_SIN },
+    { "COS" , SC_OPCODE_COS },
+    { "TAN" , SC_OPCODE_TAN },
+    { "COT" , SC_OPCODE_COT },
+    { "ASIN" , SC_OPCODE_ARC_SIN },
+    { "ACOS" , SC_OPCODE_ARC_COS },
+    { "ATAN" , SC_OPCODE_ARC_TAN },
+    { "ACOT" , SC_OPCODE_ARC_COT },
+    { "SINH" , SC_OPCODE_SIN_HYP },
+    { "COSH" , SC_OPCODE_COS_HYP },
+    { "TANH" , SC_OPCODE_TAN_HYP },
+    { "COTH" , SC_OPCODE_COT_HYP },
+    { "ASINH" , SC_OPCODE_ARC_SIN_HYP },
+    { "ACOSH" , SC_OPCODE_ARC_COS_HYP },
+    { "ATANH" , SC_OPCODE_ARC_TAN_HYP },
+    { "ACOTH" , SC_OPCODE_ARC_COT_HYP },
+    { "CSC" , SC_OPCODE_COSECANT },
+    { "SEC" , SC_OPCODE_SECANT },
+    { "CSCH" , SC_OPCODE_COSECANT_HYP },
+    { "SECH" , SC_OPCODE_SECANT_HYP },
+    { "EXP" , SC_OPCODE_EXP },
+    { "LN" , SC_OPCODE_LN },
+    { "SQRT" , SC_OPCODE_SQRT },
+    { "FACT" , SC_OPCODE_FACT },
+    { "YEAR" , SC_OPCODE_GET_YEAR },
+    { "MONTH" , SC_OPCODE_GET_MONTH },
+    { "DAY" , SC_OPCODE_GET_DAY },
+    { "HOUR" , SC_OPCODE_GET_HOUR },
+    { "MINUTE" , SC_OPCODE_GET_MIN },
+    { "SECOND" , SC_OPCODE_GET_SEC },
+    { "SIGN" , SC_OPCODE_PLUS_MINUS },
+    { "ABS" , SC_OPCODE_ABS },
+    { "INT" , SC_OPCODE_INT },
+    { "PHI" , SC_OPCODE_PHI },
+    { "GAUSS" , SC_OPCODE_GAUSS },
+    { "ISBLANK" , SC_OPCODE_IS_EMPTY },
+    { "ISTEXT" , SC_OPCODE_IS_STRING },
+    { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING },
+    { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL },
+    { "TYPE" , SC_OPCODE_TYPE },
+    { "CELL" , SC_OPCODE_CELL },
+    { "ISREF" , SC_OPCODE_IS_REF },
+    { "ISNUMBER" , SC_OPCODE_IS_VALUE },
+    { "ISFORMULA" , SC_OPCODE_IS_FORMULA },
+    { "ISNA" , SC_OPCODE_IS_NV },
+    { "ISERR" , SC_OPCODE_IS_ERR },
+    { "ISERROR" , SC_OPCODE_IS_ERROR },
+    { "ISEVEN" , SC_OPCODE_IS_EVEN },
+    { "ISODD" , SC_OPCODE_IS_ODD },
+    { "N" , SC_OPCODE_N },
+    { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE },
+    { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE },
+    { "CODE" , SC_OPCODE_CODE },
+    { "TRIM" , SC_OPCODE_TRIM },
+    { "UPPER" , SC_OPCODE_UPPER },
+    { "PROPER" , SC_OPCODE_PROPER },
+    { "LOWER" , SC_OPCODE_LOWER },
+    { "LEN" , SC_OPCODE_LEN },
+    { "T" , SC_OPCODE_T },
+    { "VALUE" , SC_OPCODE_VALUE },
+    { "CLEAN" , SC_OPCODE_CLEAN },
+    { "CHAR" , SC_OPCODE_CHAR },
+    { "JIS" , SC_OPCODE_JIS },
+    { "ASC" , SC_OPCODE_ASC },
+    { "UNICODE" , SC_OPCODE_UNICODE },
+    { "UNICHAR" , SC_OPCODE_UNICHAR },
+    { "LOG10" , SC_OPCODE_LOG10 },
+    { "EVEN" , SC_OPCODE_EVEN },
+    { "ODD" , SC_OPCODE_ODD },
+    { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST },
+    { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS },
+    { "FISHER" , SC_OPCODE_FISHER },
+    { "FISHERINV" , SC_OPCODE_FISHER_INV },
+    { "NORMSINV" , SC_OPCODE_S_NORM_INV },
+    { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS },
+    { "GAMMALN" , SC_OPCODE_GAMMA_LN },
+    { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS },
+    { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE },
+    { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF },
+    { "FORMULA" , SC_OPCODE_FORMULA },
+    { "ATAN2" , SC_OPCODE_ARC_TAN_2 },
+    { "CEILING.MATH" , SC_OPCODE_CEIL_MATH },
+    { "CEILING" , SC_OPCODE_CEIL },
+    { "CEILING.XCL" , SC_OPCODE_CEIL_MS },
+    { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE },
+    { "ISO.CEILING" , SC_OPCODE_CEIL_ISO },
+    { "FLOOR" , SC_OPCODE_FLOOR },
+    { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS },
+    { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH },
+    { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE },
+    { "ROUND" , SC_OPCODE_ROUND },
+    { "ROUNDUP" , SC_OPCODE_ROUND_UP },
+    { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN },
+    { "TRUNC" , SC_OPCODE_TRUNC },
+    { "LOG" , SC_OPCODE_LOG },
+    { "POWER" , SC_OPCODE_POWER },
+    { "GCD" , SC_OPCODE_GCD },
+    { "LCM" , SC_OPCODE_LCM },
+    { "MOD" , SC_OPCODE_MOD },
+    { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT },
+    { "SUMSQ" , SC_OPCODE_SUM_SQ },
+    { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 },
+    { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 },
+    { "SUMXMY2" , SC_OPCODE_SUM_XMY2 },
+    { "DATE" , SC_OPCODE_GET_DATE },
+    { "TIME" , SC_OPCODE_GET_TIME },
+    { "DAYS" , SC_OPCODE_GET_DIFF_DATE },
+    { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 },
+    { "DATEDIF" , SC_OPCODE_GET_DATEDIF },
+    { "MIN" , SC_OPCODE_MIN },
+    { "MINA" , SC_OPCODE_MIN_A },
+    { "MAX" , SC_OPCODE_MAX },
+    { "MAXA" , SC_OPCODE_MAX_A },
+    { "SUM" , SC_OPCODE_SUM },
+    { "PRODUCT" , SC_OPCODE_PRODUCT },
+    { "AVERAGE" , SC_OPCODE_AVERAGE },
+    { "AVERAGEA" , SC_OPCODE_AVERAGE_A },
+    { "COUNT" , SC_OPCODE_COUNT },
+    { "COUNTA" , SC_OPCODE_COUNT_2 },
+    { "NPV" , SC_OPCODE_NPV },
+    { "IRR" , SC_OPCODE_IRR },
+    { "MIRR" , SC_OPCODE_MIRR },
+    { "ISPMT" , SC_OPCODE_ISPMT },
+    { "VAR" , SC_OPCODE_VAR },
+    { "VARA" , SC_OPCODE_VAR_A },
+    { "VARP" , SC_OPCODE_VAR_P },
+    { "VARPA" , SC_OPCODE_VAR_P_A },
+    { "VAR.P" , SC_OPCODE_VAR_P_MS },
+    { "VAR.S" , SC_OPCODE_VAR_S },
+    { "STDEV" , SC_OPCODE_ST_DEV },
+    { "STDEVA" , SC_OPCODE_ST_DEV_A },
+    { "STDEVP" , SC_OPCODE_ST_DEV_P },
+    { "STDEVPA" , SC_OPCODE_ST_DEV_P_A },
+    { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS },
+    { "STDEV.S" , SC_OPCODE_ST_DEV_S },
+    { "B" , SC_OPCODE_B },
+    { "NORMDIST" , SC_OPCODE_NORM_DIST },
+    { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS },
+    { "EXPONDIST" , SC_OPCODE_EXP_DIST },
+    { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS },
+    { "BINOMDIST" , SC_OPCODE_BINOM_DIST },
+    { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS },
+    { "POISSON" , SC_OPCODE_POISSON_DIST },
+    { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS },
+    { "COMBIN" , SC_OPCODE_COMBIN },
+    { "COMBINA" , SC_OPCODE_COMBIN_A },
+    { "PERMUT" , SC_OPCODE_PERMUT },
+    { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A },
+    { "PV" , SC_OPCODE_PV },
+    { "SYD" , SC_OPCODE_SYD },
+    { "DDB" , SC_OPCODE_DDB },
+    { "DB" , SC_OPCODE_DB },
+    { "VDB" , SC_OPCODE_VBD },
+    { "DURATION" , SC_OPCODE_PDURATION }, // wrong but ODF1.1, keep it.
+    { "SLN" , SC_OPCODE_SLN },
+    { "PMT" , SC_OPCODE_PMT },
+    { "COLUMNS" , SC_OPCODE_COLUMNS },
+    { "ROWS" , SC_OPCODE_ROWS },
+    { "SHEETS" , SC_OPCODE_SHEETS },
+    { "COLUMN" , SC_OPCODE_COLUMN },
+    { "ROW" , SC_OPCODE_ROW },
+    { "SHEET" , SC_OPCODE_SHEET },
+    { "ZGZ" , SC_OPCODE_RRI },
+    { "FV" , SC_OPCODE_FV },
+    { "NPER" , SC_OPCODE_NPER },
+    { "RATE" , SC_OPCODE_RATE },
+    { "IPMT" , SC_OPCODE_IPMT },
+    { "PPMT" , SC_OPCODE_PPMT },
+    { "CUMIPMT" , SC_OPCODE_CUM_IPMT },
+    { "CUMPRINC" , SC_OPCODE_CUM_PRINC },
+    { "EFFECTIVE" , SC_OPCODE_EFFECT },
+    { "NOMINAL" , SC_OPCODE_NOMINAL },
+    { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL },
+    { "DSUM" , SC_OPCODE_DB_SUM },
+    { "DCOUNT" , SC_OPCODE_DB_COUNT },
+    { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 },
+    { "DAVERAGE" , SC_OPCODE_DB_AVERAGE },
+    { "DGET" , SC_OPCODE_DB_GET },
+    { "DMAX" , SC_OPCODE_DB_MAX },
+    { "DMIN" , SC_OPCODE_DB_MIN },
+    { "DPRODUCT" , SC_OPCODE_DB_PRODUCT },
+    { "DSTDEV" , SC_OPCODE_DB_STD_DEV },
+    { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P },
+    { "DVAR" , SC_OPCODE_DB_VAR },
+    { "DVARP" , SC_OPCODE_DB_VAR_P },
+    { "INDIRECT" , SC_OPCODE_INDIRECT },
+    { "ADDRESS" , SC_OPCODE_ADDRESS },
+    { "MATCH" , SC_OPCODE_MATCH },
+    { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { "COUNTIF" , SC_OPCODE_COUNT_IF },
+    { "SUMIF" , SC_OPCODE_SUM_IF },
+    { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF },
+    { "SUMIFS" , SC_OPCODE_SUM_IFS },
+    { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS },
+    { "COUNTIFS" , SC_OPCODE_COUNT_IFS },
+    { "LOOKUP" , SC_OPCODE_LOOKUP },
+    { "VLOOKUP" , SC_OPCODE_V_LOOKUP },
+    { "HLOOKUP" , SC_OPCODE_H_LOOKUP },
+    { "MULTIRANGE" , SC_OPCODE_MULTI_AREA },    // legacy for range list (union)
+    { "OFFSET" , SC_OPCODE_OFFSET },
+    { "INDEX" , SC_OPCODE_INDEX },
+    { "AREAS" , SC_OPCODE_AREAS },
+    { "DOLLAR" , SC_OPCODE_CURRENCY },
+    { "REPLACE" , SC_OPCODE_REPLACE },
+    { "FIXED" , SC_OPCODE_FIXED },
+    { "FIND" , SC_OPCODE_FIND },
+    { "EXACT" , SC_OPCODE_EXACT },
+    { "LEFT" , SC_OPCODE_LEFT },
+    { "RIGHT" , SC_OPCODE_RIGHT },
+    { "SEARCH" , SC_OPCODE_SEARCH },
+    { "MID" , SC_OPCODE_MID },
+    { "LENB" , SC_OPCODE_LENB },
+    { "RIGHTB" , SC_OPCODE_RIGHTB },
+    { "LEFTB" , SC_OPCODE_LEFTB },
+    { "REPLACEB" , SC_OPCODE_REPLACEB },
+    { "MIDB" , SC_OPCODE_MIDB },
+    { "TEXT" , SC_OPCODE_TEXT },
+    { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE },
+    { "REPT" , SC_OPCODE_REPT },
+    { "CONCATENATE" , SC_OPCODE_CONCAT },
+    { "CONCAT" , SC_OPCODE_CONCAT_MS },
+    { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS },
+    { "IFS" , SC_OPCODE_IFS_MS },
+    { "SWITCH" , SC_OPCODE_SWITCH_MS },
+    { "MINIFS" , SC_OPCODE_MINIFS_MS },
+    { "MAXIFS" , SC_OPCODE_MAXIFS_MS },
+    { "MVALUE" , SC_OPCODE_MAT_VALUE },
+    { "MDETERM" , SC_OPCODE_MAT_DET },
+    { "MINVERSE" , SC_OPCODE_MAT_INV },
+    { "MMULT" , SC_OPCODE_MAT_MULT },
+    { "TRANSPOSE" , SC_OPCODE_MAT_TRANS },
+    { "MUNIT" , SC_OPCODE_MATRIX_UNIT },
+    { "GOALSEEK" , SC_OPCODE_BACK_SOLVER },
+    { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST },
+    { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST },
+    { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS },
+    { "TDIST" , SC_OPCODE_T_DIST },
+    { "T.DIST.2T" , SC_OPCODE_T_DIST_2T },
+    { "T.DIST" , SC_OPCODE_T_DIST_MS },
+    { "T.DIST.RT" , SC_OPCODE_T_DIST_RT },
+    { "FDIST" , SC_OPCODE_F_DIST },
+    { "F.DIST" , SC_OPCODE_F_DIST_LT },
+    { "F.DIST.RT" , SC_OPCODE_F_DIST_RT },
+    { "CHIDIST" , SC_OPCODE_CHI_DIST },
+    { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS },
+    { "WEIBULL" , SC_OPCODE_WEIBULL },
+    { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS },
+    { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT },
+    { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { "CRITBINOM" , SC_OPCODE_CRIT_BINOM },
+    { "BINOM.INV" , SC_OPCODE_BINOM_INV },
+    { "KURT" , SC_OPCODE_KURT },
+    { "HARMEAN" , SC_OPCODE_HAR_MEAN },
+    { "GEOMEAN" , SC_OPCODE_GEO_MEAN },
+    { "STANDARDIZE" , SC_OPCODE_STANDARD },
+    { "AVEDEV" , SC_OPCODE_AVE_DEV },
+    { "SKEW" , SC_OPCODE_SKEW },
+    { "SKEWP" , SC_OPCODE_SKEWP },
+    { "DEVSQ" , SC_OPCODE_DEV_SQ },
+    { "MEDIAN" , SC_OPCODE_MEDIAN },
+    { "MODE" , SC_OPCODE_MODAL_VALUE },
+    { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS },
+    { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI },
+    { "ZTEST" , SC_OPCODE_Z_TEST },
+    { "Z.TEST" , SC_OPCODE_Z_TEST_MS },
+    { "AGGREGATE" , SC_OPCODE_AGGREGATE },
+    { "TTEST" , SC_OPCODE_T_TEST },
+    { "T.TEST" , SC_OPCODE_T_TEST_MS },
+    { "RANK" , SC_OPCODE_RANK },
+    { "PERCENTILE" , SC_OPCODE_PERCENTILE },
+    { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK },
+    { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC },
+    { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC },
+    { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC },
+    { "RANK.EQ" , SC_OPCODE_RANK_EQ },
+    { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC },
+    { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC },
+    { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC },
+    { "RANK.AVG" , SC_OPCODE_RANK_AVG },
+    { "LARGE" , SC_OPCODE_LARGE },
+    { "SMALL" , SC_OPCODE_SMALL },
+    { "FREQUENCY" , SC_OPCODE_FREQUENCY },
+    { "QUARTILE" , SC_OPCODE_QUARTILE },
+    { "NORMINV" , SC_OPCODE_NORM_INV },
+    { "NORM.INV" , SC_OPCODE_NORM_INV_MS },
+    { "CONFIDENCE" , SC_OPCODE_CONFIDENCE },
+    { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N },
+    { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T },
+    { "FTEST" , SC_OPCODE_F_TEST },
+    { "F.TEST" , SC_OPCODE_F_TEST_MS },
+    { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN },
+    { "PROB" , SC_OPCODE_PROB },
+    { "CORREL" , SC_OPCODE_CORREL },
+    { "COVAR" , SC_OPCODE_COVAR },
+    { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P },
+    { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S },
+    { "PEARSON" , SC_OPCODE_PEARSON },
+    { "RSQ" , SC_OPCODE_RSQ },
+    { "STEYX" , SC_OPCODE_STEYX },
+    { "SLOPE" , SC_OPCODE_SLOPE },
+    { "INTERCEPT" , SC_OPCODE_INTERCEPT },
+    { "TREND" , SC_OPCODE_TREND },
+    { "GROWTH" , SC_OPCODE_GROWTH },
+    { "LINEST" , SC_OPCODE_LINEST },
+    { "LOGEST" , SC_OPCODE_LOGEST },
+    { "FORECAST" , SC_OPCODE_FORECAST },
+    { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD },
+    { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA },
+    { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL },
+    { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA },
+    { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM },
+    { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA },
+    { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM },
+    { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN },
+    { "CHIINV" , SC_OPCODE_CHI_INV },
+    { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS },
+    { "GAMMADIST" , SC_OPCODE_GAMMA_DIST },
+    { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS },
+    { "GAMMAINV" , SC_OPCODE_GAMMA_INV },
+    { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS },
+    { "TINV" , SC_OPCODE_T_INV },
+    { "T.INV.2T" , SC_OPCODE_T_INV_2T },
+    { "T.INV" , SC_OPCODE_T_INV_MS },
+    { "FINV" , SC_OPCODE_F_INV },
+    { "F.INV" , SC_OPCODE_F_INV_LT },
+    { "F.INV.RT" , SC_OPCODE_F_INV_RT },
+    { "CHITEST" , SC_OPCODE_CHI_TEST },
+    { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS },
+    { "LOGINV" , SC_OPCODE_LOG_INV },
+    { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS },
+    { "TABLE" , SC_OPCODE_TABLE_OP },
+    { "BETADIST" , SC_OPCODE_BETA_DIST },
+    { "BETAINV" , SC_OPCODE_BETA_INV },
+    { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS },
+    { "BETA.INV" , SC_OPCODE_BETA_INV_MS },
+    { "WEEKNUM" , SC_OPCODE_WEEK },
+    { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
+    { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
+    { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+    { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
+    { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
+    { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
+    { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS },
+    { "#NAME!" , SC_OPCODE_NO_NAME },
+    { "STYLE" , SC_OPCODE_STYLE },
+    { "DDE" , SC_OPCODE_DDE },
+    { "BASE" , SC_OPCODE_BASE },
+    { "DECIMAL" , SC_OPCODE_DECIMAL },
+    { "CONVERT" , SC_OPCODE_CONVERT_OOO },  // wrong but ODF1.1, keep it
+    { "ROMAN" , SC_OPCODE_ROMAN },
+    { "ARABIC" , SC_OPCODE_ARABIC },
+    { "HYPERLINK" , SC_OPCODE_HYPERLINK },
+    { "INFO" , SC_OPCODE_INFO },
+    { "BAHTTEXT" , SC_OPCODE_BAHTTEXT },
+    { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA },
+    { "EUROCONVERT" , SC_OPCODE_EUROCONVERT },
+    { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE },
+    { "GAMMA" , SC_OPCODE_GAMMA },
+    { "CHISQDIST" , SC_OPCODE_CHISQ_DIST },
+    { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS },
+    { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS },
+    { "CHISQINV" , SC_OPCODE_CHISQ_INV },
+    { "BITAND" , SC_OPCODE_BITAND },
+    { "BITOR" , SC_OPCODE_BITOR },
+    { "BITXOR" , SC_OPCODE_BITXOR },
+    { "BITRSHIFT" , SC_OPCODE_BITRSHIFT },
+    { "BITLSHIFT" , SC_OPCODE_BITLSHIFT },
+    /* BEGIN defined ERROR.TYPE() values. */
+    { "#NULL!" , SC_OPCODE_ERROR_NULL },
+    { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO },
+    { "#VALUE!" , SC_OPCODE_ERROR_VALUE },
+    { "#REF!" , SC_OPCODE_ERROR_REF },
+    { "#NAME?" , SC_OPCODE_ERROR_NAME },
+    { "#NUM!" , SC_OPCODE_ERROR_NUM },
+    { "#N/A" , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+    { "FILTERXML" , SC_OPCODE_FILTERXML },
+    { "WEBSERVICE" , SC_OPCODE_WEBSERVICE },
+    { "COLOR" , SC_OPCODE_COLOR },
+    { "ERF.PRECISE" , SC_OPCODE_ERF_MS },
+    { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS },
+    { "ENCODEURL" , SC_OPCODE_ENCODEURL },
+    { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT },
+    { "ROUNDSIG" , SC_OPCODE_ROUNDSIG },
+    { nullptr, -1 }
+};
+
+/** These English names are used for XFunctionAccess API. */
+// DO NOT CHANGE NAMES! Only add functions.
+// If there is a reason for another name for some function then add an
+// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
+// ScCompiler::IsOpCode().
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH_API[] =
+{
+    { "IF" , SC_OPCODE_IF },
+    { "IFERROR" , SC_OPCODE_IF_ERROR },
+    { "IFNA" , SC_OPCODE_IF_NA },
+    { "CHOOSE" , SC_OPCODE_CHOOSE },
+    { "(" , SC_OPCODE_OPEN },
+    { ")" , SC_OPCODE_CLOSE },
+    { "[" , SC_OPCODE_TABLE_REF_OPEN },
+    { "]" , SC_OPCODE_TABLE_REF_CLOSE },
+    { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL },
+    { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS },
+    { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA },
+    { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS },
+    { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW },
+    { "{" , SC_OPCODE_ARRAY_OPEN },
+    { "}" , SC_OPCODE_ARRAY_CLOSE },
+    { "|" , SC_OPCODE_ARRAY_ROW_SEP },
+    { ";" , SC_OPCODE_ARRAY_COL_SEP },
+    { ";" , SC_OPCODE_SEP },
+    { "%" , SC_OPCODE_PERCENT_SIGN },
+    { "+" , SC_OPCODE_ADD },
+    { "-" , SC_OPCODE_SUB },
+    { "*" , SC_OPCODE_MUL },
+    { "/" , SC_OPCODE_DIV },
+    { "&" , SC_OPCODE_AMPERSAND },
+    { "^" , SC_OPCODE_POW },
+    { "=" , SC_OPCODE_EQUAL },
+    { "<>" , SC_OPCODE_NOT_EQUAL },
+    { "<" , SC_OPCODE_LESS },
+    { ">" , SC_OPCODE_GREATER },
+    { "<=" , SC_OPCODE_LESS_EQUAL },
+    { ">=" , SC_OPCODE_GREATER_EQUAL },
+    { "AND" , SC_OPCODE_AND },
+    { "OR" , SC_OPCODE_OR },
+    { "XOR" , SC_OPCODE_XOR },
+    { "!" , SC_OPCODE_INTERSECT },
+    { "~" , SC_OPCODE_UNION },
+    { ":" , SC_OPCODE_RANGE },
+    { "NOT" , SC_OPCODE_NOT },
+    { "NEG" , SC_OPCODE_NEG },
+    { "-" , SC_OPCODE_NEG_SUB },
+    { "PI" , SC_OPCODE_PI },
+    { "RAND" , SC_OPCODE_RANDOM },
+    { "TRUE" , SC_OPCODE_TRUE },
+    { "FALSE" , SC_OPCODE_FALSE },
+    { "TODAY" , SC_OPCODE_GET_ACT_DATE },
+    { "NOW" , SC_OPCODE_GET_ACT_TIME },
+    { "NA" , SC_OPCODE_NO_VALUE },
+    { "CURRENT" , SC_OPCODE_CURRENT },
+    { "DEGREES" , SC_OPCODE_DEG },
+    { "RADIANS" , SC_OPCODE_RAD },
+    { "SIN" , SC_OPCODE_SIN },
+    { "COS" , SC_OPCODE_COS },
+    { "TAN" , SC_OPCODE_TAN },
+    { "COT" , SC_OPCODE_COT },
+    { "ASIN" , SC_OPCODE_ARC_SIN },
+    { "ACOS" , SC_OPCODE_ARC_COS },
+    { "ATAN" , SC_OPCODE_ARC_TAN },
+    { "ACOT" , SC_OPCODE_ARC_COT },
+    { "SINH" , SC_OPCODE_SIN_HYP },
+    { "COSH" , SC_OPCODE_COS_HYP },
+    { "TANH" , SC_OPCODE_TAN_HYP },
+    { "COTH" , SC_OPCODE_COT_HYP },
+    { "ASINH" , SC_OPCODE_ARC_SIN_HYP },
+    { "ACOSH" , SC_OPCODE_ARC_COS_HYP },
+    { "ATANH" , SC_OPCODE_ARC_TAN_HYP },
+    { "ACOTH" , SC_OPCODE_ARC_COT_HYP },
+    { "CSC" , SC_OPCODE_COSECANT },
+    { "SEC" , SC_OPCODE_SECANT },
+    { "CSCH" , SC_OPCODE_COSECANT_HYP },
+    { "SECH" , SC_OPCODE_SECANT_HYP },
+    { "EXP" , SC_OPCODE_EXP },
+    { "LN" , SC_OPCODE_LN },
+    { "SQRT" , SC_OPCODE_SQRT },
+    { "FACT" , SC_OPCODE_FACT },
+    { "YEAR" , SC_OPCODE_GET_YEAR },
+    { "MONTH" , SC_OPCODE_GET_MONTH },
+    { "DAY" , SC_OPCODE_GET_DAY },
+    { "HOUR" , SC_OPCODE_GET_HOUR },
+    { "MINUTE" , SC_OPCODE_GET_MIN },
+    { "SECOND" , SC_OPCODE_GET_SEC },
+    { "SIGN" , SC_OPCODE_PLUS_MINUS },
+    { "ABS" , SC_OPCODE_ABS },
+    { "INT" , SC_OPCODE_INT },
+    { "PHI" , SC_OPCODE_PHI },
+    { "GAUSS" , SC_OPCODE_GAUSS },
+    { "ISBLANK" , SC_OPCODE_IS_EMPTY },
+    { "ISTEXT" , SC_OPCODE_IS_STRING },
+    { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING },
+    { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL },
+    { "TYPE" , SC_OPCODE_TYPE },
+    { "CELL" , SC_OPCODE_CELL },
+    { "ISREF" , SC_OPCODE_IS_REF },
+    { "ISNUMBER" , SC_OPCODE_IS_VALUE },
+    { "ISFORMULA" , SC_OPCODE_IS_FORMULA },
+    { "ISNA" , SC_OPCODE_IS_NV },
+    { "ISERR" , SC_OPCODE_IS_ERR },
+    { "ISERROR" , SC_OPCODE_IS_ERROR },
+    { "ISEVEN" , SC_OPCODE_IS_EVEN },
+    { "ISODD" , SC_OPCODE_IS_ODD },
+    { "N" , SC_OPCODE_N },
+    { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE },
+    { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE },
+    { "CODE" , SC_OPCODE_CODE },
+    { "TRIM" , SC_OPCODE_TRIM },
+    { "UPPER" , SC_OPCODE_UPPER },
+    { "PROPER" , SC_OPCODE_PROPER },
+    { "LOWER" , SC_OPCODE_LOWER },
+    { "LEN" , SC_OPCODE_LEN },
+    { "T" , SC_OPCODE_T },
+    { "VALUE" , SC_OPCODE_VALUE },
+    { "CLEAN" , SC_OPCODE_CLEAN },
+    { "CHAR" , SC_OPCODE_CHAR },
+    { "JIS" , SC_OPCODE_JIS },
+    { "ASC" , SC_OPCODE_ASC },
+    { "UNICODE" , SC_OPCODE_UNICODE },
+    { "UNICHAR" , SC_OPCODE_UNICHAR },
+    { "LOG10" , SC_OPCODE_LOG10 },
+    { "EVEN" , SC_OPCODE_EVEN },
+    { "ODD" , SC_OPCODE_ODD },
+    { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST },
+    { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS },
+    { "FISHER" , SC_OPCODE_FISHER },
+    { "FISHERINV" , SC_OPCODE_FISHER_INV },
+    { "NORMSINV" , SC_OPCODE_S_NORM_INV },
+    { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS },
+    { "GAMMALN" , SC_OPCODE_GAMMA_LN },
+    { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS },
+    { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE },
+    { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF },
+    { "FORMULA" , SC_OPCODE_FORMULA },
+    { "ATAN2" , SC_OPCODE_ARC_TAN_2 },
+    { "CEILING.MATH" , SC_OPCODE_CEIL_MATH },
+    { "CEILING" , SC_OPCODE_CEIL },
+    { "CEILING.XCL" , SC_OPCODE_CEIL_MS },
+    { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE },
+    { "ISO.CEILING" , SC_OPCODE_CEIL_ISO },
+    { "FLOOR" , SC_OPCODE_FLOOR },
+    { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS },
+    { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH },
+    { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE },
+    { "ROUND" , SC_OPCODE_ROUND },
+    { "ROUNDUP" , SC_OPCODE_ROUND_UP },
+    { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN },
+    { "TRUNC" , SC_OPCODE_TRUNC },
+    { "LOG" , SC_OPCODE_LOG },
+    { "POWER" , SC_OPCODE_POWER },
+    { "GCD" , SC_OPCODE_GCD },
+    { "LCM" , SC_OPCODE_LCM },
+    { "MOD" , SC_OPCODE_MOD },
+    { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT },
+    { "SUMSQ" , SC_OPCODE_SUM_SQ },
+    { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 },
+    { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 },
+    { "SUMXMY2" , SC_OPCODE_SUM_XMY2 },
+    { "DATE" , SC_OPCODE_GET_DATE },
+    { "TIME" , SC_OPCODE_GET_TIME },
+    { "DAYS" , SC_OPCODE_GET_DIFF_DATE },
+    { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 },
+    { "DATEDIF" , SC_OPCODE_GET_DATEDIF },
+    { "MIN" , SC_OPCODE_MIN },
+    { "MINA" , SC_OPCODE_MIN_A },
+    { "MAX" , SC_OPCODE_MAX },
+    { "MAXA" , SC_OPCODE_MAX_A },
+    { "SUM" , SC_OPCODE_SUM },
+    { "PRODUCT" , SC_OPCODE_PRODUCT },
+    { "AVERAGE" , SC_OPCODE_AVERAGE },
+    { "AVERAGEA" , SC_OPCODE_AVERAGE_A },
+    { "COUNT" , SC_OPCODE_COUNT },
+    { "COUNTA" , SC_OPCODE_COUNT_2 },
+    { "NPV" , SC_OPCODE_NPV },
+    { "IRR" , SC_OPCODE_IRR },
+    { "MIRR" , SC_OPCODE_MIRR },
+    { "ISPMT" , SC_OPCODE_ISPMT },
+    { "VAR" , SC_OPCODE_VAR },
+    { "VARA" , SC_OPCODE_VAR_A },
+    { "VARP" , SC_OPCODE_VAR_P },
+    { "VARPA" , SC_OPCODE_VAR_P_A },
+    { "VAR.P" , SC_OPCODE_VAR_P_MS },
+    { "VAR.S" , SC_OPCODE_VAR_S },
+    { "STDEV" , SC_OPCODE_ST_DEV },
+    { "STDEVA" , SC_OPCODE_ST_DEV_A },
+    { "STDEVP" , SC_OPCODE_ST_DEV_P },
+    { "STDEVPA" , SC_OPCODE_ST_DEV_P_A },
+    { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS },
+    { "STDEV.S" , SC_OPCODE_ST_DEV_S },
+    { "B" , SC_OPCODE_B },
+    { "NORMDIST" , SC_OPCODE_NORM_DIST },
+    { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS },
+    { "EXPONDIST" , SC_OPCODE_EXP_DIST },
+    { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS },
+    { "BINOMDIST" , SC_OPCODE_BINOM_DIST },
+    { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS },
+    { "POISSON" , SC_OPCODE_POISSON_DIST },
+    { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS },
+    { "COMBIN" , SC_OPCODE_COMBIN },
+    { "COMBINA" , SC_OPCODE_COMBIN_A },
+    { "PERMUT" , SC_OPCODE_PERMUT },
+    { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A },
+    { "PV" , SC_OPCODE_PV },
+    { "SYD" , SC_OPCODE_SYD },
+    { "DDB" , SC_OPCODE_DDB },
+    { "DB" , SC_OPCODE_DB },
+    { "VDB" , SC_OPCODE_VBD },
+    { "DURATION" , SC_OPCODE_PDURATION },
+    { "SLN" , SC_OPCODE_SLN },
+    { "PMT" , SC_OPCODE_PMT },
+    { "COLUMNS" , SC_OPCODE_COLUMNS },
+    { "ROWS" , SC_OPCODE_ROWS },
+    { "SHEETS" , SC_OPCODE_SHEETS },
+    { "COLUMN" , SC_OPCODE_COLUMN },
+    { "ROW" , SC_OPCODE_ROW },
+    { "SHEET" , SC_OPCODE_SHEET },
+    { "ZGZ" , SC_OPCODE_RRI },
+    { "FV" , SC_OPCODE_FV },
+    { "NPER" , SC_OPCODE_NPER },
+    { "RATE" , SC_OPCODE_RATE },
+    { "IPMT" , SC_OPCODE_IPMT },
+    { "PPMT" , SC_OPCODE_PPMT },
+    { "CUMIPMT" , SC_OPCODE_CUM_IPMT },
+    { "CUMPRINC" , SC_OPCODE_CUM_PRINC },
+    { "EFFECTIVE" , SC_OPCODE_EFFECT },
+    { "NOMINAL" , SC_OPCODE_NOMINAL },
+    { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL },
+    { "DSUM" , SC_OPCODE_DB_SUM },
+    { "DCOUNT" , SC_OPCODE_DB_COUNT },
+    { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 },
+    { "DAVERAGE" , SC_OPCODE_DB_AVERAGE },
+    { "DGET" , SC_OPCODE_DB_GET },
+    { "DMAX" , SC_OPCODE_DB_MAX },
+    { "DMIN" , SC_OPCODE_DB_MIN },
+    { "DPRODUCT" , SC_OPCODE_DB_PRODUCT },
+    { "DSTDEV" , SC_OPCODE_DB_STD_DEV },
+    { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P },
+    { "DVAR" , SC_OPCODE_DB_VAR },
+    { "DVARP" , SC_OPCODE_DB_VAR_P },
+    { "INDIRECT" , SC_OPCODE_INDIRECT },
+    { "ADDRESS" , SC_OPCODE_ADDRESS },
+    { "MATCH" , SC_OPCODE_MATCH },
+    { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { "COUNTIF" , SC_OPCODE_COUNT_IF },
+    { "SUMIF" , SC_OPCODE_SUM_IF },
+    { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF },
+    { "SUMIFS" , SC_OPCODE_SUM_IFS },
+    { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS },
+    { "COUNTIFS" , SC_OPCODE_COUNT_IFS },
+    { "LOOKUP" , SC_OPCODE_LOOKUP },
+    { "VLOOKUP" , SC_OPCODE_V_LOOKUP },
+    { "HLOOKUP" , SC_OPCODE_H_LOOKUP },
+    { "MULTIRANGE" , SC_OPCODE_MULTI_AREA },    // legacy for range list (union)
+    { "OFFSET" , SC_OPCODE_OFFSET },
+    { "INDEX" , SC_OPCODE_INDEX },  // ?? first character = I ??
+    { "AREAS" , SC_OPCODE_AREAS },
+    { "DOLLAR" , SC_OPCODE_CURRENCY },
+    { "REPLACE" , SC_OPCODE_REPLACE },
+    { "FIXED" , SC_OPCODE_FIXED },
+    { "FIND" , SC_OPCODE_FIND },
+    { "EXACT" , SC_OPCODE_EXACT },
+    { "LEFT" , SC_OPCODE_LEFT },
+    { "RIGHT" , SC_OPCODE_RIGHT },
+    { "SEARCH" , SC_OPCODE_SEARCH },
+    { "MID" , SC_OPCODE_MID },
+    { "LENB" , SC_OPCODE_LENB },
+    { "RIGHTB" , SC_OPCODE_RIGHTB },
+    { "LEFTB" , SC_OPCODE_LEFTB },
+    { "REPLACEB" , SC_OPCODE_REPLACEB },
+    { "MIDB" , SC_OPCODE_MIDB },
+    { "TEXT" , SC_OPCODE_TEXT },
+    { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE },
+    { "REPT" , SC_OPCODE_REPT },
+    { "CONCATENATE" , SC_OPCODE_CONCAT },
+    { "CONCAT" , SC_OPCODE_CONCAT_MS },
+    { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS },
+    { "IFS" , SC_OPCODE_IFS_MS },
+    { "SWITCH" , SC_OPCODE_SWITCH_MS },
+    { "MINIFS" , SC_OPCODE_MINIFS_MS },
+    { "MAXIFS" , SC_OPCODE_MAXIFS_MS },
+    { "MVALUE" , SC_OPCODE_MAT_VALUE },
+    { "MDETERM" , SC_OPCODE_MAT_DET },
+    { "MINVERSE" , SC_OPCODE_MAT_INV },
+    { "MMULT" , SC_OPCODE_MAT_MULT },
+    { "TRANSPOSE" , SC_OPCODE_MAT_TRANS },
+    { "MUNIT" , SC_OPCODE_MATRIX_UNIT },
+    { "GOALSEEK" , SC_OPCODE_BACK_SOLVER },
+    { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST },
+    { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST },
+    { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS },
+    { "TDIST" , SC_OPCODE_T_DIST },
+    { "T.DIST.2T" , SC_OPCODE_T_DIST_2T },
+    { "T.DIST" , SC_OPCODE_T_DIST_MS },
+    { "T.DIST.RT" , SC_OPCODE_T_DIST_RT },
+    { "FDIST" , SC_OPCODE_F_DIST },
+    { "F.DIST" , SC_OPCODE_F_DIST_LT },
+    { "F.DIST.RT" , SC_OPCODE_F_DIST_RT },
+    { "CHIDIST" , SC_OPCODE_CHI_DIST },
+    { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS },
+    { "WEIBULL" , SC_OPCODE_WEIBULL },
+    { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS },
+    { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT },
+    { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { "CRITBINOM" , SC_OPCODE_CRIT_BINOM },
+    { "BINOM.INV" , SC_OPCODE_BINOM_INV },
+    { "KURT" , SC_OPCODE_KURT },
+    { "HARMEAN" , SC_OPCODE_HAR_MEAN },
+    { "GEOMEAN" , SC_OPCODE_GEO_MEAN },
+    { "STANDARDIZE" , SC_OPCODE_STANDARD },
+    { "AVEDEV" , SC_OPCODE_AVE_DEV },
+    { "SKEW" , SC_OPCODE_SKEW },
+    { "SKEWP" , SC_OPCODE_SKEWP },
+    { "DEVSQ" , SC_OPCODE_DEV_SQ },
+    { "MEDIAN" , SC_OPCODE_MEDIAN },
+    { "MODE" , SC_OPCODE_MODAL_VALUE },
+    { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS },
+    { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI },
+    { "ZTEST" , SC_OPCODE_Z_TEST },
+    { "Z.TEST" , SC_OPCODE_Z_TEST_MS },
+    { "AGGREGATE" , SC_OPCODE_AGGREGATE },
+    { "TTEST" , SC_OPCODE_T_TEST },
+    { "T.TEST" , SC_OPCODE_T_TEST_MS },
+    { "RANK" , SC_OPCODE_RANK },
+    { "PERCENTILE" , SC_OPCODE_PERCENTILE },
+    { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK },
+    { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC },
+    { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC },
+    { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC },
+    { "RANK.EQ" , SC_OPCODE_RANK_EQ },
+    { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC },
+    { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC },
+    { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC },
+    { "RANK.AVG" , SC_OPCODE_RANK_AVG },
+    { "LARGE" , SC_OPCODE_LARGE },
+    { "SMALL" , SC_OPCODE_SMALL },
+    { "FREQUENCY" , SC_OPCODE_FREQUENCY },
+    { "QUARTILE" , SC_OPCODE_QUARTILE },
+    { "NORMINV" , SC_OPCODE_NORM_INV },
+    { "NORM.INV" , SC_OPCODE_NORM_INV_MS },
+    { "CONFIDENCE" , SC_OPCODE_CONFIDENCE },
+    { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N },
+    { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T },
+    { "FTEST" , SC_OPCODE_F_TEST },
+    { "F.TEST" , SC_OPCODE_F_TEST_MS },
+    { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN },
+    { "PROB" , SC_OPCODE_PROB },
+    { "CORREL" , SC_OPCODE_CORREL },
+    { "COVAR" , SC_OPCODE_COVAR },
+    { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P },
+    { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S },
+    { "PEARSON" , SC_OPCODE_PEARSON },
+    { "RSQ" , SC_OPCODE_RSQ },
+    { "STEYX" , SC_OPCODE_STEYX },
+    { "SLOPE" , SC_OPCODE_SLOPE },
+    { "INTERCEPT" , SC_OPCODE_INTERCEPT },
+    { "TREND" , SC_OPCODE_TREND },
+    { "GROWTH" , SC_OPCODE_GROWTH },
+    { "LINEST" , SC_OPCODE_LINEST },
+    { "LOGEST" , SC_OPCODE_LOGEST },
+    { "FORECAST" , SC_OPCODE_FORECAST },
+    { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD },
+    { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA },
+    { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL },
+    { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA },
+    { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM },
+    { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA },
+    { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM },
+    { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN },
+    { "CHIINV" , SC_OPCODE_CHI_INV },
+    { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS },
+    { "GAMMADIST" , SC_OPCODE_GAMMA_DIST },
+    { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS },
+    { "GAMMAINV" , SC_OPCODE_GAMMA_INV },
+    { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS },
+    { "TINV" , SC_OPCODE_T_INV },
+    { "T.INV.2T" , SC_OPCODE_T_INV_2T },
+    { "T.INV" , SC_OPCODE_T_INV_MS },
+    { "FINV" , SC_OPCODE_F_INV },
+    { "F.INV" , SC_OPCODE_F_INV_LT },
+    { "F.INV.RT" , SC_OPCODE_F_INV_RT },
+    { "CHITEST" , SC_OPCODE_CHI_TEST },
+    { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS },
+    { "LOGINV" , SC_OPCODE_LOG_INV },
+    { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS },
+    { "TABLE" , SC_OPCODE_TABLE_OP },
+    { "BETADIST" , SC_OPCODE_BETA_DIST },
+    { "BETAINV" , SC_OPCODE_BETA_INV },
+    { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS },
+    { "BETA.INV" , SC_OPCODE_BETA_INV_MS },
+    { "WEEKNUM" , SC_OPCODE_WEEK },
+    { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
+    { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
+    { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+    { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
+    { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
+    { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
+    { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS },
+    { "#NAME!" , SC_OPCODE_NO_NAME },
+    { "STYLE" , SC_OPCODE_STYLE },
+    { "DDE" , SC_OPCODE_DDE },
+    { "BASE" , SC_OPCODE_BASE },
+    { "DECIMAL" , SC_OPCODE_DECIMAL },
+    { "CONVERT" , SC_OPCODE_CONVERT_OOO },
+    { "ROMAN" , SC_OPCODE_ROMAN },
+    { "ARABIC" , SC_OPCODE_ARABIC },
+    { "HYPERLINK" , SC_OPCODE_HYPERLINK },
+    { "INFO" , SC_OPCODE_INFO },
+    { "BAHTTEXT" , SC_OPCODE_BAHTTEXT },
+    { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA },
+    { "EUROCONVERT" , SC_OPCODE_EUROCONVERT },
+    { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE },
+    { "GAMMA" , SC_OPCODE_GAMMA },
+    { "CHISQDIST" , SC_OPCODE_CHISQ_DIST },
+    { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS },
+    { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS },
+    { "CHISQINV" , SC_OPCODE_CHISQ_INV },
+    { "BITAND" , SC_OPCODE_BITAND },
+    { "BITOR" , SC_OPCODE_BITOR },
+    { "BITXOR" , SC_OPCODE_BITXOR },
+    { "BITRSHIFT" , SC_OPCODE_BITRSHIFT },
+    { "BITLSHIFT" , SC_OPCODE_BITLSHIFT },
+    { "#NULL!" , SC_OPCODE_ERROR_NULL },
+    { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO },
+    { "#VALUE!" , SC_OPCODE_ERROR_VALUE },
+    { "#REF!" , SC_OPCODE_ERROR_REF },
+    { "#NAME?" , SC_OPCODE_ERROR_NAME },
+    { "#NUM!" , SC_OPCODE_ERROR_NUM },
+    { "#N/A" , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+    { "FILTERXML" , SC_OPCODE_FILTERXML },
+    { "WEBSERVICE" , SC_OPCODE_WEBSERVICE },
+    { "COLOR" , SC_OPCODE_COLOR },
+    { "ERF.PRECISE" , SC_OPCODE_ERF_MS },
+    { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS },
+    { "ENCODEURL" , SC_OPCODE_ENCODEURL },
+    { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT },
+    { "ROUNDSIG" , SC_OPCODE_ROUNDSIG },
+    { nullptr, -1 }
+};
+
+/** These English names can be chosen in the UI and can be changed. They
+    should match the [en-US] names of RID_STRLIST_FUNCTION_NAMES below. */
+// As such they are a duplicate, but we can not have two string localizations
+// at the same time.
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_ENGLISH[] =
+{
+    { "IF" , SC_OPCODE_IF },
+    { "IFERROR" , SC_OPCODE_IF_ERROR },
+    { "IFNA" , SC_OPCODE_IF_NA },
+    { "CHOOSE" , SC_OPCODE_CHOOSE },
+    { "(" , SC_OPCODE_OPEN },
+    { ")" , SC_OPCODE_CLOSE },
+    { "[" , SC_OPCODE_TABLE_REF_OPEN },
+    { "]" , SC_OPCODE_TABLE_REF_CLOSE },
+    { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL },
+    { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS },
+    { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA },
+    { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS },
+    { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW },
+    { "{" , SC_OPCODE_ARRAY_OPEN },
+    { "}" , SC_OPCODE_ARRAY_CLOSE },
+    { "|" , SC_OPCODE_ARRAY_ROW_SEP },
+    { ";" , SC_OPCODE_ARRAY_COL_SEP },
+    { ";" , SC_OPCODE_SEP },
+    { "%" , SC_OPCODE_PERCENT_SIGN },
+    { "+" , SC_OPCODE_ADD },
+    { "-" , SC_OPCODE_SUB },
+    { "*" , SC_OPCODE_MUL },
+    { "/" , SC_OPCODE_DIV },
+    { "&" , SC_OPCODE_AMPERSAND },
+    { "^" , SC_OPCODE_POW },
+    { "=" , SC_OPCODE_EQUAL },
+    { "<>" , SC_OPCODE_NOT_EQUAL },
+    { "<" , SC_OPCODE_LESS },
+    { ">" , SC_OPCODE_GREATER },
+    { "<=" , SC_OPCODE_LESS_EQUAL },
+    { ">=" , SC_OPCODE_GREATER_EQUAL },
+    { "AND" , SC_OPCODE_AND },
+    { "OR" , SC_OPCODE_OR },
+    { "XOR" , SC_OPCODE_XOR },
+    { "!" , SC_OPCODE_INTERSECT },
+    { "~" , SC_OPCODE_UNION },
+    { ":" , SC_OPCODE_RANGE },
+    { "NOT" , SC_OPCODE_NOT },
+    { "NEG" , SC_OPCODE_NEG },
+    { "-" , SC_OPCODE_NEG_SUB },
+    { "PI" , SC_OPCODE_PI },
+    { "RAND" , SC_OPCODE_RANDOM },
+    { "TRUE" , SC_OPCODE_TRUE },
+    { "FALSE" , SC_OPCODE_FALSE },
+    { "TODAY" , SC_OPCODE_GET_ACT_DATE },
+    { "NOW" , SC_OPCODE_GET_ACT_TIME },
+    { "NA" , SC_OPCODE_NO_VALUE },
+    { "CURRENT" , SC_OPCODE_CURRENT },
+    { "DEGREES" , SC_OPCODE_DEG },
+    { "RADIANS" , SC_OPCODE_RAD },
+    { "SIN" , SC_OPCODE_SIN },
+    { "COS" , SC_OPCODE_COS },
+    { "TAN" , SC_OPCODE_TAN },
+    { "COT" , SC_OPCODE_COT },
+    { "ASIN" , SC_OPCODE_ARC_SIN },
+    { "ACOS" , SC_OPCODE_ARC_COS },
+    { "ATAN" , SC_OPCODE_ARC_TAN },
+    { "ACOT" , SC_OPCODE_ARC_COT },
+    { "SINH" , SC_OPCODE_SIN_HYP },
+    { "COSH" , SC_OPCODE_COS_HYP },
+    { "TANH" , SC_OPCODE_TAN_HYP },
+    { "COTH" , SC_OPCODE_COT_HYP },
+    { "ASINH" , SC_OPCODE_ARC_SIN_HYP },
+    { "ACOSH" , SC_OPCODE_ARC_COS_HYP },
+    { "ATANH" , SC_OPCODE_ARC_TAN_HYP },
+    { "ACOTH" , SC_OPCODE_ARC_COT_HYP },
+    { "CSC" , SC_OPCODE_COSECANT },
+    { "SEC" , SC_OPCODE_SECANT },
+    { "CSCH" , SC_OPCODE_COSECANT_HYP },
+    { "SECH" , SC_OPCODE_SECANT_HYP },
+    { "EXP" , SC_OPCODE_EXP },
+    { "LN" , SC_OPCODE_LN },
+    { "SQRT" , SC_OPCODE_SQRT },
+    { "FACT" , SC_OPCODE_FACT },
+    { "YEAR" , SC_OPCODE_GET_YEAR },
+    { "MONTH" , SC_OPCODE_GET_MONTH },
+    { "DAY" , SC_OPCODE_GET_DAY },
+    { "HOUR" , SC_OPCODE_GET_HOUR },
+    { "MINUTE" , SC_OPCODE_GET_MIN },
+    { "SECOND" , SC_OPCODE_GET_SEC },
+    { "SIGN" , SC_OPCODE_PLUS_MINUS },
+    { "ABS" , SC_OPCODE_ABS },
+    { "INT" , SC_OPCODE_INT },
+    { "PHI" , SC_OPCODE_PHI },
+    { "GAUSS" , SC_OPCODE_GAUSS },
+    { "ISBLANK" , SC_OPCODE_IS_EMPTY },
+    { "ISTEXT" , SC_OPCODE_IS_STRING },
+    { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING },
+    { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL },
+    { "TYPE" , SC_OPCODE_TYPE },
+    { "CELL" , SC_OPCODE_CELL },
+    { "ISREF" , SC_OPCODE_IS_REF },
+    { "ISNUMBER" , SC_OPCODE_IS_VALUE },
+    { "ISFORMULA" , SC_OPCODE_IS_FORMULA },
+    { "ISNA" , SC_OPCODE_IS_NV },
+    { "ISERR" , SC_OPCODE_IS_ERR },
+    { "ISERROR" , SC_OPCODE_IS_ERROR },
+    { "ISEVEN" , SC_OPCODE_IS_EVEN },
+    { "ISODD" , SC_OPCODE_IS_ODD },
+    { "N" , SC_OPCODE_N },
+    { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE },
+    { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE },
+    { "CODE" , SC_OPCODE_CODE },
+    { "TRIM" , SC_OPCODE_TRIM },
+    { "UPPER" , SC_OPCODE_UPPER },
+    { "PROPER" , SC_OPCODE_PROPER },
+    { "LOWER" , SC_OPCODE_LOWER },
+    { "LEN" , SC_OPCODE_LEN },
+    { "T" , SC_OPCODE_T },
+    { "VALUE" , SC_OPCODE_VALUE },
+    { "CLEAN" , SC_OPCODE_CLEAN },
+    { "CHAR" , SC_OPCODE_CHAR },
+    { "JIS" , SC_OPCODE_JIS },
+    { "ASC" , SC_OPCODE_ASC },
+    { "UNICODE" , SC_OPCODE_UNICODE },
+    { "UNICHAR" , SC_OPCODE_UNICHAR },
+    { "LOG10" , SC_OPCODE_LOG10 },
+    { "EVEN" , SC_OPCODE_EVEN },
+    { "ODD" , SC_OPCODE_ODD },
+    { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST },
+    { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS },
+    { "FISHER" , SC_OPCODE_FISHER },
+    { "FISHERINV" , SC_OPCODE_FISHER_INV },
+    { "NORMSINV" , SC_OPCODE_S_NORM_INV },
+    { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS },
+    { "GAMMALN" , SC_OPCODE_GAMMA_LN },
+    { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS },
+    { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE },
+    { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF },
+    { "FORMULA" , SC_OPCODE_FORMULA },
+    { "ATAN2" , SC_OPCODE_ARC_TAN_2 },
+    { "CEILING.MATH" , SC_OPCODE_CEIL_MATH },
+    { "CEILING" , SC_OPCODE_CEIL },
+    { "CEILING.XCL" , SC_OPCODE_CEIL_MS },
+    { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE },
+    { "ISO.CEILING" , SC_OPCODE_CEIL_ISO },
+    { "FLOOR" , SC_OPCODE_FLOOR },
+    { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS },
+    { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH },
+    { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE },
+    { "ROUND" , SC_OPCODE_ROUND },
+    { "ROUNDUP" , SC_OPCODE_ROUND_UP },
+    { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN },
+    { "TRUNC" , SC_OPCODE_TRUNC },
+    { "LOG" , SC_OPCODE_LOG },
+    { "POWER" , SC_OPCODE_POWER },
+    { "GCD" , SC_OPCODE_GCD },
+    { "LCM" , SC_OPCODE_LCM },
+    { "MOD" , SC_OPCODE_MOD },
+    { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT },
+    { "SUMSQ" , SC_OPCODE_SUM_SQ },
+    { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 },
+    { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 },
+    { "SUMXMY2" , SC_OPCODE_SUM_XMY2 },
+    { "DATE" , SC_OPCODE_GET_DATE },
+    { "TIME" , SC_OPCODE_GET_TIME },
+    { "DAYS" , SC_OPCODE_GET_DIFF_DATE },
+    { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 },
+    { "DATEDIF" , SC_OPCODE_GET_DATEDIF },
+    { "MIN" , SC_OPCODE_MIN },
+    { "MINA" , SC_OPCODE_MIN_A },
+    { "MAX" , SC_OPCODE_MAX },
+    { "MAXA" , SC_OPCODE_MAX_A },
+    { "SUM" , SC_OPCODE_SUM },
+    { "PRODUCT" , SC_OPCODE_PRODUCT },
+    { "AVERAGE" , SC_OPCODE_AVERAGE },
+    { "AVERAGEA" , SC_OPCODE_AVERAGE_A },
+    { "COUNT" , SC_OPCODE_COUNT },
+    { "COUNTA" , SC_OPCODE_COUNT_2 },
+    { "NPV" , SC_OPCODE_NPV },
+    { "IRR" , SC_OPCODE_IRR },
+    { "MIRR" , SC_OPCODE_MIRR },
+    { "ISPMT" , SC_OPCODE_ISPMT },
+    { "VAR" , SC_OPCODE_VAR },
+    { "VARA" , SC_OPCODE_VAR_A },
+    { "VARP" , SC_OPCODE_VAR_P },
+    { "VARPA" , SC_OPCODE_VAR_P_A },
+    { "VAR.P" , SC_OPCODE_VAR_P_MS },
+    { "VAR.S" , SC_OPCODE_VAR_S },
+    { "STDEV" , SC_OPCODE_ST_DEV },
+    { "STDEVA" , SC_OPCODE_ST_DEV_A },
+    { "STDEVP" , SC_OPCODE_ST_DEV_P },
+    { "STDEVPA" , SC_OPCODE_ST_DEV_P_A },
+    { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS },
+    { "STDEV.S" , SC_OPCODE_ST_DEV_S },
+    { "B" , SC_OPCODE_B },
+    { "NORMDIST" , SC_OPCODE_NORM_DIST },
+    { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS },
+    { "EXPONDIST" , SC_OPCODE_EXP_DIST },
+    { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS },
+    { "BINOMDIST" , SC_OPCODE_BINOM_DIST },
+    { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS },
+    { "POISSON" , SC_OPCODE_POISSON_DIST },
+    { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS },
+    { "COMBIN" , SC_OPCODE_COMBIN },
+    { "COMBINA" , SC_OPCODE_COMBIN_A },
+    { "PERMUT" , SC_OPCODE_PERMUT },
+    { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A },
+    { "PV" , SC_OPCODE_PV },
+    { "SYD" , SC_OPCODE_SYD },
+    { "DDB" , SC_OPCODE_DDB },
+    { "DB" , SC_OPCODE_DB },
+    { "VDB" , SC_OPCODE_VBD },
+    { "PDURATION" , SC_OPCODE_PDURATION },
+    { "SLN" , SC_OPCODE_SLN },
+    { "PMT" , SC_OPCODE_PMT },
+    { "COLUMNS" , SC_OPCODE_COLUMNS },
+    { "ROWS" , SC_OPCODE_ROWS },
+    { "SHEETS" , SC_OPCODE_SHEETS },
+    { "COLUMN" , SC_OPCODE_COLUMN },
+    { "ROW" , SC_OPCODE_ROW },
+    { "SHEET" , SC_OPCODE_SHEET },
+    { "ZGZ" , SC_OPCODE_RRI },
+    { "FV" , SC_OPCODE_FV },
+    { "NPER" , SC_OPCODE_NPER },
+    { "RATE" , SC_OPCODE_RATE },
+    { "IPMT" , SC_OPCODE_IPMT },
+    { "PPMT" , SC_OPCODE_PPMT },
+    { "CUMIPMT" , SC_OPCODE_CUM_IPMT },
+    { "CUMPRINC" , SC_OPCODE_CUM_PRINC },
+    { "EFFECTIVE" , SC_OPCODE_EFFECT },
+    { "NOMINAL" , SC_OPCODE_NOMINAL },
+    { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL },
+    { "DSUM" , SC_OPCODE_DB_SUM },
+    { "DCOUNT" , SC_OPCODE_DB_COUNT },
+    { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 },
+    { "DAVERAGE" , SC_OPCODE_DB_AVERAGE },
+    { "DGET" , SC_OPCODE_DB_GET },
+    { "DMAX" , SC_OPCODE_DB_MAX },
+    { "DMIN" , SC_OPCODE_DB_MIN },
+    { "DPRODUCT" , SC_OPCODE_DB_PRODUCT },
+    { "DSTDEV" , SC_OPCODE_DB_STD_DEV },
+    { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P },
+    { "DVAR" , SC_OPCODE_DB_VAR },
+    { "DVARP" , SC_OPCODE_DB_VAR_P },
+    { "INDIRECT" , SC_OPCODE_INDIRECT },
+    { "ADDRESS" , SC_OPCODE_ADDRESS },
+    { "MATCH" , SC_OPCODE_MATCH },
+    { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { "COUNTIF" , SC_OPCODE_COUNT_IF },
+    { "SUMIF" , SC_OPCODE_SUM_IF },
+    { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF },
+    { "SUMIFS" , SC_OPCODE_SUM_IFS },
+    { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS },
+    { "COUNTIFS" , SC_OPCODE_COUNT_IFS },
+    { "LOOKUP" , SC_OPCODE_LOOKUP },
+    { "VLOOKUP" , SC_OPCODE_V_LOOKUP },
+    { "HLOOKUP" , SC_OPCODE_H_LOOKUP },
+    { "MULTIRANGE" , SC_OPCODE_MULTI_AREA },
+    { "OFFSET" , SC_OPCODE_OFFSET },
+    { "INDEX" , SC_OPCODE_INDEX },
+    { "AREAS" , SC_OPCODE_AREAS },
+    { "DOLLAR" , SC_OPCODE_CURRENCY },
+    { "REPLACE" , SC_OPCODE_REPLACE },
+    { "FIXED" , SC_OPCODE_FIXED },
+    { "FIND" , SC_OPCODE_FIND },
+    { "EXACT" , SC_OPCODE_EXACT },
+    { "LEFT" , SC_OPCODE_LEFT },
+    { "RIGHT" , SC_OPCODE_RIGHT },
+    { "SEARCH" , SC_OPCODE_SEARCH },
+    { "MID" , SC_OPCODE_MID },
+    { "LENB" , SC_OPCODE_LENB },
+    { "RIGHTB" , SC_OPCODE_RIGHTB },
+    { "LEFTB" , SC_OPCODE_LEFTB },
+    { "REPLACEB" , SC_OPCODE_REPLACEB },
+    { "MIDB" , SC_OPCODE_MIDB },
+    { "TEXT" , SC_OPCODE_TEXT },
+    { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE },
+    { "REPT" , SC_OPCODE_REPT },
+    { "CONCATENATE" , SC_OPCODE_CONCAT },
+    { "CONCAT" , SC_OPCODE_CONCAT_MS },
+    { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS },
+    { "IFS" , SC_OPCODE_IFS_MS },
+    { "SWITCH" , SC_OPCODE_SWITCH_MS },
+    { "MINIFS" , SC_OPCODE_MINIFS_MS },
+    { "MAXIFS" , SC_OPCODE_MAXIFS_MS },
+    { "MVALUE" , SC_OPCODE_MAT_VALUE },
+    { "MDETERM" , SC_OPCODE_MAT_DET },
+    { "MINVERSE" , SC_OPCODE_MAT_INV },
+    { "MMULT" , SC_OPCODE_MAT_MULT },
+    { "TRANSPOSE" , SC_OPCODE_MAT_TRANS },
+    { "MUNIT" , SC_OPCODE_MATRIX_UNIT },
+    { "GOALSEEK" , SC_OPCODE_BACK_SOLVER },
+    { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST },
+    { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST },
+    { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS },
+    { "TDIST" , SC_OPCODE_T_DIST },
+    { "T.DIST.2T" , SC_OPCODE_T_DIST_2T },
+    { "T.DIST" , SC_OPCODE_T_DIST_MS },
+    { "T.DIST.RT" , SC_OPCODE_T_DIST_RT },
+    { "FDIST" , SC_OPCODE_F_DIST },
+    { "F.DIST" , SC_OPCODE_F_DIST_LT },
+    { "F.DIST.RT" , SC_OPCODE_F_DIST_RT },
+    { "CHIDIST" , SC_OPCODE_CHI_DIST },
+    { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS },
+    { "WEIBULL" , SC_OPCODE_WEIBULL },
+    { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS },
+    { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT },
+    { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { "CRITBINOM" , SC_OPCODE_CRIT_BINOM },
+    { "BINOM.INV" , SC_OPCODE_BINOM_INV },
+    { "KURT" , SC_OPCODE_KURT },
+    { "HARMEAN" , SC_OPCODE_HAR_MEAN },
+    { "GEOMEAN" , SC_OPCODE_GEO_MEAN },
+    { "STANDARDIZE" , SC_OPCODE_STANDARD },
+    { "AVEDEV" , SC_OPCODE_AVE_DEV },
+    { "SKEW" , SC_OPCODE_SKEW },
+    { "SKEWP" , SC_OPCODE_SKEWP },
+    { "DEVSQ" , SC_OPCODE_DEV_SQ },
+    { "MEDIAN" , SC_OPCODE_MEDIAN },
+    { "MODE" , SC_OPCODE_MODAL_VALUE },
+    { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS },
+    { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI },
+    { "ZTEST" , SC_OPCODE_Z_TEST },
+    { "Z.TEST" , SC_OPCODE_Z_TEST_MS },
+    { "AGGREGATE" , SC_OPCODE_AGGREGATE },
+    { "TTEST" , SC_OPCODE_T_TEST },
+    { "T.TEST" , SC_OPCODE_T_TEST_MS },
+    { "RANK" , SC_OPCODE_RANK },
+    { "PERCENTILE" , SC_OPCODE_PERCENTILE },
+    { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK },
+    { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC },
+    { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC },
+    { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC },
+    { "RANK.EQ" , SC_OPCODE_RANK_EQ },
+    { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC },
+    { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC },
+    { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC },
+    { "RANK.AVG" , SC_OPCODE_RANK_AVG },
+    { "LARGE" , SC_OPCODE_LARGE },
+    { "SMALL" , SC_OPCODE_SMALL },
+    { "FREQUENCY" , SC_OPCODE_FREQUENCY },
+    { "QUARTILE" , SC_OPCODE_QUARTILE },
+    { "NORMINV" , SC_OPCODE_NORM_INV },
+    { "NORM.INV" , SC_OPCODE_NORM_INV_MS },
+    { "CONFIDENCE" , SC_OPCODE_CONFIDENCE },
+    { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N },
+    { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T },
+    { "FTEST" , SC_OPCODE_F_TEST },
+    { "F.TEST" , SC_OPCODE_F_TEST_MS },
+    { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN },
+    { "PROB" , SC_OPCODE_PROB },
+    { "CORREL" , SC_OPCODE_CORREL },
+    { "COVAR" , SC_OPCODE_COVAR },
+    { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P },
+    { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S },
+    { "PEARSON" , SC_OPCODE_PEARSON },
+    { "RSQ" , SC_OPCODE_RSQ },
+    { "STEYX" , SC_OPCODE_STEYX },
+    { "SLOPE" , SC_OPCODE_SLOPE },
+    { "INTERCEPT" , SC_OPCODE_INTERCEPT },
+    { "TREND" , SC_OPCODE_TREND },
+    { "GROWTH" , SC_OPCODE_GROWTH },
+    { "LINEST" , SC_OPCODE_LINEST },
+    { "LOGEST" , SC_OPCODE_LOGEST },
+    { "FORECAST" , SC_OPCODE_FORECAST },
+    { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD },
+    { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA },
+    { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL },
+    { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA },
+    { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM },
+    { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA },
+    { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM },
+    { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN },
+    { "CHIINV" , SC_OPCODE_CHI_INV },
+    { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS },
+    { "GAMMADIST" , SC_OPCODE_GAMMA_DIST },
+    { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS },
+    { "GAMMAINV" , SC_OPCODE_GAMMA_INV },
+    { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS },
+    { "TINV" , SC_OPCODE_T_INV },
+    { "T.INV.2T" , SC_OPCODE_T_INV_2T },
+    { "T.INV" , SC_OPCODE_T_INV_MS },
+    { "FINV" , SC_OPCODE_F_INV },
+    { "F.INV" , SC_OPCODE_F_INV_LT },
+    { "F.INV.RT" , SC_OPCODE_F_INV_RT },
+    { "CHITEST" , SC_OPCODE_CHI_TEST },
+    { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS },
+    { "LOGINV" , SC_OPCODE_LOG_INV },
+    { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS },
+    { "TABLE" , SC_OPCODE_TABLE_OP },
+    { "BETADIST" , SC_OPCODE_BETA_DIST },
+    { "BETAINV" , SC_OPCODE_BETA_INV },
+    { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS },
+    { "BETA.INV" , SC_OPCODE_BETA_INV_MS },
+    { "WEEKNUM" , SC_OPCODE_WEEK },
+    { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM },
+    { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO },
+    { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY },
+    { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK },
+    { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS },
+    { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS },
+    { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS },
+    { "#NAME!" , SC_OPCODE_NO_NAME },
+    { "STYLE" , SC_OPCODE_STYLE },
+    { "DDE" , SC_OPCODE_DDE },
+    { "BASE" , SC_OPCODE_BASE },
+    { "DECIMAL" , SC_OPCODE_DECIMAL },
+    { "CONVERT_OOO" , SC_OPCODE_CONVERT_OOO },
+    { "ROMAN" , SC_OPCODE_ROMAN },
+    { "ARABIC" , SC_OPCODE_ARABIC },
+    { "HYPERLINK" , SC_OPCODE_HYPERLINK },
+    { "INFO" , SC_OPCODE_INFO },
+    { "BAHTTEXT" , SC_OPCODE_BAHTTEXT },
+    { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA },
+    { "EUROCONVERT" , SC_OPCODE_EUROCONVERT },
+    { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE },
+    { "GAMMA" , SC_OPCODE_GAMMA },
+    { "CHISQDIST" , SC_OPCODE_CHISQ_DIST },
+    { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS },
+    { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS },
+    { "CHISQINV" , SC_OPCODE_CHISQ_INV },
+    { "BITAND" , SC_OPCODE_BITAND },
+    { "BITOR" , SC_OPCODE_BITOR },
+    { "BITXOR" , SC_OPCODE_BITXOR },
+    { "BITRSHIFT" , SC_OPCODE_BITRSHIFT },
+    { "BITLSHIFT" , SC_OPCODE_BITLSHIFT },
+    { "#NULL!" , SC_OPCODE_ERROR_NULL },
+    { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO },
+    { "#VALUE!" , SC_OPCODE_ERROR_VALUE },
+    { "#REF!" , SC_OPCODE_ERROR_REF },
+    { "#NAME?" , SC_OPCODE_ERROR_NAME },
+    { "#NUM!" , SC_OPCODE_ERROR_NUM },
+    { "#N/A" , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+    { "FILTERXML" , SC_OPCODE_FILTERXML },
+    { "WEBSERVICE" , SC_OPCODE_WEBSERVICE },
+    { "COLOR" , SC_OPCODE_COLOR },
+    { "ERF.PRECISE" , SC_OPCODE_ERF_MS },
+    { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS },
+    { "ENCODEURL" , SC_OPCODE_ENCODEURL },
+    { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT },
+    { "ROUNDSIG" , SC_OPCODE_ROUNDSIG },
+    { nullptr, -1 }
+};
+
+/** Function names that can be localized if [en-US]. Same names should be used
+    in RID_STRLIST_FUNCTION_NAMES_ENGLISH above. Names can be changed, the
+    change has to be mentioned in the release notes, i.e.
+    https://wiki.documentfoundation.org/ReleaseNotes/...
+ */
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES[] =
+{
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IF") , SC_OPCODE_IF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IFERROR") , SC_OPCODE_IF_ERROR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IFNA") , SC_OPCODE_IF_NA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHOOSE") , SC_OPCODE_CHOOSE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#All") , SC_OPCODE_TABLE_REF_ITEM_ALL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#Headers") , SC_OPCODE_TABLE_REF_ITEM_HEADERS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#Data") , SC_OPCODE_TABLE_REF_ITEM_DATA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#Totals") , SC_OPCODE_TABLE_REF_ITEM_TOTALS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#This Row") , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AND") , SC_OPCODE_AND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "OR") , SC_OPCODE_OR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "XOR") , SC_OPCODE_XOR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NOT") , SC_OPCODE_NOT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NEG") , SC_OPCODE_NEG },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PI") , SC_OPCODE_PI }, // ???
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RAND") , SC_OPCODE_RANDOM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TRUE") , SC_OPCODE_TRUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FALSE") , SC_OPCODE_FALSE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TODAY") , SC_OPCODE_GET_ACT_DATE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NOW") , SC_OPCODE_GET_ACT_TIME },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NA") , SC_OPCODE_NO_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CURRENT") , SC_OPCODE_CURRENT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DEGREES") , SC_OPCODE_DEG },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RADIANS") , SC_OPCODE_RAD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SIN") , SC_OPCODE_SIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COS") , SC_OPCODE_COS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TAN") , SC_OPCODE_TAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COT") , SC_OPCODE_COT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ASIN") , SC_OPCODE_ARC_SIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOS") , SC_OPCODE_ARC_COS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ATAN") , SC_OPCODE_ARC_TAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOT") , SC_OPCODE_ARC_COT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SINH") , SC_OPCODE_SIN_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COSH") , SC_OPCODE_COS_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TANH") , SC_OPCODE_TAN_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COTH") , SC_OPCODE_COT_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ASINH") , SC_OPCODE_ARC_SIN_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOSH") , SC_OPCODE_ARC_COS_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ATANH") , SC_OPCODE_ARC_TAN_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOTH") , SC_OPCODE_ARC_COT_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CSC") , SC_OPCODE_COSECANT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SEC") , SC_OPCODE_SECANT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CSCH") , SC_OPCODE_COSECANT_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SECH") , SC_OPCODE_SECANT_HYP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EXP") , SC_OPCODE_EXP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LN") , SC_OPCODE_LN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SQRT") , SC_OPCODE_SQRT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FACT") , SC_OPCODE_FACT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "YEAR") , SC_OPCODE_GET_YEAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MONTH") , SC_OPCODE_GET_MONTH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DAY") , SC_OPCODE_GET_DAY },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HOUR") , SC_OPCODE_GET_HOUR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MINUTE") , SC_OPCODE_GET_MIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SECOND") , SC_OPCODE_GET_SEC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SIGN") , SC_OPCODE_PLUS_MINUS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ABS") , SC_OPCODE_ABS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "INT") , SC_OPCODE_INT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PHI") , SC_OPCODE_PHI },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAUSS") , SC_OPCODE_GAUSS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISBLANK") , SC_OPCODE_IS_EMPTY },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISTEXT") , SC_OPCODE_IS_STRING },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNONTEXT") , SC_OPCODE_IS_NON_STRING },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISLOGICAL") , SC_OPCODE_IS_LOGICAL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TYPE") , SC_OPCODE_TYPE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CELL") , SC_OPCODE_CELL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISREF") , SC_OPCODE_IS_REF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNUMBER") , SC_OPCODE_IS_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISFORMULA") , SC_OPCODE_IS_FORMULA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNA") , SC_OPCODE_IS_NV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISERR") , SC_OPCODE_IS_ERR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISERROR") , SC_OPCODE_IS_ERROR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISEVEN") , SC_OPCODE_IS_EVEN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISODD") , SC_OPCODE_IS_ODD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "N") , SC_OPCODE_N },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DATEVALUE") , SC_OPCODE_GET_DATE_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TIMEVALUE") , SC_OPCODE_GET_TIME_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CODE") , SC_OPCODE_CODE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TRIM") , SC_OPCODE_TRIM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "UPPER") , SC_OPCODE_UPPER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PROPER") , SC_OPCODE_PROPER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOWER") , SC_OPCODE_LOWER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LEN") , SC_OPCODE_LEN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T") , SC_OPCODE_T },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VALUE") , SC_OPCODE_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CLEAN") , SC_OPCODE_CLEAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHAR") , SC_OPCODE_CHAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "JIS") , SC_OPCODE_JIS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ASC") , SC_OPCODE_ASC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "UNICODE") , SC_OPCODE_UNICODE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "UNICHAR") , SC_OPCODE_UNICHAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOG10") , SC_OPCODE_LOG10 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EVEN") , SC_OPCODE_EVEN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ODD") , SC_OPCODE_ODD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMSDIST") , SC_OPCODE_STD_NORM_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.S.DIST") , SC_OPCODE_STD_NORM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FISHER") , SC_OPCODE_FISHER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FISHERINV") , SC_OPCODE_FISHER_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMSINV") , SC_OPCODE_S_NORM_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.S.INV") , SC_OPCODE_S_NORM_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMALN") , SC_OPCODE_GAMMA_LN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMALN.PRECISE") , SC_OPCODE_GAMMA_LN_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ERRORTYPE") , SC_OPCODE_ERROR_TYPE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ERROR.TYPE") , SC_OPCODE_ERROR_TYPE_ODF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORMULA") , SC_OPCODE_FORMULA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ARABIC") , SC_OPCODE_ARABIC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ATAN2") , SC_OPCODE_ARC_TAN_2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.MATH") , SC_OPCODE_CEIL_MATH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING") , SC_OPCODE_CEIL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.XCL") , SC_OPCODE_CEIL_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.PRECISE") , SC_OPCODE_CEIL_PRECISE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISO.CEILING") , SC_OPCODE_CEIL_ISO },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR") , SC_OPCODE_FLOOR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.XCL") , SC_OPCODE_FLOOR_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.MATH") , SC_OPCODE_FLOOR_MATH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.PRECISE") , SC_OPCODE_FLOOR_PRECISE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUND") , SC_OPCODE_ROUND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDUP") , SC_OPCODE_ROUND_UP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDDOWN") , SC_OPCODE_ROUND_DOWN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TRUNC") , SC_OPCODE_TRUNC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOG") , SC_OPCODE_LOG },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "POWER") , SC_OPCODE_POWER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GCD") , SC_OPCODE_GCD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LCM") , SC_OPCODE_LCM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MOD") , SC_OPCODE_MOD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMPRODUCT") , SC_OPCODE_SUM_PRODUCT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMSQ") , SC_OPCODE_SUM_SQ },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMX2MY2") , SC_OPCODE_SUM_X2MY2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMX2PY2") , SC_OPCODE_SUM_X2DY2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMXMY2") , SC_OPCODE_SUM_XMY2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DATE") , SC_OPCODE_GET_DATE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TIME") , SC_OPCODE_GET_TIME },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DAYS") , SC_OPCODE_GET_DIFF_DATE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DAYS360") , SC_OPCODE_GET_DIFF_DATE_360 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DATEDIF") , SC_OPCODE_GET_DATEDIF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MIN") , SC_OPCODE_MIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MINA") , SC_OPCODE_MIN_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MAX") , SC_OPCODE_MAX },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MAXA") , SC_OPCODE_MAX_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUM") , SC_OPCODE_SUM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PRODUCT") , SC_OPCODE_PRODUCT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGE") , SC_OPCODE_AVERAGE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEA") , SC_OPCODE_AVERAGE_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNT") , SC_OPCODE_COUNT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTA") , SC_OPCODE_COUNT_2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NPV") , SC_OPCODE_NPV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IRR") , SC_OPCODE_IRR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MIRR") , SC_OPCODE_MIRR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISPMT") , SC_OPCODE_ISPMT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR") , SC_OPCODE_VAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VARA") , SC_OPCODE_VAR_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VARP") , SC_OPCODE_VAR_P },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VARPA") , SC_OPCODE_VAR_P_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR.P") , SC_OPCODE_VAR_P_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR.S") , SC_OPCODE_VAR_S },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV") , SC_OPCODE_ST_DEV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVA") , SC_OPCODE_ST_DEV_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVP") , SC_OPCODE_ST_DEV_P },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVPA") , SC_OPCODE_ST_DEV_P_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV.P") , SC_OPCODE_ST_DEV_P_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV.S") , SC_OPCODE_ST_DEV_S },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "B") , SC_OPCODE_B },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMDIST") , SC_OPCODE_NORM_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.DIST") , SC_OPCODE_NORM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EXPONDIST") , SC_OPCODE_EXP_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EXPON.DIST") , SC_OPCODE_EXP_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOMDIST") , SC_OPCODE_BINOM_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOM.DIST") , SC_OPCODE_BINOM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "POISSON") , SC_OPCODE_POISSON_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "POISSON.DIST") , SC_OPCODE_POISSON_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COMBIN") , SC_OPCODE_COMBIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COMBINA") , SC_OPCODE_COMBIN_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERMUT") , SC_OPCODE_PERMUT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERMUTATIONA") , SC_OPCODE_PERMUTATION_A },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PV") , SC_OPCODE_PV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SYD") , SC_OPCODE_SYD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DDB") , SC_OPCODE_DDB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DB") , SC_OPCODE_DB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VDB") , SC_OPCODE_VBD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PDURATION") , SC_OPCODE_PDURATION },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SLN") , SC_OPCODE_SLN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PMT") , SC_OPCODE_PMT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COLUMNS") , SC_OPCODE_COLUMNS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROWS") , SC_OPCODE_ROWS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SHEETS") , SC_OPCODE_SHEETS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COLUMN") , SC_OPCODE_COLUMN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROW") , SC_OPCODE_ROW },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SHEET") , SC_OPCODE_SHEET },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RRI") , SC_OPCODE_RRI },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FV") , SC_OPCODE_FV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NPER") , SC_OPCODE_NPER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RATE") , SC_OPCODE_RATE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IPMT") , SC_OPCODE_IPMT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PPMT") , SC_OPCODE_PPMT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CUMIPMT") , SC_OPCODE_CUM_IPMT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CUMPRINC") , SC_OPCODE_CUM_PRINC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EFFECT") , SC_OPCODE_EFFECT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NOMINAL") , SC_OPCODE_NOMINAL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUBTOTAL") , SC_OPCODE_SUB_TOTAL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DSUM") , SC_OPCODE_DB_SUM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DCOUNT") , SC_OPCODE_DB_COUNT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DCOUNTA") , SC_OPCODE_DB_COUNT_2 },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DAVERAGE") , SC_OPCODE_DB_AVERAGE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DGET") , SC_OPCODE_DB_GET },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DMAX") , SC_OPCODE_DB_MAX },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DMIN") , SC_OPCODE_DB_MIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DPRODUCT") , SC_OPCODE_DB_PRODUCT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DSTDEV") , SC_OPCODE_DB_STD_DEV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DSTDEVP") , SC_OPCODE_DB_STD_DEV_P },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DVAR") , SC_OPCODE_DB_VAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DVARP") , SC_OPCODE_DB_VAR_P },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "INDIRECT") , SC_OPCODE_INDIRECT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ADDRESS") , SC_OPCODE_ADDRESS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MATCH") , SC_OPCODE_MATCH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTBLANK") , SC_OPCODE_COUNT_EMPTY_CELLS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTIF") , SC_OPCODE_COUNT_IF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMIF") , SC_OPCODE_SUM_IF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEIF") , SC_OPCODE_AVERAGE_IF },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMIFS") , SC_OPCODE_SUM_IFS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEIFS") , SC_OPCODE_AVERAGE_IFS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTIFS") , SC_OPCODE_COUNT_IFS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOOKUP") , SC_OPCODE_LOOKUP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "VLOOKUP") , SC_OPCODE_V_LOOKUP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HLOOKUP") , SC_OPCODE_H_LOOKUP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MULTIRANGE") , SC_OPCODE_MULTI_AREA }, // legacy for range list (union)
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "OFFSET") , SC_OPCODE_OFFSET },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "INDEX") , SC_OPCODE_INDEX }, // ?? first character = I ??
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AREAS") , SC_OPCODE_AREAS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DOLLAR") , SC_OPCODE_CURRENCY },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "REPLACE") , SC_OPCODE_REPLACE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FIXED") , SC_OPCODE_FIXED },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FIND") , SC_OPCODE_FIND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EXACT") , SC_OPCODE_EXACT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LEFT") , SC_OPCODE_LEFT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RIGHT") , SC_OPCODE_RIGHT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SEARCH") , SC_OPCODE_SEARCH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MID") , SC_OPCODE_MID },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LENB") , SC_OPCODE_LENB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RIGHTB") , SC_OPCODE_RIGHTB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LEFTB") , SC_OPCODE_LEFTB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "REPLACEB") , SC_OPCODE_REPLACEB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MIDB") , SC_OPCODE_MIDB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TEXT") , SC_OPCODE_TEXT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SUBSTITUTE") , SC_OPCODE_SUBSTITUTE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "REPT") , SC_OPCODE_REPT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONCATENATE") , SC_OPCODE_CONCAT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONCAT") , SC_OPCODE_CONCAT_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TEXTJOIN") , SC_OPCODE_TEXTJOIN_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "IFS") , SC_OPCODE_IFS_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SWITCH") , SC_OPCODE_SWITCH_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MINIFS") , SC_OPCODE_MINIFS_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MAXIFS") , SC_OPCODE_MAXIFS_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MVALUE") , SC_OPCODE_MAT_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MDETERM") , SC_OPCODE_MAT_DET },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MINVERSE") , SC_OPCODE_MAT_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MMULT") , SC_OPCODE_MAT_MULT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TRANSPOSE") , SC_OPCODE_MAT_TRANS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MUNIT") , SC_OPCODE_MATRIX_UNIT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GOALSEEK") , SC_OPCODE_BACK_SOLVER },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPGEOMDIST") , SC_OPCODE_HYP_GEOM_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPGEOM.DIST") , SC_OPCODE_HYP_GEOM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORMDIST") , SC_OPCODE_LOG_NORM_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORM.DIST") , SC_OPCODE_LOG_NORM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TDIST") , SC_OPCODE_T_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST.2T") , SC_OPCODE_T_DIST_2T },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST") , SC_OPCODE_T_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST.RT") , SC_OPCODE_T_DIST_RT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FDIST") , SC_OPCODE_F_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "F.DIST") , SC_OPCODE_F_DIST_LT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "F.DIST.RT") , SC_OPCODE_F_DIST_RT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHIDIST") , SC_OPCODE_CHI_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.DIST.RT") , SC_OPCODE_CHI_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEIBULL") , SC_OPCODE_WEIBULL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEIBULL.DIST") , SC_OPCODE_WEIBULL_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NEGBINOMDIST") , SC_OPCODE_NEG_BINOM_VERT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NEGBINOM.DIST") , SC_OPCODE_NEG_BINOM_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CRITBINOM") , SC_OPCODE_CRIT_BINOM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOM.INV") , SC_OPCODE_BINOM_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "KURT") , SC_OPCODE_KURT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HARMEAN") , SC_OPCODE_HAR_MEAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GEOMEAN") , SC_OPCODE_GEO_MEAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STANDARDIZE") , SC_OPCODE_STANDARD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AVEDEV") , SC_OPCODE_AVE_DEV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SKEW") , SC_OPCODE_SKEW },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SKEWP") , SC_OPCODE_SKEWP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DEVSQ") , SC_OPCODE_DEV_SQ },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MEDIAN") , SC_OPCODE_MEDIAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE") , SC_OPCODE_MODAL_VALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE.SNGL") , SC_OPCODE_MODAL_VALUE_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE.MULT") , SC_OPCODE_MODAL_VALUE_MULTI },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ZTEST") , SC_OPCODE_Z_TEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "Z.TEST") , SC_OPCODE_Z_TEST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "AGGREGATE") , SC_OPCODE_AGGREGATE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TTEST") , SC_OPCODE_T_TEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.TEST") , SC_OPCODE_T_TEST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK") , SC_OPCODE_RANK },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE") , SC_OPCODE_PERCENTILE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK") , SC_OPCODE_PERCENT_RANK },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE.INC") , SC_OPCODE_PERCENTILE_INC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK.INC") , SC_OPCODE_PERCENT_RANK_INC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE.INC") , SC_OPCODE_QUARTILE_INC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK.EQ") , SC_OPCODE_RANK_EQ },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE.EXC") , SC_OPCODE_PERCENTILE_EXC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK.EXC") , SC_OPCODE_PERCENT_RANK_EXC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE.EXC") , SC_OPCODE_QUARTILE_EXC },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK.AVG") , SC_OPCODE_RANK_AVG },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LARGE") , SC_OPCODE_LARGE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SMALL") , SC_OPCODE_SMALL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FREQUENCY") , SC_OPCODE_FREQUENCY },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE") , SC_OPCODE_QUARTILE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMINV") , SC_OPCODE_NORM_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.INV") , SC_OPCODE_NORM_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE") , SC_OPCODE_CONFIDENCE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE.NORM") , SC_OPCODE_CONFIDENCE_N },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE.T") , SC_OPCODE_CONFIDENCE_T },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FTEST") , SC_OPCODE_F_TEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "F.TEST") , SC_OPCODE_F_TEST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TRIMMEAN") , SC_OPCODE_TRIM_MEAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PROB") , SC_OPCODE_PROB },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CORREL") , SC_OPCODE_CORREL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COVAR") , SC_OPCODE_COVAR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COVARIANCE.P") , SC_OPCODE_COVARIANCE_P },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COVARIANCE.S") , SC_OPCODE_COVARIANCE_S },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "PEARSON") , SC_OPCODE_PEARSON },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RSQ") , SC_OPCODE_RSQ },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STEYX") , SC_OPCODE_STEYX },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "SLOPE") , SC_OPCODE_SLOPE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "INTERCEPT") , SC_OPCODE_INTERCEPT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TREND") , SC_OPCODE_TREND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GROWTH") , SC_OPCODE_GROWTH },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LINEST") , SC_OPCODE_LINEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGEST") , SC_OPCODE_LOGEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST") , SC_OPCODE_FORECAST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.ADD") , SC_OPCODE_FORECAST_ETS_ADD },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.SEASONALITY") , SC_OPCODE_FORECAST_ETS_SEA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.MULT") , SC_OPCODE_FORECAST_ETS_MUL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.PI.ADD") , SC_OPCODE_FORECAST_ETS_PIA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.PI.MULT") , SC_OPCODE_FORECAST_ETS_PIM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.STAT.ADD") , SC_OPCODE_FORECAST_ETS_STA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.STAT.MULT") , SC_OPCODE_FORECAST_ETS_STM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.LINEAR") , SC_OPCODE_FORECAST_LIN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHIINV") , SC_OPCODE_CHI_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.INV.RT") , SC_OPCODE_CHI_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMADIST") , SC_OPCODE_GAMMA_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA.DIST") , SC_OPCODE_GAMMA_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMAINV") , SC_OPCODE_GAMMA_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA.INV") , SC_OPCODE_GAMMA_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "TINV") , SC_OPCODE_T_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.INV.2T") , SC_OPCODE_T_INV_2T },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "T.INV") , SC_OPCODE_T_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FINV") , SC_OPCODE_F_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "F.INV") , SC_OPCODE_F_INV_LT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "F.INV.RT") , SC_OPCODE_F_INV_RT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHITEST") , SC_OPCODE_CHI_TEST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.TEST") , SC_OPCODE_CHI_TEST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGINV") , SC_OPCODE_LOG_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORM.INV") , SC_OPCODE_LOG_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "MULTIPLE.OPERATIONS") , SC_OPCODE_TABLE_OP },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BETADIST") , SC_OPCODE_BETA_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BETAINV") , SC_OPCODE_BETA_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BETA.DIST") , SC_OPCODE_BETA_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BETA.INV") , SC_OPCODE_BETA_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKNUM") , SC_OPCODE_WEEK },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ISOWEEKNUM") , SC_OPCODE_ISOWEEKNUM },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKNUM_OOO") , SC_OPCODE_WEEKNUM_OOO },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EASTERSUNDAY") , SC_OPCODE_EASTERSUNDAY },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKDAY") , SC_OPCODE_GET_DAY_OF_WEEK },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NETWORKDAYS") , SC_OPCODE_NETWORKDAYS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NETWORKDAYS.INTL") , SC_OPCODE_NETWORKDAYS_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WORKDAY.INTL") , SC_OPCODE_WORKDAY_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#NAME!") , SC_OPCODE_NO_NAME },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "STYLE") , SC_OPCODE_STYLE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DDE") , SC_OPCODE_DDE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BASE") , SC_OPCODE_BASE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "DECIMAL") , SC_OPCODE_DECIMAL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CONVERT_OOO") , SC_OPCODE_CONVERT_OOO },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROMAN") , SC_OPCODE_ROMAN },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPERLINK") , SC_OPCODE_HYPERLINK },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "INFO") , SC_OPCODE_INFO },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BAHTTEXT") , SC_OPCODE_BAHTTEXT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GETPIVOTDATA") , SC_OPCODE_GET_PIVOT_DATA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "EUROCONVERT") , SC_OPCODE_EUROCONVERT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "NUMBERVALUE") , SC_OPCODE_NUMBERVALUE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA") , SC_OPCODE_GAMMA },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQDIST") , SC_OPCODE_CHISQ_DIST },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.DIST") , SC_OPCODE_CHISQ_DIST_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQINV") , SC_OPCODE_CHISQ_INV },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.INV") , SC_OPCODE_CHISQ_INV_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BITAND") , SC_OPCODE_BITAND },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BITOR") , SC_OPCODE_BITOR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BITXOR") , SC_OPCODE_BITXOR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BITRSHIFT") , SC_OPCODE_BITRSHIFT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "BITLSHIFT") , SC_OPCODE_BITLSHIFT },
+    /* BEGIN defined ERROR.TYPE() values. */
+    /* ERROR.TYPE( #NULL! ) == 1 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#NULL!") , SC_OPCODE_ERROR_NULL },
+    /* ERROR.TYPE( #DIV/0! ) == 2 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#DIV/0!") , SC_OPCODE_ERROR_DIVZERO },
+    /* ERROR.TYPE( #VALUE! ) == 3 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#VALUE!") , SC_OPCODE_ERROR_VALUE },
+    /* ERROR.TYPE( #REF! ) == 4 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#REF!") , SC_OPCODE_ERROR_REF },
+    /* ERROR.TYPE( #NAME! ) == 5 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#NAME?") , SC_OPCODE_ERROR_NAME },
+    /* ERROR.TYPE( #NUM! ) == 6 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#NUM!") , SC_OPCODE_ERROR_NUM },
+    /* ERROR.TYPE( #N/A ) == 7 */
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "#N/A") , SC_OPCODE_ERROR_NA },
+    /* END defined ERROR.TYPE() values. */
+
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "FILTERXML") , SC_OPCODE_FILTERXML },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "COLOR") , SC_OPCODE_COLOR },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "WEBSERVICE") , SC_OPCODE_WEBSERVICE },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ERF.PRECISE") , SC_OPCODE_ERF_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ERFC.PRECISE") , SC_OPCODE_ERFC_MS },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ENCODEURL") , SC_OPCODE_ENCODEURL },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "RAWSUBTRACT") , SC_OPCODE_RAWSUBTRACT },
+    { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDSIG") , SC_OPCODE_ROUNDSIG },
+
+    { nullptr, -1 }
+};
+
+const std::pair<const char*, int> RID_STRLIST_FUNCTION_NAMES_SYMBOLS[] =
+{
+    { "(" , SC_OPCODE_OPEN  },
+    { ")" , SC_OPCODE_CLOSE  },
+    { "[" , SC_OPCODE_TABLE_REF_OPEN  },
+    { "]" , SC_OPCODE_TABLE_REF_CLOSE  },
+    { "{" , SC_OPCODE_ARRAY_OPEN  },
+    { "}" , SC_OPCODE_ARRAY_CLOSE  },
+    { "|" , SC_OPCODE_ARRAY_ROW_SEP  },
+    { ";" , SC_OPCODE_ARRAY_COL_SEP  },
+    { ";" , SC_OPCODE_SEP  },
+    { "%" , SC_OPCODE_PERCENT_SIGN  },
+    { "+" , SC_OPCODE_ADD  },
+    { "-" , SC_OPCODE_SUB  },
+    { "*" , SC_OPCODE_MUL  },
+    { "/" , SC_OPCODE_DIV  },
+    { "&" , SC_OPCODE_AMPERSAND  },
+    { "^" , SC_OPCODE_POW  },
+    { "=" , SC_OPCODE_EQUAL  },
+    { "<>" , SC_OPCODE_NOT_EQUAL  },
+    { "<" , SC_OPCODE_LESS  },
+    { ">" , SC_OPCODE_GREATER  },
+    { "<=" , SC_OPCODE_LESS_EQUAL  },
+    { ">=" , SC_OPCODE_GREATER_EQUAL  },
+    { "!" , SC_OPCODE_INTERSECT  },
+    { "~" , SC_OPCODE_UNION  },
+    { ":" , SC_OPCODE_RANGE  },
+    { "-" , SC_OPCODE_NEG_SUB  },
+    { nullptr, -1 }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/envelp/label.hrc b/formula/inc/strings.hrc
index d91422e73a6e..1d654c08e7da 100644
--- a/sw/source/uibase/envelp/label.hrc
+++ b/formula/inc/strings.hrc
@@ -17,21 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC
+#ifndef INCLUDED_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
 
-#include "envelp.hrc"
+#define NC_(Context, String) (Context "\004" u8##String)
 
-// global resources ********************************************************
-#define STR_CUSTOM              (RC_LABEL_BEGIN + 1)
+#define STR_OPTIONAL        NC_("STR_OPTIONAL", "(optional)")
+#define STR_REQUIRED        NC_("STR_REQUIRED", "(required)")
 
-// overflow check ********************************************************
-
-#define LABEL_ACT_END  STR_CUSTOM
-
-#if LABEL_ACT_END > RC_LABEL_END
-#error Resource-Ueberlauf in #file, #line
-#endif
+#define STR_TITLE1          NC_("STR_TITLE1", "Function Wizard")
+#define STR_TITLE2          NC_("STR_TITLE2", "Function Wizard  -")
+#define STR_END             NC_("STR_END", "~End")
+#define RID_STR_SHRINK      NC_("RID_STR_SHRINK", "Shrink")
+#define RID_STR_EXPAND      NC_("RID_STR_EXPAND", "Expand")
 
 #endif
 
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 8fe5738b7417..1429951649e1 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -27,8 +27,7 @@
 #include "osl/mutex.hxx"
 
 #include <svl/zforlist.hxx>
-#include <tools/rcid.h>
-#include <tools/resary.hxx>
+#include <tools/resmgr.hxx>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
 #include <com/sun/star/sheet/FormulaMapGroup.hpp>
 #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp>
@@ -145,7 +144,7 @@ class OpCodeList
 {
 public:
 
-    OpCodeList( sal_uInt16, const FormulaCompiler::NonConstOpCodeMapPtr&,
+    OpCodeList(bool bLocalized, const std::pair<const char*, int>* pSymbols, const FormulaCompiler::NonConstOpCodeMapPtr&,
             FormulaCompiler::SeparatorType = FormulaCompiler::SeparatorType::SEMICOLON_BASE );
 
 private:
@@ -154,13 +153,15 @@ private:
 
 private:
     FormulaCompiler::SeparatorType meSepType;
-    ResStringArray maStringList;
+    const std::pair<const char*, int>* mpSymbols;
+    bool mbLocalized;
 };
 
-OpCodeList::OpCodeList( sal_uInt16 nRID, const FormulaCompiler::NonConstOpCodeMapPtr& xMap,
-        FormulaCompiler::SeparatorType eSepType )
+OpCodeList::OpCodeList(bool bLocalized, const std::pair<const char*, int>* pSymbols, const FormulaCompiler::NonConstOpCodeMapPtr& xMap,
+        FormulaCompiler::SeparatorType eSepType)
     : meSepType(eSepType)
-    , maStringList(ResId(nRID, *ResourceManager::getResManager()))
+    , mpSymbols(pSymbols)
+    , mbLocalized(bLocalized)
 {
     SvtSysLocale aSysLocale;
     const CharClass* pCharClass = (xMap->isEnglish() ? nullptr : aSysLocale.GetCharClassPtr());
@@ -223,9 +224,19 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp )
 void OpCodeList::putDefaultOpCode( const FormulaCompiler::NonConstOpCodeMapPtr& xMap, sal_uInt16 nOp,
         const CharClass* pCharClass )
 {
-    sal_uInt32 nIndex = maStringList.FindIndex(nOp);
-    if (nIndex != RESARRAY_INDEX_NOTFOUND)
-        xMap->putOpCode(maStringList.GetString(nIndex), OpCode(nOp), pCharClass);
+    const char* pKey = nullptr;
+    for (const std::pair<const char*, int>* pSymbol = mpSymbols; pSymbol->first; ++pSymbol)
+    {
+        if (nOp == pSymbol->second)
+        {
+            pKey = pSymbol->first;
+            break;
+        }
+    }
+    if (!pKey)
+        return;
+    OUString sKey = !mbLocalized ? OUString::createFromAscii(pKey) : Translate::get(pKey, ResourceManager::getResLocale());
+    xMap->putOpCode(sKey, OpCode(nOp), pCharClass);
 }
 
 // static
@@ -843,8 +854,8 @@ void lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, bool bD
             new FormulaCompiler::OpCodeMap(
                 SC_OPCODE_LAST_OPCODE_ID + 1, true, FormulaGrammar::GRAM_NATIVE_UI));
         OModuleClient aModuleClient;
-        OpCodeList aOpCodeListSymbols(RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap);
-        OpCodeList aOpCodeListNative(RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap);
+        OpCodeList aOpCodeListSymbols(false, RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap);
+        OpCodeList aOpCodeListNative(true, RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap);
         // No AddInMap for native core mapping.
     }
 
@@ -931,7 +942,7 @@ void FormulaCompiler::InitSymbolsOOXML() const
 }
 
 
-void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar,
+void FormulaCompiler::loadSymbols(const std::pair<const char*, int>* pSymbols, FormulaGrammar::Grammar eGrammar,
         NonConstOpCodeMapPtr& rxMap, SeparatorType eSepType) const
 {
     if ( !rxMap.get() )
@@ -939,7 +950,7 @@ void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar
         // not Core
         rxMap.reset( new OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1, eGrammar != FormulaGrammar::GRAM_ODFF, eGrammar ));
         OModuleClient aModuleClient;
-        OpCodeList aOpCodeList( nSymbols, rxMap, eSepType);
+        OpCodeList aOpCodeList(false, pSymbols, rxMap, eSepType);
 
         fillFromAddInMap( rxMap, eGrammar);
         // Fill from collection for AddIns not already present.
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
deleted file mode 100644
index 750be5afbef3..000000000000
--- a/formula/source/core/inc/core_resource.hrc
+++ /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/.
- *
- * 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_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC
-#define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_CORE_STRINGS_START                  RID_FORMULA_START
-#define RID_CORE_OTHER_START                    RID_FORMULA_START
-
-//- String-IDs
-#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF     (RID_CORE_OTHER_START + 0)
-#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML    (RID_CORE_OTHER_START + 1)
-#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF     (RID_CORE_OTHER_START + 2)
-#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_API      (RID_CORE_OTHER_START + 3)
-#define RID_STRLIST_FUNCTION_NAMES_ENGLISH          (RID_CORE_OTHER_START + 4)
-#define RID_STRLIST_FUNCTION_NAMES_SYMBOLS          (RID_CORE_OTHER_START + 5)
-#define RID_STRLIST_FUNCTION_NAMES                  (RID_CORE_OTHER_START + 6)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index aaf3b5a9bb53..3dc321b57834 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -22,8 +22,6 @@
 
 #include <rtl/ustring.hxx>
 
-class ResMgr;
-
 namespace formula
 {
 
@@ -34,7 +32,7 @@ namespace formula
     {
         friend class OModuleClient;
         static sal_Int32    s_nClients;     /// number of registered clients
-        static ResMgr*  m_pImpl;
+        static std::locale* m_pImpl;
 
     private:
         // no instantiation allowed
@@ -50,7 +48,7 @@ namespace formula
 
     public:
 
-        static ResMgr*  getResManager();
+        static const std::locale&  getResLocale();
     };
 
 
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 6c9df0139704..b03668d3c783 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -39,26 +39,24 @@ namespace formula
         // access safety
         struct theResourceManagerMutex : public rtl::Static< osl::Mutex, theResourceManagerMutex > {};
     }
-    sal_Int32       ResourceManager::s_nClients = 0;
-    ResMgr*         ResourceManager::m_pImpl = nullptr;
 
+    sal_Int32       ResourceManager::s_nClients = 0;
+    std::locale*    ResourceManager::m_pImpl = nullptr;
 
     void ResourceManager::ensureImplExists()
     {
         if (m_pImpl)
             return;
 
-        m_pImpl = ResMgr::CreateResMgr("for", Application::GetSettings().GetUILanguageTag());
+        m_pImpl = new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag()));
     }
 
-
     void ResourceManager::registerClient()
     {
         ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
         ++s_nClients;
     }
 
-
     void ResourceManager::revokeClient()
     {
         ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
@@ -68,10 +66,11 @@ namespace formula
             m_pImpl = nullptr;
         }
     }
-    ResMgr* ResourceManager::getResManager()
+
+    const std::locale& ResourceManager::getResLocale()
     {
         ensureImplExists();
-        return m_pImpl;
+        return *m_pImpl;
     }
 
 
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
deleted file mode 100644
index 1c98ff43263e..000000000000
--- a/formula/source/core/resource/core_resource.src
+++ /dev/null
@@ -1,2708 +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 "core_resource.hrc"
-#include "formula/compiler.hrc"
-
-/** These English names are used to store/load ODFF as of ODF v1.2. */
-// NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY
-// such that at least two releases can already read the new name to be
-// introduced by a later release.
-// If there is a reason for another name for some function then add an
-// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
-// ScCompiler::IsOpCode() in the if (mxSymbols->isODFF()) block.
-StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
-{
-    ItemList =
-    {
-        < "IF" ; SC_OPCODE_IF; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR; >;
-        < "IFNA" ; SC_OPCODE_IF_NA; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE; >;
-        < "(" ; SC_OPCODE_OPEN; >;
-        < ")" ; SC_OPCODE_CLOSE; >;
-        // SC_OPCODE_TABLE_REF_... not supported in ODFF
-        < "{" ; SC_OPCODE_ARRAY_OPEN; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP; >;
-        < ";" ; SC_OPCODE_SEP; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN; >;
-        < "+" ; SC_OPCODE_ADD; >;
-        < "-" ; SC_OPCODE_SUB; >;
-        < "*" ; SC_OPCODE_MUL; >;
-        < "/" ; SC_OPCODE_DIV; >;
-        < "&" ; SC_OPCODE_AMPERSAND; >;
-        < "^" ; SC_OPCODE_POW; >;
-        < "=" ; SC_OPCODE_EQUAL; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL; >;
-        < "<" ; SC_OPCODE_LESS; >;
-        < ">" ; SC_OPCODE_GREATER; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL; >;
-        < "AND" ; SC_OPCODE_AND; >;
-        < "OR" ; SC_OPCODE_OR; >;
-        < "XOR" ; SC_OPCODE_XOR; >;
-        < "!" ; SC_OPCODE_INTERSECT; >;
-        < "~" ; SC_OPCODE_UNION; >;
-        < ":" ; SC_OPCODE_RANGE; >;
-        < "NOT" ; SC_OPCODE_NOT; >;
-        < "NEG" ; SC_OPCODE_NEG; >;
-        < "-" ; SC_OPCODE_NEG_SUB; >;
-        < "PI" ; SC_OPCODE_PI; >;
-        < "RAND" ; SC_OPCODE_RANDOM; >;
-        < "TRUE" ; SC_OPCODE_TRUE; >;
-        < "FALSE" ; SC_OPCODE_FALSE; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME; >;
-        < "NA" ; SC_OPCODE_NO_VALUE; >;
-        < "ORG.OPENOFFICE.CURRENT" ; SC_OPCODE_CURRENT; >;
-        < "DEGREES" ; SC_OPCODE_DEG; >;
-        < "RADIANS" ; SC_OPCODE_RAD; >;
-        < "SIN" ; SC_OPCODE_SIN; >;
-        < "COS" ; SC_OPCODE_COS; >;
-        < "TAN" ; SC_OPCODE_TAN; >;
-        < "COT" ; SC_OPCODE_COT; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN; >;
-        < "ACOT" ; SC_OPCODE_ARC_COT; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP; >;
-        < "COSH" ; SC_OPCODE_COS_HYP; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP; >;
-        < "COTH" ; SC_OPCODE_COT_HYP; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >;
-        < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >;
-        < "CSC" ; SC_OPCODE_COSECANT; >;
-        < "SEC" ; SC_OPCODE_SECANT; >;
-        < "CSCH" ; SC_OPCODE_COSECANT_HYP; >;
-        < "SECH" ; SC_OPCODE_SECANT_HYP; >;
-        < "EXP" ; SC_OPCODE_EXP; >;
-        < "LN" ; SC_OPCODE_LN; >;
-        < "SQRT" ; SC_OPCODE_SQRT; >;
-        < "FACT" ; SC_OPCODE_FACT; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH; >;
-        < "DAY" ; SC_OPCODE_GET_DAY; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS; >;
-        < "ABS" ; SC_OPCODE_ABS; >;
-        < "INT" ; SC_OPCODE_INT; >;
-        < "PHI" ; SC_OPCODE_PHI; >;
-        < "GAUSS" ; SC_OPCODE_GAUSS; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >;
-        < "TYPE" ; SC_OPCODE_TYPE; >;
-        < "CELL" ; SC_OPCODE_CELL; >;
-        < "ISREF" ; SC_OPCODE_IS_REF; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >;
-        < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >;
-        < "ISNA" ; SC_OPCODE_IS_NV; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD; >;
-        < "N" ; SC_OPCODE_N; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >;
-        < "CODE" ; SC_OPCODE_CODE; >;
-        < "TRIM" ; SC_OPCODE_TRIM; >;
-        < "UPPER" ; SC_OPCODE_UPPER; >;
-        < "PROPER" ; SC_OPCODE_PROPER; >;
-        < "LOWER" ; SC_OPCODE_LOWER; >;
-        < "LEN" ; SC_OPCODE_LEN; >;
-        < "T" ; SC_OPCODE_T; >;
-        < "VALUE" ; SC_OPCODE_VALUE; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN; >;
-        < "CHAR" ; SC_OPCODE_CHAR; >;
-        < "JIS" ; SC_OPCODE_JIS; >;
-        < "ASC" ; SC_OPCODE_ASC; >;
-        < "UNICODE" ; SC_OPCODE_UNICODE; >;
-        < "UNICHAR" ; SC_OPCODE_UNICHAR; >;
-        < "LOG10" ; SC_OPCODE_LOG10; >;
-        < "EVEN" ; SC_OPCODE_EVEN; >;
-        < "ODD" ; SC_OPCODE_ODD; >;
-        < "LEGACY.NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >;
-        < "COM.MICROSOFT.NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >;
-        < "FISHER" ; SC_OPCODE_FISHER; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV; >;
-        < "LEGACY.NORMSINV" ; SC_OPCODE_S_NORM_INV; >;
-        < "COM.MICROSOFT.NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >;
-        < "COM.MICROSOFT.GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >;
-        < "ORG.OPENOFFICE.ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >;
-        < "FORMULA" ; SC_OPCODE_FORMULA; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >;
-        < "COM.MICROSOFT.CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >;
-        < "CEILING" ; SC_OPCODE_CEIL; >;
-        < "COM.MICROSOFT.CEILING" ; SC_OPCODE_CEIL_MS; >;
-        < "COM.MICROSOFT.CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >;
-        < "COM.MICROSOFT.ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR; >;
-        < "COM.MICROSOFT.FLOOR" ; SC_OPCODE_FLOOR_MS; >;
-        < "COM.MICROSOFT.FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >;
-        < "COM.MICROSOFT.FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >;
-        < "ROUND" ; SC_OPCODE_ROUND; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC; >;
-        < "LOG" ; SC_OPCODE_LOG; >;
-        < "POWER" ; SC_OPCODE_POWER; >;
-        < "GCD" ; SC_OPCODE_GCD; >;
-        < "LCM" ; SC_OPCODE_LCM; >;
-        < "MOD" ; SC_OPCODE_MOD; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >;
-        < "DATE" ; SC_OPCODE_GET_DATE; >;
-        < "TIME" ; SC_OPCODE_GET_TIME; >;
-        < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >;
-        < "MIN" ; SC_OPCODE_MIN; >;
-        < "MINA" ; SC_OPCODE_MIN_A; >;
-        < "MAX" ; SC_OPCODE_MAX; >;
-        < "MAXA" ; SC_OPCODE_MAX_A; >;
-        < "SUM" ; SC_OPCODE_SUM; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >;
-        < "COUNT" ; SC_OPCODE_COUNT; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2; >;
-        < "NPV" ; SC_OPCODE_NPV; >;
-        < "IRR" ; SC_OPCODE_IRR; >;
-        < "MIRR" ; SC_OPCODE_MIRR; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT; >;
-        < "VAR" ; SC_OPCODE_VAR; >;
-        < "VARA" ; SC_OPCODE_VAR_A; >;
-        < "VARP" ; SC_OPCODE_VAR_P; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A; >;
-        < "COM.MICROSOFT.VAR.P" ; SC_OPCODE_VAR_P_MS; >;
-        < "COM.MICROSOFT.VAR.S" ; SC_OPCODE_VAR_S; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >;
-        < "COM.MICROSOFT.STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >;
-        < "COM.MICROSOFT.STDEV.S" ; SC_OPCODE_ST_DEV_S; >;
-        < "BINOM.DIST.RANGE" ; SC_OPCODE_B; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST; >;
-        < "COM.MICROSOFT.NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >;
-        < "COM.MICROSOFT.EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >;
-        < "COM.MICROSOFT.BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST; >;
-        < "COM.MICROSOFT.POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN; >;
-        < "COMBINA" ; SC_OPCODE_COMBIN_A; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT; >;
-        < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >;
-        < "PV" ; SC_OPCODE_PV; >;
-        < "SYD" ; SC_OPCODE_SYD; >;
-        < "DDB" ; SC_OPCODE_DDB; >;
-        < "DB" ; SC_OPCODE_DB; >;
-        < "VDB" ; SC_OPCODE_VBD; >;
-        < "PDURATION" ; SC_OPCODE_PDURATION; >;
-        < "SLN" ; SC_OPCODE_SLN; >;
-        < "PMT" ; SC_OPCODE_PMT; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS; >;
-        < "ROWS" ; SC_OPCODE_ROWS; >;
-        < "SHEETS" ; SC_OPCODE_SHEETS; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN; >;
-        < "ROW" ; SC_OPCODE_ROW; >;
-        < "SHEET" ; SC_OPCODE_SHEET; >;
-        < "RRI" ; SC_OPCODE_RRI; >;
-        < "FV" ; SC_OPCODE_FV; >;
-        < "NPER" ; SC_OPCODE_NPER; >;
-        < "RATE" ; SC_OPCODE_RATE; >;
-        < "IPMT" ; SC_OPCODE_IPMT; >;
-        < "PPMT" ; SC_OPCODE_PPMT; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >;
-        < "EFFECT" ; SC_OPCODE_EFFECT; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >;
-        < "DGET" ; SC_OPCODE_DB_GET; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS; >;
-        < "MATCH" ; SC_OPCODE_MATCH; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
-        < "ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;  // legacy for range list (union)
-        < "OFFSET" ; SC_OPCODE_OFFSET; >;
-        < "INDEX" ; SC_OPCODE_INDEX; >;
-        < "AREAS" ; SC_OPCODE_AREAS; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE; >;
-        < "FIXED" ; SC_OPCODE_FIXED; >;
-        < "FIND" ; SC_OPCODE_FIND; >;
-        < "EXACT" ; SC_OPCODE_EXACT; >;
-        < "LEFT" ; SC_OPCODE_LEFT; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH; >;
-        < "MID" ; SC_OPCODE_MID; >;
-        < "LENB" ; SC_OPCODE_LENB; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB; >;
-        < "TEXT" ; SC_OPCODE_TEXT; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >;
-        < "REPT" ; SC_OPCODE_REPT; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT; >;
-        < "COM.MICROSOFT.CONCAT" ; SC_OPCODE_CONCAT_MS; >;
-        < "COM.MICROSOFT.TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >;
-        < "COM.MICROSOFT.IFS" ; SC_OPCODE_IFS_MS; >;
-        < "COM.MICROSOFT.SWITCH" ; SC_OPCODE_SWITCH_MS; >;
-        < "COM.MICROSOFT.MINIFS" ; SC_OPCODE_MINIFS_MS; >;
-        < "COM.MICROSOFT.MAXIFS" ; SC_OPCODE_MAXIFS_MS; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >;
-        < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >;
-        < "ORG.OPENOFFICE.GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >;
-        < "COM.MICROSOFT.HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >;
-        < "COM.MICROSOFT.LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >;
-        < "LEGACY.TDIST" ; SC_OPCODE_T_DIST; >;
-        < "COM.MICROSOFT.T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >;
-        < "COM.MICROSOFT.T.DIST" ; SC_OPCODE_T_DIST_MS; >;
-        < "COM.MICROSOFT.T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >;
-        < "LEGACY.FDIST" ; SC_OPCODE_F_DIST; >;
-        < "FDIST" ; SC_OPCODE_F_DIST_LT; >;
-        < "COM.MICROSOFT.F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >;
-        < "LEGACY.CHIDIST" ; SC_OPCODE_CHI_DIST; >;
-        < "COM.MICROSOFT.CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL; >;
-        < "COM.MICROSOFT.WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >;
-        < "COM.MICROSOFT.NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >;
-        < "COM.MICROSOFT.BINOM.INV" ; SC_OPCODE_BINOM_INV; >;
-        < "KURT" ; SC_OPCODE_KURT; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV; >;
-        < "SKEW" ; SC_OPCODE_SKEW; >;
-        < "SKEWP" ; SC_OPCODE_SKEWP; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE; >;
-        < "COM.MICROSOFT.MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >;
-        < "COM.MICROSOFT.MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST; >;
-        < "COM.MICROSOFT.Z.TEST" ; SC_OPCODE_Z_TEST_MS; >;
-        < "COM.MICROSOFT.AGGREGATE" ; SC_OPCODE_AGGREGATE; >;
-        < "TTEST" ; SC_OPCODE_T_TEST; >;
-        < "COM.MICROSOFT.T.TEST" ; SC_OPCODE_T_TEST_MS; >;
-        < "RANK" ; SC_OPCODE_RANK; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >;
-        < "COM.MICROSOFT.PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >;
-        < "COM.MICROSOFT.PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >;
-        < "COM.MICROSOFT.QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >;
-        < "COM.MICROSOFT.RANK.EQ" ; SC_OPCODE_RANK_EQ; >;
-        < "COM.MICROSOFT.PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >;
-        < "COM.MICROSOFT.PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >;
-        < "COM.MICROSOFT.QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >;
-        < "COM.MICROSOFT.RANK.AVG" ; SC_OPCODE_RANK_AVG; >;
-        < "LARGE" ; SC_OPCODE_LARGE; >;
-        < "SMALL" ; SC_OPCODE_SMALL; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV; >;
-        < "COM.MICROSOFT.NORM.INV" ; SC_OPCODE_NORM_INV_MS; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >;
-        < "COM.MICROSOFT.CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >;
-        < "COM.MICROSOFT.CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >;
-        < "FTEST" ; SC_OPCODE_F_TEST; >;
-        < "COM.MICROSOFT.F.TEST" ; SC_OPCODE_F_TEST_MS; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >;
-        < "PROB" ; SC_OPCODE_PROB; >;
-        < "CORREL" ; SC_OPCODE_CORREL; >;
-        < "COVAR" ; SC_OPCODE_COVAR; >;
-        < "COM.MICROSOFT.COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >;
-        < "COM.MICROSOFT.COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON; >;
-        < "RSQ" ; SC_OPCODE_RSQ; >;
-        < "STEYX" ; SC_OPCODE_STEYX; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >;
-        < "TREND" ; SC_OPCODE_TREND; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH; >;
-        < "LINEST" ; SC_OPCODE_LINEST; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST; >;
-        < "COM.MICROSOFT.FORECAST.ETS" ; SC_OPCODE_FORECAST_ETS_ADD; >;
-        < "COM.MICROSOFT.FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >;
-        < "ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >;
-        < "COM.MICROSOFT.FORECAST.ETS.CONFINT" ; SC_OPCODE_FORECAST_ETS_PIA; >;
-        < "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >;
-        < "COM.MICROSOFT.FORECAST.ETS.STAT" ; SC_OPCODE_FORECAST_ETS_STA; >;
-        < "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >;
-        < "COM.MICROSOFT.FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >;
-        < "LEGACY.CHIINV" ; SC_OPCODE_CHI_INV; >;
-        < "COM.MICROSOFT.CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >;
-        < "COM.MICROSOFT.GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >;
-        < "COM.MICROSOFT.GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >;
-        < "TINV" ; SC_OPCODE_T_INV; >;
-        < "COM.MICROSOFT.T.INV.2T" ; SC_OPCODE_T_INV_2T; >;
-        < "COM.MICROSOFT.T.INV" ; SC_OPCODE_T_INV_MS; >;
-        < "LEGACY.FINV" ; SC_OPCODE_F_INV; >;
-        < "FINV" ; SC_OPCODE_F_INV_LT; >;
-        < "COM.MICROSOFT.F.INV.RT" ; SC_OPCODE_F_INV_RT; >;
-        < "LEGACY.CHITEST" ; SC_OPCODE_CHI_TEST; >;
-        < "COM.MICROSOFT.CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV; >;
-        < "COM.MICROSOFT.LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >;
-        < "MULTIPLE.OPERATIONS" ; SC_OPCODE_TABLE_OP; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV; >;
-        < "COM.MICROSOFT.BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >;
-        < "COM.MICROSOFT.BETA.INV" ; SC_OPCODE_BETA_INV_MS; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK; >;
-        < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >;
-        < "ORG.LIBREOFFICE.WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >;
-        < "ORG.OPENOFFICE.EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >;
-        < "COM.MICROSOFT.NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >;
-        < "COM.MICROSOFT.WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME; >;
-        < "ORG.OPENOFFICE.STYLE" ; SC_OPCODE_STYLE; >;
-        < "DDE" ; SC_OPCODE_DDE; >;
-        < "BASE" ; SC_OPCODE_BASE; >;
-        < "DECIMAL" ; SC_OPCODE_DECIMAL; >;
-        < "ORG.OPENOFFICE.CONVERT" ; SC_OPCODE_CONVERT_OOO; >;
-        < "ROMAN" ; SC_OPCODE_ROMAN; >;
-        < "ARABIC" ; SC_OPCODE_ARABIC; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
-        < "INFO" ; SC_OPCODE_INFO; >;
-        < "COM.MICROSOFT.BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >;
-        < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >;
-        < "GAMMA" ; SC_OPCODE_GAMMA; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >;
-        < "COM.MICROSOFT.CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >;
-        < "COM.MICROSOFT.CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >;
-        < "BITAND" ; SC_OPCODE_BITAND; >;
-        < "BITOR" ; SC_OPCODE_BITOR; >;
-        < "BITXOR" ; SC_OPCODE_BITXOR; >;
-        < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >;
-        < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >;
-        /* BEGIN defined ERROR.TYPE() values. */
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL; >;
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >;
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >;
-        < "#REF!" ; SC_OPCODE_ERROR_REF; >;
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME; >;
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM; >;
-        < "#N/A" ; SC_OPCODE_ERROR_NA; >;
-        /* END defined ERROR.TYPE() values. */
-        < "COM.MICROSOFT.FILTERXML" ; SC_OPCODE_FILTERXML; >;
-        < "COM.MICROSOFT.WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >;
-        < "ORG.LIBREOFFICE.COLOR" ; SC_OPCODE_COLOR; >;
-        < "COM.MICROSOFT.ERF.PRECISE" ; SC_OPCODE_ERF_MS; >;
-        < "COM.MICROSOFT.ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >;
-        < "COM.MICROSOFT.ENCODEURL" ; SC_OPCODE_ENCODEURL; >;
-        < "ORG.LIBREOFFICE.RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >;
-        < "ORG.LIBREOFFICE.ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-/** These function names are used in the OOXML XLSX import/export. */
-StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
-{
-    ItemList =
-    {
-        < "IF" ; SC_OPCODE_IF; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR; >;
-        < "_xlfn.IFNA" ; SC_OPCODE_IF_NA; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE; >;
-        < "(" ; SC_OPCODE_OPEN; >;
-        < ")" ; SC_OPCODE_CLOSE; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >;
-        < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >;
-        < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >;
-        < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >;
-        < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >;
-        < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE; >;
-        < ";" ; SC_OPCODE_ARRAY_ROW_SEP; >;
-        < "," ; SC_OPCODE_ARRAY_COL_SEP; >;
-        < "," ; SC_OPCODE_SEP; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN; >;
-        < "+" ; SC_OPCODE_ADD; >;
-        < "-" ; SC_OPCODE_SUB; >;
-        < "*" ; SC_OPCODE_MUL; >;
-        < "/" ; SC_OPCODE_DIV; >;
-        < "&" ; SC_OPCODE_AMPERSAND; >;
-        < "^" ; SC_OPCODE_POW; >;
-        < "=" ; SC_OPCODE_EQUAL; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL; >;
-        < "<" ; SC_OPCODE_LESS; >;
-        < ">" ; SC_OPCODE_GREATER; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL; >;
-        < "AND" ; SC_OPCODE_AND; >;
-        < "OR" ; SC_OPCODE_OR; >;
-        < "_xlfn.XOR" ; SC_OPCODE_XOR; >;
-        < " " ; SC_OPCODE_INTERSECT; >;
-        < "~" ; SC_OPCODE_UNION; >;
-        < ":" ; SC_OPCODE_RANGE; >;
-        < "NOT" ; SC_OPCODE_NOT; >;
-        < "NEG" ; SC_OPCODE_NEG; >;
-        < "-" ; SC_OPCODE_NEG_SUB; >;
-        < "PI" ; SC_OPCODE_PI; >;
-        < "RAND" ; SC_OPCODE_RANDOM; >;
-        < "TRUE" ; SC_OPCODE_TRUE; >;
-        < "FALSE" ; SC_OPCODE_FALSE; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME; >;
-        < "NA" ; SC_OPCODE_NO_VALUE; >;
-        < "_xlfn.ORG.OPENOFFICE.CURRENT" ; SC_OPCODE_CURRENT; >;
-        < "DEGREES" ; SC_OPCODE_DEG; >;
-        < "RADIANS" ; SC_OPCODE_RAD; >;
-        < "SIN" ; SC_OPCODE_SIN; >;
-        < "COS" ; SC_OPCODE_COS; >;
-        < "TAN" ; SC_OPCODE_TAN; >;
-        < "_xlfn.COT" ; SC_OPCODE_COT; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN; >;
-        < "_xlfn.ACOT" ; SC_OPCODE_ARC_COT; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP; >;
-        < "COSH" ; SC_OPCODE_COS_HYP; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP; >;
-        < "_xlfn.COTH" ; SC_OPCODE_COT_HYP; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >;
-        < "_xlfn.ACOTH" ; SC_OPCODE_ARC_COT_HYP; >;
-        < "_xlfn.CSC" ; SC_OPCODE_COSECANT; >;
-        < "_xlfn.SEC" ; SC_OPCODE_SECANT; >;
-        < "_xlfn.CSCH" ; SC_OPCODE_COSECANT_HYP; >;
-        < "_xlfn.SECH" ; SC_OPCODE_SECANT_HYP; >;
-        < "EXP" ; SC_OPCODE_EXP; >;
-        < "LN" ; SC_OPCODE_LN; >;
-        < "SQRT" ; SC_OPCODE_SQRT; >;
-        < "FACT" ; SC_OPCODE_FACT; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH; >;
-        < "DAY" ; SC_OPCODE_GET_DAY; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS; >;
-        < "ABS" ; SC_OPCODE_ABS; >;
-        < "INT" ; SC_OPCODE_INT; >;
-        < "_xlfn.PHI" ; SC_OPCODE_PHI; >;
-        < "_xlfn.GAUSS" ; SC_OPCODE_GAUSS; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >;
-        < "TYPE" ; SC_OPCODE_TYPE; >;
-        < "CELL" ; SC_OPCODE_CELL; >;
-        < "ISREF" ; SC_OPCODE_IS_REF; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >;
-        < "_xlfn.ISFORMULA" ; SC_OPCODE_IS_FORMULA; >;
-        < "ISNA" ; SC_OPCODE_IS_NV; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD; >;
-        < "N" ; SC_OPCODE_N; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >;
-        < "CODE" ; SC_OPCODE_CODE; >;
-        < "TRIM" ; SC_OPCODE_TRIM; >;
-        < "UPPER" ; SC_OPCODE_UPPER; >;
-        < "PROPER" ; SC_OPCODE_PROPER; >;
-        < "LOWER" ; SC_OPCODE_LOWER; >;
-        < "LEN" ; SC_OPCODE_LEN; >;
-        < "T" ; SC_OPCODE_T; >;
-        < "VALUE" ; SC_OPCODE_VALUE; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN; >;
-        < "CHAR" ; SC_OPCODE_CHAR; >;
-        < "JIS" ; SC_OPCODE_JIS; >;
-        < "ASC" ; SC_OPCODE_ASC; >;
-        < "_xlfn.UNICODE" ; SC_OPCODE_UNICODE; >;
-        < "_xlfn.UNICHAR" ; SC_OPCODE_UNICHAR; >;
-        < "LOG10" ; SC_OPCODE_LOG10; >;
-        < "EVEN" ; SC_OPCODE_EVEN; >;
-        < "ODD" ; SC_OPCODE_ODD; >;
-        < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >;
-        < "_xlfn.NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >;
-        < "FISHER" ; SC_OPCODE_FISHER; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV; >;
-        < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >;
-        < "_xlfn.NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >;
-        < "_xlfn.GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >;
-        < "_xlfn.ORG.OPENOFFICE.ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >;
-        < "_xlfn.FORMULATEXT" ; SC_OPCODE_FORMULA; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >;
-        < "_xlfn.CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >;
-        < "_xlfn.CEILING.MATH" ; SC_OPCODE_CEIL; >;
-        < "CEILING" ; SC_OPCODE_CEIL_MS; >;
-        < "_xlfn.CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >;
-        < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR_MS; >;
-        < "_xlfn.FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >;
-        < "_xlfn.FLOOR.MATH" ; SC_OPCODE_FLOOR; >;
-        < "_xlfn.FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >;
-        < "ROUND" ; SC_OPCODE_ROUND; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC; >;
-        < "LOG" ; SC_OPCODE_LOG; >;
-        < "POWER" ; SC_OPCODE_POWER; >;
-        < "GCD" ; SC_OPCODE_GCD; >;
-        < "LCM" ; SC_OPCODE_LCM; >;
-        < "MOD" ; SC_OPCODE_MOD; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >;
-        < "DATE" ; SC_OPCODE_GET_DATE; >;
-        < "TIME" ; SC_OPCODE_GET_TIME; >;
-        < "_xlfn.DAYS" ; SC_OPCODE_GET_DIFF_DATE; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >;
-        < "MIN" ; SC_OPCODE_MIN; >;
-        < "MINA" ; SC_OPCODE_MIN_A; >;
-        < "MAX" ; SC_OPCODE_MAX; >;
-        < "MAXA" ; SC_OPCODE_MAX_A; >;
-        < "SUM" ; SC_OPCODE_SUM; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >;
-        < "COUNT" ; SC_OPCODE_COUNT; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2; >;
-        < "NPV" ; SC_OPCODE_NPV; >;
-        < "IRR" ; SC_OPCODE_IRR; >;
-        < "MIRR" ; SC_OPCODE_MIRR; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT; >;
-        < "VAR" ; SC_OPCODE_VAR; >;
-        < "VARA" ; SC_OPCODE_VAR_A; >;
-        < "VARP" ; SC_OPCODE_VAR_P; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A; >;
-        < "_xlfn.VAR.P" ; SC_OPCODE_VAR_P_MS; >;
-        < "_xlfn.VAR.S" ; SC_OPCODE_VAR_S; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >;
-        < "_xlfn.STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >;
-        < "_xlfn.STDEV.S" ; SC_OPCODE_ST_DEV_S; >;
-        < "B" ; SC_OPCODE_B; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST; >;
-        < "_xlfn.NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >;
-        < "_xlfn.EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >;
-        < "_xlfn.BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST; >;
-        < "_xlfn.POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN; >;
-        < "_xlfn.COMBINA" ; SC_OPCODE_COMBIN_A; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT; >;
-        < "_xlfn.PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >;
-        < "PV" ; SC_OPCODE_PV; >;
-        < "SYD" ; SC_OPCODE_SYD; >;
-        < "DDB" ; SC_OPCODE_DDB; >;
-        < "DB" ; SC_OPCODE_DB; >;
-        < "VDB" ; SC_OPCODE_VBD; >;
-        < "_xlfn.PDURATION" ; SC_OPCODE_PDURATION; >;
-        < "SLN" ; SC_OPCODE_SLN; >;
-        < "PMT" ; SC_OPCODE_PMT; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS; >;
-        < "ROWS" ; SC_OPCODE_ROWS; >;
-        < "_xlfn.SHEETS" ; SC_OPCODE_SHEETS; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN; >;
-        < "ROW" ; SC_OPCODE_ROW; >;
-        < "_xlfn.SHEET" ; SC_OPCODE_SHEET; >;
-        < "_xlfn.RRI" ; SC_OPCODE_RRI; >;
-        < "FV" ; SC_OPCODE_FV; >;
-        < "NPER" ; SC_OPCODE_NPER; >;
-        < "RATE" ; SC_OPCODE_RATE; >;
-        < "IPMT" ; SC_OPCODE_IPMT; >;
-        < "PPMT" ; SC_OPCODE_PPMT; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >;
-        < "EFFECT" ; SC_OPCODE_EFFECT; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >;
-        < "DGET" ; SC_OPCODE_DB_GET; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS; >;
-        < "MATCH" ; SC_OPCODE_MATCH; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
-        < "_xlfn.ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;  // legacy for range list (union)
-        < "OFFSET" ; SC_OPCODE_OFFSET; >;
-        < "INDEX" ; SC_OPCODE_INDEX; >;
-        < "AREAS" ; SC_OPCODE_AREAS; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE; >;
-        < "FIXED" ; SC_OPCODE_FIXED; >;
-        < "FIND" ; SC_OPCODE_FIND; >;
-        < "EXACT" ; SC_OPCODE_EXACT; >;
-        < "LEFT" ; SC_OPCODE_LEFT; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH; >;
-        < "MID" ; SC_OPCODE_MID; >;
-        < "LENB" ; SC_OPCODE_LENB; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB; >;
-        < "TEXT" ; SC_OPCODE_TEXT; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >;
-        < "REPT" ; SC_OPCODE_REPT; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT; >;
-        < "_xlfn.CONCAT" ; SC_OPCODE_CONCAT_MS; >;
-        < "_xlfn.TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >;
-        < "_xlfn.IFS" ; SC_OPCODE_IFS_MS; >;
-        < "_xlfn.SWITCH" ; SC_OPCODE_SWITCH_MS; >;
-        < "_xlfn.MINIFS" ; SC_OPCODE_MINIFS_MS; >;
-        < "_xlfn.MAXIFS" ; SC_OPCODE_MAXIFS_MS; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >;
-        < "_xlfn.MUNIT" ; SC_OPCODE_MATRIX_UNIT; >;
-        < "_xlfn.ORG.OPENOFFICE.GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >;
-        < "_xlfn.HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >;
-        < "_xlfn.LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >;
-        < "TDIST" ; SC_OPCODE_T_DIST; >;
-        < "_xlfn.T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >;
-        < "_xlfn.T.DIST" ; SC_OPCODE_T_DIST_MS; >;
-        < "_xlfn.T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >;
-        < "FDIST" ; SC_OPCODE_F_DIST; >;
-        < "_xlfn.F.DIST" ; SC_OPCODE_F_DIST_LT; >;
-        < "_xlfn.F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >;
-        < "CHIDIST" ; SC_OPCODE_CHI_DIST; >;
-        < "_xlfn.CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL; >;
-        < "_xlfn.WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >;
-        < "_xlfn.NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >;
-        < "_xlfn.BINOM.INV" ; SC_OPCODE_BINOM_INV; >;
-        < "KURT" ; SC_OPCODE_KURT; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV; >;
-        < "SKEW" ; SC_OPCODE_SKEW; >;
-        < "_xlfn.SKEW.P" ; SC_OPCODE_SKEWP; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE; >;
-        < "_xlfn.MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >;
-        < "_xlfn.MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST; >;
-        < "_xlfn.Z.TEST" ; SC_OPCODE_Z_TEST_MS; >;
-        < "_xlfn.AGGREGATE" ; SC_OPCODE_AGGREGATE; >;
-        < "TTEST" ; SC_OPCODE_T_TEST; >;
-        < "_xlfn.T.TEST" ; SC_OPCODE_T_TEST_MS; >;
-        < "RANK" ; SC_OPCODE_RANK; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >;
-        < "_xlfn.PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >;
-        < "_xlfn.PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >;
-        < "_xlfn.QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >;
-        < "_xlfn.RANK.EQ" ; SC_OPCODE_RANK_EQ; >;
-        < "_xlfn.PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >;
-        < "_xlfn.PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >;
-        < "_xlfn.QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >;
-        < "_xlfn.RANK.AVG" ; SC_OPCODE_RANK_AVG; >;
-        < "LARGE" ; SC_OPCODE_LARGE; >;
-        < "SMALL" ; SC_OPCODE_SMALL; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV; >;
-        < "_xlfn.NORM.INV" ; SC_OPCODE_NORM_INV_MS; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >;
-        < "_xlfn.CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >;
-        < "_xlfn.CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >;
-        < "FTEST" ; SC_OPCODE_F_TEST; >;
-        < "_xlfn.F.TEST" ; SC_OPCODE_F_TEST_MS; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >;
-        < "PROB" ; SC_OPCODE_PROB; >;
-        < "CORREL" ; SC_OPCODE_CORREL; >;
-        < "COVAR" ; SC_OPCODE_COVAR; >;
-        < "_xlfn.COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >;
-        < "_xlfn.COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON; >;
-        < "RSQ" ; SC_OPCODE_RSQ; >;
-        < "STEYX" ; SC_OPCODE_STEYX; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >;
-        < "TREND" ; SC_OPCODE_TREND; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH; >;
-        < "LINEST" ; SC_OPCODE_LINEST; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST; >;
-        < "_xlfn.FORECAST.ETS" ; SC_OPCODE_FORECAST_ETS_ADD; >;
-        < "_xlfn.FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >;
-        < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >;
-        < "_xlfn.FORECAST.ETS.CONFINT" ; SC_OPCODE_FORECAST_ETS_PIA; >;
-        < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >;
-        < "_xlfn.FORECAST.ETS.STAT" ; SC_OPCODE_FORECAST_ETS_STA; >;
-        < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >;
-        < "_xlfn.FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >;
-        < "CHIINV" ; SC_OPCODE_CHI_INV; >;
-        < "_xlfn.CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >;
-        < "_xlfn.GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >;
-        < "_xlfn.GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >;
-        < "TINV" ; SC_OPCODE_T_INV; >;
-        < "_xlfn.T.INV.2T" ; SC_OPCODE_T_INV_2T; >;
-        < "_xlfn.T.INV" ; SC_OPCODE_T_INV_MS; >;
-        < "FINV" ; SC_OPCODE_F_INV; >;
-        < "_xlfn.F.INV" ; SC_OPCODE_F_INV_LT; >;
-        < "_xlfn.F.INV.RT" ; SC_OPCODE_F_INV_RT; >;
-        < "CHITEST" ; SC_OPCODE_CHI_TEST; >;
-        < "_xlfn.CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV; >;
-        < "_xlfn.LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >;
-        < "TABLE" ; SC_OPCODE_TABLE_OP; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV; >;
-        < "_xlfn.BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >;
-        < "_xlfn.BETA.INV" ; SC_OPCODE_BETA_INV_MS; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK; >;
-        < "_xlfn.ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >;
-        < "_xlfn.ORG.LIBREOFFICE.WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >;
-        < "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >;
-        < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >;
-        < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME; >;
-        < "_xlfn.ORG.OPENOFFICE.STYLE" ; SC_OPCODE_STYLE; >;
-        < "DDE" ; SC_OPCODE_DDE; >;
-        < "_xlfn.BASE" ; SC_OPCODE_BASE; >;
-        < "_xlfn.DECIMAL" ; SC_OPCODE_DECIMAL; >;
-        < "_xlfn.ORG.OPENOFFICE.CONVERT" ; SC_OPCODE_CONVERT_OOO; >;
-        < "ROMAN" ; SC_OPCODE_ROMAN; >;
-        < "_xlfn.ARABIC" ; SC_OPCODE_ARABIC; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
-        < "INFO" ; SC_OPCODE_INFO; >;
-        < "_xlfn.BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >;
-        < "_xlfn.NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >;
-        < "_xlfn.GAMMA" ; SC_OPCODE_GAMMA; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >;
-        < "_xlfn.CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >;
-        < "_xlfn.CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >;
-        < "_xlfn.BITAND" ; SC_OPCODE_BITAND; >;
-        < "_xlfn.BITOR" ; SC_OPCODE_BITOR; >;
-        < "_xlfn.BITXOR" ; SC_OPCODE_BITXOR; >;
-        < "_xlfn.BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >;
-        < "_xlfn.BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >;
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL; >;
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >;
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >;
-        < "#REF!" ; SC_OPCODE_ERROR_REF; >;
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME; >;
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM; >;
-        < "#N/A" ; SC_OPCODE_ERROR_NA; >;
-        /* END defined ERROR.TYPE() values. */
-        < "_xlfn.FILTERXML" ; SC_OPCODE_FILTERXML; >;
-        < "_xlfn.WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >;
-        < "_xlfn.ORG.LIBREOFFICE.COLOR" ; SC_OPCODE_COLOR; >;
-        < "_xlfn.ERF.PRECISE" ; SC_OPCODE_ERF_MS; >;
-        < "_xlfn.ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >;
-        < "_xlfn.ENCODEURL" ; SC_OPCODE_ENCODEURL; >;
-        < "_xlfn.ORG.LIBREOFFICE.RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >;
-        < "_xlfn.ORG.LIBREOFFICE.ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-/** These English names are used to store/load ODF v1.0/v1.1. */
-// DO NOT CHANGE NAMES! Only add functions.
-// If there is a reason for another name for some function then add an
-// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
-// ScCompiler::IsOpCode() in the else if (mxSymbols->isPODF()) block.
-StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF
-{
-    ItemList =
-    {
-        < "IF" ; SC_OPCODE_IF; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR; >;
-        < "IFNA" ; SC_OPCODE_IF_NA; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE; >;
-        < "(" ; SC_OPCODE_OPEN; >;
-        < ")" ; SC_OPCODE_CLOSE; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >;
-        < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >;
-        < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >;
-        < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >;
-        < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >;
-        < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP; >;
-        < ";" ; SC_OPCODE_SEP; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN; >;
-        < "+" ; SC_OPCODE_ADD; >;
-        < "-" ; SC_OPCODE_SUB; >;
-        < "*" ; SC_OPCODE_MUL; >;
-        < "/" ; SC_OPCODE_DIV; >;
-        < "&" ; SC_OPCODE_AMPERSAND; >;
-        < "^" ; SC_OPCODE_POW; >;
-        < "=" ; SC_OPCODE_EQUAL; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL; >;
-        < "<" ; SC_OPCODE_LESS; >;
-        < ">" ; SC_OPCODE_GREATER; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL; >;
-        < "AND" ; SC_OPCODE_AND; >;
-        < "OR" ; SC_OPCODE_OR; >;
-        < "XOR" ; SC_OPCODE_XOR; >;
-        < "!" ; SC_OPCODE_INTERSECT; >;
-        < "~" ; SC_OPCODE_UNION; >;
-        < ":" ; SC_OPCODE_RANGE; >;
-        < "NOT" ; SC_OPCODE_NOT; >;
-        < "NEG" ; SC_OPCODE_NEG; >;
-        < "-" ; SC_OPCODE_NEG_SUB; >;
-        < "PI" ; SC_OPCODE_PI; >;
-        < "RAND" ; SC_OPCODE_RANDOM; >;
-        < "TRUE" ; SC_OPCODE_TRUE; >;
-        < "FALSE" ; SC_OPCODE_FALSE; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME; >;
-        < "NA" ; SC_OPCODE_NO_VALUE; >;
-        < "CURRENT" ; SC_OPCODE_CURRENT; >;
-        < "DEGREES" ; SC_OPCODE_DEG; >;
-        < "RADIANS" ; SC_OPCODE_RAD; >;
-        < "SIN" ; SC_OPCODE_SIN; >;
-        < "COS" ; SC_OPCODE_COS; >;
-        < "TAN" ; SC_OPCODE_TAN; >;
-        < "COT" ; SC_OPCODE_COT; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN; >;
-        < "ACOT" ; SC_OPCODE_ARC_COT; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP; >;
-        < "COSH" ; SC_OPCODE_COS_HYP; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP; >;
-        < "COTH" ; SC_OPCODE_COT_HYP; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >;
-        < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >;
-        < "CSC" ; SC_OPCODE_COSECANT; >;
-        < "SEC" ; SC_OPCODE_SECANT; >;
-        < "CSCH" ; SC_OPCODE_COSECANT_HYP; >;
-        < "SECH" ; SC_OPCODE_SECANT_HYP; >;
-        < "EXP" ; SC_OPCODE_EXP; >;
-        < "LN" ; SC_OPCODE_LN; >;
-        < "SQRT" ; SC_OPCODE_SQRT; >;
-        < "FACT" ; SC_OPCODE_FACT; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH; >;
-        < "DAY" ; SC_OPCODE_GET_DAY; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS; >;
-        < "ABS" ; SC_OPCODE_ABS; >;
-        < "INT" ; SC_OPCODE_INT; >;
-        < "PHI" ; SC_OPCODE_PHI; >;
-        < "GAUSS" ; SC_OPCODE_GAUSS; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >;
-        < "TYPE" ; SC_OPCODE_TYPE; >;
-        < "CELL" ; SC_OPCODE_CELL; >;
-        < "ISREF" ; SC_OPCODE_IS_REF; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >;
-        < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >;
-        < "ISNA" ; SC_OPCODE_IS_NV; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD; >;
-        < "N" ; SC_OPCODE_N; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >;
-        < "CODE" ; SC_OPCODE_CODE; >;
-        < "TRIM" ; SC_OPCODE_TRIM; >;
-        < "UPPER" ; SC_OPCODE_UPPER; >;
-        < "PROPER" ; SC_OPCODE_PROPER; >;
-        < "LOWER" ; SC_OPCODE_LOWER; >;
-        < "LEN" ; SC_OPCODE_LEN; >;
-        < "T" ; SC_OPCODE_T; >;
-        < "VALUE" ; SC_OPCODE_VALUE; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN; >;
-        < "CHAR" ; SC_OPCODE_CHAR; >;
-        < "JIS" ; SC_OPCODE_JIS; >;
-        < "ASC" ; SC_OPCODE_ASC; >;
-        < "UNICODE" ; SC_OPCODE_UNICODE; >;
-        < "UNICHAR" ; SC_OPCODE_UNICHAR; >;
-        < "LOG10" ; SC_OPCODE_LOG10; >;
-        < "EVEN" ; SC_OPCODE_EVEN; >;
-        < "ODD" ; SC_OPCODE_ODD; >;
-        < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >;
-        < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >;
-        < "FISHER" ; SC_OPCODE_FISHER; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV; >;
-        < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >;
-        < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >;
-        < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >;
-        < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >;
-        < "FORMULA" ; SC_OPCODE_FORMULA; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >;
-        < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >;
-        < "CEILING" ; SC_OPCODE_CEIL; >;
-        < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >;
-        < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >;
-        < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR; >;
-        < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >;
-        < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >;
-        < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >;
-        < "ROUND" ; SC_OPCODE_ROUND; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC; >;
-        < "LOG" ; SC_OPCODE_LOG; >;
-        < "POWER" ; SC_OPCODE_POWER; >;
-        < "GCD" ; SC_OPCODE_GCD; >;
-        < "LCM" ; SC_OPCODE_LCM; >;
-        < "MOD" ; SC_OPCODE_MOD; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >;
-        < "DATE" ; SC_OPCODE_GET_DATE; >;
-        < "TIME" ; SC_OPCODE_GET_TIME; >;
-        < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >;
-        < "MIN" ; SC_OPCODE_MIN; >;
-        < "MINA" ; SC_OPCODE_MIN_A; >;
-        < "MAX" ; SC_OPCODE_MAX; >;
-        < "MAXA" ; SC_OPCODE_MAX_A; >;
-        < "SUM" ; SC_OPCODE_SUM; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >;
-        < "COUNT" ; SC_OPCODE_COUNT; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2; >;
-        < "NPV" ; SC_OPCODE_NPV; >;
-        < "IRR" ; SC_OPCODE_IRR; >;
-        < "MIRR" ; SC_OPCODE_MIRR; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT; >;
-        < "VAR" ; SC_OPCODE_VAR; >;
-        < "VARA" ; SC_OPCODE_VAR_A; >;
-        < "VARP" ; SC_OPCODE_VAR_P; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A; >;
-        < "VAR.P" ; SC_OPCODE_VAR_P_MS; >;
-        < "VAR.S" ; SC_OPCODE_VAR_S; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >;
-        < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >;
-        < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >;
-        < "B" ; SC_OPCODE_B; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST; >;
-        < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >;
-        < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >;
-        < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST; >;
-        < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN; >;
-        < "COMBINA" ; SC_OPCODE_COMBIN_A; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT; >;
-        < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >;
-        < "PV" ; SC_OPCODE_PV; >;
-        < "SYD" ; SC_OPCODE_SYD; >;
-        < "DDB" ; SC_OPCODE_DDB; >;
-        < "DB" ; SC_OPCODE_DB; >;
-        < "VDB" ; SC_OPCODE_VBD; >;
-        < "DURATION" ; SC_OPCODE_PDURATION; >;  // wrong but ODF1.1, keep it.
-        < "SLN" ; SC_OPCODE_SLN; >;
-        < "PMT" ; SC_OPCODE_PMT; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS; >;
-        < "ROWS" ; SC_OPCODE_ROWS; >;
-        < "SHEETS" ; SC_OPCODE_SHEETS; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN; >;
-        < "ROW" ; SC_OPCODE_ROW; >;
-        < "SHEET" ; SC_OPCODE_SHEET; >;
-        < "ZGZ" ; SC_OPCODE_RRI; >;
-        < "FV" ; SC_OPCODE_FV; >;
-        < "NPER" ; SC_OPCODE_NPER; >;
-        < "RATE" ; SC_OPCODE_RATE; >;
-        < "IPMT" ; SC_OPCODE_IPMT; >;
-        < "PPMT" ; SC_OPCODE_PPMT; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >;
-        < "EFFECTIVE" ; SC_OPCODE_EFFECT; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >;
-        < "DGET" ; SC_OPCODE_DB_GET; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS; >;
-        < "MATCH" ; SC_OPCODE_MATCH; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
-        < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;    // legacy for range list (union)
-        < "OFFSET" ; SC_OPCODE_OFFSET; >;
-        < "INDEX" ; SC_OPCODE_INDEX; >;
-        < "AREAS" ; SC_OPCODE_AREAS; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE; >;
-        < "FIXED" ; SC_OPCODE_FIXED; >;
-        < "FIND" ; SC_OPCODE_FIND; >;
-        < "EXACT" ; SC_OPCODE_EXACT; >;
-        < "LEFT" ; SC_OPCODE_LEFT; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH; >;
-        < "MID" ; SC_OPCODE_MID; >;
-        < "LENB" ; SC_OPCODE_LENB; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB; >;
-        < "TEXT" ; SC_OPCODE_TEXT; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >;
-        < "REPT" ; SC_OPCODE_REPT; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT; >;
-        < "CONCAT" ; SC_OPCODE_CONCAT_MS; >;
-        < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >;
-        < "IFS" ; SC_OPCODE_IFS_MS; >;
-        < "SWITCH" ; SC_OPCODE_SWITCH_MS; >;
-        < "MINIFS" ; SC_OPCODE_MINIFS_MS; >;
-        < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >;
-        < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >;
-        < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >;
-        < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >;
-        < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >;
-        < "TDIST" ; SC_OPCODE_T_DIST; >;
-        < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >;
-        < "T.DIST" ; SC_OPCODE_T_DIST_MS; >;
-        < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >;
-        < "FDIST" ; SC_OPCODE_F_DIST; >;
-        < "F.DIST" ; SC_OPCODE_F_DIST_LT; >;
-        < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >;
-        < "CHIDIST" ; SC_OPCODE_CHI_DIST; >;
-        < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL; >;
-        < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >;
-        < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >;
-        < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >;
-        < "KURT" ; SC_OPCODE_KURT; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV; >;
-        < "SKEW" ; SC_OPCODE_SKEW; >;
-        < "SKEWP" ; SC_OPCODE_SKEWP; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE; >;
-        < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >;
-        < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST; >;
-        < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >;
-        < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >;
-        < "TTEST" ; SC_OPCODE_T_TEST; >;
-        < "T.TEST" ; SC_OPCODE_T_TEST_MS; >;
-        < "RANK" ; SC_OPCODE_RANK; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >;
-        < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >;
-        < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >;
-        < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >;
-        < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >;
-        < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >;
-        < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >;
-        < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >;
-        < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >;
-        < "LARGE" ; SC_OPCODE_LARGE; >;
-        < "SMALL" ; SC_OPCODE_SMALL; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV; >;
-        < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >;
-        < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >;
-        < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >;
-        < "FTEST" ; SC_OPCODE_F_TEST; >;
-        < "F.TEST" ; SC_OPCODE_F_TEST_MS; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >;
-        < "PROB" ; SC_OPCODE_PROB; >;
-        < "CORREL" ; SC_OPCODE_CORREL; >;
-        < "COVAR" ; SC_OPCODE_COVAR; >;
-        < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >;
-        < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON; >;
-        < "RSQ" ; SC_OPCODE_RSQ; >;
-        < "STEYX" ; SC_OPCODE_STEYX; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >;
-        < "TREND" ; SC_OPCODE_TREND; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH; >;
-        < "LINEST" ; SC_OPCODE_LINEST; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST; >;
-        < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >;
-        < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >;
-        < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >;
-        < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >;
-        < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >;
-        < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >;
-        < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >;
-        < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >;
-        < "CHIINV" ; SC_OPCODE_CHI_INV; >;
-        < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >;
-        < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >;
-        < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >;
-        < "TINV" ; SC_OPCODE_T_INV; >;
-        < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >;
-        < "T.INV" ; SC_OPCODE_T_INV_MS; >;
-        < "FINV" ; SC_OPCODE_F_INV; >;
-        < "F.INV" ; SC_OPCODE_F_INV_LT; >;
-        < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >;
-        < "CHITEST" ; SC_OPCODE_CHI_TEST; >;
-        < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV; >;
-        < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >;
-        < "TABLE" ; SC_OPCODE_TABLE_OP; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV; >;
-        < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >;
-        < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK; >;
-        < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >;
-        < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >;
-        < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >;
-        < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >;
-        < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME; >;
-        < "STYLE" ; SC_OPCODE_STYLE; >;
-        < "DDE" ; SC_OPCODE_DDE; >;
-        < "BASE" ; SC_OPCODE_BASE; >;
-        < "DECIMAL" ; SC_OPCODE_DECIMAL; >;
-        < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >; // wrong but ODF1.1, keep it
-        < "ROMAN" ; SC_OPCODE_ROMAN; >;
-        < "ARABIC" ; SC_OPCODE_ARABIC; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
-        < "INFO" ; SC_OPCODE_INFO; >;
-        < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >;
-        < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >;
-        < "GAMMA" ; SC_OPCODE_GAMMA; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >;
-        < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >;
-        < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >;
-        < "BITAND" ; SC_OPCODE_BITAND; >;
-        < "BITOR" ; SC_OPCODE_BITOR; >;
-        < "BITXOR" ; SC_OPCODE_BITXOR; >;
-        < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >;
-        < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >;
-        /* BEGIN defined ERROR.TYPE() values. */
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL; >;
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >;
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >;
-        < "#REF!" ; SC_OPCODE_ERROR_REF; >;
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME; >;
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM; >;
-        < "#N/A" ; SC_OPCODE_ERROR_NA; >;
-        /* END defined ERROR.TYPE() values. */
-        < "FILTERXML" ; SC_OPCODE_FILTERXML; >;
-        < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >;
-        < "COLOR" ; SC_OPCODE_COLOR; >;
-        < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >;
-        < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >;
-        < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >;
-        < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >;
-        < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-/** These English names are used for XFunctionAccess API. */
-// DO NOT CHANGE NAMES! Only add functions.
-// If there is a reason for another name for some function then add an
-// *additional* name to be recognized to sc/source/core/tool/compiler.cxx
-// ScCompiler::IsOpCode().
-StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_API
-{
-    ItemList =
-    {
-        < "IF" ; SC_OPCODE_IF; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR; >;
-        < "IFNA" ; SC_OPCODE_IF_NA; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE; >;
-        < "(" ; SC_OPCODE_OPEN; >;
-        < ")" ; SC_OPCODE_CLOSE; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >;
-        < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >;
-        < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >;
-        < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >;
-        < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >;
-        < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP; >;
-        < ";" ; SC_OPCODE_SEP; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN; >;
-        < "+" ; SC_OPCODE_ADD; >;
-        < "-" ; SC_OPCODE_SUB; >;
-        < "*" ; SC_OPCODE_MUL; >;
-        < "/" ; SC_OPCODE_DIV; >;
-        < "&" ; SC_OPCODE_AMPERSAND; >;
-        < "^" ; SC_OPCODE_POW; >;
-        < "=" ; SC_OPCODE_EQUAL; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL; >;
-        < "<" ; SC_OPCODE_LESS; >;
-        < ">" ; SC_OPCODE_GREATER; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL; >;
-        < "AND" ; SC_OPCODE_AND; >;
-        < "OR" ; SC_OPCODE_OR; >;
-        < "XOR" ; SC_OPCODE_XOR; >;
-        < "!" ; SC_OPCODE_INTERSECT; >;
-        < "~" ; SC_OPCODE_UNION; >;
-        < ":" ; SC_OPCODE_RANGE; >;
-        < "NOT" ; SC_OPCODE_NOT; >;
-        < "NEG" ; SC_OPCODE_NEG; >;
-        < "-" ; SC_OPCODE_NEG_SUB; >;
-        < "PI" ; SC_OPCODE_PI; >;
-        < "RAND" ; SC_OPCODE_RANDOM; >;
-        < "TRUE" ; SC_OPCODE_TRUE; >;
-        < "FALSE" ; SC_OPCODE_FALSE; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME; >;
-        < "NA" ; SC_OPCODE_NO_VALUE; >;
-        < "CURRENT" ; SC_OPCODE_CURRENT; >;
-        < "DEGREES" ; SC_OPCODE_DEG; >;
-        < "RADIANS" ; SC_OPCODE_RAD; >;
-        < "SIN" ; SC_OPCODE_SIN; >;
-        < "COS" ; SC_OPCODE_COS; >;
-        < "TAN" ; SC_OPCODE_TAN; >;
-        < "COT" ; SC_OPCODE_COT; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN; >;
-        < "ACOT" ; SC_OPCODE_ARC_COT; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP; >;
-        < "COSH" ; SC_OPCODE_COS_HYP; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP; >;
-        < "COTH" ; SC_OPCODE_COT_HYP; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >;
-        < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >;
-        < "CSC" ; SC_OPCODE_COSECANT; >;
-        < "SEC" ; SC_OPCODE_SECANT; >;
-        < "CSCH" ; SC_OPCODE_COSECANT_HYP; >;
-        < "SECH" ; SC_OPCODE_SECANT_HYP; >;
-        < "EXP" ; SC_OPCODE_EXP; >;
-        < "LN" ; SC_OPCODE_LN; >;
-        < "SQRT" ; SC_OPCODE_SQRT; >;
-        < "FACT" ; SC_OPCODE_FACT; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH; >;
-        < "DAY" ; SC_OPCODE_GET_DAY; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS; >;
-        < "ABS" ; SC_OPCODE_ABS; >;
-        < "INT" ; SC_OPCODE_INT; >;
-        < "PHI" ; SC_OPCODE_PHI; >;
-        < "GAUSS" ; SC_OPCODE_GAUSS; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >;
-        < "TYPE" ; SC_OPCODE_TYPE; >;
-        < "CELL" ; SC_OPCODE_CELL; >;
-        < "ISREF" ; SC_OPCODE_IS_REF; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >;
-        < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >;
-        < "ISNA" ; SC_OPCODE_IS_NV; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD; >;
-        < "N" ; SC_OPCODE_N; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >;
-        < "CODE" ; SC_OPCODE_CODE; >;
-        < "TRIM" ; SC_OPCODE_TRIM; >;
-        < "UPPER" ; SC_OPCODE_UPPER; >;
-        < "PROPER" ; SC_OPCODE_PROPER; >;
-        < "LOWER" ; SC_OPCODE_LOWER; >;
-        < "LEN" ; SC_OPCODE_LEN; >;
-        < "T" ; SC_OPCODE_T; >;
-        < "VALUE" ; SC_OPCODE_VALUE; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN; >;
-        < "CHAR" ; SC_OPCODE_CHAR; >;
-        < "JIS" ; SC_OPCODE_JIS; >;
-        < "ASC" ; SC_OPCODE_ASC; >;
-        < "UNICODE" ; SC_OPCODE_UNICODE; >;
-        < "UNICHAR" ; SC_OPCODE_UNICHAR; >;
-        < "LOG10" ; SC_OPCODE_LOG10; >;
-        < "EVEN" ; SC_OPCODE_EVEN; >;
-        < "ODD" ; SC_OPCODE_ODD; >;
-        < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >;
-        < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >;
-        < "FISHER" ; SC_OPCODE_FISHER; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV; >;
-        < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >;
-        < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >;
-        < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >;
-        < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >;
-        < "FORMULA" ; SC_OPCODE_FORMULA; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >;
-        < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >;
-        < "CEILING" ; SC_OPCODE_CEIL; >;
-        < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >;
-        < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >;
-        < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR; >;
-        < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >;
-        < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >;
-        < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >;
-        < "ROUND" ; SC_OPCODE_ROUND; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC; >;
-        < "LOG" ; SC_OPCODE_LOG; >;
-        < "POWER" ; SC_OPCODE_POWER; >;
-        < "GCD" ; SC_OPCODE_GCD; >;
-        < "LCM" ; SC_OPCODE_LCM; >;
-        < "MOD" ; SC_OPCODE_MOD; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >;
-        < "DATE" ; SC_OPCODE_GET_DATE; >;
-        < "TIME" ; SC_OPCODE_GET_TIME; >;
-        < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >;
-        < "MIN" ; SC_OPCODE_MIN; >;
-        < "MINA" ; SC_OPCODE_MIN_A; >;
-        < "MAX" ; SC_OPCODE_MAX; >;
-        < "MAXA" ; SC_OPCODE_MAX_A; >;
-        < "SUM" ; SC_OPCODE_SUM; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >;
-        < "COUNT" ; SC_OPCODE_COUNT; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2; >;
-        < "NPV" ; SC_OPCODE_NPV; >;
-        < "IRR" ; SC_OPCODE_IRR; >;
-        < "MIRR" ; SC_OPCODE_MIRR; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT; >;
-        < "VAR" ; SC_OPCODE_VAR; >;
-        < "VARA" ; SC_OPCODE_VAR_A; >;
-        < "VARP" ; SC_OPCODE_VAR_P; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A; >;
-        < "VAR.P" ; SC_OPCODE_VAR_P_MS; >;
-        < "VAR.S" ; SC_OPCODE_VAR_S; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >;
-        < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >;
-        < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >;
-        < "B" ; SC_OPCODE_B; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST; >;
-        < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >;
-        < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >;
-        < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST; >;
-        < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN; >;
-        < "COMBINA" ; SC_OPCODE_COMBIN_A; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT; >;
-        < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >;
-        < "PV" ; SC_OPCODE_PV; >;
-        < "SYD" ; SC_OPCODE_SYD; >;
-        < "DDB" ; SC_OPCODE_DDB; >;
-        < "DB" ; SC_OPCODE_DB; >;
-        < "VDB" ; SC_OPCODE_VBD; >;
-        < "DURATION" ; SC_OPCODE_PDURATION; >;
-        < "SLN" ; SC_OPCODE_SLN; >;
-        < "PMT" ; SC_OPCODE_PMT; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS; >;
-        < "ROWS" ; SC_OPCODE_ROWS; >;
-        < "SHEETS" ; SC_OPCODE_SHEETS; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN; >;
-        < "ROW" ; SC_OPCODE_ROW; >;
-        < "SHEET" ; SC_OPCODE_SHEET; >;
-        < "ZGZ" ; SC_OPCODE_RRI; >;
-        < "FV" ; SC_OPCODE_FV; >;
-        < "NPER" ; SC_OPCODE_NPER; >;
-        < "RATE" ; SC_OPCODE_RATE; >;
-        < "IPMT" ; SC_OPCODE_IPMT; >;
-        < "PPMT" ; SC_OPCODE_PPMT; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >;
-        < "EFFECTIVE" ; SC_OPCODE_EFFECT; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >;
-        < "DGET" ; SC_OPCODE_DB_GET; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS; >;
-        < "MATCH" ; SC_OPCODE_MATCH; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
-        < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
-        < "OFFSET" ; SC_OPCODE_OFFSET; >;
-        < "INDEX" ; SC_OPCODE_INDEX; >; // ?? first character = I ??
-        < "AREAS" ; SC_OPCODE_AREAS; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE; >;
-        < "FIXED" ; SC_OPCODE_FIXED; >;
-        < "FIND" ; SC_OPCODE_FIND; >;
-        < "EXACT" ; SC_OPCODE_EXACT; >;
-        < "LEFT" ; SC_OPCODE_LEFT; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH; >;
-        < "MID" ; SC_OPCODE_MID; >;
-        < "LENB" ; SC_OPCODE_LENB; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB; >;
-        < "TEXT" ; SC_OPCODE_TEXT; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >;
-        < "REPT" ; SC_OPCODE_REPT; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT; >;
-        < "CONCAT" ; SC_OPCODE_CONCAT_MS; >;
-        < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >;
-        < "IFS" ; SC_OPCODE_IFS_MS; >;
-        < "SWITCH" ; SC_OPCODE_SWITCH_MS; >;
-        < "MINIFS" ; SC_OPCODE_MINIFS_MS; >;
-        < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >;
-        < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >;
-        < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >;
-        < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >;
-        < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >;
-        < "TDIST" ; SC_OPCODE_T_DIST; >;
-        < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >;
-        < "T.DIST" ; SC_OPCODE_T_DIST_MS; >;
-        < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >;
-        < "FDIST" ; SC_OPCODE_F_DIST; >;
-        < "F.DIST" ; SC_OPCODE_F_DIST_LT; >;
-        < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >;
-        < "CHIDIST" ; SC_OPCODE_CHI_DIST; >;
-        < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL; >;
-        < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >;
-        < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >;
-        < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >;
-        < "KURT" ; SC_OPCODE_KURT; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV; >;
-        < "SKEW" ; SC_OPCODE_SKEW; >;
-        < "SKEWP" ; SC_OPCODE_SKEWP; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE; >;
-        < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >;
-        < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST; >;
-        < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >;
-        < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >;
-        < "TTEST" ; SC_OPCODE_T_TEST; >;
-        < "T.TEST" ; SC_OPCODE_T_TEST_MS; >;
-        < "RANK" ; SC_OPCODE_RANK; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >;
-        < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >;
-        < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >;
-        < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >;
-        < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >;
-        < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >;
-        < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >;
-        < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >;
-        < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >;
-        < "LARGE" ; SC_OPCODE_LARGE; >;
-        < "SMALL" ; SC_OPCODE_SMALL; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV; >;
-        < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >;
-        < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >;
-        < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >;
-        < "FTEST" ; SC_OPCODE_F_TEST; >;
-        < "F.TEST" ; SC_OPCODE_F_TEST_MS; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >;
-        < "PROB" ; SC_OPCODE_PROB; >;
-        < "CORREL" ; SC_OPCODE_CORREL; >;
-        < "COVAR" ; SC_OPCODE_COVAR; >;
-        < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >;
-        < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON; >;
-        < "RSQ" ; SC_OPCODE_RSQ; >;
-        < "STEYX" ; SC_OPCODE_STEYX; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >;
-        < "TREND" ; SC_OPCODE_TREND; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH; >;
-        < "LINEST" ; SC_OPCODE_LINEST; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST; >;
-        < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >;
-        < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >;
-        < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >;
-        < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >;
-        < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >;
-        < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >;
-        < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >;
-        < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >;
-        < "CHIINV" ; SC_OPCODE_CHI_INV; >;
-        < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >;
-        < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >;
-        < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >;
-        < "TINV" ; SC_OPCODE_T_INV; >;
-        < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >;
-        < "T.INV" ; SC_OPCODE_T_INV_MS; >;
-        < "FINV" ; SC_OPCODE_F_INV; >;
-        < "F.INV" ; SC_OPCODE_F_INV_LT; >;
-        < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >;
-        < "CHITEST" ; SC_OPCODE_CHI_TEST; >;
-        < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV; >;
-        < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >;
-        < "TABLE" ; SC_OPCODE_TABLE_OP; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV; >;
-        < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >;
-        < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK; >;
-        < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >;
-        < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >;
-        < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >;
-        < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >;
-        < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME; >;
-        < "STYLE" ; SC_OPCODE_STYLE; >;
-        < "DDE" ; SC_OPCODE_DDE; >;
-        < "BASE" ; SC_OPCODE_BASE; >;
-        < "DECIMAL" ; SC_OPCODE_DECIMAL; >;
-        < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >;
-        < "ROMAN" ; SC_OPCODE_ROMAN; >;
-        < "ARABIC" ; SC_OPCODE_ARABIC; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
-        < "INFO" ; SC_OPCODE_INFO; >;
-        < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >;
-        < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >;
-        < "GAMMA" ; SC_OPCODE_GAMMA; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >;
-        < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >;
-        < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >;
-        < "BITAND" ; SC_OPCODE_BITAND; >;
-        < "BITOR" ; SC_OPCODE_BITOR; >;
-        < "BITXOR" ; SC_OPCODE_BITXOR; >;
-        < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >;
-        < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >;
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL; >;
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >;
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >;
-        < "#REF!" ; SC_OPCODE_ERROR_REF; >;
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME; >;
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM; >;
-        < "#N/A" ; SC_OPCODE_ERROR_NA; >;
-        /* END defined ERROR.TYPE() values. */
-        < "FILTERXML" ; SC_OPCODE_FILTERXML; >;
-        < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >;
-        < "COLOR" ; SC_OPCODE_COLOR; >;
-        < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >;
-        < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >;
-        < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >;
-        < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >;
-        < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-/** These English names can be chosen in the UI and can be changed. They
-    should match the [en-US] names of RID_STRLIST_FUNCTION_NAMES below. */
-// As such they are a duplicate, but we can not have two string localizations
-// at the same time.
-StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH
-{
-    ItemList =
-    {
-        < "IF" ; SC_OPCODE_IF; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR; >;
-        < "IFNA" ; SC_OPCODE_IF_NA; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE; >;
-        < "(" ; SC_OPCODE_OPEN; >;
-        < ")" ; SC_OPCODE_CLOSE; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >;
-        < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >;
-        < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >;
-        < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >;
-        < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >;
-        < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP; >;
-        < ";" ; SC_OPCODE_SEP; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN; >;
-        < "+" ; SC_OPCODE_ADD; >;
-        < "-" ; SC_OPCODE_SUB; >;
-        < "*" ; SC_OPCODE_MUL; >;
-        < "/" ; SC_OPCODE_DIV; >;
-        < "&" ; SC_OPCODE_AMPERSAND; >;
-        < "^" ; SC_OPCODE_POW; >;
-        < "=" ; SC_OPCODE_EQUAL; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL; >;
-        < "<" ; SC_OPCODE_LESS; >;
-        < ">" ; SC_OPCODE_GREATER; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL; >;
-        < "AND" ; SC_OPCODE_AND; >;
-        < "OR" ; SC_OPCODE_OR; >;
-        < "XOR" ; SC_OPCODE_XOR; >;
-        < "!" ; SC_OPCODE_INTERSECT; >;
-        < "~" ; SC_OPCODE_UNION; >;
-        < ":" ; SC_OPCODE_RANGE; >;
-        < "NOT" ; SC_OPCODE_NOT; >;
-        < "NEG" ; SC_OPCODE_NEG; >;
-        < "-" ; SC_OPCODE_NEG_SUB; >;
-        < "PI" ; SC_OPCODE_PI; >;
-        < "RAND" ; SC_OPCODE_RANDOM; >;
-        < "TRUE" ; SC_OPCODE_TRUE; >;
-        < "FALSE" ; SC_OPCODE_FALSE; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME; >;
-        < "NA" ; SC_OPCODE_NO_VALUE; >;
-        < "CURRENT" ; SC_OPCODE_CURRENT; >;
-        < "DEGREES" ; SC_OPCODE_DEG; >;
-        < "RADIANS" ; SC_OPCODE_RAD; >;
-        < "SIN" ; SC_OPCODE_SIN; >;
-        < "COS" ; SC_OPCODE_COS; >;
-        < "TAN" ; SC_OPCODE_TAN; >;
-        < "COT" ; SC_OPCODE_COT; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN; >;
-        < "ACOT" ; SC_OPCODE_ARC_COT; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP; >;
-        < "COSH" ; SC_OPCODE_COS_HYP; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP; >;
-        < "COTH" ; SC_OPCODE_COT_HYP; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >;
-        < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >;
-        < "CSC" ; SC_OPCODE_COSECANT; >;
-        < "SEC" ; SC_OPCODE_SECANT; >;
-        < "CSCH" ; SC_OPCODE_COSECANT_HYP; >;
-        < "SECH" ; SC_OPCODE_SECANT_HYP; >;
-        < "EXP" ; SC_OPCODE_EXP; >;
-        < "LN" ; SC_OPCODE_LN; >;
-        < "SQRT" ; SC_OPCODE_SQRT; >;
-        < "FACT" ; SC_OPCODE_FACT; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH; >;
-        < "DAY" ; SC_OPCODE_GET_DAY; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS; >;
-        < "ABS" ; SC_OPCODE_ABS; >;
-        < "INT" ; SC_OPCODE_INT; >;
-        < "PHI" ; SC_OPCODE_PHI; >;
-        < "GAUSS" ; SC_OPCODE_GAUSS; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >;
-        < "TYPE" ; SC_OPCODE_TYPE; >;
-        < "CELL" ; SC_OPCODE_CELL; >;
-        < "ISREF" ; SC_OPCODE_IS_REF; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >;
-        < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >;
-        < "ISNA" ; SC_OPCODE_IS_NV; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD; >;
-        < "N" ; SC_OPCODE_N; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >;
-        < "CODE" ; SC_OPCODE_CODE; >;
-        < "TRIM" ; SC_OPCODE_TRIM; >;
-        < "UPPER" ; SC_OPCODE_UPPER; >;
-        < "PROPER" ; SC_OPCODE_PROPER; >;
-        < "LOWER" ; SC_OPCODE_LOWER; >;
-        < "LEN" ; SC_OPCODE_LEN; >;
-        < "T" ; SC_OPCODE_T; >;
-        < "VALUE" ; SC_OPCODE_VALUE; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN; >;
-        < "CHAR" ; SC_OPCODE_CHAR; >;
-        < "JIS" ; SC_OPCODE_JIS; >;
-        < "ASC" ; SC_OPCODE_ASC; >;
-        < "UNICODE" ; SC_OPCODE_UNICODE; >;
-        < "UNICHAR" ; SC_OPCODE_UNICHAR; >;
-        < "LOG10" ; SC_OPCODE_LOG10; >;
-        < "EVEN" ; SC_OPCODE_EVEN; >;
-        < "ODD" ; SC_OPCODE_ODD; >;
-        < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >;
-        < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >;
-        < "FISHER" ; SC_OPCODE_FISHER; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV; >;
-        < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >;
-        < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >;
-        < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >;
-        < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >;
-        < "FORMULA" ; SC_OPCODE_FORMULA; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >;
-        < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >;
-        < "CEILING" ; SC_OPCODE_CEIL; >;
-        < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >;
-        < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >;
-        < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR; >;
-        < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >;
-        < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >;
-        < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >;
-        < "ROUND" ; SC_OPCODE_ROUND; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC; >;
-        < "LOG" ; SC_OPCODE_LOG; >;
-        < "POWER" ; SC_OPCODE_POWER; >;
-        < "GCD" ; SC_OPCODE_GCD; >;
-        < "LCM" ; SC_OPCODE_LCM; >;
-        < "MOD" ; SC_OPCODE_MOD; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >;
-        < "DATE" ; SC_OPCODE_GET_DATE; >;
-        < "TIME" ; SC_OPCODE_GET_TIME; >;
-        < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >;
-        < "MIN" ; SC_OPCODE_MIN; >;
-        < "MINA" ; SC_OPCODE_MIN_A; >;
-        < "MAX" ; SC_OPCODE_MAX; >;
-        < "MAXA" ; SC_OPCODE_MAX_A; >;
-        < "SUM" ; SC_OPCODE_SUM; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >;
-        < "COUNT" ; SC_OPCODE_COUNT; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2; >;
-        < "NPV" ; SC_OPCODE_NPV; >;
-        < "IRR" ; SC_OPCODE_IRR; >;
-        < "MIRR" ; SC_OPCODE_MIRR; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT; >;
-        < "VAR" ; SC_OPCODE_VAR; >;
-        < "VARA" ; SC_OPCODE_VAR_A; >;
-        < "VARP" ; SC_OPCODE_VAR_P; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A; >;
-        < "VAR.P" ; SC_OPCODE_VAR_P_MS; >;
-        < "VAR.S" ; SC_OPCODE_VAR_S; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >;
-        < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >;
-        < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >;
-        < "B" ; SC_OPCODE_B; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST; >;
-        < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >;
-        < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >;
-        < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST; >;
-        < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN; >;
-        < "COMBINA" ; SC_OPCODE_COMBIN_A; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT; >;
-        < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >;
-        < "PV" ; SC_OPCODE_PV; >;
-        < "SYD" ; SC_OPCODE_SYD; >;
-        < "DDB" ; SC_OPCODE_DDB; >;
-        < "DB" ; SC_OPCODE_DB; >;
-        < "VDB" ; SC_OPCODE_VBD; >;
-        < "PDURATION" ; SC_OPCODE_PDURATION; >;
-        < "SLN" ; SC_OPCODE_SLN; >;
-        < "PMT" ; SC_OPCODE_PMT; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS; >;
-        < "ROWS" ; SC_OPCODE_ROWS; >;
-        < "SHEETS" ; SC_OPCODE_SHEETS; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN; >;
-        < "ROW" ; SC_OPCODE_ROW; >;
-        < "SHEET" ; SC_OPCODE_SHEET; >;
-        < "ZGZ" ; SC_OPCODE_RRI; >;
-        < "FV" ; SC_OPCODE_FV; >;
-        < "NPER" ; SC_OPCODE_NPER; >;
-        < "RATE" ; SC_OPCODE_RATE; >;
-        < "IPMT" ; SC_OPCODE_IPMT; >;
-        < "PPMT" ; SC_OPCODE_PPMT; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >;
-        < "EFFECTIVE" ; SC_OPCODE_EFFECT; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >;
-        < "DGET" ; SC_OPCODE_DB_GET; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS; >;
-        < "MATCH" ; SC_OPCODE_MATCH; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
-        < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;
-        < "OFFSET" ; SC_OPCODE_OFFSET; >;
-        < "INDEX" ; SC_OPCODE_INDEX; >;
-        < "AREAS" ; SC_OPCODE_AREAS; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE; >;
-        < "FIXED" ; SC_OPCODE_FIXED; >;
-        < "FIND" ; SC_OPCODE_FIND; >;
-        < "EXACT" ; SC_OPCODE_EXACT; >;
-        < "LEFT" ; SC_OPCODE_LEFT; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH; >;
-        < "MID" ; SC_OPCODE_MID; >;
-        < "LENB" ; SC_OPCODE_LENB; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB; >;
-        < "TEXT" ; SC_OPCODE_TEXT; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >;
-        < "REPT" ; SC_OPCODE_REPT; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT; >;
-        < "CONCAT" ; SC_OPCODE_CONCAT_MS; >;
-        < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >;
-        < "IFS" ; SC_OPCODE_IFS_MS; >;
-        < "SWITCH" ; SC_OPCODE_SWITCH_MS; >;
-        < "MINIFS" ; SC_OPCODE_MINIFS_MS; >;
-        < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >;
-        < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >;
-        < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >;
-        < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >;
-        < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >;
-        < "TDIST" ; SC_OPCODE_T_DIST; >;
-        < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >;
-        < "T.DIST" ; SC_OPCODE_T_DIST_MS; >;
-        < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >;
-        < "FDIST" ; SC_OPCODE_F_DIST; >;
-        < "F.DIST" ; SC_OPCODE_F_DIST_LT; >;
-        < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >;
-        < "CHIDIST" ; SC_OPCODE_CHI_DIST; >;
-        < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL; >;
-        < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >;
-        < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >;
-        < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >;
-        < "KURT" ; SC_OPCODE_KURT; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV; >;
-        < "SKEW" ; SC_OPCODE_SKEW; >;
-        < "SKEWP" ; SC_OPCODE_SKEWP; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE; >;
-        < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >;
-        < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST; >;
-        < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >;
-        < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >;
-        < "TTEST" ; SC_OPCODE_T_TEST; >;
-        < "T.TEST" ; SC_OPCODE_T_TEST_MS; >;
-        < "RANK" ; SC_OPCODE_RANK; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >;
-        < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >;
-        < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >;
-        < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >;
-        < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >;
-        < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >;
-        < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >;
-        < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >;
-        < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >;
-        < "LARGE" ; SC_OPCODE_LARGE; >;
-        < "SMALL" ; SC_OPCODE_SMALL; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV; >;
-        < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >;
-        < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >;
-        < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >;
-        < "FTEST" ; SC_OPCODE_F_TEST; >;
-        < "F.TEST" ; SC_OPCODE_F_TEST_MS; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >;
-        < "PROB" ; SC_OPCODE_PROB; >;
-        < "CORREL" ; SC_OPCODE_CORREL; >;
-        < "COVAR" ; SC_OPCODE_COVAR; >;
-        < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >;
-        < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON; >;
-        < "RSQ" ; SC_OPCODE_RSQ; >;
-        < "STEYX" ; SC_OPCODE_STEYX; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >;
-        < "TREND" ; SC_OPCODE_TREND; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH; >;
-        < "LINEST" ; SC_OPCODE_LINEST; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST; >;
-        < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >;
-        < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >;
-        < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >;
-        < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >;
-        < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >;
-        < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >;
-        < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >;
-        < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >;
-        < "CHIINV" ; SC_OPCODE_CHI_INV; >;
-        < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >;
-        < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >;
-        < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >;
-        < "TINV" ; SC_OPCODE_T_INV; >;
-        < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >;
-        < "T.INV" ; SC_OPCODE_T_INV_MS; >;
-        < "FINV" ; SC_OPCODE_F_INV; >;
-        < "F.INV" ; SC_OPCODE_F_INV_LT; >;
-        < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >;
-        < "CHITEST" ; SC_OPCODE_CHI_TEST; >;
-        < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV; >;
-        < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >;
-        < "TABLE" ; SC_OPCODE_TABLE_OP; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV; >;
-        < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >;
-        < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK; >;
-        < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >;
-        < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >;
-        < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >;
-        < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >;
-        < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME; >;
-        < "STYLE" ; SC_OPCODE_STYLE; >;
-        < "DDE" ; SC_OPCODE_DDE; >;
-        < "BASE" ; SC_OPCODE_BASE; >;
-        < "DECIMAL" ; SC_OPCODE_DECIMAL; >;
-        < "CONVERT_OOO" ; SC_OPCODE_CONVERT_OOO; >;
-        < "ROMAN" ; SC_OPCODE_ROMAN; >;
-        < "ARABIC" ; SC_OPCODE_ARABIC; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
-        < "INFO" ; SC_OPCODE_INFO; >;
-        < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >;
-        < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >;
-        < "GAMMA" ; SC_OPCODE_GAMMA; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >;
-        < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >;
-        < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >;
-        < "BITAND" ; SC_OPCODE_BITAND; >;
-        < "BITOR" ; SC_OPCODE_BITOR; >;
-        < "BITXOR" ; SC_OPCODE_BITXOR; >;
-        < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >;
-        < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >;
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL; >;
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >;
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >;
-        < "#REF!" ; SC_OPCODE_ERROR_REF; >;
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME; >;
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM; >;
-        < "#N/A" ; SC_OPCODE_ERROR_NA; >;
-        /* END defined ERROR.TYPE() values. */
-        < "FILTERXML" ; SC_OPCODE_FILTERXML; >;
-        < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >;
-        < "COLOR" ; SC_OPCODE_COLOR; >;
-        < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >;
-        < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >;
-        < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >;
-        < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >;
-        < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-/** Function names that can be localized if [en-US]. Same names should be used
-    in RID_STRLIST_FUNCTION_NAMES_ENGLISH above. Names can be changed, the
-    change has to be mentioned in the release notes, i.e.
-    https://wiki.documentfoundation.org/ReleaseNotes/...
- */
-StringArray RID_STRLIST_FUNCTION_NAMES
-{
-    ItemList [ en-US ] =
-    {
-        < "IF" ; SC_OPCODE_IF ; >;
-        < "IFERROR" ; SC_OPCODE_IF_ERROR ; >;
-        < "IFNA" ; SC_OPCODE_IF_NA ; >;
-        < "CHOOSE" ; SC_OPCODE_CHOOSE ; >;
-        < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL ; >;
-        < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS ; >;
-        < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA ; >;
-        < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS ; >;
-        < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW ; >;
-        < "AND" ; SC_OPCODE_AND ; >;
-        < "OR" ; SC_OPCODE_OR ; >;
-        < "XOR" ; SC_OPCODE_XOR ; >;
-        < "NOT" ; SC_OPCODE_NOT ; >;
-        < "NEG" ; SC_OPCODE_NEG ; >;
-        < "PI" ; SC_OPCODE_PI ; >; // ???
-        < "RAND" ; SC_OPCODE_RANDOM ; >;
-        < "TRUE" ; SC_OPCODE_TRUE ; >;
-        < "FALSE" ; SC_OPCODE_FALSE ; >;
-        < "TODAY" ; SC_OPCODE_GET_ACT_DATE ; >;
-        < "NOW" ; SC_OPCODE_GET_ACT_TIME ; >;
-        < "NA" ; SC_OPCODE_NO_VALUE ; >;
-        < "CURRENT" ; SC_OPCODE_CURRENT ; >;
-        < "DEGREES" ; SC_OPCODE_DEG ; >;
-        < "RADIANS" ; SC_OPCODE_RAD ; >;
-        < "SIN" ; SC_OPCODE_SIN ; >;
-        < "COS" ; SC_OPCODE_COS ; >;
-        < "TAN" ; SC_OPCODE_TAN ; >;
-        < "COT" ; SC_OPCODE_COT ; >;
-        < "ASIN" ; SC_OPCODE_ARC_SIN ; >;
-        < "ACOS" ; SC_OPCODE_ARC_COS ; >;
-        < "ATAN" ; SC_OPCODE_ARC_TAN ; >;
-        < "ACOT" ; SC_OPCODE_ARC_COT ; >;
-        < "SINH" ; SC_OPCODE_SIN_HYP ; >;
-        < "COSH" ; SC_OPCODE_COS_HYP ; >;
-        < "TANH" ; SC_OPCODE_TAN_HYP ; >;
-        < "COTH" ; SC_OPCODE_COT_HYP ; >;
-        < "ASINH" ; SC_OPCODE_ARC_SIN_HYP ; >;
-        < "ACOSH" ; SC_OPCODE_ARC_COS_HYP ; >;
-        < "ATANH" ; SC_OPCODE_ARC_TAN_HYP ; >;
-        < "ACOTH" ; SC_OPCODE_ARC_COT_HYP ; >;
-        < "CSC" ; SC_OPCODE_COSECANT ; >;
-        < "SEC" ; SC_OPCODE_SECANT ; >;
-        < "CSCH" ; SC_OPCODE_COSECANT_HYP ; >;
-        < "SECH" ; SC_OPCODE_SECANT_HYP ; >;
-        < "EXP" ; SC_OPCODE_EXP ; >;
-        < "LN" ; SC_OPCODE_LN ; >;
-        < "SQRT" ; SC_OPCODE_SQRT ; >;
-        < "FACT" ; SC_OPCODE_FACT ; >;
-        < "YEAR" ; SC_OPCODE_GET_YEAR ; >;
-        < "MONTH" ; SC_OPCODE_GET_MONTH ; >;
-        < "DAY" ; SC_OPCODE_GET_DAY ; >;
-        < "HOUR" ; SC_OPCODE_GET_HOUR ; >;
-        < "MINUTE" ; SC_OPCODE_GET_MIN ; >;
-        < "SECOND" ; SC_OPCODE_GET_SEC ; >;
-        < "SIGN" ; SC_OPCODE_PLUS_MINUS ; >;
-        < "ABS" ; SC_OPCODE_ABS ; >;
-        < "INT" ; SC_OPCODE_INT ; >;
-        < "PHI" ; SC_OPCODE_PHI ; >;
-        < "GAUSS" ; SC_OPCODE_GAUSS ; >;
-        < "ISBLANK" ; SC_OPCODE_IS_EMPTY ; >;
-        < "ISTEXT" ; SC_OPCODE_IS_STRING ; >;
-        < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING ; >;
-        < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL ; >;
-        < "TYPE" ; SC_OPCODE_TYPE ; >;
-        < "CELL" ; SC_OPCODE_CELL ; >;
-        < "ISREF" ; SC_OPCODE_IS_REF ; >;
-        < "ISNUMBER" ; SC_OPCODE_IS_VALUE ; >;
-        < "ISFORMULA" ; SC_OPCODE_IS_FORMULA ; >;
-        < "ISNA" ; SC_OPCODE_IS_NV ; >;
-        < "ISERR" ; SC_OPCODE_IS_ERR ; >;
-        < "ISERROR" ; SC_OPCODE_IS_ERROR ; >;
-        < "ISEVEN" ; SC_OPCODE_IS_EVEN ; >;
-        < "ISODD" ; SC_OPCODE_IS_ODD ; >;
-        < "N" ; SC_OPCODE_N ; >;
-        < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE ; >;
-        < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE ; >;
-        < "CODE" ; SC_OPCODE_CODE ; >;
-        < "TRIM" ; SC_OPCODE_TRIM ; >;
-        < "UPPER" ; SC_OPCODE_UPPER ; >;
-        < "PROPER" ; SC_OPCODE_PROPER ; >;
-        < "LOWER" ; SC_OPCODE_LOWER ; >;
-        < "LEN" ; SC_OPCODE_LEN ; >;
-        < "T" ; SC_OPCODE_T ; >;
-        < "VALUE" ; SC_OPCODE_VALUE ; >;
-        < "CLEAN" ; SC_OPCODE_CLEAN ; >;
-        < "CHAR" ; SC_OPCODE_CHAR ; >;
-        < "JIS" ; SC_OPCODE_JIS ; >;
-        < "ASC" ; SC_OPCODE_ASC ; >;
-        < "UNICODE" ; SC_OPCODE_UNICODE ; >;
-        < "UNICHAR" ; SC_OPCODE_UNICHAR ; >;
-        < "LOG10" ; SC_OPCODE_LOG10 ; >;
-        < "EVEN" ; SC_OPCODE_EVEN ; >;
-        < "ODD" ; SC_OPCODE_ODD ; >;
-        < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST ; >;
-        < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS ; >;
-        < "FISHER" ; SC_OPCODE_FISHER ; >;
-        < "FISHERINV" ; SC_OPCODE_FISHER_INV ; >;
-        < "NORMSINV" ; SC_OPCODE_S_NORM_INV ; >;
-        < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS ; >;
-        < "GAMMALN" ; SC_OPCODE_GAMMA_LN ; >;
-        < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS ; >;
-        < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE ; >;
-        < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF ; >;
-        < "FORMULA" ; SC_OPCODE_FORMULA ; >;
-        < "ARABIC" ; SC_OPCODE_ARABIC ; >;
-        < "ATAN2" ; SC_OPCODE_ARC_TAN_2 ; >;
-        < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH ; >;
-        < "CEILING" ; SC_OPCODE_CEIL ; >;
-        < "CEILING.XCL" ; SC_OPCODE_CEIL_MS ; >;
-        < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE ; >;
-        < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO ; >;
-        < "FLOOR" ; SC_OPCODE_FLOOR ; >;
-        < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS ; >;
-        < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH ; >;
-        < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE ; >;
-        < "ROUND" ; SC_OPCODE_ROUND ; >;
-        < "ROUNDUP" ; SC_OPCODE_ROUND_UP ; >;
-        < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN ; >;
-        < "TRUNC" ; SC_OPCODE_TRUNC ; >;
-        < "LOG" ; SC_OPCODE_LOG ; >;
-        < "POWER" ; SC_OPCODE_POWER ; >;
-        < "GCD" ; SC_OPCODE_GCD ; >;
-        < "LCM" ; SC_OPCODE_LCM ; >;
-        < "MOD" ; SC_OPCODE_MOD ; >;
-        < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT ; >;
-        < "SUMSQ" ; SC_OPCODE_SUM_SQ ; >;
-        < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2 ; >;
-        < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2 ; >;
-        < "SUMXMY2" ; SC_OPCODE_SUM_XMY2 ; >;
-        < "DATE" ; SC_OPCODE_GET_DATE ; >;
-        < "TIME" ; SC_OPCODE_GET_TIME ; >;
-        < "DAYS" ; SC_OPCODE_GET_DIFF_DATE ; >;
-        < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360 ; >;
-        < "DATEDIF" ; SC_OPCODE_GET_DATEDIF ; >;
-        < "MIN" ; SC_OPCODE_MIN ; >;
-        < "MINA" ; SC_OPCODE_MIN_A ; >;
-        < "MAX" ; SC_OPCODE_MAX ; >;
-        < "MAXA" ; SC_OPCODE_MAX_A ; >;
-        < "SUM" ; SC_OPCODE_SUM ; >;
-        < "PRODUCT" ; SC_OPCODE_PRODUCT ; >;
-        < "AVERAGE" ; SC_OPCODE_AVERAGE ; >;
-        < "AVERAGEA" ; SC_OPCODE_AVERAGE_A ; >;
-        < "COUNT" ; SC_OPCODE_COUNT ; >;
-        < "COUNTA" ; SC_OPCODE_COUNT_2 ; >;
-        < "NPV" ; SC_OPCODE_NPV ; >;
-        < "IRR" ; SC_OPCODE_IRR ; >;
-        < "MIRR" ; SC_OPCODE_MIRR ; >;
-        < "ISPMT" ; SC_OPCODE_ISPMT ; >;
-        < "VAR" ; SC_OPCODE_VAR ; >;
-        < "VARA" ; SC_OPCODE_VAR_A ; >;
-        < "VARP" ; SC_OPCODE_VAR_P ; >;
-        < "VARPA" ; SC_OPCODE_VAR_P_A ; >;
-        < "VAR.P" ; SC_OPCODE_VAR_P_MS ; >;
-        < "VAR.S" ; SC_OPCODE_VAR_S ; >;
-        < "STDEV" ; SC_OPCODE_ST_DEV ; >;
-        < "STDEVA" ; SC_OPCODE_ST_DEV_A ; >;
-        < "STDEVP" ; SC_OPCODE_ST_DEV_P ; >;
-        < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A ; >;
-        < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS ; >;
-        < "STDEV.S" ; SC_OPCODE_ST_DEV_S ; >;
-        < "B" ; SC_OPCODE_B ; >;
-        < "NORMDIST" ; SC_OPCODE_NORM_DIST ; >;
-        < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS ; >;
-        < "EXPONDIST" ; SC_OPCODE_EXP_DIST ; >;
-        < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS ; >;
-        < "BINOMDIST" ; SC_OPCODE_BINOM_DIST ; >;
-        < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS ; >;
-        < "POISSON" ; SC_OPCODE_POISSON_DIST ; >;
-        < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS ; >;
-        < "COMBIN" ; SC_OPCODE_COMBIN ; >;
-        < "COMBINA" ; SC_OPCODE_COMBIN_A ; >;
-        < "PERMUT" ; SC_OPCODE_PERMUT ; >;
-        < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A ; >;
-        < "PV" ; SC_OPCODE_PV ; >;
-        < "SYD" ; SC_OPCODE_SYD ; >;
-        < "DDB" ; SC_OPCODE_DDB ; >;
-        < "DB" ; SC_OPCODE_DB ; >;
-        < "VDB" ; SC_OPCODE_VBD ; >;
-        < "PDURATION" ; SC_OPCODE_PDURATION ; >;
-        < "SLN" ; SC_OPCODE_SLN ; >;
-        < "PMT" ; SC_OPCODE_PMT ; >;
-        < "COLUMNS" ; SC_OPCODE_COLUMNS ; >;
-        < "ROWS" ; SC_OPCODE_ROWS ; >;
-        < "SHEETS" ; SC_OPCODE_SHEETS ; >;
-        < "COLUMN" ; SC_OPCODE_COLUMN ; >;
-        < "ROW" ; SC_OPCODE_ROW ; >;
-        < "SHEET" ; SC_OPCODE_SHEET ; >;
-        < "RRI" ; SC_OPCODE_RRI ; >;
-        < "FV" ; SC_OPCODE_FV ; >;
-        < "NPER" ; SC_OPCODE_NPER ; >;
-        < "RATE" ; SC_OPCODE_RATE ; >;
-        < "IPMT" ; SC_OPCODE_IPMT ; >;
-        < "PPMT" ; SC_OPCODE_PPMT ; >;
-        < "CUMIPMT" ; SC_OPCODE_CUM_IPMT ; >;
-        < "CUMPRINC" ; SC_OPCODE_CUM_PRINC ; >;
-        < "EFFECT" ; SC_OPCODE_EFFECT ; >;
-        < "NOMINAL" ; SC_OPCODE_NOMINAL ; >;
-        < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL ; >;
-        < "DSUM" ; SC_OPCODE_DB_SUM ; >;
-        < "DCOUNT" ; SC_OPCODE_DB_COUNT ; >;
-        < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2 ; >;
-        < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE ; >;
-        < "DGET" ; SC_OPCODE_DB_GET ; >;
-        < "DMAX" ; SC_OPCODE_DB_MAX ; >;
-        < "DMIN" ; SC_OPCODE_DB_MIN ; >;
-        < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT ; >;
-        < "DSTDEV" ; SC_OPCODE_DB_STD_DEV ; >;
-        < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P ; >;
-        < "DVAR" ; SC_OPCODE_DB_VAR ; >;
-        < "DVARP" ; SC_OPCODE_DB_VAR_P ; >;
-        < "INDIRECT" ; SC_OPCODE_INDIRECT ; >;
-        < "ADDRESS" ; SC_OPCODE_ADDRESS ; >;
-        < "MATCH" ; SC_OPCODE_MATCH ; >;
-        < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS ; >;
-        < "COUNTIF" ; SC_OPCODE_COUNT_IF ; >;
-        < "SUMIF" ; SC_OPCODE_SUM_IF ; >;
-        < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF ; >;
-        < "SUMIFS" ; SC_OPCODE_SUM_IFS ; >;
-        < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS ; >;
-        < "COUNTIFS" ; SC_OPCODE_COUNT_IFS ; >;
-        < "LOOKUP" ; SC_OPCODE_LOOKUP ; >;
-        < "VLOOKUP" ; SC_OPCODE_V_LOOKUP ; >;
-        < "HLOOKUP" ; SC_OPCODE_H_LOOKUP ; >;
-        < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA ; >; // legacy for range list (union)
-        < "OFFSET" ; SC_OPCODE_OFFSET ; >;
-        < "INDEX" ; SC_OPCODE_INDEX ; >; // ?? first character = I ??
-        < "AREAS" ; SC_OPCODE_AREAS ; >;
-        < "DOLLAR" ; SC_OPCODE_CURRENCY ; >;
-        < "REPLACE" ; SC_OPCODE_REPLACE ; >;
-        < "FIXED" ; SC_OPCODE_FIXED ; >;
-        < "FIND" ; SC_OPCODE_FIND ; >;
-        < "EXACT" ; SC_OPCODE_EXACT ; >;
-        < "LEFT" ; SC_OPCODE_LEFT ; >;
-        < "RIGHT" ; SC_OPCODE_RIGHT ; >;
-        < "SEARCH" ; SC_OPCODE_SEARCH ; >;
-        < "MID" ; SC_OPCODE_MID ; >;
-        < "LENB" ; SC_OPCODE_LENB ; >;
-        < "RIGHTB" ; SC_OPCODE_RIGHTB ; >;
-        < "LEFTB" ; SC_OPCODE_LEFTB ; >;
-        < "REPLACEB" ; SC_OPCODE_REPLACEB; >;
-        < "MIDB" ; SC_OPCODE_MIDB ; >;
-        < "TEXT" ; SC_OPCODE_TEXT ; >;
-        < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE ; >;
-        < "REPT" ; SC_OPCODE_REPT ; >;
-        < "CONCATENATE" ; SC_OPCODE_CONCAT ; >;
-        < "CONCAT" ; SC_OPCODE_CONCAT_MS ; >;
-        < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS ; >;
-        < "IFS" ; SC_OPCODE_IFS_MS ; >;
-        < "SWITCH" ; SC_OPCODE_SWITCH_MS ; >;
-        < "MINIFS" ; SC_OPCODE_MINIFS_MS ; >;
-        < "MAXIFS" ; SC_OPCODE_MAXIFS_MS ; >;
-        < "MVALUE" ; SC_OPCODE_MAT_VALUE ; >;
-        < "MDETERM" ; SC_OPCODE_MAT_DET ; >;
-        < "MINVERSE" ; SC_OPCODE_MAT_INV ; >;
-        < "MMULT" ; SC_OPCODE_MAT_MULT ; >;
-        < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS ; >;
-        < "MUNIT" ; SC_OPCODE_MATRIX_UNIT ; >;
-        < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER ; >;
-        < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST ; >;
-        < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS ; >;
-        < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST ; >;
-        < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS ; >;
-        < "TDIST" ; SC_OPCODE_T_DIST ; >;
-        < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T ; >;
-        < "T.DIST" ; SC_OPCODE_T_DIST_MS ; >;
-        < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT ; >;
-        < "FDIST" ; SC_OPCODE_F_DIST ; >;
-        < "F.DIST" ; SC_OPCODE_F_DIST_LT ; >;
-        < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT ; >;
-        < "CHIDIST" ; SC_OPCODE_CHI_DIST ; >;
-        < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS ; >;
-        < "WEIBULL" ; SC_OPCODE_WEIBULL ; >;
-        < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS ; >;
-        < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT ; >;
-        < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS ; >;
-        < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM ; >;
-        < "BINOM.INV" ; SC_OPCODE_BINOM_INV ; >;
-        < "KURT" ; SC_OPCODE_KURT ; >;
-        < "HARMEAN" ; SC_OPCODE_HAR_MEAN ; >;
-        < "GEOMEAN" ; SC_OPCODE_GEO_MEAN ; >;
-        < "STANDARDIZE" ; SC_OPCODE_STANDARD ; >;
-        < "AVEDEV" ; SC_OPCODE_AVE_DEV ; >;
-        < "SKEW" ; SC_OPCODE_SKEW ; >;
-        < "SKEWP" ; SC_OPCODE_SKEWP ; >;
-        < "DEVSQ" ; SC_OPCODE_DEV_SQ ; >;
-        < "MEDIAN" ; SC_OPCODE_MEDIAN ; >;
-        < "MODE" ; SC_OPCODE_MODAL_VALUE ; >;
-        < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS ; >;
-        < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI ; >;
-        < "ZTEST" ; SC_OPCODE_Z_TEST ; >;
-        < "Z.TEST" ; SC_OPCODE_Z_TEST_MS ; >;
-        < "AGGREGATE" ; SC_OPCODE_AGGREGATE ; >;
-        < "TTEST" ; SC_OPCODE_T_TEST ; >;
-        < "T.TEST" ; SC_OPCODE_T_TEST_MS ; >;
-        < "RANK" ; SC_OPCODE_RANK ; >;
-        < "PERCENTILE" ; SC_OPCODE_PERCENTILE ; >;
-        < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK ; >;
-        < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC ; >;
-        < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC ; >;
-        < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC ; >;
-        < "RANK.EQ" ; SC_OPCODE_RANK_EQ ; >;
-        < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC ; >;
-        < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC ; >;
-        < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC ; >;
-        < "RANK.AVG" ; SC_OPCODE_RANK_AVG ; >;
-        < "LARGE" ; SC_OPCODE_LARGE ; >;
-        < "SMALL" ; SC_OPCODE_SMALL ; >;
-        < "FREQUENCY" ; SC_OPCODE_FREQUENCY ; >;
-        < "QUARTILE" ; SC_OPCODE_QUARTILE ; >;
-        < "NORMINV" ; SC_OPCODE_NORM_INV ; >;
-        < "NORM.INV" ; SC_OPCODE_NORM_INV_MS ; >;
-        < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE ; >;
-        < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N ; >;
-        < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T ; >;
-        < "FTEST" ; SC_OPCODE_F_TEST ; >;
-        < "F.TEST" ; SC_OPCODE_F_TEST_MS ; >;
-        < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN ; >;
-        < "PROB" ; SC_OPCODE_PROB ; >;
-        < "CORREL" ; SC_OPCODE_CORREL ; >;
-        < "COVAR" ; SC_OPCODE_COVAR ; >;
-        < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P ; >;
-        < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S ; >;
-        < "PEARSON" ; SC_OPCODE_PEARSON ; >;
-        < "RSQ" ; SC_OPCODE_RSQ ; >;
-        < "STEYX" ; SC_OPCODE_STEYX ; >;
-        < "SLOPE" ; SC_OPCODE_SLOPE ; >;
-        < "INTERCEPT" ; SC_OPCODE_INTERCEPT ; >;
-        < "TREND" ; SC_OPCODE_TREND ; >;
-        < "GROWTH" ; SC_OPCODE_GROWTH ; >;
-        < "LINEST" ; SC_OPCODE_LINEST ; >;
-        < "LOGEST" ; SC_OPCODE_LOGEST ; >;
-        < "FORECAST" ; SC_OPCODE_FORECAST ; >;
-        < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD ; >;
-        < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA ; >;
-        < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL ; >;
-        < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA ; >;
-        < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM ; >;
-        < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA ; >;
-        < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM ; >;
-        < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN ; >;
-        < "CHIINV" ; SC_OPCODE_CHI_INV ; >;
-        < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS ; >;
-        < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST ; >;
-        < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS ; >;
-        < "GAMMAINV" ; SC_OPCODE_GAMMA_INV ; >;
-        < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS ; >;
-        < "TINV" ; SC_OPCODE_T_INV ; >;
-        < "T.INV.2T" ; SC_OPCODE_T_INV_2T ; >;
-        < "T.INV" ; SC_OPCODE_T_INV_MS ; >;
-        < "FINV" ; SC_OPCODE_F_INV ; >;
-        < "F.INV" ; SC_OPCODE_F_INV_LT ; >;
-        < "F.INV.RT" ; SC_OPCODE_F_INV_RT ; >;
-        < "CHITEST" ; SC_OPCODE_CHI_TEST ; >;
-        < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS ; >;
-        < "LOGINV" ; SC_OPCODE_LOG_INV ; >;
-        < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS ; >;
-        < "MULTIPLE.OPERATIONS" ; SC_OPCODE_TABLE_OP ; >;
-        < "BETADIST" ; SC_OPCODE_BETA_DIST ; >;
-        < "BETAINV" ; SC_OPCODE_BETA_INV ; >;
-        < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS ; >;
-        < "BETA.INV" ; SC_OPCODE_BETA_INV_MS ; >;
-        < "WEEKNUM" ; SC_OPCODE_WEEK ; >;
-        < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM ; >;
-        < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO ; >;
-        < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY ; >;
-        < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK ; >;
-        < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS ; >;
-        < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS ; >;
-        < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS ; >;
-        < "#NAME!" ; SC_OPCODE_NO_NAME ; >;
-        < "STYLE" ; SC_OPCODE_STYLE ; >;
-        < "DDE" ; SC_OPCODE_DDE ; >;
-        < "BASE" ; SC_OPCODE_BASE ; >;
-        < "DECIMAL" ; SC_OPCODE_DECIMAL ; >;
-        < "CONVERT_OOO" ; SC_OPCODE_CONVERT_OOO ; >;
-        < "ROMAN" ; SC_OPCODE_ROMAN ; >;
-        < "HYPERLINK" ; SC_OPCODE_HYPERLINK ; >;
-        < "INFO" ; SC_OPCODE_INFO ; >;
-        < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT ; >;
-        < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA ; >;
-        < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT ; >;
-        < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE ; >;
-        < "GAMMA" ; SC_OPCODE_GAMMA ; >;
-        < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST ; >;
-        < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS ; >;
-        < "CHISQINV" ; SC_OPCODE_CHISQ_INV ; >;
-        < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS ; >;
-        < "BITAND" ; SC_OPCODE_BITAND ; >;
-        < "BITOR" ; SC_OPCODE_BITOR ; >;
-        < "BITXOR" ; SC_OPCODE_BITXOR ; >;
-        < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT ; >;
-        < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT ; >;
-        /* BEGIN defined ERROR.TYPE() values. */
-        /* ERROR.TYPE( #NULL! ) == 1 */
-        < "#NULL!" ; SC_OPCODE_ERROR_NULL ; >;
-        /* ERROR.TYPE( #DIV/0! ) == 2 */
-        < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO ; >;
-        /* ERROR.TYPE( #VALUE! ) == 3 */
-        < "#VALUE!" ; SC_OPCODE_ERROR_VALUE ; >;
-        /* ERROR.TYPE( #REF! ) == 4 */
-        < "#REF!" ; SC_OPCODE_ERROR_REF ; >;
-        /* ERROR.TYPE( #NAME! ) == 5 */
-        < "#NAME?" ; SC_OPCODE_ERROR_NAME ; >;
-        /* ERROR.TYPE( #NUM! ) == 6 */
-        < "#NUM!" ; SC_OPCODE_ERROR_NUM ; >;
-        /* ERROR.TYPE( #N/A ) == 7 */
-        < "#N/A" ; SC_OPCODE_ERROR_NA ; >;
-        /* END defined ERROR.TYPE() values. */
-
-        < "FILTERXML" ; SC_OPCODE_FILTERXML ; >;
-        < "COLOR" ; SC_OPCODE_COLOR ; >;
-        < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE ; >;
-        < "ERF.PRECISE" ; SC_OPCODE_ERF_MS ; >;
-        < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS ; >;
-        < "ENCODEURL" ; SC_OPCODE_ENCODEURL ; >;
-        < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT ; >;
-        < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >;
-    };
-};
-
-StringArray RID_STRLIST_FUNCTION_NAMES_SYMBOLS
-{
-    ItemList =
-    {
-        < "(" ; SC_OPCODE_OPEN ; >;
-        < ")" ; SC_OPCODE_CLOSE ; >;
-        < "[" ; SC_OPCODE_TABLE_REF_OPEN ; >;
-        < "]" ; SC_OPCODE_TABLE_REF_CLOSE ; >;
-        < "{" ; SC_OPCODE_ARRAY_OPEN ; >;
-        < "}" ; SC_OPCODE_ARRAY_CLOSE ; >;
-        < "|" ; SC_OPCODE_ARRAY_ROW_SEP ; >;
-        < ";" ; SC_OPCODE_ARRAY_COL_SEP ; >;
-        < ";" ; SC_OPCODE_SEP ; >;
-        < "%" ; SC_OPCODE_PERCENT_SIGN ; >;
-        < "+" ; SC_OPCODE_ADD ; >;
-        < "-" ; SC_OPCODE_SUB ; >;
-        < "*" ; SC_OPCODE_MUL ; >;
-        < "/" ; SC_OPCODE_DIV ; >;
-        < "&" ; SC_OPCODE_AMPERSAND ; >;
-        < "^" ; SC_OPCODE_POW ; >;
-        < "=" ; SC_OPCODE_EQUAL ; >;
-        < "<>" ; SC_OPCODE_NOT_EQUAL ; >;
-        < "<" ; SC_OPCODE_LESS ; >;
-        < ">" ; SC_OPCODE_GREATER ; >;
-        < "<=" ; SC_OPCODE_LESS_EQUAL ; >;
-        < ">=" ; SC_OPCODE_GREATER_EQUAL ; >;
-        < "!" ; SC_OPCODE_INTERSECT ; >;
-        < "~" ; SC_OPCODE_UNION ; >;
-        < ":" ; SC_OPCODE_RANGE ; >;
-        < "-" ; SC_OPCODE_NEG_SUB ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 7704ea146e03..1f213864b89e 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -17,12 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define BTN_CANCEL          7
-#define BTN_END             10
-#define ED_FORMULA          17
-#define ED_REF              19
-#define RB_REF              20
-
 // For tab page
 #define TP_FUNCTION         1
 #define TP_STRUCT           2
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
deleted file mode 100644
index d342c1d772c9..000000000000
--- a/formula/source/ui/dlg/formdlgs.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 "formdlgs.hrc"
-#include "ForResId.hrc"
-
-String STR_TITLE1
-{
-    Text [ en-US ] = "Function Wizard" ;
-};
-
-String STR_TITLE2
-{
-    Text [ en-US ] = "Function Wizard  -" ;
-};
-
-String STR_END
-{
-    Text [ en-US ] = "~End" ;
-};
-String RID_STR_SHRINK
-{
-    Text [ en-US ] = "Shrink" ;
-};
-
-String RID_STR_EXPAND
-{
-    Text [ en-US ] = "Expand" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index d3a50fd6f0a5..8a1f3a774818 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -52,7 +52,7 @@
 #include "structpg.hxx"
 #include "parawin.hxx"
 #include "ModuleHelper.hxx"
-#include "ForResId.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
 #include <com/sun/star/sheet/FormulaMapGroup.hpp>
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 466857fabf64..e017a9a6c543 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -25,8 +25,6 @@
 #include "formula/IFunctionDescription.hxx"
 
 #include "funcpage.hxx"
-#include "formdlgs.hrc"
-#include "ForResId.hrc"
 #include "ModuleHelper.hxx"
 #include <unotools/syslocale.hxx>
 #include <unotools/charclass.hxx>
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 9b218aa09153..e52628d867e6 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -27,7 +27,7 @@
 #include "formula/IControlReferenceHandler.hxx"
 #include "ControlHelper.hxx"
 #include "ModuleHelper.hxx"
-#include "ForResId.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "com/sun/star/accessibility/AccessibleRole.hpp"
 
@@ -521,8 +521,8 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
     ImageButton(_pParent, nStyle),
     aImgRefStart(BitmapEx(RID_BMP_REFBTN1)),
     aImgRefDone(BitmapEx(RID_BMP_REFBTN2)),
-    aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
-    aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
+    aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ) ),
+    aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ) ),
     pAnyRefDlg( nullptr ),
     pRefEdit( nullptr )
 {
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 069a104574a0..f066b40e82a5 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -27,7 +27,7 @@
 #include "formula/IFunctionDescription.hxx"
 #include <formula/funcvarargs.h>
 #include "ModuleHelper.hxx"
-#include "ForResId.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 namespace formula
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index c4345bb22208..afebc0cba5c8 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -23,12 +23,10 @@
 #include "svtools/treelistentry.hxx"
 
 #include "structpg.hxx"
-#include "formdlgs.hrc"
 #include "formula/formdata.hxx"
 #include "formula/formula.hxx"
 #include "ModuleHelper.hxx"
 #include "formula/IFunctionDescription.hxx"
-#include "ForResId.hrc"
 #include "bitmaps.hlst"
 
 namespace formula
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
deleted file mode 100644
index e41d3aecbba4..000000000000
--- a/formula/source/ui/inc/ForResId.hrc
+++ /dev/null
@@ -1,52 +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 FORMULA_FORRESID_HRC
-#define FORMULA_FORRESID_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_PAGE_START                  RID_FORMULA_START
-#define RID_ERRORBOX_START              RID_FORMULA_START
-#define RID_QUERYBOX_START              RID_FORMULA_START
-#define RID_TOOLBOX_START               RID_FORMULA_START
-#define RID_BITMAP_START                RID_FORMULA_START
-#define RID_IMAGE_START                 RID_FORMULA_START
-#define RID_IMAGELIST_START             RID_FORMULA_START
-#define RID_MENU_START                  RID_FORMULA_START
-#define RID_STRING_START                RID_FORMULA_START
-#define RID_UNTYPED_START               RID_FORMULA_START
-#define RID_WARN_START                  RID_FORMULA_START
-#define RID_CONTROL_START               RID_FORMULA_START
-#define RID_MISC_START                  RID_FORMULA_START
-
-// Dialog Control Id's -----------------------------------------------------------
-
-// strings
-#define RID_STR_SHRINK                  (RID_STRING_START + 0)
-#define RID_STR_EXPAND                  (RID_STRING_START + 1)
-#define STR_OPTIONAL                    (RID_STRING_START + 4)
-#define STR_REQUIRED                    (RID_STRING_START + 5)
-#define STR_END                         (RID_STRING_START + 6)
-#define STR_TITLE1                      (RID_STRING_START + 7)
-#define STR_TITLE2                      (RID_STRING_START + 8)
-
-#endif          // FORMULA_FORRESID_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 00dca8171167..c5e92847b701 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -25,8 +25,6 @@
 
 namespace formula
 {
-
-
     //= OModule
 
     class OModuleClient;
@@ -44,7 +42,7 @@ namespace formula
 
     public:
         /// get the vcl res manager of the module
-        static ResMgr*  getResManager();
+        static const std::locale&  getResLocale();
     protected:
         /// register a client for the module
         static void registerClient();
@@ -58,20 +56,10 @@ namespace formula
         static void ensureImpl();
     };
 
-
     //= ModuleRes
-
-    /** specialized ResId, using the resource manager provided by the global module
-    */
-    class ModuleRes : public ::ResId
-    {
-    public:
-        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
-    };
-
+    OUString ModuleRes(const char *pId);
 }   // namespace formula
 
-
 #endif // INCLUDED_FORMULA_SOURCE_UI_INC_MODULEHELPER_HXX
 
 
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index febf61729092..80636792aa14 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -26,6 +26,8 @@
 #include <rtl/instance.hxx>
 #include <rtl/uri.hxx>
 #include <svl/solar.hrc>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 #define ENTER_MOD_METHOD()  \
     ::osl::MutexGuard aGuard(theOModuleMutex::get()); \
@@ -43,34 +45,32 @@ namespace formula
 */
 class OModuleImpl
 {
-    std::unique_ptr<ResMgr> m_pResources;
+    std::unique_ptr<std::locale> m_xResources;
 
 public:
     /// ctor
     OModuleImpl();
 
     /// get the manager for the resources of the module
-    ResMgr* getResManager();
+    const std::locale& getResLocale();
 };
 
 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)
+    if (!m_xResources)
     {
         // create a manager with a fixed prefix
-        m_pResources.reset( ResMgr::CreateResMgr("forui") );
+        m_xResources.reset(new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag())));
     }
-    return m_pResources.get();
+    return *m_xResources;
 }
 
-
 //= OModule
 
 namespace
@@ -81,13 +81,12 @@ namespace
 sal_Int32       OModule::s_nClients = 0;
 OModuleImpl*    OModule::s_pImpl = nullptr;
 
-ResMgr* OModule::getResManager()
+const std::locale& OModule::getResLocale()
 {
     ENTER_MOD_METHOD();
-    return s_pImpl->getResManager();
+    return s_pImpl->getResLocale();
 }
 
-
 void OModule::registerClient()
 {
     ::osl::MutexGuard aGuard(theOModuleMutex::get());
@@ -113,6 +112,10 @@ void OModule::ensureImpl()
     s_pImpl = new OModuleImpl();
 }
 
+OUString ModuleRes(const char *pId)
+{
+    return Translate::get(pId, OModule::getResLocale());
+};
 
 }   // namespace formula
 
diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui
index 613272bc13ce..992da1afa011 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkCheckButton" id="array">
-                <property name="label" translatable="yes">Array</property>
+                <property name="label" translatable="yes" context="formuladialog|array">Array</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkButton" id="back">
-                <property name="label" translatable="yes">&lt;&lt; _Back</property>
+                <property name="label" translatable="yes" context="formuladialog|back">&lt;&lt; _Back</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -69,7 +69,7 @@
             </child>
             <child>
               <object class="GtkButton" id="next">
-                <property name="label" translatable="yes">_Next &gt;&gt;</property>
+                <property name="label" translatable="yes" context="formuladialog|next">_Next &gt;&gt;</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -149,7 +149,7 @@
                       <object class="GtkLabel" id="function">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Functions</property>
+                        <property name="label" translatable="yes" context="formuladialog|function">Functions</property>
                       </object>
                       <packing>
                         <property name="tab_fill">False</property>
@@ -162,7 +162,7 @@
                       <object class="GtkLabel" id="struct">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Structure</property>
+                        <property name="label" translatable="yes" context="formuladialog|struct">Structure</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -200,7 +200,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Function result</property>
+                            <property name="label" translatable="yes" context="formuladialog|label2">Function result</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">result</property>
                           </object>
@@ -341,7 +341,7 @@
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">For_mula</property>
+                            <property name="label" translatable="yes" context="formuladialog|formula">For_mula</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">ed_formula</property>
                             <property name="yalign">1</property>
@@ -356,7 +356,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Result</property>
+                            <property name="label" translatable="yes" context="formuladialog|label1">Result</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">formula_result</property>
                           </object>
@@ -391,7 +391,7 @@
                         <property name="hexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="ed_formula-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Formula</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="formuladialog|ed_formula-atkobject">Formula</property>
                           </object>
                         </child>
                       </object>
@@ -440,7 +440,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Maximize</property>
+                    <property name="tooltip_text" translatable="yes" context="formuladialog|RB_REF|tooltip_text">Maximize</property>
                     <property name="halign">end</property>
                   </object>
                   <packing>
diff --git a/formula/uiconfig/ui/functionpage.ui b/formula/uiconfig/ui/functionpage.ui
index a382836741a4..68d13b0475cf 100644
--- a/formula/uiconfig/ui/functionpage.ui
+++ b/formula/uiconfig/ui/functionpage.ui
@@ -16,7 +16,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Search</property>
+        <property name="label" translatable="yes" context="functionpage|label_search">_Search</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">search</property>
       </object>
@@ -44,7 +44,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Category</property>
+        <property name="label" translatable="yes" context="functionpage|label1">_Category</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">category</property>
       </object>
@@ -60,8 +60,8 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <items>
-          <item translatable="yes">Last Used</item>
-          <item translatable="yes">All</item>
+          <item translatable="yes" context="functionpage|category">Last Used</item>
+          <item translatable="yes" context="functionpage|category">All</item>
         </items>
       </object>
       <packing>
@@ -75,7 +75,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Function</property>
+        <property name="label" translatable="yes" context="functionpage|label2">_Function</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">function</property>
       </object>
diff --git a/formula/uiconfig/ui/parameter.ui b/formula/uiconfig/ui/parameter.ui
index 2677c9266e6f..efc394152239 100644
--- a/formula/uiconfig/ui/parameter.ui
+++ b/formula/uiconfig/ui/parameter.ui
@@ -27,7 +27,7 @@
             <property name="hexpand">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">Function not known</property>
+            <property name="label" translatable="yes" context="parameter|editdesc">Function not known</property>
             <property name="wrap">True</property>
           </object>
           <packing>
@@ -276,7 +276,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Select</property>
+                <property name="tooltip_text" translatable="yes" context="parameter|RB_ARG1|tooltip_text">Select</property>
                 <property name="halign">end</property>
               </object>
               <packing>
@@ -292,7 +292,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Select</property>
+                <property name="tooltip_text" translatable="yes" context="parameter|RB_ARG2|tooltip_text">Select</property>
                 <property name="halign">end</property>
               </object>
               <packing>
@@ -308,7 +308,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Select</property>
+                <property name="tooltip_text" translatable="yes" context="parameter|RB_ARG3|tooltip_text">Select</property>
                 <property name="halign">end</property>
               </object>
               <packing>
@@ -324,7 +324,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Select</property>
+                <property name="tooltip_text" translatable="yes" context="parameter|RB_ARG4|tooltip_text">Select</property>
                 <property name="halign">end</property>
               </object>
               <packing>
diff --git a/formula/uiconfig/ui/structpage.ui b/formula/uiconfig/ui/structpage.ui
index b1256231d398..7abdf57e9b6b 100644
--- a/formula/uiconfig/ui/structpage.ui
+++ b/formula/uiconfig/ui/structpage.ui
@@ -16,7 +16,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Structure</property>
+        <property name="label" translatable="yes" context="structpage|label1">_Structure</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">struct</property>
       </object>
diff --git a/fpicker/AllLangMoTarget_fps.mk b/fpicker/AllLangMoTarget_fps.mk
new file mode 100644
index 000000000000..cd4495b0bc66
--- /dev/null
+++ b/fpicker/AllLangMoTarget_fps.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,fps))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,fps,fpicker))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
deleted file mode 100644
index 6c21e33d7ad5..000000000000
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ /dev/null
@@ -1,26 +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,fps_office))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,fps_office,fpicker))
-
-$(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
-    fps_office/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
-
-$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
-	fpicker/source/office/OfficeFilePicker.src \
-	fpicker/source/office/iodlg.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 2e7f0a17d42a..d6be222b1f19 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -18,6 +18,11 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
 
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
+$(eval $(call gb_Library_set_include,fps,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/fpicker/inc \
+))
+
 $(eval $(call gb_Library_use_external,fps,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,fps))
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index e4b7ef53a097..91e875c44ed9 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -12,6 +12,11 @@ $(eval $(call gb_Library_Library,fps_aqua))
 
 $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
 
+$(eval $(call gb_Library_set_include,fps_aqua,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/fpicker/inc \
+))
+
 $(eval $(call gb_Library_use_external,fps_aqua,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,fps_aqua))
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 443d60a65c21..5f4ee86c9c6c 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,fpicker))
 
 $(eval $(call gb_Module_add_targets,fpicker,\
 	Library_fps_office \
+	UIConfig_fps \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,fpicker,\
-	AllLangResTarget_fps_office \
-	UIConfig_fps \
+	AllLangMoTarget_fps \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx
index 0fcbe4cab629..1e7711d670b5 100644
--- a/fpicker/source/office/fpsofficeResMgr.hxx
+++ b/fpicker/inc/fpsofficeResMgr.hxx
@@ -12,35 +12,32 @@
 #include <rtl/instance.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 namespace fpicker
 {
-    struct ResMgrHolder
+    struct ResLocaleHolder
     {
-        ResMgr * operator ()()
+        std::locale* operator ()()
         {
-            return ResMgr::CreateResMgr ("fps_office");
+            return new std::locale(Translate::Create("fps", Application::GetSettings().GetUILanguageTag()));
         }
 
-        static ResMgr * getOrCreate()
+        static std::locale* getOrCreate()
         {
             return rtl_Instance<
-                ResMgr, ResMgrHolder,
+                std::locale, ResLocaleHolder,
                 osl::MutexGuard, osl::GetGlobalMutex >::create (
-                    ResMgrHolder(), osl::GetGlobalMutex());
+                    ResLocaleHolder(), osl::GetGlobalMutex());
         }
     };
-
-    struct SvtResId : public ResId
-    {
-        explicit SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
-    };
 }
 
-inline OUString FpsResId(sal_uInt16 nId)
+inline OUString FpsResId(const char* pId)
 {
-    return fpicker::SvtResId(nId);
-}
+    return Translate::get(pId, *fpicker::ResLocaleHolder::getOrCreate());
+};
 
 #endif
 
diff --git a/fpicker/inc/strings.hrc b/fpicker/inc/strings.hrc
new file mode 100644
index 000000000000..0dc082212e02
--- /dev/null
+++ b/fpicker/inc/strings.hrc
@@ -0,0 +1,40 @@
+/* -*- 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_EXPLORERFILE_OPEN                       NC_("STR_EXPLORERFILE_OPEN", "Open")
+#define STR_EXPLORERFILE_SAVE                       NC_("STR_EXPLORERFILE_SAVE", "Save as")
+#define STR_EXPLORERFILE_BUTTONSAVE                 NC_("STR_EXPLORERFILE_BUTTONSAVE", "~Save")
+#define STR_PATHNAME                                NC_("STR_PATHNAME", "~Path:")
+#define STR_PATHSELECT                              NC_("STR_PATHSELECT", "Select path")
+#define STR_BUTTONSELECT                            NC_("STR_BUTTONSELECT", "~Select")
+#define STR_PREVIEW                                 NC_("STR_PREVIEW", "File Preview")
+#define STR_DEFAULT_DIRECTORY                       NC_("STR_DEFAULT_DIRECTORY", "My Documents")
+#define STR_PLACES_TITLE                            NC_("STR_PLACES_TITLE", "Places")
+#define RID_FILEOPEN_NOTEXISTENTFILE                NC_("RID_FILEOPEN_NOTEXISTENTFILE", "The file $name$ does not exist.\nMake sure you have entered the correct file name.")
+#define STR_SVT_NEW_FOLDER                          NC_("STR_SVT_NEW_FOLDER", "Folder")
+#define STR_SVT_NOREMOVABLEDEVICE                   NC_("STR_SVT_NOREMOVABLEDEVICE", "No removable storage device detected.\nMake sure it is plugged in properly and try again.")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 63fb47e8ad5f..44454c8e0954 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -38,18 +38,10 @@
 #define FILE_PICKER_FILE_TYPE         504
 #define FILE_PICKER_OVERWRITE         505
 
-class CResourceProvider_Impl;
-
 class CResourceProvider
 {
 public:
-    CResourceProvider( );
-    ~CResourceProvider( );
-
     NSString* getResString( sal_Int32 aId );
-
-private:
-    std::unique_ptr<CResourceProvider_Impl> m_pImpl;
 };
 
 #endif
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index f1c9023a1cfd..6942d0fe9fda 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -23,29 +23,31 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/fpicker.hrc>
+#include <fpicker/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svtools/filedlg2.hrc>
 #include "NSString_OOoAdditions.hxx"
-
+#include "fpsofficeResMgr.hxx"
 #include "resourceprovider.hxx"
 
 using rtl::OUString;
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 
-static const char* const RES_NAME = "fps_office";
-static const char* const OTHER_RES_NAME = "svt";
-
 // we have to translate control ids to resource ids
 
 struct Entry
 {
     sal_Int32 ctrlId;
+    const char* resId;
+};
+
+struct OldEntry
+{
+    sal_Int32 ctrlId;
     sal_Int16 resId;
 };
 
@@ -64,110 +66,48 @@ Entry const CtrlIdToResIdTable[] = {
     { FOLDERPICKER_TITLE,                       STR_SVT_FOLDERPICKER_DEFAULT_TITLE },
     { FOLDER_PICKER_DEF_DESCRIPTION,            STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION },
     { FILE_PICKER_OVERWRITE,                    STR_SVT_ALREADYEXISTOVERWRITE },
-    { LISTBOX_FILTER_LABEL,                     STR_SVT_FILEPICKER_FILTER_TITLE}
-};
-
-Entry const OtherCtrlIdToResIdTable[] = {
+    { LISTBOX_FILTER_LABEL,                     STR_SVT_FILEPICKER_FILTER_TITLE},
     { FILE_PICKER_TITLE_OPEN,                   STR_FILEDLG_OPEN },
     { FILE_PICKER_TITLE_SAVE,                   STR_FILEDLG_SAVE },
     { FILE_PICKER_FILE_TYPE,                    STR_FILEDLG_TYPE }
 };
 
 const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable );
-const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable );
 
-sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
+const char* CtrlIdToResId(sal_Int32 aControlId)
 {
-    sal_Int16 aResId = -1;
+    const char *pResId = nullptr;
 
     for ( sal_Int32 i = 0; i < SIZE_TABLE; i++ )
     {
         if ( CtrlIdToResIdTable[i].ctrlId == aControlId )
         {
-            aResId = CtrlIdToResIdTable[i].resId;
-            break;
-        }
-    }
-
-    return aResId;
-}
-
-sal_Int16 OtherCtrlIdToResId( sal_Int32 aControlId )
-{
-    sal_Int16 aResId = -1;
-
-    for ( sal_Int32 i = 0; i < OTHER_SIZE_TABLE; i++ )
-    {
-        if ( OtherCtrlIdToResIdTable[i].ctrlId == aControlId )
-        {
-            aResId = OtherCtrlIdToResIdTable[i].resId;
+            pResId = CtrlIdToResIdTable[i].resId;
             break;
         }
     }
 
-    return aResId;
+    return pResId;
 }
 
-class CResourceProvider_Impl
+namespace CResourceProvider_Impl
 {
-public:
-    CResourceProvider_Impl( )
-    {
-        m_ResMgr = ResMgr::CreateResMgr( RES_NAME );
-        m_OtherResMgr = ResMgr::CreateResMgr( OTHER_RES_NAME );
-    }
-
-    ~CResourceProvider_Impl( )
-    {
-        delete m_ResMgr;
-        delete m_OtherResMgr;
-    }
-
-    NSString* getResString( sal_Int16 aId )
+    NSString* getResString(sal_Int16 aId)
     {
         OUString aResString;
 
-        const SolarMutexGuard aGuard;
-
-        try
-        {
-            OSL_ASSERT( m_ResMgr && m_OtherResMgr );
-
-            // translate the control id to a resource id
-            sal_Int16 aResId = CtrlIdToResId( aId );
-            if ( aResId > -1 )
-                aResString = ResId( aResId, *m_ResMgr );
-            else
-            {
-                aResId = OtherCtrlIdToResId( aId );
-                if ( aResId > -1 ) {
-                    aResString = ResId( aResId, *m_OtherResMgr );
-                }
-            }
-        }
-        catch(...)
-        {
-        }
+        // translate the control id to a resource id
+        const char* pResId = CtrlIdToResId(aId);
+        if (pResId)
+            aResString = FpsResId(pResId);
 
         return [NSString stringWithOUString:aResString];
     }
-
-public:
-    ResMgr* m_ResMgr;
-    ResMgr* m_OtherResMgr;
 };
 
-CResourceProvider::CResourceProvider( ) :
-    m_pImpl( o3tl::make_unique<CResourceProvider_Impl>() )
-{
-}
-
-CResourceProvider::~CResourceProvider( )
-{}
-
 NSString* CResourceProvider::getResString( sal_Int32 aId )
 {
-    NSString* sImmutable = m_pImpl->getResString( aId );
+    NSString* sImmutable = CResourceProvider_Impl::getResString(aId);
     NSMutableString *sMutableString = [NSMutableString stringWithString:sImmutable];
     [sMutableString replaceOccurrencesOfString:@"~" withString:@"" options:0 range:NSMakeRange(0, [sMutableString length])];
 
diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc
deleted file mode 100644
index c61593f4193f..000000000000
--- a/fpicker/source/office/OfficeFilePicker.hrc
+++ /dev/null
@@ -1,19 +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_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC
-#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC
-
-#include <vcl/fpicker.hrc>
-
-#define STR_SVT_NEW_FOLDER                          (RID_FPICKER_START+19)
-#define RID_FILEOPEN_NOTEXISTENTFILE                (RID_FPICKER_START+24)
-#define STR_SVT_NOREMOVABLEDEVICE                   (RID_FPICKER_START+25)
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
deleted file mode 100644
index 4f6fe4b764b9..000000000000
--- a/fpicker/source/office/OfficeFilePicker.src
+++ /dev/null
@@ -1,92 +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 "OfficeFilePicker.hrc"
-
-String STR_SVT_FILEPICKER_AUTO_EXTENSION
-{
-    Text [ en-US ] = "~Automatic file name extension" ;
-};
-
-String STR_SVT_FILEPICKER_PASSWORD
-{
-    Text [ en-US ] = "Save with pass~word" ;
-};
-
-String STR_SVT_FILEPICKER_FILTER_OPTIONS
-{
-    Text [ en-US ] = "~Edit filter settings";
-};
-
-String STR_SVT_FILEPICKER_READONLY
-{
-    Text [ en-US ] = "~Read-only" ;
-};
-
-String STR_SVT_FILEPICKER_INSERT_AS_LINK
-{
-    Text [ en-US ] = "~Link" ;
-};
-
-String STR_SVT_FILEPICKER_SHOW_PREVIEW
-{
-    Text [ en-US ] = "Pr~eview" ;
-};
-
-String STR_SVT_FILEPICKER_PLAY
-{
-    Text [ en-US ] = "~Play" ;
-};
-
-String STR_SVT_FILEPICKER_VERSION
-{
-    Text [ en-US ] = "~Version:";
-};
-
-String STR_SVT_FILEPICKER_TEMPLATES
-{
-    Text [ en-US ] = "S~tyles:" ;
-};
-
-String STR_SVT_FILEPICKER_IMAGE_TEMPLATE
-{
-    Text [ en-US ] = "Style:";
-};
-
-String STR_SVT_FILEPICKER_SELECTION
-{
-    Text [ en-US ] = "~Selection" ;
-};
-
-String STR_SVT_FILEPICKER_FILTER_TITLE
-{
-    Text [ en-US ] = "File ~type:" ;
-};
-
-String STR_SVT_FOLDERPICKER_DEFAULT_TITLE
-{
-    Text [ en-US ] = "Select Path" ;
-};
-
-String STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION
-{
-    Text [ en-US ] = "Please select a folder.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index f42a0440154a..c0bbc68235eb 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <iodlg.hrc>
+#include <strings.hrc>
 #include <PlacesListBox.hxx>
 #include <svtools/PlaceEditDialog.hxx>
 
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 36dbe624ccb1..1b92732e3239 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -20,12 +20,11 @@
 #include <svtools/fileview.hxx>
 
 #include <vcl/errinf.hxx>
-#include <tools/resid.hxx>
 
 #include <unotools/viewoptions.hxx>
 
 #include <vcl/button.hxx>
-#include <vcl/fpicker.hrc>
+#include <fpicker/fpicker.hrc>
 #include <vcl/menubtn.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/vclptr.hxx>
@@ -42,9 +41,8 @@
 
 #include "fpdialogbase.hxx"
 #include "fpsofficeResMgr.hxx"
-#include "OfficeFilePicker.hrc"
 #include "QueryFolderName.hxx"
-#include "iodlg.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::task;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index df21d5f00d7f..3415f2e2d06c 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -42,10 +42,10 @@
 #include "svtools/treelistentry.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 
+#include "fpicker/fpicker.hrc"
 #include "svtools/helpid.hrc"
-#include <svtools/svtools.hrc>
-#include "OfficeFilePicker.hrc"
-#include "iodlg.hrc"
+#include <svtools/strings.hrc>
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "asyncfilepicker.hxx"
 #include "iodlgimp.hxx"
@@ -646,26 +646,26 @@ void SvtFileDialog::Init_Impl
     AddControls_Impl( );
 
     // adjust the labels to the mode
-    sal_uInt16 nResId = STR_EXPLORERFILE_OPEN;
-    sal_uInt16 nButtonResId = 0;
+    const char* pResId = STR_EXPLORERFILE_OPEN;
+    const char* pButtonResId = nullptr;
 
     if ( nStyle & PickerFlags::SaveAs )
     {
-        nResId = STR_EXPLORERFILE_SAVE;
-        nButtonResId = STR_EXPLORERFILE_BUTTONSAVE;
+        pResId = STR_EXPLORERFILE_SAVE;
+        pButtonResId = STR_EXPLORERFILE_BUTTONSAVE;
     }
 
     if ( nStyle & PickerFlags::PathDialog )
     {
         pImpl->_pFtFileName->SetText( FpsResId( STR_PATHNAME ) );
-        nResId = STR_PATHSELECT;
-        nButtonResId = STR_BUTTONSELECT;
+        pResId = STR_PATHSELECT;
+        pButtonResId = STR_BUTTONSELECT;
     }
 
-    SetText( FpsResId( nResId ) );
+    SetText( FpsResId( pResId ) );
 
-    if ( nButtonResId )
-        pImpl->_pBtnFileOpen->SetText( FpsResId( nButtonResId ) );
+    if ( pButtonResId )
+        pImpl->_pBtnFileOpen->SetText( FpsResId( pButtonResId ) );
 
     if ( FILEDLG_TYPE_FILEDLG != pImpl->_eDlgType )
     {
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
deleted file mode 100644
index 467114efb2f9..000000000000
--- a/fpicker/source/office/iodlg.hrc
+++ /dev/null
@@ -1,38 +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_FPICKER_SOURCE_OFFICE_IODLG_HRC
-#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HRC
-
-#include "svtools/helpid.hrc"
-#include <vcl/fpicker.hrc>
-
-#define STR_EXPLORERFILE_OPEN               (RID_FPICKER_START+31)
-#define STR_EXPLORERFILE_SAVE               (RID_FPICKER_START+32)
-#define STR_EXPLORERFILE_BUTTONSAVE         (RID_FPICKER_START+33)
-#define STR_PATHNAME                        (RID_FPICKER_START+34)
-#define STR_PATHSELECT                      (RID_FPICKER_START+35)
-#define STR_BUTTONSELECT                    (RID_FPICKER_START+36)
-#define STR_PREVIEW                         (RID_FPICKER_START+38)
-#define STR_DEFAULT_DIRECTORY               (RID_FPICKER_START+39)
-#define STR_PLACES_TITLE                    (RID_FPICKER_START+40)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
deleted file mode 100644
index 74408ad7aaac..000000000000
--- a/fpicker/source/office/iodlg.src
+++ /dev/null
@@ -1,101 +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 "svtools/helpid.hrc"
-#include "svtools/svtools.hrc"
-#include "iodlg.hrc"
-#include "OfficeFilePicker.hrc"
-
-// strings *******************************************************************
-
-String STR_EXPLORERFILE_OPEN
-{
-    Text [ en-US ] = "Open" ;
-};
-String STR_EXPLORERFILE_SAVE
-{
-    Text [ en-US ] = "Save as" ;
-};
-String STR_EXPLORERFILE_BUTTONSAVE
-{
-    Text [ en-US ] = "~Save" ;
-};
-String STR_PATHNAME
-{
-    Text [ en-US ] = "~Path:" ;
-};
-String STR_PATHSELECT
-{
-    Text [ en-US ] = "Select path" ;
-};
-String STR_BUTTONSELECT
-{
-    Text [ en-US ] = "~Select";
-};
-String STR_PREVIEW
-{
-    Text [ en-US ] = "File Preview";
-};
-String STR_DEFAULT_DIRECTORY
-{
-    Text [ en-US ] = "My Documents" ;
-};
-String STR_PLACES_TITLE
-{
-    Text [ en-US ] = "Places" ;
-};
-
-String RID_FILEOPEN_NOTEXISTENTFILE
-{
-    Text [ en-US ] = "The file $name$ does not exist.\nMake sure you have entered the correct file name.";
-};
-
-String STR_FILTERNAME_ALL
-{
-    Text [ en-US ] = "All files" ;
-};
-
-String STR_SVT_ALREADYEXISTOVERWRITE
-{
-    Text [ en-US ] = "A file named \"$filename$\" already exists.\n\nDo you want to replace it?" ;
-};
-
-String STR_SVT_DELETESERVICE
-{
-    Text [ en-US ] = "Are you sure you want to delete the service?\n\"$servicename$\"" ;
-};
-
-String STR_SVT_ROOTLABEL
-{
-    Text [ en-US ] = "Root" ;
-};
-
-String STR_SVT_NEW_FOLDER
-{
-    Text [ en-US ] = "Folder" ;
-};
-
-String STR_SVT_NOREMOVABLEDEVICE
-{
-    Text [ en-US ] = "No removable storage device detected.\nMake sure it is plugged in properly and try again." ;
-};
-
-//******************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index e45764e7782e..9ee48838fc54 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -20,6 +20,7 @@
 #include "iodlgimp.hxx"
 #include "svtools/headbar.hxx"
 #include <tools/debug.hxx>
+#include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
@@ -31,45 +32,17 @@
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
-#include "iodlg.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
 #include "unotools/useroptions.hxx"
-#include "rtl/instance.hxx"
-#include <osl/getglobalmutex.hxx>
 #include <svl/svl.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::utl;
 
-
-// ResMgrHolder / SvtSimpleResId
-
-namespace
-{
-    struct ResMgrHolder
-    {
-        ResMgr * operator ()()
-        {
-            return ResMgr::CreateResMgr ("svl");
-        }
-        static ResMgr * getOrCreate()
-        {
-            return rtl_Instance<
-                ResMgr, ResMgrHolder,
-                osl::MutexGuard, osl::GetGlobalMutex >::create (
-                    ResMgrHolder(), osl::GetGlobalMutex());
-        }
-    };
-
-    struct SvtSimpleResId : public ResId
-    {
-        explicit SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
-    };
-}
-
 SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const OUString& rType )
     :m_aName( rName )
     ,m_aType( rType )
@@ -171,13 +144,13 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
         if ( nCount == 1 )
         {
             // adjust the title of the top level entry (the workspace)
-            _pMenu->SetItemText( --nItemId, SvtSimpleResId(STR_SVT_MIMETYPE_CNT_FSYSBOX).toString() );
+            std::locale loc = Translate::Create("svl", Application::GetSettings().GetUILanguageTag());
+            _pMenu->SetItemText(--nItemId, Translate::get(STR_SVT_MIMETYPE_CNT_FSYSBOX, loc));
         }
         --nCount;
     }
 }
 
-
 void SvtUpButton_Impl::Select()
 {
     sal_uInt16 nId = GetCurItemId();
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index e7a6697d4fb8..c3ce95a8054b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -491,9 +491,9 @@ static const ::sal_Int32 GROUP_IMAGETEMPLATE   =   3;
 static const ::sal_Int32 GROUP_CHECKBOXES      =   4;
 
 
-static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId)
+static void setLabelToControl(TFileDialogCustomize iCustom, sal_uInt16 nControlId)
 {
-    OUString aLabel = rResourceProvider.getResString(nControlId);
+    OUString aLabel = CResourceProvider::getResString(nControlId);
     aLabel = SOfficeToWindowsLabel(aLabel);
     iCustom->SetControlLabel(nControlId, reinterpret_cast<PCWSTR>(aLabel.getStr()) );
 }
@@ -577,42 +577,42 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
         iCustom->AddCheckButton (nControlId, L"Auto Extension", true);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD)
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD;
         iCustom->AddCheckButton (nControlId, L"Password", false);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     if ((nFeatures & FEATURE_READONLY) == FEATURE_READONLY)
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_READONLY;
         iCustom->AddCheckButton (nControlId, L"Readonly", false);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     if ((nFeatures & FEATURE_FILTEROPTIONS) == FEATURE_FILTEROPTIONS)
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS;
         iCustom->AddCheckButton (nControlId, L"Filter Options", false);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     if ((nFeatures & FEATURE_LINK) == FEATURE_LINK)
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK;
         iCustom->AddCheckButton (nControlId, L"Link", false);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     if ((nFeatures & FEATURE_SELECTION) == FEATURE_SELECTION)
     {
         nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION;
         iCustom->AddCheckButton (nControlId, L"Selection", false);
-        setLabelToControl(m_ResProvider, iCustom, nControlId);
+        setLabelToControl(iCustom, nControlId);
     }
 
     /* can be ignored ... new COM dialog supports preview native now  !
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index b7ea4de5fc0e..70272ad8c1c0 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -316,9 +316,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 
         OUString m_sFilename;
-
-        // Resource provider
-        CResourceProvider m_ResProvider;
 };
 
 } // namespace vista
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 43908c947020..5e5de9f612c4 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -138,14 +138,8 @@ CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) :
     m_bi.lpfn    = CMtaFolderPicker::FolderPickerCallback;
     m_bi.lParam  = reinterpret_cast< LPARAM >( this );
 
-
-    // read the default strings for title and
-    // description from a resource file
-
-    CResourceProvider ResProvider;
-
-    m_dialogTitle = ResProvider.getResString(FOLDERPICKER_TITLE);
-    m_Description = ResProvider.getResString(FOLDER_PICKER_DEF_DESCRIPTION);
+    m_dialogTitle = CResourceProvider::getResString(FOLDERPICKER_TITLE);
+    m_Description = CResourceProvider::getResString(FOLDER_PICKER_DEF_DESCRIPTION);
 
     // signals that the thread was successfully set up
     m_hEvtThrdReady  = CreateEventA(
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 12a733ec01d1..118d7ab932f5 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -25,13 +25,14 @@
 #include <rtl/ustrbuf.hxx>
 #include "resourceprovider.hxx"
 #include <osl/mutex.hxx>
-#include <vcl/fpicker.hrc>
+#include <fpicker/fpicker.hrc>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-#include <tools/simplerm.hxx>
+#include <tools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+#include "fpsofficeResMgr.hxx"
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
@@ -44,7 +45,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 struct Entry
 {
     sal_Int32 ctrlId;
-    sal_Int16 resId;
+    const char* resId;
 };
 
 Entry const CtrlIdToResIdTable[] = {
@@ -65,68 +66,33 @@ Entry const CtrlIdToResIdTable[] = {
 
 const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable );
 
-sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
+const char* CtrlIdToResId( sal_Int32 aControlId )
 {
-    sal_Int16 aResId = -1;
+    const char* pResId = nullptr;
 
     for ( sal_Int32 i = 0; i < SIZE_TABLE; i++ )
     {
         if ( CtrlIdToResIdTable[i].ctrlId == aControlId )
         {
-            aResId = CtrlIdToResIdTable[i].resId;
+            pResId = CtrlIdToResIdTable[i].resId;
             break;
         }
     }
 
-    return aResId;
+    return pResId;
 }
 
-class CResourceProvider_Impl
+namespace CResourceProvider
 {
-public:
-
-
-    CResourceProvider_Impl( )
-    {
-        const SolarMutexGuard aGuard;
-        m_ResMgr = o3tl::make_unique<SimpleResMgr>(
-            "fps_office", Application::GetSettings().GetUILanguageTag());
-    }
-
     OUString getResString( sal_Int16 aId )
     {
         OUString aResOUString;
-
-        try
-        {
-            // translate the control id to a resource id
-            sal_Int16 aResId = CtrlIdToResId( aId );
-
-            if ( aResId > -1 )
-                aResOUString = m_ResMgr->ReadString( aResId );
-        }
-        catch(...)
-        {
-        }
-
+        // translate the control id to a resource id
+        const char *pResId = CtrlIdToResId(aId);
+        if (pResId)
+            aResOUString = FpsResId(pResId);
         return aResOUString;
     }
-
-public:
-    std::unique_ptr<SimpleResMgr> m_ResMgr;
-};
-
-CResourceProvider::CResourceProvider( ) :
-    m_pImpl( o3tl::make_unique<CResourceProvider_Impl>() )
-{
-}
-
-CResourceProvider::~CResourceProvider( )
-{}
-
-OUString CResourceProvider::getResString( sal_Int16 aId )
-{
-   return m_pImpl->getResString( aId );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 8d515cbeb20b..a611d1aaf195 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -29,18 +29,9 @@
 
 #include <rtl/ustring.hxx>
 
-class CResourceProvider_Impl;
-
-class CResourceProvider
+namespace CResourceProvider
 {
-public:
-    CResourceProvider( );
-    ~CResourceProvider( );
-
-    OUString getResString( sal_Int16 aId );
-
-private:
-    std::unique_ptr<CResourceProvider_Impl> m_pImpl;
+    OUString getResString(sal_Int16 aId);
 };
 
 #endif
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 04c4f824d692..58b268fcc423 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="fps">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ExplorerFileDialog">
@@ -69,16 +69,16 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="connect_to_server">
-                        <property name="label" translatable="yes">Servers...</property>
+                        <property name="label" translatable="yes" context="explorerfiledialog|connect_to_server">Servers...</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Connect To Server</property>
+                        <property name="tooltip_text" translatable="yes" context="explorerfiledialog|connect_to_server|tooltip_text">Connect To Server</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect_to_server-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Connect To Server</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="explorerfiledialog|connect_to_server-atkobject">Connect To Server</property>
                           </object>
                         </child>
                       </object>
@@ -110,10 +110,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Create New Folder</property>
+                        <property name="tooltip_text" translatable="yes" context="explorerfiledialog|new_folder|tooltip_text">Create New Folder</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="new_folder-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Create New Folder</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="explorerfiledialog|new_folder-atkobject">Create New Folder</property>
                           </object>
                         </child>
                       </object>
@@ -249,7 +249,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">end</property>
-                                <property name="label" translatable="yes">File _name:</property>
+                                <property name="label" translatable="yes" context="explorerfiledialog|file_name_label">File _name:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">file_name</property>
                               </object>
@@ -274,7 +274,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">end</property>
-                                <property name="label" translatable="yes">File _type:</property>
+                                <property name="label" translatable="yes" context="explorerfiledialog|file_type_label">File _type:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">file_type</property>
                               </object>
@@ -370,7 +370,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="readonly">
-                                <property name="label" translatable="yes">_Read-only</property>
+                                <property name="label" translatable="yes" context="explorerfiledialog|readonly">_Read-only</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -394,7 +394,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkCheckButton" id="password">
-                                    <property name="label" translatable="yes">Save with password</property>
+                                    <property name="label" translatable="yes" context="explorerfiledialog|password">Save with password</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -408,7 +408,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="extension">
-                                    <property name="label" translatable="yes">_Automatic file name extension</property>
+                                    <property name="label" translatable="yes" context="explorerfiledialog|extension">_Automatic file name extension</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -423,7 +423,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="options">
-                                    <property name="label" translatable="yes">Edit _filter settings</property>
+                                    <property name="label" translatable="yes" context="explorerfiledialog|options">Edit _filter settings</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
diff --git a/fpicker/uiconfig/ui/foldernamedialog.ui b/fpicker/uiconfig/ui/foldernamedialog.ui
index d6e171203366..11fb27a728c5 100644
--- a/fpicker/uiconfig/ui/foldernamedialog.ui
+++ b/fpicker/uiconfig/ui/foldernamedialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="fps">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="FolderNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Folder Name ?</property>
+    <property name="title" translatable="yes" context="foldernamedialog|FolderNameDialog">Folder Name ?</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Na_me</property>
+                        <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entry</property>
                       </object>
@@ -112,7 +112,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Create New Folder</property>
+                <property name="label" translatable="yes" context="foldernamedialog|label1">Create New Folder</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index bcb3cd2a6013..5b1b736424a7 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="fps">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="RemoteFilesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Remote Files</property>
+    <property name="title" translatable="yes" context="remotefilesdialog|RemoteFilesDialog">Remote Files</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -102,7 +102,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Service:</property>
+                <property name="label" translatable="yes" context="remotefilesdialog|label1">Service:</property>
                 <accessibility>
                   <relation type="label-for" target="services_lb"/>
                 </accessibility>
@@ -129,7 +129,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add_service_btn:service_edit_menu">
-                <property name="label" translatable="yes">Add service</property>
+                <property name="label" translatable="yes" context="remotefilesdialog|add_service_btn">Add service</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -174,7 +174,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">List view</property>
+                <property name="tooltip_text" translatable="yes" context="remotefilesdialog|list_view|tooltip_text">List view</property>
                 <property name="image">image2</property>
               </object>
               <packing>
@@ -189,7 +189,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Icon view</property>
+                <property name="tooltip_text" translatable="yes" context="remotefilesdialog|icon_view|tooltip_text">Icon view</property>
                 <property name="image">image1</property>
               </object>
               <packing>
@@ -207,7 +207,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Create New Folder</property>
+                <property name="tooltip_text" translatable="yes" context="remotefilesdialog|new_folder|tooltip_text">Create New Folder</property>
                 <property name="margin_left">6</property>
               </object>
               <packing>
@@ -252,7 +252,7 @@
               <object class="GtkLabel" id="filterLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Filter</property>
+                <property name="label" translatable="yes" context="remotefilesdialog|filterLabel">Filter</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -264,7 +264,7 @@
               <object class="GtkLabel" id="nameLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File name</property>
+                <property name="label" translatable="yes" context="remotefilesdialog|nameLabel">File name</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -315,7 +315,7 @@
       <object class="GtkMenuItem" id="edit_service">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit service</property>
+        <property name="label" translatable="yes" context="remotefilesdialog|edit_service">_Edit service</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -323,7 +323,7 @@
       <object class="GtkMenuItem" id="delete_service">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete service</property>
+        <property name="label" translatable="yes" context="remotefilesdialog|delete_service">_Delete service</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -331,7 +331,7 @@
       <object class="GtkMenuItem" id="change_password">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Change password</property>
+        <property name="label" translatable="yes" context="remotefilesdialog|change_password">_Change password</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/framework/AllLangMoTarget_fwk.mk b/framework/AllLangMoTarget_fwk.mk
new file mode 100644
index 000000000000..cbeff181bd57
--- /dev/null
+++ b/framework/AllLangMoTarget_fwk.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,fwk))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,fwk,framework))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
deleted file mode 100644
index 7a8726d3cf7a..000000000000
--- a/framework/AllLangResTarget_fwe.mk
+++ /dev/null
@@ -1,49 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework))
-
-$(eval $(call gb_AllLangResTarget_add_srs,fwe,\
-    fwe/fwk_classes \
-))
-
-
-$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
-
-$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/classes \
-))
-
-$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
-    framework/source/classes/resource.src \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
-
-$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/services \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 2931e52e0ca7..52d53fcc79fd 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -81,7 +81,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/services/dispatchhelper \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,fwe,fwe))
-
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index f048989ad63c..93ac5e79618f 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,framework,\
     Library_fwl \
     Library_fwm \
     Package_dtd \
+    UIConfig_startmodule \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,framework,\
@@ -33,8 +34,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,framework,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,framework,\
-    AllLangResTarget_fwe \
-    UIConfig_startmodule \
+    AllLangMoTarget_fwk \
 ))
 
 ifneq ($(OOO_JUNIT_JAR),)
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index ba54eca5f081..c6606c5271e8 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -20,21 +20,10 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
 
-#include <tools/resid.hxx>
 #include <framework/fwedllapi.h>
+#include <rtl/ustring.hxx>
 
-namespace framework
-{
-
-class FWE_DLLPUBLIC FwkResId : public ResId
-{
-    public:
-        FwkResId( sal_uInt16 nId );
-
-    static ResMgr*  GetResManager();
-};
-
-}
+FWE_DLLPUBLIC OUString FwkResId(const char* pId);
 
 #endif // __FRAMEWORK_CLASSES_FWKRESID
 
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
deleted file mode 100644
index 72a45931b048..000000000000
--- a/framework/inc/classes/resource.hrc
+++ /dev/null
@@ -1,67 +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_FRAMEWORK_INC_CLASSES_RESOURCE_HRC
-#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC
-
-#define RID_STR_START       2000
-#define RID_MENU_START      10000
-#define RID_IMAGE_START     15000
-
-#define STR_MENU_HEADFOOTALL                    (RID_STR_START+2)
-#define STR_UPDATEDOC                           (RID_STR_START+3)
-#define STR_CLOSEDOC_ANDRETURN                  (RID_STR_START+4)
-#define STR_SAVECOPYDOC                         (RID_STR_START+5)
-#define STR_NODOCUMENT                          (RID_STR_START+6)
-#define STR_TOOLBAR_TITLE_ADDON                 (RID_STR_START+7)
-
-#define STR_FULL_DISC_RETRY_BUTTON              (RID_STR_START+9)  // used by AuotSave to show error state: full disc
-#define STR_FULL_DISC_MSG                       (RID_STR_START+10) // used by AuotSave to show error state: full disc
-#define STR_RESTORE_TOOLBARS                    (RID_STR_START+11)
-#define STR_CORRUPT_UICFG_SHARE                 (RID_STR_START+12)
-#define STR_CORRUPT_UICFG_USER                  (RID_STR_START+13)
-#define STR_CORRUPT_UICFG_GENERAL               (RID_STR_START+14)
-#define STR_LANGSTATUS_MULTIPLE_LANGUAGES       (RID_STR_START+15)
-#define STR_LANGSTATUS_NONE                     (RID_STR_START+16)
-#define STR_LANGSTATUS_MORE                     (RID_STR_START+17)
-#define STR_SET_LANGUAGE_FOR_PARAGRAPH          (RID_STR_START+19)
-#define STR_UNTITLED_DOCUMENT                   (RID_STR_START+21)
-#define STR_RESET_TO_DEFAULT_LANGUAGE           (RID_STR_START+22)
-#define STR_CLEAR_RECENT_FILES                  (RID_STR_START+23)
-#define STR_CLEAR_RECENT_FILES_HELP             (RID_STR_START+24)
-#define STR_LANGSTATUS_HINT                     (RID_STR_START+25)
-#define STR_REMOTE_TITLE                        (RID_STR_START+26)
-#define STR_SAFEMODE_TITLE                      (RID_STR_START+27)
-#define STR_TOOLBAR_VISIBLE_BUTTONS             (RID_STR_START+28)
-#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR           (RID_STR_START+29)
-#define STR_TOOLBAR_DOCK_TOOLBAR                (RID_STR_START+30)
-#define STR_TOOLBAR_DOCK_ALL_TOOLBARS           (RID_STR_START+31)
-#define STR_TOOLBAR_LOCK_TOOLBAR                (RID_STR_START+32)
-#define STR_TOOLBAR_CLOSE_TOOLBAR               (RID_STR_START+33)
-
-#define MENUITEM_TOOLBAR_VISIBLEBUTTON          1
-#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR       2
-#define MENUITEM_TOOLBAR_DOCKTOOLBAR            3
-#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR         4
-#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION    5
-#define MENUITEM_TOOLBAR_CLOSE                  6
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/sb.hrc b/framework/inc/classes/resource.hxx
index 12469099cf88..a9f98e607baa 100644
--- a/basic/inc/sb.hrc
+++ b/framework/inc/classes/resource.hxx
@@ -17,16 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BASIC_INC_SB_HRC
-#define INCLUDED_BASIC_INC_SB_HRC
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HXX
 
-#include <svl/solar.hrc>
-
-#ifndef IDS_SBERR_START
- #define IDS_SBERR_START RID_BASIC_START
-#endif
-
-#define IDS_SBERR_TERMINATED        IDS_SBERR_START+2000
+#define MENUITEM_TOOLBAR_VISIBLEBUTTON          1
+#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR       2
+#define MENUITEM_TOOLBAR_DOCKTOOLBAR            3
+#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR         4
+#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION    5
+#define MENUITEM_TOOLBAR_CLOSE                  6
 
 #endif
 
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 984b6266f5ab..86fb2645b5ff 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -206,7 +206,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
@@ -218,7 +217,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx
index 05a4cac9e5c8..724aa721cc42 100644
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ b/framework/inc/pch/precompiled_fwi.hxx
@@ -147,7 +147,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
@@ -157,7 +156,6 @@
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 5863dbf7d55e..900e1b3c75da 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -319,7 +319,6 @@
 #include <macros/xtypeprovider.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <svl/svldllapi.h>
 #include <svtools/miscopt.hxx>
 #include <svtools/svtdllapi.h>
@@ -343,7 +342,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index 62f2594a632e..2f59e411a3f8 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -305,7 +305,6 @@
 #include <macros/xtypeprovider.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <svl/svldllapi.h>
 #include <svtools/popupmenucontrollerbase.hxx>
 #include <svtools/svtdllapi.h>
@@ -326,7 +325,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/framework/inc/strings.hrc b/framework/inc/strings.hrc
new file mode 100644
index 000000000000..5a1cdea24093
--- /dev/null
+++ b/framework/inc/strings.hrc
@@ -0,0 +1,58 @@
+/* -*- 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_FRAMEWORK_INC_STRINGS_HRC
+#define INCLUDED_FRAMEWORK_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_MENU_HEADFOOTALL                        NC_("STR_MENU_HEADFOOTALL", "All" )
+#define STR_UPDATEDOC                               NC_("STR_UPDATEDOC", "~Update" )
+#define STR_CLOSEDOC_ANDRETURN                      NC_("STR_CLOSEDOC_ANDRETURN", "~Close & Return to " )
+#define STR_TOOLBAR_VISIBLE_BUTTONS                 NC_("STR_TOOLBAR_VISIBLE_BUTTONS", "Visible ~Buttons")
+#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR               NC_("STR_TOOLBAR_CUSTOMIZE_TOOLBAR", "~Customize Toolbar...")
+#define STR_TOOLBAR_DOCK_TOOLBAR                    NC_("STR_TOOLBAR_DOCK_TOOLBAR", "~Dock Toolbar" )
+#define STR_TOOLBAR_DOCK_ALL_TOOLBARS               NC_("STR_TOOLBAR_DOCK_ALL_TOOLBARS", "Dock ~All Toolbars" )
+#define STR_TOOLBAR_LOCK_TOOLBAR                    NC_("STR_TOOLBAR_LOCK_TOOLBAR", "~Lock Toolbar Position" )
+#define STR_TOOLBAR_CLOSE_TOOLBAR                   NC_("STR_TOOLBAR_CLOSE_TOOLBAR", "Close ~Toolbar" )
+#define STR_SAVECOPYDOC                             NC_("STR_SAVECOPYDOC", "Save Copy ~as..." )
+#define STR_NODOCUMENT                              NC_("STR_NODOCUMENT", "No Documents")
+#define STR_CLEAR_RECENT_FILES                      NC_("STR_CLEAR_RECENT_FILES", "Clear List")
+#define STR_CLEAR_RECENT_FILES_HELP                 NC_("STR_CLEAR_RECENT_FILES_HELP", "Clears the list with the most recently opened files. This action can not be undone.")
+#define STR_REMOTE_TITLE                            NC_("STR_REMOTE_TITLE", " (Remote)")
+#define STR_SAFEMODE_TITLE                          NC_("STR_SAFEMODE_TITLE", " (Safe Mode)")
+#define STR_TOOLBAR_TITLE_ADDON                     NC_("STR_TOOLBAR_TITLE_ADDON", "Add-On %num%")
+#define STR_FULL_DISC_RETRY_BUTTON                  NC_("STR_FULL_DISC_RETRY_BUTTON", "Retry" )
+#define STR_FULL_DISC_MSG                           NC_("STR_FULL_DISC_MSG", "%PRODUCTNAME could not save important internal information due to insufficient free disk space at the following location:\n%PATH\n\nYou will not be able to continue working with %PRODUCTNAME without allocating more free disk space at that location.\n\nPress the 'Retry' button after you have allocated more free disk space to retry saving the data.\n\n" )
+#define STR_RESTORE_TOOLBARS                        NC_("STR_RESTORE_TOOLBARS", "~Reset" )
+#define STR_CORRUPT_UICFG_SHARE                     NC_("STR_CORRUPT_UICFG_SHARE", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to reinstall the application." )
+#define STR_CORRUPT_UICFG_USER                      NC_("STR_CORRUPT_UICFG_USER", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application." )
+#define STR_CORRUPT_UICFG_GENERAL                   NC_("STR_CORRUPT_UICFG_GENERAL", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application first or try to reinstall the application." )
+#define STR_UNTITLED_DOCUMENT                       NC_("STR_UNTITLED_DOCUMENT", "Untitled" )
+// To translators: for displaying 'Multiple Languages' in the language statusbar control
+#define STR_LANGSTATUS_MULTIPLE_LANGUAGES           NC_("STR_LANGSTATUS_MULTIPLE_LANGUAGES", "Multiple Languages" )
+#define STR_LANGSTATUS_NONE                         NC_("STR_LANGSTATUS_NONE", "None (Do not check spelling)" )
+#define STR_RESET_TO_DEFAULT_LANGUAGE               NC_("STR_RESET_TO_DEFAULT_LANGUAGE", "Reset to Default Language" )
+#define STR_LANGSTATUS_MORE                         NC_("STR_LANGSTATUS_MORE", "More..." )
+#define STR_SET_LANGUAGE_FOR_PARAGRAPH              NC_("STR_SET_LANGUAGE_FOR_PARAGRAPH", "Set Language for Paragraph" )
+#define STR_LANGSTATUS_HINT                         NC_("STR_LANGSTATUS_HINT", "Text Language. Right-click to set character or paragraph language" )
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index f1126d7c2afd..22519dff34f8 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -21,7 +21,7 @@
 
 #include <classes/fwkresid.hxx>
 
-#include "classes/resource.hrc"
+#include "strings.hrc"
 #include <services.h>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
deleted file mode 100644
index 62e7b616b6ff..000000000000
--- a/framework/source/classes/resource.src
+++ /dev/null
@@ -1,168 +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 <classes/resource.hrc>
-
-String STR_MENU_HEADFOOTALL
-{
-    Text [ en-US ] = "All" ;
-};
-
-String STR_UPDATEDOC
-{
-    Text [ en-US ] = "~Update" ;
-};
-
-String STR_CLOSEDOC_ANDRETURN
-{
-    Text [ en-US ] = "~Close & Return to " ;
-};
-
-String STR_TOOLBAR_VISIBLE_BUTTONS
-{
-    Text[ en-US ] = "Visible ~Buttons";
-};
-
-String STR_TOOLBAR_CUSTOMIZE_TOOLBAR
-{
-    Text[ en-US ] = "~Customize Toolbar...";
-};
-
-String STR_TOOLBAR_DOCK_TOOLBAR
-{
-    Text[ en-US ] = "~Dock Toolbar" ;
-};
-
-String STR_TOOLBAR_DOCK_ALL_TOOLBARS
-{
-    Text[ en-US ] = "Dock ~All Toolbars" ;
-};
-
-String STR_TOOLBAR_LOCK_TOOLBAR
-{
-    Text[ en-US ] = "~Lock Toolbar Position" ;
-};
-
-String STR_TOOLBAR_CLOSE_TOOLBAR
-{
-    Text[ en-US ] = "Close ~Toolbar" ;
-};
-
-String STR_SAVECOPYDOC
-{
-    Text [ en-US ] = "Save Copy ~as..." ;
-};
-
-String STR_NODOCUMENT
-{
-    Text [ en-US ] = "No Documents";
-};
-
-String STR_CLEAR_RECENT_FILES
-{
-    Text [ en-US ] = "Clear List";
-};
-
-String STR_CLEAR_RECENT_FILES_HELP
-{
-    Text [ en-US ] = "Clears the list with the most recently opened files. This action can not be undone.";
-};
-
-String STR_REMOTE_TITLE
-{
-    Text [ en-US ] = " (Remote)";
-};
-
-String STR_SAFEMODE_TITLE
-{
-    Text [ en-US ] = " (Safe Mode)";
-};
-
-String STR_TOOLBAR_TITLE_ADDON
-{
-    Text [ en-US ] = "Add-On %num%";
-};
-
-String STR_FULL_DISC_RETRY_BUTTON
-{
-    Text [ en-US ] = "Retry" ;
-};
-
-String STR_FULL_DISC_MSG
-{
-    Text [ en-US ] = "%PRODUCTNAME could not save important internal information due to insufficient free disk space at the following location:\n%PATH\n\nYou will not be able to continue working with %PRODUCTNAME without allocating more free disk space at that location.\n\nPress the 'Retry' button after you have allocated more free disk space to retry saving the data.\n\n" ;
-};
-
-String STR_RESTORE_TOOLBARS
-{
-    Text [ en-US ] = "~Reset" ;
-};
-
-String STR_CORRUPT_UICFG_SHARE
-{
-    Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to reinstall the application." ;
-};
-
-String STR_CORRUPT_UICFG_USER
-{
-    Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application." ;
-};
-
-String STR_CORRUPT_UICFG_GENERAL
-{
-    Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application first or try to reinstall the application." ;
-};
-
-String STR_UNTITLED_DOCUMENT
-{
-    Text [ en-US ] = "Untitled" ;
-};
-
-// for displaying 'Multiple Languages' in the language statusbar control
-String STR_LANGSTATUS_MULTIPLE_LANGUAGES
-{
-    Text [ en-US ] = "Multiple Languages" ;
-};
-
-String STR_LANGSTATUS_NONE
-{
-    Text [ en-US ] = "None (Do not check spelling)" ;
-};
-
-String STR_RESET_TO_DEFAULT_LANGUAGE
-{
-    Text [ en-US ] = "Reset to Default Language" ;
-};
-
-String STR_LANGSTATUS_MORE
-{
-    Text [ en-US ] = "More..." ;
-};
-
-String STR_SET_LANGUAGE_FOR_PARAGRAPH
-{
-    Text [ en-US ] = "Set Language for Paragraph" ;
-};
-
-String STR_LANGSTATUS_HINT
-{
-    Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index e9a2998629fd..8ed6c1dbb5e5 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -24,27 +24,24 @@
 
 #include <rtl/strbuf.hxx>
 
-namespace framework
+namespace
 {
-
-ResMgr* FwkResId::GetResManager()
-{
-    static ResMgr*  pResMgr = nullptr;
-
-    if ( !pResMgr )
+    const std::locale& GetResLocale()
     {
-        SolarMutexGuard aSolarGuard;
-        pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag());
+        static std::locale* pResLocale = nullptr;
+        if (!pResLocale)
+        {
+            SolarMutexGuard aSolarGuard;
+            static std::locale loc(Translate::Create("fwe", Application::GetSettings().GetUILanguageTag()));
+            pResLocale = &loc;
+        }
+        return *pResLocale;
     }
-
-    return pResMgr;
 }
 
-FwkResId::FwkResId( sal_uInt16 nId ) :
-    ResId( nId, *FwkResId::GetResManager() )
+OUString FwkResId(const char* pId)
 {
-}
-
+    return Translate::get(pId, GetResLocale());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 63fbd191299d..b6f521bfeea9 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -19,7 +19,7 @@
 
 #include <framework/titlehelper.hxx>
 #include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index bbf91371e89e..373b2c73e159 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -27,7 +27,7 @@
 #include <uielement/menubarwrapper.hxx>
 #include <framework/addonsoptions.hxx>
 #include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <toolkit/helper/convert.hxx>
 #include <uielement/progressbarwrapper.hxx>
 #include <uiconfiguration/globalsettings.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index d39bb3e90bac..a20435405741 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -23,7 +23,7 @@
 #include "helpers.hxx"
 #include <services.h>
 #include <services/layoutmanager.hxx>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index fc33349faebc..b265d616fe1e 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -24,7 +24,7 @@
 #include <loadenv/targethelper.hxx>
 #include <pattern/frame.hxx>
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 #include <protocols.h>
 #include <properties.h>
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 090c109318d6..f727fbe3f576 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -32,7 +32,7 @@
 #include <general.h>
 #include <properties.h>
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index f497ea01826e..211c9f9e27b3 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -24,7 +24,8 @@
 #include "services.h"
 #include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
+#include <classes/resource.hxx>
+#include <strings.hrc>
 #include <framework/addonsoptions.hxx>
 #include <uielement/comboboxtoolbarcontroller.hxx>
 #include <uielement/imagebuttontoolbarcontroller.hxx>
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 5cd2984fad64..5831e5112ee6 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <svl/solar.hrc>
-#include <tools/rcid.h>
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/popupmenucontrollerbase.hxx>
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index d139475079bf..0d8ffad400b7 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -20,7 +20,7 @@
 #include <uielement/footermenucontroller.hxx>
 
 #include "services.h"
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 886bee4fcf83..6a8dedac82fb 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -35,7 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <tools/urlobj.hxx>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 #include <framework/menuconfiguration.hxx>
 #include <uielement/menubarmanager.hxx>
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 41bf068c7047..3f086d15c337 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -21,7 +21,7 @@
 
 #include "services.h"
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 701bdf1902da..e659d5edb5de 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -40,7 +40,7 @@
 #include <svtools/langtab.hxx>
 #include <classes/fwkresid.hxx>
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 
 #include "helper/mischelper.hxx"
 #include <osl/mutex.hxx>
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 6f3daabb5109..e59c32eca8ae 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -19,7 +19,7 @@
 
 #include <classes/fwkresid.hxx>
 #include <services.h>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 7b54f2aaa911..0f3d972eb776 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -20,7 +20,7 @@
 #include <uielement/macrosmenucontroller.hxx>
 #include <uielement/menubarmanager.hxx>
 #include "services.h"
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0b82b567c855..4c2c5c79ff54 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -25,7 +25,7 @@
 #include <classes/fwkresid.hxx>
 #include <helper/mischelper.hxx>
 #include <framework/menuextensionsupplier.hxx>
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <services.h>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index adb39d870bf6..d774fecc0ecf 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -20,7 +20,7 @@
 #include <uielement/newmenucontroller.hxx>
 
 #include "services.h"
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 806af7cfbc16..202f3fa85dc8 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <classes/fwkresid.hxx>
 
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 6d3f2deafb5c..763862240844 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 
 #include <cppuhelper/supportsservice.hxx>
@@ -37,7 +37,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
-using namespace framework;
 
 #define MAX_MENU_ITEMS  99
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ae92672d40ec..856c3916f5d9 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -29,7 +29,8 @@
 #include "properties.h"
 #include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
-#include <classes/resource.hrc>
+#include <classes/resource.hxx>
+#include <strings.hrc>
 #include <framework/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 1b5c451af138..35f12c14d9ad 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -22,7 +22,7 @@
 #include <algorithm>
 
 #include "services.h"
-#include <classes/resource.hrc>
+#include <strings.hrc>
 #include <classes/fwkresid.hxx>
 #include <framework/sfxhelperfunctions.hxx>
 #include <uiconfiguration/windowstateproperties.hxx>
diff --git a/i18nlangtag/Executable_localestr.mk b/i18nlangtag/Executable_localestr.mk
new file mode 100644
index 000000000000..99195ffc7b80
--- /dev/null
+++ b/i18nlangtag/Executable_localestr.mk
@@ -0,0 +1,29 @@
+# -*- 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_Executable_Executable,localestr))
+
+$(eval $(call gb_Executable_use_api,localestr,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,localestr,liblangtag))
+
+$(eval $(call gb_Executable_use_libraries,localestr,\
+    i18nlangtag \
+    sal \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,localestr,\
+    i18nlangtag/source/localestr/localestr \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk
index edd2e1d2e2a9..0aecbc05ffdb 100644
--- a/i18nlangtag/Module_i18nlangtag.mk
+++ b/i18nlangtag/Module_i18nlangtag.mk
@@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,i18nlangtag))
 
 $(eval $(call gb_Module_add_targets,i18nlangtag,\
 	Library_i18nlangtag \
+	Executable_localestr \
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18nlangtag,\
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 4bf244284289..2da3b95174ed 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -279,6 +279,7 @@ private:
     OUString            getRegion() const;
     OUString const &    getVariants() const;
     bool                hasScript() const;
+    OUString            getGlibcLocaleString() const;
 
     void                setScriptType(LanguageTag::ScriptType st);
     LanguageTag::ScriptType getScriptType() const;
@@ -1920,6 +1921,25 @@ OUString LanguageTag::getVariants() const
     return aRet;
 }
 
+OUString LanguageTagImpl::getGlibcLocaleString() const
+{
+    OUString sLocale;
+    if (!mpImplLangtag)
+    {
+        meIsLiblangtagNeeded = DECISION_YES;
+        const_cast<LanguageTagImpl*>(this)->synCanonicalize();
+    }
+    if (mpImplLangtag)
+    {
+        char* pLang = lt_tag_convert_to_locale(mpImplLangtag, nullptr);
+        if (pLang)
+        {
+            sLocale = OUString::createFromAscii( pLang);
+            free(pLang);
+        }
+    }
+    return sLocale;
+}
 
 OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const
 {
@@ -1934,16 +1954,16 @@ OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const
     }
     else
     {
-        /* FIXME: use the aImplIsoLangGLIBCModifiersEntries table from
-         * i18nlangtag/source/isolang/isolang.cxx or let liblangtag handle it.
-         * So far no code was prepared for anything else than a simple
-         * language_country locale so we don't lose anything here right now.
-         * */
+        aRet = getImpl()->getGlibcLocaleString();
+        sal_Int32 nAt = aRet.indexOf('@');
+        if (nAt != -1)
+            aRet = aRet.copy(0, nAt) + rEncoding + aRet.copy(nAt);
+        else
+            aRet += rEncoding;
     }
     return aRet;
 }
 
-
 bool LanguageTagImpl::hasScript() const
 {
     if (!mbCachedScript)
diff --git a/i18nlangtag/source/localestr/localestr.cxx b/i18nlangtag/source/localestr/localestr.cxx
new file mode 100644
index 000000000000..c18531330c51
--- /dev/null
+++ b/i18nlangtag/source/localestr/localestr.cxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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 <i18nlangtag/languagetag.hxx>
+#include <stdio.h>
+
+int main(int /*argc*/, char **argv)
+{
+    LanguageTag aTag(OUString::createFromAscii(argv[1]));
+    OUString aLocaleStr = aTag.getGlibcLocaleString("");
+    printf("%s", aLocaleStr.toUtf8().getStr());
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 47da169f5ce5..46a32a406934 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -227,7 +227,7 @@ public:
      * @param nY vertical position in document coordinates
      * @param nCount number of clicks: 1 for single click, 2 for double click
      * @param nButtons: which mouse buttons: 1 for left, 2 for middle, 4 right
-     * @param nModifier: which keyboard modifier: (see include/rsc/rsc-vcl-shared-types.hxx for possible values)
+     * @param nModifier: which keyboard modifier: (see include/vcl/vclenum.hxx for possible values)
      */
     void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier)
     {
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index 623ec6afcbaf..6c2fc4655122 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -23,8 +23,6 @@
 #include <basic/basicdllapi.h>
 #include <memory>
 
-class ResMgr;
-
 class BASIC_DLLPUBLIC BasicDLL
 {
 public:
@@ -32,10 +30,10 @@ public:
     std::unique_ptr<Impl> m_xImpl;
 
 public:
-                BasicDLL();
-                ~BasicDLL();
+    BasicDLL();
+    ~BasicDLL();
 
-    ResMgr*     GetBasResMgr() const;
+    const std::locale& GetBasResLocale() const;
 
     static void BasicBreak();
 
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 40071031eff2..8df50e07678a 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -23,6 +23,7 @@
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
+#include <svtools/ehdl.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 // Returns type name for Basic type, array flag is ignored
@@ -67,6 +68,8 @@ enum class PropertyMode
     Set
 };
 
+BASIC_DLLPUBLIC const ErrMsgCode* getRID_BASIC_START();
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
deleted file mode 100644
index 8f127d534a28..000000000000
--- a/include/comphelper/officeresourcebundle.hxx
+++ /dev/null
@@ -1,93 +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_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
-#define INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
-
-#include <comphelper/comphelperdllapi.h>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <rtl/ustring.hxx>
-
-#include <memory>
-
-
-namespace comphelper
-{
-
-
-    //= OfficeResourceBundle
-
-    class ResourceBundle_Impl;
-    /** wraps the css::resource::OfficeResourceAccess service
-    */
-    class COMPHELPER_DLLPUBLIC OfficeResourceBundle
-    {
-    private:
-        ::std::unique_ptr< ResourceBundle_Impl >  m_pImpl;
-
-    public:
-        /** constructs a resource bundle with the resource bundle given as 8-bit ASCII name
-
-            This is a convenience constructor only, it does nothing different than the constructor
-            taking an unicode string.
-
-            @param  _context
-                the component context to operate in
-            @param  _bundleBaseName
-                the base name of the resource file which should be accessed (*without* the SUPD!)
-            @throws css::lang::NullPointerException
-                if the given component context is <NULL/>
-        */
-        OfficeResourceBundle(
-            const css::uno::Reference< css::uno::XComponentContext >& _context,
-            const sal_Char* _bundleBaseAsciiName
-        );
-
-        /** destroys the instance
-        */
-        ~OfficeResourceBundle();
-
-        /** loads the string with the given resource id from the resource bundle
-            @param  _resourceId
-                the id of the string to load
-            @return
-                the requested resource string. If no string with the given id exists in the resource bundle,
-                an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
-                then.
-        */
-        OUString loadString( sal_Int32 _resourceId ) const;
-
-        /** determines whether the resource bundle has a string with the given id
-            @param  _resourceId
-                the id of the string whose existence is to be checked
-            @return
-                <TRUE/> if and only if a string with the given ID exists in the resource
-                bundle.
-        */
-        bool            hasString( sal_Int32 _resourceId ) const;
-    };
-
-
-} // namespace comphelper
-
-
-#endif // INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 71421453752e..2e364af0f75f 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/editengdllapi.h>
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index b9eb96236d9e..68aa86c7c20e 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EDITENG_EDITOBJ_HXX
 #define INCLUDED_EDITENG_EDITOBJ_HXX
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editdata.hxx>
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index f88f0d0c00a3..096d119aa002 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -16,364 +16,308 @@
  *   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_EDITENG_EDITRIDS_HRC
-#define INCLUDED_EDITENG_EDITRIDS_HRC
 
-#include <svl/solar.hrc>
+#ifndef INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC
+#define INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC
 
-// strings also used in cui
-#define RID_SVXSTR_PAPERBIN_SETTINGS        (RID_EDIT_START)
-#define RID_SVXSTR_PAPERBIN                 (RID_EDIT_START + 1)
-
-#define RID_OUTLUNDO_EXPAND                 (RID_EDIT_START + 2)
-#define RID_OUTLUNDO_COLLAPSE               (RID_EDIT_START + 3)
-#define RID_OUTLUNDO_ATTR                   (RID_EDIT_START + 4)
-#define RID_OUTLUNDO_INSERT                 (RID_EDIT_START + 5)
-#define RID_OUTLUNDO_DEPTH                  (RID_EDIT_START + 6)
-
-// strings for items
-
-#define RID_SVXITEMS_FRMDIR_BEGIN           (RID_EDIT_START + 9)
-#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP   (RID_EDIT_START + 9)
-#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP  (RID_EDIT_START + 10)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT  (RID_EDIT_START + 11)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT   (RID_EDIT_START + 12)
-#define RID_SVXITEMS_FRMDIR_ENVIRONMENT     (RID_EDIT_START + 13)
-//      RID_SVXITEMS_FRMDIR_END             (RID_EDIT_START + 14)
-
-#define RID_SVXITEMS_BORDER_COMPLETE        (RID_EDIT_START + 17)
-#define RID_SVXITEMS_BORDER_TOP             (RID_EDIT_START + 18)
-#define RID_SVXITEMS_BORDER_BOTTOM          (RID_EDIT_START + 19)
-#define RID_SVXITEMS_BORDER_LEFT            (RID_EDIT_START + 20)
-#define RID_SVXITEMS_BORDER_RIGHT           (RID_EDIT_START + 21)
-#define RID_SVXITEMS_BORDER_DISTANCE        (RID_EDIT_START + 22)
-#define RID_SVXITEMS_BORDER_NONE            (RID_EDIT_START + 23)
-
-#define RID_SVXITEMS_TRANSPARENT_TRUE       (RID_EDIT_START + 24)
-#define RID_SVXITEMS_TRANSPARENT_FALSE      (RID_EDIT_START + 25)
-#define RID_SVXITEMS_OPAQUE_TRUE            (RID_EDIT_START + 26)
-#define RID_SVXITEMS_OPAQUE_FALSE           (RID_EDIT_START + 27)
-
-#define RID_SVXITEMS_SHADOW_COMPLETE        (RID_EDIT_START + 28)
-#define RID_SVXITEMS_GRAPHIC                (RID_EDIT_START + 29)
-#define RID_SVXITEMS_LINES                  (RID_EDIT_START + 30)
-#define RID_SVXITEMS_ORPHANS_COMPLETE       (RID_EDIT_START + 31)
-#define RID_SVXITEMS_WIDOWS_COMPLETE        (RID_EDIT_START + 32)
-#define RID_SVXITEMS_PAGEMODEL_COMPLETE     (RID_EDIT_START + 33)
-
-#define RID_SVXITEMS_SHADOWED_TRUE          (RID_EDIT_START + 34)
-#define RID_SVXITEMS_SHADOWED_FALSE         (RID_EDIT_START + 35)
-#define RID_SVXITEMS_AUTOKERN_TRUE          (RID_EDIT_START + 36)
-#define RID_SVXITEMS_AUTOKERN_FALSE         (RID_EDIT_START + 37)
-#define RID_SVXITEMS_WORDLINE_TRUE          (RID_EDIT_START + 38)
-#define RID_SVXITEMS_WORDLINE_FALSE         (RID_EDIT_START + 39)
-#define RID_SVXITEMS_CONTOUR_TRUE           (RID_EDIT_START + 40)
-#define RID_SVXITEMS_CONTOUR_FALSE          (RID_EDIT_START + 41)
-#define RID_SVXITEMS_FMTKEEP_TRUE           (RID_EDIT_START + 46)
-#define RID_SVXITEMS_FMTKEEP_FALSE          (RID_EDIT_START + 47)
-#define RID_SVXITEMS_FMTSPLIT_TRUE          (RID_EDIT_START + 48)
-#define RID_SVXITEMS_FMTSPLIT_FALSE         (RID_EDIT_START + 49)
-#define RID_SVXITEMS_PRINT_TRUE             (RID_EDIT_START + 50)
-#define RID_SVXITEMS_PRINT_FALSE            (RID_EDIT_START + 51)
-#define RID_SVXITEMS_PROT_POS_TRUE          (RID_EDIT_START + 52)
-#define RID_SVXITEMS_PROT_POS_FALSE         (RID_EDIT_START + 53)
-#define RID_SVXITEMS_PROT_SIZE_TRUE         (RID_EDIT_START + 54)
-#define RID_SVXITEMS_PROT_SIZE_FALSE        (RID_EDIT_START + 55)
-#define RID_SVXITEMS_PROT_CONTENT_TRUE      (RID_EDIT_START + 56)
-#define RID_SVXITEMS_PROT_CONTENT_FALSE     (RID_EDIT_START + 57)
-#define RID_SVXITEMS_ULSPACE_UPPER          (RID_EDIT_START + 58)
-#define RID_SVXITEMS_ULSPACE_LOWER          (RID_EDIT_START + 59)
-#define RID_SVXITEMS_LRSPACE_LEFT           (RID_EDIT_START + 60)
-#define RID_SVXITEMS_LRSPACE_FLINE          (RID_EDIT_START + 62)
-#define RID_SVXITEMS_LRSPACE_RIGHT          (RID_EDIT_START + 63)
-#define RID_SVXITEMS_SIZE_WIDTH             (RID_EDIT_START + 64)
-#define RID_SVXITEMS_SIZE_HEIGHT            (RID_EDIT_START + 65)
-#define RID_SVXITEMS_PAGE_END_TRUE          (RID_EDIT_START + 66)
-#define RID_SVXITEMS_PAGE_END_FALSE         (RID_EDIT_START + 67)
-#define RID_SVXITEMS_HYPHEN_TRUE            (RID_EDIT_START + 68)
-#define RID_SVXITEMS_HYPHEN_FALSE           (RID_EDIT_START + 69)
-#define RID_SVXITEMS_HYPHEN_MINLEAD         (RID_EDIT_START + 70)
-#define RID_SVXITEMS_HYPHEN_MINTRAIL        (RID_EDIT_START + 71)
-#define RID_SVXITEMS_HYPHEN_MAX             (RID_EDIT_START + 72)
-#define RID_SVXITEMS_HNGPNCT_OFF            (RID_EDIT_START + 73)
-#define RID_SVXITEMS_HNGPNCT_ON             (RID_EDIT_START + 74)
-#define RID_SVXITEMS_FORBIDDEN_RULE_OFF     (RID_EDIT_START + 75)
-#define RID_SVXITEMS_FORBIDDEN_RULE_ON      (RID_EDIT_START + 76)
-#define RID_SVXITEMS_SCRPTSPC_OFF           (RID_EDIT_START + 77)
-#define RID_SVXITEMS_SCRPTSPC_ON            (RID_EDIT_START + 78)
-#define RID_SVXITEMS_CHARSCALE_OFF          (RID_EDIT_START + 79)
-#define RID_SVXITEMS_CHARSCALE              (RID_EDIT_START + 80)
-#define RID_SVXITEMS_CHARROTATE_OFF         (RID_EDIT_START + 81)
-#define RID_SVXITEMS_CHARROTATE             (RID_EDIT_START + 82)
-#define RID_SVXITEMS_CHARROTATE_FITLINE     (RID_EDIT_START + 83)
-#define RID_SVXITEMS_TEXTROTATE_OFF         (RID_EDIT_START + 84)
-#define RID_SVXITEMS_TEXTROTATE             (RID_EDIT_START + 89)
-
-#define RID_SVXITEMS_RELIEF_BEGIN           (RID_EDIT_START + 85)
-#define RID_SVXITEMS_RELIEF_NONE            (RID_EDIT_START + 85)
-#define RID_SVXITEMS_RELIEF_EMBOSSED        (RID_EDIT_START + 86)
-#define RID_SVXITEMS_RELIEF_ENGRAVED        (RID_EDIT_START + 87)
-//      RID_SVXITEMS_RELIEF_END             (RID_EDIT_START + 88)
-
-// enum FontEmphasisMark ---------------------------------------------------
-#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE   (RID_EDIT_START + 90)
-#define RID_SVXITEMS_EMPHASIS_NONE_STYLE    (RID_EDIT_START + 90)
-#define RID_SVXITEMS_EMPHASIS_DOT_STYLE     (RID_EDIT_START + 91)
-#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE  (RID_EDIT_START + 92)
-#define RID_SVXITEMS_EMPHASIS_DISC_STYLE    (RID_EDIT_START + 93)
-#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE  (RID_EDIT_START + 94)
-
-#define RID_SVXITEMS_EMPHASIS_ABOVE_POS     (RID_EDIT_START + 95)
-#define RID_SVXITEMS_EMPHASIS_BELOW_POS     (RID_EDIT_START + 96)
-
-// enum ESCAPEMENT -------------------------------------------------------
-#define RID_SVXITEMS_ESCAPEMENT_BEGIN       (RID_EDIT_START + 97)
-#define RID_SVXITEMS_ESCAPEMENT_OFF         (RID_EDIT_START + 97)
-#define RID_SVXITEMS_ESCAPEMENT_SUPER       (RID_EDIT_START + 98)
-#define RID_SVXITEMS_ESCAPEMENT_SUB         (RID_EDIT_START + 99)
-#define RID_SVXITEMS_ESCAPEMENT_AUTO        (RID_EDIT_START + 100)
-
-// enum CASEMAP ----------------------------------------------------------
-#define RID_SVXITEMS_CASEMAP_BEGIN          (RID_EDIT_START + 101)
-#define RID_SVXITEMS_CASEMAP_NONE           (RID_EDIT_START + 101)
-#define RID_SVXITEMS_CASEMAP_VERSALIEN      (RID_EDIT_START + 102)
-#define RID_SVXITEMS_CASEMAP_GEMEINE        (RID_EDIT_START + 103)
-#define RID_SVXITEMS_CASEMAP_TITEL          (RID_EDIT_START + 104)
-#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN   (RID_EDIT_START + 105)
-
-#define RID_SVXITEMS_KERNING_COMPLETE       (RID_EDIT_START + 106)
-#define RID_SVXITEMS_KERNING_EXPANDED       (RID_EDIT_START + 107)
-#define RID_SVXITEMS_KERNING_CONDENSED      (RID_EDIT_START + 108)
-
-#define RID_SVXITEMS_BLINK_TRUE             (RID_EDIT_START + 109)
-#define RID_SVXITEMS_BLINK_FALSE            (RID_EDIT_START + 110)
-
-#define RID_SVXITEMS_TWOLINES_OFF           (RID_EDIT_START + 111)
-#define RID_SVXITEMS_TWOLINES               (RID_EDIT_START + 112)
-
-// enum FontStrikeout ----------------------------------------------------
-#define RID_SVXITEMS_STRIKEOUT_BEGIN        (RID_EDIT_START + 113)
-#define RID_SVXITEMS_STRIKEOUT_NONE         (RID_EDIT_START + 113)
-#define RID_SVXITEMS_STRIKEOUT_SINGLE       (RID_EDIT_START + 114)
-#define RID_SVXITEMS_STRIKEOUT_DOUBLE       (RID_EDIT_START + 115)
-#define RID_SVXITEMS_STRIKEOUT_BOLD         (RID_EDIT_START + 117)
-#define RID_SVXITEMS_STRIKEOUT_SLASH        (RID_EDIT_START + 118)
-#define RID_SVXITEMS_STRIKEOUT_X            (RID_EDIT_START + 119)
-
-// enum FontUnderline - used for overline --------------------------------
-#define RID_SVXITEMS_OL_BEGIN               (RID_EDIT_START + 120)
-#define RID_SVXITEMS_OL_NONE                (RID_EDIT_START + 120)
-#define RID_SVXITEMS_OL_SINGLE              (RID_EDIT_START + 121)
-#define RID_SVXITEMS_OL_DOUBLE              (RID_EDIT_START + 122)
-#define RID_SVXITEMS_OL_DOTTED              (RID_EDIT_START + 123)
-#define RID_SVXITEMS_OL_DONTKNOW            (RID_EDIT_START + 124)
-#define RID_SVXITEMS_OL_DASH                (RID_EDIT_START + 125)
-#define RID_SVXITEMS_OL_LONGDASH            (RID_EDIT_START + 126)
-#define RID_SVXITEMS_OL_DASHDOT             (RID_EDIT_START + 127)
-#define RID_SVXITEMS_OL_DASHDOTDOT          (RID_EDIT_START + 128)
-#define RID_SVXITEMS_OL_SMALLWAVE           (RID_EDIT_START + 129)
-#define RID_SVXITEMS_OL_WAVE                (RID_EDIT_START + 130)
-#define RID_SVXITEMS_OL_DOUBLEWAVE          (RID_EDIT_START + 131)
-#define RID_SVXITEMS_OL_BOLD                (RID_EDIT_START + 132)
-#define RID_SVXITEMS_OL_BOLDDOTTED          (RID_EDIT_START + 133)
-#define RID_SVXITEMS_OL_BOLDDASH            (RID_EDIT_START + 134)
-#define RID_SVXITEMS_OL_BOLDLONGDASH        (RID_EDIT_START + 135)
-#define RID_SVXITEMS_OL_BOLDDASHDOT         (RID_EDIT_START + 136)
-#define RID_SVXITEMS_OL_BOLDDASHDOTDOT      (RID_EDIT_START + 137)
-#define RID_SVXITEMS_OL_BOLDWAVE            (RID_EDIT_START + 138)
-
-// enum FontUnderline - used for underline -------------------------------
-#define RID_SVXITEMS_UL_BEGIN               (RID_EDIT_START + 139)
-#define RID_SVXITEMS_UL_NONE                (RID_EDIT_START + 139)
-#define RID_SVXITEMS_UL_SINGLE              (RID_EDIT_START + 140)
-#define RID_SVXITEMS_UL_DOUBLE              (RID_EDIT_START + 141)
-#define RID_SVXITEMS_UL_DOTTED              (RID_EDIT_START + 142)
-#define RID_SVXITEMS_UL_DONTKNOW            (RID_EDIT_START + 143)
-#define RID_SVXITEMS_UL_DASH                (RID_EDIT_START + 144)
-#define RID_SVXITEMS_UL_LONGDASH            (RID_EDIT_START + 145)
-#define RID_SVXITEMS_UL_DASHDOT             (RID_EDIT_START + 146)
-#define RID_SVXITEMS_UL_DASHDOTDOT          (RID_EDIT_START + 147)
-#define RID_SVXITEMS_UL_SMALLWAVE           (RID_EDIT_START + 148)
-#define RID_SVXITEMS_UL_WAVE                (RID_EDIT_START + 149)
-#define RID_SVXITEMS_UL_DOUBLEWAVE          (RID_EDIT_START + 150)
-#define RID_SVXITEMS_UL_BOLD                (RID_EDIT_START + 151)
-#define RID_SVXITEMS_UL_BOLDDOTTED          (RID_EDIT_START + 152)
-#define RID_SVXITEMS_UL_BOLDDASH            (RID_EDIT_START + 153)
-#define RID_SVXITEMS_UL_BOLDLONGDASH        (RID_EDIT_START + 154)
-#define RID_SVXITEMS_UL_BOLDDASHDOT         (RID_EDIT_START + 155)
-#define RID_SVXITEMS_UL_BOLDDASHDOTDOT      (RID_EDIT_START + 156)
-#define RID_SVXITEMS_UL_BOLDWAVE            (RID_EDIT_START + 157)
-
-// enum FontWeight -------------------------------------------------------
-#define RID_SVXITEMS_WEIGHT_BEGIN           (RID_EDIT_START + 158)
-#define RID_SVXITEMS_WEIGHT_DONTKNOW        (RID_EDIT_START + 158)
-#define RID_SVXITEMS_WEIGHT_THIN            (RID_EDIT_START + 159)
-#define RID_SVXITEMS_WEIGHT_ULTRALIGHT      (RID_EDIT_START + 160)
-#define RID_SVXITEMS_WEIGHT_LIGHT           (RID_EDIT_START + 161)
-#define RID_SVXITEMS_WEIGHT_SEMILIGHT       (RID_EDIT_START + 162)
-#define RID_SVXITEMS_WEIGHT_NORMAL          (RID_EDIT_START + 163)
-#define RID_SVXITEMS_WEIGHT_MEDIUM          (RID_EDIT_START + 164)
-#define RID_SVXITEMS_WEIGHT_SEMIBOLD        (RID_EDIT_START + 165)
-#define RID_SVXITEMS_WEIGHT_BOLD            (RID_EDIT_START + 166)
-#define RID_SVXITEMS_WEIGHT_ULTRABOLD       (RID_EDIT_START + 167)
-#define RID_SVXITEMS_WEIGHT_BLACK           (RID_EDIT_START + 168)
-
-// enum FontItalic -------------------------------------------------------
-#define RID_SVXITEMS_ITALIC_NONE            (RID_EDIT_START + 206)
-#define RID_SVXITEMS_ITALIC_OBLIQUE         (RID_EDIT_START + 207)
-#define RID_SVXITEMS_ITALIC_NORMAL          (RID_EDIT_START + 208)
-
-// enum SvxAdjust -----------------------------------------------------------
-#define RID_SVXITEMS_ADJUST_BEGIN           (RID_EDIT_START + 209)
-#define RID_SVXITEMS_ADJUST_LEFT            (RID_EDIT_START + 209)
-#define RID_SVXITEMS_ADJUST_RIGHT           (RID_EDIT_START + 210)
-#define RID_SVXITEMS_ADJUST_BLOCK           (RID_EDIT_START + 211)
-#define RID_SVXITEMS_ADJUST_CENTER          (RID_EDIT_START + 212)
-#define RID_SVXITEMS_ADJUST_BLOCKLINE       (RID_EDIT_START + 213)
+#define NC_(Context, String) (Context "\004" u8##String)
 
 // enum SvxBreak ------------------------------------------------------------
-#define RID_SVXITEMS_BREAK_BEGIN            (RID_EDIT_START + 222)
-#define RID_SVXITEMS_BREAK_NONE             (RID_EDIT_START + 222)
-#define RID_SVXITEMS_BREAK_COLUMN_BEFORE    (RID_EDIT_START + 223)
-#define RID_SVXITEMS_BREAK_COLUMN_AFTER     (RID_EDIT_START + 224)
-#define RID_SVXITEMS_BREAK_COLUMN_BOTH      (RID_EDIT_START + 225)
-#define RID_SVXITEMS_BREAK_PAGE_BEFORE      (RID_EDIT_START + 226)
-#define RID_SVXITEMS_BREAK_PAGE_AFTER       (RID_EDIT_START + 227)
-#define RID_SVXITEMS_BREAK_PAGE_BOTH        (RID_EDIT_START + 228)
+#define RID_SVXITEMS_BREAK_NONE                 NC_("RID_SVXITEMS_BREAK_NONE", "No break")
+#define RID_SVXITEMS_BREAK_COLUMN_BEFORE        NC_("RID_SVXITEMS_BREAK_COLUMN_BEFORE", "Break before new column")
+#define RID_SVXITEMS_BREAK_COLUMN_AFTER         NC_("RID_SVXITEMS_BREAK_COLUMN_AFTER", "Break after new column")
+#define RID_SVXITEMS_BREAK_COLUMN_BOTH          NC_("RID_SVXITEMS_BREAK_COLUMN_BOTH", "Break before and after new column")
+#define RID_SVXITEMS_BREAK_PAGE_BEFORE          NC_("RID_SVXITEMS_BREAK_PAGE_BEFORE", "Break before new page")
+#define RID_SVXITEMS_BREAK_PAGE_AFTER           NC_("RID_SVXITEMS_BREAK_PAGE_AFTER", "Break after new page")
+#define RID_SVXITEMS_BREAK_PAGE_BOTH            NC_("RID_SVXITEMS_BREAK_PAGE_BOTH", "Break before and after new page")
 
 // enum SvxShadowLocation ---------------------------------------------------
-#define RID_SVXITEMS_SHADOW_BEGIN           (RID_EDIT_START + 229)
-#define RID_SVXITEMS_SHADOW_NONE            (RID_EDIT_START + 229)
-#define RID_SVXITEMS_SHADOW_TOPLEFT         (RID_EDIT_START + 230)
-#define RID_SVXITEMS_SHADOW_TOPRIGHT        (RID_EDIT_START + 231)
-#define RID_SVXITEMS_SHADOW_BOTTOMLEFT      (RID_EDIT_START + 232)
-#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT     (RID_EDIT_START + 233)
-
-// Border lines
-#define RID_SOLID                           (RID_EDIT_START + 234)
-#define RID_DOTTED                          (RID_EDIT_START + 235)
-#define RID_DASHED                          (RID_EDIT_START + 236)
-#define RID_DOUBLE                          (RID_EDIT_START + 237)
-#define RID_THINTHICK_SMALLGAP              (RID_EDIT_START + 238)
-#define RID_THINTHICK_MEDIUMGAP             (RID_EDIT_START + 239)
-#define RID_THINTHICK_LARGEGAP              (RID_EDIT_START + 240)
-#define RID_THICKTHIN_SMALLGAP              (RID_EDIT_START + 241)
-#define RID_THICKTHIN_MEDIUMGAP             (RID_EDIT_START + 242)
-#define RID_THICKTHIN_LARGEGAP              (RID_EDIT_START + 243)
-#define RID_EMBOSSED                        (RID_EDIT_START + 244)
-#define RID_ENGRAVED                        (RID_EDIT_START + 245)
-#define RID_OUTSET                          (RID_EDIT_START + 246)
-#define RID_INSET                           (RID_EDIT_START + 247)
-#define RID_FINE_DASHED                     (RID_EDIT_START + 248)
-#define RID_DOUBLE_THIN                     (RID_EDIT_START + 249)
-// border lines continue at RID_EDIT_START + 330
-
-// Metric-Text
-#define RID_SVXITEMS_METRIC_MM              (RID_EDIT_START + 250)
-#define RID_SVXITEMS_METRIC_CM              (RID_EDIT_START + 251)
-#define RID_SVXITEMS_METRIC_INCH            (RID_EDIT_START + 252)
-#define RID_SVXITEMS_METRIC_POINT           (RID_EDIT_START + 253)
-#define RID_SVXITEMS_METRIC_TWIP            (RID_EDIT_START + 254)
-#define RID_SVXITEMS_METRIC_PIXEL           (RID_EDIT_START + 255)
+#define RID_SVXITEMS_SHADOW_NONE                NC_("RID_SVXITEMS_SHADOW_NONE", "No Shadow")
+#define RID_SVXITEMS_SHADOW_TOPLEFT             NC_("RID_SVXITEMS_SHADOW_TOPLEFT", "Shadow top left")
+#define RID_SVXITEMS_SHADOW_TOPRIGHT            NC_("RID_SVXITEMS_SHADOW_TOPRIGHT", "Shadow top right")
+#define RID_SVXITEMS_SHADOW_BOTTOMLEFT          NC_("RID_SVXITEMS_SHADOW_BOTTOMLEFT", "Shadow bottom left")
+#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT         NC_("RID_SVXITEMS_SHADOW_BOTTOMRIGHT", "Shadow bottom right")
 
 // enum ColorName -----------------------------------------------------------
-#define RID_SVXITEMS_COLOR_BEGIN            (RID_EDIT_START + 256)
-#define RID_SVXITEMS_COLOR                  (RID_EDIT_START + 256)
-#define RID_SVXITEMS_COLOR_BLACK            (RID_EDIT_START + 257)
-#define RID_SVXITEMS_COLOR_BLUE             (RID_EDIT_START + 258)
-#define RID_SVXITEMS_COLOR_GREEN            (RID_EDIT_START + 259)
-#define RID_SVXITEMS_COLOR_CYAN             (RID_EDIT_START + 260)
-#define RID_SVXITEMS_COLOR_RED              (RID_EDIT_START + 261)
-#define RID_SVXITEMS_COLOR_MAGENTA          (RID_EDIT_START + 262)
-#define RID_SVXITEMS_COLOR_BROWN            (RID_EDIT_START + 263)
-#define RID_SVXITEMS_COLOR_GRAY             (RID_EDIT_START + 264)
-#define RID_SVXITEMS_COLOR_LIGHTGRAY        (RID_EDIT_START + 265)
-#define RID_SVXITEMS_COLOR_LIGHTBLUE        (RID_EDIT_START + 266)
-#define RID_SVXITEMS_COLOR_LIGHTGREEN       (RID_EDIT_START + 267)
-#define RID_SVXITEMS_COLOR_LIGHTCYAN        (RID_EDIT_START + 268)
-#define RID_SVXITEMS_COLOR_LIGHTRED         (RID_EDIT_START + 269)
-#define RID_SVXITEMS_COLOR_LIGHTMAGENTA     (RID_EDIT_START + 270)
-#define RID_SVXITEMS_COLOR_YELLOW           (RID_EDIT_START + 271)
-#define RID_SVXITEMS_COLOR_WHITE            (RID_EDIT_START + 272)
-#define RID_SVXITEMS_COLOR_MENUBAR          (RID_EDIT_START + 273)
-#define RID_SVXITEMS_COLOR_MENUBARTEXT      (RID_EDIT_START + 274)
-#define RID_SVXITEMS_COLOR_POPUPMENU        (RID_EDIT_START + 275)
-#define RID_SVXITEMS_COLOR_POPUPMENUTEXT    (RID_EDIT_START + 276)
-#define RID_SVXITEMS_COLOR_WINDOWTEXT       (RID_EDIT_START + 277)
-#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE  (RID_EDIT_START + 278)
-#define RID_SVXITEMS_COLOR_HIGHLIGHT        (RID_EDIT_START + 279)
-#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT    (RID_EDIT_START + 280)
-#define RID_SVXITEMS_COLOR_3DTEXT           (RID_EDIT_START + 281)
-#define RID_SVXITEMS_COLOR_3DFACE           (RID_EDIT_START + 282)
-#define RID_SVXITEMS_COLOR_3DLIGHT          (RID_EDIT_START + 283)
-#define RID_SVXITEMS_COLOR_3DSHADOW         (RID_EDIT_START + 284)
-#define RID_SVXITEMS_COLOR_SCROLLBAR        (RID_EDIT_START + 285)
-#define RID_SVXITEMS_COLOR_FIELD            (RID_EDIT_START + 286)
-#define RID_SVXITEMS_COLOR_FIELDTEXT        (RID_EDIT_START + 287)
-
-#define RID_SVXITEMS_PARASNAPTOGRID_ON      (RID_EDIT_START + 288)
-#define RID_SVXITEMS_PARASNAPTOGRID_OFF     (RID_EDIT_START + 289)
-
-#define RID_SVXITEMS_PARAVERTALIGN_AUTO     (RID_EDIT_START + 290)
-#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291)
-#define RID_SVXITEMS_PARAVERTALIGN_TOP      (RID_EDIT_START + 292)
-#define RID_SVXITEMS_PARAVERTALIGN_CENTER   (RID_EDIT_START + 293)
-#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM   (RID_EDIT_START + 294)
+#define RID_SVXITEMS_COLOR                      NC_("RID_SVXITEMS_COLOR", "Color ")
+#define RID_SVXITEMS_COLOR_BLACK                NC_("RID_SVXITEMS_COLOR_BLACK", "Black")
+#define RID_SVXITEMS_COLOR_BLUE                 NC_("RID_SVXITEMS_COLOR_BLUE", "Blue")
+#define RID_SVXITEMS_COLOR_GREEN                NC_("RID_SVXITEMS_COLOR_GREEN", "Green")
+#define RID_SVXITEMS_COLOR_CYAN                 NC_("RID_SVXITEMS_COLOR_CYAN", "Cyan")
+#define RID_SVXITEMS_COLOR_RED                  NC_("RID_SVXITEMS_COLOR_RED", "Red")
+#define RID_SVXITEMS_COLOR_MAGENTA              NC_("RID_SVXITEMS_COLOR_MAGENTA", "Magenta")
+#define RID_SVXITEMS_COLOR_BROWN                NC_("RID_SVXITEMS_COLOR_BROWN", "Brown")
+#define RID_SVXITEMS_COLOR_GRAY                 NC_("RID_SVXITEMS_COLOR_GRAY", "Gray")
+#define RID_SVXITEMS_COLOR_LIGHTGRAY            NC_("RID_SVXITEMS_COLOR_LIGHTGRAY", "Light Gray")
+#define RID_SVXITEMS_COLOR_LIGHTBLUE            NC_("RID_SVXITEMS_COLOR_LIGHTBLUE", "Light Blue")
+#define RID_SVXITEMS_COLOR_LIGHTGREEN           NC_("RID_SVXITEMS_COLOR_LIGHTGREEN", "Light Green")
+#define RID_SVXITEMS_COLOR_LIGHTCYAN            NC_("RID_SVXITEMS_COLOR_LIGHTCYAN", "Light Cyan")
+#define RID_SVXITEMS_COLOR_LIGHTRED             NC_("RID_SVXITEMS_COLOR_LIGHTRED", "Light Red")
+#define RID_SVXITEMS_COLOR_LIGHTMAGENTA         NC_("RID_SVXITEMS_COLOR_LIGHTMAGENTA", "Light Magenta")
+#define RID_SVXITEMS_COLOR_YELLOW               NC_("RID_SVXITEMS_COLOR_YELLOW", "Yellow")
+#define RID_SVXITEMS_COLOR_WHITE                NC_("RID_SVXITEMS_COLOR_WHITE", "White")
 
-#define RID_SVXITEMS_CHARHIDDEN_FALSE       (RID_EDIT_START + 295)
-#define RID_SVXITEMS_CHARHIDDEN_TRUE        (RID_EDIT_START + 296)
-
-// strings for error messages in dictionary updates
-#define RID_SVXSTR_DIC_ERR_UNKNOWN          (RID_EDIT_START + 297)
-#define RID_SVXSTR_DIC_ERR_FULL             (RID_EDIT_START + 298)
-#define RID_SVXSTR_DIC_ERR_READONLY         (RID_EDIT_START + 299)
-#define RID_SVXSTR_QUERY_BW_CONTINUE        (RID_EDIT_START + 300)
-#define RID_SVXSTR_QUERY_CONTINUE           (RID_EDIT_START + 301)
-
-// EditEngine
-#define RID_EDITUNDO_DEL                    (RID_EDIT_START + 302)
-#define RID_EDITUNDO_MOVE                   (RID_EDIT_START + 303)
-#define RID_EDITUNDO_INSERT                 (RID_EDIT_START + 304)
-#define RID_EDITUNDO_REPLACE                (RID_EDIT_START + 305)
-#define RID_EDITUNDO_SETATTRIBS             (RID_EDIT_START + 306)
-#define RID_EDITUNDO_SETSTYLE               (RID_EDIT_START + 307)
-#define RID_EDITUNDO_RESETATTRIBS           (RID_EDIT_START + 308)
-#define RID_EDITUNDO_INDENT                 (RID_EDIT_START + 309)
-#define RID_EDITUNDO_TRANSLITERATE          (RID_EDIT_START + 310)
-#define RID_SVXSTR_AUTOMATIC                (RID_EDIT_START + 311)
-#define RID_STR_PARAGRAPH                   (RID_EDIT_START + 312)
-#define RID_STR_WORD                        (RID_EDIT_START + 313)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME        (RID_EDIT_START + 315)
-
-// enum SvxCellHorJustify
-#define RID_SVXITEMS_HORJUST_STANDARD       (RID_EDIT_START + 316)
-#define RID_SVXITEMS_HORJUST_LEFT           (RID_EDIT_START + 317)
-#define RID_SVXITEMS_HORJUST_CENTER         (RID_EDIT_START + 318)
-#define RID_SVXITEMS_HORJUST_RIGHT          (RID_EDIT_START + 319)
-#define RID_SVXITEMS_HORJUST_BLOCK          (RID_EDIT_START + 320)
-#define RID_SVXITEMS_HORJUST_REPEAT         (RID_EDIT_START + 321)
+// enum FontItalic -------------------------------------------------------
+#define RID_SVXITEMS_ITALIC_NONE                NC_("RID_SVXITEMS_ITALIC_NONE", "Not Italic")
+#define RID_SVXITEMS_ITALIC_OBLIQUE             NC_("RID_SVXITEMS_ITALIC_OBLIQUE", "Oblique italic")
+#define RID_SVXITEMS_ITALIC_NORMAL              NC_("RID_SVXITEMS_ITALIC_NORMAL", "Italic")
 
-// enum SvxCellVerJustify
-#define RID_SVXITEMS_VERJUST_STANDARD       (RID_EDIT_START + 322)
-#define RID_SVXITEMS_VERJUST_TOP            (RID_EDIT_START + 323)
-#define RID_SVXITEMS_VERJUST_CENTER         (RID_EDIT_START + 324)
-#define RID_SVXITEMS_VERJUST_BOTTOM         (RID_EDIT_START + 325)
+// enum FontWeight -------------------------------------------------------
+#define RID_SVXITEMS_WEIGHT_DONTKNOW            NC_("RID_SVXITEMS_WEIGHT_DONTKNOW", "?")
+#define RID_SVXITEMS_WEIGHT_THIN                NC_("RID_SVXITEMS_WEIGHT_THIN", "thin")
+#define RID_SVXITEMS_WEIGHT_ULTRALIGHT          NC_("RID_SVXITEMS_WEIGHT_ULTRALIGHT", "ultra thin")
+#define RID_SVXITEMS_WEIGHT_LIGHT               NC_("RID_SVXITEMS_WEIGHT_LIGHT", "light")
+#define RID_SVXITEMS_WEIGHT_SEMILIGHT           NC_("RID_SVXITEMS_WEIGHT_SEMILIGHT", "semi light")
+#define RID_SVXITEMS_WEIGHT_NORMAL              NC_("RID_SVXITEMS_WEIGHT_NORMAL", "normal")
+#define RID_SVXITEMS_WEIGHT_MEDIUM              NC_("RID_SVXITEMS_WEIGHT_MEDIUM", "medium")
+#define RID_SVXITEMS_WEIGHT_SEMIBOLD            NC_("RID_SVXITEMS_WEIGHT_SEMIBOLD", "semi bold")
+#define RID_SVXITEMS_WEIGHT_BOLD                NC_("RID_SVXITEMS_WEIGHT_BOLD", "bold")
+#define RID_SVXITEMS_WEIGHT_ULTRABOLD           NC_("RID_SVXITEMS_WEIGHT_ULTRABOLD", "ultra bold")
+#define RID_SVXITEMS_WEIGHT_BLACK               NC_("RID_SVXITEMS_WEIGHT_BLACK", "black")
+
+// enum FontUnderline - used for underline ------------------------------
+#define RID_SVXITEMS_UL_NONE                    NC_("RID_SVXITEMS_UL_NONE", "No underline")
+#define RID_SVXITEMS_UL_SINGLE                  NC_("RID_SVXITEMS_UL_SINGLE", "Single underline")
+#define RID_SVXITEMS_UL_DOUBLE                  NC_("RID_SVXITEMS_UL_DOUBLE", "Double underline")
+#define RID_SVXITEMS_UL_DOTTED                  NC_("RID_SVXITEMS_UL_DOTTED", "Dotted underline")
+#define RID_SVXITEMS_UL_DONTKNOW                NC_("RID_SVXITEMS_UL_DONTKNOW", "Underline")
+#define RID_SVXITEMS_UL_DASH                    NC_("RID_SVXITEMS_UL_DASH", "Underline (dashes)")
+#define RID_SVXITEMS_UL_LONGDASH                NC_("RID_SVXITEMS_UL_LONGDASH", "Underline (long dashes)")
+#define RID_SVXITEMS_UL_DASHDOT                 NC_("RID_SVXITEMS_UL_DASHDOT", "Underline (dot dash)")
+#define RID_SVXITEMS_UL_DASHDOTDOT              NC_("RID_SVXITEMS_UL_DASHDOTDOT", "Underline (dot dot dash)")
+#define RID_SVXITEMS_UL_SMALLWAVE               NC_("RID_SVXITEMS_UL_SMALLWAVE", "Underline (small wave)")
+#define RID_SVXITEMS_UL_WAVE                    NC_("RID_SVXITEMS_UL_WAVE", "Underline (Wave)")
+#define RID_SVXITEMS_UL_DOUBLEWAVE              NC_("RID_SVXITEMS_UL_DOUBLEWAVE", "Underline (Double wave)")
+#define RID_SVXITEMS_UL_BOLD                    NC_("RID_SVXITEMS_UL_BOLD", "Underlined (Bold)")
+#define RID_SVXITEMS_UL_BOLDDOTTED              NC_("RID_SVXITEMS_UL_BOLDDOTTED", "Dotted underline (Bold)")
+#define RID_SVXITEMS_UL_BOLDDASH                NC_("RID_SVXITEMS_UL_BOLDDASH", "Underline (Dash bold)")
+#define RID_SVXITEMS_UL_BOLDLONGDASH            NC_("RID_SVXITEMS_UL_BOLDLONGDASH", "Underline (long dash, bold)")
+#define RID_SVXITEMS_UL_BOLDDASHDOT             NC_("RID_SVXITEMS_UL_BOLDDASHDOT", "Underline (dot dash, bold)")
+#define RID_SVXITEMS_UL_BOLDDASHDOTDOT          NC_("RID_SVXITEMS_UL_BOLDDASHDOTDOT", "Underline (dot dot dash, bold)")
+#define RID_SVXITEMS_UL_BOLDWAVE                NC_("RID_SVXITEMS_UL_BOLDWAVE", "Underline (wave, bold)")
+
+// enum FontUnderline - used for overline -------------------------------
+#define RID_SVXITEMS_OL_NONE                    NC_("RID_SVXITEMS_OL_NONE", "No overline")
+#define RID_SVXITEMS_OL_SINGLE                  NC_("RID_SVXITEMS_OL_SINGLE", "Single overline")
+#define RID_SVXITEMS_OL_DOUBLE                  NC_("RID_SVXITEMS_OL_DOUBLE", "Double overline")
+#define RID_SVXITEMS_OL_DOTTED                  NC_("RID_SVXITEMS_OL_DOTTED", "Dotted overline")
+#define RID_SVXITEMS_OL_DONTKNOW                NC_("RID_SVXITEMS_OL_DONTKNOW", "Overline")
+#define RID_SVXITEMS_OL_DASH                    NC_("RID_SVXITEMS_OL_DASH", "Overline (dashes)")
+#define RID_SVXITEMS_OL_LONGDASH                NC_("RID_SVXITEMS_OL_LONGDASH", "Overline (long dashes)")
+#define RID_SVXITEMS_OL_DASHDOT                 NC_("RID_SVXITEMS_OL_DASHDOT", "Overline (dot dash)")
+#define RID_SVXITEMS_OL_DASHDOTDOT              NC_("RID_SVXITEMS_OL_DASHDOTDOT", "Overline (dot dot dash)")
+#define RID_SVXITEMS_OL_SMALLWAVE               NC_("RID_SVXITEMS_OL_SMALLWAVE", "Overline (small wave)")
+#define RID_SVXITEMS_OL_WAVE                    NC_("RID_SVXITEMS_OL_WAVE", "Overline (Wave)")
+#define RID_SVXITEMS_OL_DOUBLEWAVE              NC_("RID_SVXITEMS_OL_DOUBLEWAVE", "Overline (Double wave)")
+#define RID_SVXITEMS_OL_BOLD                    NC_("RID_SVXITEMS_OL_BOLD", "Overlined (Bold)")
+#define RID_SVXITEMS_OL_BOLDDOTTED              NC_("RID_SVXITEMS_OL_BOLDDOTTED", "Dotted overline (Bold)")
+#define RID_SVXITEMS_OL_BOLDDASH                NC_("RID_SVXITEMS_OL_BOLDDASH", "Overline (Dash bold)")
+#define RID_SVXITEMS_OL_BOLDLONGDASH            NC_("RID_SVXITEMS_OL_BOLDLONGDASH", "Overline (long dash, bold)")
+#define RID_SVXITEMS_OL_BOLDDASHDOT             NC_("RID_SVXITEMS_OL_BOLDDASHDOT", "Overline (dot dash, bold)")
+#define RID_SVXITEMS_OL_BOLDDASHDOTDOT          NC_("RID_SVXITEMS_OL_BOLDDASHDOTDOT", "Overline (dot dot dash, bold)")
+#define RID_SVXITEMS_OL_BOLDWAVE                NC_("RID_SVXITEMS_OL_BOLDWAVE", "Overline (wave, bold)")
 
-// enum SvxCellJustifyMethod
-#define RID_SVXITEMS_JUSTMETHOD_AUTO            (RID_EDIT_START + 326)
-#define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE      (RID_EDIT_START + 327)
+// enum FontStrikeout ----------------------------------------------------
+#define RID_SVXITEMS_STRIKEOUT_NONE             NC_("RID_SVXITEMS_STRIKEOUT_NONE", "No strikethrough")
+#define RID_SVXITEMS_STRIKEOUT_SINGLE           NC_("RID_SVXITEMS_STRIKEOUT_SINGLE", "Single strikethrough")
+#define RID_SVXITEMS_STRIKEOUT_DOUBLE           NC_("RID_SVXITEMS_STRIKEOUT_DOUBLE", "Double strikethrough")
+#define RID_SVXITEMS_STRIKEOUT_DONTKNOW         NC_("RID_SVXITEMS_STRIKEOUT_DONTKNOW", "Strikethrough")
+#define RID_SVXITEMS_STRIKEOUT_BOLD             NC_("RID_SVXITEMS_STRIKEOUT_BOLD", "Bold strikethrough")
+#define RID_SVXITEMS_STRIKEOUT_SLASH            NC_("RID_SVXITEMS_STRIKEOUT_SLASH", "Strike through with slash")
+#define RID_SVXITEMS_STRIKEOUT_X                NC_("RID_SVXITEMS_STRIKEOUT_X", "Strike through with Xes")
 
-#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION   (RID_EDIT_START + 328)
-// unused (RID_EDIT_START + 329)
+// enum CASEMAP ----------------------------------------------------------
+#define RID_SVXITEMS_CASEMAP_NONE               NC_("RID_SVXITEMS_CASEMAP_NONE", "None")
+#define RID_SVXITEMS_CASEMAP_VERSALIEN          NC_("RID_SVXITEMS_CASEMAP_VERSALIEN", "Caps")
+#define RID_SVXITEMS_CASEMAP_GEMEINE            NC_("RID_SVXITEMS_CASEMAP_GEMEINE", "Lowercase")
+#define RID_SVXITEMS_CASEMAP_TITEL              NC_("RID_SVXITEMS_CASEMAP_TITEL", "Title")
+#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN       NC_("RID_SVXITEMS_CASEMAP_KAPITAELCHEN", "Small caps")
 
-// Border lines (continued)
-#define RID_DASH_DOT                        (RID_EDIT_START + 330)
-#define RID_DASH_DOT_DOT                    (RID_EDIT_START + 331)
+// enum ESCAPEMENT -------------------------------------------------------
+#define RID_SVXITEMS_ESCAPEMENT_OFF             NC_("RID_SVXITEMS_ESCAPEMENT_OFF", "Normal position")
+#define RID_SVXITEMS_ESCAPEMENT_SUPER           NC_("RID_SVXITEMS_ESCAPEMENT_SUPER", "Superscript ")
+#define RID_SVXITEMS_ESCAPEMENT_SUB             NC_("RID_SVXITEMS_ESCAPEMENT_SUB", "Subscript ")
+#define RID_SVXITEMS_ESCAPEMENT_AUTO            NC_("RID_SVXITEMS_ESCAPEMENT_AUTO", "automatic")
 
-#if 331 > (RID_EDIT_END-RID_EDIT_START)
-#error Resource overflow in #line, #file
-#endif
+// enum SvxAdjust -----------------------------------------------------------
+#define RID_SVXITEMS_ADJUST_LEFT                NC_("RID_SVXITEMS_ADJUST_LEFT", "Align left")
+#define RID_SVXITEMS_ADJUST_RIGHT               NC_("RID_SVXITEMS_ADJUST_RIGHT", "Align right")
+#define RID_SVXITEMS_ADJUST_BLOCK               NC_("RID_SVXITEMS_ADJUST_BLOCK", "Justify")
+#define RID_SVXITEMS_ADJUST_CENTER              NC_("RID_SVXITEMS_ADJUST_CENTER", "Centered")
+#define RID_SVXITEMS_ADJUST_BLOCKLINE           NC_("RID_SVXITEMS_ADJUST_BLOCKLINE", "Justify")
+#define RID_SOLID                               NC_("RID_SOLID", "Single, solid")
+#define RID_DOTTED                              NC_("RID_DOTTED", "Single, dotted")
+#define RID_DASHED                              NC_("RID_DASHED", "Single, dashed")
+#define RID_DOUBLE                              NC_("RID_DOUBLE", "Double")
+#define RID_THINTHICK_SMALLGAP                  NC_("RID_THINTHICK_SMALLGAP", "Double, inside: fine, outside: thick, spacing: small")
+#define RID_THINTHICK_MEDIUMGAP                 NC_("RID_THINTHICK_MEDIUMGAP", "Double, inside: fine, outside: thick, spacing: medium")
+#define RID_THINTHICK_LARGEGAP                  NC_("RID_THINTHICK_LARGEGAP", "Double, inside: fine, outside: thick, spacing: large")
+#define RID_THICKTHIN_SMALLGAP                  NC_("RID_THICKTHIN_SMALLGAP", "Double, inside: thick, outside: fine, spacing: small")
+#define RID_THICKTHIN_MEDIUMGAP                 NC_("RID_THICKTHIN_MEDIUMGAP", "Double, inside: thick, outside: fine, spacing: medium")
+#define RID_THICKTHIN_LARGEGAP                  NC_("RID_THICKTHIN_LARGEGAP", "Double, inside: thick, outside: fine, spacing: large")
+#define RID_EMBOSSED                            NC_("RID_EMBOSSED", "3D embossed")
+#define RID_ENGRAVED                            NC_("RID_ENGRAVED", "3D engraved")
+#define RID_INSET                               NC_("RID_INSET", "Inset")
+#define RID_OUTSET                              NC_("RID_OUTSET", "Outset")
+#define RID_FINE_DASHED                         NC_("RID_FINE_DASHED", "Single, fine dashed")
+#define RID_DOUBLE_THIN                         NC_("RID_DOUBLE_THIN", "Double, fixed thin lines")
+#define RID_DASH_DOT                            NC_("RID_DASH_DOT", "Single, dash-dot")
+#define RID_DASH_DOT_DOT                        NC_("RID_DASH_DOT_DOT", "Single, dash-dot-dot")
+#define RID_SVXITEMS_METRIC_MM                  NC_("RID_SVXITEMS_METRIC_MM", "mm")
+#define RID_SVXITEMS_METRIC_CM                  NC_("RID_SVXITEMS_METRIC_CM", "cm")
+#define RID_SVXITEMS_METRIC_INCH                NC_("RID_SVXITEMS_METRIC_INCH", "inch")
+#define RID_SVXITEMS_METRIC_POINT               NC_("RID_SVXITEMS_METRIC_POINT", "pt")
+#define RID_SVXITEMS_METRIC_TWIP                NC_("RID_SVXITEMS_METRIC_TWIP", "twip")
+#define RID_SVXITEMS_METRIC_PIXEL               NC_("RID_SVXITEMS_METRIC_PIXEL", "pixel")
+
+// GetValueText of BoolItems
+#define RID_SVXITEMS_SHADOWED_TRUE              NC_("RID_SVXITEMS_SHADOWED_TRUE", "Shadowed")
+#define RID_SVXITEMS_SHADOWED_FALSE             NC_("RID_SVXITEMS_SHADOWED_FALSE", "Not Shadowed")
+#define RID_SVXITEMS_BLINK_TRUE                 NC_("RID_SVXITEMS_BLINK_TRUE", "Blinking")
+#define RID_SVXITEMS_BLINK_FALSE                NC_("RID_SVXITEMS_BLINK_FALSE", "Not Blinking")
+#define RID_SVXITEMS_AUTOKERN_TRUE              NC_("RID_SVXITEMS_AUTOKERN_TRUE", "Pair Kerning")
+#define RID_SVXITEMS_AUTOKERN_FALSE             NC_("RID_SVXITEMS_AUTOKERN_FALSE", "No pair kerning")
+#define RID_SVXITEMS_WORDLINE_TRUE              NC_("RID_SVXITEMS_WORDLINE_TRUE", "Individual words")
+#define RID_SVXITEMS_WORDLINE_FALSE             NC_("RID_SVXITEMS_WORDLINE_FALSE", "Not Words Only")
+#define RID_SVXITEMS_CONTOUR_TRUE               NC_("RID_SVXITEMS_CONTOUR_TRUE", "Outline")
+#define RID_SVXITEMS_CONTOUR_FALSE              NC_("RID_SVXITEMS_CONTOUR_FALSE", "No Outline")
+#define RID_SVXITEMS_PRINT_TRUE                 NC_("RID_SVXITEMS_PRINT_TRUE", "Print")
+#define RID_SVXITEMS_PRINT_FALSE                NC_("RID_SVXITEMS_PRINT_FALSE", "Don't print")
+#define RID_SVXITEMS_OPAQUE_TRUE                NC_("RID_SVXITEMS_OPAQUE_TRUE", "Opaque")
+#define RID_SVXITEMS_OPAQUE_FALSE               NC_("RID_SVXITEMS_OPAQUE_FALSE", "Not Opaque")
+#define RID_SVXITEMS_FMTKEEP_TRUE               NC_("RID_SVXITEMS_FMTKEEP_TRUE", "Keep with next paragraph")
+#define RID_SVXITEMS_FMTKEEP_FALSE              NC_("RID_SVXITEMS_FMTKEEP_FALSE", "Don't Keep Paragraphs Together")
+#define RID_SVXITEMS_FMTSPLIT_TRUE              NC_("RID_SVXITEMS_FMTSPLIT_TRUE", "Split paragraph")
+#define RID_SVXITEMS_FMTSPLIT_FALSE             NC_("RID_SVXITEMS_FMTSPLIT_FALSE", "Don't split paragraph")
+#define RID_SVXITEMS_PROT_CONTENT_TRUE          NC_("RID_SVXITEMS_PROT_CONTENT_TRUE", "Contents protected")
+#define RID_SVXITEMS_PROT_CONTENT_FALSE         NC_("RID_SVXITEMS_PROT_CONTENT_FALSE", "Contents not protected")
+#define RID_SVXITEMS_PROT_SIZE_TRUE             NC_("RID_SVXITEMS_PROT_SIZE_TRUE", "Size protected")
+#define RID_SVXITEMS_PROT_SIZE_FALSE            NC_("RID_SVXITEMS_PROT_SIZE_FALSE", "Size not protected")
+#define RID_SVXITEMS_PROT_POS_TRUE              NC_("RID_SVXITEMS_PROT_POS_TRUE", "Position protected")
+#define RID_SVXITEMS_PROT_POS_FALSE             NC_("RID_SVXITEMS_PROT_POS_FALSE", "Position not protected")
+#define RID_SVXITEMS_TRANSPARENT_TRUE           NC_("RID_SVXITEMS_TRANSPARENT_TRUE", "Transparent")
+#define RID_SVXITEMS_TRANSPARENT_FALSE          NC_("RID_SVXITEMS_TRANSPARENT_FALSE", "Not Transparent")
+#define RID_SVXITEMS_HYPHEN_TRUE                NC_("RID_SVXITEMS_HYPHEN_TRUE", "Hyphenation")
+#define RID_SVXITEMS_HYPHEN_FALSE               NC_("RID_SVXITEMS_HYPHEN_FALSE", "No hyphenation")
+#define RID_SVXITEMS_PAGE_END_TRUE              NC_("RID_SVXITEMS_PAGE_END_TRUE", "Page End")
+#define RID_SVXITEMS_PAGE_END_FALSE             NC_("RID_SVXITEMS_PAGE_END_FALSE", "No Page End")
+#define RID_SVXITEMS_SIZE_WIDTH                 NC_("RID_SVXITEMS_SIZE_WIDTH", "Width: ")
+#define RID_SVXITEMS_SIZE_HEIGHT                NC_("RID_SVXITEMS_SIZE_HEIGHT", "Height: ")
+#define RID_SVXITEMS_LRSPACE_LEFT               NC_("RID_SVXITEMS_LRSPACE_LEFT", "Indent left ")
+#define RID_SVXITEMS_LRSPACE_FLINE              NC_("RID_SVXITEMS_LRSPACE_FLINE", "First Line ")
+#define RID_SVXITEMS_LRSPACE_RIGHT              NC_("RID_SVXITEMS_LRSPACE_RIGHT", "Indent right ")
+#define RID_SVXITEMS_SHADOW_COMPLETE            NC_("RID_SVXITEMS_SHADOW_COMPLETE", "Shadow: ")
+#define RID_SVXITEMS_BORDER_COMPLETE            NC_("RID_SVXITEMS_BORDER_COMPLETE", "Borders ")
+#define RID_SVXITEMS_BORDER_NONE                NC_("RID_SVXITEMS_BORDER_NONE", "No border")
+#define RID_SVXITEMS_BORDER_TOP                 NC_("RID_SVXITEMS_BORDER_TOP", "top ")
+#define RID_SVXITEMS_BORDER_BOTTOM              NC_("RID_SVXITEMS_BORDER_BOTTOM", "bottom ")
+#define RID_SVXITEMS_BORDER_LEFT                NC_("RID_SVXITEMS_BORDER_LEFT", "left ")
+#define RID_SVXITEMS_BORDER_RIGHT               NC_("RID_SVXITEMS_BORDER_RIGHT", "right ")
+#define RID_SVXITEMS_BORDER_DISTANCE            NC_("RID_SVXITEMS_BORDER_DISTANCE", "Spacing ")
+#define RID_SVXITEMS_ULSPACE_UPPER              NC_("RID_SVXITEMS_ULSPACE_UPPER", "From top ")
+#define RID_SVXITEMS_ULSPACE_LOWER              NC_("RID_SVXITEMS_ULSPACE_LOWER", "From bottom ")
+// To translators: %1 == will be replaced by the number of lines
+#define RID_SVXITEMS_LINES                      NC_("RID_SVXITEMS_LINES", "%1 Lines")
+#define RID_SVXITEMS_WIDOWS_COMPLETE            NC_("RID_SVXITEMS_WIDOWS_COMPLETE", "Widow control")
+#define RID_SVXITEMS_ORPHANS_COMPLETE           NC_("RID_SVXITEMS_ORPHANS_COMPLETE", "Orphan control")
+#define RID_SVXITEMS_HYPHEN_MINLEAD             NC_("RID_SVXITEMS_HYPHEN_MINLEAD", "%1 characters at end of line")
+#define RID_SVXITEMS_HYPHEN_MINTRAIL            NC_("RID_SVXITEMS_HYPHEN_MINTRAIL", "%1 characters at beginning of line")
+#define RID_SVXITEMS_HYPHEN_MAX                 NC_("RID_SVXITEMS_HYPHEN_MAX", "%1 hyphens")
+#define RID_SVXITEMS_PAGEMODEL_COMPLETE         NC_("RID_SVXITEMS_PAGEMODEL_COMPLETE", "Page Style: ")
+#define RID_SVXITEMS_KERNING_COMPLETE           NC_("RID_SVXITEMS_KERNING_COMPLETE", "Kerning ")
+#define RID_SVXITEMS_KERNING_EXPANDED           NC_("RID_SVXITEMS_KERNING_EXPANDED", "locked ")
+#define RID_SVXITEMS_KERNING_CONDENSED          NC_("RID_SVXITEMS_KERNING_CONDENSED", "Condensed ")
+#define RID_SVXITEMS_GRAPHIC NC_("RID_SVXITEMS_GRAPHIC", "Graphic")
+#define RID_SVXITEMS_EMPHASIS_NONE_STYLE        NC_("RID_SVXITEMS_EMPHASIS_NONE_STYLE", "none")
+#define RID_SVXITEMS_EMPHASIS_DOT_STYLE         NC_("RID_SVXITEMS_EMPHASIS_DOT_STYLE", "Dots ")
+#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE      NC_("RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE", "Circle ")
+// ??? disc == filled ring
+#define RID_SVXITEMS_EMPHASIS_DISC_STYLE        NC_("RID_SVXITEMS_EMPHASIS_DISC_STYLE", "Filled circle ")
+#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE      NC_("RID_SVXITEMS_EMPHASIS_ACCENT_STYLE", "Accent ")
+#define RID_SVXITEMS_EMPHASIS_ABOVE_POS         NC_("RID_SVXITEMS_EMPHASIS_ABOVE_POS", "Above")
+#define RID_SVXITEMS_EMPHASIS_BELOW_POS         NC_("RID_SVXITEMS_EMPHASIS_BELOW_POS", "Below")
+#define RID_SVXITEMS_TWOLINES_OFF               NC_("RID_SVXITEMS_TWOLINES_OFF", "Double-lined off")
+#define RID_SVXITEMS_TWOLINES                   NC_("RID_SVXITEMS_TWOLINES", "Double-lined")
+#define RID_SVXITEMS_SCRPTSPC_OFF               NC_("RID_SVXITEMS_SCRPTSPC_OFF", "No automatic character spacing")
+#define RID_SVXITEMS_SCRPTSPC_ON                NC_("RID_SVXITEMS_SCRPTSPC_ON", "No automatic character spacing")
+#define RID_SVXITEMS_HNGPNCT_OFF                NC_("RID_SVXITEMS_HNGPNCT_OFF", "No hanging punctuation at line end")
+#define RID_SVXITEMS_HNGPNCT_ON                 NC_("RID_SVXITEMS_HNGPNCT_ON", "Hanging punctuation at line end")
+#define RID_SVXITEMS_FORBIDDEN_RULE_OFF         NC_("RID_SVXITEMS_FORBIDDEN_RULE_OFF", "Apply list of forbidden characters to beginning and end of lines")
+#define RID_SVXITEMS_FORBIDDEN_RULE_ON          NC_("RID_SVXITEMS_FORBIDDEN_RULE_ON", "Don't apply list of forbidden characters to beginning and end of lines")
+#define RID_SVXITEMS_CHARROTATE_OFF             NC_("RID_SVXITEMS_CHARROTATE_OFF", "No rotated characters")
+#define RID_SVXITEMS_CHARROTATE                 NC_("RID_SVXITEMS_CHARROTATE", "Character rotated by $(ARG1)°")
+#define RID_SVXITEMS_CHARROTATE_FITLINE         NC_("RID_SVXITEMS_CHARROTATE_FITLINE", "Fit to line")
+#define RID_SVXITEMS_TEXTROTATE_OFF             NC_("RID_SVXITEMS_TEXTROTATE_OFF", "Text is not rotated")
+#define RID_SVXITEMS_TEXTROTATE                 NC_("RID_SVXITEMS_TEXTROTATE", "Text is rotated by $(ARG1)°")
+#define RID_SVXITEMS_CHARSCALE                  NC_("RID_SVXITEMS_CHARSCALE", "Characters scaled $(ARG1)%")
+#define RID_SVXITEMS_CHARSCALE_OFF              NC_("RID_SVXITEMS_CHARSCALE_OFF", "No scaled characters")
+#define RID_SVXITEMS_RELIEF_NONE                NC_("RID_SVXITEMS_RELIEF_NONE", "No relief")
+#define RID_SVXITEMS_RELIEF_EMBOSSED            NC_("RID_SVXITEMS_RELIEF_EMBOSSED", "Relief")
+#define RID_SVXITEMS_RELIEF_ENGRAVED            NC_("RID_SVXITEMS_RELIEF_ENGRAVED", "Engraved")
+#define RID_SVXITEMS_PARAVERTALIGN_AUTO         NC_("RID_SVXITEMS_PARAVERTALIGN_AUTO", "Automatic text alignment")
+#define RID_SVXITEMS_PARAVERTALIGN_BASELINE     NC_("RID_SVXITEMS_PARAVERTALIGN_BASELINE", "Text aligned to base line")
+#define RID_SVXITEMS_PARAVERTALIGN_TOP          NC_("RID_SVXITEMS_PARAVERTALIGN_TOP", "Text aligned top")
+#define RID_SVXITEMS_PARAVERTALIGN_CENTER       NC_("RID_SVXITEMS_PARAVERTALIGN_CENTER", "Text aligned middle")
+#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM       NC_("RID_SVXITEMS_PARAVERTALIGN_BOTTOM", "Text aligned bottom")
+#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP       NC_("RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP", "Text direction left-to-right (horizontal)")
+#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP      NC_("RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP", "Text direction right-to-left (horizontal)")
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT      NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT", "Text direction right-to-left (vertical)")
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT       NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT", "Text direction left-to-right (vertical)")
+#define RID_SVXITEMS_FRMDIR_ENVIRONMENT         NC_("RID_SVXITEMS_FRMDIR_ENVIRONMENT", "Use superordinate object text direction setting")
+#define RID_SVXITEMS_PARASNAPTOGRID_ON          NC_("RID_SVXITEMS_PARASNAPTOGRID_ON", "Paragraph snaps to text grid (if active)")
+#define RID_SVXITEMS_PARASNAPTOGRID_OFF         NC_("RID_SVXITEMS_PARASNAPTOGRID_OFF", "Paragraph does not snap to text grid")
+#define RID_SVXITEMS_CHARHIDDEN_FALSE           NC_("RID_SVXITEMS_CHARHIDDEN_FALSE", "Not hidden")
+#define RID_SVXITEMS_CHARHIDDEN_TRUE            NC_("RID_SVXITEMS_CHARHIDDEN_TRUE", "Hidden")
+
+// enum SvxCellHorJustify ----------------------------------------------------
+#define RID_SVXITEMS_HORJUST_STANDARD           NC_("RID_SVXITEMS_HORJUST_STANDARD", "Horizontal alignment default")
+#define RID_SVXITEMS_HORJUST_LEFT               NC_("RID_SVXITEMS_HORJUST_LEFT", "Align left")
+#define RID_SVXITEMS_HORJUST_CENTER             NC_("RID_SVXITEMS_HORJUST_CENTER", "Centered horizontally")
+#define RID_SVXITEMS_HORJUST_RIGHT              NC_("RID_SVXITEMS_HORJUST_RIGHT", "Align right")
+#define RID_SVXITEMS_HORJUST_BLOCK              NC_("RID_SVXITEMS_HORJUST_BLOCK", "Justify")
+#define RID_SVXITEMS_HORJUST_REPEAT             NC_("RID_SVXITEMS_HORJUST_REPEAT", "Repeat alignment")
+
+// enum SvxCellVerJustify ----------------------------------------------------
+#define RID_SVXITEMS_VERJUST_STANDARD           NC_("RID_SVXITEMS_VERJUST_STANDARD", "Vertical alignment default")
+#define RID_SVXITEMS_VERJUST_TOP                NC_("RID_SVXITEMS_VERJUST_TOP", "Align to top")
+#define RID_SVXITEMS_VERJUST_CENTER             NC_("RID_SVXITEMS_VERJUST_CENTER", "Centered vertically")
+#define RID_SVXITEMS_VERJUST_BOTTOM             NC_("RID_SVXITEMS_VERJUST_BOTTOM", "Align to bottom")
+
+// enum SvxCellJustifyMethod ----------------------------------------------------
+#define RID_SVXITEMS_JUSTMETHOD_AUTO            NC_("RID_SVXITEMS_JUSTMETHOD_AUTO", "Automatic")
+#define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE      NC_("RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE", "Distributed")
+
+#define RID_SVXSTR_PAPERBIN                     NC_("RID_SVXSTR_PAPERBIN", "Paper tray")
+#define RID_SVXSTR_PAPERBIN_SETTINGS            NC_("RID_SVXSTR_PAPERBIN_SETTINGS", "[From printer settings]")
+
+#define RID_EDITUNDO_DEL                        NC_("RID_EDITUNDO_DEL", "Delete")
+#define RID_EDITUNDO_MOVE                       NC_("RID_EDITUNDO_MOVE", "Move")
+#define RID_EDITUNDO_INSERT                     NC_("RID_EDITUNDO_INSERT", "Insert")
+#define RID_EDITUNDO_REPLACE                    NC_("RID_EDITUNDO_REPLACE", "Replace")
+#define RID_EDITUNDO_SETATTRIBS                 NC_("RID_EDITUNDO_SETATTRIBS", "Apply attributes")
+#define RID_EDITUNDO_RESETATTRIBS               NC_("RID_EDITUNDO_RESETATTRIBS", "Reset attributes")
+#define RID_EDITUNDO_INDENT                     NC_("RID_EDITUNDO_INDENT", "Indent")
+#define RID_EDITUNDO_SETSTYLE                   NC_("RID_EDITUNDO_SETSTYLE", "Apply Styles")
+#define RID_EDITUNDO_TRANSLITERATE              NC_("RID_EDITUNDO_TRANSLITERATE", "Change Case")
+#define RID_STR_WORD                            NC_("RID_STR_WORD", "Word is %x")
+#define RID_STR_PARAGRAPH                       NC_("RID_STR_PARAGRAPH", "Paragraph is %x")
+#define RID_SVXSTR_AUTOMATIC                    NC_("RID_SVXSTR_AUTOMATIC", "Automatic")
+
+#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION NC_("RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION", "Image bullet in paragraph")
+#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME        NC_("RID_SVXSTR_A11Y_IMAGEBULLET_NAME", "Image bullet")
+#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION   NC_("RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION", "Paragraph: $(ARG) ")
+
+#define RID_SVXSTR_QUERY_CONTINUE               NC_("RID_SVXSTR_QUERY_CONTINUE", "Continue checking at beginning of document?")
+#define RID_SVXSTR_QUERY_BW_CONTINUE            NC_("RID_SVXSTR_QUERY_BW_CONTINUE", "Continue checking at end of document?")
+#define RID_SVXSTR_DIC_ERR_UNKNOWN              NC_("RID_SVXSTR_DIC_ERR_UNKNOWN", "Word cannot be added to dictionary\ndue to unknown reason.")
+#define RID_SVXSTR_DIC_ERR_FULL                 NC_("RID_SVXSTR_DIC_ERR_FULL", "The dictionary is already full.")
+#define RID_SVXSTR_DIC_ERR_READONLY             NC_("RID_SVXSTR_DIC_ERR_READONLY", "The dictionary is read-only.")
+
+#define RID_OUTLUNDO_DEPTH                      NC_("RID_OUTLUNDO_DEPTH", "Indent")
+#define RID_OUTLUNDO_EXPAND                     NC_("RID_OUTLUNDO_EXPAND", "Show subpoints")
+#define RID_OUTLUNDO_COLLAPSE                   NC_("RID_OUTLUNDO_COLLAPSE", "Collapse")
+#define RID_OUTLUNDO_ATTR                       NC_("RID_OUTLUNDO_ATTR", "Apply attributes")
+#define RID_OUTLUNDO_INSERT                     NC_("RID_OUTLUNDO_INSERT", "Insert")
 
 #endif
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index f402730653a0..62e5de2aad2b 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -23,7 +23,7 @@
 #include <memory>
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 4af426358849..1f1a8411c7c6 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_EDITENG_EERDLL_HXX
 #define INCLUDED_EDITENG_EERDLL_HXX
 
-#include <tools/resid.hxx>
 #include <editeng/editengdllapi.h>
+#include <rtl/ustring.hxx>
 #include <memory>
 
 class GlobalEditData;
@@ -30,13 +30,7 @@ namespace editeng
     class SharedVclResources;
 }
 
-class EDITENG_DLLPUBLIC EditResId: public ResId
-{
-public:
-    EditResId( sal_uInt16 nId );
-    static OUString GetString(sal_uInt16 nId)
-        { return EditResId(nId); }
-};
+OUString EDITENG_DLLPUBLIC EditResId(const char *pId);
 
 class EditDLL
 {
@@ -47,7 +41,7 @@ public:
     EditDLL();
     ~EditDLL();
 
-    static ResMgr* GetResMgr();
+    static std::locale& GetResLocale();
     GlobalEditData* GetGlobalData() const   { return pGlobalData.get(); }
     std::shared_ptr<editeng::SharedVclResources> GetSharedVclResources();
     static EditDLL& Get();
diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx
index 85f60b30da2a..b0ada2cce30a 100644
--- a/include/editeng/frmdir.hxx
+++ b/include/editeng/frmdir.hxx
@@ -51,6 +51,7 @@ enum class SvxFrameDirection
     Environment = css::text::WritingMode2::CONTEXT
 };
 
+const char* getFrmDirResId(size_t nIndex);
 
 #endif // INCLUDED_EDITENG_FRMDIR_HXX
 
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 873d5cd7febb..e6ac557e02c7 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -34,10 +34,10 @@ class IntlWrapper;
 
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC OUString GetSvxString( sal_uInt16 nId );
+EDITENG_DLLPUBLIC OUString GetSvxString(const char* pId);
 EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl );
 OUString GetColorString( const Color& rCol );
-EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( MapUnit eUnit );
+EDITENG_DLLPUBLIC const char* GetMetricId(MapUnit eUnit);
 
 
 inline long Scale( long nVal, long nMult, long nDiv )
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index f7a015b4a0a5..7b7f028c6aec 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -33,7 +33,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/link.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <editeng/editengdllapi.h>
 #include <com/sun/star/lang/Locale.hpp>
 
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 24c806b6952e..394a878d1085 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -23,7 +23,7 @@
 #include <editeng/paragraphdata.hxx>
 #include <editeng/editengdllapi.h>
 #include <rtl/ustring.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <memory>
 
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 45166193487c..ef1c058eaa4e 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -361,8 +361,8 @@ private:
     void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand
     void InitSymbolsOOXML() const;     /// only SymbolsOOXML, on demand
 
-    void loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap,
-            SeparatorType eSepType = SeparatorType::SEMICOLON_BASE ) const;
+    void loadSymbols(const std::pair<const char*, int>* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap,
+            SeparatorType eSepType = SeparatorType::SEMICOLON_BASE) const;
 
     /** Check pCurrentFactorToken for nParam's (0-based) ForceArray types and
         set ForceArray at rCurr if so. Set nParam+1 as 1-based
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 9b6cf62ecd19..e88cd775ca57 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -89,11 +89,6 @@ protected:
 
 class FORMULA_DLLPUBLIC FormulaDlg:
     private OModuleClient, public SfxModelessDialog, public IFormulaEditorHelper
-        // order of base classes is important, as OModuleClient controls the
-        // lifecycle of the ResMgr passed into SfxModelessDialog (via
-        // formula::ModuleRes), and at least with DBG_UTIL calling TestRes in
-        // ~Resource, the ResMgr must outlive the Resource (from which
-        // SfxModelessDialog ultimately derives)
 {
     friend class FormulaDlg_Impl;
 public:
diff --git a/include/fpicker/fpicker.hrc b/include/fpicker/fpicker.hrc
new file mode 100644
index 000000000000..ad0569aed0ed
--- /dev/null
+++ b/include/fpicker/fpicker.hrc
@@ -0,0 +1,37 @@
+/* -*- 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_FPICKER_FPICKER_HRC
+#define INCLUDED_FPICKER_FPICKER_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_SVT_FILEPICKER_AUTO_EXTENSION           NC_("STR_SVT_FILEPICKER_AUTO_EXTENSION", "~Automatic file name extension")
+#define STR_SVT_FILEPICKER_PASSWORD                 NC_("STR_SVT_FILEPICKER_PASSWORD", "Save with pass~word")
+#define STR_SVT_FILEPICKER_FILTER_OPTIONS           NC_("STR_SVT_FILEPICKER_FILTER_OPTIONS", "~Edit filter settings")
+#define STR_SVT_FILEPICKER_READONLY                 NC_("STR_SVT_FILEPICKER_READONLY", "~Read-only")
+#define STR_SVT_FILEPICKER_INSERT_AS_LINK           NC_("STR_SVT_FILEPICKER_INSERT_AS_LINK", "~Link")
+#define STR_SVT_FILEPICKER_SHOW_PREVIEW             NC_("STR_SVT_FILEPICKER_SHOW_PREVIEW", "Pr~eview")
+#define STR_SVT_FILEPICKER_PLAY                     NC_("STR_SVT_FILEPICKER_PLAY", "~Play")
+#define STR_SVT_FILEPICKER_VERSION                  NC_("STR_SVT_FILEPICKER_VERSION", "~Version:")
+#define STR_SVT_FILEPICKER_TEMPLATES                NC_("STR_SVT_FILEPICKER_TEMPLATES", "S~tyles:")
+#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE           NC_("STR_SVT_FILEPICKER_IMAGE_TEMPLATE", "Style:")
+#define STR_SVT_FILEPICKER_SELECTION                NC_("STR_SVT_FILEPICKER_SELECTION", "~Selection")
+#define STR_SVT_FILEPICKER_FILTER_TITLE             NC_("STR_SVT_FILEPICKER_FILTER_TITLE", "File ~type:")
+#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE          NC_("STR_SVT_FOLDERPICKER_DEFAULT_TITLE", "Select Path")
+#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    NC_("STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION", "Please select a folder.")
+#define STR_SVT_ALREADYEXISTOVERWRITE               NC_("STR_SVT_ALREADYEXISTOVERWRITE", "A file named \"$filename$\" already exists.\n\nDo you want to replace it?")
+#define STR_SVT_DELETESERVICE                       NC_("STR_SVT_DELETESERVICE", "Are you sure you want to delete the service?\n\"$servicename$\"")
+#define STR_SVT_ROOTLABEL                           NC_("STR_SVT_ROOTLABEL", "Root")
+#define STR_FILTERNAME_ALL                          NC_("STR_FILTERNAME_ALL", "All files")
+#define STR_FILEDLG_OPEN                            NC_("STR_FILEDLG_OPEN", "Open")
+#define STR_FILEDLG_TYPE                            NC_("STR_FILEDLG_TYPE", "File ~type")
+#define STR_FILEDLG_SAVE                            NC_("STR_FILEDLG_SAVE", "Save")
+
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx
deleted file mode 100644
index bc943b078fb9..000000000000
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ /dev/null
@@ -1,139 +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_RSC_RSC_VCL_SHARED_TYPES_HXX
-#define INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX
-
-#include <sal/types.h>
-#include <o3tl/typed_flags_set.hxx>
-
-enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS };
-
-enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
-                   SAVEAS, PRINT, CLOSE, QUIT,
-                   CUT, COPY, PASTE, UNDO,
-                   REDO, DELETE, REPEAT, FIND,
-                   FINDBACKWARD, PROPERTIES, FRONT };
-
-enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR };
-
-enum class MenuItemBits : sal_Int16
-{
-    NONE                = 0x0000,
-    CHECKABLE           = 0x0001,
-    RADIOCHECK          = 0x0002,
-    AUTOCHECK           = 0x0004,
-    ABOUT               = 0x0008,
-    HELP                = 0x0010,
-    POPUPSELECT         = 0x0020,
-    // These have been said to be a preliminary (sic) solution since 2007
-    NOSELECT            = 0x0040,
-    ICON                = 0x0080,
-    TEXT                = 0x0100,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<MenuItemBits> : is_typed_flags<MenuItemBits, 0x1ff> {};
-}
-
-enum class ToolBoxItemBits
-{
-    NONE                = 0x0000,
-    CHECKABLE           = 0x0001,
-    RADIOCHECK          = 0x0002,
-    AUTOCHECK           = 0x0004,
-    LEFT                = 0x0008,
-    AUTOSIZE            = 0x0010,
-    DROPDOWN            = 0x0020,
-    REPEAT              = 0x0040,
-    DROPDOWNONLY        = 0x00a0, // 0x0080 | DROPDOWN
-    TEXT_ONLY           = 0x0100,
-    ICON_ONLY           = 0x0200
-};
-namespace o3tl
-{
-    template<> struct typed_flags<ToolBoxItemBits> : is_typed_flags<ToolBoxItemBits, 0x3ff> {};
-}
-
-enum class ToolBoxItemType { DONTKNOW, BUTTON, SPACE, SEPARATOR, BREAK };
-
-enum class ButtonType { SYMBOLONLY, TEXT, SYMBOLTEXT };
-
-enum class SymbolType : sal_uInt16
-{
-    DONTKNOW         = 0,
-    IMAGE            = 1,
-    ARROW_UP         = 2,
-    ARROW_DOWN       = 3,
-    ARROW_LEFT       = 4,
-    ARROW_RIGHT      = 5,
-    SPIN_UP          = 6,
-    SPIN_DOWN        = 7,
-    SPIN_LEFT        = 8,
-    SPIN_RIGHT       = 9,
-    FIRST            = 10,
-    LAST             = 11,
-    PREV             = 12,
-    NEXT             = 13,
-    PAGEUP           = 14,
-    PAGEDOWN         = 15,
-    PLAY             = 16,
-    STOP             = 19,
-    CLOSE            = 25,
-    ROLLUP           = 26,
-    ROLLDOWN         = 27,
-    CHECKMARK        = 28,
-    RADIOCHECKMARK   = 29,
-    FLOAT            = 31,
-    DOCK             = 32,
-    HIDE             = 33,
-    HELP             = 34,
-    PLUS             = 35,
-    MENU             = SymbolType::SPIN_DOWN
-};
-
-
-// Border styles for SetBorder()
-enum class WindowBorderStyle : sal_Int16
-{
-    NONE              = 0x0000,
-    NORMAL            = 0x0001,
-    MONO              = 0x0002,
-    MENU              = 0x0010,
-    NWF               = 0x0020,
-    NOBORDER          = 0x1000,
-    REMOVEBORDER      = 0x2000
-};
-namespace o3tl
-{
-    template<> struct typed_flags<WindowBorderStyle> : is_typed_flags<WindowBorderStyle, 0x3033> {};
-}
-
-#define KEY_CODE_MASK       ((sal_uInt16)0x0FFF)
-
-// Modifier keys
-#define KEY_SHIFT           ((sal_uInt16)0x1000)
-#define KEY_MOD1            ((sal_uInt16)0x2000)
-#define KEY_MOD2            ((sal_uInt16)0x4000)
-#define KEY_MOD3            ((sal_uInt16)0x8000)
-#define KEY_MODIFIERS_MASK  ((sal_uInt16)0xF000)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx
index b67a710b92a4..7c3bcfeb1d3f 100644
--- a/include/sfx2/StyleManager.hxx
+++ b/include/sfx2/StyleManager.hxx
@@ -15,7 +15,7 @@
 #include <vcl/outdev.hxx>
 
 #include <sfx2/StylePreviewRenderer.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/objsh.hxx>
 
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx
index 6e3cf72b2212..eb016d6cf1d4 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -12,7 +12,6 @@
 
 #include <sfx2/dllapi.h>
 #include <vcl/outdev.hxx>
-#include <rsc/rscsfx.hxx>
 #include <svl/style.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 0b83b0561fcd..28e41d416863 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -75,7 +75,6 @@ namespace vcl { class Window; }
 struct SfxChildWinFactory;
 struct SfxStbCtrlFactory;
 struct SfxTbxCtrlFactory;
-class SimpleResMgr;
 class ModalDialog;
 class SbxArray;
 class SbxValue;
@@ -134,8 +133,8 @@ public:
     static SfxApplication*      GetOrCreate();
     static SfxApplication*      Get();
 
-    // Resource Manager
-    static ResMgr*              GetSfxResManager();
+    // Resource Locale
+    static std::locale*         GetSfxResLocale();
 
     // DDE
 #if defined(_WIN32)
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 014196c50578..de487dafaa3f 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace frame {
 class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
 private:
-    ResMgr*                     pResMgr;
+    std::locale                 m_aResLocale;
 
     // Warning this cannot be turned into a unique_ptr.
     // SfxInterface destruction in the SfxSlotPool refers again to pImpl after deletion of pImpl has commenced. See tdf#100270
@@ -69,10 +69,10 @@ private:
 
 public:
 
-                                SfxModule( ResMgr* pMgrP, std::initializer_list<SfxObjectFactory*> pFactoryList);
-                                virtual ~SfxModule() override;
+    SfxModule(const std::locale& rResLocale, std::initializer_list<SfxObjectFactory*> pFactoryList);
+    virtual ~SfxModule() override;
 
-    ResMgr*                     GetResMgr();
+    const std::locale&          GetResLocale() const { return m_aResLocale; }
     SfxSlotPool*                GetSlotPool() const;
 
     void                        RegisterToolBoxControl(const SfxTbxCtrlFactory&);
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index e8b12ec54cec..a0a9afb0ef7f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
 #include <sfx2/toolbarids.hxx>
-#include <tools/resid.hxx>
 
 struct SfxInterface_Impl;
 class  SfxConfigItem;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 5b97ce138570..6b6f5758dfca 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -41,7 +41,7 @@
 #include <vcl/bitmap.hxx>
 #include <sot/formats.hxx>
 #include <sot/object.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/XmlIdRegistry.hxx>
 #include <sfx2/shell.hxx>
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 8f24aa447dbe..1b5e603d6b40 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -76,52 +76,6 @@
 
 #define RID_DEFAULTABOUT                    (RID_SFX_START+0)
 
-// +13 already used!
-#define STR_STYLE_FILTER_HIERARCHICAL       (RID_SFX_START+1200)
-
-#define STR_NONAME                          (RID_SFX_START+100)
-#define STR_NONE                            (RID_SFX_START+101)
-#define STR_STANDARD                        (RID_SFX_START+104)
-#define STR_READONLY                        (RID_SFX_START+105)
-
-#define STR_SFX_FILTERNAME_ALL              (RID_SFX_START+106)
-#define STR_SFX_FILTERNAME_PDF              (RID_SFX_START+107)
-#define STR_EDIT                            (RID_SFX_START+108)
-
-#define STR_BYTES                           (RID_SFX_START+111)
-#define STR_KB                              (RID_SFX_START+112)
-#define STR_MB                              (RID_SFX_START+113)
-#define STR_GB                              (RID_SFX_START+114)
-#define STR_QUERY_LASTVERSION               (RID_SFX_START+115)
-#define STR_STANDARD_SHORTCUT               (RID_SFX_START+117)
-#define STR_REPAIREDDOCUMENT                (RID_SFX_START+118)
-#define STR_ERRUNOEVENTBINDUNG              (RID_SFX_START+119)
-#define STR_SHARED                          (RID_SFX_START+120)
-#define RID_XMLSEC_DOCUMENTSIGNED           (RID_SFX_START+121)
-#define STR_EMBEDDED_TITLE                  (RID_SFX_START+122)
-#define STR_PASSWD_EMPTY                    (RID_SFX_START+123)
-#define STR_PASSWD_MIN_LEN                  (RID_SFX_START+124)
-#define STR_NONCHECKEDOUT_DOCUMENT          (RID_SFX_START+125)
-#define STR_CHECKOUT                        (RID_SFX_START+126)
-#define STR_READONLY_EDIT                   (RID_SFX_START+127)
-#define STR_READONLY_DOCUMENT               (RID_SFX_START+128)
-#define STR_PASSWD_MIN_LEN1                 (RID_SFX_START+129)
-#define STR_MODULENOTINSTALLED              (RID_SFX_START+130)
-#define STR_CLASSIFIED_DOCUMENT             (RID_SFX_START+131)
-#define STR_TARGET_DOC_NOT_CLASSIFIED       (RID_SFX_START+132)
-#define STR_DOC_CLASSIFICATION_TOO_LOW      (RID_SFX_START+133)
-#define STR_CLASSIFIED_INTELLECTUAL_PROPERTY (RID_SFX_START+134)
-#define STR_CLASSIFIED_NATIONAL_SECURITY    (RID_SFX_START+135)
-#define STR_CLASSIFIED_EXPORT_CONTROL       (RID_SFX_START+136)
-#define STR_READONLY_SIGN                   (RID_SFX_START+137)
-#define STR_READONLY_PDF                    (RID_SFX_START+138)
-#define STR_SIGNATURE_BROKEN                (RID_SFX_START+139)
-#define STR_SIGNATURE_INVALID               (RID_SFX_START+140)
-#define STR_SIGNATURE_SHOW                  (RID_SFX_START+141)
-#define STR_SIGNATURE_NOTVALIDATED          (RID_SFX_START+142)
-#define STR_SIGNATURE_PARTIAL_OK            (RID_SFX_START+143)
-#define STR_SIGNATURE_OK                    (RID_SFX_START+144)
-
 // group ids
 
 // !! If you add a new group, please change sfxbasecontroller.cxx and
@@ -172,7 +126,7 @@
 #define MID_DOCINFO_DESCRIPTION              0x13
 #define MID_DOCINFO_KEYWORDS                 0x17
 #define MID_DOCINFO_SUBJECT                  0x1b
-#define MID_DOCINFO_TITLE                        0x1d
+#define MID_DOCINFO_TITLE                    0x1d
 #define MID_DOCINFO_AUTOLOADENABLED          0x2d
 #define MID_DOCINFO_AUTOLOADURL              0x2e
 #define MID_DOCINFO_AUTOLOADSECS             0x2f
@@ -183,8 +137,8 @@
 
 // only for FastPropertySet
 #define MID_TYPE                             0x38
-#define MID_VALUE               	     0x39
-#define MID_VALUESET   	                     0x40
+#define MID_VALUE                            0x39
+#define MID_VALUESET                         0x40
 
 // Config-Ids -----------------------------------------------------------
 
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index 945d79939cdb..b7b7f553c4ef 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
@@ -20,18 +20,16 @@
 #define INCLUDED_SFX2_SFXRESID_HXX
 
 #include <sfx2/dllapi.h>
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
+#include <locale>
 
-struct SFX2_DLLPUBLIC SfxResMgr
+struct SFX2_DLLPUBLIC SfxResLocale
 {
-    static ResMgr* GetResMgr();
-    static void DeleteResMgr();
+    static std::locale* GetResLocale();
+    static void DeleteResLocale();
 };
 
-inline OUString SfxResId(sal_uInt16 nId)
-{
-    return ResId(nId, *SfxResMgr::GetResMgr());
-}
+SFX2_DLLPUBLIC OUString SfxResId(const char* pId);
 
 #endif
 
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 82364685964e..e82a000a9f13 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -30,7 +30,6 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/strong_int.hxx>
 
-class ResMgr;
 namespace vcl { class Window; }
 class ToolBox;
 class SfxItemPool;
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
new file mode 100644
index 000000000000..1b0ea6ccb2ff
--- /dev/null
+++ b/include/sfx2/strings.hrc
@@ -0,0 +1,281 @@
+/* -*- 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_SFX2_INC_STRINGS_HRC
+#define INCLUDED_SFX2_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_TEMPLATE_FILTER                     NC_("STR_TEMPLATE_FILTER", "Templates")
+#define STR_SAVEDOC                             NC_("STR_SAVEDOC", "~Save")
+#define STR_SAVEASDOC                           NC_("STR_SAVEASDOC", "Save ~As...")
+#define STR_SAVEACOPY                           NC_("STR_SAVEACOPY", "Save a Copy...")
+#define STR_CLOSEDOC                            NC_("STR_CLOSEDOC", "~Close")
+#define STR_OPEN                                NC_("STR_OPEN", "Open")
+#define STR_EDIT_TEMPLATE                       NC_("STR_EDIT_TEMPLATE", "Edit")
+#define STR_DEFAULT_TEMPLATE                    NC_("STR_DEFAULT_TEMPLATE", "Set As Default")
+#define STR_RESET_DEFAULT                       NC_("STR_RESET_DEFAULT", "Reset Default")
+#define STR_DELETE                              NC_("STR_DELETE", "Delete")
+#define STR_RENAME                              NC_("STR_RENAME", "Rename")
+#define STR_CATEGORY_RENAME                     NC_("STR_CATEGORY_RENAME", "Rename Category")
+#define STR_RENAME_TEMPLATE                     NC_("STR_RENAME_TEMPLATE", "Enter New Name: ")
+#define STR_TEMPLATE_TOOLTIP                    NC_("STR_TEMPLATE_TOOLTIP", "Title: $1\nCategory: $2")
+#define STR_TEMPLATE_SELECTION                  NC_("STR_TEMPLATE_SELECTION", "Select a Template")
+#define STR_AUTOMATICVERSION                    NC_("STR_AUTOMATICVERSION", "Automatically saved version")
+#define STR_EXPORTBUTTON                        NC_("STR_EXPORTBUTTON", "Export")
+#define STR_LABEL_FILEFORMAT                    NC_("STR_LABEL_FILEFORMAT", "File format:")
+#define STR_HIDDENINFO_CONTAINS                 NC_("STR_HIDDENINFO_CONTAINS", "This document contains:\n\n")
+#define STR_HIDDENINFO_RECORDCHANGES            NC_("STR_HIDDENINFO_RECORDCHANGES", "Recorded changes")
+#define STR_HIDDENINFO_NOTES                    NC_("STR_HIDDENINFO_NOTES", "Notes")
+#define STR_HIDDENINFO_DOCVERSIONS              NC_("STR_HIDDENINFO_DOCVERSIONS", "Document versions")
+#define STR_HIDDENINFO_CONTINUE_SAVING          NC_("STR_HIDDENINFO_CONTINUE_SAVING", "Do you want to continue saving the document?")
+#define STR_HIDDENINFO_CONTINUE_PRINTING        NC_("STR_HIDDENINFO_CONTINUE_PRINTING", "Do you want to continue printing the document?")
+#define STR_HIDDENINFO_CONTINUE_SIGNING         NC_("STR_HIDDENINFO_CONTINUE_SIGNING", "Do you want to continue signing the document?")
+#define STR_HIDDENINFO_CONTINUE_CREATEPDF       NC_("STR_HIDDENINFO_CONTINUE_CREATEPDF", "Do you want to continue creating a PDF file?")
+#define STR_NEW_FILENAME_SAVE                   NC_("STR_NEW_FILENAME_SAVE", "If you do not want to overwrite the original document, you should save your work under a new filename.")
+// Used in the title of a shared document.
+#define STR_SHARED                              NC_("STR_SHARED", " (shared)")
+#define STR_XMLSEC_ODF12_EXPECTED               NC_("STR_XMLSEC_ODF12_EXPECTED", "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x).")
+#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN   NC_("STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN", "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?")
+#define STR_QRYTEMPL_MESSAGE                    NC_("STR_QRYTEMPL_MESSAGE", "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?")
+#define STR_QRYTEMPL_UPDATE_BTN                 NC_("STR_QRYTEMPL_UPDATE_BTN", "~Update Styles")
+#define STR_QRYTEMPL_KEEP_BTN                   NC_("STR_QRYTEMPL_KEEP_BTN", "~Keep Old Styles")
+#define STR_ACTION_REFRESH                      NC_("STR_ACTION_REFRESH", "Refresh")
+// leave ending space
+#define STR_ACTION_DEFAULT                      NC_("STR_ACTION_DEFAULT", "Reset Default Template ")
+#define STR_CATEGORY_NEW                        NC_("STR_CATEGORY_NEW", "New Category")
+#define STR_CATEGORY_DELETE                     NC_("STR_CATEGORY_DELETE", "Delete Category")
+#define STR_CATEGORY_SELECT                     NC_("STR_CATEGORY_SELECT", "Select Category")
+#define STR_MSG_EXPORT_SUCCESS                  NC_("STR_MSG_EXPORT_SUCCESS", "$1 templates successfully exported.")
+#define STR_MSG_QUERY_COPY                      NC_("STR_MSG_QUERY_COPY", "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?")
+#define STR_CREATE_ERROR                        NC_("STR_CREATE_ERROR", "Cannot create category: $1")
+#define STR_ERROR_SAVEAS                        NC_("STR_ERROR_SAVEAS", "Cannot save template: $1")
+#define STR_INPUT_NEW                           NC_("STR_INPUT_NEW", "Enter category name:")
+#define STR_MSG_ERROR_LOCAL_MOVE                NC_("STR_MSG_ERROR_LOCAL_MOVE", "Error moving the following templates to $1.\n$2")
+#define STR_MSG_ERROR_EXPORT                    NC_("STR_MSG_ERROR_EXPORT", "Error exporting the following templates:\n$1")
+#define STR_MSG_ERROR_IMPORT                    NC_("STR_MSG_ERROR_IMPORT", "Error importing the following templates to $1:\n$2")
+#define STR_MSG_ERROR_DELETE_TEMPLATE           NC_("STR_MSG_ERROR_DELETE_TEMPLATE", "The following templates cannot be deleted:\n$1")
+#define STR_MSG_ERROR_DELETE_FOLDER             NC_("STR_MSG_ERROR_DELETE_FOLDER", "The following folders cannot be deleted:\n$1")
+#define STR_QMSG_SEL_FOLDER_DELETE              NC_("STR_QMSG_SEL_FOLDER_DELETE", "Do you want to delete the selected folders?")
+#define STR_QMSG_TEMPLATE_OVERWRITE             NC_("STR_QMSG_TEMPLATE_OVERWRITE", "A template named $1 already exist in $2. Do you want to overwrite it?")
+#define STR_QMSG_SEL_TEMPLATE_DELETE            NC_("STR_QMSG_SEL_TEMPLATE_DELETE", "Do you want to delete the selected templates?")
+#define STR_QMSG_ERROR_OPENING_FILE             NC_("STR_QMSG_ERROR_OPENING_FILE", "An error occurred during opening the file. This may be caused by incorrect file contents.\n")
+#define STR_QMSG_ERROR_OPENING_FILE_DETAILS     NC_("STR_QMSG_ERROR_OPENING_FILE_DETAILS", "The error details are:\n")
+#define STR_QMSG_ERROR_OPENING_FILE_CONTINUE    NC_("STR_QMSG_ERROR_OPENING_FILE_CONTINUE", "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?")
+
+#define STR_HELP_WINDOW_TITLE                   NC_("STR_HELP_WINDOW_TITLE", "%PRODUCTNAME Help")
+#define STR_HELP_BUTTON_INDEX_ON                NC_("STR_HELP_BUTTON_INDEX_ON", "Show Navigation Pane")
+#define STR_HELP_BUTTON_INDEX_OFF               NC_("STR_HELP_BUTTON_INDEX_OFF", "Hide Navigation Pane")
+#define STR_HELP_BUTTON_START                   NC_("STR_HELP_BUTTON_START", "First Page")
+#define STR_HELP_BUTTON_PREV                    NC_("STR_HELP_BUTTON_PREV", "Previous Page")
+#define STR_HELP_BUTTON_NEXT                    NC_("STR_HELP_BUTTON_NEXT", "Next Page")
+#define STR_HELP_BUTTON_PRINT                   NC_("STR_HELP_BUTTON_PRINT", "Print...")
+#define STR_HELP_BUTTON_ADDBOOKMARK             NC_("STR_HELP_BUTTON_ADDBOOKMARK", "Add to Bookmarks...")
+#define STR_HELP_BUTTON_SEARCHDIALOG            NC_("STR_HELP_BUTTON_SEARCHDIALOG", "Find on this Page...")
+#define STR_HELP_BUTTON_SOURCEVIEW              NC_("STR_HELP_BUTTON_SOURCEVIEW", "HTML Source")
+#define STR_HELP_MENU_TEXT_SELECTION_MODE       NC_("STR_HELP_MENU_TEXT_SELECTION_MODE", "Select Text")
+#define STR_HELP_MENU_TEXT_COPY                 NC_("STR_HELP_MENU_TEXT_COPY", "~Copy")
+#define STR_INFO_NOSEARCHRESULTS                NC_("STR_INFO_NOSEARCHRESULTS", "No topics found.")
+#define STR_INFO_NOSEARCHTEXTFOUND              NC_("STR_INFO_NOSEARCHTEXTFOUND", "The text you entered was not found.")
+#define RID_HELP_ONSTARTUP_TEXT                 NC_("RID_HELP_ONSTARTUP_TEXT", "~Display %PRODUCTNAME %MODULENAME Help at Startup")
+
+#define STR_NONAME                              NC_("STR_NONAME", "Untitled")
+#define STR_STANDARD_SHORTCUT                   NC_("STR_STANDARD_SHORTCUT", "Standard")
+#define STR_BYTES                               NC_("STR_BYTES", "Bytes")
+#define STR_KB                                  NC_("STR_KB", "KB")
+#define STR_MB                                  NC_("STR_MB", "MB")
+#define STR_GB                                  NC_("STR_GB", "GB")
+#define STR_QUERY_LASTVERSION                   NC_("STR_QUERY_LASTVERSION", "Cancel all changes?")
+#define STR_NO_WEBBROWSER_FOUND                 NC_("STR_NO_WEBBROWSER_FOUND", "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\nMaybe no web browser could be found on your system. In that case, please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation.")
+#define STR_NO_ABS_URI_REF                      NC_("STR_NO_ABS_URI_REF", "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it.")
+#define STR_GID_INTERN                          NC_("STR_GID_INTERN", "Internal")
+#define STR_GID_APPLICATION                     NC_("STR_GID_APPLICATION", "Application")
+#define STR_GID_VIEW                            NC_("STR_GID_VIEW", "View")
+#define STR_GID_DOCUMENT                        NC_("STR_GID_DOCUMENT", "Documents")
+#define STR_GID_EDIT                            NC_("STR_GID_EDIT", "Edit")
+#define STR_GID_MACRO                           NC_("STR_GID_MACRO", "BASIC")
+#define STR_GID_OPTIONS                         NC_("STR_GID_OPTIONS", "Options")
+#define STR_GID_MATH                            NC_("STR_GID_MATH", "Math")
+#define STR_GID_NAVIGATOR                       NC_("STR_GID_NAVIGATOR", "Navigate")
+#define STR_GID_INSERT                          NC_("STR_GID_INSERT", "Insert")
+#define STR_GID_FORMAT                          NC_("STR_GID_FORMAT", "Format")
+#define STR_GID_TEMPLATE                        NC_("STR_GID_TEMPLATE", "Templates")
+#define STR_GID_TEXT                            NC_("STR_GID_TEXT", "Text")
+#define STR_GID_FRAME                           NC_("STR_GID_FRAME", "Frame")
+#define STR_GID_GRAPHIC                         NC_("STR_GID_GRAPHIC", "Image")
+#define STR_GID_TABLE                           NC_("STR_GID_TABLE", "Table")
+#define STR_GID_ENUMERATION                     NC_("STR_GID_ENUMERATION", "Numbering")
+#define STR_GID_DATA                            NC_("STR_GID_DATA", "Data")
+#define STR_GID_SPECIAL                         NC_("STR_GID_SPECIAL", "Special Functions")
+#define STR_GID_IMAGE                           NC_("STR_GID_IMAGE", "Image")
+#define STR_GID_CHART                           NC_("STR_GID_CHART", "Chart")
+#define STR_GID_EXPLORER                        NC_("STR_GID_EXPLORER", "Explorer")
+#define STR_GID_CONNECTOR                       NC_("STR_GID_CONNECTOR", "Connector")
+#define STR_GID_MODIFY                          NC_("STR_GID_MODIFY", "Modify")
+#define STR_GID_DRAWING                         NC_("STR_GID_DRAWING", "Drawing")
+#define STR_GID_CONTROLS                        NC_("STR_GID_CONTROLS", "Controls")
+#define STR_QUITAPP                             NC_("STR_QUITAPP", "E~xit %PRODUCTNAME")
+#define RID_STR_HELP                            NC_("RID_STR_HELP", "Help")
+#define RID_STR_HLPFILENOTEXIST                 NC_("RID_STR_HLPFILENOTEXIST", "The help file for this topic is not installed.")
+#define STR_QUICKSTART_EXIT                     NC_("STR_QUICKSTART_EXIT", "Exit Quickstarter")
+#define STR_QUICKSTART_TIP                      NC_("STR_QUICKSTART_TIP", "%PRODUCTNAME %PRODUCTVERSION Quickstarter")
+#define STR_QUICKSTART_FILEOPEN                 NC_("STR_QUICKSTART_FILEOPEN", "Open Document...")
+#define STR_QUICKSTART_FROMTEMPLATE             NC_("STR_QUICKSTART_FROMTEMPLATE", "From Template...")
+#define STR_QUICKSTART_PRELAUNCH                NC_("STR_QUICKSTART_PRELAUNCH", "Load %PRODUCTNAME During System Start-Up")
+#define STR_QUICKSTART_PRELAUNCH_UNX            NC_("STR_QUICKSTART_PRELAUNCH_UNX", "Disable systray Quickstarter")
+#define STR_QUICKSTART_LNKNAME                  NC_("STR_QUICKSTART_LNKNAME", "%PRODUCTNAME %PRODUCTVERSION")
+#define STR_QUICKSTART_FILE                     NC_("STR_QUICKSTART_FILE", "File")
+#define STR_QUICKSTART_STARTCENTER              NC_("STR_QUICKSTART_STARTCENTER", "Startcenter")
+#define STR_QUICKSTART_RECENTDOC                NC_("STR_QUICKSTART_RECENTDOC", "Recent Documents")
+#define STR_QUERY_UPDATE_LINKS                  NC_("STR_QUERY_UPDATE_LINKS", "This document contains one or more links to external data.\n\nWould you like to change the document, and update all links\nto get the most recent data?")
+#define STR_DDE_ERROR                           NC_("STR_DDE_ERROR", "DDE link to %1 for %2 area %3 are not available.")
+#define STR_SECURITY_WARNING_NO_HYPERLINKS      NC_("STR_SECURITY_WARNING_NO_HYPERLINKS", "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened.")
+#define RID_SECURITY_WARNING_TITLE                  NC_("RID_SECURITY_WARNING_TITLE", "Security Warning")
+#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE NC_("RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE", "Saving will remove all existing signatures.\nDo you want to continue saving the document?")
+#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN  NC_("RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN", "The document has to be saved before it can be signed.\nDo you want to save the document?")
+#define STR_QUERY_CANCELCHECKOUT                NC_("STR_QUERY_CANCELCHECKOUT", "This will discard all changes on the server since check-out.\nDo you want to proceed?")
+#define STR_INFO_WRONGDOCFORMAT                 NC_("STR_INFO_WRONGDOCFORMAT", "This document must be saved in OpenDocument file format before it can be digitally signed.")
+#define RID_XMLSEC_DOCUMENTSIGNED               NC_("RID_XMLSEC_DOCUMENTSIGNED", " (Signed)")
+#define STR_EMBEDDED_TITLE                      NC_("STR_EMBEDDED_TITLE", " (Embedded document)")
+#define STR_STANDARD                            NC_("STR_STANDARD", "Standard")
+#define RID_SVXSTR_FILELINK                     NC_("RID_SVXSTR_FILELINK", "Document")
+#define STR_NONE                                NC_("STR_NONE", "- None -")
+#define RID_SVXSTR_GRAFIKLINK                   NC_("RID_SVXSTR_GRAFIKLINK", "Image")
+#define STR_SFX_FILTERNAME_ALL                  NC_("STR_SFX_FILTERNAME_ALL", "All files")
+#define STR_SFX_FILTERNAME_PDF                  NC_("STR_SFX_FILTERNAME_PDF", "PDF files")
+#define RID_SVXSTR_EDITGRFLINK                  NC_("RID_SVXSTR_EDITGRFLINK", "Link Image")
+// i66948 used in project scripting
+#define STR_ERRUNOEVENTBINDUNG                  NC_("STR_ERRUNOEVENTBINDUNG", "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.")
+#define RID_SVXSTR_GRFILTER_OPENERROR           NC_("RID_SVXSTR_GRFILTER_OPENERROR", "Image file cannot be opened")
+#define RID_SVXSTR_GRFILTER_IOERROR             NC_("RID_SVXSTR_GRFILTER_IOERROR", "Image file cannot be read")
+#define RID_SVXSTR_GRFILTER_FORMATERROR         NC_("RID_SVXSTR_GRFILTER_FORMATERROR", "Unknown image format")
+#define RID_SVXSTR_GRFILTER_VERSIONERROR        NC_("RID_SVXSTR_GRFILTER_VERSIONERROR", "This version of the image file is not supported")
+#define RID_SVXSTR_GRFILTER_FILTERERROR         NC_("RID_SVXSTR_GRFILTER_FILTERERROR", "Image filter not found")
+#define RID_SVXSTR_END_REDLINING_WARNING        NC_("RID_SVXSTR_END_REDLINING_WARNING", "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n")
+#define RID_SVXSTR_INCORRECT_PASSWORD           NC_("RID_SVXSTR_INCORRECT_PASSWORD", "Incorrect password")
+
+#define STR_PASSWD_MIN_LEN                      NC_("STR_PASSWD_MIN_LEN", "(Minimum $(MINLEN) characters)")
+#define STR_PASSWD_MIN_LEN1                     NC_("STR_PASSWD_MIN_LEN1", "(Minimum 1 character)")
+#define STR_PASSWD_EMPTY                        NC_("STR_PASSWD_EMPTY", "(The password can be empty)")
+#define STR_MODULENOTINSTALLED                  NC_("STR_MODULENOTINSTALLED", "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed.")
+
+#define STR_FILTER_NOT_INSTALLED                NC_("STR_FILTER_NOT_INSTALLED", "The selected filter $(FILTER) has not been installed.\nWould you like to do this now?")
+#define STR_FILTER_CONSULT_SERVICE              NC_("STR_FILTER_CONSULT_SERVICE", "The selected filter $(FILTER) is not included in your edition.\nYou can find information about orders on our homepage.")
+
+#define STR_WELCOME_LINE1                       NC_("STR_WELCOME_LINE1", "Welcome to %PRODUCTNAME.")
+#define STR_WELCOME_LINE2                       NC_("STR_WELCOME_LINE2", "Drop a document here or pick an app from the left side to create one.")
+
+#define STR_SFX_FILEDLG_ACTUALVERSION           NC_("STR_SFX_FILEDLG_ACTUALVERSION", "Current version")
+#define STR_SFX_EXPLORERFILE_EXPORT             NC_("STR_SFX_EXPLORERFILE_EXPORT", "Export")
+#define STR_SFX_EXPLORERFILE_INSERT             NC_("STR_SFX_EXPLORERFILE_INSERT", "Insert")
+#define STR_SFX_EXPLORERFILE_BUTTONINSERT       NC_("STR_SFX_EXPLORERFILE_BUTTONINSERT", "~Insert")
+#define STR_SFX_IMPORT_ALL                      NC_("STR_SFX_IMPORT_ALL", "<All formats>")
+#define STR_PB_SAVEACOPY                        NC_("STR_PB_SAVEACOPY", "Save a Copy")
+#define STR_PB_COMPAREDOC                       NC_("STR_PB_COMPAREDOC", "Compare to")
+#define STR_PB_MERGEDOC                         NC_("STR_PB_MERGEDOC", "Merge with")
+
+#define STR_SFX_NEWOFFICEDOC                    NC_("STR_SFX_NEWOFFICEDOC", "%PRODUCTNAME document")
+#define SFX_ST_DURATION_FORMAT                  NC_("SFX_ST_DURATION_FORMAT", " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6")
+#define STR_SFX_REMOVE_PROPERTY                 NC_("STR_SFX_REMOVE_PROPERTY", "Remove Property")
+#define STR_SFX_QUERY_WRONG_TYPE                NC_("STR_SFX_QUERY_WRONG_TYPE", "The value entered does not match the specified type.\nThe value will be stored as text.")
+
+#define STR_QUERY_OVERWRITE                     NC_("STR_QUERY_OVERWRITE", "Style already exists. Overwrite?")
+
+#define STR_RESET                               NC_("STR_RESET", "~Reset")
+#define STR_TABPAGE_INVALIDNAME                 NC_("STR_TABPAGE_INVALIDNAME", "This name is already in use.")
+#define STR_TABPAGE_INVALIDSTYLE                NC_("STR_TABPAGE_INVALIDSTYLE", "This Style does not exist.")
+#define STR_TABPAGE_INVALIDPARENT               NC_("STR_TABPAGE_INVALIDPARENT", "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference.")
+#define STR_POOL_STYLE_NAME                     NC_("STR_POOL_STYLE_NAME", "Name already exists as a default Style.\nPlease choose another name.")
+#define STR_DELETE_STYLE_USED                   NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n")
+#define STR_DELETE_STYLE                        NC_("STR_DELETE_STYLE", "Styles in use: ")
+#define STR_SID_NAVIGATOR                       NC_("STR_SID_NAVIGATOR", "Navigator")
+#define STR_SID_SIDEBAR                         NC_("STR_SID_SIDEBAR", "Sidebar")
+#define STR_ERROR_WRONG_CONFIRM                 NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation")
+#define STR_PDF_EXPORT_SEND                     NC_("STR_PDF_EXPORT_SEND", "Send")
+#define STR_FONT_TABPAGE                        NC_("STR_FONT_TABPAGE", "Font")
+#define STR_PREVIEW_CHECKBOX                    NC_("STR_PREVIEW_CHECKBOX", "Show Previews")
+
+#define STR_VIEWVERSIONCOMMENT                  NC_("STR_VIEWVERSIONCOMMENT", "View Version Comment")
+#define STR_NO_NAME_SET                         NC_("STR_NO_NAME_SET", "(no name set)")
+
+#define STR_STYLE_ELEMTLIST                     NC_("STR_STYLE_ELEMTLIST", "Style List")
+#define STR_STYLE_FILTER_HIERARCHICAL           NC_("STR_STYLE_FILTER_HIERARCHICAL", "Hierarchical")
+#define STR_STYLE_FILL_FORMAT_MODE              NC_("STR_STYLE_FILL_FORMAT_MODE", "Fill Format Mode")
+#define STR_STYLE_NEW_STYLE_FROM_SELECTION      NC_("STR_STYLE_NEW_STYLE_FROM_SELECTION", "New Style from Selection")
+#define STR_STYLE_UPDATE_STYLE                  NC_("STR_STYLE_UPDATE_STYLE", "Update Style")
+
+#define STR_MACRO_LOSS                          NC_("STR_MACRO_LOSS", "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.")
+#define STR_CANCEL_RECORDING                    NC_("STR_CANCEL_RECORDING", "Cancel Recording")
+
+#define RID_CNT_STR_WAITING                     NC_("RID_CNT_STR_WAITING", "The templates are being initialized for first-time usage.")
+
+#define STR_NODEFPRINTER                        NC_("STR_NODEFPRINTER", "No default printer found.\nPlease choose a printer and try again.")
+#define STR_NOSTARTPRINTER                      NC_("STR_NOSTARTPRINTER", "Could not start printer.\nPlease check your printer configuration.")
+#define STR_ERROR_PRINTER_BUSY                  NC_("STR_ERROR_PRINTER_BUSY", "Printer busy")
+#define STR_READONLY                            NC_("STR_READONLY", " (read-only)")
+#define STR_PRINT_NEWORI                        NC_("STR_PRINT_NEWORI", "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?")
+#define STR_PRINT_NEWSIZE                       NC_("STR_PRINT_NEWSIZE", "The page size has been modified.\nShould the new settings be saved\nin the active document?")
+#define STR_PRINT_NEWORISIZE                    NC_("STR_PRINT_NEWORISIZE", "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?")
+#define STR_CANT_CLOSE                          NC_("STR_CANT_CLOSE", "The document cannot be closed because a\n print job is being carried out.")
+#define STR_ERROR_SEND_MAIL                     NC_("STR_ERROR_SEND_MAIL", "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings.")
+#define STR_QUERY_OPENASTEMPLATE                NC_("STR_QUERY_OPENASTEMPLATE", "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?")
+#define STR_REPAIREDDOCUMENT                    NC_("STR_REPAIREDDOCUMENT", " (repaired document)")
+#define STR_NONCHECKEDOUT_DOCUMENT              NC_("STR_NONCHECKEDOUT_DOCUMENT", "This document is not checked out on the server.")
+#define STR_READONLY_DOCUMENT                   NC_("STR_READONLY_DOCUMENT", "This document is open in read-only mode.")
+#define STR_READONLY_PDF                        NC_("STR_READONLY_PDF", "This PDF is open in read-only mode to allow signing the existing file.")
+#define STR_CLASSIFIED_DOCUMENT                 NC_("STR_CLASSIFIED_DOCUMENT", "The classification label of this document is %1.")
+#define STR_TARGET_DOC_NOT_CLASSIFIED           NC_("STR_TARGET_DOC_NOT_CLASSIFIED", "This document must be classified before the clipboard can be pasted.")
+#define STR_DOC_CLASSIFICATION_TOO_LOW          NC_("STR_DOC_CLASSIFICATION_TOO_LOW", "This document has a lower classification level than the clipboard.")
+#define STR_CLASSIFIED_INTELLECTUAL_PROPERTY    NC_("STR_CLASSIFIED_INTELLECTUAL_PROPERTY", "Intellectual Property:")
+#define STR_CLASSIFIED_NATIONAL_SECURITY        NC_("STR_CLASSIFIED_NATIONAL_SECURITY", "National Security:")
+#define STR_CLASSIFIED_EXPORT_CONTROL           NC_("STR_CLASSIFIED_EXPORT_CONTROL", "Export Control:")
+#define STR_CHECKOUT                            NC_("STR_CHECKOUT", "Check Out")
+#define STR_READONLY_EDIT                       NC_("STR_READONLY_EDIT", "Edit Document")
+#define STR_READONLY_SIGN                       NC_("STR_READONLY_SIGN", "Sign Document")
+#define STR_SIGNATURE_BROKEN                    NC_("STR_SIGNATURE_BROKEN", "This document has an invalid signature.")
+#define STR_SIGNATURE_INVALID                   NC_("STR_SIGNATURE_INVALID", "The signature was valid, but the document has been modified")
+#define STR_SIGNATURE_NOTVALIDATED              NC_("STR_SIGNATURE_NOTVALIDATED", "The signature is OK, but the certificate could not be validated.")
+#define STR_SIGNATURE_PARTIAL_OK                NC_("STR_SIGNATURE_PARTIAL_OK", "The signature is OK, but the document is only partially signed.")
+#define STR_SIGNATURE_OK                        NC_("STR_SIGNATURE_OK", "This document is digitally signed and the signature is valid.")
+#define STR_SIGNATURE_SHOW                      NC_("STR_SIGNATURE_SHOW", "Show Signatures")
+
+#define STR_SFX_DOCK                            NC_("STR_SFX_DOCK", "Dock")
+#define STR_SFX_UNDOCK                          NC_("STR_SFX_UNDOCK", "Undock")
+
+#define SFX_STR_SIDEBAR_MORE_OPTIONS            NC_("SFX_STR_SIDEBAR_MORE_OPTIONS", "More Options")
+#define SFX_STR_SIDEBAR_CLOSE_DECK              NC_("SFX_STR_SIDEBAR_CLOSE_DECK", "Close Sidebar Deck")
+#define SFX_STR_SIDEBAR_SETTINGS                NC_("SFX_STR_SIDEBAR_SETTINGS", "Sidebar Settings")
+#define SFX_STR_SIDEBAR_CUSTOMIZATION           NC_("SFX_STR_SIDEBAR_CUSTOMIZATION", "Customization")
+#define SFX_STR_SIDEBAR_RESTORE                 NC_("SFX_STR_SIDEBAR_RESTORE", "Restore Default")
+#define SFX_STR_SIDEBAR_HIDE_SIDEBAR            NC_("SFX_STR_SIDEBAR_HIDE_SIDEBAR", "Close Sidebar")
+
+#define STR_TEMPLATE_NAME1                      NC_("STR_TEMPLATE_NAME1", "Abstract Green")
+#define STR_TEMPLATE_NAME2                      NC_("STR_TEMPLATE_NAME2", "Abstract Red")
+#define STR_TEMPLATE_NAME3                      NC_("STR_TEMPLATE_NAME3", "Abstract Yellow")
+#define STR_TEMPLATE_NAME4                      NC_("STR_TEMPLATE_NAME4", "Bright Blue")
+#define STR_TEMPLATE_NAME5                      NC_("STR_TEMPLATE_NAME5", "DNA")
+#define STR_TEMPLATE_NAME6                      NC_("STR_TEMPLATE_NAME6", "Inspiration")
+#define STR_TEMPLATE_NAME7                      NC_("STR_TEMPLATE_NAME7", "Lush Green")
+#define STR_TEMPLATE_NAME8                      NC_("STR_TEMPLATE_NAME8", "Metropolis")
+#define STR_TEMPLATE_NAME9                      NC_("STR_TEMPLATE_NAME9", "Sunset")
+#define STR_TEMPLATE_NAME10                     NC_("STR_TEMPLATE_NAME10", "Vintage")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 5c96960f428b..5f59f6e55b07 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -24,15 +24,20 @@
 #include <sfx2/dllapi.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
-#include <tools/resary.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <vector>
 
 struct SFX2_DLLPUBLIC SfxFilterTupel
 {
     OUString aName;
     sal_uInt16 nFlags;
+    SfxFilterTupel(const OUString& rName, sal_uInt16 nArg)
+        : aName(rName)
+        , nFlags(nArg)
+    {
+    }
 };
+
 typedef std::vector<SfxFilterTupel> SfxStyleFilter;
 
 class SFX2_DLLPUBLIC SfxStyleFamilyItem
@@ -43,7 +48,7 @@ class SFX2_DLLPUBLIC SfxStyleFamilyItem
     SfxStyleFilter  aFilterList;
 
 public:
-    SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const Image& rImage, const ResId &rStringArray);
+    SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const Image& rImage, const std::pair<const char*, int>* pStringArray, const std::locale& rLocale);
 
     const OUString& GetText() const { return aText; }
     SfxStyleFamily  GetFamily() const { return nFamily; }
diff --git a/include/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc
deleted file mode 100644
index c4e005a12712..000000000000
--- a/include/sfx2/templatelocnames.hrc
+++ /dev/null
@@ -1,24 +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 NUM_TEMPLATE_NAMES      10
-#define TEMPL_LOC_OFFSET        2210
-
-#define STR_TEMPLATE_NAME1      (TEMPL_LOC_OFFSET + 51)
-#define STR_TEMPLATE_NAME2      (TEMPL_LOC_OFFSET + 52)
-#define STR_TEMPLATE_NAME3      (TEMPL_LOC_OFFSET + 53)
-#define STR_TEMPLATE_NAME4      (TEMPL_LOC_OFFSET + 54)
-#define STR_TEMPLATE_NAME5      (TEMPL_LOC_OFFSET + 55)
-#define STR_TEMPLATE_NAME6      (TEMPL_LOC_OFFSET + 56)
-#define STR_TEMPLATE_NAME7      (TEMPL_LOC_OFFSET + 57)
-#define STR_TEMPLATE_NAME8      (TEMPL_LOC_OFFSET + 58)
-#define STR_TEMPLATE_NAME9      (TEMPL_LOC_OFFSET + 59)
-#define STR_TEMPLATE_NAME10     (TEMPL_LOC_OFFSET + 60)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 0601bf65f470..7301a2896946 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <vcl/ctrl.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/dockwin.hxx>
 #include <sfx2/childwin.hxx>
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index a98f13ee75e8..d76551ca03c7 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <svl/flagitem.hxx>
-#include <svl/style.hrc>
+#include <svl/style.hxx>
 
 class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index 7422dcda5a01..e6ae8d18730b 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -12,7 +12,7 @@
 
 #include <sal/types.h>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 0c3a86772f78..b3e52a3b6aae 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -27,7 +27,7 @@
 #include <i18nutil/transliteration.hxx>
 #include <i18nutil/searchopt.hxx>
 #include <unotools/configitem.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/srchdefs.hxx>
 
diff --git a/include/svl/style.hrc b/include/svl/style.hrc
deleted file mode 100644
index 352cfe18e2b0..000000000000
--- a/include/svl/style.hrc
+++ /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/.
- *
- * 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 SFX_STYLE_HRC
-#define SFX_STYLE_HRC
-
-#define SFXSTYLEBIT_AUTO        0x0000 ///< automatic: flags from application
-#define SFXSTYLEBIT_HIDDEN      0x0200 ///< hidden styles (search mask)
-#define SFXSTYLEBIT_HIERARCHY   0x1000 ///< hierarchical view - just for dialog
-#define SFXSTYLEBIT_READONLY    0x2000 ///< readonly styles (search mask)
-#define SFXSTYLEBIT_USED        0x4000 ///< used styles (search mask)
-#define SFXSTYLEBIT_USERDEF     0x8000 ///< user defined styles (search mask)
-#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF ///< all styles
-#define SFXSTYLEBIT_ALL         0xFFFF ///< all styles
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index e0a4181fc198..1695c8fd3483 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -27,16 +27,37 @@
 #include <comphelper/weak.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <svl/svldllapi.h>
-#include <rsc/rscsfx.hxx>
 #include <svl/hint.hxx>
 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/stylesheetuser.hxx>
 
-#include <svl/style.hrc>
 #include <memory>
 
+// This is used as a flags enum in sw/, but only there,
+// so I don't pull in o3tl::typed_flags here
+enum class SfxStyleFamily {
+    None    = 0x00,
+    Char    = 0x01,
+    Para    = 0x02,
+    Frame   = 0x04,
+    Page    = 0x08,
+    Pseudo  = 0x10,
+    Table   = 0x20,
+    Cell    = 0x40,
+    All     = 0x7fff
+};
+
+#define SFXSTYLEBIT_AUTO        0x0000 ///< automatic: flags from application
+#define SFXSTYLEBIT_HIDDEN      0x0200 ///< hidden styles (search mask)
+#define SFXSTYLEBIT_HIERARCHY   0x1000 ///< hierarchical view - just for dialog
+#define SFXSTYLEBIT_READONLY    0x2000 ///< readonly styles (search mask)
+#define SFXSTYLEBIT_USED        0x4000 ///< used styles (search mask)
+#define SFXSTYLEBIT_USERDEF     0x8000 ///< user defined styles (search mask)
+#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF ///< all styles
+#define SFXSTYLEBIT_ALL         0xFFFF ///< all styles
+
 class SfxItemSet;
 class SfxItemPool;
 class SfxStyleSheetBasePool;
diff --git a/include/svl/svl.hrc b/include/svl/svl.hrc
index 6ccd2435ad3a..f066331992df 100644
--- a/include/svl/svl.hrc
+++ b/include/svl/svl.hrc
@@ -19,85 +19,81 @@
 #ifndef INCLUDED_SVL_SVL_HRC
 #define INCLUDED_SVL_SVL_HRC
 
-#include <svl/solar.hrc>
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define STR_SVT_MIMETYPE_START              (RID_SVL_START)
-#define STR_SVT_MIMETYPE_APP_OCTSTREAM      (STR_SVT_MIMETYPE_START+0)
-#define STR_SVT_MIMETYPE_APP_PDF            (STR_SVT_MIMETYPE_START+1)
-#define STR_SVT_MIMETYPE_APP_RTF            (STR_SVT_MIMETYPE_START+2)
-#define STR_SVT_MIMETYPE_APP_MSWORD         (STR_SVT_MIMETYPE_START+3)
-#define STR_SVT_MIMETYPE_APP_STARCALC       (STR_SVT_MIMETYPE_START+4)
-#define STR_SVT_MIMETYPE_APP_STARCHART      (STR_SVT_MIMETYPE_START+5)
-#define STR_SVT_MIMETYPE_APP_STARDRAW       (STR_SVT_MIMETYPE_START+6)
-#define STR_SVT_MIMETYPE_APP_STARIMAGE      (STR_SVT_MIMETYPE_START+7)
-#define STR_SVT_MIMETYPE_APP_STARMATH       (STR_SVT_MIMETYPE_START+8)
-#define STR_SVT_MIMETYPE_APP_STARWRITER     (STR_SVT_MIMETYPE_START+9)
-#define STR_SVT_MIMETYPE_APP_ZIP            (STR_SVT_MIMETYPE_START+10)
-#define STR_SVT_MIMETYPE_AUDIO_AIFF         (STR_SVT_MIMETYPE_START+11)
-#define STR_SVT_MIMETYPE_AUDIO_BASIC        (STR_SVT_MIMETYPE_START+12)
-#define STR_SVT_MIMETYPE_AUDIO_VORBIS       (STR_SVT_MIMETYPE_START+13)
-#define STR_SVT_MIMETYPE_AUDIO_MIDI         (STR_SVT_MIMETYPE_START+14)
-#define STR_SVT_MIMETYPE_AUDIO_WAV          (STR_SVT_MIMETYPE_START+15)
-#define STR_SVT_MIMETYPE_IMAGE_GIF          (STR_SVT_MIMETYPE_START+16)
-#define STR_SVT_MIMETYPE_IMAGE_JPEG         (STR_SVT_MIMETYPE_START+17)
-#define STR_SVT_MIMETYPE_IMAGE_PCX          (STR_SVT_MIMETYPE_START+18)
-#define STR_SVT_MIMETYPE_IMAGE_BMP          (STR_SVT_MIMETYPE_START+19)
-#define STR_SVT_MIMETYPE_TEXT_HTML          (STR_SVT_MIMETYPE_START+20)
-#define STR_SVT_MIMETYPE_TEXT_PLAIN         (STR_SVT_MIMETYPE_START+21)
-#define STR_SVT_MIMETYPE_TEXT_URL           (STR_SVT_MIMETYPE_START+22)
-#define STR_SVT_MIMETYPE_TEXT_VCARD         (STR_SVT_MIMETYPE_START+23)
-#define STR_SVT_MIMETYPE_VIDEO_THEORA       (STR_SVT_MIMETYPE_START+24)
-#define STR_SVT_MIMETYPE_VIDEO_VDO          (STR_SVT_MIMETYPE_START+25)
-#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO      (STR_SVT_MIMETYPE_START+26)
-#define STR_SVT_MIMETYPE_X_STARMAIL         (STR_SVT_MIMETYPE_START+27)
-#define STR_SVT_MIMETYPE_X_VRML             (STR_SVT_MIMETYPE_START+28)
-#define STR_SVT_MIMETYPE_APP_STARHELP       (STR_SVT_MIMETYPE_START+29)
-#define STR_SVT_MIMETYPE_APP_STARIMPRESS    (STR_SVT_MIMETYPE_START+30)
+//  Internet Media Type Presentations
 
-#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+35)
-#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+36)
-#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+37)
-#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+38)
-#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+39)
-#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+40)
-#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+41)
-#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+42)
-#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+48)
-#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+49)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+50)
-#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+51)
-#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+52)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+53)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+54)
-#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+55)
-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+56)
-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+57)
-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+58)
-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+59)
-#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+60)
-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+61)
-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+62)
-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+63)
-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+64)
-#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+65)
-#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+66)
-#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+67)
-#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+68)
-#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+69)
-
-#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+70)
-#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+71)
-#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+72)
-#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+73)
-#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+74)
-#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+75)
-#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+76)
-#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+77)
-
-#define STR_SVT_MIMETYPE_VIDEO_WEBM         (STR_SVT_MIMETYPE_START+78)
-#define STR_SVT_MIMETYPE_AUDIO_WEBM         (STR_SVT_MIMETYPE_START+79)
-
-#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_AUDIO_WEBM)
+#define STR_SVT_MIMETYPE_APP_OCTSTREAM          NC_("STR_SVT_MIMETYPE_APP_OCTSTREAM", "Binary file")
+#define STR_SVT_MIMETYPE_APP_PDF                NC_("STR_SVT_MIMETYPE_APP_PDF", "PDF file")
+#define STR_SVT_MIMETYPE_APP_RTF                NC_("STR_SVT_MIMETYPE_APP_RTF", "RTF File")
+#define STR_SVT_MIMETYPE_APP_MSWORD             NC_("STR_SVT_MIMETYPE_APP_MSWORD", "MS-Word document")
+#define STR_SVT_MIMETYPE_APP_STARCALC           NC_("STR_SVT_MIMETYPE_APP_STARCALC", "%PRODUCTNAME Spreadsheet")
+#define STR_SVT_MIMETYPE_APP_STARCHART          NC_("STR_SVT_MIMETYPE_APP_STARCHART", "%PRODUCTNAME Chart")
+#define STR_SVT_MIMETYPE_APP_STARDRAW           NC_("STR_SVT_MIMETYPE_APP_STARDRAW", "%PRODUCTNAME Drawing")
+#define STR_SVT_MIMETYPE_APP_STARIMAGE          NC_("STR_SVT_MIMETYPE_APP_STARIMAGE", "%PRODUCTNAME Image")
+#define STR_SVT_MIMETYPE_APP_STARMATH           NC_("STR_SVT_MIMETYPE_APP_STARMATH", "%PRODUCTNAME Formula")
+#define STR_SVT_MIMETYPE_APP_STARWRITER         NC_("STR_SVT_MIMETYPE_APP_STARWRITER", "%PRODUCTNAME Text")
+#define STR_SVT_MIMETYPE_APP_ZIP                NC_("STR_SVT_MIMETYPE_APP_ZIP", "ZIP file")
+#define STR_SVT_MIMETYPE_APP_JAR                NC_("STR_SVT_MIMETYPE_APP_JAR", "JAR file")
+#define STR_SVT_MIMETYPE_AUDIO_AIFF             NC_("STR_SVT_MIMETYPE_AUDIO_AIFF", "Audio file")
+#define STR_SVT_MIMETYPE_AUDIO_BASIC            NC_("STR_SVT_MIMETYPE_AUDIO_BASIC", "Audio file")
+#define STR_SVT_MIMETYPE_AUDIO_MIDI             NC_("STR_SVT_MIMETYPE_AUDIO_MIDI", "Audio file")
+#define STR_SVT_MIMETYPE_AUDIO_VORBIS           NC_("STR_SVT_MIMETYPE_AUDIO_VORBIS", "Audio file")
+#define STR_SVT_MIMETYPE_AUDIO_WAV              NC_("STR_SVT_MIMETYPE_AUDIO_WAV", "Audio file")
+#define STR_SVT_MIMETYPE_AUDIO_WEBM             NC_("STR_SVT_MIMETYPE_AUDIO_WEBM", "Audio file")
+#define STR_SVT_MIMETYPE_IMAGE_GIF              NC_("STR_SVT_MIMETYPE_IMAGE_GIF", "Image")
+#define STR_SVT_MIMETYPE_IMAGE_PNG              NC_("STR_SVT_MIMETYPE_IMAGE_PNG", "Image")
+#define STR_SVT_MIMETYPE_IMAGE_TIFF             NC_("STR_SVT_MIMETYPE_IMAGE_TIFF", "Image")
+#define STR_SVT_MIMETYPE_IMAGE_JPEG             NC_("STR_SVT_MIMETYPE_IMAGE_JPEG", "Image")
+#define STR_SVT_MIMETYPE_IMAGE_PCX              NC_("STR_SVT_MIMETYPE_IMAGE_PCX", "Image")
+#define STR_SVT_MIMETYPE_IMAGE_BMP              NC_("STR_SVT_MIMETYPE_IMAGE_BMP", "Bitmap")
+#define STR_SVT_MIMETYPE_TEXT_HTML              NC_("STR_SVT_MIMETYPE_TEXT_HTML", "HTML document")
+#define STR_SVT_MIMETYPE_TEXT_PLAIN             NC_("STR_SVT_MIMETYPE_TEXT_PLAIN", "Text file")
+#define STR_SVT_MIMETYPE_TEXT_URL               NC_("STR_SVT_MIMETYPE_TEXT_URL", "Bookmark")
+#define STR_SVT_MIMETYPE_TEXT_VCARD             NC_("STR_SVT_MIMETYPE_TEXT_VCARD", "vCard file")
+#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO          NC_("STR_SVT_MIMETYPE_VIDEO_MSVIDEO", "Video file")
+#define STR_SVT_MIMETYPE_VIDEO_THEORA           NC_("STR_SVT_MIMETYPE_VIDEO_THEORA", "Video file")
+#define STR_SVT_MIMETYPE_VIDEO_VDO              NC_("STR_SVT_MIMETYPE_VIDEO_VDO", "Video file")
+#define STR_SVT_MIMETYPE_VIDEO_WEBM             NC_("STR_SVT_MIMETYPE_VIDEO_WEBM", "Video file")
+#define STR_SVT_MIMETYPE_X_STARMAIL             NC_("STR_SVT_MIMETYPE_X_STARMAIL", "Message")
+#define STR_SVT_MIMETYPE_X_VRML                 NC_("STR_SVT_MIMETYPE_X_VRML", "VRML file")
+#define STR_SVT_MIMETYPE_APP_STARIMPRESS        NC_("STR_SVT_MIMETYPE_APP_STARIMPRESS", "%PRODUCTNAME Presentation")
+#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      NC_("STR_SVT_MIMETYPE_APP_IMPRESSPACKED", "%PRODUCTNAME Presentation (packed)")
+#define STR_SVT_MIMETYPE_APP_STARHELP           NC_("STR_SVT_MIMETYPE_APP_STARHELP", "%PRODUCTNAME Help")
+#define STR_SVT_MIMETYPE_CNT_FSYSBOX            NC_("STR_SVT_MIMETYPE_CNT_FSYSBOX", "Workplace")
+#define STR_SVT_MIMETYPE_CNT_FSYSFLD            NC_("STR_SVT_MIMETYPE_CNT_FSYSFLD", "Folder")
+#define STR_SVT_MIMETYPE_APP_GAL                NC_("STR_SVT_MIMETYPE_APP_GAL", "Gallery")
+#define STR_SVT_MIMETYPE_APP_GAL_THEME          NC_("STR_SVT_MIMETYPE_APP_GAL_THEME", "Gallery theme")
+#define STR_SVT_MIMETYPE_APP_STARW_GLOB         NC_("STR_SVT_MIMETYPE_APP_STARW_GLOB", "%PRODUCTNAME Master Document")
+#define STR_SVT_MIMETYPE_APP_SDM                NC_("STR_SVT_MIMETYPE_APP_SDM", "Message")
+#define STR_SVT_MIMETYPE_APP_SMD                NC_("STR_SVT_MIMETYPE_APP_SMD", "Message")
+#define STR_SVT_MIMETYPE_APP_STARW_WEB          NC_("STR_SVT_MIMETYPE_APP_STARW_WEB", "%PRODUCTNAME Writer/Web")
+#define STR_SVT_MIMETYPE_FRAMESET               NC_("STR_SVT_MIMETYPE_FRAMESET", "Frameset Document")
+#define STR_SVT_MIMETYPE_MACRO                  NC_("STR_SVT_MIMETYPE_MACRO", "Macro file")
+#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER        NC_("STR_SVT_MIMETYPE_CNT_SFSYSFOLDER", "System folder")
+#define STR_SVT_MIMETYPE_APP_TEMPLATE           NC_("STR_SVT_MIMETYPE_APP_TEMPLATE", "%PRODUCTNAME Template")
+#define STR_SVT_MIMETYPE_IMAGE_GENERIC          NC_("STR_SVT_MIMETYPE_IMAGE_GENERIC", "Image")
+#define STR_SVT_MIMETYPE_APP_MSEXCEL            NC_("STR_SVT_MIMETYPE_APP_MSEXCEL", "MS Excel document")
+#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL      NC_("STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL", "MS Excel Template")
+#define STR_SVT_MIMETYPE_APP_MSPPOINT           NC_("STR_SVT_MIMETYPE_APP_MSPPOINT", "MS PowerPoint document")
+#define STR_SVT_MIMETYPE_TEXT_VCALENDAR         NC_("STR_SVT_MIMETYPE_TEXT_VCALENDAR", "vCalendar-file")
+#define STR_SVT_MIMETYPE_TEXT_ICALENDAR         NC_("STR_SVT_MIMETYPE_TEXT_ICALENDAR", "iCalendar-File")
+#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR      NC_("STR_SVT_MIMETYPE_TEXT_XMLICALENDAR", "XML-iCalendar-File")
+#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  NC_("STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP", "CDE-Calendar-File")
+#define STR_SVT_MIMETYPE_INET_MSG_RFC822        NC_("STR_SVT_MIMETYPE_INET_MSG_RFC822", "message/rfc822")
+#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE NC_("STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE", "multipart/alternative")
+#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      NC_("STR_SVT_MIMETYPE_INET_MULTI_DIGEST", "multipart/digest")
+#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    NC_("STR_SVT_MIMETYPE_INET_MULTI_PARALLEL", "multipart/parallel")
+#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     NC_("STR_SVT_MIMETYPE_INET_MULTI_RELATED", "multipart/related")
+#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       NC_("STR_SVT_MIMETYPE_INET_MULTI_MIXED", "multipart/mixed")
+#define STR_SVT_MIMETYPE_APP_SXCALC             NC_("STR_SVT_MIMETYPE_APP_SXCALC", "OpenOffice.org 1.0 Spreadsheet")
+#define STR_SVT_MIMETYPE_APP_SXCHART            NC_("STR_SVT_MIMETYPE_APP_SXCHART", "OpenOffice.org 1.0 Chart")
+#define STR_SVT_MIMETYPE_APP_SXDRAW             NC_("STR_SVT_MIMETYPE_APP_SXDRAW", "OpenOffice.org 1.0 Drawing")
+#define STR_SVT_MIMETYPE_APP_SXMATH             NC_("STR_SVT_MIMETYPE_APP_SXMATH", "OpenOffice.org 1.0 Formula")
+#define STR_SVT_MIMETYPE_APP_SXWRITER           NC_("STR_SVT_MIMETYPE_APP_SXWRITER", "OpenOffice.org 1.0 Text Document")
+#define STR_SVT_MIMETYPE_APP_SXIMPRESS          NC_("STR_SVT_MIMETYPE_APP_SXIMPRESS", "OpenOffice.org 1.0 Presentation")
+#define STR_SVT_MIMETYPE_APP_SXGLOBAL           NC_("STR_SVT_MIMETYPE_APP_SXGLOBAL", "OpenOffice.org 1.0 Master Document")
+#define STR_SVT_MIMETYPE_APP_SXIPACKED          NC_("STR_SVT_MIMETYPE_APP_SXIPACKED", "OpenOffice.org 1.0 Presentation (packed)")
 
 #endif
 
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index aa58ebc42bda..cec92f040b41 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -29,7 +29,6 @@
 #include <vcl/window.hxx>
 
 class ExtMultiLineEdit;
-class SvtDocInfoTable_Impl;
 
 namespace com { namespace sun { namespace star {
     namespace document { class XDocumentProperties; }
@@ -53,7 +52,6 @@ public:
 
 private:
     VclPtr<ExtMultiLineEdit> m_pEditWin;
-    std::unique_ptr< SvtDocInfoTable_Impl > m_xInfoTable;
 
     void insertEntry(OUString const & title, OUString const & value);
 
diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hxx
index a29fea575c13..a29fea575c13 100644
--- a/include/svtools/controldims.hrc
+++ b/include/svtools/controldims.hxx
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 51f78bf27506..50426b37fb2d 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -27,31 +27,34 @@
 
 #include <vcl/errinf.hxx>
 
+typedef std::pair<const char*, ErrCode> ErrMsgCode;
+SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRHDL();
+SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRCTX();
+
 namespace vcl { class Window; }
-class ResMgr;
 
 class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext
 {
 public:
     SfxErrorContext(
             sal_uInt16 nCtxIdP, vcl::Window *pWin=nullptr,
-            sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr);
+            const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr);
     SfxErrorContext(
             sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=nullptr,
-            sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr);
+            const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr);
     bool GetString(ErrCode nErrId, OUString &rStr) override;
 
 private:
     sal_uInt16 nCtxId;
-    sal_uInt16 nResId;
-    ResMgr *pMgr;
+    const ErrMsgCode* pIds;
+    const std::locale *pResLocale;
     OUString aArg1;
 };
 
 class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
 {
 public:
-    SfxErrorHandler(sal_uInt16 nId, ErrCode lStart, ErrCode lEnd, ResMgr *pMgr=nullptr);
+    SfxErrorHandler(const ErrMsgCode* pIds, ErrCode lStart, ErrCode lEnd, const std::locale* pResLocale = nullptr);
     virtual ~SfxErrorHandler() override;
 
 protected:
@@ -61,10 +64,9 @@ private:
 
     ErrCode              lStart;
     ErrCode              lEnd;
-    sal_uInt16           nId;
-    ResMgr              *pMgr;
-    std::unique_ptr<ResMgr>
-                         pFreeMgr;
+    const ErrMsgCode*    pIds;
+    const std::locale*   pResLocale;
+    std::unique_ptr<std::locale> xFreeLocale;
 
     SVT_DLLPRIVATE static void GetClassString(sal_uLong lErrId, OUString &);
     virtual bool          CreateString(const ErrorInfo *, OUString &) const override;
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 1dbb4f33dc81..22acd8ebbb44 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -25,15 +25,13 @@
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
 
-
-#define STR_FILECTRL_BUTTONTEXT     333     // ID-Range?!
-
 // Flags for internal use of FileControl
 enum class FileControlMode_Internal
 {
     INRESIZE               = 0x0001,
     ORIGINALBUTTONTEXT     = 0x0002,
 };
+
 namespace o3tl
 {
     template<> struct typed_flags<FileControlMode_Internal> : is_typed_flags<FileControlMode_Internal, 0x03> {};
diff --git a/include/svtools/filedlg2.hrc b/include/svtools/filedlg2.hrc
deleted file mode 100644
index 4da7f5e0f894..000000000000
--- a/include/svtools/filedlg2.hrc
+++ /dev/null
@@ -1,23 +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 STR_FILEDLG_OPEN            1002
-#define STR_FILEDLG_TYPE            1005
-#define STR_FILEDLG_SAVE            1010
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 23fc485965e9..51a180c6729b 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -17,7 +17,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <svtools/svtdllapi.h>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/treelistentry.hxx>
 
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index dfc1b88f3ed8..380efe1d0a2b 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -20,10 +20,12 @@
 #define INCLUDED_SVTOOLS_SOERR_HXX
 
 #include <vcl/errcode.hxx>
+#ifndef __RSC
+#include <svtools/ehdl.hxx>
+#include <svtools/svtdllapi.h>
+#endif
 
 // error codes
-#define RID_SO_ERROR_HANDLER    32000
-
 #define SO_ERR(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | x)
 #define SO_WRN(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK | x)
 
@@ -35,10 +37,12 @@
 #define ERRCODE_SO_NOTIMPL                  SO_ERR(33)
 
 // error contexts
-#define RID_SO_ERRCTX           32001
-
 #define ERRCTX_SO_DOVERB        1
 
+#ifndef __RSC
+SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER();
+SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX();
+#endif
 
 #endif
 
diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx
deleted file mode 100644
index 581197c4a6ce..000000000000
--- a/include/svtools/sores.hxx
+++ /dev/null
@@ -1,104 +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_SVTOOLS_SORES_HXX
-#define INCLUDED_SVTOOLS_SORES_HXX
-
-//  Strings
-#define STR_ERROR_OBJNOCREATE                   32014
-#define STR_ERROR_OBJNOCREATE_FROM_FILE         32015
-#define STR_ERROR_OBJNOCREATE_PLUGIN            32018
-#define STR_FURTHER_OBJECT                      32026
-#define STR_UNKNOWN_SOURCE                      32027
-
-// Sot Format Strings
-#define STR_FORMAT_START                        32100
-#define STR_FORMAT_STRING                       (STR_FORMAT_START + 1)
-#define STR_FORMAT_BITMAP                       (STR_FORMAT_START + 2)
-#define STR_FORMAT_GDIMETAFILE                  (STR_FORMAT_START + 3)
-#define STR_FORMAT_RTF                          (STR_FORMAT_START + 7)
-#define STR_FORMAT_ID_DRAWING                   (STR_FORMAT_START + 8)
-#define STR_FORMAT_ID_SVXB                      (STR_FORMAT_START + 9)
-#define STR_FORMAT_ID_INTERNALLINK_STATE        (STR_FORMAT_START + 13)
-#define STR_FORMAT_ID_SOLK                      (STR_FORMAT_START + 14)
-#define STR_FORMAT_ID_NETSCAPE_BOOKMARK         (STR_FORMAT_START + 15)
-#define STR_FORMAT_ID_STARSERVER                (STR_FORMAT_START + 19)
-#define STR_FORMAT_ID_STAROBJECT                (STR_FORMAT_START + 20)
-#define STR_FORMAT_ID_APPLETOBJECT              (STR_FORMAT_START + 21)
-#define STR_FORMAT_ID_PLUGIN_OBJECT             (STR_FORMAT_START + 22)
-#define STR_FORMAT_ID_STARWRITER_30             (STR_FORMAT_START + 23)
-#define STR_FORMAT_ID_STARWRITER_40             (STR_FORMAT_START + 24)
-#define STR_FORMAT_ID_STARWRITER_50             (STR_FORMAT_START + 25)
-#define STR_FORMAT_ID_STARWRITERWEB_40          (STR_FORMAT_START + 26)
-#define STR_FORMAT_ID_STARWRITERWEB_50          (STR_FORMAT_START + 27)
-#define STR_FORMAT_ID_STARWRITERGLOB_40         (STR_FORMAT_START + 28)
-#define STR_FORMAT_ID_STARWRITERGLOB_50         (STR_FORMAT_START + 29)
-#define STR_FORMAT_ID_STARDRAW                  (STR_FORMAT_START + 30)
-#define STR_FORMAT_ID_STARDRAW_40               (STR_FORMAT_START + 31)
-#define STR_FORMAT_ID_STARIMPRESS_50            (STR_FORMAT_START + 32)
-#define STR_FORMAT_ID_STARDRAW_50               (STR_FORMAT_START + 33)
-#define STR_FORMAT_ID_STARCALC                  (STR_FORMAT_START + 34)
-#define STR_FORMAT_ID_STARCALC_40               (STR_FORMAT_START + 35)
-#define STR_FORMAT_ID_STARCALC_50               (STR_FORMAT_START + 36)
-#define STR_FORMAT_ID_STARCHART                 (STR_FORMAT_START + 37)
-#define STR_FORMAT_ID_STARCHART_40              (STR_FORMAT_START + 38)
-#define STR_FORMAT_ID_STARCHART_50              (STR_FORMAT_START + 39)
-#define STR_FORMAT_ID_STARIMAGE                 (STR_FORMAT_START + 40)
-#define STR_FORMAT_ID_STARIMAGE_40              (STR_FORMAT_START + 41)
-#define STR_FORMAT_ID_STARIMAGE_50              (STR_FORMAT_START + 42)
-#define STR_FORMAT_ID_STARMATH                  (STR_FORMAT_START + 43)
-#define STR_FORMAT_ID_STARMATH_40               (STR_FORMAT_START + 44)
-#define STR_FORMAT_ID_STARMATH_50               (STR_FORMAT_START + 45)
-#define STR_FORMAT_ID_STAROBJECT_PAINTDOC       (STR_FORMAT_START + 46)
-#define STR_FORMAT_ID_HTML                      (STR_FORMAT_START + 48)
-#define STR_FORMAT_ID_HTML_SIMPLE               (STR_FORMAT_START + 49)
-#define STR_FORMAT_ID_BIFF_5                    (STR_FORMAT_START + 52)
-#define STR_FORMAT_ID_BIFF_8                    (STR_FORMAT_START + 53)
-#define STR_FORMAT_ID_SYLK                      (STR_FORMAT_START + 54)
-#define STR_FORMAT_ID_LINK                      (STR_FORMAT_START + 56)
-#define STR_FORMAT_ID_DIF                       (STR_FORMAT_START + 57)
-#define STR_FORMAT_ID_MSWORD_DOC                (STR_FORMAT_START + 60)
-#define STR_FORMAT_ID_STAR_FRAMESET_DOC         (STR_FORMAT_START + 61)
-#define STR_FORMAT_ID_OFFICE_DOC                (STR_FORMAT_START + 62)
-#define STR_FORMAT_ID_NOTES_DOCINFO             (STR_FORMAT_START + 63)
-#define STR_FORMAT_ID_SFX_DOC                   (STR_FORMAT_START + 66)
-#define STR_FORMAT_ID_FILEGRPDESCRIPTOR     (STR_FORMAT_START + 86)
-#define STR_FORMAT_ID_STARCHARTDOCUMENT_50      (STR_FORMAT_START + 102)
-#define STR_FORMAT_ID_GRAPHOBJ                  (STR_FORMAT_START + 103)
-#define STR_FORMAT_ID_STARWRITER_60             (STR_FORMAT_START + 104)
-#define STR_FORMAT_ID_STARWRITERWEB_60          (STR_FORMAT_START + 105)
-#define STR_FORMAT_ID_STARWRITERGLOB_60         (STR_FORMAT_START + 106)
-#define STR_FORMAT_ID_STARDRAW_60               (STR_FORMAT_START + 107)
-#define STR_FORMAT_ID_STARIMPRESS_60            (STR_FORMAT_START + 108)
-#define STR_FORMAT_ID_STARCALC_60               (STR_FORMAT_START + 109)
-#define STR_FORMAT_ID_STARCHART_60              (STR_FORMAT_START + 110)
-#define STR_FORMAT_ID_STARMATH_60               (STR_FORMAT_START + 111)
-#define STR_FORMAT_ID_WMF                       (STR_FORMAT_START + 112)
-#define STR_FORMAT_ID_DBACCESS_QUERY            (STR_FORMAT_START + 113)
-#define STR_FORMAT_ID_DBACCESS_TABLE            (STR_FORMAT_START + 114)
-#define STR_FORMAT_ID_DBACCESS_COMMAND          (STR_FORMAT_START + 115)
-#define STR_FORMAT_ID_DIALOG_60                 (STR_FORMAT_START + 116)
-#define STR_FORMAT_ID_HTML_NO_COMMENT           (STR_FORMAT_START + 119)
-#define STR_FORMAT_ID_RICHTEXT                  (STR_FORMAT_START + 120)
-
-#define STR_FORMAT_END                          (STR_FORMAT_ID_RICHTEXT)
-
-#endif // INCLUDED_SVTOOLS_SORES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
new file mode 100644
index 000000000000..f9dc617f4313
--- /dev/null
+++ b/include/svtools/strings.hrc
@@ -0,0 +1,357 @@
+/* -*- 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_SVTOOLS_INC_STRINGS_HRC
+#define INCLUDED_SVTOOLS_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_UNDO                                NC_("STR_UNDO", "Undo: ")
+#define STR_REDO                                NC_("STR_REDO", "Re~do: ")
+#define STR_REPEAT                              NC_("STR_REPEAT", "~Repeat: ")
+
+#define STR_FORMAT_STRING                       NC_("STR_FORMAT_STRING", "Unformatted text")
+#define STR_FORMAT_BITMAP                       NC_("STR_FORMAT_BITMAP", "Bitmap")
+#define STR_FORMAT_GDIMETAFILE                  NC_("STR_FORMAT_GDIMETAFILE", "GDI metafile")
+#define STR_FORMAT_RTF                          NC_("STR_FORMAT_RTF", "Formatted text [RTF]")
+#define STR_FORMAT_ID_RICHTEXT                  NC_("STR_FORMAT_ID_RICHTEXT", "Formatted text [Richtext]")
+#define STR_FORMAT_ID_DRAWING                   NC_("STR_FORMAT_ID_DRAWING", "Drawing format")
+#define STR_FORMAT_ID_SVXB                      NC_("STR_FORMAT_ID_SVXB", "SVXB (StarView bitmap/animation)")
+#define STR_FORMAT_ID_INTERNALLINK_STATE        NC_("STR_FORMAT_ID_INTERNALLINK_STATE", "Status Info from Svx Internal Link")
+#define STR_FORMAT_ID_SOLK                      NC_("STR_FORMAT_ID_SOLK", "SOLK (%PRODUCTNAME Link)")
+#define STR_FORMAT_ID_NETSCAPE_BOOKMARK         NC_("STR_FORMAT_ID_NETSCAPE_BOOKMARK", "Netscape Bookmark")
+#define STR_FORMAT_ID_STARSERVER                NC_("STR_FORMAT_ID_STARSERVER", "Star server format")
+#define STR_FORMAT_ID_STAROBJECT                NC_("STR_FORMAT_ID_STAROBJECT", "Star object format")
+#define STR_FORMAT_ID_APPLETOBJECT              NC_("STR_FORMAT_ID_APPLETOBJECT", "Applet object")
+#define STR_FORMAT_ID_PLUGIN_OBJECT             NC_("STR_FORMAT_ID_PLUGIN_OBJECT", "Plug-in object")
+#define STR_FORMAT_ID_STARWRITER_30             NC_("STR_FORMAT_ID_STARWRITER_30", "StarWriter 3.0 object")
+#define STR_FORMAT_ID_STARWRITER_40             NC_("STR_FORMAT_ID_STARWRITER_40", "StarWriter 4.0 object")
+#define STR_FORMAT_ID_STARWRITER_50             NC_("STR_FORMAT_ID_STARWRITER_50", "StarWriter 5.0 object")
+#define STR_FORMAT_ID_STARWRITERWEB_40          NC_("STR_FORMAT_ID_STARWRITERWEB_40", "StarWriter/Web 4.0 object")
+#define STR_FORMAT_ID_STARWRITERWEB_50          NC_("STR_FORMAT_ID_STARWRITERWEB_50", "StarWriter/Web 5.0 object")
+#define STR_FORMAT_ID_STARWRITERGLOB_40         NC_("STR_FORMAT_ID_STARWRITERGLOB_40", "StarWriter/Master 4.0 object")
+#define STR_FORMAT_ID_STARWRITERGLOB_50         NC_("STR_FORMAT_ID_STARWRITERGLOB_50", "StarWriter/Master 5.0 object")
+#define STR_FORMAT_ID_STARDRAW                  NC_("STR_FORMAT_ID_STARDRAW", "StarDraw object")
+#define STR_FORMAT_ID_STARDRAW_40               NC_("STR_FORMAT_ID_STARDRAW_40", "StarDraw 4.0 object")
+#define STR_FORMAT_ID_STARIMPRESS_50            NC_("STR_FORMAT_ID_STARIMPRESS_50", "StarImpress 5.0 object")
+#define STR_FORMAT_ID_STARDRAW_50               NC_("STR_FORMAT_ID_STARDRAW_50", "StarDraw 5.0 object")
+#define STR_FORMAT_ID_STARCALC                  NC_("STR_FORMAT_ID_STARCALC", "StarCalc object")
+#define STR_FORMAT_ID_STARCALC_40               NC_("STR_FORMAT_ID_STARCALC_40", "StarCalc  4.0 object")
+#define STR_FORMAT_ID_STARCALC_50               NC_("STR_FORMAT_ID_STARCALC_50", "StarCalc 5.0 object")
+#define STR_FORMAT_ID_STARCHART                 NC_("STR_FORMAT_ID_STARCHART", "StarChart object")
+#define STR_FORMAT_ID_STARCHART_40              NC_("STR_FORMAT_ID_STARCHART_40", "StarChart 4.0 object")
+#define STR_FORMAT_ID_STARCHART_50              NC_("STR_FORMAT_ID_STARCHART_50", "StarChart 5.0 object")
+#define STR_FORMAT_ID_STARIMAGE                 NC_("STR_FORMAT_ID_STARIMAGE", "StarImage object")
+#define STR_FORMAT_ID_STARIMAGE_40              NC_("STR_FORMAT_ID_STARIMAGE_40", "StarImage 4.0 object")
+#define STR_FORMAT_ID_STARIMAGE_50              NC_("STR_FORMAT_ID_STARIMAGE_50", "StarImage 5.0 object")
+#define STR_FORMAT_ID_STARMATH                  NC_("STR_FORMAT_ID_STARMATH", "StarMath object")
+#define STR_FORMAT_ID_STARMATH_40               NC_("STR_FORMAT_ID_STARMATH_40", "StarMath 4.0 object")
+#define STR_FORMAT_ID_STARMATH_50               NC_("STR_FORMAT_ID_STARMATH_50", "StarMath 5.0 object")
+#define STR_FORMAT_ID_STAROBJECT_PAINTDOC       NC_("STR_FORMAT_ID_STAROBJECT_PAINTDOC", "StarObject Paint object")
+#define STR_FORMAT_ID_HTML                      NC_("STR_FORMAT_ID_HTML", "HTML (HyperText Markup Language)")
+#define STR_FORMAT_ID_HTML_SIMPLE               NC_("STR_FORMAT_ID_HTML_SIMPLE", "HTML format")
+#define STR_FORMAT_ID_BIFF_5                    NC_("STR_FORMAT_ID_BIFF_5", "Biff5 (Microsoft Excel 5.0/95)")
+#define STR_FORMAT_ID_BIFF_8                    NC_("STR_FORMAT_ID_BIFF_8", "Biff8 (Microsoft Excel 97/2000/XP/2003)")
+#define STR_FORMAT_ID_SYLK                      NC_("STR_FORMAT_ID_SYLK", "Sylk")
+#define STR_FORMAT_ID_LINK                      NC_("STR_FORMAT_ID_LINK", "DDE link" )
+#define STR_FORMAT_ID_DIF                       NC_("STR_FORMAT_ID_DIF", "DIF")
+#define STR_FORMAT_ID_MSWORD_DOC                NC_("STR_FORMAT_ID_MSWORD_DOC", "Microsoft Word object")
+#define STR_FORMAT_ID_STAR_FRAMESET_DOC         NC_("STR_FORMAT_ID_STAR_FRAMESET_DOC", "StarFrameSet object")
+#define STR_FORMAT_ID_OFFICE_DOC                NC_("STR_FORMAT_ID_OFFICE_DOC", "Office document object")
+#define STR_FORMAT_ID_NOTES_DOCINFO             NC_("STR_FORMAT_ID_NOTES_DOCINFO", "Notes document info")
+#define STR_FORMAT_ID_SFX_DOC                   NC_("STR_FORMAT_ID_SFX_DOC", "Sfx document")
+#define STR_FORMAT_ID_STARCHARTDOCUMENT_50      NC_("STR_FORMAT_ID_STARCHARTDOCUMENT_50", "StarChart 5.0 object")
+#define STR_FORMAT_ID_GRAPHOBJ                  NC_("STR_FORMAT_ID_GRAPHOBJ", "Graphic object")
+#define STR_FORMAT_ID_STARWRITER_60             NC_("STR_FORMAT_ID_STARWRITER_60", "OpenOffice.org 1.0 Writer object")
+#define STR_FORMAT_ID_STARWRITERWEB_60          NC_("STR_FORMAT_ID_STARWRITERWEB_60", "OpenOffice.org 1.0 Writer/Web object")
+#define STR_FORMAT_ID_STARWRITERGLOB_60         NC_("STR_FORMAT_ID_STARWRITERGLOB_60", "OpenOffice.org 1.0 Writer/Master object")
+#define STR_FORMAT_ID_STARDRAW_60               NC_("STR_FORMAT_ID_STARDRAW_60", "OpenOffice.org 1.0 Draw object")
+#define STR_FORMAT_ID_STARIMPRESS_60            NC_("STR_FORMAT_ID_STARIMPRESS_60", "OpenOffice.org 1.0 Impress object")
+#define STR_FORMAT_ID_STARCALC_60               NC_("STR_FORMAT_ID_STARCALC_60", "OpenOffice.org 1.0 Calc object")
+#define STR_FORMAT_ID_STARCHART_60              NC_("STR_FORMAT_ID_STARCHART_60", "OpenOffice.org 1.0 Chart object")
+#define STR_FORMAT_ID_STARMATH_60               NC_("STR_FORMAT_ID_STARMATH_60", "OpenOffice.org 1.0 Math object")
+#define STR_FORMAT_ID_WMF                       NC_("STR_FORMAT_ID_WMF", "Windows metafile")
+#define STR_FORMAT_ID_DBACCESS_QUERY            NC_("STR_FORMAT_ID_DBACCESS_QUERY", "Data source object")
+#define STR_FORMAT_ID_DBACCESS_TABLE            NC_("STR_FORMAT_ID_DBACCESS_TABLE", "Data source table")
+#define STR_FORMAT_ID_DBACCESS_COMMAND          NC_("STR_FORMAT_ID_DBACCESS_COMMAND", "SQL query")
+#define STR_FORMAT_ID_DIALOG_60                 NC_("STR_FORMAT_ID_DIALOG_60", "OpenOffice.org 1.0 dialog")
+#define STR_FORMAT_ID_FILEGRPDESCRIPTOR         NC_("STR_FORMAT_ID_FILEGRPDESCRIPTOR", "Link")
+#define STR_FORMAT_ID_HTML_NO_COMMENT           NC_("STR_FORMAT_ID_HTML_NO_COMMENT", "HTML format without comments")
+
+#define STR_ERROR_OBJNOCREATE                   NC_("STR_ERROR_OBJNOCREATE", "Object % could not be inserted.")
+#define STR_ERROR_OBJNOCREATE_FROM_FILE         NC_("STR_ERROR_OBJNOCREATE_FROM_FILE", "Object from file % could not be inserted.")
+#define STR_ERROR_OBJNOCREATE_PLUGIN            NC_("STR_ERROR_OBJNOCREATE_PLUGIN", "Plug-in from document % could not be inserted.")
+#define STR_FURTHER_OBJECT                      NC_("STR_FURTHER_OBJECT", "Further objects")
+#define STR_UNKNOWN_SOURCE                      NC_("STR_UNKNOWN_SOURCE", "Unknown source")
+
+#define STR_SVT_FILEVIEW_COLUMN_TITLE           NC_("STR_SVT_FILEVIEW_COLUMN_TITLE", "Name")
+#define STR_SVT_FILEVIEW_COLUMN_SIZE            NC_("STR_SVT_FILEVIEW_COLUMN_SIZE", "Size")
+#define STR_SVT_FILEVIEW_COLUMN_DATE            NC_("STR_SVT_FILEVIEW_COLUMN_DATE", "Date modified")
+#define STR_SVT_FILEVIEW_COLUMN_TYPE            NC_("STR_SVT_FILEVIEW_COLUMN_TYPE", "Type")
+#define STR_SVT_BYTES                           NC_("STR_SVT_BYTES", "Bytes")
+#define STR_SVT_KB                              NC_("STR_SVT_KB", "KB")
+#define STR_SVT_MB                              NC_("STR_SVT_MB", "MB")
+#define STR_SVT_GB                              NC_("STR_SVT_GB", "GB")
+
+// descriptions of accessible objects
+#define STR_SVT_ACC_DESC_TABLISTBOX             NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2")
+#define STR_SVT_ACC_DESC_FILEVIEW               NC_("STR_SVT_ACC_DESC_FILEVIEW", ", Type: %1, URL: %2")
+#define STR_SVT_ACC_DESC_FOLDER                 NC_("STR_SVT_ACC_DESC_FOLDER", "Folder")
+#define STR_SVT_ACC_DESC_FILE                   NC_("STR_SVT_ACC_DESC_FILE", "File")
+#define STR_SVT_ACC_EMPTY_FIELD                 NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field")
+
+/*
+ * resources for CollatorResource / CollatorResourceData resp.
+ */
+/* alphanumeric sorting algorithm */
+#define STR_SVT_COLLATE_ALPHANUMERIC            NC_("STR_SVT_COLLATE_ALPHANUMERIC", "Alphanumeric")
+/* default or normal sorting algorithm */
+#define STR_SVT_COLLATE_NORMAL                  NC_("STR_SVT_COLLATE_NORMAL", "Normal")
+/* default or normal sorting algorithm */
+#define STR_SVT_COLLATE_CHARSET                 NC_("STR_SVT_COLLATE_CHARSET", "Character set")
+/* german dictionary word order / sorting */
+#define STR_SVT_COLLATE_DICTIONARY              NC_("STR_SVT_COLLATE_DICTIONARY", "Dictionary")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_PINYIN                  NC_("STR_SVT_COLLATE_PINYIN", "Pinyin")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_STROKE                  NC_("STR_SVT_COLLATE_STROKE", "Stroke")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_RADICAL                 NC_("STR_SVT_COLLATE_RADICAL", "Radical")
+/* sorting according to the unicode code point of the character */
+#define STR_SVT_COLLATE_UNICODE                 NC_("STR_SVT_COLLATE_UNICODE", "Unicode")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_ZHUYIN                  NC_("STR_SVT_COLLATE_ZHUYIN", "Zhuyin")
+/* phone book sorting algorithm. e.g. German */
+#define STR_SVT_COLLATE_PHONEBOOK               NC_("STR_SVT_COLLATE_PHONEBOOK", "Phone book")
+#define STR_SVT_COLLATE_PHONETIC_F              NC_("STR_SVT_COLLATE_PHONETIC_F", "Phonetic (alphanumeric first)")
+#define STR_SVT_COLLATE_PHONETIC_L              NC_("STR_SVT_COLLATE_PHONETIC_L", "Phonetic (alphanumeric last)")
+/* alphanumeric indexentry algorithm */
+#define STR_SVT_INDEXENTRY_ALPHANUMERIC         NC_("STR_SVT_INDEXENTRY_ALPHANUMERIC", "Alphanumeric")
+/* korean dictionary indexentry algorithm */
+#define STR_SVT_INDEXENTRY_DICTIONARY           NC_("STR_SVT_INDEXENTRY_DICTIONARY", "Dictionary")
+/* chinese sorting algorithm */
+#define STR_SVT_INDEXENTRY_PINYIN               NC_("STR_SVT_INDEXENTRY_PINYIN", "Pinyin")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_RADICAL              NC_("STR_SVT_INDEXENTRY_RADICAL", "Radical")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_STROKE               NC_("STR_SVT_INDEXENTRY_STROKE", "Stroke")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_ZHUYIN               NC_("STR_SVT_INDEXENTRY_ZHUYIN", "Zhuyin")
+#define STR_SVT_INDEXENTRY_PHONETIC_FS          NC_("STR_SVT_INDEXENTRY_PHONETIC_FS", "Phonetic (alphanumeric first, grouped by syllables)")
+#define STR_SVT_INDEXENTRY_PHONETIC_FC          NC_("STR_SVT_INDEXENTRY_PHONETIC_FC", "Phonetic (alphanumeric first, grouped by consonants)")
+#define STR_SVT_INDEXENTRY_PHONETIC_LS          NC_("STR_SVT_INDEXENTRY_PHONETIC_LS", "Phonetic (alphanumeric last, grouped by syllables)")
+#define STR_SVT_INDEXENTRY_PHONETIC_LC          NC_("STR_SVT_INDEXENTRY_PHONETIC_LC", "Phonetic (alphanumeric last, grouped by consonants)")
+
+#define STR_SVT_CALENDAR_DAY                    NC_("STR_SVT_CALENDAR_DAY", "Day")
+#define STR_SVT_CALENDAR_WEEK                   NC_("STR_SVT_CALENDAR_WEEK", "Week")
+#define STR_SVT_CALENDAR_TODAY                  NC_("STR_SVT_CALENDAR_TODAY", "Today")
+#define STR_SVT_CALENDAR_NONE                   NC_("STR_SVT_CALENDAR_NONE", "None")
+
+#define STR_SVT_STYLE_LIGHT                     NC_("STR_SVT_STYLE_LIGHT", "Light")
+#define STR_SVT_STYLE_LIGHT_ITALIC              NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic")
+#define STR_SVT_STYLE_NORMAL                    NC_("STR_SVT_STYLE_NORMAL", "Regular")
+#define STR_SVT_STYLE_NORMAL_ITALIC             NC_("STR_SVT_STYLE_NORMAL_ITALIC", "Italic")
+#define STR_SVT_STYLE_BOLD                      NC_("STR_SVT_STYLE_BOLD", "Bold")
+#define STR_SVT_STYLE_BOLD_ITALIC               NC_("STR_SVT_STYLE_BOLD_ITALIC", "Bold Italic")
+#define STR_SVT_STYLE_BLACK                     NC_("STR_SVT_STYLE_BLACK", "Black")
+#define STR_SVT_STYLE_BLACK_ITALIC              NC_("STR_SVT_STYLE_BLACK_ITALIC", "Black Italic")
+#define STR_SVT_STYLE_BOOK                      NC_("STR_SVT_STYLE_BOOK", "Book")
+#define STR_SVT_STYLE_BOLD_OBLIQUE              NC_("STR_SVT_STYLE_BOLD_OBLIQUE", "Bold Oblique")
+#define STR_SVT_STYLE_CONDENSED                 NC_("STR_SVT_STYLE_CONDENSED", "Condensed")
+#define STR_SVT_STYLE_CONDENSED_BOLD            NC_("STR_SVT_STYLE_CONDENSED_BOLD", "Condensed Bold")
+#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC     NC_("STR_SVT_STYLE_CONDENSED_BOLD_ITALIC", "Condensed Bold Italic")
+#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE    NC_("STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE", "Condensed Bold Oblique")
+#define STR_SVT_STYLE_CONDENSED_ITALIC          NC_("STR_SVT_STYLE_CONDENSED_ITALIC", "Condensed Italic")
+#define STR_SVT_STYLE_CONDENSED_OBLIQUE         NC_("STR_SVT_STYLE_CONDENSED_OBLIQUE", "Condensed Oblique")
+#define STR_SVT_STYLE_EXTRALIGHT                NC_("STR_SVT_STYLE_EXTRALIGHT", "ExtraLight")
+#define STR_SVT_STYLE_EXTRALIGHT_ITALIC         NC_("STR_SVT_STYLE_EXTRALIGHT_ITALIC", "ExtraLight Italic")
+#define STR_SVT_STYLE_OBLIQUE                   NC_("STR_SVT_STYLE_OBLIQUE", "Oblique")
+#define STR_SVT_STYLE_SEMIBOLD                  NC_("STR_SVT_STYLE_SEMIBOLD", "Semibold")
+#define STR_SVT_STYLE_SEMIBOLD_ITALIC           NC_("STR_SVT_STYLE_SEMIBOLD_ITALIC", "Semibold Italic")
+#define STR_SVT_FONTMAP_BOTH                    NC_("STR_SVT_FONTMAP_BOTH", "The same font will be used on both your printer and your screen.")
+#define STR_SVT_FONTMAP_PRINTERONLY             NC_("STR_SVT_FONTMAP_PRINTERONLY", "This is a printer font. The screen image may differ.")
+#define STR_SVT_FONTMAP_STYLENOTAVAILABLE       NC_("STR_SVT_FONTMAP_STYLENOTAVAILABLE", "This font style will be simulated or the closest matching style will be used.")
+#define STR_SVT_FONTMAP_NOTAVAILABLE            NC_("STR_SVT_FONTMAP_NOTAVAILABLE", "This font has not been installed. The closest available font will be used.")
+
+#define STR_FILECTRL_BUTTONTEXT                 NC_("STR_FILECTRL_BUTTONTEXT", "Browse...")
+#define STR_TABBAR_PUSHBUTTON_MOVET0HOME        NC_("STR_TABBAR_PUSHBUTTON_MOVET0HOME", "Move To Home")
+#define STR_TABBAR_PUSHBUTTON_MOVELEFT          NC_("STR_TABBAR_PUSHBUTTON_MOVELEFT", "Move Left")
+#define STR_TABBAR_PUSHBUTTON_MOVERIGHT         NC_("STR_TABBAR_PUSHBUTTON_MOVERIGHT", "Move Right")
+#define STR_TABBAR_PUSHBUTTON_MOVETOEND         NC_("STR_TABBAR_PUSHBUTTON_MOVETOEND", "Move To End")
+#define STR_TABBAR_PUSHBUTTON_ADDTAB            NC_("STR_TABBAR_PUSHBUTTON_ADDTAB", "Add")
+
+#define STR_SVT_ACC_RULER_HORZ_NAME             NC_("STR_SVT_ACC_RULER_HORZ_NAME", "Horizontal Ruler")
+#define STR_SVT_ACC_RULER_VERT_NAME             NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler")
+
+#define STR_SVT_1BIT_THRESHOLD                  NC_("STR_SVT_1BIT_THRESHOLD", "1 bit threshold")
+#define STR_SVT_1BIT_DITHERED                   NC_("STR_SVT_1BIT_DITHERED", "1 bit dithered")
+#define STR_SVT_4BIT_GRAYSCALE                  NC_("STR_SVT_4BIT_GRAYSCALE", "4 bit grayscale")
+#define STR_SVT_4BIT_COLOR_PALETTE              NC_("STR_SVT_4BIT_COLOR_PALETTE", "4 bit color")
+#define STR_SVT_8BIT_GRAYSCALE                  NC_("STR_SVT_8BIT_GRAYSCALE", "8 bit grayscale")
+#define STR_SVT_8BIT_COLOR_PALETTE              NC_("STR_SVT_8BIT_COLOR_PALETTE", "8 bit color")
+#define STR_SVT_24BIT_TRUE_COLOR                NC_("STR_SVT_24BIT_TRUE_COLOR", "24 bit true color")
+#define STR_SVT_ESTIMATED_SIZE_PIX_1            NC_("STR_SVT_ESTIMATED_SIZE_PIX_1", "The image needs about %1 KB of memory.")
+#define STR_SVT_ESTIMATED_SIZE_PIX_2            NC_("STR_SVT_ESTIMATED_SIZE_PIX_2", "The image needs about %1 KB of memory, the file size is %2 KB.")
+#define STR_SVT_ESTIMATED_SIZE_VEC              NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 KB.")
+#define STR_SVT_HOST                            NC_("STR_SVT_HOST", "host")
+#define STR_SVT_PORT                            NC_("STR_SVT_PORT", "port")
+#define STR_SVT_PRNDLG_READY                    NC_("STR_SVT_PRNDLG_READY", "Ready")
+#define STR_SVT_PRNDLG_PAUSED                   NC_("STR_SVT_PRNDLG_PAUSED", "Paused")
+#define STR_SVT_PRNDLG_PENDING                  NC_("STR_SVT_PRNDLG_PENDING", "Pending deletion")
+#define STR_SVT_PRNDLG_BUSY                     NC_("STR_SVT_PRNDLG_BUSY", "Busy")
+#define STR_SVT_PRNDLG_INITIALIZING             NC_("STR_SVT_PRNDLG_INITIALIZING", "Initializing")
+#define STR_SVT_PRNDLG_WAITING                  NC_("STR_SVT_PRNDLG_WAITING", "Waiting")
+#define STR_SVT_PRNDLG_WARMING_UP               NC_("STR_SVT_PRNDLG_WARMING_UP", "Warming up")
+#define STR_SVT_PRNDLG_PROCESSING               NC_("STR_SVT_PRNDLG_PROCESSING", "Processing")
+#define STR_SVT_PRNDLG_PRINTING                 NC_("STR_SVT_PRNDLG_PRINTING", "Printing")
+#define STR_SVT_PRNDLG_OFFLINE                  NC_("STR_SVT_PRNDLG_OFFLINE", "Offline")
+#define STR_SVT_PRNDLG_ERROR                    NC_("STR_SVT_PRNDLG_ERROR", "Error")
+#define STR_SVT_PRNDLG_SERVER_UNKNOWN           NC_("STR_SVT_PRNDLG_SERVER_UNKNOWN", "Unknown Server")
+#define STR_SVT_PRNDLG_PAPER_JAM                NC_("STR_SVT_PRNDLG_PAPER_JAM", "Paper jam")
+#define STR_SVT_PRNDLG_PAPER_OUT                NC_("STR_SVT_PRNDLG_PAPER_OUT", "Not enough paper")
+#define STR_SVT_PRNDLG_MANUAL_FEED              NC_("STR_SVT_PRNDLG_MANUAL_FEED", "Manual feed")
+#define STR_SVT_PRNDLG_PAPER_PROBLEM            NC_("STR_SVT_PRNDLG_PAPER_PROBLEM", "Paper problem")
+#define STR_SVT_PRNDLG_IO_ACTIVE                NC_("STR_SVT_PRNDLG_IO_ACTIVE", "I/O active")
+#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL          NC_("STR_SVT_PRNDLG_OUTPUT_BIN_FULL", "Output bin full")
+#define STR_SVT_PRNDLG_TONER_LOW                NC_("STR_SVT_PRNDLG_TONER_LOW", "Toner low")
+#define STR_SVT_PRNDLG_NO_TONER                 NC_("STR_SVT_PRNDLG_NO_TONER", "No toner")
+#define STR_SVT_PRNDLG_PAGE_PUNT                NC_("STR_SVT_PRNDLG_PAGE_PUNT", "Delete Page")
+#define STR_SVT_PRNDLG_USER_INTERVENTION        NC_("STR_SVT_PRNDLG_USER_INTERVENTION", "User intervention necessary")
+#define STR_SVT_PRNDLG_OUT_OF_MEMORY            NC_("STR_SVT_PRNDLG_OUT_OF_MEMORY", "Insufficient memory")
+#define STR_SVT_PRNDLG_DOOR_OPEN                NC_("STR_SVT_PRNDLG_DOOR_OPEN", "Cover open")
+#define STR_SVT_PRNDLG_POWER_SAVE               NC_("STR_SVT_PRNDLG_POWER_SAVE", "Power save mode")
+#define STR_SVT_PRNDLG_DEFPRINTER               NC_("STR_SVT_PRNDLG_DEFPRINTER", "Default printer")
+#define STR_SVT_PRNDLG_JOBCOUNT                 NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents")
+
+#define STR_WIZDLG_FINISH                       NC_("STR_WIZDLG_FINISH", "~Finish")
+#define STR_WIZDLG_NEXT                         NC_("STR_WIZDLG_NEXT", "~Next >>")
+#define STR_WIZDLG_PREVIOUS                     NC_("STR_WIZDLG_PREVIOUS", "<< Bac~k")
+#define STR_WIZDLG_ROADMAP_TITLE                NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps")
+
+#define STR_NO_FIELD_SELECTION                  NC_("STR_NO_FIELD_SELECTION", "<none>")
+#define STR_FIELD_COMPANY                       NC_("STR_FIELD_COMPANY", "Company")
+#define STR_FIELD_DEPARTMENT                    NC_("STR_FIELD_DEPARTMENT", "Department")
+#define STR_FIELD_FIRSTNAME                     NC_("STR_FIELD_FIRSTNAME", "First name")
+#define STR_FIELD_LASTNAME                      NC_("STR_FIELD_LASTNAME", "Last name")
+#define STR_FIELD_STREET                        NC_("STR_FIELD_STREET", "Street")
+#define STR_FIELD_COUNTRY                       NC_("STR_FIELD_COUNTRY", "Country")
+#define STR_FIELD_ZIPCODE                       NC_("STR_FIELD_ZIPCODE", "ZIP Code")
+#define STR_FIELD_CITY                          NC_("STR_FIELD_CITY", "City")
+#define STR_FIELD_TITLE                         NC_("STR_FIELD_TITLE", "Title")
+#define STR_FIELD_POSITION                      NC_("STR_FIELD_POSITION", "Position")
+#define STR_FIELD_ADDRFORM                      NC_("STR_FIELD_ADDRFORM", "Addr. Form")
+#define STR_FIELD_INITIALS                      NC_("STR_FIELD_INITIALS", "Initials")
+#define STR_FIELD_SALUTATION                    NC_("STR_FIELD_SALUTATION", "Complimentary close")
+#define STR_FIELD_HOMETEL                       NC_("STR_FIELD_HOMETEL", "Tel: Home")
+#define STR_FIELD_WORKTEL                       NC_("STR_FIELD_WORKTEL", "Tel: Work")
+#define STR_FIELD_FAX                           NC_("STR_FIELD_FAX", "FAX")
+#define STR_FIELD_EMAIL                         NC_("STR_FIELD_EMAIL", "E-mail")
+#define STR_FIELD_URL                           NC_("STR_FIELD_URL", "URL")
+#define STR_FIELD_NOTE                          NC_("STR_FIELD_NOTE", "Note")
+#define STR_FIELD_USER1                         NC_("STR_FIELD_USER1", "User 1")
+#define STR_FIELD_USER2                         NC_("STR_FIELD_USER2", "User 2")
+#define STR_FIELD_USER3                         NC_("STR_FIELD_USER3", "User 3")
+#define STR_FIELD_USER4                         NC_("STR_FIELD_USER4", "User 4")
+#define STR_FIELD_ID                            NC_("STR_FIELD_ID", "ID")
+#define STR_FIELD_STATE                         NC_("STR_FIELD_STATE", "State")
+#define STR_FIELD_OFFICETEL                     NC_("STR_FIELD_OFFICETEL", "Tel: Office")
+#define STR_FIELD_PAGER                         NC_("STR_FIELD_PAGER", "Pager")
+#define STR_FIELD_MOBILE                        NC_("STR_FIELD_MOBILE", "Mobile")
+#define STR_FIELD_TELOTHER                      NC_("STR_FIELD_TELOTHER", "Tel: Other")
+#define STR_FIELD_CALENDAR                      NC_("STR_FIELD_CALENDAR", "Calendar")
+#define STR_FIELD_INVITE                        NC_("STR_FIELD_INVITE", "Invite")
+
+#define STR_SVT_DEFAULT_SERVICE_LABEL           NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
+
+#define STR_WARNING_JAVANOTFOUND                NC_("STR_WARNING_JAVANOTFOUND", "PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.")
+#define STR_WARNING_JAVANOTFOUND_MAC            NC_("STR_WARNING_JAVANOTFOUND_MAC", "PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.")
+#define STR_WARNING_INVALIDJAVASETTINGS_MAC     NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
+#define STR_WARNING_INVALIDJAVASETTINGS         NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
+#define STR_ERROR_JVMCREATIONFAILED_MAC         NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced.")
+#define STR_ERROR_JVMCREATIONFAILED             NC_("STR_ERROR_JVMCREATIONFAILED", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.")
+#define STR_WARNING_JAVANOTFOUND_TITLE          NC_("STR_WARNING_JAVANOTFOUND_TITLE", "JRE Required")
+#define STR_WARNING_INVALIDJAVASETTINGS_TITLE   NC_("STR_WARNING_INVALIDJAVASETTINGS_TITLE", "Select JRE")
+#define STR_ERROR_JVMCREATIONFAILED_TITLE       NC_("STR_ERROR_JVMCREATIONFAILED_TITLE", "JRE is Defective")
+
+#define STR_DESCRIPTION_SOURCEFILE              NC_("STR_DESCRIPTION_SOURCEFILE", "Source code")
+#define STR_DESCRIPTION_BOOKMARKFILE            NC_("STR_DESCRIPTION_BOOKMARKFILE", "Bookmark file")
+#define STR_DESCRIPTION_GRAPHIC_DOC             NC_("STR_DESCRIPTION_GRAPHIC_DOC", "Graphics")
+#define STR_DESCRIPTION_CFGFILE                 NC_("STR_DESCRIPTION_CFGFILE", "Configuration file")
+#define STR_DESCRIPTION_APPLICATION             NC_("STR_DESCRIPTION_APPLICATION", "Application")
+#define STR_DESCRIPTION_DATABASE_TABLE          NC_("STR_DESCRIPTION_DATABASE_TABLE", "Database table")
+#define STR_DESCRIPTION_SYSFILE                 NC_("STR_DESCRIPTION_SYSFILE", "System file")
+#define STR_DESCRIPTION_WORD_DOC                NC_("STR_DESCRIPTION_WORD_DOC", "MS Word document")
+#define STR_DESCRIPTION_HELP_DOC                NC_("STR_DESCRIPTION_HELP_DOC", "Help file")
+#define STR_DESCRIPTION_HTMLFILE                NC_("STR_DESCRIPTION_HTMLFILE", "HTML document")
+#define STR_DESCRIPTION_ARCHIVFILE              NC_("STR_DESCRIPTION_ARCHIVFILE", "Archive file")
+#define STR_DESCRIPTION_LOGFILE                 NC_("STR_DESCRIPTION_LOGFILE", "Log file")
+#define STR_DESCRIPTION_SDATABASE_DOC           NC_("STR_DESCRIPTION_SDATABASE_DOC", "StarOffice Database")
+#define STR_DESCRIPTION_GLOBALDOC               NC_("STR_DESCRIPTION_GLOBALDOC", "StarWriter 4.0 / 5.0 Master Document")
+#define STR_DESCRIPTION_SIMAGE_DOC              NC_("STR_DESCRIPTION_SIMAGE_DOC", "StarOffice Image")
+#define STR_DESCRIPTION_TEXTFILE                NC_("STR_DESCRIPTION_TEXTFILE", "Text file")
+#define STR_DESCRIPTION_LINK                    NC_("STR_DESCRIPTION_LINK", "Link")
+#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC    NC_("STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC", "StarOffice 3.0 - 5.0 Template")
+#define STR_DESCRIPTION_EXCEL_DOC               NC_("STR_DESCRIPTION_EXCEL_DOC", "MS Excel document")
+#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC      NC_("STR_DESCRIPTION_EXCEL_TEMPLATE_DOC", "MS Excel template")
+#define STR_DESCRIPTION_BATCHFILE               NC_("STR_DESCRIPTION_BATCHFILE", "Batch file")
+#define STR_DESCRIPTION_FILE                    NC_("STR_DESCRIPTION_FILE", "File")
+#define STR_DESCRIPTION_FOLDER                  NC_("STR_DESCRIPTION_FOLDER", "Folder")
+#define STR_DESCRIPTION_FACTORY_WRITER          NC_("STR_DESCRIPTION_FACTORY_WRITER", "Text Document")
+#define STR_DESCRIPTION_FACTORY_CALC            NC_("STR_DESCRIPTION_FACTORY_CALC", "Spreadsheet")
+#define STR_DESCRIPTION_FACTORY_IMPRESS         NC_("STR_DESCRIPTION_FACTORY_IMPRESS", "Presentation")
+#define STR_DESCRIPTION_FACTORY_DRAW            NC_("STR_DESCRIPTION_FACTORY_DRAW", "Drawing")
+#define STR_DESCRIPTION_FACTORY_WRITERWEB       NC_("STR_DESCRIPTION_FACTORY_WRITERWEB", "HTML document")
+#define STR_DESCRIPTION_FACTORY_GLOBALDOC       NC_("STR_DESCRIPTION_FACTORY_GLOBALDOC", "Master document")
+#define STR_DESCRIPTION_FACTORY_MATH            NC_("STR_DESCRIPTION_FACTORY_MATH", "Formula")
+#define STR_DESCRIPTION_FACTORY_DATABASE        NC_("STR_DESCRIPTION_FACTORY_DATABASE", "Database")
+#define STR_DESCRIPTION_CALC_TEMPLATE           NC_("STR_DESCRIPTION_CALC_TEMPLATE", "OpenOffice.org 1.0 Spreadsheet Template")
+#define STR_DESCRIPTION_DRAW_TEMPLATE           NC_("STR_DESCRIPTION_DRAW_TEMPLATE", "OpenOffice.org 1.0 Drawing Template")
+#define STR_DESCRIPTION_IMPRESS_TEMPLATE        NC_("STR_DESCRIPTION_IMPRESS_TEMPLATE", "OpenOffice.org 1.0 Presentation Template")
+#define STR_DESCRIPTION_WRITER_TEMPLATE         NC_("STR_DESCRIPTION_WRITER_TEMPLATE", "OpenOffice.org 1.0 Text Document Template")
+#define STR_DESCRIPTION_LOCALE_VOLUME           NC_("STR_DESCRIPTION_LOCALE_VOLUME", "Local drive")
+#define STR_DESCRIPTION_FLOPPY_VOLUME           NC_("STR_DESCRIPTION_FLOPPY_VOLUME", "Disk drive")
+#define STR_DESCRIPTION_CDROM_VOLUME            NC_("STR_DESCRIPTION_CDROM_VOLUME", "CD-ROM drive")
+#define STR_DESCRIPTION_REMOTE_VOLUME           NC_("STR_DESCRIPTION_REMOTE_VOLUME", "Network connection")
+#define STR_DESCRIPTION_POWERPOINT              NC_("STR_DESCRIPTION_POWERPOINT", "MS PowerPoint Document")
+#define STR_DESCRIPTION_POWERPOINT_TEMPLATE     NC_("STR_DESCRIPTION_POWERPOINT_TEMPLATE", "MS PowerPoint Template")
+#define STR_DESCRIPTION_POWERPOINT_SHOW         NC_("STR_DESCRIPTION_POWERPOINT_SHOW", "MS PowerPoint Show")
+#define STR_DESCRIPTION_SXMATH_DOC              NC_("STR_DESCRIPTION_SXMATH_DOC", "OpenOffice.org 1.0 Formula")
+#define STR_DESCRIPTION_SXCHART_DOC             NC_("STR_DESCRIPTION_SXCHART_DOC", "OpenOffice.org 1.0 Chart")
+#define STR_DESCRIPTION_SXDRAW_DOC              NC_("STR_DESCRIPTION_SXDRAW_DOC", "OpenOffice.org 1.0 Drawing")
+#define STR_DESCRIPTION_SXCALC_DOC              NC_("STR_DESCRIPTION_SXCALC_DOC", "OpenOffice.org 1.0 Spreadsheet")
+#define STR_DESCRIPTION_SXIMPRESS_DOC           NC_("STR_DESCRIPTION_SXIMPRESS_DOC", "OpenOffice.org 1.0 Presentation")
+#define STR_DESCRIPTION_SXWRITER_DOC            NC_("STR_DESCRIPTION_SXWRITER_DOC", "OpenOffice.org 1.0 Text Document")
+#define STR_DESCRIPTION_SXGLOBAL_DOC            NC_("STR_DESCRIPTION_SXGLOBAL_DOC", "OpenOffice.org 1.0 Master Document")
+#define STR_DESCRIPTION_MATHML_DOC              NC_("STR_DESCRIPTION_MATHML_DOC", "MathML Document")
+#define STR_DESCRIPTION_OO_DATABASE_DOC         NC_("STR_DESCRIPTION_OO_DATABASE_DOC", "OpenDocument Database")
+#define STR_DESCRIPTION_OO_DRAW_DOC             NC_("STR_DESCRIPTION_OO_DRAW_DOC", "OpenDocument Drawing")
+#define STR_DESCRIPTION_OO_MATH_DOC             NC_("STR_DESCRIPTION_OO_MATH_DOC", "OpenDocument Formula")
+#define STR_DESCRIPTION_OO_GLOBAL_DOC           NC_("STR_DESCRIPTION_OO_GLOBAL_DOC", "OpenDocument Master Document")
+#define STR_DESCRIPTION_OO_IMPRESS_DOC          NC_("STR_DESCRIPTION_OO_IMPRESS_DOC", "OpenDocument Presentation")
+#define STR_DESCRIPTION_OO_CALC_DOC             NC_("STR_DESCRIPTION_OO_CALC_DOC", "OpenDocument Spreadsheet")
+#define STR_DESCRIPTION_OO_WRITER_DOC           NC_("STR_DESCRIPTION_OO_WRITER_DOC", "OpenDocument Text")
+#define STR_DESCRIPTION_OO_CALC_TEMPLATE        NC_("STR_DESCRIPTION_OO_CALC_TEMPLATE", "OpenDocument Spreadsheet Template")
+#define STR_DESCRIPTION_OO_DRAW_TEMPLATE        NC_("STR_DESCRIPTION_OO_DRAW_TEMPLATE", "OpenDocument Drawing Template")
+#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE     NC_("STR_DESCRIPTION_OO_IMPRESS_TEMPLATE", "OpenDocument Presentation Template")
+#define STR_DESCRIPTION_OO_WRITER_TEMPLATE      NC_("STR_DESCRIPTION_OO_WRITER_TEMPLATE", "OpenDocument Text Template")
+#define STR_DESCRIPTION_EXTENSION               NC_("STR_DESCRIPTION_EXTENSION", "%PRODUCTNAME Extension")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
deleted file mode 100644
index 70186f41fabb..000000000000
--- a/include/svtools/svtools.hrc
+++ /dev/null
@@ -1,247 +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_SVTOOLS_SVTOOLS_HRC
-#define INCLUDED_SVTOOLS_SVTOOLS_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_SVTOOLS_BITMAP_START        (RID_SVTOOLS_START + 0)
-#define RID_SVTOOLS_IMAGELIST_START     (RID_SVTOOLS_START + 0)
-
-// various unsorted stuff
-
-#define STR_SVT_FILEVIEW_COLUMN_TITLE   (RID_SVTOOLS_START + 20)
-#define STR_SVT_FILEVIEW_COLUMN_SIZE    (RID_SVTOOLS_START + 21)
-#define STR_SVT_FILEVIEW_COLUMN_DATE    (RID_SVTOOLS_START + 22)
-#define STR_SVT_BYTES                   (RID_SVTOOLS_START + 25)
-#define STR_SVT_KB                      (RID_SVTOOLS_START + 26)
-#define STR_SVT_MB                      (RID_SVTOOLS_START + 27)
-#define STR_SVT_GB                      (RID_SVTOOLS_START + 28)
-#define STR_SVT_FILEVIEW_COLUMN_TYPE    (RID_SVTOOLS_START + 29)
-#define STR_FILTERNAME_ALL              (RID_SVTOOLS_START + 30)
-//FREE
-#define STR_SVT_1BIT_THRESHOLD          (RID_SVTOOLS_START + 32)
-#define STR_SVT_1BIT_DITHERED           (RID_SVTOOLS_START + 33)
-#define STR_SVT_4BIT_GRAYSCALE          (RID_SVTOOLS_START + 34)
-#define STR_SVT_4BIT_COLOR_PALETTE      (RID_SVTOOLS_START + 35)
-#define STR_SVT_8BIT_GRAYSCALE          (RID_SVTOOLS_START + 36)
-#define STR_SVT_8BIT_COLOR_PALETTE      (RID_SVTOOLS_START + 37)
-#define STR_SVT_24BIT_TRUE_COLOR        (RID_SVTOOLS_START + 38)
-#define STR_SVT_ESTIMATED_SIZE_PIX_1    (RID_SVTOOLS_START + 39)
-#define STR_SVT_ESTIMATED_SIZE_PIX_2    (RID_SVTOOLS_START + 40)
-#define STR_SVT_ESTIMATED_SIZE_VEC      (RID_SVTOOLS_START + 41)
-#define STR_SVT_HOST                    (RID_SVTOOLS_START + 42)
-#define STR_SVT_PORT                    (RID_SVTOOLS_START + 43)
-
-// FREE
-
-#define STR_SVT_DEFAULT_SERVICE_LABEL   (RID_SVTOOLS_START+57)
-
-#define STRARY_SVT_DOCINFO              (RID_SVTOOLS_START+58)
-
-#define STR_BASICKEY_FORMAT_ON          (RID_SVTOOLS_START+103)
-#define STR_BASICKEY_FORMAT_OFF         (RID_SVTOOLS_START+104)
-#define STR_BASICKEY_FORMAT_YES         (RID_SVTOOLS_START+105)
-#define STR_BASICKEY_FORMAT_NO          (RID_SVTOOLS_START+106)
-#define STR_BASICKEY_FORMAT_TRUE        (RID_SVTOOLS_START+107)
-#define STR_BASICKEY_FORMAT_FALSE       (RID_SVTOOLS_START+108)
-#define STR_UNDO                        (RID_SVTOOLS_START+110)
-#define STR_REDO                        (RID_SVTOOLS_START+111)
-#define STR_REPEAT                      (RID_SVTOOLS_START+112)
-
-#define STR_BASICKEY_FORMAT_CURRENCY    (RID_SVTOOLS_START+130)
-
-#define STR_SVT_PRNDLG_START                (RID_SVTOOLS_START+141)
-
-#define STR_SVT_PRNDLG_READY                (STR_SVT_PRNDLG_START+2)
-#define STR_SVT_PRNDLG_PAUSED               (STR_SVT_PRNDLG_START+3)
-#define STR_SVT_PRNDLG_PENDING              (STR_SVT_PRNDLG_START+4)
-#define STR_SVT_PRNDLG_BUSY                 (STR_SVT_PRNDLG_START+5)
-#define STR_SVT_PRNDLG_INITIALIZING         (STR_SVT_PRNDLG_START+6)
-#define STR_SVT_PRNDLG_WAITING              (STR_SVT_PRNDLG_START+7)
-#define STR_SVT_PRNDLG_WARMING_UP           (STR_SVT_PRNDLG_START+8)
-#define STR_SVT_PRNDLG_PROCESSING           (STR_SVT_PRNDLG_START+9)
-#define STR_SVT_PRNDLG_PRINTING             (STR_SVT_PRNDLG_START+10)
-#define STR_SVT_PRNDLG_OFFLINE              (STR_SVT_PRNDLG_START+11)
-#define STR_SVT_PRNDLG_ERROR                (STR_SVT_PRNDLG_START+12)
-#define STR_SVT_PRNDLG_SERVER_UNKNOWN       (STR_SVT_PRNDLG_START+13)
-#define STR_SVT_PRNDLG_PAPER_JAM            (STR_SVT_PRNDLG_START+14)
-#define STR_SVT_PRNDLG_PAPER_OUT            (STR_SVT_PRNDLG_START+15)
-#define STR_SVT_PRNDLG_MANUAL_FEED          (STR_SVT_PRNDLG_START+16)
-#define STR_SVT_PRNDLG_PAPER_PROBLEM        (STR_SVT_PRNDLG_START+17)
-#define STR_SVT_PRNDLG_IO_ACTIVE            (STR_SVT_PRNDLG_START+18)
-#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL      (STR_SVT_PRNDLG_START+19)
-#define STR_SVT_PRNDLG_TONER_LOW            (STR_SVT_PRNDLG_START+20)
-#define STR_SVT_PRNDLG_NO_TONER             (STR_SVT_PRNDLG_START+21)
-#define STR_SVT_PRNDLG_PAGE_PUNT            (STR_SVT_PRNDLG_START+22)
-#define STR_SVT_PRNDLG_USER_INTERVENTION    (STR_SVT_PRNDLG_START+23)
-#define STR_SVT_PRNDLG_OUT_OF_MEMORY        (STR_SVT_PRNDLG_START+24)
-#define STR_SVT_PRNDLG_DOOR_OPEN            (STR_SVT_PRNDLG_START+25)
-#define STR_SVT_PRNDLG_POWER_SAVE           (STR_SVT_PRNDLG_START+26)
-#define STR_SVT_PRNDLG_DEFPRINTER           (STR_SVT_PRNDLG_START+27)
-#define STR_SVT_PRNDLG_JOBCOUNT             (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END                  (STR_SVT_PRNDLG_JOBCOUNT)
-
-#define STR_SVT_CALENDAR_START              (STR_SVT_PRNDLG_END+1)
-#define STR_SVT_CALENDAR_DAY                (STR_SVT_CALENDAR_START+0)
-#define STR_SVT_CALENDAR_WEEK               (STR_SVT_CALENDAR_START+1)
-#define STR_SVT_CALENDAR_TODAY              (STR_SVT_CALENDAR_START+2)
-#define STR_SVT_CALENDAR_NONE               (STR_SVT_CALENDAR_START+3)
-#define STR_SVT_CALENDAR_END                (STR_SVT_CALENDAR_NONE)
-
-#define STR_SVT_STYLE_START                 (STR_SVT_CALENDAR_END+1)
-#define STR_SVT_STYLE_LIGHT                 (STR_SVT_STYLE_START+0)
-#define STR_SVT_STYLE_LIGHT_ITALIC          (STR_SVT_STYLE_START+1)
-#define STR_SVT_STYLE_NORMAL                (STR_SVT_STYLE_START+2)
-#define STR_SVT_STYLE_NORMAL_ITALIC         (STR_SVT_STYLE_START+3)
-#define STR_SVT_STYLE_BOLD                  (STR_SVT_STYLE_START+4)
-#define STR_SVT_STYLE_BOLD_ITALIC           (STR_SVT_STYLE_START+5)
-#define STR_SVT_STYLE_BLACK                 (STR_SVT_STYLE_START+6)
-#define STR_SVT_STYLE_BLACK_ITALIC          (STR_SVT_STYLE_START+7)
-#define STR_SVT_STYLE_BOOK                  (STR_SVT_STYLE_START+8)
-#define STR_SVT_STYLE_BOLD_OBLIQUE          (STR_SVT_STYLE_START+9)
-#define STR_SVT_STYLE_CONDENSED             (STR_SVT_STYLE_START+10)
-#define STR_SVT_STYLE_CONDENSED_BOLD        (STR_SVT_STYLE_START+11)
-#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC (STR_SVT_STYLE_START+12)
-#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE (STR_SVT_STYLE_START+13)
-#define STR_SVT_STYLE_CONDENSED_ITALIC      (STR_SVT_STYLE_START+14)
-#define STR_SVT_STYLE_CONDENSED_OBLIQUE     (STR_SVT_STYLE_START+15)
-#define STR_SVT_STYLE_EXTRALIGHT            (STR_SVT_STYLE_START+16)
-#define STR_SVT_STYLE_EXTRALIGHT_ITALIC     (STR_SVT_STYLE_START+17)
-#define STR_SVT_STYLE_OBLIQUE               (STR_SVT_STYLE_START+18)
-#define STR_SVT_STYLE_SEMIBOLD              (STR_SVT_STYLE_START+19)
-#define STR_SVT_STYLE_SEMIBOLD_ITALIC       (STR_SVT_STYLE_START+20)
-#define STR_SVT_STYLE_END                   (STR_SVT_STYLE_SEMIBOLD_ITALIC)
-
-#define STR_SVT_FONTMAP_START               (STR_SVT_STYLE_END+1)
-#define STR_SVT_FONTMAP_BOTH                (STR_SVT_FONTMAP_START+0)
-#define STR_SVT_FONTMAP_PRINTERONLY         (STR_SVT_FONTMAP_START+1)
-#define STR_SVT_FONTMAP_STYLENOTAVAILABLE   (STR_SVT_FONTMAP_START+4)
-#define STR_SVT_FONTMAP_NOTAVAILABLE        (STR_SVT_FONTMAP_START+5)
-#define STR_SVT_FONTMAP_END                 (STR_SVT_FONTMAP_NOTAVAILABLE)
-
-#define STR_SVT_ERRORCONTEXT_START          (STR_SVT_FONTMAP_END+1)
-#define RID_ERRCTX                          (STR_SVT_ERRORCONTEXT_START+2)
-#define RID_ERRHDL                          (STR_SVT_ERRORCONTEXT_START+3)
-#define STR_SVT_ERRORCONTEXT_END            (RID_ERRHDL)
-
-#define STR_WIZARDDIALOG_START              (STR_SVT_ERRORCONTEXT_END + 1)
-#define STR_WIZDLG_FINISH                   (STR_WIZARDDIALOG_START + 0)
-#define STR_WIZDLG_NEXT                     (STR_WIZARDDIALOG_START + 1)
-#define STR_WIZDLG_PREVIOUS                 (STR_WIZARDDIALOG_START + 2)
-#define STR_WIZDLG_ROADMAP_TITLE            (STR_WIZARDDIALOG_START + 3)
-#define STR_WIZARDDIALOG_END                (STR_WIZDLG_ROADMAP_TITLE)
-
-#define STR_SVT_COLLATE_START               (STR_WIZARDDIALOG_END+1)
-#define STR_SVT_COLLATE_NORMAL              (STR_SVT_COLLATE_START+0)
-#define STR_SVT_COLLATE_DICTIONARY          (STR_SVT_COLLATE_START+1)
-#define STR_SVT_COLLATE_PINYIN              (STR_SVT_COLLATE_START+2)
-#define STR_SVT_COLLATE_STROKE              (STR_SVT_COLLATE_START+3)
-#define STR_SVT_COLLATE_RADICAL             (STR_SVT_COLLATE_START+4)
-#define STR_SVT_COLLATE_CHARSET             (STR_SVT_COLLATE_START+5)
-#define STR_SVT_COLLATE_ZHUYIN              (STR_SVT_COLLATE_START+6)
-#define STR_SVT_COLLATE_ALPHANUMERIC        (STR_SVT_COLLATE_START+7)
-#define STR_SVT_COLLATE_UNICODE             (STR_SVT_COLLATE_START+8)
-#define STR_SVT_COLLATE_PHONEBOOK           (STR_SVT_COLLATE_START+9)
-#define STR_SVT_COLLATE_PHONETIC_F          (STR_SVT_COLLATE_START+10)
-#define STR_SVT_COLLATE_PHONETIC_L          (STR_SVT_COLLATE_START+11)
-#define STR_SVT_COLLATE_END                 (STR_SVT_COLLATE_PHONETIC_L)
-
-// String-Ids for accessibility
-#define STR_SVT_ACC_BEGIN                   (STR_SVT_COLLATE_END+1)
-// free
-#define STR_SVT_ACC_DESC_TABLISTBOX         (STR_SVT_ACC_BEGIN+2)
-#define STR_SVT_ACC_DESC_FILEVIEW           (STR_SVT_ACC_BEGIN+3)
-#define STR_SVT_ACC_DESC_FOLDER             (STR_SVT_ACC_BEGIN+4)
-#define STR_SVT_ACC_DESC_FILE               (STR_SVT_ACC_BEGIN+5)
-#define STR_SVT_ACC_EMPTY_FIELD             (STR_SVT_ACC_BEGIN+6)
-#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7)
-#define STR_SVT_ACC_RULER_VERT_NAME         (STR_SVT_ACC_BEGIN+8)
-#define STR_SVT_ACC_RULER_HORZ_NAME         (STR_SVT_ACC_BEGIN+9)
-#define STR_SVT_ACC_END                     (STR_SVT_ACC_RULER_HORZ_NAME)
-
-#define STR_SVT_INDEXENTRY_START            (STR_SVT_ACC_END + 1)
-#define STR_SVT_INDEXENTRY_ALPHANUMERIC     (STR_SVT_INDEXENTRY_START+0)
-#define STR_SVT_INDEXENTRY_DICTIONARY       (STR_SVT_INDEXENTRY_START+1)
-#define STR_SVT_INDEXENTRY_PINYIN           (STR_SVT_INDEXENTRY_START+2)
-#define STR_SVT_INDEXENTRY_RADICAL          (STR_SVT_INDEXENTRY_START+3)
-#define STR_SVT_INDEXENTRY_STROKE           (STR_SVT_INDEXENTRY_START+4)
-#define STR_SVT_INDEXENTRY_ZHUYIN           (STR_SVT_INDEXENTRY_START+5)
-#define STR_SVT_INDEXENTRY_PHONETIC_FS      (STR_SVT_INDEXENTRY_START+6)
-#define STR_SVT_INDEXENTRY_PHONETIC_FC      (STR_SVT_INDEXENTRY_START+7)
-#define STR_SVT_INDEXENTRY_PHONETIC_LS      (STR_SVT_INDEXENTRY_START+8)
-#define STR_SVT_INDEXENTRY_PHONETIC_LC      (STR_SVT_INDEXENTRY_START+9)
-#define STR_SVT_INDEXENTRY_END              (STR_SVT_INDEXENTRY_PHONETIC_LC)
-
-//String - Ids for Java errors, messages
-#define STR_SVT_JAVAERROR_START               (STR_SVT_INDEXENTRY_END + 1)
-#define STR_ERROR_JVMCREATIONFAILED_TITLE     (STR_SVT_JAVAERROR_START+1)
-#define STR_WARNING_JAVANOTFOUND              (STR_SVT_JAVAERROR_START+2)
-#define STR_WARNING_JAVANOTFOUND_TITLE        (STR_SVT_JAVAERROR_START+3)
-#define STR_WARNING_INVALIDJAVASETTINGS       (STR_SVT_JAVAERROR_START+4)
-#define STR_WARNING_INVALIDJAVASETTINGS_MAC   (STR_SVT_JAVAERROR_START+5)
-#define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6)
-#define STR_ERROR_JVMCREATIONFAILED           (STR_SVT_JAVAERROR_START+7)
-#define STR_ERROR_JVMCREATIONFAILED_MAC       (STR_SVT_JAVAERROR_START+8)
-#define STR_WARNING_JAVANOTFOUND_MAC          (STR_SVT_JAVAERROR_START+9)
-#define STR_SVT_JAVAERROR_END                 (STR_ERROR_JVMCREATIONFAILED_MAC)
-
-// String array to match UI language names to LanguageType values and vice versa
-#define STR_ARR_SVT_LANGUAGE_TABLE_START    (STR_SVT_JAVAERROR_END + 1)
-#define STR_ARR_SVT_LANGUAGE_TABLE          (STR_ARR_SVT_LANGUAGE_TABLE_START + 0)
-#define STR_ARR_SVT_LANGUAGE_TABLE_END      (STR_ARR_SVT_LANGUAGE_TABLE)
-
-#define STR_SVT_ADDRESSTEMPLATE_START       (STR_ARR_SVT_LANGUAGE_TABLE_END+1)
-#define STR_NO_FIELD_SELECTION              (STR_SVT_ADDRESSTEMPLATE_START+0)
-#define STR_FIELD_COMPANY                   (STR_SVT_ADDRESSTEMPLATE_START+1)
-#define STR_FIELD_DEPARTMENT                (STR_SVT_ADDRESSTEMPLATE_START+2)
-#define STR_FIELD_FIRSTNAME                 (STR_SVT_ADDRESSTEMPLATE_START+3)
-#define STR_FIELD_LASTNAME                  (STR_SVT_ADDRESSTEMPLATE_START+4)
-#define STR_FIELD_STREET                    (STR_SVT_ADDRESSTEMPLATE_START+5)
-#define STR_FIELD_COUNTRY                   (STR_SVT_ADDRESSTEMPLATE_START+6)
-#define STR_FIELD_ZIPCODE                   (STR_SVT_ADDRESSTEMPLATE_START+7)
-#define STR_FIELD_CITY                      (STR_SVT_ADDRESSTEMPLATE_START+8)
-#define STR_FIELD_TITLE                     (STR_SVT_ADDRESSTEMPLATE_START+9)
-#define STR_FIELD_POSITION                  (STR_SVT_ADDRESSTEMPLATE_START+10)
-#define STR_FIELD_ADDRFORM                  (STR_SVT_ADDRESSTEMPLATE_START+11)
-#define STR_FIELD_INITIALS                  (STR_SVT_ADDRESSTEMPLATE_START+12)
-#define STR_FIELD_SALUTATION                (STR_SVT_ADDRESSTEMPLATE_START+13)
-#define STR_FIELD_HOMETEL                   (STR_SVT_ADDRESSTEMPLATE_START+14)
-#define STR_FIELD_WORKTEL                   (STR_SVT_ADDRESSTEMPLATE_START+15)
-#define STR_FIELD_FAX                       (STR_SVT_ADDRESSTEMPLATE_START+16)
-#define STR_FIELD_EMAIL                     (STR_SVT_ADDRESSTEMPLATE_START+17)
-#define STR_FIELD_URL                       (STR_SVT_ADDRESSTEMPLATE_START+18)
-#define STR_FIELD_NOTE                      (STR_SVT_ADDRESSTEMPLATE_START+19)
-#define STR_FIELD_USER1                     (STR_SVT_ADDRESSTEMPLATE_START+20)
-#define STR_FIELD_USER2                     (STR_SVT_ADDRESSTEMPLATE_START+21)
-#define STR_FIELD_USER3                     (STR_SVT_ADDRESSTEMPLATE_START+22)
-#define STR_FIELD_USER4                     (STR_SVT_ADDRESSTEMPLATE_START+23)
-#define STR_FIELD_ID                        (STR_SVT_ADDRESSTEMPLATE_START+24)
-#define STR_FIELD_STATE                     (STR_SVT_ADDRESSTEMPLATE_START+25)
-#define STR_FIELD_OFFICETEL                 (STR_SVT_ADDRESSTEMPLATE_START+26)
-#define STR_FIELD_PAGER                     (STR_SVT_ADDRESSTEMPLATE_START+27)
-#define STR_FIELD_MOBILE                    (STR_SVT_ADDRESSTEMPLATE_START+28)
-#define STR_FIELD_TELOTHER                  (STR_SVT_ADDRESSTEMPLATE_START+29)
-#define STR_FIELD_CALENDAR                  (STR_SVT_ADDRESSTEMPLATE_START+30)
-#define STR_FIELD_INVITE                    (STR_SVT_ADDRESSTEMPLATE_START+31)
-#define STR_SVT_ADDRESSTEMPLATE_END         (STR_FIELD_INVITE)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index 374406b1e455..8f6cfc8b43f0 100644
--- a/include/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
@@ -21,19 +21,15 @@
 #define INCLUDED_SVTOOLS_SVTRESID_HXX
 
 #include <svtools/svtdllapi.h>
-#include <tools/resid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 
-struct SVT_DLLPUBLIC SvtResMgr
+struct SVT_DLLPUBLIC SvtResLocale
 {
-    static ResMgr* GetResMgr();
-    static void DeleteResMgr();
+    static std::locale* GetResLocale();
+    static void DeleteResLocale();
 };
 
-inline OUString SvtResId(sal_uInt16 nId)
-{
-    return ResId(nId, *SvtResMgr::GetResMgr());
-}
+SVT_DLLPUBLIC OUString SvtResId(const char* pId);
 
 #endif // INCLUDED_SVTOOLS_SVTRESID_HXX
 
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index b1249859bfcc..ecbe8cc51093 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -68,12 +68,12 @@ public:
 
     /** Initialize the description with the specified string from the
         resource followed by the shape's style in parantheses and a colon.
-        @param nResourceId
+        @param pResourceId
             A resource id the specifies the introductory description of the
             shape that is made more specific by later calls to
             <member>addProperty</member>.
     */
-    void Initialize (sal_Int32 nResourceId);
+    void Initialize(const char* pResourceId);
 
     /**  Returns the description string and then resets it.  Usually called
          as last method before destroying the object.
@@ -114,7 +114,7 @@ public:
         @param aType
             Type of the property's value.  It controls the transformation
             into the value's string representation.
-        @param nResourceId
+        @param pResourceId
             Id of the localized name of the property int the resource.
         @param nWhichId
             This which id is used to localize the property value.  If it is
@@ -122,7 +122,7 @@ public:
     */
     void AddProperty (const OUString& sPropertyName,
         PropertyType aType,
-        sal_Int32 nResourceId,
+        const char* pResourceId,
         long nWhichId=-1);
 
     /** Append the given string as is to the current description.
diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx
index 54951aaee993..ee9147d1f503 100644
--- a/include/svx/dialmgr.hxx
+++ b/include/svx/dialmgr.hxx
@@ -19,22 +19,11 @@
 #ifndef INCLUDED_SVX_DIALMGR_HXX
 #define INCLUDED_SVX_DIALMGR_HXX
 
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
 
-// forward ---------------------------------------------------------------
-
-struct SVX_DLLPUBLIC DialogsResMgr
-{
-    static ResMgr*      GetResMgr();
-};
-
-#define DIALOG_MGR()    (*DialogsResMgr::GetResMgr())
-
-inline OUString SvxResId(sal_uInt16 nId)
-{
-    return ResId(nId, DIALOG_MGR());
-}
+SVX_DLLPUBLIC const std::locale& SvxResLocale();
+SVX_DLLPUBLIC OUString SvxResId(const char* pId);
 
 #endif
 
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 9cb968dc7a17..45f12bc3bc54 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -23,34 +23,6 @@
 #include <svx/svxids.hrc>
 #include <sfx2/dialogs.hrc>
 
-// Resource-Id's ------------------------------------------------------------
-
-// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE                   330
-
-// some strings also used in CUI
-#define RID_SVXERRCTX                       (RID_SVX_START + 351)
-#define RID_SVXSTR_COLOR                    (RID_SVX_START + 179)
-#define RID_SVXSTR_NOFILL                   (RID_SVX_START + 190)
-#define RID_SVXSTR_BY_AUTHOR                (RID_SVX_START + 842)
-#define RID_SVXSTR_TRANSPARENT              (RID_SVX_START + 843)
-#define RID_SVXSTR_DEFAULT                  (RID_SVX_START + 844)
-#define RID_SVXSTR_INVISIBLE                (RID_SVX_START + 178)
-#define RID_SVXSTR_NONE                     (RID_SVX_START + 183)
-#define RID_SVXSTR_SOLID                    (RID_SVX_START + 160)
-#define RID_SVXSTR_LINEEND                  (RID_SVX_START + 237)
-#define RID_SVXSTR_GRADIENT                 (RID_SVX_START + 161)
-#define RID_SVXSTR_HATCH                    (RID_SVX_START + 180)
-#define RID_SVXSTR_BITMAP                   (RID_SVX_START + 167)
-#define RID_SVXSTR_PATTERN                  (RID_SVX_START + 168)
-#define RID_SVXSTR_PATTERN_UNTITLED         (RID_SVX_START + 169)
-#define RID_SVXSTR_LINESTYLE                (RID_SVX_START + 173)
-#define RID_SVXSTR_FIELDUNIT_TABLE          (RID_SVX_START + 311)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME    (RID_SVX_START + 251)
-#define RID_SVXSTR_GALLERY_THEMEITEMS       (RID_SVX_START + 252)
-
-#define RID_SVXSTR_GALLERY_PREVIEW          (RID_SVX_START + 255)
-
 // factory IDs of tabpages implemented in CUI
 #define RID_SVXPAGE_CHAR_TWOLINES           (RID_SVX_START + 242)
 #define RID_SVXPAGE_EXT_PARAGRAPH           (RID_SVX_START +   7)
@@ -130,770 +102,6 @@
 #define RID_SC_TP_DEFAULTS              (RID_OFA_START + 253)
 #define SID_SC_TP_STAT                  (RID_OFA_START + 254)
 
-// ResIds for dialogs from StarDraw
-#define RID_SVXSW_FRAMEPOSITIONS            (RID_SVX_START + 289)
-
-#define RID_SVXFLOAT3D_FAVORITE             (RID_SVX_START + 73)
-#define RID_SVXFLOAT3D_FIX_R                (RID_SVX_START + 77)
-#define RID_SVXFLOAT3D_FIX_G                (RID_SVX_START + 78)
-#define RID_SVXFLOAT3D_FIX_B                (RID_SVX_START + 84)
-
-#define RID_SVXSTR_FRMSEL_TEXTS             (RID_SVX_START +  93)
-#define RID_SVXSTR_FRMSEL_DESCRIPTIONS      (RID_SVX_START +  94)
-
-#define RID_SIDEBAR_EMPTY_PANEL_TEXT        (RID_SVX_START + 321)
-
-// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
-
-// Strings ------------------------------------------------------------------
-
-// Strings for the language
-#define RID_SVXSTR_LANGUAGE_ALL             (RID_SVX_START +  15)
-
-// Strings from the search dialog
-#define RID_SVXSTR_SEARCH_END_SHEET         (RID_SVX_START +  71)
-#define RID_SVXSTR_SEARCH_END               (RID_SVX_START +  79)
-#define RID_SVXSTR_SEARCH_STYLES            (RID_SVX_START +  80)
-#define RID_SVXSTR_SEARCH                   (RID_SVX_START +  81)
-#define RID_SVXSTR_REPLACE                  (RID_SVX_START +  82)
-#define RID_SVXSTR_WRITER_STYLES            (RID_SVX_START +  83)
-#define RID_SVXSTR_CALC_STYLES              (RID_SVX_START +  85)
-#define RID_SVXSTR_SEARCH_NOT_FOUND         (RID_SVX_START +  88)
-#define RID_SVXSTR_QUERY_EXIT_RECOVERY      (RID_SVX_START +  89)
-#define RID_SVXSTR_SEARCH_START             (RID_SVX_START +  90)
-// ResIds for the PageDialog
-
-// Strings of the ToolBox-Controls from tbcontrl.cxx
-#define RID_SVXSTR_FRAME                    (RID_SVX_START + 192)
-#define RID_SVXSTR_FRAME_STYLE              (RID_SVX_START + 195)
-#define RID_SVXSTR_CLEARFORM                (RID_SVX_START + 197)
-#define RID_SVXSTR_MORE                     (RID_SVX_START + 198)
-#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
-#define RID_SVXSTR_CHARFONTNAME             (RID_SVX_START + 200)
-#define RID_SVXSTR_MORE_STYLES              (RID_SVX_START + 202)
-#define RID_SVXSTR_MORENUMBERING            (RID_SVX_START + 204)
-#define RID_SVXSTR_MOREBULLETS              (RID_SVX_START + 205)
-
-#define RID_SVXSTR_CUSTOM_PAL               (RID_SVX_START + 206)
-#define RID_SVXSTR_DOC_COLORS               (RID_SVX_START + 207)
-#define RID_SVXSTR_DOC_COLOR_PREFIX         (RID_SVX_START + 208)
-
-// Strings for insert/overwrite mode
-#define RID_SVXSTR_INSERT_HELPTEXT          (RID_SVX_START + 210)
-#define RID_SVXSTR_OVERWRITE_HELPTEXT       (RID_SVX_START + 211)
-#define RID_SVXSTR_OVERWRITE_TEXT           (RID_SVX_START + 212)
-
-#define RID_SVXSTR_XMLSEC_SIG_OK            (RID_SVX_START + 222)
-#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY  (RID_SVX_START + 223)
-#define RID_SVXSTR_XMLSEC_SIG_NOT_OK        (RID_SVX_START + 224)
-#define RID_SVXSTR_XMLSEC_NO_SIG            (RID_SVX_START + 225)
-#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226)
-
-// Strings for the ruler
-#define RID_SVXSTR_RULER_START              (RID_SVX_START + 245)
-#define RID_SVXSTR_RULER_TAB_LEFT           (RID_SVX_START + 245)
-#define RID_SVXSTR_RULER_TAB_RIGHT          (RID_SVX_START + 246)
-#define RID_SVXSTR_RULER_TAB_CENTER         (RID_SVX_START + 247)
-#define RID_SVXSTR_RULER_TAB_DECIMAL        (RID_SVX_START + 248)
-
-// Color strings
-#define RID_SVXSTR_COLOR_BLACK              (RID_SVX_START + 275)
-#define RID_SVXSTR_COLOR_BLUE               (RID_SVX_START + 276)
-#define RID_SVXSTR_COLOR_GREEN              (RID_SVX_START + 277)
-#define RID_SVXSTR_COLOR_CYAN               (RID_SVX_START + 278)
-#define RID_SVXSTR_COLOR_RED                (RID_SVX_START + 279)
-#define RID_SVXSTR_COLOR_MAGENTA            (RID_SVX_START + 280)
-#define RID_SVXSTR_COLOR_GREY               (RID_SVX_START + 282)
-#define RID_SVXSTR_COLOR_YELLOW             (RID_SVX_START + 289)
-#define RID_SVXSTR_COLOR_WHITE              (RID_SVX_START + 290)
-#define RID_SVXSTR_COLOR_BLUEGREY           (RID_SVX_START + 291)
-#define RID_SVXSTR_COLOR_ORANGE             (RID_SVX_START + 292)
-#define RID_SVXSTR_COLOR_TURQUOISE          (RID_SVX_START + 293)
-#define RID_SVXSTR_COLOR_TURQUOISE_DEF      (RID_SVX_START + 294)
-#define RID_SVXSTR_COLOR_BLUE_CLASSIC       (RID_SVX_START + 295)
-#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF   (RID_SVX_START + 296)
-
-// Line endings strings
-#define RID_SVXSTR_ARROW                    (RID_SVX_START + 300)
-#define RID_SVXSTR_SQUARE                   (RID_SVX_START + 301)
-#define RID_SVXSTR_CIRCLE                   (RID_SVX_START + 302)
-
-#define RID_SVXSTR_TRANSPARENCE             (RID_SVX_START + 305)
-#define RID_SVXSTR_CENTERED                 (RID_SVX_START + 306)
-#define RID_SVXSTR_NOTCENTERED              (RID_SVX_START + 307)
-
-// String-Arrays
-#define RID_SVXSTR_TEXTENCODING_TABLE       (RID_SVX_START + 312)
-
-#define RID_SVXERRCODE                      (RID_SVX_START + 350)
-
-// gallery
-#define RID_SVX_GALLERY_START               (RID_SVX_START + 360)
-//      RID_SVX_GALLERY_END                 (RID_SVX_START + 410)
-
-// Define - Region for bitmap masking
-// !!! don't use defines from this region !!!
-#define RID_SVX_BMPMASK_START               (RID_SVX_START + 420)
-//      RID_SVX_BMPMASK_END                 (RID_SVX_START + 440)
-
-// Define - Region for IMAP editor
-// !!! don't use defines from this region !!!
-#define RID_SVX_IMAP_START                  (RID_SVX_START + 450)
-//      RID_SVX_IMAP_END                    (RID_SVX_START + 460)
-
-// Define - Region for contour editor
-// !!! don't use defines from this region !!!
-#define RID_SVX_CONTOUR_START               (RID_SVX_START + 461)
-//      RID_SVX_CONTOUR_END                 (RID_SVX_START + 471)
-
-// Defines for the 3D engine
-#define RID_SVX_3D_UNDO_EXCHANGE_PASTE      (RID_SVX_START + 489)
-#define RID_SVX_3D_UNDO_ROTATE              (RID_SVX_START + 495)
-#define RID_SVX_3D_UNDO_EXTRUDE             (RID_SVX_START + 496)
-#define RID_SVX_3D_UNDO_LATHE               (RID_SVX_START + 497)
-#define RID_SVX_3D_UNDO_BREAK_LATHE         (RID_SVX_START + 498)
-
-// ResIds for graphics drawmode
-#define RID_SVXSTR_GRAFMODE_STANDARD        (RID_SVX_START + 520)
-#define RID_SVXSTR_GRAFMODE_GREYS           (RID_SVX_START + 521)
-#define RID_SVXSTR_GRAFMODE_MONO            (RID_SVX_START + 522)
-#define RID_SVXSTR_GRAFMODE_WATERMARK       (RID_SVX_START + 523)
-
-// BM: some additional standard colors
-#define RID_SVXSTR_COLOR_VIOLET             (RID_SVX_START + 540)
-#define RID_SVXSTR_COLOR_BORDEAUX           (RID_SVX_START + 541)
-#define RID_SVXSTR_COLOR_PALE_YELLOW        (RID_SVX_START + 542)
-#define RID_SVXSTR_COLOR_PALE_GREEN         (RID_SVX_START + 543)
-#define RID_SVXSTR_COLOR_DARKVIOLET         (RID_SVX_START + 544)
-#define RID_SVXSTR_COLOR_SALMON             (RID_SVX_START + 545)
-#define RID_SVXSTR_COLOR_SEABLUE            (RID_SVX_START + 546)
-
-// LibreOffice palette colors
-#define RID_SVXSTR_COLOR_LIBRE_GREEN_1       (RID_SVX_START + 548)
-#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT  (RID_SVX_START + 549)
-#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT   (RID_SVX_START + 550)
-#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551)
-#define RID_SVXSTR_COLOR_LIBRE_PURPLE        (RID_SVX_START + 552)
-#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553)
-#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT (RID_SVX_START + 554)
-
-// JP: string resource ids for table-autoformat-names, used in SW/SC
-// !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
-#define RID_SVXSTR_TBLAFMT_BEGIN            (RID_SVX_START + 560)
-#define RID_SVXSTR_TBLAFMT_3D               RID_SVXSTR_TBLAFMT_BEGIN
-#define RID_SVXSTR_TBLAFMT_BLACK1           (RID_SVX_START + 561)
-#define RID_SVXSTR_TBLAFMT_BLACK2           (RID_SVX_START + 562)
-#define RID_SVXSTR_TBLAFMT_BLUE             (RID_SVX_START + 563)
-#define RID_SVXSTR_TBLAFMT_BROWN            (RID_SVX_START + 564)
-#define RID_SVXSTR_TBLAFMT_CURRENCY         (RID_SVX_START + 565)
-#define RID_SVXSTR_TBLAFMT_CURRENCY_3D      (RID_SVX_START + 566)
-#define RID_SVXSTR_TBLAFMT_CURRENCY_GRAY    (RID_SVX_START + 567)
-#define RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER    (RID_SVX_START + 568)
-#define RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE   (RID_SVX_START + 569)
-#define RID_SVXSTR_TBLAFMT_GRAY             (RID_SVX_START + 570)
-#define RID_SVXSTR_TBLAFMT_GREEN            (RID_SVX_START + 571)
-#define RID_SVXSTR_TBLAFMT_LAVENDER         (RID_SVX_START + 572)
-#define RID_SVXSTR_TBLAFMT_RED              (RID_SVX_START + 573)
-#define RID_SVXSTR_TBLAFMT_TURQUOISE        (RID_SVX_START + 574)
-#define RID_SVXSTR_TBLAFMT_YELLOW           (RID_SVX_START + 575)
-#define RID_SVXSTR_TBLAFMT_END              (RID_SVX_START + 576)
-
-// string resources for XLineCap item
-#define RID_SVXSTR_LINECAP_BUTT             (RID_SVX_START + 586 )
-#define RID_SVXSTR_LINECAP_ROUND            (RID_SVX_START + 587 )
-#define RID_SVXSTR_LINECAP_SQUARE           (RID_SVX_START + 588 )
-
-// string resources for css::drawing::LineJoint item
-#define RID_SVXSTR_LINEJOINT_NONE           RID_SVXSTR_NONE
-#define RID_SVXSTR_LINEJOINT_MIDDLE         (RID_SVX_START + 589 )
-#define RID_SVXSTR_LINEJOINT_BEVEL          (RID_SVX_START + 590 )
-#define RID_SVXSTR_LINEJOINT_MITER          (RID_SVX_START + 591 )
-#define RID_SVXSTR_LINEJOINT_ROUND          (RID_SVX_START + 592 )
-
-// Default-Color-Names
-#define RID_SVXSTR_COLOR_BLACK_DEF          (RID_SVX_START + 595)
-#define RID_SVXSTR_COLOR_BLUE_DEF           (RID_SVX_START + 596)
-#define RID_SVXSTR_COLOR_GREEN_DEF          (RID_SVX_START + 597)
-#define RID_SVXSTR_COLOR_CYAN_DEF           (RID_SVX_START + 598)
-#define RID_SVXSTR_COLOR_RED_DEF            (RID_SVX_START + 599)
-#define RID_SVXSTR_COLOR_MAGENTA_DEF        (RID_SVX_START + 600)
-#define RID_SVXSTR_COLOR_GREY_DEF           (RID_SVX_START + 602)
-#define RID_SVXSTR_COLOR_YELLOW_DEF         (RID_SVX_START + 609)
-#define RID_SVXSTR_COLOR_WHITE_DEF          (RID_SVX_START + 610)
-#define RID_SVXSTR_COLOR_BLUEGREY_DEF       (RID_SVX_START + 611)
-#define RID_SVXSTR_COLOR_ORANGE_DEF         (RID_SVX_START + 612)
-#define RID_SVXSTR_COLOR_VIOLET_DEF         (RID_SVX_START + 613)
-#define RID_SVXSTR_COLOR_BORDEAUX_DEF       (RID_SVX_START + 614)
-#define RID_SVXSTR_COLOR_PALE_YELLOW_DEF    (RID_SVX_START + 615)
-#define RID_SVXSTR_COLOR_PALE_GREEN_DEF     (RID_SVX_START + 616)
-#define RID_SVXSTR_COLOR_DARKVIOLET_DEF     (RID_SVX_START + 617)
-#define RID_SVXSTR_COLOR_SALMON_DEF         (RID_SVX_START + 618)
-#define RID_SVXSTR_COLOR_SEABLUE_DEF        (RID_SVX_START + 619)
-#define RID_SVXSTR_COLOR_CHART              (RID_SVX_START + 621)
-#define RID_SVXSTR_COLOR_CHART_DEF          (RID_SVX_START + 622)
-#define RID_SVXSTR_COLOR_PURPLE             (RID_SVX_START + 623)
-#define RID_SVXSTR_COLOR_PURPLE_DEF         (RID_SVX_START + 624)
-#define RID_SVXSTR_COLOR_SKYBLUE            (RID_SVX_START + 625)
-#define RID_SVXSTR_COLOR_SKYBLUE_DEF        (RID_SVX_START + 626)
-#define RID_SVXSTR_COLOR_YELLOWGREEN        (RID_SVX_START + 627)
-#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF    (RID_SVX_START + 628)
-#define RID_SVXSTR_COLOR_PINK               (RID_SVX_START + 629)
-#define RID_SVXSTR_COLOR_PINK_DEF           (RID_SVX_START + 630)
-
-// LibreOffice palette colors
-#define RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF       (RID_SVX_START + 631)
-#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF  (RID_SVX_START + 632)
-#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF   (RID_SVX_START + 633)
-#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 634)
-#define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF        (RID_SVX_START + 635)
-#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 636)
-#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 637)
-
-// Tango palette colors
-#define RID_SVXSTR_COLOR_TANGO_BUTTER            (RID_SVX_START + 638)
-#define RID_SVXSTR_COLOR_TANGO_ORANGE            (RID_SVX_START + 639)
-#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE         (RID_SVX_START + 640)
-#define RID_SVXSTR_COLOR_TANGO_CHAMELEON         (RID_SVX_START + 641)
-#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE          (RID_SVX_START + 642)
-#define RID_SVXSTR_COLOR_TANGO_PLUM              (RID_SVX_START + 643)
-#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED       (RID_SVX_START + 644)
-#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM         (RID_SVX_START + 645)
-#define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF        (RID_SVX_START + 646)
-#define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF        (RID_SVX_START + 647)
-#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF     (RID_SVX_START + 648)
-#define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF     (RID_SVX_START + 649)
-#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF      (RID_SVX_START + 650)
-#define RID_SVXSTR_COLOR_TANGO_PLUM_DEF          (RID_SVX_START + 651)
-#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF   (RID_SVX_START + 652)
-#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF     (RID_SVX_START + 653)
-
-// Default-Gradient-Names
-#define RID_SVXSTR_GRDT0_DEF                 (RID_SVX_START + 2000)
-#define RID_SVXSTR_GRDT1_DEF                 (RID_SVX_START + 2001)
-#define RID_SVXSTR_GRDT2_DEF                 (RID_SVX_START + 2002)
-#define RID_SVXSTR_GRDT3_DEF                 (RID_SVX_START + 2003)
-#define RID_SVXSTR_GRDT4_DEF                 (RID_SVX_START + 2004)
-#define RID_SVXSTR_GRDT5_DEF                 (RID_SVX_START + 2005)
-#define RID_SVXSTR_GRDT6_DEF                 (RID_SVX_START + 2006)
-#define RID_SVXSTR_GRDT7_DEF                 (RID_SVX_START + 2007)
-#define RID_SVXSTR_GRDT8_DEF                 (RID_SVX_START + 2008)
-#define RID_SVXSTR_GRDT9_DEF                 (RID_SVX_START + 2009)
-#define RID_SVXSTR_GRDT10_DEF                (RID_SVX_START + 2010)
-#define RID_SVXSTR_GRDT11_DEF                (RID_SVX_START + 2011)
-#define RID_SVXSTR_GRDT12_DEF                (RID_SVX_START + 2012)
-#define RID_SVXSTR_GRDT13_DEF                (RID_SVX_START + 2013)
-#define RID_SVXSTR_GRDT14_DEF                (RID_SVX_START + 2014)
-#define RID_SVXSTR_GRDT15_DEF                (RID_SVX_START + 2015)
-#define RID_SVXSTR_GRDT16_DEF                (RID_SVX_START + 2016)
-#define RID_SVXSTR_GRDT17_DEF                (RID_SVX_START + 2017)
-#define RID_SVXSTR_GRDT18_DEF                (RID_SVX_START + 2018)
-#define RID_SVXSTR_GRDT19_DEF                (RID_SVX_START + 2019)
-#define RID_SVXSTR_GRDT20_DEF                (RID_SVX_START + 2020)
-#define RID_SVXSTR_GRDT21_DEF                (RID_SVX_START + 2021)
-#define RID_SVXSTR_GRDT22_DEF                (RID_SVX_START + 2022)
-#define RID_SVXSTR_GRDT23_DEF                (RID_SVX_START + 2023)
-#define RID_SVXSTR_GRDT24_DEF                (RID_SVX_START + 2024)
-#define RID_SVXSTR_GRDT25_DEF                (RID_SVX_START + 2025)
-#define RID_SVXSTR_GRDT26_DEF                (RID_SVX_START + 2026)
-#define RID_SVXSTR_GRDT27_DEF                (RID_SVX_START + 2027)
-#define RID_SVXSTR_GRDT28_DEF                (RID_SVX_START + 2028)
-#define RID_SVXSTR_GRDT29_DEF                (RID_SVX_START + 2029)
-#define RID_SVXSTR_GRDT30_DEF                (RID_SVX_START + 2030)
-#define RID_SVXSTR_GRDT31_DEF                (RID_SVX_START + 2031)
-#define RID_SVXSTR_GRDT32_DEF                (RID_SVX_START + 2032)
-#define RID_SVXSTR_GRDT33_DEF                (RID_SVX_START + 2033)
-#define RID_SVXSTR_GRDT34_DEF                (RID_SVX_START + 2034)
-#define RID_SVXSTR_GRDT35_DEF                (RID_SVX_START + 2035)
-#define RID_SVXSTR_GRDT36_DEF                (RID_SVX_START + 2036)
-#define RID_SVXSTR_GRDT37_DEF                (RID_SVX_START + 2037)
-#define RID_SVXSTR_GRDT38_DEF                (RID_SVX_START + 2038)
-#define RID_SVXSTR_GRDT39_DEF                (RID_SVX_START + 2039)
-#define RID_SVXSTR_GRDT40_DEF                (RID_SVX_START + 2040)
-#define RID_SVXSTR_GRDT41_DEF                (RID_SVX_START + 2041)
-#define RID_SVXSTR_GRDT42_DEF                (RID_SVX_START + 2042)
-#define RID_SVXSTR_GRDT43_DEF                (RID_SVX_START + 2043)
-#define RID_SVXSTR_GRDT44_DEF                (RID_SVX_START + 2044)
-#define RID_SVXSTR_GRDT45_DEF                (RID_SVX_START + 2045)
-#define RID_SVXSTR_GRDT46_DEF                (RID_SVX_START + 2046)
-#define RID_SVXSTR_GRDT47_DEF                (RID_SVX_START + 2047)
-#define RID_SVXSTR_GRDT48_DEF                (RID_SVX_START + 2048)
-#define RID_SVXSTR_GRDT49_DEF                (RID_SVX_START + 2049)
-#define RID_SVXSTR_GRDT50_DEF                (RID_SVX_START + 2050)
-#define RID_SVXSTR_GRDT51_DEF                (RID_SVX_START + 2051)
-#define RID_SVXSTR_GRDT52_DEF                (RID_SVX_START + 2052)
-#define RID_SVXSTR_GRDT53_DEF                (RID_SVX_START + 2053)
-#define RID_SVXSTR_GRDT54_DEF                (RID_SVX_START + 2054)
-#define RID_SVXSTR_GRDT55_DEF                (RID_SVX_START + 2055)
-#define RID_SVXSTR_GRDT56_DEF                (RID_SVX_START + 2056)
-#define RID_SVXSTR_GRDT57_DEF                (RID_SVX_START + 2057)
-#define RID_SVXSTR_GRDT58_DEF                (RID_SVX_START + 2058)
-#define RID_SVXSTR_GRDT59_DEF                (RID_SVX_START + 2059)
-#define RID_SVXSTR_GRDT60_DEF                (RID_SVX_START + 2060)
-#define RID_SVXSTR_GRDT61_DEF                (RID_SVX_START + 2061)
-#define RID_SVXSTR_GRDT62_DEF                (RID_SVX_START + 2062)
-#define RID_SVXSTR_GRDT63_DEF                (RID_SVX_START + 2063)
-#define RID_SVXSTR_GRDT64_DEF                (RID_SVX_START + 2064)
-#define RID_SVXSTR_GRDT65_DEF                (RID_SVX_START + 2065)
-#define RID_SVXSTR_GRDT66_DEF                (RID_SVX_START + 2066)
-#define RID_SVXSTR_GRDT67_DEF                (RID_SVX_START + 2067)
-#define RID_SVXSTR_GRDT68_DEF                (RID_SVX_START + 2068)
-#define RID_SVXSTR_GRDT69_DEF                (RID_SVX_START + 2069)
-#define RID_SVXSTR_GRDT70_DEF                (RID_SVX_START + 2070)
-#define RID_SVXSTR_GRDT71_DEF                (RID_SVX_START + 2071)
-#define RID_SVXSTR_GRDT72_DEF                (RID_SVX_START + 2072)
-#define RID_SVXSTR_GRDT73_DEF                (RID_SVX_START + 2073)
-#define RID_SVXSTR_GRDT74_DEF                (RID_SVX_START + 2074)
-#define RID_SVXSTR_GRDT75_DEF                (RID_SVX_START + 2075)
-#define RID_SVXSTR_GRDT76_DEF                (RID_SVX_START + 2076)
-#define RID_SVXSTR_GRDT77_DEF                (RID_SVX_START + 2077)
-#define RID_SVXSTR_GRDT78_DEF                (RID_SVX_START + 2078)
-#define RID_SVXSTR_GRDT79_DEF                (RID_SVX_START + 2079)
-#define RID_SVXSTR_GRDT80_DEF                (RID_SVX_START + 2080)
-#define RID_SVXSTR_GRDT81_DEF                (RID_SVX_START + 2081)
-#define RID_SVXSTR_GRDT82_DEF                (RID_SVX_START + 2082)
-#define RID_SVXSTR_GRDT83_DEF                (RID_SVX_START + 2083)
-#define RID_SVXSTR_GRDT84_DEF                (RID_SVX_START + 2084)
-#define RID_SVXSTR_GRDT85_DEF                (RID_SVX_START + 2085)
-#define RID_SVXSTR_GRDT86_DEF                (RID_SVX_START + 2086)
-#define RID_SVXSTR_GRDT87_DEF                (RID_SVX_START + 2087)
-#define RID_SVXSTR_GRDT0                     (RID_SVX_START + 2100)
-#define RID_SVXSTR_GRDT1                     (RID_SVX_START + 2101)
-#define RID_SVXSTR_GRDT2                     (RID_SVX_START + 2102)
-#define RID_SVXSTR_GRDT3                     (RID_SVX_START + 2103)
-#define RID_SVXSTR_GRDT4                     (RID_SVX_START + 2104)
-#define RID_SVXSTR_GRDT5                     (RID_SVX_START + 2105)
-#define RID_SVXSTR_GRDT6                     (RID_SVX_START + 2106)
-#define RID_SVXSTR_GRDT7                     (RID_SVX_START + 2107)
-#define RID_SVXSTR_GRDT8                     (RID_SVX_START + 2108)
-#define RID_SVXSTR_GRDT9                     (RID_SVX_START + 2109)
-#define RID_SVXSTR_GRDT10                    (RID_SVX_START + 2110)
-#define RID_SVXSTR_GRDT11                    (RID_SVX_START + 2111)
-#define RID_SVXSTR_GRDT12                    (RID_SVX_START + 2112)
-#define RID_SVXSTR_GRDT13                    (RID_SVX_START + 2113)
-#define RID_SVXSTR_GRDT14                    (RID_SVX_START + 2114)
-#define RID_SVXSTR_GRDT15                    (RID_SVX_START + 2115)
-#define RID_SVXSTR_GRDT16                    (RID_SVX_START + 2116)
-#define RID_SVXSTR_GRDT17                    (RID_SVX_START + 2117)
-#define RID_SVXSTR_GRDT18                    (RID_SVX_START + 2118)
-#define RID_SVXSTR_GRDT19                    (RID_SVX_START + 2119)
-#define RID_SVXSTR_GRDT20                    (RID_SVX_START + 2120)
-#define RID_SVXSTR_GRDT21                    (RID_SVX_START + 2121)
-#define RID_SVXSTR_GRDT22                    (RID_SVX_START + 2122)
-#define RID_SVXSTR_GRDT23                    (RID_SVX_START + 2123)
-#define RID_SVXSTR_GRDT24                    (RID_SVX_START + 2124)
-#define RID_SVXSTR_GRDT25                    (RID_SVX_START + 2125)
-#define RID_SVXSTR_GRDT26                    (RID_SVX_START + 2126)
-#define RID_SVXSTR_GRDT27                    (RID_SVX_START + 2127)
-#define RID_SVXSTR_GRDT28                    (RID_SVX_START + 2128)
-#define RID_SVXSTR_GRDT29                    (RID_SVX_START + 2129)
-#define RID_SVXSTR_GRDT30                    (RID_SVX_START + 2130)
-#define RID_SVXSTR_GRDT31                    (RID_SVX_START + 2131)
-#define RID_SVXSTR_GRDT32                    (RID_SVX_START + 2132)
-#define RID_SVXSTR_GRDT33                    (RID_SVX_START + 2133)
-#define RID_SVXSTR_GRDT34                    (RID_SVX_START + 2134)
-#define RID_SVXSTR_GRDT35                    (RID_SVX_START + 2135)
-#define RID_SVXSTR_GRDT36                    (RID_SVX_START + 2136)
-#define RID_SVXSTR_GRDT37                    (RID_SVX_START + 2137)
-#define RID_SVXSTR_GRDT38                    (RID_SVX_START + 2138)
-#define RID_SVXSTR_GRDT39                    (RID_SVX_START + 2139)
-#define RID_SVXSTR_GRDT40                    (RID_SVX_START + 2140)
-#define RID_SVXSTR_GRDT41                    (RID_SVX_START + 2141)
-#define RID_SVXSTR_GRDT42                    (RID_SVX_START + 2142)
-#define RID_SVXSTR_GRDT43                    (RID_SVX_START + 2143)
-#define RID_SVXSTR_GRDT44                    (RID_SVX_START + 2144)
-#define RID_SVXSTR_GRDT45                    (RID_SVX_START + 2145)
-#define RID_SVXSTR_GRDT46                    (RID_SVX_START + 2146)
-#define RID_SVXSTR_GRDT47                    (RID_SVX_START + 2147)
-#define RID_SVXSTR_GRDT48                    (RID_SVX_START + 2148)
-#define RID_SVXSTR_GRDT49                    (RID_SVX_START + 2149)
-#define RID_SVXSTR_GRDT50                    (RID_SVX_START + 2150)
-#define RID_SVXSTR_GRDT51                    (RID_SVX_START + 2151)
-#define RID_SVXSTR_GRDT52                    (RID_SVX_START + 2152)
-#define RID_SVXSTR_GRDT53                    (RID_SVX_START + 2153)
-#define RID_SVXSTR_GRDT54                    (RID_SVX_START + 2154)
-#define RID_SVXSTR_GRDT55                    (RID_SVX_START + 2155)
-#define RID_SVXSTR_GRDT56                    (RID_SVX_START + 2156)
-#define RID_SVXSTR_GRDT57                    (RID_SVX_START + 2157)
-#define RID_SVXSTR_GRDT58                    (RID_SVX_START + 2158)
-#define RID_SVXSTR_GRDT59                    (RID_SVX_START + 2159)
-#define RID_SVXSTR_GRDT60                    (RID_SVX_START + 2160)
-#define RID_SVXSTR_GRDT61                    (RID_SVX_START + 2161)
-#define RID_SVXSTR_GRDT62                    (RID_SVX_START + 2162)
-#define RID_SVXSTR_GRDT63                    (RID_SVX_START + 2163)
-#define RID_SVXSTR_GRDT64                    (RID_SVX_START + 2164)
-#define RID_SVXSTR_GRDT65                    (RID_SVX_START + 2165)
-#define RID_SVXSTR_GRDT66                    (RID_SVX_START + 2166)
-#define RID_SVXSTR_GRDT67                    (RID_SVX_START + 2167)
-#define RID_SVXSTR_GRDT68                    (RID_SVX_START + 2168)
-#define RID_SVXSTR_GRDT69                    (RID_SVX_START + 2169)
-#define RID_SVXSTR_GRDT70                    (RID_SVX_START + 2170)
-#define RID_SVXSTR_GRDT71                    (RID_SVX_START + 2171)
-#define RID_SVXSTR_GRDT72                    (RID_SVX_START + 2172)
-#define RID_SVXSTR_GRDT73                    (RID_SVX_START + 2173)
-#define RID_SVXSTR_GRDT74                    (RID_SVX_START + 2174)
-#define RID_SVXSTR_GRDT75                    (RID_SVX_START + 2175)
-#define RID_SVXSTR_GRDT76                    (RID_SVX_START + 2176)
-#define RID_SVXSTR_GRDT77                    (RID_SVX_START + 2177)
-#define RID_SVXSTR_GRDT78                    (RID_SVX_START + 2178)
-#define RID_SVXSTR_GRDT79                    (RID_SVX_START + 2179)
-#define RID_SVXSTR_GRDT80                    (RID_SVX_START + 2180)
-#define RID_SVXSTR_GRDT81                    (RID_SVX_START + 2181)
-#define RID_SVXSTR_GRDT82                    (RID_SVX_START + 2182)
-#define RID_SVXSTR_GRDT83                    (RID_SVX_START + 2183)
-#define RID_SVXSTR_GRDT84                    (RID_SVX_START + 2184)
-#define RID_SVXSTR_GRDT85                    (RID_SVX_START + 2185)
-#define RID_SVXSTR_GRDT86                    (RID_SVX_START + 2186)
-#define RID_SVXSTR_GRDT87                    (RID_SVX_START + 2187)
-#define RID_SVXSTR_GRDT_DEF_START            RID_SVXSTR_GRDT0_DEF
-#define RID_SVXSTR_GRDT_DEF_END              RID_SVXSTR_GRDT87_DEF
-#define RID_SVXSTR_GRDT_START                RID_SVXSTR_GRDT0
-//      RID_SVXSTR_GRDT_END                  RID_SVXSTR_GRDT87
-
-// Default-Hatch-Names
-#define RID_SVXSTR_HATCH0_DEF               (RID_SVX_START + 661)
-#define RID_SVXSTR_HATCH1_DEF               (RID_SVX_START + 662)
-#define RID_SVXSTR_HATCH2_DEF               (RID_SVX_START + 663)
-#define RID_SVXSTR_HATCH3_DEF               (RID_SVX_START + 664)
-#define RID_SVXSTR_HATCH4_DEF               (RID_SVX_START + 665)
-#define RID_SVXSTR_HATCH5_DEF               (RID_SVX_START + 666)
-#define RID_SVXSTR_HATCH6_DEF               (RID_SVX_START + 667)
-#define RID_SVXSTR_HATCH7_DEF               (RID_SVX_START + 668)
-#define RID_SVXSTR_HATCH8_DEF               (RID_SVX_START + 669)
-#define RID_SVXSTR_HATCH9_DEF               (RID_SVX_START + 670)
-#define RID_SVXSTR_HATCH10_DEF              (RID_SVX_START + 671)
-#define RID_SVXSTR_HATCH0                   (RID_SVX_START + 672)
-#define RID_SVXSTR_HATCH1                   (RID_SVX_START + 673)
-#define RID_SVXSTR_HATCH2                   (RID_SVX_START + 674)
-#define RID_SVXSTR_HATCH3                   (RID_SVX_START + 675)
-#define RID_SVXSTR_HATCH4                   (RID_SVX_START + 676)
-#define RID_SVXSTR_HATCH5                   (RID_SVX_START + 677)
-#define RID_SVXSTR_HATCH6                   (RID_SVX_START + 678)
-#define RID_SVXSTR_HATCH7                   (RID_SVX_START + 679)
-#define RID_SVXSTR_HATCH8                   (RID_SVX_START + 680)
-#define RID_SVXSTR_HATCH9                   (RID_SVX_START + 681)
-#define RID_SVXSTR_HATCH10                  (RID_SVX_START + 682)
-#define RID_SVXSTR_HATCH_DEF_START          RID_SVXSTR_HATCH0_DEF
-#define RID_SVXSTR_HATCH_DEF_END            RID_SVXSTR_HATCH10_DEF
-#define RID_SVXSTR_HATCH_START              RID_SVXSTR_HATCH0
-//      RID_SVXSTR_HATCH_END                RID_SVXSTR_HATCH10
-
-// Default-Bitmap-Names
-#define RID_SVXSTR_BMP0_DEF                 (RID_SVX_START + 691)
-#define RID_SVXSTR_BMP1_DEF                 (RID_SVX_START + 692)
-#define RID_SVXSTR_BMP2_DEF                 (RID_SVX_START + 693)
-#define RID_SVXSTR_BMP3_DEF                 (RID_SVX_START + 694)
-#define RID_SVXSTR_BMP4_DEF                 (RID_SVX_START + 695)
-#define RID_SVXSTR_BMP5_DEF                 (RID_SVX_START + 696)
-#define RID_SVXSTR_BMP6_DEF                 (RID_SVX_START + 697)
-#define RID_SVXSTR_BMP7_DEF                 (RID_SVX_START + 698)
-#define RID_SVXSTR_BMP8_DEF                 (RID_SVX_START + 699)
-#define RID_SVXSTR_BMP9_DEF                 (RID_SVX_START + 700)
-#define RID_SVXSTR_BMP10_DEF                (RID_SVX_START + 701)
-#define RID_SVXSTR_BMP11_DEF                (RID_SVX_START + 702)
-#define RID_SVXSTR_BMP12_DEF                (RID_SVX_START + 703)
-#define RID_SVXSTR_BMP13_DEF                (RID_SVX_START + 704)
-#define RID_SVXSTR_BMP14_DEF                (RID_SVX_START + 705)
-#define RID_SVXSTR_BMP15_DEF                (RID_SVX_START + 706)
-#define RID_SVXSTR_BMP16_DEF                (RID_SVX_START + 707)
-#define RID_SVXSTR_BMP17_DEF                (RID_SVX_START + 708)
-#define RID_SVXSTR_BMP18_DEF                (RID_SVX_START + 709)
-#define RID_SVXSTR_BMP19_DEF                (RID_SVX_START + 710)
-#define RID_SVXSTR_BMP20_DEF                (RID_SVX_START + 711)
-#define RID_SVXSTR_BMP21_DEF                (RID_SVX_START + 712)
-#define RID_SVXSTR_BMP0                     (RID_SVX_START + 713)
-#define RID_SVXSTR_BMP1                     (RID_SVX_START + 714)
-#define RID_SVXSTR_BMP2                     (RID_SVX_START + 715)
-#define RID_SVXSTR_BMP3                     (RID_SVX_START + 716)
-#define RID_SVXSTR_BMP4                     (RID_SVX_START + 717)
-#define RID_SVXSTR_BMP5                     (RID_SVX_START + 718)
-#define RID_SVXSTR_BMP6                     (RID_SVX_START + 719)
-#define RID_SVXSTR_BMP7                     (RID_SVX_START + 720)
-#define RID_SVXSTR_BMP8                     (RID_SVX_START + 721)
-#define RID_SVXSTR_BMP9                     (RID_SVX_START + 722)
-#define RID_SVXSTR_BMP10                    (RID_SVX_START + 723)
-#define RID_SVXSTR_BMP11                    (RID_SVX_START + 724)
-#define RID_SVXSTR_BMP12                    (RID_SVX_START + 725)
-#define RID_SVXSTR_BMP13                    (RID_SVX_START + 726)
-#define RID_SVXSTR_BMP14                    (RID_SVX_START + 727)
-#define RID_SVXSTR_BMP15                    (RID_SVX_START + 728)
-#define RID_SVXSTR_BMP16                    (RID_SVX_START + 729)
-#define RID_SVXSTR_BMP17                    (RID_SVX_START + 730)
-#define RID_SVXSTR_BMP18                    (RID_SVX_START + 731)
-#define RID_SVXSTR_BMP19                    (RID_SVX_START + 732)
-#define RID_SVXSTR_BMP20                    (RID_SVX_START + 733)
-#define RID_SVXSTR_BMP21                    (RID_SVX_START + 734)
-#define RID_SVXSTR_BMP_DEF_START            RID_SVXSTR_BMP0_DEF
-#define RID_SVXSTR_BMP_DEF_END              RID_SVXSTR_BMP21_DEF
-#define RID_SVXSTR_BMP_START                RID_SVXSTR_BMP0
-//      RID_SVXSTR_BMP_END                  RID_SVXSTR_BMP21
-
-// Default-Linestyle-Names
-#define RID_SVXSTR_DASH0_DEF                (RID_SVX_START + 740)
-#define RID_SVXSTR_DASH1_DEF                (RID_SVX_START + 741)
-#define RID_SVXSTR_DASH2_DEF                (RID_SVX_START + 742)
-#define RID_SVXSTR_DASH3_DEF                (RID_SVX_START + 743)
-#define RID_SVXSTR_DASH4_DEF                (RID_SVX_START + 744)
-#define RID_SVXSTR_DASH5_DEF                (RID_SVX_START + 745)
-#define RID_SVXSTR_DASH6_DEF                (RID_SVX_START + 746)
-#define RID_SVXSTR_DASH7_DEF                (RID_SVX_START + 747)
-#define RID_SVXSTR_DASH8_DEF                (RID_SVX_START + 748)
-#define RID_SVXSTR_DASH9_DEF                (RID_SVX_START + 749)
-#define RID_SVXSTR_DASH10_DEF               (RID_SVX_START + 750)
-#define RID_SVXSTR_DASH11_DEF               (RID_SVX_START + 751)
-#define RID_SVXSTR_DASH12_DEF               (RID_SVX_START + 752)
-#define RID_SVXSTR_DASH0                    (RID_SVX_START + 753)
-#define RID_SVXSTR_DASH1                    (RID_SVX_START + 754)
-#define RID_SVXSTR_DASH2                    (RID_SVX_START + 755)
-#define RID_SVXSTR_DASH3                    (RID_SVX_START + 756)
-#define RID_SVXSTR_DASH4                    (RID_SVX_START + 757)
-#define RID_SVXSTR_DASH5                    (RID_SVX_START + 758)
-#define RID_SVXSTR_DASH6                    (RID_SVX_START + 759)
-#define RID_SVXSTR_DASH7                    (RID_SVX_START + 760)
-#define RID_SVXSTR_DASH8                    (RID_SVX_START + 761)
-#define RID_SVXSTR_DASH9                    (RID_SVX_START + 762)
-#define RID_SVXSTR_DASH10                   (RID_SVX_START + 763)
-#define RID_SVXSTR_DASH11                   (RID_SVX_START + 764)
-#define RID_SVXSTR_DASH12                   (RID_SVX_START + 765)
-#define RID_SVXSTR_DASH_DEF_START           RID_SVXSTR_DASH0_DEF
-#define RID_SVXSTR_DASH_DEF_END             RID_SVXSTR_DASH12_DEF
-#define RID_SVXSTR_DASH_START               RID_SVXSTR_DASH0
-//      RID_SVXSTR_DASH_END                 RID_SVXSTR_DASH12
-
-// Default-Line-End-Names
-// Shifted numbers. Old value range from +770 to +795 is unused now
-#define RID_SVXSTR_LEND0_DEF                (RID_SVX_START + 2770)
-#define RID_SVXSTR_LEND1_DEF                (RID_SVX_START + 2771)
-#define RID_SVXSTR_LEND2_DEF                (RID_SVX_START + 2772)
-#define RID_SVXSTR_LEND3_DEF                (RID_SVX_START + 2773)
-#define RID_SVXSTR_LEND4_DEF                (RID_SVX_START + 2774)
-#define RID_SVXSTR_LEND5_DEF                (RID_SVX_START + 2775)
-#define RID_SVXSTR_LEND6_DEF                (RID_SVX_START + 2776)
-#define RID_SVXSTR_LEND7_DEF                (RID_SVX_START + 2777)
-#define RID_SVXSTR_LEND8_DEF                (RID_SVX_START + 2778)
-#define RID_SVXSTR_LEND9_DEF                (RID_SVX_START + 2779)
-#define RID_SVXSTR_LEND10_DEF               (RID_SVX_START + 2780)
-#define RID_SVXSTR_LEND11_DEF               (RID_SVX_START + 2781)
-#define RID_SVXSTR_LEND12_DEF               (RID_SVX_START + 2782)
-#define RID_SVXSTR_LEND13_DEF               (RID_SVX_START + 2783)
-#define RID_SVXSTR_LEND14_DEF               (RID_SVX_START + 2784)
-#define RID_SVXSTR_LEND15_DEF               (RID_SVX_START + 2785)
-#define RID_SVXSTR_LEND16_DEF               (RID_SVX_START + 2786)
-#define RID_SVXSTR_LEND17_DEF               (RID_SVX_START + 2787)
-#define RID_SVXSTR_LEND18_DEF               (RID_SVX_START + 2788)
-#define RID_SVXSTR_LEND19_DEF               (RID_SVX_START + 2789)
-#define RID_SVXSTR_LEND20_DEF               (RID_SVX_START + 2790)
-#define RID_SVXSTR_LEND0                    (RID_SVX_START + 2791)
-#define RID_SVXSTR_LEND1                    (RID_SVX_START + 2792)
-#define RID_SVXSTR_LEND2                    (RID_SVX_START + 2793)
-#define RID_SVXSTR_LEND3                    (RID_SVX_START + 2794)
-#define RID_SVXSTR_LEND4                    (RID_SVX_START + 2795)
-#define RID_SVXSTR_LEND5                    (RID_SVX_START + 2796)
-#define RID_SVXSTR_LEND6                    (RID_SVX_START + 2797)
-#define RID_SVXSTR_LEND7                    (RID_SVX_START + 2798)
-#define RID_SVXSTR_LEND8                    (RID_SVX_START + 2799)
-#define RID_SVXSTR_LEND9                    (RID_SVX_START + 2800)
-#define RID_SVXSTR_LEND10                   (RID_SVX_START + 2801)
-#define RID_SVXSTR_LEND11                   (RID_SVX_START + 2802)
-#define RID_SVXSTR_LEND12                   (RID_SVX_START + 2803)
-#define RID_SVXSTR_LEND13                   (RID_SVX_START + 2804)
-#define RID_SVXSTR_LEND14                   (RID_SVX_START + 2805)
-#define RID_SVXSTR_LEND15                   (RID_SVX_START + 2806)
-#define RID_SVXSTR_LEND16                   (RID_SVX_START + 2807)
-#define RID_SVXSTR_LEND17                   (RID_SVX_START + 2808)
-#define RID_SVXSTR_LEND18                   (RID_SVX_START + 2809)
-#define RID_SVXSTR_LEND19                   (RID_SVX_START + 2810)
-#define RID_SVXSTR_LEND20                   (RID_SVX_START + 2811)
-#define RID_SVXSTR_LEND_DEF_START           RID_SVXSTR_LEND0_DEF
-#define RID_SVXSTR_LEND_DEF_END             RID_SVXSTR_LEND20_DEF
-#define RID_SVXSTR_LEND_START               RID_SVXSTR_LEND0
-//      RID_SVXSTR_LEND_END                 RID_SVXSTR_LEND20
-
-#define RID_SVXSTR_QRY_PRINT_TITLE          (RID_SVX_START + 802)
-#define RID_SVXSTR_QRY_PRINT_MSG            (RID_SVX_START + 803)
-#define RID_SVXSTR_QRY_PRINT_ALL            (RID_SVX_START + 804)
-#define RID_SVXSTR_QRY_PRINT_SELECTION      (RID_SVX_START + 805)
-
-// strings for graphic attributes/undo
-#define RID_SVXSTR_GRAFCROP                 (RID_SVX_START + 820)
-#define RID_SVXSTR_UNDO_GRAFMODE            (RID_SVX_START + 821)
-#define RID_SVXSTR_UNDO_GRAFRED             (RID_SVX_START + 822)
-#define RID_SVXSTR_UNDO_GRAFGREEN           (RID_SVX_START + 823)
-#define RID_SVXSTR_UNDO_GRAFBLUE            (RID_SVX_START + 824)
-#define RID_SVXSTR_UNDO_GRAFLUMINANCE       (RID_SVX_START + 825)
-#define RID_SVXSTR_UNDO_GRAFCONTRAST        (RID_SVX_START + 826)
-#define RID_SVXSTR_UNDO_GRAFGAMMA           (RID_SVX_START + 827)
-#define RID_SVXSTR_UNDO_GRAFTRANSPARENCY    (RID_SVX_START + 828)
-#define RID_SVXSTR_UNDO_GRAFCROP            (RID_SVXSTR_GRAFCROP)
-
-// strings for UNDO and REDO
-#define RID_SVXSTR_NUM_UNDO_ACTIONS         (RID_SVX_START +  846)
-#define RID_SVXSTR_NUM_REDO_ACTIONS         (RID_SVX_START +  847)
-#define RID_SVXSTR_NUM_UNDO_ACTION          (RID_SVX_START +  848)
-#define RID_SVXSTR_NUM_REDO_ACTION          (RID_SVX_START +  849)
-
-// Default-transparence-gradient-names
-#define RID_SVXSTR_TRASNGR0_DEF             (RID_SVX_START + 850)
-#define RID_SVXSTR_TRASNGR0                 (RID_SVX_START + 851)
-#define RID_SVXSTR_TRASNGR_DEF_START        RID_SVXSTR_TRASNGR0_DEF
-#define RID_SVXSTR_TRASNGR_DEF_END          RID_SVXSTR_TRASNGR0_DEF
-#define RID_SVXSTR_TRASNGR_START            RID_SVXSTR_TRASNGR0
-//      RID_SVXSTR_TRASNGR_END              RID_SVXSTR_TRASNGR0
-
-// Accessibility strings.  The actual string ids are defined in
-// svx/inc/accessibility.hrc, the strings are defined in
-// svx/source/accessibility/accessibility.src
-#define RID_SVXSTR_ACCESSIBILITY_START      (RID_SVX_START + 860)
-//      RID_SVXSTR_ACCESSIBILITY_END        (RID_SVX_START + 950)
-
-#define RID_SVXSTR_EXPORT_GRAPHIC_TITLE     (RID_SVX_START + 984)
-#define RID_SVXSTR_SAVEAS_IMAGE             (RID_SVX_START + 985)
-#define RID_SVX_EXTRUSION_BAR               (RID_SVX_START + 986)
-#define RID_SVX_FONTWORK_BAR                (RID_SVX_START + 987)
-
-// String for saving modified image (instead of original)
-#define RID_SVXSTR_SAVE_MODIFIED_IMAGE      (RID_SVX_START + 988)
-
-#define RID_SVXSTR_DEPTH_0                  (RID_SVX_START + 992)
-#define RID_SVXSTR_DEPTH_1                  (RID_SVX_START + 993)
-#define RID_SVXSTR_DEPTH_2                  (RID_SVX_START + 994)
-#define RID_SVXSTR_DEPTH_3                  (RID_SVX_START + 995)
-#define RID_SVXSTR_DEPTH_4                  (RID_SVX_START + 996)
-
-#define RID_SVXSTR_DEPTH_0_INCH             (RID_SVX_START + 997)
-#define RID_SVXSTR_DEPTH_1_INCH             (RID_SVX_START + 998)
-#define RID_SVXSTR_DEPTH_2_INCH             (RID_SVX_START + 999)
-#define RID_SVXSTR_DEPTH_3_INCH             (RID_SVX_START + 1000)
-#define RID_SVXSTR_DEPTH_4_INCH             (RID_SVX_START + 1001)
-
-#define RID_SVXSTR_PAGES                    (RID_SVX_START + 1002)
-
-#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE                (RID_SVX_START + 1118)
-#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT   (RID_SVX_START + 1119)
-#define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT            (RID_SVX_START + 1120)
-#define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING    (RID_SVX_START + 1122)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF              (RID_SVX_START + 1123)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN         (RID_SVX_START + 1124)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP           (RID_SVX_START + 1125)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT         (RID_SVX_START + 1126)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT        (RID_SVX_START + 1127)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH               (RID_SVX_START + 1128)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION         (RID_SVX_START + 1129)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION          (RID_SVX_START + 1130)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING            (RID_SVX_START + 1131)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS          (RID_SVX_START + 1132)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE             (RID_SVX_START + 1133)
-#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR               (RID_SVX_START + 1134)
-
-#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN                  (RID_SVX_START + 1168)
-    // if you add here, remember to adjust RID_SVXSTR_NEXTFREE
-
-#define RID_SVXSTR_BULLET_DESCRIPTIONS                      (RID_SVX_START + 1138)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS                   (RID_SVX_START + 1146)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS                  (RID_SVX_START + 1154)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_0                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_1                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_2                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_3                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_4                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_5                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_6                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_7                     (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7                  (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7                 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
-
-#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED                  (RID_SVX_START + 1188)
-#define RID_SVXSTR_FINDBAR_MATCHCASE                        (RID_SVX_START + 1189)
-#define RID_SVXSTR_FINDBAR_FIND                             (RID_SVX_START + 1190)
-
-#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION      (RID_SVX_START + 1193)
-#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION   (RID_SVX_START + 1194)
-#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION  (RID_SVX_START + 1195)
-
-// ooo-build specific resources
-
-#define SVX_OOO_BUILD_START              (RID_SVX_START + 1230)
-#define RID_SVXSTR_DOC_MODIFIED_YES      (SVX_OOO_BUILD_START + 4) // 1234
-#define RID_SVXSTR_DOC_MODIFIED_NO       (SVX_OOO_BUILD_START + 5) // 1235
-#define RID_SVXSTR_DOC_LOAD              (SVX_OOO_BUILD_START + 6) // 1236
-#define RID_SVXSTR_ERR_OLD_PASSWD        (SVX_OOO_BUILD_START + 7) // 1237
-#define RID_SVXSTR_ERR_REPEAT_PASSWD     (SVX_OOO_BUILD_START + 8) // 1238
-#define RID_SVXSTR_FIT_SLIDE             (SVX_OOO_BUILD_START + 10) // 1240
-#define RID_SVXSTR_WARN_MISSING_SMARTART (SVX_OOO_BUILD_START + 11) // 1241
-
-#define RID_SVXSTR_SUCCESSRECOV          (RID_SVX_START + 1283)
-#define RID_SVXSTR_ORIGDOCRECOV          (RID_SVX_START + 1284)
-#define RID_SVXSTR_RECOVFAILED           (RID_SVX_START + 1285)
-#define RID_SVXSTR_RECOVINPROGR          (RID_SVX_START + 1286)
-#define RID_SVXSTR_NOTRECOVYET           (RID_SVX_START + 1287)
-#define RID_SVXSTR_RECOVERY_INPROGRESS   (RID_SVX_START + 1288)
-#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289)
-#define RID_SVXSTR_RECOVERYONLY_FINISH   (RID_SVX_START + 1290)
-#define RID_SVXSTR_ZOOMTOOL_HINT         (RID_SVX_START + 1291)
-#define RID_SVXSTR_ZOOM_IN               (RID_SVX_START + 1293)
-#define RID_SVXSTR_ZOOM_OUT              (RID_SVX_START + 1294)
-#define RID_SVXSTR_CUSTOM                (RID_SVX_START + 1295)
-#define RID_SVXSTR_INFINITY              (RID_SVX_START + 1296)
-#define RID_SVXSTR_WIREFRAME             (RID_SVX_START + 1297)
-#define RID_SVXSTR_MATTE                 (RID_SVX_START + 1298)
-#define RID_SVXSTR_PLASTIC               (RID_SVX_START + 1299)
-#define RID_SVXSTR_METAL                 (RID_SVX_START + 1300)
-#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT (RID_SVX_START + 1301)
-#define RID_SVXSTR_CHARS_SPACING_TIGHT   (RID_SVX_START + 1302)
-#define RID_SVXSTR_CHARS_SPACING_NORMAL  (RID_SVX_START + 1303)
-#define RID_SVXSTR_CHARS_SPACING_LOOSE   (RID_SVX_START + 1304)
-#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305)
-#define RID_SVXSTR_CHARS_SPACING_CUSTOM   (RID_SVX_START + 1306)
-#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307)
-#define RID_SVXSTR_DIRECTION             (RID_SVX_START + 1320)  // needs 10 resource ids
-#define RID_SVXSTR_PERSPECTIVE           (RID_SVX_START + 1330)
-#define RID_SVXSTR_PARALLEL              (RID_SVX_START + 1331)
-#define RID_SVXSTR_BRIGHT                (RID_SVX_START + 1332)
-#define RID_SVXSTR_NORMAL                (RID_SVX_START + 1333)
-#define RID_SVXSTR_DIM                   (RID_SVX_START + 1334)
-#define RID_SVXSTR_ALIGN_LEFT            (RID_SVX_START + 1368)
-#define RID_SVXSTR_ALIGN_CENTER          (RID_SVX_START + 1369)
-#define RID_SVXSTR_ALIGN_RIGHT           (RID_SVX_START + 1370)
-#define RID_SVXSTR_ALIGN_WORD            (RID_SVX_START + 1371)
-#define RID_SVXSTR_ALIGN_STRETCH         (RID_SVX_START + 1372)
-#define RID_SVXSTR_ZOOM_25               (RID_SVX_START + 1382)
-#define RID_SVXSTR_ZOOM_50               (RID_SVX_START + 1383)
-#define RID_SVXSTR_ZOOM_75               (RID_SVX_START + 1384)
-#define RID_SVXSTR_ZOOM_100              (RID_SVX_START + 1385)
-#define RID_SVXSTR_ZOOM_150              (RID_SVX_START + 1386)
-#define RID_SVXSTR_ZOOM_200              (RID_SVX_START + 1387)
-#define RID_SVXSTR_ZOOM_WHOLE_PAGE       (RID_SVX_START + 1388)
-#define RID_SVXSTR_ZOOM_PAGE_WIDTH       (RID_SVX_START + 1389)
-#define RID_SVXSTR_ZOOM_OPTIMAL_VIEW     (RID_SVX_START + 1390)
-
-#define RID_SVXSTR_WIDTH_LAST_CUSTOM     (RID_SVX_START + 1391)
-#define RID_SVXSTR_PT                    (RID_SVX_START + 1392)
-#define RID_SVXSTRARY_PAPERSIZE_STD      (RID_SVX_START + 1395)
-#define RID_SVXSTRARY_PAPERSIZE_DRAW     (RID_SVX_START + 1396)
-#define RID_SVXSTRARY_NUMBERINGTYPE      (RID_SVX_START + 1397)
-#define RID_SVXSTRARY_SPACING            (RID_SVX_START + 1398)
-#define RID_SVXSTRARY_SAMECONTENT        (RID_SVX_START + 1399)
-
-// Strings for SafeModeDialog
-#define RID_SVXSTR_SAFEMODE_ZIP_FAILURE  (RID_SVX_START + 1400)
-
-
-// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE              (RID_SVX_START + 1401)
-
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be
 // unique relative to a fixed type (you can't have two dialogs with the same
@@ -907,8 +115,6 @@
 // TabPages --------------------------------------------------------------
 
 #define RID_SW_TP_OPTTEST_PAGE          (RID_OFA_START + 215)
-#define STR_COLORTABLE                  (RID_OFA_START + 257)
-#define STR_SWITCH                      (RID_OFA_START + 258)
 #define SID_SC_TP_FORMULA               (RID_OFA_START + 259)
 #define SID_SC_TP_COMPATIBILITY         (RID_OFA_START + 260)
 
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
deleted file mode 100644
index ab86f858a531..000000000000
--- a/include/svx/fmresids.hrc
+++ /dev/null
@@ -1,147 +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_SVX_FMRESIDS_HRC
-#define INCLUDED_SVX_FMRESIDS_HRC
-
-#include <svl/solar.hrc>
-
-// String-Id's -----------------------------------------------------------
-#define RID_STR_INVALID_XMLNAME                     (RID_FORMS_START + 1)
-#define RID_STR_INVALID_XMLPREFIX                   (RID_FORMS_START + 2)
-#define RID_STR_DOUBLE_MODELNAME                    (RID_FORMS_START + 3)
-#define RID_STR_EMPTY_SUBMISSIONNAME                (RID_FORMS_START + 4)
-#define RID_STR_QRY_REMOVE_BINDING                  (RID_FORMS_START + 5)
-#define RID_STR_QRY_REMOVE_SUBMISSION               (RID_FORMS_START + 6)
-#define RID_STR_QRY_REMOVE_ATTRIBUTE                (RID_FORMS_START + 7)
-#define RID_STR_QRY_REMOVE_ELEMENT                  (RID_FORMS_START + 8)
-#define RID_STR_QRY_REMOVE_INSTANCE                 (RID_FORMS_START + 9)
-
-#define RID_STR_STDFORMNAME                         (RID_FORMS_START +  11)
-#define RID_STR_REC_TEXT                            (RID_FORMS_START +  12)
-#define RID_STR_REC_FROM_TEXT                       (RID_FORMS_START +  13)
-#define RID_STR_UNDO_PROPERTY                       (RID_FORMS_START +  14)
-#define RID_STR_UNDO_CONTAINER_INSERT               (RID_FORMS_START +  15)
-#define RID_STR_UNDO_CONTAINER_REMOVE               (RID_FORMS_START +  16)
-#define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE      (RID_FORMS_START +  27)
-#define RID_STR_UNDO_CONTAINER_REPLACE              (RID_FORMS_START +  28)
-#define RID_STR_UNDO_MODEL_REPLACE                  (RID_FORMS_START +  31)
-#define RID_STR_NAVIGATIONBAR                       (RID_FORMS_START +  32)
-#define RID_STR_FORM                                (RID_FORMS_START +  36)
-#define RID_STR_FIELDSELECTION                      (RID_FORMS_START +  37)
-#define RID_STR_NO_PROPERTIES                       (RID_FORMS_START +  38)
-#define RID_STR_PROPERTIES_CONTROL                  (RID_FORMS_START +  39)
-#define RID_STR_PROPERTIES_FORM                     (RID_FORMS_START +  40)
-#define RID_STR_FMEXPLORER                          (RID_FORMS_START +  41)
-#define RID_STR_FORMS                               (RID_FORMS_START +  42)
-#define RID_STR_WRITEERROR                          (RID_FORMS_START +  43)
-#define RID_STR_DELETECONFIRM_RECORD                (RID_FORMS_START +  44)
-#define RID_STR_DELETECONFIRM                       (RID_FORMS_START +  45)
-#define RID_STR_COLUMN                              (RID_FORMS_START +  48)
-#define RID_STR_PROPTITLE_NAVBAR                    (RID_FORMS_START +  51)
-#define RID_STR_PROPTITLE_PUSHBUTTON                (RID_FORMS_START +  52)
-#define RID_STR_PROPTITLE_RADIOBUTTON               (RID_FORMS_START +  53)
-#define RID_STR_PROPTITLE_CHECKBOX                  (RID_FORMS_START +  54)
-#define RID_STR_PROPTITLE_FIXEDTEXT                 (RID_FORMS_START +  55)
-#define RID_STR_PROPTITLE_GROUPBOX                  (RID_FORMS_START +  56)
-#define RID_STR_PROPTITLE_EDIT                      (RID_FORMS_START +  57)
-#define RID_STR_PROPTITLE_LISTBOX                   (RID_FORMS_START +  58)
-#define RID_STR_PROPTITLE_COMBOBOX                  (RID_FORMS_START +  59)
-#define RID_STR_PROPTITLE_IMAGEBUTTON               (RID_FORMS_START +  60)
-#define RID_STR_PROPTITLE_IMAGECONTROL              (RID_FORMS_START +  61)
-#define RID_STR_PROPTITLE_FILECONTROL               (RID_FORMS_START +  62)
-#define RID_STR_PROPTITLE_DATEFIELD                 (RID_FORMS_START +  63)
-#define RID_STR_PROPTITLE_TIMEFIELD                 (RID_FORMS_START +  64)
-#define RID_STR_PROPTITLE_NUMERICFIELD              (RID_FORMS_START +  65)
-#define RID_STR_PROPTITLE_CURRENCYFIELD             (RID_FORMS_START +  66)
-#define RID_STR_PROPTITLE_PATTERNFIELD              (RID_FORMS_START +  67)
-#define RID_STR_PROPTITLE_DBGRID                    (RID_FORMS_START +  68)
-#define RID_STR_PROPTITLE_MULTISELECT               (RID_FORMS_START +  69)
-#define RID_STR_DELETECONFIRM_RECORDS               (RID_FORMS_START +  70)
-#define RID_STR_CONTROL                             (RID_FORMS_START +  71)
-#define RID_STR_POSTFIX_DATE                        (RID_FORMS_START +  72)
-#define RID_STR_POSTFIX_TIME                        (RID_FORMS_START +  73)
-#define RID_STR_NODATACONTROLS                      (RID_FORMS_START +  77)
-#define RID_STR_FILTER_NAVIGATOR                    (RID_FORMS_START +  78)
-#define RID_STR_FILTER_FILTER_FOR                   (RID_FORMS_START +  79)
-#define RID_STR_FILTER_FILTER_OR                    (RID_FORMS_START +  80)
-#define RID_STR_PROPTITLE_FORMATTED                 (RID_FORMS_START +  81)
-#define RID_STR_SYNTAXERROR                         (RID_FORMS_START +  82)
-#define RID_STR_QRY_REMOVE_MODEL                    (RID_FORMS_START +  83)
-#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +  84)
-#define RID_STR_AUTOFIELD                           (RID_FORMS_START +  89)
-#define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +  90)
-#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE        (RID_FORMS_START +  91)
-#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE        (RID_FORMS_START +  92)
-#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE      (RID_FORMS_START +  93)
-#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID         (RID_FORMS_START +  94)
-#define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID  (RID_FORMS_START +  95)
-#define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID        (RID_FORMS_START +  96)
-#define RID_STR_SVT_SQL_SYNTAX_TABLE                (RID_FORMS_START +  97)
-#define RID_STR_SVT_SQL_SYNTAX_COLUMN               (RID_FORMS_START +  98)
-#define RID_STR_PROPTITLE_SCROLLBAR                 (RID_FORMS_START +  99)
-#define RID_STR_PROPTITLE_SPINBUTTON                (RID_FORMS_START + 100)
-#define RID_STR_PROPTITLE_HIDDEN                    (RID_FORMS_START + 101)
-    // FREE
-#define RID_STR_ELEMENT                             (RID_FORMS_START + 114)
-#define RID_STR_ATTRIBUTE                           (RID_FORMS_START + 115)
-#define RID_STR_BINDING                             (RID_FORMS_START + 116)
-#define RID_STR_BINDING_EXPR                        (RID_FORMS_START + 117)
-#define RID_STR_METHOD_POST                         (RID_FORMS_START + 118)
-#define RID_STR_METHOD_PUT                          (RID_FORMS_START + 119)
-#define RID_STR_METHOD_GET                          (RID_FORMS_START + 120)
-#define RID_STR_REPLACE_NONE                        (RID_FORMS_START + 121)
-#define RID_STR_REPLACE_INST                        (RID_FORMS_START + 122)
-#define RID_STR_REPLACE_DOC                         (RID_FORMS_START + 123)
-#define RID_STR_DATANAVIGATOR                       (RID_FORMS_START + 124)
-#define RID_STR_DATANAV_SUBM_ACTION                 (RID_FORMS_START + 127)
-#define RID_STR_DATANAV_SUBM_METHOD                 (RID_FORMS_START + 128)
-#define RID_STR_DATANAV_SUBM_REF                    (RID_FORMS_START + 129)
-#define RID_STR_DATANAV_SUBM_BIND                   (RID_FORMS_START + 130)
-#define RID_STR_DATANAV_SUBM_REPLACE                (RID_FORMS_START + 131)
-#define RID_STR_DATANAV_ADD_ELEMENT                 (RID_FORMS_START + 132)
-#define RID_STR_DATANAV_EDIT_ELEMENT                (RID_FORMS_START + 133)
-#define RID_STR_DATANAV_REMOVE_ELEMENT              (RID_FORMS_START + 134)
-#define RID_STR_DATANAV_ADD_ATTRIBUTE               (RID_FORMS_START + 135)
-#define RID_STR_DATANAV_EDIT_ATTRIBUTE              (RID_FORMS_START + 136)
-#define RID_STR_DATANAV_REMOVE_ATTRIBUTE            (RID_FORMS_START + 137)
-#define RID_STR_DATANAV_ADD_BINDING                 (RID_FORMS_START + 138)
-#define RID_STR_DATANAV_EDIT_BINDING                (RID_FORMS_START + 139)
-#define RID_STR_DATANAV_REMOVE_BINDING              (RID_FORMS_START + 140)
-#define RID_STR_DATANAV_ADD_SUBMISSION              (RID_FORMS_START + 141)
-#define RID_STR_DATANAV_EDIT_SUBMISSION             (RID_FORMS_START + 142)
-#define RID_STR_DATANAV_REMOVE_SUBMISSION           (RID_FORMS_START + 143)
-#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY       (RID_FORMS_START + 145)
-#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS         (RID_FORMS_START + 146)
-#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS         (RID_FORMS_START + 147)
-#define RID_STR_READONLY_VIEW                       (RID_FORMS_START + 148)
-#define RID_STR_ALREADYEXISTOVERWRITE               (RID_FORMS_START + 149)
-#define RID_STR_OBJECT_LABEL                        (RID_FORMS_START + 150)
-
-// Error-String-Id's -----------------------------------------------------------
-#define RID_ERR_START                               (RID_FORMS_START + 600)
-#define RID_ERR_FIELDREQUIRED                       (RID_ERR_START + 2)
-
-// untyped resources  ----------------------------------------------------------
-
-#define RID_RSC_TABWIN_PREFIX                       ( RID_FORMS_START +  0 )
-#define RID_RSC_SQL_INTERNATIONAL                   ( RID_FORMS_START +  1 )
-
-#endif          // _FM_FMPAGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index d5a534615734..4d5b1e8b2fa6 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -25,18 +25,73 @@
 #include <vector>
 
 // Defines for preinstalled themes
-// Has to be in sync with svx/inc/galtheme.hrc
 #define GALLERY_THEME_3D                1
 #define GALLERY_THEME_BULLETS           3
 #define GALLERY_THEME_HOMEPAGE          10
 #define GALLERY_THEME_HTMLBUTTONS       15
 #define GALLERY_THEME_POWERPOINT        16
+#define GALLERY_THEME_RULERS            17
 #define GALLERY_THEME_SOUNDS            18
+#define GALLERY_THEME_MYTHEME           20
 #define GALLERY_THEME_USERSOUNDS        21
 #define GALLERY_THEME_DUMMY5            36
 #define GALLERY_THEME_FONTWORK          37
 #define GALLERY_THEME_FONTWORK_VERTICAL 38
 
+#define RID_GALLERY_THEME_START          (6000)
+
+// ATTENTION: This list has to be in sync with
+//  * share/gallery (theme files are identified by id)
+//
+// Since galleries may be copied from older offices to newer, do *never* change
+// this IDs except adding new ones (and adapting GALLERY_THEME_LAST). The ID
+// *is* written into the binary file *.thm (which is a gallery theme combined
+// of three files, *.thm, *.sdv and *.sdg)
+
+#define RID_GALLERY_THEME_3D             (RID_GALLERY_THEME_START + 1)
+#define RID_GALLERY_THEME_ANIMATIONS     (RID_GALLERY_THEME_START + 2)
+#define RID_GALLERY_THEME_BULLETS        (RID_GALLERY_THEME_START + 3)
+#define RID_GALLERY_THEME_OFFICE         (RID_GALLERY_THEME_START + 4)
+#define RID_GALLERY_THEME_FLAGS          (RID_GALLERY_THEME_START + 5)
+#define RID_GALLERY_THEME_FLOWCHARTS     (RID_GALLERY_THEME_START + 6)
+#define RID_GALLERY_THEME_EMOTICONS      (RID_GALLERY_THEME_START + 7)
+#define RID_GALLERY_THEME_PHOTOS         (RID_GALLERY_THEME_START + 8)
+#define RID_GALLERY_THEME_BACKGROUNDS    (RID_GALLERY_THEME_START + 9)
+#define RID_GALLERY_THEME_HOMEPAGE       (RID_GALLERY_THEME_START + 10)
+#define RID_GALLERY_THEME_INTERACTION    (RID_GALLERY_THEME_START + 11)
+#define RID_GALLERY_THEME_MAPS           (RID_GALLERY_THEME_START + 12)
+#define RID_GALLERY_THEME_PEOPLE         (RID_GALLERY_THEME_START + 13)
+#define RID_GALLERY_THEME_SURFACES       (RID_GALLERY_THEME_START + 14)
+
+#define RID_GALLERY_THEME_SOUNDS         (RID_GALLERY_THEME_START + 18)
+#define RID_GALLERY_THEME_SYMBOLS        (RID_GALLERY_THEME_START + 19)
+#define RID_GALLERY_THEME_MYTHEME        (RID_GALLERY_THEME_START + 20)
+
+#define RID_GALLERY_THEME_ARROWS         (RID_GALLERY_THEME_START + 22)
+#define RID_GALLERY_THEME_BALLOONS       (RID_GALLERY_THEME_START + 23)
+#define RID_GALLERY_THEME_KEYBOARD       (RID_GALLERY_THEME_START + 24)
+#define RID_GALLERY_THEME_TIME           (RID_GALLERY_THEME_START + 25)
+#define RID_GALLERY_THEME_PRESENTATION   (RID_GALLERY_THEME_START + 26)
+#define RID_GALLERY_THEME_CALENDAR       (RID_GALLERY_THEME_START + 27)
+#define RID_GALLERY_THEME_NAVIGATION     (RID_GALLERY_THEME_START + 28)
+#define RID_GALLERY_THEME_COMMUNICATION  (RID_GALLERY_THEME_START + 29)
+#define RID_GALLERY_THEME_FINANCES       (RID_GALLERY_THEME_START + 30)
+#define RID_GALLERY_THEME_COMPUTER       (RID_GALLERY_THEME_START + 31)
+#define RID_GALLERY_THEME_CLIMA          (RID_GALLERY_THEME_START + 32)
+#define RID_GALLERY_THEME_EDUCATION      (RID_GALLERY_THEME_START + 33)
+#define RID_GALLERY_THEME_TROUBLE        (RID_GALLERY_THEME_START + 34)
+#define RID_GALLERY_THEME_SCREENBEANS    (RID_GALLERY_THEME_START + 35)
+
+#define RID_GALLERY_THEME_COMPUTERS      (RID_GALLERY_THEME_START + 39)
+#define RID_GALLERY_THEME_DIAGRAMS       (RID_GALLERY_THEME_START + 40)
+#define RID_GALLERY_THEME_ENVIRONMENT    (RID_GALLERY_THEME_START + 41)
+#define RID_GALLERY_THEME_FINANCE        (RID_GALLERY_THEME_START + 42)
+#define RID_GALLERY_THEME_TRANSPORT      (RID_GALLERY_THEME_START + 43)
+#define RID_GALLERY_THEME_TXTSHAPES      (RID_GALLERY_THEME_START + 44)
+
+#define RID_GALLERY_THEME_FIRST          RID_GALLERY_THEME_3D
+#define RID_GALLERY_THEME_LAST           RID_GALLERY_THEME_TXTSHAPES
+
 class Gallery;
 class VCDrawModel;
 class FmFormModel;
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index ce89ab0ec5de..7ab20dee1ef0 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -31,7 +31,6 @@
 #include <svx/svxdllapi.h>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
-#include <tools/resid.hxx>
 
 class GalleryTheme;
 class SotStorageStream;
@@ -63,15 +62,6 @@ enum class SgaObjKind
 
 #define ID_IMAPINFO             2
 
-class ResMgr;
-
-SVX_DLLPUBLIC ResMgr* GetGalleryResMgr();
-
-inline OUString GalResId(sal_uInt16 nId)
-{
-    return ResId(nId, *GetGalleryResMgr());
-}
-
 #define STREAMBUF_SIZE          16384L
 
 enum class GalleryGraphicImportRet
diff --git a/include/svx/strarray.hxx b/include/svx/strarray.hxx
index 9b0f4ec8b9d4..a5dca6b84101 100644
--- a/include/svx/strarray.hxx
+++ b/include/svx/strarray.hxx
@@ -19,21 +19,45 @@
 #ifndef INCLUDED_SVX_STRARRAY_HXX
 #define INCLUDED_SVX_STRARRAY_HXX
 
-#include <tools/resary.hxx>
+#include <tools/fldunit.hxx>
 #include <svx/svxdllapi.h>
+#include <vector>
 
 //  class SvxStringArray -------------------------------------------------
 
-class SVX_DLLPUBLIC SvxStringArray : public ResStringArray
+class SVX_DLLPUBLIC SvxStringArray
 {
+    std::vector<OUString> m_aTranslations;
 public:
-    SvxStringArray( sal_uInt32 nResId );
-    SvxStringArray( const ResId& rResId );
-    ~SvxStringArray();
+    SvxStringArray(const char** pResId, size_t nLength);
+    const OUString GetString(sal_uInt32 nPos) const;
+};
+
+class SVX_DLLPUBLIC SvxFieldUnitTable
+{
+public:
+    static OUString GetString(sal_uInt32 i);
+    static sal_uInt32 Count();
+    static FieldUnit GetValue(sal_uInt32 i);
+};
 
-    const OUString GetStringByPos( sal_uInt32 nPos ) const;
+class SVX_DLLPUBLIC SvxNumberingTypeTable
+{
+public:
+    static OUString GetString(sal_uInt32 i);
+    static sal_uInt32 Count();
+    static int GetValue(sal_uInt32 i);
+    static sal_uInt32 FindIndex(int nValue);
 };
 
+class SVX_DLLPUBLIC SvxAttrNameTable
+{
+public:
+    static OUString GetString(sal_uInt32 i);
+    static sal_uInt32 Count();
+    static sal_uInt16 GetValue(sal_uInt32 i);
+    static sal_uInt32 FindIndex(int nValue);
+};
 
 #endif
 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
new file mode 100644
index 000000000000..a3ec0eedc488
--- /dev/null
+++ b/include/svx/strings.hrc
@@ -0,0 +1,1261 @@
+/* -*- 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_SVX_INC_STRINGS_HRC
+#define INCLUDED_SVX_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_ObjNameSingulNONE                               NC_("STR_ObjNameSingulNONE", "Drawing object")
+#define STR_ObjNamePluralNONE                               NC_("STR_ObjNamePluralNONE", "Drawing objects")
+#define STR_ObjNameSingulGRUP                               NC_("STR_ObjNameSingulGRUP", "Group object")
+#define STR_ObjNamePluralGRUP                               NC_("STR_ObjNamePluralGRUP", "Group objects")
+#define STR_ObjNameSingulGRUPEMPTY                          NC_("STR_ObjNameSingulGRUPEMPTY", "Blank group object")
+#define STR_ObjNamePluralGRUPEMPTY                          NC_("STR_ObjNamePluralGRUPEMPTY", "Blank group objects")
+#define STR_ObjNameSingulLINE                               NC_("STR_ObjNameSingulLINE", "Line")
+#define STR_ObjNameSingulLINE_Hori                          NC_("STR_ObjNameSingulLINE_Hori", "Horizontal line")
+#define STR_ObjNameSingulLINE_Vert                          NC_("STR_ObjNameSingulLINE_Vert", "Vertical line")
+#define STR_ObjNameSingulLINE_Diag                          NC_("STR_ObjNameSingulLINE_Diag", "Diagonal line")
+#define STR_ObjNamePluralLINE                               NC_("STR_ObjNamePluralLINE", "Lines")
+#define STR_ObjNameSingulRECT                               NC_("STR_ObjNameSingulRECT", "Rectangle")
+#define STR_ObjNamePluralRECT                               NC_("STR_ObjNamePluralRECT", "Rectangles")
+#define STR_ObjNameSingulQUAD                               NC_("STR_ObjNameSingulQUAD", "Square")
+#define STR_ObjNamePluralQUAD                               NC_("STR_ObjNamePluralQUAD", "Squares")
+#define STR_ObjNameSingulPARAL                              NC_("STR_ObjNameSingulPARAL", "Parallelogram")
+#define STR_ObjNamePluralPARAL                              NC_("STR_ObjNamePluralPARAL", "Parallelograms")
+#define STR_ObjNameSingulRAUTE                              NC_("STR_ObjNameSingulRAUTE", "Rhombus")
+#define STR_ObjNamePluralRAUTE                              NC_("STR_ObjNamePluralRAUTE", "Rhombuses")
+#define STR_ObjNameSingulRECTRND                            NC_("STR_ObjNameSingulRECTRND", "Rounded rectangle")
+#define STR_ObjNamePluralRECTRND                            NC_("STR_ObjNamePluralRECTRND", "Rounded Rectangles")
+#define STR_ObjNameSingulQUADRND                            NC_("STR_ObjNameSingulQUADRND", "rounded square")
+#define STR_ObjNamePluralQUADRND                            NC_("STR_ObjNamePluralQUADRND", "Rounded Squares")
+#define STR_ObjNameSingulPARALRND                           NC_("STR_ObjNameSingulPARALRND", "Rounded Parallelogram")
+#define STR_ObjNamePluralPARALRND                           NC_("STR_ObjNamePluralPARALRND", "Rounded parallelograms")
+#define STR_ObjNameSingulRAUTERND                           NC_("STR_ObjNameSingulRAUTERND", "rounded rhombus")
+#define STR_ObjNamePluralRAUTERND                           NC_("STR_ObjNamePluralRAUTERND", "Rounded rhombuses")
+#define STR_ObjNameSingulCIRC                               NC_("STR_ObjNameSingulCIRC", "Circle")
+#define STR_ObjNamePluralCIRC                               NC_("STR_ObjNamePluralCIRC", "Circles")
+#define STR_ObjNameSingulSECT                               NC_("STR_ObjNameSingulSECT", "Circle sector")
+#define STR_ObjNamePluralSECT                               NC_("STR_ObjNamePluralSECT", "Circle sectors")
+#define STR_ObjNameSingulCARC                               NC_("STR_ObjNameSingulCARC", "Arc")
+#define STR_ObjNamePluralCARC                               NC_("STR_ObjNamePluralCARC", "Arcs")
+#define STR_ObjNameSingulCCUT                               NC_("STR_ObjNameSingulCCUT", "Circle segment")
+#define STR_ObjNamePluralCCUT                               NC_("STR_ObjNamePluralCCUT", "Circle segments")
+#define STR_ObjNameSingulCIRCE                              NC_("STR_ObjNameSingulCIRCE", "Ellipse")
+#define STR_ObjNamePluralCIRCE                              NC_("STR_ObjNamePluralCIRCE", "Ellipses")
+#define STR_ObjNameSingulSECTE                              NC_("STR_ObjNameSingulSECTE", "Ellipse Pie")
+#define STR_ObjNamePluralSECTE                              NC_("STR_ObjNamePluralSECTE", "Ellipse Pies")
+#define STR_ObjNameSingulCARCE                              NC_("STR_ObjNameSingulCARCE", "Elliptical arc")
+#define STR_ObjNamePluralCARCE                              NC_("STR_ObjNamePluralCARCE", "Elliptical arcs")
+#define STR_ObjNameSingulCCUTE                              NC_("STR_ObjNameSingulCCUTE", "Ellipse Segment")
+#define STR_ObjNamePluralCCUTE                              NC_("STR_ObjNamePluralCCUTE", "Ellipse Segments")
+#define STR_ObjNameSingulPOLY                               NC_("STR_ObjNameSingulPOLY", "Polygon")
+#define STR_ObjNameSingulPOLY_PointCount                    NC_("STR_ObjNameSingulPOLY_PointCount", "Polygon %2 corners")
+#define STR_ObjNamePluralPOLY                               NC_("STR_ObjNamePluralPOLY", "Polygons")
+#define STR_ObjNameSingulPLIN                               NC_("STR_ObjNameSingulPLIN", "Polyline")
+#define STR_ObjNameSingulPLIN_PointCount                    NC_("STR_ObjNameSingulPLIN_PointCount", "Polyline with %2 corners")
+#define STR_ObjNamePluralPLIN                               NC_("STR_ObjNamePluralPLIN", "Polylines")
+#define STR_ObjNameSingulPATHLINE                           NC_("STR_ObjNameSingulPATHLINE", "Bézier curve")
+#define STR_ObjNamePluralPATHLINE                           NC_("STR_ObjNamePluralPATHLINE", "Bézier curves")
+#define STR_ObjNameSingulPATHFILL                           NC_("STR_ObjNameSingulPATHFILL", "Bézier curve")
+#define STR_ObjNamePluralPATHFILL                           NC_("STR_ObjNamePluralPATHFILL", "Bézier curves")
+#define STR_ObjNameSingulFREELINE                           NC_("STR_ObjNameSingulFREELINE", "Freeform Line")
+#define STR_ObjNamePluralFREELINE                           NC_("STR_ObjNamePluralFREELINE", "Freeform Lines")
+#define STR_ObjNameSingulFREEFILL                           NC_("STR_ObjNameSingulFREEFILL", "Freeform Line")
+#define STR_ObjNamePluralFREEFILL                           NC_("STR_ObjNamePluralFREEFILL", "Freeform Lines")
+#define STR_ObjNameSingulCOMBLINE                           NC_("STR_ObjNameSingulCOMBLINE", "Curve")
+#define STR_ObjNameSingulNATSPLN                            NC_("STR_ObjNameSingulNATSPLN", "Natural Spline")
+#define STR_ObjNamePluralNATSPLN                            NC_("STR_ObjNamePluralNATSPLN", "Natural Splines")
+#define STR_ObjNameSingulPERSPLN                            NC_("STR_ObjNameSingulPERSPLN", "Periodic Spline")
+#define STR_ObjNamePluralPERSPLN                            NC_("STR_ObjNamePluralPERSPLN", "Periodic Splines")
+#define STR_ObjNameSingulTEXT                               NC_("STR_ObjNameSingulTEXT", "Text Frame")
+#define STR_ObjNamePluralTEXT                               NC_("STR_ObjNamePluralTEXT", "Text Frame")
+#define STR_ObjNameSingulTEXTLNK                            NC_("STR_ObjNameSingulTEXTLNK", "Linked text frame")
+#define STR_ObjNamePluralTEXTLNK                            NC_("STR_ObjNamePluralTEXTLNK", "Linked text frames")
+#define STR_ObjNameSingulTITLETEXT                          NC_("STR_ObjNameSingulTITLETEXT", "Title text")
+#define STR_ObjNamePluralTITLETEXT                          NC_("STR_ObjNamePluralTITLETEXT", "Title texts")
+#define STR_ObjNameSingulOUTLINETEXT                        NC_("STR_ObjNameSingulOUTLINETEXT", "Outline Text")
+#define STR_ObjNamePluralOUTLINETEXT                        NC_("STR_ObjNamePluralOUTLINETEXT", "Outline Texts")
+#define STR_ObjNameSingulGRAF                               NC_("STR_ObjNameSingulGRAF", "Image")
+#define STR_ObjNamePluralGRAF                               NC_("STR_ObjNamePluralGRAF", "Images")
+#define STR_ObjNameSingulGRAFLNK                            NC_("STR_ObjNameSingulGRAFLNK", "Linked image")
+#define STR_ObjNamePluralGRAFLNK                            NC_("STR_ObjNamePluralGRAFLNK", "Linked images")
+#define STR_ObjNameSingulGRAFNONE                           NC_("STR_ObjNameSingulGRAFNONE", "Blank image object")
+#define STR_ObjNamePluralGRAFNONE                           NC_("STR_ObjNamePluralGRAFNONE", "Blank image objects")
+#define STR_ObjNameSingulGRAFNONELNK                        NC_("STR_ObjNameSingulGRAFNONELNK", "Blank linked image")
+#define STR_ObjNamePluralGRAFNONELNK                        NC_("STR_ObjNamePluralGRAFNONELNK", "Blank linked images")
+#define STR_ObjNameSingulGRAFMTF                            NC_("STR_ObjNameSingulGRAFMTF", "Metafile")
+#define STR_ObjNamePluralGRAFMTF                            NC_("STR_ObjNamePluralGRAFMTF", "Metafiles")
+#define STR_ObjNameSingulGRAFMTFLNK                         NC_("STR_ObjNameSingulGRAFMTFLNK", "Linked Metafile")
+#define STR_ObjNamePluralGRAFMTFLNK                         NC_("STR_ObjNamePluralGRAFMTFLNK", "Linked Metafiles")
+#define STR_ObjNameSingulGRAFBMP                            NC_("STR_ObjNameSingulGRAFBMP", "Image")
+#define STR_ObjNameSingulGRAFBMPTRANS                       NC_("STR_ObjNameSingulGRAFBMPTRANS", "Image with transparency")
+#define STR_ObjNameSingulGRAFBMPLNK                         NC_("STR_ObjNameSingulGRAFBMPLNK", "Linked Image")
+#define STR_ObjNameSingulGRAFBMPTRANSLNK                    NC_("STR_ObjNameSingulGRAFBMPTRANSLNK", "Linked image with transparency")
+#define STR_ObjNamePluralGRAFBMP                            NC_("STR_ObjNamePluralGRAFBMP", "Images")
+#define STR_ObjNamePluralGRAFBMPTRANS                       NC_("STR_ObjNamePluralGRAFBMPTRANS", "Images with transparency")
+#define STR_ObjNamePluralGRAFBMPLNK                         NC_("STR_ObjNamePluralGRAFBMPLNK", "Linked images")
+#define STR_ObjNamePluralGRAFBMPTRANSLNK                    NC_("STR_ObjNamePluralGRAFBMPTRANSLNK", "Linked images with transparency")
+#define STR_ObjNameSingulCUSTOMSHAPE                        NC_("STR_ObjNameSingulCUSTOMSHAPE", "Shape")
+#define STR_ObjNamePluralCUSTOMSHAPE                        NC_("STR_ObjNamePluralCUSTOMSHAPE", "Shapes")
+#define STR_ObjNameSingulGRAFSVG                            NC_("STR_ObjNameSingulGRAFSVG", "SVG")
+#define STR_ObjNamePluralGRAFSVG                            NC_("STR_ObjNamePluralGRAFSVG", "SVGs")
+#define STR_ObjNameSingulGRAFWMF                            NC_("STR_ObjNameSingulGRAFWMF", "WMF")
+#define STR_ObjNamePluralGRAFWMF                            NC_("STR_ObjNamePluralGRAFWMF", "WMFs")
+#define STR_ObjNameSingulGRAFEMF                            NC_("STR_ObjNameSingulGRAFEMF", "EMF")
+#define STR_ObjNamePluralGRAFEMF                            NC_("STR_ObjNamePluralGRAFEMF", "EMFs")
+#define STR_ObjNameSingulOLE2                               NC_("STR_ObjNameSingulOLE2", "embedded object (OLE)")
+#define STR_ObjNamePluralOLE2                               NC_("STR_ObjNamePluralOLE2", "Embedded objects (OLE)")
+#define STR_ObjNameSingulUno                                NC_("STR_ObjNameSingulUno", "Control")
+#define STR_ObjNamePluralUno                                NC_("STR_ObjNamePluralUno", "Controls")
+#define STR_ObjNameSingulFrame                              NC_("STR_ObjNameSingulFrame", "Frame")
+#define STR_ObjNamePluralFrame                              NC_("STR_ObjNamePluralFrame", "Frames")
+#define STR_ObjNameSingulEDGE                               NC_("STR_ObjNameSingulEDGE", "Object Connectors")
+#define STR_ObjNamePluralEDGE                               NC_("STR_ObjNamePluralEDGE", "Object Connectors")
+#define STR_ObjNameSingulCAPTION                            NC_("STR_ObjNameSingulCAPTION", "Callout")
+#define STR_ObjNamePluralCAPTION                            NC_("STR_ObjNamePluralCAPTION", "Callouts")
+#define STR_ObjNameSingulPAGE                               NC_("STR_ObjNameSingulPAGE", "Preview object")
+#define STR_ObjNamePluralPAGE                               NC_("STR_ObjNamePluralPAGE", "Preview objects")
+#define STR_ObjNameSingulMEASURE                            NC_("STR_ObjNameSingulMEASURE", "Dimension line")
+#define STR_ObjNamePluralMEASURE                            NC_("STR_ObjNamePluralMEASURE", "Dimensioning objects")
+#define STR_ObjNamePlural                                   NC_("STR_ObjNamePlural", "Drawing objects")
+#define STR_ObjNameNoObj                                    NC_("STR_ObjNameNoObj", "No draw object")
+#define STR_ObjNameSingulPlural                             NC_("STR_ObjNameSingulPlural", "Draw object(s)")
+#define STR_ObjNameSingulCube3d                             NC_("STR_ObjNameSingulCube3d", "3D cube")
+#define STR_ObjNamePluralCube3d                             NC_("STR_ObjNamePluralCube3d", "3D cubes")
+#define STR_ObjNameSingulExtrude3d                          NC_("STR_ObjNameSingulExtrude3d", "Extrusion object")
+#define STR_ObjNamePluralExtrude3d                          NC_("STR_ObjNamePluralExtrude3d", "Extrusion objects")
+#define STR_ObjNameSingulLathe3d                            NC_("STR_ObjNameSingulLathe3d", "Rotation object")
+#define STR_ObjNamePluralLathe3d                            NC_("STR_ObjNamePluralLathe3d", "Rotation objects")
+#define STR_ObjNameSingulObj3d                              NC_("STR_ObjNameSingulObj3d", "3D object")
+#define STR_ObjNamePluralObj3d                              NC_("STR_ObjNamePluralObj3d", "3D objects")
+#define STR_ObjNameSingulScene3d                            NC_("STR_ObjNameSingulScene3d", "3D scene")
+#define STR_ObjNamePluralScene3d                            NC_("STR_ObjNamePluralScene3d", "3D scenes")
+#define STR_ObjNameSingulSphere3d                           NC_("STR_ObjNameSingulSphere3d", "Sphere")
+#define STR_ObjNamePluralSphere3d                           NC_("STR_ObjNamePluralSphere3d", "Spheres")
+#define STR_EditWithCopy                                    NC_("STR_EditWithCopy", "with copy")
+#define STR_EditPosSize                                     NC_("STR_EditPosSize", "Set position and size for %1")
+#define STR_EditDelete                                      NC_("STR_EditDelete", "Delete %1")
+#define STR_EditMovToTop                                    NC_("STR_EditMovToTop", "Move %1 forward")
+#define STR_EditMovToBtm                                    NC_("STR_EditMovToBtm", "Move %1 further back")
+#define STR_EditPutToTop                                    NC_("STR_EditPutToTop", "Move %1 to front")
+#define STR_EditPutToBtm                                    NC_("STR_EditPutToBtm", "Move %1 to back")
+#define STR_EditRevOrder                                    NC_("STR_EditRevOrder", "Reverse order of %1")
+#define STR_EditMove                                        NC_("STR_EditMove", "Move %1")
+#define STR_EditResize                                      NC_("STR_EditResize", "Resize %1")
+#define STR_EditRotate                                      NC_("STR_EditRotate", "Rotate %1")
+#define STR_EditMirrorHori                                  NC_("STR_EditMirrorHori", "Flip %1 horizontal")
+#define STR_EditMirrorVert                                  NC_("STR_EditMirrorVert", "Flip %1 vertical")
+#define STR_EditMirrorDiag                                  NC_("STR_EditMirrorDiag", "Flip %1 diagonal")
+#define STR_EditMirrorFree                                  NC_("STR_EditMirrorFree", "Flip %1 freehand")
+#define STR_EditShear                                       NC_("STR_EditShear", "Distort %1 (slant)")
+#define STR_EditCrook                                       NC_("STR_EditCrook", "Arrange %1 in circle")
+#define STR_EditCrookContortion                             NC_("STR_EditCrookContortion", "Curve %1 in circle")
+#define STR_EditDistort                                     NC_("STR_EditDistort", "Distort %1")
+#define STR_EditRipUp                                       NC_("STR_EditRipUp", "Undo %1")
+#define STR_EditSetPointsSmooth                             NC_("STR_EditSetPointsSmooth", "Modify bézier properties of %1")
+#define STR_EditSetSegmentsKind                             NC_("STR_EditSetSegmentsKind", "Modify bézier properties of %1")
+#define STR_EditSetGlueEscDir                               NC_("STR_EditSetGlueEscDir", "Set exit direction for %1")
+#define STR_EditSetGluePercent                              NC_("STR_EditSetGluePercent", "Set relative attribute at %1")
+#define STR_EditSetGlueAlign                                NC_("STR_EditSetGlueAlign", "Set reference point for %1")
+#define STR_EditGroup                                       NC_("STR_EditGroup", "Group %1")
+#define STR_EditUngroup                                     NC_("STR_EditUngroup", "Ungroup %1")
+#define STR_EditSetAttributes                               NC_("STR_EditSetAttributes", "Apply attributes to %1")
+#define STR_EditSetStylesheet                               NC_("STR_EditSetStylesheet", "Apply Styles to %1")
+#define STR_EditDelStylesheet                               NC_("STR_EditDelStylesheet", "Remove Style from %1")
+#define STR_EditConvToPoly                                  NC_("STR_EditConvToPoly", "Convert %1 to polygon")
+#define STR_EditConvToPolys                                 NC_("STR_EditConvToPolys", "Convert %1 to polygons")
+#define STR_EditConvToCurve                                 NC_("STR_EditConvToCurve", "Convert %1 to curve")
+#define STR_EditConvToCurves                                NC_("STR_EditConvToCurves", "Convert %1 to curves")
+#define STR_EditConvToContour                               NC_("STR_EditConvToContour", "Convert %1 to contour")
+#define STR_EditConvToContours                              NC_("STR_EditConvToContours", "Convert %1 to contours")
+#define STR_EditAlign                                       NC_("STR_EditAlign", "Align %1")
+#define STR_EditAlignVTop                                   NC_("STR_EditAlignVTop", "Align %1 to top")
+#define STR_EditAlignVBottom                                NC_("STR_EditAlignVBottom", "Align %1 to bottom")
+#define STR_EditAlignVCenter                                NC_("STR_EditAlignVCenter", "Horizontally center %1")
+#define STR_EditAlignHLeft                                  NC_("STR_EditAlignHLeft", "Align %1 to left")
+#define STR_EditAlignHRight                                 NC_("STR_EditAlignHRight", "Align %1 to right")
+#define STR_EditAlignHCenter                                NC_("STR_EditAlignHCenter", "Vertically center %1")
+#define STR_EditAlignCenter                                 NC_("STR_EditAlignCenter", "Center %1")
+#define STR_EditTransform                                   NC_("STR_EditTransform", "Transform %1")
+#define STR_EditCombine_PolyPoly                            NC_("STR_EditCombine_PolyPoly", "Combine %1")
+#define STR_EditMergeMergePoly                              NC_("STR_EditMergeMergePoly", "Merge %1")
+#define STR_EditMergeSubstractPoly                          NC_("STR_EditMergeSubstractPoly", "Subtract %1")
+#define STR_EditMergeIntersectPoly                          NC_("STR_EditMergeIntersectPoly", "Intersect %1")
+#define STR_DistributeMarkedObjects                         NC_("STR_DistributeMarkedObjects", "Distribute selected objects")
+#define STR_EqualizeWidthMarkedObjects                      NC_("STR_EqualizeWidthMarkedObjects", "Equalize Width %1")
+#define STR_EqualizeHeightMarkedObjects                     NC_("STR_EqualizeHeightMarkedObjects", "Equalize Height %1")
+#define STR_EditCombine_OnePoly                             NC_("STR_EditCombine_OnePoly", "Combine %1")
+#define STR_EditDismantle_Polys                             NC_("STR_EditDismantle_Polys", "Split %1")
+#define STR_EditDismantle_Lines                             NC_("STR_EditDismantle_Lines", "Split %1")
+#define STR_EditImportMtf                                   NC_("STR_EditImportMtf", "Split %1")
+#define STR_ExchangePaste                                   NC_("STR_ExchangePaste", "Insert object(s)")
+#define STR_DragInsertPoint                                 NC_("STR_DragInsertPoint", "Insert point to %1")
+#define STR_DragInsertGluePoint                             NC_("STR_DragInsertGluePoint", "Insert glue point to %1")
+#define STR_DragMethMovHdl                                  NC_("STR_DragMethMovHdl", "Move reference-point")
+#define STR_DragMethObjOwn                                  NC_("STR_DragMethObjOwn", "Geometrically change %1")
+#define STR_DragMethMove                                    NC_("STR_DragMethMove", "Move %1")
+#define STR_DragMethResize                                  NC_("STR_DragMethResize", "Resize %1")
+#define STR_DragMethRotate                                  NC_("STR_DragMethRotate", "Rotate %1")
+#define STR_DragMethMirrorHori                              NC_("STR_DragMethMirrorHori", "Flip %1 horizontal")
+#define STR_DragMethMirrorVert                              NC_("STR_DragMethMirrorVert", "Flip %1 vertical")
+#define STR_DragMethMirrorDiag                              NC_("STR_DragMethMirrorDiag", "Flip %1 diagonal")
+#define STR_DragMethMirrorFree                              NC_("STR_DragMethMirrorFree", "Flip %1 freehand")
+#define STR_DragMethGradient                                NC_("STR_DragMethGradient", "Interactive gradient for %1")
+#define STR_DragMethTransparence                            NC_("STR_DragMethTransparence", "Interactive transparency for %1")
+#define STR_DragMethShear                                   NC_("STR_DragMethShear", "Distort %1 (slant)")
+#define STR_DragMethCrook                                   NC_("STR_DragMethCrook", "Arrange %1 in circle")
+#define STR_DragMethCrookContortion                         NC_("STR_DragMethCrookContortion", "Curve %1 in circle")
+#define STR_DragMethDistort                                 NC_("STR_DragMethDistort", "Distort %1")
+#define STR_DragMethCrop                                    NC_("STR_DragMethCrop", "Crop %1")
+#define STR_DragRectEckRad                                  NC_("STR_DragRectEckRad", "Alter radius by %1")
+#define STR_DragPathObj                                     NC_("STR_DragPathObj", "Change %1")
+#define STR_DragRectResize                                  NC_("STR_DragRectResize", "Resize %1")
+#define STR_DragCaptFram                                    NC_("STR_DragCaptFram", "Move %1")
+#define STR_DragCaptTail                                    NC_("STR_DragCaptTail", "Move end point of %1")
+#define STR_DragCircAngle                                   NC_("STR_DragCircAngle", "Adjust angle by %1")
+#define STR_DragEdgeTail                                    NC_("STR_DragEdgeTail", "Change %1")
+#define STR_ViewTextEdit                                    NC_("STR_ViewTextEdit", "TextEdit: Paragraph %1, Row %2, Column %3")
+#define STR_ViewMarked                                      NC_("STR_ViewMarked", "%1 selected")
+#define STR_ViewMarkedPoint                                 NC_("STR_ViewMarkedPoint", "Point from %1")
+#define STR_ViewMarkedPoints                                NC_("STR_ViewMarkedPoints", "%2 points from %1")
+#define STR_ViewMarkedGluePoint                             NC_("STR_ViewMarkedGluePoint", "Glue point from %1")
+#define STR_ViewMarkedGluePoints                            NC_("STR_ViewMarkedGluePoints", "%2 glue points from %1")
+#define STR_ViewMarkObjs                                    NC_("STR_ViewMarkObjs", "Mark objects")
+#define STR_ViewMarkMoreObjs                                NC_("STR_ViewMarkMoreObjs", "Mark additional objects")
+#define STR_ViewMarkPoints                                  NC_("STR_ViewMarkPoints", "Mark points")
+#define STR_ViewMarkMorePoints                              NC_("STR_ViewMarkMorePoints", "Mark additional points")
+#define STR_ViewMarkGluePoints                              NC_("STR_ViewMarkGluePoints", "Mark glue points")
+#define STR_ViewMarkMoreGluePoints                          NC_("STR_ViewMarkMoreGluePoints", "Mark additional glue points")
+#define STR_ViewCreateObj                                   NC_("STR_ViewCreateObj", "Create %1")
+#define STR_UndoInsertObj                                   NC_("STR_UndoInsertObj", "Insert %1")
+#define STR_UndoCopyObj                                     NC_("STR_UndoCopyObj", "Copy %1")
+#define STR_UndoObjOrdNum                                   NC_("STR_UndoObjOrdNum", "Change object order of %1")
+#define STR_UndoObjSetText                                  NC_("STR_UndoObjSetText", "Edit text of %1")
+#define STR_UndoNewPage                                     NC_("STR_UndoNewPage", "Insert page")
+#define STR_UndoDelPage                                     NC_("STR_UndoDelPage", "Delete page")
+#define STR_UndoCopPage                                     NC_("STR_UndoCopPage", "Copy page")
+#define STR_UndoMovPage                                     NC_("STR_UndoMovPage", "Change order of pages")
+#define STR_UndoDelPageMasterDscr                           NC_("STR_UndoDelPageMasterDscr", "Clear background page assignment")
+#define STR_UndoChgPageMasterDscr                           NC_("STR_UndoChgPageMasterDscr", "Change background page assignment")
+#define STR_UndoMergeModel                                  NC_("STR_UndoMergeModel", "Insert document")
+#define STR_UndoNewLayer                                    NC_("STR_UndoNewLayer", "Insert Layer")
+#define STR_UndoDelLayer                                    NC_("STR_UndoDelLayer", "Delete layer")
+#define STR_UndoMovLayer                                    NC_("STR_UndoMovLayer", "Change order of layers")
+// Undo/Redo for setting object's name (#i73249#)
+#define STR_UndoObjName                                     NC_("STR_UndoObjName", "Change object name of %1 to")
+#define STR_UndoObjTitle                                    NC_("STR_UndoObjTitle", "Change object title of %1")
+#define STR_UndoObjDescription                              NC_("STR_UndoObjDescription", "Change object description of %1")
+#define STR_StandardLayerName                               NC_("STR_StandardLayerName", "Standard")
+#define STR_ItemValON                                       NC_("STR_ItemValON", "on")
+#define STR_ItemValOFF                                      NC_("STR_ItemValOFF", "off")
+#define STR_ItemValYES                                      NC_("STR_ItemValYES", "yes")
+#define STR_ItemValNO                                       NC_("STR_ItemValNO", "No")
+#define STR_ItemValCAPTIONTYPE1                             NC_("STR_ItemValCAPTIONTYPE1", "Type 1")
+#define STR_ItemValCAPTIONTYPE2                             NC_("STR_ItemValCAPTIONTYPE2", "Type 2")
+#define STR_ItemValCAPTIONTYPE3                             NC_("STR_ItemValCAPTIONTYPE3", "Type 3")
+#define STR_ItemValCAPTIONTYPE4                             NC_("STR_ItemValCAPTIONTYPE4", "Type 4")
+#define STR_ItemValCAPTIONESCHORI                           NC_("STR_ItemValCAPTIONESCHORI", "Horizontal")
+#define STR_ItemValCAPTIONESCVERT                           NC_("STR_ItemValCAPTIONESCVERT", "Vertical")
+#define STR_ItemValCAPTIONESCBESTFIT                        NC_("STR_ItemValCAPTIONESCBESTFIT", "Automatic")
+#define STR_ItemValFITTOSIZENONE                            NC_("STR_ItemValFITTOSIZENONE", "Off")
+#define STR_ItemValFITTOSIZEPROP                            NC_("STR_ItemValFITTOSIZEPROP", "Proportional")
+#define STR_ItemValFITTOSIZEALLLINES                        NC_("STR_ItemValFITTOSIZEALLLINES", "Fit to size (all rows separately) ")
+#define STR_ItemValFITTOSIZERESIZEAT                        NC_("STR_ItemValFITTOSIZERESIZEAT", "Use hard attributes")
+#define STR_ItemValTEXTVADJTOP                              NC_("STR_ItemValTEXTVADJTOP", "Top")
+#define STR_ItemValTEXTVADJCENTER                           NC_("STR_ItemValTEXTVADJCENTER", "Center")
+#define STR_ItemValTEXTVADJBOTTOM                           NC_("STR_ItemValTEXTVADJBOTTOM", "Bottom")
+#define STR_ItemValTEXTVADJBLOCK                            NC_("STR_ItemValTEXTVADJBLOCK", "Use entire height")
+#define STR_ItemValTEXTVADJSTRETCH                          NC_("STR_ItemValTEXTVADJSTRETCH", "Stretched")
+#define STR_ItemValTEXTHADJLEFT                             NC_("STR_ItemValTEXTHADJLEFT", "Left")
+#define STR_ItemValTEXTHADJCENTER                           NC_("STR_ItemValTEXTHADJCENTER", "Center")
+#define STR_ItemValTEXTHADJRIGHT                            NC_("STR_ItemValTEXTHADJRIGHT", "Right")
+#define STR_ItemValTEXTHADJBLOCK                            NC_("STR_ItemValTEXTHADJBLOCK", "Use entire width")
+#define STR_ItemValTEXTHADJSTRETCH                          NC_("STR_ItemValTEXTHADJSTRETCH", "Stretched")
+#define STR_ItemValTEXTANI_NONE                             NC_("STR_ItemValTEXTANI_NONE", "off")
+#define STR_ItemValTEXTANI_BLINK                            NC_("STR_ItemValTEXTANI_BLINK", "flash")
+#define STR_ItemValTEXTANI_SCROLL                           NC_("STR_ItemValTEXTANI_SCROLL", "Scroll Through")
+#define STR_ItemValTEXTANI_ALTERNATE                        NC_("STR_ItemValTEXTANI_ALTERNATE", "alternating")
+#define STR_ItemValTEXTANI_SLIDE                            NC_("STR_ItemValTEXTANI_SLIDE", "Scroll In")
+#define STR_ItemValTEXTANI_LEFT                             NC_("STR_ItemValTEXTANI_LEFT", "left")
+#define STR_ItemValTEXTANI_UP                               NC_("STR_ItemValTEXTANI_UP", "up")
+#define STR_ItemValTEXTANI_RIGHT                            NC_("STR_ItemValTEXTANI_RIGHT", "right")
+#define STR_ItemValTEXTANI_DOWN                             NC_("STR_ItemValTEXTANI_DOWN", "down")
+#define STR_ItemValEDGE_ORTHOLINES                          NC_("STR_ItemValEDGE_ORTHOLINES", "Standard Connector")
+#define STR_ItemValEDGE_THREELINES                          NC_("STR_ItemValEDGE_THREELINES", "Line Connector")
+#define STR_ItemValEDGE_ONELINE                             NC_("STR_ItemValEDGE_ONELINE", "Straight Connector")
+#define STR_ItemValEDGE_BEZIER                              NC_("STR_ItemValEDGE_BEZIER", "Curved Connector")
+#define STR_ItemValMEASURE_STD                              NC_("STR_ItemValMEASURE_STD", "Standard")
+#define STR_ItemValMEASURE_RADIUS                           NC_("STR_ItemValMEASURE_RADIUS", "Radius")
+#define STR_ItemValMEASURE_TEXTHAUTO                        NC_("STR_ItemValMEASURE_TEXTHAUTO", "automatic")
+#define STR_ItemValMEASURE_TEXTLEFTOUTSIDE                  NC_("STR_ItemValMEASURE_TEXTLEFTOUTSIDE", "left outside")
+#define STR_ItemValMEASURE_TEXTINSIDE                       NC_("STR_ItemValMEASURE_TEXTINSIDE", "inside (centered)")
+#define STR_ItemValMEASURE_TEXTRIGHTOUTSID                  NC_("STR_ItemValMEASURE_TEXTRIGHTOUTSID", "right outside")
+#define STR_ItemValMEASURE_TEXTVAUTO                        NC_("STR_ItemValMEASURE_TEXTVAUTO", "automatic")
+#define STR_ItemValMEASURE_ABOVE                            NC_("STR_ItemValMEASURE_ABOVE", "on the line")
+#define STR_ItemValMEASURETEXT_BREAKEDLINE                  NC_("STR_ItemValMEASURETEXT_BREAKEDLINE", "broken line")
+#define STR_ItemValMEASURE_BELOW                            NC_("STR_ItemValMEASURE_BELOW", "below the line")
+#define STR_ItemValMEASURETEXT_VERTICALCEN                  NC_("STR_ItemValMEASURETEXT_VERTICALCEN", "centered")
+#define STR_ItemValCIRC_FULL                                NC_("STR_ItemValCIRC_FULL", "full circle")
+#define STR_ItemValCIRC_SECT                                NC_("STR_ItemValCIRC_SECT", "Circle Pie")
+#define STR_ItemValCIRC_CUT                                 NC_("STR_ItemValCIRC_CUT", "Circle segment")
+#define STR_ItemValCIRC_ARC                                 NC_("STR_ItemValCIRC_ARC", "Arc")
+// Strings for the templates dialog
+#define SIP_UNKNOWN_ATTR                                    NC_("SIP_UNKNOWN_ATTR", "Unknown attribute")
+// Strings for the templates dialog
+#define SIP_XA_LINESTYLE                                    NC_("SIP_XA_LINESTYLE", "Line style")
+#define SIP_XA_LINEDASH                                     NC_("SIP_XA_LINEDASH", "Line pattern")
+#define SIP_XA_LINEWIDTH                                    NC_("SIP_XA_LINEWIDTH", "Line width")
+#define SIP_XA_LINECOLOR                                    NC_("SIP_XA_LINECOLOR", "Line color")
+#define SIP_XA_LINESTART                                    NC_("SIP_XA_LINESTART", "Line head")
+#define SIP_XA_LINEEND                                      NC_("SIP_XA_LINEEND", "Line end")
+#define SIP_XA_LINESTARTWIDTH                               NC_("SIP_XA_LINESTARTWIDTH", "Line head width")
+#define SIP_XA_LINEENDWIDTH                                 NC_("SIP_XA_LINEENDWIDTH", "Line end width")
+#define SIP_XA_LINESTARTCENTER                              NC_("SIP_XA_LINESTARTCENTER", "Center arrowhead")
+#define SIP_XA_LINEENDCENTER                                NC_("SIP_XA_LINEENDCENTER", "Center arrowend")
+#define SIP_XA_LINETRANSPARENCE                             NC_("SIP_XA_LINETRANSPARENCE", "Line transparency")
+#define SIP_XA_LINEJOINT                                    NC_("SIP_XA_LINEJOINT", "Line joint")
+#define SIP_XATTRSET_LINE                                   NC_("SIP_XATTRSET_LINE", "Line attributes")
+#define SIP_XA_FILLSTYLE                                    NC_("SIP_XA_FILLSTYLE", "Fill style")
+#define SIP_XA_FILLCOLOR                                    NC_("SIP_XA_FILLCOLOR", "Fillcolor")
+#define SIP_XA_FILLGRADIENT                                 NC_("SIP_XA_FILLGRADIENT", "Gradient")
+#define SIP_XA_FILLHATCH                                    NC_("SIP_XA_FILLHATCH", "Hatching")
+#define SIP_XA_FILLBITMAP                                   NC_("SIP_XA_FILLBITMAP", "Fillbitmap")
+#define SIP_XA_FILLTRANSPARENCE                             NC_("SIP_XA_FILLTRANSPARENCE", "Transparency")
+#define SIP_XA_GRADIENTSTEPCOUNT                            NC_("SIP_XA_GRADIENTSTEPCOUNT", "Number of gradient steps")
+#define SIP_XA_FILLBMP_TILE                                 NC_("SIP_XA_FILLBMP_TILE", "Tile fill")
+#define SIP_XA_FILLBMP_POS                                  NC_("SIP_XA_FILLBMP_POS", "Fillbitmap position")
+#define SIP_XA_FILLBMP_SIZEX                                NC_("SIP_XA_FILLBMP_SIZEX", "Fillbitmap width")
+#define SIP_XA_FILLBMP_SIZEY                                NC_("SIP_XA_FILLBMP_SIZEY", "Height of fillbitmap")
+#define SIP_XA_FILLFLOATTRANSPARENCE                        NC_("SIP_XA_FILLFLOATTRANSPARENCE", "Transparent gradient")
+#define SIP_XA_SECONDARYFILLCOLOR                           NC_("SIP_XA_SECONDARYFILLCOLOR", "Fill reserved for 2")
+#define SIP_XA_FILLBMP_SIZELOG                              NC_("SIP_XA_FILLBMP_SIZELOG", "Tile size not in %")
+#define SIP_XA_FILLBMP_TILEOFFSETX                          NC_("SIP_XA_FILLBMP_TILEOFFSETX", "Tile offset X in %")
+#define SIP_XA_FILLBMP_TILEOFFSETY                          NC_("SIP_XA_FILLBMP_TILEOFFSETY", "Tile offset Y in %")
+#define SIP_XA_FILLBMP_STRETCH                              NC_("SIP_XA_FILLBMP_STRETCH", "Bitmap scaling")
+#define SIP_XA_FILLBMP_POSOFFSETX                           NC_("SIP_XA_FILLBMP_POSOFFSETX", "Tile position X in %")
+#define SIP_XA_FILLBMP_POSOFFSETY                           NC_("SIP_XA_FILLBMP_POSOFFSETY", "Tile position Y in %")
+#define SIP_XA_FILLBACKGROUND                               NC_("SIP_XA_FILLBACKGROUND", "Background fill")
+#define SIP_XATTRSET_FILL                                   NC_("SIP_XATTRSET_FILL", "Area attributes")
+#define SIP_XA_FORMTXTSTYLE                                 NC_("SIP_XA_FORMTXTSTYLE", "Fontwork style")
+#define SIP_XA_FORMTXTADJUST                                NC_("SIP_XA_FORMTXTADJUST", "Fontwork alignment")
+#define SIP_XA_FORMTXTDISTANCE                              NC_("SIP_XA_FORMTXTDISTANCE", "Fontwork spacing")
+#define SIP_XA_FORMTXTSTART                                 NC_("SIP_XA_FORMTXTSTART", "Fontwork font begin")
+#define SIP_XA_FORMTXTMIRROR                                NC_("SIP_XA_FORMTXTMIRROR", "Fontwork mirror")
+#define SIP_XA_FORMTXTOUTLINE                               NC_("SIP_XA_FORMTXTOUTLINE", "Fontwork outline")
+#define SIP_XA_FORMTXTSHADOW                                NC_("SIP_XA_FORMTXTSHADOW", "Fontwork shadow")
+#define SIP_XA_FORMTXTSHDWCOLOR                             NC_("SIP_XA_FORMTXTSHDWCOLOR", "Fontwork shadow color")
+#define SIP_XA_FORMTXTSHDWXVAL                              NC_("SIP_XA_FORMTXTSHDWXVAL", "Fontwork shadow offset X")
+#define SIP_XA_FORMTXTSHDWYVAL                              NC_("SIP_XA_FORMTXTSHDWYVAL", "Fontwork shadow offset Y")
+#define SIP_XA_FORMTXTHIDEFORM                              NC_("SIP_XA_FORMTXTHIDEFORM", "Hide fontwork outline")
+#define SIP_XA_FORMTXTSHDWTRANSP                            NC_("SIP_XA_FORMTXTSHDWTRANSP", "Fontwork shadow transparency")
+#define SIP_SA_SHADOW                                       NC_("SIP_SA_SHADOW", "Shadow")
+#define SIP_SA_SHADOWCOLOR                                  NC_("SIP_SA_SHADOWCOLOR", "Shadow color")
+#define SIP_SA_SHADOWXDIST                                  NC_("SIP_SA_SHADOWXDIST", "Shadow spacing X")
+#define SIP_SA_SHADOWYDIST                                  NC_("SIP_SA_SHADOWYDIST", "Shadow spacing Y")
+#define SIP_SA_SHADOWTRANSPARENCE                           NC_("SIP_SA_SHADOWTRANSPARENCE", "Shadow transparency")
+#define SIP_SA_SHADOW3D                                     NC_("SIP_SA_SHADOW3D", "3D shadow")
+#define SIP_SA_SHADOWPERSP                                  NC_("SIP_SA_SHADOWPERSP", "Perspective shadow")
+#define SIP_SA_CAPTIONTYPE                                  NC_("SIP_SA_CAPTIONTYPE", "Type of legend")
+#define SIP_SA_CAPTIONFIXEDANGLE                            NC_("SIP_SA_CAPTIONFIXEDANGLE", "Fixed legend angle")
+#define SIP_SA_CAPTIONANGLE                                 NC_("SIP_SA_CAPTIONANGLE", "Legend angle")
+#define SIP_SA_CAPTIONGAP                                   NC_("SIP_SA_CAPTIONGAP", "Legend lines spacing")
+#define SIP_SA_CAPTIONESCDIR                                NC_("SIP_SA_CAPTIONESCDIR", "Legend exit alignment")
+#define SIP_SA_CAPTIONESCISREL                              NC_("SIP_SA_CAPTIONESCISREL", "Relative exit legend")
+#define SIP_SA_CAPTIONESCREL                                NC_("SIP_SA_CAPTIONESCREL", "Relative exit legend")
+#define SIP_SA_CAPTIONESCABS                                NC_("SIP_SA_CAPTIONESCABS", "Absolute exit of legend")
+#define SIP_SA_CAPTIONLINELEN                               NC_("SIP_SA_CAPTIONLINELEN", "Legend line length")
+#define SIP_SA_CAPTIONFITLINELEN                            NC_("SIP_SA_CAPTIONFITLINELEN", "AutoLength of legend lines")
+#define SIP_SA_ECKENRADIUS                                  NC_("SIP_SA_ECKENRADIUS", "Corner radius")
+#define SIP_SA_TEXT_MINFRAMEHEIGHT                          NC_("SIP_SA_TEXT_MINFRAMEHEIGHT", "Minimal frame height")
+#define SIP_SA_TEXT_AUTOGROWHEIGHT                          NC_("SIP_SA_TEXT_AUTOGROWHEIGHT", "AutoFit height")
+#define SIP_SA_TEXT_FITTOSIZE                               NC_("SIP_SA_TEXT_FITTOSIZE", "Fit text to frame")
+#define SIP_SA_TEXT_LEFTDIST                                NC_("SIP_SA_TEXT_LEFTDIST", "Left text frame spacing")
+#define SIP_SA_TEXT_RIGHTDIST                               NC_("SIP_SA_TEXT_RIGHTDIST", "Right text frame spacing")
+#define SIP_SA_TEXT_UPPERDIST                               NC_("SIP_SA_TEXT_UPPERDIST", "Upper text frame spacing")
+#define SIP_SA_TEXT_LOWERDIST                               NC_("SIP_SA_TEXT_LOWERDIST", "Lower text frame spacing")
+#define SIP_SA_TEXT_VERTADJUST                              NC_("SIP_SA_TEXT_VERTADJUST", "Vertical text anchor")
+#define SIP_SA_TEXT_MAXFRAMEHEIGHT                          NC_("SIP_SA_TEXT_MAXFRAMEHEIGHT", "Maximal frame height")
+#define SIP_SA_TEXT_MINFRAMEWIDTH                           NC_("SIP_SA_TEXT_MINFRAMEWIDTH", "Minimal frame width")
+#define SIP_SA_TEXT_MAXFRAMEWIDTH                           NC_("SIP_SA_TEXT_MAXFRAMEWIDTH", "Maximal frame width")
+#define SIP_SA_TEXT_AUTOGROWWIDTH                           NC_("SIP_SA_TEXT_AUTOGROWWIDTH", "AutoFit width")
+#define SIP_SA_TEXT_HORZADJUST                              NC_("SIP_SA_TEXT_HORZADJUST", "Horizontal text anchor")
+#define SIP_SA_TEXT_ANIKIND                                 NC_("SIP_SA_TEXT_ANIKIND", "Ticker")
+#define SIP_SA_TEXT_ANIDIRECTION                            NC_("SIP_SA_TEXT_ANIDIRECTION", "Ticker direction")
+#define SIP_SA_TEXT_ANISTARTINSIDE                          NC_("SIP_SA_TEXT_ANISTARTINSIDE", "Ticker start inside")
+#define SIP_SA_TEXT_ANISTOPINSIDE                           NC_("SIP_SA_TEXT_ANISTOPINSIDE", "Ticker stop inside")
+#define SIP_SA_TEXT_ANICOUNT                                NC_("SIP_SA_TEXT_ANICOUNT", "Number of ticker runs")
+#define SIP_SA_TEXT_ANIDELAY                                NC_("SIP_SA_TEXT_ANIDELAY", "Speed of ticker")
+#define SIP_SA_TEXT_ANIAMOUNT                               NC_("SIP_SA_TEXT_ANIAMOUNT", "Ticker step size")
+#define SIP_SA_TEXT_CONTOURFRAME                            NC_("SIP_SA_TEXT_CONTOURFRAME", "Outline text flow")
+#define SIP_SA_CUSTOMSHAPE_ADJUSTMENT                       NC_("SIP_SA_CUSTOMSHAPE_ADJUSTMENT", "Shape Adjustment")
+#define SIP_SA_XMLATTRIBUTES                                NC_("SIP_SA_XMLATTRIBUTES", "User-defined attributes")
+#define SIP_SA_TEXT_USEFIXEDCELLHEIGHT                      NC_("SIP_SA_TEXT_USEFIXEDCELLHEIGHT", "Use font-independent line spacing")
+#define SIP_SA_WORDWRAP                                     NC_("SIP_SA_WORDWRAP", "Word wrap text in shape")
+#define SIP_SA_CHAINNEXTNAME                                NC_("SIP_SA_CHAINNEXTNAME", "Next link in text chain")
+#define SIP_SA_EDGEKIND                                     NC_("SIP_SA_EDGEKIND", "Type of connector")
+#define SIP_SA_EDGENODE1HORZDIST                            NC_("SIP_SA_EDGENODE1HORZDIST", "Horz. spacing object 1")
+#define SIP_SA_EDGENODE1VERTDIST                            NC_("SIP_SA_EDGENODE1VERTDIST", "Vert. spacing object 1")
+#define SIP_SA_EDGENODE2HORZDIST                            NC_("SIP_SA_EDGENODE2HORZDIST", "Horz. spacing object 2")
+#define SIP_SA_EDGENODE2VERTDIST                            NC_("SIP_SA_EDGENODE2VERTDIST", "Vert. spacing object 2")
+#define SIP_SA_EDGENODE1GLUEDIST                            NC_("SIP_SA_EDGENODE1GLUEDIST", "Glue spacing object 1")
+#define SIP_SA_EDGENODE2GLUEDIST                            NC_("SIP_SA_EDGENODE2GLUEDIST", "Glue spacing object 2")
+#define SIP_SA_EDGELINEDELTAANZ                             NC_("SIP_SA_EDGELINEDELTAANZ", "Number of movable lines")
+#define SIP_SA_EDGELINE1DELTA                               NC_("SIP_SA_EDGELINE1DELTA", "Offset line 1")
+#define SIP_SA_EDGELINE2DELTA                               NC_("SIP_SA_EDGELINE2DELTA", "Offset line 2")
+#define SIP_SA_EDGELINE3DELTA                               NC_("SIP_SA_EDGELINE3DELTA", "Offset line 3")
+#define SIP_SA_MEASUREKIND                                  NC_("SIP_SA_MEASUREKIND", "Type of dimensioning")
+#define SIP_SA_MEASURETEXTHPOS                              NC_("SIP_SA_MEASURETEXTHPOS", "Dimension value - horizontal position")
+#define SIP_SA_MEASURETEXTVPOS                              NC_("SIP_SA_MEASURETEXTVPOS", "Dimension value - vertical position")
+#define SIP_SA_MEASURELINEDIST                              NC_("SIP_SA_MEASURELINEDIST", "Dimension line space")
+#define SIP_SA_MEASUREHELPLINEOVERHANG                      NC_("SIP_SA_MEASUREHELPLINEOVERHANG", "Dimension help line overhang")
+#define SIP_SA_MEASUREHELPLINEDIST                          NC_("SIP_SA_MEASUREHELPLINEDIST", "Dimension help line spacing")
+#define SIP_SA_MEASUREHELPLINE1LEN                          NC_("SIP_SA_MEASUREHELPLINE1LEN", "Backlog of dimension help line 1")
+#define SIP_SA_MEASUREHELPLINE2LEN                          NC_("SIP_SA_MEASUREHELPLINE2LEN", "Backlog of dimension help line 2")
+#define SIP_SA_MEASUREBELOWREFEDGE                          NC_("SIP_SA_MEASUREBELOWREFEDGE", "Lower edge dimensioning")
+#define SIP_SA_MEASURETEXTROTA90                            NC_("SIP_SA_MEASURETEXTROTA90", "Dimension value across dimension line")
+#define SIP_SA_MEASURETEXTUPSIDEDOWN                        NC_("SIP_SA_MEASURETEXTUPSIDEDOWN", "Rotate dimension value by 180 degree")
+#define SIP_SA_MEASUREOVERHANG                              NC_("SIP_SA_MEASUREOVERHANG", "Dimension line overhang")
+#define SIP_SA_MEASUREUNIT                                  NC_("SIP_SA_MEASUREUNIT", "Measure unit")
+#define SIP_SA_MEASURESCALE                                 NC_("SIP_SA_MEASURESCALE", "Additional scale factor")
+#define SIP_SA_MEASURESHOWUNIT                              NC_("SIP_SA_MEASURESHOWUNIT", "Measure unit display")
+#define SIP_SA_MEASUREFORMATSTRING                          NC_("SIP_SA_MEASUREFORMATSTRING", "Dimension value format")
+#define SIP_SA_MEASURETEXTAUTOANGLE                         NC_("SIP_SA_MEASURETEXTAUTOANGLE", "AutoPositioning of the dimension value")
+#define SIP_SA_MEASURETEXTAUTOANGLEVIEW                     NC_("SIP_SA_MEASURETEXTAUTOANGLEVIEW", "Angle for the automatic positioning of the dimension value")
+#define SIP_SA_MEASURETEXTISFIXEDANGLE                      NC_("SIP_SA_MEASURETEXTISFIXEDANGLE", "Determination of the dimension value angle")
+#define SIP_SA_MEASURETEXTFIXEDANGLE                        NC_("SIP_SA_MEASURETEXTFIXEDANGLE", "Angle of the dimension value")
+#define SIP_SA_MEASUREDECIMALPLACES                         NC_("SIP_SA_MEASUREDECIMALPLACES", "Decimal places")
+#define SIP_SA_CIRCKIND                                     NC_("SIP_SA_CIRCKIND", "Type of circle")
+#define SIP_SA_CIRCSTARTANGLE                               NC_("SIP_SA_CIRCSTARTANGLE", "Start angle")
+#define SIP_SA_CIRCENDANGLE                                 NC_("SIP_SA_CIRCENDANGLE", "End angle")
+#define SIP_SA_OBJMOVEPROTECT                               NC_("SIP_SA_OBJMOVEPROTECT", "Protected object position")
+#define SIP_SA_OBJSIZEPROTECT                               NC_("SIP_SA_OBJSIZEPROTECT", "Protected object size")
+#define SIP_SA_OBJPRINTABLE                                 NC_("SIP_SA_OBJPRINTABLE", "Object, printable")
+#define SIP_SA_OBJVISIBLE                                   NC_("SIP_SA_OBJVISIBLE", "Object, visible")
+#define SIP_SA_LAYERID                                      NC_("SIP_SA_LAYERID", "Level ID")
+#define SIP_SA_LAYERNAME                                    NC_("SIP_SA_LAYERNAME", "Layer")
+#define SIP_SA_OBJECTNAME                                   NC_("SIP_SA_OBJECTNAME", "Object name")
+#define SIP_SA_ALLPOSITIONX                                 NC_("SIP_SA_ALLPOSITIONX", "Position X, complete")
+#define SIP_SA_ALLPOSITIONY                                 NC_("SIP_SA_ALLPOSITIONY", "Position Y, complete")
+#define SIP_SA_ALLSIZEWIDTH                                 NC_("SIP_SA_ALLSIZEWIDTH", "Total Width")
+#define SIP_SA_ALLSIZEHEIGHT                                NC_("SIP_SA_ALLSIZEHEIGHT", "Height, complete")
+#define SIP_SA_ONEPOSITIONX                                 NC_("SIP_SA_ONEPOSITIONX", "Single position X")
+#define SIP_SA_ONEPOSITIONY                                 NC_("SIP_SA_ONEPOSITIONY", "Single position Y")
+#define SIP_SA_ONESIZEWIDTH                                 NC_("SIP_SA_ONESIZEWIDTH", "Single width")
+#define SIP_SA_ONESIZEHEIGHT                                NC_("SIP_SA_ONESIZEHEIGHT", "Single height")
+#define SIP_SA_LOGICSIZEWIDTH                               NC_("SIP_SA_LOGICSIZEWIDTH", "Logical width")
+#define SIP_SA_LOGICSIZEHEIGHT                              NC_("SIP_SA_LOGICSIZEHEIGHT", "Logical height")
+#define SIP_SA_ROTATEANGLE                                  NC_("SIP_SA_ROTATEANGLE", "Single rotation angle")
+#define SIP_SA_SHEARANGLE                                   NC_("SIP_SA_SHEARANGLE", "Single shear angle")
+#define SIP_SA_MOVEX                                        NC_("SIP_SA_MOVEX", "Move horizontally")
+#define SIP_SA_MOVEY                                        NC_("SIP_SA_MOVEY", "Move vertically")
+#define SIP_SA_RESIZEXONE                                   NC_("SIP_SA_RESIZEXONE", "Resize X, single")
+#define SIP_SA_RESIZEYONE                                   NC_("SIP_SA_RESIZEYONE", "Resize Y, single")
+#define SIP_SA_ROTATEONE                                    NC_("SIP_SA_ROTATEONE", "Single rotation")
+#define SIP_SA_HORZSHEARONE                                 NC_("SIP_SA_HORZSHEARONE", "Single horizontal shear")
+#define SIP_SA_VERTSHEARONE                                 NC_("SIP_SA_VERTSHEARONE", "Single vertical shear")
+#define SIP_SA_RESIZEXALL                                   NC_("SIP_SA_RESIZEXALL", "Resize X, complete")
+#define SIP_SA_RESIZEYALL                                   NC_("SIP_SA_RESIZEYALL", "Resize Y, complete")
+#define SIP_SA_ROTATEALL                                    NC_("SIP_SA_ROTATEALL", "Rotate all")
+#define SIP_SA_HORZSHEARALL                                 NC_("SIP_SA_HORZSHEARALL", "Shear horizontal, complete")
+#define SIP_SA_VERTSHEARALL                                 NC_("SIP_SA_VERTSHEARALL", "Shear vertical, complete")
+#define SIP_SA_TRANSFORMREF1X                               NC_("SIP_SA_TRANSFORMREF1X", "Reference point 1 X")
+#define SIP_SA_TRANSFORMREF1Y                               NC_("SIP_SA_TRANSFORMREF1Y", "Reference point 1 Y")
+#define SIP_SA_TRANSFORMREF2X                               NC_("SIP_SA_TRANSFORMREF2X", "Reference point 2 X")
+#define SIP_SA_TRANSFORMREF2Y                               NC_("SIP_SA_TRANSFORMREF2Y", "Reference point 2 Y")
+#define SIP_EE_PARA_HYPHENATE                               NC_("SIP_EE_PARA_HYPHENATE", "Hyphenation")
+#define SIP_EE_PARA_BULLETSTATE                             NC_("SIP_EE_PARA_BULLETSTATE", "Display bullets")
+#define SIP_EE_PARA_OUTLLRSPACE                             NC_("SIP_EE_PARA_OUTLLRSPACE", "Numbering indents")
+#define SIP_EE_PARA_OUTLLEVEL                               NC_("SIP_EE_PARA_OUTLLEVEL", "Numbering level")
+#define SIP_EE_PARA_BULLET                                  NC_("SIP_EE_PARA_BULLET", "Bullets and Numberings")
+#define SIP_EE_PARA_LRSPACE                                 NC_("SIP_EE_PARA_LRSPACE", "Indents")
+#define SIP_EE_PARA_ULSPACE                                 NC_("SIP_EE_PARA_ULSPACE", "Paragraph spacing")
+#define SIP_EE_PARA_SBL                                     NC_("SIP_EE_PARA_SBL", "Line spacing")
+#define SIP_EE_PARA_JUST                                    NC_("SIP_EE_PARA_JUST", "Paragraph alignment")
+#define SIP_EE_PARA_TABS                                    NC_("SIP_EE_PARA_TABS", "Tabulators")
+#define SIP_EE_CHAR_COLOR                                   NC_("SIP_EE_CHAR_COLOR", "Font color")
+#define SIP_EE_CHAR_FONTINFO                                NC_("SIP_EE_CHAR_FONTINFO", "Character set")
+#define SIP_EE_CHAR_FONTHEIGHT                              NC_("SIP_EE_CHAR_FONTHEIGHT", "Font size")
+#define SIP_EE_CHAR_FONTWIDTH                               NC_("SIP_EE_CHAR_FONTWIDTH", "Font width")
+#define SIP_EE_CHAR_WEIGHT                                  NC_("SIP_EE_CHAR_WEIGHT", "Bold (thickness)")
+#define SIP_EE_CHAR_UNDERLINE                               NC_("SIP_EE_CHAR_UNDERLINE", "Underline")
+#define SIP_EE_CHAR_OVERLINE                                NC_("SIP_EE_CHAR_OVERLINE", "Overline")
+#define SIP_EE_CHAR_STRIKEOUT                               NC_("SIP_EE_CHAR_STRIKEOUT", "Strikethrough")
+#define SIP_EE_CHAR_ITALIC                                  NC_("SIP_EE_CHAR_ITALIC", "Italic")
+#define SIP_EE_CHAR_OUTLINE                                 NC_("SIP_EE_CHAR_OUTLINE", "Outline")
+#define SIP_EE_CHAR_SHADOW                                  NC_("SIP_EE_CHAR_SHADOW", "Font shadow")
+#define SIP_EE_CHAR_ESCAPEMENT                              NC_("SIP_EE_CHAR_ESCAPEMENT", "Superscript/subscript")
+#define SIP_EE_CHAR_PAIRKERNING                             NC_("SIP_EE_CHAR_PAIRKERNING", "Kerning")
+#define SIP_EE_CHAR_KERNING                                 NC_("SIP_EE_CHAR_KERNING", "Manual kerning")
+#define SIP_EE_CHAR_WLM                                     NC_("SIP_EE_CHAR_WLM", "No underline for spaces")
+#define SIP_EE_FEATURE_TAB                                  NC_("SIP_EE_FEATURE_TAB", "Tabulator")
+#define SIP_EE_FEATURE_LINEBR                               NC_("SIP_EE_FEATURE_LINEBR", "Optional line break")
+#define SIP_EE_FEATURE_NOTCONV                              NC_("SIP_EE_FEATURE_NOTCONV", "Non-convertible character")
+#define SIP_EE_FEATURE_FIELD                                NC_("SIP_EE_FEATURE_FIELD", "Fields")
+#define SIP_SA_GRAFRED                                      NC_("SIP_SA_GRAFRED", "Red")
+#define SIP_SA_GRAFGREEN                                    NC_("SIP_SA_GRAFGREEN", "Green")
+#define SIP_SA_GRAFBLUE                                     NC_("SIP_SA_GRAFBLUE", "Blue")
+#define SIP_SA_GRAFLUMINANCE                                NC_("SIP_SA_GRAFLUMINANCE", "Brightness")
+#define SIP_SA_GRAFCONTRAST                                 NC_("SIP_SA_GRAFCONTRAST", "Contrast")
+#define SIP_SA_GRAFGAMMA                                    NC_("SIP_SA_GRAFGAMMA", "Gamma")
+#define SIP_SA_GRAFTRANSPARENCE                             NC_("SIP_SA_GRAFTRANSPARENCE", "Transparency")
+#define SIP_SA_GRAFINVERT                                   NC_("SIP_SA_GRAFINVERT", "Invert")
+#define SIP_SA_GRAFMODE                                     NC_("SIP_SA_GRAFMODE", "Image mode")
+#define SIP_SA_GRAFCROP                                     NC_("SIP_SA_GRAFCROP", "Crop")
+#define STR_ObjNameSingulMEDIA                              NC_("STR_ObjNameSingulMEDIA", "Media object")
+#define STR_ObjNamePluralMEDIA                              NC_("STR_ObjNamePluralMEDIA", "Media objects")
+// drawing layer table strings
+#define STR_TABLE_INSCOL                                    NC_("STR_TABLE_INSCOL", "Insert column")
+#define STR_TABLE_INSROW                                    NC_("STR_TABLE_INSROW", "Insert row")
+#define STR_UNDO_COL_DELETE                                 NC_("STR_UNDO_COL_DELETE", "Delete column")
+#define STR_UNDO_ROW_DELETE                                 NC_("STR_UNDO_ROW_DELETE", "Delete row")
+#define STR_TABLE_SPLIT                                     NC_("STR_TABLE_SPLIT", "Split cells")
+#define STR_TABLE_MERGE                                     NC_("STR_TABLE_MERGE", "Merge cells")
+#define STR_TABLE_NUMFORMAT                                 NC_("STR_TABLE_NUMFORMAT", "Format cell")
+#define STR_TABLE_DISTRIBUTE_ROWS                           NC_("STR_TABLE_DISTRIBUTE_ROWS", "Distribute rows")
+#define STR_TABLE_DISTRIBUTE_COLUMNS                        NC_("STR_TABLE_DISTRIBUTE_COLUMNS", "Distribute columns")
+#define STR_TABLE_DELETE_CELL_CONTENTS                      NC_("STR_TABLE_DELETE_CELL_CONTENTS", "Delete cell contents")
+#define STR_TABLE_STYLE                                     NC_("STR_TABLE_STYLE", "Table style")
+#define STR_TABLE_STYLE_SETTINGS                            NC_("STR_TABLE_STYLE_SETTINGS", "Table style settings")
+#define STR_ObjNameSingulTable                              NC_("STR_ObjNameSingulTable", "Table")
+#define STR_ObjNamePluralTable                              NC_("STR_ObjNamePluralTable", "Tables")
+#define STR_ObjNameSingulFONTWORK                           NC_("STR_ObjNameSingulFONTWORK", "Font work")
+// Strings for the Draw-Dialog --------------------------------------------
+#define RID_SVXSTR_SOLID                                    NC_("RID_SVXSTR_SOLID", "Continuous")
+#define RID_SVXSTR_GRADIENT                                 NC_("RID_SVXSTR_GRADIENT", "Gradient")
+#define RID_SVXSTR_BITMAP                                   NC_("RID_SVXSTR_BITMAP", "Bitmap")
+#define RID_SVXSTR_PATTERN                                  NC_("RID_SVXSTR_PATTERN", "Pattern")
+#define RID_SVXSTR_PATTERN_UNTITLED                         NC_("RID_SVXSTR_PATTERN_UNTITLED", "Untitled Pattern")
+#define RID_SVXSTR_LINESTYLE                                NC_("RID_SVXSTR_LINESTYLE", "Line Style")
+#define RID_SVXSTR_INVISIBLE                                NC_("RID_SVXSTR_INVISIBLE", "None")
+#define RID_SVXSTR_COLOR                                    NC_("RID_SVXSTR_COLOR", "Color")
+#define RID_SVXSTR_HATCH                                    NC_("RID_SVXSTR_HATCH", "Hatching")
+#define RID_SVXSTR_LINEEND                                  NC_("RID_SVXSTR_LINEEND", "Arrowheads")
+#define RID_SVXSTR_COLOR_BLACK                              NC_("RID_SVXSTR_COLOR_BLACK", "Black")
+#define RID_SVXSTR_COLOR_BLUE                               NC_("RID_SVXSTR_COLOR_BLUE", "Blue")
+#define RID_SVXSTR_COLOR_GREEN                              NC_("RID_SVXSTR_COLOR_GREEN", "Green")
+#define RID_SVXSTR_COLOR_CYAN                               NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
+#define RID_SVXSTR_COLOR_RED                                NC_("RID_SVXSTR_COLOR_RED", "Red")
+#define RID_SVXSTR_COLOR_MAGENTA                            NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
+#define RID_SVXSTR_COLOR_GREY                               NC_("RID_SVXSTR_COLOR_GREY", "Gray")
+#define RID_SVXSTR_COLOR_YELLOW                             NC_("RID_SVXSTR_COLOR_YELLOW", "Yellow")
+#define RID_SVXSTR_COLOR_WHITE                              NC_("RID_SVXSTR_COLOR_WHITE", "White")
+#define RID_SVXSTR_COLOR_BLUEGREY                           NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray")
+/* Old default color Blue9, probably often u                sed in saved files */
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC                       NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
+#define RID_SVXSTR_COLOR_ORANGE                             NC_("RID_SVXSTR_COLOR_ORANGE", "Orange")
+#define RID_SVXSTR_ARROW                                    NC_("RID_SVXSTR_ARROW", "Arrow")
+#define RID_SVXSTR_SQUARE                                   NC_("RID_SVXSTR_SQUARE", "Square")
+#define RID_SVXSTR_CIRCLE                                   NC_("RID_SVXSTR_CIRCLE", "Circle")
+#define RID_SVXSTR_NONE                                     NC_("RID_SVXSTR_NONE", "- none -")
+#define RID_SVXSTR_TRANSPARENCE                             NC_("RID_SVXSTR_TRANSPARENCE", "Transparency")
+#define RID_SVXSTR_CENTERED                                 NC_("RID_SVXSTR_CENTERED", "Centered")
+#define RID_SVXSTR_NOTCENTERED                              NC_("RID_SVXSTR_NOTCENTERED", "Not centered")
+#define RID_SVXSTR_GRAFMODE_STANDARD                        NC_("RID_SVXSTR_GRAFMODE_STANDARD", "Default")
+#define RID_SVXSTR_GRAFMODE_GREYS                           NC_("RID_SVXSTR_GRAFMODE_GREYS", "Grayscale")
+#define RID_SVXSTR_GRAFMODE_MONO                            NC_("RID_SVXSTR_GRAFMODE_MONO", "Black/White")
+#define RID_SVXSTR_GRAFMODE_WATERMARK                       NC_("RID_SVXSTR_GRAFMODE_WATERMARK", "Watermark")
+// BM: some additional standard colors
+#define RID_SVXSTR_COLOR_VIOLET                             NC_("RID_SVXSTR_COLOR_VIOLET", "Violet")
+#define RID_SVXSTR_COLOR_BORDEAUX                           NC_("RID_SVXSTR_COLOR_BORDEAUX", "Bordeaux")
+#define RID_SVXSTR_COLOR_PALE_YELLOW                        NC_("RID_SVXSTR_COLOR_PALE_YELLOW", "Pale yellow")
+#define RID_SVXSTR_COLOR_PALE_GREEN                         NC_("RID_SVXSTR_COLOR_PALE_GREEN", "Pale green")
+#define RID_SVXSTR_COLOR_DARKVIOLET                         NC_("RID_SVXSTR_COLOR_DARKVIOLET", "Dark violet")
+#define RID_SVXSTR_COLOR_SALMON                             NC_("RID_SVXSTR_COLOR_SALMON", "Salmon")
+#define RID_SVXSTR_COLOR_SEABLUE                            NC_("RID_SVXSTR_COLOR_SEABLUE", "Sea blue")
+#define RID_SVXSTR_COLOR_CHART                              NC_("RID_SVXSTR_COLOR_CHART", "Chart")
+#define RID_SVXSTR_COLOR_PURPLE                             NC_("RID_SVXSTR_COLOR_PURPLE", "Purple")
+#define RID_SVXSTR_COLOR_SKYBLUE                            NC_("RID_SVXSTR_COLOR_SKYBLUE", "Sky blue")
+#define RID_SVXSTR_COLOR_YELLOWGREEN                        NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green")
+#define RID_SVXSTR_COLOR_PINK                               NC_("RID_SVXSTR_COLOR_PINK", "Pink")
+#define RID_SVXSTR_COLOR_TURQUOISE                          NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise")
+#define RID_SVXSTR_TBLAFMT_3D                               NC_("RID_SVXSTR_TBLAFMT_3D", "3D")
+#define RID_SVXSTR_TBLAFMT_BLACK1                           NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1")
+#define RID_SVXSTR_TBLAFMT_BLACK2                           NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2")
+#define RID_SVXSTR_TBLAFMT_BLUE                             NC_("RID_SVXSTR_TBLAFMT_BLUE", "Blue")
+#define RID_SVXSTR_TBLAFMT_BROWN                            NC_("RID_SVXSTR_TBLAFMT_BROWN", "Brown")
+#define RID_SVXSTR_TBLAFMT_CURRENCY                         NC_("RID_SVXSTR_TBLAFMT_CURRENCY", "Currency")
+#define RID_SVXSTR_TBLAFMT_CURRENCY_3D                      NC_("RID_SVXSTR_TBLAFMT_CURRENCY_3D", "Currency 3D")
+#define RID_SVXSTR_TBLAFMT_CURRENCY_GRAY                    NC_("RID_SVXSTR_TBLAFMT_CURRENCY_GRAY", "Currency Gray")
+#define RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER                NC_("RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER", "Currency Lavender")
+#define RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE               NC_("RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE", "Currency Turquoise")
+#define RID_SVXSTR_TBLAFMT_GRAY                             NC_("RID_SVXSTR_TBLAFMT_GRAY", "Gray")
+#define RID_SVXSTR_TBLAFMT_GREEN                            NC_("RID_SVXSTR_TBLAFMT_GREEN", "Green")
+#define RID_SVXSTR_TBLAFMT_LAVENDER                         NC_("RID_SVXSTR_TBLAFMT_LAVENDER", "Lavender")
+#define RID_SVXSTR_TBLAFMT_RED                              NC_("RID_SVXSTR_TBLAFMT_RED", "Red")
+#define RID_SVXSTR_TBLAFMT_TURQUOISE                        NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise")
+#define RID_SVXSTR_TBLAFMT_YELLOW                           NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow")
+#define RID_SVXSTR_LINEJOINT_MIDDLE                         NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged")
+#define RID_SVXSTR_LINEJOINT_BEVEL                          NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel")
+#define RID_SVXSTR_LINEJOINT_MITER                          NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter")
+#define RID_SVXSTR_LINEJOINT_ROUND                          NC_("RID_SVXSTR_LINEJOINT_ROUND", "Line joint round")
+// the familiar name for it
+#define RID_SVXSTR_LINECAP_BUTT                             NC_("RID_SVXSTR_LINECAP_BUTT", "Line cap flat")
+#define RID_SVXSTR_LINECAP_ROUND                            NC_("RID_SVXSTR_LINECAP_ROUND", "Line cap round")
+#define RID_SVXSTR_LINECAP_SQUARE                           NC_("RID_SVXSTR_LINECAP_SQUARE", "Line cap square")
+#define RID_SVXSTR_GRDT0                                    NC_("RID_SVXSTR_GRDT0", "Gradient")
+#define RID_SVXSTR_GRDT1                                    NC_("RID_SVXSTR_GRDT1", "Linear blue/white")
+#define RID_SVXSTR_GRDT2                                    NC_("RID_SVXSTR_GRDT2", "Linear magenta/green")
+#define RID_SVXSTR_GRDT3                                    NC_("RID_SVXSTR_GRDT3", "Linear yellow/brown")
+#define RID_SVXSTR_GRDT4                                    NC_("RID_SVXSTR_GRDT4", "Radial green/black")
+#define RID_SVXSTR_GRDT5                                    NC_("RID_SVXSTR_GRDT5", "Radial red/yellow")
+#define RID_SVXSTR_GRDT6                                    NC_("RID_SVXSTR_GRDT6", "Rectangular red/white")
+#define RID_SVXSTR_GRDT7                                    NC_("RID_SVXSTR_GRDT7", "Square yellow/white")
+#define RID_SVXSTR_GRDT8                                    NC_("RID_SVXSTR_GRDT8", "Ellipsoid blue gray/light blue")
+#define RID_SVXSTR_GRDT9                                    NC_("RID_SVXSTR_GRDT9", "Axial light red/white")
+// l means left
+#define RID_SVXSTR_GRDT10                                   NC_("RID_SVXSTR_GRDT10", "Diagonal 1l")
+// r means right
+#define RID_SVXSTR_GRDT11                                   NC_("RID_SVXSTR_GRDT11", "Diagonal 1r")
+// l means left
+#define RID_SVXSTR_GRDT12                                   NC_("RID_SVXSTR_GRDT12", "Diagonal 2l")
+// r means right
+#define RID_SVXSTR_GRDT13                                   NC_("RID_SVXSTR_GRDT13", "Diagonal 2r")
+// l means left
+#define RID_SVXSTR_GRDT14                                   NC_("RID_SVXSTR_GRDT14", "Diagonal 3l")
+// r means right
+#define RID_SVXSTR_GRDT15                                   NC_("RID_SVXSTR_GRDT15", "Diagonal 3r")
+// l means left
+#define RID_SVXSTR_GRDT16                                   NC_("RID_SVXSTR_GRDT16", "Diagonal 4l")
+// r means right
+#define RID_SVXSTR_GRDT17                                   NC_("RID_SVXSTR_GRDT17", "Diagonal 4r")
+#define RID_SVXSTR_GRDT18                                   NC_("RID_SVXSTR_GRDT18", "Diagonal Blue")
+#define RID_SVXSTR_GRDT19                                   NC_("RID_SVXSTR_GRDT19", "Diagonal Green")
+#define RID_SVXSTR_GRDT20                                   NC_("RID_SVXSTR_GRDT20", "Diagonal Orange")
+#define RID_SVXSTR_GRDT21                                   NC_("RID_SVXSTR_GRDT21", "Diagonal Red")
+#define RID_SVXSTR_GRDT22                                   NC_("RID_SVXSTR_GRDT22", "Diagonal Turquoise")
+#define RID_SVXSTR_GRDT23                                   NC_("RID_SVXSTR_GRDT23", "Diagonal Violet")
+#define RID_SVXSTR_GRDT24                                   NC_("RID_SVXSTR_GRDT24", "From a Corner")
+#define RID_SVXSTR_GRDT25                                   NC_("RID_SVXSTR_GRDT25", "From a Corner, Blue")
+#define RID_SVXSTR_GRDT26                                   NC_("RID_SVXSTR_GRDT26", "From a Corner, Green")
+#define RID_SVXSTR_GRDT27                                   NC_("RID_SVXSTR_GRDT27", "From a Corner, Orange")
+#define RID_SVXSTR_GRDT28                                   NC_("RID_SVXSTR_GRDT28", "From a Corner, Red")
+#define RID_SVXSTR_GRDT29                                   NC_("RID_SVXSTR_GRDT29", "From a Corner, Turquoise")
+#define RID_SVXSTR_GRDT30                                   NC_("RID_SVXSTR_GRDT30", "From a Corner, Violet")
+#define RID_SVXSTR_GRDT31                                   NC_("RID_SVXSTR_GRDT31", "From the Middle")
+#define RID_SVXSTR_GRDT32                                   NC_("RID_SVXSTR_GRDT32", "From the Middle, Blue")
+#define RID_SVXSTR_GRDT33                                   NC_("RID_SVXSTR_GRDT33", "From the Middle, Green")
+#define RID_SVXSTR_GRDT34                                   NC_("RID_SVXSTR_GRDT34", "From the Middle, Orange")
+#define RID_SVXSTR_GRDT35                                   NC_("RID_SVXSTR_GRDT35", "From the Middle, Red")
+#define RID_SVXSTR_GRDT36                                   NC_("RID_SVXSTR_GRDT36", "From the Middle, Turquoise")
+#define RID_SVXSTR_GRDT37                                   NC_("RID_SVXSTR_GRDT37", "From the Middle, Violet")
+#define RID_SVXSTR_GRDT38                                   NC_("RID_SVXSTR_GRDT38", "Horizontal")
+#define RID_SVXSTR_GRDT39                                   NC_("RID_SVXSTR_GRDT39", "Horizontal Blue")
+#define RID_SVXSTR_GRDT40                                   NC_("RID_SVXSTR_GRDT40", "Horizontal Green")
+#define RID_SVXSTR_GRDT41                                   NC_("RID_SVXSTR_GRDT41", "Horizontal Orange")
+#define RID_SVXSTR_GRDT42                                   NC_("RID_SVXSTR_GRDT42", "Horizontal Red")
+#define RID_SVXSTR_GRDT43                                   NC_("RID_SVXSTR_GRDT43", "Horizontal Turquoise")
+#define RID_SVXSTR_GRDT44                                   NC_("RID_SVXSTR_GRDT44", "Horizontal Violet")
+#define RID_SVXSTR_GRDT45                                   NC_("RID_SVXSTR_GRDT45", "Radial")
+#define RID_SVXSTR_GRDT46                                   NC_("RID_SVXSTR_GRDT46", "Radial Blue")
+#define RID_SVXSTR_GRDT47                                   NC_("RID_SVXSTR_GRDT47", "Radial Green")
+#define RID_SVXSTR_GRDT48                                   NC_("RID_SVXSTR_GRDT48", "Radial Orange")
+#define RID_SVXSTR_GRDT49                                   NC_("RID_SVXSTR_GRDT49", "Radial Red")
+#define RID_SVXSTR_GRDT50                                   NC_("RID_SVXSTR_GRDT50", "Radial Turquoise")
+#define RID_SVXSTR_GRDT51                                   NC_("RID_SVXSTR_GRDT51", "Radial Violet")
+#define RID_SVXSTR_GRDT52                                   NC_("RID_SVXSTR_GRDT52", "Vertical")
+#define RID_SVXSTR_GRDT53                                   NC_("RID_SVXSTR_GRDT53", "Vertical Blue")
+#define RID_SVXSTR_GRDT54                                   NC_("RID_SVXSTR_GRDT54", "Vertical Green")
+#define RID_SVXSTR_GRDT55                                   NC_("RID_SVXSTR_GRDT55", "Vertical Orange")
+#define RID_SVXSTR_GRDT56                                   NC_("RID_SVXSTR_GRDT56", "Vertical Red")
+#define RID_SVXSTR_GRDT57                                   NC_("RID_SVXSTR_GRDT57", "Vertical Turquoise")
+#define RID_SVXSTR_GRDT58                                   NC_("RID_SVXSTR_GRDT58", "Vertical Violet")
+#define RID_SVXSTR_GRDT59                                   NC_("RID_SVXSTR_GRDT59", "Gray Gradient")
+#define RID_SVXSTR_GRDT60                                   NC_("RID_SVXSTR_GRDT60", "Yellow Gradient")
+#define RID_SVXSTR_GRDT61                                   NC_("RID_SVXSTR_GRDT61", "Orange Gradient")
+#define RID_SVXSTR_GRDT62                                   NC_("RID_SVXSTR_GRDT62", "Red Gradient")
+#define RID_SVXSTR_GRDT63                                   NC_("RID_SVXSTR_GRDT63", "Pink Gradient")
+#define RID_SVXSTR_GRDT64                                   NC_("RID_SVXSTR_GRDT64", "Sky")
+#define RID_SVXSTR_GRDT65                                   NC_("RID_SVXSTR_GRDT65", "Cyan Gradient")
+#define RID_SVXSTR_GRDT66                                   NC_("RID_SVXSTR_GRDT66", "Blue Gradient")
+#define RID_SVXSTR_GRDT67                                   NC_("RID_SVXSTR_GRDT67", "Purple Pipe")
+#define RID_SVXSTR_GRDT68                                   NC_("RID_SVXSTR_GRDT68", "Night")
+#define RID_SVXSTR_GRDT69                                   NC_("RID_SVXSTR_GRDT69", "Green Gradient")
+#define RID_SVXSTR_GRDT70                                   NC_("RID_SVXSTR_GRDT70", "Tango Green")
+#define RID_SVXSTR_GRDT71                                   NC_("RID_SVXSTR_GRDT71", "Subtle Tango Green")
+#define RID_SVXSTR_GRDT72                                   NC_("RID_SVXSTR_GRDT72", "Tango Purple")
+#define RID_SVXSTR_GRDT73                                   NC_("RID_SVXSTR_GRDT73", "Tango Red")
+#define RID_SVXSTR_GRDT74                                   NC_("RID_SVXSTR_GRDT74", "Tango Blue")
+#define RID_SVXSTR_GRDT75                                   NC_("RID_SVXSTR_GRDT75", "Tango Yellow")
+#define RID_SVXSTR_GRDT76                                   NC_("RID_SVXSTR_GRDT76", "Tango Orange")
+#define RID_SVXSTR_GRDT77                                   NC_("RID_SVXSTR_GRDT77", "Tango Gray")
+#define RID_SVXSTR_GRDT78                                   NC_("RID_SVXSTR_GRDT78", "Clay")
+#define RID_SVXSTR_GRDT79                                   NC_("RID_SVXSTR_GRDT79", "Olive Green")
+#define RID_SVXSTR_GRDT80                                   NC_("RID_SVXSTR_GRDT80", "Silver")
+#define RID_SVXSTR_GRDT81                                   NC_("RID_SVXSTR_GRDT81", "Sunburst")
+#define RID_SVXSTR_GRDT82                                   NC_("RID_SVXSTR_GRDT82", "Brownie")
+#define RID_SVXSTR_GRDT83                                   NC_("RID_SVXSTR_GRDT83", "Sunset")
+#define RID_SVXSTR_GRDT84                                   NC_("RID_SVXSTR_GRDT84", "Deep Green")
+#define RID_SVXSTR_GRDT85                                   NC_("RID_SVXSTR_GRDT85", "Deep Orange")
+#define RID_SVXSTR_GRDT86                                   NC_("RID_SVXSTR_GRDT86", "Deep Blue")
+#define RID_SVXSTR_GRDT87                                   NC_("RID_SVXSTR_GRDT87", "Purple Haze")
+#define RID_SVXSTR_HATCH0                                   NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide")
+#define RID_SVXSTR_HATCH1                                   NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees")
+#define RID_SVXSTR_HATCH2                                   NC_("RID_SVXSTR_HATCH2", "Black -45 Degrees")
+#define RID_SVXSTR_HATCH3                                   NC_("RID_SVXSTR_HATCH3", "Black 90 Degrees")
+#define RID_SVXSTR_HATCH4                                   NC_("RID_SVXSTR_HATCH4", "Red Crossed 45 Degrees")
+#define RID_SVXSTR_HATCH5                                   NC_("RID_SVXSTR_HATCH5", "Red Crossed 0 Degrees")
+#define RID_SVXSTR_HATCH6                                   NC_("RID_SVXSTR_HATCH6", "Blue Crossed 45 Degrees")
+#define RID_SVXSTR_HATCH7                                   NC_("RID_SVXSTR_HATCH7", "Blue Crossed 0 Degrees")
+#define RID_SVXSTR_HATCH8                                   NC_("RID_SVXSTR_HATCH8", "Blue Triple 90 Degrees")
+#define RID_SVXSTR_HATCH9                                   NC_("RID_SVXSTR_HATCH9", "Black 0 Degrees")
+#define RID_SVXSTR_HATCH10                                  NC_("RID_SVXSTR_HATCH10", "Hatching" )
+#define RID_SVXSTR_BMP0                                     NC_("RID_SVXSTR_BMP0", "Empty")
+#define RID_SVXSTR_BMP1                                     NC_("RID_SVXSTR_BMP1", "Sky")
+#define RID_SVXSTR_BMP2                                     NC_("RID_SVXSTR_BMP2", "Water")
+#define RID_SVXSTR_BMP3                                     NC_("RID_SVXSTR_BMP3", "Coarse grained")
+#define RID_SVXSTR_BMP4                                     NC_("RID_SVXSTR_BMP4", "Mercury")
+#define RID_SVXSTR_BMP5                                     NC_("RID_SVXSTR_BMP5", "Space")
+#define RID_SVXSTR_BMP6                                     NC_("RID_SVXSTR_BMP6", "Metal")
+#define RID_SVXSTR_BMP7                                     NC_("RID_SVXSTR_BMP7", "Droplets")
+#define RID_SVXSTR_BMP8                                     NC_("RID_SVXSTR_BMP8", "Marble")
+#define RID_SVXSTR_BMP9                                     NC_("RID_SVXSTR_BMP9", "Linen")
+#define RID_SVXSTR_BMP10                                    NC_("RID_SVXSTR_BMP10", "Stone")
+#define RID_SVXSTR_BMP11                                    NC_("RID_SVXSTR_BMP11", "Gravel")
+#define RID_SVXSTR_BMP12                                    NC_("RID_SVXSTR_BMP12", "Wall")
+#define RID_SVXSTR_BMP13                                    NC_("RID_SVXSTR_BMP13", "Brownstone")
+#define RID_SVXSTR_BMP14                                    NC_("RID_SVXSTR_BMP14", "Netting")
+#define RID_SVXSTR_BMP15                                    NC_("RID_SVXSTR_BMP15", "Leaves")
+#define RID_SVXSTR_BMP16                                    NC_("RID_SVXSTR_BMP16", "Artificial Turf")
+#define RID_SVXSTR_BMP17                                    NC_("RID_SVXSTR_BMP17", "Daisy")
+#define RID_SVXSTR_BMP18                                    NC_("RID_SVXSTR_BMP18", "Orange")
+#define RID_SVXSTR_BMP19                                    NC_("RID_SVXSTR_BMP19", "Fiery")
+#define RID_SVXSTR_BMP20                                    NC_("RID_SVXSTR_BMP20", "Roses")
+#define RID_SVXSTR_BMP21                                    NC_("RID_SVXSTR_BMP21", "Bitmap")
+#define RID_SVXSTR_DASH0                                    NC_("RID_SVXSTR_DASH0", "Ultrafine Dashed")
+#define RID_SVXSTR_DASH1                                    NC_("RID_SVXSTR_DASH1", "Fine Dashed")
+#define RID_SVXSTR_DASH2                                    NC_("RID_SVXSTR_DASH2", "2 Dots 3 Dashes")
+#define RID_SVXSTR_DASH3                                    NC_("RID_SVXSTR_DASH3", "Fine Dotted")
+#define RID_SVXSTR_DASH4                                    NC_("RID_SVXSTR_DASH4", "Line with Fine Dots")
+#define RID_SVXSTR_DASH5                                    NC_("RID_SVXSTR_DASH5", "Fine Dashed")
+#define RID_SVXSTR_DASH6                                    NC_("RID_SVXSTR_DASH6", "3 Dashes 3 Dots")
+#define RID_SVXSTR_DASH7                                    NC_("RID_SVXSTR_DASH7", "Ultrafine Dotted")
+#define RID_SVXSTR_DASH8                                    NC_("RID_SVXSTR_DASH8", "Line Style 9")
+#define RID_SVXSTR_DASH9                                    NC_("RID_SVXSTR_DASH9", "2 Dots 1 Dash")
+#define RID_SVXSTR_DASH10                                   NC_("RID_SVXSTR_DASH10", "Dashed")
+#define RID_SVXSTR_DASH11                                   NC_("RID_SVXSTR_DASH11", "Dashed")
+#define RID_SVXSTR_DASH12                                   NC_("RID_SVXSTR_DASH12", "Line Style")
+#define RID_SVXSTR_LEND0                                    NC_("RID_SVXSTR_LEND0", "Arrow concave")
+#define RID_SVXSTR_LEND1                                    NC_("RID_SVXSTR_LEND1", "Square 45")
+#define RID_SVXSTR_LEND2                                    NC_("RID_SVXSTR_LEND2", "Small arrow")
+#define RID_SVXSTR_LEND3                                    NC_("RID_SVXSTR_LEND3", "Dimension lines")
+#define RID_SVXSTR_LEND4                                    NC_("RID_SVXSTR_LEND4", "Double Arrow")
+#define RID_SVXSTR_LEND5                                    NC_("RID_SVXSTR_LEND5", "Rounded short arrow")
+#define RID_SVXSTR_LEND6                                    NC_("RID_SVXSTR_LEND6", "Symmetric arrow")
+#define RID_SVXSTR_LEND7                                    NC_("RID_SVXSTR_LEND7", "Line arrow")
+#define RID_SVXSTR_LEND8                                    NC_("RID_SVXSTR_LEND8", "Rounded large arrow")
+#define RID_SVXSTR_LEND9                                    NC_("RID_SVXSTR_LEND9", "Circle")
+#define RID_SVXSTR_LEND10                                   NC_("RID_SVXSTR_LEND10", "Square")
+#define RID_SVXSTR_LEND11                                   NC_("RID_SVXSTR_LEND11", "Arrow")
+#define RID_SVXSTR_LEND12                                   NC_("RID_SVXSTR_LEND12", "Short line arrow")
+#define RID_SVXSTR_LEND13                                   NC_("RID_SVXSTR_LEND13", "Triangle unfilled")
+#define RID_SVXSTR_LEND14                                   NC_("RID_SVXSTR_LEND14", "Diamond unfilled")
+#define RID_SVXSTR_LEND15                                   NC_("RID_SVXSTR_LEND15", "Diamond")
+#define RID_SVXSTR_LEND16                                   NC_("RID_SVXSTR_LEND16", "Circle unfilled")
+#define RID_SVXSTR_LEND17                                   NC_("RID_SVXSTR_LEND17", "Square 45 unfilled")
+#define RID_SVXSTR_LEND18                                   NC_("RID_SVXSTR_LEND18", "Square unfilled")
+#define RID_SVXSTR_LEND19                                   NC_("RID_SVXSTR_LEND19", "Half circle unfilled")
+#define RID_SVXSTR_LEND20                                   NC_("RID_SVXSTR_LEND20", "Arrowhead")
+#define RID_SVXSTR_TRASNGR0                                 NC_("RID_SVXSTR_TRASNGR0", "Transparency")
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_1                      NC_("RID_SVXSTR_COLOR_LIBRE_GREEN_1", "Green 1 (%PRODUCTNAME Main Color)")
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT                 NC_("RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT", "Green Accent")
+#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT                  NC_("RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT", "Blue Accent")
+#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT                NC_("RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT", "Orange Accent")
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE                       NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE", "Purple")
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT                NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT", "Purple Accent")
+#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT                NC_("RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT", "Yellow Accent")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_BUTTER                       NC_("RID_SVXSTR_COLOR_TANGO_BUTTER", "Tango: Butter")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_ORANGE                       NC_("RID_SVXSTR_COLOR_TANGO_ORANGE", "Tango: Orange")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE                    NC_("RID_SVXSTR_COLOR_TANGO_CHOCOLATE", "Tango: Chocolate")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_CHAMELEON                    NC_("RID_SVXSTR_COLOR_TANGO_CHAMELEON", "Tango: Chameleon")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE                     NC_("RID_SVXSTR_COLOR_TANGO_SKY_BLUE", "Tango: Sky Blue")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_PLUM                         NC_("RID_SVXSTR_COLOR_TANGO_PLUM", "Tango: Plum")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED                  NC_("RID_SVXSTR_COLOR_TANGO_SCARLET_RED", "Tango: Scarlet Red")
+// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM                    NC_("RID_SVXSTR_COLOR_TANGO_ALUMINIUM", "Tango: Aluminium")
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME                    NC_("RID_SVXSTR_GALLERYPROPS_GALTHEME", "Gallery Theme")
+#define RID_SVXSTR_GALLERY_THEMEITEMS                       NC_("RID_SVXSTR_GALLERY_THEMEITEMS", "Theme Items")
+#define RID_SVXSTR_GALLERY_PREVIEW                          NC_("RID_SVXSTR_GALLERY_PREVIEW", "Preview")
+#define RID_SVXSTR_SUCCESSRECOV                             NC_("RID_SVXSTR_SUCCESSRECOV", "Successfully recovered")
+#define RID_SVXSTR_ORIGDOCRECOV                             NC_("RID_SVXSTR_ORIGDOCRECOV", "Original document recovered")
+#define RID_SVXSTR_RECOVFAILED                              NC_("RID_SVXSTR_RECOVFAILED", "Recovery failed")
+#define RID_SVXSTR_RECOVINPROGR                             NC_("RID_SVXSTR_RECOVINPROGR", "Recovery in progress")
+#define RID_SVXSTR_NOTRECOVYET                              NC_("RID_SVXSTR_NOTRECOVYET", "Not recovered yet")
+#define RID_SVXSTR_RECOVERY_INPROGRESS                      NC_("RID_SVXSTR_RECOVERY_INPROGRESS", "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time.")
+#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR                NC_("RID_SVXSTR_RECOVERYONLY_FINISH_DESCR", "Recovery of your documents was finished. Click 'Finish' to see your documents.")
+#define RID_SVXSTR_RECOVERYONLY_FINISH                      NC_("RID_SVXSTR_RECOVERYONLY_FINISH", "~Finish")
+#define RID_SVXSTR_WIDTH_LAST_CUSTOM                        NC_("RID_SVXSTR_WIDTH_LAST_CUSTOM", "Last Custom Value")
+#define RID_SVXSTR_PT                                       NC_("RID_SVXSTR_PT", "pt")
+
+#define RID_SVXSTR_EXPORT_GRAPHIC_TITLE                     NC_("RID_SVXSTR_EXPORT_GRAPHIC_TITLE", "Image Export")
+#define RID_SVXSTR_SAVEAS_IMAGE                             NC_("RID_SVXSTR_SAVEAS_IMAGE", "Save as Image")
+
+// Strings for the Draw Dialog --------------------------------------------
+#define RID_SVX_3D_UNDO_EXCHANGE_PASTE                      NC_("RID_SVX_3D_UNDO_EXCHANGE_PASTE", "Insert object(s)")
+#define RID_SVX_3D_UNDO_ROTATE                              NC_("RID_SVX_3D_UNDO_ROTATE", "Rotate 3D object")
+#define RID_SVX_3D_UNDO_EXTRUDE                             NC_("RID_SVX_3D_UNDO_EXTRUDE", "Create extrusion object")
+#define RID_SVX_3D_UNDO_LATHE                               NC_("RID_SVX_3D_UNDO_LATHE", "Create rotation object")
+#define RID_SVX_3D_UNDO_BREAK_LATHE                         NC_("RID_SVX_3D_UNDO_BREAK_LATHE", "Split 3D object")
+
+// Language-Strings ------------------------------------------------------
+#define RID_SVXSTR_LANGUAGE_ALL                             NC_("RID_SVXSTR_LANGUAGE_ALL", "[All]")
+
+#define RID_SVXSTR_GALLERY_FILTER                           NC_("RID_SVXSTR_GALLERY_FILTER", "Graphics filter")
+#define RID_SVXSTR_GALLERY_NEWTHEME                         NC_("RID_SVXSTR_GALLERY_NEWTHEME", "New Theme")
+#define RID_SVXSTR_GALLERY_CREATETHEME                      NC_("RID_SVXSTR_GALLERY_CREATETHEME", "New Theme...")
+#define RID_SVXSTR_GALLERY_TITLE                            NC_("RID_SVXSTR_GALLERY_TITLE", "Title")
+#define RID_SVXSTR_GALLERY_ICONVIEW                         NC_("RID_SVXSTR_GALLERY_ICONVIEW", "Icon View")
+#define RID_SVXSTR_GALLERY_LISTVIEW                         NC_("RID_SVXSTR_GALLERY_LISTVIEW", "Detailed View")
+
+#define RID_GALLERYSTR_THEME_3D                             NC_("RID_GALLERYSTR_THEME_3D", "3D Effects")
+#define RID_GALLERYSTR_THEME_ANIMATIONS                     NC_("RID_GALLERYSTR_THEME_ANIMATIONS", "Animations")
+#define RID_GALLERYSTR_THEME_BULLETS                        NC_("RID_GALLERYSTR_THEME_BULLETS", "Bullets")
+#define RID_GALLERYSTR_THEME_OFFICE                         NC_("RID_GALLERYSTR_THEME_OFFICE", "Office")
+#define RID_GALLERYSTR_THEME_FLAGS                          NC_("RID_GALLERYSTR_THEME_FLAGS", "Flags")
+#define RID_GALLERYSTR_THEME_FLOWCHARTS                     NC_("RID_GALLERYSTR_THEME_FLOWCHARTS", "Flow Charts")
+#define RID_GALLERYSTR_THEME_EMOTICONS                      NC_("RID_GALLERYSTR_THEME_EMOTICONS", "Emoticons")
+#define RID_GALLERYSTR_THEME_PHOTOS                         NC_("RID_GALLERYSTR_THEME_PHOTOS", "Images")
+#define RID_GALLERYSTR_THEME_BACKGROUNDS                    NC_("RID_GALLERYSTR_THEME_BACKGROUNDS", "Backgrounds")
+#define RID_GALLERYSTR_THEME_HOMEPAGE                       NC_("RID_GALLERYSTR_THEME_HOMEPAGE", "Homepage")
+#define RID_GALLERYSTR_THEME_INTERACTION                    NC_("RID_GALLERYSTR_THEME_INTERACTION", "Interaction")
+#define RID_GALLERYSTR_THEME_MAPS                           NC_("RID_GALLERYSTR_THEME_MAPS", "Maps")
+#define RID_GALLERYSTR_THEME_PEOPLE                         NC_("RID_GALLERYSTR_THEME_PEOPLE", "People")
+#define RID_GALLERYSTR_THEME_SURFACES                       NC_("RID_GALLERYSTR_THEME_SURFACES", "Surfaces")
+#define RID_GALLERYSTR_THEME_COMPUTERS                      NC_("RID_GALLERYSTR_THEME_COMPUTERS", "Computers")
+#define RID_GALLERYSTR_THEME_DIAGRAMS                       NC_("RID_GALLERYSTR_THEME_DIAGRAMS", "Diagrams")
+#define RID_GALLERYSTR_THEME_ENVIRONMENT                    NC_("RID_GALLERYSTR_THEME_ENVIRONMENT", "Environment")
+#define RID_GALLERYSTR_THEME_FINANCE                        NC_("RID_GALLERYSTR_THEME_FINANCE", "Finance")
+#define RID_GALLERYSTR_THEME_TRANSPORT                      NC_("RID_GALLERYSTR_THEME_TRANSPORT", "Transport")
+#define RID_GALLERYSTR_THEME_TXTSHAPES                      NC_("RID_GALLERYSTR_THEME_TXTSHAPES", "Textshapes")
+#define RID_GALLERYSTR_THEME_SOUNDS                         NC_("RID_GALLERYSTR_THEME_SOUNDS", "Sounds")
+#define RID_GALLERYSTR_THEME_SYMBOLS                        NC_("RID_GALLERYSTR_THEME_SYMBOLS", "Symbols")
+#define RID_GALLERYSTR_THEME_MYTHEME                        NC_("RID_GALLERYSTR_THEME_MYTHEME", "My Theme")
+#define RID_GALLERYSTR_THEME_ARROWS                         NC_("RID_GALLERYSTR_THEME_ARROWS", "Arrows")
+#define RID_GALLERYSTR_THEME_BALLOONS                       NC_("RID_GALLERYSTR_THEME_BALLOONS", "Balloons")
+#define RID_GALLERYSTR_THEME_KEYBOARD                       NC_("RID_GALLERYSTR_THEME_KEYBOARD", "Keyboard")
+#define RID_GALLERYSTR_THEME_TIME                           NC_("RID_GALLERYSTR_THEME_TIME", "Time")
+#define RID_GALLERYSTR_THEME_PRESENTATION                   NC_("RID_GALLERYSTR_THEME_PRESENTATION", "Presentation")
+#define RID_GALLERYSTR_THEME_CALENDAR                       NC_("RID_GALLERYSTR_THEME_CALENDAR", "Calendar")
+#define RID_GALLERYSTR_THEME_NAVIGATION                     NC_("RID_GALLERYSTR_THEME_NAVIGATION", "Navigation")
+#define RID_GALLERYSTR_THEME_COMMUNICATION                  NC_("RID_GALLERYSTR_THEME_COMMUNICATION", "Communication")
+#define RID_GALLERYSTR_THEME_FINANCES                       NC_("RID_GALLERYSTR_THEME_FINANCES", "Finances")
+#define RID_GALLERYSTR_THEME_COMPUTER                       NC_("RID_GALLERYSTR_THEME_COMPUTER", "Computers")
+#define RID_GALLERYSTR_THEME_CLIMA                          NC_("RID_GALLERYSTR_THEME_CLIMA", "Climate")
+#define RID_GALLERYSTR_THEME_EDUCATION                      NC_("RID_GALLERYSTR_THEME_EDUCATION", "School & University")
+#define RID_GALLERYSTR_THEME_TROUBLE                        NC_("RID_GALLERYSTR_THEME_TROUBLE", "Problem Solving")
+#define RID_GALLERYSTR_THEME_SCREENBEANS                    NC_("RID_GALLERYSTR_THEME_SCREENBEANS", "Screen Beans")
+
+#define RID_SVXSTR_ALIGN_LEFT                               NC_("RID_SVXSTR_ALIGN_LEFT", "~Left Align")
+#define RID_SVXSTR_ALIGN_CENTER                             NC_("RID_SVXSTR_ALIGN_CENTER", "~Center")
+#define RID_SVXSTR_ALIGN_RIGHT                              NC_("RID_SVXSTR_ALIGN_RIGHT", "~Right Align")
+#define RID_SVXSTR_ALIGN_WORD                               NC_("RID_SVXSTR_ALIGN_WORD", "~Word Justify")
+#define RID_SVXSTR_ALIGN_STRETCH                            NC_("RID_SVXSTR_ALIGN_STRETCH", "S~tretch Justify")
+#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT                 NC_("RID_SVXSTR_CHARS_SPACING_VERY_TIGHT", "~Very Tight")
+#define RID_SVXSTR_CHARS_SPACING_TIGHT                      NC_("RID_SVXSTR_CHARS_SPACING_TIGHT", "~Tight")
+#define RID_SVXSTR_CHARS_SPACING_NORMAL                     NC_("RID_SVXSTR_CHARS_SPACING_NORMAL", "~Normal")
+#define RID_SVXSTR_CHARS_SPACING_LOOSE                      NC_("RID_SVXSTR_CHARS_SPACING_LOOSE", "~Loose")
+#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE                 NC_("RID_SVXSTR_CHARS_SPACING_VERY_LOOSE", "Very ~Loose")
+#define RID_SVXSTR_CHARS_SPACING_CUSTOM                     NC_("RID_SVXSTR_CHARS_SPACING_CUSTOM", "~Custom...")
+#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS                 NC_("RID_SVXSTR_CHARS_SPACING_KERN_PAIRS", "~Kern Character Pairs")
+
+#define RID_SVXSTR_QRY_PRINT_TITLE                          NC_("RID_SVXSTR_QRY_PRINT_TITLE", "Printing selection")
+#define RID_SVXSTR_QRY_PRINT_MSG                            NC_("RID_SVXSTR_QRY_PRINT_MSG", "Do you want to print the selection or the entire document?")
+#define RID_SVXSTR_QRY_PRINT_ALL                            NC_("RID_SVXSTR_QRY_PRINT_ALL", "~All")
+#define RID_SVXSTR_QRY_PRINT_SELECTION                      NC_("RID_SVXSTR_QRY_PRINT_SELECTION", "~Selection")
+
+#define RID_SVXSTR_PERSPECTIVE                              NC_("RID_SVXSTR_PERSPECTIVE", "~Perspective")
+#define RID_SVXSTR_PARALLEL                                 NC_("RID_SVXSTR_PARALLEL", "P~arallel")
+#define RID_SVXSTR_DIRECTION_NW                             NC_("RID_SVXSTR_DIRECTION_NW", "Extrusion North-West")
+#define RID_SVXSTR_DIRECTION_N                              NC_("RID_SVXSTR_DIRECTION_N", "Extrusion North")
+#define RID_SVXSTR_DIRECTION_NE                             NC_("RID_SVXSTR_DIRECTION_NE", "Extrusion North-East")
+#define RID_SVXSTR_DIRECTION_W                              NC_("RID_SVXSTR_DIRECTION_W", "Extrusion West")
+#define RID_SVXSTR_DIRECTION_NONE                           NC_("RID_SVXSTR_DIRECTION_NONE", "Extrusion Backwards")
+#define RID_SVXSTR_DIRECTION_E                              NC_("RID_SVXSTR_DIRECTION_E", "Extrusion East")
+#define RID_SVXSTR_DIRECTION_SW                             NC_("RID_SVXSTR_DIRECTION_SW", "Extrusion South-West")
+#define RID_SVXSTR_DIRECTION_S                              NC_("RID_SVXSTR_DIRECTION_S", "Extrusion South")
+#define RID_SVXSTR_DIRECTION_SE                             NC_("RID_SVXSTR_DIRECTION_SE", "Extrusion South-East")
+#define RID_SVXSTR_BRIGHT                                   NC_("RID_SVXSTR_BRIGHT", "~Bright")
+#define RID_SVXSTR_NORMAL                                   NC_("RID_SVXSTR_NORMAL", "~Normal")
+#define RID_SVXSTR_DIM                                      NC_("RID_SVXSTR_DIM", "~Dim")
+#define RID_SVXSTR_WIREFRAME                                NC_("RID_SVXSTR_WIREFRAME", "~Wire Frame")
+#define RID_SVXSTR_MATTE                                    NC_("RID_SVXSTR_MATTE", "~Matt")
+#define RID_SVXSTR_PLASTIC                                  NC_("RID_SVXSTR_PLASTIC", "~Plastic")
+#define RID_SVXSTR_METAL                                    NC_("RID_SVXSTR_METAL", "Me~tal")
+#define RID_SVXSTR_DEPTH_0                                  NC_("RID_SVXSTR_DEPTH_0", "~0 cm")
+#define RID_SVXSTR_DEPTH_1                                  NC_("RID_SVXSTR_DEPTH_1", "~1 cm")
+#define RID_SVXSTR_DEPTH_2                                  NC_("RID_SVXSTR_DEPTH_2", "~2.5 cm")
+#define RID_SVXSTR_DEPTH_3                                  NC_("RID_SVXSTR_DEPTH_3", "~5 cm")
+#define RID_SVXSTR_DEPTH_4                                  NC_("RID_SVXSTR_DEPTH_4", "10 ~cm")
+#define RID_SVXSTR_DEPTH_0_INCH                             NC_("RID_SVXSTR_DEPTH_0_INCH", "0 inch")
+#define RID_SVXSTR_DEPTH_1_INCH                             NC_("RID_SVXSTR_DEPTH_1_INCH", "0.~5 inch")
+#define RID_SVXSTR_DEPTH_2_INCH                             NC_("RID_SVXSTR_DEPTH_2_INCH", "~1 inch")
+#define RID_SVXSTR_DEPTH_3_INCH                             NC_("RID_SVXSTR_DEPTH_3_INCH", "~2 inch")
+#define RID_SVXSTR_DEPTH_4_INCH                             NC_("RID_SVXSTR_DEPTH_4_INCH", "~4 inch")
+#define RID_SVXSTR_CUSTOM                                   NC_("RID_SVXSTR_CUSTOM", "~Custom...")
+#define RID_SVXSTR_INFINITY                                 NC_("RID_SVXSTR_INFINITY", "~Infinity")
+
+#define RID_SVXSTR_NOFILL                                   NC_("RID_SVXSTR_NOFILL", "No Fill")
+#define RID_SVXSTR_TRANSPARENT                              NC_("RID_SVXSTR_TRANSPARENT", "Transparent")
+#define RID_SVXSTR_DEFAULT                                  NC_("RID_SVXSTR_DEFAULT", "Default")
+#define RID_SVXSTR_FRAME                                    NC_("RID_SVXSTR_FRAME", "Borders")
+#define RID_SVXSTR_FRAME_STYLE                              NC_("RID_SVXSTR_FRAME_STYLE", "Border Style")
+#define RID_SVXSTR_MORENUMBERING                            NC_("RID_SVXSTR_MORENUMBERING", "More Numbering...")
+#define RID_SVXSTR_MOREBULLETS                              NC_("RID_SVXSTR_MOREBULLETS", "More Bullets...")
+#define RID_SVXSTR_BY_AUTHOR                                NC_("RID_SVXSTR_BY_AUTHOR", "By author")
+#define RID_SVXSTR_PAGES                                    NC_("RID_SVXSTR_PAGES", "Pages")
+#define RID_SVXSTR_CLEARFORM                                NC_("RID_SVXSTR_CLEARFORM", "Clear formatting")
+#define RID_SVXSTR_MORE_STYLES                              NC_("RID_SVXSTR_MORE_STYLES", "More Styles...")
+#define RID_SVXSTR_MORE                                     NC_("RID_SVXSTR_MORE", "More Options...")
+// This is duplicated in GenericCommands.xcu in officecfg.
+#define RID_SVXSTR_CHARFONTNAME                             NC_("RID_SVXSTR_CHARFONTNAME", "Font Name")
+#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE                NC_("RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE", "Font Name. The current font is not available and will be substituted.")
+#define RID_SVXSTR_CUSTOM_PAL                               NC_("RID_SVXSTR_CUSTOM_PAL", "custom")
+#define RID_SVXSTR_DOC_COLORS                               NC_("RID_SVXSTR_DOC_COLORS", "Document colors")
+#define RID_SVXSTR_DOC_COLOR_PREFIX                         NC_("RID_SVXSTR_DOC_COLOR_PREFIX", "Document Color")
+
+#define RID_SVX_EXTRUSION_BAR                               NC_("RID_SVX_EXTRUSION_BAR", "Extrusion")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF              NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF", "Apply Extrusion On/Off")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN         NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN", "Tilt Down")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP           NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP", "Tilt Up")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT         NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT", "Tilt Left")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT        NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT", "Tilt Right")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH               NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH", "Change Extrusion Depth")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION         NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION", "Change Orientation")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION          NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION", "Change Projection Type")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING            NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING", "Change Lighting")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS          NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS", "Change Brightness")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE             NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE", "Change Extrusion Surface")
+#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR               NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR", "Change Extrusion Color")
+
+#define RID_SVXFLOAT3D_FAVORITE                             NC_("RID_SVXFLOAT3D_FAVORITE", "Favorite")
+#define RID_SVXFLOAT3D_FIX_R                                NC_("RID_SVXFLOAT3D_FIX_R", "R:")
+#define RID_SVXFLOAT3D_FIX_G                                NC_("RID_SVXFLOAT3D_FIX_G", "G:")
+#define RID_SVXFLOAT3D_FIX_B                                NC_("RID_SVXFLOAT3D_FIX_B", "B:")
+
+#define RID_SVX_FONTWORK_BAR                                NC_("RID_SVX_FONTWORK_BAR", "Fontwork")
+#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE                NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE", "Apply Fontwork Shape")
+#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT   NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT", "Apply Fontwork Same Letter Heights")
+#define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT            NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT", "Apply Fontwork Alignment")
+#define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING    NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING", "Apply Fontwork Character Spacing")
+
+#define RID_SVXSTR_A11Y_3D_MATERIAL_COLOR                   NC_("RID_SVXSTR_A11Y_3D_MATERIAL_COLOR", "3D material color")
+#define RID_SVXSTR_A11Y_FILLSTYLE_NONE                      NC_("RID_SVXSTR_A11Y_FILLSTYLE_NONE", "None")
+#define RID_SVXSTR_A11Y_FILLSTYLE_SOLID                     NC_("RID_SVXSTR_A11Y_FILLSTYLE_SOLID", "Solid")
+#define RID_SVXSTR_A11Y_FILLSTYLE_HATCH                     NC_("RID_SVXSTR_A11Y_FILLSTYLE_HATCH", "With hatching")
+#define RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT                  NC_("RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT", "Gradient")
+#define RID_SVXSTR_A11Y_FILLSTYLE_BITMAP                    NC_("RID_SVXSTR_A11Y_FILLSTYLE_BITMAP", "Bitmap")
+#define RID_SVXSTR_A11Y_WITH                                NC_("RID_SVXSTR_A11Y_WITH", "with")
+#define RID_SVXSTR_A11Y_STYLE                               NC_("RID_SVXSTR_A11Y_STYLE", "Style")
+#define RID_SVXSTR_A11Y_AND                                 NC_("RID_SVXSTR_A11Y_AND", "and")
+// SvxRectCtl
+#define RID_SVXSTR_RECTCTL_ACC_CORN_NAME                    NC_("RID_SVXSTR_RECTCTL_ACC_CORN_NAME", "Corner control")
+#define RID_SVXSTR_RECTCTL_ACC_CORN_DESCR                   NC_("RID_SVXSTR_RECTCTL_ACC_CORN_DESCR", "Selection of a corner point.")
+#define RID_SVXSTR_RECTCTL_ACC_ANGL_NAME                    NC_("RID_SVXSTR_RECTCTL_ACC_ANGL_NAME", "Angle control")
+#define RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR                   NC_("RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR", "Selection of a major angle.")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_LT                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LT", "Top left")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_MT                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MT", "Top middle")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_RT                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RT", "Top right")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_LM                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LM", "Left center")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_MM                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MM", "Center")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_RM                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RM", "Right center")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_LB                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LB", "Bottom left")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_MB                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MB", "Bottom middle")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_RB                      NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RB", "Bottom right")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A000                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A000", "0 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A045                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A045", "45 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A090                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A090", "90 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A135                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A135", "135 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A180                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A180", "180 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A225                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A225", "225 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A270                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A270", "270 degrees")
+#define RID_SVXSTR_RECTCTL_ACC_CHLD_A315                    NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A315", "315 degrees")
+// SvxGraphCtrlAccessibleContext
+#define RID_SVXSTR_GRAPHCTRL_ACC_NAME                       NC_("RID_SVXSTR_GRAPHCTRL_ACC_NAME", "Contour control")
+#define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION                NC_("RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION", "This is where you can edit the contour.")
+#define RID_SVXSTR_CHARACTER_SELECTION                      NC_("RID_SVXSTR_CHARACTER_SELECTION", "Special character selection")
+#define RID_SVXSTR_CHAR_SEL_DESC                            NC_("RID_SVXSTR_CHAR_SEL_DESC", "Select special characters in this area.")
+// The space behind is a must.
+#define RID_SVXSTR_CHARACTER_CODE                           NC_("RID_SVXSTR_CHARACTER_CODE", "Character code ")
+
+#define RID_ERR_FIELDREQUIRED                               NC_("RID_ERR_FIELDREQUIRED", "Input required in field '#'. Please enter a value.")
+#define RID_STR_FORMS                                       NC_("RID_STR_FORMS", "Forms")
+#define RID_STR_NO_PROPERTIES                               NC_("RID_STR_NO_PROPERTIES", "No control selected")
+#define RID_STR_PROPERTIES_CONTROL                          NC_("RID_STR_PROPERTIES_CONTROL", "Properties: ")
+#define RID_STR_PROPERTIES_FORM                             NC_("RID_STR_PROPERTIES_FORM", "Form Properties")
+#define RID_STR_FMEXPLORER                                  NC_("RID_STR_FMEXPLORER", "Form Navigator")
+#define RID_STR_FORM                                        NC_("RID_STR_FORM", "Form")
+#define RID_STR_STDFORMNAME                                 NC_("RID_STR_STDFORMNAME", "Form")
+#define RID_STR_PROPTITLE_HIDDEN                            NC_("RID_STR_PROPTITLE_HIDDEN", "Hidden Control")
+#define RID_STR_CONTROL                                     NC_("RID_STR_CONTROL", "Control")
+#define RID_STR_REC_TEXT                                    NC_("RID_STR_REC_TEXT", "Record")
+#define RID_STR_REC_FROM_TEXT                               NC_("RID_STR_REC_FROM_TEXT", "of")
+#define RID_STR_FIELDSELECTION                              NC_("RID_STR_FIELDSELECTION", "Add field:")
+#define RID_STR_WRITEERROR                                  NC_("RID_STR_WRITEERROR", "Error writing data to database")
+#define RID_STR_SYNTAXERROR                                 NC_("RID_STR_SYNTAXERROR", "Syntax error in query expression")
+#define RID_STR_DELETECONFIRM_RECORD                        NC_("RID_STR_DELETECONFIRM_RECORD", "You intend to delete 1 record.")
+#define RID_STR_DELETECONFIRM_RECORDS                       NC_("RID_STR_DELETECONFIRM_RECORDS", "# records will be deleted.")
+#define RID_STR_DELETECONFIRM                               NC_("RID_STR_DELETECONFIRM", "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?")
+#define RID_STR_NAVIGATIONBAR                               NC_("RID_STR_NAVIGATIONBAR", "Navigation bar")
+#define RID_STR_COLUMN                                      NC_("RID_STR_COLUMN", "Col")
+#define RID_STR_UNDO_PROPERTY                               NC_("RID_STR_UNDO_PROPERTY", "Set property '#'")
+#define RID_STR_UNDO_CONTAINER_INSERT                       NC_("RID_STR_UNDO_CONTAINER_INSERT", "Insert in container")
+#define RID_STR_UNDO_CONTAINER_REMOVE                       NC_("RID_STR_UNDO_CONTAINER_REMOVE", "Delete #")
+#define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE              NC_("RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE", "Delete # objects")
+#define RID_STR_UNDO_CONTAINER_REPLACE                      NC_("RID_STR_UNDO_CONTAINER_REPLACE", "Replace a container element")
+#define RID_STR_UNDO_MODEL_REPLACE                          NC_("RID_STR_UNDO_MODEL_REPLACE", "Replace Control")
+#define RID_STR_PROPTITLE_PUSHBUTTON                        NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Push 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_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 RID_STR_PROPTITLE_SCROLLBAR                         NC_("RID_STR_PROPTITLE_SCROLLBAR", "Scrollbar")
+#define RID_STR_PROPTITLE_SPINBUTTON                        NC_("RID_STR_PROPTITLE_SPINBUTTON", "Spin Button")
+#define RID_STR_PROPTITLE_NAVBAR                            NC_("RID_STR_PROPTITLE_NAVBAR", "Navigation Bar")
+#define RID_STR_PROPTITLE_MULTISELECT                       NC_("RID_STR_PROPTITLE_MULTISELECT", "Multiselection")
+#define RID_STR_NODATACONTROLS                              NC_("RID_STR_NODATACONTROLS", "No data-related controls in the current form!")
+#define RID_STR_POSTFIX_DATE                                NC_("RID_STR_POSTFIX_DATE", " (Date)")
+#define RID_STR_POSTFIX_TIME                                NC_("RID_STR_POSTFIX_TIME", " (Time)")
+#define RID_STR_FILTER_NAVIGATOR                            NC_("RID_STR_FILTER_NAVIGATOR", "Filter navigator")
+#define RID_STR_FILTER_FILTER_FOR                           NC_("RID_STR_FILTER_FILTER_FOR", "Filter for")
+#define RID_STR_FILTER_FILTER_OR                            NC_("RID_STR_FILTER_FILTER_OR", "Or")
+#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY              NC_("RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY", "Valid bound controls which can be used in the table view do not exist in the current form.")
+#define RID_STR_AUTOFIELD                                   NC_("RID_STR_AUTOFIELD", "<AutoField>")
+#define RID_STR_SVT_SQL_SYNTAX_ERROR                        NC_("RID_STR_SVT_SQL_SYNTAX_ERROR", "Syntax error in SQL statement")
+#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE                NC_("RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE", "The value #1 cannot be used with LIKE.")
+#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE                NC_("RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE", "LIKE cannot be used with this field.")
+#define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID          NC_("RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID", "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY.")
+#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID                 NC_("RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID", "The field cannot be compared with an integer.")
+#define RID_STR_SVT_SQL_SYNTAX_TABLE                        NC_("RID_STR_SVT_SQL_SYNTAX_TABLE", "The database does not contain a table named \"#\".")
+#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY               NC_("RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY", "The database does contain neither a table nor a query named \"#\".")
+#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS                 NC_("RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS", "The database already contains a table or view with name \"#\".")
+#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS                 NC_("RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS", "The database already contains a query with name \"#\".")
+#define RID_STR_SVT_SQL_SYNTAX_COLUMN                       NC_("RID_STR_SVT_SQL_SYNTAX_COLUMN", "The column \"#1\" is unknown in the table \"#2\".")
+#define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID                NC_("RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID", "The field cannot be compared with a floating point number.")
+#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE              NC_("RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE", "The entered criterion cannot be compared with this field.")
+#define RID_STR_DATANAVIGATOR                               NC_("RID_STR_DATANAVIGATOR", "Data Navigator")
+#define RID_STR_READONLY_VIEW                               NC_("RID_STR_READONLY_VIEW", " (read-only)")
+#define RID_STR_ALREADYEXISTOVERWRITE                       NC_("RID_STR_ALREADYEXISTOVERWRITE", "The file already exists. Overwrite?")
+#define RID_STR_OBJECT_LABEL                                NC_("RID_STR_OBJECT_LABEL", "#object# label")
+
+#define RID_STR_QRY_REMOVE_MODEL                            NC_("RID_STR_QRY_REMOVE_MODEL", "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?")
+#define RID_STR_QRY_REMOVE_INSTANCE                         NC_("RID_STR_QRY_REMOVE_INSTANCE", "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\nDo you really want to delete this instance?")
+#define RID_STR_QRY_REMOVE_ELEMENT                          NC_("RID_STR_QRY_REMOVE_ELEMENT", "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\nDo you really want to delete this element?")
+#define RID_STR_QRY_REMOVE_ATTRIBUTE                        NC_("RID_STR_QRY_REMOVE_ATTRIBUTE", "Do you really want to delete the attribute '$ATTRIBUTENAME'?")
+#define RID_STR_QRY_REMOVE_SUBMISSION                       NC_("RID_STR_QRY_REMOVE_SUBMISSION", "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n\nDo you really want to delete this submission?")
+#define RID_STR_QRY_REMOVE_BINDING                          NC_("RID_STR_QRY_REMOVE_BINDING", "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n\nDo you really want to delete this binding?")
+#define RID_STR_INVALID_XMLNAME                             NC_("RID_STR_INVALID_XMLNAME", "The name '%1' is not valid in XML. Please enter a different name.")
+#define RID_STR_INVALID_XMLPREFIX                           NC_("RID_STR_INVALID_XMLPREFIX", "The prefix '%1' is not valid in XML. Please enter a different prefix.")
+#define RID_STR_DOUBLE_MODELNAME                            NC_("RID_STR_DOUBLE_MODELNAME", "The name '%1' already exists. Please enter a new name.")
+#define RID_STR_EMPTY_SUBMISSIONNAME                        NC_("RID_STR_EMPTY_SUBMISSIONNAME", "The submission must have a name.")
+#define RID_STR_METHOD_POST                                 NC_("RID_STR_METHOD_POST", "Post")
+#define RID_STR_METHOD_PUT                                  NC_("RID_STR_METHOD_PUT", "Put")
+#define RID_STR_METHOD_GET                                  NC_("RID_STR_METHOD_GET", "Get")
+#define RID_STR_REPLACE_NONE                                NC_("RID_STR_REPLACE_NONE", "None")
+#define RID_STR_REPLACE_INST                                NC_("RID_STR_REPLACE_INST", "Instance")
+#define RID_STR_REPLACE_DOC                                 NC_("RID_STR_REPLACE_DOC", "Document")
+#define RID_STR_DATANAV_SUBM_BIND                           NC_("RID_STR_DATANAV_SUBM_BIND", "Binding: ")
+#define RID_STR_DATANAV_SUBM_REF                            NC_("RID_STR_DATANAV_SUBM_REF", "Reference: ")
+#define RID_STR_DATANAV_SUBM_ACTION                         NC_("RID_STR_DATANAV_SUBM_ACTION", "Action: ")
+#define RID_STR_DATANAV_SUBM_METHOD                         NC_("RID_STR_DATANAV_SUBM_METHOD", "Method: ")
+#define RID_STR_DATANAV_SUBM_REPLACE                        NC_("RID_STR_DATANAV_SUBM_REPLACE", "Replace: ")
+#define RID_STR_DATANAV_ADD_ELEMENT                         NC_("RID_STR_DATANAV_ADD_ELEMENT", "Add Element")
+#define RID_STR_DATANAV_EDIT_ELEMENT                        NC_("RID_STR_DATANAV_EDIT_ELEMENT", "Edit Element")
+#define RID_STR_DATANAV_REMOVE_ELEMENT                      NC_("RID_STR_DATANAV_REMOVE_ELEMENT", "Delete Element")
+#define RID_STR_DATANAV_ADD_ATTRIBUTE                       NC_("RID_STR_DATANAV_ADD_ATTRIBUTE", "Add Attribute")
+#define RID_STR_DATANAV_EDIT_ATTRIBUTE                      NC_("RID_STR_DATANAV_EDIT_ATTRIBUTE", "Edit Attribute")
+#define RID_STR_DATANAV_REMOVE_ATTRIBUTE                    NC_("RID_STR_DATANAV_REMOVE_ATTRIBUTE", "Delete Attribute")
+#define RID_STR_DATANAV_ADD_BINDING                         NC_("RID_STR_DATANAV_ADD_BINDING", "Add Binding")
+#define RID_STR_DATANAV_EDIT_BINDING                        NC_("RID_STR_DATANAV_EDIT_BINDING", "Edit Binding")
+#define RID_STR_DATANAV_REMOVE_BINDING                      NC_("RID_STR_DATANAV_REMOVE_BINDING", "Delete Binding")
+#define RID_STR_DATANAV_ADD_SUBMISSION                      NC_("RID_STR_DATANAV_ADD_SUBMISSION", "Add Submission")
+#define RID_STR_DATANAV_EDIT_SUBMISSION                     NC_("RID_STR_DATANAV_EDIT_SUBMISSION", "Edit Submission")
+#define RID_STR_DATANAV_REMOVE_SUBMISSION                   NC_("RID_STR_DATANAV_REMOVE_SUBMISSION", "Delete Submission")
+#define RID_STR_ELEMENT                                     NC_("RID_STR_ELEMENT", "Element")
+#define RID_STR_ATTRIBUTE                                   NC_("RID_STR_ATTRIBUTE", "Attribute")
+#define RID_STR_BINDING                                     NC_("RID_STR_BINDING", "Binding")
+#define RID_STR_BINDING_EXPR                                NC_("RID_STR_BINDING_EXPR", "Binding expression")
+
+#define RID_SVXSTR_QUERY_EXIT_RECOVERY                      NC_("RID_SVXSTR_QUERY_EXIT_RECOVERY", "Are you sure you want to discard the %PRODUCTNAME document recovery data?")
+
+#define RID_SVXSTR_RULER_TAB_LEFT                           NC_("RID_SVXSTR_RULER_TAB_LEFT", "Left")
+#define RID_SVXSTR_RULER_TAB_RIGHT                          NC_("RID_SVXSTR_RULER_TAB_RIGHT", "Right")
+#define RID_SVXSTR_RULER_TAB_CENTER                         NC_("RID_SVXSTR_RULER_TAB_CENTER", "Center")
+#define RID_SVXSTR_RULER_TAB_DECIMAL                        NC_("RID_SVXSTR_RULER_TAB_DECIMAL", "Decimal")
+
+#define RID_SVXSTR_INSERT_HELPTEXT                          NC_("RID_SVXSTR_INSERT_HELPTEXT", "Insert mode. Click to change to overwrite mode.")
+#define RID_SVXSTR_OVERWRITE_HELPTEXT                       NC_("RID_SVXSTR_OVERWRITE_HELPTEXT", "Overwrite mode. Click to change to insert mode.")
+// To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'.
+#define RID_SVXSTR_OVERWRITE_TEXT                           NC_("RID_SVXSTR_OVERWRITE_TEXT", "Overwrite")
+#define RID_SVXSTR_XMLSEC_SIG_OK                            NC_("RID_SVXSTR_XMLSEC_SIG_OK", "Digital Signature: The document signature is OK.")
+#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY                  NC_("RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY", "Digital Signature: The document signature is OK, but the certificates could not be validated.")
+#define RID_SVXSTR_XMLSEC_SIG_NOT_OK                        NC_("RID_SVXSTR_XMLSEC_SIG_NOT_OK", "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document.")
+#define RID_SVXSTR_XMLSEC_NO_SIG                            NC_("RID_SVXSTR_XMLSEC_NO_SIG", "Digital Signature: The document is not signed.")
+#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG           NC_("RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG", "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed.")
+#define RID_SVXSTR_DOC_MODIFIED_YES                         NC_("RID_SVXSTR_DOC_MODIFIED_YES", "The document has been modified. Click to save the document.")
+#define RID_SVXSTR_DOC_MODIFIED_NO                          NC_("RID_SVXSTR_DOC_MODIFIED_NO", "The document has not been modified since the last save.")
+#define RID_SVXSTR_DOC_LOAD                                 NC_("RID_SVXSTR_DOC_LOAD", "Loading document...")
+#define RID_SVXSTR_FIT_SLIDE                                NC_("RID_SVXSTR_FIT_SLIDE", "Fit slide to current window.")
+#define RID_SVXSTR_WARN_MISSING_SMARTART                    NC_("RID_SVXSTR_WARN_MISSING_SMARTART", "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue.")
+#define RID_SVXSTR_ZOOMTOOL_HINT                            NC_("RID_SVXSTR_ZOOMTOOL_HINT", "Zoom level. Right-click to change zoom level or click to open Zoom dialog.")
+#define RID_SVXSTR_ZOOM_IN                                  NC_("RID_SVXSTR_ZOOM_IN", "Zoom In")
+#define RID_SVXSTR_ZOOM_OUT                                 NC_("RID_SVXSTR_ZOOM_OUT", "Zoom Out")
+#define RID_SVXSTR_ZOOM_25                                  NC_("RID_SVXSTR_ZOOM_25", "25%")
+#define RID_SVXSTR_ZOOM_50                                  NC_("RID_SVXSTR_ZOOM_50", "50%")
+#define RID_SVXSTR_ZOOM_75                                  NC_("RID_SVXSTR_ZOOM_75", "75%")
+#define RID_SVXSTR_ZOOM_100                                 NC_("RID_SVXSTR_ZOOM_100", "100%")
+#define RID_SVXSTR_ZOOM_150                                 NC_("RID_SVXSTR_ZOOM_150", "150%")
+#define RID_SVXSTR_ZOOM_200                                 NC_("RID_SVXSTR_ZOOM_200", "200%")
+#define RID_SVXSTR_ZOOM_WHOLE_PAGE                          NC_("RID_SVXSTR_ZOOM_WHOLE_PAGE", "Entire Page")
+#define RID_SVXSTR_ZOOM_PAGE_WIDTH                          NC_("RID_SVXSTR_ZOOM_PAGE_WIDTH", "Page Width")
+#define RID_SVXSTR_ZOOM_OPTIMAL_VIEW                        NC_("RID_SVXSTR_ZOOM_OPTIMAL_VIEW", "Optimal View")
+#define RID_SIDEBAR_EMPTY_PANEL_TEXT                        NC_("RID_SIDEBAR_EMPTY_PANEL_TEXT", "Properties for the task that you are performing are not available for the current selection")
+
+#define RID_SVXSTR_SEARCH_STYLES                            NC_("RID_SVXSTR_SEARCH_STYLES", "Including Styles")
+#define RID_SVXSTR_WRITER_STYLES                            NC_("RID_SVXSTR_WRITER_STYLES", "Paragraph St~yles")
+#define RID_SVXSTR_CALC_STYLES                              NC_("RID_SVXSTR_CALC_STYLES", "Cell St~yles")
+#define RID_SVXSTR_SEARCH                                   NC_("RID_SVXSTR_SEARCH", "(Search)")
+#define RID_SVXSTR_REPLACE                                  NC_("RID_SVXSTR_REPLACE", "(Replace)")
+#define RID_SVXSTR_SEARCH_END                               NC_("RID_SVXSTR_SEARCH_END", "Reached the end of the document")
+#define RID_SVXSTR_SEARCH_END_SHEET                         NC_("RID_SVXSTR_SEARCH_END_SHEET", "Reached the end of the sheet")
+#define RID_SVXSTR_SEARCH_NOT_FOUND                         NC_("RID_SVXSTR_SEARCH_NOT_FOUND", "Search key not found")
+#define RID_SVXSTR_SEARCH_START                             NC_("RID_SVXSTR_SEARCH_START", "Reached the beginning of the document")
+
+#define RID_SVXDLG_BMPMASK_STR_PALETTE                      NC_("RID_SVXDLG_BMPMASK_STR_PALETTE", "Color Palette")
+
+#define RID_SVXSTR_ERR_OLD_PASSWD                           NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password")
+#define RID_SVXSTR_ERR_REPEAT_PASSWD                        NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match")
+
+#define RID_SVXSTR_BULLET_DESCRIPTION_0                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_1                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_2                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_3                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_4                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled out")
+#define RID_SVXSTR_BULLET_DESCRIPTION_5                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_6                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Check mark bullets")
+#define RID_SVXSTR_BULLET_DESCRIPTION_7                     NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Tick mark bullets")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_2", "Number (1) (2) (3)")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_3", "Uppercase Roman number I. II. III.")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_4", "Uppercase letter A) B) C)")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_5", "Lowercase letter a) b) c)")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_6", "Lowercase letter (a) (b) (c)")
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7                  NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_7", "Lowercase Roman number i. ii. iii.")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_0", "Numeric, numeric, lowercase letters, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_1", "Numeric, lowercase letters, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_2", "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_3", "Numeric")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_4", "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_5", "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_6", "Numeric with all sublevels")
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7                 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_7", "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet")
+
+#define RID_SVXSTR_SAFEMODE_ZIP_FAILURE                     NC_("RID_SVXSTR_SAFEMODE_ZIP_FAILURE", "The zip file could not be created.")
+
+#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN                  NC_("RID_SVXSTR_STYLEFAMILY_TABLEDESIGN", "Table Design Styles")
+
+#define RID_SVXSTR_NUM_UNDO_ACTIONS                         NC_("RID_SVXSTR_NUM_UNDO_ACTIONS", "Actions to undo: $(ARG1)")
+#define RID_SVXSTR_NUM_UNDO_ACTION                          NC_("RID_SVXSTR_NUM_UNDO_ACTION", "Actions to undo: $(ARG1)")
+#define RID_SVXSTR_NUM_REDO_ACTIONS                         NC_("RID_SVXSTR_NUM_REDO_ACTIONS", "Actions to redo: $(ARG1)")
+#define RID_SVXSTR_NUM_REDO_ACTION                          NC_("RID_SVXSTR_NUM_REDO_ACTION", "Actions to redo: $(ARG1)")
+
+#define RID_SVXSTR_FINDBAR_FIND                             NC_("RID_SVXSTR_FINDBAR_FIND", "Find")
+#define RID_SVXSTR_FINDBAR_MATCHCASE                        NC_("RID_SVXSTR_FINDBAR_MATCHCASE", "Match Case")
+#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED                  NC_("RID_SVXSTR_FINDBAR_SEARCHFORMATTED", "Formatted Display")
+
+#define STR_IMAGE_ORIGINAL_SIZE                             NC_("STR_IMAGE_ORIGINAL_SIZE", "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)")
+#define STR_IMAGE_VIEW_SIZE                                 NC_("STR_IMAGE_VIEW_SIZE", "$(WIDTH) x $(HEIGHT) at $(DPI) DPI")
+#define STR_IMAGE_CAPACITY                                  NC_("STR_IMAGE_CAPACITY", "$(CAPACITY) kiB")
+#define STR_IMAGE_GIF                                       NC_("STR_IMAGE_GIF", "Gif image")
+#define STR_IMAGE_JPEG                                      NC_("STR_IMAGE_JPEG", "Jpeg image")
+#define STR_IMAGE_PNG                                       NC_("STR_IMAGE_PNG", "PNG image")
+#define STR_IMAGE_TIFF                                      NC_("STR_IMAGE_TIFF", "TIFF image")
+#define STR_IMAGE_WMF                                       NC_("STR_IMAGE_WMF", "WMF image")
+#define STR_IMAGE_MET                                       NC_("STR_IMAGE_MET", "MET image")
+#define STR_IMAGE_PCT                                       NC_("STR_IMAGE_PCT", "PCT image")
+#define STR_IMAGE_SVG                                       NC_("STR_IMAGE_SVG", "SVG image")
+#define STR_IMAGE_BMP                                       NC_("STR_IMAGE_BMP", "BMP image")
+#define STR_IMAGE_UNKNOWN                                   NC_("STR_IMAGE_UNKNOWN", "Unknown")
+
+#define STR_SWITCH                                          NC_("STR_SWITCH", "Switch")
+
+#define RID_SVXSTR_UNDO_GRAFMODE                            NC_("RID_SVXSTR_UNDO_GRAFMODE", "Image Mode")
+#define RID_SVXSTR_UNDO_GRAFRED                             NC_("RID_SVXSTR_UNDO_GRAFRED", "Red")
+#define RID_SVXSTR_UNDO_GRAFGREEN                           NC_("RID_SVXSTR_UNDO_GRAFGREEN", "Green")
+#define RID_SVXSTR_UNDO_GRAFBLUE                            NC_("RID_SVXSTR_UNDO_GRAFBLUE", "Blue")
+#define RID_SVXSTR_UNDO_GRAFLUMINANCE                       NC_("RID_SVXSTR_UNDO_GRAFLUMINANCE", "Brightness")
+#define RID_SVXSTR_UNDO_GRAFCONTRAST                        NC_("RID_SVXSTR_UNDO_GRAFCONTRAST", "Contrast")
+#define RID_SVXSTR_UNDO_GRAFGAMMA                           NC_("RID_SVXSTR_UNDO_GRAFGAMMA", "Gamma")
+#define RID_SVXSTR_UNDO_GRAFTRANSPARENCY                    NC_("RID_SVXSTR_UNDO_GRAFTRANSPARENCY", "Transparency")
+#define RID_SVXSTR_GRAFCROP                                 NC_("RID_SVXSTR_GRAFCROP", "Crop")
+
+#define RID_SVXITEMS_ORI_STANDARD                           NC_("RID_SVXITEMS_ORI_STANDARD", "Default orientation")
+#define RID_SVXITEMS_ORI_TOPBOTTOM                          NC_("RID_SVXITEMS_ORI_TOPBOTTOM", "From top to bottom")
+#define RID_SVXITEMS_ORI_BOTTOMTOP                          NC_("RID_SVXITEMS_ORI_BOTTOMTOP", "Bottom to Top")
+#define RID_SVXITEMS_ORI_STACKED                            NC_("RID_SVXITEMS_ORI_STACKED", "Stacked")
+#define RID_SVXITEMS_MARGIN_LEFT                            NC_("RID_SVXITEMS_MARGIN_LEFT", "Left margin: ")
+#define RID_SVXITEMS_MARGIN_TOP                             NC_("RID_SVXITEMS_MARGIN_TOP", "Top margin: ")
+#define RID_SVXITEMS_MARGIN_RIGHT                           NC_("RID_SVXITEMS_MARGIN_RIGHT", "Right margin: ")
+#define RID_SVXITEMS_MARGIN_BOTTOM                          NC_("RID_SVXITEMS_MARGIN_BOTTOM", "Bottom margin: ")
+#define RID_SVXITEMS_PAGE_COMPLETE                          NC_("RID_SVXITEMS_PAGE_COMPLETE", "Page Description: ")
+#define RID_SVXITEMS_PAGE_NUM_CHR_UPPER                     NC_("RID_SVXITEMS_PAGE_NUM_CHR_UPPER", "Capitals")
+#define RID_SVXITEMS_PAGE_NUM_CHR_LOWER                     NC_("RID_SVXITEMS_PAGE_NUM_CHR_LOWER", "Lowercase")
+#define RID_SVXITEMS_PAGE_NUM_ROM_UPPER                     NC_("RID_SVXITEMS_PAGE_NUM_ROM_UPPER", "Uppercase Roman")
+#define RID_SVXITEMS_PAGE_NUM_ROM_LOWER                     NC_("RID_SVXITEMS_PAGE_NUM_ROM_LOWER", "Lowercase Roman")
+#define RID_SVXITEMS_PAGE_NUM_ARABIC                        NC_("RID_SVXITEMS_PAGE_NUM_ARABIC", "Arabic")
+#define RID_SVXITEMS_PAGE_NUM_NONE                          NC_("RID_SVXITEMS_PAGE_NUM_NONE", "None")
+#define RID_SVXITEMS_PAGE_LAND_TRUE                         NC_("RID_SVXITEMS_PAGE_LAND_TRUE", "Landscape")
+#define RID_SVXITEMS_PAGE_LAND_FALSE                        NC_("RID_SVXITEMS_PAGE_LAND_FALSE", "Portrait")
+#define RID_SVXITEMS_PAGE_USAGE_LEFT                        NC_("RID_SVXITEMS_PAGE_USAGE_LEFT", "Left")
+#define RID_SVXITEMS_PAGE_USAGE_RIGHT                       NC_("RID_SVXITEMS_PAGE_USAGE_RIGHT", "Right")
+#define RID_SVXITEMS_PAGE_USAGE_ALL                         NC_("RID_SVXITEMS_PAGE_USAGE_ALL", "All")
+#define RID_SVXITEMS_PAGE_USAGE_MIRROR                      NC_("RID_SVXITEMS_PAGE_USAGE_MIRROR", "Mirrored")
+#define RID_SVXITEMS_AUTHOR_COMPLETE                        NC_("RID_SVXITEMS_AUTHOR_COMPLETE", "Author: ")
+#define RID_SVXITEMS_DATE_COMPLETE                          NC_("RID_SVXITEMS_DATE_COMPLETE", "Date: ")
+#define RID_SVXITEMS_TEXT_COMPLETE                          NC_("RID_SVXITEMS_TEXT_COMPLETE", "Text: ")
+#define RID_SVXITEMS_BRUSH_CHAR                             NC_("RID_SVXITEMS_BRUSH_CHAR", "Character background")
+
+#define STR_COLORTABLE                                      NC_("STR_COLORTABLE", "Color Palette")
+
+// String for saving modified image (instead of original)
+#define RID_SVXSTR_SAVE_MODIFIED_IMAGE                      NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index c484c8736625..ab6a87344511 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -146,7 +146,7 @@ protected:
     void createSdrDragEntries_GlueDrag();
 
     // old call forwarders to the SdrDragView
-    void               ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const;
+    void               ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const;
     SdrHdl*            GetDragHdl() const              { return getSdrDragView().mpDragHdl; }
     SdrHdlKind         GetDragHdlKind() const          { return getSdrDragView().meDragHdl; }
     SdrDragStat&       DragStat()                      { return getSdrDragView().maDragStat; }
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index ef0619358141..8cffd3cb6323 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -39,7 +39,6 @@
  * is set.
  */
 
-class ResMgr;
 class SdrOutliner;
 class SdrModel;
 class SvtSysLocale;
@@ -208,7 +207,6 @@ public:
     std::vector<Link<SdrObjUserDataCreatorParams, SdrObjUserData*>>
                         aUserMakeObjUserDataHdl;
     SdrEngineDefaults*  pDefaults;
-    ResMgr*             pResMgr;
     OLEObjCache         aOLEObjCache;
 
 
@@ -224,7 +222,7 @@ SVX_DLLPUBLIC SdrGlobalData & GetSdrGlobalData();
 
 namespace sdr
 {
-    SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID);
+    SVX_DLLPUBLIC OUString GetResourceString(const char* pResID);
 }
 
 
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 3009d9871bbb..dd2bd2ea3b4c 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -156,7 +156,7 @@ protected:
     SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const;
     SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const;
     bool ImpIsFrameHandles() const;
-    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const;
+    void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const;
 
     // Generates a string including degrees symbol, from an angel specification in 1/100deg
     bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index e330554c08cb..380564066a69 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -872,7 +872,7 @@ protected:
     tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
 
     // for GetDragComment
-    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const;
+    void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const;
 
     void ImpForcePlusData();
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 1781f6d5b128..6be7578d7d86 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -25,7 +25,7 @@
 #include <svx/svdoattr.hxx>
 #include <svx/svdtrans.hxx>
 #include <tools/datetime.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <svx/xtextit0.hxx>
 #include <svx/svdtext.hxx>
 #include <vector>
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
deleted file mode 100644
index 69bc66a44417..000000000000
--- a/include/svx/svdstr.hrc
+++ /dev/null
@@ -1,583 +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 SDR_ResourceBegin            2560
-
-// Attention: All strings between SDR_StringCacheBegin and
-// SDR_StringCacheEnd must be aligned next to each other.
-
-#define STR_ObjNameBegin             (SDR_ResourceBegin)
-#define STR_ObjNameSingulNONE        (STR_ObjNameBegin +  0)
-#define STR_ObjNamePluralNONE        (STR_ObjNameBegin +  1)
-#define STR_ObjNameSingulGRUP        (STR_ObjNameBegin +  2)
-#define STR_ObjNamePluralGRUP        (STR_ObjNameBegin +  3)
-#define STR_ObjNameSingulGRUPEMPTY   (STR_ObjNameBegin +  4)
-#define STR_ObjNamePluralGRUPEMPTY   (STR_ObjNameBegin +  5)
-#define STR_ObjNameSingulTable       (STR_ObjNameBegin + 6)
-#define STR_ObjNamePluralTable       (STR_ObjNameBegin + 7)
-#define STR_ObjNameSingulLINE        (STR_ObjNameBegin +  8)
-#define STR_ObjNameSingulLINE_Hori   (STR_ObjNameBegin +  9)
-#define STR_ObjNameSingulLINE_Vert   (STR_ObjNameBegin + 10)
-#define STR_ObjNameSingulLINE_Diag   (STR_ObjNameBegin + 11)
-#define STR_ObjNamePluralLINE        (STR_ObjNameBegin + 12)
-#define STR_ObjNameSingulRECT        (STR_ObjNameBegin + 13)
-#define STR_ObjNamePluralRECT        (STR_ObjNameBegin + 14)
-#define STR_ObjNameSingulQUAD        (STR_ObjNameBegin + 15)
-#define STR_ObjNamePluralQUAD        (STR_ObjNameBegin + 16)
-#define STR_ObjNameSingulPARAL       (STR_ObjNameBegin + 17)
-#define STR_ObjNamePluralPARAL       (STR_ObjNameBegin + 18)
-#define STR_ObjNameSingulRAUTE       (STR_ObjNameBegin + 19)
-#define STR_ObjNamePluralRAUTE       (STR_ObjNameBegin + 20)
-#define STR_ObjNameSingulRECTRND     (STR_ObjNameBegin + 21)
-#define STR_ObjNamePluralRECTRND     (STR_ObjNameBegin + 22)
-#define STR_ObjNameSingulQUADRND     (STR_ObjNameBegin + 23)
-#define STR_ObjNamePluralQUADRND     (STR_ObjNameBegin + 24)
-#define STR_ObjNameSingulPARALRND    (STR_ObjNameBegin + 25)
-#define STR_ObjNamePluralPARALRND    (STR_ObjNameBegin + 26)
-#define STR_ObjNameSingulRAUTERND    (STR_ObjNameBegin + 27)
-#define STR_ObjNamePluralRAUTERND    (STR_ObjNameBegin + 28)
-#define STR_ObjNameSingulCIRC        (STR_ObjNameBegin + 29)
-#define STR_ObjNamePluralCIRC        (STR_ObjNameBegin + 30)
-#define STR_ObjNameSingulSECT        (STR_ObjNameBegin + 31)
-#define STR_ObjNamePluralSECT        (STR_ObjNameBegin + 32)
-#define STR_ObjNameSingulCARC        (STR_ObjNameBegin + 33)
-#define STR_ObjNamePluralCARC        (STR_ObjNameBegin + 34)
-#define STR_ObjNameSingulCCUT        (STR_ObjNameBegin + 35)
-#define STR_ObjNamePluralCCUT        (STR_ObjNameBegin + 36)
-#define STR_ObjNameSingulCIRCE       (STR_ObjNameBegin + 37)
-#define STR_ObjNamePluralCIRCE       (STR_ObjNameBegin + 38)
-#define STR_ObjNameSingulSECTE       (STR_ObjNameBegin + 39)
-#define STR_ObjNamePluralSECTE       (STR_ObjNameBegin + 40)
-#define STR_ObjNameSingulCARCE       (STR_ObjNameBegin + 41)
-#define STR_ObjNamePluralCARCE       (STR_ObjNameBegin + 42)
-#define STR_ObjNameSingulCCUTE       (STR_ObjNameBegin + 43)
-#define STR_ObjNamePluralCCUTE       (STR_ObjNameBegin + 44)
-#define STR_ObjNameSingulPOLY        (STR_ObjNameBegin + 45)
-#define STR_ObjNameSingulPOLY_PointCount (STR_ObjNameBegin + 46)
-#define STR_ObjNamePluralPOLY        (STR_ObjNameBegin + 47)
-#define STR_ObjNameSingulPLIN        (STR_ObjNameBegin + 48)
-#define STR_ObjNameSingulPLIN_PointCount (STR_ObjNameBegin + 49)
-#define STR_ObjNamePluralPLIN        (STR_ObjNameBegin + 50)
-#define STR_ObjNameSingulPATHLINE    (STR_ObjNameBegin + 51)
-#define STR_ObjNamePluralPATHLINE    (STR_ObjNameBegin + 52)
-#define STR_ObjNameSingulPATHFILL    (STR_ObjNameBegin + 53)
-#define STR_ObjNamePluralPATHFILL    (STR_ObjNameBegin + 54)
-#define STR_ObjNameSingulFREELINE    (STR_ObjNameBegin + 55)
-#define STR_ObjNamePluralFREELINE    (STR_ObjNameBegin + 56)
-#define STR_ObjNameSingulFREEFILL    (STR_ObjNameBegin + 57)
-#define STR_ObjNamePluralFREEFILL    (STR_ObjNameBegin + 58)
-#define STR_ObjNameSingulCOMBLINE    (STR_ObjNameBegin + 59)
-#define STR_ObjNameSingulNATSPLN     (STR_ObjNameBegin + 63)
-#define STR_ObjNamePluralNATSPLN     (STR_ObjNameBegin + 64)
-#define STR_ObjNameSingulPERSPLN     (STR_ObjNameBegin + 65)
-#define STR_ObjNamePluralPERSPLN     (STR_ObjNameBegin + 66)
-#define STR_ObjNameSingulTEXT        (STR_ObjNameBegin + 67)
-#define STR_ObjNamePluralTEXT        (STR_ObjNameBegin + 68)
-#define STR_ObjNameSingulTEXTLNK     (STR_ObjNameBegin + 69)
-#define STR_ObjNamePluralTEXTLNK     (STR_ObjNameBegin + 70)
-#define STR_ObjNameSingulTITLETEXT   (STR_ObjNameBegin + 75)
-#define STR_ObjNamePluralTITLETEXT   (STR_ObjNameBegin + 76)
-#define STR_ObjNameSingulOUTLINETEXT (STR_ObjNameBegin + 77)
-#define STR_ObjNamePluralOUTLINETEXT (STR_ObjNameBegin + 78)
-#define STR_ObjNameSingulGRAF        (STR_ObjNameBegin + 79)
-#define STR_ObjNamePluralGRAF        (STR_ObjNameBegin + 80)
-#define STR_ObjNameSingulGRAFLNK     (STR_ObjNameBegin + 81)
-#define STR_ObjNamePluralGRAFLNK     (STR_ObjNameBegin + 82)
-#define STR_ObjNameSingulGRAFNONE    (STR_ObjNameBegin + 83)
-#define STR_ObjNamePluralGRAFNONE    (STR_ObjNameBegin + 84)
-#define STR_ObjNameSingulGRAFNONELNK (STR_ObjNameBegin + 85)
-#define STR_ObjNamePluralGRAFNONELNK (STR_ObjNameBegin + 86)
-#define STR_ObjNameSingulGRAFMTF     (STR_ObjNameBegin + 87)
-#define STR_ObjNamePluralGRAFMTF     (STR_ObjNameBegin + 88)
-#define STR_ObjNameSingulGRAFMTFLNK  (STR_ObjNameBegin + 89)
-#define STR_ObjNamePluralGRAFMTFLNK  (STR_ObjNameBegin + 90)
-#define STR_ObjNameSingulGRAFBMP     (STR_ObjNameBegin + 91)
-#define STR_ObjNamePluralGRAFBMP     (STR_ObjNameBegin + 92)
-#define STR_ObjNameSingulGRAFBMPLNK  (STR_ObjNameBegin + 93)
-#define STR_ObjNamePluralGRAFBMPLNK  (STR_ObjNameBegin + 94)
-#define STR_ObjNameSingulOLE2        (STR_ObjNameBegin + 99)
-#define STR_ObjNamePluralOLE2        (STR_ObjNameBegin +100)
-#define STR_ObjNameSingulFrame       (STR_ObjNameBegin +104)
-#define STR_ObjNamePluralFrame       (STR_ObjNameBegin +105)
-#define STR_ObjNameSingulEDGE        (STR_ObjNameBegin +107)
-#define STR_ObjNamePluralEDGE        (STR_ObjNameBegin +108)
-#define STR_ObjNameSingulCAPTION     (STR_ObjNameBegin +109)
-#define STR_ObjNamePluralCAPTION     (STR_ObjNameBegin +110)
-#define STR_ObjNameSingulPAGE        (STR_ObjNameBegin +111)
-#define STR_ObjNamePluralPAGE        (STR_ObjNameBegin +112)
-#define STR_ObjNameSingulMEASURE     (STR_ObjNameBegin +113)
-#define STR_ObjNamePluralMEASURE     (STR_ObjNameBegin +114)
-#define STR_ObjNamePlural            (STR_ObjNameBegin +115)
-#define STR_ObjNameNoObj             (STR_ObjNameBegin +116)
-#define STR_ObjNameSingulPlural      (STR_ObjNameBegin +118)
-#define STR_ObjNameSingulUno         (STR_ObjNameBegin +119)
-#define STR_ObjNamePluralUno         (STR_ObjNameBegin +120)
-
-#define STR_ObjNameSingulCube3d     (STR_ObjNameBegin + 121)
-#define STR_ObjNamePluralCube3d     (STR_ObjNameBegin + 122)
-#define STR_ObjNameSingulExtrude3d  (STR_ObjNameBegin + 123)
-#define STR_ObjNamePluralExtrude3d  (STR_ObjNameBegin + 124)
-#define STR_ObjNameSingulLathe3d    (STR_ObjNameBegin + 127)
-#define STR_ObjNamePluralLathe3d    (STR_ObjNameBegin + 128)
-#define STR_ObjNameSingulObj3d      (STR_ObjNameBegin + 129)
-#define STR_ObjNamePluralObj3d      (STR_ObjNameBegin + 130)
-#define STR_ObjNameSingulScene3d    (STR_ObjNameBegin + 133)
-#define STR_ObjNamePluralScene3d    (STR_ObjNameBegin + 134)
-#define STR_ObjNameSingulSphere3d   (STR_ObjNameBegin + 135)
-#define STR_ObjNamePluralSphere3d   (STR_ObjNameBegin + 136)
-
-#define STR_ObjNameSingulGRAFBMPTRANS       (STR_ObjNameBegin + 137)
-#define STR_ObjNameSingulGRAFBMPTRANSLNK    (STR_ObjNameBegin + 138)
-
-#define STR_ObjNamePluralGRAFBMPTRANS       (STR_ObjNameBegin + 139)
-#define STR_ObjNamePluralGRAFBMPTRANSLNK    (STR_ObjNameBegin + 140)
-
-#define STR_ObjNameSingulCUSTOMSHAPE        (STR_ObjNameBegin + 141)
-#define STR_ObjNamePluralCUSTOMSHAPE        (STR_ObjNameBegin + 142)
-
-#define STR_ObjNameSingulMEDIA              (STR_ObjNameBegin + 143)
-#define STR_ObjNamePluralMEDIA              (STR_ObjNameBegin + 144)
-
-#define STR_ObjNameSingulFONTWORK           (STR_ObjNameBegin+145)
-
-// Svg support
-#define STR_ObjNameSingulGRAFSVG            (STR_ObjNameBegin + 147)
-#define STR_ObjNamePluralGRAFSVG            (STR_ObjNameBegin + 148)
-#define STR_ObjNameSingulGRAFWMF            (STR_ObjNameBegin + 149)
-#define STR_ObjNamePluralGRAFWMF            (STR_ObjNameBegin + 150)
-#define STR_ObjNameSingulGRAFEMF            (STR_ObjNameBegin + 151)
-#define STR_ObjNamePluralGRAFEMF            (STR_ObjNameBegin + 152)
-
-#define STR_ObjNameEnd                      (STR_ObjNamePluralGRAFEMF)
-
-#define STR_EditBegin                (STR_ObjNameEnd+1)
-#define STR_EditWithCopy             (STR_EditBegin  +  0)
-#define STR_EditPosSize              (STR_EditBegin  +  1)
-#define STR_EditDelete               (STR_EditBegin  +  2)
-#define STR_EditMovToTop             (STR_EditBegin  +  3)
-#define STR_EditMovToBtm             (STR_EditBegin  +  4)
-#define STR_EditPutToTop             (STR_EditBegin  +  5)
-#define STR_EditPutToBtm             (STR_EditBegin  +  6)
-#define STR_EditRevOrder             (STR_EditBegin  +  7)
-#define STR_EditMove                 (STR_EditBegin  +  8)
-#define STR_EditResize               (STR_EditBegin  +  9)
-#define STR_EditRotate               (STR_EditBegin  + 10)
-#define STR_EditMirrorHori           (STR_EditBegin  + 11)
-#define STR_EditMirrorVert           (STR_EditBegin  + 12)
-#define STR_EditMirrorDiag           (STR_EditBegin  + 13)
-#define STR_EditMirrorFree           (STR_EditBegin  + 14)
-#define STR_EditShear                (STR_EditBegin  + 15)
-#define STR_EditCrook                (STR_EditBegin  + 16)
-#define STR_EditCrookContortion      (STR_EditBegin  + 17)
-#define STR_EditDistort              (STR_EditBegin  + 18)
-#define STR_EditRipUp                (STR_EditBegin  + 19)
-#define STR_EditSetPointsSmooth      (STR_EditBegin  + 20)
-#define STR_EditSetSegmentsKind      (STR_EditBegin  + 21)
-// free (22)
-#define STR_EditSetGlueEscDir        (STR_EditBegin  + 23)
-#define STR_EditSetGluePercent       (STR_EditBegin  + 24)
-#define STR_EditSetGlueAlign         (STR_EditBegin  + 25)
-#define STR_EditGroup                (STR_EditBegin  + 26)
-#define STR_EditUngroup              (STR_EditBegin  + 27)
-#define STR_EditSetAttributes        (STR_EditBegin  + 28)
-#define STR_EditSetStylesheet        (STR_EditBegin  + 29)
-#define STR_EditDelStylesheet        (STR_EditBegin  + 30)
-#define STR_EditConvToPoly           (STR_EditBegin  + 31)
-#define STR_EditConvToPolys          (STR_EditBegin  + 32)
-#define STR_EditConvToCurve          (STR_EditBegin  + 33)
-#define STR_EditConvToCurves         (STR_EditBegin  + 34)
-#define STR_EditAlign                (STR_EditBegin  + 35)
-#define STR_EditAlignVTop            (STR_EditBegin  + 36)
-#define STR_EditAlignVBottom         (STR_EditBegin  + 37)
-#define STR_EditAlignVCenter         (STR_EditBegin  + 38)
-#define STR_EditAlignHLeft           (STR_EditBegin  + 39)
-#define STR_EditAlignHRight          (STR_EditBegin  + 40)
-#define STR_EditAlignHCenter         (STR_EditBegin  + 41)
-#define STR_EditAlignCenter          (STR_EditBegin  + 42)
-#define STR_EditTransform            (STR_EditBegin  + 43)
-#define STR_EditCombine_PolyPoly     (STR_EditBegin  + 44)
-#define STR_EditCombine_OnePoly      (STR_EditBegin  + 45)
-#define STR_EditDismantle_Polys      (STR_EditBegin  + 46)
-#define STR_EditDismantle_Lines      (STR_EditBegin  + 47)
-#define STR_EditImportMtf            (STR_EditBegin  + 48)
-// free (49-51)
-#define STR_EditConvToContour        (STR_EditBegin  + 52)
-#define STR_EditConvToContours       (STR_EditBegin  + 53)
-#define STR_EditMergeMergePoly       (STR_EditBegin  + 54)
-#define STR_EditMergeSubstractPoly   (STR_EditBegin  + 55)
-#define STR_EditMergeIntersectPoly   (STR_EditBegin  + 56)
-#define STR_DistributeMarkedObjects  (STR_EditBegin  + 57)
-#define STR_EqualizeWidthMarkedObjects  (STR_EditBegin  + 58)
-#define STR_EqualizeHeightMarkedObjects (STR_EditBegin  + 59)
-#define STR_EditEnd                  (STR_EqualizeHeightMarkedObjects)
-
-#define STR_ExchangeBegin            (STR_EditEnd+1)
-#define STR_ExchangePaste            (STR_ExchangeBegin +0)
-#define STR_ExchangeEnd              (STR_ExchangePaste)
-
-#define STR_DragBegin                (STR_ExchangeEnd+1)
-#define STR_DragInsertPoint          (STR_DragBegin + 0)
-#define STR_DragInsertGluePoint      (STR_DragBegin + 1)
-#define STR_DragMethMovHdl           (STR_DragBegin + 2)
-#define STR_DragMethObjOwn           (STR_DragBegin + 3)
-#define STR_DragMethMove             (STR_DragBegin + 4)
-#define STR_DragMethResize           (STR_DragBegin + 5)
-#define STR_DragMethRotate           (STR_DragBegin + 6)
-#define STR_DragMethMirrorHori       (STR_DragBegin + 7)
-#define STR_DragMethMirrorVert       (STR_DragBegin + 8)
-#define STR_DragMethMirrorDiag       (STR_DragBegin + 9)
-#define STR_DragMethMirrorFree       (STR_DragBegin +10)
-#define STR_DragMethShear            (STR_DragBegin +11)
-#define STR_DragMethCrook            (STR_DragBegin +12)
-#define STR_DragMethCrookContortion  (STR_DragBegin +13)
-#define STR_DragMethDistort          (STR_DragBegin +14)
-#define STR_DragRectEckRad           (STR_DragBegin +15)
-#define STR_DragPathObj              (STR_DragBegin +16)
-#define STR_DragRectResize           (STR_DragBegin +17)
-#define STR_DragCaptFram             (STR_DragBegin +18)
-#define STR_DragCaptTail             (STR_DragBegin +19)
-#define STR_DragCircAngle            (STR_DragBegin +20)
-#define STR_DragEdgeTail             (STR_DragBegin +21)
-#define STR_DragMethGradient         (STR_DragBegin +22)
-#define STR_DragMethTransparence     (STR_DragBegin +23)
-#define STR_DragMethCrop             (STR_DragBegin +24)
-#define STR_DragEnd                  (STR_DragMethCrop)
-
-#define STR_ViewBegin                (STR_DragEnd+1)
-#define STR_ViewTextEdit             (STR_ViewBegin + 0)
-#define STR_ViewMarked               (STR_ViewBegin + 1)
-#define STR_ViewMarkedPoint          (STR_ViewBegin + 2)
-#define STR_ViewMarkedPoints         (STR_ViewBegin + 3)
-#define STR_ViewMarkedGluePoint      (STR_ViewBegin + 4)
-#define STR_ViewMarkedGluePoints     (STR_ViewBegin + 5)
-#define STR_ViewMarkObjs             (STR_ViewBegin + 6)
-#define STR_ViewMarkMoreObjs         (STR_ViewBegin + 7)
-#define STR_ViewMarkPoints           (STR_ViewBegin + 8)
-#define STR_ViewMarkMorePoints       (STR_ViewBegin + 9)
-#define STR_ViewMarkGluePoints       (STR_ViewBegin +10)
-#define STR_ViewMarkMoreGluePoints   (STR_ViewBegin +11)
-#define STR_ViewCreateObj            (STR_ViewBegin +12)
-#define STR_ViewEnd                  (STR_ViewCreateObj)
-
-#define STR_UndoBegin                (STR_ViewEnd+1)
-#define STR_UndoInsertObj            (STR_UndoBegin + 0)
-#define STR_UndoCopyObj              (STR_UndoBegin + 1)
-#define STR_UndoObjOrdNum            (STR_UndoBegin + 2)
-#define STR_UndoObjSetText           (STR_UndoBegin + 3)
-
-#define STR_UndoNewPage              (STR_UndoBegin + 4)
-#define STR_UndoDelPage              (STR_UndoBegin + 5)
-#define STR_UndoCopPage              (STR_UndoBegin + 6)
-#define STR_UndoMovPage              (STR_UndoBegin + 7)
-
-#define STR_UndoDelPageMasterDscr    (STR_UndoBegin + 9)
-#define STR_UndoChgPageMasterDscr    (STR_UndoBegin +11)
-
-#define STR_UndoMergeModel           (STR_UndoBegin +12)
-
-#define STR_UndoNewLayer             (STR_UndoBegin +13)
-#define STR_UndoDelLayer             (STR_UndoBegin +14)
-#define STR_UndoMovLayer             (STR_UndoBegin +15)
-
-// #i73249#
-#define STR_UndoObjName              (STR_UndoBegin +16)
-#define STR_UndoObjTitle             (STR_UndoBegin +17)
-#define STR_UndoObjDescription       (STR_UndoBegin +18)
-#define STR_UndoEnd                  (STR_UndoObjDescription)
-
-#define STR_LayerBegin               (STR_UndoEnd+1)
-#define STR_StandardLayerName        (STR_LayerBegin +0)
-#define STR_LayerEnd                 (STR_StandardLayerName)
-
-#define STR_ItemBegin                    (STR_LayerEnd+1)
-#define STR_ItemValBegin                 (STR_ItemBegin)
-#define STR_ItemValON                      (STR_ItemValBegin +  0)
-#define STR_ItemValOFF                     (STR_ItemValBegin +  1)
-#define STR_ItemValYES                     (STR_ItemValBegin +  2)
-#define STR_ItemValNO                      (STR_ItemValBegin +  3)
-#define STR_ItemValCAPTIONTYPE1            (STR_ItemValBegin +  4)
-#define STR_ItemValCAPTIONTYPE2            (STR_ItemValBegin +  5)
-#define STR_ItemValCAPTIONTYPE3            (STR_ItemValBegin +  6)
-#define STR_ItemValCAPTIONTYPE4            (STR_ItemValBegin +  7)
-#define STR_ItemValCAPTIONESCHORI          (STR_ItemValBegin +  8)
-#define STR_ItemValCAPTIONESCVERT          (STR_ItemValBegin +  9)
-#define STR_ItemValCAPTIONESCBESTFIT       (STR_ItemValBegin + 10)
-#define STR_ItemValFITTOSIZENONE           (STR_ItemValBegin + 11)
-#define STR_ItemValFITTOSIZEPROP           (STR_ItemValBegin + 12)
-#define STR_ItemValFITTOSIZEALLLINES       (STR_ItemValBegin + 13)
-#define STR_ItemValFITTOSIZERESIZEAT       (STR_ItemValBegin + 14)
-#define STR_ItemValTEXTVADJTOP             (STR_ItemValBegin + 15)
-#define STR_ItemValTEXTVADJCENTER          (STR_ItemValBegin + 16)
-#define STR_ItemValTEXTVADJBOTTOM          (STR_ItemValBegin + 17)
-#define STR_ItemValTEXTVADJBLOCK           (STR_ItemValBegin + 18)
-#define STR_ItemValTEXTVADJSTRETCH         (STR_ItemValBegin + 19)
-#define STR_ItemValTEXTHADJLEFT            (STR_ItemValBegin + 20)
-#define STR_ItemValTEXTHADJCENTER          (STR_ItemValBegin + 21)
-#define STR_ItemValTEXTHADJRIGHT           (STR_ItemValBegin + 22)
-#define STR_ItemValTEXTHADJBLOCK           (STR_ItemValBegin + 23)
-#define STR_ItemValTEXTHADJSTRETCH         (STR_ItemValBegin + 24)
-#define STR_ItemValTEXTANI_NONE            (STR_ItemValBegin + 25)
-#define STR_ItemValTEXTANI_BLINK           (STR_ItemValBegin + 26)
-#define STR_ItemValTEXTANI_SCROLL          (STR_ItemValBegin + 27)
-#define STR_ItemValTEXTANI_ALTERNATE       (STR_ItemValBegin + 28)
-#define STR_ItemValTEXTANI_SLIDE           (STR_ItemValBegin + 29)
-#define STR_ItemValTEXTANI_LEFT            (STR_ItemValBegin + 30)
-#define STR_ItemValTEXTANI_RIGHT           (STR_ItemValBegin + 31)
-#define STR_ItemValTEXTANI_UP              (STR_ItemValBegin + 32)
-#define STR_ItemValTEXTANI_DOWN            (STR_ItemValBegin + 33)
-#define STR_ItemValEDGE_ORTHOLINES         (STR_ItemValBegin + 34)
-#define STR_ItemValEDGE_THREELINES         (STR_ItemValBegin + 35)
-#define STR_ItemValEDGE_ONELINE            (STR_ItemValBegin + 36)
-#define STR_ItemValEDGE_BEZIER             (STR_ItemValBegin + 37)
-#define STR_ItemValMEASURE_STD             (STR_ItemValBegin + 38)
-#define STR_ItemValMEASURE_RADIUS          (STR_ItemValBegin + 39)
-#define STR_ItemValMEASURE_TEXTHAUTO       (STR_ItemValBegin + 40)
-#define STR_ItemValMEASURE_TEXTLEFTOUTSIDE (STR_ItemValBegin + 41)
-#define STR_ItemValMEASURE_TEXTINSIDE      (STR_ItemValBegin + 42)
-#define STR_ItemValMEASURE_TEXTRIGHTOUTSID (STR_ItemValBegin + 43)
-#define STR_ItemValMEASURE_TEXTVAUTO       (STR_ItemValBegin + 44)
-#define STR_ItemValMEASURE_ABOVE           (STR_ItemValBegin + 45)
-#define STR_ItemValMEASURETEXT_BREAKEDLINE (STR_ItemValBegin + 46)
-#define STR_ItemValMEASURE_BELOW           (STR_ItemValBegin + 47)
-#define STR_ItemValMEASURETEXT_VERTICALCEN (STR_ItemValBegin + 48)
-#define STR_ItemValCIRC_FULL               (STR_ItemValBegin + 49)
-#define STR_ItemValCIRC_SECT               (STR_ItemValBegin + 50)
-#define STR_ItemValCIRC_CUT                (STR_ItemValBegin + 51)
-#define STR_ItemValCIRC_ARC                (STR_ItemValBegin + 52)
-#define STR_ItemValEnd                     (STR_ItemValCIRC_ARC)
-
-// Strings for the template dialog
-#define SIP_Begin                           (STR_ItemValEnd+1)
-
-#define SIP_UNKNOWN_ATTR                    (SIP_Begin +   0)
-#define SIP_XA_LINESTYLE                    (SIP_Begin +   1)
-#define SIP_XA_LINEDASH                     (SIP_Begin +   2)
-#define SIP_XA_LINEWIDTH                    (SIP_Begin +   3)
-#define SIP_XA_LINECOLOR                    (SIP_Begin +   4)
-#define SIP_XA_LINESTART                    (SIP_Begin +   5)
-#define SIP_XA_LINEEND                      (SIP_Begin +   6)
-#define SIP_XA_LINESTARTWIDTH               (SIP_Begin +   7)
-#define SIP_XA_LINEENDWIDTH                 (SIP_Begin +   8)
-#define SIP_XA_LINESTARTCENTER              (SIP_Begin +   9)
-#define SIP_XA_LINEENDCENTER                (SIP_Begin +  10)
-#define SIP_XA_LINETRANSPARENCE             (SIP_Begin +  11)
-#define SIP_XA_LINEJOINT                    (SIP_Begin +  12)
-#define SIP_XATTRSET_LINE                   (SIP_Begin +  18)
-#define SIP_XA_FILLSTYLE                    (SIP_Begin +  19)
-#define SIP_XA_FILLCOLOR                    (SIP_Begin +  20)
-#define SIP_XA_FILLGRADIENT                 (SIP_Begin +  21)
-#define SIP_XA_FILLHATCH                    (SIP_Begin +  22)
-#define SIP_XA_FILLBITMAP                   (SIP_Begin +  23)
-#define SIP_XA_FILLTRANSPARENCE             (SIP_Begin +  24)
-#define SIP_XA_GRADIENTSTEPCOUNT            (SIP_Begin +  25)
-#define SIP_XA_FILLBMP_TILE                 (SIP_Begin +  26)
-#define SIP_XA_FILLBMP_POS                  (SIP_Begin +  27)
-#define SIP_XA_FILLBMP_SIZEX                (SIP_Begin +  28)
-#define SIP_XA_FILLBMP_SIZEY                (SIP_Begin +  29)
-#define SIP_XA_FILLFLOATTRANSPARENCE        (SIP_Begin +  30)
-#define SIP_XA_SECONDARYFILLCOLOR           (SIP_Begin +  31)
-#define SIP_XA_FILLBMP_SIZELOG              (SIP_Begin +  32)
-#define SIP_XA_FILLBMP_TILEOFFSETX          (SIP_Begin +  33)
-#define SIP_XA_FILLBMP_TILEOFFSETY          (SIP_Begin +  34)
-#define SIP_XA_FILLBMP_STRETCH              (SIP_Begin +  35)
-#define SIP_XA_FILLBMP_POSOFFSETX           (SIP_Begin +  42)
-#define SIP_XA_FILLBMP_POSOFFSETY           (SIP_Begin +  43)
-#define SIP_XA_FILLBACKGROUND               (SIP_Begin +  44)
-#define SIP_XATTRSET_FILL                   (SIP_Begin +  48)
-#define SIP_XA_FORMTXTSTYLE                 (SIP_Begin +  49)
-#define SIP_XA_FORMTXTADJUST                (SIP_Begin +  50)
-#define SIP_XA_FORMTXTDISTANCE              (SIP_Begin +  51)
-#define SIP_XA_FORMTXTSTART                 (SIP_Begin +  52)
-#define SIP_XA_FORMTXTMIRROR                (SIP_Begin +  53)
-#define SIP_XA_FORMTXTOUTLINE               (SIP_Begin +  54)
-#define SIP_XA_FORMTXTSHADOW                (SIP_Begin +  55)
-#define SIP_XA_FORMTXTSHDWCOLOR             (SIP_Begin +  56)
-#define SIP_XA_FORMTXTSHDWXVAL              (SIP_Begin +  57)
-#define SIP_XA_FORMTXTSHDWYVAL              (SIP_Begin +  58)
-#define SIP_XA_FORMTXTHIDEFORM              (SIP_Begin +  60)
-#define SIP_XA_FORMTXTSHDWTRANSP            (SIP_Begin +  61)
-#define SIP_SA_SHADOW                       (SIP_Begin +  68)
-#define SIP_SA_SHADOWCOLOR                  (SIP_Begin +  69)
-#define SIP_SA_SHADOWXDIST                  (SIP_Begin +  70)
-#define SIP_SA_SHADOWYDIST                  (SIP_Begin +  71)
-#define SIP_SA_SHADOWTRANSPARENCE           (SIP_Begin +  72)
-#define SIP_SA_SHADOW3D                     (SIP_Begin +  73)
-#define SIP_SA_SHADOWPERSP                  (SIP_Begin +  74)
-#define SIP_SA_CAPTIONTYPE                  (SIP_Begin +  81)
-#define SIP_SA_CAPTIONFIXEDANGLE            (SIP_Begin +  82)
-#define SIP_SA_CAPTIONANGLE                 (SIP_Begin +  83)
-#define SIP_SA_CAPTIONGAP                   (SIP_Begin +  84)
-#define SIP_SA_CAPTIONESCDIR                (SIP_Begin +  85)
-#define SIP_SA_CAPTIONESCISREL              (SIP_Begin +  86)
-#define SIP_SA_CAPTIONESCREL                (SIP_Begin +  87)
-#define SIP_SA_CAPTIONESCABS                (SIP_Begin +  88)
-#define SIP_SA_CAPTIONLINELEN               (SIP_Begin +  89)
-#define SIP_SA_CAPTIONFITLINELEN            (SIP_Begin +  90)
-#define SIP_SA_ECKENRADIUS                  (SIP_Begin +  98)
-#define SIP_SA_TEXT_MINFRAMEHEIGHT          (SIP_Begin +  99)
-#define SIP_SA_TEXT_AUTOGROWHEIGHT          (SIP_Begin + 100)
-#define SIP_SA_TEXT_FITTOSIZE               (SIP_Begin + 101)
-#define SIP_SA_TEXT_LEFTDIST                (SIP_Begin + 102)
-#define SIP_SA_TEXT_RIGHTDIST               (SIP_Begin + 103)
-#define SIP_SA_TEXT_UPPERDIST               (SIP_Begin + 104)
-#define SIP_SA_TEXT_LOWERDIST               (SIP_Begin + 105)
-#define SIP_SA_TEXT_VERTADJUST              (SIP_Begin + 106)
-#define SIP_SA_TEXT_MAXFRAMEHEIGHT          (SIP_Begin + 107)
-#define SIP_SA_TEXT_MINFRAMEWIDTH           (SIP_Begin + 108)
-#define SIP_SA_TEXT_MAXFRAMEWIDTH           (SIP_Begin + 109)
-#define SIP_SA_TEXT_AUTOGROWWIDTH           (SIP_Begin + 110)
-#define SIP_SA_TEXT_HORZADJUST              (SIP_Begin + 111)
-#define SIP_SA_TEXT_ANIKIND                 (SIP_Begin + 112)
-#define SIP_SA_TEXT_ANIDIRECTION            (SIP_Begin + 113)
-#define SIP_SA_TEXT_ANISTARTINSIDE          (SIP_Begin + 114)
-#define SIP_SA_TEXT_ANISTOPINSIDE           (SIP_Begin + 115)
-#define SIP_SA_TEXT_ANICOUNT                (SIP_Begin + 116)
-#define SIP_SA_TEXT_ANIDELAY                (SIP_Begin + 117)
-#define SIP_SA_TEXT_ANIAMOUNT               (SIP_Begin + 118)
-#define SIP_SA_TEXT_CONTOURFRAME            (SIP_Begin + 119)
-#define SIP_SA_CUSTOMSHAPE_ADJUSTMENT       (SIP_Begin + 120)
-#define SIP_SA_XMLATTRIBUTES                (SIP_Begin + 121)
-#define SIP_SA_TEXT_USEFIXEDCELLHEIGHT      (SIP_Begin + 122)
-#define SIP_SA_WORDWRAP                     (SIP_Begin + 123)
-#define SIP_SA_CHAINNEXTNAME                (SIP_Begin + 124)
-#define SIP_SA_EDGEKIND                     (SIP_Begin + 128)
-#define SIP_SA_EDGENODE1HORZDIST            (SIP_Begin + 129)
-#define SIP_SA_EDGENODE1VERTDIST            (SIP_Begin + 130)
-#define SIP_SA_EDGENODE2HORZDIST            (SIP_Begin + 131)
-#define SIP_SA_EDGENODE2VERTDIST            (SIP_Begin + 132)
-#define SIP_SA_EDGENODE1GLUEDIST            (SIP_Begin + 133)
-#define SIP_SA_EDGENODE2GLUEDIST            (SIP_Begin + 134)
-#define SIP_SA_EDGELINEDELTAANZ             (SIP_Begin + 135)
-#define SIP_SA_EDGELINE1DELTA               (SIP_Begin + 136)
-#define SIP_SA_EDGELINE2DELTA               (SIP_Begin + 137)
-#define SIP_SA_EDGELINE3DELTA               (SIP_Begin + 138)
-#define SIP_SA_MEASUREKIND                  (SIP_Begin + 148)
-#define SIP_SA_MEASURETEXTHPOS              (SIP_Begin + 149)
-#define SIP_SA_MEASURETEXTVPOS              (SIP_Begin + 150)
-#define SIP_SA_MEASURELINEDIST              (SIP_Begin + 151)
-#define SIP_SA_MEASUREHELPLINEOVERHANG      (SIP_Begin + 152)
-#define SIP_SA_MEASUREHELPLINEDIST          (SIP_Begin + 153)
-#define SIP_SA_MEASUREHELPLINE1LEN          (SIP_Begin + 154)
-#define SIP_SA_MEASUREHELPLINE2LEN          (SIP_Begin + 155)
-#define SIP_SA_MEASUREBELOWREFEDGE          (SIP_Begin + 156)
-#define SIP_SA_MEASURETEXTROTA90            (SIP_Begin + 157)
-#define SIP_SA_MEASURETEXTUPSIDEDOWN        (SIP_Begin + 158)
-#define SIP_SA_MEASUREOVERHANG              (SIP_Begin + 159)
-#define SIP_SA_MEASUREUNIT                  (SIP_Begin + 160)
-#define SIP_SA_MEASURESCALE                 (SIP_Begin + 161)
-#define SIP_SA_MEASURESHOWUNIT              (SIP_Begin + 162)
-#define SIP_SA_MEASUREFORMATSTRING          (SIP_Begin + 163)
-#define SIP_SA_MEASURETEXTAUTOANGLE         (SIP_Begin + 164)
-#define SIP_SA_MEASURETEXTAUTOANGLEVIEW     (SIP_Begin + 165)
-#define SIP_SA_MEASURETEXTISFIXEDANGLE      (SIP_Begin + 166)
-#define SIP_SA_MEASURETEXTFIXEDANGLE        (SIP_Begin + 167)
-#define SIP_SA_MEASUREDECIMALPLACES         (SIP_Begin + 168)
-#define SIP_SA_CIRCKIND                     (SIP_Begin + 173)
-#define SIP_SA_CIRCSTARTANGLE               (SIP_Begin + 174)
-#define SIP_SA_CIRCENDANGLE                 (SIP_Begin + 175)
-#define SIP_SA_OBJVISIBLE                   (SIP_Begin + 180)
-#define SIP_SA_OBJMOVEPROTECT               (SIP_Begin + 181)
-#define SIP_SA_OBJSIZEPROTECT               (SIP_Begin + 182)
-#define SIP_SA_OBJPRINTABLE                 (SIP_Begin + 183)
-#define SIP_SA_LAYERID                      (SIP_Begin + 184)
-#define SIP_SA_LAYERNAME                    (SIP_Begin + 185)
-#define SIP_SA_OBJECTNAME                   (SIP_Begin + 186)
-#define SIP_SA_ALLPOSITIONX                 (SIP_Begin + 187)
-#define SIP_SA_ALLPOSITIONY                 (SIP_Begin + 188)
-#define SIP_SA_ALLSIZEWIDTH                 (SIP_Begin + 189)
-#define SIP_SA_ALLSIZEHEIGHT                (SIP_Begin + 190)
-#define SIP_SA_ONEPOSITIONX                 (SIP_Begin + 191)
-#define SIP_SA_ONEPOSITIONY                 (SIP_Begin + 192)
-#define SIP_SA_ONESIZEWIDTH                 (SIP_Begin + 193)
-#define SIP_SA_ONESIZEHEIGHT                (SIP_Begin + 194)
-#define SIP_SA_LOGICSIZEWIDTH               (SIP_Begin + 195)
-#define SIP_SA_LOGICSIZEHEIGHT              (SIP_Begin + 196)
-#define SIP_SA_ROTATEANGLE                  (SIP_Begin + 197)
-#define SIP_SA_SHEARANGLE                   (SIP_Begin + 198)
-#define SIP_SA_MOVEX                        (SIP_Begin + 199)
-#define SIP_SA_MOVEY                        (SIP_Begin + 200)
-#define SIP_SA_RESIZEXONE                   (SIP_Begin + 201)
-#define SIP_SA_RESIZEYONE                   (SIP_Begin + 202)
-#define SIP_SA_ROTATEONE                    (SIP_Begin + 203)
-#define SIP_SA_HORZSHEARONE                 (SIP_Begin + 204)
-#define SIP_SA_VERTSHEARONE                 (SIP_Begin + 205)
-#define SIP_SA_RESIZEXALL                   (SIP_Begin + 206)
-#define SIP_SA_RESIZEYALL                   (SIP_Begin + 207)
-#define SIP_SA_ROTATEALL                    (SIP_Begin + 208)
-#define SIP_SA_HORZSHEARALL                 (SIP_Begin + 209)
-#define SIP_SA_VERTSHEARALL                 (SIP_Begin + 210)
-#define SIP_SA_TRANSFORMREF1X               (SIP_Begin + 211)
-#define SIP_SA_TRANSFORMREF1Y               (SIP_Begin + 212)
-#define SIP_SA_TRANSFORMREF2X               (SIP_Begin + 213)
-#define SIP_SA_TRANSFORMREF2Y               (SIP_Begin + 214)
-#define SIP_EE_PARA_HYPHENATE               (SIP_Begin + 215)
-#define SIP_EE_PARA_BULLETSTATE             (SIP_Begin + 216)
-#define SIP_EE_PARA_OUTLLRSPACE             (SIP_Begin + 217)
-#define SIP_EE_PARA_OUTLLEVEL               (SIP_Begin + 218)
-#define SIP_EE_PARA_BULLET                  (SIP_Begin + 219)
-#define SIP_EE_PARA_LRSPACE                 (SIP_Begin + 220)
-#define SIP_EE_PARA_ULSPACE                 (SIP_Begin + 221)
-#define SIP_EE_PARA_SBL                     (SIP_Begin + 222)
-#define SIP_EE_PARA_JUST                    (SIP_Begin + 223)
-#define SIP_EE_PARA_TABS                    (SIP_Begin + 224)
-#define SIP_EE_CHAR_COLOR                   (SIP_Begin + 225)
-#define SIP_EE_CHAR_FONTINFO                (SIP_Begin + 226)
-#define SIP_EE_CHAR_FONTHEIGHT              (SIP_Begin + 227)
-#define SIP_EE_CHAR_FONTWIDTH               (SIP_Begin + 228)
-#define SIP_EE_CHAR_WEIGHT                  (SIP_Begin + 229)
-#define SIP_EE_CHAR_UNDERLINE               (SIP_Begin + 230)
-#define SIP_EE_CHAR_OVERLINE                (SIP_Begin + 231)
-#define SIP_EE_CHAR_STRIKEOUT               (SIP_Begin + 232)
-#define SIP_EE_CHAR_ITALIC                  (SIP_Begin + 233)
-#define SIP_EE_CHAR_OUTLINE                 (SIP_Begin + 234)
-#define SIP_EE_CHAR_SHADOW                  (SIP_Begin + 235)
-#define SIP_EE_CHAR_ESCAPEMENT              (SIP_Begin + 236)
-#define SIP_EE_CHAR_PAIRKERNING             (SIP_Begin + 237)
-#define SIP_EE_CHAR_KERNING                 (SIP_Begin + 238)
-#define SIP_EE_CHAR_WLM                     (SIP_Begin + 239)
-#define SIP_EE_FEATURE_TAB                  (SIP_Begin + 240)
-#define SIP_EE_FEATURE_LINEBR               (SIP_Begin + 241)
-#define SIP_EE_FEATURE_NOTCONV              (SIP_Begin + 242)
-#define SIP_EE_FEATURE_FIELD                (SIP_Begin + 243)
-
-#define SIP_SA_GRAFRED                      (SIP_Begin + 244)
-#define SIP_SA_GRAFGREEN                    (SIP_Begin + 245)
-#define SIP_SA_GRAFBLUE                     (SIP_Begin + 246)
-#define SIP_SA_GRAFLUMINANCE                (SIP_Begin + 247)
-#define SIP_SA_GRAFCONTRAST                 (SIP_Begin + 248)
-#define SIP_SA_GRAFGAMMA                    (SIP_Begin + 249)
-#define SIP_SA_GRAFTRANSPARENCE             (SIP_Begin + 250)
-#define SIP_SA_GRAFINVERT                   (SIP_Begin + 251)
-#define SIP_SA_GRAFMODE                     (SIP_Begin + 252)
-#define SIP_SA_GRAFCROP                     (SIP_Begin + 253)
-
-#define STR_TABLE_INSCOL                    (SIP_Begin + 265)
-#define STR_TABLE_INSROW                    (SIP_Begin + 266)
-#define STR_UNDO_COL_DELETE                 (SIP_Begin + 267)
-#define STR_UNDO_ROW_DELETE                 (SIP_Begin + 268)
-#define STR_TABLE_SPLIT                     (SIP_Begin + 269)
-#define STR_TABLE_MERGE                     (SIP_Begin + 270)
-#define STR_TABLE_NUMFORMAT                 (SIP_Begin + 271)
-#define STR_TABLE_DISTRIBUTE_ROWS           (SIP_Begin + 272)
-#define STR_TABLE_DISTRIBUTE_COLUMNS        (SIP_Begin + 273)
-#define STR_TABLE_STYLE                     (SIP_Begin + 274)
-#define STR_TABLE_STYLE_SETTINGS            (SIP_Begin + 275)
-#define STR_TABLE_DELETE_CELL_CONTENTS      (SIP_Begin + 277)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index ec7b4a61e625..5f9b6049c5a9 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -128,9 +128,9 @@ protected:
 protected:
     SdrUndoObj(SdrObject& rNewObj);
 
-    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat = false) const;
+    void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, bool bRepeat = false) const;
 
-    static SAL_WARN_UNUSED_RESULT OUString GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat = false );
+    static SAL_WARN_UNUSED_RESULT OUString GetDescriptionStringForObject( const SdrObject& _rForObject, const char* pStrCacheID, bool bRepeat = false );
 
     // #94278# new method for evtl. PageChange at UNDO/REDO
     void ImpShowPageOfThisObject();
@@ -557,7 +557,7 @@ protected:
 protected:
     SdrUndoPage(SdrPage& rNewPg);
 
-    static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr);
+    static void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr);
 };
 
 /**
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 2c9fb5c08922..8ea7fce5b612 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -88,8 +88,10 @@ public:
     static void ensure();
 };
 
-#endif
+SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCODE();
+SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCTX();
 
+#endif
 
 #endif
 
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index 1870806f5c90..deb55860d82b 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -17,51 +17,79 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SVXITEMS_HRC
-#define INCLUDED_SVX_SVXITEMS_HRC
+#ifndef INCLUDED_SVX_INC_SVX_ITEMS_HRC
+#define INCLUDED_SVX_INC_SVX_ITEMS_HRC
 
-#include <svl/solar.hrc>
+#include <utility>
 
-// enum SvxCellOrientation
-#define RID_SVXITEMS_ORI_STANDARD           (RID_SVXITEMS_START + 410)
-#define RID_SVXITEMS_ORI_TOPBOTTOM          (RID_SVXITEMS_START + 411)
-#define RID_SVXITEMS_ORI_BOTTOMTOP          (RID_SVXITEMS_START + 412)
-#define RID_SVXITEMS_ORI_STACKED            (RID_SVXITEMS_START + 413)
+#include "svx/svxitems.hrc"
+#include "svx/svxids.hrc"
+#include <editeng/editids.hrc>
 
-// Complete-texts -----------------------------------------------------------
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define RID_SVXITEMS_MARGIN_LEFT            (RID_SVXITEMS_START + 480)
-#define RID_SVXITEMS_MARGIN_TOP             (RID_SVXITEMS_START + 481)
-#define RID_SVXITEMS_MARGIN_RIGHT           (RID_SVXITEMS_START + 482)
-#define RID_SVXITEMS_MARGIN_BOTTOM          (RID_SVXITEMS_START + 483)
-#define RID_SVXITEMS_PAGE_COMPLETE          (RID_SVXITEMS_START + 498)
-#define RID_SVXITEMS_PAGE_NUM_BEGIN         (RID_SVXITEMS_START + 499)
-#define RID_SVXITEMS_PAGE_NUM_CHR_UPPER     (RID_SVXITEMS_START + 499)
-#define RID_SVXITEMS_PAGE_NUM_CHR_LOWER     (RID_SVXITEMS_START + 500)
-#define RID_SVXITEMS_PAGE_NUM_ROM_UPPER     (RID_SVXITEMS_START + 501)
-#define RID_SVXITEMS_PAGE_NUM_ROM_LOWER     (RID_SVXITEMS_START + 502)
-#define RID_SVXITEMS_PAGE_NUM_ARABIC        (RID_SVXITEMS_START + 503)
-#define RID_SVXITEMS_PAGE_NUM_NONE          (RID_SVXITEMS_START + 504)
-#define RID_SVXITEMS_PAGE_LAND_TRUE         (RID_SVXITEMS_START + 505)
-#define RID_SVXITEMS_PAGE_LAND_FALSE        (RID_SVXITEMS_START + 506)
-#define RID_SVXITEMS_PAGE_USAGE_LEFT        (RID_SVXITEMS_START + 507)
-#define RID_SVXITEMS_PAGE_USAGE_RIGHT       (RID_SVXITEMS_START + 508)
-#define RID_SVXITEMS_PAGE_USAGE_ALL         (RID_SVXITEMS_START + 509)
-#define RID_SVXITEMS_PAGE_USAGE_MIRROR      (RID_SVXITEMS_START + 510)
-#define RID_SVXITEMS_AUTHOR_COMPLETE        (RID_SVXITEMS_START + 521)
-#define RID_SVXITEMS_DATE_COMPLETE          (RID_SVXITEMS_START + 522)
-#define RID_SVXITEMS_TEXT_COMPLETE          (RID_SVXITEMS_START + 523)
-
-#define RID_SVXITEMS_BRUSH_CHAR             (RID_SVXITEMS_START + 527)
-#define RID_ATTR_NAMES                      (RID_SVXITEMS_START + 528)
-
-// Overflow check --------------------------------------------------------
-
-// Resource-Id's
-#define ACT_RID_SVXITEMS_END    RID_ATTR_NAMES
-#if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END
-#error Resource overflow in #line, #file
-#endif
+const std::pair<const char*, sal_uInt16> RID_ATTR_NAMES[] =
+{
+    { NC_("RID_ATTR_NAMES", "Scale")           ,           SID_ATTR_ZOOM },
+    { NC_("RID_ATTR_NAMES", "Brush")           ,           SID_ATTR_BRUSH },
+    { NC_("RID_ATTR_NAMES", "Tab stops")               ,   SID_ATTR_TABSTOP },
+    { NC_("RID_ATTR_NAMES", "Character")               ,   SID_ATTR_CHAR },
+    { NC_("RID_ATTR_NAMES", "Font")            ,           SID_ATTR_CHAR_FONT },
+    { NC_("RID_ATTR_NAMES", "Font posture")        ,       SID_ATTR_CHAR_POSTURE },
+    { NC_("RID_ATTR_NAMES", "Font weight")             ,   SID_ATTR_CHAR_WEIGHT },
+    { NC_("RID_ATTR_NAMES", "Shadowed")            ,       SID_ATTR_CHAR_SHADOWED },
+    { NC_("RID_ATTR_NAMES", "Individual words")        ,   SID_ATTR_CHAR_WORDLINEMODE },
+    { NC_("RID_ATTR_NAMES", "Outline")         ,           SID_ATTR_CHAR_CONTOUR },
+    { NC_("RID_ATTR_NAMES", "Strikethrough")           ,   SID_ATTR_CHAR_STRIKEOUT },
+    { NC_("RID_ATTR_NAMES", "Underline")           ,       SID_ATTR_CHAR_UNDERLINE },
+    { NC_("RID_ATTR_NAMES", "Font size")               ,   SID_ATTR_CHAR_FONTHEIGHT },
+    { NC_("RID_ATTR_NAMES", "Rel. Font size")      ,       SID_ATTR_CHAR_PROPSIZE },
+    { NC_("RID_ATTR_NAMES", "Font color")          ,       SID_ATTR_CHAR_COLOR },
+    { NC_("RID_ATTR_NAMES", "Kerning")     ,               SID_ATTR_CHAR_KERNING },
+    { NC_("RID_ATTR_NAMES", "Effects")     ,               SID_ATTR_CHAR_CASEMAP },
+    { NC_("RID_ATTR_NAMES", "Language"),                   SID_ATTR_CHAR_LANGUAGE },
+    { NC_("RID_ATTR_NAMES", "Position")        ,           SID_ATTR_CHAR_ESCAPEMENT },
+    { NC_("RID_ATTR_NAMES", "Character blinking")    ,     SID_ATTR_CHAR_AUTOKERN },
+    { NC_("RID_ATTR_NAMES", "Character set color")       , SID_ATTR_CHAR_CHARSETCOLOR },
+    { NC_("RID_ATTR_NAMES", "Overline")      ,             SID_ATTR_CHAR_OVERLINE },
+    { NC_("RID_ATTR_NAMES", "Paragraph")       ,           SID_ATTR_PARA },
+    { NC_("RID_ATTR_NAMES", "Alignment")       ,           SID_ATTR_PARA_ADJUST },
+    { NC_("RID_ATTR_NAMES", "Line spacing")        ,       SID_ATTR_PARA_LINESPACE },
+    { NC_("RID_ATTR_NAMES", "Page Break")      ,           SID_ATTR_PARA_PAGEBREAK },
+    { NC_("RID_ATTR_NAMES", "Hyphenation")     ,           SID_ATTR_PARA_HYPHENZONE },
+    { NC_("RID_ATTR_NAMES", "Do not split paragraph"),     SID_ATTR_PARA_SPLIT },
+    { NC_("RID_ATTR_NAMES", "Orphans")     ,               SID_ATTR_PARA_ORPHANS },
+    { NC_("RID_ATTR_NAMES", "Widows")      ,               SID_ATTR_PARA_WIDOWS },
+    { NC_("RID_ATTR_NAMES", "Paragraph spacing")     ,     SID_ATTR_PARA_ULSPACE },
+    { NC_("RID_ATTR_NAMES", "Paragraph indent")      ,     SID_ATTR_PARA_LRSPACE },
+    { NC_("RID_ATTR_NAMES", "Indent")      ,               SID_ATTR_LRSPACE },
+    { NC_("RID_ATTR_NAMES", "Spacing")     ,               SID_ATTR_ULSPACE },
+    { NC_("RID_ATTR_NAMES", "Page")        ,               SID_ATTR_PAGE },
+    { NC_("RID_ATTR_NAMES", "Page Style")      ,           SID_ATTR_PARA_MODEL },
+    { NC_("RID_ATTR_NAMES", "Keep with next paragraph"),   SID_ATTR_PARA_KEEP },
+    { NC_("RID_ATTR_NAMES", "Blinking")        ,           SID_ATTR_FLASH },
+    { NC_("RID_ATTR_NAMES", "Register-true")       ,       SID_ATTR_PARA_REGISTER },
+    { NC_("RID_ATTR_NAMES", "Character background")    ,   SID_ATTR_BRUSH_CHAR },
+    { NC_("RID_ATTR_NAMES", "Asian font")      ,           SID_ATTR_CHAR_CJK_FONT },
+    { NC_("RID_ATTR_NAMES", "Size of Asian font")      ,   SID_ATTR_CHAR_CJK_FONTHEIGHT },
+    { NC_("RID_ATTR_NAMES", "Language of Asian font"),     SID_ATTR_CHAR_CJK_LANGUAGE },
+    { NC_("RID_ATTR_NAMES", "Posture of Asian font")   ,   SID_ATTR_CHAR_CJK_POSTURE },
+    { NC_("RID_ATTR_NAMES", "Weight of Asian font")    ,   SID_ATTR_CHAR_CJK_WEIGHT },
+    { NC_("RID_ATTR_NAMES", "CTL")     ,                   SID_ATTR_CHAR_CTL_FONT },
+    { NC_("RID_ATTR_NAMES", "Size of complex scripts") ,   SID_ATTR_CHAR_CTL_FONTHEIGHT },
+    { NC_("RID_ATTR_NAMES", "Language of complex scripts"),SID_ATTR_CHAR_CTL_LANGUAGE },
+    { NC_("RID_ATTR_NAMES", "Posture of complex scripts"), SID_ATTR_CHAR_CTL_POSTURE },
+    { NC_("RID_ATTR_NAMES", "Weight of complex scripts"),  SID_ATTR_CHAR_CTL_WEIGHT },
+    { NC_("RID_ATTR_NAMES", "Double-lined")        ,       SID_ATTR_CHAR_TWO_LINES },
+    { NC_("RID_ATTR_NAMES", "Emphasis mark")       ,       SID_ATTR_CHAR_EMPHASISMARK },
+    { NC_("RID_ATTR_NAMES", "Text spacing")        ,       SID_ATTR_PARA_SCRIPTSPACE },
+    { NC_("RID_ATTR_NAMES", "Hanging punctuation")     ,   SID_ATTR_PARA_HANGPUNCTUATION },
+    { NC_("RID_ATTR_NAMES", "Forbidden characters")    ,   SID_ATTR_PARA_FORBIDDEN_RULES },
+    { NC_("RID_ATTR_NAMES", "Rotation")        ,           SID_ATTR_CHAR_ROTATED },
+    { NC_("RID_ATTR_NAMES", "Character scaling")       ,   SID_ATTR_CHAR_SCALEWIDTH },
+    { NC_("RID_ATTR_NAMES", "Relief")      ,               SID_ATTR_CHAR_RELIEF },
+    { NC_("RID_ATTR_NAMES", "Vertical text alignment") ,   SID_PARA_VERTALIGN }
+};
 
 #endif
 
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index e04522e326cb..0a52979a0219 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -27,12 +27,9 @@
     contains strings needed for positioning dialogs
     of frames and drawing in Writer
  */
-class ResStringArray;
 class SVX_DLLPUBLIC SvxSwFramePosString
 {
 public:
-    SvxSwFramePosString();
-    ~SvxSwFramePosString();
     enum StringId
     {
         LEFT                       ,
@@ -80,10 +77,7 @@ public:
 
         STR_MAX
     };
-    OUString GetString(StringId eId) const;
-
-private:
-    std::unique_ptr<ResStringArray> pImpl;
+    static OUString GetString(StringId eId);
 };
 #endif
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index ef86f26957f6..6fb31324f2a6 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -130,7 +130,7 @@
 
 // ITEMID_... defines in the *.cxx
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/strarray.hxx>
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index dc86c1626f0a..b9827c3cc841 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -23,19 +23,14 @@
 #include <rtl/textenc.h>
 #include <svx/svxdllapi.h>
 
-class SvxTextEncodingTable;
-
 class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
 {
 private:
-    const SvxTextEncodingTable*     m_pEncTable;
-
     SVX_DLLPRIVATE sal_Int32                EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
 
 public:
     SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits );
     virtual ~SvxTextEncodingBox() override;
-    virtual void dispose() override;
 
     /** Fill with all known encodings but exclude those matching one or more
         given flags as defined in rtl/tencinfo.h
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index 2c288aeae31a..74a72372c896 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -22,23 +22,15 @@
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/resary.hxx>
-
 
 //  class SvxTextEncodingTable
-
-
-class SVX_DLLPUBLIC SvxTextEncodingTable : public ResStringArray
+class SVX_DLLPUBLIC SvxTextEncodingTable
 {
 public:
-    SvxTextEncodingTable();
-    ~SvxTextEncodingTable();
-
-    const OUString GetTextString( const rtl_TextEncoding nEnc ) const;
-    rtl_TextEncoding    GetTextEncoding( const OUString& rStr ) const;
+    static const OUString GetTextString(const rtl_TextEncoding nEnc);
+    static rtl_TextEncoding GetTextEncoding(const OUString& rStr);
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index 1157a7e8d707..e826a84d83bb 100644
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
@@ -21,7 +21,6 @@
 
 // strings for unicode range descriptions (used e.g. by Charmap dialog)
 // (see the Unicode spec and TrueType::OS2.ulUnicodeRange description)
-#define RID_SUBSETMAP                   1243
 #define RID_SUBSET_START                (RID_SVX_START + 901)
 
 #define RID_SUBSETSTR_BASIC_LATIN               (RID_SUBSET_START + 0)
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 46e780fc9fa7..19b5b3c43881 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -63,7 +63,7 @@ public:
         Argument pPool2 can be null.
         If returned string equals NameOrIndex->GetName(), the name was already unique.
     */
-    static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, const XPropertyListRef &pDefaults );
+    static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults );
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
deleted file mode 100644
index 7dd4c7f08fa4..000000000000
--- a/include/tools/rcid.h
+++ /dev/null
@@ -1,44 +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_TOOLS_RCID_H
-#define INCLUDED_TOOLS_RCID_H
-
-#include <tools/resid.hxx>
-
-// Definition of the version number
-#define RSCVERSION_ID           200U
-// Definition of an invalid identifier
-#define RC_NO_ID                (sal_uInt32(0xFFFFFFFF))
-
-// Resource types
-// Minimum is 0x100 due to MS-Windows resource types
-// (RSC_NOTYPE=0x100) is defined in resid.hxx
-#define RSC_VERSIONCONTROL      (RSC_NOTYPE + RESOURCE_TYPE(0x02)) // Version control
-
-#define RSC_RESOURCE            (RSC_NOTYPE + RESOURCE_TYPE(0x10))
-#define RSC_STRING              (RSC_NOTYPE + RESOURCE_TYPE(0x11))
-
-#define RSC_STRINGARRAY         (RSC_NOTYPE + RESOURCE_TYPE(0x79))
-
-// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 5a935c271066..9573a9affd21 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -19,33 +19,8 @@
 #ifndef INCLUDED_TOOLS_RESARY_HXX
 #define INCLUDED_TOOLS_RESARY_HXX
 
-#include <tools/toolsdllapi.h>
-#include <rtl/ustring.hxx>
-#include <memory>
-
 #define RESARRAY_INDEX_NOTFOUND (0xffffffff)
 
-class ResId;
-
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResStringArray
-{
-    struct Impl;
-    std::unique_ptr<Impl> mpImpl;
-
-    ResStringArray( const ResStringArray& ) = delete;
-    ResStringArray& operator=( const ResStringArray& ) = delete;
-
-public:
-    ResStringArray( const ResId& rResId );
-    ~ResStringArray();
-
-    OUString GetString( sal_uInt32 nIndex ) const;
-    sal_IntPtr GetValue( sal_uInt32 nIndex ) const;
-    sal_uInt32 Count() const;
-    sal_uInt32 FindIndex( sal_IntPtr nValue ) const;
-    sal_uInt32 AddItem( const OUString& rString, sal_IntPtr nValue );
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
deleted file mode 100644
index 329f39aaf0c2..000000000000
--- a/include/tools/resid.hxx
+++ /dev/null
@@ -1,99 +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_TOOLS_RESID_HXX
-#define INCLUDED_TOOLS_RESID_HXX
-
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <tools/toolsdllapi.h>
-#include <o3tl/strong_int.hxx>
-
-struct RSHEADER_TYPE;
-struct RESOURCE_TYPE_Tag {};
-typedef o3tl::strong_int<sal_uInt32, RESOURCE_TYPE_Tag> RESOURCE_TYPE;
-#define RSC_NOTYPE              RESOURCE_TYPE(0x100)
-#define RSC_DONTRELEASE         (sal_uInt32(1U << 31))
-
-class ResMgr;
-
-class SAL_WARN_UNUSED ResId
-{
-    /*
-    Consider two cases:
-    either
-    (a) m_pResource is valid and points to a resource data buffer;
-        then m_nResId and m_pResMgr are not used and may be 0 and nullptr respectively
-    or
-    (b) m_pResource is NULL, then m_nResId and m_pResMgr must be valid.
-        In this case the highest bit, if set, decides whether or not to
-        release the Resource context after loading this id.
-    */
-    RSHEADER_TYPE*          m_pResource;
-    mutable sal_uInt32      m_nResId;      // Resource Identifier
-    mutable RESOURCE_TYPE   m_nRT;         // type for loading (mutable to be set later)
-    mutable ResMgr *        m_pResMgr;     // load from this ResMgr (mutable for setting on demand)
-
-    void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
-    {
-        m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr;
-        OSL_ENSURE( m_pResMgr != nullptr, "ResId without ResMgr created" );
-    }
-
-public:
-    ResId( sal_uInt32 nId, ResMgr& rMgr )
-    {
-        ImplInit( nId, rMgr, nullptr );
-    }
-
-    RESOURCE_TYPE   GetRT() const { return m_nRT; }
-
-    /** Set the type if not already set. Ask for type with GetRT()
-
-    [Example]
-    ResId aId( 1000 );
-    aId.SetRT( RSC_RESOURCE );    // settype window Resource
-    //aId.GetRT() == RSC_RESOURCE is true
-
-    @see
-    ResId::GetRT2(), ResId::GetRT()
-    */
-     const ResId &   SetRT( RESOURCE_TYPE nType ) const
-     {
-         if( RSC_NOTYPE == m_nRT )
-             m_nRT = nType;
-         return *this;
-     }
-
-    ResMgr *        GetResMgr() const { return m_pResMgr; }
-    void            ClearResMgr() const { m_pResMgr = nullptr; }
-
-    bool            IsAutoRelease()  const { return !(m_nResId & RSC_DONTRELEASE); }
-
-    sal_uInt32      GetId()          const { return m_nResId & ~RSC_DONTRELEASE; }
-    RSHEADER_TYPE*  GetpResource()   const { return m_pResource; }
-
-    TOOLS_DLLPUBLIC OUString toString() const;
-    TOOLS_DLLPUBLIC operator OUString() const { return toString(); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 5c464ae05c9a..fe5b68e6328e 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -21,175 +21,16 @@
 
 #include <tools/toolsdllapi.h>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/resid.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
-#include <vector>
+typedef OUString (*ResHookProc)(const OUString& rStr);
 
-class SvStream;
-class InternalResMgr;
-
-/// Defines structure used to build resource
-struct RSHEADER_TYPE
-{
-private:
-    char nId[4];        ///< Identifier of resource
-    char nRT[4];        ///< Resource type
-    char nGlobOff[4];   ///< Global offset
-    char nLocalOff[4];  ///< Local offset
-
-public:
-    inline sal_uInt32       GetId();    ///< Identifier of resource
-    inline RESOURCE_TYPE    GetRT();    ///< Resource type
-    inline sal_uInt32       GetGlobOff();  ///< Global offset
-    inline sal_uInt32       GetLocalOff(); ///< Local offset
-};
-
-typedef OUString (*ResHookProc)( const OUString& rStr );
-
-// Initialization
-enum class RCFlags
-{
-    NONE                 = 0x00,
-    GLOBAL               = 0x01,  // Global resource
-    AUTORELEASE          = 0x02,
-    NOTFOUND             = 0x04,
-    FALLBACK_DOWN        = 0x08,
-    FALLBACK_UP          = 0x10,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<RCFlags> : is_typed_flags<RCFlags, 0x1f> {};
-}
-
-class Resource;
-class ResMgr;
-
-struct ImpRCStack
-{
-    // pResource and pClassRes equal NULL: resource was not loaded
-    RSHEADER_TYPE * pResource;  ///< pointer to resource
-    void          * pClassRes;  ///< pointer to class specified init data
-    RCFlags         Flags;      ///< resource status
-    void *          aResHandle; ///< Resource-Identifier from InternalResMgr
-    const Resource* pResObj;    ///< pointer to Resource object
-
-    void            Clear();
-    void            Init( const Resource * pObj, sal_uInt32 nId );
-};
-
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResMgr
-{
-private:
-    InternalResMgr* pImpRes;
-    std::vector< ImpRCStack >  aStack; ///< resource context stack
-    int             nCurStack;
-    ResMgr*         pFallbackResMgr;   ///< fallback ResMgr in case the Resource
-                                       ///< was not contained in this ResMgr
-    ResMgr*         pOriginalResMgr;   ///< the res mgr that fell back to this
-                                       ///< stack level
-
-    TOOLS_DLLPRIVATE void incStack();
-    TOOLS_DLLPRIVATE void decStack();
-
-    TOOLS_DLLPRIVATE void  Init( const OUString& rFileName );
-
-    TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp );
-
-    #ifdef DBG_UTIL
-    TOOLS_DLLPRIVATE static void RscError_Impl( const sal_Char* pMessage,
-                                                ResMgr* pResMgr,
-                                                RESOURCE_TYPE nRT,
-                                                sal_uInt32 nId,
-                                                std::vector< ImpRCStack >& rResStack,
-                                                int nDepth );
-    #endif
-
-    // called from within GetResource() if a resource could not be found
-    TOOLS_DLLPRIVATE ResMgr* CreateFallbackResMgr( const ResId& rId,
-                                                   const Resource* pResource );
-    // creates a 1k sized buffer set to zero for unfound resources
-    // used in case RC_NOTFOUND
-    static void* pEmptyBuffer;
-    TOOLS_DLLPRIVATE static void* getEmptyBuffer();
-
-    // the next two methods are needed to prevent the string hook called
-    // with the res mgr mutex locked
-    // like GetString, but doesn't call the string hook
-    TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( OUString& rStr,
-                                                             const sal_uInt8* pStr );
-    // like ReadString but doesn't call the string hook
-    TOOLS_DLLPRIVATE OUString ReadStringWithoutHook();
-
-    ResMgr(const ResMgr&) = delete;
-    ResMgr& operator=(const ResMgr&) = delete;
-
-public:
-    static void         DestroyAllResMgr();  ///< Called upon app shutdown
-
-    ~ResMgr();
-
-    /// Language-dependent resource library
-    static ResMgr*      SearchCreateResMgr( const sal_Char* pPrefixName,
-                                            LanguageTag& rLocale );
-    static ResMgr*      CreateResMgr( const sal_Char* pPrefixName,
-                                      const LanguageTag& aLocale = LanguageTag( LANGUAGE_SYSTEM) );
-
-    /// Check whether resource is available
-    bool                IsAvailable( const ResId& rId,
-                                     const Resource* = nullptr) const;
-
-    /// Search and load resource, given its ID
-    bool                GetResource( const ResId& rId, const Resource * = nullptr );
-    /// Free resource context
-    void                PopContext( const Resource* = nullptr );
-
-    /// Increment resource pointer
-    void*               Increment( sal_uInt32 nSize );
-
-    /// Return a string and its length out of the resource
-    static sal_uInt32   GetString( OUString& rStr, const sal_uInt8* pStr );
-
-    /// Return the size of a string in the resource
-    static sal_uInt32   GetStringSize( sal_uInt32 nLen )
-                            { nLen++; return (nLen + nLen%2); }
-    static sal_uInt32   GetStringSize( const sal_uInt8* pStr, sal_uInt32& nLen );
-
-    /// Return a long
-    static sal_Int32    GetLong( void const * pLong );
-
-    /// Return a pointer to the resource
-    void *              GetClass();
-
-    const OUString& GetFileName() const;
-
-    sal_Int32           ReadLong();
-    OUString            ReadString();
-
-    static void         SetReadStringHook( ResHookProc pProc );
-    static ResHookProc  GetReadStringHook();
-    static OUString     ExpandVariables(const OUString& rString);
-    static void         SetDefaultLocale( const LanguageTag& rLocale );
-};
-
-inline sal_uInt32 RSHEADER_TYPE::GetId()
-{
-    return (sal_uInt32)ResMgr::GetLong( &nId );
-}
-
-inline RESOURCE_TYPE RSHEADER_TYPE::GetRT()
-{
-    return RESOURCE_TYPE(ResMgr::GetLong( &nRT ));
-}
-
-inline sal_uInt32 RSHEADER_TYPE::GetGlobOff()
-{
-    return (sal_uInt32)ResMgr::GetLong( &nGlobOff );
-}
-
-inline sal_uInt32 RSHEADER_TYPE::GetLocalOff()
+namespace Translate
 {
-    return (sal_uInt32)ResMgr::GetLong( &nLocalOff );
+    TOOLS_DLLPUBLIC std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale);
+    TOOLS_DLLPUBLIC OUString get(const char* pId, const std::locale &loc);
+    TOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc );
+    TOOLS_DLLPUBLIC ResHookProc GetReadStringHook();
+    TOOLS_DLLPUBLIC OUString ExpandVariables(const OUString& rString);
 }
 
 #endif
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
deleted file mode 100644
index d82764f70f18..000000000000
--- a/include/tools/simplerm.hxx
+++ /dev/null
@@ -1,83 +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 .
- */
-
-// a simple resource manager : no stacks, no sharing of the impl class, only loading of strings and blobs
-// but thread-safety !! :)
-
-#ifndef INCLUDED_TOOLS_SIMPLERM_HXX
-#define INCLUDED_TOOLS_SIMPLERM_HXX
-
-#include <osl/mutex.hxx>
-#include <tools/resid.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <tools/toolsdllapi.h>
-#include <memory>
-
-class InternalResMgr;
-
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC SimpleResMgr final
-{
-    osl::Mutex              m_aAccessSafety;
-    std::unique_ptr<InternalResMgr>
-                            m_pResImpl;
-
-public:
-                            /** creates a new SimpleResManager
-                                @param pPrefixName
-                                    denotes the prefix of the resource file name,
-                                    in ThreadTextEncoding
-                                @param rLocale
-                                    denotes the locale of the resource file to
-                                    load. If empty (SYSTEM), a default locale will be used.
-                            */
-                            SimpleResMgr( const sal_Char* pPrefixName,
-                                          const LanguageTag& rLocale);
-
-                            ~SimpleResMgr();
-
-    static SimpleResMgr*    Create( const sal_Char* pPrefixName,
-                                    const LanguageTag& rLocale );// only in VCL
-
-    bool                    IsValid() const { return m_pResImpl != nullptr; }
-
-    /** reads the string with the given resource id
-        @param  nId
-            the resource id of the string to read
-        @return
-            the string with the given resource id, or an empty string if the id does not denote
-            an existent string
-        @seealso IsAvailable
-    */
-    OUString           ReadString( sal_uInt32 nId );
-
-    /** checks whether a certain resource is available
-        @param  _resourceType
-            the type of the resource to check. Currently, only RSC_STRING (strings) and RSC_RESOURCE (blobs)
-            are supported, for every other type, <FALSE/> will be returned.
-        @param  _resourceId
-            the id of the resource to lookup.
-        @return
-            <TRUE/> if and only if a resource of the given type, with the given id, is available.
-    */
-    bool                    IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index e363f658bac2..127954d7dfb9 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -21,14 +21,10 @@
 
 #include <comphelper/componentmodule.hxx>
 #include <unotools/unotoolsdllapi.h>
-
-#include <tools/resid.hxx>
-
 #include <osl/getglobalmutex.hxx>
-
 #include <memory>
 
-class ResMgr;
+class LanguageTag;
 
 namespace utl
 {
@@ -49,30 +45,16 @@ namespace utl
         ::std::unique_ptr< OComponentResModuleImpl >  m_pImpl;
 
     public:
-        OComponentResourceModule( const OString& _rResFilePrefix );
+        OComponentResourceModule(const OString& _rResFilePrefix, const LanguageTag& rLanguage);
         virtual ~OComponentResourceModule() override;
 
-        /// get the vcl res manager of the module
-        ResMgr* getResManager();
-
-    protected:
-        // OModule overridables
-        virtual void onLastClient() override;
-    };
-
-    //= ModuleRes
-
-    /** specialized ResId, using the resource manager provided by a given OModule
-    */
-    class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId
-    {
-    public:
-        ModuleRes( sal_uInt16 _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { }
+        /// get the resource locale of the module
+        const std::locale& getResLocale();
     };
 
     //= defining a concrete module
 
-#define DEFINE_MODULE( ModuleClass, ClientClass, ResClass ) \
+#define DEFINE_MODULE( ModuleClass, ClientClass ) \
     /* -------------------------------------------------------------------- */ \
     class ModuleClass : public ::utl::OComponentResourceModule \
     { \
@@ -99,18 +81,6 @@ namespace utl
     }; \
     \
     /* -------------------------------------------------------------------- */ \
-    class ResClass : public ::utl::ModuleRes \
-    { \
-    private: \
-        typedef ::utl::ModuleRes    BaseClass; \
-    \
-    public: \
-        ResClass( sal_uInt16 _nId ) : BaseClass( _nId, ModuleClass::getInstance() ) \
-        { \
-        } \
-    }; \
-    \
-    /* -------------------------------------------------------------------- */ \
     template < class TYPE > \
     class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE > \
     { \
@@ -143,7 +113,7 @@ namespace utl
     }; \
     \
     ModuleClass::ModuleClass() \
-        :BaseClass( OString( resprefix ) ) \
+        :BaseClass( OString( resprefix ), Application::GetSettings().GetUILanguageTag() ) \
     { \
     } \
     \
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 96265f967bc9..a446405d544c 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -247,9 +247,6 @@ private:
     static void     mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustment);
     static void     mungeAdjustment(Slider &rTarget, const Adjustment &rAdjustment);
 
-    typedef std::map<OString, OString> WidgetTranslations;
-    typedef std::map<OString, WidgetTranslations> Translations;
-
     struct stockinfo
     {
         OUString m_sStock;
@@ -270,6 +267,8 @@ private:
 
     struct ParserState
     {
+        std::locale m_aResLocale;
+
         std::vector<RadioButtonGroupMap> m_aGroupMaps;
 
         std::vector<ComboBoxModelMap> m_aModelMaps;
@@ -291,8 +290,6 @@ private:
 
         std::vector<ButtonMenuMap> m_aButtonMenuMaps;
 
-        Translations m_aTranslations;
-
         std::map<VclPtr<vcl::Window>, VclPtr<vcl::Window>> m_aRedundantParentWidgets;
 
         std::vector<SizeGroup> m_aSizeGroups;
@@ -310,9 +307,6 @@ private:
         ParserState();
     };
 
-    void        loadTranslations(const LanguageTag &rLanguageTag, const OUString &rUri);
-    OString     getTranslation(const OString &rId, const OString &rProperty) const;
-
     OString     m_sID;
     OString     m_sHelpRoot;
     ResHookProc m_pStringReplace;
@@ -362,8 +356,6 @@ private:
     bool        extractStock(const OString &id, stringmap &rMap);
     void        extractMnemonicWidget(const OString &id, stringmap &rMap);
 
-    void        handleTranslations(xmlreader::XmlReader &reader);
-
     void        handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader);
     VclPtr<vcl::Window> handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader);
     void        handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader);
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3872a8c2c156..6de11784086d 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -27,7 +27,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/salnativewidgets.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <memory>
 #include <vector>
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 1cb36bb8d723..136780893f52 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -22,7 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 namespace tools { class Rectangle; }
diff --git a/include/vcl/fpicker.hrc b/include/vcl/fpicker.hrc
deleted file mode 100644
index 29c446ddbd36..000000000000
--- a/include/vcl/fpicker.hrc
+++ /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/.
- */
-#ifndef INCLUDED_VCL_FPICKER_HRC
-#define INCLUDED_VCL_FPICKER_HRC
-
-#include <svl/solar.hrc>
-
-#define STR_SVT_FILEPICKER_START                    (RID_FPICKER_START+1)
-#define STR_SVT_FILEPICKER_AUTO_EXTENSION           (STR_SVT_FILEPICKER_START+ 0)
-#define STR_SVT_FILEPICKER_PASSWORD                 (STR_SVT_FILEPICKER_START+ 1)
-#define STR_SVT_FILEPICKER_FILTER_OPTIONS           (STR_SVT_FILEPICKER_START+ 2)
-#define STR_SVT_FILEPICKER_READONLY                 (STR_SVT_FILEPICKER_START+ 3)
-#define STR_SVT_FILEPICKER_INSERT_AS_LINK           (STR_SVT_FILEPICKER_START+ 4)
-#define STR_SVT_FILEPICKER_SHOW_PREVIEW             (STR_SVT_FILEPICKER_START+ 5)
-#define STR_SVT_FILEPICKER_PLAY                     (STR_SVT_FILEPICKER_START+ 6)
-#define STR_SVT_FILEPICKER_VERSION                  (STR_SVT_FILEPICKER_START+ 7)
-#define STR_SVT_FILEPICKER_TEMPLATES                (STR_SVT_FILEPICKER_START+ 8)
-#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE           (STR_SVT_FILEPICKER_START+ 9)
-#define STR_SVT_FILEPICKER_SELECTION                (STR_SVT_FILEPICKER_START+10)
-#define STR_SVT_FILEPICKER_FILTER_TITLE             (STR_SVT_FILEPICKER_START+11)
-#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE          (STR_SVT_FILEPICKER_START+12)
-#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    (STR_SVT_FILEPICKER_START+13)
-#define STR_SVT_ALREADYEXISTOVERWRITE               (STR_SVT_FILEPICKER_START+14)
-#define STR_SVT_DELETESERVICE                       (STR_SVT_FILEPICKER_START+15)
-#define STR_SVT_ROOTLABEL                           (STR_SVT_FILEPICKER_START+16)
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 6ee8f897e942..4577bd8fbed1 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/outdev.hxx>
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 89e57b988265..06843738eee1 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_KEYCOD_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/resid.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/keycodes.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index 06b7c124972f..cc7d51ec30b8 100644
--- a/include/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_KEYCODES_HXX
 #define INCLUDED_VCL_KEYCODES_HXX
 
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #undef DELETE
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index c828aae0baa3..680ccd9d5af2 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_MENU_HXX
 
 #include <memory>
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 5136a343612a..28d05b7783ef 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_TOOLBOX_HXX
 
 #include <vcl/vclstatuslistener.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dockwin.hxx>
 #include <vcl/image.hxx>
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 10e97df02f3c..95e977c696dd 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -20,10 +20,122 @@
 #ifndef INCLUDED_VCL_VCLENUM_HXX
 #define INCLUDED_VCL_VCLENUM_HXX
 
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sal/types.h>
 #include <tools/fontenum.hxx>
 
+enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS };
+
+enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
+                   SAVEAS, PRINT, CLOSE, QUIT,
+                   CUT, COPY, PASTE, UNDO,
+                   REDO, DELETE, REPEAT, FIND,
+                   FINDBACKWARD, PROPERTIES, FRONT };
+
+enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR };
+
+enum class MenuItemBits : sal_Int16
+{
+    NONE                = 0x0000,
+    CHECKABLE           = 0x0001,
+    RADIOCHECK          = 0x0002,
+    AUTOCHECK           = 0x0004,
+    ABOUT               = 0x0008,
+    HELP                = 0x0010,
+    POPUPSELECT         = 0x0020,
+    // These have been said to be a preliminary (sic) solution since 2007
+    NOSELECT            = 0x0040,
+    ICON                = 0x0080,
+    TEXT                = 0x0100,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<MenuItemBits> : is_typed_flags<MenuItemBits, 0x1ff> {};
+}
+
+enum class ToolBoxItemBits
+{
+    NONE                = 0x0000,
+    CHECKABLE           = 0x0001,
+    RADIOCHECK          = 0x0002,
+    AUTOCHECK           = 0x0004,
+    LEFT                = 0x0008,
+    AUTOSIZE            = 0x0010,
+    DROPDOWN            = 0x0020,
+    REPEAT              = 0x0040,
+    DROPDOWNONLY        = 0x00a0, // 0x0080 | DROPDOWN
+    TEXT_ONLY           = 0x0100,
+    ICON_ONLY           = 0x0200
+};
+namespace o3tl
+{
+    template<> struct typed_flags<ToolBoxItemBits> : is_typed_flags<ToolBoxItemBits, 0x3ff> {};
+}
+
+enum class ToolBoxItemType { DONTKNOW, BUTTON, SPACE, SEPARATOR, BREAK };
+
+enum class ButtonType { SYMBOLONLY, TEXT, SYMBOLTEXT };
+
+enum class SymbolType : sal_uInt16
+{
+    DONTKNOW         = 0,
+    IMAGE            = 1,
+    ARROW_UP         = 2,
+    ARROW_DOWN       = 3,
+    ARROW_LEFT       = 4,
+    ARROW_RIGHT      = 5,
+    SPIN_UP          = 6,
+    SPIN_DOWN        = 7,
+    SPIN_LEFT        = 8,
+    SPIN_RIGHT       = 9,
+    FIRST            = 10,
+    LAST             = 11,
+    PREV             = 12,
+    NEXT             = 13,
+    PAGEUP           = 14,
+    PAGEDOWN         = 15,
+    PLAY             = 16,
+    STOP             = 19,
+    CLOSE            = 25,
+    ROLLUP           = 26,
+    ROLLDOWN         = 27,
+    CHECKMARK        = 28,
+    RADIOCHECKMARK   = 29,
+    FLOAT            = 31,
+    DOCK             = 32,
+    HIDE             = 33,
+    HELP             = 34,
+    PLUS             = 35,
+    MENU             = SymbolType::SPIN_DOWN
+};
+
+
+// Border styles for SetBorder()
+enum class WindowBorderStyle : sal_Int16
+{
+    NONE              = 0x0000,
+    NORMAL            = 0x0001,
+    MONO              = 0x0002,
+    MENU              = 0x0010,
+    NWF               = 0x0020,
+    NOBORDER          = 0x1000,
+    REMOVEBORDER      = 0x2000
+};
+namespace o3tl
+{
+    template<> struct typed_flags<WindowBorderStyle> : is_typed_flags<WindowBorderStyle, 0x3033> {};
+}
+
+#define KEY_CODE_MASK       ((sal_uInt16)0x0FFF)
+
+// Modifier keys
+#define KEY_SHIFT           ((sal_uInt16)0x1000)
+#define KEY_MOD1            ((sal_uInt16)0x2000)
+#define KEY_MOD2            ((sal_uInt16)0x4000)
+#define KEY_MOD3            ((sal_uInt16)0x8000)
+#define KEY_MODIFIERS_MASK  ((sal_uInt16)0xF000)
+
+
+
 enum class ExtTimeFieldFormat
 {
     Short24H, Long24H
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 1422c14e4165..71ca0d2f282b 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -25,7 +25,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
 #include <tools/wintypes.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/inputctx.hxx>
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 2dedfd4414d8..5ef5fc5d6596 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -24,7 +24,7 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <memory>
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index c82527530c7a..95eba463ef7c 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -51,6 +51,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
 		&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
 		&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
+		&& echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
 		&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry $(if $(ENABLE_DCONF),dconf:* )$(if $(filter WNT,$(OS)),winreg:LOCAL_MACHINE )bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini $(if $(filter WNT,$(OS)),winreg:CURRENT_USER )user:!$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu' \
 		&& echo 'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
 		&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
deleted file mode 100644
index 4ae66a8f05a1..000000000000
--- a/l10ntools/Executable_transex3.mk
+++ /dev/null
@@ -1,40 +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_Executable_Executable,transex3))
-
-$(eval $(call gb_Executable_set_include,transex3,\
-    -I$(SRCDIR)/l10ntools/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_libraries,transex3,\
-    sal \
-))
-
-$(eval $(call gb_Executable_add_scanners,transex3,\
-    l10ntools/source/srclex \
-))
-
-$(call gb_LexTarget_get_scanner_target,l10ntools/source/srclex) : T_LEXFLAGS := -w
-
-$(eval $(call gb_Executable_use_static_libraries,transex3,\
-    transex \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,transex3,\
-    l10ntools/source/export \
-))
-
-$(eval $(call gb_Executable_use_externals,transex3,\
-    boost_headers \
-    libxml2 \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
deleted file mode 100644
index 064b2078479e..000000000000
--- a/l10ntools/Executable_uiex.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_Executable_Executable,uiex))
-
-$(eval $(call gb_Executable_set_include,uiex,\
-    -I$(SRCDIR)/l10ntools/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_libraries,uiex,\
-    sal \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,uiex,\
-    transex \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,uiex,\
-    l10ntools/source/uimerge \
-))
-
-$(eval $(call gb_Executable_use_externals,uiex,\
-    libexslt \
-    libxml2 \
-    libxslt \
-    boost_headers \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index d391ed7463c7..3806c7d6fe59 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -14,10 +14,8 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
     Executable_idxdict \
     Executable_ulfex \
     Executable_cfgex \
-    Executable_uiex \
     Executable_xrmex \
     Executable_localize \
-    Executable_transex3 \
     Executable_pocheck \
     Executable_propex \
     Executable_treex \
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
deleted file mode 100644
index a3f98ef3f2ac..000000000000
--- a/l10ntools/source/export.cxx
+++ /dev/null
@@ -1,1304 +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 "sal/config.h"
-
-#include <cstddef>
-#include <cstring>
-
-#include "helper.hxx"
-#include "srclex.hxx"
-
-#include <cstdio>
-#include <cstdlib>
-#include "common.hxx"
-#include "export.hxx"
-#include "tokens.h"
-#include <iostream>
-#include <memory>
-#include <rtl/strbuf.hxx>
-
-void yyerror( const char * );
-void YYWarning( const char * );
-
-namespace {
-
-MergeDataFile * pMergeDataFile = nullptr; //TODO
-
-namespace global {
-
-OString inputPathname;
-std::unique_ptr< Export > exporter;
-
-}
-
-OString lcl_GetListTyp( const ExportListType nTyp, const bool bUpperCamelCase )
-{
-    OString sType;
-    switch (nTyp)
-    {
-        case ExportListType::String:
-            sType = bUpperCamelCase ? "StringList" : "stringlist";
-            break;
-        case ExportListType::Filter:
-            sType = bUpperCamelCase ? "FilterList" : "filterlist";
-            break;
-        case ExportListType::Item:
-            sType = bUpperCamelCase ? "ItemList" : "itemlist";
-            break;
-        case ExportListType::Paired:
-            sType = bUpperCamelCase ? "PairedList" : "pairedlist";
-            break;
-        default: break;
-    }
-    return sType;
-}
-
-}
-
-extern "C" {
-
-FILE * init(int argc, char ** argv)
-{
-    common::HandledArgs aArgs;
-    if ( !common::handleArguments(argc, argv, aArgs) )
-    {
-        common::writeUsage("transex3","*.src/*.hrc");
-        std::exit(EXIT_FAILURE);
-    }
-    global::inputPathname =  aArgs.m_sInputFile;
-
-    FILE * pFile = std::fopen(global::inputPathname.getStr(), "r");
-    if (pFile == nullptr) {
-        std::fprintf(
-            stderr, "Error: Cannot open file \"%s\"\n",
-            global::inputPathname.getStr());
-        std::exit(EXIT_FAILURE);
-    }
-
-    if (aArgs.m_bMergeMode) {
-        global::exporter.reset(new Export(aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
-                                          aArgs.m_bUTF8BOM));
-    } else {
-        global::exporter.reset(new Export(aArgs.m_sOutputFile));
-    }
-
-    global::exporter->Init();
-
-    return pFile;
-}
-
-int Parse( int nTyp, const char *pTokenText ){
-    global::exporter->Execute( nTyp , pTokenText );
-    return 1;
-}
-
-void Close()
-{
-    global::exporter->GetParseQueue()->Close();
-    global::exporter.reset();
-        // avoid nontrivial Export dtor being executed during exit
-}
-
-int WorkOnTokenSet( int nTyp, char *pTokenText )
-{
-    global::exporter->GetParseQueue()->Push( QueueEntry( nTyp , OString(pTokenText) ) );
-    return 1;
-}
-
-int SetError()
-{
-    // set error at global instance of class Export
-    global::exporter->SetError();
-    return 1;
-}
-
-int GetError()
-{
-    // get error at global instance of class Export
-    if (global::exporter->GetError())
-        return 1;
-    return false;
-}
-
-} // extern "C"
-
-
-// class ResData
-
-
-bool ResData::SetId( const OString& rId, IdLevel nLevel )
-{
-    if ( nLevel > nIdLevel )
-    {
-        nIdLevel = nLevel;
-        sId = rId;
-
-        if ( bChild && bChildWithText )
-        {
-            yyerror("ResId after child definition");
-            SetError();
-        }
-
-        if ( sId.getLength() > 255 )
-        {
-            YYWarning( "LocalId > 255 chars, truncating..." );
-            sId = sId.copy(0, 255).trim();
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-
-// class Export
-
-
-namespace
-{
-
-sal_Int32 lcl_countOccurrences(const OString& text, char c)
-{
-    sal_Int32 n = 0;
-    for (sal_Int32 i = 0;; ++i) {
-        i = text.indexOf(c, i);
-        if (i == -1) {
-            break;
-        }
-        ++n;
-    }
-    return n;
-}
-
-}
-
-Export::Export(const OString &rOutput)
-                :
-                bDefine( false ),
-                bNextMustBeDefineEOL( false ),
-                nLevel( 0 ),
-                nList( ExportListType::NONE ),
-                nListLevel( 0 ),
-                bMergeMode( false ),
-                bError( false ),
-                bReadOver( false ),
-                sFilename( global::inputPathname ),
-                pParseQueue( new ParserQueue( *this ) )
-{
-    aOutput.mPo = new PoOfstream( rOutput, PoOfstream::APP );
-    if (!aOutput.mPo->isOpen())
-    {
-        std::fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr());
-        std::exit(EXIT_FAILURE);
-    }
-}
-
-Export::Export(
-    const OString &rMergeSource, const OString &rOutput,
-    bool bUTF8BOM)
-                :
-                bDefine( false ),
-                bNextMustBeDefineEOL( false ),
-                nLevel( 0 ),
-                nList( ExportListType::NONE ),
-                nListLevel( 0 ),
-                bMergeMode( true ),
-                sMergeSrc( rMergeSource ),
-                bError( false ),
-                bReadOver( false ),
-                sFilename( global::inputPathname ),
-                pParseQueue( new ParserQueue( *this ) )
-{
-    aOutput.mSimple = new std::ofstream();
-    aOutput.mSimple->open(rOutput.getStr(), std::ios_base::out | std::ios_base::trunc);
-    if (!aOutput.mSimple->is_open())
-    {
-        std::fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr());
-        std::exit(EXIT_FAILURE);
-    }
-
-    if ( bUTF8BOM )
-        *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF';
-}
-
-void Export::Init()
-{
-    // resets the internal status, used before parsing another file
-    bDefine = false;
-    bNextMustBeDefineEOL = false;
-    nLevel = 0;
-    nList = ExportListType::NONE;
-    for ( size_t i = 0, n = aResStack.size(); i < n;  ++i )
-        delete aResStack[ i ];
-    aResStack.clear();
-}
-
-Export::~Export()
-{
-    delete pParseQueue;
-    if ( bMergeMode )
-    {
-        aOutput.mSimple->close();
-        delete aOutput.mSimple;
-    }
-    else
-    {
-        aOutput.mPo->close();
-        delete aOutput.mPo;
-    }
-    for ( size_t i = 0, n = aResStack.size(); i < n;  ++i )
-        delete aResStack[ i ];
-    aResStack.clear();
-
-    if ( bMergeMode ) {
-        if ( !pMergeDataFile )
-            pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, true);
-
-        delete pMergeDataFile;
-    }
-}
-
-void Export::Execute( int nToken, const char * pToken )
-{
-
-    OString sToken( pToken );
-    OString sOrig( sToken );
-
-    if ( nToken == CONDITION )
-    {
-        OString sTestToken(pToken);
-        sTestToken = sTestToken.replaceAll("\t", OString()).
-            replaceAll(" ", OString());
-        if (( !bReadOver ) && ( sTestToken.startsWith("#ifndef__RSC_PARSER")))
-            bReadOver = true;
-        else if (( bReadOver ) && ( sTestToken.startsWith("#endif") ))
-            bReadOver = false;
-    }
-    if ((( nToken < FILTER_LEVEL ) || ( bReadOver )) &&
-        (!(( bNextMustBeDefineEOL ) && ( sOrig == "\n" )))) {
-        // this tokens are not mandatory for parsing, so ignore them ...
-        if ( bMergeMode )
-            WriteToMerged( sOrig , false ); // ... or write them directly to dest.
-        return;
-    }
-
-    ResData *pResData = nullptr;
-    if ( nLevel ) {
-        // res. exists at cur. level
-        pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : nullptr;
-    }
-    else if (( nToken != RESOURCE ) &&
-            ( nToken != RESOURCEEXPR ) &&
-            ( nToken != SMALRESOURCE ) &&
-            ( nToken != LEVELUP ) &&
-            ( nToken != NORMDEFINE ) &&
-            ( nToken != RSCDEFINE ) &&
-            ( nToken != CONDITION ) &&
-            ( nToken != PRAGMA ))
-    {
-        // no res. exists at cur. level so return
-        if ( bMergeMode )
-            WriteToMerged( sOrig , false );
-        return;
-    }
-
-    if ( bDefine ) {
-        if (( nToken != EMPTYLINE ) && ( nToken != LEVELDOWN ) && ( nToken != LEVELUP )) {
-            // cur. res. defined in macro
-            if ( bNextMustBeDefineEOL ) {
-                if ( nToken != RSCDEFINELEND ) {
-                    // end of macro found, so destroy res.
-                    bDefine = false;
-                    Execute( LEVELDOWN, "" );
-                    bNextMustBeDefineEOL = false;
-                }
-                else {
-                    // next line also in macro definition
-                    bNextMustBeDefineEOL = false;
-                    if ( bMergeMode )
-                        WriteToMerged( sOrig , false );
-                    return;
-                }
-            }
-        }
-    }
-
-    bool bExecuteDown = false;
-    if ( nToken != LEVELDOWN ) {
-        sal_uInt16 nOpen = 0;
-        sal_uInt16 nClose = 0;
-        bool bReadOver1 = false;
-        for ( sal_Int32 i = 0; i < sToken.getLength(); i++ ) {
-            if ( sToken[i] == '"' )
-                bReadOver1 = !bReadOver1;
-            if ( !bReadOver1 && ( sToken[i] == '{' ))
-                nOpen++;
-        }
-
-        bReadOver1 = false;
-        for ( sal_Int32 i = 0; i < sToken.getLength(); i++ ) {
-            if ( sToken[i] == '"' )
-                bReadOver1 = !bReadOver1;
-            if ( !bReadOver1 && ( sToken[i] == '}' ))
-                nClose++;
-        }
-
-        if ( nOpen < nClose )
-            bExecuteDown = true;
-    }
-
-    bool bWriteToMerged = bMergeMode;
-    switch ( nToken ) {
-
-        case NORMDEFINE:
-            if ( bMergeMode )
-                WriteToMerged( sOrig , false );
-            return;
-        case RSCDEFINE:
-            bDefine = true; // res. defined in macro
-            SAL_FALLTHROUGH;
-        case RESOURCE:
-        case RESOURCEEXPR: {
-            if ( nToken != RSCDEFINE )
-                bNextMustBeDefineEOL = false;
-            // this is the beginning of a new res.
-            nLevel++;
-            if ( nLevel > 1 ) {
-                aResStack[ nLevel - 2 ]->bChild = true;
-            }
-
-            // create new instance for this res. and fill mandatory fields
-
-            pResData = new ResData( FullId() , sFilename );
-            aResStack.push_back( pResData );
-            sToken = sToken.replaceAll("\n", OString()).
-                replaceAll("\r", OString()).
-                replaceAll("{", OString()).replace('\t', ' ');
-            sToken = sToken.trim();
-            OString sTLower = sToken.getToken(0, ' ').toAsciiLowerCase();
-            pResData->sResTyp = sTLower;
-            OString sId( sToken.copy( pResData->sResTyp.getLength() + 1 ));
-            OString sCondition;
-            if ( sId.indexOf( '#' ) != -1 )
-            {
-                // between ResTyp, Id and parentheses is a precomp. condition
-                sCondition = "#";
-                sal_Int32 n = 0;
-                sId = sId.getToken(0, '#', n);
-                sCondition += sId.getToken(0, '#', n);
-            }
-            sId = sId.getToken(0, '/');
-            CleanValue( sId );
-            sId = sId.replaceAll("\t", OString());
-            pResData->SetId( sId, IdLevel::Identifier );
-            if (!sCondition.isEmpty())
-            {
-                Execute( CONDITION, "");  // execute the precomp. condition
-            }
-        }
-        break;
-        case SMALRESOURCE: {
-            // this is the beginning of a new res.
-            bNextMustBeDefineEOL = false;
-            nLevel++;
-            if ( nLevel > 1 ) {
-                aResStack[ nLevel - 2 ]->bChild = true;
-            }
-
-            // create new instance for this res. and fill mandatory fields
-
-            pResData = new ResData( FullId() , sFilename );
-            aResStack.push_back( pResData );
-            sToken = sToken.replaceAll("\n", OString()).
-                replaceAll("\r", OString()).
-                replaceAll("{", OString()).
-                replaceAll("\t", OString()).
-                replaceAll(" ", OString()).
-                replaceAll("\\", OString()).toAsciiLowerCase();
-            pResData->sResTyp = sToken;
-        }
-        break;
-        case LEVELUP: {
-            // push
-            if ( nList != ExportListType::NONE )
-            {
-                nListLevel++;
-                break;
-            }
-
-            OString sLowerTyp;
-            if ( pResData )
-                sLowerTyp = "unknown";
-            nLevel++;
-            if ( nLevel > 1 ) {
-                aResStack[ nLevel - 2 ]->bChild = true;
-            }
-
-            ResData *pNewData = new ResData( FullId() , sFilename );
-            pNewData->sResTyp = sLowerTyp;
-            aResStack.push_back( pNewData );
-        }
-        break;
-        case LEVELDOWN: {
-            // pop
-            if ( nList == ExportListType::NONE || !nListLevel ) {
-                if ( nLevel ) {
-                    if ( bDefine && (nLevel == 1 )) {
-                        bDefine = false;
-                        bNextMustBeDefineEOL = false;
-                    }
-                    WriteData( pResData );
-                    ResStack::iterator it = aResStack.begin();
-                    ::std::advance( it, nLevel-1 );
-                    delete *it;
-                    aResStack.erase( it );
-                    nLevel--;
-                }
-                if( nList != ExportListType::NONE )
-                {
-                    nList = ExportListType::NONE;
-                    nListLevel = 1;
-                }
-            }
-            else
-            {
-                if ( bDefine )
-                    bNextMustBeDefineEOL = true;
-                nListLevel--;
-            }
-        }
-        break;
-        case ASSIGNMENT:
-        {
-            // interpret different types of assignement
-            sal_Int32 n = 0;
-            OString sKey = sToken.getToken(0, '=', n).
-                replaceAll(" ", OString()).
-                replaceAll("\t", OString());
-            OString sValue = sToken.getToken(0, '=', n);
-            CleanValue( sValue );
-            sKey = sKey.toAsciiUpperCase();
-            if (sKey == "IDENTIFIER")
-            {
-                OString sId(
-                    sValue.replaceAll("\t", OString()).
-                    replaceAll(" ", OString()));
-                pResData->SetId(sId, IdLevel::Identifier);
-            }
-            else if (sKey =="STRINGLIST")
-            {
-                nList = ExportListType::String;
-                nListLevel = 1;
-            }
-            else if (sKey == "FILTERLIST")
-            {
-                nList = ExportListType::Filter;
-                nListLevel = 1;
-            }
-            if (sToken.indexOf( '{' ) != -1
-                && (lcl_countOccurrences(sToken, '{')
-                    > lcl_countOccurrences(sToken, '}')))
-            {
-                Parse( LEVELUP, "" );
-            }
-         }
-        break;
-        case LISTASSIGNMENT:
-        {
-            OString sTmpToken(
-                sToken.replaceAll(" ", OString()).toAsciiLowerCase());
-            sal_Int32 nPos = sTmpToken.indexOf("[en-us]=");
-            if (nPos != -1) {
-                OString sKey(
-                    sTmpToken.copy(0 , nPos).replaceAll(" ", OString()).
-                    replaceAll("\t", OString()));
-                OString sValue = sToken.getToken(1, '=');
-                CleanValue( sValue );
-                sKey = sKey.toAsciiUpperCase();
-                if (sKey == "STRINGLIST")
-                {
-                    nList = ExportListType::String;
-                }
-                else if (sKey == "FILTERLIST")
-                {
-                    nList = ExportListType::Filter;
-                }
-                else if (sKey == "PAIREDLIST")
-                {
-                    nList = ExportListType::Paired;
-                }
-                else if (sKey == "ITEMLIST")
-                {
-                    nList = ExportListType::Item;
-                }
-                if( nList != ExportListType::NONE )
-                {
-                    nListLevel = 1;
-                }
-            }
-        }
-        break;
-        case TEXT:
-        case LISTTEXT_:
-        case LISTTEXT: {
-            // this is an entry for a List
-            if ( nList != ExportListType::NONE )
-            {
-                SetChildWithText();
-                InsertListEntry( sOrig );
-            }
-        }
-        break;
-        case LONGTEXTLINE:
-        case TEXTLINE:
-            if ( nLevel )
-            {
-                CutComment( sToken );
-
-                // this is a text line!!!
-                OString t(sToken.getToken(0, '='));
-                OString sKey(
-                    t.getToken(0, '[').replaceAll(" ", OString()).
-                    replaceAll("\t", OString()));
-                OString sText( GetText( sToken, nToken ));
-                OString sLang;
-                if ( sToken.getToken(0, '=').indexOf('[') != -1 )
-                {
-                    sLang = sToken.getToken(0, '=').getToken(1, '[').
-                        getToken(0, ']');
-                    CleanValue( sLang );
-                }
-                OString sLangIndex = sLang;
-                OString sOrigKey = sKey;
-                if ( !sText.isEmpty() && !sLang.isEmpty() )
-                {
-                    sKey = sKey.toAsciiUpperCase();
-                    if (sKey == "TEXT" || sKey == "MESSAGE"  || sKey == "CUSTOMUNITTEXT")
-                    {
-                        SetChildWithText();
-                        if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
-                            pResData->SetId( sText, IdLevel::Text );
-
-                        pResData->bText = true;
-                        pResData->sTextTyp = sOrigKey;
-                        if ( !bMergeMode )
-                        {
-                            pResData->sText[ sLangIndex ] = sText;
-                        }
-                    }
-                    else if ( sKey == "QUICKHELPTEXT" ) {
-                        SetChildWithText();
-                        pResData->bQuickHelpText = true;
-                        if ( !bMergeMode )
-                        {
-                            pResData->sQuickHelpText[ sLangIndex ] = sText;
-                        }
-                    }
-                    else if ( sKey == "TITLE" ) {
-                        SetChildWithText();
-                        pResData->bTitle = true;
-                        if ( !bMergeMode )
-                        {
-                            pResData->sTitle[ sLangIndex ] = sText;
-                        }
-                    }
-                }
-            }
-        break;
-        case APPFONTMAPPING:
-        break;
-        case RSCDEFINELEND:
-        break;
-        case CONDITION: {
-            if ( nLevel && pResData ) {
-                WriteData( pResData, true );
-            }
-        }
-        break;
-        case EMPTYLINE : {
-            if ( bDefine ) {
-                bNextMustBeDefineEOL = false;
-                bDefine = false;
-                while ( nLevel )
-                    Parse( LEVELDOWN, "" );
-            }
-        }
-        break;
-        case PRAGMA : {
-            std::fprintf(stderr, "ERROR: archaic PRAGMA %s\n", sToken.getStr());
-            std::exit(EXIT_FAILURE);
-        }
-        break;
-        }
-    if ( bWriteToMerged ) {
-        // the current token must be written to dest. without merging
-
-        if( bDefine && sOrig.getLength() > 2 ){
-            for( sal_Int32 n = 0; n < sOrig.getLength(); n++ ){
-                if( sOrig[n] == '\n' && sOrig[n-1] != '\\'){
-                    sOrig = sOrig.replaceAt(n++, 0, "\\");
-                }
-            }
-        }
-        WriteToMerged( sOrig , false);
-    }
-
-    if ( bExecuteDown ) {
-        Parse( LEVELDOWN, "" );
-    }
-}
-
-void Export::CutComment( OString &rText )
-{
-    if (rText.indexOf("//") != -1) {
-        OString sWork(rText.replaceAll("\\\"", "XX"));
-        bool bInner = false;
-        for (sal_Int32 i = 0; i < sWork.getLength() - 1; ++i) {
-            if (sWork[i] == '"') {
-                bInner = !bInner;
-            } else if (sWork[i] == '/' && !bInner && sWork[i + 1] == '/' ) {
-                rText = rText.copy(0, i);
-                break;
-            }
-        }
-    }
-}
-
-void Export::WriteData( ResData *pResData, bool bCreateNew )
-{
-    if ( bMergeMode ) {
-        MergeRest( pResData );
-        return;
-    }
-
-       // mandatory to export: en-US
-
-     if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty())
-        ||
-        (  !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty())
-         ||
-        (  !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty()))
-
-       {
-        OString sGID = pResData->sGId;
-        OString sLID;
-        if (sGID.isEmpty())
-            sGID = pResData->sId;
-        else
-            sLID = pResData->sId;
-
-        OString sXText = pResData->sText[ SOURCE_LANGUAGE ];
-        OString sXHText = pResData->sText[ X_COMMENT ];
-        OString sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
-        OString sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
-
-        if( !sXText.isEmpty() )
-        {
-            ConvertExportContent(sXText);
-            ConvertExportContent(sXHText);
-            common::writePoEntry(
-                "Transex3", *aOutput.mPo, global::inputPathname,
-                pResData->sResTyp, sGID, sLID, sXHText, sXText);
-        }
-        if( !sXQHText.isEmpty() )
-        {
-            ConvertExportContent(sXQHText);
-            common::writePoEntry(
-                "Transex3", *aOutput.mPo, global::inputPathname, pResData->sResTyp,
-                sGID, sLID, OString(), sXQHText, PoEntry::TQUICKHELPTEXT );
-        }
-        if( !sXTitle.isEmpty() )
-        {
-            ConvertExportContent(sXTitle);
-            common::writePoEntry(
-                "Transex3", *aOutput.mPo, global::inputPathname, pResData->sResTyp,
-                sGID, sLID, OString(), sXTitle, PoEntry::TTITLE );
-        }
-
-        if ( bCreateNew ) {
-            pResData->sText[ SOURCE_LANGUAGE ]         = "";
-            pResData->sQuickHelpText[ SOURCE_LANGUAGE ]= "";
-            pResData->sTitle[ SOURCE_LANGUAGE ]        = "";
-        }
-    }
-
-    if( nList != ExportListType::NONE )
-    {
-        WriteExportList( pResData, pResData->m_aList, nList );
-        if ( bCreateNew )
-            pResData->m_aList.clear();
-    }
-}
-
-OString Export::GetPairedListID(const OString& rText)
-{
-// < "STRING" ; IDENTIFIER ; > ;
-    return rText.getToken(1, ';').toAsciiUpperCase().replace('\t', ' ').trim();
-}
-
-OString Export::GetPairedListString(const OString& rText)
-{
-// < "STRING" ; IDENTIFIER ; > ;
-    OString sString(rText.getToken(0, ';').replace('\t', ' '));
-    sString = sString.trim();
-    OString s1(sString.copy(sString.indexOf('"') + 1));
-    sString = s1.copy(0, s1.lastIndexOf('"'));
-    return sString.trim();
-}
-
-OString Export::StripList(const OString & rText)
-{
-    OString s1 = rText.copy( rText.indexOf('\"') + 1);
-    return s1.copy( 0 , s1.lastIndexOf('\"'));
-}
-
-void Export::WriteExportList(ResData *pResData, ExportList& rExportList,
-    const ExportListType nTyp)
-{
-    OString sGID(pResData->sGId);
-    if (sGID.isEmpty())
-        sGID = pResData->sId;
-    else {
-        sGID += ".";
-        sGID += pResData->sId;
-        while (sGID.endsWith(".")) {
-            sGID = sGID.copy(0, sGID.getLength() - 1);
-        }
-    }
-
-    for ( size_t i = 0; i < rExportList.size(); i++ )
-    {
-        OString sLID;
-        OString sText(rExportList[ i ]);
-
-        // Strip PairList Line String
-        if (nTyp == ExportListType::Paired)
-        {
-            sLID = GetPairedListID( sText );
-            sText = GetPairedListString( sText );
-        }
-        else
-        {
-            sText = StripList( sText );
-            if( sText == "\\\"" )
-                sText = "\"";
-        }
-        ConvertExportContent(sText);
-
-        if (nTyp != ExportListType::Paired)
-            sLID = sText;
-
-        OString sType = lcl_GetListTyp( nList, false );
-
-        common::writePoEntry(
-            "Transex3", *aOutput.mPo, global::inputPathname,
-            sType, sGID, sLID, OString(), sText);
-    }
-}
-
-OString Export::FullId()
-{
-    OStringBuffer sFull;
-    if ( nLevel > 1 )
-    {
-        sFull.append(aResStack[ 0 ]->sId);
-        for ( size_t i = 1; i < nLevel - 1; ++i )
-        {
-            OString sToAdd = aResStack[ i ]->sId;
-            if (!sToAdd.isEmpty())
-                sFull.append('.').append(sToAdd);
-        }
-    }
-    if (sFull.getLength() > 255)
-    {
-        printf("GroupID = %s\n", sFull.getStr());
-        yyerror("GroupId > 255 chars");
-    }
-
-    return sFull.makeStringAndClear();
-}
-
-void Export::InsertListEntry(const OString &rLine)
-{
-    ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : nullptr;
-
-    if (!pResData)
-        std::exit(EXIT_FAILURE);
-
-    pResData->m_aList.push_back(rLine);
-}
-
-void Export::CleanValue( OString &rValue )
-{
-    while ( !rValue.isEmpty()) {
-        if (( rValue[0] == ' ' ) || ( rValue[0] == '\t' ))
-            rValue = rValue.copy( 1 );
-        else
-            break;
-    }
-
-    if ( !rValue.isEmpty()) {
-        for ( sal_Int32 i = rValue.getLength() - 1; i > 0; i-- ) {
-            if (( rValue[i] == ' ' ) || ( rValue[i] == '\t' ) ||
-                ( rValue[i] == '\n' ) || ( rValue[i] == ';' ) ||
-                ( rValue[i] == '{' ) || ( rValue[i] == '\\' ) ||
-                ( rValue[i] == '\r' ))
-                rValue = rValue.copy(0, i);
-            else
-                break;
-        }
-    }
-}
-
-enum class TextState { Text=1, Macro };
-
-OString Export::GetText(const OString &rSource, int nToken)
-{
-    OString sReturn;
-    switch ( nToken )
-    {
-        case TEXTLINE:
-        case LONGTEXTLINE:
-        {
-            OString sTmp(rSource.copy(rSource.indexOf('=')));
-            CleanValue( sTmp );
-            sTmp = sTmp.replaceAll("\n", OString()).
-                replaceAll("\r", OString()).
-                replaceAll("\\\\\"", "-=<[BSlashBSlashHKom]>=-\"").
-                replaceAll("\\\"", "-=<[Hochkomma]>=-").
-                replaceAll("\\", "-=<[0x7F]>=-").
-                replaceAll("\\0x7F", "-=<[0x7F]>=-");
-
-            TextState nState = TextState::Text;
-            for (sal_Int32 i = 1; i <= lcl_countOccurrences(sTmp, '"'); ++i)
-            {
-                OString sToken(sTmp.getToken(i, '"'));
-                if (!sToken.isEmpty()) {
-                    if ( nState == TextState::Text ) {
-                        sReturn += sToken;
-                        nState = TextState::Macro;
-                    }
-                    else {
-                        sToken = sToken.replace('\t', ' ');
-                        for (;;) {
-                            sal_Int32 n = 0;
-                            sToken = sToken.replaceFirst("  ", " ", &n);
-                            if (n == -1) {
-                                break;
-                            }
-                        }
-                        sToken = sToken.trim();
-                        if (!sToken.isEmpty()) {
-                            sReturn += "\\\" ";
-                            sReturn += sToken;
-                            sReturn += " \\\"";
-                        }
-                        nState = TextState::Text;
-                    }
-                }
-            }
-
-            sReturn = sReturn.replaceAll("-=<[0x7F]>=-", "").
-                replaceAll("-=<[Hochkomma]>=-", "\"").
-                replaceAll("-=<[BSlashBSlashHKom]>=-", "\\\\").
-                replaceAll("\\\\", "-=<[BSlashBSlash]>=-").
-                replaceAll("-=<[BSlashBSlash]>=-", "\\");
-        }
-        break;
-    }
-    return sReturn;
-}
-
-void Export::WriteToMerged(const OString &rText , bool bSDFContent)
-{
-    OString sText(rText);
-    for (;;) {
-        sal_Int32 n = 0;
-        sText = sText.replaceFirst(" \n", "\n", &n);
-        if (n == -1) {
-            break;
-        }
-    }
-    if (pParseQueue->bNextIsM && bSDFContent && sText.getLength() > 2) {
-        for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
-            if (sText[n] == '\n' && sText[n - 1] != '\\') {
-                sText = sText.replaceAt(n++, 0, "\\");
-            }
-        }
-    } else if (pParseQueue->bLastWasM && sText.getLength() > 2) {
-        for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
-            if (sText[n] == '\n' && sText[n - 1] != '\\') {
-                sText = sText.replaceAt(n++, 0, "\\");
-            }
-            if (sText[n] == '\n') {
-                pParseQueue->bMflag = true;
-            }
-        }
-    } else if (pParseQueue->bCurrentIsM && bSDFContent && sText.getLength() > 2)
-    {
-        for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
-            if (sText[n] == '\n' && sText[n - 1] != '\\') {
-                sText = sText.replaceAt(n++, 0, "\\");
-                pParseQueue->bMflag = true;
-            }
-        }
-    } else if (pParseQueue->bMflag) {
-        for (sal_Int32 n = 1; n < sText.getLength(); ++n) {
-            if (sText[n] == '\n' && sText[n - 1] != '\\') {
-                sText = sText.replaceAt(n++, 0, "\\");
-            }
-        }
-    } for (sal_Int32 i = 0; i < sText.getLength(); ++i) {
-        if (sText[i] == '\n') {
-            *aOutput.mSimple << '\n';
-        } else {
-            char cChar = sText[i];
-            *aOutput.mSimple << cChar;
-        }
-    }
-}
-
-void Export::ConvertMergeContent( OString &rText )
-{
-    rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
-                                            // (Maybe next PO update solve this)
-    rText =
-        helper::escapeAll(
-            rText.replaceAll("","\\0x7F"),
-            "\n""\t""\\""\"","\\n""\\t""\\\\""\\\"");
-
-    rText = "\"" + rText + "\"";
-}
-
-void Export::ConvertExportContent( OString& rText )
-{
-    rText = helper::unEscapeAll(rText,"\\n""\\t""\\\\""\\\"","\n""\t""\\""\"");
-}
-
-void Export::ResData2Output( MergeEntrys *pEntry, StringType nType, const OString& rTextType )
-{
-    bool bAddSemicolon = false;
-    bool bFirst = true;
-    OString sCur;
-
-    for( size_t n = 0; n < aLanguages.size(); n++ ){
-        sCur = aLanguages[ n ];
-
-        OString sText;
-        bool bText = pEntry->GetText( sText, nType, sCur , true );
-        if ( bText && !sText.isEmpty() ) {
-            OStringBuffer sOutput;
-            if ( bNextMustBeDefineEOL)  {
-                if ( bFirst )
-                    sOutput.append("\t\\\n");
-                else
-                    sOutput.append(";\t\\\n");
-            }
-            bFirst=false;
-            sOutput.append("\t" + rTextType);
-
-            if ( !sCur.equalsIgnoreAsciiCase("en-US") ) {
-                sOutput.append("[ " + sCur + " ] ");
-            }
-
-            ConvertMergeContent( sText );
-            sOutput.append("= " + sText);
-
-            if ( bDefine )
-                sOutput.append(";\\\n");
-            else if ( !bNextMustBeDefineEOL )
-                sOutput.append(";\n");
-            else
-                bAddSemicolon = true;
-            for ( size_t j = 1; j < nLevel; j++ )
-                sOutput.append("\t");
-            WriteToMerged( sOutput.makeStringAndClear() , true );
-        }
-    }
-
-
-    if ( bAddSemicolon ) {
-        WriteToMerged( ";" , false );
-    }
-}
-
-void Export::MergeRest( ResData *pResData )
-{
-    if ( !pMergeDataFile ){
-        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, true );
-        aLanguages = pMergeDataFile->GetLanguages();
-
-    }
-
-    MergeEntrys *pEntry = nullptr;
-    if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
-        pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
-
-    if ( pEntry )
-    {
-        if ( pResData->bText )
-            ResData2Output( pEntry, StringType::Text, pResData->sTextTyp );
-
-        if ( pResData->bQuickHelpText )
-            ResData2Output( pEntry, StringType::QuickHelpText, OString("QuickHelpText") );
-
-        if ( pResData->bTitle )
-            ResData2Output( pEntry, StringType::Title, OString("Title") );
-    }
-
-    // Merge Lists
-    if ( nList != ExportListType::NONE )
-    {
-        OString sOldId = pResData->sId;
-        OString sOldGId = pResData->sGId;
-        OString sOldTyp = pResData->sResTyp;
-
-        // Set pResData so we can find the corresponding string
-        if (!pResData->sGId.isEmpty())
-            pResData->sGId = pResData->sGId + OString('.');
-        pResData->sGId = pResData->sGId + pResData->sId;
-
-        pResData->sResTyp = lcl_GetListTyp( nList, false );
-
-        OString sSpace;
-        for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
-            sSpace += "\t";
-
-        OString sCur;
-        for( size_t n = 0; n < aLanguages.size(); n++ )
-        {
-            sCur = aLanguages[ n ];
-
-            sal_uInt16 nLIndex = 0;
-            sal_uInt16 nMaxIndex = pResData->m_aList.size();
-            while( nLIndex < nMaxIndex )
-            {
-                if ( nLIndex == 0 )
-                {
-                    OStringBuffer sHead;
-                    if ( bNextMustBeDefineEOL )
-                        sHead.append("\\\n\t");
-                    sHead.append(sSpace + lcl_GetListTyp( nList, true ) + " [ " + sCur + " ] ");
-
-                    if ( bDefine || bNextMustBeDefineEOL )
-                    {
-                        sHead.append("= \\\n" + sSpace + "\t{\\\n\t");
-                    }
-                    else
-                    {
-                        sHead.append("= \n" + sSpace + "\t{\n\t");
-                    }
-                    WriteToMerged(sHead.makeStringAndClear() , true);
-                }
-
-                OString sLine = pResData->m_aList[ nLIndex ];
-                if ( sLine.indexOf( '>' ) != -1 )
-                {
-                    if ((( sLine.indexOf( '{' ) == -1 ) ||
-                        ( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
-                        (( sLine.indexOf( '<' ) == -1 ) ||
-                        ( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
-                    {
-                        sLine = sLine.replaceFirst("\"", "< \"" );
-                    }
-                }
-
-                // Set matching identifier
-                if ( nList == ExportListType::Paired )
-                {
-                    pResData->sId = GetPairedListID ( sLine );
-                }
-                else
-                {
-                    pResData->sId =
-                        sLine.copy(
-                        sLine.indexOf('"')+1,
-                        sLine.lastIndexOf('"')-sLine.indexOf('"')-1);
-                    ConvertExportContent( pResData->sId );
-                }
-
-                MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
-
-                if( pEntrys )
-                {
-                    OString sText;
-                    pEntrys->GetText( sText, StringType::Text, sCur );
-                    if( !sText.isEmpty())
-                    {
-                        ConvertMergeContent( sText );
-                        sLine =
-                            sLine.copy( 0 , sLine.indexOf('"') ) +
-                            sText +
-                            sLine.copy( sLine.lastIndexOf('"') + 1 );
-                    }
-                }
-
-                OString sText1( "\t" );
-                sText1 += sLine;
-                if ( bDefine || bNextMustBeDefineEOL )
-                    sText1 += " ;\\\n";
-                else
-                    sText1 += " ;\n";
-                sText1 += sSpace;
-                sText1 += "\t";
-                WriteToMerged( sText1 ,true );
-                ++nLIndex;
-            }
-
-            if ( nLIndex > 0 )
-            {
-                OString sFooter;
-                if (!sSpace.isEmpty())
-                    sFooter = sSpace.copy(1);
-
-                if ( bNextMustBeDefineEOL )
-                    sFooter += "};";
-                else if ( !bDefine )
-                    sFooter += "};\n\t";
-                else
-                    sFooter += "\n\n";
-                WriteToMerged( sFooter ,true );
-            }
-        }
-        pResData->sId = sOldId;
-        pResData->sGId = sOldGId;
-        pResData->sResTyp = sOldTyp;
-    }
-    pParseQueue->bMflag = false;
-}
-
-void Export::SetChildWithText()
-{
-    if ( aResStack.size() > 1 ) {
-        for ( size_t i = 0; i < aResStack.size() - 1; i++ ) {
-            aResStack[ i ]->bChildWithText = true;
-        }
-    }
-}
-
-void ParserQueue::Push( const QueueEntry& aEntry )
-{
-    sal_Int32 nLen = aEntry.sLine.getLength();
-
-    if( !bStart ){
-        aQueueCur->push( aEntry );
-        if( nLen > 1 && aEntry.sLine[nLen-1] == '\n' )
-            bStart = true;
-        else if ( aEntry.nTyp != IGNOREDTOKENS ){
-            if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){
-                // Next is Macro
-                bCurrentIsM = true;
-             }else{
-                // Next is no Macro
-                bCurrentIsM = false;
-             }
-        }
-    }
-    else{
-        aQueueNext->push( aEntry );
-        if( nLen > 1 && aEntry.sLine[nLen-1] != '\n' ){
-            if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){
-                // Next is Macro
-                bNextIsM = true;
-            }
-            else{
-                // Next is no Macro
-                bNextIsM = false;
-            }
-        }else if( nLen > 2 && aEntry.sLine[nLen-1] == '\n' ){
-            if( aEntry.nTyp != IGNOREDTOKENS ){
-                if( nLen > 2 && ( aEntry.sLine[nLen-2] == '\\') ){
-                    // Next is Macro
-                    bNextIsM = true;
-                }
-                else{
-                    // Next is no Macro
-                    bNextIsM = false;
-                }
-            }
-            // Pop current
-            Pop( *aQueueCur );
-            bLastWasM = bCurrentIsM;
-            // next -> current
-            bCurrentIsM = bNextIsM;
-            std::queue<QueueEntry>* aQref = aQueueCur;
-            aQueueCur = aQueueNext;
-            aQueueNext = aQref;
-
-        }
-
-        else{
-            // Pop current
-            Pop( *aQueueCur );
-            bLastWasM = bCurrentIsM;
-            // next -> current
-            bCurrentIsM = bNextIsM;
-            std::queue<QueueEntry>* aQref = aQueueCur;
-            aQueueCur = aQueueNext;
-            aQueueNext = aQref;
-        }
-    }
-}
-
-void ParserQueue::Close(){
-    // Pop current
-    Pop( *aQueueCur );
-    // next -> current
-    bLastWasM = bCurrentIsM;
-    bCurrentIsM = bNextIsM;
-    std::queue<QueueEntry>* aQref = aQueueCur;
-    aQueueCur = aQueueNext;
-    aQueueNext = aQref;
-    bNextIsM = false;
-    Pop( *aQueueNext );
-};
-
-void ParserQueue::Pop( std::queue<QueueEntry>& aQueue )
-{
-    while (!aQueue.empty())
-    {
-        QueueEntry aEntry = aQueue.front();
-        aQueue.pop();
-        aExport.Execute(aEntry.nTyp, aEntry.sLine.getStr());
-    }
-}
-
-ParserQueue::ParserQueue( Export& aExportObj )
-        :
-          bCurrentIsM( false ),
-          bNextIsM( false ) ,
-          bLastWasM( false ),
-          bMflag( false ) ,
-          aExport( aExportObj ) ,
-          bStart( false )
-{
-          aQueueNext = new std::queue<QueueEntry>;
-          aQueueCur  = new std::queue<QueueEntry>;
-}
-
-
-ParserQueue::~ParserQueue()
-{
-    delete aQueueNext;
-    delete aQueueCur;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index 496cbac4d40c..b9eec92733a2 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -490,10 +490,6 @@ ${MYCMD} --files sw/source/uibase/wrtsh/wrtsh.src
 
 ${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src lockfailed.src lockcorrupt.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src trylater.src
 
-${MYCMD} --files vcl/source/edit/textundo.src
-
-${MYCMD} --base vcl/source/src --files app.src btntext.src fpicker.src helptext.src images.src menu.src print.src stdtext.src throbber.src units.src
-
 ${MYCMD} --files wizards/source/euro/euro.src
 
 ${MYCMD} --files wizards/source/formwizard/dbwizres.src
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index b977562fba2f..42c6184496fb 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -83,8 +83,17 @@ void handleCommand(
     const OString& rInPath, const OString& rOutPath,
     const OString& rExecutable)
 {
-    OStringBuffer buf(OString(getenv("WORKDIR_FOR_BUILD")));
-    buf.append("/LinkTarget/Executable/");
+    OStringBuffer buf;
+    if (rExecutable == "uiex" || rExecutable == "hrcex")
+    {
+        buf.append(OString(getenv("SRC_ROOT")));
+        buf.append("/solenv/bin/");
+    }
+    else
+    {
+        buf.append(OString(getenv("WORKDIR_FOR_BUILD")));
+        buf.append("/LinkTarget/Executable/");
+    }
     buf.append(rExecutable);
     buf.append(" -i ");
     buf.append(rInPath);
@@ -143,9 +152,22 @@ void InitPoFile(
     aPoOutPut.close();
 }
 
-bool handleFile(
-    const OString& rProject, const OUString& rUrl,
-    const OString& rPotDir, bool bInitPoFile )
+bool fileExists(const OString& fileName)
+{
+    FILE *f = fopen(fileName.getStr(), "r");
+
+    if (f != nullptr)
+    {
+        fclose(f);
+        return true;
+    }
+
+    return false;
+}
+
+OString gDestRoot;
+
+bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rPotDir)
 {
     struct Command {
         OUStringLiteral extension;
@@ -153,8 +175,7 @@ bool handleFile(
         bool positive;
     };
     static Command const commands[] = {
-        { OUStringLiteral(".src"), "transex3", false },
-        { OUStringLiteral(".hrc"), "transex3", true },
+        { OUStringLiteral(".hrc"), "hrcex", false },
         { OUStringLiteral(".ulf"), "ulfex", false },
         { OUStringLiteral(".xcu"), "cfgex", false },
         { OUStringLiteral(".xrm"), "xrmex", false },
@@ -182,13 +203,35 @@ bool handleFile(
                     }
                     sInPath = OUStringToOString( sInPathTmp, RTL_TEXTENCODING_UTF8 );
                 }
-                OString sOutPath = rPotDir.concat(".pot");
+                OString sOutPath;
+                if (commands[i].executable == "uiex" || commands[i].executable == "hrcex")
+                    sOutPath = gDestRoot + "/" + rProject + "/messages.pot";
+                else
+                    sOutPath = rPotDir.concat(".pot");
 
-                if ( bInitPoFile )
-                {
+                if (!fileExists(sOutPath))
                     InitPoFile(rProject, sInPath, rPotDir, sOutPath);
-                }
                 handleCommand(sInPath, sOutPath, commands[i].executable);
+
+                {
+                    //Delete pot file if it contain only the header
+                    PoIfstream aPOStream(sOutPath);
+                    PoEntry aPO;
+                    aPOStream.readEntry( aPO );
+                    bool bDel = aPOStream.eof();
+                    aPOStream.close();
+                    if (bDel)
+                    {
+                        if ( system(OString("rm " + sOutPath).getStr()) != 0 )
+                        {
+                            cerr
+                                << "Error: Cannot remove entryless pot file: "
+                                << sOutPath << "\n";
+                                throw false; //TODO
+                        }
+                    }
+                }
+
                 return true;
             }
             break;
@@ -206,40 +249,13 @@ void handleFilesOfDir(
 
     typedef std::vector<OUString>::const_iterator citer_t;
 
-    bool bFirstLocFile = true; ///< First file in directory which needs localization
-
     for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt )
-    {
-        if (handleFile( rProject, *aIt, rPotDir, bFirstLocFile))
-        {
-            bFirstLocFile = false;
-        }
-    }
-
-    if( !bFirstLocFile )
-    {
-        //Delete pot file if it contain only the header
-        OString sPotFile = rPotDir.concat(".pot");
-        PoIfstream aPOStream( sPotFile );
-        PoEntry aPO;
-        aPOStream.readEntry( aPO );
-        bool bDel = aPOStream.eof();
-        aPOStream.close();
-        if( bDel )
-        {
-            if ( system(OString("rm " + sPotFile).getStr()) != 0 )
-            {
-                cerr
-                    << "Error: Cannot remove entryless pot file: "
-                    << sPotFile << "\n";
-                    throw false; //TODO
-            }
-        }
-    }
+        handleFile(rProject, *aIt, rPotDir);
 }
 
 bool includeProject(const OString& rProject) {
     static const char *projects[] = {
+        "include",
         "accessibility",
         "avmedia",
         "basctl",
@@ -373,9 +389,19 @@ void handleDirectory(
         }
     }
 
+    OString aPotDir(rPotDir);
     if( !aFileNames.empty() )
     {
-        handleFilesOfDir( aFileNames, rProject, rPotDir );
+        OString aProject(rProject);
+        if (aProject == "include" && nLevel > 1)
+        {
+            aProject = aPotDir.copy(aPotDir.lastIndexOf('/') + 1);
+            aPotDir = aPotDir.copy(0, aPotDir.lastIndexOf("include")) + aProject + "/messages";
+        }
+        if (aProject != "include")
+        {
+            handleFilesOfDir(aFileNames, aProject, aPotDir);
+        }
     }
 
     if (dir.close() != osl::FileBase::E_None) {
@@ -386,7 +412,7 @@ void handleDirectory(
     //Remove empty pot directory
     OUString sPoPath =
         OStringToOUString(
-            rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
+            aPotDir.copy(0,aPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
     OUString sPoUrl;
     if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
         != osl::FileBase::E_None)
@@ -427,7 +453,8 @@ void handleProjects(char * sSourceRoot, char const * sDestRoot)
             << "\n";
         throw false; //TODO
     }
-    handleDirectory(rootUrl, 0, OString(), OString(sDestRoot));
+    gDestRoot = OString(sDestRoot);
+    handleDirectory(rootUrl, 0, OString(), gDestRoot);
 }
 }
 
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index f8a191adb10d..f2ad01b3f68f 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -484,16 +484,9 @@ namespace
 // Check the validity of read entry
 bool lcl_CheckInputEntry(const GenPoEntry& rEntry)
 {
-    const OString sMsgCtxt = rEntry.getMsgCtxt();
-    const sal_Int32 nFirstEndLine = sMsgCtxt.indexOf('\n');
-    const sal_Int32 nLastEndLine = sMsgCtxt.lastIndexOf('\n');
-    const sal_Int32 nLastDot = sMsgCtxt.lastIndexOf('.');
-    const OString sType = sMsgCtxt.copy( nLastDot + 1 );
     return !rEntry.getReference().isEmpty() &&
-            nFirstEndLine > 0 &&
-            nLastDot - nLastEndLine > 1 &&
-            (sType == "text" || sType == "quickhelptext" || sType == "title")&&
-            !rEntry.getMsgId().isEmpty();
+           !rEntry.getMsgCtxt().isEmpty() &&
+           !rEntry.getMsgId().isEmpty();
 }
 
 }
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
deleted file mode 100644
index 0bc13697cd8e..000000000000
--- a/l10ntools/source/uimerge.cxx
+++ /dev/null
@@ -1,215 +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 <sal/main.h>
-
-#include <osl/file.hxx>
-
-#include <rtl/strbuf.hxx>
-
-#include <libexslt/exslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltutils.h>
-
-#include <stdio.h>
-
-#include "common.hxx"
-#include "helper.hxx"
-#include "export.hxx"
-#include "tokens.h"
-#include "po.hxx"
-#include <iostream>
-#include <fstream>
-#include <vector>
-
-static OString sInputFileName;
-static OString sOutputFile;
-
-int extractTranslations()
-{
-    PoOfstream aPOStream( sOutputFile, PoOfstream::APP);
-    if (!aPOStream.isOpen())
-    {
-        fprintf(stderr, "cannot open %s\n", sOutputFile.getStr());
-        return 1;
-    }
-
-    exsltRegisterAll();
-
-    OString sStyleSheet = OString(getenv("SRC_ROOT"))  + OString("/solenv/bin/uilangfilter.xslt");
-
-    xsltStylesheetPtr stylesheet = xsltParseStylesheetFile (reinterpret_cast<const xmlChar *>(sStyleSheet.getStr()));
-
-    xmlDocPtr doc = xmlParseFile(sInputFileName.getStr());
-
-    xmlDocPtr res = xsltApplyStylesheet(stylesheet, doc, nullptr);
-
-    for( xmlNodePtr nodeLevel1 = res->children; nodeLevel1 != nullptr; nodeLevel1 = nodeLevel1->next)
-    {
-        for( xmlNodePtr nodeLevel2 = nodeLevel1->children; nodeLevel2 != nullptr; nodeLevel2 = nodeLevel2->next)
-        {
-            if (nodeLevel2->type == XML_ELEMENT_NODE)
-            {
-                std::vector<OString> vIDs;
-                for(xmlAttrPtr attribute = nodeLevel2->properties; attribute != nullptr; attribute = attribute->next)
-                {
-                    xmlChar *content = xmlNodeListGetString(res, attribute->children, 1);
-                    vIDs.push_back(helper::xmlStrToOString(content));
-                    xmlFree(content);
-                }
-                OString sText = helper::UnQuotHTML(helper::xmlStrToOString(xmlNodeGetContent(nodeLevel2)));
-                common::writePoEntry(
-                    "Uiex", aPOStream, sInputFileName, vIDs[0],
-                    (vIDs.size()>=2) ? vIDs[1] : OString(),
-                    (vIDs.size()>=3) ? vIDs[2] : OString(),
-                    OString(), sText);
-            }
-        }
-    }
-
-    xmlFreeDoc(res);
-
-    xmlFreeDoc(doc);
-
-    xsltFreeStylesheet(stylesheet);
-
-    aPOStream.close();
-
-    return 0;
-}
-
-namespace
-{
-    bool lcl_MergeLang(
-            const MergeDataHashMap &rMap,
-            const OString &rLanguage,
-            const OString &rDestinationFile)
-    {
-        std::ofstream aDestination(
-            rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc);
-        if (!aDestination.is_open()) {
-            return false;
-        }
-
-        aDestination << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-        aDestination << "<t>\n";
-
-        for (MergeDataHashMap::const_iterator aI = rMap.begin(), aEnd = rMap.end(); aI != aEnd; ++aI)
-        {
-            if (aI->second->sGID.isEmpty())
-                continue;
-
-            MergeEntrys* pEntrys = aI->second->GetMergeEntries();
-            OString sOut;
-            pEntrys->GetText( sOut, StringType::Text, rLanguage );
-
-            if (sOut.isEmpty())
-                continue;
-
-            aDestination << " <e g=\"" << aI->second->sGID << "\" i=\""
-                << aI->second->sLID << "\">"
-                << helper::QuotHTML(sOut) << "</e>\n";
-        }
-
-        aDestination << "</t>";
-        aDestination.close();
-
-        return true;
-    }
-
-}
-
-bool Merge(
-    const OString &rPOFile,
-    const OString &rSourceFile,
-    const OString &rDestinationDir,
-    const OString &rLanguage )
-{
-    {
-        bool bDestinationIsDir(false);
-
-        const OUString aDestDir(OStringToOUString(rDestinationDir, RTL_TEXTENCODING_UTF8));
-        OUString aDestDirUrl;
-        if (osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(aDestDir, aDestDirUrl))
-        {
-            osl::DirectoryItem aTmp;
-            if (osl::DirectoryItem::E_None == osl::DirectoryItem::get(aDestDirUrl, aTmp))
-            {
-                osl::FileStatus aDestinationStatus(osl_FileStatus_Mask_Type);
-                if (osl::DirectoryItem::E_None == aTmp.getFileStatus(aDestinationStatus))
-                    bDestinationIsDir = aDestinationStatus.isDirectory();
-            }
-        }
-
-        if (!bDestinationIsDir)
-        {
-            fprintf(stderr, "%s must be a directory\n", rDestinationDir.getStr());
-            return false;
-        }
-    }
-
-    MergeDataFile aMergeDataFile( rPOFile, rSourceFile, false );
-    std::vector<OString> aLanguages;
-    if( rLanguage.equalsIgnoreAsciiCase("ALL") )
-        aLanguages = aMergeDataFile.GetLanguages();
-    else
-        aLanguages.push_back(rLanguage);
-
-    const MergeDataHashMap& rMap = aMergeDataFile.getMap();
-    const OString aDestinationDir(rDestinationDir + "/");
-
-    bool bResult = true;
-    for(size_t n = 0; n < aLanguages.size(); ++n)
-    {
-        OString sCur = aLanguages[ n ];
-        if (sCur.isEmpty() || sCur.equalsIgnoreAsciiCase("en-US"))
-            continue;
-        const OString aDestinationFile(aDestinationDir + sCur + ".ui");
-        if (!lcl_MergeLang(rMap, sCur, aDestinationFile))
-            bResult = false;
-    }
-
-    return bResult;
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    int nRetValue = 0;
-    try
-    {
-
-        common::HandledArgs aArgs;
-        if ( !common::handleArguments(argc, argv, aArgs) )
-        {
-            common::writeUsage("uiex","*.ui");
-            return 1;
-        }
-
-        sInputFileName = aArgs.m_sInputFile;
-        sOutputFile = aArgs.m_sOutputFile;
-
-        if (!aArgs.m_bMergeMode)
-        {
-            nRetValue = extractTranslations();
-        }
-        else
-        {
-            Merge(aArgs.m_sMergeSrc, sInputFileName, sOutputFile, aArgs.m_sLanguage);
-        }
-    }
-    catch (std::exception& e)
-    {
-        fprintf(stderr, "exception: %s\n", e.what());
-        return 1;
-    }
-    return nRetValue;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/leak-suppress.txt b/leak-suppress.txt
index ce4b42350a2c..e9a01fd83e56 100644
--- a/leak-suppress.txt
+++ b/leak-suppress.txt
@@ -20,9 +20,6 @@ leak:SfxFilterContainer::ReadSingleFilter_Impl
 # build-time tool soltools/cpp:
 leak:soltools/cpp/_cpp.c
 
-# resource managers, normally global objects
-leak:ResMgr::CreateResMgr
-
 # bridge's RTTI information, leaked knowingly
 leak:RTTI::getRTTI
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 0849b1a620d1..88cf455e728c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -23,7 +23,6 @@
 #include <LibreOfficeKit/LibreOfficeKitInit.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <LibreOfficeKit/LibreOfficeKitGtk.h>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <vcl/event.hxx>
 
 #include "tilebuffer.hxx"
diff --git a/odk/docs/idl/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt
index c9ffe1bbea74..8be5850fb4cb 100644
--- a/odk/docs/idl/idl_chapter_refs.txt
+++ b/odk/docs/idl/idl_chapter_refs.txt
@@ -5358,7 +5358,6 @@ com.sun.star.uno.XInterface
 LINK:Documentation/DevGuide/FirstSteps/Objects%2C_Interfaces%2C_and_Services#Interfaces
 DESCR:FirstSteps - Objects, Interfaces, and Services - Interfaces
 REF:
-com.sun.star.resource.XResourceBundle
 com.sun.star.container.XNameAccess
 TOPIC:
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ac292df2578e..f6f95a50f6fa 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -305,7 +305,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/report/inspection
 	DefaultComponentInspectorModel \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/resource,\
-	OfficeResourceLoader \
 	StringResource \
 	StringResourceWithLocation \
 	StringResourceWithStorage \
@@ -3086,8 +3085,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/report/meta,\
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/resource,\
 	MissingResourceException \
 	XLocale \
-	XResourceBundle \
-	XResourceBundleLoader \
 	XStringResourceManager \
 	XStringResourcePersistence \
 	XStringResourceResolver \
diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl
index 95e78e6a104a..9650d57ab61e 100644
--- a/offapi/com/sun/star/resource/MissingResourceException.idl
+++ b/offapi/com/sun/star/resource/MissingResourceException.idl
@@ -28,7 +28,7 @@ module com {  module sun {  module star {  module resource {
 
 /** is used to signal that a resource is missing.
 
-    @see XResourceBundle
+    @see XStringResourceResolver
  */
 published exception MissingResourceException: com::sun::star::uno::RuntimeException
 {
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
deleted file mode 100644
index 1caf113084f3..000000000000
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ /dev/null
@@ -1,69 +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 __com_sun_star_resource_OfficeResourceLoader_idl__
-#define __com_sun_star_resource_OfficeResourceLoader_idl__
-
-#include <com/sun/star/resource/XResourceBundleLoader.idl>
-
-module com { module sun { module star { module resource {
-
-/** describes a XResourceBundleLoader which provides access to the OpenOffice.org
-    resource files.
-
-    <p>An OpenOffice.org installation comes with a number of resource files in an proprietary
-    format, located inside the installation's program/resource directory. The OfficeResourceLoader
-    singleton (available at a component context as value with the key
-    <code>/singletons/com.sun.star.resource.OfficeResourceLoader</code>), provides access to some
-    types of resources within those files.</p>
-
-    <p>Clients have to specify the resource file base name in the call to
-    XResourceBundleLoader::loadBundle() resp. XResourceBundleLoader::loadBundle_Default()
-    method. The loader will extent this base name so that the resulting name conforms to the OpenOffice.org
-    resource file naming conventions, and look up the respective resource file, for the requested locale,
-    in OpenOffice.org's installation.</p>
-
-    <p>The lookup process uses the fallback mechanism as described at the XResourceBundle interface,
-    except that <code>Locale.getDefault()</code> is not used.</p>
-
-    <p>Resource keys, as passed to the XResourceBundle::getDirectElement() or
-    com::sun::star::container::XNameAccess::getByName(), have the following format:
-    <code>&lt;resource_type&gt;:&lt;numeric_identifier&gt;</code>, where <code>&lt;resource_type&gt;</code> specifies
-    the type of the requested resource (see below) and <code>&lt;numeric_identifier&gt;</code> is the numeric
-    identifier of the resource.</p>
-
-    <p>The following resource types are currently supported:
-    <ul>
-        <li><em>string</em>: denotes a string resource</li>
-    </ul>
-    </p>
-
-    <p>Since the numeric resource identifiers are highly build-dependent (e.g. can change with any next
-    OpenOffice.org build), you are <strong>strongly</strong> discouraged from using the OfficeResourceLoader
-    service in a component which targets more than one particular OpenOffice.org build.</p>
-
-    @since OOo 2.0.3
-*/
-singleton OfficeResourceLoader : XResourceBundleLoader;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl
index fe37fccfdb8d..562307d82def 100644
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ b/offapi/com/sun/star/resource/XLocale.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module resource {
 
 /** offers some operations on com::sun::star::lang::Locale
-    structures.@see         XResourceBundle
+    structures.
         @see         Locale
  */
 published interface XLocale: com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl
deleted file mode 100644
index c0011ac33afe..000000000000
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++ /dev/null
@@ -1,226 +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 __com_sun_star_resource_XResourceBundle_idl__
-#define __com_sun_star_resource_XResourceBundle_idl__
-
-#include <com/sun/star/container/XNameAccess.idl>
-#include <com/sun/star/lang/Locale.idl>
-
-
-
-module com { module sun { module star { module resource {
-
-/** Resource bundles contain locale-specific objects.
-
-    <p>When your program needs a locale-specific resource, such as
-    <code>String</code> for example, your program can load it from the
-    resource bundle that is appropriate for the current user's locale. In
-    this way, you can write program code that is largely independent of
-    the user's locale, which isolates most, if not all, of the
-    locale-specific information in resource bundles.
-
-    <p>This allows you to write programs that can:
-
-    <UL type=SQUARE>
-
-    <LI> be easily localized, or translated, into different
-    languages.
-
-    <LI> handle multiple locales at once.
-
-    <LI> be easily modified, later, to support even more locales.
-
-    </UL>
-
-    <P> One resource bundle is, conceptually, a set of related services
-    that supports <code>XResourceBundle</code>. Each related service of
-    <code>XResourceBundle</code> has the same base name plus an
-    additional component that identifies its locale. For example, suppose
-    your resource bundle is named <code>MyResources</code>. The first
-    service you are likely to implement is the default resource bundle,
-    which has the same name as its family--<code>MyResources</code>. You
-    can also provide as many related locale-specific services as you need.
-
-    For example, perhaps you would provide a German one named
-    <code>MyResources_de</code>.
-
-    <P>
-    Each related implementation of <code>XResourceBundle</code> contains
-    the same items, but the items have been translated for the locale
-    represented by that <code>XResourceBundle</code> implementation. For
-    example, both <code>MyResources</code> and <code>MyResources_de</code>
-    may have a <code>String</code> that is used on a button for
-    confirming operations. In <code>MyResources</code> the
-    <code>String</code> may contain <code>OK</code> and in
-    <code>MyResources_de</code> it may contain <code>Gut</code>.
-
-    <P>
-    If there are different resources for different countries, you
-    can make specializations: for example, <code>MyResources_de_CH</code>
-    is the German language (de) in Switzerland (CH). If you only want to
-    modify some of the resources in the specialization, you can do so.
-
-    <P>
-    When your program needs a locale-specific object, it loads
-
-    the <code>XResourceBundle</code> implementation using the
-    XResourceBundleLoader service:
-
-    @code{.java}
-    XResourceBundle myResources = xLoader.getBundle("MyResources", currentLocale);
-    @endcode
-
-    <p>The first argument specifies the family name of the resource
-    bundle that contains the object in question. The second argument
-    indicates the desired locale. <code>getBundle</code> uses these two
-    arguments to construct the name of the <code>ResourceBundle</code>
-    subclass it should load according to the following specifications.
-
-    <P>The resource bundle lookup searches for services with various
-    suffixes on the basis of (1) the desired locale and (2) the current
-    default locale as returned by Locale.getDefault(), and (3) the root
-    resource bundle (baseclass), in the following order from lower-level
-    (more specific) to parent-level (less specific):
-    <p> baseclass + "_" + language1 + "_" + country1 + "_" + variant1
-    <BR> baseclass + "_" + language1 + "_" + country1
-    <BR> baseclass + "_" + language1
-    <BR> baseclass + "_" + language2 + "_" + country2 + "_" + variant2
-    <BR> baseclass + "_" + language2 + "_" + country2
-    <BR> baseclass + "_" + language2
-    <BR> baseclass
-
-    <P> For example, if the current default locale is <TT>en_US</TT>, the
-    locale that the caller is interested in is <TT>fr_CH</TT>, and the
-    resource bundle name is <TT>MyResources</TT>; resource bundle lookup
-    will search for the following services, in order:
-    <BR> <TT>MyResources_fr_CH
-    <BR> MyResources_fr
-    <BR> MyResources_en_US
-    <BR> MyResources_en
-    <BR> MyResources</TT>
-
-    <P> The result of the lookup is a service, but that service may be
-    backed by a property file on disk. If a lookup fails,
-    <code>getBundle()</code> throws a
-    <code>MissingResourceException</code>.
-
-    <P> The base service <strong>must</strong> be fully qualified (for
-    example, <code>myPackage::MyResources</code>, not just
-    <code>MyResources</code>).
-
-    <P> Resource bundles contain key/value pairs. The keys uniquely
-    identify a locale-specific object in the bundle. Here is an
-    example of a <code>XResourceBundle</code> implementation that contains
-    two key/value pairs:
-
-    @code{.java}
-    class MyResource extends com.sun.star.resource.XResourceBundle
-    {
-        // some queryInterface stuff
-
-        public final Object getDirectElement(String key)
-        {
-            if (key.equals("okKey")) return "Ok";
-            if (key.equals("cancelKey")) return "Cancel";
-            return null;
-        }
-    }
-    @endcode
-
-    <p>Keys are always <code>String</code>s. In this example, the keys
-    are <code>OkKey</code> and <code>CancelKey</code>. In the above
-    example, the values are also <code>String</code>s--<code>OK</code>
-    and <code>Cancel</code>--but they do not have to be. The values can
-    be any type of object.
-
-    <P> You retrieve an object from resource bundle using the appropriate
-    get method. Because <code>OkKey</code> and <code>CancelKey</code>
-    are both strings, you use <code>getByName</code> to retrieve them:
-
-    @code{.java}
-    button1 = new Button(myResourceBundle.getByName("OkKey").getString());
-    button2 = new Button(myResourceBundle.getByName("CancelKey").getString());
-    @endcode
-
-    <p>The get methods all require the key as an argument and return
-    the object if found. If the object is not found, the get methods
-    throw a com::sun::star::container::NoSuchElementException.
-
-    <P> <STRONG>NOTE:</STRONG> You should always supply a base service
-    with no suffixes. This will be the class of "last resort" if a
-    locale is requested that does not exist. In fact, you must provide
-    <I>all</I> of the services in any given inheritance chain for which
-    you provide a resource.  For example, if you provide
-    <TT>MyResources_fr_BE</TT>, you must provide <I>both</I>
-    <TT>MyResources</TT> <I>and</I> <TT>MyResources_fr</TT>, or the
-    resource bundle lookup will not work right.
-
-    <P>You do not have to restrict yourself to using a single family of
-    <code>ResourceBundle</code>s. For example, you could have a set of
-    bundles for exception messages, <code>ExceptionResources</code>
-    (<code>ExceptionResources_fr</code>, <code>ExceptionResources_de</code>, ...),
-    and one for widgets, <code>WidgetResource</code> (<code>WidgetResources_fr</code>,
-    <code>WidgetResources_de</code>, ...); breaking up the resources however you like.
-
-    @see        MissingResourceException
-    @see         Locale
-    @version     0.1 26 May 1999
-    @author      Mark Davis
-    @author      Markus Meyer
-    @deprecated draft
-*/
-published interface XResourceBundle: com::sun::star::container::XNameAccess
-{
-    /** contains the parent bundle of this bundle.
-
-        <p>The parent bundle is searched by the method
-        com::sun::star::container::XNameAccess::getByName()
-        when this bundle does not contain a particular resource.
-     */
-    [attribute] XResourceBundle Parent;
-
-    /** @returns
-        the locale for this resource bundle.
-
-        <p>This function can be used to determine whether the
-        resource bundle that is returned really corresponds to the
-        requested locale or is a fallback.
-
-    */
-    com::sun::star::lang::Locale getLocale();
-
-    /** @returns
-        an object from a resource bundle or NULL if no resource
-        exists.
-
-        <p>It does not look in the parents.
-
-        @param key
-            specifies the element.
-    */
-    any getDirectElement( [in] string key );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl
deleted file mode 100644
index fa25531647c1..000000000000
--- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl
+++ /dev/null
@@ -1,67 +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 __com_sun_star_resource_XResourceBundleLoader_idl__
-#define __com_sun_star_resource_XResourceBundleLoader_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-#include <com/sun/star/resource/XResourceBundle.idl>
-
-#include <com/sun/star/resource/MissingResourceException.idl>
-
-#include <com/sun/star/lang/Locale.idl>
-
-
-
-module com {  module sun {  module star {  module resource {
-
-
-/** makes it possible to load resource bundles.
-
-    <p>The search algorithm is specified in the documentation of
-    XResourceBundle. The implementations must follow
-    the name scheme, but it is allowed to search in several locations.
-
-    @see MissingResourceException
-    @see XResourceBundle
-    @see Locale
- */
-published interface XResourceBundleLoader: com::sun::star::uno::XInterface
-{
-
-    /** loads the appropriate resource bundle.
-     */
-    com::sun::star::resource::XResourceBundle loadBundle_Default( [in] string aBaseName )
-            raises( com::sun::star::resource::MissingResourceException );
-
-
-    /** loads the appropriate resource bundle subclass.
-     */
-    com::sun::star::resource::XResourceBundle loadBundle( [in] string abaseName,
-             [in] com::sun::star::lang::Locale aLocale )
-            raises( com::sun::star::resource::MissingResourceException );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index e796d59192e2..e0c1235cb0cf 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -9805,12 +9805,6 @@ module com {
    module resource {
     published exception MissingResourceException: ::com::sun::star::uno::RuntimeException {
     };
-    published interface XResourceBundle;
-    published interface XResourceBundleLoader {
-     interface ::com::sun::star::uno::XInterface;
-     ::com::sun::star::resource::XResourceBundle loadBundle_Default([in] string aBaseName) raises (::com::sun::star::resource::MissingResourceException);
-     ::com::sun::star::resource::XResourceBundle loadBundle([in] string abaseName, [in] ::com::sun::star::lang::Locale aLocale) raises (::com::sun::star::resource::MissingResourceException);
-    };
     published interface XLocale {
      interface ::com::sun::star::uno::XInterface;
      ::com::sun::star::lang::Locale create([in] string aLanguage, [in] string aCountry, [in] string aVariant);
@@ -9832,12 +9826,6 @@ module com {
      string getDisplayName([in] ::com::sun::star::lang::Locale locale, [in] ::com::sun::star::lang::Locale inLocale);
      boolean equals([in] ::com::sun::star::lang::Locale l1, [in] ::com::sun::star::lang::Locale l2);
     };
-    /** @deprecated */ published interface XResourceBundle {
-     interface ::com::sun::star::container::XNameAccess;
-     [attribute] ::com::sun::star::resource::XResourceBundle Parent;
-     ::com::sun::star::lang::Locale getLocale();
-     any getDirectElement([in] string key);
-    };
    };
    module scanner {
     published enum ScanError {
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 6bd7c15b6831..30d3d2951b24 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -26,9 +26,10 @@
 #include <vcl/svapp.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <tools/urlobj.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 #include "oox/ppt/pptimport.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
 #include "oox/dump/pptxdumper.hxx"
@@ -145,12 +146,11 @@ bool PowerPointImport::importDocument()
     {
         // Construct a warning message.
         INetURLObject aURL(getFileUrl());
-        SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset), nullptr, RID_ERRCTX);
+        SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset), nullptr, getRID_ERRCTX());
         OUString aWarning;
         aContext.GetString(ERRCODE_NONE.MakeWarning(), aWarning);
         aWarning += ":\n";
-        static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-        aWarning += ResId(RID_SVXSTR_WARN_MISSING_SMARTART, *pResMgr).toString();
+        aWarning += SvxResId(RID_SVXSTR_WARN_MISSING_SMARTART);
 
         // Show it.
         WinBits eBits = WB_OK | WB_DEF_OK;
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 487d7e3c46af..c2ce94aa6835 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -299,7 +299,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	extensions/source/abpilot/abp \
 	extensions/source/config/ldap/ldapbe2 \
 	extensions/source/logging/log \
-	extensions/source/resource/res \
 	extensions/source/scanner/scn \
 	extensions/source/update/feed/updatefeed \
 	xmlhelp/util/ucpchelp1 \
diff --git a/extensions/AllLangResTarget_upd.mk b/reportdesign/AllLangMoTarget_rpt.mk
index c05b888b2cdb..b2a4a0b85ea3 100644
--- a/extensions/AllLangResTarget_upd.mk
+++ b/reportdesign/AllLangMoTarget_rpt.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,rpt))
 
-$(eval $(call gb_SrsTarget_add_files,upd/res,\
-	extensions/source/update/check/updatehdl.src \
-))
+$(eval $(call gb_AllLangMoTarget_set_polocation,rpt,reportdesign))
 
-# vim:set noet sw=4 ts=4:
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
deleted file mode 100644
index 65c93a2fe4ee..000000000000
--- a/reportdesign/AllLangResTarget_rpt.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,rpt))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,rpt,reportdesign))
-
-$(eval $(call gb_AllLangResTarget_add_srs,rpt,\
-    reportdesign/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
-
-$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/reportdesign/source/core/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
-    reportdesign/source/core/resource/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
deleted file mode 100644
index c0e799dfa39b..000000000000
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ /dev/null
@@ -1,44 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign))
-
-$(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui))
-
-$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
-
-$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/reportdesign/source/ui/inc \
-	-I$(SRCDIR)/reportdesign/inc \
-))
-
-
-$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
-	reportdesign/source/ui/dlg/PageNumber.src	\
-	reportdesign/source/ui/dlg/CondFormat.src	\
-	reportdesign/source/ui/dlg/Navigator.src	\
-	reportdesign/source/ui/dlg/GroupsSorting.src \
-	reportdesign/source/ui/inspection/inspection.src \
-	reportdesign/source/ui/report/report.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 02fd8748d26c..dec0903992d0 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,rpt,\
     reportdesign/source/core/misc/reportformula \
     reportdesign/source/core/resource/core_resource \
     reportdesign/source/core/sdr/formatnormalizer \
-    reportdesign/source/core/sdr/ModuleHelper \
     reportdesign/source/core/sdr/PropertyForward \
     reportdesign/source/core/sdr/ReportDrawPage \
     reportdesign/source/core/sdr/ReportUndoFactory \
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index 518addb5bd2c..d827dc1ba9c6 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -13,12 +13,11 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
     Library_rpt \
     Library_rptui \
     Library_rptxml \
+    UIConfig_dbreport \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,reportdesign,\
-    AllLangResTarget_rpt \
-    AllLangResTarget_rptui \
-    UIConfig_dbreport \
+    AllLangMoTarget_rpt \
 ))
 
 # deactivated since sb123;
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
deleted file mode 100644
index d88375a7f07a..000000000000
--- a/reportdesign/inc/ModuleHelper.hxx
+++ /dev/null
@@ -1,91 +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_REPORTDESIGN_INC_MODULEHELPER_HXX
-#define INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX
-
-#include "dllapi.h"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <tools/resmgr.hxx>
-
-
-namespace rptui
-{
-
-
-    //= OModule
-
-    class OModuleImpl;
-    class REPORTDESIGN_DLLPUBLIC OModule
-    {
-        friend class OModuleClient;
-
-    private:
-        OModule() = delete; //TODO: get rid of this class
-
-    protected:
-        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
-
-    public:
-        /// get the vcl res manager of the module
-        static ResMgr*  getResManager();
-    protected:
-        /// register a client for the module
-        static void registerClient();
-        /// revoke a client for the module
-        static void revokeClient();
-
-    private:
-        /** ensure that the impl class exists
-            @precond m_aMutex is guarded when this method gets called
-        */
-        static void ensureImpl();
-    };
-
-
-    //= OModuleClient
-
-    /** base class for objects which uses any global module-specific resources
-    */
-    class REPORTDESIGN_DLLPUBLIC OModuleClient
-    {
-    public:
-        OModuleClient()      { OModule::registerClient(); }
-        ~OModuleClient() { OModule::revokeClient(); }
-    };
-
-
-    //= ModuleRes
-
-    /** specialized ResId, using the resource manager provided by the global module
-    */
-    class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
-    {
-    public:
-        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
-    };
-
-}   // namespace rptui
-
-
-#endif // INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
deleted file mode 100644
index e635ad9a9c0b..000000000000
--- a/reportdesign/inc/RptResId.hrc
+++ /dev/null
@@ -1,204 +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_REPORTDESIGN_INC_RPTRESID_HRC
-#define INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_DIALOG_START                RID_RPT_START
-#define RID_PAGE_START                  RID_RPT_START
-#define RID_ERRORBOX_START              RID_RPT_START
-#define RID_QUERYBOX_START              RID_RPT_START
-#define RID_TOOLBOX_START               RID_RPT_START
-#define RID_BITMAP_START                RID_RPT_START
-#define RID_IMAGE_START                 RID_RPT_START
-#define RID_IMAGELIST_START             RID_RPT_START
-#define RID_MENU_START                  RID_RPT_START
-#define RID_STRING_START                RID_RPT_START
-#define RID_UNTYPED_START               RID_RPT_START
-#define RID_WARN_START                  RID_RPT_START
-#define RID_CONTROL_START               RID_RPT_START
-#define RID_MISC_START                  RID_RPT_START
-
-// strings
-#define RID_STR_PROPTITLE_FIXEDTEXT         ( RID_STRING_START +   4 )
-#define RID_STR_PROPTITLE_FORMATTED         ( RID_STRING_START +   5 )
-#define RID_STR_PROPTITLE_SHAPE             ( RID_STRING_START +   6 )
-#define RID_STR_PROPTITLE_IMAGECONTROL      ( RID_STRING_START +   7 )
-#define RID_STR_PROPTITLE_REPORT            ( RID_STRING_START +   8 )
-#define RID_STR_PROPTITLE_SECTION           ( RID_STRING_START +   9 )
-#define RID_STR_PROPTITLE_FUNCTION          ( RID_STRING_START +  10 )
-
-// undo strings
-#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER  ( RID_STRING_START +  11 )
-#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER     ( RID_STRING_START +  12 )
-#define RID_STR_UNDO_PROPERTY                   ( RID_STRING_START +  15 )
-#define RID_STR_UNDO_REMOVE_GROUP               ( RID_STRING_START +  16 )
-#define RID_STR_UNDO_APPEND_GROUP               ( RID_STRING_START +  17 )
-#define RID_STR_UNDO_MOVE_GROUP                 ( RID_STRING_START +  18 )
-#define RID_STR_UNDO_CONDITIONAL_FORMATTING     ( RID_STRING_START +  19 )
-#define RID_STR_UNDO_REMOVE_SELECTION           ( RID_STRING_START +  20 )
-#define RID_STR_UNDO_PASTE                      ( RID_STRING_START +  21 )
-#define RID_STR_UNDO_CHANGE_SIZE                ( RID_STRING_START +  22 )
-#define RID_STR_UNDO_INSERT_CONTROL             ( RID_STRING_START +  23 )
-#define RID_STR_UNDO_DELETE_CONTROL             ( RID_STRING_START +  24 )
-#define RID_STR_UNDO_CHANGEPOSITION             ( RID_STRING_START +  27 )
-#define RID_STR_UNDO_ADDFUNCTION                ( RID_STRING_START +  28 )
-
-// other
-#define STR_RPT_LABEL                       ( RID_STRING_START +  33 )
-#define STR_RPT_EXPRESSION                  ( RID_STRING_START +  34 )
-#define STR_RPT_PN_PAGE                     ( RID_STRING_START +  36 )
-#define STR_RPT_PN_PAGE_OF                  ( RID_STRING_START +  37 )
-#define STR_RPT_PREFIXCHARS                 ( RID_STRING_START +  38 )
-#define STR_RPT_YEAR                        ( RID_STRING_START +  39 )
-#define STR_RPT_QUARTER                     ( RID_STRING_START +  40 )
-#define STR_RPT_MONTH                       ( RID_STRING_START +  41 )
-#define STR_RPT_WEEK                        ( RID_STRING_START +  42 )
-#define STR_RPT_DAY                         ( RID_STRING_START +  43 )
-#define STR_RPT_HOUR                        ( RID_STRING_START +  44 )
-#define STR_RPT_MINUTE                      ( RID_STRING_START +  45 )
-#define STR_RPT_INTERVAL                    ( RID_STRING_START +  46 )
-#define STR_RPT_HELP_FIELD                  ( RID_STRING_START +  47 )
-#define STR_RPT_HELP_HEADER                 ( RID_STRING_START +  48 )
-#define STR_RPT_HELP_FOOTER                 ( RID_STRING_START +  49 )
-#define STR_RPT_HELP_GROUPON                ( RID_STRING_START +  50 )
-#define STR_RPT_HELP_INTERVAL               ( RID_STRING_START +  51 )
-#define STR_RPT_HELP_KEEP                   ( RID_STRING_START +  52 )
-#define STR_RPT_HELP_SORT                   ( RID_STRING_START +  53 )
-#define RID_STR_GROUPHEADER                 ( RID_STRING_START +  54 )
-#define RID_STR_GROUPFOOTER                 ( RID_STRING_START +  55 )
-#define RID_STR_UNDO_REMOVE_FUNCTION        ( RID_STRING_START +  56 )
-#define STR_NUMBERED_CONDITION              ( RID_STRING_START +  57 )
-
-// Property Browser Headline Id's -----------------------------------------------------------
-#define RID_STR_BRWTITLE_PROPERTIES         ( RID_STRING_START +  60 )
-#define RID_STR_BRWTITLE_NO_PROPERTIES      ( RID_STRING_START +  61 )
-#define RID_STR_BRWTITLE_MULTISELECT        ( RID_STRING_START +  62 )
-
-#define RID_STR_FIELDSELECTION              ( RID_STRING_START +  69 )
-
-#define RID_STR_UNDO_ADD_GROUP_HEADER       ( RID_STRING_START +  70 )
-#define RID_STR_UNDO_REMOVE_GROUP_HEADER    ( RID_STRING_START +  71 )
-#define RID_STR_UNDO_ADD_GROUP_FOOTER       ( RID_STRING_START +  72 )
-#define RID_STR_UNDO_REMOVE_GROUP_FOOTER    ( RID_STRING_START +  73 )
-
-#define RID_STR_PROPPAGE_DEFAULT            ( RID_STRING_START +  74 )
-#define RID_STR_PROPPAGE_DATA               ( RID_STRING_START +  75 )
-
-#define RID_STR_FILTER                      ( RID_STRING_START +  76 )
-// free
-
-#define RID_STR_FORCENEWPAGE                (RID_STRING_START + 78)
-#define RID_STR_NEWROWORCOL                 (RID_STRING_START + 79)
-#define RID_STR_KEEPTOGETHER                (RID_STRING_START + 80)
-#define RID_STR_CANGROW                     (RID_STRING_START + 81)
-#define RID_STR_CANSHRINK                   (RID_STRING_START + 82)
-#define RID_STR_REPEATSECTION               (RID_STRING_START + 83)
-
-#define RID_STR_PROPTITLE_GROUP             (RID_STRING_START + 84)
-#define RID_STR_PROPTITLE_FIXEDLINE         (RID_STRING_START + 85)
-// free
-#define RID_STR_BACKTRANSPARENT             (RID_STRING_START + 87)
-#define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88)
-#define RID_STR_OVERLAP_OTHER_CONTROL       (RID_STRING_START + 89)
-#define RID_STR_ILLEGAL_POSITION            (RID_STRING_START + 90)
-#define RID_STR_PAGEHEADERFOOTER_INSERT     (RID_STRING_START + 91)
-#define RID_STR_PAGEHEADERFOOTER_DELETE     (RID_STRING_START + 92)
-#define RID_STR_BACKCOLOR                   (RID_STRING_START + 93)
-#define RID_STR_PRINTREPEATEDVALUES         (RID_STRING_START + 94)
-#define RID_STR_CONDITIONALPRINTEXPRESSION  (RID_STRING_START + 95)
-#define RID_STR_STARTNEWCOLUMN              (RID_STRING_START + 97)
-#define RID_STR_STARTNEWPAGE                (RID_STRING_START + 98)
-#define RID_STR_RESETPAGENUMBER             (RID_STRING_START + 99)
-#define RID_STR_PRINTWHENGROUPCHANGE        (RID_STRING_START + 102)
-#define RID_STR_REPORTHEADERFOOTER_INSERT   (RID_STRING_START + 103)
-#define RID_STR_REPORTHEADERFOOTER_DELETE   (RID_STRING_START + 104)
-#define RID_STR_VISIBLE                     (RID_STRING_START + 105)
-
-#define RID_STR_DETAIL                      (RID_STRING_START + 106)
-#define RID_STR_PAGE_HEADER                 (RID_STRING_START + 107)
-#define RID_STR_GROUPKEEPTOGETHER           (RID_STRING_START + 108)
-#define RID_STR_PAGE_FOOTER                 (RID_STRING_START + 109)
-#define RID_STR_PAGEHEADEROPTION            (RID_STRING_START + 110)
-#define RID_STR_PAGEFOOTEROPTION            (RID_STRING_START + 111)
-#define RID_STR_REPORT_HEADER               (RID_STRING_START + 112)
-#define RID_STR_REPORT_FOOTER               (RID_STRING_START + 113)
-#define RID_STR_SCOPE_GROUP                 (RID_STRING_START + 114)
-#define RID_STR_UNDO_ALIGNMENT              (RID_STRING_START + 117)
-#define RID_STR_HEADER                      (RID_STRING_START + 118)
-#define RID_STR_FOOTER                      (RID_STRING_START + 119)
-#define RID_STR_DATAFIELD                   (RID_STRING_START + 120)
-#define RID_STR_FONT                        (RID_STRING_START + 121)
-#define RID_STR_COULD_NOT_CREATE_REPORT     (RID_STRING_START + 122)
-#define RID_STR_PRESERVEIRI                 (RID_STRING_START + 123)
-#define RID_STR_IMPORT_GRAPHIC              (RID_STRING_START + 124)
-#define RID_STR_POSITIONX                   (RID_STRING_START + 125)
-#define RID_STR_POSITIONY                   (RID_STRING_START + 126)
-#define RID_STR_WIDTH                       (RID_STRING_START + 127)
-#define RID_STR_HEIGHT                      (RID_STRING_START + 128)
-#define RID_STR_DELETE                      (RID_STRING_START + 129)
-#define RID_STR_DEEPTRAVERSING              (RID_STRING_START + 130)
-#define RID_STR_PREEVALUATED                (RID_STRING_START + 131)
-#define RID_STR_FUNCTIONS                   (RID_STRING_START + 132)
-#define RID_STR_GROUPS                      (RID_STRING_START + 133)
-#define RID_STR_FUNCTION                    (RID_STRING_START + 134)
-#define RID_STR_FORMULA                     (RID_STRING_START + 135)
-#define RID_STR_INITIALFORMULA              (RID_STRING_START + 136)
-#define RID_STR_UNDO_CHANGEFONT             (RID_STRING_START + 137)
-#define RID_STR_UNDO_CHANGEPAGE             (RID_STRING_START + 138)
-#define RID_STR_CAUGHT_FOREIGN_EXCEPTION    (RID_STRING_START + 139)
-#define RID_STR_FORMULALIST                 (RID_STRING_START + 140)
-#define RID_STR_SCOPE                       (RID_STRING_START + 141)
-#define RID_STR_TYPE                        (RID_STRING_START + 142)
-#define RID_STR_MIMETYPE                    (RID_STRING_START + 143)
-#define RID_STR_CHARTTYPE                   (RID_STRING_START + 144)
-#define RID_STR_MASTERFIELDS                (RID_STRING_START + 145)
-#define RID_STR_DETAILFIELDS                (RID_STRING_START + 146)
-#define RID_STR_EXPLANATION                 (RID_STRING_START + 147)
-#define RID_STR_DETAILLABEL                 (RID_STRING_START + 148)
-#define RID_STR_MASTERLABEL                 (RID_STRING_START + 149)
-#define RID_STR_PREVIEW_COUNT               (RID_STRING_START + 150)
-#define RID_ERR_NO_COMMAND                  (RID_STRING_START + 151)
-#define RID_ERR_NO_OBJECTS                  (RID_STRING_START + 152)
-#define RID_STR_AREA                        (RID_STRING_START + 153)
-// free
-#define RID_STR_UNDO_SHRINK                 (RID_STRING_START + 155)
-#define RID_STR_F_COUNTER                   (RID_STRING_START + 156)
-#define RID_STR_F_ACCUMULATION              (RID_STRING_START + 157)
-#define RID_STR_F_MINIMUM                   (RID_STRING_START + 158)
-#define RID_STR_F_MAXIMUM                   (RID_STRING_START + 159)
-#define RID_STR_VERTICALALIGN               (RID_STRING_START + 160)
-#define RID_STR_PARAADJUST                  (RID_STRING_START + 161)
-
-// untyped ---------------------------------------------------------------------
-#define RID_STR_BOOL                        (RID_UNTYPED_START +  0 )
-#define RID_STR_FORCENEWPAGE_CONST          (RID_UNTYPED_START +  1 )
-#define RID_STR_KEEPTOGETHER_CONST          (RID_UNTYPED_START +  2)
-#define RID_STR_GROUPKEEPTOGETHER_CONST     (RID_UNTYPED_START +  3)
-#define RID_STR_REPORTPRINTOPTION_CONST     (RID_UNTYPED_START +  4)
-#define RID_STR_SECTIONPAGEBREAK_CONST      (RID_UNTYPED_START +  5)
-#define RID_STR_TYPE_CONST                  (RID_UNTYPED_START +  6)
-#define RID_STR_VERTICAL_ALIGN_CONST        (RID_UNTYPED_START +  7)
-#define RID_STR_PARAADJUST_CONST            (RID_UNTYPED_START +  8)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index b78d56997bf5..7df624f28418 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -151,8 +151,7 @@ namespace rptui
         ::dbaui::IController*   m_pController;
 
     public:
-        OCommentUndoAction( SdrModel& rMod
-                            ,sal_uInt16 nCommentID);
+        OCommentUndoAction(SdrModel& rMod, const char* pCommentID);
         virtual ~OCommentUndoAction() override;
 
         virtual OUString GetComment() const override { return m_strComment; }
@@ -180,7 +179,7 @@ namespace rptui
                             ,Action _eAction
                             ,const css::uno::Reference< css::container::XIndexContainer >& rContainer
                             ,const css::uno::Reference< css::uno::XInterface>& xElem
-                            ,sal_uInt16 _nCommentId);
+                            ,const char* pCommentId);
         virtual ~OUndoContainerAction() override;
 
         virtual void Undo() override;
@@ -206,7 +205,7 @@ namespace rptui
                                 ,OReportHelper> _pMemberFunction
                             ,const css::uno::Reference< css::report::XReportDefinition >& _xReport
                             ,const css::uno::Reference< css::uno::XInterface>& xElem
-                            ,sal_uInt16 _nCommentId);
+                            ,const char* pCommentId);
 
     protected:
         virtual void    implReInsert( ) override;
@@ -227,7 +226,7 @@ namespace rptui
                                             ,OGroupHelper> _pMemberFunction
                             ,const css::uno::Reference< css::report::XGroup >& _xGroup
                             ,const css::uno::Reference< css::uno::XInterface>& xElem
-                            ,sal_uInt16 _nCommentId);
+                            ,const char* pCommentId);
 
     protected:
         virtual void    implReInsert( ) override;
diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/reportdesign/inc/core_resource.hxx
index 2268ad83e892..5d6643b83276 100644
--- a/dbaccess/source/inc/sdbtstrings.hrc
+++ b/reportdesign/inc/core_resource.hxx
@@ -16,16 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef DBACCESS_SHARED_SDBTSTRINGS_HRC
-#define DBACCESS_SHARED_SDBTSTRINGS_HRC
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
+#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
+
+#include "dllapi.h"
 
 #include <rtl/ustring.hxx>
 
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.inc"
+OUString REPORTDESIGN_DLLPUBLIC RptResId(const char* pId);
 
-#endif // DBACCESS_SHARED_SDBTSTRINGS_HRC
+#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index c596f6e5a543..4e5e9da61abf 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -266,8 +266,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/dllapi.h>
 #include <svl/cenumitm.hxx>
 #include <svl/cintitem.hxx>
@@ -317,7 +315,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index bcbaff0a411b..75292c8b43d1 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -180,7 +180,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
-#include <ModuleHelper.hxx>
 #include <RptDef.hxx>
 #include <RptModel.hxx>
 #include <RptObject.hxx>
@@ -379,8 +378,6 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <reportformula.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/linksrc.hxx>
 #include <sot/exchange.hxx>
@@ -527,7 +524,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/reportdesign/inc/stringarray.hrc b/reportdesign/inc/stringarray.hrc
new file mode 100644
index 000000000000..6c91b21102b4
--- /dev/null
+++ b/reportdesign/inc/stringarray.hrc
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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_REPORTDESIGN_INC_FNP_HRC
+#define INCLUDED_REPORTDESIGN_INC_FNP_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_STR_FORCENEWPAGE_CONST[] =
+{
+    NC_("RID_STR_FORCENEWPAGE_CONST", "None"),
+    NC_("RID_STR_FORCENEWPAGE_CONST", "Before Section"),
+    NC_("RID_STR_FORCENEWPAGE_CONST", "After Section"),
+    NC_("RID_STR_FORCENEWPAGE_CONST", "Before & After Section"),
+    nullptr
+};
+
+const char* RID_STR_GROUPKEEPTOGETHER_CONST[] =
+{
+    NC_("RID_STR_GROUPKEEPTOGETHER_CONST", "Per Page"),
+    NC_("RID_STR_GROUPKEEPTOGETHER_CONST", "Per Column"),
+    nullptr
+};
+
+const char* RID_STR_REPORTPRINTOPTION_CONST[] =
+{
+    NC_("RID_STR_REPORTPRINTOPTION_CONST", "All Pages"),
+    NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Header"),
+    NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Footer"),
+    NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Header/Footer"),
+    nullptr
+};
+
+const char* RID_STR_TYPE_CONST[] =
+{
+    NC_("RID_STR_TYPE_CONST", "Field or Formula"),
+    NC_("RID_STR_TYPE_CONST", "Function"),
+    NC_("RID_STR_TYPE_CONST", "Counter"),
+    NC_("RID_STR_TYPE_CONST", "User defined Function"),
+    nullptr
+};
+
+const char* RID_STR_BOOL[] =
+{
+    NC_("RID_STR_BOOL", "No"),
+    NC_("RID_STR_BOOL", "Yes"),
+    nullptr
+};
+
+const char* RID_STR_KEEPTOGETHER_CONST[] =
+{
+    NC_("RID_STR_KEEPTOGETHER_CONST", "No"),
+    NC_("RID_STR_KEEPTOGETHER_CONST", "Whole Group"),
+    NC_("RID_STR_KEEPTOGETHER_CONST", "With First Detail"),
+    nullptr
+};
+
+const char* RID_STR_VERTICAL_ALIGN_CONST[] =
+{
+    NC_("RID_STR_VERTICAL_ALIGN_CONST", "Top"),
+    NC_("RID_STR_VERTICAL_ALIGN_CONST", "Middle"),
+    NC_("RID_STR_VERTICAL_ALIGN_CONST", "Bottom"),
+    nullptr
+};
+
+const char* RID_STR_PARAADJUST_CONST[] =
+{
+    NC_("RID_STR_PARAADJUST_CONST", "Left"),
+    NC_("RID_STR_PARAADJUST_CONST", "Right"),
+    NC_("RID_STR_PARAADJUST_CONST", "Block"),
+    NC_("RID_STR_PARAADJUST_CONST", "Center"),
+    nullptr
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/reportdesign/inc/strings.hrc b/reportdesign/inc/strings.hrc
new file mode 100644
index 000000000000..1766d3f6b209
--- /dev/null
+++ b/reportdesign/inc/strings.hrc
@@ -0,0 +1,189 @@
+/* -*- 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_REPORTDESIGN_INC_STRINGS_HRC
+#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#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_FORCENEWPAGE                    NC_("RID_STR_FORCENEWPAGE", "Force New Page")
+#define RID_STR_NEWROWORCOL                     NC_("RID_STR_NEWROWORCOL", "New Row Or Column")
+#define RID_STR_KEEPTOGETHER                    NC_("RID_STR_KEEPTOGETHER", "Keep Together")
+#define RID_STR_CANGROW                         NC_("RID_STR_CANGROW", "Can Grow")
+#define RID_STR_CANSHRINK                       NC_("RID_STR_CANSHRINK", "Can Shrink")
+#define RID_STR_REPEATSECTION                   NC_("RID_STR_REPEATSECTION", "Repeat Section")
+#define RID_STR_PRINTREPEATEDVALUES             NC_("RID_STR_PRINTREPEATEDVALUES", "Print repeated values")
+#define RID_STR_CONDITIONALPRINTEXPRESSION      NC_("RID_STR_CONDITIONALPRINTEXPRESSION", "Conditional Print Expression")
+#define RID_STR_STARTNEWCOLUMN                  NC_("RID_STR_STARTNEWCOLUMN", "Start new column")
+#define RID_STR_STARTNEWPAGE                    NC_("RID_STR_STARTNEWPAGE", "Start new page")
+#define RID_STR_RESETPAGENUMBER                 NC_("RID_STR_RESETPAGENUMBER", "Reset page number")
+#define RID_STR_CHARTTYPE                       NC_("RID_STR_CHARTTYPE", "Chart type")
+#define RID_STR_PRINTWHENGROUPCHANGE            NC_("RID_STR_PRINTWHENGROUPCHANGE", "Print repeated value on group change")
+#define RID_STR_VISIBLE                         NC_("RID_STR_VISIBLE", "Visible")
+#define RID_STR_GROUPKEEPTOGETHER               NC_("RID_STR_GROUPKEEPTOGETHER", "Group keep together")
+#define RID_STR_PAGEHEADEROPTION                NC_("RID_STR_PAGEHEADEROPTION", "Page header")
+#define RID_STR_PAGEFOOTEROPTION                NC_("RID_STR_PAGEFOOTEROPTION", "Page footer")
+#define RID_STR_DEEPTRAVERSING                  NC_("RID_STR_DEEPTRAVERSING", "Deep traversing")
+#define RID_STR_PREEVALUATED                    NC_("RID_STR_PREEVALUATED", "Pre evaluation")
+#define RID_STR_POSITIONX                       NC_("RID_STR_POSITIONX", "Position X")
+#define RID_STR_POSITIONY                       NC_("RID_STR_POSITIONY", "Position Y")
+#define RID_STR_WIDTH                           NC_("RID_STR_WIDTH", "Width")
+#define RID_STR_HEIGHT                          NC_("RID_STR_HEIGHT", "Height")
+#define RID_STR_INITIALFORMULA                  NC_("RID_STR_INITIALFORMULA", "Initial value")
+#define RID_STR_PRESERVEIRI                     NC_("RID_STR_PRESERVEIRI", "Preserve as Link")
+#define RID_STR_FORMULA                         NC_("RID_STR_FORMULA", "Formula")
+#define RID_STR_DATAFIELD                       NC_("RID_STR_DATAFIELD", "Data field")
+#define RID_STR_FONT                            NC_("RID_STR_FONT", "Font")
+#define RID_STR_BACKCOLOR                       NC_("RID_STR_BACKCOLOR", "Background color")
+#define RID_STR_BACKTRANSPARENT                 NC_("RID_STR_BACKTRANSPARENT", "Background Transparent")
+#define RID_STR_CONTROLBACKGROUNDTRANSPARENT    NC_("RID_STR_CONTROLBACKGROUNDTRANSPARENT", "Background Transparent")
+#define RID_STR_OVERLAP_OTHER_CONTROL           NC_("RID_STR_OVERLAP_OTHER_CONTROL", "This operation is not allowed. The control overlaps with another one.")
+#define RID_STR_ILLEGAL_POSITION                NC_("RID_STR_ILLEGAL_POSITION", "This position can not be set. It is invalid.")
+#define RID_STR_SCOPE_GROUP                     NC_("RID_STR_SCOPE_GROUP", "Group: %1")
+#define RID_STR_FORMULALIST                     NC_("RID_STR_FORMULALIST", "Function")
+#define RID_STR_SCOPE                           NC_("RID_STR_SCOPE", "Scope")
+#define RID_STR_TYPE                            NC_("RID_STR_TYPE", "Data Field Type")
+#define RID_STR_MASTERFIELDS                    NC_("RID_STR_MASTERFIELDS", "Link master fields")
+#define RID_STR_DETAILFIELDS                    NC_("RID_STR_DETAILFIELDS", "Link slave fields")
+#define RID_STR_EXPLANATION                     ("Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report.")
+#define RID_STR_DETAILLABEL                     NC_("RID_STR_DETAILLABEL", "Chart")
+#define RID_STR_MASTERLABEL                     NC_("RID_STR_MASTERLABEL", "Report")
+#define RID_STR_PREVIEW_COUNT                   NC_("RID_STR_PREVIEW_COUNT", "Preview Row(s)")
+#define RID_STR_AREA                            NC_("RID_STR_AREA", "Area")
+#define RID_STR_MIMETYPE                        NC_("RID_STR_MIMETYPE", "Report Output Format")
+#define RID_STR_VERTICALALIGN                   NC_("RID_STR_VERTICALALIGN", "Vert. Alignment")
+#define RID_STR_PARAADJUST                      NC_("RID_STR_PARAADJUST", "Horz. Alignment")
+#define RID_STR_F_COUNTER                       NC_("RID_STR_F_COUNTER", "Counter")
+#define RID_STR_F_ACCUMULATION                  NC_("RID_STR_F_ACCUMULATION", "Accumulation")
+#define RID_STR_F_MINIMUM                       NC_("RID_STR_F_MINIMUM", "Minimum")
+#define RID_STR_F_MAXIMUM                       NC_("RID_STR_F_MAXIMUM", "Maximum")
+
+#define RID_STR_BRWTITLE_PROPERTIES             NC_("RID_STR_BRWTITLE_PROPERTIES", "Properties: ")
+#define RID_STR_BRWTITLE_NO_PROPERTIES          NC_("RID_STR_BRWTITLE_NO_PROPERTIES", "No Control marked")
+#define RID_STR_BRWTITLE_MULTISELECT            NC_("RID_STR_BRWTITLE_MULTISELECT", "Multiselection")
+#define RID_STR_PROPTITLE_IMAGECONTROL          NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control")
+#define RID_STR_PROPTITLE_FIXEDTEXT             NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label field")
+#define RID_STR_PROPTITLE_FIXEDLINE             NC_("RID_STR_PROPTITLE_FIXEDLINE", "Line")
+#define RID_STR_PROPTITLE_FORMATTED             NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field")
+#define RID_STR_PROPTITLE_SHAPE                 NC_("RID_STR_PROPTITLE_SHAPE", "Shape")
+#define RID_STR_PROPTITLE_REPORT                NC_("RID_STR_PROPTITLE_REPORT", "Report")
+#define RID_STR_PROPTITLE_SECTION               NC_("RID_STR_PROPTITLE_SECTION", "Section")
+#define RID_STR_PROPTITLE_FUNCTION              NC_("RID_STR_PROPTITLE_FUNCTION", "Function")
+#define RID_STR_PROPTITLE_GROUP                 NC_("RID_STR_PROPTITLE_GROUP", "Group")
+#define RID_STR_UNDO_CHANGEPOSITION             NC_("RID_STR_UNDO_CHANGEPOSITION", "Change Object")
+#define RID_STR_UNDO_MOVE_GROUP                 NC_("RID_STR_UNDO_MOVE_GROUP", "Move Group(s)")
+#define RID_STR_UNDO_CONDITIONAL_FORMATTING     NC_("RID_STR_UNDO_CONDITIONAL_FORMATTING", "Conditional Formatting")
+#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER  NC_("RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER", "Remove report header / report footer")
+#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER     NC_("RID_STR_UNDO_ADD_REPORTHEADERFOOTER", "Add report header / report footer")
+// The # character is used for replacing
+#define RID_STR_UNDO_PROPERTY                   NC_("RID_STR_UNDO_PROPERTY", "Change property '#'")
+#define RID_STR_UNDO_ADD_GROUP_HEADER           NC_("RID_STR_UNDO_ADD_GROUP_HEADER", "Add group header ")
+#define RID_STR_UNDO_REMOVE_GROUP_HEADER        NC_("RID_STR_UNDO_REMOVE_GROUP_HEADER", "Remove group header ")
+#define RID_STR_UNDO_ADD_GROUP_FOOTER           NC_("RID_STR_UNDO_ADD_GROUP_FOOTER", "Add group footer ")
+#define RID_STR_UNDO_REMOVE_GROUP_FOOTER        NC_("RID_STR_UNDO_REMOVE_GROUP_FOOTER", "Remove group footer ")
+#define RID_STR_UNDO_ADDFUNCTION                NC_("RID_STR_UNDO_ADDFUNCTION", "Add function")
+#define STR_RPT_LABEL                           NC_("STR_RPT_LABEL", "~Report name")
+#define RID_STR_UNDO_REMOVE_GROUP               NC_("RID_STR_UNDO_REMOVE_GROUP", "Delete Group")
+#define RID_STR_UNDO_APPEND_GROUP               NC_("RID_STR_UNDO_APPEND_GROUP", "Add Group")
+#define RID_STR_UNDO_REMOVE_SELECTION           NC_("RID_STR_UNDO_REMOVE_SELECTION", "Delete Selection")
+#define RID_STR_UNDO_REMOVE_FUNCTION            NC_("RID_STR_UNDO_REMOVE_FUNCTION", "Delete Function")
+#define RID_STR_UNDO_CHANGE_SIZE                NC_("RID_STR_UNDO_CHANGE_SIZE", "Change Size")
+#define RID_STR_UNDO_PASTE                      NC_("RID_STR_UNDO_PASTE", "Paste")
+#define RID_STR_UNDO_INSERT_CONTROL             NC_("RID_STR_UNDO_INSERT_CONTROL", "Insert Control")
+#define RID_STR_UNDO_DELETE_CONTROL             NC_("RID_STR_UNDO_DELETE_CONTROL", "Delete Control")
+// Please try to avoid spaces in the name. It is used as a programmatic one.
+#define RID_STR_GROUPHEADER                     NC_("RID_STR_GROUPHEADER", "GroupHeader")
+// Please try to avoid spaces in the name. It is used as a programmatic one.
+#define RID_STR_GROUPFOOTER                     NC_("RID_STR_GROUPFOOTER", "GroupFooter")
+#define RID_STR_FIELDSELECTION                  NC_("RID_STR_FIELDSELECTION", "Add field:")
+#define RID_STR_FILTER                          NC_("RID_STR_FILTER", "Filter")
+#define RID_STR_UNDO_ALIGNMENT                  NC_("RID_STR_UNDO_ALIGNMENT", "Change Alignment")
+// # will be replaced with a name.
+#define RID_STR_HEADER                          NC_("RID_STR_HEADER", "# Header")
+// # will be replaced with a name.";
+#define RID_STR_FOOTER                          NC_("RID_STR_FOOTER", "# Footer")
+#define RID_STR_IMPORT_GRAPHIC                  NC_("RID_STR_IMPORT_GRAPHIC", "Insert graphics")
+#define RID_STR_DELETE                          NC_("RID_STR_DELETE", "Delete")
+#define RID_STR_FUNCTION                        NC_("RID_STR_FUNCTION", "Function")
+#define RID_STR_COULD_NOT_CREATE_REPORT         NC_("RID_STR_COULD_NOT_CREATE_REPORT", "An error occurred while creating the report.")
+#define RID_STR_CAUGHT_FOREIGN_EXCEPTION        NC_("RID_STR_CAUGHT_FOREIGN_EXCEPTION", "An exception of type $type$ was caught.")
+#define RID_STR_UNDO_CHANGEFONT                 NC_("RID_STR_UNDO_CHANGEFONT", "Change font")
+#define RID_STR_UNDO_CHANGEPAGE                 NC_("RID_STR_UNDO_CHANGEPAGE", "Change page attributes")
+#define RID_STR_PAGEHEADERFOOTER_INSERT         NC_("RID_STR_PAGEHEADERFOOTER_INSERT", "Insert Page Header/Footer")
+#define RID_STR_PAGEHEADERFOOTER_DELETE         NC_("RID_STR_PAGEHEADERFOOTER_DELETE", "Delete Page Header/Footer")
+#define RID_STR_REPORTHEADERFOOTER_INSERT       NC_("RID_STR_REPORTHEADERFOOTER_INSERT", "Insert Report Header/Footer")
+#define RID_STR_REPORTHEADERFOOTER_DELETE       NC_("RID_STR_REPORTHEADERFOOTER_DELETE", "Delete Report Header/Footer")
+#define RID_ERR_NO_COMMAND                      NC_("RID_ERR_NO_COMMAND", "The report can not be executed unless it is bound to content.")
+#define RID_ERR_NO_OBJECTS                      NC_("RID_ERR_NO_OBJECTS", "The report can not be executed unless at least one object has been inserted.")
+#define RID_STR_UNDO_SHRINK                     NC_("RID_STR_UNDO_SHRINK", "Shrink Section")
+#define RID_STR_DETAIL                          NC_("RID_STR_DETAIL", "Detail")
+#define RID_STR_PAGE_HEADER                     NC_("RID_STR_PAGE_HEADER", "Page Header")
+#define RID_STR_PAGE_FOOTER                     NC_("RID_STR_PAGE_FOOTER", "Page Footer")
+#define RID_STR_REPORT_HEADER                   NC_("RID_STR_REPORT_HEADER", "Report Header")
+#define RID_STR_REPORT_FOOTER                   NC_("RID_STR_REPORT_FOOTER", "Report Footer")
+
+#define STR_NUMBERED_CONDITION                  NC_("STR_NUMBERED_CONDITION", "Condition $number$")
+
+#define STR_RPT_EXPRESSION                      NC_("STR_RPT_EXPRESSION", "Field/Expression")
+#define STR_RPT_PREFIXCHARS                     NC_("STR_RPT_PREFIXCHARS", "Prefix Characters")
+#define STR_RPT_YEAR                            NC_("STR_RPT_YEAR", "Year")
+#define STR_RPT_QUARTER                         NC_("STR_RPT_QUARTER", "Quarter")
+#define STR_RPT_MONTH                           NC_("STR_RPT_MONTH", "Month")
+#define STR_RPT_WEEK                            NC_("STR_RPT_WEEK", "Week")
+#define STR_RPT_DAY                             NC_("STR_RPT_DAY", "Day")
+#define STR_RPT_HOUR                            NC_("STR_RPT_HOUR", "Hour")
+#define STR_RPT_MINUTE                          NC_("STR_RPT_MINUTE", "Minute")
+#define STR_RPT_INTERVAL                        NC_("STR_RPT_INTERVAL", "Interval")
+#define STR_RPT_HELP_FIELD                      NC_("STR_RPT_HELP_FIELD", "Select a field or type an expression to sort or group on.")
+#define STR_RPT_HELP_HEADER                     NC_("STR_RPT_HELP_HEADER", "Display a header for this group?")
+#define STR_RPT_HELP_FOOTER                     NC_("STR_RPT_HELP_FOOTER", "Display a footer for this group?")
+#define STR_RPT_HELP_GROUPON                    NC_("STR_RPT_HELP_GROUPON", "Select the value or range of values that starts a new group.")
+#define STR_RPT_HELP_INTERVAL                   NC_("STR_RPT_HELP_INTERVAL", "Interval or number of characters to group on.")
+#define STR_RPT_HELP_KEEP                       NC_("STR_RPT_HELP_KEEP", "Keep group together on one page?")
+#define STR_RPT_HELP_SORT                       NC_("STR_RPT_HELP_SORT", "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9")
+
+// The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as "
+#define STR_RPT_PN_PAGE                 NC_("STR_RPT_PN_PAGE", "\"Page \" & #PAGENUMBER#")
+// The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated  as well as "
+#define STR_RPT_PN_PAGE_OF                  NC_("STR_RPT_PN_PAGE_OF", " & \" of \" & #PAGECOUNT#")
+
+#define RID_STR_FUNCTIONS                   NC_("RID_STR_FUNCTIONS", "Functions")
+#define RID_STR_GROUPS                      NC_("RID_STR_GROUPS", "Groups")
+
+#define RID_STR_DETAIL                      NC_("RID_STR_DETAIL", "Detail")
+#define RID_STR_PAGE_HEADER                 NC_("RID_STR_PAGE_HEADER", "Page Header")
+#define RID_STR_PAGE_FOOTER                 NC_("RID_STR_PAGE_FOOTER", "Page Footer")
+#define RID_STR_GROUP_HEADER                NC_("RID_STR_GROUP_HEADER", "Group Header")
+#define RID_STR_GROUP_FOOTER                NC_("RID_STR_GROUP_FOOTER", "Group Footer")
+#define RID_STR_REPORT_HEADER               NC_("RID_STR_REPORT_HEADER", "Report Header")
+#define RID_STR_REPORT_FOOTER               NC_("RID_STR_REPORT_FOOTER", "Report Footer")
+#define RID_STR_ERROR_WRONG_ARGUMENT        NC_("RID_STR_ERROR_WRONG_ARGUMENT", "You tried to set an illegal argument. Please have a look at '#1' for valid arguments.")
+#define RID_STR_ARGUMENT_IS_NULL            NC_("RID_STR_ARGUMENT_IS_NULL", "The element is invalid.")
+#define RID_STR_FIXEDTEXT                   NC_("RID_STR_FIXEDTEXT", "Label field")
+#define RID_STR_FORMATTEDFIELD              NC_("RID_STR_FORMATTEDFIELD", "Formatted field")
+#define RID_STR_IMAGECONTROL                NC_("RID_STR_IMAGECONTROL", "Image control")
+#define RID_STR_REPORT                      NC_("RID_STR_REPORT", "Report")
+#define RID_STR_SHAPE                       NC_("RID_STR_SHAPE", "Shape")
+#define RID_STR_FIXEDLINE                   NC_("RID_STR_FIXEDLINE", "Fixed line")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/strings.hxx b/reportdesign/inc/strings.hxx
index d5fd6ad8385b..06d88c360909 100644
--- a/reportdesign/inc/strings.hxx
+++ b/reportdesign/inc/strings.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
-#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HXX
+#define INCLUDED_REPORTDESIGN_INC_STRINGS_HXX
 
 // Dialog Controls
 
@@ -17,6 +17,271 @@
 #define RID_STR_CLASS_IMAGECONTROL      "Graphic"
 #define RID_STR_CLASS_FORMATTEDFIELD    "FormattedField"
 
+//= service names
+
+#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText"
+#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField"
+#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl"
+#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition"
+#define SERVICE_FUNCTION "com.sun.star.report.Function"
+#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition"
+#define SERVICE_SHAPE "com.sun.star.report.Shape"
+#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine"
+#define SERVICE_SECTION "com.sun.star.report.Section"
+#define SERVICE_GROUP "com.sun.star.report.Group"
+
+//= property names
+
+#define PROPERTY_VISIBLE "Visible"
+#define PROPERTY_NAME "Name"
+#define PROPERTY_HEIGHT "Height"
+#define PROPERTY_BACKCOLOR "BackColor"
+#define PROPERTY_BACKTRANSPARENT "BackTransparent"
+#define PROPERTY_CONTROLBACKGROUND "ControlBackground"
+#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent"
+#define PROPERTY_FORCENEWPAGE "ForceNewPage"
+#define PROPERTY_NEWROWORCOL "NewRowOrCol"
+#define PROPERTY_KEEPTOGETHER "KeepTogether"
+#define PROPERTY_CANGROW "CanGrow"
+#define PROPERTY_CANSHRINK "CanShrink"
+#define PROPERTY_REPEATSECTION "RepeatSection"
+#define PROPERTY_GROUP "Group"
+#define PROPERTY_REPORTDEFINITION "ReportDefinition"
+
+#define PROPERTY_GROUPINTERVAL "GroupInterval"
+#define PROPERTY_EXPRESSION "Expression"
+#define PROPERTY_GROUPON "GroupOn"
+#define PROPERTY_SORTASCENDING "SortAscending"
+
+#define PROPERTY_MASTERFIELDS "MasterFields"
+#define PROPERTY_DETAILFIELDS "DetailFields"
+#define PROPERTY_CAPTION "Caption"
+#define PROPERTY_COMMAND "Command"
+#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation"
+#define PROPERTY_ORIENTATION "Orientation"
+#define PROPERTY_PAPERSIZE "Size"
+#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether"
+#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption"
+#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption"
+#define PROPERTY_COMMANDTYPE "CommandType"
+#define PROPERTY_REPORTHEADERON "ReportHeaderOn"
+#define PROPERTY_REPORTFOOTERON "ReportFooterOn"
+#define PROPERTY_PAGEHEADERON "PageHeaderOn"
+#define PROPERTY_PAGEFOOTERON "PageFooterOn"
+#define PROPERTY_HEADERON "HeaderOn"
+#define PROPERTY_FOOTERON "FooterOn"
+#define PROPERTY_WIDTH "Width"
+#define PROPERTY_POSITIONX "PositionX"
+#define PROPERTY_POSITIONY "PositionY"
+#define PROPERTY_DATAFIELD "DataField"
+#define PROPERTY_PARAADJUST "ParaAdjust"
+#define PROPERTY_FONTDESCRIPTOR "FontDescriptor"
+#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian"
+#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex"
+#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis"
+#define PROPERTY_CHARRELIEF "CharRelief"
+#define PROPERTY_CHARCOLOR "CharColor"
+#define PROPERTY_VERTICALALIGN "VerticalAlign"
+#define PROPERTY_IMAGEPOSITION "ImagePosition"
+#define PROPERTY_IMAGEURL "ImageURL"
+#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor"
+#define PROPERTY_LABEL "Label"
+#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault"
+#define PROPERTY_EFFECTIVEMAX "EffectiveMax"
+#define PROPERTY_EFFECTIVEMIN "EffectiveMin"
+#define PROPERTY_FORMATKEY "FormatKey"
+#define PROPERTY_MAXTEXTLEN "MaxTextLen"
+#define PROPERTY_LISTSOURCE "ListSource"
+#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier"
+#define PROPERTY_CONTROLBORDER "ControlBorder"
+#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor"
+#define PROPERTY_BORDER "Border"
+#define PROPERTY_BORDERCOLOR "BorderColor"
+#define PROPERTY_DEFAULTCONTROL "DefaultControl"
+
+#define PROPERTY_LEFTMARGIN "LeftMargin"
+#define PROPERTY_RIGHTMARGIN "RightMargin"
+#define PROPERTY_TOPMARGIN "TopMargin"
+#define PROPERTY_BOTTOMMARGIN "BottomMargin"
+
+#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues"
+#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression"
+#define PROPERTY_STARTNEWCOLUMN "StartNewColumn"
+#define PROPERTY_RESETPAGENUMBER "ResetPageNumber"
+#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange"
+#define PROPERTY_STATE "State"
+#define PROPERTY_TIME_STATE "TimeState"
+#define PROPERTY_DATE_STATE "DateState"
+#define PROPERTY_TRISTATE "TriState"
+#define PROPERTY_LISTSOURCETYPE "ListSourceType"
+#define PROPERTY_FONTCHARWIDTH    "FontCharWidth"
+#define PROPERTY_FONTCHARSET      "CharFontCharSet"
+#define PROPERTY_FONTFAMILY       "CharFontFamily"
+#define PROPERTY_CHARFONTHEIGHT   "CharHeight"
+#define PROPERTY_FONTHEIGHT       "FontHeight"
+#define PROPERTY_FONTKERNING      "FontKerning"
+#define PROPERTY_FONT             "FontDescriptor"
+#define PROPERTY_FONTNAME         "FontName"
+#define PROPERTY_FONTORIENTATION  "CharRotation"
+#define PROPERTY_FONTPITCH        "CharFontPitch"
+#define PROPERTY_FONTSLANT        "FontSlant"
+#define PROPERTY_CHARSTRIKEOUT    "CharStrikeout"
+#define PROPERTY_FONTSTRIKEOUT    "FontStrikeout"
+#define PROPERTY_FONTSTYLENAME    "CharFontStyleName"
+#define PROPERTY_FONTUNDERLINE    "CharUnderline"
+#define PROPERTY_FONTWEIGHT       "CharWeight"
+#define PROPERTY_FONTWIDTH        "FontWidth"
+#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
+#define PROPERTY_FONTTYPE         "FontType"
+
+#define PROPERTY_ENABLED       "Enabled"
+
+#define PROPERTY_CHAREMPHASIS     "CharEmphasis"
+#define PROPERTY_CHARFONTNAME     "CharFontName"
+#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName"
+#define PROPERTY_CHARFONTFAMILY   "CharFontFamily"
+#define PROPERTY_CHARFONTCHARSET  "CharFontCharSet"
+#define PROPERTY_CHARFONTPITCH    "CharFontPitch"
+#define PROPERTY_CHARHEIGHT       "CharHeight"
+#define PROPERTY_CHARUNDERLINE    "CharUnderline"
+#define PROPERTY_CHARWEIGHT       "CharWeight"
+#define PROPERTY_CHARPOSTURE      "CharPosture"
+#define PROPERTY_CHARWORDMODE     "CharWordMode"
+#define PROPERTY_CHARROTATION     "CharRotation"
+#define PROPERTY_CHARSCALEWIDTH   "CharScaleWidth"
+
+// Asian
+#define PROPERTY_CHAREMPHASISASIAN        "CharEmphasisAsian"
+#define PROPERTY_CHARFONTNAMEASIAN        "CharFontNameAsian"
+#define PROPERTY_CHARFONTSTYLENAMEASIAN   "CharFontStyleNameAsian"
+#define PROPERTY_CHARFONTFAMILYASIAN      "CharFontFamilyAsian"
+#define PROPERTY_CHARFONTCHARSETASIAN     "CharFontCharSetAsian"
+#define PROPERTY_CHARFONTPITCHASIAN       "CharFontPitchAsian"
+#define PROPERTY_CHARHEIGHTASIAN          "CharHeightAsian"
+#define PROPERTY_CHARUNDERLINEASIAN       "CharUnderlineAsian"
+#define PROPERTY_CHARWEIGHTASIAN          "CharWeightAsian"
+#define PROPERTY_CHARPOSTUREASIAN         "CharPostureAsian"
+#define PROPERTY_CHARWORDMODEASIAN        "CharWordModeAsian"
+#define PROPERTY_CHARROTATIONASIAN        "CharRotationAsian"
+#define PROPERTY_CHARSCALEWIDTHASIAN      "CharScaleWidthAsian"
+#define PROPERTY_CHARLOCALEASIAN           "CharLocaleAsian"
+
+// Complex
+#define PROPERTY_CHAREMPHASISCOMPLEX      "CharEmphasisComplex"
+#define PROPERTY_CHARFONTNAMECOMPLEX      "CharFontNameComplex"
+#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex"
+#define PROPERTY_CHARFONTFAMILYCOMPLEX    "CharFontFamilyComplex"
+#define PROPERTY_CHARFONTCHARSETCOMPLEX   "CharFontCharSetComplex"
+#define PROPERTY_CHARFONTPITCHCOMPLEX     "CharFontPitchComplex"
+#define PROPERTY_CHARHEIGHTCOMPLEX        "CharHeightComplex"
+#define PROPERTY_CHARUNDERLINECOMPLEX     "CharUnderlineComplex"
+#define PROPERTY_CHARWEIGHTCOMPLEX        "CharWeightComplex"
+#define PROPERTY_CHARPOSTURECOMPLEX       "CharPostureComplex"
+#define PROPERTY_CHARWORDMODECOMPLEX      "CharWordModeComplex"
+#define PROPERTY_CHARROTATIONCOMPLEX      "CharRotationComplex"
+#define PROPERTY_CHARSCALEWIDTHCOMPLEX    "CharScaleWidthComplex"
+#define PROPERTY_CHARLOCALECOMPLEX        "CharLocaleComplex"
+
+#define PROPERTY_STATUSINDICATOR  "StatusIndicator"
+#define PROPERTY_SECTION          "Section"
+#define PROPERTY_FILTER           "Filter"
+#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing"
+
+#define PROPERTY_MULTILINE        "MultiLine"
+#define PROPERTY_ACTIVECONNECTION "ActiveConnection"
+#define PROPERTY_DATASOURCENAME   "DataSourceName"
+#define PROPERTY_FORMULA          "Formula"
+#define PROPERTY_INITIALFORMULA   "InitialFormula"
+#define PROPERTY_PREEVALUATED     "PreEvaluated"
+#define PROPERTY_DEEPTRAVERSING   "DeepTraversing"
+#define PROPERTY_MIMETYPE         "MimeType"
+#define PROPERTY_BACKGROUNDCOLOR  "BackgroundColor"
+#define PROPERTY_TEXT             "Text"
+#define PROPERTY_TEXTCOLOR        "TextColor"
+#define PROPERTY_TEXTLINECOLOR   "TextLineColor"
+#define PROPERTY_FONTRELIEF   "FontRelief"
+#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark"
+#define PROPERTY_ZORDER           "ZOrder"
+#define PROPERTY_OPAQUE           "Opaque"
+#define PROPERTY_TRANSFORMATION    "Transformation"
+#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine"
+#define PROPERTY_CUSTOMSHAPEDATA   "CustomShapeData"
+#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry"
+
+#define PROPERTY_NUMBERINGTYPE     "NumberingType"
+#define PROPERTY_PAGESTYLELAYOUT   "PageStyleLayout"
+#define PROPERTY_ISLANDSCAPE       "IsLandscape"
+#define PROPERTY_ALIGN "Align"
+#define PROPERTY_TYPE  "Type"
+
+#define PROPERTY_PRESERVEIRI  "PreserveIRI"
+#define PROPERTY_SCALEMODE  "ScaleMode"
+
+#define PROPERTY_LINESTYLE  "LineStyle"
+#define PROPERTY_LINEDASH  "LineDash"
+#define PROPERTY_LINECOLOR  "LineColor"
+#define PROPERTY_LINETRANSPARENCE  "LineTransparence"
+#define PROPERTY_LINEWIDTH  "LineWidth"
+
+#define PROPERTY_CHARFLASH            "CharFlash"
+#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight"
+#define PROPERTY_CHARLOCALE           "CharLocale"
+#define PROPERTY_CHARESCAPEMENT       "CharEscapement"
+#define PROPERTY_CHARCASEMAP          "CharCaseMap"
+#define PROPERTY_CHARCOMBINEISON      "CharCombineIsOn"
+#define PROPERTY_CHARCOMBINEPREFIX    "CharCombinePrefix"
+#define PROPERTY_CHARCOMBINESUFFIX    "CharCombineSuffix"
+#define PROPERTY_CHARHIDDEN           "CharHidden"
+#define PROPERTY_CHARSHADOWED         "CharShadowed"
+#define PROPERTY_CHARCONTOURED        "CharContoured"
+#define PROPERTY_CHARAUTOKERNING      "CharAutoKerning"
+#define PROPERTY_CHARKERNING          "CharKerning"
+#define PROPERTY_HYPERLINKURL "HyperLinkURL"
+#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget"
+#define PROPERTY_HYPERLINKNAME "HyperLinkName"
+#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName"
+#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName"
+#define PROPERTY_ORDER                "Order"
+#define PROPERTY_APPLYFILTER          "ApplyFilter"
+#define PROPERTY_MAXROWS              "MaxRows"
+
+#define PROPERTY_REPORTNAME "ReportName"
+#define CFG_REPORTDESIGNER "SunReportBuilder"
+#define DBREPORTHEADER "ReportHeader"
+#define DBREPORTFOOTER "ReportFooter"
+#define DBPAGEHEADER "PageHeader"
+#define DBPAGEFOOTER "PageFooter"
+#define DBGROUPHEADER "GroupHeader"
+#define DBGROUPFOOTER "GroupFooter"
+#define DBDETAIL "Detail"
+#define REPORTCONTROLFORMAT "ReportControlFormat"
+#define CURRENT_WINDOW "CurrentWindow"
+#define PROPERTY_FONTCOLOR "FontColor"
+#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull"
+#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal"
+#define PROPERTY_POSITION "Position"
+#define PROPERTY_FORMATKEYDATE "FormatKeyDate"
+#define PROPERTY_FORMATKEYTIME "FormatKeyTime"
+#define DBOVERLAPPEDCONTROL "OverlappedControl"
+#define PROPERTY_FORMULALIST "FormulaList"
+#define PROPERTY_SCOPE "Scope"
+#define PROPERTY_CHARTTYPE "ChartType"
+#define PROPERTY_PREVIEW_COUNT "RowLimit"
+#define PROPERTY_TITLE "Title"
+#define PROPERTY_AREA "Area"
+#define PROPERTY_FILLCOLOR "FillColor"
+#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent"
+
+#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter"
+#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter"
+#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter"
+#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter"
+#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter"
+#define PROPERTY_BORDERLEFT "BorderLeft"
+#define PROPERTY_BORDERRIGHT "BorderRight"
+#define PROPERTY_BORDERTOP "BorderTop"
+#define PROPERTY_BORDERBOTTOM "BorderBottom"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 5438cba7aedb..be9c96ccdd64 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -18,8 +18,8 @@
  */
 #include "FixedLine.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -136,7 +136,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
 ,m_LineTransparence(0)
 ,m_LineWidth(0)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDLINE);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FIXEDLINE);
     m_aProps.aComponent.m_nWidth = MIN_WIDTH;
 }
 
@@ -153,7 +153,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
 ,m_LineTransparence(0)
 ,m_LineWidth(0)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDLINE);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FIXEDLINE);
     m_aProps.aComponent.m_xFactory = _xFactory;
     osl_atomic_increment( &m_refCount );
     try
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index db3dd5ae2427..0ebad3934f31 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -18,9 +18,9 @@
  */
 #include "FixedText.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "Tools.hxx"
 #include <tools/color.hxx>
@@ -47,7 +47,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
 ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDTEXT);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FIXEDTEXT);
     m_aProps.aComponent.m_nBorder = 0; // no border
 }
 
@@ -58,7 +58,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
 ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDTEXT);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FIXEDTEXT);
     m_aProps.aComponent.m_nBorder = 0; // no border
     m_aProps.aComponent.m_xFactory = _xFactory;
     osl_atomic_increment( &m_refCount );
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 81687c85ca4a..d5ff822d2678 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -18,7 +18,7 @@
  */
 #include "FormatCondition.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <tools/color.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 4aa4fbd7edb5..b00c5e1d6669 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -19,8 +19,8 @@
 #include "FormattedField.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include <tools/color.hxx>
 #include <connectivity/dbtools.hxx>
@@ -54,7 +54,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 ,m_nFormatKey(0)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FORMATTEDFIELD);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FORMATTEDFIELD);
 }
 
 OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext
@@ -65,7 +65,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 ,m_nFormatKey(0)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FORMATTEDFIELD);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_FORMATTEDFIELD);
     m_aProps.aComponent.m_xFactory = _xFactory;
     osl_atomic_increment( &m_refCount );
     {
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 8696f41e3bf4..e365dc928e70 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -18,7 +18,7 @@
  */
 #include "Function.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index 9c9d84bd124c..d70ca0fcf427 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -19,7 +19,7 @@
 #include "Functions.hxx"
 #include "Function.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <comphelper/property.hxx>
 #include <algorithm>
@@ -77,7 +77,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle
             checkIndex(Index);
         uno::Reference< report::XFunction > xFunction(aElement,uno::UNO_QUERY);
         if ( !xFunction.is() )
-            throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2);
+            throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2);
 
         if ( bAdd )
             m_aFunctions.push_back(xFunction);
@@ -120,7 +120,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele
         checkIndex(Index);
         uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY);
         if ( !xFunction.is() )
-            throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2);
+            throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2);
         TFunctions::iterator aPos = m_aFunctions.begin();
         ::std::advance(aPos,Index);
         aOldElement <<= *aPos;
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index f32a33ed5437..6bcba7b6dbc6 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -22,8 +22,8 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/report/GroupOn.hpp>
 #include <com/sun/star/report/KeepTogether.hpp>
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "Tools.hxx"
 #include <comphelper/property.hxx>
@@ -118,7 +118,7 @@ void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron )
 {
     if ( bool(_headeron) != m_xHeader.is() )
     {
-        OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER));
+        OUString sName(RptResId(RID_STR_GROUP_HEADER));
         setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
     }
 }
@@ -133,7 +133,7 @@ void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron )
 {
     if ( bool(_footeron) != m_xFooter.is() )
     {
-        OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER));
+        OUString sName(RptResId(RID_STR_GROUP_FOOTER));
         setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
     }
 }
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index d94a6e016234..3a4ae59b9872 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include <algorithm>
 
 namespace reportdesign
@@ -81,7 +81,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen
             checkIndex(Index);
         uno::Reference< report::XGroup > xGroup(aElement,uno::UNO_QUERY);
         if ( !xGroup.is() )
-            throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2);
+            throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2);
 
         if ( bAdd )
             m_aGroups.push_back(xGroup);
@@ -122,7 +122,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen
         checkIndex(Index);
         uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY);
         if ( !xGroup.is() )
-            throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2);
+            throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2);
         TGroups::iterator aPos = m_aGroups.begin();
         ::std::advance(aPos,Index);
         aOldElement <<= *aPos;
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index a42673323e4b..f0d48b45976a 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -19,8 +19,8 @@
 #include "ImageControl.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "Tools.hxx"
 #include <tools/color.hxx>
@@ -119,7 +119,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
 ,m_nScaleMode(awt::ImageScaleMode::NONE)
 ,m_bPreserveIRI(true)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_IMAGECONTROL);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_IMAGECONTROL);
 }
 
 OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext
@@ -131,7 +131,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
 ,m_nScaleMode(awt::ImageScaleMode::NONE)
 ,m_bPreserveIRI(true)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_IMAGECONTROL);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_IMAGECONTROL);
     m_aProps.aComponent.m_xFactory = _xFactory;
     osl_atomic_increment( &m_refCount );
     {
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 3c6c4baac61d..5504abb4a4de 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -18,7 +18,7 @@
  */
 #include "ReportComponent.hxx"
 
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 1124d6881d83..04f5a8b7679e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -37,9 +37,9 @@
 #include "Shape.hxx"
 #include "Tools.hxx"
 #include "UndoEnv.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
@@ -537,13 +537,13 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
 ,m_aProps(new OReportComponentProperties(_xContext))
 ,m_pImpl(new OReportDefinitionImpl(m_aMutex))
 {
-    m_aProps->m_sName  = RPT_RESSTRING(RID_STR_REPORT);
+    m_aProps->m_sName  = RptResId(RID_STR_REPORT);
     osl_atomic_increment(&m_refCount);
     {
         init();
         m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext);
         m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext);
-        m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL));
+        m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL));
     }
     osl_atomic_decrement( &m_refCount );
 }
@@ -556,7 +556,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
 ,m_aProps(new OReportComponentProperties(_xContext))
 ,m_pImpl(new OReportDefinitionImpl(m_aMutex))
 {
-    m_aProps->m_sName  = RPT_RESSTRING(RID_STR_REPORT);
+    m_aProps->m_sName  = RptResId(RID_STR_REPORT);
     m_aProps->m_xFactory = _xFactory;
     osl_atomic_increment(&m_refCount);
     {
@@ -564,7 +564,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
         init();
         m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext);
         m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext);
-        m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL));
+        m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL));
     }
     osl_atomic_decrement( &m_refCount );
 }
@@ -855,7 +855,7 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon )
 {
     if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() )
     {
-        setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RPT_RESSTRING(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader);
+        setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RptResId(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader);
     }
 }
 
@@ -869,7 +869,7 @@ void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron )
 {
     if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() )
     {
-        setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RPT_RESSTRING(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter);
+        setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RptResId(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter);
     }
 }
 
@@ -883,7 +883,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon )
 {
     if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() )
     {
-        setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RPT_RESSTRING(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader);
+        setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RptResId(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader);
     }
 }
 
@@ -897,7 +897,7 @@ void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron )
 {
     if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() )
     {
-        setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RPT_RESSTRING(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter);
+        setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RptResId(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter);
     }
 }
 
@@ -1281,7 +1281,7 @@ void SAL_CALL OReportDefinition::loadFromStorage( const uno::Reference< embed::X
 void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XStorage >& _xStorageToSaveTo, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
 {
     if ( !_xStorageToSaveTo.is() )
-        throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1);
+        throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1);
 
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -1437,7 +1437,7 @@ void SAL_CALL OReportDefinition::switchToStorage(
         const uno::Reference< embed::XStorage >& xStorage)
 {
     if (!xStorage.is())
-        throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1);
+        throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1);
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 8661cf2b94bc..2a8b1cd0fb56 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -45,8 +45,8 @@
 #include <unotools/sharedunocomponent.hxx>
 
 #include "Tools.hxx"
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 
 #include <connectivity/CommonTools.hxx>
@@ -195,7 +195,7 @@ OUString OReportEngineJFree::getNewOutputName()
                 ::utl::TempFile aTestFile(sName, false, &sExt);
                 if ( !aTestFile.IsValid() )
                 {
-                    sName = RPT_RESSTRING(RID_STR_REPORT);
+                    sName = RptResId(RID_STR_REPORT);
                     ::utl::TempFile aFile(sName, false, &sExt);
                     sFileURL = aFile.GetURL();
                 }
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index c8b29a7798b4..c712046276d3 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include "core_resource.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "Tools.hxx"
 #include "RptModel.hxx"
 #include "RptPage.hxx"
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index ce0b655d3496..3ed54547b154 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -28,8 +28,8 @@
 #include <tools/diagnose_ex.h>
 #include <svx/unoshape.hxx>
 
-#include "corestrings.hrc"
-#include "core_resource.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include "Tools.hxx"
 #include "RptObject.hxx"
@@ -59,7 +59,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
 ,m_nZOrder(0)
 ,m_bOpaque(false)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_SHAPE);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_SHAPE);
 }
 
 OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
@@ -73,7 +73,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
 ,m_bOpaque(false)
 ,m_sServiceName(_sServiceName)
 {
-    m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_SHAPE);
+    m_aProps.aComponent.m_sName  = RptResId(RID_STR_SHAPE);
     m_aProps.aComponent.m_xFactory = _xFactory;
     osl_atomic_increment( &m_refCount );
     {
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index 44c2b0e5ed76..886e7fe16675 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "Tools.hxx"
-#include "core_resource.hrc"
+#include "strings.hrc"
 #include "core_resource.hxx"
 #include <comphelper/property.hxx>
 
@@ -45,7 +45,7 @@ void throwIllegallArgumentException( const OUString& _sTypeName
                                     ,sal_Int16 ArgumentPosition_
                                     )
 {
-    OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT));
+    OUString sErrorMessage(RptResId(RID_STR_ERROR_WRONG_ARGUMENT));
     sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName);
     throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_);
 }
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 0f247e4aad36..7829022d4a6f 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -21,13 +21,11 @@
 
 #include <svx/svdundo.hxx>
 #include <memory>
-#include "ModuleHelper.hxx"
 
 namespace rptui
 {
     class OReportUndoFactory : public SdrUndoFactory
     {
-        OModuleClient       m_aModuleClient;
         ::std::unique_ptr<SdrUndoFactory> m_pUndoFactory;
 
         OReportUndoFactory(const OReportUndoFactory&) = delete;
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 37a7357cf006..64ad3ab96f78 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -28,7 +28,7 @@
 
 
 #include "Section.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc
deleted file mode 100644
index 9b4e58889fe5..000000000000
--- a/reportdesign/source/core/inc/core_resource.hrc
+++ /dev/null
@@ -1,46 +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 REPORTDESIGN_CORE_RESOURCE_HRC_
-#define REPORTDESIGN_CORE_RESOURCE_HRC_
-
-#include <svl/solar.hrc>
-
-#define RID_CORE_STRINGS_START                  RID_RPT_START
-
-//- String-IDs
-#define RID_STR_DETAIL                      ( RID_CORE_STRINGS_START +  0 )
-#define RID_STR_PAGE_HEADER                 ( RID_CORE_STRINGS_START +  1 )
-#define RID_STR_PAGE_FOOTER                 ( RID_CORE_STRINGS_START +  2 )
-#define RID_STR_REPORT_HEADER               ( RID_CORE_STRINGS_START +  3 )
-#define RID_STR_REPORT_FOOTER               ( RID_CORE_STRINGS_START +  4 )
-#define RID_STR_ERROR_WRONG_ARGUMENT        ( RID_CORE_STRINGS_START +  6 )
-#define RID_STR_ARGUMENT_IS_NULL            ( RID_CORE_STRINGS_START +  7 )
-#define RID_STR_SHAPE                       ( RID_CORE_STRINGS_START +  8 )
-#define RID_STR_REPORT                      ( RID_CORE_STRINGS_START +  9 )
-#define RID_STR_IMAGECONTROL                ( RID_CORE_STRINGS_START +  10 )
-#define RID_STR_FIXEDTEXT                   ( RID_CORE_STRINGS_START +  11 )
-#define RID_STR_FORMATTEDFIELD              ( RID_CORE_STRINGS_START +  12 )
-#define RID_STR_GROUP_HEADER                ( RID_CORE_STRINGS_START +  13 )
-#define RID_STR_GROUP_FOOTER                ( RID_CORE_STRINGS_START +  14 )
-#define RID_STR_FIXEDLINE                   ( RID_CORE_STRINGS_START +  15 )
-
-#endif // REPORTDESIGN_CORE_RESOURCE_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
deleted file mode 100644
index 797dc6f77de5..000000000000
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ /dev/null
@@ -1,66 +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_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-
-class SimpleResMgr;
-
-namespace reportdesign
-{
-
-#define RPT_RESSTRING(id) ResourceManager::loadString(id)
-
-
-    //= ResourceManager
-    //= handling resources within the DBA-Core library
-
-    class ResourceManager
-    {
-        static SimpleResMgr*    m_pImpl;
-
-        // no instantiation allowed
-        ResourceManager() = delete;
-
-        // we'll instantiate one static member of the following class, which, in its dtor,
-        // ensures that m_pImpl will be deleted
-        class EnsureDelete
-        {
-        public:
-            EnsureDelete() { }
-            ~EnsureDelete();
-        };
-        friend class EnsureDelete;
-
-    public:
-        /** loads the string with the specified resource id from the FormLayer resource file
-        */
-        static OUString loadString(sal_uInt16 _nResId);
-    };
-
-
-}
-
-
-#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 67813be52298..21718d124830 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "core_resource.hxx"
-#include <tools/simplerm.hxx>
+#include <tools/resmgr.hxx>
 
 // ---- needed as long as we have no contexts for components ---
 #include <vcl/svapp.hxx>
@@ -30,36 +30,11 @@
 #include <rtl/uri.hxx>
 
 #include <svl/solar.hrc>
-#include "ModuleHelper.hxx"
 
-namespace reportdesign
+OUString RptResId(const char* pId)
 {
-    using namespace ::com::sun::star;
-
-    //= ResourceManager
-
-    SimpleResMgr* ResourceManager::m_pImpl = nullptr;
-
-
-    ResourceManager::EnsureDelete::~EnsureDelete()
-    {
-        delete ResourceManager::m_pImpl;
-    }
-
-    OUString ResourceManager::loadString(sal_uInt16 _nResId)
-    {
-        if (!m_pImpl)
-        {
-            // now that we have an impl class make sure it's deleted on unloading the library
-            static ResourceManager::EnsureDelete    s_aDeleteTheImplClass;
-
-            m_pImpl = SimpleResMgr::Create("rpt", Application::GetSettings().GetUILanguageTag());
-        }
-        return m_pImpl->ReadString(_nResId);
-    }
-
-
+    static std::locale loc = Translate::Create("rpt", Application::GetSettings().GetUILanguageTag());
+    return Translate::get(pId, loc);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src
deleted file mode 100644
index 027f30415769..000000000000
--- a/reportdesign/source/core/resource/strings.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 "core_resource.hrc"
-
-String RID_STR_DETAIL
-{
-    Text [ en-US ] = "Detail";
-};
-
-String RID_STR_PAGE_HEADER
-{
-    Text [ en-US ] = "Page Header";
-};
-
-String RID_STR_PAGE_FOOTER
-{
-    Text [ en-US ] = "Page Footer";
-};
-
-String RID_STR_GROUP_HEADER
-{
-    Text [ en-US ] = "Group Header";
-};
-
-String RID_STR_GROUP_FOOTER
-{
-    Text [ en-US ] = "Group Footer";
-};
-
-String RID_STR_REPORT_HEADER
-{
-    Text [ en-US ] = "Report Header";
-};
-
-String RID_STR_REPORT_FOOTER
-{
-    Text [ en-US ] = "Report Footer";
-};
-
-String RID_STR_ERROR_WRONG_ARGUMENT
-{
-    Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments.";
-};
-
-String RID_STR_ARGUMENT_IS_NULL
-{
-    Text [ en-US ] = "The element is invalid.";
-};
-
-String RID_STR_FIXEDTEXT
-{
-    Text [ en-US ] = "Label field" ;
-};
-
-String RID_STR_FORMATTEDFIELD
-{
-    Text [ en-US ] = "Formatted field";
-};
-
-String RID_STR_IMAGECONTROL
-{
-    Text [ en-US ] = "Image control" ;
-};
-
-String RID_STR_REPORT
-{
-    Text [ en-US ] = "Report";
-};
-
-String RID_STR_SHAPE
-{
-    Text [ en-US ] = "Shape";
-};
-
-String RID_STR_FIXEDLINE
-{
-    Text [ en-US ] = "Fixed line";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
deleted file mode 100644
index 58f1691227b1..000000000000
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ /dev/null
@@ -1,124 +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 <memory>
-#include "ModuleHelper.hxx"
-#include <comphelper/processfactory.hxx>
-#include <osl/thread.h>
-#include <com/sun/star/util/XMacroExpander.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <rtl/instance.hxx>
-#include <rtl/uri.hxx>
-#include <svl/solar.hrc>
-
-#define ENTER_MOD_METHOD()  \
-    ::osl::MutexGuard aGuard(theOModuleMutex::get()); \
-    ensureImpl()
-
-
-namespace rptui
-{
-
-    using namespace ::com::sun::star;
-
-//= OModuleImpl
-
-/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner
-*/
-class OModuleImpl
-{
-    std::unique_ptr<ResMgr> m_pResources;
-
-public:
-    /// ctor
-    OModuleImpl();
-
-    /// get the manager for the resources of the module
-    ResMgr* getResManager();
-};
-
-
-OModuleImpl::OModuleImpl()
-    :m_pResources(nullptr)
-{
-}
-
-
-ResMgr* OModuleImpl::getResManager()
-{
-    // note that this method is not threadsafe, which counts for the whole class !
-
-    if (!m_pResources)
-    {
-        // create a manager with a fixed prefix
-        m_pResources.reset( ResMgr::CreateResMgr("rptui") );
-    }
-    return m_pResources.get();
-}
-
-
-//= OModule
-
-
-namespace
-{
-    // access safety
-    struct theOModuleMutex : public rtl::Static< osl::Mutex, theOModuleMutex > {};
-}
-
-sal_Int32       OModule::s_nClients = 0;
-OModuleImpl*    OModule::s_pImpl = nullptr;
-
-ResMgr* OModule::getResManager()
-{
-    ENTER_MOD_METHOD();
-    return s_pImpl->getResManager();
-}
-
-
-void OModule::registerClient()
-{
-    ::osl::MutexGuard aGuard(theOModuleMutex::get());
-    ++s_nClients;
-}
-
-
-void OModule::revokeClient()
-{
-    ::osl::MutexGuard aGuard(theOModuleMutex::get());
-    if (!--s_nClients && s_pImpl)
-    {
-        delete s_pImpl;
-        s_pImpl = nullptr;
-    }
-}
-
-
-void OModule::ensureImpl()
-{
-    if (s_pImpl)
-        return;
-    s_pImpl = new OModuleImpl();
-}
-
-
-}   // namespace dbaui
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index d65386302c23..0b06d5946698 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "corestrings.hrc"
+#include "strings.hxx"
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 4fb8ca0d3a6c..56573be9421a 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -20,7 +20,7 @@
 #include "RptObject.hxx"
 #include "RptModel.hxx"
 #include "RptDef.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 984da1343982..712eb12e8727 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -19,13 +19,13 @@
 #include "ReportUndoFactory.hxx"
 #include "RptObject.hxx"
 #include "UndoActions.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 
 namespace rptui
 {
     using namespace ::com::sun::star;
 
-SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCommentId)
+SdrUndoAction* lcl_createUndo(SdrObject& rObject, Action _eAction, const char* pCommentId)
 {
     OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject);
     if ( !pObj )
@@ -35,9 +35,9 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo
     uno::Reference< report::XGroup> xGroup = xSection->getGroup();
     SdrUndoAction* pUndo = nullptr;
     if ( xGroup.is() )
-        pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId);
+        pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,pCommentId);
     else
-        pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId);
+        pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,pCommentId);
     return pUndo;
 }
 
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 4eb29d0c3b89..36a25e337294 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -20,6 +20,7 @@
 #include "RptModel.hxx"
 #include "RptPage.hxx"
 #include <dbaccess/dbsubcomponentcontroller.hxx>
+#include <tools/resmgr.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/svapp.hxx>
 
@@ -31,7 +32,7 @@
 #include <svx/tbcontrl.hxx>
 #include "rptui_slotid.hrc"
 #include "RptDef.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include "FixedLine.hxx"
 #include "FormattedField.hxx"
 #include "FixedText.hxx"
@@ -186,5 +187,4 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aSer
 
 }   //rptui
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index d82f4a457851..8e82dcab9b77 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -27,11 +27,10 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include "RptPage.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include <dbaccess/dbsubcomponentcontroller.hxx>
-#include "ModuleHelper.hxx"
 
-#include <RptResId.hrc>
+#include <strings.hrc>
 #include "strings.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 08edfe1cdc60..68a6023f1a71 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -21,13 +21,13 @@
 #include "UndoEnv.hxx"
 #include "formatnormalizer.hxx"
 #include "conditionupdater.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include "rptui_slotid.hrc"
 #include "RptDef.hxx"
-#include "ModuleHelper.hxx"
+#include "core_resource.hxx"
 #include "RptObject.hxx"
 #include "RptPage.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "RptModel.hxx"
 
 #include <com/sun/star/container/XChild.hpp>
@@ -79,12 +79,12 @@ namespace rptui
 }
 
 
-OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
+OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,const char* pCommentID)
     :SdrUndoAction(_rMod)
 {
     m_pController = static_cast< OReportModel& >( _rMod ).getController();
-    if ( nCommentID )
-        m_strComment = ModuleRes(nCommentID);
+    if (pCommentID)
+        m_strComment = RptResId(pCommentID);
 }
 OCommentUndoAction::~OCommentUndoAction()
 {
@@ -102,8 +102,8 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
                                              ,Action _eAction
                                              ,const uno::Reference< container::XIndexContainer >& rContainer
                                              ,const Reference< XInterface > & xElem
-                                             ,sal_uInt16 _nCommentId)
-                      :OCommentUndoAction(_rMod,_nCommentId)
+                                             ,const char* pCommentId)
+                      :OCommentUndoAction(_rMod, pCommentId)
                       ,m_xElement(xElem)
                       ,m_xContainer(rContainer)
                          ,m_eAction( _eAction )
@@ -246,8 +246,8 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod
                                                     ,OGroupHelper> _pMemberFunction
                                              ,const uno::Reference< report::XGroup >& _xGroup
                                              ,const Reference< XInterface > & xElem
-                                             ,sal_uInt16 _nCommentId)
-:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId)
+                                             ,const char* pCommentId)
+:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId)
 ,m_aGroupHelper(_xGroup)
 ,m_pMemberFunction(_pMemberFunction)
 {
@@ -292,8 +292,8 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod
                                                 ,OReportHelper> _pMemberFunction
                                              ,const uno::Reference< report::XReportDefinition >& _xReport
                                              ,const Reference< XInterface > & xElem
-                                             ,sal_uInt16 _nCommentId)
-:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId)
+                                             ,const char* pCommentId)
+:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId)
 ,m_aReportHelper(_xReport)
 ,m_pMemberFunction(_pMemberFunction)
 {
@@ -338,7 +338,7 @@ void OUndoReportSectionAction::implReRemove( )
 }
 
 ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt)
-                     :OCommentUndoAction(rNewMod,0)
+                     :OCommentUndoAction(rNewMod,nullptr)
                      ,m_xObj(evt.Source, UNO_QUERY)
                      ,m_aPropertyName(evt.PropertyName)
                      ,m_aNewValue(evt.NewValue)
@@ -381,7 +381,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld)
 
 OUString ORptUndoPropertyAction::GetComment() const
 {
-    OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY) );
+    OUString aStr( RptResId(RID_STR_UNDO_PROPERTY) );
 
     return aStr.replaceFirst("#", m_aPropertyName);
 }
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ed3caaaba4a8..38c03995ec8d 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -20,13 +20,12 @@
 #include "UndoEnv.hxx"
 #include "formatnormalizer.hxx"
 #include "conditionupdater.hxx"
-#include "corestrings.hrc"
+#include "strings.hxx"
 #include "rptui_slotid.hrc"
 #include "RptDef.hxx"
-#include "ModuleHelper.hxx"
 #include "RptObject.hxx"
 #include "RptPage.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "RptModel.hxx"
 
 #include <com/sun/star/container/XChild.hpp>
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 5a5696861bb9..b2887720d4cd 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFixedLine.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlTable.hxx"
 #include "xmlFormattedField.hxx"
 #include "xmlImage.hxx"
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index f010f246c351..a563799502c2 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 
 #define PROPERTY_ID_WIDTH    1
 #define PROPERTY_ID_HEIGHT   2
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index cc9b689d1dde..788a0a3a09be 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -24,7 +24,7 @@
 #include <xmloff/nmspmap.hxx>
 #include "xmlEnums.hxx"
 #include "xmlHelper.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlStyleImport.hxx"
 #include <ucbhelper/content.hxx>
 #include <comphelper/namecontainer.hxx>
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index d44a982b8b33..767f1733c942 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -24,7 +24,7 @@
 #include "xmlEnums.hxx"
 #include "xmlControlProperty.hxx"
 #include "xmlComponent.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index f37e32667841..7a66a583f019 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -31,7 +31,7 @@
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/numehelp.hxx>
 #include "xmlHelper.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlPropertyHandler.hxx"
 #include <sax/tools/converter.hxx>
 #include <com/sun/star/awt/ImagePosition.hpp>
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 21a8fc1a6306..d8ce3fa9cd2e 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -24,7 +24,7 @@
 #include "xmlEnums.hxx"
 #include "xmlReportElement.hxx"
 #include "xmlCell.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/report/XFixedText.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 323d47e897d8..0e66bb46e689 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -27,7 +27,7 @@
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlStyleImport.hxx"
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 586296daf52d..76c7c00f18ae 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -23,7 +23,7 @@
 #include <xmloff/nmspmap.hxx>
 #include "xmlHelper.hxx"
 #include "xmlEnums.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index d3e0095f4731..6582a4543444 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/awt/ImagePosition.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <xmloff/prstylei.hxx>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlEnums.hxx"
 #include <xmloff/contextid.hxx>
 #include <xmloff/txtprmap.hxx>
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index fbf2ab633345..1f9862a01ab2 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/namecontainer.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index c8e714237f0a..f69b5e3edffa 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -29,7 +29,7 @@
 #include "xmlStyleImport.hxx"
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/report/ReportPrintOption.hpp>
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlTable.hxx"
 
 
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index c36fdfc33077..5ff337bcaf4f 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/report/ForceNewPage.hpp>
 #include "xmlCondPrtExpr.hxx"
 #include "xmlStyleImport.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFixedLine.hpp>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index f691cf7bbbac..7925036608fa 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -57,7 +57,7 @@
 #include <svtools/sfxecode.hxx>
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
-#include "xmlstrings.hrc"
+#include "strings.hxx"
 #include "xmlPropertyHandler.hxx"
 #include <xmloff/txtprmap.hxx>
 #include "ReportDefinition.hxx"
diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc
deleted file mode 100644
index 2d5505b2afea..000000000000
--- a/reportdesign/source/inc/corestrings.hrc
+++ /dev/null
@@ -1,30 +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 REPORTDESIGN_SHARED_CORESTRINGS_HRC
-#define REPORTDESIGN_SHARED_CORESTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-
-#endif // REPORTDESIGN_SHARED_CORESTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
deleted file mode 100644
index 1cfe717f8092..000000000000
--- a/reportdesign/source/inc/stringconstants.hrc
+++ /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 .
- */
-
-#ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
-#define INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
-
-#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
-#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
-#endif
-
-//= service names
-
-#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText"
-#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField"
-#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl"
-#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition"
-#define SERVICE_FUNCTION "com.sun.star.report.Function"
-#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition"
-#define SERVICE_SHAPE "com.sun.star.report.Shape"
-#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine"
-#define SERVICE_SECTION "com.sun.star.report.Section"
-#define SERVICE_GROUP "com.sun.star.report.Group"
-
-//= property names
-
-#define PROPERTY_VISIBLE "Visible"
-#define PROPERTY_NAME "Name"
-#define PROPERTY_HEIGHT "Height"
-#define PROPERTY_BACKCOLOR "BackColor"
-#define PROPERTY_BACKTRANSPARENT "BackTransparent"
-#define PROPERTY_CONTROLBACKGROUND "ControlBackground"
-#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent"
-#define PROPERTY_FORCENEWPAGE "ForceNewPage"
-#define PROPERTY_NEWROWORCOL "NewRowOrCol"
-#define PROPERTY_KEEPTOGETHER "KeepTogether"
-#define PROPERTY_CANGROW "CanGrow"
-#define PROPERTY_CANSHRINK "CanShrink"
-#define PROPERTY_REPEATSECTION "RepeatSection"
-#define PROPERTY_GROUP "Group"
-#define PROPERTY_REPORTDEFINITION "ReportDefinition"
-
-#define PROPERTY_GROUPINTERVAL "GroupInterval"
-#define PROPERTY_EXPRESSION "Expression"
-#define PROPERTY_GROUPON "GroupOn"
-#define PROPERTY_SORTASCENDING "SortAscending"
-
-#define PROPERTY_MASTERFIELDS "MasterFields"
-#define PROPERTY_DETAILFIELDS "DetailFields"
-#define PROPERTY_CAPTION "Caption"
-#define PROPERTY_COMMAND "Command"
-#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation"
-#define PROPERTY_ORIENTATION "Orientation"
-#define PROPERTY_PAPERSIZE "Size"
-#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether"
-#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption"
-#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption"
-#define PROPERTY_COMMANDTYPE "CommandType"
-#define PROPERTY_REPORTHEADERON "ReportHeaderOn"
-#define PROPERTY_REPORTFOOTERON "ReportFooterOn"
-#define PROPERTY_PAGEHEADERON "PageHeaderOn"
-#define PROPERTY_PAGEFOOTERON "PageFooterOn"
-#define PROPERTY_HEADERON "HeaderOn"
-#define PROPERTY_FOOTERON "FooterOn"
-#define PROPERTY_WIDTH "Width"
-#define PROPERTY_POSITIONX "PositionX"
-#define PROPERTY_POSITIONY "PositionY"
-#define PROPERTY_DATAFIELD "DataField"
-#define PROPERTY_PARAADJUST "ParaAdjust"
-#define PROPERTY_FONTDESCRIPTOR "FontDescriptor"
-#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian"
-#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex"
-#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis"
-#define PROPERTY_CHARRELIEF "CharRelief"
-#define PROPERTY_CHARCOLOR "CharColor"
-#define PROPERTY_VERTICALALIGN "VerticalAlign"
-#define PROPERTY_IMAGEPOSITION "ImagePosition"
-#define PROPERTY_IMAGEURL "ImageURL"
-#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor"
-#define PROPERTY_LABEL "Label"
-#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault"
-#define PROPERTY_EFFECTIVEMAX "EffectiveMax"
-#define PROPERTY_EFFECTIVEMIN "EffectiveMin"
-#define PROPERTY_FORMATKEY "FormatKey"
-#define PROPERTY_MAXTEXTLEN "MaxTextLen"
-#define PROPERTY_LISTSOURCE "ListSource"
-#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier"
-#define PROPERTY_CONTROLBORDER "ControlBorder"
-#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor"
-#define PROPERTY_BORDER "Border"
-#define PROPERTY_BORDERCOLOR "BorderColor"
-#define PROPERTY_DEFAULTCONTROL "DefaultControl"
-
-#define PROPERTY_LEFTMARGIN "LeftMargin"
-#define PROPERTY_RIGHTMARGIN "RightMargin"
-#define PROPERTY_TOPMARGIN "TopMargin"
-#define PROPERTY_BOTTOMMARGIN "BottomMargin"
-
-#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues"
-#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression"
-#define PROPERTY_STARTNEWCOLUMN "StartNewColumn"
-#define PROPERTY_RESETPAGENUMBER "ResetPageNumber"
-#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange"
-#define PROPERTY_STATE "State"
-#define PROPERTY_TIME_STATE "TimeState"
-#define PROPERTY_DATE_STATE "DateState"
-#define PROPERTY_TRISTATE "TriState"
-#define PROPERTY_LISTSOURCETYPE "ListSourceType"
-#define PROPERTY_FONTCHARWIDTH    "FontCharWidth"
-#define PROPERTY_FONTCHARSET      "CharFontCharSet"
-#define PROPERTY_FONTFAMILY       "CharFontFamily"
-#define PROPERTY_CHARFONTHEIGHT   "CharHeight"
-#define PROPERTY_FONTHEIGHT       "FontHeight"
-#define PROPERTY_FONTKERNING      "FontKerning"
-#define PROPERTY_FONT             "FontDescriptor"
-#define PROPERTY_FONTNAME         "FontName"
-#define PROPERTY_FONTORIENTATION  "CharRotation"
-#define PROPERTY_FONTPITCH        "CharFontPitch"
-#define PROPERTY_FONTSLANT        "FontSlant"
-#define PROPERTY_CHARSTRIKEOUT    "CharStrikeout"
-#define PROPERTY_FONTSTRIKEOUT    "FontStrikeout"
-#define PROPERTY_FONTSTYLENAME    "CharFontStyleName"
-#define PROPERTY_FONTUNDERLINE    "CharUnderline"
-#define PROPERTY_FONTWEIGHT       "CharWeight"
-#define PROPERTY_FONTWIDTH        "FontWidth"
-#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
-#define PROPERTY_FONTTYPE         "FontType"
-
-#define PROPERTY_ENABLED       "Enabled"
-
-#define PROPERTY_CHAREMPHASIS     "CharEmphasis"
-#define PROPERTY_CHARFONTNAME     "CharFontName"
-#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName"
-#define PROPERTY_CHARFONTFAMILY   "CharFontFamily"
-#define PROPERTY_CHARFONTCHARSET  "CharFontCharSet"
-#define PROPERTY_CHARFONTPITCH    "CharFontPitch"
-#define PROPERTY_CHARHEIGHT       "CharHeight"
-#define PROPERTY_CHARUNDERLINE    "CharUnderline"
-#define PROPERTY_CHARWEIGHT       "CharWeight"
-#define PROPERTY_CHARPOSTURE      "CharPosture"
-#define PROPERTY_CHARWORDMODE     "CharWordMode"
-#define PROPERTY_CHARROTATION     "CharRotation"
-#define PROPERTY_CHARSCALEWIDTH   "CharScaleWidth"
-
-// Asian
-#define PROPERTY_CHAREMPHASISASIAN        "CharEmphasisAsian"
-#define PROPERTY_CHARFONTNAMEASIAN        "CharFontNameAsian"
-#define PROPERTY_CHARFONTSTYLENAMEASIAN   "CharFontStyleNameAsian"
-#define PROPERTY_CHARFONTFAMILYASIAN      "CharFontFamilyAsian"
-#define PROPERTY_CHARFONTCHARSETASIAN     "CharFontCharSetAsian"
-#define PROPERTY_CHARFONTPITCHASIAN       "CharFontPitchAsian"
-#define PROPERTY_CHARHEIGHTASIAN          "CharHeightAsian"
-#define PROPERTY_CHARUNDERLINEASIAN       "CharUnderlineAsian"
-#define PROPERTY_CHARWEIGHTASIAN          "CharWeightAsian"
-#define PROPERTY_CHARPOSTUREASIAN         "CharPostureAsian"
-#define PROPERTY_CHARWORDMODEASIAN        "CharWordModeAsian"
-#define PROPERTY_CHARROTATIONASIAN        "CharRotationAsian"
-#define PROPERTY_CHARSCALEWIDTHASIAN      "CharScaleWidthAsian"
-#define PROPERTY_CHARLOCALEASIAN           "CharLocaleAsian"
-
-// Complex
-#define PROPERTY_CHAREMPHASISCOMPLEX      "CharEmphasisComplex"
-#define PROPERTY_CHARFONTNAMECOMPLEX      "CharFontNameComplex"
-#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex"
-#define PROPERTY_CHARFONTFAMILYCOMPLEX    "CharFontFamilyComplex"
-#define PROPERTY_CHARFONTCHARSETCOMPLEX   "CharFontCharSetComplex"
-#define PROPERTY_CHARFONTPITCHCOMPLEX     "CharFontPitchComplex"
-#define PROPERTY_CHARHEIGHTCOMPLEX        "CharHeightComplex"
-#define PROPERTY_CHARUNDERLINECOMPLEX     "CharUnderlineComplex"
-#define PROPERTY_CHARWEIGHTCOMPLEX        "CharWeightComplex"
-#define PROPERTY_CHARPOSTURECOMPLEX       "CharPostureComplex"
-#define PROPERTY_CHARWORDMODECOMPLEX      "CharWordModeComplex"
-#define PROPERTY_CHARROTATIONCOMPLEX      "CharRotationComplex"
-#define PROPERTY_CHARSCALEWIDTHCOMPLEX    "CharScaleWidthComplex"
-#define PROPERTY_CHARLOCALECOMPLEX        "CharLocaleComplex"
-
-#define PROPERTY_STATUSINDICATOR  "StatusIndicator"
-#define PROPERTY_SECTION          "Section"
-#define PROPERTY_FILTER           "Filter"
-#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing"
-
-#define PROPERTY_MULTILINE        "MultiLine"
-#define PROPERTY_ACTIVECONNECTION "ActiveConnection"
-#define PROPERTY_DATASOURCENAME   "DataSourceName"
-#define PROPERTY_FORMULA          "Formula"
-#define PROPERTY_INITIALFORMULA   "InitialFormula"
-#define PROPERTY_PREEVALUATED     "PreEvaluated"
-#define PROPERTY_DEEPTRAVERSING   "DeepTraversing"
-#define PROPERTY_MIMETYPE         "MimeType"
-#define PROPERTY_BACKGROUNDCOLOR  "BackgroundColor"
-#define PROPERTY_TEXT             "Text"
-#define PROPERTY_TEXTCOLOR        "TextColor"
-#define PROPERTY_TEXTLINECOLOR   "TextLineColor"
-#define PROPERTY_FONTRELIEF   "FontRelief"
-#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark"
-#define PROPERTY_ZORDER           "ZOrder"
-#define PROPERTY_OPAQUE           "Opaque"
-#define PROPERTY_TRANSFORMATION    "Transformation"
-#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine"
-#define PROPERTY_CUSTOMSHAPEDATA   "CustomShapeData"
-#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry"
-
-#define PROPERTY_NUMBERINGTYPE     "NumberingType"
-#define PROPERTY_PAGESTYLELAYOUT   "PageStyleLayout"
-#define PROPERTY_ISLANDSCAPE       "IsLandscape"
-#define PROPERTY_ALIGN "Align"
-#define PROPERTY_TYPE  "Type"
-
-#define PROPERTY_PRESERVEIRI  "PreserveIRI"
-#define PROPERTY_SCALEMODE  "ScaleMode"
-
-#define PROPERTY_LINESTYLE  "LineStyle"
-#define PROPERTY_LINEDASH  "LineDash"
-#define PROPERTY_LINECOLOR  "LineColor"
-#define PROPERTY_LINETRANSPARENCE  "LineTransparence"
-#define PROPERTY_LINEWIDTH  "LineWidth"
-
-#define PROPERTY_CHARFLASH            "CharFlash"
-#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight"
-#define PROPERTY_CHARLOCALE           "CharLocale"
-#define PROPERTY_CHARESCAPEMENT       "CharEscapement"
-#define PROPERTY_CHARCASEMAP          "CharCaseMap"
-#define PROPERTY_CHARCOMBINEISON      "CharCombineIsOn"
-#define PROPERTY_CHARCOMBINEPREFIX    "CharCombinePrefix"
-#define PROPERTY_CHARCOMBINESUFFIX    "CharCombineSuffix"
-#define PROPERTY_CHARHIDDEN           "CharHidden"
-#define PROPERTY_CHARSHADOWED         "CharShadowed"
-#define PROPERTY_CHARCONTOURED        "CharContoured"
-#define PROPERTY_CHARAUTOKERNING      "CharAutoKerning"
-#define PROPERTY_CHARKERNING          "CharKerning"
-#define PROPERTY_HYPERLINKURL "HyperLinkURL"
-#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget"
-#define PROPERTY_HYPERLINKNAME "HyperLinkName"
-#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName"
-#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName"
-#define PROPERTY_ORDER                "Order"
-#define PROPERTY_APPLYFILTER          "ApplyFilter"
-#define PROPERTY_MAXROWS              "MaxRows"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc
deleted file mode 100644
index 4aaca430f215..000000000000
--- a/reportdesign/source/inc/uistrings.hrc
+++ /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 .
- */
-#ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
-#define REPORTDESIGN_SHARED_UISTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-
-#define PROPERTY_REPORTNAME "ReportName"
-#define CFG_REPORTDESIGNER "SunReportBuilder"
-#define DBREPORTHEADER "ReportHeader"
-#define DBREPORTFOOTER "ReportFooter"
-#define DBPAGEHEADER "PageHeader"
-#define DBPAGEFOOTER "PageFooter"
-#define DBGROUPHEADER "GroupHeader"
-#define DBGROUPFOOTER "GroupFooter"
-#define DBDETAIL "Detail"
-#define REPORTCONTROLFORMAT "ReportControlFormat"
-#define CURRENT_WINDOW "CurrentWindow"
-#define PROPERTY_FONTCOLOR "FontColor"
-#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull"
-#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal"
-#define PROPERTY_POSITION "Position"
-#define PROPERTY_FORMATKEYDATE "FormatKeyDate"
-#define PROPERTY_FORMATKEYTIME "FormatKeyTime"
-#define DBOVERLAPPEDCONTROL "OverlappedControl"
-#define PROPERTY_FORMULALIST "FormulaList"
-#define PROPERTY_SCOPE "Scope"
-#define PROPERTY_CHARTTYPE "ChartType"
-#define PROPERTY_PREVIEW_COUNT "RowLimit"
-#define PROPERTY_TITLE "Title"
-#define PROPERTY_AREA "Area"
-#define PROPERTY_FILLCOLOR "FillColor"
-#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent"
-
-#endif // REPORTDESIGN_SHARED_UISTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc
deleted file mode 100644
index ab0082a40dc1..000000000000
--- a/reportdesign/source/inc/xmlstrings.hrc
+++ /dev/null
@@ -1,42 +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 REPORTDESIGN_SHARED_XMLSTRINGS_HRC
-#define REPORTDESIGN_SHARED_XMLSTRINGS_HRC
-
-#include <rtl/ustring.hxx>
-
-#define STRINGCONSTANTS_INCLUDED_INDIRECT
-#include "stringconstants.hrc"
-#undef STRINGCONSTANTS_INCLUDED_INDIRECT
-
-//= XML
-
-#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter"
-#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter"
-#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter"
-#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter"
-#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter"
-#define PROPERTY_BORDERLEFT "BorderLeft"
-#define PROPERTY_BORDERRIGHT "BorderRight"
-#define PROPERTY_BORDERTOP "BorderTop"
-#define PROPERTY_BORDERBOTTOM "BorderBottom"
-
-#endif // REPORTDESIGN_SHARED_XMLSTRINGS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 4d89af8070e7..2092c538a2ee 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -33,10 +33,10 @@
 #include "rptui_slotid.hrc"
 
 #include <connectivity/dbtools.hxx>
+#include "core_resource.hxx"
 #include "helpids.hrc"
-#include "RptResId.hrc"
-#include "ModuleHelper.hxx"
-#include "uistrings.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #include "ColumnInfo.hxx"
 
 #include <comphelper/property.hxx>
@@ -320,7 +320,7 @@ void OAddFieldWindow::Update()
             m_aActions->EnableItem(m_aActions->GetItemId(j),false);
         }
 
-        OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION));
+        OUString aTitle(RptResId(RID_STR_FIELDSELECTION));
         SetText(aTitle);
         if ( m_xRowSet.is() )
         {
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 0a3b665085f5..3ac4e1581c24 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -19,10 +19,10 @@
 
 #include "CondFormat.hxx"
 
-#include "uistrings.hrc"
-#include "RptResId.hrc"
+#include "strings.hxx"
+#include "strings.hrc"
 #include "rptui_slotid.hrc"
-#include "ModuleHelper.hxx"
+#include "core_resource.hxx"
 #include "helpids.hrc"
 #include "UITools.hxx"
 #include "ReportController.hxx"
@@ -434,7 +434,7 @@ namespace rptui
         short nRet = ModalDialog::Execute();
         if ( nRet == RET_OK )
         {
-            const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
+            const OUString sUndoAction( RptResId( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
             const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction );
             try
             {
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
deleted file mode 100644
index ecf70cae59fd..000000000000
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ /dev/null
@@ -1,28 +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 "RptResId.hrc"
-#include "helpids.hrc"
-#include "rptui_slotid.hrc"
-
-String STR_NUMBERED_CONDITION
-{
-    Text [ en-US ] = "Condition $number$";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index f93326f6eaec..fcec991d2348 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -20,9 +20,9 @@
 #include "Condition.hxx"
 #include "UITools.hxx"
 #include "CondFormat.hxx"
-#include "RptResId.hrc"
+#include "core_resource.hxx"
+#include "strings.hrc"
 #include "ReportController.hxx"
-#include "ModuleHelper.hxx"
 #include "ColorChanger.hxx"
 #include "helpids.hrc"
 #include "reportformula.hxx"
@@ -445,7 +445,7 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi
 void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount )
 {
     m_nCondIndex = _nCondIndex;
-    OUString sHeader( ModuleRes( STR_NUMBERED_CONDITION ) );
+    OUString sHeader( RptResId( STR_NUMBERED_CONDITION ) );
     sHeader = sHeader.replaceFirst( "$number$", OUString::number( _nCondIndex + 1) );
     m_pHeader->SetText( sHeader );
 
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 8c72bb98375b..7e5639e6cd34 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -18,16 +18,15 @@
  */
 #include "DateTime.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "rptui_slotid.hrc"
-#include "ModuleHelper.hxx"
 #include "helpids.hrc"
 #include <vcl/msgbox.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <unotools/syslocale.hxx>
 #include "UITools.hxx"
 #include "RptDef.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "ReportController.hxx"
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 50bd4d4c31b8..5bd6b8b632a9 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -26,14 +26,14 @@
 #include <com/sun/star/report/GroupOn.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "rptui_slotid.hrc"
-#include "ModuleHelper.hxx"
+#include "core_resource.hxx"
 #include "helpids.hrc"
 #include "GroupExchange.hxx"
 #include "UITools.hxx"
 #include "UndoActions.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "ReportController.hxx"
 #include "ColumnInfo.hxx"
 
@@ -318,7 +318,7 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups
         m_bIgnoreEvent = true;
         {
             sal_Int32 nRow = _nRow;
-            const OUString sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP));
+            const OUString sUndoAction(RptResId(RID_STR_UNDO_MOVE_GROUP));
             const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction );
 
             uno::Reference< report::XGroups> xGroups = m_pParent->getGroups();
@@ -379,7 +379,7 @@ void OFieldExpressionControl::lateInit()
         SetFont(aFont);
 
         InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
-        InsertDataColumn( FIELD_EXPRESSION, OUString(ModuleRes(STR_RPT_EXPRESSION)), 100);
+        InsertDataColumn( FIELD_EXPRESSION, RptResId(STR_RPT_EXPRESSION), 100);
 
         m_pComboCell = VclPtr<ComboBoxControl>::Create( &GetDataWindow() );
         m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl));
@@ -430,7 +430,7 @@ bool OFieldExpressionControl::SaveModified()
             if ( m_aGroupPositions[nRow] == NO_GROUP )
             {
                 bAppend = true;
-                OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
+                OUString sUndoAction(RptResId(RID_STR_UNDO_APPEND_GROUP));
                 m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) );
                 xGroup = m_pParent->getGroups()->createGroup();
                 xGroup->setHeaderOn(true);
@@ -756,7 +756,7 @@ void OFieldExpressionControl::DeleteRows()
             if ( bFirstTime )
             {
                 bFirstTime = false;
-                OUString sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION));
+                OUString sUndoAction(RptResId(RID_STR_UNDO_REMOVE_SELECTION));
                 m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) );
             }
 
@@ -972,10 +972,18 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void )
 {
     if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() )
     {
-        Control* pControls[] = { m_pFieldExpression->getExpressionControl(), m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pGroupIntervalEd, m_pKeepTogetherLst, m_pOrderLst};
+        const std::pair<Control*, const char*> pControls[] = {
+            { m_pFieldExpression->getExpressionControl(), STR_RPT_HELP_FIELD },
+            { m_pHeaderLst, STR_RPT_HELP_HEADER },
+            { m_pFooterLst, STR_RPT_HELP_FOOTER },
+            { m_pGroupOnLst, STR_RPT_HELP_GROUPON },
+            { m_pGroupIntervalEd, STR_RPT_HELP_INTERVAL },
+            { m_pKeepTogetherLst, STR_RPT_HELP_KEEP },
+            { m_pOrderLst, STR_RPT_HELP_SORT }
+        };
         for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
         {
-            if ( &rControl == pControls[i] )
+            if (&rControl == pControls[i].first)
             {
                 ListBox* pListBox = dynamic_cast< ListBox* >( &rControl );
                 if ( pListBox )
@@ -984,7 +992,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void )
                 if ( pNumericField )
                     pNumericField->SaveValue();
                 //shows the text given by the id in the multiline edit
-                m_pHelpWindow->SetText(OUString(ModuleRes(static_cast<sal_uInt16>(i+STR_RPT_HELP_FIELD))));
+                m_pHelpWindow->SetText(RptResId(pControls[i].second));
                 break;
             }
         }
@@ -1106,23 +1114,23 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
         case sdbc::DataType::LONGVARCHAR:
         case sdbc::DataType::VARCHAR:
         case sdbc::DataType::CHAR:
-            m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_PREFIXCHARS)));
+            m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_PREFIXCHARS));
             m_pGroupOnLst->SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::PREFIX_CHARACTERS));
             break;
         case sdbc::DataType::DATE:
         case sdbc::DataType::TIME:
         case sdbc::DataType::TIMESTAMP:
             {
-                const sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
-                for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(nIds); ++i)
+                const char* aIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
+                for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
                 {
-                    m_pGroupOnLst->InsertEntry(OUString(ModuleRes(nIds[i])));
+                    m_pGroupOnLst->InsertEntry(RptResId(aIds[i]));
                     m_pGroupOnLst->SetEntryData(i+1,reinterpret_cast<void*>(i+2));
                 }
             }
             break;
         default:
-            m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_INTERVAL)));
+            m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_INTERVAL));
             m_pGroupOnLst->SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL));
             break;
     }
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
deleted file mode 100644
index 9ae6ebda573a..000000000000
--- a/reportdesign/source/ui/dlg/GroupsSorting.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 "RptResId.hrc"
-#include "helpids.hrc"
-#include <svx/svxids.hrc>
-
-String STR_RPT_EXPRESSION
-{
-    Text [ en-US ] = "Field/Expression" ;
-};
-
-String STR_RPT_PREFIXCHARS
-{
-    Text [ en-US ] = "Prefix Characters" ;
-};
-
-String STR_RPT_YEAR
-{
-    Text [ en-US ] = "Year" ;
-};
-
-String STR_RPT_QUARTER
-{
-    Text [ en-US ] = "Quarter" ;
-};
-
-String STR_RPT_MONTH
-{
-    Text [ en-US ] = "Month" ;
-};
-
-String STR_RPT_WEEK
-{
-    Text [ en-US ] = "Week" ;
-};
-
-String STR_RPT_DAY
-{
-    Text [ en-US ] = "Day" ;
-};
-
-String STR_RPT_HOUR
-{
-    Text [ en-US ] = "Hour" ;
-};
-
-String STR_RPT_MINUTE
-{
-    Text [ en-US ] = "Minute" ;
-};
-
-String STR_RPT_INTERVAL
-{
-    Text [ en-US ] = "Interval" ;
-};
-
-String STR_RPT_HELP_FIELD
-{
-    Text [ en-US ] = "Select a field or type an expression to sort or group on." ;
-};
-
-String STR_RPT_HELP_HEADER
-{
-    Text [ en-US ] = "Display a header for this group?" ;
-};
-
-String STR_RPT_HELP_FOOTER
-{
-    Text [ en-US ] = "Display a footer for this group?" ;
-};
-
-String STR_RPT_HELP_GROUPON
-{
-    Text [ en-US ] = "Select the value or range of values that starts a new group." ;
-};
-
-String STR_RPT_HELP_INTERVAL
-{
-    Text [ en-US ] = "Interval or number of characters to group on." ;
-};
-
-String STR_RPT_HELP_KEEP
-{
-    Text [ en-US ] = "Keep group together on one page?" ;
-};
-
-String STR_RPT_HELP_SORT
-{
-    Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 4d1b2d745925..cdefb2f4bd25 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -19,7 +19,7 @@
 
 #include "Navigator.hxx"
 
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "bitmaps.hlst"
 #include "ReportController.hxx"
 #include "UITools.hxx"
@@ -33,7 +33,7 @@
 #include <com/sun/star/report/XImageControl.hpp>
 #include <com/sun/star/report/XShape.hpp>
 #include "helpids.hrc"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "rptui_slotid.hrc"
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/containermultiplexer.hxx>
@@ -44,7 +44,7 @@
 #include <svtools/treelistentry.hxx>
 #include <svl/solar.hrc>
 #include "ReportVisitor.hxx"
-#include "ModuleHelper.hxx"
+#include "core_resource.hxx"
 #include <rtl/ref.hxx>
 
 #include <memory>
@@ -552,7 +552,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS
 
 void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent)
 {
-    SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions));
+    SvTreeListEntry* pFunctions = insertEntry(RptResId(RID_STR_FUNCTIONS), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions));
     const sal_Int32 nCount = _xFunctions->getCount();
     for (sal_Int32 i = 0; i< nCount; ++i)
     {
@@ -622,7 +622,7 @@ void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>&
 void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups)
 {
     SvTreeListEntry* pReport = find(_xGroups->getReportDefinition());
-    insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups));
+    insertEntry(RptResId(RID_STR_GROUPS), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups));
 }
 
 void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup)
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
deleted file mode 100644
index c0caf74d1dad..000000000000
--- a/reportdesign/source/ui/dlg/Navigator.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 "RptResId.hrc"
-#include "helpids.hrc"
-#include "rptui_slotid.hrc"
-#include <svx/svxids.hrc>
-#include <svl/solar.hrc>
-
-String RID_STR_FUNCTIONS
-{
-    Text [ en-US ] = "Functions" ;
-};
-
-String RID_STR_GROUPS
-{
-    Text [ en-US ] = "Groups" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index cbe3fe9a7ef6..184b8040e390 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -18,16 +18,15 @@
  */
 #include "PageNumber.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "rptui_slotid.hrc"
-#include "ModuleHelper.hxx"
 #include "RptDef.hxx"
 #include "helpids.hrc"
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 
 #include "UITools.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "ReportController.hxx"
 #include <comphelper/propertysequence.hxx>
 #include <algorithm>
diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src
deleted file mode 100644
index be120f608e77..000000000000
--- a/reportdesign/source/ui/dlg/PageNumber.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/.
- *
- * 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 "RptResId.hrc"
-#include "helpids.hrc"
-#include <svx/svxids.hrc>
-
-String STR_RPT_PN_PAGE
-{
-    Text [ en-US ] = "\"Page \" & #PAGENUMBER#" ;
-    Text [ x-comment ] = "The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as \"";
-};
-String STR_RPT_PN_PAGE_OF
-{
-    Text [ en-US ] = " & \" of \" & #PAGECOUNT#" ;
-    Text [ x-comment ] = "The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated  as well as \"";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 2651ef18bd59..5bb8c376f1c5 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -23,8 +23,7 @@
 #include <svx/svxdlg.hxx>
 #include <editeng/svxenum.hxx>
 #include "dlgpage.hxx"
-#include "ModuleHelper.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include <svl/intitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/aeitem.hxx>
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 6b6aea5ee854..6150a14c4924 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -22,7 +22,6 @@
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/extcolorcfg.hxx>
-#include "ModuleHelper.hxx"
 #include <tools/link.hxx>
 
 namespace rptui
@@ -32,7 +31,6 @@ namespace rptui
         OColorListener(const OColorListener&) = delete;
         void operator =(const OColorListener&) = delete;
     protected:
-        OModuleClient                       m_aModuleClient;
         Link<OColorListener&,void>          m_aCollapsedLink;
         svtools::ColorConfig                m_aColorConfig;
         svtools::ExtendedColorConfig        m_aExtendedColorConfig;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 9f1daeacc9f2..0118fe54eac1 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX
 
-#include "ModuleHelper.hxx"
-
 #include <com/sun/star/report/XReportControlModel.hpp>
 
 #include <vcl/dialog.hxx>
@@ -69,7 +67,6 @@ namespace rptui
     {
         typedef ::std::vector< VclPtr<Condition> >  Conditions;
 
-        OModuleClient             m_aModuleClient;
         VclPtr<vcl::Window>       m_pConditionPlayground;
         Conditions                m_aConditions;
         VclPtr<VclScrolledWindow> m_pScrollWindow;
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index ff2bd78f92ec..58e1270a974e 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -90,12 +90,12 @@ namespace rptui
         */
         sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const;
 
-        css::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
+        css::uno::Any getConstantValue(bool bToControlValue,const char** pResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
         css::beans::Property getProperty(const OUString & PropertyName);
         static void implCreateListLikeControl(
                 const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory
                 ,css::inspection::LineDescriptor & out_Descriptor
-                ,sal_uInt16 _nResId
+                ,const char** pResId
                 ,bool _bReadOnlyControl
                 ,bool _bTrueIfListBoxFalseIfComboBox
             );
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 29f6e28f4c33..43550c9f3929 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX
 
 #include <vcl/floatwin.hxx>
-#include "ModuleHelper.hxx"
 #include <memory>
 namespace rptui
 {
@@ -28,7 +27,6 @@ namespace rptui
     class ONavigatorImpl;
     class ONavigator :  public FloatingWindow
     {
-        OModuleClient       m_aModuleClient;
         ::std::unique_ptr<ONavigatorImpl> m_pImpl;
         ONavigator(const ONavigator&) = delete;
         void operator =(const ONavigator&) = delete;
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 499372f6a5df..55f952147e6b 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX
 
 #include "DesignView.hxx"
-#include "ModuleHelper.hxx"
 #include "ReportControllerObserver.hxx"
 #include "RptDef.hxx"
 
@@ -83,7 +82,6 @@ namespace rptui
                                 ,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE >
     {
     private:
-        OModuleClient           m_aModuleClient;
         ::comphelper::OInterfaceContainerHelper2
                                 m_aSelectionListeners;
         css::uno::Sequence< css::beans::PropertyValue>
@@ -201,20 +199,20 @@ namespace rptui
                          ,sal_Int32 _nGroupPos
                          ,bool _bShow);
 
-        void executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun);
-        void alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false);
+        void executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun);
+        void alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false);
 
         css::uno::Reference< css::frame::XFrame > getXFrame();
 
         /** shrink a section
-        @param _nUndoStrId the string id of the string which is shown in undo menu
+        @param pUndoStrId the string id of the string which is shown in undo menu
         @param _nShrinkId  ID of what you would like to shrink.
         */
         static void shrinkSectionBottom(const css::uno::Reference< css::report::XSection >& _xSection);
         static void shrinkSectionTop(const css::uno::Reference< css::report::XSection >& _xSection);
 
     public:
-        void shrinkSection(sal_uInt16 _nUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId);
+        void shrinkSection(const char* pUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId);
 
         /** opens the file open dialog to allow the user to select a image which will be
         * bound to a newly created image button.
@@ -299,7 +297,7 @@ namespace rptui
         /** set the property at all selected controls.
             @return <TRUE/> when the selection is not empty
         */
-        bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId
+        bool impl_setPropertyAtControls_throw(const char* pUndoResId
             ,const OUString& _sProperty
             ,const css::uno::Any& _aValue
             ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs);
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index 50374e4dcb97..e9f03e722470 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -54,7 +54,7 @@ namespace rptui
         OSectionUndo(   OReportModel& rMod
                         ,sal_uInt16 _nSlot
                         ,Action _eAction
-                        ,sal_uInt16 nCommentID);
+                        ,const char* pCommentID);
         virtual ~OSectionUndo() override;
 
         virtual void        Undo() override;
@@ -106,7 +106,7 @@ namespace rptui
                                             ,OGroupHelper> _pMemberFunction
                             ,const css::uno::Reference< css::report::XGroup >& _xGroup
                             ,Action _eAction
-                            ,sal_uInt16 nCommentID);
+                            ,const char* pCommentID);
 
         virtual OUString GetComment() const override;
     };
@@ -125,7 +125,7 @@ namespace rptui
         void    implReRemove( );
     public:
         OGroupUndo(OReportModel& rMod
-                    ,sal_uInt16 nCommentID
+                    ,const char* pCommentID
                     ,Action _eAction
                     ,const css::uno::Reference< css::report::XGroup>& _xGroup
                     ,const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index fefc2d7d5ac2..cafca76a2551 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -66,7 +66,7 @@ namespace rptui
         * \param _pIsSectionOn
         * @return sal_True when title was set otherwise FALSE
         */
-        bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn);
+        bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn);
 
         /** set the title of the (report/page) header or footer
         *
@@ -76,7 +76,7 @@ namespace rptui
         * \param _pIsSectionOn
         * @return sal_True when title was set otherwise FALSE
         */
-        bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn);
+        bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn);
         void ImplInitSettings();
 
         DECL_LINK(Collapsed, OColorListener&, void);
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index c9e0e6a3e989..812a4bc0c9f0 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -19,11 +19,10 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX
 
-#include "ModuleHelper.hxx"
-
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <o3tl/typed_flags_set.hxx>
+#include <vector>
 
     //= UI flags (for all browseable properties)
 enum class PropUIFlags {
@@ -47,7 +46,6 @@ namespace rptui
     //= OPropertyInfoService
 
     class OPropertyInfoService
-        :public OModuleClient
     {
         OPropertyInfoService(const OPropertyInfoService&) = delete;
         void operator =(const OPropertyInfoService&) = delete;
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index e205d41e19b4..6d4c6351704a 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -29,7 +29,6 @@
 #include <svl/lstner.hxx>
 #include <vcl/dockwin.hxx>
 #include <svx/svdmark.hxx>
-#include "ModuleHelper.hxx"
 
 namespace rptui
 {
@@ -44,7 +43,6 @@ class OObjectBase;
 class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster
 {
 private:
-    OModuleClient       m_aModuleClient;
     css::uno::Reference< css::uno::XComponentContext >
                         m_xInspectorContext;
     css::uno::Reference< css::uno::XComponentContext >
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 3eba1fced3e4..b7eec893da1c 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -22,7 +22,7 @@
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
@@ -47,8 +47,9 @@
 #include "metadata.hxx"
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
+#include "core_resource.hxx"
 #include "helpids.hrc"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "PropertyForward.hxx"
 
 namespace rptui
@@ -495,13 +496,13 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
     aSeq[2] <<= aParam;
 
     aParam.Name = "Explanation";
-    aParam.Value <<= OUString(ModuleRes(RID_STR_EXPLANATION));
+    aParam.Value <<= RptResId(RID_STR_EXPLANATION);
     aSeq[3] <<= aParam;
     aParam.Name = "DetailLabel";
-    aParam.Value <<= OUString(ModuleRes(RID_STR_DETAILLABEL));
+    aParam.Value <<= RptResId(RID_STR_DETAILLABEL);
     aSeq[4] <<= aParam;
     aParam.Name = "MasterLabel";
-    aParam.Value <<= OUString(ModuleRes(RID_STR_MASTERLABEL));
+    aParam.Value <<= RptResId(RID_STR_MASTERLABEL);
     aSeq[5] <<= aParam;
 
     uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 72ccc2b5211b..b832c74bc759 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -19,8 +19,8 @@
 #include "DefaultInspection.hxx"
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <RptResId.hrc>
-#include "ModuleHelper.hxx"
+#include <strings.hrc>
+#include "core_resource.hxx"
 #include "helpids.hrc"
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -201,7 +201,7 @@ namespace rptui
         const struct
         {
             const sal_Char* programmaticName;
-            sal_uInt16          uiNameResId;
+            const char* uiNameResId;
             OString    helpId;
         } aCategories[] = {
             { "General",    RID_STR_PROPPAGE_DEFAULT,   HID_RPT_PROPDLG_TAB_GENERAL },
@@ -214,7 +214,7 @@ namespace rptui
         for ( size_t i=0; i<nCategories; ++i, ++pReturn )
         {
             pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName );
-            pReturn->UIName = ModuleRes( aCategories[i].uiNameResId );
+            pReturn->UIName = RptResId( aCategories[i].uiNameResId );
             pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId );
         }
 
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index c865a1293f8b..0b409b0a5767 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -29,7 +29,7 @@
 #include <comphelper/mimeconfighelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "reportformula.hxx"
 
 #include <i18nutil/searchopt.hxx>
@@ -69,8 +69,9 @@
 #include <tools/fldunit.hxx>
 #include <vcl/stdtext.hxx>
 
-#include "ModuleHelper.hxx"
-#include "RptResId.hrc"
+#include "core_resource.hxx"
+#include "stringarray.hrc"
+#include "strings.hrc"
 #include "RptDef.hxx"
 #include "UITools.hxx"
 
@@ -668,16 +669,14 @@ beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString &
 void GeometryHandler::implCreateListLikeControl(
         const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
         ,inspection::LineDescriptor & out_Descriptor
-        ,sal_uInt16 _nResId
+        ,const char** pResId
         ,bool _bReadOnlyControl
         ,bool _bTrueIfListBoxFalseIfComboBox
     )
 {
-    ModuleRes aRes(_nResId);
-    ResStringArray aResList(aRes);
     std::vector<OUString> aList;
-    for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
-        aList.push_back(aResList.GetString(i));
+    for (const char** pItem = pResId; *pItem; ++pItem)
+        aList.push_back(RptResId(*pItem));
     implCreateListLikeControl(_rxControlFactory, out_Descriptor, aList, _bReadOnlyControl, _bTrueIfListBoxFalseIfComboBox);
 }
 
@@ -760,10 +759,10 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
         case PROPERTY_ID_BACKTRANSPARENT:
         case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT:
             {
-                sal_uInt16 nResId = RID_STR_BOOL;
+                const char** pResId = RID_STR_BOOL;
                 if ( PROPERTY_ID_KEEPTOGETHER == nId && uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
-                    nResId = RID_STR_KEEPTOGETHER_CONST;
-                implCreateListLikeControl(_xControlFactory,aOut,nResId,false,true);
+                    pResId = RID_STR_KEEPTOGETHER_CONST;
+                implCreateListLikeControl(_xControlFactory,aOut,pResId,false,true);
             }
             break;
         case PROPERTY_ID_INITIALFORMULA:
@@ -928,13 +927,14 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
         return beans::Property();
     return *pFind;
 }
-uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
+uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,const char** pResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
 {
-    ModuleRes aRes(_nResId);
-    ResStringArray aResList(aRes);
-    uno::Sequence< OUString > aSeq(aResList.Count());
-    for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
-        aSeq[i] = aResList.GetString(i);
+    std::vector<OUString> aList;
+    for (const char** pItem = pResId; *pItem; ++pItem)
+        aList.push_back(RptResId(*pItem));
+    uno::Sequence< OUString > aSeq(aList.size());
+    for (size_t i = 0; i < aList.size(); ++i)
+        aSeq[i] = aList[i];
 
     uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::createConstant( m_xContext,m_xTypeConverter,_sConstantName,aSeq);
     if ( _bToControlValue )
@@ -1069,16 +1069,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ModuleRes aRes(RID_STR_TYPE_CONST);
-                ResStringArray aResList(aRes);
+
                 sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
-                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                sal_uInt32 i = 0;
+                for (const char** pItem = RID_STR_TYPE_CONST; *pItem; ++pItem)
                 {
-                    if (aResList.GetString(i) == sValue)
+                    if (sValue == RptResId(*pItem))
                     {
                         nFound = i;
                         break;
                     }
+                    ++i;
                 }
                 if (nFound != RESARRAY_INDEX_NOTFOUND)
                     aPropertyValue <<= nFound;
@@ -1091,16 +1092,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
-                ResStringArray aResList(aRes);
+
                 sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
-                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                sal_uInt32 i = 0;
+                for (const char** pItem = RID_STR_VERTICAL_ALIGN_CONST; *pItem; ++pItem)
                 {
-                    if (aResList.GetString(i) == sValue)
+                    if (sValue == RptResId(*pItem))
                     {
                         nFound = i;
                         break;
                     }
+                    ++i;
                 }
                 if (nFound != RESARRAY_INDEX_NOTFOUND)
                     aPropertyValue <<= static_cast<style::VerticalAlignment>(nFound);
@@ -1110,17 +1112,19 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
             {
                 OUString sValue;
                 _rControlValue >>= sValue;
-                ModuleRes aRes(RID_STR_PARAADJUST_CONST);
-                ResStringArray aResList(aRes);
+
                 sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND);
-                for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
+                sal_uInt32 i = 0;
+                for (const char** pItem = RID_STR_PARAADJUST_CONST; *pItem; ++pItem)
                 {
-                    if (aResList.GetString(i) == sValue)
+                    if (sValue == RptResId(*pItem))
                     {
                         nFound = i;
                         break;
                     }
+                    ++i;
                 }
+
                 if (nFound != RESARRAY_INDEX_NOTFOUND)
                     aPropertyValue <<= static_cast<sal_Int16>(nFound);
             }
@@ -1236,30 +1240,24 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
             break;
         case PROPERTY_ID_TYPE:
             {
-                ModuleRes aRes(RID_STR_TYPE_CONST);
-                ResStringArray aResList(aRes);
-                if (m_nDataFieldType < aResList.Count())
-                    aControlValue <<= aResList.GetString(m_nDataFieldType);
+                if (m_nDataFieldType < SAL_N_ELEMENTS(RID_STR_TYPE_CONST) - 1)
+                    aControlValue <<= RptResId(RID_STR_TYPE_CONST[m_nDataFieldType]);
             }
             break;
         case PROPERTY_ID_VERTICALALIGN:
             {
                 style::VerticalAlignment nParagraphVertAlign = style::VerticalAlignment_TOP;
                 aPropertyValue >>= nParagraphVertAlign;
-                ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
-                ResStringArray aResList(aRes);
-                if (sal_uInt32(nParagraphVertAlign) < aResList.Count())
-                    aControlValue <<= aResList.GetString((sal_uInt32)nParagraphVertAlign);
+                if (sal_uInt32(nParagraphVertAlign) < SAL_N_ELEMENTS(RID_STR_VERTICAL_ALIGN_CONST) - 1)
+                    aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[(sal_uInt32)nParagraphVertAlign]);
             }
             break;
         case PROPERTY_ID_PARAADJUST:
             {
                 sal_Int16 nParagraphAdjust = (sal_Int16)style::ParagraphAdjust_LEFT;
                 aPropertyValue >>= nParagraphAdjust;
-                ModuleRes aRes(RID_STR_PARAADJUST_CONST);
-                ResStringArray aResList(aRes);
-                if (static_cast<sal_uInt32>(nParagraphAdjust) < aResList.Count())
-                    aControlValue <<= aResList.GetString(nParagraphAdjust);
+                if (static_cast<sal_uInt32>(nParagraphAdjust) < SAL_N_ELEMENTS(RID_STR_PARAADJUST_CONST) - 1)
+                    aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[nParagraphAdjust]);
             }
             break;
         case PROPERTY_ID_BACKCOLOR:
@@ -1607,7 +1605,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
         // create the dialog
         uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow);
 
-        const OUString sPropertyUIName(OUString(ModuleRes(RID_STR_FILTER)));
+        const OUString sPropertyUIName(RptResId(RID_STR_FILTER));
         // initialize the dialog
         xDialog->setTitle( sPropertyUIName );
 
@@ -1640,7 +1638,7 @@ void GeometryHandler::checkPosAndSize(  const awt::Point& _aNewPos,
 
     ::Point aPos(VCLPoint(_aNewPos));
     if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()->
-        throw beans::PropertyVetoException(ModuleRes(RID_STR_ILLEGAL_POSITION),xSourceReportComponent);
+        throw beans::PropertyVetoException(RptResId(RID_STR_ILLEGAL_POSITION),xSourceReportComponent);
 
     ::tools::Rectangle aSourceRect(aPos,VCLSize(_aSize));
 
@@ -1653,7 +1651,7 @@ void GeometryHandler::checkPosAndSize(  const awt::Point& _aNewPos,
             const ::tools::Rectangle aBoundRect(VCLPoint(xReportComponent->getPosition()),VCLSize(xReportComponent->getSize()));
             const ::tools::Rectangle aRect = aSourceRect.GetIntersection(aBoundRect);
             if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) )
-                throw beans::PropertyVetoException(ModuleRes( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent);
+                throw beans::PropertyVetoException(RptResId( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent);
         }
     }
 }
@@ -1745,7 +1743,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out
         else if ( xSection == xReportDefinition->getDetail() )
             nPos = xGroups->getCount()-1;
 
-        const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP);
+        const OUString sGroup = RptResId(RID_STR_SCOPE_GROUP);
         for (sal_Int32 i = 0 ; i <= nPos ; ++i)
         {
             xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
@@ -1772,7 +1770,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
         const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY);
         if ( xGroup.is() )
         {
-            OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
+            OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP);
             _rsNamePostfix = xGroup->getExpression();
             m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix);
             xReturn = xGroup.get();
@@ -1784,7 +1782,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
             if ( nCount )
             {
                 const uno::Reference< report::XGroup> xGroup2(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW);
-                OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
+                OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP);
                 _rsNamePostfix = xGroup2->getExpression();
                 m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix);
                 xReturn = xGroup2.get();
@@ -1809,7 +1807,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
         for (sal_Int32 i = 0 ; i < nCount; ++i)
         {
             const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
-            OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
+            OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP);
             if ( m_sScope == sGroupName.replaceFirst("%1",xGroup->getExpression()) )
             {
                 _rsNamePostfix = xGroup->getExpression();
@@ -1855,7 +1853,7 @@ bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
                             uno::Reference< report::XGroup> xGroup(aFind.first->second.second,uno::UNO_QUERY);
                             if ( xGroup.is() )
                             {
-                                OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
+                                OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP);
                                 m_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression());
                             }
                             else
@@ -1920,7 +1918,7 @@ void GeometryHandler::loadDefaultFunctions()
     if ( m_aDefaultFunctions.empty() )
     {
         m_aCounterFunction.m_bPreEvaluated = false;
-        m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER);
+        m_aCounterFunction.m_sName = RptResId(RID_STR_F_COUNTER);
         m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1";
         m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*";
         m_aCounterFunction.m_sInitialFormula.IsPresent = true;
@@ -1930,21 +1928,21 @@ void GeometryHandler::loadDefaultFunctions()
 
         aDefault.m_bPreEvaluated = true;
 
-        aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION);
+        aDefault.m_sName = RptResId(RID_STR_F_ACCUMULATION);
         aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]";
         aDefault.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
         aDefault.m_sInitialFormula.IsPresent = true;
         aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
         m_aDefaultFunctions.push_back(aDefault);
 
-        aDefault.m_sName = ModuleRes(RID_STR_F_MINIMUM);
+        aDefault.m_sName = RptResId(RID_STR_F_MINIMUM);
         aDefault.m_sFormula = "rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])";
         aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
         aDefault.m_sInitialFormula.IsPresent = true;
         aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
         m_aDefaultFunctions.push_back(aDefault);
 
-        aDefault.m_sName = ModuleRes(RID_STR_F_MAXIMUM);
+        aDefault.m_sName = RptResId(RID_STR_F_MAXIMUM);
         aDefault.m_sFormula = "rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])";
         aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
         aDefault.m_sInitialFormula.IsPresent = true;
@@ -2112,7 +2110,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct
                 const uno::Reference< report::XGroup > xGroup(aFind.first->second.second,uno::UNO_QUERY);
                 if ( xGroup.is() )
                 {
-                    OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
+                    OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP);
                     Out_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression());
                 }
                 else
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 552938e817cd..7cbd0cb839c7 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src
deleted file mode 100644
index 7720b82aa816..000000000000
--- a/reportdesign/source/ui/inspection/inspection.src
+++ /dev/null
@@ -1,348 +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 "RptResId.hrc"
-#include "rptui_slotid.hrc"
-#include <svx/svxids.hrc>
-
-String RID_STR_PROPPAGE_DEFAULT
-{
-    Text [ en-US ] = "General" ;
-};
-
-String RID_STR_PROPPAGE_DATA
-{
-    Text [ en-US ] = "Data" ;
-};
-
-StringArray RID_STR_BOOL
-{
-    ItemList [ en-US ] =
-    {
-        < "No" ; >;
-        < "Yes" ; >;
-    };
-};
-
-String RID_STR_FORCENEWPAGE
-{
-    Text [ en-US ] = "Force New Page" ;
-};
-
-StringArray RID_STR_FORCENEWPAGE_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "None" ; >;
-        < "Before Section" ; >;
-        < "After Section" ; >;
-        < "Before & After Section" ; >;
-    };
-};
-
-String RID_STR_NEWROWORCOL
-{
-    Text [ en-US ] = "New Row Or Column" ;
-};
-
-String RID_STR_KEEPTOGETHER
-{
-    Text [ en-US ] = "Keep Together" ;
-};
-
-StringArray RID_STR_KEEPTOGETHER_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "No" ; >;
-        < "Whole Group" ; >;
-        < "With First Detail" ; >;
-    };
-};
-String RID_STR_CANGROW
-{
-    Text [ en-US ] = "Can Grow" ;
-};
-String RID_STR_CANSHRINK
-{
-    Text [ en-US ] = "Can Shrink" ;
-};
-String RID_STR_REPEATSECTION
-{
-    Text [ en-US ] = "Repeat Section" ;
-};
-String RID_STR_PRINTREPEATEDVALUES
-{
-    Text [ en-US ] = "Print repeated values" ;
-};
-String RID_STR_CONDITIONALPRINTEXPRESSION
-{
-    Text [ en-US ] = "Conditional Print Expression" ;
-};
-String RID_STR_STARTNEWCOLUMN
-{
-    Text [ en-US ] = "Start new column" ;
-};
-String RID_STR_STARTNEWPAGE
-{
-    Text [ en-US ] = "Start new page" ;
-};
-String RID_STR_RESETPAGENUMBER
-{
-    Text [ en-US ] = "Reset page number" ;
-};
-String RID_STR_CHARTTYPE
-{
-    Text [ en-US ] = "Chart type" ;
-};
-String RID_STR_PRINTWHENGROUPCHANGE
-{
-    Text [ en-US ] = "Print repeated value on group change" ;
-};
-String RID_STR_VISIBLE
-{
-    Text [ en-US ] = "Visible" ;
-};
-String RID_STR_GROUPKEEPTOGETHER
-{
-    Text [ en-US ] = "Group keep together" ;
-};
-
-StringArray RID_STR_GROUPKEEPTOGETHER_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "Per Page" ; >;
-        < "Per Column" ; >;
-    };
-};
-
-StringArray RID_STR_SECTIONPAGEBREAK_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "None" ; >;
-        < "Section" ; >;
-        < "Automatic" ; >;
-    };
-};
-
-String RID_STR_PAGEHEADEROPTION
-{
-    Text [ en-US ] = "Page header" ;
-};
-
-String RID_STR_PAGEFOOTEROPTION
-{
-    Text [ en-US ] = "Page footer" ;
-};
-
-StringArray RID_STR_REPORTPRINTOPTION_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "All Pages" ; >;
-        < "Not With Report Header" ; >;
-        < "Not With Report Footer" ; >;
-        < "Not With Report Header/Footer" ; >;
-    };
-};
-String RID_STR_DEEPTRAVERSING
-{
-    Text [ en-US ] = "Deep traversing" ;
-};
-String RID_STR_PREEVALUATED
-{
-    Text [ en-US ] = "Pre evaluation" ;
-};
-String RID_STR_POSITIONX
-{
-    Text [ en-US ] = "Position X";
-};
-String RID_STR_POSITIONY
-{
-    Text [ en-US ] = "Position Y";
-};
-String RID_STR_WIDTH
-{
-    Text [ en-US ] = "Width";
-};
-String RID_STR_HEIGHT
-{
-    Text [ en-US ] = "Height";
-};
-String RID_STR_INITIALFORMULA
-{
-    Text [ en-US ] = "Initial value" ;
-};
-String RID_STR_PRESERVEIRI
-{
-    Text [ en-US ] = "Preserve as Link" ;
-};
-String RID_STR_FORMULA
-{
-    Text [ en-US ] = "Formula" ;
-};
-String RID_STR_DATAFIELD
-{
-    Text [ en-US ] = "Data field" ;
-};
-String RID_STR_FONT
-{
-    Text [ en-US ] = "Font" ;
-};
-String RID_STR_BACKCOLOR
-{
-    Text [ en-US ] = "Background color";
-};
-String RID_STR_BACKTRANSPARENT
-{
-    Text [ en-US ] = "Background Transparent";
-};
-String RID_STR_CONTROLBACKGROUNDTRANSPARENT
-{
-    Text [ en-US ] = "Background Transparent";
-};
-String RID_STR_OVERLAP_OTHER_CONTROL
-{
-    Text [ en-US ] = "This operation is not allowed. The control overlaps with another one.";
-};
-String RID_STR_ILLEGAL_POSITION
-{
-    Text [ en-US ] = "This position can not be set. It is invalid.";
-};
-String RID_STR_SCOPE_GROUP
-{
-    Text [ en-US ] = "Group: %1";
-};
-String RID_STR_FORMULALIST
-{
-    Text [ en-US ] = "Function";
-};
-String RID_STR_SCOPE
-{
-    Text [ en-US ] = "Scope";
-};
-String RID_STR_TYPE
-{
-    Text [ en-US ] = "Data Field Type";
-};
-
-StringArray RID_STR_TYPE_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "Field or Formula"; >;
-        < "Function"; >;
-        < "Counter"; >;
-        < "User defined Function"; >;
-    };
-};
-
-String RID_STR_MASTERFIELDS
-{
-    Text [ en-US ] = "Link master fields" ;
-};
-
-String RID_STR_DETAILFIELDS
-{
-    Text [ en-US ] = "Link slave fields" ;
-};
-
-String RID_STR_EXPLANATION
-{
-    Text [ en-US ] = "Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report.";
-};
-
-String RID_STR_DETAILLABEL
-{
-    Text [ en-US ] = "Chart" ;
-};
-
-String RID_STR_MASTERLABEL
-{
-    Text [ en-US ] = "Report" ;
-};
-
-String RID_STR_PREVIEW_COUNT
-{
-    Text [ en-US ] = "Preview Row(s)" ;
-};
-
-String RID_STR_AREA
-{
-    Text [ en-US ] = "Area" ;
-};
-
-String RID_STR_MIMETYPE
-{
-    Text [ en-US ] = "Report Output Format" ;
-};
-
-String RID_STR_VERTICALALIGN
-{
-    Text [ en-US ] = "Vert. Alignment" ;
-};
-
-StringArray RID_STR_VERTICAL_ALIGN_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "Top"; >;
-        < "Middle"; >;
-        < "Bottom"; >;
-    };
-};
-
-String RID_STR_PARAADJUST
-{
-    Text [ en-US ] = "Horz. Alignment" ;
-};
-
-StringArray RID_STR_PARAADJUST_CONST
-{
-    ItemList [ en-US ] =
-    {
-        < "Left"; >;
-        < "Right"; >;
-        < "Block"; >;
-        < "Center"; >;
-    };
-};
-
-String RID_STR_F_COUNTER
-{
-    Text [ en-US ] = "Counter" ;
-};
-
-String RID_STR_F_ACCUMULATION
-{
-    Text [ en-US ] = "Accumulation" ;
-};
-
-String RID_STR_F_MINIMUM
-{
-    Text [ en-US ] = "Minimum" ;
-};
-
-String RID_STR_F_MAXIMUM
-{
-    Text [ en-US ] = "Maximum" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 7b3e73b8cf2b..adae3e8f6505 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -19,9 +19,10 @@
 #include "metadata.hxx"
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <comphelper/extract.hxx>
+#include "core_resource.hxx"
 #include "helpids.hrc"
-#include "RptResId.hrc"
-#include "uistrings.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 
 #include <algorithm>
 
@@ -78,7 +79,7 @@ namespace rptui
 
 #define DEF_INFO( ident, uinameres, helpid, flags )   \
     OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-            OUString( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags )
+                       RptResId( RID_STR_##uinameres ), HID_RPT_PROP_##helpid, flags )
 
 #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
     DEF_INFO( ident, uinameres, helpid, PropUIFlags::flag1 )
@@ -94,9 +95,6 @@ namespace rptui
         if ( s_pPropertyInfos )
             return s_pPropertyInfos;
 
-        OModuleClient aResourceAccess;
-        // this ensures that we have our resource file loaded
-
         static OPropertyInfoImpl aPropertyInfos[] =
         {
         /*
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index bbd66c5c84ba..5064d6451b63 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -20,7 +20,7 @@
 #include <svl/hint.hxx>
 #include <vcl/settings.hxx>
 
-#include "uistrings.hrc"
+#include "strings.hxx"
 
 
 namespace rptui
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 09325299e7aa..dec9f097b337 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "RptUndo.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "rptui_slotid.hrc"
 #include "UITools.hxx"
 #include "UndoEnv.hxx"
@@ -113,8 +113,8 @@ namespace
 OSectionUndo::OSectionUndo(OReportModel& _rMod
                            ,sal_uInt16 _nSlot
                            ,Action _eAction
-                           ,sal_uInt16 nCommentID)
-: OCommentUndoAction(_rMod,nCommentID)
+                           ,const char* pCommentID)
+: OCommentUndoAction(_rMod,pCommentID)
 ,m_eAction(_eAction)
 ,m_nSlot(_nSlot)
 ,m_bInserted(false)
@@ -220,7 +220,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
                                             ,OReportHelper> _pMemberFunction
                                        ,const uno::Reference< report::XReportDefinition >& _xReport
                                        ,Action _eAction)
-: OSectionUndo(_rMod,_nSlot,_eAction,0)
+: OSectionUndo(_rMod,_nSlot,_eAction,nullptr)
 ,m_aReportHelper(_xReport)
 ,m_pMemberFunction(_pMemberFunction)
 {
@@ -257,8 +257,8 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
                                             ,OGroupHelper> _pMemberFunction
                                        ,const uno::Reference< report::XGroup >& _xGroup
                                        ,Action _eAction
-                                       ,sal_uInt16 nCommentID)
-: OSectionUndo(_rMod,_nSlot,_eAction,nCommentID)
+                                       ,const char* pCommentID)
+: OSectionUndo(_rMod,_nSlot,_eAction,pCommentID)
 ,m_aGroupHelper(_xGroup)
 ,m_pMemberFunction(_pMemberFunction)
 {
@@ -323,11 +323,11 @@ void OGroupSectionUndo::implReRemove( )
 
 
 OGroupUndo::OGroupUndo(OReportModel& _rMod
-                       ,sal_uInt16 nCommentID
+                       ,const char* pCommentID
                        ,Action  _eAction
                        ,const uno::Reference< report::XGroup>& _xGroup
                        ,const uno::Reference< report::XReportDefinition >& _xReportDefinition)
-: OCommentUndoAction(_rMod,nCommentID)
+: OCommentUndoAction(_rMod,pCommentID)
 ,m_xGroup(_xGroup)
 ,m_xReportDefinition(_xReportDefinition)
 ,m_eAction(_eAction)
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 443e23ca2c1f..9d7a3eed25ad 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -100,11 +100,11 @@
 #include "dlgpage.hxx"
 #include <vcl/msgbox.hxx>
 #include "rptui_slotid.hrc"
-#include "uistrings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
 #include "RptObject.hxx"
-#include "ModuleHelper.hxx"
 #include "RptDef.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "ReportDefinition.hxx"
 #include "RptModel.hxx"
 
@@ -163,14 +163,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
     OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF");
     if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() )
     {
-        OUString sName = ModuleRes(RID_STR_GROUPHEADER);
+        OUString sName = RptResId(RID_STR_GROUPHEADER);
         sName += OUString::number(_nPos);
         _xGroup->getHeader()->setName(sName);
     }
 
     if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() )
     {
-        OUString sName = ModuleRes(RID_STR_GROUPFOOTER);
+        OUString sName = RptResId(RID_STR_GROUPFOOTER);
         sName += OUString::number(_nPos);
         _xGroup->getFooter()->setName(sName);
     }
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index fccb41abb983..83233bb7e67f 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -37,7 +37,7 @@
 #include "ScrollHelper.hxx"
 #include "Navigator.hxx"
 #include "SectionWindow.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index de398d2aa1ab..51b1f3cb9f05 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -28,7 +28,7 @@
 #include <ViewsWindow.hxx>
 #include <ReportSection.hxx>
 #include <ReportController.hxx>
-#include <uistrings.hrc>
+#include <strings.hxx>
 #include <reportformula.hxx>
 #include <toolkit/helper/property.hxx>
 
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 54b7fbfc80f0..db79387e4701 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -29,7 +29,7 @@
 #include <ViewsWindow.hxx>
 #include <ReportSection.hxx>
 #include <ReportController.hxx>
-#include <uistrings.hrc>
+#include <strings.hxx>
 #include <reportformula.hxx>
 #include <toolkit/helper/property.hxx>
 
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index d23550f9de16..2e0a68235562 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -112,17 +112,17 @@
 #include <svx/zoom_def.hxx>
 #include <svx/dialogs.hrc>
 
+#include "core_resource.hxx"
 #include "DesignView.hxx"
-#include "ModuleHelper.hxx"
 #include "RptObject.hxx"
 #include "RptUndo.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "RptDef.hxx"
 #include "ReportSection.hxx"
 #include "SectionView.hxx"
 #include "UndoActions.hxx"
 #include "dlgpage.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
@@ -407,7 +407,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
         case SID_REPORTHEADERFOOTER:
             {
                 aReturn.bEnabled = isEditable();
-                OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT);
+                OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT);
                 aReturn.sTitle = sText;
             }
             break;
@@ -416,7 +416,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
         case SID_PAGEHEADERFOOTER:
             {
                 aReturn.bEnabled = isEditable();
-                OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT);
+                OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT);
                 aReturn.sTitle = sText;
             }
             break;
@@ -569,7 +569,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
                     aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive();
             }
             {
-                OUString sText = ModuleRes(RID_STR_DELETE);
+                OUString sText = RptResId(RID_STR_DELETE);
                 aReturn.sTitle = sText;
             }
             break;
@@ -1153,7 +1153,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 {
                     uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW);
                     sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction);
-                    const OUString sUndoAction = ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION);
+                    const OUString sUndoAction = RptResId(RID_STR_UNDO_REMOVE_FUNCTION);
                     UndoContext aUndoContext( getUndoManager(), sUndoAction );
                     xFunctions->removeByIndex(nIndex);
                     select(uno::makeAny(xFunctions->getParent()));
@@ -1436,7 +1436,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 ::std::vector< uno::Reference< uno::XInterface > > aControlsFormats;
                 lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats );
 
-                const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
+                const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEFONT));
                 UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
                 ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin();
@@ -1513,7 +1513,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
 
                 if ( !aControlsFormats.empty() )
                 {
-                    const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) );
+                    const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGEFONT ) );
                     UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
                     ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin();
@@ -2450,7 +2450,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
                 else
                 {
                     uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW);
-                    const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE));
+                    const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEPAGE));
                     UndoContext aUndoContext( getUndoManager(), sUndoAction );
                     const SfxPoolItem* pItem = nullptr;
                     if ( SfxItemState::SET == pSet->GetItemState( RPTUI_ID_SIZE,true,&pItem))
@@ -2575,17 +2575,17 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi
     }
 }
 
-void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun)
+void OReportController::executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun)
 {
-    const OUString sUndoAction = ModuleRes(_nUndoStrId);
+    const OUString sUndoAction = RptResId(pUndoStrId);
     UndoContext aUndoContext( getUndoManager(), sUndoAction );
     _pMemfun( getDesignView() );
     InvalidateFeature( SID_UNDO );
 }
 
-void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection)
+void OReportController::alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection)
 {
-    const OUString sUndoAction = ModuleRes(_nUndoStrId);
+    const OUString sUndoAction = RptResId(pUndoStrId);
     UndoContext aUndoContext( getUndoManager(), sUndoAction );
     getDesignView()->alignMarkedObjects(_nControlModification,_bAlignAtSection);
     InvalidateFeature( SID_UNDO );
@@ -2659,11 +2659,11 @@ void OReportController::shrinkSectionTop(const uno::Reference<report::XSection>&
     _xSection->setHeight(nNewSectionHeight);
 }
 
-void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid)
+void OReportController::shrinkSection(const char* pUndoStrId, const uno::Reference<report::XSection>& _xSection, sal_Int32 _nSid)
 {
     if ( _xSection.is() )
     {
-        const OUString sUndoAction = ModuleRes(_nUndoStrId);
+        const OUString sUndoAction = RptResId(pUndoStrId);
         UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
         if (_nSid == SID_SECTION_SHRINK)
@@ -2835,7 +2835,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
     uno::Reference<frame::XModel> xModel;
     if ( m_xReportDefinition.is() )
     {
-        sal_uInt16 nErrorId = RID_ERR_NO_COMMAND;
+        const char* pErrorId = RID_ERR_NO_COMMAND;
         bool bEnabled = !m_xReportDefinition->getCommand().isEmpty();
         if ( bEnabled )
         {
@@ -2848,20 +2848,20 @@ uno::Reference<frame::XModel> OReportController::executeReport()
                 bEnabled = pPage->GetObjCount() != 0;
             }
             if ( !bEnabled )
-                nErrorId = RID_ERR_NO_OBJECTS;
+                pErrorId = RID_ERR_NO_OBJECTS;
         }
 
         dbtools::SQLExceptionInfo aInfo;
         if ( !bEnabled )
         {
             sdb::SQLContext aFirstMessage;
-            OUString sInfo = ModuleRes( nErrorId );
+            OUString sInfo = RptResId( pErrorId );
             aFirstMessage.Message = sInfo;
             aInfo = aFirstMessage;
             if ( isEditable() )
             {
                 sal_uInt16 nCommand = 0;
-                if ( nErrorId == RID_ERR_NO_COMMAND )
+                if (!strcmp(pErrorId, RID_ERR_NO_COMMAND))
                 {
                     if ( !m_bShowProperties )
                         executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>());
@@ -2904,7 +2904,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
 
                 // our first message says: we caught an exception
                 sdb::SQLContext aFirstMessage;
-                OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION));
+                OUString sInfo(RptResId(RID_STR_CAUGHT_FOREIGN_EXCEPTION));
                 sInfo = sInfo.replaceAll("$type$", aCaughtException.getValueTypeName());
                 aFirstMessage.Message = sInfo;
 
@@ -2930,7 +2930,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
             }
             if (aInfo.isValid())
             {
-                const OUString suSQLContext = ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT );
+                const OUString suSQLContext = RptResId( RID_STR_COULD_NOT_CREATE_REPORT );
                 aInfo.prepend(suSQLContext);
             }
             m_bInGeneratePreview = false;
@@ -2986,7 +2986,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet()
 
 void OReportController::insertGraphic()
 {
-    const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC));
+    const OUString sTitle(RptResId(RID_STR_IMPORT_GRAPHIC));
     // build some arguments for the upcoming dialog
     try
     {
@@ -3082,7 +3082,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference<
 void OReportController::createNewFunction(const uno::Any& _aValue)
 {
     uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW);
-    const OUString sNewName = ModuleRes(RID_STR_FUNCTION);
+    const OUString sNewName = RptResId(RID_STR_FUNCTION);
     uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext));
     xFunction->setName(sNewName);
     // the call below will also create an undo action -> listener
@@ -3217,7 +3217,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
 {
     getDesignView()->unmarkAllObjects();
 
-    const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
+    const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL));
     UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
     SequenceAsHashMap aMap(_aArgs);
@@ -3245,7 +3245,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
 {
     getDesignView()->unmarkAllObjects();
 
-    const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
+    const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL));
     UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
     if ( !m_xReportDefinition->getPageHeaderOn() )
@@ -3257,12 +3257,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
     SequenceAsHashMap aMap(_aArgs);
     bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false);
 
-    OUString sFunction( ModuleRes(STR_RPT_PN_PAGE) );
+    OUString sFunction( RptResId(STR_RPT_PN_PAGE) );
     sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()");
 
     if ( bStateOfPage )
     {
-        sFunction += ModuleRes(STR_RPT_PN_PAGE_OF);
+        sFunction += RptResId(STR_RPT_PN_PAGE_OF);
         sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()");
     }
 
@@ -3288,7 +3288,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
     }
 
     uno::Reference<report::XSection> xCurrentSection = getDesignView()->getCurrentSection();
-    UndoContext aUndoContext( getUndoManager(), OUString( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) );
+    UndoContext aUndoContext(getUndoManager(), RptResId(RID_STR_UNDO_INSERT_CONTROL));
 
     try
     {
@@ -3742,7 +3742,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId)
         std::unique_ptr< UndoContext > pUndoContext;
         if ( SID_REPORTHEADERFOOTER == _nId )
         {
-            const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
+            const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
             pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) );
 
             addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO
@@ -3789,7 +3789,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
         std::unique_ptr< UndoContext > pUndoContext;
         if ( SID_PAGEHEADERFOOTER == _nId )
         {
-            const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
+            const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
             pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) );
 
             addUndoAction(new OReportSectionUndo(*m_aReportModel
@@ -4127,14 +4127,14 @@ bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::R
     return bRet;
 }
 
-bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs)
+bool OReportController::impl_setPropertyAtControls_throw(const char* pUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs)
 {
     ::std::vector< uno::Reference< uno::XInterface > > aSelection;
     uno::Reference< awt::XWindow> xWindow;
     lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection );
     ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin();
 
-    const OUString sUndoAction = ModuleRes( _nUndoResId );
+    const OUString sUndoAction = RptResId( pUndoResId );
     UndoContext aUndoContext( getUndoManager(), sUndoAction );
 
     for(;  aIter != aSelection.end();++aIter)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 544dfb203638..7363f3eaaf9d 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -20,7 +20,7 @@
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"
 #include "DesignView.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "RptObject.hxx"
 #include "RptModel.hxx"
 #include "SectionView.hxx"
@@ -50,7 +50,7 @@
 #include "RptDef.hxx"
 #include "SectionWindow.hxx"
 #include "helpids.hrc"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "dlgedclip.hxx"
 #include "UndoActions.hxx"
 #include "rptui_slotid.hrc"
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 8ac0e90fa598..6513c2cba02c 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -32,7 +32,7 @@
 #include "RptDef.hxx"
 #include "dlgedfunc.hxx"
 #include "RptModel.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "RptPage.hxx"
 #include "ReportController.hxx"
 #include "EndMarker.hxx"
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index d94fe0deb51d..b179abc92811 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -26,7 +26,7 @@
 #include <vcl/scrbar.hxx>
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 6e4a3fa386e6..ebcc09695dbb 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -24,9 +24,10 @@
 #include "RptDef.hxx"
 #include "ReportSection.hxx"
 #include "DesignView.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
+#include "core_resource.hxx"
 #include "helpids.hrc"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "StartMarker.hxx"
 #include "EndMarker.hxx"
 #include "ViewsWindow.hxx"
@@ -149,7 +150,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
             }
             else
             {
-                OUString sTitle = ModuleRes(RID_STR_DETAIL);
+                OUString sTitle = RptResId(RID_STR_DETAIL);
                 m_aStartMarker->setTitle(sTitle);
                 m_aStartMarker->Invalidate(InvalidateFlags::Children);
             }
@@ -165,20 +166,20 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
     }
 }
 
-bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool,OReportHelper>& _pIsSectionOn)
+bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool,OReportHelper>& _pIsSectionOn)
 {
     OReportHelper aReportHelper(_xReport);
     const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection->getSection();
     if ( bRet )
     {
-        OUString sTitle = ModuleRes(_nResId);
+        OUString sTitle = RptResId(pResId);
         m_aStartMarker->setTitle(sTitle);
         m_aStartMarker->Invalidate(InvalidateFlags::Children);
     }
     return bRet;
 }
 
-bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool,OGroupHelper>& _pIsSectionOn)
+bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool,OGroupHelper>& _pIsSectionOn)
 {
     OGroupHelper aGroupHelper(_xGroup);
     const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection->getSection() ;
@@ -191,8 +192,7 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
             sExpression = sLabel;
         }
 
-        ModuleRes aRes(_nResId);
-        OUString sTitle(aRes);
+        OUString sTitle(RptResId(pResId));
         sTitle = sTitle.replaceFirst("#", sExpression);
         m_aStartMarker->setTitle( sTitle );
         m_aStartMarker->Invalidate(InvalidateFlags::Children);
@@ -317,7 +317,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
 
 IMPL_LINK_NOARG( OSectionWindow, StartSplitHdl, Splitter*, void)
 {
-    const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) );
+    const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGE_SIZE ) );
     getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) );
 }
 
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 5e070d8076f7..ac3c7b5a6221 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -19,9 +19,8 @@
 #include "StartMarker.hxx"
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
-#include "ModuleHelper.hxx"
 #include "ColorChanger.hxx"
 #include "ReportDefines.hxx"
 #include "SectionWindow.hxx"
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index a8c1f9d021ee..b97a72d1efa2 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -26,21 +26,20 @@
 #include "ReportController.hxx"
 #include "UITools.hxx"
 #include "RptDef.hxx"
-#include "RptResId.hrc"
+#include "strings.hrc"
 #include "SectionView.hxx"
 #include "ReportSection.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "rptui_slotid.hrc"
 #include "dlgedclip.hxx"
 #include "ColorChanger.hxx"
 #include "RptObject.hxx"
-#include "ModuleHelper.hxx"
 #include "EndMarker.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/unoshape.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-
+#include "core_resource.hxx"
 #include "helpids.hrc"
 #include <svx/svdundo.hxx>
 #include <toolkit/helper/convert.hxx>
@@ -1234,7 +1233,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects()
 
 void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSection, const Point& _aPnt)
 {
-    const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION);
+    const OUString sUndoAction = RptResId(RID_STR_UNDO_CHANGEPOSITION);
     const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction );
 
     Point aNewPos = _aPnt;
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 0bc995800283..bc4e87011c39 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "dlgedfac.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "RptObject.hxx"
 #include <RptDef.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 62b8fe3fef35..a57d3eec9dc9 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -48,7 +48,7 @@
 #include "ScrollHelper.hxx"
 #include "UITools.hxx"
 
-#include <uistrings.hrc>
+#include <strings.hxx>
 #include "UndoEnv.hxx"
 #include <RptModel.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 5e7316b7dcd3..7c0ffd2b9149 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -21,7 +21,7 @@
 #include "RptObject.hxx"
 #include "ReportController.hxx"
 #include <cppuhelper/component_context.hxx>
-#include <RptResId.hrc>
+#include <strings.hrc>
 #include "rptui_slotid.hrc"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -47,9 +47,10 @@
 #include <comphelper/types.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
+#include "core_resource.hxx"
 #include "SectionView.hxx"
 #include "ReportSection.hxx"
-#include "uistrings.hrc"
+#include "strings.hxx"
 #include "DesignView.hxx"
 #include "ViewsWindow.hxx"
 #include "UITools.hxx"
@@ -332,52 +333,52 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
     OUString aName;
     if ( !_aObjects.getLength() )
     {
-        aName = ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES);
+        aName = RptResId(RID_STR_BRWTITLE_NO_PROPERTIES);
     }
     else if ( _aObjects.getLength() == 1 )    // single selection
     {
-        aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES);
+        aName = RptResId(RID_STR_BRWTITLE_PROPERTIES);
 
         uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY);
         Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY );
         if ( xServiceInfo.is() )
         {
-            sal_uInt16 nResId = 0;
+            const char* pResId = nullptr;
             if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) )
             {
-                nResId = RID_STR_PROPTITLE_FIXEDTEXT;
+                pResId = RID_STR_PROPTITLE_FIXEDTEXT;
             }
             else if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL ) )
             {
-                nResId = RID_STR_PROPTITLE_IMAGECONTROL;
+                pResId = RID_STR_PROPTITLE_IMAGECONTROL;
             }
             else if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ) )
             {
-                nResId = RID_STR_PROPTITLE_FORMATTED;
+                pResId = RID_STR_PROPTITLE_FORMATTED;
             }
             else if ( xServiceInfo->supportsService( SERVICE_SHAPE ) )
             {
-                nResId = RID_STR_PROPTITLE_SHAPE;
+                pResId = RID_STR_PROPTITLE_SHAPE;
             }
             else if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) )
             {
-                nResId = RID_STR_PROPTITLE_REPORT;
+                pResId = RID_STR_PROPTITLE_REPORT;
             }
             else if ( xServiceInfo->supportsService( SERVICE_SECTION ) )
             {
-                nResId = RID_STR_PROPTITLE_SECTION;
+                pResId = RID_STR_PROPTITLE_SECTION;
             }
             else if ( xServiceInfo->supportsService( SERVICE_FUNCTION ) )
             {
-                nResId = RID_STR_PROPTITLE_FUNCTION;
+                pResId = RID_STR_PROPTITLE_FUNCTION;
             }
             else if ( xServiceInfo->supportsService( SERVICE_GROUP ) )
             {
-                nResId = RID_STR_PROPTITLE_GROUP;
+                pResId = RID_STR_PROPTITLE_GROUP;
             }
             else if ( xServiceInfo->supportsService( SERVICE_FIXEDLINE ) )
             {
-                nResId = RID_STR_PROPTITLE_FIXEDLINE;
+                pResId = RID_STR_PROPTITLE_FIXEDLINE;
             }
             else
             {
@@ -386,16 +387,16 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
                 return aName;
             }
 
-            if (nResId)
+            if (pResId)
             {
-                aName += ModuleRes(nResId);
+                aName += RptResId(pResId);
             }
         }
     }
     else    // multiselection
     {
-        aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES);
-        aName += ModuleRes(RID_STR_BRWTITLE_MULTISELECT);
+        aName = RptResId(RID_STR_BRWTITLE_PROPERTIES);
+        aName += RptResId(RID_STR_BRWTITLE_MULTISELECT);
     }
 
     return aName;
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
deleted file mode 100644
index 55472688ab79..000000000000
--- a/reportdesign/source/ui/report/report.src
+++ /dev/null
@@ -1,284 +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 "RptResId.hrc"
-#include "rptui_slotid.hrc"
-#include <svx/svxids.hrc>
-#include "helpids.hrc"
-
-// Property Browser Headline ----------------------------------------------------------------
-
-String RID_STR_BRWTITLE_PROPERTIES
-{
-    Text [ en-US ] = "Properties: ";
-};
-String RID_STR_BRWTITLE_NO_PROPERTIES
-{
-    Text [ en-US ] = "No Control marked";
-};
-String RID_STR_BRWTITLE_MULTISELECT
-{
-    Text [ en-US ] = "Multiselection";
-};
-
-String RID_STR_PROPTITLE_IMAGECONTROL
-{
-    Text [ en-US ] = "Image Control" ;
-};
-String RID_STR_PROPTITLE_FIXEDTEXT
-{
-    Text [ en-US ] = "Label field" ;
-};
-String RID_STR_PROPTITLE_FIXEDLINE
-{
-    Text [ en-US ] = "Line" ;
-};
-String RID_STR_PROPTITLE_FORMATTED
-{
-    Text [ en-US ] = "Formatted Field";
-};
-String RID_STR_PROPTITLE_SHAPE
-{
-    Text [ en-US ] = "Shape";
-};
-String RID_STR_PROPTITLE_REPORT
-{
-    Text [ en-US ] = "Report";
-};
-String RID_STR_PROPTITLE_SECTION
-{
-    Text [ en-US ] = "Section";
-};
-String RID_STR_PROPTITLE_FUNCTION
-{
-    Text [ en-US ] = "Function";
-};
-String RID_STR_PROPTITLE_GROUP
-{
-    Text [ en-US ] = "Group";
-};
-
-String RID_STR_UNDO_CHANGEPOSITION
-{
-    Text [ en-US ] = "Change Object";
-};
-String RID_STR_UNDO_MOVE_GROUP
-{
-    Text [ en-US ] = "Move Group(s)";
-};
-String RID_STR_UNDO_CONDITIONAL_FORMATTING
-{
-    Text [ en-US ] = "Conditional Formatting";
-};
-String RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER
-{
-    Text [ en-US ] = "Remove report header / report footer";
-};
-
-String RID_STR_UNDO_ADD_REPORTHEADERFOOTER
-{
-    Text [ en-US ] = "Add report header / report footer";
-};
-
-String RID_STR_UNDO_PROPERTY
-{
-    Text [ en-US ] = "Change property '#'";
-    Text [ x-comment ] = "The # character is used for replacing";
-};
-
-String RID_STR_UNDO_ADD_GROUP_HEADER
-{
-    Text [ en-US ] = "Add group header ";
-};
-
-String RID_STR_UNDO_REMOVE_GROUP_HEADER
-{
-    Text [ en-US ] = "Remove group header ";
-};
-
-String RID_STR_UNDO_ADD_GROUP_FOOTER
-{
-    Text [ en-US ] = "Add group footer ";
-};
-
-String RID_STR_UNDO_REMOVE_GROUP_FOOTER
-{
-    Text [ en-US ] = "Remove group footer ";
-};
-String RID_STR_UNDO_ADDFUNCTION
-{
-    Text [ en-US ] = "Add function";
-};
-
-String STR_RPT_LABEL
-{
-    Text [ en-US ] = "~Report name" ;
-};
-
-String RID_STR_UNDO_REMOVE_GROUP
-{
-    Text [ en-US ] = "Delete Group" ;
-};
-
-String RID_STR_UNDO_APPEND_GROUP
-{
-    Text [ en-US ] = "Add Group" ;
-};
-
-String RID_STR_UNDO_REMOVE_SELECTION
-{
-    Text [ en-US ] = "Delete Selection" ;
-};
-String RID_STR_UNDO_REMOVE_FUNCTION
-{
-    Text [ en-US ] = "Delete Function" ;
-};
-
-String RID_STR_UNDO_CHANGE_SIZE
-{
-    Text [ en-US ] = "Change Size" ;
-};
-
-String RID_STR_UNDO_PASTE
-{
-    Text [ en-US ] = "Paste" ;
-};
-
-String RID_STR_UNDO_INSERT_CONTROL
-{
-    Text [ en-US ] = "Insert Control" ;
-};
-
-String RID_STR_UNDO_DELETE_CONTROL
-{
-    Text [ en-US ] = "Delete Control" ;
-};
-
-String RID_STR_GROUPHEADER
-{
-    Text [ en-US ] = "GroupHeader";
-    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one.";
-};
-String RID_STR_GROUPFOOTER
-{
-    Text [ en-US ] = "GroupFooter";
-    Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one.";
-};
-
-String RID_STR_FIELDSELECTION
-{
-    Text [ en-US ] = "Add field:";
-};
-
-String RID_STR_FILTER
-{
-    Text [ en-US ] = "Filter" ;
-};
-
-String RID_STR_UNDO_ALIGNMENT
-{
-    Text [ en-US ] = "Change Alignment" ;
-};
-String RID_STR_HEADER
-{
-    Text [ en-US ] = "# Header" ;
-    Text[ x-comment ] = "# will be replaced with a name.";
-};
-String RID_STR_FOOTER
-{
-    Text [ en-US ] = "# Footer" ;
-    Text[ x-comment ] = "# will be replaced with a name.";
-};
-String RID_STR_IMPORT_GRAPHIC
-{
-    Text [ en-US ] = "Insert graphics" ;
-};
-String RID_STR_DELETE
-{
-    Text [ en-US ] = "Delete" ;
-};
-String RID_STR_FUNCTION
-{
-    Text [ en-US ] = "Function" ;
-};
-
-String RID_STR_COULD_NOT_CREATE_REPORT
-{
-    Text [ en-US ] = "An error occurred while creating the report." ;
-};
-String RID_STR_CAUGHT_FOREIGN_EXCEPTION
-{
-    Text [ en-US ] = "An exception of type $type$ was caught." ;
-};
-String RID_STR_UNDO_CHANGEFONT
-{
-    Text [ en-US ] = "Change font";
-};
-String RID_STR_UNDO_CHANGEPAGE
-{
-    Text [ en-US ] = "Change page attributes";
-};
-String RID_STR_PAGEHEADERFOOTER_INSERT
-{
-    Text [ en-US ] = "Insert Page Header/Footer";
-};
-String RID_STR_PAGEHEADERFOOTER_DELETE
-{
-    Text [ en-US ] = "Delete Page Header/Footer";
-};
-String RID_STR_REPORTHEADERFOOTER_INSERT
-{
-    Text [ en-US ] = "Insert Report Header/Footer";
-};
-String RID_STR_REPORTHEADERFOOTER_DELETE
-{
-    Text [ en-US ] = "Delete Report Header/Footer";
-};
-String RID_ERR_NO_COMMAND
-{
-    Text [ en-US ] = "The report can not be executed unless it is bound to content.";
-};
-String RID_ERR_NO_OBJECTS
-{
-    Text [ en-US ] = "The report can not be executed unless at least one object has been inserted.";
-};
-String RID_STR_UNDO_SHRINK
-{
-    Text [ en-US ] = "Shrink Section";
-};
-String RID_STR_DETAIL
-{
-    Text [ en-US ] = "Detail";
-};
-String RID_STR_PAGE_HEADER
-{
-    Text [ en-US ] = "Page Header";
-};
-String RID_STR_PAGE_FOOTER
-{
-    Text [ en-US ] = "Page Footer";
-};
-String RID_STR_REPORT_HEADER
-{
-    Text [ en-US ] = "Report Header";
-};
-String RID_STR_REPORT_FOOTER
-{
-    Text [ en-US ] = "Report Footer";
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
index c08ef8bfd0b5..81f06b43ac9e 100644
--- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="BackgroundDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Section Setup</property>
+    <property name="title" translatable="yes" context="backgrounddialog|BackgroundDialog">Section Setup</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="backgrounddialog|background">Background</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
index 47491da9b178..8fc9aa4da781 100644
--- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CharDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Character Settings</property>
+    <property name="title" translatable="yes" context="chardialog|CharDialog">Character Settings</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="chardialog|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="chardialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="chardialog|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="asianlayout">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Layout</property>
+                <property name="label" translatable="yes" context="chardialog|asianlayout">Asian Layout</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="chardialog|background">Highlighting</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="chardialog|alignment">Alignment</property>
               </object>
               <packing>
                 <property name="position">5</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
index a336a5bfbc8f..623ffc6c4755 100644
--- a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CondFormat">
     <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">Conditional Formatting</property>
+    <property name="title" translatable="yes" context="condformatdialog|CondFormat">Conditional Formatting</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui
index 9c141ffdc11f..b5bb144de770 100644
--- a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui
+++ b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="image1">
@@ -53,8 +53,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <items>
-                  <item translatable="yes">Field Value Is</item>
-                  <item translatable="yes">Expression Is</item>
+                  <item translatable="yes" context="conditionwin|typeCombobox">Field Value Is</item>
+                  <item translatable="yes" context="conditionwin|typeCombobox">Expression Is</item>
                 </items>
               </object>
               <packing>
@@ -68,14 +68,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <items>
-                  <item translatable="yes">between</item>
-                  <item translatable="yes">not between</item>
-                  <item translatable="yes">equal to</item>
-                  <item translatable="yes">not equal to</item>
-                  <item translatable="yes">greater than</item>
-                  <item translatable="yes">less than</item>
-                  <item translatable="yes">greater than or equal to</item>
-                  <item translatable="yes">less than or equal to</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">between</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">not between</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">equal to</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">not equal to</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">greater than</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">less than</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">greater than or equal to</item>
+                  <item translatable="yes" context="conditionwin|opCombobox">less than or equal to</item>
                 </items>
               </object>
               <packing>
@@ -104,7 +104,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="lhsButton">
-                    <property name="label" translatable="yes">...</property>
+                    <property name="label" translatable="yes" context="conditionwin|lhsButton">...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
               <object class="GtkLabel" id="andLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">and</property>
+                <property name="label" translatable="yes" context="conditionwin|andLabel">and</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -155,7 +155,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="rhsButton">
-                    <property name="label" translatable="yes">...</property>
+                    <property name="label" translatable="yes" context="conditionwin|rhsButton">...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -217,7 +217,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:Bold</property>
-                    <property name="label" translatable="yes">Bold</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem1">Bold</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_bold.png</property>
                   </object>
@@ -232,7 +232,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:Italic</property>
-                    <property name="label" translatable="yes">Italic</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem2">Italic</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_italic.png</property>
                   </object>
@@ -247,7 +247,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:Underline</property>
-                    <property name="label" translatable="yes">Underline</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem3">Underline</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_underline.png</property>
                   </object>
@@ -272,7 +272,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:BackgroundColor</property>
-                    <property name="label" translatable="yes">Background Color</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem4">Background Color</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_backgroundcolor.png</property>
                   </object>
@@ -287,7 +287,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:FontColor</property>
-                    <property name="label" translatable="yes">Font Color</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem5">Font Color</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_fontcolor.png</property>
                   </object>
@@ -302,7 +302,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">.uno:FontDialog</property>
-                    <property name="label" translatable="yes">Character Formatting</property>
+                    <property name="label" translatable="yes" context="conditionwin|ToolBoxItem6">Character Formatting</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">cmd/sc_fontdialog.png</property>
                   </object>
@@ -368,7 +368,7 @@
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkButton" id="removeButton">
-            <property name="label" translatable="yes">-</property>
+            <property name="label" translatable="yes" context="conditionwin|removeButton">-</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -382,7 +382,7 @@
         </child>
         <child>
           <object class="GtkButton" id="addButton">
-            <property name="label" translatable="yes">+</property>
+            <property name="label" translatable="yes" context="conditionwin|addButton">+</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
index 065a46346028..3b877c6ba235 100644
--- a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DateTimeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Date and Time</property>
+    <property name="title" translatable="yes" context="datetimedialog|DateTimeDialog">Date and Time</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -84,7 +84,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="date">
-                <property name="label" translatable="yes">_Include Date</property>
+                <property name="label" translatable="yes" context="datetimedialog|date">_Include Date</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -105,7 +105,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">12</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Format:</property>
+                <property name="label" translatable="yes" context="datetimedialog|datelistbox_label">_Format:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">datelistbox</property>
               </object>
@@ -116,7 +116,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="time">
-                <property name="label" translatable="yes">Include _Time</property>
+                <property name="label" translatable="yes" context="datetimedialog|time">Include _Time</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">12</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Fo_rmat:</property>
+                <property name="label" translatable="yes" context="datetimedialog|timelistbox_label">Fo_rmat:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">timelistbox</property>
               </object>
diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
index 050cc6104a1c..da3057f645fa 100644
--- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
+++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingField">
     <property name="visible">True</property>
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sorting and Grouping</property>
+    <property name="title" translatable="yes" context="floatingfield|FloatingField">Sorting and Grouping</property>
     <property name="type_hint">utility</property>
     <child>
       <object class="GtkGrid" id="grid3">
@@ -27,7 +27,7 @@
               <object class="GtkToolButton" id="up">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sort Ascending</property>
+                <property name="label" translatable="yes" context="floatingfield|up">Sort Ascending</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">cmd/sc_sortup.png</property>
               </object>
@@ -40,7 +40,7 @@
               <object class="GtkToolButton" id="down">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sort Descending</property>
+                <property name="label" translatable="yes" context="floatingfield|down">Sort Descending</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">cmd/sc_sortdown.png</property>
               </object>
@@ -53,7 +53,7 @@
               <object class="GtkToolButton" id="delete">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Remove sorting</property>
+                <property name="label" translatable="yes" context="floatingfield|delete">Remove sorting</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">cmd/sc_removefiltersort.png</property>
               </object>
@@ -76,7 +76,7 @@
               <object class="GtkToolButton" id="insert">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="floatingfield|insert">Insert</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -95,7 +95,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Highlight the fields to insert into the selected section of the template, then click Insert or press Enter.</property>
+            <property name="label" translatable="yes" context="floatingfield|helptext">Highlight the fields to insert into the selected section of the template, then click Insert or press Enter.</property>
             <property name="wrap">True</property>
             <property name="max_width_chars">60</property>
             <property name="xalign">0</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui
index e4d3ef8d8107..5163b146441e 100644
--- a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui
+++ b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingNavigator">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Report navigator</property>
+    <property name="title" translatable="yes" context="floatingnavigator|FloatingNavigator">Report navigator</property>
     <property name="type_hint">utility</property>
     <child>
       <object class="GtkBox" id="box">
diff --git a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui
index d29f7b102e52..40fe9c3f67b9 100644
--- a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui
+++ b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingSort">
     <property name="visible">True</property>
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sorting and Grouping</property>
+    <property name="title" translatable="yes" context="floatingsort|FloatingSort">Sorting and Grouping</property>
     <property name="type_hint">utility</property>
     <child>
       <object class="GtkGrid" id="grid1">
@@ -50,7 +50,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Group actions</property>
+                            <property name="label" translatable="yes" context="floatingsort|label5">Group actions</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">toolbox</property>
                           </object>
@@ -72,7 +72,7 @@
                               <object class="GtkToolButton" id="up">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Move up</property>
+                                <property name="label" translatable="yes" context="floatingsort|up">Move up</property>
                                 <property name="use_underline">True</property>
                                 <property name="icon_name">cmd/sc_moveup.png</property>
                               </object>
@@ -85,7 +85,7 @@
                               <object class="GtkToolButton" id="down">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Move down</property>
+                                <property name="label" translatable="yes" context="floatingsort|down">Move down</property>
                                 <property name="use_underline">True</property>
                                 <property name="icon_name">cmd/sc_movedown.png</property>
                               </object>
@@ -98,7 +98,7 @@
                               <object class="GtkToolButton" id="delete">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Delete</property>
+                                <property name="label" translatable="yes" context="floatingsort|delete">Delete</property>
                                 <property name="use_underline">True</property>
                                 <property name="icon_name">cmd/sc_deleterows.png</property>
                               </object>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Groups</property>
+                <property name="label" translatable="yes" context="floatingsort|label1">Groups</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -189,7 +189,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Sorting</property>
+                        <property name="label" translatable="yes" context="floatingsort|label6">Sorting</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sorting</property>
                       </object>
@@ -205,7 +205,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Group Header</property>
+                        <property name="label" translatable="yes" context="floatingsort|label7">Group Header</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">header</property>
                       </object>
@@ -221,7 +221,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Group Footer</property>
+                        <property name="label" translatable="yes" context="floatingsort|label8">Group Footer</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">footer</property>
                       </object>
@@ -237,7 +237,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Group On</property>
+                        <property name="label" translatable="yes" context="floatingsort|label9">Group On</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">group</property>
                       </object>
@@ -253,7 +253,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Group Interval</property>
+                        <property name="label" translatable="yes" context="floatingsort|label10">Group Interval</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">interval</property>
                       </object>
@@ -269,7 +269,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Keep Together</property>
+                        <property name="label" translatable="yes" context="floatingsort|label11">Keep Together</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">keep</property>
                       </object>
@@ -287,8 +287,8 @@
                         <property name="hexpand">True</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">Ascending</item>
-                          <item translatable="yes">Descending</item>
+                          <item translatable="yes" context="floatingsort|sorting">Ascending</item>
+                          <item translatable="yes" context="floatingsort|sorting">Descending</item>
                         </items>
                       </object>
                       <packing>
@@ -305,8 +305,8 @@
                         <property name="hexpand">True</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">Present</item>
-                          <item translatable="yes">Not present</item>
+                          <item translatable="yes" context="floatingsort|header">Present</item>
+                          <item translatable="yes" context="floatingsort|header">Not present</item>
                         </items>
                       </object>
                       <packing>
@@ -323,9 +323,9 @@
                         <property name="hexpand">True</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">No</item>
-                          <item translatable="yes">Whole Group</item>
-                          <item translatable="yes">With First Detail</item>
+                          <item translatable="yes" context="floatingsort|keep">No</item>
+                          <item translatable="yes" context="floatingsort|keep">Whole Group</item>
+                          <item translatable="yes" context="floatingsort|keep">With First Detail</item>
                         </items>
                       </object>
                       <packing>
@@ -342,8 +342,8 @@
                         <property name="hexpand">True</property>
                         <property name="active">1</property>
                         <items>
-                          <item translatable="yes">Present</item>
-                          <item translatable="yes">Not present</item>
+                          <item translatable="yes" context="floatingsort|footer">Present</item>
+                          <item translatable="yes" context="floatingsort|footer">Not present</item>
                         </items>
                       </object>
                       <packing>
@@ -360,7 +360,7 @@
                         <property name="hexpand">True</property>
                         <property name="active">0</property>
                         <items>
-                          <item translatable="yes">Each Value</item>
+                          <item translatable="yes" context="floatingsort|group">Each Value</item>
                         </items>
                       </object>
                       <packing>
@@ -391,7 +391,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Properties</property>
+                <property name="label" translatable="yes" context="floatingsort|label2">Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -433,7 +433,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Help</property>
+                <property name="label" translatable="yes" context="floatingsort|label3">Help</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui
index b9df6f291084..b4825b5916cb 100644
--- a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui
+++ b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="groupsortmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui
index 2b3cab082f74..29da91edc09c 100644
--- a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui
+++ b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="sorting">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sorting and Grouping...</property>
+        <property name="label" translatable="yes" context="navigatormenu|sorting">Sorting and Grouping...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkCheckMenuItem" id="page">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Page Header/Footer...</property>
+        <property name="label" translatable="yes" context="navigatormenu|page">Page Header/Footer...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkCheckMenuItem" id="report">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Report Header/Footer...</property>
+        <property name="label" translatable="yes" context="navigatormenu|report">Report Header/Footer...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -45,7 +45,7 @@
       <object class="GtkMenuItem" id="function">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">New Function</property>
+        <property name="label" translatable="yes" context="navigatormenu|function">New Function</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -59,7 +59,7 @@
       <object class="GtkMenuItem" id="properties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Properties...</property>
+        <property name="label" translatable="yes" context="navigatormenu|properties">Properties...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -67,7 +67,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="navigatormenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
index 9a8061da18a5..5fa08b2a48ab 100644
--- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Page Setup</property>
+    <property name="title" translatable="yes" context="pagedialog|PageDialog">Page Setup</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="page">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page</property>
+                <property name="label" translatable="yes" context="pagedialog|page">Page</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="pagedialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
index 50c54bf0b56d..0fe1de492856 100644
--- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="rpt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PageNumberDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Page Numbers</property>
+    <property name="title" translatable="yes" context="pagenumberdialog|PageNumberDialog">Page Numbers</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="pagen">
-                        <property name="label" translatable="yes">_Page N</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|pagen">_Page N</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="pagenofm">
-                        <property name="label" translatable="yes">Page _N of M</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|pagenofm">Page _N of M</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Format</property>
+                <property name="label" translatable="yes" context="pagenumberdialog|label1">Format</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -174,7 +174,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="toppage">
-                        <property name="label" translatable="yes">_Top of Page (Header)</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|toppage">_Top of Page (Header)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -192,7 +192,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="bottompage">
-                        <property name="label" translatable="yes">_Bottom of Page (Footer)</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|bottompage">_Bottom of Page (Footer)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="pagenumberdialog|label2">Position</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -259,9 +259,9 @@
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">Left</item>
-                          <item translatable="yes">Center</item>
-                          <item translatable="yes">Right</item>
+                          <item translatable="yes" context="pagenumberdialog|alignment">Left</item>
+                          <item translatable="yes" context="pagenumberdialog|alignment">Center</item>
+                          <item translatable="yes" context="pagenumberdialog|alignment">Right</item>
                         </items>
                       </object>
                       <packing>
@@ -274,7 +274,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Alignment:</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|alignment_label">_Alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">alignment</property>
                       </object>
@@ -285,7 +285,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="shownumberonfirstpage">
-                        <property name="label" translatable="yes">Show Number on First Page</property>
+                        <property name="label" translatable="yes" context="pagenumberdialog|shownumberonfirstpage">Show Number on First Page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -306,7 +306,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General</property>
+                <property name="label" translatable="yes" context="pagenumberdialog|label3">General</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
deleted file mode 100644
index 06b119805d10..000000000000
--- a/rsc/Executable_rsc.mk
+++ /dev/null
@@ -1,86 +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_Executable_Executable,rsc))
-
-$(eval $(call gb_Executable_use_external,rsc,boost_headers))
-
-$(eval $(call gb_Executable_set_include,rsc,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/rsc/inc \
-))
-
-$(eval $(call gb_Executable_use_sdk_api,rsc))
-
-$(eval $(call gb_Executable_add_defs,rsc,\
-	-DSOLAR \
-))
-
-$(eval $(call gb_Executable_use_libraries,rsc,\
-	comphelper \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),cppu) \
-	i18nlangtag \
-	tl \
-	sal \
-))
-
-$(eval $(call gb_Executable_use_externals,rsc,\
-    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),liblangtag) \
-    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),libxml2) \
-))
-
-$(eval $(call gb_Executable_add_grammars,rsc,\
-	rsc/source/parser/rscyacc \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,rsc,\
-	rsc/source/parser/erscerr \
-	rsc/source/parser/rscdb \
-	rsc/source/parser/rscibas \
-	rsc/source/parser/rscicpx \
-	rsc/source/parser/rscinit \
-	rsc/source/parser/rsckey \
-	rsc/source/parser/rsclex \
-	rsc/source/parser/rscpar \
-	rsc/source/prj/gui \
-	rsc/source/prj/start \
-	rsc/source/res/rscall \
-	rsc/source/res/rscarray \
-	rsc/source/res/rscclass \
-	rsc/source/res/rscclobj \
-	rsc/source/res/rscconst \
-	rsc/source/res/rsccont \
-	rsc/source/res/rscmgr \
-	rsc/source/res/rscrange \
-	rsc/source/res/rscstr \
-	rsc/source/res/rsctop \
-	rsc/source/rsc/rsc \
-	rsc/source/tools/rscchar \
-	rsc/source/tools/rscdef \
-	rsc/source/tools/rschash \
-	rsc/source/tools/rsctools \
-	rsc/source/tools/rsctree \
-))
-
-$(eval $(call gb_Executable_add_cobjects,rsc,\
-	rsc/source/rscpp/cpp1 \
-	rsc/source/rscpp/cpp2 \
-	rsc/source/rscpp/cpp3 \
-	rsc/source/rscpp/cpp4 \
-	rsc/source/rscpp/cpp5 \
-	rsc/source/rscpp/cpp6 \
-))
-
-ifneq ($(OS),WNT)
-$(eval $(call gb_Executable_add_defs,rsc,\
-	-Dunix \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/rsc/Makefile b/rsc/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/rsc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/rsc/README b/rsc/README
deleted file mode 100644
index ed940f727fb0..000000000000
--- a/rsc/README
+++ /dev/null
@@ -1,32 +0,0 @@
-Resource Compiler.
-
-This compiler converts .src files and .hrc equivalents into binary
-.res files.  The basic idea is that this provides a map between
-integer identifiers and the resources: string, pixmap (only the
-file-name), and VCL control properties.
-
-In more detail:
-
-Typically we would have a .hrc file with entries like this:
-
-#define SID_STR_FOO    1234
-
-And then a .src file with some entries like this:
-
-String SID_STR_FOO
-{
-    Text [ en-US ] = "Foo !" ;
-};
-
-This is compiled into a binary resource file, we have many of these
-which live in program/resource/ and then tends to get used in the code
-thus:
-
-String aStr( ResId( SID_STR_FOO ) );
-
-It is important to note that any appearance of hierarchical structure
-in the .src files is in fact a mirage. The file is compiled at root
-into a plain map<integer,resource>.
-
-There is some German documentation about it in a subdirectory called
-[git:rsc/doku].  Seems to be very old (January 1992).
diff --git a/rsc/documentation/rsc.odt b/rsc/documentation/rsc.odt
deleted file mode 100644
index 3b93057a6256..000000000000
--- a/rsc/documentation/rsc.odt
+++ /dev/null
diff --git a/rsc/documentation/rscerror.odt b/rsc/documentation/rscerror.odt
deleted file mode 100644
index effe74db93fb..000000000000
--- a/rsc/documentation/rscerror.odt
+++ /dev/null
diff --git a/rsc/documentation/rscinst.odt b/rsc/documentation/rscinst.odt
deleted file mode 100644
index 8880557ac3b8..000000000000
--- a/rsc/documentation/rscinst.odt
+++ /dev/null
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
deleted file mode 100644
index e141b50340f4..000000000000
--- a/rsc/inc/rscall.h
+++ /dev/null
@@ -1,91 +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_RSC_INC_RSCALL_H
-#define INCLUDED_RSC_INC_RSCALL_H
-
-#include <rsctools.hxx>
-#include <rscerror.h>
-#include <rscdef.hxx>
-#include <rschash.hxx>
-#include <rtl/alloc.h>
-#include <o3tl/typed_flags_set.hxx>
-
-/******************* T y p e s *******************************************/
-typedef char * CLASS_DATA;  // Pointer to the data of a class
-
-/******************* C l a s s e s   F o r w a r d s *********************/
-class RscCompiler;
-class RscTop;
-class RscTypCont;
-
-/******************* G l o b a l   V a r i a b l e s *********************/
-extern OString* pStdParType;
-extern OString* pStdPar1;
-extern OString* pStdPar2;
-extern sal_uInt32       nRefDeep;
-extern sal_uInt32       nRsc_DELTALANG;
-extern sal_uInt32       nRsc_DELTASYSTEM;
-extern AtomContainer*   pHS;
-
-/******************* D e f i n e s ***************************************/
-
-enum class CommandFlags {
-    NONE         = 0x0000,
-    Help         = 0x0001,  // show help
-    NoPrePro     = 0x0002,  // no preprocessor
-    NoSyntax     = 0x0004,  // no parsing
-    NoLink       = 0x0008,  // no linking
-    NoResFile    = 0x0010,  // do not create .res file
-    Define       = 0x0020,  // definitions stated
-    Include      = 0x0040,  // include path extended
-    Preload      = 0x0200,  // preload all resources
-    SrsDefault   = 0x1000,  // always wrote the default
-    NoSysResTest = 0x2000   // do not check the correctness of (bmp, ico, cur)
-};
-namespace o3tl {
-    template<> struct typed_flags<CommandFlags> : is_typed_flags<CommandFlags, 0x327f> {};
-}
-
-/******************* S t r u c t s ***************************************/
-struct RSCINST
-{
-    RscTop *    pClass;
-    CLASS_DATA  pData;
-
-                RSCINST(){ pClass = nullptr; pData = nullptr; }
-                RSCINST( RscTop * pCl, CLASS_DATA pClassData )
-                    {
-                        pClass = pCl;
-                        pData = pClassData;
-                    }
-    bool        IsInst() const { return( pData != nullptr ); }
-};
-
-/********************** S U B I N F O S T R U C T ************************/
-struct SUBINFO_STRUCT
-{
-    RscId        aId;    // resource identifier
-};
-
-/******************* F u n c t i o n *************************************/
-void InitRscCompiler();
-
-#endif // INCLUDED_RSC_INC_RSCALL_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
deleted file mode 100644
index 01a5ddf8795e..000000000000
--- a/rsc/inc/rscarray.hxx
+++ /dev/null
@@ -1,102 +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_RSC_INC_RSCARRAY_HXX
-#define INCLUDED_RSC_INC_RSCARRAY_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rsctop.hxx>
-
-class RscEnum;
-
-class RscInstNode : public IdNode
-{
-    sal_uInt32  nTypeId;
-protected:
-    using NameNode::Search;
-public:
-    RSCINST aInst;
-    RscInstNode( sal_uInt32 nId );
-    virtual ~RscInstNode() override;
-    virtual sal_uInt32  GetId() const override;
-    RscInstNode *   Left() const { return static_cast<RscInstNode *>(pLeft); };
-    RscInstNode *   Right() const{ return static_cast<RscInstNode *>(pRight); };
-    RscInstNode *   Search( sal_uInt32 nId ) const
-                        {
-                            return static_cast<RscInstNode *>(IdNode::Search( nId ));
-                        }
-};
-
-struct RscArrayInst
-{
-    RscInstNode *   pNode;
-};
-
-/* The tree is sorted against its enum value, not against its HashId */
-class RscArray : public RscTop
-{
-protected:
-    RscEnum *       pTypeClass; // type of entries
-    const sal_uInt32 nOffInstData;// Offset of self instance data
-    const sal_uInt32 nSize;      // size of this class instance data with super class
-    void            WriteSrcArray( const RSCINST & rInst, FILE * fOutput,
-                                   RscTypCont * pTC, sal_uInt32 nTab, const char * );
-public:
-                    RscArray( Atom nId, RESOURCE_TYPE nTypId,
-                              RscTop * pSuper, RscEnum * pTypeClass );
-                    virtual ~RscArray() override;
-
-    virtual RscTop *    GetTypeClass() const override;
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
-    void            Destroy( const RSCINST & rInst ) override;
-    virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
-                                 RscTop * pCreateClass,
-                                 RSCINST * pGetInst ) override;
-    virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
-                                 RscTop * pCreateClass,
-                                 RSCINST * pGetInst ) override;
-
-                    // gives the size of the class in bytes
-    sal_uInt32      Size() const override { return nSize; }
-
-    bool            IsConsistent( const RSCINST & rInst ) override;
-    virtual void    SetToDefault( const RSCINST & rInst ) override;
-    bool            IsDefault( const RSCINST & rInst ) override;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-
-    virtual void    WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
-                                    RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & aId, const char * ) override;
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-class RscLangArray : public RscArray
-{
-public:
-                    RscLangArray( Atom nId, RESOURCE_TYPE nTypId,
-                                  RscTop * pSuper, RscEnum * pTypeClass );
-};
-
-#endif // INCLUDED_RSC_INC_RSCARRAY_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
deleted file mode 100644
index 382006c39c5d..000000000000
--- a/rsc/inc/rscclass.hxx
+++ /dev/null
@@ -1,104 +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_RSC_INC_RSCCLASS_HXX
-#define INCLUDED_RSC_INC_RSCCLASS_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rsctop.hxx>
-
-class RscClass : public RscTop
-{
-protected:
-    struct RscClassInst
-    {
-        sal_uLong       nVarDflt;
-    };
-    struct VARTYPE_STRUCT
-    {
-        Atom            nVarName;   // variable name
-        RSCVAR          nVarType;   // variable type
-        sal_uInt32      nMask;      // bit mask
-        sal_uInt32      nOffset;    // start of instance data
-        RscTop *        pClass;     // class
-        CLASS_DATA      pDefault;   // pointer to default data
-        Atom            nDataBaseName;//name of foreign data area
-    };
-    sal_uInt32          nSuperSize; // size of super class instance data
-    sal_uInt32          nSize;      // size of this class instance data
-                                    // with super class
-    sal_uInt32          nEntries;   // entries in pVarTypeList
-    VARTYPE_STRUCT *    pVarTypeList;   // variable list
-    RSCINST             GetInstData( CLASS_DATA pData, sal_uInt32 nEle,
-                                     bool bGetCopy = false );
-    CLASS_DATA          GetDfltData( sal_uInt32 nEle );
-    bool                IsDflt( CLASS_DATA pData, sal_uInt32 nEle );
-    bool                IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle );
-    void                SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle,
-                                    bool bSet );
-public:
-                    RscClass( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuperCl );
-                    virtual ~RscClass() override;
-
-    void            Pre_dtor() override;
-    ERRTYPE         SetVariable( Atom nVarName, RscTop * pClass,
-                                 RSCINST * pDflt = nullptr,
-                                 RSCVAR nVarType = RSCVAR::NONE, sal_uInt32 nMask = 0,
-                                 Atom nDataBaseName = InvalidAtom ) override;
-    RSCINST         GetVariable( const RSCINST & rInst, Atom nVarName,
-                                 const RSCINST & rInitInst,
-                                 bool bInitDflt = false,
-                                 RscTop * pCreateClass = nullptr ) override;
-    RSCINST         GetCopyVar( const RSCINST & rInst, Atom nVarName ) override;
-
-                    // gives the class size in bytes
-    sal_uInt32      Size() const override { return nSize; }
-
-    bool            IsConsistent( const RSCINST & rInst ) override;
-    void            SetToDefault( const RSCINST & rInst ) override;
-    bool            IsDefault( const RSCINST & rInst ) override;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-    void            SetDefault( const RSCINST & rData, Atom nVarId ) override;
-    using RscTop::GetDefault;
-    RSCINST         GetDefault( Atom nVarId ) override;
-
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
-    void            Destroy( const RSCINST & rInst ) override;
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem,
-                                 RscTypCont * pTC, sal_uInt32 );
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-class RscTupel : public RscClass
-{
-public:
-    RscTupel( Atom nId, RESOURCE_TYPE nTypId );
-    RSCINST         GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RSCINST & rInitInst ) override;
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-};
-
-#endif // INCLUDED_RSC_INC_RSCCLASS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
deleted file mode 100644
index 61e350773d7d..000000000000
--- a/rsc/inc/rscclobj.hxx
+++ /dev/null
@@ -1,90 +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_RSC_INC_RSCCLOBJ_HXX
-#define INCLUDED_RSC_INC_RSCCLOBJ_HXX
-
-#include <rsctree.hxx>
-#include <rscdef.hxx>
-#include <rscall.h>
-
-/******************* O b j N o d e ***************************************/
-class ObjNode : public IdNode
-{
-    RscId       aRscId;         // resource ID
-    CLASS_DATA  pRscObj;        // pointer to a resourceobject
-    RscFileTab::Index lFileKey;
-protected:
-    using NameNode::Search;
-
-public:
-    using NameNode::Insert;
-
-                ObjNode( const RscId & rId, CLASS_DATA pData, RscFileTab::Index lKey );
-    ObjNode *   DelObjNode( RscTop * pClass, RscFileTab::Index lFileKey );
-    sal_uInt32  GetId() const override;
-    const RscId& GetRscId() const { return aRscId; }
-    RscFileTab::Index GetFileKey() const { return lFileKey; };
-    ObjNode*    Search( const RscId &rName ) const //< search the index in the b-tree
-                    {
-                        return static_cast<ObjNode *>(IdNode::Search( rName.GetNumber() ));
-                    }
-    bool        Insert( ObjNode* pTN ) //< insert a new node in the b-tree
-
-                    {
-                        return IdNode::Insert( static_cast<IdNode *>(pTN) );
-                    }
-    CLASS_DATA  GetRscObj() const//< get the Object from this Node
-
-                    {
-                        return pRscObj;
-                    }
-    bool        IsConsistent();
-};
-
-/******************* R e f N o d e ***************************************/
-class RefNode : public IdNode
-{
-    Atom        nTypNameId; // index of a Name in a hashtabel
-protected:
-    using NameNode::Search;
-
-public:
-    using NameNode::Insert;
-
-    ObjNode*    pObjBiTree; // pointer to object tree
-                RefNode( Atom nTyp );
-    sal_uInt32  GetId() const override;
-    void        Insert( RefNode* pTN ) //< insert a new node in the b-tree
-                    {
-                        IdNode::Insert( static_cast<IdNode *>(pTN) );
-                    }
-    bool        PutObjNode( ObjNode * pPutObject );
-
-                // insert new node in b-tree pObjBiTree
-    ObjNode *   GetObjNode( const RscId &rRscId );
-
-    ObjNode *   GetObjNode() const
-                    {
-                        return pObjBiTree;
-                    }
-};
-
-#endif // INCLUDED_RSC_INC_RSCCLOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
deleted file mode 100644
index a9ce5040a168..000000000000
--- a/rsc/inc/rscconst.hxx
+++ /dev/null
@@ -1,93 +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_RSC_INC_RSCCONST_HXX
-#define INCLUDED_RSC_INC_RSCCONST_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rsctop.hxx>
-#include <tools/resid.hxx>
-
-class RscEnum : public RscTop
-{
-    struct RscEnumInst
-    {
-        sal_uInt32  nValue; // constant position in the array
-        bool        bDflt;  // is default
-    };
-    struct VarEle
-    {
-        Atom    nId;    // constant name
-        sal_Int32   lValue; // constant value
-    };
-    VarEle *        pVarArray;  // pointer to the field with constant
-    sal_uInt32      nEntries;   // number of entries in field
-public:
-                    RscEnum( Atom nId, RESOURCE_TYPE nTypId );
-                    virtual ~RscEnum() override;
-                    // sets the allowed values
-    void            SetConstant( Atom nVarName, sal_Int32 lValue );
-    bool            GetConstValue( Atom nConstId, sal_Int32 * pVal ) const;
-    bool            GetValueConst( sal_Int32 nValue, Atom  * pConstId ) const;
-    sal_uInt32      GetConstPos( Atom nConstId );
-
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
-    sal_uInt32      Size() const override { return ALIGNED_SIZE(sizeof(RscEnumInst)); }
-
-    virtual void    SetToDefault( const RSCINST & rInst ) override
-                    {
-                        reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt = true;
-                    }
-    bool            IsDefault( const RSCINST & rInst ) override
-                    {
-                        return reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt;
-                    };
-                    // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-
-    ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) override;
-    ERRTYPE         SetNumber( const RSCINST & rInst, sal_Int32 nValue ) override;
-    ERRTYPE         GetConst( const RSCINST & rInst, Atom * ) override;
-    ERRTYPE         GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) override;
-    void            WriteSrc( const RSCINST &rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-class RscNameTable;
-
-sal_uInt32 GetLangId( const OString& rLang);
-
-class RscLangEnum : public RscEnum
-{
-    long mnLangId;
-public:
-    RscLangEnum();
-
-    void Init( RscNameTable& rNames );
-
-    Atom AddLanguage( const char* pLang, RscNameTable& rNames );
-};
-
-#endif // INCLUDED_RSC_INC_RSCCONST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
deleted file mode 100644
index c1cf83700a11..000000000000
--- a/rsc/inc/rsccont.hxx
+++ /dev/null
@@ -1,120 +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_RSC_INC_RSCCONT_HXX
-#define INCLUDED_RSC_INC_RSCCONT_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rsctop.hxx>
-
-struct ENTRY_STRUCT
-{
-    RscId   aName;
-    RSCINST aInst;
-    void Create(){ aName.Create(); aInst = RSCINST(); }
-    void Destroy();
-};
-struct RscBaseContInst
-{
-    sal_uInt32          nEntries;
-    ENTRY_STRUCT *  pEntries;
-    bool            bDflt;
-};
-
-class RscBaseCont : public RscTop
-{
-protected:
-    RscTop *        pTypeClass; // type of entries
-    bool            bNoId;      // whether there is no identifier
-    const sal_uInt32 nOffInstData;// offset of own instance data
-    const sal_uInt32 nSize;      // size of this class and super classes instance data
-    static void     DestroyElements( RscBaseContInst * pClassData );
-    RSCINST         SearchElePos( const RSCINST & rInst, const RscId & rEleName,
-                                  RscTop * pClass, sal_uInt32 nPos );
-protected:
-    void            ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
-                                  RscTypCont * pTC, sal_uInt32 nTab, const char * );
-    ERRTYPE         ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                                 RscTypCont * pTC, sal_uInt32 );
-public:
-                    RscBaseCont( Atom nId, RESOURCE_TYPE nTypId,
-                                 bool bNoId );
-                    virtual ~RscBaseCont() override;
-    void            SetTypeClass( RscTop * pClass )
-                        {
-                            pTypeClass = pClass;
-                        }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
-    void            Destroy( const RSCINST & rInst ) override;
-    ERRTYPE         GetElement( const RSCINST & rInst, const RscId & rEleName,
-                                RscTop * pCreateClass, const RSCINST & rCreateInst,
-                                RSCINST * pGetInst ) override;
-    RSCINST         SearchEle( const RSCINST & rInst, const RscId & rEleName,
-                               RscTop * pClass ) override;
-    sal_uInt32          GetCount( const RSCINST & rInst ) override;
-    RSCINST         GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) override;
-    ERRTYPE         MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
-                                sal_uInt32 nSourcePos ) override;
-    virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RscId & rRscId) override;
-    SUBINFO_STRUCT  GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) override;
-    ERRTYPE         SetString( const RSCINST &, const char * pStr ) override;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 lValue ) override;
-    ERRTYPE         SetBool( const RSCINST & rInst, bool bValue ) override;
-    ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) override;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
-
-                    // returns the class size in bytes
-    sal_uInt32      Size() const override { return nSize; }
-
-    bool            IsConsistent( const RSCINST & rInst ) override;
-    void            SetToDefault( const RSCINST & rInst ) override;
-    bool            IsDefault( const RSCINST & rInst ) override;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-
-    void            Delete( const RSCINST & rInst, RscTop * pClass,
-                            const RscId & rId ) override;
-    void            DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) override;
-
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-class RscContWriteSrc : public RscBaseCont
-{
-public:
-                    RscContWriteSrc( Atom nId, RESOURCE_TYPE nTypId );
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-};
-
-class RscCont : public RscContWriteSrc
-{
-public:
-                    RscCont( Atom nId, RESOURCE_TYPE nTypId );
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-#endif // INCLUDED_RSC_INC_RSCCONT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
deleted file mode 100644
index da235e8bc0e3..000000000000
--- a/rsc/inc/rscdb.hxx
+++ /dev/null
@@ -1,112 +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_RSC_INC_RSCDB_HXX
-#define INCLUDED_RSC_INC_RSCDB_HXX
-
-#include <rscall.h>
-#include <rsckey.hxx>
-#include <rscconst.hxx>
-#include <rscrange.hxx>
-#include <rscstr.hxx>
-#include <rscarray.hxx>
-#include <rscdef.hxx>
-
-#include <vector>
-#include <map>
-
-class RscError;
-class RscTupel;
-class RscCont;
-class RscCmdLine;
-enum class MenuItemBits : sal_Int16;
-enum class MapUnit;
-
-struct WriteRcContext
-{
-    FILE *         fOutput;
-    OString        aOutputRc;
-    OString        aOutputSysList;
-    RscCmdLine*    pCmdLine;
-};
-
-class RscTypCont
-{
-    rtl_TextEncoding    nSourceCharSet;
-    RSCBYTEORDER_TYPE   nByteOrder;         // Intel or
-    OString             aLanguage;          // output language
-    std::vector< sal_uInt32 > aLangFallbacks;   // language fallback list (entry 0 is language itself)
-    sal_uLong           nFilePos;           // position in file (MTF)
-    sal_uInt32          nPMId;              // unique id for PR-resource file
-                                            // must be greater that RSC_VERSIONCONTROL_ID
-    RscTop  *           pRoot;              // pointer to the root of type tree
-    RSCINST             aVersion;           // version control instance
-
-    ::std::vector< RscTop* >
-                        aBaseLst;           // list of simple resource class
-
-    void        Init();         // initializes classes and tables
-    void        SETCONST( RscEnum *, const char *, sal_uInt32 );
-    RscEnum *   InitFieldUnitsType();
-    RscTupel *  InitStringLongTupel();
-    static RscCont  *  InitStringLongTupelList( RscTupel * pStringLongTupel );
-    RscArray *  InitLangStringLongTupelList( RscCont * pStrLongTupelLst );
-
-    RscTop *    InitClassMgr();
-    RscTop *    InitClassString( RscTop * pSuper );
-
-public:
-    RscLongEnumRange    aEnumLong;
-    RscString           aString;
-    RscLangEnum         aLangType;
-    RscLangArray        aLangString;
-
-    RscError*           pEH;        // error handler
-    RscNameTable        aNmTb;      // name table
-    RscFileTab          aFileTab;   // file name table
-    CommandFlags        nFlags;
-    std::map<sal_uInt64, sal_uLong> aIdTranslator; // map resources types and ids to an id (under PM9 or to a file position (MTF)
-
-    RscTypCont( RscError *, RSCBYTEORDER_TYPE, CommandFlags nFlags );
-    ~RscTypCont();
-
-    Atom AddLanguage( const char* );
-    bool              IsSrsDefault() const
-                          { return bool(nFlags & CommandFlags::SrsDefault); }
-    OString           ChangeLanguage(const OString & rNewLang);
-    const std::vector< sal_uInt32 >& GetFallbacks() const
-                          { return aLangFallbacks; }
-
-    RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; }
-    rtl_TextEncoding  GetSourceCharSet() const { return nSourceCharSet; }
-    void              SetSourceCharSet( rtl_TextEncoding aCharSet )
-                          {
-                              nSourceCharSet = aCharSet;
-                          }
-                      // deletes all resource objects of this file
-    void              Delete( RscFileTab::Index lFileKey );
-    ERRTYPE           WriteRc( WriteRcContext& rContext );
-    void              WriteSrc( FILE * fOutput, RscFileTab::Index nFileIndex );
-    void              PutTranslatorKey( sal_uInt64 nKey );
-    void              IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
deleted file mode 100644
index 9ca0c8483fab..000000000000
--- a/rsc/inc/rscdef.hxx
+++ /dev/null
@@ -1,282 +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_RSC_INC_RSCDEF_HXX
-#define INCLUDED_RSC_INC_RSCDEF_HXX
-
-#include <sal/config.h>
-
-#include <tools/solar.h>
-#include <tools/unqidx.hxx>
-#include <rsctree.hxx>
-#include <rtl/strbuf.hxx>
-#include <vector>
-
-/****************** C L A S S E S ****************************************/
-class RscExpression;
-class RscFileTab;
-class RscDefine;
-
-/*********** R s c E x p r e s s i o n ***********************************/
-#define RSCEXP_LONG     0
-#define RSCEXP_EXP      1
-#define RSCEXP_DEF      2
-#define RSCEXP_NOTHING  3
-
-class RscExpType
-{
-public:
-    union
-    {
-        RscExpression * pExp;
-        RscDefine     * pDef;
-        struct
-        {
-             short           nHi;
-             unsigned short  nLo;
-        } aLong;
-    } aExp;
-    char cType;
-    bool cUnused;
-    bool IsNumber()    const { return( RSCEXP_LONG     == cType ); }
-    bool IsExpression()const { return( RSCEXP_EXP      == cType ); }
-    bool IsDefinition()const { return( RSCEXP_DEF      == cType ); }
-    bool IsNothing()   const { return( RSCEXP_NOTHING  == cType ); }
-    void SetLong( sal_Int32 lValue )
-    {
-        aExp.aLong.nHi = (short)(lValue >> 16);
-        aExp.aLong.nLo = (unsigned short)lValue;
-        cType = RSCEXP_LONG;
-    }
-    sal_Int32 GetLong() const
-    {
-        return aExp.aLong.nLo | ((sal_uInt32)aExp.aLong.nHi << 16);
-    }
-    bool Evaluate( sal_Int32 * pValue ) const;
-    void AppendMacro( OStringBuffer & ) const;
-};
-
-/*********** R s c I d ***************************************************/
-class RscId
-{
-    static      bool bNames;// if false, only count name operation
-public:
-    RscExpType  aExp;       // number, define or expression
-    sal_Int32   GetNumber() const;
-    void    Create( const RscExpType & rExpType );
-    void    Create(){ aExp.cType = RSCEXP_NOTHING; }
-
-            RscId() { Create();                         }
-
-            RscId( RscDefine * pEle );
-            RscId( sal_Int32 lNumber )
-            {
-                aExp.cUnused = false;
-                aExp.SetLong( lNumber );
-            }
-
-            RscId( const RscExpType & rExpType )
-                    { Create( rExpType );               }
-
-            void Destroy();
-
-            ~RscId() { Destroy(); }
-
-            RscId( const RscId& rRscId );
-
-            RscId& operator = ( const RscId& rRscId );
-
-    static void SetNames( bool bSet = true );
-    OString GetName()  const;   // returns the define
-    bool    operator <  ( const RscId& rRscId ) const;
-    bool    operator >  ( const RscId& rRscId ) const;
-    bool    operator == ( const RscId& rRscId ) const;
-    bool    operator <=  ( const RscId& rRscId ) const
-                { return !(operator > ( rRscId )); }
-    bool    operator >= ( const RscId& rRscId ) const
-                { return !(operator < ( rRscId )); }
-    bool    IsId() const { return !aExp.IsNothing(); }
-};
-
-typedef ::std::vector< RscDefine* > RscSubDefList;
-
-/*********** R s c E x p r e s s i o n ***********************************/
-class RscExpression
-{
-friend class RscFileTab;
-    char        cOperation;
-    RscExpType  aLeftExp;
-    RscExpType  aRightExp;
-public:
-                RscExpression( RscExpType aLE, char cOp,
-                               RscExpType aRE );
-                ~RscExpression();
-    bool        Evaluate( sal_Int32 * pValue );
-    OString     GetMacro();
-};
-
-/********************** R S C F I L E ************************************/
-class RscDepend;
-
-typedef ::std::vector< RscDepend* > RscDependList;
-
-class RscDefTree
-{
-    RscDefine * pDefRoot;
-public:
-    static bool Evaluate( RscDefine * pDef );
-                RscDefTree(){ pDefRoot = nullptr; }
-                ~RscDefTree();
-    void        Remove();
-    RscDefine * Search( const char * pName );
-    void        Insert( RscDefine * pDef );
-    void        Remove( RscDefine * pDef );
-};
-
-class RscFile;
-
-class RscFileTab : public UniqueIndex<RscFile>
-{
-public:
-    using UniqueIndex<RscFile>::Index;
-    using UniqueIndex<RscFile>::IndexNotFound;
-
-private:
-    RscDefTree aDefTree;
-    Index       Find(const OString& rName);
-public:
-                RscFileTab();
-                ~RscFileTab();
-
-    RscDefine * FindDef( const char * );
-    RscDefine * FindDef(const OString& rStr)
-                {
-                    return FindDef(rStr.getStr());
-                }
-
-    bool        Depend( Index lDepend, Index lFree );
-    bool        TestDef( Index lFileKey, size_t lPos,
-                         const RscDefine * pDefDec );
-    bool        TestDef( Index lFileKey, size_t lPos,
-                         const RscExpression * pExpDec );
-
-    RscDefine * NewDef( Index lKey, const OString& rDefName,
-                        sal_Int32 lId );
-    RscDefine * NewDef( Index lKey, const OString& rDefName,
-                        RscExpression * );
-
-           // deletes all defines defined in this file
-    void        DeleteFileContext( Index lKey );
-    Index       NewCodeFile(const OString& rName);
-    Index       NewIncFile(const OString& rName, const OString& rPath);
-    RscFile *   GetFile( Index lFileKey ){ return Get( lFileKey ); }
-};
-
-class RscDepend
-{
-    RscFileTab::Index   lKey;
-public:
-                RscDepend( RscFileTab::Index lIncKey ){ lKey = lIncKey; };
-    RscFileTab::Index   GetFileKey(){ return lKey; }
-};
-
-class RscDefineList
-{
-friend class RscFile;
-friend class RscFileTab;
-private:
-    RscSubDefList   maList;
-                // pExpression always belongs to the list
-    RscDefine * New( RscFileTab::Index lFileKey, const OString& rDefName,
-                     sal_Int32 lDefId, size_t lPos );
-    RscDefine * New( RscFileTab::Index lFileKey, const OString& rDefName,
-                     RscExpression * pExpression, size_t lPos );
-    bool        Remove();
-    size_t      GetPos( RscDefine* item )
-                    {
-                        for ( size_t i = 0, n = maList.size(); i < n; ++i )
-                            if ( maList[ i ] == item )
-                                return i;
-                        return size_t(-1);
-                    }
-};
-
-// table containing all file names
-class RscFile
-{
-friend class RscFileTab;
-    bool            bIncFile;   // whether it is an include file
-public:
-    bool            bLoaded;    // whether the file is loaded
-    bool            bScanned;   // whether the file searches for include
-    OString         aFileName;  // file name
-    OString         aPathName;  // file path and name
-    RscDefineList   aDefLst;    // list of defines
-    RscDependList   aDepLst;    // list of depend
-
-                    RscFile();
-                    ~RscFile();
-    void            InsertDependFile( RscFileTab::Index lDepFile );
-    bool            Depend( RscFileTab::Index lDepend, RscFileTab::Index lFree );
-    void            SetIncFlag(){ bIncFile = true; };
-    bool            IsIncFile(){  return bIncFile; };
-};
-
-/*********** R s c D e f i n e *******************************************/
-class RscDefine : public NameNode
-{
-friend class RscFileTab;
-friend class RscDefineList;
-friend class RscDefTree;
-friend class RscExpression;
-friend class RscId;
-
-    RscFileTab::Index lFileKey;   // file the define belongs to
-    sal_uInt32  nRefCount;  // reference count to this object
-    sal_Int32   lId;        // identifier
-    RscExpression * pExp;   // expression
-    OString     m_aName;
-
-    virtual COMPARE Compare( const NameNode * ) const override;
-    virtual COMPARE Compare( const void * ) const override;
-
-public:
-    RscDefine( RscFileTab::Index lFileKey, const OString& rDefName,
-                           sal_Int32 lDefId );
-    virtual ~RscDefine() override;
-
-protected:
-    RscDefine( RscFileTab::Index lFileKey, const OString& rDefName,
-                           RscExpression * pExpression );
-
-    void          IncRef() { nRefCount++; }
-    void          DecRef();
-    void          DefineToNumber();
-
-public:
-    RscFileTab::Index GetFileKey() const { return lFileKey; }
-    void           Evaluate();
-    sal_Int32      GetNumber() const  { return lId;      }
-    RscDefine*     Search( const char * ) const;
-    const OString& GetName() const { return m_aName; }
-};
-
-
-#endif // INCLUDED_RSC_INC_RSCDEF_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
deleted file mode 100644
index 11a498e96756..000000000000
--- a/rsc/inc/rscerror.h
+++ /dev/null
@@ -1,149 +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 <sal/types.h>
-
-#ifndef INCLUDED_RSC_INC_RSCERROR_H
-#define INCLUDED_RSC_INC_RSCERROR_H
-
-// Return errors
-#define ERR_OK              0xFFFFFFFF
-
-#define ERR_ERROR           0x0100
-#define ERR_UNKNOWN_METHOD  0x0101  // Return
-#define ERR_OPENFILE        0x0102  // Return
-#define ERR_NOCHAR          0x0103  // Return
-#define ERR_NORSCINST       0x0104  // Return
-#define ERR_USAGE           0x0105
-#define ERR_NOINPUT         0x0106  // Return
-#define ERR_UNKNOWNSW       0x0107
-#define ERR_REFTODEEP       0x0108  // Return
-#define ERR_FILEFORMAT      0x0109  // Return
-#define ERR_FILESIZE        0x010A  // Return
-#define ERR_RENAMEFILE      0x010B  // Return
-#define ERR_NOIMAGE         0x010C  // Return
-
-#define ERR_RSCRANGE        0x0200  // Return
-#define ERR_RSCRANGE_OUTDEFSET  (ERR_RSCRANGE +1 )
-
-#define ERR_RSCENUM         0x0210  // Return
-#define ERR_RSCFLAG         0x0220  // Return
-#define ERR_RSCCONT         0x0240  // Return
-#define ERR_CONT_INVALIDPOS     (ERR_RSCCONT +1 ) // Return
-#define ERR_CONT_INVALIDTYPE    (ERR_RSCCONT +2 ) // Return
-
-#define ERR_RSCINST         0x0260
-#define ERR_RSCINST_NOVARNAME   (ERR_RSCINST +1 ) // Return
-#define ERR_RSCINST_RESERVEDNAME (ERR_RSCINST +2 ) // Return
-
-#define ERR_YACC            0x0280
-#define ERR_DOUBLEID            (ERR_YACC    +1 )
-#define ERR_FALSETYPE           (ERR_YACC    +2 )
-#define ERR_NOVARIABLENAME      (ERR_YACC    +3 )
-#define ERR_USHORTRANGE         (ERR_YACC    +4 )
-#define ERR_IDRANGE             (ERR_YACC    +5 )
-#define ERR_NOCOPYOBJ           (ERR_YACC    +6 )
-#define ERR_REFNOTALLOWED       (ERR_YACC    +7 ) // Return
-#define ERR_DOUBLEDEFINE        (ERR_YACC    +8 )
-#define ERR_COPYNOTALLOWED      (ERR_YACC    +9 )
-#define ERR_IDEXPECTED          (ERR_YACC    +10)
-#define ERR_ZERODIVISION        (ERR_YACC    +11)
-#define ERR_PRAGMA              (ERR_YACC    +12)
-#define ERR_DECLAREDEFINE       (ERR_YACC    +13)
-#define ERR_NOTUPELNAME         (ERR_YACC    +14)
-#define ERR_NOTYPE              (ERR_YACC    +15)
-
-#define ERR_RSCARRAY         0x02A0  // Return
-#define ERR_ARRAY_INVALIDINDEX  (ERR_RSCARRAY +1 ) // Return
-
-#define ERR_ERROREND                0x1000
-
-#define ERR_WARNINGSTART        0x1001
-#define WRN_LOCALID             (ERR_WARNINGSTART +1 )
-#define WRN_GLOBALID            (ERR_WARNINGSTART +2 )
-#define WRN_SUBINMEMBER         (ERR_WARNINGSTART +3 )
-#define WRN_CONT_NOID           (ERR_WARNINGSTART +4 )
-#define WRN_STR_REFNOTFOUND     (ERR_WARNINGSTART +5 )
-#define WRN_MGR_REFNOTFOUND     (ERR_WARNINGSTART +6 )
-#define WRN_CONT_DOUBLEID       (ERR_WARNINGSTART +7 )
-
-#define ERR_WARNINGEND      0x2000
-
-class ERRTYPE
-{
-    sal_uInt32  nError;
-public:
-    ERRTYPE()                { nError = ERR_OK; }
-    ERRTYPE( sal_uInt32 nErr )   { nError = nErr; }
-    ERRTYPE( const ERRTYPE & ) = default;
-    ERRTYPE& operator = ( const ERRTYPE & rError );
-    sal_uInt32 GetError() const { return nError; }
-    bool IsError() const     { return nError <= ERR_ERROREND; }
-    bool IsOk() const        { return !IsError(); }
-    bool IsWarning() const   { return nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND;}
-    void Clear()             { nError = ERR_OK; }
-};
-
-// Rsc Error
-class RscId;
-class RscTop;
-
-enum RscVerbosity
-{
-    RscVerbositySilent = 0,
-    RscVerbosityNormal = 1,
-    RscVerbosityVerbose = 2
-};
-
-class RscError final
-{
-    FILE *  fListing;
-    RscVerbosity m_verbosity;
-
-    void WriteError( const ERRTYPE& rError, const char * pMessage );
-    void StdLstOut( const char * pStr );
-    void StdLstErr( const char * pStr );
-    void ErrorFormat( const ERRTYPE& rError, RscTop * pClass,
-                      const RscId & aId );
-public:
-
-    sal_uInt32  nErrors;    // Number of errors
-                    RscError( RscVerbosity _verbosity )
-                        {
-                            fListing = nullptr;
-                            nErrors = 0;
-                            m_verbosity = _verbosity;
-                        }
-    void            SetListFile( FILE * fList ){ fListing = fList; }
-    FILE *          GetListFile(){ return fListing; }
-    RscVerbosity    GetVerbosity() const { return m_verbosity; }
-    void            StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
-    static void     StdErr( const char * );
-    void            LstOut( const char * );
-    void            Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
-                           const char * pMessage = nullptr );
-    // The error should only happen in compile mode,
-    // the program will terminated with exit()
-    void            FatalError( const ERRTYPE& rError, const RscId &aId,
-                                const char * pMessage = nullptr );
-};
-
-#endif // INCLUDED_RSC_INC_RSCERROR_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
deleted file mode 100644
index 898969e7c14c..000000000000
--- a/rsc/inc/rschash.hxx
+++ /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 .
- */
-#ifndef INCLUDED_RSC_INC_RSCHASH_HXX
-#define INCLUDED_RSC_INC_RSCHASH_HXX
-
-#include <sal/types.h>
-#include <rtl/string.hxx>
-#include <unordered_map>
-
-typedef sal_uInt32 Atom;
-
-#define InvalidAtom Atom( ~0 )
-
-class AtomContainer
-{
-    Atom m_nNextID;
-    std::unordered_map< OString, Atom, OStringHash > m_aStringToID;
-    std::unordered_map< Atom, OString > m_aIDToString;
-
-    public:
-    AtomContainer();
-    ~AtomContainer();
-
-    Atom getID( const OString& rStr, bool bOnlyIfExists = false );
-    const OString& getString( Atom nAtom );
-
-};
-
-#endif // INCLUDED_RSC_INC_RSCHASH_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
deleted file mode 100644
index 4ca2812ff69d..000000000000
--- a/rsc/inc/rsckey.hxx
+++ /dev/null
@@ -1,54 +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_RSC_INC_RSCKEY_HXX
-#define INCLUDED_RSC_INC_RSCKEY_HXX
-
-// class forwards
-class RscTop;
-
-#include <rscall.h>
-
-typedef struct
-{
-    Atom            nName;
-    sal_uInt32      nTyp;
-    sal_IntPtr      yylval;
-} KEY_STRUCT;
-
-class RscNameTable
-{
-    bool            bSort;      // whether it must be sorted for each insertion
-    sal_uInt32      nEntries;   // number of entries
-    KEY_STRUCT *    pTable;
-public:
-            RscNameTable();
-            ~RscNameTable();
-    void    SetSort( bool bSorted = true );
-    Atom    Put( Atom nName, sal_uInt32 nTyp, sal_IntPtr nValue );
-    Atom    Put( const char * pName, sal_uInt32 nTyp, sal_IntPtr nValue );
-    Atom    Put( const char * pName, sal_uInt32 nTyp );
-    void    Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass );
-
-            // if true, it was found
-    bool    Get( Atom nName, KEY_STRUCT * pEle );
-};
-
-#endif // INCLUDED_RSC_INC_RSCKEY_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx
deleted file mode 100644
index 307e6bc8ea7f..000000000000
--- a/rsc/inc/rsclex.hxx
+++ /dev/null
@@ -1,115 +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_RSC_INC_RSCLEX_HXX
-#define INCLUDED_RSC_INC_RSCLEX_HXX
-
-#include <rtl/strbuf.hxx>
-#include <rtl/string.hxx>
-#include <unordered_set>
-
-// a buffer for unique strings
-class StringContainer
-{
-    std::unordered_set< OString, OStringHash >      m_aStrings;
-public:
-    StringContainer() {}
-
-    const char* putString( const char* pString );
-};
-
-
-enum MODE_ENUM { MODE_MODELESS, MODE_APPLICATIONMODAL, MODE_SYSTEMMODAL };
-
-enum JUSTIFY_ENUM { JUST_CENTER, JUST_RIGHT, JUST_LEFT };
-
-enum SHOW_ENUM { SHOW_NORMAL, SHOW_MINIMIZED, SHOW_MAXIMIZED };
-
-enum ENUMHEADER { HEADER_NAME, HEADER_NUMBER };
-
-enum REF_ENUM { TYPE_NOTHING, TYPE_REF, TYPE_COPY };
-
-struct RSCHEADER {
-    RscTop *    pClass;
-    RscExpType  nName1;
-    REF_ENUM    nTyp;
-    RscTop *    pRefClass;
-    RscExpType  nName2;
-};
-
-/************** O b j e c t s t a c k ************************************/
-struct Node
-{
-    Node*   pPrev;
-    RSCINST aInst;
-    Node() { pPrev = nullptr; }
-};
-
-class ObjectStack
-{
-    private:
-        Node* pRoot;
-    public:
-
-        ObjectStack ()   { pRoot = nullptr; }
-
-        const RSCINST & Top  ()     { return pRoot->aInst; }
-        bool        IsEmpty()   { return( pRoot == nullptr ); }
-        void        Push( RSCINST aInst )
-                    {
-                        Node* pTmp;
-
-                        pTmp         = pRoot;
-                        pRoot        = new Node;
-                        pRoot->aInst = aInst;
-                        pRoot->pPrev = pTmp;
-                    }
-        void        Pop()
-                    {
-                       Node* pTmp;
-
-                       pTmp  = pRoot;
-                       pRoot = pTmp->pPrev;
-                       delete pTmp;
-                    }
-};
-
-/****************** F o r w a r d s **************************************/
-#if defined(__sun)
-extern "C" int yyparse();   // forward declaration for created function
-extern "C" void yyerror( const char * );
-extern "C" int  yylex();
-#else
-int yyparse();              // forward declaration for created function
-void yyerror( char * );
-int  yylex();
-#endif
-
-class RscTypCont;
-class RscFileInst;
-
-extern RscTypCont*              pTC;
-extern RscFileInst *            pFI;
-extern RscExpression *          pExp;
-extern ObjectStack              S;
-extern StringContainer*         pStringContainer;
-
-#endif // INCLUDED_RSC_INC_RSCLEX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
deleted file mode 100644
index 3bd159a901ec..000000000000
--- a/rsc/inc/rscmgr.hxx
+++ /dev/null
@@ -1,67 +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_RSC_INC_RSCMGR_HXX
-#define INCLUDED_RSC_INC_RSCMGR_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rsctop.hxx>
-#include <rscclass.hxx>
-
-/******************* R s c M g r *****************************************/
-class RscMgr : public RscClass
-{
-    struct RscMgrInst
-    {
-        RscId   aRefId; // nRefId = Referenz Identifier
-        bool    bDflt;  // default
-        void Create(){ aRefId.Create(); bDflt = true; }
-        void Destroy(){ aRefId.Destroy(); }
-    };
-    ERRTYPE         IsToDeep( const RSCINST & rInst );
-public:
-                    RscMgr( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuperCl );
-
-    void            SetToDefault( const RSCINST & rInst ) override;
-    bool            IsDefault( const RSCINST & rInst ) override;
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override;
-    void            Destroy( const RSCINST & rInst ) override;
-    sal_uInt32      Size() const override;
-    void            WriteSrcHeader( const RSCINST & aInst, FILE * fOutput,
-                                    RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & rId, const char * ) override;
-
-    void            WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
-                                   RscTypCont * pTC, const RscId & rId,
-                                   sal_uInt32 ) override;
-    ERRTYPE         WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-    bool            IsConsistent( const RSCINST & rInst ) override;
-    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) override;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
-};
-
-#endif // INCLUDED_RSC_INC_RSCMGR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
deleted file mode 100644
index aea9a8740c35..000000000000
--- a/rsc/inc/rscpar.hxx
+++ /dev/null
@@ -1,77 +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_RSC_INC_RSCPAR_HXX
-#define INCLUDED_RSC_INC_RSCPAR_HXX
-
-#include <rsctools.hxx>
-#include <rscerror.h>
-#include <rscdef.hxx>
-#include <tools/solar.h>
-
-class RscTypCont;
-
-#define READBUFFER_MAX  256
-
-class RscFileInst
-{
-    ERRTYPE             aFirstError;
-    sal_uInt32          nLineNo;    // line in input file
-    RscFileTab::Index   lFileIndex; // index input file
-    RscFileTab::Index   lSrcIndex;  // index base file
-    FILE *              fInputFile;
-    char *              pInput;     // read buffer
-    static const sal_uInt32 nInputBufLen = READBUFFER_MAX;
-    sal_uInt32          nInputPos;
-    sal_uInt32          nInputEndPos;
-    char *              pLine;
-    sal_uInt32          nLineBufLen;
-    sal_uInt32          nScanPos;   // line position
-    int                 cLastChar;
-    bool                bEof;
-
-public:
-    RscTypCont *        pTypCont;
-    void        Init();  // init ctor
-                RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc,
-                         RscFileTab::Index lFileIndex, FILE * fFile );
-                ~RscFileInst();
-    bool        IsEof() const { return bEof; }
-    void        SetFileIndex( RscFileTab::Index lFIndex ) { lFileIndex = lFIndex;  }
-    RscFileTab::Index GetFileIndex()                { return lFileIndex;  }
-    void        SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine;    }
-    sal_uInt32  GetLineNo()                   { return nLineNo;     }
-    sal_uInt32  GetScanPos()                  { return nScanPos;    }
-    char *      GetLine()                     { return pLine;       }
-    char        GetChar();
-    char        GetFastChar()
-                    {
-                        return pLine[ nScanPos ] ?
-                            pLine[ nScanPos++ ] : GetChar();
-                    }
-    void        GetNewLine();
-                // error handling
-    void        SetError( ERRTYPE aError );
-};
-
-void IncludeParser( RscFileInst * pFileInst );
-ERRTYPE parser( RscFileInst * pFileInst );
-
-#endif // INCLUDED_RSC_INC_RSCPAR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
deleted file mode 100644
index 202b86f98e08..000000000000
--- a/rsc/inc/rscrange.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_RSC_INC_RSCRANGE_HXX
-#define INCLUDED_RSC_INC_RSCRANGE_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rsctop.hxx>
-
-class RscLongRange : public RscTop
-{
-protected:
-    struct RscLongRangeInst
-    {
-        sal_Int32    nValue; // nValue = output value - nMin
-        bool    bDflt;  // is default
-    };
-    sal_Int32    nMin;   // range minimum value
-    sal_Int32    nMax;   // range maximum value
-public:
-                    RscLongRange( Atom nId, RESOURCE_TYPE nTypId );
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
-                    // sets the allowed range
-    void            SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
-                    // returns the class size in bytes
-    sal_uInt32      Size() const override { return ALIGNED_SIZE(sizeof(RscLongRangeInst)); }
-                    // an assignment to a variable
-    virtual void    SetToDefault( const RSCINST & rInst ) override
-                        {
-                            reinterpret_cast<RscLongRangeInst*>(rInst.pData)->bDflt = true;
-                        }
-    bool            IsDefault( const RSCINST & rInst) override
-                        {
-                            return reinterpret_cast<RscLongRangeInst*>(rInst.pData)->bDflt;
-                        };
-                    // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-    ERRTYPE         SetNumber( const RSCINST &, sal_Int32 ) override;
-    ERRTYPE         GetNumber( const RSCINST &, sal_Int32 * ) override;
-    void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-
-};
-
-class RscLongEnumRange : public RscLongRange
-{
-public:
-                    RscLongEnumRange( Atom nId, RESOURCE_TYPE nTypId );
-
-    ERRTYPE         SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue ) override;
-};
-
-#endif // INCLUDED_RSC_INC_RSCRANGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
deleted file mode 100644
index f09b42d6004d..000000000000
--- a/rsc/inc/rscrsc.hxx
+++ /dev/null
@@ -1,98 +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_RSC_INC_RSCRSC_HXX
-#define INCLUDED_RSC_INC_RSCRSC_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rsctools.hxx>
-
-#include <list>
-
-class RscTypCont;
-
-
-/****************** R s c C m d L i n e **********************************/
-class RscCmdLine
-{
-    void        Init();
-
-public:
-
-    RscStrList     aInputList;     // source file list
-    OString        aPath;          // path list
-    RSCBYTEORDER_TYPE   nByteOrder;
-    CommandFlags   nCommands;      // command bits
-    OString        aOutputSrs;     // Srs output file name
-
-    struct OutputFile
-    {
-        OString aLangName;         // language name
-        OString aOutputRc;         // target file
-        OString aLangSearchPath;   // language specific search path
-        ::std::list< OString >    aSysSearchDirs;    // paths to search for images
-
-        OutputFile() {}
-    };
-
-    std::list<OutputFile>                                   m_aOutputFiles;
-    std::list< std::pair< OString, OString > >    m_aReplacements;
-
-    RscCmdLine( int argc, char ** argv, RscError * pEH );
-    ~RscCmdLine();
-
-    OString     substitutePaths( const OString& rIn );
-};
-/****************** R s c ************************************************/
-
-struct WriteRcContext;
-
-class RscCompiler
-{
-private:
-    static bool     GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
-                                      const WriteRcContext& rContext,
-                                      const OString& rBaseFileName,
-                                      OString& rImagePath,
-                                      FILE* pSysListFile );
-    void            PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
-                                       const WriteRcContext& rContext,
-                                       const OUString& rSrsInPath,
-                                       const OUString& rSrsOutPath );
-
-public:
-    RscTypCont*     pTC;        // string and id manager
-    RscCmdLine*     pCL;        // command line
-    FILE *          fExitFile;  // when deconstructed, this file must be deleted
-
-                    RscCompiler( RscCmdLine *, RscTypCont * );
-                    ~RscCompiler();
-
-    ERRTYPE         Start();
-
-                    // read include statements
-    ERRTYPE         IncludeParser( RscFileTab::Index lFileKey );
-    ERRTYPE         ParseOneFile( RscFileTab::Index lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
-    ERRTYPE         Link();
-    void            EndCompile();
-};
-
-#endif // INCLUDED_RSC_INC_RSCRSC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
deleted file mode 100644
index 5ae1d17aa92d..000000000000
--- a/rsc/inc/rscstr.hxx
+++ /dev/null
@@ -1,66 +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_RSC_INC_RSCSTR_HXX
-#define INCLUDED_RSC_INC_RSCSTR_HXX
-
-#include <rscall.h>
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rsctop.hxx>
-
-class RscString : public RscTop
-{
-    RscTop * pRefClass;
-    struct RscStringInst
-    {
-        char *  pStr;   // pointer to string
-        bool    bDflt;  // is default
-        RscId   aRefId; // reference name
-    };
-public:
-                    RscString( Atom nId, RESOURCE_TYPE nTypId );
-
-    void            SetRefClass( RscTop * pClass ) { pRefClass = pClass; }
-    RSCINST         Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override;
-                    // sets the allowed range
-    void            Destroy( const RSCINST & rInst ) override;
-    sal_uInt32      Size() const override { return ALIGNED_SIZE(sizeof(RscStringInst)); }
-    void            SetToDefault( const RSCINST & rInst ) override
-                        {
-                            reinterpret_cast<RscStringInst*>(rInst.pData)->bDflt = true;
-                        }
-    bool            IsDefault( const RSCINST & rInst) override
-                        {
-                            return reinterpret_cast<RscStringInst*>(rInst.pData)->bDflt;
-                        }
-                    // sets as default
-    bool            IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override;
-    ERRTYPE         SetString( const RSCINST &, const char * pStr ) override;
-    ERRTYPE         GetString( const RSCINST &, char ** ppStr ) override;
-    ERRTYPE         GetRef( const RSCINST & rInst, RscId * ) override;
-    ERRTYPE         SetRef( const RSCINST & rInst, const RscId & rRefId ) override;
-    void            WriteSrc( const RSCINST &, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
-    ERRTYPE         WriteRc( const RSCINST &, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 ) override;
-};
-
-#endif // INCLUDED_RSC_INC_RSCSTR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
deleted file mode 100644
index dcfade4adaf7..000000000000
--- a/rsc/inc/rsctools.hxx
+++ /dev/null
@@ -1,185 +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 .
- */
-struct RSHEADER_TYPE;
-class  RscPtrPtr;
-
-#ifndef INCLUDED_RSC_INC_RSCTOOLS_HXX
-#define INCLUDED_RSC_INC_RSCTOOLS_HXX
-
-#ifdef UNX
-#include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <vector>
-#include <rtl/ustring.hxx>
-#include <osl/endian.h>
-
-// character set
-enum COMPARE { LESS = -1, EQUAL = 0, GREATER = 1 };
-
-enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
-
-#define ALIGNED_SIZE( nSize )                               \
-            (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
-
-// Function Forwards
-OString GetTmpFileName();
-
-OString OutputFile(const OString &rInput, const char * ext);
-
-char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
-                     sal_uInt32 nArgc );
-
-void RscExit( sal_uInt32 nExit );
-
-int rsc_strnicmp( const char *string1, const char *string2, size_t count );
-int rsc_stricmp( const char *string1, const char *string2 );
-char* rsc_strdup( const char* );
-
-typedef ::std::vector< OString* > RscStrList;
-
-class RscChar
-{
-public:
-    static char * MakeUTF8( char * pStr, sal_uInt16 nTextEncoding );
-};
-
-class RscPtrPtr
-{
-    sal_uInt32  nCount;
-    void **         pMem;
-public:
-                    RscPtrPtr();
-                    ~RscPtrPtr();
-    void            Reset();
-    sal_uInt32      Append( void * );
-    sal_uInt32      Append( char * pStr ) { return Append( static_cast<void *>(pStr) ); }
-    sal_uInt32      GetCount() { return nCount; }
-    void *          GetEntry( sal_uInt32 nEle );
-    void **         GetBlock() { return pMem; }
-};
-
-class RscWriteRc
-{
-    sal_uInt32          nLen;
-    bool                bSwap;
-    char *              pMem;
-    char *              GetPointer( sal_uInt32 nSize );
-public:
-                RscWriteRc( RSCBYTEORDER_TYPE nOrder = RSC_SYSTEMENDIAN );
-                ~RscWriteRc();
-    sal_uInt32      IncSize( sal_uInt32 nSize ); // gives the previous size
-    void *      GetBuffer()
-                {
-                    return GetPointer( 0 );
-                }
-    sal_uInt32  GetLong( sal_uInt32 nPos )
-                {
-                    sal_uInt32 nVal = 0;
-                    char* pFrom = GetPointer(nPos);
-                    char* pTo = reinterpret_cast<char*>(&nVal);
-                    *pTo++ = *pFrom++;
-                    *pTo++ = *pFrom++;
-                    *pTo++ = *pFrom++;
-                    *pTo++ = *pFrom++;
-                    return bSwap ? OSL_SWAPDWORD( nVal ) : nVal;
-                }
-    sal_uInt32  Size(){ return nLen; }
-    void        Put( sal_uInt64 lVal )
-                {
-                    union
-                    {
-                        sal_uInt64 lVal64;
-                        sal_uInt32 aVal32[2];
-                    };
-                    lVal64 = lVal;
-                    if( bSwap )
-                    {
-                        Put( aVal32[1] );
-                        Put( aVal32[0] );
-                    }
-                    else
-                    {
-                        Put( aVal32[0] );
-                        Put( aVal32[1] );
-                    }
-                }
-    void        Put( sal_Int32 lVal )
-                {
-                    union
-                    {
-                        sal_uInt32 lVal32;
-                        sal_uInt16 aVal16[2];
-                    };
-                    lVal32 = lVal;
-
-                    if( bSwap )
-                    {
-                        Put( aVal16[1] );
-                        Put( aVal16[0] );
-                    }
-                    else
-                    {
-                        Put( aVal16[0] );
-                        Put( aVal16[1] );
-                    }
-                }
-    void        Put( sal_uInt32 nValue )
-                { Put( (sal_Int32)nValue ); }
-    void        Put( sal_uInt16 nValue );
-    void        PutUTF8( char * pData );
-
-    void        PutAt( sal_uInt32 nPos, sal_Int32 lVal )
-                {
-                    union
-                    {
-                        sal_uInt32 lVal32;
-                        sal_uInt16 aVal16[2];
-                    };
-                    lVal32 = lVal;
-
-                    if( bSwap )
-                    {
-                        PutAt( nPos, aVal16[1] );
-                        PutAt( nPos + 2, aVal16[0] );
-                    }
-                    else
-                    {
-                        PutAt( nPos, aVal16[0] );
-                        PutAt( nPos + 2, aVal16[1] );
-                    }
-                }
-    void        PutAt( sal_uInt32 nPos, sal_uInt32 lVal )
-                {
-                    PutAt( nPos, (sal_Int32)lVal);
-                }
-    void        PutAt( sal_uInt32 nPos, sal_uInt16 nVal )
-                {
-                    if( bSwap )
-                        nVal = OSL_SWAPWORD( nVal );
-                    char* pTo = GetPointer( nPos );
-                    char* pFrom = reinterpret_cast<char*>(&nVal);
-                    *pTo++ = *pFrom++;
-                    *pTo++ = *pFrom++;
-                }
-};
-
-#endif // INCLUDED_RSC_INC_RSCTOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
deleted file mode 100644
index 76c96844cb73..000000000000
--- a/rsc/inc/rsctop.hxx
+++ /dev/null
@@ -1,210 +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_RSC_INC_RSCTOP_HXX
-#define INCLUDED_RSC_INC_RSCTOP_HXX
-
-#include <rscerror.h>
-#include <rsctools.hxx>
-#include <rschash.hxx>
-#include <rscclobj.hxx>
-#include <rsc/rscsfx.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <tools/resid.hxx>
-
-enum class RSCVAR {
-    NONE        = 0x0000,
-    Pointer     = 0x0001,
-    Hidden      = 0x0002,
-    NoDataInst  = 0x0004,
-    NoRc        = 0x0008,
-    SvDynamic   = 0x0010,
-    NoEnum      = 0x0020
-};
-namespace o3tl {
-    template<> struct typed_flags<RSCVAR> : is_typed_flags<RSCVAR, 0x007f> {};
-}
-
-class RscTop : public RefNode
-{
-    RscTop *        pSuperClass;
-    RSCINST         aDfltInst;
-    RESOURCE_TYPE   nTypId;
-    RscTop *        pRefClass;
-
-protected:
-                    RscTop( Atom nId, RESOURCE_TYPE nTypIdent,
-                            RscTop * pSuperCl = nullptr );
-
-public:
-         OString    aCallPar1;      // class call without types until ResId
-         OString    aCallPar2;      // class call without types staring at ResId
-         OString    aCallParType;   // class call with types
-
-            RscTop* GetSuperClass() const
-                    { return pSuperClass; }
-                    // returns the type identifier
-            RESOURCE_TYPE GetTypId() const
-                    { return nTypId; };
-                    // returns the super class
-            bool    InHierarchy( RscTop * pClass );
-            void    SetCallPar( const OString& rPar1, const OString& rPar2,
-                                const OString& rParType );
-            RscTop* GetRefClass() const { return pRefClass; }
-            RSCINST const & GetDefault();
-
-                    // preparation fro the destructor call
-                    // given that classes can have mutual dependencies,
-                    // we cannot assume in destructor that all class pointer
-                    // are still valid
-    virtual void    Pre_dtor();
-
-    virtual RscTop* GetTypeClass() const;
-
-                    // returns the class size in bytes
-    virtual sal_uInt32  Size() const;
-
-                    // returns the reference
-    virtual ERRTYPE GetRef( const RSCINST & rInst, RscId * );
-
-                    // sets the reference
-    virtual ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId );
-
-                    // sets the variable
-    virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
-                                 RSCINST * pDflt = nullptr,
-                                 RSCVAR nVarType = RSCVAR::NONE, sal_uInt32 nMask = 0,
-                                 Atom nDataBaseName = InvalidAtom );
-
-                    // returns variable instance
-                    // returned pData, pClass may be NULL
-    virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
-                                 const RSCINST & rInitInst,
-                                 bool bInitDflt = false,
-                                 RscTop * pCreateClass = nullptr );
-    virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
-
-    virtual RSCINST GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RSCINST & rInitInst );
-
-                    // returns instance from a field
-                    // returned pGetInst may be NULL
-    virtual ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName,
-                                RscTop *pCreateClass, const RSCINST & rCreateInst,
-                                RSCINST * pGetInst );
-
-                    // returns instance from a value
-                    // returned pGetInst may be NULL
-    virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
-                                RscTop * pCreateClass,
-                                RSCINST * pGetInst );
-
-                    // returns instance from an array
-                    // returned pGetInst may be NULL
-    virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
-                                RscTop * pCreateClass,
-                                RSCINST * pGetInst );
-
-    virtual RSCINST SearchEle( const RSCINST & rInst, const RscId & rEleName,
-                               RscTop * pClass );
-
-                    // returns instance at the position
-    virtual RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos );
-
-                    // move an instance
-    virtual ERRTYPE MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
-                                sal_uInt32 nSourcePos );
-
-                    // changes RscId at position
-    virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
-                                 const RscId & rRscId);
-
-                    // returns instance information at position
-    virtual SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos );
-
-                    // number of entries
-    virtual sal_uInt32 GetCount( const RSCINST & rInst );
-
-                    // an assignment to a variable
-    virtual ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 lValue );
-
-                    // an assignment to a variable
-    virtual ERRTYPE SetBool( const RSCINST & rInst, bool bValue );
-
-                    // an assignment to a variable
-    virtual ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
-                              sal_Int32 nValue );
-
-                    // an assignment to a variable
-    ERRTYPE SetNotConst( const RSCINST & rInst, Atom nId );
-
-    virtual ERRTYPE SetString( const RSCINST & rInst, const char * pStr );
-
-    virtual ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * pN );
-
-    ERRTYPE GetBool( const RSCINST & rInst, bool * pB );
-
-    virtual ERRTYPE GetConst( const RSCINST & rInst, Atom * pH );
-
-    virtual ERRTYPE GetString( const RSCINST & rInst, char ** ppStr );
-
-    virtual RSCINST Create( RSCINST * pInst,
-                            const RSCINST & rDefInst, bool bOwnClass = false );
-
-                    // destroys instance
-    virtual void    Destroy( const RSCINST & rInst );
-
-                    // checks consistency
-    virtual bool    IsConsistent( const RSCINST & rInst );
-
-                    // sets all default values
-    virtual void    SetToDefault( const RSCINST & rInst );
-
-                    // whether input is equal to default
-    virtual bool    IsDefault( const RSCINST & rInst );
-
-                    // sets value to default
-    virtual bool    IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
-
-                    // sets intance to default
-    virtual void    SetDefault( const RSCINST & rInst, Atom nVarId );
-
-                    // returns a variable default
-    virtual RSCINST GetDefault( Atom nVarId );
-
-    virtual void    Delete( const RSCINST & rInst, RscTop * pClass,
-                            const RscId & rId );
-
-    virtual void    DeletePos( const RSCINST & rInst, sal_uInt32 nPos );
-
-                    // writes header and footer of a resource script file
-    virtual void    WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
-                                    RscTypCont * pTC, sal_uInt32 nTab,
-                                    const RscId & aId, const char * );
-    virtual void    WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab,const char * );
-    virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
-                                   RscTypCont * pTC, const RscId & aId,
-                                    sal_uInt32 nDeep );
-    virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                             RscTypCont * pTC, sal_uInt32 nDeep );
-};
-
-#endif // INCLUDED_RSC_INC_RSCTOP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
deleted file mode 100644
index 47dffeb66a5a..000000000000
--- a/rsc/inc/rsctree.hxx
+++ /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 .
- */
-#ifndef INCLUDED_RSC_INC_RSCTREE_HXX
-#define INCLUDED_RSC_INC_RSCTREE_HXX
-
-#include <tools/link.hxx>
-#include <rsctools.hxx>
-
-class NameNode
-{
-    void                SubOrderTree( NameNode * pOrderNode );
-
-protected:
-    NameNode*     pLeft;    // left subtree
-    NameNode*     pRight;   // right subtree
-
-                        // pCmp is pointer to names
-            NameNode*   Search( const void * pCmp ) const;
-
-                         // convert a double linked list into a binary tree
-            NameNode*   ChangeDLListBTree( NameNode * pList );
-
-                        NameNode();
-    virtual             ~NameNode();
-
-                        // convert a binary tree in a double linked list
-                        NameNode* ChangeBTreeDLList();
-
-public:
-            void        EnumNodes( Link<const NameNode&,void> aLink ) const;
-            NameNode*   Left() const { return pLeft; }
-            NameNode*   Right() const{ return pRight; }
-            NameNode*   Search( const NameNode * pName ) const;
-                        // insert a new node in the b-tree
-            bool        Insert( NameNode * pTN, sal_uInt32 * nDepth );
-            bool        Insert( NameNode* pTN );
-    virtual COMPARE     Compare( const NameNode * ) const;
-    virtual COMPARE     Compare( const void * ) const;
-            NameNode*   SearchParent( const NameNode * ) const;
-                        // returns the new root
-            NameNode*   Remove( NameNode * );
-            void        OrderTree();
-};
-
-class IdNode : public NameNode
-{
-    virtual COMPARE Compare( const NameNode * ) const override;
-    virtual COMPARE Compare( const void * ) const override;
-protected:
-    using NameNode::Search;
-
-public:
-
-    IdNode*         Search( sal_uInt32 nTypName ) const;
-    virtual sal_uInt32  GetId() const;
-};
-
-#endif // INCLUDED_RSC_INC_RSCTREE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
deleted file mode 100644
index a6dcb46cf227..000000000000
--- a/rsc/source/parser/erscerr.cxx
+++ /dev/null
@@ -1,403 +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 <stdlib.h>
-#include <stdio.h>
-
-#include <tools/rcid.h>
-#include <rschash.hxx>
-#include <rscerror.h>
-#include <rscall.h>
-#include <rscdb.hxx>
-#include <rscpar.hxx>
-
-#include "rsclex.hxx"
-
-ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
-{
-    if( !IsError() ){
-        if( rError.IsError() || !IsWarning() )
-            nError = rError.nError;
-    }
-    return *this;
-}
-
-void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
-{
-    if ( m_verbosity >= _verbosityLevel )
-    {
-        if( pStr ){
-            printf( "%s", pStr );
-            fflush( stdout );
-        }
-    }
-}
-
-void RscError::StdErr( const char * pStr )
-{
-    if( pStr )
-        fprintf( stderr, "%s", pStr );
-}
-
-void RscError::LstOut( const char * pStr ){
-    if( fListing && pStr )
-        fprintf( fListing, "%s", pStr );
-}
-
-void RscError::StdLstOut( const char * pStr ){
-    StdOut( pStr );
-    LstOut( pStr );
-}
-
-void RscError::StdLstErr( const char * pStr ){
-    StdErr( pStr );
-    LstOut( pStr );
-}
-
-void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
-{
-    switch( rError.GetError() )
-    {
-        case ERR_ERROR: {
-            StdLstErr( "!! " );
-            if( 1 == nErrors )
-                StdLstErr(OString::number(nErrors).getStr());
-            else
-                StdLstErr(OString::number(nErrors -1).getStr());
-            StdLstErr( " Error" );
-            StdLstErr( " found!!" );
-        }
-        break;
-
-        case ERR_UNKNOWN_METHOD:
-            StdLstErr( "The used type is not allowed." );
-        break;
-
-        case ERR_OPENFILE:
-            StdLstErr( "This file <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> cannot be opened." );
-        break;
-
-        case ERR_RENAMEFILE:
-            StdLstErr( "rename <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> s not possible." );
-        break;
-
-        case ERR_FILESIZE:
-            StdLstErr( "Wrong file <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> length." );
-        break;
-
-        case ERR_FILEFORMAT:
-            StdLstErr( "Wrong file type <" );
-            StdLstErr( pMessage );
-            StdLstErr( ">." );
-        break;
-
-        case ERR_NOCHAR:
-            StdLstErr( "Character: '\\xxx'; The value xxx is greater than 255.");
-            break;
-
-        case ERR_NORSCINST:
-            StdLstErr( "Internal error, instance invalid.");
-            break;
-
-
-        case ERR_NOINPUT:
-            StdLstErr( "Input file was not specified.\n");
-            SAL_FALLTHROUGH;
-        case ERR_USAGE:
-            StdLstOut( "Copyright (C) 2000 - 2012 LibreOffice contributors.\n" );
-            {
-                char    buf[40];
-
-                StdLstOut( "DataVersion: " );
-                sprintf( buf, "%d.%d\n\n",
-                         RSCVERSION_ID / 100, RSCVERSION_ID % 100 );
-                StdLstOut( buf );
-            }
-
-            StdLstOut( "Command line: rsc [Switches] <Source File(s)>\n" );
-            StdLstOut( "Command line: rsc @<Command File>\n" );
-            StdLstOut( "-h  shows this help.\n" );
-            StdLstOut( "-p  No preprocessor.\n" );
-            StdLstOut( "-s  Syntax analysis, creates .srs file\n");
-            StdLstOut( "-l  Linker, links files created with rsc -s,\n" );
-            StdLstOut( "    creates .rc file and .res file.\n" );
-            StdLstOut( "-r  Prevents .res file.\n" );
-            StdLstOut( "-d  Symbol definitions for the Preprocessor.\n" );
-            StdLstOut( "-i  Include directives for the Preprocessor.\n" );
-            StdLstOut( "-presponse     Use response file for Preprocessor.\n" );
-            StdLstOut( "-lg<language>  Use a different language.\n" );
-            StdLstOut( "-fs=<filename> Name of the .res file.\n" );
-            StdLstOut( "-lip=<path>    additional search path for system dependent files\n" );
-            StdLstOut( "-fp=<filename> Renaming of the .srs file.\n" );
-            StdLstOut( "-sub<ENV>=<path> replace <path> by <ENV> in image list files\n" );
-            StdLstOut( "-BIGENDIAN    Format of number values.\n" );
-            StdLstOut( "-LITTLEENDIAN Format of number values.\n" );
-            StdLstOut( "-SrsDefault   Only write one language to srs file.\n" );
-            StdLstOut( "\nwhen creating multiple .res files in one pass, please give these\n" );
-            StdLstOut( "options in consecutive blocks:\n" );
-            StdLstOut( "-lg<language> -fs<filename> [-lip<path> [-lip<path>] ]\n" );
-            StdLstOut( "a new block begins when either -lg or -fs is used again.\n" );
-            break;
-
-        case ERR_UNKNOWNSW:
-            StdLstErr( "Unknown switch <" );
-            StdLstErr( pMessage );
-            StdLstErr( ">." );
-            break;
-
-        case ERR_REFTODEEP:
-            StdLstErr( "Too many reference levels have been used (see Switch -RefDeep)." );
-            break;
-
-        case ERR_CONT_INVALIDPOS:
-            StdLstErr( "Internal error, Container class: invalid position." );
-            break;
-
-        case ERR_CONT_INVALIDTYPE:
-            StdLstErr( "Invalid type <" );
-            StdLstErr( pMessage );
-            StdLstErr( ">." );
-            break;
-
-        case ERR_ARRAY_INVALIDINDEX:
-            StdLstErr( "Internal error, Array class: invalid index." );
-            break;
-
-        case ERR_RSCINST_NOVARNAME:
-            StdLstErr( "Internal error, invalid name of variable." );
-            break;
-
-        case ERR_YACC:
-            StdLstErr( pMessage );
-            break;
-
-        case ERR_DOUBLEID:
-            StdLstErr( "Two global resources have the same identifier." );
-            break;
-
-        case ERR_FALSETYPE:
-            StdLstErr( "Wrong type <" );
-            StdLstErr( pMessage );
-            StdLstErr( ">." );
-            break;
-
-        case ERR_NOVARIABLENAME:
-            StdLstErr( "The variable <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> must not be used here." );
-            break;
-
-        case ERR_RSCRANGE_OUTDEFSET:
-            StdLstErr( "The used value is not in the expected domain." );
-            break;
-
-        case ERR_USHORTRANGE:
-            StdLstErr( "Value is <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> the allowed domain is from 0 up to 65535." );
-            break;
-
-        case ERR_IDRANGE:
-            StdLstErr( "Value is <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> the allowed domain is from 1 up to 32767." );
-            break;
-
-        case ERR_NOCOPYOBJ:
-            StdLstErr( "Default resource <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> not found." );
-            break;
-
-        case ERR_REFNOTALLOWED:
-            StdLstErr( "The use of a reference is not allowed." );
-            break;
-
-        case ERR_COPYNOTALLOWED:
-            StdLstErr( "The use of a default resource is not allowed." );
-            break;
-
-        case ERR_IDEXPECTED:
-            StdLstErr( "An identifier needs to be specified." );
-            break;
-
-        case ERR_DOUBLEDEFINE:
-            StdLstErr( "The symbol <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> is defined twice." );
-            break;
-
-        case ERR_RSCINST_RESERVEDNAME:
-            StdLstErr( "The symbol <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> is a reserved name." );
-            break;
-
-        case ERR_ZERODIVISION:
-            StdLstErr( "Attempt to divide by zero." );
-            break;
-
-        case ERR_PRAGMA:
-            StdLstErr( "Error in a #pragma statement." );
-            break;
-
-        case ERR_DECLAREDEFINE:
-            StdLstErr( "Error in the declaration part of the macro." );
-            break;
-
-        case ERR_NOTYPE:
-            StdLstErr( "type expected." );
-            break;
-
-        case ERR_NOIMAGE:
-            StdLstErr( "The image(s) <" );
-            StdLstErr( pMessage );
-            StdLstErr( "> could not be found." );
-            break;
-
-        case WRN_LOCALID:
-            StdLstErr( "Sub resources should have an identifier < 256." );
-            break;
-
-        case WRN_GLOBALID:
-            StdLstErr( "Global resources should have an identifier >= 256." );
-            break;
-
-        case WRN_SUBINMEMBER:
-            StdLstErr( "Sub resources are ignored." );
-            break;
-
-        case WRN_CONT_NOID:
-            StdLstErr( "Resources without name are ignored." );
-            break;
-
-        case WRN_CONT_DOUBLEID:
-            StdLstErr( "Two local resources have the same identifier." );
-            break;
-
-        case WRN_STR_REFNOTFOUND:
-            StdLstErr( "String reference <" );
-            StdLstErr( pMessage );
-            StdLstErr( " > could not be resolved." );
-            break;
-
-        case WRN_MGR_REFNOTFOUND:
-            StdLstErr( "Reference <" );
-            StdLstErr( pMessage );
-            StdLstErr( " > could not be resolved." );
-            break;
-
-        default:
-            if( pMessage ){
-                StdLstErr( "\nMessage: " );
-                StdLstErr( pMessage );
-            };
-            break;
-    }
-}
-
-void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass,
-                            const RscId & aId ){
-    char buf[ 10 ];
-    sal_uInt32 i;
-
-    if( pFI )
-    {
-        pFI->SetError( rError );
-        StdErr( "\n" );
-        StdErr( pFI->GetLine() );
-        StdErr( "\n" );
-        // Show location of error
-        for( i = 0; (i +1) < pFI->GetScanPos(); i++ )
-            StdLstErr( " " );
-        LstOut( "     ^" ); // for the linenumber
-        StdErr( "^" );
-        StdLstErr( "\n" );
-    }
-    StdLstErr( "f" );
-    sprintf( buf, "%u", (unsigned int)rError.GetError() );
-    StdLstErr( buf );
-
-    if( pFI && pTC ){
-        StdLstErr( ": \"" );
-        StdLstErr( pTC->aFileTab.Get( pFI->GetFileIndex() )->aFileName.getStr() );
-        StdLstErr( "\", line " );
-        sprintf( buf, "%u", (unsigned int)pFI->GetLineNo() );
-        StdLstErr( buf );
-    }
-
-    if( rError.IsError() )
-        StdLstErr( ": Error" );
-    else
-        StdLstErr( ": Warning" );
-
-    if( pClass || aId.IsId() )
-    {
-        StdLstErr( " in the object (" );
-        if( pClass )
-        {
-            StdLstErr( "Type: " );
-            StdLstErr( pHS->getString( pClass->GetId() ).getStr() );
-            if( aId.IsId() )
-                StdLstErr( ", " );
-        }
-        if( aId.IsId() )
-            StdLstErr( aId.GetName().getStr() );
-        StdLstErr( "):\n" );
-    }
-    else
-        StdLstErr( ": " );
-}
-
-void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
-                      const RscId & aId, const char * pMessage )
-{
-    if( WRN_LOCALID == rError.GetError() ) // ignore warnings
-        return;
-    if( rError.IsError() )
-        nErrors++;
-    if( rError.IsError() || rError.IsWarning() ){
-        ErrorFormat( rError, pClass, aId );
-        WriteError( rError, pMessage );
-        StdLstErr( "\n" );
-    }
-}
-
-void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
-                           const char * pMessage )
-{
-    if( ERR_USAGE != rError.GetError() ){
-        nErrors++;
-        ErrorFormat( rError, nullptr, aId );
-        WriteError( rError, pMessage );
-        StdLstErr( "\nTerminating compiler\n" );
-    }
-    else
-        WriteError( rError, pMessage );
-
-    exit( 1 );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
deleted file mode 100644
index cf6f73bbaba8..000000000000
--- a/rsc/source/parser/rscdb.cxx
+++ /dev/null
@@ -1,456 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <i18nlangtag/languagetag.hxx>
-#include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <tools/rcid.h>
-
-#include <rsctree.hxx>
-#include <rsctop.hxx>
-#include <rscmgr.hxx>
-#include <rscdb.hxx>
-#include <rscrsc.hxx>
-
-
-RscTypCont::RscTypCont( RscError * pErrHdl,
-                          RSCBYTEORDER_TYPE nOrder,
-                          CommandFlags nFlagsP )
-    : nSourceCharSet( RTL_TEXTENCODING_UTF8 )
-    , nByteOrder( nOrder )
-    , nFilePos( 0 )
-    , nPMId(RSC_VERSIONCONTROL + RESOURCE_TYPE(1)) // at least one more
-    , aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE )
-    , aString( pHS->getID( "Chars" ), RSC_NOTYPE )
-    , aLangType()
-    , aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType )
-    , pEH(pErrHdl)
-    , nFlags( nFlagsP )
-{
-    Init();
-}
-
-OString RscTypCont::ChangeLanguage(const OString& rNewLang)
-{
-    OString aRet = aLanguage;
-    aLanguage = rNewLang;
-
-    ::std::vector< OUString > aFallbacks;
-
-    if (rNewLang.isEmpty())
-        aFallbacks.push_back( "" );     // do not resolve to SYSTEM (en-US)
-    else
-        aFallbacks = LanguageTag( OStringToOUString( rNewLang, RTL_TEXTENCODING_ASCII_US)).getFallbackStrings( true);
-
-    bool bAppendEnUsFallback = ! (rNewLang.equalsIgnoreAsciiCase( "en-US" ) ||
-                                  rNewLang.equalsIgnoreAsciiCase( "x-no-translate" ) );
-    if (bAppendEnUsFallback)
-        aFallbacks.push_back( "en-US");
-
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "RscTypCont::ChangeLanguage: " );
-#endif
-
-    aLangFallbacks.clear();
-
-    for (OUString& rItem : aFallbacks)
-    {
-        OString aLang(OUStringToOString(rItem, RTL_TEXTENCODING_ASCII_US));
-        sal_uInt32 nID = GetLangId( aLang );
-        bool bAdd = (nID == 0);
-        if ( bAdd )
-        {
-            AddLanguage( aLang.getStr() );
-            nID = GetLangId( aLang );
-        }
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, " '%s' (0x%hx) (%s)", aLang.getStr(), (int)nID, (bAdd ? "added" : "exists") );
-#endif
-        aLangFallbacks.push_back( nID);
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "\n" );
-#endif
-
-    return aRet;
-}
-
-Atom RscTypCont::AddLanguage( const char* pLang )
-{
-    return aLangType.AddLanguage( pLang, aNmTb );
-}
-
-
-void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode )
-{
-    if( pObjNode )
-    {
-        DestroyNode( pRscTop, static_cast<ObjNode*>(pObjNode->Left()) );
-        DestroyNode( pRscTop, static_cast<ObjNode*>(pObjNode->Right()) );
-
-        if( pObjNode->GetRscObj() )
-        {
-            pRscTop->Destroy( RSCINST( pRscTop, pObjNode->GetRscObj() ) );
-            rtl_freeMemory( pObjNode->GetRscObj() );
-        }
-        delete pObjNode;
-    }
-}
-
-void DestroySubTrees( RscTop * pRscTop )
-{
-    if( pRscTop )
-    {
-        DestroySubTrees( static_cast<RscTop*>(pRscTop->Left()) );
-        DestroyNode( pRscTop, pRscTop->GetObjNode() );
-        DestroySubTrees( static_cast<RscTop*>(pRscTop->Right()) );
-    }
-}
-
-void DestroyTree( RscTop * pRscTop )
-{
-    if( pRscTop )
-    {
-        DestroyTree( static_cast<RscTop*>(pRscTop->Left()) );
-        DestroyTree( static_cast<RscTop*>(pRscTop->Right()) );
-
-        delete pRscTop;
-    }
-}
-
-void Pre_dtorTree( RscTop * pRscTop )
-{
-    if( pRscTop )
-    {
-        Pre_dtorTree( static_cast<RscTop*>(pRscTop->Left()) );
-        Pre_dtorTree( static_cast<RscTop*>(pRscTop->Right()) );
-
-        pRscTop->Pre_dtor();
-    }
-}
-
-RscTypCont::~RscTypCont()
-{
-    // delete all subtrees
-    aVersion.pClass->Destroy( aVersion );
-    rtl_freeMemory( aVersion.pData );
-    DestroySubTrees( pRoot );
-
-    // all classes are still valid, destroy each instance
-    // of base types
-    for (RscTop* pItem : aBaseLst)
-        pItem->Pre_dtor();
-
-    aString.Pre_dtor();
-    aVersion.pClass->Pre_dtor();
-    // sub-types
-    Pre_dtorTree( pRoot );
-
-    // destroy classes
-    delete aVersion.pClass;
-    DestroyTree( pRoot );
-
-    for (RscTop* pItem : aBaseLst)
-        delete pItem;
-}
-
-class RscEnumerateObj
-{
-friend class RscEnumerateRef;
-private:
-    ERRTYPE     aError;     // contains the first field
-    RscTypCont* pTypCont;
-    FILE *      fOutput;    // output file
-    RscFileTab::Index lFileKey;   // what source file
-    RscTop *    pClass;
-
-    RscEnumerateObj(RscTypCont* pTC, FILE* pOutputFile)
-        :pTypCont(pTC)
-        ,fOutput(pOutputFile)
-        ,lFileKey(0)
-        ,pClass(nullptr)
-    {
-    }
-
-    DECL_LINK( CallBackWriteRc, const NameNode&, void );
-    DECL_LINK( CallBackWriteSrc, const NameNode&, void );
-
-    void WriteRc( RscTop * pCl, ObjNode * pRoot )
-    {
-        pClass = pCl;
-        if( pRoot )
-            pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteRc ) );
-    }
-    void WriteSrc( RscTop * pCl, ObjNode * pRoot ){
-        pClass = pCl;
-        if( pRoot )
-            pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteSrc ) );
-    }
-public:
-    void WriteRcFile( RscWriteRc & rMem, FILE * fOutput );
-};
-
-IMPL_LINK( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void )
-{
-    const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode);
-    RscWriteRc     aMem( pTypCont->GetByteOrder() );
-
-    aError = pClass->WriteRcHeader( RSCINST( pClass, rObjNode.GetRscObj() ),
-                                     aMem, pTypCont,
-                                     rObjNode.GetRscId(), 0 );
-    if( aError.IsError() || aError.IsWarning() )
-        pTypCont->pEH->Error( aError, pClass, rObjNode.GetRscId() );
-
-    WriteRcFile( aMem, fOutput );
-}
-
-IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void )
-{
-    const ObjNode& rObjNode = static_cast<const ObjNode&>(rNode);
-    if( rObjNode.GetFileKey() == lFileKey )
-    {
-        pClass->WriteSrcHeader( RSCINST( pClass, rObjNode.GetRscObj() ),
-                                fOutput, pTypCont, 0,
-                                rObjNode.GetRscId(), "" );
-        fprintf( fOutput, ";\n" );
-    }
-}
-
-void RscEnumerateObj::WriteRcFile( RscWriteRc & rMem, FILE * fOut )
-{
-    // structure definition from which the resource is built
-    /*
-    struct RSHEADER_TYPE{
-        sal_uInt32          nId;        // resource identifier
-        RESOURCE_TYPE       nRT;        // resource type
-        sal_uInt32          nGlobOff;   // global offset
-        sal_uInt32          nLocalOff;  // local offset
-    } aHeader;
-    */
-
-    sal_uInt32 nId = rMem.GetLong( 0 );
-    RESOURCE_TYPE nRT(rMem.GetLong( 4 ));
-
-    // table is filled with nId and nRT
-    pTypCont->PutTranslatorKey( (sal_uInt64(sal_uInt32(nRT)) << 32) + sal_uInt64(nId) );
-
-    if( nRT == RSC_VERSIONCONTROL )
-    { // always comes last
-        sal_Int32 nCount = pTypCont->aIdTranslator.size();
-        // table size
-        sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32);
-
-        rMem.Put( nCount ); // save the count
-        for (auto& rItem : pTypCont->aIdTranslator)
-        {
-            // save the key
-            rMem.Put( rItem.first );
-            // save the object id or position
-            rMem.Put( static_cast<sal_Int32>(rItem.second) );
-        }
-        rMem.Put( nSize ); // save the size next
-    }
-
-    // reset the file offset
-    pTypCont->IncFilePos( rMem.Size() );
-
-
-    // position was written previously in the table
-    bool bSuccess = (1 == fwrite( rMem.GetBuffer(), rMem.Size(), 1, fOut ));
-    SAL_WARN_IF(!bSuccess, "rsc", "short write");
-};
-
-class RscEnumerateRef
-{
-private:
-    RscTop *        pRoot;
-
-    DECL_LINK( CallBackWriteRc, const NameNode&, void );
-    DECL_LINK( CallBackWriteSrc, const NameNode&, void );
-public:
-    RscEnumerateObj aEnumObj;
-
-    RscEnumerateRef(RscTypCont* pTC, RscTop* pR, FILE* fOutput)
-        : pRoot(pR), aEnumObj(pTC, fOutput)
-        {
-        }
-    ERRTYPE const & WriteRc()
-        {
-            aEnumObj.aError.Clear();
-            pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteRc ) );
-            return aEnumObj.aError;
-        }
-    ERRTYPE const & WriteSrc( RscFileTab::Index lFileKey )
-        {
-            aEnumObj.lFileKey = lFileKey;
-
-            aEnumObj.aError.Clear();
-            pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteSrc ) );
-            return aEnumObj.aError;
-        }
-};
-
-IMPL_LINK( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void )
-{
-    const RscTop& rRef = static_cast<const RscTop&>(rNode);
-    aEnumObj.WriteRc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() );
-}
-
-IMPL_LINK( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void )
-{
-    const RscTop& rRef = static_cast<const RscTop&>(rNode);
-    aEnumObj.WriteSrc( const_cast<RscTop*>(&rRef), rRef.GetObjNode() );
-}
-
-ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
-{
-    ERRTYPE       aError;
-    RscEnumerateRef aEnumRef( this, pRoot, rContext.fOutput );
-
-    aIdTranslator.clear();
-    nFilePos = 0;
-    nPMId = RSCVERSION_ID +1; // at least one more
-
-    aError = aEnumRef.WriteRc();
-
-    // version control
-    RscWriteRc aMem( nByteOrder );
-    aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0 );
-    aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
-
-    return aError;
-}
-
-void RscTypCont::WriteSrc( FILE * fOutput, RscFileTab::Index nFileKey )
-{
-    RscEnumerateRef aEnumRef( this, pRoot, fOutput );
-
-    unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf };
-    size_t nItems = SAL_N_ELEMENTS(aUTF8BOM);
-    bool bSuccess = (nItems == fwrite(aUTF8BOM, 1, nItems, fOutput));
-    SAL_WARN_IF(!bSuccess, "rsc", "short write");
-    RscId::SetNames( false );
-    if( nFileKey == RscFileTab::IndexNotFound )
-    {
-        RscFileTab::Index aIndex = aFileTab.FirstIndex();
-        while( aIndex != RscFileTab::IndexNotFound )
-        {
-            aEnumRef.WriteSrc( aIndex );
-            aIndex = aFileTab.NextIndex( aIndex );
-        };
-    }
-    else
-         aEnumRef.WriteSrc( nFileKey );
-    RscId::SetNames();
-}
-
-class RscDel
-{
-    RscFileTab::Index lFileKey;
-    DECL_LINK( Delete, const NameNode&, void );
-public:
-    RscDel( RscTop * pRoot, RscFileTab::Index lKey );
-};
-
-
-inline RscDel::RscDel( RscTop * pRoot, RscFileTab::Index lKey )
-    : lFileKey(lKey)
-{
-    pRoot->EnumNodes( LINK( this, RscDel, Delete ) );
-}
-
-IMPL_LINK( RscDel, Delete, const NameNode&, r, void )
-{
-    RscTop* pNode = const_cast<RscTop*>(static_cast<const RscTop*>(&r));
-    if( pNode->GetObjNode() )
-        pNode->pObjBiTree = pNode->GetObjNode()->DelObjNode( pNode, lFileKey );
-}
-
-void RscTypCont::Delete( RscFileTab::Index lFileKey )
-{
-    // delete resource instance
-    RscDel aDel( pRoot, lFileKey );
-    // delete defines
-    aFileTab.DeleteFileContext( lFileKey );
-}
-
-bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
-{
-    bool bRet = true;
-
-    if( pObjNode )
-    {
-        RSCINST aTmpI;
-
-        if( ! IsInstConsistent( static_cast<ObjNode*>(pObjNode->Left()), pRscTop ) )
-            bRet = false;
-
-        aTmpI.pClass = pRscTop;
-        aTmpI.pData = pObjNode->GetRscObj();
-        if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
-            bRet = false;
-
-        if( ! IsInstConsistent( static_cast<ObjNode*>(pObjNode->Right()), pRscTop ) )
-            bRet = false;
-    }
-
-    return bRet;
-}
-
-bool MakeConsistent( RscTop * pRscTop )
-{
-    bool bRet = true;
-
-    if( pRscTop )
-    {
-        if( ! ::MakeConsistent( static_cast<RscTop*>(pRscTop->Left()) ) )
-            bRet = false;
-
-        if( pRscTop->GetObjNode() )
-        {
-            if( ! pRscTop->GetObjNode()->IsConsistent() )
-            {
-                pRscTop->GetObjNode()->OrderTree();
-                if( ! pRscTop->GetObjNode()->IsConsistent() )
-                    bRet = false;
-            }
-            if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) )
-                bRet = false;
-        }
-
-        if( ! ::MakeConsistent( static_cast<RscTop*>(pRscTop->Right()) ) )
-            bRet = false;
-    }
-
-    return bRet;
-}
-
-void RscTypCont::PutTranslatorKey( sal_uInt64 nKey )
-{
-    aIdTranslator[ nKey ] = nFilePos;
-    nPMId++;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
deleted file mode 100644
index 556563b76512..000000000000
--- a/rsc/source/parser/rscibas.cxx
+++ /dev/null
@@ -1,216 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <comphelper/string.hxx>
-#include <i18nlangtag/mslangid.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <tools/color.hxx>
-#include <tools/fldunit.hxx>
-#include <tools/gen.hxx>
-#include <tools/mapunit.hxx>
-#include <tools/wintypes.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-
-#include <com/sun/star/awt/Key.hpp>
-
-#include <rscconst.hxx>
-#include <rscarray.hxx>
-#include <rscclass.hxx>
-#include <rsccont.hxx>
-#include <rscdb.hxx>
-#include <rsclex.hxx>
-#include <rscyacc.hxx>
-
-#include <unordered_map>
-
-void RscTypCont::SETCONST( RscEnum * pClass, const char * szString, sal_uInt32 nVal )
-{
-#if OSL_DEBUG_LEVEL > 2
-    fprintf( stderr, "setconst : %s\n", szString );
-#endif
-    pClass->SetConstant( aNmTb.Put( szString,
-                         CONSTNAME, nVal ), nVal );
-}
-
-typedef std::unordered_map< OString, sal_uInt32, OStringHash > langmap;
-static langmap ULong_Iso_map;
-
-sal_uInt32 GetLangId(const OString &rLang)
-{
-    langmap::iterator pIter = ULong_Iso_map.find( rLang );
-    if ( pIter != ULong_Iso_map.end())
-        return pIter->second;
-    return 0;
-}
-
-void RscLangEnum::Init( RscNameTable& rNames )
-{
-    SetConstant( rNames.Put( "SYSTEM", CONSTNAME, (sal_uInt16)LANGUAGE_SYSTEM ), (sal_uInt16)LANGUAGE_SYSTEM );
-    SetConstant( rNames.Put( "DONTKNOW", CONSTNAME, (sal_uInt16)LANGUAGE_DONTKNOW ), (sal_uInt16)LANGUAGE_DONTKNOW );
-
-    sal_Int32 nIndex = 0;
-    mnLangId = 0x400; // stay away from selfdefined...
-
-    const ::std::vector< MsLangId::LanguagetagMapping > aList( MsLangId::getDefinedLanguagetags());
-    for (::std::vector< MsLangId::LanguagetagMapping >::const_iterator iTag( aList.begin()); iTag != aList.end(); ++iTag)
-    {
-#if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "ISO Language in : %d, 0x%04x, %s\n",
-                (int)nIndex,
-                (unsigned)(*iTag).mnLang,
-                OUStringToOString( (*iTag).maBcp47, RTL_TEXTENCODING_ASCII_US).getStr());
-        fprintf( stderr, "ISO Language out:");
-#endif
-        LanguageTag aLanguageTag( (*iTag).maBcp47);
-        ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings( true));
-        for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it)
-        {
-            OString aLang( OUStringToOString( *it, RTL_TEXTENCODING_ASCII_US));
-            SetConstant( rNames.Put( aLang.getStr(), CONSTNAME, mnLangId ), mnLangId );
-            bool bAdd = (GetLangId( aLang ) == 0);
-            if ( bAdd )
-                ULong_Iso_map[ aLang ] = mnLangId;
-#if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, " %s 0x%lx (%s)", aLang.getStr(), mnLangId, (bAdd ? "added" : "exists") );
-#endif
-            mnLangId++;
-        }
-#if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "\n");
-#endif
-        nIndex++;
-    }
-    // hack - survive "x-no-translate"
-    /* XXX: that ^^^ was the original comment, but we're adding "x-comment"
-     * here? Which is good anyway. */
-    SetConstant( rNames.Put( "x-comment", CONSTNAME, mnLangId ), mnLangId );
-    mnLangId++;
-
-    OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" );
-    if ( !aEnvIsoTokens.isEmpty() )
-    {
-        OString aIsoToken;
-        sal_uInt16 nTokenCounter = 0;
-        bool bOneMore = true;
-        while ( bOneMore )
-        {
-            aIsoToken = aEnvIsoTokens.getToken(nTokenCounter, ' ');
-            if ( !aIsoToken.isEmpty() )
-            {
-                SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
-                bool bAdd = (GetLangId( aIsoToken ) == 0);
-                if ( bAdd )
-                    ULong_Iso_map[ aIsoToken ] = mnLangId;
-#if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "Env ISO Language out: %s 0x%lx (%s)\n",
-                        aIsoToken.getStr(), mnLangId, (bAdd ? "added" : "exists") );
-#endif
-                mnLangId++;
-            }
-            else
-                bOneMore = false;
-
-            nTokenCounter++;
-        }
-    }
-}
-
-Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
-{
-    Atom nResult = 0;
-    KEY_STRUCT aStruct;
-    if( ! rNames.Get( nResult = pHS->getID( pLang ), &aStruct ) )
-    {
-        SetConstant( nResult = rNames.Put( pLang, CONSTNAME, mnLangId ), mnLangId );
-        // insert new lang to ULong_Iso_map
-        OString aLang( pLang );
-        bool bAdd = (GetLangId( aLang ) == 0);
-        if ( bAdd )
-            ULong_Iso_map[ aLang ] = mnLangId;
-        // increase id counter
-        mnLangId++;
-    }
-    return nResult;
-}
-
-RscEnum * RscTypCont::InitFieldUnitsType()
-{
-    RscEnum * pFieldUnits;
-    pFieldUnits = new RscEnum( pHS->getID( "EnumFieldUnit" ), RSC_NOTYPE );
-
-    SETCONST( pFieldUnits, "FUNIT_NONE", FUNIT_NONE );
-    SETCONST( pFieldUnits, "FUNIT_MM", FUNIT_MM );
-    SETCONST( pFieldUnits, "FUNIT_CM", FUNIT_CM );
-    SETCONST( pFieldUnits, "FUNIT_M", FUNIT_M );
-    SETCONST( pFieldUnits, "FUNIT_KM", FUNIT_KM );
-    SETCONST( pFieldUnits, "FUNIT_TWIP", FUNIT_TWIP );
-    SETCONST( pFieldUnits, "FUNIT_POINT", FUNIT_POINT );
-    SETCONST( pFieldUnits, "FUNIT_PICA", FUNIT_PICA );
-    SETCONST( pFieldUnits, "FUNIT_INCH", FUNIT_INCH );
-    SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT );
-    SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE );
-    SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM );
-    SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR );
-    SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE );
-    SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
-    SETCONST( pFieldUnits, "FUNIT_DEGREE",  FUNIT_DEGREE);
-    SETCONST( pFieldUnits, "FUNIT_SECOND",  FUNIT_SECOND);
-    SETCONST( pFieldUnits, "FUNIT_MILLISECOND",  FUNIT_MILLISECOND);
-    SETCONST( pFieldUnits, "FUNIT_PIXEL",   FUNIT_PIXEL );
-
-    return pFieldUnits;
-}
-
-RscTupel * RscTypCont::InitStringLongTupel()
-{
-    RscTop *    pTupel;
-    Atom        nId;
-
-    // insert client variables
-    pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE );
-    nId = aNmTb.Put( "ItemText", VARNAME );
-    pTupel->SetVariable( nId, &aString );
-    nId = aNmTb.Put( "ItemId", VARNAME );
-    pTupel->SetVariable( nId, &aEnumLong );
-
-    return static_cast<RscTupel *>(pTupel);
-}
-
-RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong )
-{
-    RscCont * pCont;
-
-    pCont = new RscCont( pHS->getID( "CharsLongTupel[]" ), RSC_NOTYPE );
-    pCont->SetTypeClass( pStringLong );
-
-    return pCont;
-}
-
-RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst )
-{
-    return new RscArray( pHS->getID( "Lang_CharsLongTupelList" ),
-                         RSC_NOTYPE, pStrLongTupelLst, &aLangType );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
deleted file mode 100644
index 46ab34a0fd97..000000000000
--- a/rsc/source/parser/rscicpx.cxx
+++ /dev/null
@@ -1,74 +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 <stdlib.h>
-#include <stdio.h>
-
-#include <tools/rcid.h>
-#include <tools/wintypes.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-
-#include <rscmgr.hxx>
-#include <rscclass.hxx>
-#include <rsccont.hxx>
-#include <rscdb.hxx>
-#include <rsc/rscsfx.hxx>
-#include <rsclex.hxx>
-#include <rscyacc.hxx>
-
-RscTop * RscTypCont::InitClassMgr()
-{
-    RscTop      *   pClassMgr;
-    RscBaseCont *   pClass;
-    Atom            nId;
-
-    aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, false ) );
-
-    nId = pHS->getID( "Resource" );
-    pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass );
-    aNmTb.Put( nId, CLASSNAME, pClassMgr );
-    pClassMgr->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
-    // initialize variables
-    nId = aNmTb.Put( "Comment", VARNAME );
-    pClassMgr->SetVariable( nId, &aString, nullptr, RSCVAR::NoRc );
-
-    pClass->SetTypeClass( pClassMgr );
-
-    return pClassMgr;
-}
-
-RscTop * RscTypCont::InitClassString( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassString;
-
-    nId = pHS->getID( "String" );
-    pClassString = new RscClass( nId, RSC_STRING, pSuper );
-    aNmTb.Put( nId, CLASSNAME, pClassString );
-    pClassString->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-
-    // initialize variables
-    nId = aNmTb.Put( "Text", VARNAME );
-    pClassString->SetVariable( nId, &aLangString );
-    return pClassString;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
deleted file mode 100644
index 282b9cad33bf..000000000000
--- a/rsc/source/parser/rscinit.cxx
+++ /dev/null
@@ -1,106 +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 <stdlib.h>
-#include <stdio.h>
-
-#include <tools/rcid.h>
-#include <tools/wintypes.hxx>
-
-#include <rsctree.hxx>
-#include <rsctop.hxx>
-#include <rscrange.hxx>
-#include <rscconst.hxx>
-#include <rscstr.hxx>
-#include <rsccont.hxx>
-#include <rscmgr.hxx>
-#include <rscclass.hxx>
-#include <rsckey.hxx>
-#include <rscdb.hxx>
-#include <rsclex.hxx>
-#include <rscyacc.hxx>
-
-void RscTypCont::Init()
-{
-    RscTupel *  pStringLongTupel;
-    RscCont  *  pStringLongTupelList;
-    RscArray *  pLangStringLongTupelList;
-
-    RscTop   *  pClassMgr;
-    RscTop   *  pClassString;
-    RscTop   *  pClassStringArray;
-
-    Atom        nId;
-
-    aNmTb.SetSort( false );
-{
-    aNmTb.Put( "LINE",               LINE,           (sal_IntPtr)0 );
-    aNmTb.Put( "NOT",                NOT,            (sal_IntPtr)0 );
-    aNmTb.Put( "DEFINE",             DEFINE,         (sal_IntPtr)0 );
-    aNmTb.Put( "INCLUDE",            INCLUDE,        (sal_IntPtr)0 );
-    aNmTb.Put( "DEFAULT",            DEFAULT,        (sal_IntPtr)0  );
-    aNmTb.Put( "class",              CLASS,          (sal_IntPtr)0  );
-    aNmTb.Put( "extendable",         EXTENDABLE,     (sal_IntPtr)0  );
-    aNmTb.Put( "writeifset",         WRITEIFSET,     (sal_IntPtr)0  );
-
-/* values for integer types */
-    aNmTb.Put( "TRUE",               BOOLEAN,        (sal_IntPtr)true  );
-    aNmTb.Put( "FALSE",              BOOLEAN,        (sal_IntPtr)false );
-}
-{
-    aEnumLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 );
-}
-{
-    aLangType.Init( aNmTb );
-    aBaseLst.push_back( InitFieldUnitsType() );
-
-    aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() );
-    aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) );
-    aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) );
-}
-{
-    pRoot = pClassMgr = InitClassMgr();
-
-    aVersion.pClass = new RscClass( pHS->getID( "VersionControl" ),
-                                    RSC_VERSIONCONTROL, pClassMgr );
-    aVersion = aVersion.pClass->Create( nullptr, RSCINST() );
-
-    pClassString = InitClassString( pClassMgr );
-    pRoot->Insert( pClassString );
-
-    // set String as reference class of the base strings
-    aString.SetRefClass( pClassString );
-
-    // initialize class
-    nId = pHS->getID( "StringArray" );
-    pClassStringArray = new RscClass( nId, RSC_STRINGARRAY, pClassMgr );
-    pClassStringArray->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-    aNmTb.Put( nId, CLASSNAME, pClassStringArray );
-    pRoot->Insert( pClassStringArray );
-
-    // initialize variables
-    nId = aNmTb.Put( "ItemList", VARNAME );
-    pClassStringArray->SetVariable( nId, pLangStringLongTupelList );
-}
-
-    aNmTb.SetSort();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
deleted file mode 100644
index 843470f793b8..000000000000
--- a/rsc/source/parser/rsckey.cxx
+++ /dev/null
@@ -1,138 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <rscall.h>
-#include <rsctools.hxx>
-#include <rschash.hxx>
-#include <rsckey.hxx>
-
-extern "C" {
-    int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond );
-}
-
-int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond )
-{
-    if( static_cast<KEY_STRUCT const *>(pFirst)->nName > static_cast<KEY_STRUCT const *>(pSecond)->nName )
-        return 1;
-    else if( static_cast<KEY_STRUCT const *>(pFirst)->nName < static_cast<KEY_STRUCT const *>(pSecond)->nName )
-        return -1;
-    else
-        return 0;
-}
-
-RscNameTable::RscNameTable()
-{
-    bSort    = true;
-    nEntries = 0;
-    pTable   = nullptr;
-};
-
-RscNameTable::~RscNameTable()
-{
-    if( pTable )
-        rtl_freeMemory( pTable );
-};
-
-
-void RscNameTable::SetSort( bool bSorted )
-{
-    bSort = bSorted;
-    if( bSort && pTable)
-    {
-        // sort keyword field
-        qsort( static_cast<void *>(pTable), nEntries,
-               sizeof( KEY_STRUCT ), KeyCompare );
-    }
-};
-
-Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, sal_IntPtr nValue )
-{
-    if( pTable )
-        pTable = static_cast<KEY_STRUCT *>(
-                 rtl_reallocateMemory( static_cast<void *>(pTable),
-                 ((nEntries +1) * sizeof( KEY_STRUCT )) ));
-    else
-        pTable = static_cast<KEY_STRUCT *>(
-                 rtl_allocateMemory( (nEntries + 1) * sizeof( KEY_STRUCT ) ) );
-
-    pTable[ nEntries ].nName  = nName;
-    pTable[ nEntries ].nTyp   = nTyp;
-    pTable[ nEntries ].yylval = nValue;
-    nEntries++;
-    if( bSort )
-        SetSort();
-
-    return nName;
-};
-
-Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, sal_IntPtr nValue )
-{
-    return Put( pHS->getID( pName ), nTyp, nValue );
-};
-
-Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp )
-{
-    Atom  nId;
-
-    nId = pHS->getID( pName );
-    return Put( nId, nTyp, (sal_IntPtr)nId );
-};
-
-void RscNameTable::Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass )
-{
-    Put( nName, nTyp, reinterpret_cast<sal_IntPtr>(pClass) );
-};
-
-bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle )
-{
-    KEY_STRUCT * pKey = nullptr;
-    KEY_STRUCT  aSearchName;
-    sal_uInt32  i;
-
-    if( bSort )
-    {
-        // search for the keyword
-        aSearchName.nName = nName;
-        pKey = static_cast<KEY_STRUCT *>(bsearch(
-                &aSearchName, pTable,
-                nEntries, sizeof( KEY_STRUCT ), KeyCompare ));
-    }
-    else
-    {
-        i = 0;
-        while( i < nEntries && !pKey )
-        {
-            if( pTable[ i ].nName == nName )
-                pKey = &pTable[ i ];
-            i++;
-        }
-    }
-
-    if( pKey )
-    {
-        *pEle = *pKey;
-        return true;
-    }
-    return false;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
deleted file mode 100644
index c85ef55c96cc..000000000000
--- a/rsc/source/parser/rsclex.cxx
+++ /dev/null
@@ -1,432 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include <rscerror.h>
-#include <rschash.hxx>
-#include <rscdb.hxx>
-#include <rsctop.hxx>
-#include <rsckey.hxx>
-#include <rscpar.hxx>
-#include <rscdef.hxx>
-
-#include <rsclex.hxx>
-#include <rscyacc.hxx>
-
-#include <rtl/character.hxx>
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-
-
-const char* StringContainer::putString( const char* pString )
-{
-    OString aString( pString );
-    std::pair<
-        std::unordered_set< OString, OStringHash >::iterator,
-        bool > aInsert =
-        m_aStrings.insert( aString );
-
-    return aInsert.first->getStr();
-}
-
-static char     c;
-static bool     bLastInclude;//  true, if last symbol was INCLUDE
-RscFileInst*    pFI;
-RscTypCont*     pTC;
-RscExpression * pExp;
-struct KeyVal
-{
-    int     nKeyWord;
-    YYSTYPE aYYSType;
-};
-static KeyVal aKeyVal[ 1 ];
-static bool bTargetDefined;
-
-StringContainer* pStringContainer = nullptr;
-
-static RscDefine RSC_GLOBAL_DEFINE(RscFileTab::Index(0), OString("__RSC"), 1);
-
-sal_uInt32 GetNumber()
-{
-    sal_uInt32  l = 0;
-    sal_uInt32  nLog = 10;
-
-    if( '0' == c )
-    {
-        c = pFI->GetFastChar();
-        if( 'x' == c )
-        {
-            nLog = 16;
-            c = pFI->GetFastChar();
-        }
-    }
-
-    if( nLog == 16 )
-    {
-        while( rtl::isAsciiHexDigit( static_cast<unsigned char>(c) ) )
-        {
-            if( rtl::isAsciiDigit( static_cast<unsigned char>(c) ) )
-                l = l * nLog + (c - '0');
-            else
-                l = l * nLog + (rtl::toAsciiUpperCase( static_cast<sal_uInt32>(c) ) - 'A' + 10 );
-
-            c = pFI->GetFastChar();
-        }
-    }
-    else
-    {
-        while( rtl::isAsciiDigit( static_cast<unsigned char>(c) ) || 'x' == c )
-        {
-            l = l * nLog + (c - '0');
-            c = pFI->GetFastChar();
-        }
-    }
-
-    while( c=='U' || c=='u' || c=='l' || c=='L' ) // because of unsigned longs
-        c = pFI->GetFastChar();
-
-    if( l > 0x7fffffff ) // drop the most significant bit if needed;
-        l &= 0x7fffffff;
-
-    return l;
-}
-
-int MakeToken( YYSTYPE * pTokenVal )
-{
-    int             c1;
-
-    while( true ) // ignore comments and space characters
-    {
-        while( rtl::isAsciiWhiteSpace( static_cast<unsigned char>(c) ) )
-            c = pFI->GetFastChar();
-
-        if( '/' == c )
-        {
-            c1 = c;
-            c = pFI->GetFastChar();
-            if( '/' == c )
-            {
-                while( '\n' != c && !pFI->IsEof() )
-                    c = pFI->GetFastChar();
-
-                c = pFI->GetFastChar();
-            }
-            else if( '*' == c )
-            {
-                c = pFI->GetFastChar();
-                do
-                {
-                    while( '*' != c && !pFI->IsEof() )
-                        c = pFI->GetFastChar();
-
-                    c = pFI->GetFastChar();
-                }
-                while( '/' != c && !pFI->IsEof() );
-                c = pFI->GetFastChar();
-            }
-            else
-                return c1;
-        }
-        else
-            break;
-    }
-
-    // FIXME: wtf is this supposed to do?
-    if( (c != 0) == pFI->IsEof() )
-    {
-        return 0;
-    }
-
-    if( bLastInclude )
-    {
-        bLastInclude = false; // reset
-        if( '<' == c )
-        {
-            OStringBuffer aBuf( 256 );
-            c = pFI->GetFastChar();
-            while( '>' != c && !pFI->IsEof() )
-            {
-                aBuf.append( c );
-                c = pFI->GetFastChar();
-            }
-            c = pFI->GetFastChar();
-            pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
-            return INCLUDE_STRING;
-        }
-    }
-
-    if( c == '"' )
-    {
-        OStringBuffer aBuf( 256 );
-        bool bDone = false;
-        while( !bDone && !pFI->IsEof() && c )
-        {
-            c = pFI->GetFastChar();
-            if( c == '"' )
-            {
-                do
-                {
-                    c = pFI->GetFastChar();
-                }
-                while(  c == ' ' || c == '\t' );
-
-                if( c == '"' )
-                {
-                    // this is a continued string
-                    // note: multiline string continuations are handled by the parser
-                    // see rscyacc.y
-                }
-                else
-                    bDone = true;
-            }
-            else if( c == '\\' )
-            {
-                aBuf.append( '\\' );
-                c = pFI->GetFastChar();
-                if( c )
-                    aBuf.append( c );
-            }
-            else
-                aBuf.append( c );
-        }
-        pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
-        return STRING;
-    }
-    if (rtl::isAsciiDigit (static_cast<unsigned char>(c)))
-    {
-        pTokenVal->value = GetNumber();
-        return NUMBER;
-    }
-
-    if( rtl::isAsciiAlpha (static_cast<unsigned char>(c)) || (c == '_') )
-    {
-        Atom        nHashId;
-        OStringBuffer aBuf( 256 );
-
-        while( rtl::isAsciiAlphanumeric (static_cast<unsigned char>(c))
-               || (c == '_') || (c == '-') || (c == ':'))
-        {
-            aBuf.append( c );
-            c = pFI->GetFastChar();
-        }
-
-        nHashId = pHS->getID( aBuf.getStr(), true );
-        if( InvalidAtom != nHashId )
-        {
-            KEY_STRUCT  aKey;
-
-            // search for keyword
-            if( pTC->aNmTb.Get( nHashId, &aKey ) )
-            {
-
-                // keyword found
-                switch( aKey.nTyp )
-                {
-                case CLASSNAME:
-                    pTokenVal->pClass = reinterpret_cast<RscTop *>(aKey.yylval);
-                    break;
-                case VARNAME:
-                    pTokenVal->varid = aKey.nName;
-                    break;
-                case CONSTNAME:
-                    pTokenVal->constname.hashid = aKey.nName;
-                    pTokenVal->constname.nValue = aKey.yylval;
-                    break;
-                case BOOLEAN:
-                    pTokenVal->svbool = (bool)aKey.yylval;
-                    break;
-                case INCLUDE:
-                    bLastInclude = true;
-                    SAL_FALLTHROUGH;
-                default:
-                    pTokenVal->value = aKey.yylval;
-                }
-
-                return aKey.nTyp;
-            }
-            else
-            {
-                pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
-                return SYMBOL;
-            }
-        }
-        else
-        {
-            // Symbol
-            RscDefine  * pDef;
-
-            // this #define symbol is used to indicate to various code that it is being processed with the RSC compiler
-            if (strcmp(aBuf.getStr(), "__RSC") == 0)
-                pDef = &RSC_GLOBAL_DEFINE;
-            else
-                pDef = pTC->aFileTab.FindDef( aBuf.getStr() );
-            if( pDef )
-            {
-                pTokenVal->defineele = pDef;
-
-                return RSCDEFINE;
-            }
-
-            pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
-            return SYMBOL;
-        }
-    }
-
-    if( c=='<' )
-    {
-        c = pFI->GetFastChar();
-        if( c=='<' )
-        {
-            c = pFI->GetFastChar();
-            return LEFTSHIFT;
-        }
-        else
-            return '<';
-    }
-
-    if( c=='>' )
-    {
-        c = pFI->GetFastChar();
-        if( c=='>' )
-        {
-            c = pFI->GetFastChar();
-            return RIGHTSHIFT;
-        }
-        else
-            return '>';
-    }
-
-    c1 = c;
-    c = pFI->GetFastChar();
-    return c1;
-}
-
-int yylex()
-{
-    if( bTargetDefined )
-        bTargetDefined = false;
-    else
-        aKeyVal[ 0 ].nKeyWord = MakeToken( &aKeyVal[ 0 ].aYYSType );
-
-    yylval = aKeyVal[ 0 ].aYYSType;
-    return aKeyVal[ 0 ].nKeyWord;
-}
-
-#if defined __sun
-extern "C" void yyerror( const char* pMessage )
-#else
-void yyerror( char* pMessage )
-#endif
-{
-    pTC->pEH->Error( ERR_YACC, nullptr, RscId(), pMessage );
-}
-
-void InitParser( RscFileInst * pFileInst )
-{
-    pTC = pFileInst->pTypCont;          // set file container
-    pFI = pFileInst;
-    pStringContainer = new StringContainer();
-    pExp = nullptr;                // for macro parser
-    bTargetDefined = false;
-
-    // initialize first character
-    bLastInclude = false;
-    c = pFI->GetFastChar();
-}
-
-void EndParser()
-{
-    // empty stack
-    while( ! S.IsEmpty() )
-        S.Pop();
-
-    // free string container
-    delete pStringContainer;
-    pStringContainer = nullptr;
-
-    delete pExp;
-    pTC      = nullptr;
-    pFI      = nullptr;
-    pExp     = nullptr;
-
-}
-
-void IncludeParser( RscFileInst * pFileInst )
-{
-    int           nToken;   // token value
-    YYSTYPE       aYYSType; // token data
-    RscFile     * pFName;   // file structure
-    RscFileTab::Index lKey;     // file key
-    RscTypCont  * pTypCon  = pFileInst->pTypCont;
-
-    pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() );
-    InitParser( pFileInst );
-
-    nToken = MakeToken( &aYYSType );
-    while( 0 != nToken && CLASSNAME != nToken )
-    {
-        if( '#' == nToken )
-        {
-            if( INCLUDE == (nToken = MakeToken( &aYYSType )) )
-            {
-                if( STRING == (nToken = MakeToken( &aYYSType )) )
-                {
-                    lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
-                                                         aYYSType.string );
-                    pFName->InsertDependFile( lKey );
-                }
-                else if( INCLUDE_STRING == nToken )
-                {
-                    lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
-                                                         OString() );
-                    pFName->InsertDependFile( lKey );
-                }
-            }
-        }
-        nToken = MakeToken( &aYYSType );
-    }
-
-    EndParser();
-}
-
-ERRTYPE parser( RscFileInst * pFileInst )
-{
-    ERRTYPE aError;
-
-    InitParser( pFileInst );
-
-    aError = yyparse();
-
-    EndParser();
-
-    // yyparser returns 0 on success
-    if( 0 == aError.GetError() )
-        aError.Clear();
-    if( pFileInst->pTypCont->pEH->nErrors )
-        aError = ERR_ERROR;
-    pFileInst->SetError( aError );
-    return aError;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
deleted file mode 100644
index de4780aee143..000000000000
--- a/rsc/source/parser/rscpar.cxx
+++ /dev/null
@@ -1,160 +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 <string.h>
-#include <rscpar.hxx>
-#include <rscdb.hxx>
-
-void RscFileInst::Init()
-{
-    nLineNo = 0;
-    nLineBufLen = 256;
-    pLine = static_cast<char *>(rtl_allocateMemory( nLineBufLen ));
-    *pLine = '\0';
-    nScanPos = 0;
-    cLastChar = '\0';
-    bEof = false;
-}
-
-RscFileInst::RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc,
-                          RscFileTab::Index lFIndex, FILE * fFile )
-{
-    pTypCont = pTC;
-    Init();
-
-    lFileIndex = lFIndex;
-    lSrcIndex = lIndexSrc;
-    fInputFile = fFile;
-
-    // state: pointer at the end of the input buffer
-    nInputPos = nInputEndPos = READBUFFER_MAX;
-    pInput    = static_cast<char *>(rtl_allocateMemory( nInputBufLen ));
-}
-
-RscFileInst::~RscFileInst()
-{
-    if( pInput )
-        rtl_freeMemory( pInput );
-    if( pLine )
-        rtl_freeMemory( pLine );
-}
-
-char RscFileInst::GetChar()
-{
-    if( pLine[ nScanPos ] )
-        return pLine[ nScanPos++ ];
-    else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen )
-    {
-        // end of file
-        bEof = true;
-        return 0;
-    }
-    else
-    {
-        GetNewLine();
-        return '\n';
-    }
-}
-
-void RscFileInst::GetNewLine()
-{
-    nLineNo++;
-    nScanPos = 0;
-
-    // run until end of file
-    sal_uInt32 nLen = 0;
-    while( (nInputPos < nInputEndPos) || (nInputEndPos == nInputBufLen) )
-    {
-        if( (nInputPos >= nInputEndPos) && fInputFile )
-        {
-            nInputEndPos = fread( pInput, 1, nInputBufLen, fInputFile );
-            nInputPos = 0;
-        }
-
-        while( nInputPos < nInputEndPos )
-        {
-            // always read one line
-            if( nLen >= nLineBufLen )
-            {
-                nLineBufLen += 256;
-                // one more for '\0'
-                pLine = static_cast<char*>(rtl_reallocateMemory( pLine, nLineBufLen +1 ));
-            }
-
-            // cr lf, lf cr, lf or cr become '\0'
-            if( pInput[ nInputPos ] == '\n' )
-            {
-                nInputPos++;
-                if( cLastChar != '\r' )
-                {
-                    cLastChar = '\n';
-                    pLine[ nLen++ ] = '\0';
-                    goto END;
-                }
-            }
-            else if( pInput[ nInputPos ] == '\r' )
-            {
-                nInputPos++;
-                if( cLastChar != '\n' )
-                {
-                    cLastChar = '\r';
-                    pLine[ nLen++ ] = '\0';
-                    goto END;
-                }
-            }
-            else
-            {
-                pLine[ nLen++ ] = pInput[ nInputPos++ ];
-                if( nLen > 2 )
-                {
-                    if( (unsigned char)pLine[nLen-3] == 0xef &&
-                        (unsigned char)pLine[nLen-2] == 0xbb &&
-                        (unsigned char)pLine[nLen-1] == 0xbf )
-                    {
-                        nLen -= 3;
-                    }
-                }
-            }
-        }
-    }
-
-    // stop on reaching EOF
-    pLine[ nLen ] = '\0';
-
-END:
-    if( pTypCont->pEH->GetListFile() )
-    {
-        char buf[ 10 ];
-
-        sprintf( buf, "%5d ", (int)GetLineNo() );
-        pTypCont->pEH->LstOut( buf );
-        pTypCont->pEH->LstOut( GetLine() );
-        pTypCont->pEH->LstOut( "\n" );
-    }
-}
-
-void RscFileInst::SetError( ERRTYPE aError )
-{
-    if( aError.IsOk() )
-    {
-        aFirstError = aError;
-    }
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
deleted file mode 100644
index 45efad4891d7..000000000000
--- a/rsc/source/parser/rscyacc.y
+++ /dev/null
@@ -1,1153 +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 "sal/config.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rtl/strbuf.hxx>
-#include <rscerror.h>
-#include <rsctools.hxx>
-#include <rscclass.hxx>
-#include <rsccont.hxx>
-#include <rsctree.hxx>
-#include <rscdb.hxx>
-#include <rscdef.hxx>
-#include <rscpar.hxx>
-
-#include <rsclex.hxx>
-
-ObjectStack                     S;
-
-RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName )
-{
-    RSCINST aInst;
-
-    aInst = rInst.pClass->GetVariable( rInst, pHS->getID( pVarName ),
-                                       RSCINST() );
-
-    if( !aInst.pData )
-        pTC->pEH->Error( ERR_NOVARIABLENAME, rInst.pClass, RscId() );
-
-    return aInst;
-}
-
-void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr )
-{
-    RSCINST aInst;
-
-    aInst = GetVarInst( rInst, pVarName );
-    if( aInst.pData ){
-        ERRTYPE aError;
-        aError = aInst.pClass->SetString( aInst, pStr );
-
-        if( aError.IsError() )
-            pTC->pEH->Error( aError, aInst.pClass, RscId() );
-    }
-}
-
-RscId MakeRscId( RscExpType aExpType )
-{
-    if( !aExpType.IsNothing() )
-    {
-        sal_Int32 lValue(0);
-
-        if( !aExpType.Evaluate( &lValue ) )
-            pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() );
-        if( lValue < 1 || lValue > (sal_Int32)0x7FFF )
-        {
-            pTC->pEH->Error( ERR_IDRANGE, nullptr, RscId(),
-                             rtl::OString::number(lValue).getStr() );
-        }
-
-        if( aExpType.IsDefinition() )
-            return RscId( aExpType.aExp.pDef );
-        else
-            return RscId( lValue );
-    }
-    return RscId();
-}
-
-bool DoClassHeader( RSCHEADER * pHeader, bool bMember )
-{
-    RSCINST aCopyInst;
-    RscId aName1 = MakeRscId( pHeader->nName1 );
-    RscId aName2 = MakeRscId( pHeader->nName2 );
-
-    if( pHeader->pRefClass )
-        aCopyInst.pClass = pHeader->pRefClass;
-    else
-        aCopyInst.pClass = pHeader->pClass;
-
-    if( pHeader->nTyp == TYPE_COPY )
-    {
-        ObjNode * pCopyObj = aCopyInst.pClass->GetObjNode( aName2 );
-
-        if( !pCopyObj )
-        {
-            rtl::OStringBuffer aMsg( pHS->getString( aCopyInst.pClass->GetId() ) );
-            aMsg.append(' ');
-            aMsg.append(aName2.GetName());
-            pTC->pEH->Error( ERR_NOCOPYOBJ, pHeader->pClass, aName1,
-                             aMsg.getStr() );
-        }
-        else
-            aCopyInst.pData = pCopyObj->GetRscObj();
-    }
-
-    if( bMember )
-    {
-        // specification of superclasses or derived classes is now allowed
-        if( S.Top().pClass->InHierarchy( pHeader->pClass ) ||
-            pHeader->pClass->InHierarchy( S.Top().pClass) )
-        {
-            if( aCopyInst.IsInst() )
-            {
-                RSCINST aTmpI( S.Top() );
-                aTmpI.pClass->Destroy( aTmpI );
-                aTmpI.pClass->Create( &aTmpI, aCopyInst );
-            }
-        }
-        else
-            pTC->pEH->Error( ERR_FALSETYPE, S.Top().pClass, aName1,
-                             pHS->getString( pHeader->pClass->GetId() ).getStr() );
-    }
-    else
-    {
-        if( S.IsEmpty() )
-        {
-            if( aName1.GetNumber() < 256 )
-                pTC->pEH->Error( WRN_GLOBALID, pHeader->pClass, aName1 );
-
-            if( aCopyInst.IsInst() )
-                S.Push( pHeader->pClass->Create( nullptr, aCopyInst ) );
-            else
-                S.Push( pHeader->pClass->Create( nullptr, RSCINST() ) );
-
-            pTC->pEH->StdOut( ".", RscVerbosityVerbose );
-
-            if( !aName1.IsId() )
-                pTC->pEH->Error( ERR_IDEXPECTED, pHeader->pClass, aName1 );
-            else
-            {
-                ObjNode * pNode = new ObjNode( aName1, S.Top().pData,
-                                               pFI->GetFileIndex() );
-                if( !pHeader->pClass->PutObjNode( pNode ) )
-                    pTC->pEH->Error( ERR_DOUBLEID, pHeader->pClass, aName1 );
-            }
-        }
-        else
-        {
-            RSCINST aTmpI;
-            ERRTYPE aError;
-
-            if( aName1.GetNumber() >= 256 && aName1.IsId() )
-                pTC->pEH->Error( WRN_LOCALID, pHeader->pClass, aName1 );
-
-            aError = S.Top().pClass->GetElement( S.Top(), aName1,
-                                                 pHeader->pClass, aCopyInst, &aTmpI );
-
-            if( aError.IsWarning() )
-            {
-                pTC->pEH->Error( aError, pHeader->pClass, aName1 );
-            }
-            else if( aError.IsError() )
-            {
-                if( aError.GetError() == ERR_CONT_INVALIDTYPE )
-                    pTC->pEH->Error( aError, S.Top().pClass, aName1,
-                                     pHS->getString( pHeader->pClass->GetId() ).getStr() );
-                else
-                    pTC->pEH->Error( aError, S.Top().pClass, aName1 );
-
-                S.Top().pClass->GetElement( S.Top(), RscId(),
-                                            pHeader->pClass, RSCINST(), &aTmpI );
-
-                if( !aTmpI.IsInst() )
-                    return false;
-            }
-            S.Push( aTmpI );
-        }
-    }
-    if( pHeader->nTyp == TYPE_REF )
-    {
-        ERRTYPE aError;
-
-        aError = S.Top().pClass->SetRef( S.Top(), aName2 );
-        pTC->pEH->Error( aError, S.Top().pClass, aName1 );
-    }
-
-    return true ;
-}
-
-RSCINST GetFirstTupelEle( const RSCINST & rTop )
-{ // upward compatible, test Tupel
-    RSCINST aInst;
-    ERRTYPE aErr;
-
-    aErr = rTop.pClass->GetElement( rTop, RscId(), nullptr, RSCINST(), &aInst );
-    if( !aErr.IsError() )
-        aInst = aInst.pClass->GetTupelVar( aInst, 0, RSCINST() );
-    return aInst;
-}
-
-//#define YYDEBUG 1
-
-#ifdef UNX
-#define YYMAXDEPTH              2000
-#else
-#define YYMAXDEPTH              800
-#endif
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable:4129 4273 4701 4702)
-#endif
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wwrite-strings"
-#endif
-%}
-
-/* Compilerstack */
-
-%union {
-        Atom                    varid;
-        struct {
-                Atom            hashid;
-                sal_Int32       nValue;
-        } constname;
-        RscTop *                pClass;
-        RSCHEADER               header;
-        struct {
-                CLASS_DATA      pData;
-                RscTop *        pClass;
-        } instance;
-        sal_Int32               value;
-        sal_uInt16              ushort;
-        short                   exp_short;
-        char *                  string;
-        bool                    svbool;
-        REF_ENUM                copyref;
-        RscDefine *             defineele;
-        rtl_TextEncoding        charset;
-        RscExpType              macrostruct;
-}
-
-/* Token */
-%token <value>                  NUMBER
-%token <string>                 SYMBOL
-%token <defineele>              RSCDEFINE
-%token <string>                 STRING
-%token <string>                 INCLUDE_STRING
-%token <character>              CHARACTER
-%token <svbool>                 BOOLEAN
-
-%token LINE
-%token AUTO_ID
-%token NOT
-%token DEFINE
-%token INCLUDE
-%token MACROTARGET
-%token DEFAULT
-
-
-%token <pClass>                 CLASSNAME
-%token <varid>                  VARNAME
-%token <constname>              CONSTNAME
-%token CLASS
-%token EXTENDABLE
-%token WRITEIFSET
-
-
-%type  <macrostruct>    macro_expression
-%type  <macrostruct>    id_expression
-%type  <string>                 string_multiline
-
-%type  <header>                 class_header_body
-%type  <header>                 class_header
-%type  <header>                 var_header_class
-%type  <copyref>                copy_ref
-
-
-%left '|'
-%left '&'
-%left LEFTSHIFT RIGHTSHIFT
-%left '+' '-'
-%left '*' '/'
-%left UNARYMINUS
-%left UNARYPLUS
-%left ','
-%left '(' ')'
-
-
-/*      Grammatik  */
-
-%start resource_definitions
-
-%%
-
-resource_definitions
-  :
-  | resource_definitions resource_definition
-  | MACROTARGET macro_expression
-  {
-      RscExpType              aExpType;
-      sal_Int32                       lValue;
-
-      aExpType.cUnused = false;
-      aExpType.cType = RSCEXP_NOTHING;
-      pExp = new RscExpression( aExpType, '+', $2 );
-      if( !pExp->Evaluate( &lValue ) )
-      {
-          pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() );
-      }
-      delete pExp;
-  }
-;
-
-resource_definition
-  : line_number
-  | '#' DEFINE SYMBOL macro_expression
-  {
-      bool bError = false;
-
-      if( $4.IsNumber() )
-      {
-          if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-                                     rtl::OString( $3 ),
-                                     $4.GetLong() ) )
-              bError = true;
-      }
-      else if( $4.IsDefinition() )
-      {
-          RscExpType aExpType;
-          RscExpression * pExpr;
-
-          aExpType.cUnused = false;
-          aExpType.cType = RSCEXP_NOTHING;
-          aExpType.SetLong( 0 );
-          aExpType.cType = RSCEXP_LONG;
-          pExpr = new RscExpression( aExpType, '+', $4 );
-
-          if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-                                     rtl::OString( $3 ), pExpr ) )
-          {
-              bError =true;
-          }
-      }
-      else if( $4.IsExpression() )
-      {
-          if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-                                     rtl::OString( $3 ), $4.aExp.pExp ) )
-          {
-              bError = true;
-          }
-      }
-
-      if( bError )
-      {
-          pTC->pEH->Error( ERR_DECLAREDEFINE, nullptr, RscId(), $3 );
-      }
-  }
-  | '#' DEFINE RSCDEFINE macro_expression
-  {
-      pTC->pEH->Error(
-          ERR_DOUBLEDEFINE, nullptr, RscId(), $3->GetName().getStr() );
-  }
-  | '#' INCLUDE STRING
-  {
-  }
-  | '#' INCLUDE INCLUDE_STRING
-  {
-  }
-  | class_definition ';'
-  {
-#ifdef D40
-      void * pMem;
-      pMem = rtl_allocateMemory( 20000 );
-      rtl_freeMemory( pMem );
-#endif
-  }
-  ;
-
-class_definition
-  : class_header class_body
-  {
-      if( $1.nTyp == TYPE_REF )
-      {
-          pTC->pEH->Error( ERR_REFNOTALLOWED, S.Top().pClass,
-                           RscId( $1.nName1 ) );
-      }
-      S.Pop();
-  }
-  | class_header
-  {
-      ERRTYPE aError;
-      RscId aRscId( $1.nName1 );
-
-      if( $1.nTyp == TYPE_NOTHING && aRscId.IsId() )
-          aError = S.Top().pClass->SetRef( S.Top(), aRscId );
-      else if( $1.nTyp == TYPE_COPY )
-          aError = ERR_COPYNOTALLOWED;
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, aRscId );
-      S.Pop();
-  }
-  ;
-
-class_header
-  : class_header_body
-  {
-      if( !DoClassHeader( &$1, false ) )
-          return ERR_ERROR;
-      $$ = $1;
-  }
-  ;
-
-copy_ref
-  : '<'
-  {
-      $$ = TYPE_COPY;
-  }
-  | ','
-  {
-      $$ = TYPE_REF;
-  }
-;
-
-class_header_body
-  : CLASSNAME id_expression copy_ref CLASSNAME id_expression
-  {
-      $$.pClass = $1;
-      $$.nName1 = $2;
-      $$.nTyp = $3;
-      $$.pRefClass = $4;
-      $$.nName2 = $5;
-  }
-  | CLASSNAME id_expression copy_ref id_expression
-  {
-      $$.pClass = $1;
-      $$.nName1 = $2;
-      $$.nTyp = $3;
-      $$.pRefClass = nullptr;
-      $$.nName2 = $4;
-  }
-  | CLASSNAME id_expression
-  {
-      $$.pClass = $1;
-      $$.nName1 = $2;
-      $$.nTyp = TYPE_NOTHING;
-      $$.pRefClass = nullptr;
-      $$.nName2.cType = RSCEXP_NOTHING;
-  }
-  | CLASSNAME copy_ref id_expression
-  {
-      $$.pClass = $1;
-      $$.nName1.cType = RSCEXP_NOTHING;
-      $$.nTyp = $2;
-      $$.pRefClass = nullptr;
-      $$.nName2 = $3;
-  }
-  | CLASSNAME copy_ref CLASSNAME id_expression
-  {
-      $$.pClass = $1;
-      $$.nName1.cType = RSCEXP_NOTHING;
-      $$.nTyp = $2;
-      $$.pRefClass = $3;
-      $$.nName2 = $4;
-  }
-  | CLASSNAME
-  {
-      $$.pClass = $1;
-      $$.nName1.cType = RSCEXP_NOTHING;
-      $$.nTyp = TYPE_NOTHING;
-      $$.nName2.cType = RSCEXP_NOTHING;
-  }
-;
-
-class_body
-  : '{' var_definitions '}'
-  | '{' '}'
-  | string_multiline
-  {
-      SetString( S.Top(), "TEXT", $1 );
-  }
-;
-
-var_definitions
-  : var_definition
-  | var_definitions var_definition
-  ;
-
-var_definition
-  : line_number
-  | var_header var_body ';'
-  {
-      S.Pop();
-  }
-  | class_definition ';'
-  | var_header_class class_body ';'
-  {
-      if( $1.nTyp == TYPE_REF )
-          pTC->pEH->Error( ERR_REFNOTALLOWED, S.Top().pClass,
-                           RscId( $1.nName1 ) );
-
-      if( S.Top().pClass->GetCount( S.Top() ) )
-          pTC->pEH->Error( WRN_SUBINMEMBER, S.Top().pClass,
-                           RscId(  $1.nName1 ) );
-
-      S.Pop();
-  }
-  | var_header_class ';'
-  {
-      ERRTYPE aError;
-      RscId aRscId( $1.nName1 );
-
-      if( $1.nTyp == TYPE_NOTHING && aRscId.IsId() )
-          aError = S.Top().pClass->SetRef( S.Top(), aRscId );
-      else if( $1.nTyp == TYPE_COPY )
-          aError = ERR_COPYNOTALLOWED;
-      if( S.Top().pClass->GetCount( S.Top() ) )
-          aError = WRN_SUBINMEMBER;
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, aRscId );
-
-      S.Pop();
-  }
-;
-
-var_header_class
-  : VARNAME '=' class_header_body
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), false, $3.pClass );
-
-      if( aInst.pData )
-          S.Push( aInst );
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-
-      if( !DoClassHeader( &$3, true ) )
-          return ERR_ERROR;
-      $$ = $3;
-  }
-  | VARNAME '[' CONSTNAME ']' '=' class_header_body
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() );
-
-      if( aInst.pData )
-      {
-          ERRTYPE aError;
-          RSCINST aIdxInst;
-
-          aError = aInst.pClass->GetArrayEle(
-              aInst, $3.hashid, nullptr, &aIdxInst );
-          if( aError.IsError() || aError.IsWarning() )
-              pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-          if( aError.IsError() )
-              return ERR_ERROR;
-          S.Push( aIdxInst );
-      }
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-      if( !DoClassHeader( &$6, true ) )
-          return ERR_ERROR;
-      $$ = $6;
-  }
-  | VARNAME '[' SYMBOL ']' '=' class_header_body
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() );
-
-      if( aInst.pData )
-      {
-          long nNewLang = pTC->AddLanguage( $3 );
-          ERRTYPE aError;
-          RSCINST aIdxInst;
-
-          aError = aInst.pClass->GetArrayEle(
-              aInst, nNewLang, nullptr, &aIdxInst );
-          if( aError.IsError() || aError.IsWarning() )
-              pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-          if( aError.IsError() )
-              return ERR_ERROR;
-          S.Push( aIdxInst );
-      }
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-      if( !DoClassHeader( &$6, true ) )
-          return ERR_ERROR;
-      $$ = $6;
-  }
-;
-
-var_header
-  : VARNAME '='
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() );
-
-      if( aInst.pData )
-          S.Push( aInst );
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-  }
-  | VARNAME '[' CONSTNAME ']' '='
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() );
-
-      if( aInst.pData )
-      {
-          ERRTYPE aError;
-          RSCINST aIdxInst;
-
-          aError = aInst.pClass->GetArrayEle(
-              aInst, $3.hashid, nullptr, &aIdxInst );
-          if( aError.IsError() || aError.IsWarning() )
-              pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-          if( aError.IsError() )
-              return ERR_ERROR;
-          S.Push( aIdxInst );
-      }
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-  }
-  | VARNAME '[' SYMBOL ']' '='
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() );
-
-      if( aInst.pData )
-      {
-          long nNewLang = pTC->AddLanguage( $3 );
-          ERRTYPE aError;
-          RSCINST aIdxInst;
-
-          aError = aInst.pClass->GetArrayEle(
-              aInst, nNewLang, nullptr, &aIdxInst );
-          if( aError.IsError() || aError.IsWarning() )
-              pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-          if( aError.IsError() )
-              return ERR_ERROR;
-          S.Push( aIdxInst );
-      }
-      else
-      {
-          pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(),
-                           pHS->getString( $1 ).getStr() );
-          return ERR_ERROR;
-      }
-  }
-;
-
-tupel_header0
-  :
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetTupelVar( S.Top(), 0, RSCINST() );
-      if( aInst.pData )
-          S.Push( aInst );
-      else
-      {
-          pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() );
-          return ERR_ERROR;
-      }
-  }
-;
-
-tupel_header1
-  :
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetTupelVar( S.Top(), 1, RSCINST() );
-      if( aInst.pData )
-          S.Push( aInst );
-      else
-      {
-          pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() );
-          return ERR_ERROR;
-      }
-  }
-;
-
-tupel_header2
-  :
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetTupelVar( S.Top(), 2, RSCINST() );
-      if( aInst.pData )
-          S.Push( aInst );
-      else
-      {
-          pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() );
-          return ERR_ERROR;
-      }
-  }
-;
-
-tupel_header3
-  :
-  {
-      RSCINST aInst;
-
-      aInst = S.Top().pClass->GetTupelVar( S.Top(), 3, RSCINST() );
-      if( !aInst.pData )
-      {
-          pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() );
-          return ERR_ERROR;
-      }
-      S.Push( aInst );
-  }
-;
-
-tupel_body
-  : var_body
-  {
-      S.Pop();
-  }
-;
-
-var_list_header
-  :
-  {
-      ERRTYPE aError;
-      RSCINST aInst;
-
-      aError = S.Top().pClass->GetElement( S.Top(), RscId(),
-                                           nullptr, RSCINST(), &aInst );
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-      if( aError.IsError() )
-      { // implicit to get instance on the stack
-          aInst = S.Top().pClass->Create( nullptr, RSCINST() );
-      }
-      S.Push( aInst );
-  }
-;
-
-list_body
-  : var_bodycomplex
-  {
-      S.Pop();
-  }
-;
-
-list_header
-  :
-  {
-      sal_uInt32 nCount = S.Top().pClass->GetCount( S.Top() );
-      sal_uInt32 i;
-
-      for( i = nCount; i > 0; i-- )
-          S.Top().pClass->DeletePos( S.Top(), i -1 );
-  }
-;
-
-list
-  : list var_list_header list_body ';'
-  | list var_bodysimple ';'
-  | list class_definition ';'
-  | list line_number
-  |
-  ;
-
-var_bodysimple
-  : macro_expression
-  {
-      sal_Int32       l;
-      ERRTYPE aError;
-
-      if( !$1.Evaluate( &l ) )
-          pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() );
-      else
-      {
-          aError = S.Top().pClass->SetRef( S.Top(), RscId( $1 ) );
-          if( aError.IsError() )
-          {
-              aError.Clear();
-              aError = S.Top().pClass->SetNumber( S.Top(), l );
-          }
-          if( aError.IsError() )
-          { // upward compatible, test Tupel
-              RSCINST aInst = GetFirstTupelEle( S.Top() );
-              if( aInst.pData )
-              {
-                  aError.Clear(); // reset error
-                  aError = aInst.pClass->SetRef( aInst, RscId( $1 ) );
-                  if( aError.IsError() )
-                  {
-                      aError.Clear();
-                      aError = aInst.pClass->SetNumber( aInst, l );
-                  }
-              }
-          }
-      }
-
-      if( $1.IsExpression() )
-          delete $1.aExp.pExp;
-
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-  }
-  | CONSTNAME
-  {
-      ERRTYPE aError;
-      aError = S.Top().pClass->SetConst( S.Top(), $1.hashid, $1.nValue );
-      if( aError.IsError() )
-      { // upward compatible, test Tupel
-          RSCINST aInst = GetFirstTupelEle( S.Top() );
-          if( aInst.pData )
-          {
-              aError.Clear(); // reset error
-              aError = aInst.pClass->SetConst( aInst, $1.hashid, $1.nValue );
-          }
-      }
-
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-  }
-  | NOT CONSTNAME
-  {
-      ERRTYPE aError;
-      aError = S.Top().pClass->SetNotConst( S.Top(), $2.hashid );
-      if( aError.IsError() )
-      { // upward compatible, test Tupel
-          RSCINST aInst = GetFirstTupelEle( S.Top() );
-          if( aInst.pData )
-          {
-              aError.Clear(); // reset error
-              aError = aInst.pClass->SetNotConst( aInst, $2.hashid );
-          }
-      }
-
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-  }
-  | BOOLEAN
-  {
-      ERRTYPE aError;
-      aError = S.Top().pClass->SetBool( S.Top(), $1 );
-      if( aError.IsError() )
-      { // upward compatible, test Tupel
-          RSCINST aInst = GetFirstTupelEle( S.Top() );
-          if( aInst.pData )
-          {
-              aError.Clear(); // reset error
-              aError = aInst.pClass->SetBool( aInst, $1 );
-          }
-      }
-
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-  }
-  | string_multiline
-  {
-      ERRTYPE aError;
-      aError = S.Top().pClass->SetString( S.Top(), $1 );
-      if( aError.IsError() )
-      { // upward compatible, test Tupel
-          RSCINST aInst = GetFirstTupelEle( S.Top() );
-          if( aInst.pData )
-          {
-              aError.Clear(); // reset error
-              aError = aInst.pClass->SetString( aInst, $1 );
-          }
-      }
-
-      if( aError.IsError() || aError.IsWarning() )
-          pTC->pEH->Error( aError, S.Top().pClass, RscId() );
-  }
-  | DEFAULT
-  ;
-
-var_bodycomplex
-  : '{' list_header list '}'
-  | '<' tupel_header0 tupel_body ';' '>'
-  | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';' '>'
-  | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';'
-                tupel_header2 tupel_body ';' '>'
-  | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';'
-                tupel_header2 tupel_body ';' tupel_header3 tupel_body ';' '>'
-  ;
-
-var_body
-  : var_bodysimple
-  | var_bodycomplex
-  ;
-
-string_multiline
-  : STRING
-  {
-      $$ = $1;
-  }
-  | string_multiline STRING
-  {
-      rtl::OStringBuffer aBuf( 256 );
-      aBuf.append( $1 );
-      aBuf.append( $2 );
-      $$ = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
-  }
-;
-
-macro_expression
-  : RSCDEFINE
-  {
-      $$.cType = RSCEXP_DEF;
-      $$.aExp.pDef = $1;
-  }
-  | NUMBER
-  {
-      $$.cType = RSCEXP_LONG;
-      $$.SetLong( $1 );
-  }
-  | '-' macro_expression %prec UNARYMINUS
-  {
-      if( $2.IsNumber() ){
-          $$.cType = $2.cType;
-          $$.SetLong( - $2.GetLong() );
-      }
-      else
-      {
-          RscExpType aLeftExp;
-
-          aLeftExp.cType = RSCEXP_NOTHING;
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( aLeftExp, '-', $2 );
-      }
-  }
-  | '+' macro_expression %prec UNARYPLUS
-  {
-      $$ = $2;
-  }
-  | macro_expression '+' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() + $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '+', $3 );
-      }
-  }
-  | macro_expression '-' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() - $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '-', $3 );
-      }
-  }
-  | macro_expression '*' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() * $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '*', $3 );
-      }
-  }
-  | macro_expression '/' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          if( $3.GetLong() == 0 )
-          {
-              $$.cType = RSCEXP_EXP;
-              $$.aExp.pExp = new RscExpression( $1, '/', $3 );
-          }
-          else
-          {
-              $$.cType = RSCEXP_LONG;
-              $$.SetLong( $1.GetLong() / $3.GetLong() );
-          }
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '/', $3 );
-      }
-  }
-  | macro_expression '&' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() & $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '&', $3 );
-      }
-  }
-  | macro_expression '|' macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() | $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, '|', $3 );
-      }
-  }
-  | '(' macro_expression ')'
-  {
-      $$ = $2;
-  }
-  | macro_expression LEFTSHIFT macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() << $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, 'l', $3 );
-      }
-  }
-  | macro_expression RIGHTSHIFT macro_expression
-  {
-      if( $1.IsNumber() && $3.IsNumber() )
-      {
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( $1.GetLong() >> $3.GetLong() );
-      }
-      else
-      {
-          $$.cType = RSCEXP_EXP;
-          $$.aExp.pExp = new RscExpression( $1, 'r', $3 );
-      }
-  }
-;
-
-id_expression
-  : id_expression line_number
-  | macro_expression
-  {  // evaluate pExpession and delete it
-      if( $1.cType == RSCEXP_EXP )
-      {
-          sal_Int32       lValue;
-
-          if( !$1.Evaluate( &lValue ) )
-              pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() );
-          delete $1.aExp.pExp;
-          $$.cType = RSCEXP_LONG;
-          $$.SetLong( lValue );
-      }
-      else
-      {
-          $$ = $1;
-      }
-  }
-;
-
-DUMMY_NUMBER
-  : NUMBER
-  {
-  }
-  |
-  {
-  }
-  ;
-
-line_number
-  : '#' LINE NUMBER STRING
-  {
-      RscFile * pFName;
-
-      pFI->SetLineNo( $3 );
-      pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $4 ) ) );
-      pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
-      pFName->bLoaded = true;
-      pFName->bScanned = true;
-  }
-  | '#' NUMBER STRING DUMMY_NUMBER
-  {
-      RscFile * pFName;
-
-      pFI->SetLineNo( $2 );
-      pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $3 ) ) );
-      pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
-      pFName->bLoaded = true;
-      pFName->bScanned = true;
-  }
-  | '#' NUMBER
-  {
-      pFI->SetLineNo( $2 );
-  }
-;
-
-%%
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
-
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
deleted file mode 100644
index 323bc5728cc0..000000000000
--- a/rsc/source/prj/gui.cxx
+++ /dev/null
@@ -1,74 +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 <stdlib.h>
-#include <stdio.h>
-#include <memory>
-
-#include <gui.hxx>
-#include <rscrsc.hxx>
-#include <rscdb.hxx>
-
-static RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
-{
-    for ( int i = 0; i < argc; ++i )
-    {
-        if ( argv[i] == nullptr )
-            continue;
-        if ( rsc_stricmp( argv[i], "-verbose" ) == 0 )
-            return RscVerbosityVerbose;
-        if ( rsc_stricmp( argv[i], "-quiet" ) == 0 )
-            return RscVerbositySilent;
-    }
-    return RscVerbosityNormal;
-}
-
-int rsc2_main( int argc, char **argv )
-{
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "debugging %s\n", argv[0] );
-#endif
-
-    ERRTYPE     aError;
-
-    InitRscCompiler();
-    std::unique_ptr<RscError>   pErrHdl(new RscError( lcl_determineVerbosity( argc, argv ) ));
-    std::unique_ptr<RscCmdLine> pCmdLine(new RscCmdLine( argc, argv, pErrHdl.get() ));
-    std::unique_ptr<RscTypCont> pTypCont(new RscTypCont( pErrHdl.get(),
-                                             pCmdLine->nByteOrder,
-                                             pCmdLine->nCommands ));
-
-    if( pErrHdl->nErrors )
-        aError = ERR_ERROR;
-    else{
-        std::unique_ptr<RscCompiler> pCompiler(new RscCompiler( pCmdLine.get(), pTypCont.get() ));
-
-        aError = pCompiler->Start();
-    }
-
-    delete pHS; // is generated by InitRscCompiler
-
-    if( aError.IsOk() )
-        return 0;
-    else
-        return 1;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/prj/gui.hxx b/rsc/source/prj/gui.hxx
deleted file mode 100644
index 7deab5b3b88e..000000000000
--- a/rsc/source/prj/gui.hxx
+++ /dev/null
@@ -1,32 +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_RSC_SOURCE_PRJ_GUI_HXX
-#define INCLUDED_RSC_SOURCE_PRJ_GUI_HXX
-
-#include <sal/config.h>
-
-int rsc2_main(int, char**);
-
-// Entry point declaration for modules rscpp and rsc2
-extern "C" int rscpp_main(int, char**);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
deleted file mode 100644
index c4ed4bf21f5a..000000000000
--- a/rsc/source/prj/start.cxx
+++ /dev/null
@@ -1,350 +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 <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
-
-#ifdef UNX
-#include <unistd.h>
-#include <sys/wait.h>
-#else // UNX
-
-#include <io.h>
-#include <process.h>
-#include <dos.h>
-
-#endif // UNX
-
-#include <gui.hxx>
-#include <rsctools.hxx>
-#include <rscerror.h>
-#include <sal/main.h>
-#include <rtl/strbuf.hxx>
-
-
-static bool CallPrePro( const OString& rInput,
-                        const OString& rOutput, RscPtrPtr * pCmdLine,
-                        bool bResponse )
-{
-    RscPtrPtr       aNewCmdL;
-    RscPtrPtr       aRespCmdL;
-    RscPtrPtr *     pCmdL = &aNewCmdL;
-    int             i, nRet;
-    FILE*           fRspFile = nullptr;
-    OString    aRspFileName;
-
-    if( bResponse )
-    {
-        aRspFileName = ::GetTmpFileName();
-        fRspFile = fopen( aRspFileName.getStr(), "w" );
-    }
-
-    if( !fRspFile )
-        aNewCmdL.Append( rsc_strdup( "rscpp" ) );
-
-    bool bVerbose = false;
-    for( i = 1; i < int(pCmdLine->GetCount() -1); i++ )
-    {
-        if ( 0 == rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-verbose" ) )
-        {
-            bVerbose = true;
-            continue;
-        }
-        if (strcmp(static_cast<char *>(pCmdLine->GetEntry(i)), "-isystem") == 0)
-        {
-            // ignore "-isystem" and following arg
-            if (i < int(pCmdLine->GetCount()) - 1)
-            {
-                ++i;
-            }
-            continue;
-        }
-        if (strncmp(
-                static_cast<char *>(pCmdLine->GetEntry(i)), "-isystem",
-                strlen("-isystem"))
-            == 0)
-        {
-            // ignore args starting with "-isystem"
-            continue;
-        }
-        if ( !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-u", 2 ) ||
-             !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-i", 2 ) ||
-             !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-d", 2 ))
-        {
-            aNewCmdL.Append( rsc_strdup( static_cast<char *>(pCmdLine->GetEntry( i )) ) );
-        }
-    }
-
-    aNewCmdL.Append( rsc_strdup( rInput.getStr() ) );
-    aNewCmdL.Append( rsc_strdup( rOutput.getStr() ) );
-    aNewCmdL.Append( static_cast<void *>(nullptr) );
-
-    if ( bVerbose )
-    {
-        printf( "Preprocessor commandline: " );
-        for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
-        {
-            printf( " " );
-            printf( "%s", static_cast<const char *>(pCmdL->GetEntry( i )) );
-        }
-        printf( "\n" );
-    }
-
-    if( fRspFile )
-    {
-        aRespCmdL.Append( rsc_strdup( "rscpp" ) );
-        OStringBuffer aTmpStr;
-        aTmpStr.append('@').append(aRspFileName);
-        aRespCmdL.Append( rsc_strdup( aTmpStr.getStr() ) );
-        aRespCmdL.Append( static_cast<void *>(nullptr) );
-
-        pCmdL = &aRespCmdL;
-        for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ )
-        {
-            fprintf( fRspFile, "%s ", static_cast<const char *>(aNewCmdL.GetEntry( i )) );
-        }
-        fclose( fRspFile );
-
-        if ( bVerbose )
-        {
-            printf( "Preprocessor startline: " );
-            for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
-            {
-                printf( " " );
-                printf( "%s", static_cast<const char *>(pCmdL->GetEntry( i )) );
-            }
-            printf( "\n" );
-        }
-    }
-
-    nRet = rscpp_main( pCmdL->GetCount()-1, reinterpret_cast<char**>(pCmdL->GetBlock()) );
-
-    if ( fRspFile )
-    {
-        #if OSL_DEBUG_LEVEL > 5
-        fprintf( stderr, "leaving response file %s\n", aRspFileName.getStr() );
-        #else
-        unlink( aRspFileName.getStr() );
-        #endif
-    }
-    if ( nRet )
-        return false;
-
-    return true;
-}
-
-
-static bool CallRsc2( RscStrList * pInputList,
-                      const OString &rSrsName, RscPtrPtr * pCmdLine )
-{
-    int nRet;
-    RscVerbosity eVerbosity = RscVerbosityNormal;
-
-    RscPtrPtr aNewCmdL;
-    aNewCmdL.Append( rsc_strdup( "rsc2" ) );
-
-    for (int i = 1; i < (int)(pCmdLine->GetCount() -1); ++i)
-    {
-        if ( !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-verbose" ) )
-        {
-            eVerbosity = RscVerbosityVerbose;
-            continue;
-        }
-        if ( !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-quiet" ) )
-        {
-            eVerbosity = RscVerbositySilent;
-            continue;
-        }
-        if( !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )),  "-fp=", 4 ) ||
-            !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-fo=", 4 ) ||
-            !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-presponse", 10 ) ||
-            !rsc_strnicmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-rc", 3 ) ||
-            !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-+" ) ||
-            !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-br" ) ||
-            !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-bz" ) ||
-            !rsc_stricmp( static_cast<char *>(pCmdLine->GetEntry( i )), "-r" ) ||
-            ( '-' != *static_cast<char *>(pCmdLine->GetEntry( i )) ) )
-        {
-        }
-        else
-        {
-            aNewCmdL.Append( rsc_strdup( static_cast<char *>(pCmdLine->GetEntry( i )) ) );
-        }
-    }
-
-    aNewCmdL.Append( rsc_strdup( rSrsName.getStr() ) );
-
-    for ( size_t i = 0, n = pInputList->size(); i < n; ++i )
-    {
-        OString* pString = (*pInputList)[ i ];
-        aNewCmdL.Append( rsc_strdup( pString->getStr() ) );
-    }
-
-    if ( eVerbosity >= RscVerbosityVerbose )
-    {
-        printf( "Rsc2 commandline: " );
-        for( size_t i = 0; i < (unsigned int)(aNewCmdL.GetCount() -1); i++ )
-        {
-            printf( " %s", static_cast<const char *>(aNewCmdL.GetEntry( i )) );
-        }
-        printf( "\n" );
-    }
-
-    nRet = rsc2_main( aNewCmdL.GetCount(), reinterpret_cast<char**>(aNewCmdL.GetBlock()) );
-
-    if( nRet )
-        return false;
-    return true;
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-    bool        bPrePro  = true;
-    bool        bHelp    = false;
-    bool        bError   = false;
-    bool        bResponse = false;
-    OString     aSrsName;
-    OString     aResName;
-    RscStrList  aInputList;
-    RscStrList  aTmpList;
-    char *      pStr;
-    char **     ppStr;
-    RscPtrPtr   aCmdLine;
-    sal_uInt32  i;
-
-    pStr = ::ResponseFile( &aCmdLine, argv, argc );
-    if( pStr )
-    {
-        printf( "Cannot open response file <%s>\n", pStr );
-        return 1;
-    };
-
-    ppStr  = reinterpret_cast<char **>(aCmdLine.GetBlock());
-    ppStr++;
-    i = 1;
-    bool bSetSrs = false;
-    while( ppStr && i < (aCmdLine.GetCount() -1) )
-    {
-        if (strcmp(*ppStr, "-isystem") == 0)
-        {
-            // ignore "-isystem" and following arg
-            if (i < aCmdLine.GetCount() - 1)
-            {
-                ++ppStr;
-                ++i;
-            }
-        }
-        else if (strncmp(*ppStr, "-isystem", strlen("-isystem")) == 0)
-        {
-            // ignore args starting with "-isystem"
-        }
-        else if( '-' == **ppStr )
-        {
-            if( !rsc_stricmp( (*ppStr) + 1, "p" )
-              || !rsc_stricmp( (*ppStr) + 1, "l" ) )
-            { // no pre-processor
-                bPrePro = false;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "h" ) )
-            { // print help
-                bHelp = true;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "presponse", 9 ) )
-            { // whether to use response file when parameterising preprocessor
-                bResponse = true;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "fo=", 3 ) )
-            { // another Name for .res-file
-                aResName = (*ppStr) + 4;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
-            { // another Name for .srs-file
-                bSetSrs  = true;
-                aSrsName = (*ppStr);
-            }
-        }
-        else
-        {
-            aInputList.push_back( new OString(*ppStr) );
-        }
-        ppStr++;
-        i++;
-    }
-
-    if( !aInputList.empty() )
-    {
-        // build the output file names
-        if (!aResName.getLength())
-            aResName = OutputFile( *aInputList[ 0 ], "res" );
-        if( ! bSetSrs )
-        {
-            aSrsName = OString("-fp=") + OutputFile(*aInputList[0], "srs");
-        }
-    };
-
-    if( bHelp )
-        bPrePro = false;
-
-    if( bPrePro && !aInputList.empty() )
-    {
-        OString aTmpName;
-
-        for ( size_t k = 0, n = aInputList.size(); k < n; ++k )
-        {
-            OString* pString = aInputList[ k ];
-            aTmpName = ::GetTmpFileName();
-            if( !CallPrePro( *pString, aTmpName, &aCmdLine, bResponse ) )
-            {
-                printf( "Error starting preprocessor\n" );
-                bError = true;
-                break;
-            }
-            aTmpList.push_back( new OString(aTmpName) );
-        };
-    };
-
-    if( !bError )
-    {
-        if( !CallRsc2( bPrePro ? &aTmpList : &aInputList, aSrsName, &aCmdLine ) )
-        {
-            if( !bHelp )
-            {
-                printf( "Error starting rsc2 compiler\n" );
-                bError = true;
-            }
-        };
-    };
-
-    for ( size_t k = 0, n = aTmpList.size(); k < n; ++k )
-        unlink( aTmpList[ k ]->getStr() );
-
-    return bError ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-void RscExit( sal_uInt32 nExit )
-{
-    if( nExit )
-        printf( "Program exit is %d\n", (int)nExit );
-    exit( nExit );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
deleted file mode 100644
index 84829c7e0ced..000000000000
--- a/rsc/source/res/rscall.cxx
+++ /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 .
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <rscall.h>
-#include <rsckey.hxx>
-
-Atom    nRsc_DELTALANG = InvalidAtom;
-Atom    nRsc_DELTASYSTEM = InvalidAtom;
-
-void InitRscCompiler()
-{
-    pStdParType      = new OString("( const ResId & rResId, sal_Bool");
-    pStdPar1         = new OString('(');
-    pStdPar2         = new OString('(');
-
-    nRefDeep         = 10;
-    pHS = new AtomContainer();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
deleted file mode 100644
index ba5f8fe16cbc..000000000000
--- a/rsc/source/res/rscarray.cxx
+++ /dev/null
@@ -1,426 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rscconst.hxx>
-#include <rscarray.hxx>
-#include <rscdb.hxx>
-
-RscInstNode::RscInstNode(sal_uInt32 nId) : nTypeId(nId)
-{
-}
-
-RscInstNode::~RscInstNode()
-{
-    if( aInst.IsInst() )
-    {
-        aInst.pClass->Destroy( aInst );
-        rtl_freeMemory( aInst.pData );
-    }
-}
-
-sal_uInt32 RscInstNode::GetId() const
-{
-    return nTypeId;
-}
-
-RscArray::RscArray( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper, RscEnum * pTypeCl )
-    : RscTop( nId, nTypeId, pSuper )
-    , pTypeClass(pTypeCl)
-    , nOffInstData(RscTop::Size())
-    , nSize(nOffInstData + ALIGNED_SIZE(sizeof(RscArrayInst)))
-{
-}
-
-RscArray::~RscArray()
-{
-}
-
-RscTop * RscArray::GetTypeClass() const
-{
-    return pTypeClass;
-}
-
-static RscInstNode * Create( RscInstNode * pNode )
-{
-    RscInstNode * pRetNode = nullptr;
-
-    if( pNode )
-    {
-        pRetNode = new RscInstNode( pNode->GetId() );
-        pRetNode->aInst = pNode->aInst.pClass->Create( nullptr, pNode->aInst );
-        RscInstNode * pTmpNode = Create(pNode->Left());
-        if (pTmpNode)
-            pRetNode->Insert( pTmpNode );
-        if( (pTmpNode = Create( pNode->Right() )) != nullptr )
-            pRetNode->Insert( pTmpNode );
-    }
-
-    return pRetNode;
-}
-
-RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt,
-                          bool bOwnClass )
-{
-    RSCINST aInst;
-    RscArrayInst *  pClassData;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(rtl_allocateMemory( Size() ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    RscTop::Create( &aInst, rDflt, bOwnClass );
-
-    pClassData = reinterpret_cast<RscArrayInst *>(aInst.pData + nOffInstData);
-    pClassData->pNode = nullptr;
-    if( bOwnClass )
-    {
-        RscArrayInst *   pDfltClassData;
-
-        pDfltClassData = reinterpret_cast<RscArrayInst *>(rDflt.pData + nOffInstData);
-
-        pClassData->pNode = ::Create( pDfltClassData->pNode );
-    }
-    return aInst;
-}
-
-static void Destroy( RscInstNode * pNode )
-{
-    if( pNode )
-    {
-        Destroy( pNode->Left() );
-        Destroy( pNode->Right() );
-        delete pNode;
-    }
-}
-
-void RscArray::Destroy( const RSCINST & rInst )
-{
-    RscArrayInst *  pClassData;
-
-    RscTop::Destroy( rInst );
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    // delete the tree recursively
-    ::Destroy( pClassData->pNode );
-}
-
-ERRTYPE RscArray::GetValueEle( const RSCINST & rInst,
-                               sal_Int32 lValue,
-                               RscTop * pCreateClass,
-                               RSCINST * pGetInst)
-{
-    RscArrayInst *  pClassData;
-    RscInstNode *   pNode;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    ERRTYPE     aError;
-
-    Atom  nId;
-    if( !pTypeClass->GetValueConst( sal_uInt32(lValue), &nId ) )
-    { // not found
-        return ERR_ARRAY_INVALIDINDEX;
-    }
-
-    if( pClassData->pNode )
-        pNode = pClassData->pNode->Search( sal_uInt32(lValue) );
-    else
-        pNode = nullptr;
-
-    if( !pNode )
-    {
-        pNode = new RscInstNode( sal_uInt32(lValue) );
-        if( pCreateClass && GetSuperClass()->InHierarchy( pCreateClass ) )
-            pNode->aInst = pCreateClass->Create( nullptr, rInst );
-        else
-            pNode->aInst = GetSuperClass()->Create( nullptr, rInst );
-
-        pNode->aInst.pClass->SetToDefault( pNode->aInst );
-        if( pClassData->pNode )
-            pClassData->pNode->Insert( pNode );
-        else
-            pClassData->pNode = pNode;
-    }
-
-    *pGetInst = pNode->aInst;
-    return aError;
-}
-
-ERRTYPE RscArray::GetArrayEle( const RSCINST & rInst,
-                               Atom nId,
-                               RscTop * pCreateClass,
-                               RSCINST * pGetInst)
-{
-    sal_Int32  lValue;
-    if( !pTypeClass->GetConstValue( nId, &lValue ) )
-    { // not found
-        return ERR_ARRAY_INVALIDINDEX;
-    }
-
-    return GetValueEle( rInst, lValue, pCreateClass, pGetInst );
-}
-
-static bool IsConsistent( RscInstNode * pNode )
-{
-    bool bRet = true;
-
-    if( pNode )
-    {
-        bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst );
-        if( !IsConsistent( pNode->Left() ) )
-            bRet = false;
-        if( !IsConsistent( pNode->Right() ) )
-            bRet = false;
-    }
-    return bRet;
-}
-
-bool RscArray::IsConsistent( const RSCINST & rInst )
-{
-    RscArrayInst * pClassData;
-    bool    bRet;
-
-    bRet = RscTop::IsConsistent( rInst );
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-    if( !::IsConsistent( pClassData->pNode ) )
-        bRet = false;
-
-    return bRet;
-}
-
-static void SetToDefault( RscInstNode * pNode )
-{
-    if( pNode )
-    {
-        pNode->aInst.pClass->SetToDefault( pNode->aInst );
-        SetToDefault( pNode->Left() );
-        SetToDefault( pNode->Right() );
-    }
-}
-
-void RscArray::SetToDefault( const RSCINST & rInst )
-{
-    RscArrayInst * pClassData;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    ::SetToDefault( pClassData->pNode );
-
-    RscTop::SetToDefault( rInst );
-}
-
-static bool IsDefault( RscInstNode * pNode )
-{
-    bool bRet = true;
-
-    if( pNode )
-    {
-        bRet = pNode->aInst.pClass->IsDefault( pNode->aInst );
-        if( bRet )
-            bRet = IsDefault( pNode->Left() );
-        if( bRet )
-            bRet = IsDefault( pNode->Right() );
-    }
-    return bRet;
-}
-
-bool RscArray::IsDefault( const RSCINST & rInst )
-{
-    RscArrayInst * pClassData;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    bool bRet = ::IsDefault( pClassData->pNode );
-
-    if( bRet )
-        bRet = RscTop::IsDefault( rInst );
-    return bRet;
-}
-
-static bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
-{
-    bool bRet = true;
-
-    if( pNode )
-    {
-        bRet = pNode->aInst.pClass->IsValueDefault( pNode->aInst, pDef );
-        if( bRet )
-            bRet = IsValueDefault( pNode->Left(), pDef );
-        if( bRet )
-            bRet = IsValueDefault( pNode->Right(), pDef );
-    }
-    return bRet;
-}
-
-bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    bool bRet = RscTop::IsValueDefault( rInst, pDef );
-
-    if( bRet )
-    {
-        RscArrayInst * pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-        bRet = ::IsValueDefault( pClassData->pNode, pDef );
-    }
-    return bRet;
-}
-
-void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
-                               RscTypCont * pTC, sal_uInt32 nTab,
-                               const RscId & aId, const char * pVarName )
-{
-    RscArrayInst * pClassData;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    if( pTC->IsSrsDefault() )
-    { // only write one value
-        RscInstNode *   pNode = nullptr;
-        if( pClassData->pNode )
-        {
-            std::vector< sal_uInt32 >::const_iterator it;
-            for( it = pTC->GetFallbacks().begin(); !pNode && it != pTC->GetFallbacks().end(); ++it )
-                pNode = pClassData->pNode->Search( *it );
-        }
-
-        if( pNode )
-        {
-            if( pNode->aInst.pClass->IsDefault( pNode->aInst ) )
-                fprintf( fOutput, "Default" );
-            else
-                pNode->aInst.pClass->WriteSrcHeader(
-                                        pNode->aInst, fOutput,
-                                        pTC, nTab, aId, pVarName );
-            return;
-        }
-    }
-
-    if( IsDefault( rInst ) )
-        fprintf( fOutput, "Default" );
-    else
-    {
-        RSCINST aSuper( GetSuperClass(), rInst.pData );
-        aSuper.pClass->WriteSrcHeader( aSuper, fOutput, pTC,
-                                        nTab, aId, pVarName );
-    }
-    if( !pTC->IsSrsDefault() )
-        WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-}
-
-static void WriteSrc( RscInstNode * pNode, FILE * fOutput, RscTypCont * pTC,
-                      sal_uInt32 nTab, const char * pVarName,
-                      CLASS_DATA pDfltData, RscEnum * pTypeClass )
-{
-    if( pNode )
-    {
-        WriteSrc( pNode->Left(), fOutput, pTC, nTab, pVarName,
-                    pDfltData, pTypeClass );
-        if( !pNode->aInst.pClass->IsValueDefault( pNode->aInst, pDfltData ) )
-        {
-            fprintf( fOutput, ";\n" );
-            for( sal_uInt32 n = 0; n < nTab; n++ )
-                fputc( '\t', fOutput );
-
-            Atom  nIdxId;
-            pTypeClass->GetValueConst( pNode->GetId(), &nIdxId );
-            fprintf( fOutput, "%s[ %s ] = ", pVarName, pHS->getString( nIdxId ).getStr() );
-            pNode->aInst.pClass->WriteSrcHeader( pNode->aInst, fOutput, pTC,
-                                                nTab, RscId(), pVarName );
-        }
-        WriteSrc( pNode->Right(), fOutput, pTC, nTab, pVarName,
-                    pDfltData, pTypeClass );
-    }
-}
-
-void RscArray::WriteSrcArray( const RSCINST & rInst, FILE * fOutput,
-                              RscTypCont * pTC, sal_uInt32 nTab,
-                              const char * pVarName )
-{
-    RscArrayInst * pClassData;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    ::WriteSrc( pClassData->pNode, fOutput, pTC, nTab, pVarName,
-                rInst.pData, pTypeClass );
-};
-
-void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                         RscTypCont * pTC, sal_uInt32 nTab,
-                         const char * pVarName )
-{
-    WriteSrcArray( rInst, fOutput, pTC, nTab, pVarName );
-}
-
-ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                           RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    ERRTYPE aError;
-    RscArrayInst * pClassData;
-    RscInstNode *   pNode = nullptr;
-
-    pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData);
-
-    if( pClassData->pNode )
-    {
-#if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "RscArray::WriteRc: Fallback " );
-#endif
-        std::vector< sal_uInt32 >::const_iterator it;
-        for( it = pTC->GetFallbacks().begin(); !pNode && it != pTC->GetFallbacks().end(); ++it )
-        {
-            pNode = pClassData->pNode->Search( *it );
-#if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, " 0x%hx", *it );
-#endif
-        }
-#if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, "\n" );
-#endif
-    }
-
-    if( pNode )
-        aError = pNode->aInst.pClass->WriteRc( pNode->aInst, rMem, pTC,
-                                                nDeep );
-    else
-        aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
-
-    return aError;
-}
-
-RscLangArray::RscLangArray( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper,
-                          RscEnum * pTypeCl )
-    : RscArray( nId, nTypeId, pSuper, pTypeCl )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
deleted file mode 100644
index 386b34a2229a..000000000000
--- a/rsc/source/res/rscclass.cxx
+++ /dev/null
@@ -1,672 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rscdb.hxx>
-#include <rscclass.hxx>
-
-#include <tools/rcid.h>
-
-RscClass::RscClass( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuperCl )
-    : RscTop( nId, nTypeId, pSuperCl )
-    , nSuperSize(RscTop::Size())
-    , nSize(nSuperSize + ALIGNED_SIZE(sizeof(RscClassInst )))
-    , nEntries(0), pVarTypeList(nullptr)
-{
-}
-
-void RscClass::Pre_dtor()
-{
-    sal_uInt32  i;
-
-    RscTop::Pre_dtor();
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarTypeList[ i ].pDefault )
-        {
-            pVarTypeList[ i ].pClass->Destroy(
-                         RSCINST( pVarTypeList[ i ].pClass,
-                                  pVarTypeList[ i ].pDefault ) );
-            rtl_freeMemory( pVarTypeList[ i ].pDefault );
-            pVarTypeList[ i ].pDefault = nullptr;
-        }
-    }
-}
-
-RscClass::~RscClass()
-{
-    if( pVarTypeList )
-        rtl_freeMemory( static_cast<void *>(pVarTypeList) );
-}
-
-RSCINST RscClass::GetInstData
-(
-    CLASS_DATA pData,
-    sal_uInt32 nEle,
-    bool bGetCopy
-)
-{
-    RSCINST aInst;
-
-    aInst.pClass = pVarTypeList[ nEle ].pClass;
-    if( pData )
-    {
-        if( RSCVAR::NoDataInst & pVarTypeList[ nEle ].nVarType )
-        {
-            RSCINST aTmpI;
-
-            aTmpI.pClass = this;
-            aTmpI.pData = pData;
-            if( bGetCopy )
-                aInst.pData = GetCopyVar(
-                                  aTmpI,
-                                  pVarTypeList[ nEle ].nDataBaseName
-                              ).pData;
-            else
-                aInst.pData = GetVariable(
-                                  aTmpI,
-                                  pVarTypeList[ nEle ].nDataBaseName,
-                                  RSCINST()
-                              ).pData;
-        }
-        else if( RSCVAR::Pointer & pVarTypeList[ nEle ].nVarType )
-        {
-            aInst.pData = *reinterpret_cast<CLASS_DATA *>(pData + pVarTypeList[ nEle ].nOffset);
-        }
-        else
-            aInst.pData = pData + pVarTypeList[ nEle ].nOffset;
-    }
-    return aInst;
-}
-
-CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
-{
-    if( pVarTypeList[ nEle ].pDefault )
-        return pVarTypeList[ nEle ].pDefault;
-
-    return pVarTypeList[ nEle ].pClass->GetDefault().pData;
-}
-
-void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, bool bSet )
-{
-    RscClassInst * pClass;
-
-    pClass = reinterpret_cast<RscClassInst *>(pData + nSuperSize );
-    if( bSet )
-        pClass->nVarDflt |= ((sal_uLong)1 << nEle);
-    else
-        pClass->nVarDflt &= ~((sal_uLong)1 << nEle);
-}
-
-bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
-{
-    RscClassInst *  pClass;
-
-    pClass = reinterpret_cast<RscClassInst *>(pData + nSuperSize );
-    return pClass->nVarDflt & ((sal_uLong)1 << nEle);
-}
-
-RSCINST RscClass::Create( RSCINST * pInst,
-                          const RSCINST & rDflt,
-                          bool bOwnClass)
-{
-    sal_uInt32  i;
-    RSCINST aInst;
-    RSCINST aMemInst, aDfltI;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(rtl_allocateMemory( Size() ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    RscTop::Create( &aInst, rDflt, bOwnClass );
-
-    if( bOwnClass )
-        reinterpret_cast<RscClassInst *>(aInst.pData + nSuperSize)->nVarDflt =
-            reinterpret_cast<RscClassInst *>(rDflt.pData + nSuperSize)->nVarDflt;
-    else
-        reinterpret_cast<RscClassInst *>(aInst.pData + nSuperSize)->nVarDflt = ~((sal_uLong)0);
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        aDfltI = GetInstData( bOwnClass ? rDflt.pData : nullptr, i, true );
-
-        if( (RSCVAR::Pointer & pVarTypeList[ i ].nVarType) &&
-            !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) )
-        {
-            CLASS_DATA  * ppData = reinterpret_cast<CLASS_DATA*>(aInst.pData + pVarTypeList[ i ].nOffset );
-            *ppData = nullptr;
-            if( aDfltI.IsInst() )
-            {
-                aMemInst = pVarTypeList[ i ].pClass->Create( nullptr, aDfltI );
-                *ppData = aMemInst.pData;
-            }
-        }
-        else
-        {
-            aMemInst = GetInstData( aInst.pData, i, true );
-            aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI );
-        }
-    }
-
-    return aInst;
-}
-
-void RscClass::Destroy( const RSCINST & rInst )
-{
-    sal_uInt32  i;
-
-    RscTop::Destroy( rInst );
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( !(pVarTypeList[ i ].nVarType & RSCVAR::NoDataInst) )
-        {
-            RSCINST aTmpI;
-
-            aTmpI = GetInstData( rInst.pData, i, true );
-            if( aTmpI.IsInst() )
-            {
-                // destroy object
-                aTmpI.pClass->Destroy( aTmpI );
-                if( pVarTypeList[ i ].nVarType & RSCVAR::Pointer )
-                {
-                    // free memory
-                    rtl_freeMemory( aTmpI.pData );
-                }
-            }
-        }
-    }
-}
-
-ERRTYPE RscClass::SetVariable( Atom nVarName,
-                               RscTop * pClass,
-                               RSCINST * pDflt,
-                               RSCVAR nVarType,
-                               sal_uInt32 nMask,
-                               Atom nDataBaseName)
-{
-    if( pVarTypeList )
-    {
-        pVarTypeList = static_cast<VARTYPE_STRUCT *>(rtl_reallocateMemory( static_cast<void *>(pVarTypeList),
-                                                                ((nEntries +1) * sizeof( VARTYPE_STRUCT )) ));
-    }
-    else
-    {
-        pVarTypeList = static_cast<VARTYPE_STRUCT *>(rtl_allocateMemory( (nEntries + 1)
-                                                               * sizeof( VARTYPE_STRUCT ) ));
-    }
-    pVarTypeList[ nEntries ].nVarName       = nVarName;
-    pVarTypeList[ nEntries ].nMask          = nMask;
-    pVarTypeList[ nEntries ].pClass         = pClass;
-    pVarTypeList[ nEntries ].nOffset        = nSize;
-    pVarTypeList[ nEntries ].nDataBaseName  = nDataBaseName;
-    if( pDflt )
-        pVarTypeList[ nEntries ].pDefault = pDflt->pData;
-    else
-        pVarTypeList[ nEntries ].pDefault = nullptr;
-
-    pVarTypeList[ nEntries ].nVarType = ~RSCVAR::Pointer & nVarType;
-    if( pClass->Size() > 10 )
-        pVarTypeList[ nEntries ].nVarType |= RSCVAR::Pointer;
-
-    if( !(pVarTypeList[ nEntries ].nVarType & RSCVAR::NoDataInst) )
-    {
-        if( pVarTypeList[ nEntries ].nVarType & RSCVAR::Pointer )
-        {
-            nSize += sizeof( CLASS_DATA );
-        }
-        else
-            nSize += pClass->Size();
-    }
-
-    nEntries++;
-    if( nEntries > (sizeof( sal_uLong ) * 8) )
-    {
-        // range for default is too small
-        RscExit( 16 );
-    }
-    return ERR_OK;
-}
-
-RSCINST RscClass::GetVariable( const RSCINST & rInst,
-                               Atom nVarName,
-                               const RSCINST & rInitInst,
-                               bool bInitDflt,
-                               RscTop * pCreateClass)
-{
-    sal_uInt32  i = 0;
-    RSCINST aTmpI;
-
-    while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
-        i++;
-
-    if( i < nEntries )
-    {
-        if( RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType )
-        {
-            aTmpI = GetVariable( rInst,
-                                 pVarTypeList[ i ].nDataBaseName,
-                                 RSCINST() );
-            aTmpI.pClass = pVarTypeList[ i ].pClass;
-        }
-        else
-        {
-            // generate default instance
-            RSCINST aDefInst = rInitInst;
-            if( !aDefInst.IsInst() && bInitDflt )
-            {
-                // set to default variables
-                aDefInst.pData  = pVarTypeList[ i ].pDefault;
-                aDefInst.pClass = pVarTypeList[ i ].pClass;
-            }
-
-            aTmpI = GetInstData( rInst.pData, i );
-            if( aTmpI.IsInst() )
-            {
-                if( aDefInst.IsInst() )
-                {
-                    aTmpI.pClass->Destroy( aTmpI );
-                    aTmpI.pClass->Create( &aTmpI, aDefInst );
-                }
-            }
-            else
-            { // is provided via pointer
-                CLASS_DATA  * ppData
-                    = reinterpret_cast<CLASS_DATA *>(rInst.pData + pVarTypeList[ i ].nOffset);
-                aTmpI = aTmpI.pClass->Create( nullptr, aDefInst );
-                *ppData = aTmpI.pData;
-            }
-        }
-        // set as non default
-        SetVarDflt( rInst.pData, i, false );
-        return aTmpI;
-    }
-
-    return RscTop::GetVariable( rInst, nVarName, rInitInst,
-                                bInitDflt, pCreateClass );
-}
-
-RSCINST RscClass::GetCopyVar( const RSCINST & rInst, Atom nVarName)
-{
-    sal_uInt32  i = 0;
-    RSCINST aVarI;
-
-    while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
-        i++;
-
-    if( i < nEntries )
-    {
-        if( RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType )
-        {
-            aVarI = GetCopyVar( rInst, pVarTypeList[ i ].nDataBaseName );
-            aVarI.pClass = pVarTypeList[ i ].pClass;
-        }
-        else
-        {
-            if( IsDflt( rInst.pData, i ) )
-            {
-                // initialize with default variables
-                aVarI = GetVariable( rInst, nVarName, RSCINST(), true );
-                SetVarDflt( rInst.pData, i, true );
-            }
-            else
-                aVarI = GetInstData( rInst.pData, i, true );
-
-        }
-        return aVarI ;
-    }
-
-    return RscTop::GetCopyVar( rInst, nVarName );
-}
-
-bool RscClass::IsConsistent( const RSCINST & rInst )
-{
-    sal_uInt32  i = 0;
-    RSCINST aTmpI;
-    bool    bRet;
-
-    bRet = RscTop::IsConsistent( rInst );
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) )
-        {
-            aTmpI = GetInstData( rInst.pData, i, true );
-
-            if( aTmpI.IsInst() )
-                if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
-                    bRet = false;
-        }
-    }
-
-    return bRet;
-}
-
-void RscClass::SetToDefault( const RSCINST & rInst )
-{
-    sal_uInt32  i;
-    RSCINST aTmpI;
-    RscClassInst *  pClass;
-
-    pClass = reinterpret_cast<RscClassInst *>(rInst.pData + nSuperSize );
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        // variables without own memory are set from "data server" to default
-        if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) )
-        {
-            aTmpI = GetInstData( rInst.pData, i, true );
-            if( aTmpI.IsInst() )
-                aTmpI.pClass->SetToDefault( aTmpI );
-        }
-    }
-    pClass->nVarDflt = ~((sal_uLong)0); // set everything to default
-
-    RscTop::SetToDefault( rInst );
-}
-
-bool RscClass::IsDefault( const RSCINST & rInst )
-{
-    sal_uInt32  i;
-    RSCINST aTmpI;
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        // variables without own memory are looked for default in "data server"
-        if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) )
-            if( !IsDflt( rInst.pData, i ) )
-                return false;
-    }
-
-    return RscTop::IsDefault( rInst );
-}
-
-RSCINST RscClass::GetDefault( Atom nVarId )
-{
-    sal_uInt32  i;
-
-    i = 0;
-    while( i < nEntries && pVarTypeList[ i ].nVarName != nVarId )
-        i++;
-
-    if( i < nEntries )
-    {
-        RSCINST aTmpI;
-
-        aTmpI.pClass = pVarTypeList[ i ].pClass;
-        aTmpI.pData  = GetDfltData( i );
-        return aTmpI;
-    }
-
-    return RscTop::GetDefault( nVarId );
-}
-
-bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
-{
-    RSCINST aTmpI;
-
-    aTmpI = GetInstData( pData, nEle, true );
-
-    if( aTmpI.IsInst() )
-    {
-        if( RSCVAR::SvDynamic & pVarTypeList[ nEle ].nVarType )
-            return false;
-
-        if( aTmpI.pClass == pVarTypeList[ nEle ].pClass )
-            // they also have the same class
-            return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) );
-        else
-            return false;
-    }
-    return true;
-}
-
-bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    RSCINST aTmpI;
-    RSCINST aDfltI;
-
-    if( !RscTop::IsValueDefault( rInst, pDef ) )
-        return false;
-
-    if( pDef )
-    {
-        for( sal_uInt32 i = 0; i < nEntries; i++ )
-        {
-            aTmpI = GetInstData( rInst.pData, i, true );
-            if( aTmpI.IsInst() )
-            {
-                if( aTmpI.pClass != pVarTypeList[ i ].pClass )
-                    // they don't have the same class
-                    return false;
-
-                aDfltI = GetInstData( pDef, i, true );
-                if( !aDfltI.IsInst() )
-                    aDfltI.pData = GetDfltData( i );
-
-                if( !aTmpI.pClass->IsValueDefault( aTmpI, aDfltI.pData ) )
-                    return false;
-            }
-        }
-    }
-    else
-        return false;
-
-    return true;
-}
-
-void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
-{
-    sal_uInt32  i = 0;
-    RSCINST aTmpI;
-
-    while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
-        i++;
-
-    if( i < nEntries )
-    {
-        aTmpI = GetInstData( rInst.pData, i, true );
-        if( aTmpI.IsInst() )
-        {
-            aTmpI.pClass->Destroy( aTmpI );
-            aTmpI.pClass->Create( &aTmpI, RSCINST() );
-            SetVarDflt( rInst.pData, i, true );
-        }
-    }
-    else // look for variable in super class
-        RscTop::SetDefault( rInst, nVarName );
-
-}
-
-
-void RscClass::WriteSrc( const RSCINST & rInst,
-                         FILE * fOutput,
-                         RscTypCont * pTC,
-                         sal_uInt32 nTab,
-                         const char * pVarName)
-{
-    sal_uInt32  i = 0, n = 0;
-    RSCINST aTmpI;
-
-    RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( !(RSCVAR::Hidden & pVarTypeList[ i ].nVarType) )
-        {
-            if( !IsDflt( rInst.pData, i ) && !IsValueDflt( rInst.pData, i ) )
-            {
-                aTmpI = GetInstData( rInst.pData, i, true );
-
-                if( aTmpI.IsInst() )
-                {
-                    const char * pName = pHS->getString( pVarTypeList[ i ].nVarName ).getStr();
-
-                    for( n = 0; n < nTab; n++ )
-                        fputc( '\t', fOutput );
-
-                    fprintf( fOutput, "%s", pName );
-                    fprintf( fOutput, " = " );
-                    aTmpI.pClass->WriteSrcHeader(
-                              aTmpI, fOutput, pTC, nTab, RscId(), pName );
-                    fprintf( fOutput, ";\n" );
-                }
-            }
-        }
-    }
-
-    return;
-}
-
-ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
-                               RscWriteRc & rMem,
-                               RscTypCont * pTC,
-                               sal_uInt32 nDeep )
-{
-    sal_uInt32 i = 0;
-    ERRTYPE aError;
-    RSCINST aTmpI;
-    sal_uInt32  nMaskOff = 0;// offset to address mask field
-
-    // when a variable is masked, then mask field
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarTypeList[ i ].nMask )
-        {
-            nMaskOff = rMem.Size();
-            rMem.Put( sal_uInt32(0) );
-            break;
-        }
-    }
-
-    for( i = 0; i < nEntries && aError.IsOk(); i++ )
-    {
-        if( !((RSCVAR::NoDataInst | RSCVAR::NoRc) & pVarTypeList[ i ].nVarType ))
-        {
-            if( pVarTypeList[ i ].nMask )
-            {
-                if( !IsDflt( rInst.pData, i ) )
-                {
-                    aTmpI = GetInstData( rInst.pData, i, true );
-                    aError = aTmpI.pClass->
-                        WriteRcHeader(aTmpI, rMem, pTC,
-                                      RscId(), nDeep);
-                    sal_uInt32 nMask = rMem.GetLong( nMaskOff );
-                    nMask |= pVarTypeList[ i ].nMask;
-                    rMem.PutAt( nMaskOff, nMask );
-                }
-            }
-            else
-            {
-                if( IsDflt( rInst.pData, i ) )
-                {
-                    aTmpI.pClass = pVarTypeList[ i ].pClass;
-                    aTmpI.pData  = GetDfltData( i );
-                }
-                else
-                    aTmpI = GetInstData( rInst.pData, i, true );
-
-                aError = aTmpI.pClass->
-                            WriteRcHeader( aTmpI, rMem, pTC,
-                                        RscId(), nDeep );
-            }
-        }
-    }
-
-    return aError;
-}
-
-ERRTYPE RscClass::WriteRc( const RSCINST & rInst,
-                           RscWriteRc & rMem,
-                           RscTypCont * pTC,
-                           sal_uInt32 nDeep )
-{
-    ERRTYPE aError;
-
-    aError = RscTop::WriteRc(rInst, rMem, pTC, nDeep);
-    if( aError.IsOk() )
-        aError = WriteInstRc(rInst, rMem, pTC, nDeep);
-
-    return aError;
-}
-
-RscTupel::RscTupel( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscClass( nId, nTypeId, nullptr )
-{
-}
-
-RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
-                               const RSCINST & rInitInst )
-{
-    if( nPos >= nEntries )
-    {
-        return RSCINST();
-    }
-    else
-        return GetVariable( rInst, pVarTypeList[ nPos ].nVarName, rInitInst );
-}
-
-void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                         RscTypCont * pTC, sal_uInt32 nTab,
-                         const char * pVarName )
-{
-    sal_uInt32  i = 0;
-    RSCINST aTmpI;
-
-    RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-
-    fprintf( fOutput, "< " );
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( !(RSCVAR::Hidden & pVarTypeList[ i ].nVarType) )
-        {
-            if( !IsDflt( rInst.pData, i )
-              && !IsValueDflt( rInst.pData, i ) )
-            {
-                aTmpI = GetInstData( rInst.pData, i, true );
-
-                if( aTmpI.IsInst() )
-                    aTmpI.pClass->WriteSrcHeader(
-                              aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
-                else
-                    fprintf( fOutput, "Default" );
-            }
-            else
-                fprintf( fOutput, "Default" );
-            fprintf( fOutput, "; " );
-        }
-    }
-    fprintf( fOutput, ">" );
-
-    return;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
deleted file mode 100644
index 29184286cd8d..000000000000
--- a/rsc/source/res/rscclobj.cxx
+++ /dev/null
@@ -1,138 +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 <rscclobj.hxx>
-#include <rsctop.hxx>
-
-
-RefNode::RefNode( Atom nTyp )
-    : nTypNameId(nTyp), pObjBiTree(nullptr)
-{
-}
-
-sal_uInt32 RefNode::GetId() const
-{
-    return nTypNameId;
-}
-
-// insert a node in the b-tree pObjBiTree
-// if the node with the same name is in pObjBiTree,
-// return sal_False and no insert,
-
-bool RefNode::PutObjNode( ObjNode * pPutObject )
-{
-    if( pObjBiTree )
-        return pObjBiTree->Insert( pPutObject );
-
-    pObjBiTree = pPutObject;
-    return true;
-}
-
-// insert a node in the b-tree pObjBiTree
-// if the node with the same name is in pObjBiTree,
-// return NULL and no insert,
-// if not return the pointer to the Object
-ObjNode * RefNode::GetObjNode( const RscId & rRscId )
-{
-    if( pObjBiTree )
-        return pObjBiTree->Search( rRscId );
-    return nullptr;
-}
-
-ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, RscFileTab::Index lKey )
-    : aRscId(rId)
-    , pRscObj(pData)
-    , lFileKey(lKey)
-{
-}
-
-ObjNode * ObjNode::DelObjNode( RscTop * pClass, RscFileTab::Index nFileKey )
-{
-    ObjNode * pRetNode = this;
-
-    if( Right() )
-        pRight = static_cast<ObjNode *>(Right())->DelObjNode( pClass, nFileKey );
-    if( Left() )
-        pLeft = static_cast<ObjNode *>(Left())->DelObjNode( pClass, nFileKey );
-
-    if( GetFileKey() == nFileKey )
-    {
-        if( GetRscObj() )
-        {
-            pClass->Destroy( RSCINST( pClass, GetRscObj() ) );
-            rtl_freeMemory( GetRscObj() );
-        }
-        pRetNode = static_cast<ObjNode *>(Right());
-        if( pRetNode )
-        {
-            if( Left() )
-                pRetNode->Insert( static_cast<ObjNode *>(Left()) );
-        }
-        else
-            pRetNode = static_cast<ObjNode *>(Left());
-
-        delete this;
-    }
-    return pRetNode;
-}
-
-sal_uInt32 ObjNode::GetId() const
-{
-    return aRscId.GetNumber();
-}
-
-bool ObjNode::IsConsistent()
-{
-    bool bRet = true;
-
-    if( aRscId.GetNumber() > 0x7FFF || aRscId.GetNumber() < 1 )
-    {
-        bRet = false;
-    }
-    else
-    {
-        if( Left() )
-        {
-            if( !static_cast<ObjNode *>(Left())->IsConsistent() )
-            {
-                bRet = false;
-            }
-            if( static_cast<ObjNode *>(Left())->aRscId >= aRscId )
-            {
-                bRet = false;
-            }
-        }
-        if( Right() )
-        {
-            if( static_cast<ObjNode *>(Right())->aRscId <= aRscId )
-            {
-                bRet = false;
-            }
-            if( !static_cast<ObjNode *>(Right())->IsConsistent() )
-            {
-                bRet = false;
-            }
-        }
-    }
-
-    return bRet;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
deleted file mode 100644
index c0161106dbea..000000000000
--- a/rsc/source/res/rscconst.cxx
+++ /dev/null
@@ -1,186 +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 <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-#include <rscconst.hxx>
-#include <rscall.h>
-#include <rschash.hxx>
-#include <tools/resid.hxx>
-
-RscEnum::RscEnum( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscTop( nId, nTypeId )
-    , pVarArray(nullptr), nEntries(0)
-{
-}
-
-RscEnum::~RscEnum()
-{
-    if( pVarArray )
-        rtl_freeMemory( static_cast<void *>(pVarArray) );
-}
-
-void RscEnum::SetConstant( Atom nVarName, sal_Int32 lValue )
-{
-    if( pVarArray )
-        pVarArray = static_cast<VarEle *>(rtl_reallocateMemory( static_cast<void *>(pVarArray),
-                                                     ((nEntries +1) * sizeof( VarEle )) ));
-    else
-        pVarArray = static_cast<VarEle *>(rtl_allocateMemory( (nEntries +1) * sizeof( VarEle ) ));
-    pVarArray[ nEntries ].nId     = nVarName;
-    pVarArray[ nEntries ].lValue  = lValue;
-    nEntries++;
-}
-
-bool RscEnum::GetConstValue( Atom nConst, sal_Int32 * pValue ) const
-{
-    sal_uInt32 i = 0;
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarArray[ i ].nId == nConst )
-        {
-            *pValue = pVarArray[ i ].lValue;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool RscEnum::GetValueConst( sal_Int32 lValue, Atom * pConst ) const
-{
-    sal_uInt32 i = 0;
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarArray[ i ].lValue == lValue )
-        {
-            *pConst = pVarArray[ i ].nId;
-            return true;
-        }
-    }
-    return false;
-}
-
-sal_uInt32 RscEnum::GetConstPos( Atom nConst )
-{
-    sal_uInt32 i = 0;
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarArray[ i ].nId == nConst )
-            return i;
-    }
-
-    return nEntries;
-}
-
-ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ )
-{
-    sal_uInt32 i = 0;
-
-    if( nEntries != (i = GetConstPos( nConst )) )
-    {
-        reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue = i;
-        reinterpret_cast<RscEnumInst *>(rInst.pData)->bDflt = false;
-        return ERR_OK;
-    }
-
-    return ERR_RSCENUM;
-}
-
-ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
-{
-    sal_uInt32  i = 0;
-
-    for( i = 0; i < nEntries; i++ )
-    {
-        if( pVarArray[ i ].lValue == lValue )
-            return SetConst( rInst, pVarArray[ i ].nId, lValue );
-    }
-
-    return ERR_RSCENUM;
-}
-
-ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH )
-{
-    *pH = pVarArray[ reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue ].nId;
-    return ERR_OK;
-}
-
-ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){
-    *pNumber = pVarArray[ reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue ].lValue;
-    return ERR_OK;
-}
-
-RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
-{
-    RSCINST aInst;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(
-                      rtl_allocateMemory( sizeof( RscEnumInst ) ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    if( bOwnClass )
-        memmove( aInst.pData, rDflt.pData, Size() );
-    else
-    {
-        reinterpret_cast<RscEnumInst *>(aInst.pData)->nValue = 0;
-        reinterpret_cast<RscEnumInst *>(aInst.pData)->bDflt = true;
-    }
-
-    return aInst;
-}
-
-bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    return pDef && (reinterpret_cast<RscEnumInst*>(rInst.pData)->nValue == reinterpret_cast<RscEnumInst*>(pDef)->nValue );
-}
-
-void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                        RscTypCont *, sal_uInt32, const char * )
-{
-    fprintf( fOutput, "%s",
-             pHS->getString( pVarArray[ reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue ].nId ).getStr() );
-}
-
-ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                          RscTypCont *, sal_uInt32 )
-{
-    aMem.Put( pVarArray[ reinterpret_cast<RscEnumInst *>(rInst.pData)->nValue ].lValue );
-    return ERR_OK;
-}
-
-RscLangEnum::RscLangEnum()
-    : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ),
-      mnLangId( 0x400 )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
deleted file mode 100644
index 60e7064efe49..000000000000
--- a/rsc/source/res/rsccont.cxx
+++ /dev/null
@@ -1,755 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rsccont.hxx>
-
-#include <tools/rcid.h>
-
-void ENTRY_STRUCT::Destroy()
-{
-    aName.Destroy();
-    if( aInst.IsInst() )
-    {
-        aInst.pClass->Destroy( aInst );
-        rtl_freeMemory( aInst.pData );
-    }
-}
-
-RscBaseCont::RscBaseCont( Atom nId, RESOURCE_TYPE nTypeId,
-                          bool bNoIdent )
-    : RscTop(nId, nTypeId, nullptr)
-    , pTypeClass(nullptr)
-    , bNoId(bNoIdent), nOffInstData(RscTop::Size())
-    , nSize(nOffInstData + ALIGNED_SIZE(sizeof(RscBaseContInst)))
-
-{
-}
-
-RscBaseCont::~RscBaseCont()
-{
-}
-
-void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
-{
-    if( pClassData->nEntries )
-    {
-        for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ )
-        {
-            pClassData->pEntries[ i ].Destroy();
-        }
-        rtl_freeMemory( pClassData->pEntries );
-        pClassData->pEntries = nullptr;
-        pClassData->nEntries = 0;
-    }
-}
-
-RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
-                             bool bOwnClass )
-{
-    RSCINST aInst;
-    RscBaseContInst * pClassData;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(rtl_allocateMemory( Size() ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    RscTop::Create( &aInst, rDflt, bOwnClass );
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(aInst.pData + nOffInstData);
-    pClassData->nEntries = 0;
-    pClassData->pEntries = nullptr;
-    pClassData->bDflt = true;
-
-    if( bOwnClass )
-    {
-        RscBaseContInst *   pDfltClassData;
-        RSCINST         aDfltI;
-
-        pDfltClassData = reinterpret_cast<RscBaseContInst *>(rDflt.pData + nOffInstData);
-
-        if( 0 != pDfltClassData->nEntries )
-        {
-            *pClassData = *pDfltClassData;
-            pClassData->pEntries =
-                static_cast<ENTRY_STRUCT *>(rtl_allocateMemory( sizeof( ENTRY_STRUCT )
-                                                    * pClassData->nEntries ));
-            for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ )
-            {
-                pClassData->pEntries[ i ].Create();
-                pClassData->pEntries[ i ].aName =
-                                    pDfltClassData->pEntries[ i ].aName;
-                aDfltI = pDfltClassData->pEntries[ i ].aInst;
-                pClassData->pEntries[ i ].aInst =
-                                    aDfltI.pClass->Create( nullptr, aDfltI );
-            }
-        }
-    }
-
-    return aInst;
-}
-
-void RscBaseCont::Destroy( const RSCINST & rInst )
-{
-    RscBaseContInst * pClassData;
-
-    RscTop::Destroy( rInst);
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-    DestroyElements( pClassData );
-}
-
-RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName,
-                                   RscTop * pClass, sal_uInt32 nPos )
-{
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-    if( !pClass )
-        pClass = pTypeClass;
-
-    if( rEleName.IsId() )
-    {
-        for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ )
-        {
-            if( pClassData->pEntries[ i ].aName == rEleName &&
-                pClassData->pEntries[ i ].aInst.pClass == pClass )
-            {
-                return pClassData->pEntries[ i ].aInst;
-            }
-        }
-    }
-    return RSCINST();
-}
-
-RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName,
-                                RscTop * pClass )
-{
-    return SearchElePos( rInst, rEleName, pClass, 0 );
-}
-
-ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
-                                 RscTop * pCreateClass,
-                                 const RSCINST & rCreateInst, RSCINST * pGetInst )
-{
-    RscBaseContInst * pClassData;
-    RSCINST           aTmpI;
-    ERRTYPE           aError;
-
-    if( !bNoId && !rEleName.IsId() )
-        aError = WRN_CONT_NOID;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( pCreateClass )
-    {
-        if( !pCreateClass->InHierarchy( pTypeClass ) )
-        {
-             return ERR_CONT_INVALIDTYPE;
-        }
-    }
-    else
-        pCreateClass = pTypeClass;
-
-    pClassData->bDflt = false;
-
-    if( !bNoId )
-        aTmpI = SearchEle( rInst, rEleName, pCreateClass );
-    // entry found
-    if( aTmpI.IsInst() )
-    {
-        aError = WRN_CONT_DOUBLEID;
-        if( rCreateInst.IsInst() )
-        {
-            aTmpI.pClass->Destroy( aTmpI );
-            aTmpI.pClass->Create( &aTmpI, rCreateInst );
-        }
-    }
-    else
-    {
-        if( pClassData->pEntries )
-        {
-            pClassData->pEntries =
-                static_cast<ENTRY_STRUCT *>(rtl_reallocateMemory( pClassData->pEntries,
-                         sizeof( ENTRY_STRUCT ) * (pClassData->nEntries +1) ));
-        }
-        else
-        {
-            pClassData->pEntries =
-                static_cast<ENTRY_STRUCT *>(rtl_allocateMemory( sizeof( ENTRY_STRUCT )
-                                                * (pClassData->nEntries +1) ));
-        }
-
-        pClassData->pEntries[ pClassData->nEntries ].Create();
-        pClassData->pEntries[ pClassData->nEntries ].aName = rEleName;
-
-        if( rCreateInst.IsInst() )
-        {
-            // initialize instance with CreateInst data
-            pClassData->pEntries[ pClassData->nEntries ].aInst =
-                pCreateClass->Create( nullptr, rCreateInst );
-        }
-        else
-        {
-            pClassData->pEntries[ pClassData->nEntries ].aInst =
-                pCreateClass->Create( nullptr, RSCINST() );
-        }
-
-        pClassData->nEntries++;
-        aTmpI = pClassData->pEntries[ pClassData->nEntries -1 ].aInst;
-    }
-
-    *pGetInst = aTmpI;
-    return aError;
-}
-
-sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst )
-{
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-    return pClassData->nEntries;
-}
-
-RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( nPos < pClassData->nEntries )
-        return pClassData->pEntries[ nPos ].aInst;
-    return RSCINST();
-}
-
-ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
-                                 sal_uInt32 nSourcePos )
-{
-    ERRTYPE aError;
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) )
-    {
-        ENTRY_STRUCT aEntry;
-        int nInc = 1;
-        sal_uInt32 i = 0;
-
-        // mark source
-        aEntry = pClassData->pEntries[ nSourcePos ];
-        // guess direction of the for-loop
-        if( nDestPos < nSourcePos )
-            nInc = -1;
-
-        for( i = nSourcePos; i != nDestPos; i += nInc )
-            pClassData->pEntries[ i ] = pClassData->pEntries[ i + nInc ];
-
-        // assign source to target
-        pClassData->pEntries[ nDestPos ] = aEntry;
-    }
-    else
-        aError = ERR_RSCCONT;
-
-    return aError;
-}
-
-ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
-                                  const RscId & rId )
-{
-    RscBaseContInst * pClassData;
-    RSCINST           aTmpI;
-    ERRTYPE           aError;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( nPos < pClassData->nEntries )
-    {
-        if( ! (rId == pClassData->pEntries[ nPos ].aName) )
-            aTmpI = SearchEle( rInst, rId,
-                               pClassData->pEntries[ nPos ].aInst.pClass );
-        if( !aTmpI.IsInst() )
-            pClassData->pEntries[ nPos ].aName = rId;
-        else
-            aError = ERR_RSCCONT;
-    }
-    else
-        aError = ERR_RSCCONT;
-
-    return aError;
-}
-
-SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    RscBaseContInst * pClassData;
-    SUBINFO_STRUCT  aInfo;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( nPos < pClassData->nEntries )
-    {
-        aInfo.aId = pClassData->pEntries[ nPos ].aName;
-    }
-    return aInfo;
-}
-
-ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
-{
-    RscBaseContInst * pClassData;
-    RSCINST aTmpI;
-    ERRTYPE aError;
-    char    *pTmpStr;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // otherwise infinite recursion is possible
-    if( RSC_NOTYPE == pTypeClass->GetTypId() )
-    {
-        aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
-        aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr );
-
-        if( aError.IsOk() )
-            aError = aTmpI.pClass->SetString( aTmpI, pStr );
-        else
-        {
-            aError.Clear();
-            DeletePos( rInst, pClassData->nEntries -1 );
-            aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI );
-            aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr );
-            if( aError.IsOk() )
-                aError = aTmpI.pClass->SetString( aTmpI, pStr );
-        }
-
-        if( aError.IsError() )
-            DeletePos( rInst, pClassData->nEntries -1 );
-    }
-    else
-        aError = ERR_UNKNOWN_METHOD;
-
-    return aError;
-}
-
-ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
-{
-    RscBaseContInst * pClassData;
-    RSCINST aTmpI;
-    ERRTYPE aError;
-    sal_Int32   lNumber;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // otherwise infinite recursion is possible
-    if( RSC_NOTYPE == pTypeClass->GetTypId() )
-    {
-        aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
-        aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber );
-
-        if( aError.IsOk() )
-            aError = aTmpI.pClass->SetNumber( aTmpI, lValue );
-        else
-        {
-            aError.Clear();
-            DeletePos( rInst, pClassData->nEntries -1 );
-            aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI );
-            aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber );
-            if( aError.IsOk() )
-                aError = aTmpI.pClass->SetNumber( aTmpI, lValue );
-        }
-        if( aError.IsError() )
-            DeletePos( rInst, pClassData->nEntries -1 );
-    }
-    else
-        aError = ERR_UNKNOWN_METHOD;
-
-    return aError;
-}
-
-ERRTYPE RscBaseCont::SetBool( const RSCINST & rInst,
-                              bool bValue)
-{
-    RscBaseContInst * pClassData;
-    RSCINST aTmpI;
-    ERRTYPE aError;
-    bool    bBool;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // otherwise infinite recursion is possible
-    if( RSC_NOTYPE == pTypeClass->GetTypId() )
-    {
-        aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
-        aError = aTmpI.pClass->GetBool( aTmpI, &bBool );
-
-        if( aError.IsOk() )
-            aError = aTmpI.pClass->SetBool( aTmpI, bValue );
-        else
-        {
-            aError.Clear();
-            DeletePos( rInst, pClassData->nEntries -1 );
-            aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI );
-            aError = aTmpI.pClass->GetBool( aTmpI, &bBool );
-            if( aError.IsOk() )
-                aError = aTmpI.pClass->SetBool( aTmpI, bValue );
-        }
-
-        if( aError.IsError() )
-            DeletePos( rInst, pClassData->nEntries -1 );
-    }
-    else
-        aError = ERR_UNKNOWN_METHOD;
-
-    return aError;
-}
-
-ERRTYPE RscBaseCont::SetConst( const RSCINST & rInst,
-                               Atom nValueId,
-                               sal_Int32 lValue)
-{
-    RscBaseContInst * pClassData;
-    RSCINST aTmpI;
-    ERRTYPE aError;
-    Atom    nConst;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // otherwise infinite recursion is possible
-    if( RSC_NOTYPE == pTypeClass->GetTypId() )
-    {
-        aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
-        aError = aTmpI.pClass->GetConst( aTmpI, &nConst );
-
-        if( aError.IsOk() )
-            aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue );
-        else
-        {
-            aError.Clear();
-            DeletePos( rInst, pClassData->nEntries -1 );
-            aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI );
-            aError = aTmpI.pClass->GetConst( aTmpI, &nConst );
-            if( aError.IsOk() )
-                aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue );
-        }
-
-        if( aError.IsError() )
-            DeletePos( rInst, pClassData->nEntries -1 );
-    }
-    else
-        aError = ERR_UNKNOWN_METHOD;
-
-    return aError;
-}
-
-ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId )
-{
-    RscBaseContInst * pClassData;
-    RSCINST aTmpI;
-    ERRTYPE aError;
-    RscId   aId;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // otherwise infinite recursion is possible
-    if( RSC_NOTYPE == pTypeClass->GetTypId() )
-    {
-        aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
-        aError = aTmpI.pClass->GetRef( aTmpI, &aId );
-
-        if( aError.IsOk() )
-            aError = aTmpI.pClass->SetRef( aTmpI, rRefId );
-        else
-        {
-            aError.Clear();
-            DeletePos( rInst, pClassData->nEntries -1 );
-            aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI );
-            aError = aTmpI.pClass->GetRef( aTmpI, &aId );
-            if( aError.IsOk() )
-                aError = aTmpI.pClass->SetNumber( aTmpI, rRefId.GetNumber() );
-        }
-
-        if( aError.IsError() )
-            DeletePos( rInst, pClassData->nEntries -1 );
-    }
-    else
-        aError = ERR_UNKNOWN_METHOD;
-
-    return aError;
-}
-
-bool RscBaseCont::IsConsistent( const RSCINST & rInst )
-{
-    sal_uInt32  i = 0;
-    RscBaseContInst * pClassData;
-    bool    bRet;
-
-    bRet = RscTop::IsConsistent( rInst );
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    // check for duplicate Id and keep order
-    // complexity = n^2 / 2
-    for( i = 0; i < pClassData->nEntries; i++ )
-    {
-        if( !bNoId )
-        {
-            if( pClassData->pEntries[ i ].aName.GetNumber() > 0x7FFF ||
-                pClassData->pEntries[ i ].aName.GetNumber() < 1 )
-            {
-                bRet = false;
-            }
-            else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName,
-                                   pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
-            {
-                 bRet = false;
-            }
-        }
-        if( ! pClassData->pEntries[ i ].aInst.pClass->
-            IsConsistent( pClassData->pEntries[ i ].aInst ) )
-        {
-            bRet = false;
-        }
-    }
-
-    return bRet;
-}
-
-void RscBaseCont::SetToDefault( const RSCINST & rInst )
-{
-    sal_uInt32  i = 0;
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    for( i = 0; i < pClassData->nEntries; i++ )
-    {
-        pClassData->pEntries[ i ].aInst.pClass->
-                  SetToDefault( pClassData->pEntries[ i ].aInst );
-    }
-
-    RscTop::SetToDefault( rInst );
-}
-
-bool RscBaseCont::IsDefault( const RSCINST & rInst )
-{
-    sal_uInt32  i = 0;
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( !pClassData->bDflt )
-        return false;
-
-    for( i = 0; i < pClassData->nEntries; i++ )
-    {
-        if( ! pClassData->pEntries[ i ].aInst.pClass->
-            IsDefault( pClassData->pEntries[ i ].aInst ) )
-        {
-            return false;
-        }
-    }
-
-    return RscTop::IsDefault( rInst );
-}
-
-bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    RscBaseContInst * pClassData;
-
-    if( !RscTop::IsValueDefault( rInst, pDef ) )
-        return false;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( pClassData->nEntries )
-        return false;
-    else
-        return true;
-}
-
-void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
-                          const RscId & rId )
-{
-    sal_uInt32  i = 0;
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-    if( !pClass )
-        pClass = pTypeClass;
-
-    for( i = 0; i < pClassData->nEntries; i++ )
-    {
-        if( pClassData->pEntries[ i ].aName == rId )
-        {
-            if( pClassData->pEntries[ i ].aInst.pClass == pClass || !pClass )
-            {
-                DeletePos( rInst, i );
-                return;
-            }
-        }
-    }
-
-}
-
-void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    RscBaseContInst *   pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    if( nPos < pClassData->nEntries )
-    {
-        if( 1 == pClassData->nEntries )
-            DestroyElements( pClassData );
-        else
-        {
-            pClassData->pEntries[ nPos ].Destroy();
-            pClassData->nEntries--;
-
-            for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ )
-                pClassData->pEntries[ i ] = pClassData->pEntries[ i + 1 ];
-
-        }
-    }
-}
-
-void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
-                                RscTypCont * pTC, sal_uInt32 nTab,
-                                const char * pVarName )
-{
-    sal_uInt32  i = 0, t = 0;
-    RscBaseContInst * pClassData;
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    for( i = 0; i < pClassData->nEntries; i++ )
-    {
-        for( t = 0; t < nTab; t++ )
-            fputc( '\t', fOutput );
-
-        pClassData->pEntries[ i ].aInst.pClass->
-                  WriteSrcHeader( pClassData->pEntries[ i ].aInst,
-                                  fOutput, pTC, nTab,
-                                  pClassData->pEntries[ i ].aName, pVarName );
-        fprintf( fOutput, ";\n" );
-    }
-}
-
-ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                  RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    RscBaseContInst * pClassData;
-    ERRTYPE       aError;
-
-    if( bNoId )
-    {
-        pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-        for (sal_uInt32 i = 0; i < pClassData->nEntries && aError.IsOk(); i++ )
-        {
-            aError = pClassData->pEntries[ i ].aInst.pClass->
-                         WriteRcHeader( pClassData->pEntries[ i ].aInst,
-                                        rMem, pTC,
-                                        pClassData->pEntries[ i ].aName,
-                                        nDeep );
-        }
-    }
-
-    return aError ;
-}
-
-void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                            RscTypCont * pTC, sal_uInt32 nTab,
-                            const char * pVarName )
-{
-    RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-    ContWriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-}
-
-ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                              RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    ERRTYPE       aError;
-
-    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
-    if( aError.IsOk() )
-        aError = ContWriteRc( rInst, rMem, pTC, nDeep );
-
-    return aError;
-}
-
-RscContWriteSrc::RscContWriteSrc( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscBaseCont( nId, nTypeId, true )
-{
-}
-
-void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                                RscTypCont * pTC, sal_uInt32 nTab,
-                                const char * pVarName )
-{
-    sal_uInt32  i;
-
-    RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-
-    fprintf( fOutput, "\n" );
-    for( i = 0; i < nTab; i++ )
-        fputc( '\t', fOutput );
-
-    fprintf( fOutput, "{\n" );
-
-    ContWriteSrc( rInst, fOutput, pTC, nTab +1, pVarName );
-
-    for( i = 0; i < nTab; i++ )
-        fputc( '\t', fOutput );
-
-    fprintf( fOutput, "}" );
-}
-
-RscCont::RscCont( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscContWriteSrc( nId, nTypeId )
-{
-}
-
-ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                                 RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    RscBaseContInst * pClassData;
-    ERRTYPE aError;
-
-    aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
-
-    pClassData = reinterpret_cast<RscBaseContInst *>(rInst.pData + nOffInstData);
-
-    rMem.Put( pClassData->nEntries );
-
-    if( aError.IsOk() )
-        aError = ContWriteRc( rInst, rMem, pTC, nDeep );
-
-    return aError;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
deleted file mode 100644
index 6c0b1441d042..000000000000
--- a/rsc/source/res/rscmgr.cxx
+++ /dev/null
@@ -1,346 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rscmgr.hxx>
-#include <rscdb.hxx>
-
-RscMgr::RscMgr( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuperCl )
-    : RscClass( nId, nTypeId, pSuperCl )
-{
-}
-
-sal_uInt32 RscMgr::Size() const
-{
-    return RscClass::Size() + ALIGNED_SIZE( sizeof( RscMgrInst ) );
-}
-
-RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
-{
-    RSCINST aInst;
-    RscMgrInst * pClassData;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(rtl_allocateMemory( Size() ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    RscClass::Create( &aInst, rDflt, bOwnClass );
-
-    pClassData = reinterpret_cast<RscMgrInst *>(aInst.pData + RscClass::Size() );
-    pClassData->Create();
-
-    if( bOwnClass )
-    {
-        RscMgrInst * pDfltData = reinterpret_cast<RscMgrInst *>(rDflt.pData + RscClass::Size());
-        *pClassData = *pDfltData;
-    }
-
-    return aInst;
-}
-
-void RscMgr::Destroy( const RSCINST & rInst )
-{
-    RscMgrInst * pClassData;
-
-    RscClass::Destroy( rInst );
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-    pClassData->Destroy();
-}
-
-void RscMgr::SetToDefault( const RSCINST & rInst )
-{
-    RscMgrInst * pClassData;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-    pClassData->bDflt = true;
-
-    RscClass::SetToDefault( rInst );
-}
-
-bool RscMgr::IsDefault( const RSCINST & rInst )
-{
-    RscMgrInst * pClassData;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-    if( !pClassData->bDflt )
-        return false;
-
-    return RscClass::IsDefault( rInst );
-}
-
-bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    if( !RscClass::IsValueDefault( rInst, pDef ) )
-        return false;
-
-    if( pDef )
-    {
-        RscMgrInst * pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-        RscMgrInst * pDfltData  = reinterpret_cast<RscMgrInst *>(pDef + RscClass::Size());
-
-        if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() )
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
-                             RscTypCont * pTC, sal_uInt32 nTab,
-                             const RscId & rId, const char * pVarName )
-{
-    RscMgrInst * pClassData;
-    sal_uInt32       i;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-
-    fprintf( fOutput, "%s %s",
-             pHS->getString( rInst.pClass->GetId() ).getStr(),
-             (rId.GetName()).getStr() );
-
-    if( pClassData->aRefId.IsId() )
-        fprintf( fOutput, ",%s", pClassData->aRefId.GetName().getStr() );
-    else
-    {
-        fprintf( fOutput, "\n" );
-        for( i = 0; i < nTab; i++ )
-            fputc( '\t', fOutput );
-
-        fprintf( fOutput, "{\n" );
-
-        rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab +1, pVarName );
-
-        RscClass::WriteSrc( rInst, fOutput, pTC, nTab +1, pVarName);
-
-        for( i = 0; i < nTab; i++ )
-            fputc( '\t', fOutput );
-
-        fprintf( fOutput, "}" );
-    }
-}
-
-void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
-                       const char * )
-{
-}
-
-ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
-                               RscTypCont * pTC, const RscId &rId,
-                               sal_uInt32 nDeep )
-{
-    RscMgrInst *    pClassData;
-    ERRTYPE         aError;
-    ObjNode *       pObjNode = nullptr;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-
-    if( pClassData->aRefId.IsId() )
-    {
-        // increment and test to avoid endless recursion
-        nDeep++;
-        if( nDeep > nRefDeep )
-            aError = ERR_REFTODEEP;
-        else
-            pObjNode = rInst.pClass->GetRefClass()->
-                                        GetObjNode( pClassData->aRefId );
-
-        if( !pObjNode && pTC )
-        {
-            OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId()));
-            aMsg.append(' ').append(pClassData->aRefId.GetName());
-            aError = WRN_MGR_REFNOTFOUND;
-            pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr());
-        }
-    }
-
-    if( aError.IsOk() )
-    {
-        if( pObjNode )
-        {
-            RSCINST     aRefI;
-            RscTop *    pTmpRefClass = rInst.pClass->GetRefClass();
-
-            aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() );
-            if( pTmpRefClass == rInst.pClass )
-            {
-                aError = aRefI.pClass->WriteRcHeader( aRefI, rMem, pTC,
-                                                       rId, nDeep );
-            }
-            else
-            {
-                RSCINST aRefInst = rInst.pClass->Create( nullptr, aRefI );
-                aError = aRefI.pClass->WriteRcHeader( aRefInst, rMem, pTC,
-                                                       rId, nDeep );
-                pTmpRefClass->Destroy( aRefInst );
-            }
-        }
-        else
-        {
-            sal_uInt32          nOldSize;
-            sal_uInt32          nLocalSize;
-
-            nOldSize = rMem.IncSize( 16 /*sizeof( RSHEADER_TYPE )*/ );
-
-            aError = rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep );
-            if( aError.IsOk() )
-                aError = WriteInstRc( rInst, rMem, pTC, nDeep );
-            nLocalSize = rMem.Size();
-
-            if( aError.IsOk() )
-            {
-                // RscClass is skipped
-                aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep );
-            }
-
-            /*
-            // structure definition from which the resource is built
-            struct RSHEADER_TYPE{
-                RESOURCE_TYPE   nRT;        // resource type
-                sal_uInt32          nRT;        // resource type
-                sal_uInt32          nGlobOff;   // global offset
-                sal_uInt32          nLocalOff;  // local offset
-            };
-            */
-            sal_uInt32 nID = rId.GetNumber();
-            rMem.PutAt( nOldSize, nID );
-            rMem.PutAt( nOldSize +4, (sal_uInt32)rInst.pClass->GetTypId() );
-            rMem.PutAt( nOldSize +8, (sal_uInt32)(rMem.Size() - nOldSize) );
-            rMem.PutAt( nOldSize +12, (sal_uInt32)(nLocalSize - nOldSize) );
-        }
-    }
-
-    return aError;
-}
-
-ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
-                         RscTypCont *, sal_uInt32 )
-
-{
-    return ERR_OK;
-}
-
-bool RscMgr::IsConsistent( const RSCINST & rInst )
-{
-    bool    bRet;
-    RscMgrInst * pClassData;
-
-    bRet = RscClass::IsConsistent( rInst );
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-    if( pClassData->aRefId.IsId() &&
-        ((pClassData->aRefId.GetNumber() < 1) ||
-         (pClassData->aRefId.GetNumber() > 0x7FFF) ||
-         IsToDeep( rInst ).IsError()) )
-    {
-        bRet = false;
-    }
-
-    return bRet;
-}
-
-ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId )
-{
-    RscMgrInst * pClassData;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-    *pRscId = pClassData->aRefId;
-    return ERR_OK;
-}
-
-ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst )
-{
-    RscMgrInst *    pClassData;
-    RscId           aOldId, aId;
-    ERRTYPE         aError;
-    RSCINST         aTmpI = rInst;
-    ObjNode *       pObjNode;
-    sal_uInt32      nDeep = 0;
-
-    pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-
-    while( aTmpI.IsInst() && (nDeep < nRefDeep) && aError.IsOk() )
-    {
-        // retrieve reference
-        aTmpI.pClass->GetRef( aTmpI, &aId );
-        // retrieve referenced object
-        pObjNode = aTmpI.pClass->GetObjNode( aId );
-        // was the referenced object found?
-        if( pObjNode )
-        {
-            aTmpI.pData = pObjNode->GetRscObj();
-            nDeep++;
-        }
-        else //aTmpI.IsInst() becomes false, end loop
-            aTmpI.pData = nullptr;
-    }
-
-    if( nDeep >= nRefDeep )
-    {
-        pClassData->aRefId = aOldId;
-        aError             = ERR_REFTODEEP;
-    }
-
-    return aError;
-}
-
-ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
-{
-    RscMgrInst *    pClassData;
-    RscId           aOldId, aId;
-    ERRTYPE         aError;
-
-    if( rRefId.IsId() &&
-        ((rRefId.GetNumber() < 1) ||
-         (rRefId.GetNumber() > 0x7FFF)) )
-    {
-        aError = ERR_IDRANGE;
-    }
-    else
-    {
-        pClassData = reinterpret_cast<RscMgrInst *>(rInst.pData + RscClass::Size());
-        aOldId = pClassData->aRefId;// mark old value
-        pClassData->aRefId = rRefId;// previous entry to avoid failure when recursing
-
-
-        aError = IsToDeep( rInst );
-        if( aError.IsOk() )
-            pClassData->bDflt  = false;
-        else
-            pClassData->aRefId = aOldId;
-    }
-
-    return aError;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
deleted file mode 100644
index db7957d07644..000000000000
--- a/rsc/source/res/rscrange.cxx
+++ /dev/null
@@ -1,139 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rscrange.hxx>
-
-RscLongRange::RscLongRange( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscTop( nId, nTypeId )
-    , nMin(0), nMax(0)
-{
-}
-
-void RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
-{
-    if( nMinimum > nMaximum )
-    {
-        nMin = nMaximum;
-        nMax = nMinimum;
-    }
-    else
-    {
-        nMax = nMaximum;
-        nMin = nMinimum;
-    }
-}
-
-bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    if( pDef )
-        return 0 == memcmp( &reinterpret_cast<RscLongRangeInst*>(rInst.pData)->nValue,
-                            &reinterpret_cast<RscLongRangeInst*>(pDef)->nValue,
-                            sizeof( sal_Int32 ) );
-
-    return false;
-}
-
-ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
-{
-    if( nMax < nValue || nMin > nValue )
-        return ERR_RSCRANGE_OUTDEFSET;
-
-    void * pData = &reinterpret_cast<RscLongRangeInst*>(rInst.pData)->nValue;
-    memcpy( pData, &nValue, sizeof( sal_Int32 ) );
-    reinterpret_cast<RscLongRangeInst *>(rInst.pData)->bDflt = false;
-    return ERR_OK;
-}
-
-ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
-{
-    memmove( pN, &reinterpret_cast<RscLongRangeInst*>(rInst.pData)->nValue,
-             sizeof( sal_Int32 ) );
-    return ERR_OK;
-}
-
-RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
-                              bool bOwnClass )
-{
-    RSCINST aInst;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(rtl_allocateMemory( sizeof( RscLongRangeInst ) ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    if( bOwnClass )
-        memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) );
-    else
-    {
-        sal_Int32   lDflt;
-        if( 0 >= nMin && 0 <= nMax )
-            lDflt = 0;
-        else
-            lDflt = nMin;
-
-        void * pData = &reinterpret_cast<RscLongRangeInst*>(aInst.pData)->nValue;
-        memcpy( pData, &lDflt, sizeof( sal_Int32 ) );
-        reinterpret_cast<RscLongRangeInst *>(aInst.pData)->bDflt = true;
-    }
-
-    return aInst;
-}
-
-void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                             RscTypCont *, sal_uInt32, const char * )
-{
-    sal_Int32 lVal;
-    GetNumber( rInst, &lVal );
-    fprintf( fOutput, "%d", static_cast<int>(lVal) );
-}
-
-ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
-                               RscTypCont *, sal_uInt32 )
-{
-    sal_Int32 lVal;
-
-    GetNumber( rInst, &lVal );
-    aMem.Put( lVal );
-
-    return ERR_OK;
-}
-
-RscLongEnumRange::RscLongEnumRange( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscLongRange( nId, nTypeId )
-{
-}
-
-ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/,
-                                    sal_Int32 nValue )
-{
-    return SetNumber( rInst, nValue );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
deleted file mode 100644
index 918fb5ab1afb..000000000000
--- a/rsc/source/res/rscstr.cxx
+++ /dev/null
@@ -1,293 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rscdb.hxx>
-#include <rscstr.hxx>
-
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-
-RscString::RscString( Atom nId, RESOURCE_TYPE nTypeId )
-    : RscTop( nId, nTypeId )
-    , pRefClass(nullptr)
-{
-}
-
-ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr )
-{
-    char    * pTmp;
-    ERRTYPE aError;
-
-    if( aError.IsOk() )
-    {
-        reinterpret_cast<RscStringInst *>(rInst.pData)->bDflt = false;
-
-        pTmp = reinterpret_cast<RscStringInst *>(rInst.pData)->pStr;
-        if( pTmp )
-        {
-            rtl_freeMemory( pTmp );
-            pTmp = nullptr;
-        }
-
-        if( pStr )
-        {
-            sal_uInt32  nLen = strlen( pStr ) +1;
-            pTmp = static_cast<char *>(rtl_allocateMemory( nLen ));
-            memcpy( pTmp, pStr, nLen );
-        }
-
-        reinterpret_cast<RscStringInst *>(rInst.pData)->pStr = pTmp;
-    }
-
-    return aError;
-}
-
-ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr )
-{
-    *ppStr = reinterpret_cast<RscStringInst *>(rInst.pData)->pStr;
-    return ERR_OK;
-}
-
-ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId )
-{
-    *pRscId = reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId;
-    return ERR_OK;
-}
-
-ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId )
-{
-    if( pRefClass )
-    {
-        reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId = rRefId;
-        reinterpret_cast<RscStringInst *>(rInst.pData)->bDflt  = false;
-    }
-    else
-        return ERR_REFNOTALLOWED;
-
-    return ERR_OK;
-}
-
-RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
-                           bool bOwnClass )
-{
-    RSCINST aInst;
-
-    if( !pInst )
-    {
-        aInst.pClass = this;
-        aInst.pData = static_cast<CLASS_DATA>(
-                      rtl_allocateMemory( sizeof( RscStringInst ) ));
-    }
-    else
-        aInst = *pInst;
-
-    if( !bOwnClass && rDflt.IsInst() )
-        bOwnClass = rDflt.pClass->InHierarchy( this );
-
-    reinterpret_cast<RscStringInst *>(aInst.pData)->aRefId.Create();
-    reinterpret_cast<RscStringInst *>(aInst.pData)->pStr = nullptr;
-    reinterpret_cast<RscStringInst *>(aInst.pData)->bDflt = true;
-
-    if( bOwnClass )
-    {
-        reinterpret_cast<RscStringInst *>(aInst.pData)->aRefId =
-            reinterpret_cast<RscStringInst *>(rDflt.pData)->aRefId;
-        SetString( aInst, reinterpret_cast<RscStringInst *>(rDflt.pData)->pStr );
-        reinterpret_cast<RscStringInst *>(aInst.pData)->bDflt =
-            reinterpret_cast<RscStringInst *>(rDflt.pData)->bDflt;
-    }
-
-    return aInst;
-}
-
-void RscString::Destroy( const RSCINST & rInst )
-{
-    if( reinterpret_cast<RscStringInst *>(rInst.pData)->pStr )
-        rtl_freeMemory( reinterpret_cast<RscStringInst *>(rInst.pData)->pStr );
-    reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId.Destroy();
-}
-
-bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    RscStringInst * pData    = reinterpret_cast<RscStringInst*>(rInst.pData);
-    RscStringInst * pDefData = reinterpret_cast<RscStringInst*>(pDef);
-
-    if( pDef )
-    {
-        if( pData->aRefId.IsId() || pDefData->aRefId.IsId() )
-        {
-            if( pData->aRefId.aExp.IsNumber() &&
-                pDefData->aRefId.aExp.IsNumber() )
-            {
-                // check whether reference identifiers are equal
-                if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() )
-                {
-                    return true;
-                }
-            }
-        }
-        else
-        {
-            bool bStrEmpty = false;
-            bool bDefStrEmpty = false;
-
-            if( pData->pStr )
-            {
-                bStrEmpty = ('\0' == *pData->pStr);
-            }
-            else
-                bStrEmpty = true;
-
-            if( pDefData->pStr )
-            {
-                bDefStrEmpty = ('\0' == *pDefData->pStr);
-            }
-            else
-                bDefStrEmpty = true;
-
-            if( !bStrEmpty || !bDefStrEmpty )
-            {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                          RscTypCont *, sal_uInt32, const char * )
-{
-    if ( reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId.IsId() )
-    {
-        fprintf( fOutput, "%s",
-                 reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId.GetName().getStr() );
-    }
-    else
-    {
-        RscStringInst * pStrI = reinterpret_cast<RscStringInst *>(rInst.pData);
-        if(  pStrI->pStr ){
-            //char *  pChangeTab = RscChar::GetChangeTab();
-            sal_uInt32  n = 0;
-            sal_uInt32  nPos, nSlashPos;
-
-            do
-            {
-                fputc( '\"', fOutput );
-                nSlashPos = nPos = 0;
-
-                while( pStrI->pStr[ n ] && (nPos < 72 || nPos - nSlashPos <= 3) )
-                { // after \ drop at least 3 characters \xa7
-                    fputc( pStrI->pStr[ n ], fOutput );
-                    if( pStrI->pStr[ n ] == '\\' )
-                        nSlashPos = nPos;
-                    n++;
-                    nPos++;
-                }
-
-                fputc( '\"', fOutput );
-                if( pStrI->pStr[ n ] ) // end not reached yet
-                {
-                    fputc( '\n', fOutput );
-                }
-            }
-            while( pStrI->pStr[ n ] );
-        }
-        else
-            fprintf( fOutput, "\"\"" );
-    }
-}
-
-ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                            RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    ERRTYPE aError;
-    ObjNode *       pObjNode = nullptr;
-
-
-    if( reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId.IsId() )
-    {
-        RscId   aId( reinterpret_cast<RscStringInst *>(rInst.pData)->aRefId );
-        RSCINST aTmpI;
-
-        aTmpI.pClass = pRefClass;
-
-        while( aError.IsOk() && aId.IsId() )
-        {
-            // increment and test to avoid endless recursion
-            nDeep++;
-            if( nDeep > nRefDeep )
-                aError = ERR_REFTODEEP;
-            else
-            {
-                pObjNode = pRefClass->GetObjNode( aId );
-                if( pObjNode )
-                {
-                    aTmpI.pData = pObjNode->GetRscObj();
-                    aError = pRefClass->GetRef( aTmpI, &aId );
-                }
-                else
-                {
-                    if( pTC )
-                    {
-                        OStringBuffer aMsg(pHS->getString(
-                            pRefClass->GetId()));
-                        aMsg.append(' ').append(aId.GetName());
-                        aError = WRN_STR_REFNOTFOUND;
-                        pTC->pEH->Error( aError, rInst.pClass,
-                                         RscId(), aMsg.getStr() );
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    if( aError.IsOk() )
-    {
-        if( pObjNode )
-        {
-            RSCINST     aRefI;
-
-            aRefI = RSCINST( pRefClass, pObjNode->GetRscObj() );
-            aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep );
-        }
-        else
-        {
-            if( reinterpret_cast<RscStringInst *>(rInst.pData)->pStr && pTC )
-            {
-                char * pStr = RscChar::MakeUTF8( reinterpret_cast<RscStringInst *>(rInst.pData)->pStr,
-                                                pTC->GetSourceCharSet() );
-                rMem.PutUTF8( pStr );
-                rtl_freeMemory( pStr );
-            }
-            else
-                rMem.PutUTF8( reinterpret_cast<RscStringInst *>(rInst.pData)->pStr );
-        }
-    }
-    return aError;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
deleted file mode 100644
index adc61de5a086..000000000000
--- a/rsc/source/res/rsctop.cxx
+++ /dev/null
@@ -1,410 +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 <stdio.h>
-#include <string.h>
-#include <rsctop.hxx>
-
-RscTop::RscTop( Atom nId, RESOURCE_TYPE nTypIdent, RscTop * pSuperCl )
-    : RefNode( nId )
-    , pSuperClass( pSuperCl )
-    , nTypId( nTypIdent )
-{
-    pRefClass = this;
-    if( pSuperClass )
-        SetCallPar( pSuperClass->aCallPar1, pSuperClass->aCallPar2,
-                    pSuperClass->aCallParType );
-}
-
-void RscTop::SetCallPar(const OString& rPar1, const OString& rPar2,
-    const OString& rParType)
-{
-    aCallPar1 = rPar1;
-    aCallPar2 = rPar2;
-    aCallParType = rParType;
-}
-
-RSCINST const & RscTop::GetDefault()
-{
-    if( !aDfltInst.IsInst() )
-        aDfltInst = this->Create( nullptr, RSCINST() );
-    return aDfltInst;
-}
-
-void RscTop::Pre_dtor()
-{
-    if( aDfltInst.IsInst() )
-    {
-        aDfltInst.pClass->Destroy( aDfltInst );
-        rtl_freeMemory( aDfltInst.pData );
-        aDfltInst = RSCINST();
-    };
-}
-
-RscTop * RscTop::GetTypeClass() const
-{
-    if( pSuperClass )
-        return pSuperClass->GetTypeClass();
-    else
-        return nullptr;
-}
-
-sal_uInt32 RscTop::Size() const
-{
-    if( pSuperClass )
-        return pSuperClass->Size();
-    else
-        return 0;
-}
-
-ERRTYPE RscTop::GetRef( const RSCINST & rInst, RscId * pRscId )
-{
-    if( pSuperClass )
-        return pSuperClass->GetRef( rInst, pRscId );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-bool RscTop::InHierarchy( RscTop * pClass )
-{
-    if( this == pClass )
-        return true;
-    if( pSuperClass )
-        return pSuperClass->InHierarchy( pClass );
-    return false;
-}
-
-ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
-                     RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask,
-                     Atom nDataBaseName )
-{
-    if( pSuperClass )
-        return pSuperClass->SetVariable( nVarName, pClass, pDflt,
-                                         nVarType, nMask, nDataBaseName );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-RSCINST RscTop::GetVariable( const RSCINST & rInst,
-                             Atom nVarName,
-                             const RSCINST & rInitInst,
-                             bool bInitDflt,
-                             RscTop * pCreateClass)
-{
-    if( pSuperClass )
-        return pSuperClass->GetVariable( rInst, nVarName, rInitInst, bInitDflt, pCreateClass );
-    else
-        return RSCINST();
-}
-
-RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName )
-{
-    if( pSuperClass )
-        return pSuperClass->GetCopyVar( rInst, nVarName );
-    else
-        return RSCINST();
-}
-
-RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
-                            const RSCINST & rInitInst )
-{
-    if( pSuperClass )
-        return pSuperClass->GetTupelVar( rInst, nPos, rInitInst );
-    else
-        return RSCINST();
-}
-
-ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName,
-                    RscTop *pCreateClass, const RSCINST & rCreateInst,
-                    RSCINST * pGetInst )
-{
-    if( pSuperClass )
-        return pSuperClass-> GetElement( rInst, rEleName,
-                                         pCreateClass, rCreateInst,
-                                         pGetInst );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetArrayEle( const RSCINST & rInst,
-                             Atom nId,
-                             RscTop * pCreateClass,
-                             RSCINST * pGetInst)
-{
-    if( pSuperClass )
-        return pSuperClass->GetArrayEle( rInst, nId, pCreateClass, pGetInst );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetValueEle( const RSCINST & rInst,
-                             sal_Int32 lValue,
-                             RscTop * pCreateClass,
-                             RSCINST * pGetInst)
-{
-    if( pSuperClass )
-        return pSuperClass->GetValueEle( rInst, lValue, pCreateClass, pGetInst );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName,
-                           RscTop * pClass )
-{
-    if( pSuperClass )
-        return pSuperClass->SearchEle( rInst, rEleName, pClass );
-    else
-        return RSCINST();
-}
-
-RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    if( pSuperClass )
-        return pSuperClass->GetPosEle( rInst, nPos );
-    else
-        return RSCINST();
-}
-
-ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
-                            sal_uInt32 nSourcePos )
-{
-    if( pSuperClass )
-        return pSuperClass->MovePosEle( rInst, nDestPos, nSourcePos );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
-                     const RscId & rRscId )
-{
-    if( pSuperClass )
-        return pSuperClass->SetPosRscId( rInst, nPos, rRscId );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    if( pSuperClass )
-        return pSuperClass->GetInfoEle( rInst, nPos );
-    else
-        return SUBINFO_STRUCT();
-}
-
-sal_uInt32  RscTop::GetCount( const RSCINST & rInst )
-{
-    if( pSuperClass )
-        return pSuperClass->GetCount( rInst );
-    else
-        return 0;
-}
-
-ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
-{
-    if( pSuperClass )
-        return pSuperClass->SetNumber( rInst, lValue );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::SetBool( const RSCINST & rInst, bool bValue )
-{
-    if( pSuperClass )
-        return pSuperClass->SetBool( rInst, bValue );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal )
-{
-    if( pSuperClass )
-        return pSuperClass->SetConst( rInst, nId, nVal );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId )
-{
-    if( pSuperClass )
-        return pSuperClass->SetNotConst( rInst, nId );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr )
-{
-    if( pSuperClass )
-        return pSuperClass->SetString( rInst, pStr );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
-{
-    if( pSuperClass )
-        return pSuperClass->GetNumber( rInst, pN );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetBool( const RSCINST & rInst, bool * pB )
-{
-    if( pSuperClass )
-        return pSuperClass->GetBool( rInst, pB );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH )
-{
-    if( pSuperClass )
-        return pSuperClass->GetConst( rInst, pH );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr )
-{
-    if( pSuperClass )
-        return pSuperClass->GetString( rInst, ppStr );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, bool bOwnRange )
-{
-    if( pSuperClass )
-        return pSuperClass->Create( pInst, rDefInst, bOwnRange );
-    else
-    {
-        if( pInst )
-            return *pInst;
-        return RSCINST();
-    }
-}
-
-void    RscTop::Destroy( const RSCINST & rInst )
-{
-    if( pSuperClass )
-        pSuperClass->Destroy( rInst );
-}
-
-bool RscTop::IsConsistent( const RSCINST & rInst )
-{
-    if( pSuperClass )
-        return pSuperClass->IsConsistent( rInst );
-    else
-        return true;
-}
-
-void    RscTop::SetToDefault( const RSCINST & rInst )
-{
-    if( pSuperClass )
-        pSuperClass->SetToDefault( rInst );
-}
-
-bool    RscTop::IsDefault( const RSCINST & rInst )
-{
-    if( pSuperClass )
-        return pSuperClass->IsDefault( rInst );
-    else
-        return true;
-}
-
-bool    RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
-{
-    if( pSuperClass )
-        return pSuperClass->IsValueDefault( rInst, pDef );
-    else
-        return true;
-}
-
-void    RscTop::SetDefault( const RSCINST & rInst, Atom nVarId )
-{
-    if( pSuperClass )
-        pSuperClass->SetDefault( rInst, nVarId );
-}
-
-RSCINST RscTop::GetDefault( Atom nVarId )
-{
-    if( pSuperClass )
-        return pSuperClass->GetDefault( nVarId );
-    else
-        return RSCINST();
-}
-
-void    RscTop::Delete( const RSCINST & rInst, RscTop * pClass,
-                        const RscId & rId )
-{
-    if( pSuperClass )
-        pSuperClass->Delete( rInst, pClass, rId );
-}
-
-void    RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
-{
-    if( pSuperClass )
-        pSuperClass->DeletePos( rInst, nPos );
-}
-
-ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId )
-{
-    if( pSuperClass )
-        return pSuperClass->SetRef( rInst, rRefId );
-    else
-        return ERR_UNKNOWN_METHOD;
-}
-
-void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
-                             RscTypCont * pTC, sal_uInt32 nTab,
-                             const RscId & rId, const char * pVarName )
-{
-    if( pSuperClass )
-        pSuperClass->WriteSrcHeader( rInst, fOutput, pTC, nTab, rId, pVarName );
-    else
-        rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-}
-
-void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
-                       RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName )
-{
-    if( pSuperClass )
-        pSuperClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName );
-}
-
-ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
-                               RscTypCont * pTC, const RscId & rId,
-                               sal_uInt32 nDeep )
-{
-    if( pSuperClass )
-        return pSuperClass->WriteRcHeader( rInst, rMem, pTC, rId, nDeep );
-    else
-        return rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep );
-}
-
-ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
-                         RscTypCont * pTC, sal_uInt32 nDeep )
-{
-    if( pSuperClass )
-        return pSuperClass->WriteRc( rInst, rMem, pTC, nDeep );
-    else
-        return ERR_OK;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
deleted file mode 100644
index 187a0b1a1e1c..000000000000
--- a/rsc/source/rsc/rsc.cxx
+++ /dev/null
@@ -1,843 +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 <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#ifdef UNX
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#else
-#include <io.h>
-#include <process.h>
-#include <direct.h>
-#endif
-
-#include <string.h>
-#include <errno.h>
-
-#include <tools/stream.hxx>
-#include <rscerror.h>
-#include <rsctop.hxx>
-#include <rscdb.hxx>
-#include <rscpar.hxx>
-#include <rscrsc.hxx>
-#include <rschash.hxx>
-
-#include <osl/file.h>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/tencinfo.h>
-#include <rtl/textenc.h>
-#include <comphelper/string.hxx>
-
-#include <vector>
-#include <algorithm>
-
-using comphelper::string::getTokenCount;
-
-OString*  pStdParType  = nullptr;
-OString*  pStdPar1     = nullptr;
-OString*  pStdPar2     = nullptr;
-sal_uInt32      nRefDeep     = 10;
-AtomContainer*  pHS          = nullptr;
-
-
-void RscCmdLine::Init()
-{
-    nCommands       = CommandFlags::NONE;
-    nByteOrder      = RSC_BIGENDIAN;
-
-    aPath = OString(".");
-    m_aOutputFiles.clear();
-    m_aOutputFiles.push_back( OutputFile() );
-}
-
-RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
-{
-    char *          pStr;
-    char **         ppStr;
-    RscPtrPtr       aCmdLine;
-    sal_uInt32      i;
-    bool            bOutputSrsIsSet = false;
-
-    Init();
-
-    pStr = ::ResponseFile( &aCmdLine, argv, argc );
-    if( pStr )
-        pEH->FatalError( ERR_OPENFILE, RscId(), pStr );
-
-    /* check the inputted switches       */
-    ppStr  = reinterpret_cast<char **>(aCmdLine.GetBlock());
-    ppStr++;
-    i = 1;
-    while( ppStr && i < (aCmdLine.GetCount() -1) )
-    {
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "CmdLineArg: \"%s\"\n", *ppStr );
-#endif
-        if (strcmp(*ppStr, "-isystem") == 0)
-        {
-            // ignore "-isystem" and following arg
-            if (i < aCmdLine.GetCount() - 1)
-            {
-                ++ppStr;
-                ++i;
-            }
-        }
-        else if (strncmp(*ppStr, "-isystem", strlen("-isystem")) == 0)
-        {
-            // ignore args starting with "-isystem"
-        }
-        else if( '-' == **ppStr )
-        {
-            if( !rsc_stricmp( (*ppStr) + 1, "h" )
-              || !strcmp( (*ppStr) + 1, "?" ) )
-            { // Write help to standard output
-                nCommands |= CommandFlags::Help;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "p" ) )
-            { // No preprocessor
-                nCommands |= CommandFlags::NoPrePro;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "s" ) )
-            { // Syntax analysis, creates .srs file
-                nCommands |= CommandFlags::NoLink;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "l" ) )
-            { // links, no syntax and no preprocessing
-                nCommands |= CommandFlags::NoPrePro;
-                nCommands |= CommandFlags::NoSyntax;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "r" ) )
-            { // generate no .res file
-                nCommands |= CommandFlags::NoResFile;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "sub", 3 ) )
-            {
-                const char* pEqual;
-                for( pEqual = (*ppStr)+4; *pEqual && *pEqual != '='; ++pEqual )
-                    ;
-                if( *pEqual )
-                {
-                    m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
-                        OString( pEqual + 1 ) ) );
-                }
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
-            { // all resources with Preload
-                nCommands |= CommandFlags::Preload;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) )
-            { // endianness when writing
-                nByteOrder = RSC_LITTLEENDIAN;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "BIGENDIAN" ) )
-            { // endianness when writing
-                nByteOrder = RSC_BIGENDIAN;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "d", 1 ) )
-            { // define symbols
-                nCommands |= CommandFlags::Define;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) )
-            { // define include path
-                nCommands |= CommandFlags::Include;
-                OStringBuffer aBuffer(aPath);
-                if (!aBuffer.isEmpty())
-                    aBuffer.append(SAL_PATHSEPARATOR);
-                aBuffer.append((*ppStr) + 2);
-                aPath = aBuffer.makeStringAndClear();
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "fs=", 3 ) )
-            { // define name of .res file
-                if( m_aOutputFiles.back().aOutputRc.getLength() )
-                    m_aOutputFiles.push_back( OutputFile() );
-                m_aOutputFiles.back().aOutputRc = (*ppStr) + 4;
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) )
-            {  // additional language specific include for system dependent files
-                const OString aSysSearchDir( (*ppStr)+5 );
-
-                // ignore empty -lip= arguments that we get lots of these days
-                if (!aSysSearchDir.isEmpty())
-                {
-                    m_aOutputFiles.back().aSysSearchDirs.push_back(aSysSearchDir);
-                    OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath;
-                    if( !aLangSearchPath.isEmpty() )
-                    {
-                        aLangSearchPath = aLangSearchPath + OString( SAL_PATHSEPARATOR );
-                    }
-                    aLangSearchPath = aLangSearchPath + aSysSearchDir;
-
-                    m_aOutputFiles.back().aLangSearchPath = aLangSearchPath;
-                }
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
-            { // define name of .srs file
-                aOutputSrs = (*ppStr) + 4;
-                bOutputSrsIsSet = true;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) )
-            { // don't check Bitmap, Pointers, Icons
-                nCommands |= CommandFlags::NoSysResTest;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "SrsDefault" ) )
-            { // Only write one language to srs file
-                nCommands |= CommandFlags::SrsDefault;
-            }
-            else if( !rsc_stricmp( (*ppStr) + 1, "lg" ) )
-            {
-                m_aOutputFiles.back().aLangName.clear();
-            }
-            else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) )
-            {
-                if( !m_aOutputFiles.back().aLangName.isEmpty() )
-                    m_aOutputFiles.push_back( OutputFile() );
-                m_aOutputFiles.back().aLangName = OString((*ppStr)+3);
-            }
-            else
-                pEH->FatalError( ERR_UNKNOWNSW, RscId(), *ppStr );
-        }
-        else
-        {
-            // input file
-            aInputList.push_back( new OString(*ppStr) );
-        }
-        ppStr++;
-        i++;
-    }
-
-    if( nCommands & CommandFlags::Help )
-        pEH->FatalError( ERR_USAGE, RscId() );
-    // was an inputted file specified
-    else if( !aInputList.empty() )
-    {
-        ::std::list<OutputFile>::iterator it;
-        for( it = m_aOutputFiles.begin(); it != m_aOutputFiles.end(); ++it )
-        {
-            if( it->aOutputRc.isEmpty() )
-                it->aOutputRc  = ::OutputFile( *aInputList.front(), "rc"  );
-        }
-        if( ! bOutputSrsIsSet )
-            aOutputSrs = ::OutputFile( *aInputList.front(), "srs" );
-    }
-    else
-        pEH->FatalError( ERR_NOINPUT, RscId() );
-}
-
-RscCmdLine::~RscCmdLine()
-{
-    for ( size_t i = 0, n = aInputList.size(); i < n; ++i )
-        delete aInputList[ i ];
-    aInputList.clear();
-}
-
-OString RscCmdLine::substitutePaths( const OString& rIn )
-{
-    // prepare return value
-    OStringBuffer aRet( 256 );
-    std::list< std::pair< OString, OString > >::const_iterator last_match = m_aReplacements.end();
-
-    // search for longest replacement match
-    for( std::list< std::pair< OString, OString > >::const_iterator repl = m_aReplacements.begin(); repl != m_aReplacements.end(); ++repl )
-    {
-        if( rIn.startsWith( repl->second ) ) // path matches
-        {
-            if( last_match == m_aReplacements.end() || last_match->second.getLength() < repl->second.getLength() )
-                last_match = repl;
-        }
-    }
-
-    // copy replacement found and rest of rIn
-    sal_Int32 nIndex = 0;
-    if( last_match != m_aReplacements.end() )
-    {
-        aRet.append( "%" );
-        aRet.append( last_match->first );
-        aRet.append( "%" );
-        nIndex = last_match->second.getLength();
-    }
-
-    if( rIn.match( "/", nIndex ) )
-        aRet.append( rIn.copy( nIndex ) );
-    else
-        aRet.append( rIn.copy( nIndex - 1 ) );
-
-    return aRet.makeStringAndClear();
-}
-
-RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
-{
-    fExitFile     = nullptr;
-
-    //Set Command Line, set Type Container
-    pCL = pLine;
-    pTC = pTypCont;
-}
-
-RscCompiler::~RscCompiler()
-{
-    pTC->pEH->SetListFile( nullptr );
-
-    if( fExitFile )
-        fclose( fExitFile );
-}
-
-ERRTYPE RscCompiler::Start()
-{
-    ERRTYPE         aError;
-    RscFile*        pFName;
-
-    if( pCL->aInputList.empty() )
-        pTC->pEH->FatalError( ERR_NOINPUT, RscId() );
-
-    for( size_t i = 0, n = pCL->aInputList.size(); i < n; ++i )
-        pTC->aFileTab.NewCodeFile( *pCL->aInputList[ i ] );
-
-    if( !(pCL->nCommands & CommandFlags::NoSyntax) )
-    {
-        if( pCL->nCommands & CommandFlags::NoPrePro )
-        {
-
-            pTC->pEH->SetListFile( nullptr );
-
-            RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-            while( aIndex != RscFileTab::IndexNotFound && aError.IsOk() )
-            {
-                pFName = pTC->aFileTab.Get( aIndex );
-                if( !pFName->bScanned && !pFName->IsIncFile() )
-                {
-                    aError = IncludeParser( aIndex );
-                    // set current pointer correctly
-                    aIndex = pTC->aFileTab.GetIndexOf( pFName );
-                }
-                aIndex = pTC->aFileTab.NextIndex( aIndex );
-            }
-
-            pTC->pEH->SetListFile( nullptr );
-        }
-    }
-
-    if ( pTC->pEH->GetVerbosity() >= RscVerbosityVerbose )
-    {
-        pTC->pEH->StdOut( "Files: " );
-        RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-        while( aIndex != RscFileTab::IndexNotFound )
-        {
-            pFName = pTC->aFileTab.Get( aIndex );
-            pTC->pEH->StdOut( pFName->aFileName.getStr() );
-            pTC->pEH->StdOut( " " );
-            aIndex = pTC->aFileTab.NextIndex( aIndex );
-        }
-        pTC->pEH->StdOut( "\n" );
-    }
-
-    if( aError.IsOk() )
-        aError = Link();
-
-    if( aError.IsOk() )
-        EndCompile();
-
-    if( aError.IsError() )
-        pTC->pEH->Error( ERR_ERROR, nullptr, RscId() );
-
-    return aError;
-}
-
-void RscCompiler::EndCompile()
-{
-    if( !pCL->aOutputSrs.isEmpty() && (pCL->nCommands & CommandFlags::NoLink) )
-    {
-        pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
-        pTC->pEH->StdOut( pCL->aOutputSrs.getStr(), RscVerbosityVerbose );
-        pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
-
-        // copy from TMP to real names
-        unlink( pCL->aOutputSrs.getStr() );   // delete target file
-        if( !(pCL->nCommands & CommandFlags::NoSyntax) )
-        {
-            FILE        * foutput;
-
-            if( nullptr == (foutput = fopen( pCL->aOutputSrs.getStr(), "w" )) )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputSrs.getStr() );
-            else
-            {
-                // write file
-                RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-                while( aIndex != RscFileTab::IndexNotFound )
-                {
-                    RscFile* pFN = pTC->aFileTab.Get( aIndex );
-                    if( !pFN->IsIncFile() )
-                    {
-                        pTC->WriteSrc( foutput, RscFileTab::IndexNotFound );
-                        break; // ?T 281091MM only one source file
-                    }
-                }
-
-                fclose( foutput );
-            }
-        }
-    }
-}
-
-ERRTYPE RscCompiler::IncludeParser( RscFileTab::Index lFileKey )
-{
-    FILE            * finput;
-    RscFile         * pFName;
-    ERRTYPE           aError;
-
-    pFName = pTC->aFileTab.Get( lFileKey );
-    if( !pFName )
-        aError = ERR_ERROR;
-    else if( !pFName->bScanned )
-    {
-        finput = fopen( pFName->aPathName.getStr(), "r" );
-        if( !finput )
-        {
-            aError = ERR_OPENFILE;
-            pTC->pEH->Error( aError, nullptr, RscId(),
-                             pFName->aPathName.getStr() );
-        }
-        else
-        {
-            RscFileInst       aFileInst( pTC, lFileKey, lFileKey, finput );
-
-            pFName->bScanned = true;
-            ::IncludeParser( &aFileInst );
-            fclose( finput );
-
-            // look into include path
-            for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i )
-            {
-                RscDepend       * pDep = pFName->aDepLst[ i ];
-                RscFile         * pFNTmp = pTC->aFileTab.GetFile( pDep->GetFileKey() );
-                // no path and include file
-                if( pFNTmp && !pFNTmp->bLoaded )
-                {
-                   pFNTmp->aPathName = pFNTmp->aFileName;
-                }
-            };
-        };
-    };
-
-    return aError;
-}
-
-ERRTYPE RscCompiler::ParseOneFile( RscFileTab::Index lFileKey,
-                                     const RscCmdLine::OutputFile* pOutputFile,
-                                     const WriteRcContext* pContext )
-{
-    FILE *     finput = nullptr;
-    ERRTYPE    aError;
-    RscFile *  pFName;
-
-    pFName = pTC->aFileTab.Get( lFileKey );
-    if( !pFName )
-        aError = ERR_ERROR;
-    else if( !pFName->bLoaded )
-    {
-
-        // first read include file
-        pFName->bLoaded = true; // avoid endless recursion
-
-        for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i )
-        {
-            RscDepend* pDep = pFName->aDepLst[ i ];
-            aError = ParseOneFile( pDep->GetFileKey(), pOutputFile, pContext );
-        }
-
-        if( aError.IsError() )
-            pFName->bLoaded = false; // not loaded upon error
-        else
-        {
-            OUString aTmpPath;
-            OUString aSrsPath = OStringToOUString( pFName->aPathName, RTL_TEXTENCODING_ASCII_US );
-
-            osl::FileBase::createTempFile( nullptr, nullptr, &aTmpPath );
-            osl::FileBase::getFileURLFromSystemPath( aSrsPath, aSrsPath );
-
-            if( pContext && pOutputFile )
-                PreprocessSrsFile( *pOutputFile, *pContext, aSrsPath, aTmpPath );
-            else
-                osl::File::copy( aSrsPath, aTmpPath );
-
-            OUString aParseFile;
-            osl::FileBase::getSystemPathFromFileURL( aTmpPath, aParseFile );
-            finput = fopen(OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), "r");
-
-            if( !finput )
-            {
-                pTC->pEH->Error( ERR_OPENFILE, nullptr, RscId(), pFName->aPathName.getStr() );
-                aError = ERR_OPENFILE;
-            }
-            else
-            {
-                RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
-
-                pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose );
-                pTC->pEH->StdOut( OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), RscVerbosityVerbose );
-                pTC->pEH->StdOut( " ", RscVerbosityVerbose );
-
-                aError = ::parser( &aFileInst );
-                if( aError.IsError() )
-                    pTC->Delete( lFileKey );// delete resource objects
-                pTC->pEH->StdOut( "\n", RscVerbosityVerbose );
-                fclose( finput );
-            };
-
-            osl::File::remove( aTmpPath );
-        };
-    };
-
-    return aError;
-}
-
-namespace
-{
-    using namespace ::osl;
-    class RscIoError { };
-
-    inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const OString& i_sPath)
-    {
-        OUString sRelUrl, sAbsUrl;
-        if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath, RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None)
-            throw RscIoError();
-        if(FileBase::getAbsoluteFileURL(i_sBaseUrl, sRelUrl, sAbsUrl) != FileBase::E_None)
-            throw RscIoError();
-        return sAbsUrl;
-    };
-
-    inline OString lcl_getSystemPath(const OUString& i_sUrl)
-    {
-        OUString sSys;
-        if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None)
-            throw RscIoError();
-        return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252);
-    };
-
-    inline OString lcl_getTempFile(OUString& sTempDirUrl)
-    {
-        // get a temp file name for the rc file
-        OUString sTempUrl;
-        if(FileBase::createTempFile(&sTempDirUrl, nullptr, &sTempUrl) != FileBase::E_None)
-            throw RscIoError();
-        return lcl_getSystemPath(sTempUrl);
-    };
-}
-
-ERRTYPE RscCompiler::Link()
-{
-    FILE *      foutput;
-    ERRTYPE     aError;
-    RscFile*    pFName;
-
-    if( !(pCL->nCommands & CommandFlags::NoLink) )
-    {
-        ::std::list<RscCmdLine::OutputFile>::const_iterator it;
-
-        for( it = pCL->m_aOutputFiles.begin(); it != pCL->m_aOutputFiles.end(); ++it )
-        {
-            // cleanup nodes
-            for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-                 aIndex != RscFileTab::IndexNotFound && aError.IsOk();
-                 aIndex = pTC->aFileTab.NextIndex( aIndex ) )
-            {
-                pFName = pTC->aFileTab.Get( aIndex );
-                if( !pFName->IsIncFile() )
-                {
-                    pTC->Delete( aIndex );
-                    aIndex = pTC->aFileTab.GetIndexOf( pFName );
-                    pFName->bLoaded = false;
-                }
-            }
-
-
-            // get two temp file urls
-            OString aRcTmp, aSysListTmp, aSysList;
-            try
-            {
-                OUString sPwdUrl;
-                osl_getProcessWorkingDir( &sPwdUrl.pData );
-                OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc);
-                // TempDir is either the directory where the rc file is located or pwd
-                OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/'));
-
-                aRcTmp = lcl_getTempFile(sTempDirUrl);
-
-                OUString sOilDirUrl = sTempDirUrl;
-
-                aSysListTmp = lcl_getTempFile(sOilDirUrl);
-
-                OUString sIlstUrl;
-                sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
-                sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
-                sIlstUrl += ".ilst";
-                sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
-
-                aSysList = lcl_getSystemPath(sIlstUrl);
-            }
-            catch (RscIoError&)
-            {
-                OString sMsg = "Error with paths:\n"
-                        "temporary rc file: " + aRcTmp + "\n"
-                        "temporary ilst file: " + aSysListTmp + "\n"
-                        "ilst file: " + aSysList + "\n";
-                pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg.getStr());
-            }
-            if ( nullptr == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
-                pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
-
-            // write file
-            pTC->ChangeLanguage( it->aLangName );
-            pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
-
-            WriteRcContext  aContext;
-
-            aContext.fOutput = foutput;
-            aContext.aOutputRc = it->aOutputRc;
-            aContext.aOutputSysList = aSysListTmp;
-            aContext.pCmdLine = pCL;
-
-            // create empty sys list
-            if( !aContext.aOutputSysList.isEmpty() )
-            {
-                FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" );
-
-                if( !pSysListFile )
-                    pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aContext.aOutputSysList.getStr() );
-                else
-                    fclose( pSysListFile );
-            }
-
-            // parse files for specific language
-            for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-                 aIndex != RscFileTab::IndexNotFound && aError.IsOk();
-                 aIndex = pTC->aFileTab.NextIndex( aIndex ) )
-            {
-                pFName = pTC->aFileTab.Get( aIndex );
-                if( !pFName->IsIncFile() )
-                {
-                    aError = ParseOneFile( aIndex, &*it, &aContext );
-                    aIndex = pTC->aFileTab.GetIndexOf( pFName );
-                }
-            };
-
-            aError = pTC->WriteRc( aContext );
-
-            fclose( foutput );
-            fExitFile = nullptr;
-            unlink( it->aOutputRc.getStr() );
-            if( rename( aRcTmp.getStr(), it->aOutputRc.getStr() ) )
-            {
-                OStringBuffer aBuf;
-                aBuf.append( aRcTmp );
-                aBuf.append( " -> " );
-                aBuf.append( it->aOutputRc );
-                pTC->pEH->FatalError( ERR_RENAMEFILE, RscId(), aBuf.getStr() );
-            }
-            else
-            {
-#ifdef UNX
-                (void)chmod( it->aOutputRc.getStr(), S_IRWXU | S_IRWXG | S_IROTH );
-#endif
-            }
-
-            unlink( aSysList.getStr() );
-            if( rename( aSysListTmp.getStr(), aSysList.getStr() ) )
-            {
-                OStringBuffer aBuf;
-                aBuf.append( aSysListTmp );
-                aBuf.append( " -> " );
-                aBuf.append( aSysList );
-                pTC->pEH->FatalError( ERR_RENAMEFILE, RscId(), aBuf.getStr() );
-            }
-            else
-            {
-#ifdef UNX
-                (void)chmod( aSysList.getStr(), S_IRWXU | S_IRWXG | S_IROTH );
-#endif
-            }
-        }
-    }
-    else
-    {
-        // parse files
-        for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex();
-             aIndex != RscFileTab::IndexNotFound && aError.IsOk();
-             aIndex = pTC->aFileTab.NextIndex( aIndex ) )
-        {
-            pFName = pTC->aFileTab.Get( aIndex );
-            if( !pFName->IsIncFile() )
-            {
-                aError = ParseOneFile( aIndex, nullptr, nullptr );
-                aIndex = pTC->aFileTab.GetIndexOf( pFName );
-            }
-        };
-    }
-
-    return aError;
-}
-
-bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
-                                    const WriteRcContext& rContext,
-                                    const OString& rBaseFileName,
-                                    OString& rImagePath,
-                                    FILE* pSysListFile )
-{
-    ::std::list< OString >  aFileNames;
-    bool bFound = false;
-
-    aFileNames.push_back( rBaseFileName + OString(".png") );
-    aFileNames.push_back( rBaseFileName + OString(".bmp") );
-
-    ::std::list< OString >::iterator aFileIter( aFileNames.begin() );
-
-    while( ( aFileIter != aFileNames.end() ) && !bFound )
-    {
-        ::std::list< OString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() );
-
-        while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound )
-        {
-            const OString aSysPath = *aDirIter + "/" + *aFileIter;
-            OUString aAbsPath = OStringToOUString( aSysPath, RTL_TEXTENCODING_ASCII_US );
-
-
-            osl::FileBase::getFileURLFromSystemPath( aAbsPath, aAbsPath );
-            osl::DirectoryItem aDirectoryItem;
-            bool bFile = false;
-            if (osl::DirectoryItem::E_None == osl::DirectoryItem::get( aAbsPath, aDirectoryItem ))
-            {
-                osl::FileStatus aFS(osl_FileStatus_Mask_Type);
-                if (osl::DirectoryItem::E_None == aDirectoryItem.getFileStatus( aFS ))
-                    bFile = aFS.isRegular();
-            }
-
-#if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "Searching image: %s\n", aSysPath.getStr() );
-#endif
-
-            if( bFile )
-            {
-                std::list< std::pair< OString, OString > >::const_iterator  aReplIter( rContext.pCmdLine->m_aReplacements.begin() );
-                OString aRelPathStr( aSysPath );
-
-                while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound )
-                {
-                    OString aSearch(aReplIter->second.toAsciiLowerCase());
-                    OString aSearchIn(aRelPathStr.toAsciiLowerCase());
-                    if( aSearchIn.startsWith(aSearch) )
-                    {
-                        sal_Int32       nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength();
-                        const sal_Char* pChars = aRelPathStr.getStr();
-
-                        while( ( nCopyPos < nLength ) && ( pChars[ nCopyPos ] == '/' || pChars[ nCopyPos ] == '\\' || pChars[ nCopyPos ] == ':' ) )
-                        {
-                            ++nCopyPos;
-                        }
-
-                        if( nCopyPos < nLength )
-                            rImagePath = aRelPathStr.copy( nCopyPos ).replace( '\\', '/' );
-
-                        bFound = true;
-                    }
-
-                    ++aReplIter;
-                }
-
-                if( bFound && pSysListFile )
-                {
-                    fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPath ).getStr() );
-                }
-
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr, "ImagePath to add: %s\n", rImagePath.getStr() );
-#endif
-            }
-
-            ++aDirIter;
-        }
-
-        ++aFileIter;
-    }
-
-    return bFound;
-}
-
-void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
-                                     const WriteRcContext& rContext,
-                                     const OUString& rSrsInPath,
-                                     const OUString& rSrsOutPath )
-{
-    SvFileStream                aIStm( rSrsInPath, StreamMode::READ );
-    SvFileStream                aOStm( rSrsOutPath, StreamMode::WRITE | StreamMode::TRUNC );
-    ::std::vector< OString > aMissingImages;
-    FILE*                       pSysListFile = rContext.aOutputSysList.isEmpty() ? nullptr : fopen( rContext.aOutputSysList.getStr(), "ab" );
-
-    if( !aIStm.GetError() && !aOStm.GetError() )
-    {
-        OString aLine;
-        OString aFilePath;
-
-        while( aIStm.ReadLine( aLine ) )
-        {
-            if( ( getTokenCount(aLine, '=') == 2 ) &&
-                ( aLine.getToken(0, '=').indexOf("File") != -1 ) )
-            {
-                OString aBaseFileName( aLine.getToken(1, '"').getToken(0, '.') );
-
-                if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) )
-                {
-                    aLine = OStringBuffer("File = \"").
-                        append(aFilePath).append("\";").
-                        makeStringAndClear();
-                }
-                else
-                    aMissingImages.push_back( aBaseFileName );
-
-                aOStm.WriteLine(aLine);
-            }
-            else
-                aOStm.WriteLine(aLine);
-        }
-    }
-
-    if( aMissingImages.size() > 0 )
-    {
-        OStringBuffer aImagesStr;
-
-        for( size_t i = 0; i < aMissingImages.size(); ++i )
-        {
-            if( i )
-                aImagesStr.append(' ');
-
-            aImagesStr.append(aMissingImages[i]);
-        }
-
-        pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.getStr() );
-    }
-
-    if( pSysListFile )
-        fclose( pSysListFile );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
deleted file mode 100644
index 4dcf1c89abd9..000000000000
--- a/rsc/source/rscpp/cpp.h
+++ /dev/null
@@ -1,340 +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_RSC_SOURCE_RSCPP_CPP_H
-#define INCLUDED_RSC_SOURCE_RSCPP_CPP_H
-
-#ifndef TRUE
-#define TRUE            1
-#define FALSE           0
-#endif
-
-/* in cpp1.c: file-pointer on stdout file file */
-extern FILE* pCppOut;                                   /* BP */
-#define PUTCHAR( d )   fprintf( pCppOut, "%c", (d) )    /* BP */
-#if OSL_DEBUG_LEVEL > 1
-extern FILE* pDefOut;                                   /* ER */
-#ifdef EVALDEFS
-#define NEVALBUF        2048
-#endif
-#endif
-
-/* limit for reading commandfiles */
-#define PARALIMIT       100
-
-#define EOS             '\0'            /* End of string                */
-#define EOF_CHAR        0               /* Returned by get() on eof     */
-#define NULLST          ((char *) NULL) /* Pointer to nowhere (linked)  */
-#define DEF_NOARGS      (-1)            /* #define foo vs #define foo() */
-
-/*
- * The following may need to change if the host system doesn't use ASCII.
- */
-#define DEF_MAGIC       0x1D            /* Magic for #defines           */
-#define TOK_SEP         0x1E            /* Token concatenation delim.   */
-#define COM_SEP         0x1F            /* Magic comment separator      */
-
-#define HT              0x09            /* horizontal tab               */
-#define NL              0x0A            /* new line                     */
-#define CR              0x0D            /* carriage return              */
-#define DEL             0x7F
-
-
-
-#ifdef  SOLAR
-#define MAC_PARM        0x01            /* Macro formals start here     */
-#else
-/*
- * Note -- in Ascii, the following will map macro formals onto DEL + the
- * C1 control character region (decimal 128 .. (128 + PAR_MAC)) which will
- * be ok as long as PAR_MAC is less than 33).  Note that the last PAR_MAC
- * value is reserved for string substitution.
- */
-
-#define MAC_PARM        DEL             /* Macro formals start here     */
-#if PAR_MAC >= 33
-        assertion fails -- PAR_MAC is not less than 33
-#endif
-#endif
-#define LASTPARM        (PAR_MAC - 1)
-
-/*
- * Character type codes.
- */
-
-#define INV             0               /* Invalid, must be zero        */
-#define OP_EOE          INV             /* End of expression            */
-#define DIG             1               /* Digit                        */
-#define LET             2               /* Identifier start             */
-#define FIRST_BINOP     OP_ADD
-#define OP_ADD          3
-#define OP_SUB          4
-#define OP_MUL          5
-#define OP_DIV          6
-#define OP_MOD          7
-#define OP_ASL          8
-#define OP_ASR          9
-#define OP_AND          10              /* &, not &&                    */
-#define OP_OR           11              /* |, not ||                    */
-#define OP_XOR          12
-#define OP_EQ           13
-#define OP_NE           14
-#define OP_LT           15
-#define OP_LE           16
-#define OP_GE           17
-#define OP_GT           18
-#define OP_ANA          19              /* &&                           */
-#define OP_ORO          20              /* ||                           */
-#define OP_QUE          21              /* ?                            */
-#define OP_COL          22              /* :                            */
-#define OP_CMA          23              /* , (relevant?)                */
-#define LAST_BINOP      OP_CMA          /* Last binary operand          */
-/*
- * The following are unary.
- */
-#define OP_PLU          24              /* + (draft ANSI standard)      */
-#define OP_NEG          25              /* -                            */
-#define OP_COM          26              /* ~                            */
-#define OP_NOT          27              /* !                            */
-#define OP_LPA          28              /* (                            */
-#define OP_RPA          29              /* )                            */
-#define OP_END          30              /* End of expression marker     */
-#define OP_MAX          (OP_END + 1)    /* Number of operators          */
-#define OP_FAIL         (OP_END + 1)    /* For error returns            */
-
-/*
- * The following are for lexical scanning only.
- */
-
-#define QUO             65              /* Both flavors of quotation    */
-#define DOT             66              /* . might start a number       */
-#define SPA             67              /* Space and tab                */
-#define BSH             68              /* Just a backslash             */
-#define END             69              /* EOF                          */
-
-/*
- * These bits are set in ifstack[]
- */
-#define WAS_COMPILING   1               /* TRUE if compile set at entry */
-#define ELSE_SEEN       2               /* TRUE when #else processed    */
-#define TRUE_SEEN       4               /* TRUE when #if TRUE processed */
-
-/*
- * Define bits for the basic types and their adjectives
- */
-
-#define T_CHAR            1
-#define T_INT             2
-#define T_FLOAT           4
-#define T_DOUBLE          8
-#define T_SHORT          16
-#define T_LONG           32
-#define T_SIGNED         64
-#define T_UNSIGNED      128
-#define T_PTR           256             /* Pointer                      */
-#define T_FPTR          512             /* Pointer to functions         */
-
-/*
- * The DEFBUF structure stores information about #defined
- * macros.  Note that the defbuf->repl information is always
- * in malloc storage.
- */
-
-typedef struct defbuf
-{
-    struct defbuf*  link;           /* Next define in chain */
-    char*           repl;           /* -> replacement       */
-    int             hash;           /* Symbol table hash    */
-    int             nargs;          /* For define(args)     */
-    char            name[];         /* #define name         */
-} DEFBUF;
-
-/*
- * The FILEINFO structure stores information about open files
- * and macros being expanded.
- */
-
-typedef struct fileinfo
-{
-    char*           bptr;           /* Buffer pointer       */
-    int             line;           /* for include or macro */
-    FILE*           fp;             /* File if non-null     */
-    struct fileinfo* parent;        /* Link to includer     */
-    char*           filename;       /* File/macro name      */
-    char*           progname;       /* From #line statement */
-    unsigned int    unrecur;        /* For macro recursion  */
-    char            buffer[1];      /* current input line   */
-} FILEINFO;
-
-/*
- * The SIZES structure is used to store the values for #if sizeof
- */
-
-typedef struct sizes
-{
-    short       bits;                   /* If this bit is set,          */
-    int         size;                   /* this is the datum size value */
-    int         psize;                  /* this is the pointer size     */
-} SIZES;
-
-#define cput(c)         { if (c != TOK_SEP) PUTCHAR(c); }
-#define streq(s1, s2)   (strcmp(s1, s2) == 0)
-
-/*
- * Error codes.
- */
-#define IO_NORMAL 0
-#define IO_ERROR  1
-
-/*
- * Externs
- */
-
-extern int      line;                   /* Current line number          */
-extern int      wrongline;              /* Force #line to cc pass 1     */
-extern char     type[];                 /* Character classifier         */
-extern char     token[IDMAX + 1];       /* Current input token          */
-extern int      instring;               /* TRUE if scanning string      */
-extern int      inmacro;                /* TRUE if scanning #define     */
-extern int      errors;                 /* Error counter                */
-extern int      recursion;              /* Macro depth counter          */
-extern char     ifstack[BLK_NEST];      /* #if information              */
-#define compiling ifstack[0]
-extern char*    ifptr;                  /* -> current ifstack item      */
-extern char*    incdir[NINCLUDE];       /* -i directories               */
-extern char**   incend;                 /* -> active end of incdir      */
-extern int      cflag;                  /* -C option (keep comments)    */
-extern int      eflag;                  /* -E option (ignore errors)    */
-extern int      nflag;                  /* -N option (no pre-defines)   */
-extern int      rec_recover;            /* unwind recursive macros      */
-extern char*    preset[];               /* Standard predefined symbols  */
-extern char*    magic[];                /* Magic predefined symbols     */
-extern FILEINFO* infile;                /* Current input file           */
-extern char     work[NWORK + 1];        /* #define scratch              */
-extern char*    workp;                  /* Free space in work           */
-#if OSL_DEBUG_LEVEL > 1
-extern int      debug;                  /* Debug level                  */
-/* ER dump & evaluate #define's */
-extern int      bDumpDefs;              /* TRUE if #define's dump req.  */
-extern int      bIsInEval;              /* TRUE if #define dumping now  */
-#ifdef EVALDEFS
-extern char     EvalBuf[NEVALBUF + 1];  /* evaluation buffer            */
-extern int      nEvalOff;               /* offset to free buffer pos    */
-#endif
-#endif
-extern int      keepcomments;           /* Don't remove comments if set */
-extern SIZES    size_table[];           /* For #if sizeof sizes         */
-
-#ifdef NOMAIN                /* BP */
-#ifndef _NO_PROTO
-int rscpp_main( int argc, char **argv );
-#endif
-#define MAIN   rscpp_main     /* main() needs to be changed for the cpp.lib */
-#else
-#ifdef _WIN32
-#define MAIN   __cdecl main
-#else
-#define MAIN   main
-#endif
-#endif
-
-
-void InitCpp1( void );
-void InitCpp4( void );
-void InitCpp6( void );
-
-#define HELLO()   fprintf( stderr, "[Hello at %s, %d] ", __FILE__, __LINE__ )
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* cpp1.c */
-void output( int c );
-void sharp( void );
-void cppmain( void );
-#if OSL_DEBUG_LEVEL > 1
-#ifdef EVALDEFS
-int outputEval( int c );
-#endif
-#endif
-
-
-/* cpp2.c */
-int control( int counter );
-void dodefine( void );
-int openfile( char* );
-
-/* cpp3.c */
-void addfile( FILE* fp, char* filename );
-void setincdirs( void );
-int AddInclude( char* pIncStr );
-
-void initdefines( void );
-int dooptions( int argc, char* argv[] );
-int readoptions( char* filename, char*** pfargv );
-
-/* cpp4.c */
-void checkparm( int c, DEFBUF* dp );
-
-void stparmscan( int delim );
-#if OSL_DEBUG_LEVEL > 1
-void dumpparm( char* why );
-#endif
-
-void doundef( void );
-void textput( char* text );
-void charput( int c );
-void expand( DEFBUF* tokenp );
-
-/* cpp5.c */
-int eval( void );
-
-/* cpp6.c */
-
-void skipnl( void );
-int skipws( void );
-void scanid( int c );
-int macroid( int c );
-int catenate(void);
-int scanstring( int c, void (*outfun)( int c ) );
-void scannumber( int c, void (*outfun)( int c ) );
-void save( int c );
-char* savestring( char* text );
-FILEINFO* getfile( size_t bufsize, char* name );
-char *getmem( size_t size );
-DEFBUF* lookid( int c );
-DEFBUF* defendel( char* name, int delete );
-int get( void );
-int cget( void );
-void unget( void );
-void ungetstring( char* text );
-void cerror( char* format, char* sarg );
-void cwarn( char* format, char* sarg );
-void cfatal( char* format, char* sarg );
-void cierror( char* format, int n );
-void ciwarn( char* format, int n );
-#if OSL_DEBUG_LEVEL > 1
-void dumpdef( char* why );
-void dumpadef( char* why, DEFBUF *dp );
-#endif
-
-#endif // INCLUDED_RSC_SOURCE_RSCPP_CPP_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
deleted file mode 100644
index 13518a264187..000000000000
--- a/rsc/source/rscpp/cpp1.c
+++ /dev/null
@@ -1,574 +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 NOMAIN
-
-#include <stdio.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-FILE* pCppOut = NULL;
-static FILE* pCppIn  = NULL;
-
-#if OSL_DEBUG_LEVEL > 1
-FILE* pDefOut = NULL;       /* ER  possible #define's dump */
-#endif
-
-#ifdef B200
-/* only possibility under BC to set stack and head */
-extern unsigned _stklen  = 24000;
-extern unsigned _heaplen = 30000;
-#endif
-
-
-
-/*
- * Commonly used global variables:
- * line         is the current input line number.
- * wrongline    is set in many places when the actual output
- *              line is out of sync with the numbering, e.g,
- *              when expanding a macro with an embedded newline.
- *
- * token        holds the last identifier scanned (which might
- *              be a candidate for macro expansion).
- * errors       is the running cpp error counter.
- * infile       is the head of a linked list of input files (extended by
- *              #include and macros being expanded).  infile always points
- *              to the current file/macro.  infile->parent to the includer,
- *              etc.  infile->fd is NULL if this input stream is a macro.
- */
-int line;                   /* Current line number          */
-int wrongline;              /* Force #line to compiler      */
-char token[IDMAX + 1];      /* Current input token          */
-int errors;                 /* cpp error counter            */
-FILEINFO* infile = NULL;    /* Current input file           */
-#if OSL_DEBUG_LEVEL > 1
-int debug;                  /* TRUE if debugging now        */
-int bDumpDefs;              /* TRUE if #define's dump req.  */
-#ifdef EVALDEFS
-int bIsInEval;              /* TRUE if #define eval now     */
-char EvalBuf[NEVALBUF + 1]; /* evaluation buffer            */
-int nEvalOff = 0;           /* offset to free buffer pos    */
-#endif
-#endif
-/*
- * This counter is incremented when a macro expansion is initiated.
- * If it exceeds a built-in value, the expansion stops -- this tests
- * for a runaway condition:
- *      #define X Y
- *      #define Y X
- *      X
- * This can be disabled by falsifying rec_recover.  (Nothing does this
- * currently: it is a hook for an eventual invocation flag.)
- */
-int recursion;              /* Infinite recursion counter   */
-int rec_recover = TRUE;     /* Unwind recursive macros      */
-
-/*
- * instring is set TRUE when a string is scanned.  It modifies the
- * behavior of the "get next character" routine, causing all characters
- * to be passed to the caller (except <DEF_MAGIC>).  Note especially that
- * comments and \<newline> are not removed from the source.  (This
- * prevents cpp output lines from being arbitrarily long).
- *
- * inmacro is set by #define -- it absorbs comments and converts
- * form-feed and vertical-tab to space, but returns \<newline>
- * to the caller.  Strictly speaking, this is a bug as \<newline>
- * shouldn't delimit tokens, but we'll worry about that some other
- * time -- it is more important to prevent infinitly long output lines.
- *
- * instring and inmacro are parameters to the get() routine which
- * were made global for speed.
- */
-int instring = FALSE;       /* TRUE if scanning string      */
-int inmacro = FALSE;        /* TRUE if #defining a macro    */
-
-/*
- * work[] and workp are used to store one piece of text in a temporary
- * buffer.  To initialize storage, set workp = work.  To store one
- * character, call save(c);  (This will fatally exit if there isn't
- * room.)  To terminate the string, call save(EOS).  Note that
- * the work buffer is used by several subroutines -- be sure your
- * data won't be overwritten.  The extra byte in the allocation is
- * needed for string formal replacement.
- */
-char work[NWORK + 1];        /* Work buffer                  */
-char* workp;                 /* Work buffer pointer          */
-
-/*
- * keepcomments is set TRUE by the -C option.  If TRUE, comments
- * are written directly to the output stream.  This is needed if
- * the output from cpp is to be passed to lint (which uses commands
- * embedded in comments).  cflag contains the permanent state of the
- * -C flag.  keepcomments is always falsified when processing #control
- * commands and when compilation is suppressed by a false #if
- *
- * If eflag is set, CPP returns "success" even if non-fatal errors
- * were detected.
- *
- * If nflag is non-zero, no symbols are predefined except __LINE__.
- * __FILE__, and __DATE__.  If nflag > 1, absolutely no symbols
- * are predefined.
- */
-int keepcomments = FALSE;   /* Write out comments flag      */
-int cflag = FALSE;          /* -C option (keep comments)    */
-int eflag = FALSE;          /* -E option (never fail)       */
-int nflag = 0;              /* -N option (no predefines)    */
-
-/*
- * ifstack[] holds information about nested #if's.  It is always
- * accessed via *ifptr.  The information is as follows:
- *      WAS_COMPILING   state of compiling flag at outer level.
- *      ELSE_SEEN       set TRUE when #else seen to prevent 2nd #else.
- *      TRUE_SEEN       set TRUE when #if or #elif succeeds
- * ifstack[0] holds the compiling flag.  It is TRUE if compilation
- * is currently enabled.  Note that this must be initialized TRUE.
- */
-char ifstack[BLK_NEST] = { TRUE };   /* #if information      */
-char* ifptr = ifstack;               /* -> current ifstack[] */
-
-/*
- * incdir[] stores the -i directories (and the system-specific
- * #include <...> directories.
- */
-char* incdir[NINCLUDE];              /* -i directories               */
-char** incend = incdir;              /* -> free space in incdir[]    */
-
-/*
- * This is the table used to predefine target machine and operating
- * system designators.  It may need hacking for specific circumstances.
- * Note: it is not clear that this is part of the Ansi Standard.
- * The -N option suppresses preset definitions.
- */
-char* preset[] =
-{                   /* names defined at cpp start   */
-#ifdef  MACHINE
-        MACHINE,
-#endif
-#ifdef  SYSTEM
-        SYSTEM,
-#endif
-#ifdef  COMPILER
-        COMPILER,
-#endif
-#if OSL_DEBUG_LEVEL > 1
-        "decus_cpp",                    /* Ourselves!                   */
-#endif
-        NULL                            /* Must be last                 */
-};
-
-/*
- * The value of these predefined symbols must be recomputed whenever
- * they are evaluated.  The order must not be changed.
- */
-char* magic[] =
-{                    /* Note: order is important     */
-        "__LINE__",
-        "__FILE__",
-        NULL                            /* Must be last                 */
-};
-
-static char* sharpfilename = NULL;
-
-static int nRunde = 0;
-
-void InitCpp1()
-{
-    int i;
-    /* in LIB-Version all variables must be initialized */
-
-    line = wrongline = errors = recursion = 0;
-    for( i = 0; i < IDMAX; i++ )
-        token[ i ] = 0;
-
-    for( i = 0; i < NWORK; i++ )
-        work[ i ] = 0;
-
-    for( i = 0; i < NINCLUDE; i++ )
-        incdir[ i ] = NULL;
-
-    workp = NULL;
-    for( i = 0; i < BLK_NEST; i++ )
-        ifstack[ i ] = TRUE;
-    ifptr = ifstack;
-
-    pCppOut = stdout;
-    pCppIn  = stdin;
-#if OSL_DEBUG_LEVEL > 1
-    debug = 0;
-    bDumpDefs = 0;
-    pDefOut = stdout;
-#ifdef EVALDEFS
-    bIsInEval = 0;
-    for( i = 0; i < NEVALBUF; i++ )
-        EvalBuf[ i ] = 0;
-    nEvalOff = 0;
-#endif
-#endif
-    rec_recover = TRUE;
-    infile = NULL;
-    instring = inmacro = keepcomments = cflag = eflag = FALSE;
-    nflag = 0;
-    incend = incdir;
-    sharpfilename = NULL;
-}
-
-int MAIN(int argc, char** argv)
-{
-    int    i;
-    char** useargv = NULL;
-    char** pfargv = NULL;
-
-    if( nRunde == 0 )
-    {
-        pCppIn = stdin;
-        pCppOut = stdout;
-    }
-
-    nRunde++;
-    InitCpp1();
-    InitCpp4();
-    InitCpp6();
-
-    initdefines();                          /* O.S. specific def's  */
-    if ( argv[argc-1][0] == '@' )
-    {
-        i = readoptions( argv[1], &pfargv );    /* Command file */
-        useargv=pfargv;
-    }
-    else
-    {
-        i = dooptions(argc, argv);              /* Command line -flags  */
-        useargv=argv;
-    }
-    switch (i)
-    {
-#if OSL_DEBUG_LEVEL > 1
-    case 4:
-        if ( bDumpDefs )
-        {
-            /*
-             * Get defBase file, "-" means use stdout.
-             */
-            if (!streq(useargv[3], "-"))
-            {
-                pDefOut = fopen( useargv[3], "w" );
-                if( pDefOut == NULL )
-                {
-                    perror(useargv[3]);
-                    cerror("Can't open output file \"%s\"", useargv[3]);
-                    exit(IO_ERROR);
-                }
-            }                           /* Continue by opening output    */
-        }
-        /* fall through */
-#endif
-    case 3:
-        /*
-         * Get output file, "-" means use stdout.
-         */
-        if (!streq(useargv[2], "-"))
-        {
-            pCppOut = fopen( useargv[2], "w" );
-            if( pCppOut == NULL )
-            {
-                perror(useargv[2]);
-                cerror("Can't open output file \"%s\"", useargv[2]);
-                exit(IO_ERROR);
-            }
-        }                           /* Continue by opening input    */
-        /* fall through */
-    case 2:                         /* One file -> stdin            */
-        /*
-         * Open input file, "-" means use stdin.
-         */
-        if (!streq(useargv[1], "-"))
-        {
-            pCppIn = fopen( useargv[1], "r" );
-            if( pCppIn == NULL)
-            {
-                perror(useargv[1]);
-                cerror("Can't open input file \"%s\"", useargv[1]);
-                exit(IO_ERROR);
-            }
-            strncpy(work, useargv[1], NWORK);  /* Remember input filename      */
-            break;
-        }                           /* Else, just get stdin         */
-        /* fall through */
-    case 0:                         /* No args?                     */
-    case 1:                         /* No files, stdin -> stdout    */
-        work[0] = EOS;              /* Unix can't find stdin name   */
-        break;
-
-    default:
-        exit(IO_ERROR);             /* Can't happen                 */
-    }
-
-    setincdirs();                   /* Setup -I include directories */
-    addfile( pCppIn, work);           /* "open" main input file       */
-#if OSL_DEBUG_LEVEL > 1
-    if (debug > 0 || bDumpDefs)
-        dumpdef("preset #define symbols");
-#endif
-    if( pCppIn != stdin )
-        rewind( pCppIn );
-
-    cppmain();                      /* Process main file            */
-
-    if ((i = (ifptr - &ifstack[0])) != 0)
-    {
-        cierror("Inside #ifdef block at end of input, depth = %d", i);
-    }
-#if OSL_DEBUG_LEVEL > 1
-    if( pDefOut != stdout && pDefOut != stderr )
-        fclose( pDefOut );
-#endif
-    if( pCppOut != stdout && pCppOut != stderr )
-        fclose( pCppOut );
-
-    if (errors > 0)
-    {
-        fprintf(stderr, (errors == 1)
-                ? "%d error in preprocessor\n"
-                : "%d errors in preprocessor\n", errors);
-        if (!eflag)
-            exit(IO_ERROR);
-    }
-    if( pfargv )
-        free(pfargv);
-    return IO_NORMAL;
-
-}
-
-/*
- * Main process for cpp -- copies tokens from the current input
- * stream (main file, include file, or a macro) to the output
- * file.
- */
-void cppmain()
-{
-    int c;              /* Current character    */
-    int counter;        /* newlines and spaces  */
-
-    /*
-     * Explicitly output a #line at the start of cpp output so
-     * that lint (etc.) knows the name of the original source
-     * file.  If we don't do this explicitly, we may get
-     * the name of the first #include file instead.
-     * We also seem to need a blank line following that first #line.
-     */
-#ifdef EVALDEFS
-    if ( !bIsInEval )
-#endif
-    {
-        sharp();
-        PUTCHAR('\n');
-    }
-    /*
-     * This loop is started "from the top" at the beginning of each line
-     * wrongline is set TRUE in many places if it is necessary to write
-     * a #line record.  (But we don't write them when expanding macros.)
-     *
-     * The counter variable has two different uses:  at
-     * the start of a line, it counts the number of blank lines that
-     * have been skipped over.  These are then either output via
-     * #line records or by outputting explicit blank lines.
-     * When expanding tokens within a line, the counter remembers
-     * whether a blank/tab has been output.  These are dropped
-     * at the end of the line, and replaced by a single blank
-     * within lines.
-     */
-    for (;;)
-    {
-        counter = 0;                        /* Count empty lines    */
-        for (;;)
-        {                                   /* For each line, ...   */
-            while (type[(c = get())] == SPA) /* Skip leading blanks */
-                ;                           /* in this line.        */
-            if (c == '\n')                  /* If line's all blank, */
-                ++counter;                  /* Do nothing now       */
-            else if (c == '#')
-            {            /* Is 1st non-space '#' */
-                keepcomments = FALSE;       /* Don't pass comments  */
-                counter = control(counter); /* Yes, do a #command   */
-                keepcomments = (cflag && compiling);
-            }
-            else if (c == EOF_CHAR)         /* At end of file?      */
-            {
-                break;
-            }
-            else if (!compiling)
-            {                               /* #ifdef false?        */
-                skipnl();                   /* Skip to newline      */
-                counter++;                  /* Count it, too.       */
-            }
-            else
-            {
-                break;                      /* Actual token         */
-            }
-        }
-        if (c == EOF_CHAR)                  /* Exit process at      */
-            break;                          /* End of file          */
-        /*
-         * If the loop didn't terminate because of end of file, we
-         * know there is a token to compile.  First, clean up after
-         * absorbing newlines.  counter has the number we skipped.
-         */
-        if ((wrongline && infile->fp != NULL) || counter > 4)
-            sharp();                        /* Output # line number */
-        else
-        {                                   /* If just a few, stuff */
-            while (--counter >= 0)          /* them out ourselves   */
-                PUTCHAR('\n');
-        }
-        /*
-         * Process each token on this line.
-         */
-        unget();                            /* Reread the char.     */
-        for (;;)
-        {                                   /* For the whole line,  */
-            do
-            {                            /* Token concat. loop   */
-                for (counter = 0; type[(c = get())] == SPA;)
-                {
-                    counter++;              /* Skip over blanks     */
-
-                }
-                if (c == EOF_CHAR || c == '\n')
-                    goto end_line;          /* Exit line loop       */
-                else if (counter > 0)       /* If we got any spaces */
-                    PUTCHAR(' ');           /* Output one space     */
-                c = macroid(c);             /* Grab the token       */
-            }
-            while (type[c] == LET && catenate());
-
-            if (c == EOF_CHAR || c == '\n') /* From macro exp error */
-                goto end_line;              /* Exit line loop       */
-
-            switch (type[c])
-            {
-            case LET:
-                fputs(token, pCppOut);       /* Quite ordinary token */
-#ifdef EVALDEFS
-                {
-                    int len;
-                    if ( bIsInEval
-                         && nEvalOff + (len=strlen(token)) < NEVALBUF )
-                    {
-                        strcpy( &EvalBuf[nEvalOff], token );
-                        nEvalOff += len;
-                    }
-                }
-#endif
-                break;
-
-
-            case DIG:                       /* Output a number      */
-            case DOT:                       /* Dot may begin floats */
-#ifdef EVALDEFS
-                if ( bIsInEval )
-                    scannumber(c, outputEval);
-                else
-                    scannumber(c, output);
-#else
-                scannumber(c, output);
-#endif
-                break;
-
-            case QUO:                       /* char or string const */
-                scanstring(c, output);      /* Copy it to output    */
-                break;
-
-            default:                        /* Some other character */
-                cput(c);                    /* Just output it       */
-#ifdef EVALDEFS
-                if ( bIsInEval && nEvalOff < NEVALBUF )
-                    EvalBuf[nEvalOff++] = c;
-#endif
-                break;
-            }                               /* Switch ends          */
-        }                                   /* Line for loop        */
-      end_line:
-        if (c == '\n')
-        {                                   /* Compiling at EOL?    */
-            PUTCHAR('\n');                  /* Output newline, if   */
-            if (infile->fp == NULL)         /* Expanding a macro,   */
-                wrongline = TRUE;           /* Output # line later  */
-        }
-    }                                       /* Continue until EOF   */
-#ifdef EVALDEFS
-    if ( bIsInEval )
-        EvalBuf[nEvalOff++] = '\0';
-#endif
-}
-
-/*
- * Output one character to stdout -- output() is passed as an
- * argument to scanstring()
- */
-void output(int c)
-{
-    if (c != TOK_SEP)
-        PUTCHAR(c);
-}
-
-#ifdef EVALDEFS
-/*
- * Output one character to stdout -- output() is passed as an
- * argument to scanstring()
- */
-int outputEval(int c)
-{
-    if (c != TOK_SEP)
-    {
-        PUTCHAR(c);
-        if ( bIsInEval && nEvalOff < NEVALBUF )
-            EvalBuf[nEvalOff++] = c;
-    }
-}
-#endif
-
-
-/*
- * Output a line number line.
- */
-void sharp()
-{
-    char* name;
-
-    if (keepcomments)                       /* Make sure # comes on */
-        PUTCHAR('\n');                      /* a fresh, new line.   */
-
-    fprintf( pCppOut, "#%s %d", LINE_PREFIX, line);
-    if (infile->fp != NULL)
-    {
-        name = (infile->progname != NULL) ? infile->progname : infile->filename;
-        if (sharpfilename == NULL || (!streq(name, sharpfilename)))
-        {
-            if (sharpfilename != NULL)
-                free(sharpfilename);
-            sharpfilename = savestring(name);
-            fprintf( pCppOut, " \"%s\"", name);
-        }
-    }
-    PUTCHAR('\n');
-    wrongline = FALSE;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
deleted file mode 100644
index e55dc384018f..000000000000
--- a/rsc/source/rscpp/cpp2.c
+++ /dev/null
@@ -1,552 +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 <stdio.h>
-#include <ctype.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-static void doinclude( void );
-static void doif( int hash );
-static int openinclude( char*, int );
-static int hasdirectory( char*, char*, int );
-
-/*
- * Generate (by hand-inspection) a set of unique values for each control
- * operator.  Note that this is not guaranteed to work for non-Ascii
- * machines.  CPP won't compile if there are hash conflicts.
- */
-
-#define L_assert        ('a' + ('s' << 1))
-#define L_define        ('d' + ('f' << 1))
-#define L_elif          ('e' + ('i' << 1))
-#define L_else          ('e' + ('s' << 1))
-#define L_endif         ('e' + ('d' << 1))
-#define L_if            ('i' + (EOS << 1))
-#define L_ifdef         ('i' + ('d' << 1))
-#define L_ifndef        ('i' + ('n' << 1))
-#define L_include       ('i' + ('c' << 1))
-#define L_line          ('l' + ('n' << 1))
-#define L_nogood        (EOS + (EOS << 1))      /* To catch #i          */
-#define L_pragma        ('p' + ('a' << 1))
-#define L_undef         ('u' + ('d' << 1))
-#define L_error         ('e' + ('r' << 1))      /* BP 5.3.92, #error */
-#if OSL_DEBUG_LEVEL > 1
-#define L_debug         ('d' + ('b' << 1))      /* #debug               */
-#define L_nodebug       ('n' + ('d' << 1))      /* #nodebug             */
-#endif
-
-
-/*
- * Process #control lines.  Simple commands are processed inline,
- * while complex commands have their own subroutines.
- *
- * The counter is used to force out a newline before #line, and
- * #pragma commands.  This prevents these commands from ending up at
- * the end of the previous line if cpp is invoked with the -C option.
- */
-int control(int counter)
-{
-    int c;
-    char* tp;
-    int hash;
-    char* ep;
-
-    c = skipws();
-    if (c == '\n' || c == EOF_CHAR)
-        return counter + 1;
-    if (!isdigit(c))
-        scanid(c);                  /* Get #word to token[]         */
-    else
-    {
-        unget();                    /* Hack -- allow #123 as a      */
-        strcpy(token, "line");      /* synonym for #line 123        */
-    }
-    hash = (token[1] == EOS) ? L_nogood : (token[0] + (token[2] << 1));
-    switch (hash)
-    {
-    case L_assert:  tp = "assert";          break;
-    case L_define:  tp = "define";          break;
-    case L_elif:    tp = "elif";            break;
-    case L_else:    tp = "else";            break;
-    case L_endif:   tp = "endif";           break;
-    case L_if:      tp = "if";              break;
-    case L_ifdef:   tp = "ifdef";           break;
-    case L_ifndef:  tp = "ifndef";          break;
-    case L_include: tp = "include";         break;
-    case L_line:    tp = "line";            break;
-    case L_pragma:  tp = "pragma";          break;
-    case L_undef:   tp = "undef";           break;
-    case L_error:   tp = "error";           break;
-#if OSL_DEBUG_LEVEL > 1
-    case L_debug:   tp = "debug";           break;
-    case L_nodebug: tp = "nodebug";         break;
-#endif
-    default:        hash = L_nogood;
-        /*fall-through*/
-    case L_nogood:  tp = "";                break;
-    }
-    if (!streq(tp, token))
-        hash = L_nogood;
-    /*
-     * hash is set to a unique value corresponding to the
-     * control keyword (or L_nogood if we think it's nonsense).
-     */
-    if (infile->fp == NULL)
-        cwarn("Control line \"%s\" within macro expansion", token);
-    if (!compiling)
-    {                       /* Not compiling now    */
-        switch (hash)
-        {
-        case L_if:                          /* These can't turn     */
-        case L_ifdef:                       /*  compilation on, but */
-        case L_ifndef:                      /*   we must nest #if's */
-            if (++ifptr >= &ifstack[BLK_NEST])
-                goto if_nest_err;
-            *ifptr = 0;                     /* !WAS_COMPILING       */
-            /* fall through */
-        case L_line:                        /* Many                 */
-            /*
-             * Are pragma's always processed?
-             */
-        case L_pragma:                      /*  options             */
-        case L_include:                     /*   are uninteresting  */
-        case L_define:                      /*    if we             */
-        case L_undef:                       /*     aren't           */
-        case L_assert:                      /*      compiling.      */
-        case L_error:                       /* BP 5.3.92, #error */
-        dump_line:      skipnl();                       /* Ignore rest of line  */
-            return counter + 1;
-        }
-    }
-    /*
-     * Make sure that #line and #pragma are output on a fresh line.
-     */
-    if (counter > 0 && (hash == L_line || hash == L_pragma))
-    {
-        PUTCHAR('\n');
-        counter--;
-    }
-
-    switch (hash)
-    {
-    case L_line:
-        /*
-         * Parse the line to update the line number and "progname"
-         * field and line number for the next input line.
-         * Set wrongline to force it out later.
-         */
-        c = skipws();
-        workp = work;                       /* Save name in work    */
-        while (c != '\n' && c != EOF_CHAR)
-        {
-            save(c);
-            c = get();
-        }
-        unget();
-        save(EOS);
-        /*
-         * Split #line argument into <line-number> and <name>
-         * We subtract 1 as we want the number of the next line.
-         */
-        line = atoi(work) - 1;              /* Reset line number    */
-        for (tp = work; isdigit((unsigned char)*tp) || type[(int)*tp] == SPA; tp++)
-            ;                               /* Skip over digits     */
-        if (*tp != EOS)                     /* Got a filename, so:  */
-        {
-            if (*tp == '"' && (ep = strrchr(tp + 1, '"')) != NULL)
-            {
-                tp++;                       /* Skip over left quote */
-                *ep = EOS;                  /* And ignore right one */
-            }
-            if (infile->progname != NULL)   /* Give up the old name */
-                free(infile->progname);     /* if it's allocated.   */
-            infile->progname = savestring(tp);
-        }
-        wrongline = TRUE;                   /* Force output later   */
-        break;
-
-    case L_include:
-        doinclude();
-        break;
-
-    case L_define:
-        dodefine();
-        break;
-
-    case L_undef:
-        doundef();
-        break;
-
-    case L_else:
-        if (ifptr == &ifstack[0])
-            goto nest_err;
-        else if ((*ifptr & ELSE_SEEN) != 0)
-            goto else_seen_err;
-        *ifptr |= ELSE_SEEN;
-        if ((*ifptr & WAS_COMPILING) != 0)
-        {
-            if (compiling || (*ifptr & TRUE_SEEN) != 0)
-                compiling = FALSE;
-            else
-            {
-                compiling = TRUE;
-            }
-        }
-        break;
-
-    case L_elif:
-        if (ifptr == &ifstack[0])
-            goto nest_err;
-        else if ((*ifptr & ELSE_SEEN) != 0)
-        {
-          else_seen_err:  cerror("#%s may not follow #else", token);
-            goto dump_line;
-        }
-        if ((*ifptr & (WAS_COMPILING | TRUE_SEEN)) != WAS_COMPILING)
-        {
-            compiling = FALSE;              /* Done compiling stuff */
-            goto dump_line;                 /* Skip this clause     */
-        }
-        doif(L_if);
-        break;
-
-    case L_if:
-    case L_ifdef:
-    case L_ifndef:
-        if (++ifptr >= &ifstack[BLK_NEST])
-          if_nest_err:    cfatal("Too many nested #%s statements", token);
-        *ifptr = WAS_COMPILING;
-        doif(hash);
-        break;
-
-    case L_endif:
-        if (ifptr == &ifstack[0])
-        {
-          nest_err:       cerror("#%s must be in an #if", token);
-            goto dump_line;
-        }
-        if (!compiling && (*ifptr & WAS_COMPILING) != 0)
-            wrongline = TRUE;
-        compiling = ((*ifptr & WAS_COMPILING) != 0);
-        --ifptr;
-        break;
-
-    case L_assert:
-        if (eval() == 0)
-            cerror("Preprocessor assertion failure", NULLST);
-        break;
-
-    case L_pragma:
-        /*
-         * #pragma is provided to pass "options" to later
-         * passes of the compiler.  cpp doesn't have any yet.
-         */
-        fprintf( pCppOut, "#pragma ");
-        while ((c = get()) != '\n' && c != EOF_CHAR)
-            cput(c);
-        unget();
-        break;
-
-#if OSL_DEBUG_LEVEL > 1
-    case L_debug:
-        if (debug == 0)
-            dumpdef("debug set on");
-        debug++;
-        break;
-
-    case L_nodebug:
-        debug--;
-        break;
-#endif
-    case L_error:                       /* BP 5.3.92, #error */
-        fprintf( pCppOut, "cpp: line %d, Error directive: ", line );
-        while ((c = get()) != '\n' && c != EOF_CHAR)
-            cput(c);
-        fprintf( pCppOut, "\n" );
-        exit( 1 );
-
-    default:
-        /*
-         * Undefined #control keyword.
-         * Note: the correct behavior may be to warn and
-         * pass the line to a subsequent compiler pass.
-         * This would allow #asm or similar extensions.
-         */
-        cerror("Illegal # command \"%s\"", token);
-        break;
-    }
-    if (hash != L_include)
-    {
-        if (skipws() != '\n')
-        {
-            cwarn("Unexpected text in #control line ignored", NULLST);
-            skipnl();
-        }
-    }
-    return counter + 1;
-}
-
-/*
- * Process an #if, #ifdef, or #ifndef.  The latter two are straightforward,
- * while #if needs a subroutine of its own to evaluate the expression.
- *
- * doif() is called only if compiling is TRUE.  If false, compilation
- * is always suppressed, so we don't need to evaluate anything.  This
- * suppresses unnecessary warnings.
- */
-static void doif(int hash)
-{
-    int c;
-    int found;
-
-    if ((c = skipws()) == '\n' || c == EOF_CHAR)
-    {
-        unget();
-        goto badif;
-    }
-    if (hash == L_if)
-    {
-        unget();
-        found = (eval() != 0);      /* Evaluate expr, != 0 is  TRUE */
-        hash = L_ifdef;             /* #if is now like #ifdef       */
-    }
-    else
-    {
-        if (type[c] != LET)         /* Next non-blank isn't letter  */
-            goto badif;             /* ... is an error              */
-        found = (lookid(c) != NULL); /* Look for it in symbol table */
-    }
-    if (found == (hash == L_ifdef))
-    {
-        compiling = TRUE;
-        *ifptr |= TRUE_SEEN;
-    }
-    else
-    {
-        compiling = FALSE;
-    }
-    return;
-
-  badif:  cerror("#if, #ifdef, or #ifndef without an argument", NULLST);
-    skipnl();                               /* Prevent an extra     */
-    unget();                                /* Error message        */
-    return;
-}
-
-/*
- * Process the #include control line.
- * There are three variations:
- *      #include "file"         search somewhere relative to the
- *                              current source file, if not found,
- *                              treat as #include <file>.
- *      #include <file>         Search in an implementation-dependent
- *                              list of places.
- *      #include token          Expand the token, it must be one of
- *                              "file" or <file>, process as such.
- *
- * Note: the November 12 draft forbids '>' in the #include <file> format.
- * This restriction is unnecessary and not implemented.
- */
-static void doinclude()
-{
-    int c;
-    int delim;
-
-    delim = macroid(skipws());
-    if (delim != '<' && delim != '"')
-        goto incerr;
-    if (delim == '<')
-        delim = '>';
-    workp = work;
-    instring = TRUE;                /* Accept all characters        */
-#ifdef CONTROL_COMMENTS_NOT_ALLOWED
-    while ((c = get()) != '\n' && c != EOF_CHAR)
-        save(c);                    /* Put it away.                 */
-    unget();                        /* Force nl after include      */
-    /*
-     * The draft is unclear if the following should be done.
-     */
-    while (--workp >= work && *workp == ' ')
-        ;                           /* Trim blanks from filename    */
-    if (*workp != delim)
-        goto incerr;
-#else
-    while ((c = get()) != delim && c != EOF_CHAR)
-        save(c);
-#endif
-    *workp = EOS;                   /* Terminate filename           */
-    instring = FALSE;
-    if (openinclude(work, (delim == '"')))
-        return;
-    /*
-     * No sense continuing if #include file isn't there.
-     */
-    cfatal("Cannot open include file \"%s\"", work);
-
-  incerr: cerror("#include syntax error", NULLST);
-    return;
-}
-
-/*
- * Actually open an include file.  This routine is only called from
- * doinclude() above, but was written as a separate subroutine for
- * programmer convenience.  It searches the list of directories
- * and actually opens the file, linking it into the list of
- * active files.  Returns TRUE if the file was opened, FALSE
- * if openinclude() fails.  No error message is printed.
- */
-static int openinclude(char* filename, int searchlocal)
-{
-    char** incptr;
-    char tmpname[NFWORK]; /* Filename work area   */
-
-    if (searchlocal)
-    {
-        /*
-         * Look in local directory first
-         */
-#if HOST == SYS_UNIX
-        /*
-         * Try to open filename relative to the directory of the current
-         * source file (as opposed to the current directory). (ARF, SCK).
-         */
-        if (filename[0] != '/' &&
-            hasdirectory(infile->filename, tmpname, NFWORK))
-        {
-            int len = strlen(tmpname);
-            int len2 = strlen(filename);
-            if(len + len2 < NFWORK)
-            {
-                memcpy(tmpname + len, filename, len2);
-                tmpname[len + len2] = 0;
-            }
-            else
-            {
-                cfatal("Filename work buffer overflow", NULLST);
-            }
-        }
-        else
-        {
-            int len = strlen(filename);
-            if(len < NFWORK)
-            {
-                memcpy(tmpname, filename, len);
-                tmpname[len] = 0;
-            }
-            else
-            {
-                cfatal("Filename work buffer overflow", NULLST);
-            }
-        }
-#else
-        if (!hasdirectory(filename, tmpname, NFWORK) &&
-            hasdirectory(infile->filename, tmpname, NFWORK))
-        {
-            strcat(tmpname, filename);
-        }
-        else
-        {
-            strcpy(tmpname, filename);
-        }
-#endif
-        if (openfile(tmpname))
-            return TRUE;
-    }
-    /*
-     * Look in any directories specified by -I command line
-     * arguments, then in the builtin search list.
-     */
-    for (incptr = incdir; incptr < incend; incptr++)
-    {
-        if (strlen(*incptr) + strlen(filename) >= (NFWORK - 1))
-            cfatal("Filename work buffer overflow", NULLST);
-        else
-        {
-#if HOST == SYS_UNIX
-            if (filename[0] == '/')
-                strcpy(tmpname, filename);
-            else
-                sprintf(tmpname, "%s/%s", *incptr, filename);
-
-#elif HOST == SYS_UNKNOWN
-            if (filename[0] == '\\')
-                strcpy(tmpname, filename);
-            else
-                sprintf(tmpname, "%s\\%s", *incptr, filename);
-#else
-            if (!hasdirectory(filename, tmpname, NFWORK))
-                sprintf(tmpname, "%s%s", *incptr, filename);
-#endif
-            if (openfile(tmpname))
-                return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-/*
- * If a device or directory is found in the source filename string, the
- * node/device/directory part of the string is copied to result and
- * hasdirectory returns TRUE.  Else, nothing is copied and it returns FALSE.
- */
-static int hasdirectory(char* source, char* result, int max)
-{
-#if HOST == SYS_UNIX
-    char* tp;
-
-    if ((tp = strrchr(source, '/')) == NULL)
-        return FALSE;
-    else
-    {
-        int len = (int)(tp - source);
-        if(len < max)
-        {
-            memcpy(result, source, len);
-            result[len] = 0;
-        }
-        else
-        {
-            cfatal("Filename work buffer overflow", NULLST);
-        }
-        return TRUE;
-    }
-#else
-    /*
-     * Random DEC operating system (RSTS/E)
-     */
-    char* tp;
-
-    (void)max;
-
-    if ((tp = strrchr(source, ']')) == NULL &&
-        (tp = strrchr(source, ':')) == NULL)
-    {
-        return FALSE;
-    }
-    else
-    {
-        strncpy(result, source, tp - source + 1);
-        result[tp - source + 1] = EOS;
-        return TRUE;
-    }
-#endif
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
deleted file mode 100644
index c26ef0b665b4..000000000000
--- a/rsc/source/rscpp/cpp3.c
+++ /dev/null
@@ -1,428 +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 <stdio.h>
-#ifdef UNX
-#include <stdlib.h>
-#endif
-#include <ctype.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-#include "time.h" /* BP */
-
-#include <string.h>
-
-#if (OSL_DEBUG_LEVEL > 1) && (HOST == SYS_UNIX)
-#include <signal.h>
-#endif
-
-/*
- * Open a file, add it to the linked list of open files.
- * This is called only from openfile() above.
- */
-int openfile(char* filename)
-{
-    FILE* fp;
-
-    if ((fp = fopen(filename, "r")) == NULL)
-    {
-#if OSL_DEBUG_LEVEL > 1
-        if ( debug || !bDumpDefs )
-            perror(filename);
-#endif
-        return (FALSE);
-    }
-#if OSL_DEBUG_LEVEL > 1
-    if (debug)
-        fprintf(stderr, "Reading from \"%s\"\n", filename);
-#endif
-    addfile(fp, filename);
-    return (TRUE);
-}
-
-/*
- * Initialize tables for this open file.  This is called from openfile()
- * above (for #include files), and from the entry to cpp to open the main
- * input file.  It calls a common routine, getfile() to build the FILEINFO
- * structure which is used to read characters.  (getfile() is also called
- * to setup a macro replacement.)
- */
-void addfile(FILE* fp, char* filename)
-{
-    FILEINFO* file;
-
-    file = getfile(NBUFF, filename);
-    file->fp = fp;                  /* Better remember FILE *       */
-    file->buffer[0] = EOS;          /* Initialize for first read    */
-    line = 1;                       /* Working on line 1 now        */
-    wrongline = TRUE;               /* Force out initial #line      */
-}
-
-/*
- * Append system-specific directories to the include directory list.
- * Called only when cpp is started.
- */
-void setincdirs()
-{
-
-#ifdef  CPP_INCLUDE
-    *incend++ = CPP_INCLUDE;
-#define IS_INCLUDE      1
-#else
-#define IS_INCLUDE      0
-#endif
-
-#if HOST == SYS_UNIX
-    *incend++ = "/usr/include";
-#define MAXINCLUDE      (NINCLUDE - 1 - IS_INCLUDE)
-#endif
-
-
-#if HOST == SYS_UNKNOWN
-/*
- * Context: GenMake
- * Under DOS also the environment variable INCLUDE is used.
- * To make it difficult all entries separated by ';' have to be
- * included in the list and this is done with strtok().
- * Be careful using malloc() !!!
- * In savestring() as a matter of fact getmem() is used and probably these
- * two functions are getting in the way of each other.
- * When I used malloc() instead of savestring() an error occurred in strcpy().
- */
-
-#if !defined(_WIN32) && !defined(UNX)
-    extern char* getenv( char *pStr ); /* BP */
-#endif
-    char* pIncGetEnv = NULL;    /* Pointer to INCLUDE   */
-
-    if ( ( pIncGetEnv = getenv("INCLUDE") ) != NULL )
-        AddInclude( pIncGetEnv );
-
-#define MAXINCLUDE      (NINCLUDE - 3 - IS_INCLUDE)
-#endif
-
-}
-
-
-/* Context: Extension of the INCLUDE service
- * So far the cpp couldn't use include statements in the command line
- * where the directories are separated with ';'.
- * This totally understandable because this cpp is fitted to UNIX
- * systems and under UNIX ';' is used to terminate commandos.
- */
-
-int AddInclude( char* pIncStr )
-{
-    char* pIncEnv    = NULL;    /* copy of INCLUDE     */
-    char* pIncPos;              /* goes to the next */
-
-    pIncEnv = savestring( pIncStr );
-    pIncPos = strtok( pIncEnv, ";" );
-
-    while( pIncPos != NULL )
-    {
-        if (incend >= &incdir[MAXINCLUDE])
-            cfatal("Too many include directories", NULLST);
-        *incend++ = pIncPos;
-        pIncPos   = strtok( NULL, ";" );
-    }
-    /* coverity[leaked_storage] - we know this leaks, but it doesn't matter in this short lived utility */
-    return 1;
-}
-
-/*
- * dooptions is called to process command line arguments (-Detc).
- * It is called only at cpp startup.
- */
-int dooptions(int argc, char** argv)
-{
-    char* ap;
-    DEFBUF* dp;
-    int c;
-    int i, j;
-    char* arg;
-    SIZES* sizp;        /* For -S               */
-    int size;           /* For -S               */
-    int isdatum;        /* FALSE for -S*        */
-    int endtest;        /* For -S               */
-
-    for (i = j = 1; i < argc; i++)
-    {
-        arg = ap = argv[i];
-
-        if (*ap++ != '-' || *ap == EOS)
-        {
-            argv[j++] = argv[i];
-        }
-        else
-        {
-            c = *ap++;                      /* Option byte          */
-            if (islower((unsigned char)c))                 /* Normalize case       */
-                c = toupper(c);
-            switch (c)                      /* Command character    */
-            {
-            case 'C':                       /* Keep comments        */
-                cflag = TRUE;
-                keepcomments = TRUE;
-                break;
-
-            case 'D':                       /* Define symbol        */
-                /*
-                 * If the option is just "-Dfoo", make it -Dfoo=1
-                 */
-                while (*ap != EOS && *ap != '=')
-                    ap++;
-                if (*ap == EOS)
-                    ap = "1";
-                else
-                    *ap++ = EOS;
-                /*
-                 * Now, save the word and its definition.
-                 */
-                dp = defendel(argv[i] + 2, FALSE);
-                dp->repl = savestring(ap);
-                dp->nargs = DEF_NOARGS;
-                break;
-
-            case 'E':                       /* Ignore non-fatal     */
-                eflag = TRUE;               /* errors.              */
-                break;
-
-            case 'I':                       /* Include directory    */
-                AddInclude( ap );           /* BP, 11.09.91 */
-                break;
-
-            case 'N':                       /* No predefined        */
-                nflag++;                    /* Repeat to undefine   */
-                break;                      /* __LINE__, etc.       */
-
-            case 'S':
-                sizp = size_table;
-                if (0 != (isdatum = (*ap != '*'))) /* If it's just -S,     */
-                    endtest = T_FPTR;       /* Stop here            */
-                else                        /* But if it's -S*      */
-                {
-                    ap++;                   /* Step over '*'        */
-                    endtest = 0;            /* Stop at end marker   */
-                }
-                while (sizp->bits != endtest && *ap != EOS)
-                {
-                    if (!isdigit((unsigned char)*ap))      /* Skip to next digit   */
-                    {
-                        ap++;
-                        continue;
-                    }
-                    size = 0;               /* Compile the value    */
-                    while (isdigit((unsigned char)*ap))
-                    {
-                        size *= 10;
-                        size += (*ap++ - '0');
-                    }
-                    if (isdatum)
-                        sizp->size = size;  /* Datum size           */
-                    else
-                        sizp->psize = size; /* Pointer size         */
-                    sizp++;
-                }
-                if (sizp->bits != endtest)
-                    cwarn("-S, too few values specified in %s", argv[i]);
-                else if (*ap != EOS)
-                    cwarn("-S, too many values, \"%s\" unused", ap);
-                break;
-
-            case 'U':                       /* Undefine symbol      */
-                if (defendel(ap, TRUE) == NULL)
-                    cwarn("\"%s\" wasn't defined", ap);
-                break;
-
-#if OSL_DEBUG_LEVEL > 1
-            case 'X':                       /* Debug                */
-                debug = (isdigit((unsigned char)*ap)) ? atoi(ap) : 1;
-#if (HOST == SYS_UNIX)
-                signal(SIGINT, (void (*)(int)) abort); /* Trap "interrupt" */
-#endif
-                fprintf(stderr, "Debug set to %d\n", debug);
-                break;
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-            case 'P':                       /* #define's dump       */
-                bDumpDefs = 1;
-                fprintf(stderr, "Dump #define's is on\n");
-                break;
-#endif
-
-            default:                        /* What is this one?    */
-                cwarn("Unknown option \"%s\"", arg);
-                fprintf(stderr, "The following options are valid:\n\
-  -C\t\t\tWrite source file comments to output\n\
-  -Dsymbol=value\tDefine a symbol with the given (optional) value\n\
-  -Idirectory\t\tAdd a directory to the #include search list\n\
-  -N\t\t\tDon't predefine target-specific names\n\
-  -Stext\t\tSpecify sizes for #if sizeof\n\
-  -Usymbol\t\tUndefine symbol\n");
-#if OSL_DEBUG_LEVEL > 1
-                fprintf(stderr, "  -Xvalue\t\tSet internal debug flag\n");
-                fprintf(stderr, "  -P\t\t\tdump #define's\n");
-#endif
-                break;
-            }                       /* Switch on all options        */
-        }                           /* If it's a -option            */
-    }                               /* For all arguments            */
-#if OSL_DEBUG_LEVEL > 1
-    if ( (bDumpDefs ? j > 4 : j > 3) )
-#else
-    if (j > 3)
-#endif
-    {
-        cerror( "Too many file arguments.  Usage: cpp [input [output]]",
-                NULLST);
-    }
-    return j;                     /* Return new argc              */
-}
-
-int readoptions(char* filename, char*** pfargv)
-{
-    FILE* fp;
-    int c;
-    int bInQuotes = 0;
-    char optbuff[1024];
-    char* poptbuff;
-    int fargc=0;
-    int back;
-    char* fargv[PARALIMIT];
-    char** pfa;
-
-    pfa = *pfargv = malloc(sizeof(fargv));
-
-    poptbuff = &optbuff[0];
-    filename++;
-    if ((fp = fopen(filename, "r")) == NULL)
-    {
-#if OSL_DEBUG_LEVEL > 1
-        if ( debug || !bDumpDefs )
-            perror(filename);
-#endif
-        return (FALSE);
-    }
-    do
-    {
-        /*
-         *  #i27914# double ticks '"' now have a duplicate function:
-         *  1. they define a string ( e.g. -DFOO="baz" )
-         *  2. a string can contain spaces, so -DFOO="baz zum" defines one
-         *  argument no two !
-         */
-        c = fgetc(fp);
-        if ( c != ' ' && c != CR && c != NL && c != HT && c != EOF)
-        {
-            *poptbuff++ = (char)c;
-            if( c == '"' )
-                bInQuotes = ~bInQuotes;
-        }
-        else
-        {
-            if( c != EOF && bInQuotes )
-                *poptbuff++ = (char)c;
-            else
-            {
-                *poptbuff = EOS;
-                if (optbuff[0] != '\0')
-                {
-                    pfa[fargc + 1] = strdup(optbuff);
-                    fargc++;
-                    pfa[fargc + 1] = NULL;
-                    poptbuff = &optbuff[0];
-                }
-            }
-        }
-    }
-    while ( c != EOF );
-
-    fclose(fp);
-    back=dooptions(fargc+1,pfa);
-
-    return back;
-}
-
-/*
- * Initialize the built-in #define's.  There are two flavors:
- *      #define decus   1               (static definitions)
- *      #define __FILE__ ??             (dynamic, evaluated by magic)
- * Called only on cpp startup.
- *
- * Note: the built-in static definitions are suppressed by the -N option.
- * __LINE__, __FILE__, and __DATE__ are always present.
- */
-void initdefines()
-{
-    char** pp;
-    char* tp;
-    DEFBUF* dp;
-    int i;
-    time_t tvec;
-
-    /*
-     * Predefine the built-in symbols.  Allow the
-     * implementor to pre-define a symbol as "" to
-     * eliminate it.
-     */
-    if (nflag == 0)
-    {
-        for (pp = preset; *pp != NULL; pp++)
-        {
-            if (*pp[0] != EOS)
-            {
-                dp = defendel(*pp, FALSE);
-                dp->repl = savestring("1");
-                dp->nargs = DEF_NOARGS;
-            }
-        }
-    }
-    /*
-     * The magic pre-defines (__FILE__ and __LINE__ are
-     * initialized with negative argument counts.  expand()
-     * notices this and calls the appropriate routine.
-     * DEF_NOARGS is one greater than the first "magic" definition.
-     */
-    if (nflag < 2)
-    {
-        for (pp = magic, i = DEF_NOARGS; *pp != NULL; pp++)
-        {
-            dp = defendel(*pp, FALSE);
-            dp->nargs = --i;
-        }
-#if OK_DATE
-        /*
-         * Define __DATE__ as today's date.
-         */
-        dp = defendel("__DATE__", FALSE);
-        dp->repl = tp = getmem(27);
-        dp->nargs = DEF_NOARGS;
-        time( &tvec);
-        *tp++ = '"';
-        strcpy(tp, ctime(&tvec));
-        tp[24] = '"';                       /* Overwrite newline    */
-#endif
-    }
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
deleted file mode 100644
index 6e1811164e62..000000000000
--- a/rsc/source/rscpp/cpp4.c
+++ /dev/null
@@ -1,630 +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 <sal/types.h>
-#include <stdio.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-/*
- * parm[], parmp, and parlist[] are used to store #define() argument
- * lists.  nargs contains the actual number of parameters stored.
- */
-static char parm[NPARMWORK + 1];    /* define param work buffer     */
-static char* parmp;                 /* Free space in parm           */
-static char* parlist[LASTPARM];     /* -> start of each parameter   */
-static int nargs;                   /* Parameters for this macro    */
-
-static int expcollect( void );
-static void expstuff( DEFBUF* dp );
-
-void InitCpp4()
-{
-    int i;
-    for( i = 0; i < NPARMWORK; i++ )
-        parm[ i ] = 0;
-    for( i = 0; i < LASTPARM; i++ )
-        parlist[ i ] = NULL;
-
-    nargs = 0;
-}
-
-
-/*
- * Called from control when a #define is scanned.  This module
- * parses formal parameters and the replacement string.  When
- * the formal parameter name is encountered in the replacement
- * string, it is replaced by a character in the range 128 to
- * 128+NPARAM (this allows up to 32 parameters within the
- * Dec Multinational range).
- *
- * There is some special case code to distinguish
- *      #define foo     bar
- * from #define foo()   bar
- *
- * Also, we make sure that
- *      #define foo     foo
- * expands to "foo" but doesn't put cpp into an infinite loop.
- *
- * A warning message is printed if you redefine a symbol to a
- * different text.  I.e,
- *      #define foo     123
- *      #define foo     123
- * is ok, but
- *      #define foo     123
- *      #define foo     +123
- * is not.
- *
- * The following subroutines are called from define():
- * checkparm    called when a token is scanned.  It checks through the
- *              array of formal parameters.  If a match is found, the
- *              token is replaced by a control byte which will be used
- *              to locate the parameter when the macro is expanded.
- * textput      puts a string in the macro work area (parm[]), updating
- *              parmp to point to the first free byte in parm[].
- *              textput() tests for work buffer overflow.
- * charput      puts a single character in the macro work area (parm[])
- *              in a manner analogous to textput().
- */
-void dodefine()
-{
-    int c;
-    DEFBUF* dp;            /* -> new definition    */
-    int isredefine;        /* TRUE if redefined    */
-    char* old = NULL;         /* Remember redefined   */
-
-    if (type[(c = skipws())] != LET)
-        goto bad_define;
-    isredefine = FALSE;                     /* Set if redefining    */
-    if ((dp = lookid(c)) == NULL)           /* If not known now     */
-        dp = defendel(token, FALSE);        /* Save the name        */
-    else                                    /* It's known:          */
-    {
-        isredefine = TRUE;                  /* Remember this fact   */
-        old = dp->repl;                     /* Remember replacement */
-        dp->repl = NULL;                    /* No replacement now   */
-    }
-    parlist[0] = parmp = parm;              /* Setup parm buffer    */
-    if ((c = get()) == '(')                 /* With arguments?      */
-    {
-        nargs = 0;                          /* Init formals counter */
-        do                                  /* Collect formal parms */
-        {
-            if (nargs >= LASTPARM)
-                cfatal("Too many arguments for macro", NULLST);
-            else if ((c = skipws()) == ')')
-                break;                      /* Got them all         */
-            else if (type[c] != LET)        /* Bad formal syntax    */
-                goto bad_define;
-            scanid(c);                      /* Get the formal param */
-            parlist[nargs++] = parmp;       /* Save its start       */
-            textput(token);                 /* Save text in parm[]  */
-        }
-        while ((c = skipws()) == ',');      /* Get another argument */
-        if (c != ')')                       /* Must end at )        */
-            goto bad_define;
-        c = ' ';                            /* Will skip to body    */
-    }
-    else
-    {
-        /*
-         * DEF_NOARGS is needed to distinguish between
-         * "#define foo" and "#define foo()".
-         */
-        nargs = DEF_NOARGS;                 /* No () parameters     */
-    }
-    if (type[c] == SPA)                     /* At whitespace?       */
-        c = skipws();                       /* Not any more.        */
-    workp = work;                           /* Replacement put here */
-    inmacro = TRUE;                         /* Keep \<newline> now  */
-    while (c != EOF_CHAR && c != '\n')      /* Compile macro body   */
-    {
-        if (c == '#')                       /* Token concatenation? */
-        {
-            while (workp > work && type[(int)workp[-1]] == SPA)
-                --workp;                    /* Erase leading spaces */
-            save(TOK_SEP);                  /* Stuff a delimiter    */
-            c = skipws();                   /* Eat whitespace       */
-            if (type[c] == LET)             /* Another token here?  */
-                ;                           /* Stuff it normally    */
-            else if (type[c] == DIG)        /* Digit string after?  */
-            {
-                while (type[c] == DIG)      /* Stuff the digits     */
-                {
-                    save(c);
-                    c = get();
-                }
-                save(TOK_SEP);              /* Delimit 2nd token    */
-            }
-            else
-            {
-                ciwarn("Strange character after # (%d.)", c);
-            }
-            continue;
-        }
-        switch (type[c])
-        {
-        case LET:
-            checkparm(c, dp);               /* Might be a formal    */
-            break;
-
-        case DIG:                           /* Number in mac. body  */
-        case DOT:                           /* Maybe a float number */
-            scannumber(c, save);            /* Scan it off          */
-            break;
-
-        case QUO:                           /* String in mac. body  */
-            stparmscan(c);
-            break;
-
-        case BSH:                           /* Backslash            */
-            save('\\');
-            if ((c = get()) == '\n')
-                wrongline = TRUE;
-            save(c);
-            break;
-
-        case SPA:                           /* Absorb whitespace    */
-            /*
-             * Note: the "end of comment" marker is passed on
-             * to allow comments to separate tokens.
-             */
-            if (workp[-1] == ' ')           /* Absorb multiple      */
-                break;                      /* spaces               */
-            else if (c == '\t')
-                c = ' ';                    /* Normalize tabs       */
-            /* fall through *//* to store character                 */
-        default:                            /* Other character      */
-            save(c);
-            break;
-        }
-        c = get();
-    }
-    inmacro = FALSE;                        /* Stop newline hack    */
-    unget();                                /* For control check    */
-    if (workp > work && workp[-1] == ' ')   /* Drop trailing blank  */
-        workp--;
-    *workp = EOS;                           /* Terminate work       */
-    dp->repl = savestring(work);            /* Save the string      */
-    dp->nargs = nargs;                      /* Save arg count       */
-#if OSL_DEBUG_LEVEL > 1
-    if (debug)
-        dumpadef("macro definition", dp);
-    else if (bDumpDefs)
-        dumpadef(NULL, dp);
-#endif
-    if (isredefine)                         /* Error if redefined   */
-    {
-        if ((old != NULL && dp->repl != NULL && !streq(old, dp->repl)) ||
-            (old == NULL && dp->repl != NULL) ||
-            (old != NULL && dp->repl == NULL))
-        {
-#ifdef STRICT_UNDEF
-            cerror("Redefining defined variable \"%s\"", dp->name);
-#else
-            cwarn("Redefining defined variable \"%s\"", dp->name);
-#endif
-        }
-        if (old != NULL)                    /* We don't need the    */
-            free(old);                      /* old definition now.  */
-    }
-    return;
-
-  bad_define:
-    cerror("#define syntax error", NULLST);
-    inmacro = FALSE;                        /* Stop <newline> hack  */
-}
-
-/*
- * Replace this param if it's defined.  Note that the macro name is a
- * possible replacement token.  We stuff DEF_MAGIC in front of the token
- * which is treated as a LETTER by the token scanner and eaten by
- * the output routine.  This prevents the macro expander from
- * looping if someone writes "#define foo foo".
- */
-void checkparm(int c, DEFBUF* dp)
-{
-    int i;
-    char* cp;
-
-    scanid(c);                              /* Get parm to token[]  */
-    for (i = 0; i < nargs; i++)             /* For each argument    */
-    {
-        if (streq(parlist[i], token))       /* If it's known        */
-        {
-#ifdef SOLAR
-            save(DEL);
-#endif
-            save(i + MAC_PARM);             /* Save a magic cookie  */
-            return;                         /* And exit the search  */
-        }
-    }
-    if (streq(dp->name, token))             /* Macro name in body?  */
-        save(DEF_MAGIC);                    /* Save magic marker    */
-    for (cp = token; *cp != EOS;)           /* And save             */
-        save(*cp++);                        /* The token itself     */
-}
-
-/*
- * Normal string parameter scan.
- */
-void stparmscan(int delim)
-{
-    char* wp;
-    int i;
-
-    wp = workp;                     /* Here's where it starts       */
-    if (!scanstring(delim, save))
-        return;                     /* Exit on scanstring error     */
-    workp[-1] = EOS;                /* Erase trailing quote         */
-    wp++;                           /* -> first string content byte */
-    for (i = 0; i < nargs; i++)
-    {
-        if (streq(parlist[i], wp))
-        {
-#ifdef SOLAR
-            *wp++ = DEL;
-#if defined __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wconstant-conversion"
-#endif
-            *wp++ = MAC_PARM + PAR_MAC;     /* Stuff a magic marker */
-#if defined __clang__
-#pragma clang diagnostic pop
-#endif
-            *wp++ = (char)(i + MAC_PARM);   /* Make a formal marker */
-            *wp = wp[-4];                   /* Add on closing quote */
-            workp = wp + 1;                 /* Reset string end     */
-#else
-            *wp++ = MAC_PARM + PAR_MAC;     /* Stuff a magic marker */
-            *wp++ = (i + MAC_PARM);         /* Make a formal marker */
-            *wp = wp[-3];                   /* Add on closing quote */
-            workp = wp + 1;                 /* Reset string end     */
-#endif
-            return;
-        }
-    }
-    workp[-1] = wp[-1];             /* Nope, reset end quote.       */
-}
-
-/*
- * Remove the symbol from the defined list.
- * Called from the #control processor.
- */
-void doundef()
-{
-    int c;
-
-    if (type[(c = skipws())] != LET)
-        cerror("Illegal #undef argument", NULLST);
-    else
-    {
-        scanid(c);                          /* Get name to token[]  */
-        if (defendel(token, TRUE) == NULL)
-        {
-#ifdef STRICT_UNDEF
-            cwarn("Symbol \"%s\" not defined in #undef", token);
-#endif
-        }
-    }
-}
-
-/*
- * Put the string in the parm[] buffer.
- */
-void textput(char* text)
-{
-    size_t size;
-
-    size = strlen(text) + 1;
-    if ((parmp + size) >= &parm[NPARMWORK])
-        cfatal("Macro work area overflow", NULLST);
-    else
-    {
-        strcpy(parmp, text);
-        parmp += size;
-    }
-}
-
-/*
- * Put the byte in the parm[] buffer.
- */
-void charput(int c)
-{
-    if (parmp >= &parm[NPARMWORK])
-        cfatal("Macro work area overflow", NULLST);
-    else
-    {
-        *parmp++ = (char)c;
-    }
-}
-
-/*
- *              M a c r o   E x p a n s i o n
- */
-
-static DEFBUF* macro;         /* Catches start of infinite macro      */
-
-/*
- * Expand a macro.  Called from the cpp mainline routine (via subroutine
- * macroid()) when a token is found in the symbol table.  It calls
- * expcollect() to parse actual parameters, checking for the correct number.
- * It then creates a "file" containing a single line containing the
- * macro with actual parameters inserted appropriately.  This is
- * "pushed back" onto the input stream.  (When the get() routine runs
- * off the end of the macro line, it will dismiss the macro itself.)
- */
-void expand(DEFBUF* tokenp)
-{
-    int c;
-    FILEINFO* file;
-
-#if OSL_DEBUG_LEVEL > 1
-    if (debug)
-        dumpadef("expand entry", tokenp);
-#endif
-    /*
-     * If no macro is pending, save the name of this macro
-     * for an eventual error message.
-     */
-    if (recursion++ == 0)
-        macro = tokenp;
-    else if (recursion == RECURSION_LIMIT)
-    {
-        cerror("Recursive macro definition of \"%s\"", tokenp->name);
-        fprintf(stderr, "(Defined by \"%s\")\n", macro->name);
-        if (rec_recover)
-        {
-            do
-            {
-                c = get();
-            }
-            while (infile != NULL && infile->fp == NULL);
-            unget();
-            recursion = 0;
-            return;
-        }
-    }
-    /*
-     * Here's a macro to expand.
-     */
-    nargs = 0;                              /* Formals counter      */
-    parmp = parm;                           /* Setup parm buffer    */
-    switch (tokenp->nargs)
-    {
-    case (-2):                              /* __LINE__             */
-        sprintf(work, "%d", line);
-        ungetstring(work);
-        break;
-
-    case (-3):                              /* __FILE__             */
-        for (file = infile; file != NULL; file = file->parent)
-        {
-            if (file->fp != NULL)
-            {
-                sprintf(work, "\"%s\"", (file->progname != NULL)
-                        ? file->progname : file->filename);
-                ungetstring(work);
-                break;
-            }
-        }
-        break;
-
-    default:
-        /*
-         * Nothing funny about this macro.
-         */
-        if (tokenp->nargs < 0)
-            cfatal("Bug: Illegal __ macro \"%s\"", tokenp->name);
-        while ((c = skipws()) == '\n')      /* Look for (, skipping */
-            wrongline = TRUE;               /* spaces and newlines  */
-        if (c != '(')
-        {
-            /*
-             * If the programmer writes
-             *      #define foo() ...
-             *      ...
-             *      foo [no ()]
-             * just write foo to the output stream.
-             */
-            unget();
-            cwarn("Macro \"%s\" needs arguments", tokenp->name);
-            fputs(tokenp->name, pCppOut );
-            return;
-        }
-        else if (expcollect())              /* Collect arguments    */
-        {
-            if (tokenp->nargs != nargs)     /* Should be an error?  */
-            {
-                cwarn("Wrong number of macro arguments for \"%s\"",
-                      tokenp->name);
-            }
-#if OSL_DEBUG_LEVEL > 1
-            if (debug)
-                dumpparm("expand");
-#endif
-        }                           /* Collect arguments            */
-        /* fall through */
-    case DEF_NOARGS:                /* No parameters just stuffs    */
-        expstuff(tokenp);           /* Do actual parameters         */
-    }                               /* nargs switch                 */
-}
-
-/*
- * Collect the actual parameters for this macro.  TRUE if ok.
- */
-static int expcollect()
-{
-    int c;
-    int paren;                  /* For embedded ()'s    */
-    for (;;)
-    {
-        paren = 0;                          /* Collect next arg.    */
-        while ((c = skipws()) == '\n')      /* Skip over whitespace */
-            wrongline = TRUE;               /* and newlines.        */
-        if (c == ')')                       /* At end of all args?  */
-        {
-            /*
-             * Note that there is a guard byte in parm[]
-             * so we don't have to check for overflow here.
-             */
-            *parmp = EOS;                   /* Make sure terminated */
-            break;                          /* Exit collection loop */
-        }
-        else if (nargs >= LASTPARM)
-            cfatal("Too many arguments in macro expansion", NULLST);
-        parlist[nargs++] = parmp;           /* At start of new arg  */
-        for (;; c = cget())                 /* Collect arg's bytes  */
-        {
-            if (c == EOF_CHAR)
-            {
-                cerror("end of file within macro argument", NULLST);
-                return FALSE;             /* Sorry.               */
-            }
-            else if (c == '\\')             /* Quote next character */
-            {
-                charput(c);                 /* Save the \ for later */
-                charput(cget());            /* Save the next char.  */
-                continue;                   /* And go get another   */
-            }
-            else if (type[c] == QUO)        /* Start of string?     */
-            {
-                scanstring(c, charput);     /* Scan it off          */
-                continue;                   /* Go get next char     */
-            }
-            else if (c == '(')              /* Worry about balance  */
-                paren++;                    /* To know about commas */
-            else if (c == ')')              /* Other side too       */
-            {
-                if (paren == 0)             /* At the end?          */
-                {
-                    unget();                /* Look at it later     */
-                    break;                  /* Exit arg getter.     */
-                }
-                paren--;                    /* More to come.        */
-            }
-            else if (c == ',' && paren == 0) /* Comma delimits args */
-                break;
-            else if (c == '\n')             /* Newline inside arg?  */
-                wrongline = TRUE;           /* We'll need a #line   */
-            charput(c);                     /* Store this one       */
-        }                                   /* Collect an argument  */
-        charput(EOS);                       /* Terminate argument   */
-#if OSL_DEBUG_LEVEL > 1
-        if (debug)
-            fprintf( pCppOut, "parm[%d] = \"%s\"\n", nargs, parlist[nargs - 1]);
-#endif
-    }                                       /* Collect all args.    */
-    return TRUE;                            /* Normal return        */
-}
-
-/*
- * Stuff the macro body, replacing formal parameters by actual parameters.
- */
-static void expstuff(DEFBUF* tokenp)
-{
-    int c;                      /* Current character    */
-    char* inp;                  /* -> repl string       */
-    char* defp;                 /* -> macro output buff */
-    size_t size;                   /* Actual parm. size    */
-    char* defend;               /* -> output buff end   */
-    int string_magic;           /* String formal hack   */
-    FILEINFO* file;             /* Funny #include       */
-
-    file = getfile(NBUFF, tokenp->name);
-    inp = tokenp->repl;                     /* -> macro replacement */
-    defp = file->buffer;                    /* -> output buffer     */
-    defend = defp + (NBUFF - 1);            /* Note its end         */
-    if (inp != NULL)
-    {
-        while ((c = (*inp++ & 0xFF)) != EOS)
-        {
-#ifdef SOLAR
-            if (c == DEL)
-            {
-                c = (*inp++ & 0xFF);
-#else
-                if (c >= MAC_PARM && c <= (MAC_PARM + PAR_MAC))
-                {
-#endif
-                    string_magic = (c == (MAC_PARM + PAR_MAC));
-                    if (string_magic)
-                        c = (*inp++ & 0xFF);
-                    /*
-                     * Replace formal parameter by actual parameter string.
-                     */
-                    if ((c -= MAC_PARM) < nargs)
-                    {
-                        size = strlen(parlist[c]);
-                        if ((defp + size) >= defend)
-                            goto nospace;
-                        /*
-                         * Erase the extra set of quotes.
-                         */
-                        if (string_magic && defp[-1] == parlist[c][0])
-                        {
-                            strcpy(defp-1, parlist[c]);
-                            defp += (size - 2);
-                        }
-                        else
-                        {
-                            strcpy(defp, parlist[c]);
-                            defp += size;
-                        }
-                    }
-                }
-                else if (defp >= defend)
-                {
-                  nospace:
-                    cfatal("Out of space in macro \"%s\" arg expansion",
-                           tokenp->name);
-                }
-                else
-                {
-                    *defp++ = (char)c;
-                }
-            }
-        }
-        *defp = EOS;
-#if OSL_DEBUG_LEVEL > 1
-        if (debug > 1)
-            fprintf( pCppOut, "macroline: \"%s\"\n", file->buffer);
-#endif
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-
-    /*
-     * Dump parameter list.
-     */
-    void dumpparm(char* why)
-    {
-        int    i;
-
-        fprintf( pCppOut, "dump of %d parameters (%" SAL_PRI_SIZET "u bytes total) %s\n",
-                 nargs, parmp - parm, why);
-        for (i = 0; i < nargs; i++)
-        {
-            fprintf( pCppOut, "parm[%d] (%d) = \"%s\"\n",
-                     i + 1, (int)strlen(parlist[i]), parlist[i]);
-        }
-    }
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
deleted file mode 100644
index e64a3e01327d..000000000000
--- a/rsc/source/rscpp/cpp5.c
+++ /dev/null
@@ -1,949 +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 <stdio.h>
-#include <ctype.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-static int evallex(int skip);
-static int dosizeof(void);
-static int bittest(int value);
-static int evalnum(int c);
-static int evalchar(int skip);
-static int *evaleval(int* valp, int op, int skip);
-
-/*
- * Evaluate an #if expression.
- */
-
-static char* opname[] = {       /* For debug and error messages */
-"end of expression", "val", "id",
-  "+",   "-",  "*",  "/",  "%",
-  "<<", ">>",  "&",  "|",  "^",
-  "==", "!=",  "<", "<=", ">=",  ">",
-  "&&", "||",  "?",  ":",  ",",
-  "unary +", "unary -", "~", "!",  "(",  ")", "(none)",
-};
-
-/*
- * opdope[] has the operator precedence:
- *     Bits
- *    7 Unused (so the value is always positive)
- *  6-2 Precedence (000x .. 017x)
- *  1-0 Binary op. flags:
- *      01  The binop flag should be set/cleared when this op is seen.
- *      10  The new value of the binop flag.
- * Note:  Expected, New binop
- * constant 0   1   Binop, end, or ) should follow constants
- * End of line  1   0   End may not be preceded by an operator
- * binary   1   0   Binary op follows a value, value follows.
- * unary    0   0   Unary op doesn't follow a value, value follows
- *   (      0   0   Doesn't follow value, value or unop follows
- *   )      1   1   Follows value.  Op follows.
- */
-
-static char opdope[OP_MAX] = {
-  0001,                 /* End of expression        */
-  0002,                 /* Digit            */
-  0000,                 /* Letter (identifier)      */
-  0141, 0141, 0151, 0151, 0151,     /* ADD, SUB, MUL, DIV, MOD  */
-  0131, 0131, 0101, 0071, 0071,     /* ASL, ASR, AND,  OR, XOR  */
-  0111, 0111, 0121, 0121, 0121, 0121,   /*  EQ,  NE,  LT,  LE,  GE,  GT */
-  0061, 0051, 0041, 0041, 0031,     /* ANA, ORO, QUE, COL, CMA  */
-/*
- * Unary op's follow
- */
-  0160, 0160, 0160, 0160,       /* NEG, PLU, COM, NOT       */
-  0170, 0013, 0023,         /* LPA, RPA, END        */
-};
-/*
- * OP_QUE and OP_RPA have alternate precedences:
- */
-#define OP_RPA_PREC 0013
-#define OP_QUE_PREC 0034
-
-/*
- * S_ANDOR and S_QUEST signal "short-circuit" boolean evaluation, so that
- *  #if FOO != 0 && 10 / FOO ...
- * doesn't generate an error message.  They are stored in optab.skip.
- */
-#define S_ANDOR     2
-#define S_QUEST     1
-
-typedef struct optab
-{
-    char    op;         /* Operator         */
-    char    prec;           /* Its precedence       */
-    char    skip;           /* Short-circuit: TRUE to skip  */
-} OPTAB;
-static int  evalue;         /* Current value from evallex() */
-
-#define isbinary(op)    (op >= FIRST_BINOP && op <= LAST_BINOP)
-
-/*
- * The following definitions are used to specify basic variable sizes.
- */
-
-#ifndef S_CHAR
-#define S_CHAR      (sizeof (char))
-#endif
-#ifndef S_SINT
-#define S_SINT      (sizeof (short int))
-#endif
-#ifndef S_INT
-#define S_INT       (sizeof (int))
-#endif
-#ifndef S_LINT
-#define S_LINT      (sizeof (long int))
-#endif
-#ifndef S_FLOAT
-#define S_FLOAT     (sizeof (float))
-#endif
-#ifndef S_DOUBLE
-#define S_DOUBLE    (sizeof (double))
-#endif
-#ifndef S_PCHAR
-#define S_PCHAR     (sizeof (char *))
-#endif
-#ifndef S_PSINT
-#define S_PSINT     (sizeof (short int *))
-#endif
-#ifndef S_PINT
-#define S_PINT      (sizeof (int *))
-#endif
-#ifndef S_PLINT
-#define S_PLINT     (sizeof (long int *))
-#endif
-#ifndef S_PFLOAT
-#define S_PFLOAT    (sizeof (float *))
-#endif
-#ifndef S_PDOUBLE
-#define S_PDOUBLE   (sizeof (double *))
-#endif
-#ifndef S_PFPTR
-#define S_PFPTR     (sizeof (int (*)(void)))
-#endif
-
-typedef struct types
-{
-    short   type;           /* This is the bit if       */
-    char    *name;          /* this is the token word   */
-} TYPES;
-
-static TYPES basic_types[] = {
-    { T_CHAR,   "char",     },
-    { T_INT,    "int",      },
-    { T_FLOAT,  "float",    },
-    { T_DOUBLE, "double",   },
-    { T_SHORT,  "short",    },
-    { T_LONG,   "long",     },
-    { T_SIGNED, "signed",   },
-    { T_UNSIGNED,   "unsigned", },
-    { 0,        NULL,       },  /* Signal end       */
-};
-
-/*
- * Test_table[] is used to test for illegal combinations.
- */
-static short test_table[] = {
-    T_FLOAT | T_DOUBLE | T_LONG | T_SHORT,
-    T_FLOAT | T_DOUBLE | T_CHAR | T_INT,
-    T_FLOAT | T_DOUBLE | T_SIGNED | T_UNSIGNED,
-    T_LONG  | T_SHORT  | T_CHAR,
-    0                       /* end marker   */
-};
-
-/*
- * The order of this table is important -- it is also referenced by
- * the command line processor to allow run-time overriding of the
- * built-in size values.  The order must not be changed:
- *  char, short, int, long, float, double (func pointer)
- */
-SIZES size_table[] = {
-    { T_CHAR,   S_CHAR,     S_PCHAR     },  /* char     */
-    { T_SHORT,  S_SINT,     S_PSINT     },  /* short int    */
-    { T_INT,    S_INT,      S_PINT      },  /* int      */
-    { T_LONG,   S_LINT,     S_PLINT     },  /* long     */
-    { T_FLOAT,  S_FLOAT,    S_PFLOAT    },  /* float    */
-    { T_DOUBLE, S_DOUBLE,   S_PDOUBLE   },  /* double   */
-    { T_FPTR,   0,      S_PFPTR     },  /* int (*())    */
-    { 0,    0,      0       },  /* End of table */
-};
-
-/*
- * Evaluate an expression.  Straight-forward operator precedence.
- * This is called from control() on encountering an #if statement.
- * It calls the following routines:
- * evallex  Lexical analyser -- returns the type and value of
- *      the next input token.
- * evaleval Evaluate the current operator, given the values on
- *      the value stack.  Returns a pointer to the (new)
- *      value stack.
- * For compatibility with older cpp's, this return returns 1 (TRUE)
- * if a syntax error is detected.
- */
-int eval()
-{
-    int op;         /* Current operator     */
-    int* valp;      /* -> value vector      */
-    OPTAB* opp;     /* Operator stack       */
-    int prec;       /* Op precedence        */
-    int binop;      /* Set if binary op. needed */
-    int op1;        /* Operand from stack       */
-    int skip;       /* For short-circuit testing    */
-    int value[NEXP]; /* Value stack          */
-    OPTAB opstack[NEXP]; /* Operand stack        */
-
-    valp = value;
-    opp = opstack;
-    opp->op = OP_END;       /* Mark bottom of stack     */
-    opp->prec = opdope[OP_END]; /* And its precedence       */
-    opp->skip = 0;          /* Not skipping now     */
-    binop = 0;
-
-again:
-#ifdef  DEBUG_EVAL
-    fprintf( pCppOut, "In #if at again: skip = %d, binop = %d, line is: %s",
-        opp->skip, binop, infile->bptr);
-#endif
-    if ((op = evallex(opp->skip)) == OP_SUB && binop == 0)
-        op = OP_NEG;            /* Unary minus      */
-    else if (op == OP_ADD && binop == 0)
-        op = OP_PLU;            /* Unary plus       */
-    else if (op == OP_FAIL)
-        return 1;             /* Error in evallex */
-#ifdef  DEBUG_EVAL
-    fprintf( pCppOut, "op = %s, opdope = %03o, binop = %d, skip = %d\n",
-        opname[op], opdope[op], binop, opp->skip);
-#endif
-    if (op == DIG)              /* Value?       */
-    {
-        if (binop != 0)
-        {
-            cerror("misplaced constant in #if", NULLST);
-            return 1;
-        }
-        else if (valp >= &value[NEXP-1])
-        {
-            cerror("#if value stack overflow", NULLST);
-            return 1;
-        }
-        else
-        {
-#ifdef  DEBUG_EVAL
-            fprintf( pCppOut, "pushing %d onto value stack[%td]\n",
-                     evalue, valp - value);
-#endif
-            *valp++ = evalue;
-            binop = 1;
-        }
-        goto again;
-    }
-    else if (op > OP_END)
-    {
-        cerror("Illegal #if line", NULLST);
-        return 1;
-    }
-    prec = opdope[op];
-    if (binop != (prec & 1))
-    {
-        cerror("Operator %s in incorrect context", opname[op]);
-        return 1;
-    }
-    binop = (prec & 2) >> 1;
-    for (;;)
-    {
-#ifdef  DEBUG_EVAL
-        fprintf( pCppOut, "op %s, prec %d., stacked op %s, prec %d, skip %d\n",
-        opname[op], prec, opname[opp->op], opp->prec, opp->skip);
-#endif
-        if (prec > opp->prec)
-        {
-            if (op == OP_LPA)
-                prec = OP_RPA_PREC;
-            else if (op == OP_QUE)
-                prec = OP_QUE_PREC;
-            op1 = opp->skip;        /* Save skip for test   */
-            /*
-             * Push operator onto op. stack.
-             */
-            opp++;
-            if (opp >= &opstack[NEXP])
-            {
-                cerror("expression stack overflow at op \"%s\"",
-                       opname[op]);
-                return 1;
-            }
-            opp->op = (char)op;
-            opp->prec = (char)prec;
-            /*
-             * Do the short-circuit stuff here.  Short-circuiting
-             * stops automagically when operators are evaluated.
-             */
-            if ((op == OP_ANA && valp[-1] == 0) ||
-                (op == OP_ORO && valp[-1] != 0))
-            {
-                opp->skip = S_ANDOR;    /* And/or skip starts   */
-            }
-            else if (op == OP_QUE)      /* Start of ?: operator */
-                opp->skip = (char)((op1 & S_ANDOR) | ((valp[-1] == 0) ? S_QUEST : 0));
-            else if (op == OP_COL)      /* : inverts S_QUEST    */
-            {
-                opp->skip = (char)((op1 & S_ANDOR)
-                                   | (((op1 & S_QUEST) != 0) ? 0 : S_QUEST));
-            }
-            else                 /* Other ops leave  */
-            {
-                opp->skip = (char)op1;      /*  skipping unchanged. */
-            }
-#ifdef  DEBUG_EVAL
-            fprintf( pCppOut, "stacking %s, valp[-1] == %d at %s",
-                     opname[op], valp[-1], infile->bptr);
-            dumpstack(opstack, opp, value, valp);
-#endif
-            goto again;
-        }
-        /*
-         * Pop operator from op. stack and evaluate it.
-         * End of stack and '(' are specials.
-         */
-        skip = opp->skip;           /* Remember skip value  */
-        switch ((op1 = opp->op))    /* Look at stacked op   */
-        {
-        case OP_END:                /* Stack end marker */
-            if (op == OP_EOE)
-                return valp[-1];    /* Finished ok.     */
-            goto again;             /* Read another op. */
-
-        case OP_LPA:                /* ( on stack       */
-            if (op != OP_RPA)       /* Matches ) on input   */
-            {
-                cerror("unbalanced paren's, op is \"%s\"", opname[op]);
-                return 1;
-            }
-            opp--;                  /* Unstack it       */
-            /* goto again;          -- Fall through     */
-
-        case OP_QUE:
-            goto again;             /* Evaluate true expr.  */
-
-        case OP_COL:                /* : on stack.      */
-            opp--;                  /* Unstack :        */
-            if (opp->op != OP_QUE)  /* Matches ? on stack?  */
-            {
-                cerror("Misplaced '?' or ':', previous operator is %s",
-                       opname[(int)opp->op]);
-                return 1;
-            }
-            /* fall through */
-        /*
-         * Evaluate op1.
-         */
-        default:                /* Others:      */
-            opp--;              /* Unstack the operator */
-#ifdef  DEBUG_EVAL
-            fprintf( pCppOut, "Stack before evaluation of %s\n", opname[op1]);
-            dumpstack(opstack, opp, value, valp);
-#endif
-            valp = evaleval(valp, op1, skip);
-#ifdef  DEBUG_EVAL
-            fprintf( pCppOut, "Stack after evaluation\n");
-            dumpstack(opstack, opp, value, valp);
-#endif
-        }                   /* op1 switch end   */
-    }                   /* Stack unwind loop    */
-}
-
-/*
- * Return next eval operator or value.  Called from eval().  It
- * calls a special-purpose routines for 'char' strings and
- * numeric values:
- * evalchar called to evaluate 'x'
- * evalnum  called to evaluate numbers.
- */
-static int evallex(int skip)
-{
-    int c;
-    int c1;
-    int t;
-
-again:
-    do                              /* Collect the token    */
-    {
-        c = skipws();
-        if ((c = macroid(c)) == EOF_CHAR || c == '\n')
-        {
-            unget();
-            return OP_EOE;          /* End of expression    */
-        }
-    }
-    while ((t = type[c]) == LET && catenate());
-    if (t == INV)                   /* Total nonsense   */
-    {
-        if (!skip)
-        {
-            if (isascii(c) && isprint(c))
-                cierror("illegal character '%c' in #if", c);
-            else
-                cierror("illegal character (%d decimal) in #if", c);
-        }
-        return OP_FAIL;
-    }
-    else if (t == QUO)              /* ' or "       */
-    {
-        if (c == '\'')              /* Character constant   */
-        {
-            evalue = evalchar(skip);    /* Somewhat messy   */
-#ifdef  DEBUG_EVAL
-            fprintf( pCppOut, "evalchar returns %d.\n", evalue);
-#endif
-            return DIG;           /* Return a value   */
-        }
-        cerror("Can't use a string in an #if", NULLST);
-        return OP_FAIL;
-    }
-    else if (t == LET)              /* ID must be a macro   */
-    {
-        if (streq(token, "defined"))  /* Or defined name  */
-        {
-            c1 = c = skipws();
-            if (c == '(')           /* Allow defined(name)  */
-                c = skipws();
-            if (type[c] == LET)
-            {
-                evalue = (lookid(c) != NULL);
-                if (c1 != '(' ||      /* Need to balance  */
-                    skipws() == ')')    /* Did we balance?  */
-                {
-                    return DIG;       /* Parsed ok        */
-                }
-            }
-            cerror("Bad #if ... defined() syntax", NULLST);
-            return OP_FAIL;
-        }
-        else if (streq(token, "sizeof"))    /* New sizeof hackery   */
-            return dosizeof();        /* Gets own routine */
-        /*
-         * The Draft ANSI C Standard says that an undefined symbol
-         * in an #if has the value zero.  We are a bit pickier,
-         * warning except where the programmer was careful to write
-         *      #if defined(foo) ? foo : 0
-         */
-#ifdef STRICT_UNDEF
-        if (!skip)
-            cwarn("undefined symbol \"%s\" in #if, 0 used", token);
-#endif
-        evalue = 0;
-        return DIG;
-    }
-    else if (t == DIG)              /* Numbers are harder   */
-    {
-        evalue = evalnum(c);
-#ifdef  DEBUG_EVAL
-        fprintf( pCppOut, "evalnum returns %d.\n", evalue);
-#endif
-    }
-    else if (strchr("!=<>&|\\", c) != NULL)
-    {
-        /*
-         * Process a possible multi-byte lexeme.
-         */
-        c1 = cget();                /* Peek at next char    */
-        switch (c)
-        {
-        case '!':
-            if (c1 == '=')
-                return OP_NE;
-            break;
-
-        case '=':
-            if (c1 != '=')          /* Can't say a=b in #if */
-            {
-                unget();
-                cerror("= not allowed in #if", NULLST);
-                return OP_FAIL;
-            }
-            return OP_EQ;
-
-        case '>':
-        case '<':
-            if (c1 == c)
-                return ((c == '<') ? OP_ASL : OP_ASR);
-            else if (c1 == '=')
-                return ((c == '<') ? OP_LE  : OP_GE);
-            break;
-
-        case '|':
-        case '&':
-            if (c1 == c)
-                return ((c == '|') ? OP_ORO : OP_ANA);
-            break;
-
-        case '\\':
-            if (c1 == '\n')         /* Multi-line if    */
-                goto again;
-            cerror("Unexpected \\ in #if", NULLST);
-            return OP_FAIL;
-        }
-        unget();
-    }
-    return t;
-}
-
-/*
- * Process the sizeof (basic type) operation in an #if string.
- * Sets evalue to the size and returns
- *  DIG     success
- *  OP_FAIL     bad parse or something.
- */
-static int dosizeof(void)
-{
-    int c;
-    TYPES* tp;
-    SIZES* sizp;
-    short* testp;
-    short typecode;
-
-    if ((c = skipws()) != '(')
-        goto nogood;
-    /*
-     * Scan off the tokens.
-     */
-    typecode = 0;
-    while (0 != (c = skipws()))
-    {
-        if ((c = macroid(c)) == EOF_CHAR || c == '\n')
-            goto nogood;            /* End of line is a bug */
-        else if (c == '(')          /* thing (*)() func ptr */
-        {
-            if (skipws() == '*' && skipws() == ')')
-            {                       /* We found (*)     */
-                if (skipws() != '(')    /* Let () be optional   */
-                    unget();
-                else if (skipws() != ')')
-                    goto nogood;
-                typecode |= T_FPTR; /* Function pointer */
-            }
-            else                    /* Junk is a bug    */
-                goto nogood;
-        }
-        else if (type[c] != LET)    /* Exit if not a type   */
-            break;
-        else if (!catenate())       /* Maybe combine tokens */
-        {
-            /*
-             * Look for this unexpandable token in basic_types.
-             * The code accepts "int long" as well as "long int"
-             * which is a minor bug as bugs go (and one shared with
-             * a lot of C compilers).
-             */
-            for (tp = basic_types; tp->name != NULLST; tp++)
-            {
-                if (streq(token, tp->name))
-                    break;
-            }
-            if (tp->name == NULLST)
-            {
-                cerror("#if sizeof, unknown type \"%s\"", token);
-                return OP_FAIL;
-            }
-            typecode |= tp->type;   /* Or in the type bit   */
-        }
-    }
-    /*
-     * We are at the end of the type scan.  Chew off '*' if necessary.
-     */
-    if (c == '*')
-    {
-        typecode |= T_PTR;
-        c = skipws();
-    }
-    if (c == ')')                   /* Last syntax check    */
-    {
-        for (testp = test_table; *testp != 0; testp++)
-        {
-            if (!bittest(typecode & *testp))
-            {
-                cerror("#if ... sizeof: illegal type combination", NULLST);
-                return OP_FAIL;
-            }
-        }
-        /*
-         * We assume that all function pointers are the same size:
-         *      sizeof (int (*)()) == sizeof (float (*)())
-         * We assume that signed and unsigned don't change the size:
-         *      sizeof (signed int) == (sizeof unsigned int)
-         */
-        if ((typecode & T_FPTR) != 0) /* Function pointer */
-            typecode = T_FPTR | T_PTR;
-        else                        /* Var or var * datum   */
-        {
-            typecode &= ~(T_SIGNED | T_UNSIGNED);
-            if ((typecode & (T_SHORT | T_LONG)) != 0)
-                typecode &= ~T_INT;
-        }
-        if ((typecode & ~T_PTR) == 0)
-        {
-            cerror("#if sizeof() error, no type specified", NULLST);
-            return OP_FAIL;
-        }
-        /*
-         * Exactly one bit (and possibly T_PTR) may be set.
-         */
-        for (sizp = size_table; sizp->bits != 0; sizp++)
-        {
-            if ((typecode & ~T_PTR) == sizp->bits)
-            {
-                evalue = ((typecode & T_PTR) != 0)
-                    ? sizp->psize : sizp->size;
-                return DIG;
-            }
-        }                   /* We shouldn't fail    */
-        cierror("#if ... sizeof: bug, unknown type code 0x%x", typecode);
-        return OP_FAIL;
-    }
-
-  nogood:
-    unget();
-    cerror("#if ... sizeof() syntax error", NULLST);
-    return OP_FAIL;
-}
-
-/*
- * TRUE if value is zero or exactly one bit is set in value.
- */
-static int bittest(int value)
-{
-/* whoaa!! really worried about non 2's complement machines...
- * but not at all about cross-compiling ?
- */
-#if (4096 & ~(-4096)) == 0
-    return ((value & ~(-value)) == 0);
-#else
-    /*
-     * Do it the hard way (for non 2's complement machines)
-     */
-    return (value == 0 || value ^ (value - 1) == (value * 2 - 1));
-#endif
-}
-
-/*
- * Expand number for #if lexical analysis.  Note: evalnum recognizes
- * the unsigned suffix, but only returns a signed int value.
- */
-static int evalnum(int c)
-{
-    int value;
-    int base;
-    int c1;
-
-    if (c != '0')
-        base = 10;
-    else if ((c = cget()) == 'x' || c == 'X')
-    {
-        base = 16;
-        c = cget();
-    }
-    else base = 8;
-    value = 0;
-    for (;;)
-    {
-        c1 = c;
-        if (isascii(c) && isupper(c1))
-            c1 = tolower(c1);
-        if (c1 >= 'a')
-            c1 -= ('a' - 10);
-        else
-            c1 -= '0';
-        if (c1 < 0 || c1 >= base)
-            break;
-        value *= base;
-        value += c1;
-        c = cget();
-    }
-    if (c == 'u' || c == 'U')            /* Unsigned nonsense */
-        cget();
-    unget();
-    return value;
-}
-
-/*
- * Get a character constant
- */
-static int evalchar(int skip)
-{
-    int c;
-    int value;
-    int count;
-
-    instring = TRUE;
-    if ((c = cget()) == '\\')
-    {
-        switch ((c = cget()))
-        {
-        case 'a':               /* New in Standard  */
-#if ('a' == '\a' || '\a' == ALERT)
-            value = ALERT;          /* Use predefined value */
-#else
-            value = '\a';           /* Use compiler's value */
-#endif
-            break;
-
-        case 'b':
-            value = '\b';
-            break;
-
-        case 'f':
-            value = '\f';
-            break;
-
-        case 'n':
-            value = '\n';
-            break;
-
-        case 'r':
-            value = '\r';
-            break;
-
-        case 't':
-            value = '\t';
-            break;
-
-        case 'v':               /* New in Standard  */
-#if ('v' == '\v' || '\v' == VT)
-            value = VT;         /* Use predefined value */
-#else
-            value = '\v';           /* Use compiler's value */
-#endif
-            break;
-
-        case 'x':               /* '\xFF'       */
-            count = 3;
-            value = 0;
-            while ((((c = get()) >= '0' && c <= '9') ||
-                    (c >= 'a' && c <= 'f') ||
-                    (c >= 'A' && c <= 'F')) &&
-                   (--count >= 0))
-            {
-                value *= 16;
-                value += (c - '0');
-            }
-            unget();
-            break;
-
-        default:
-            if (c >= '0' && c <= '7')
-            {
-                count = 3;
-                value = 0;
-                while (c >= '0' && c <= '7' && --count >= 0)
-                {
-                    value *= 8;
-                    value += (c - '0');
-                    c = get();
-                }
-                unget();
-            }
-            else value = c;
-            break;
-        }
-    }
-    else if (c == '\'')
-        value = 0;
-    else
-        value = c;
-    /*
-     * We warn on multi-byte constants and try to hack
-     * (big|little)endian machines.
-     */
-    while ((c = get()) != '\'' && c != EOF_CHAR && c != '\n')
-    {
-        if (!skip)
-            ciwarn("multi-byte constant '%c' isn't portable", c);
-        value <<= BITS_CHAR;
-        value += c;
-    }
-    instring = FALSE;
-    return value;
-}
-
-/*
- * Apply the argument operator to the data on the value stack.
- * One or two values are popped from the value stack and the result
- * is pushed onto the value stack.
- *
- * OP_COL is a special case.
- *
- * evaleval() returns the new pointer to the top of the value stack.
- */
-static int * evaleval(int* valp, int op, int skip)
-{
-    int v1;
-    int v2 = 0;
-
-    if (isbinary(op))
-        v2 = *--valp;
-    v1 = *--valp;
-#ifdef  DEBUG_EVAL
-    fprintf( pCppOut, "%s op %s", (isbinary(op)) ? "binary" : "unary",
-             opname[op]);
-    if (isbinary(op))
-        fprintf( pCppOut, ", v2 = %d.", v2);
-    fprintf( pCppOut, ", v1 = %d.\n", v1);
-#endif
-    switch (op)
-    {
-    case OP_EOE:
-        break;
-
-    case OP_ADD:
-        v1 += v2;
-        break;
-
-    case OP_SUB:
-        v1 -= v2;
-        break;
-
-    case OP_MUL:
-        v1 *= v2;
-        break;
-
-    case OP_DIV:
-    case OP_MOD:
-        if (v2 == 0)
-        {
-            if (!skip)
-            {
-                cwarn("%s by zero in #if, zero result assumed",
-                      (op == OP_DIV) ? "divide" : "mod");
-            }
-            v1 = 0;
-        }
-        else if (op == OP_DIV)
-            v1 /= v2;
-        else
-            v1 %= v2;
-        break;
-
-    case OP_ASL:
-        v1 <<= v2;
-        break;
-
-    case OP_ASR:
-        v1 >>= v2;
-        break;
-
-    case OP_AND:
-        v1 &= v2;
-        break;
-
-    case OP_OR:
-        v1 |= v2;
-        break;
-
-    case OP_XOR:
-        v1 ^= v2;
-        break;
-
-    case OP_EQ:
-        v1 = (v1 == v2);
-        break;
-
-    case OP_NE:
-        v1 = (v1 != v2);
-        break;
-
-    case OP_LT:
-        v1 = (v1 < v2);
-        break;
-
-    case OP_LE:
-        v1 = (v1 <= v2);
-        break;
-
-    case OP_GE:
-        v1 = (v1 >= v2);
-        break;
-
-    case OP_GT:
-        v1 = (v1 > v2);
-        break;
-
-    case OP_ANA:
-        v1 = (v1 && v2);
-        break;
-
-    case OP_ORO:
-        v1 = (v1 || v2);
-        break;
-
-    case OP_COL:
-        /*
-         * v1 has the "true" value, v2 the "false" value.
-         * The top of the value stack has the test.
-         */
-        v1 = (*--valp) ? v1 : v2;
-        break;
-
-    case OP_NEG:
-        v1 = (-v1);
-        break;
-
-    case OP_PLU:
-        break;
-
-    case OP_COM:
-        v1 = ~v1;
-        break;
-
-    case OP_NOT:
-        v1 = !v1;
-        break;
-
-    default:
-        cierror("#if bug, operand = %d.", op);
-        v1 = 0;
-    }
-    *valp++ = v1;
-    return valp;
-}
-
-#ifdef  DEBUG_EVAL
-dumpstack(opstack, opp, value, valp)
-OPTAB   opstack[NEXP];  /* Operand stack        */
-OPTAB  *opp;            /* Operator stack       */
-int     value[NEXP];    /* Value stack          */
-int    *valp;           /* -> value vector      */
-{
-    fprintf( pCppOut, "index op prec skip name -- op stack at %s", infile->bptr);
-    while (opp > opstack)
-    {
-        fprintf( pCppOut, " [%2d] %2d  %03o    %d %s\n", opp - opstack,
-                 opp->op, opp->prec, opp->skip, opname[opp->op]);
-        opp--;
-    }
-    while (--valp >= value)
-    {
-        fprintf( pCppOut, "value[%d] = %d\n", (valp - value), *valp);
-    }
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
deleted file mode 100644
index 1f6bd68a44d3..000000000000
--- a/rsc/source/rscpp/cpp6.c
+++ /dev/null
@@ -1,1135 +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 <sal/types.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include "cppdef.h"
-#include "cpp.h"
-
-/*ER evaluate macros to pDefOut */
-
-/*
- * skipnl()     skips over input text to the end of the line.
- * skipws()     skips over "whitespace" (spaces or tabs), but
- *              not skip over the end of the line.  It skips over
- *              TOK_SEP, however (though that shouldn't happen).
- * scanid()     reads the next token (C identifier) into token[].
- *              The caller has already read the first character of
- *              the identifier.  Unlike macroid(), the token is
- *              never expanded.
- * macroid()    reads the next token (C identifier) into token[].
- *              If it is a #defined macro, it is expanded, and
- *              macroid() returns TRUE, otherwise, FALSE.
- * catenate()   Does the dirty work of token concatenation, TRUE if it did.
- * scanstring() Reads a string from the input stream, calling
- *              a user-supplied function for each character.
- *              This function may be output() to write the
- *              string to the output file, or save() to save
- *              the string in the work buffer.
- * scannumber() Reads a C numeric constant from the input stream,
- *              calling the user-supplied function for each
- *              character.  (output() or save() as noted above.)
- * save()       Save one character in the work[] buffer.
- * savestring() Saves a string in malloc() memory.
- * getfile()    Initialize a new FILEINFO structure, called when
- *              #include opens a new file, or a macro is to be
- *              expanded.
- * getmem()     Get a specified number of bytes from malloc memory.
- * output()     Write one character to stdout (calling PUTCHAR) --
- *              implemented as a function so its address may be
- *              passed to scanstring() and scannumber().
- * lookid()     Scans the next token (identifier) from the input
- *              stream.  Looks for it in the #defined symbol table.
- *              Returns a pointer to the definition, if found, or NULL
- *              if not present.  The identifier is stored in token[].
- * defnedel()   Define enter/delete subroutine.  Updates the
- *              symbol table.
- * get()        Read the next byte from the current input stream,
- *              handling end of (macro/file) input and embedded
- *              comments appropriately.  Note that the global
- *              instring is -- essentially -- a parameter to get().
- * cget()       Like get(), but skip over TOK_SEP.
- * unget()      Push last gotten character back on the input stream.
- * cerror(), cwarn(), cfatal(), cierror(), ciwarn()
- *              These routines format an print messages to the user.
- *              cerror & cwarn take a format and a single string argument.
- *              cierror & ciwarn take a format and a single int (char) argument.
- *              cfatal takes a format and a single string argument.
- */
-
-/*
- * This table must be rewritten for a non-Ascii machine.
- *
- * Note that several "non-visible" characters have special meaning:
- * Hex 1D DEF_MAGIC -- a flag to prevent #define recursion.
- * Hex 1E TOK_SEP   -- a delimiter for token concatenation
- * Hex 1F COM_SEP   -- a zero-width whitespace for comment concatenation
- */
-#if TOK_SEP != 0x1E || COM_SEP != 0x1F || DEF_MAGIC != 0x1D
-        << error type table is not correct >>
-#endif
-
-#define DOL     LET
-
-
-char type[256] = {              /* Character type codes    Hex          */
-   END,   000,   000,   000,   000,   000,   000,   000, /* 00          */
-   000,   SPA,   000,   000,   000,   000,   000,   000, /* 08          */
-   000,   000,   000,   000,   000,   000,   000,   000, /* 10          */
-   000,   000,   000,   000,   000,   LET,   000,   SPA, /* 18          */
-   SPA,OP_NOT,   QUO,   000,   DOL,OP_MOD,OP_AND,   QUO, /* 20  !"#$%&' */
-OP_LPA,OP_RPA,OP_MUL,OP_ADD,   000,OP_SUB,   DOT,OP_DIV, /* 28 ()*+,-./ */
-   DIG,   DIG,   DIG,   DIG,   DIG,   DIG,   DIG,   DIG, /* 30 01234567 */
-   DIG,   DIG,OP_COL,   000, OP_LT, OP_EQ, OP_GT,OP_QUE, /* 38 89:;<=>? */
-   000,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 40 @ABCDEFG */
-   LET,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 48 HIJKLMNO */
-   LET,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 50 PQRSTUVW */
-   LET,   LET,   LET,   000,   BSH,   000,OP_XOR,   LET, /* 58 XYZ[\]^_ */
-   000,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 60 `abcdefg */
-   LET,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 68 hijklmno */
-   LET,   LET,   LET,   LET,   LET,   LET,   LET,   LET, /* 70 pqrstuvw */
-   LET,   LET,   LET,   000, OP_OR,   000,OP_NOT,   000, /* 78 xyz{|}~  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-   000,   000,   000,   000,   000,   000,   000,   000, /*   80 .. FF  */
-};
-
-
-/*
- *                      C P P   S y m b o l   T a b l e s
- */
-
-/*
- * SBSIZE defines the number of hash-table slots for the symbol table.
- * It must be a power of 2.
- */
-#ifndef SBSIZE
-#define SBSIZE  64
-#endif
-#define SBMASK  (SBSIZE - 1)
-#if (SBSIZE ^ SBMASK) != ((SBSIZE * 2) - 1)
-        << error, SBSIZE must be a power of 2 >>
-#endif
-
-
-static DEFBUF   *symtab[SBSIZE];        /* Symbol table queue headers   */
-
-void InitCpp6()
-{
-    int i;
-    for( i = 0; i < SBSIZE; i++ )
-        symtab[ i ] = NULL;
-}
-
-
-
-/*
- * Skip to the end of the current input line.
- */
-void skipnl()
-{
-    int c;
-
-    do
-    {                            /* Skip to newline      */
-        c = get();
-    }
-    while (c != '\n' && c != EOF_CHAR);
-}
-
-/*
- * Skip over whitespace
- */
-int skipws()
-{
-    int            c;
-
-    do {                            /* Skip whitespace      */
-        c = get();
-    } while (type[c] == SPA);
-    return c;
-}
-
-/*
- * Get the next token (an id) into the token buffer.
- * Note: this code is duplicated in lookid().
- * Change one, change both.
- */
-void scanid(int c)
-{
-    char* bp;
-
-    if (c == DEF_MAGIC)                     /* Eat the magic token  */
-        c = get();                          /* undefiner.           */
-    bp = token;
-    do
-    {
-        if (bp < &token[IDMAX])             /* token dim is IDMAX+1 */
-            *bp++ = (char)c;
-        c = get();
-    }
-    while (type[c] == LET || type[c] == DIG);
-    unget();
-    *bp = EOS;
-}
-
-/*
- * If c is a letter, scan the id.  if it's #defined, expand it and scan
- * the next character and try again.
- *
- * Else, return the character.  If type[c] is a LET, the token is in token.
- */
-int macroid(int c)
-{
-    DEFBUF* dp;
-
-    if (infile != NULL && infile->fp != NULL)
-        recursion = 0;
-    while (type[c] == LET && (dp = lookid(c)) != NULL)
-    {
-        expand(dp);
-        c = get();
-    }
-    return c;
-}
-
-/*
- * A token was just read (via macroid).
- * If the next character is TOK_SEP, concatenate the next token
- * return TRUE -- which should recall macroid after refreshing
- * macroid's argument.  If it is not TOK_SEP, unget() the character
- * and return FALSE.
- */
-int catenate()
-{
-    int c;
-    char* token1;
-
-    if (get() != TOK_SEP)                   /* Token concatenation  */
-    {
-        unget();
-        return FALSE;
-    }
-    else
-    {
-        token1 = savestring(token);         /* Save first token     */
-        c = macroid(get());                 /* Scan next token      */
-        switch(type[c])                     /* What was it?         */
-        {
-        case LET:                           /* An identifier, ...   */
-            if (strlen(token1) + strlen(token) >= NWORK)
-                cfatal("work buffer overflow doing %s #", token1);
-            sprintf(work, "%s%s", token1, token);
-            break;
-
-        case DIG:                           /* A digit string       */
-            strcpy(work, token1);
-            workp = work + strlen(work);
-            do
-            {
-                save(c);
-            }
-            while ((c = get()) != TOK_SEP);
-            /*
-             * The trailing TOK_SEP is no longer needed.
-             */
-            save(EOS);
-            break;
-
-        default:                            /* An error, ...        */
-            if (isprint(c))
-                cierror("Strange character '%c' after #", c);
-            else
-                cierror("Strange character (%d.) after #", c);
-            strcpy(work, token1);
-            unget();
-            break;
-        }
-        /*
-         * work has the concatenated token and token1 has
-         * the first token (no longer needed).  Unget the
-         * new (concatenated) token after freeing token1.
-         * Finally, setup to read the new token.
-         */
-        free(token1);                       /* Free up memory       */
-        ungetstring(work);                  /* Unget the new thing, */
-        return TRUE;
-    }
-}
-
-/*
- * Scan off a string.  Warning if terminated by newline or EOF.
- * outfun() outputs the character -- to a buffer if in a macro.
- * TRUE if ok, FALSE if error.
- */
-int scanstring(int delim,
-#ifndef _NO_PROTO
-           void (*outfun)( int ) /* BP */    /* Output function              */
-#else
-           void (*outfun)() /* BP */
-#endif
-    )
-{
-    int c;
-
-    instring = TRUE;                /* Don't strip comments         */
-    (*outfun)(delim);
-    while ((c = get()) != delim &&
-           c != '\n' &&
-           c != EOF_CHAR)
-    {
-        if (c != DEF_MAGIC)
-            (*outfun)(c);
-        if (c == '\\')
-            (*outfun)(get());
-    }
-    instring = FALSE;
-    if (c == delim)
-    {
-        (*outfun)(c);
-        return TRUE;
-    }
-    else
-    {
-        cerror("Unterminated string", NULLST);
-        unget();
-        return FALSE;
-    }
-}
-
-/*
- * Process a number.  We know that c is from 0 to 9 or dot.
- * Algorithm from Dave Conroy's Decus C.
- */
-void scannumber(int c,
-#ifndef _NO_PROTO
-                void (*outfun)( int )  /* BP */    /* Output/store func    */
-#else
-                void (*outfun)() /* BP */
-#endif
-    )
-{
-    int radix;                              /* 8, 10, or 16         */
-    int expseen;                            /* 'e' seen in floater  */
-    int signseen;                           /* '+' or '-' seen      */
-    int octal89;                            /* For bad octal test   */
-    int dotflag;                            /* TRUE if '.' was seen */
-
-    expseen = FALSE;                        /* No exponent seen yet */
-    signseen = TRUE;                        /* No +/- allowed yet   */
-    octal89 = FALSE;                        /* No bad octal yet     */
-    radix = 10;                             /* Assume decimal       */
-    if ((dotflag = (c == '.')) != FALSE)    /* . something?         */
-    {
-        (*outfun)('.');                     /* Always out the dot   */
-        if (type[(c = get())] != DIG)       /* If not a float numb, */
-        {
-            unget();                        /* Rescan strange char  */
-            return;                         /* All done for now     */
-        }
-    }                                       /* End of float test    */
-    else if (c == '0')                      /* Octal or hex?        */
-    {
-        (*outfun)(c);                       /* Stuff initial zero   */
-        radix = 8;                          /* Assume it's octal    */
-        c = get();                          /* Look for an 'x'      */
-        if (c == 'x' || c == 'X')           /* Did we get one?      */
-        {
-            radix = 16;                     /* Remember new radix   */
-            (*outfun)(c);                   /* Stuff the 'x'        */
-            c = get();                      /* Get next character   */
-        }
-    }
-    for (;;)                                /* Process curr. char.  */
-    {
-        /*
-         * Note that this algorithm accepts "012e4" and "03.4"
-         * as legitimate floating-point numbers.
-         */
-        if (radix != 16 && (c == 'e' || c == 'E'))
-        {
-            if (expseen)                    /* Already saw 'E'?     */
-                break;                      /* Exit loop, bad nbr.  */
-            expseen = TRUE;                 /* Set exponent seen    */
-            signseen = FALSE;               /* We can read '+' now  */
-            radix = 10;                     /* Decimal exponent     */
-        }
-        else if (radix != 16 && c == '.')
-        {
-            if (dotflag)                    /* Saw dot already?     */
-                break;                      /* Exit loop, two dots  */
-            dotflag = TRUE;                 /* Remember the dot     */
-            radix = 10;                     /* Decimal fraction     */
-        }
-        else if (c == '+' || c == '-')      /* 1.0e+10              */
-        {
-            if (signseen)                   /* Sign in wrong place? */
-                break;                      /* Exit loop, not nbr.  */
-            /* signseen = TRUE; */          /* Remember we saw it   */
-        }
-        else                                /* Check the digit      */
-        {
-            switch (c)
-            {
-            case '8': case '9':             /* Sometimes wrong      */
-                octal89 = TRUE;             /* Do check later       */
-            case '0': case '1': case '2': case '3':
-            case '4': case '5': case '6': case '7':
-                break;                      /* Always ok            */
-
-            case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-            case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-                if (radix == 16)            /* Alpha's are ok only  */
-                    break;                  /* if reading hex.      */
-            default:                        /* At number end        */
-                goto done;                  /* Break from for loop  */
-            }                               /* End of switch        */
-        }                                   /* End general case     */
-        (*outfun)(c);                       /* Accept the character */
-        signseen = TRUE;                    /* Don't read sign now  */
-        c = get();                          /* Read another char    */
-    }                                       /* End of scan loop     */
-    /*
-     * When we break out of the scan loop, c contains the first
-     * character (maybe) not in the number.  If the number is an
-     * integer, allow a trailing 'L' for long and/or a trailing 'U'
-     * for unsigned.  If not those, push the trailing character back
-     * on the input stream.  Floating point numbers accept a trailing
-     * 'L' for "long double".
-     */
-  done:
-    if (dotflag || expseen)           /* Floating point?      */
-    {
-        if (c == 'l' || c == 'L')
-        {
-            (*outfun)(c);
-            get();                          /* Ungotten later       */
-        }
-    }
-    else                                    /* Else it's an integer */
-    {
-        /*
-         * We know that dotflag and expseen are both zero, now:
-         * dotflag signals "saw 'L'", and
-         * expseen signals "saw 'U'".
-         */
-        for (;;)
-        {
-            switch (c)
-            {
-            case 'l':
-            case 'L':
-                if (dotflag)
-                    goto nomore;
-                dotflag = TRUE;
-                break;
-
-            case 'u':
-            case 'U':
-                if (expseen)
-                    goto nomore;
-                expseen = TRUE;
-                break;
-
-            default:
-                goto nomore;
-            }
-            (*outfun)(c);                   /* Got 'L' or 'U'.      */
-            c = get();                      /* Look at next, too.   */
-        }
-    }
-  nomore:
-    unget();                                /* Not part of a number */
-    if (octal89 && radix == 8)
-        cwarn("Illegal digit in octal number", NULLST);
-}
-
-void save(int c)
-{
-    if (workp >= &work[NWORK])
-    {
-        work[NWORK-1] = '\0';
-        cfatal("Work buffer overflow:  %s", work);
-    }
-    else
-        *workp++ = (char)c;
-}
-
-/*
- * Store a string into free memory.
- */
-char* savestring(char* text)
-{
-    char* result;
-
-    size_t size = strlen(text) + 1;
-    result = getmem(size);
-    strcpy(result, text);
-    return result;
-}
-
-/*
- * Common FILEINFO buffer initialization for a new file or macro.
- */
-FILEINFO* getfile(size_t bufsize, char* name)
-{
-    FILEINFO* file;
-    size_t size;
-
-    size = strlen(name);                    /* File/macro name      */
-    file = (FILEINFO*) getmem(sizeof (FILEINFO) + bufsize + size);
-    file->parent = infile;                  /* Chain files together */
-    file->fp = NULL;                        /* No file yet          */
-    file->filename = savestring(name);      /* Save file/macro name */
-    file->progname = NULL;                  /* No #line seen yet    */
-    file->unrecur = 0;                      /* No macro fixup       */
-    file->bptr = file->buffer;              /* Initialize line ptr  */
-    file->buffer[0] = EOS;                  /* Force first read     */
-    file->line = 0;                         /* (Not used just yet)  */
-    if (infile != NULL)                     /* If #include file     */
-        infile->line = line;                /* Save current line    */
-    infile = file;                          /* New current file     */
-    line = 1;                               /* Note first line      */
-    return file;                            /* All done.            */
-}
-
-/*
- * Get a block of free memory.
- */
-char* getmem(size_t size)
-{
-    char* result;
-
-    if ((result = malloc((unsigned) size)) == NULL)
-        cfatal("Out of memory", NULLST);
-    return result;
-}
-
-/*
- * Look for the next token in the symbol table.  Returns token in "token".
- * If found, returns the table pointer;  Else returns NULL.
- */
-DEFBUF* lookid(int c)
-{
-    int nhash;
-    DEFBUF* dp;
-    char* np;
-    int temp = 0;
-    int isrecurse;      /* For #define foo foo  */
-
-    np = token;
-    nhash = 0;
-    if (0 != (isrecurse = (c == DEF_MAGIC)))/* If recursive macro   */
-        c = get();                          /* hack, skip DEF_MAGIC */
-    do
-    {
-        if (np < &token[IDMAX])             /* token dim is IDMAX+1 */
-        {
-            *np++ = (char)c;                /* Store token byte     */
-            nhash += c;                     /* Update hash value    */
-        }
-        c = get();                          /* And get another byte */
-    }
-    while (type[c] == LET || type[c] == DIG);
-    unget();                                /* Rescan terminator    */
-    *np = EOS;                              /* Terminate token      */
-    if (isrecurse)                          /* Recursive definition */
-        return NULL;                        /* undefined just now   */
-    nhash += (np - token);                  /* Fix hash value       */
-    dp = symtab[nhash & SBMASK];            /* Starting bucket      */
-    while (dp != (DEFBUF*) NULL)           /* Search symbol table  */
-    {
-        if (dp->hash == nhash &&            /* Fast precheck        */
-            (temp = strcmp(dp->name, token)) >= 0)
-        {
-            break;
-        }
-        dp = dp->link;                      /* Nope, try next one   */
-    }
-    return ((temp == 0) ? dp : NULL);
-}
-
-/*
- * Enter this name in the lookup table (delete = FALSE)
- * or delete this name (delete = TRUE).
- * Returns a pointer to the define block (delete = FALSE)
- * Returns NULL if the symbol wasn't defined (delete = TRUE).
- */
-DEFBUF* defendel(char* name, int delete)
-{
-    DEFBUF* dp;
-    DEFBUF** prevp;
-    char* np;
-    int nhash;
-    int temp=0;
-    int size;
-
-    for (nhash = 0, np = name; *np != EOS;)
-        nhash += *np++;
-    size = (np - name);
-    nhash += size;
-    prevp = &symtab[nhash & SBMASK];
-    while ((dp = *prevp) != (DEFBUF*) NULL)
-    {
-        if (dp->hash == nhash &&
-            (temp = strcmp(dp->name, name)) >= 0)
-        {
-            if (temp > 0)
-                dp = NULL;                  /* Not found            */
-            else
-            {
-                *prevp = dp->link;          /* Found, unlink and    */
-                if (dp->repl != NULL)       /* Free the replacement */
-                    free(dp->repl);         /* if any, and then     */
-                free((char*) dp);          /* Free the symbol      */
-                dp = NULL;
-            }
-            break;
-        }
-        prevp = &dp->link;
-    }
-    if (!delete)
-    {
-        dp = (DEFBUF*) getmem(sizeof (DEFBUF) + size + 1);
-        dp->link = *prevp;
-        *prevp = dp;
-        dp->hash = nhash;
-        dp->repl = NULL;
-        dp->nargs = 0;
-        strcpy(dp->name, name);
-    }
-    return dp;
-}
-
-#if OSL_DEBUG_LEVEL > 1
-
-void dumpdef(char* why)
-{
-    DEFBUF* dp;
-    DEFBUF** syp;
-    FILE* pRememberOut = NULL;
-
-    if ( bDumpDefs )    /*ER */
-    {
-        pRememberOut = pCppOut;
-        pCppOut = pDefOut;
-    }
-    fprintf( pCppOut, "CPP symbol table dump %s\n", why);
-    for (syp = symtab; syp < &symtab[SBSIZE]; syp++)
-    {
-        if ((dp = *syp) != (DEFBUF*) NULL)
-        {
-            fprintf( pCppOut, "symtab[%" SAL_PRI_PTRDIFFT "d]\n", (syp - symtab));
-            do
-            {
-                dumpadef((char*) NULL, dp);
-            }
-            while ((dp = dp->link) != (DEFBUF*) NULL);
-        }
-    }
-    if ( bDumpDefs )
-    {
-        fprintf( pCppOut, "\n");
-        pCppOut = pRememberOut;
-    }
-}
-
-void dumpadef(char* why, DEFBUF* dp)
-{
-    char* cp;
-    int c;
-    FILE* pRememberOut = NULL;
-
-/*ER dump #define's to pDefOut */
-    if ( bDumpDefs )
-    {
-        pRememberOut = pCppOut;
-        pCppOut = pDefOut;
-    }
-    fprintf( pCppOut, " \"%s\" [%d]", dp->name, dp->nargs);
-    if (why != NULL)
-        fprintf( pCppOut, " (%s)", why);
-    if (dp->repl != NULL)
-    {
-        fprintf( pCppOut, " => ");
-        for (cp = dp->repl; (c = *cp++ & 0xFF) != EOS;)
-        {
-#ifdef SOLAR
-            if (c == DEL)
-            {
-                c = *cp++ & 0xFF;
-                if( c == EOS ) break;
-                fprintf( pCppOut, "<%%%d>", c - MAC_PARM);
-            }
-#else
-            if (c >= MAC_PARM && c <= (MAC_PARM + PAR_MAC))
-                fprintf( pCppOut, "<%%%d>", c - MAC_PARM);
-#endif
-            else if (isprint(c) || c == '\n' || c == '\t')
-                PUTCHAR(c);
-            else if (c < ' ')
-                fprintf( pCppOut, "<^%c>", c + '@');
-            else
-                fprintf( pCppOut, "<\\0%o>", c);
-        }
-/*ER evaluate macros to pDefOut */
-#ifdef EVALDEFS
-        if ( bDumpDefs && !bIsInEval && dp->nargs <= 0 )
-        {
-            FILEINFO* infileSave = infile;
-            char* tokenSave = savestring( token );
-            char* workSave = savestring( work );
-            int lineSave = line;
-            int wronglineSave = wrongline;
-            int recursionSave = recursion;
-            FILEINFO* file;
-            EVALTYPE valEval;
-
-            bIsInEval = 1;
-            infile = NULL;          /* start from scrap */
-            line = 0;
-            wrongline = 0;
-            *token = EOS;
-            *work = EOS;
-            recursion = 0;
-            file = getfile( strlen( dp->repl ), dp->name );
-            strcpy( file->buffer, dp->repl );
-            fprintf( pCppOut, " ===> ");
-            nEvalOff = 0;
-            cppmain();              /* get() frees also *file */
-            valEval = 0;
-            if ( 0 == evaluate( EvalBuf, &valEval ) )
-            {
-#ifdef EVALFLOATS
-                if ( valEval != (EVALTYPE)((long)valEval ) )
-                    fprintf( pCppOut, " ==eval=> %f", valEval );
-                else
-#endif
-                    fprintf( pCppOut, " ==eval=> %ld", (long)valEval );
-            }
-            recursion = recursionSave;
-            wrongline = wronglineSave;
-            line = lineSave;
-            strcpy( work, workSave );
-            free( workSave );
-            strcpy( token, tokenSave );
-            free( tokenSave );
-            infile = infileSave;
-            bIsInEval = 0;
-        }
-#endif
-    }
-    else
-    {
-        fprintf( pCppOut, ", no replacement.");
-    }
-    PUTCHAR('\n');
-    if ( bDumpDefs )
-        pCppOut = pRememberOut;
-}
-#endif
-
-/*
- *                      G E T
- */
-
-/*
- * Return the next character from a macro or the current file.
- * Handle end of file from #include files.
- */
-int get()
-{
-    int c;
-    FILEINFO* file;
-    int popped;         /* Recursion fixup      */
-
-    popped = 0;
-  get_from_file:
-    if ((file = infile) == NULL)
-        return EOF_CHAR;
-  newline:
-
-    /*
-     * Read a character from the current input line or macro.
-     * At EOS, either finish the current macro (freeing temp.
-     * storage) or read another line from the current input file.
-     * At EOF, exit the current file (#include) or, at EOF from
-     * the cpp input file, return EOF_CHAR to finish processing.
-     */
-    if ((c = *file->bptr++ & 0xFF) == EOS)
-    {
-        /*
-         * Nothing in current line or macro.  Get next line (if
-         * input from a file), or do end of file/macro processing.
-         * In the latter case, jump back to restart from the top.
-         */
-        if (file->fp == NULL)               /* NULL if macro        */
-        {
-            popped++;
-            recursion -= file->unrecur;
-            if (recursion < 0)
-                recursion = 0;
-            infile = file->parent;          /* Unwind file chain    */
-        }
-        else                                /* Else get from a file */
-        {
-            if ((file->bptr = fgets(file->buffer, NBUFF, file->fp)) != NULL)
-            {
-#if OSL_DEBUG_LEVEL > 1
-                if (debug > 1)              /* Dump it to stdout    */
-                {
-                    fprintf( pCppOut, "\n#line %d (%s), %s",
-                             line, file->filename, file->buffer);
-                }
-#endif
-                goto newline;               /* process the line     */
-            }
-            else
-            {
-                if( file->fp != stdin )
-                    fclose(file->fp);           /* Close finished file  */
-                if ((infile = file->parent) != NULL)
-                {
-                    /*
-                     * There is an "ungotten" newline in the current
-                     * infile buffer (set there by doinclude() in
-                     * cpp1.c).  Thus, we know that the mainline code
-                     * is skipping over blank lines and will do a
-                     * #line at its convenience.
-                     */
-                    wrongline = TRUE;       /* Need a #line now     */
-                }
-            }
-        }
-        /*
-         * Free up space used by the (finished) file or macro and
-         * restart input from the parent file/macro, if any.
-         */
-        free(file->filename);               /* Free name and        */
-        if (file->progname != NULL)         /* if a #line was seen, */
-            free(file->progname);           /* free it, too.        */
-        free((char*) file);                /* Free file space      */
-        if (infile == NULL)                 /* If at end of file    */
-            return EOF_CHAR;                /* Return end of file   */
-        line = infile->line;                /* Reset line number    */
-        goto get_from_file;                 /* Get from the top.    */
-    }
-    /*
-     * Common processing for the new character.
-     */
-    if (c == DEF_MAGIC && file->fp != NULL) /* Don't allow delete   */
-        goto newline;                       /* from a file          */
-    if (file->parent != NULL)               /* Macro or #include    */
-    {
-        if (popped != 0)
-            file->parent->unrecur += popped;
-        else
-        {
-            recursion -= file->parent->unrecur;
-            if (recursion < 0)
-                recursion = 0;
-            file->parent->unrecur = 0;
-        }
-    }
-#if (HOST == SYS_UNIX)
-    if (c == '\r')
-        return get();                       /* DOS fuck             */
-#endif
-    if (c == '\n')                          /* Maintain current     */
-        ++line;                             /* line counter         */
-    if (instring)                           /* Strings just return  */
-        return c;                           /* the character.       */
-    else if (c == '/')                      /* Comment?             */
-    {
-        instring = TRUE;                    /* So get() won't loop  */
-
-        c = get();
-        if ((c != '*') && (c != '/'))       /* Next byte '*'?       */
-        {
-            instring = FALSE;               /* Nope, no comment     */
-            unget();                        /* Push the char. back  */
-            return '/';                     /* Return the slash     */
-        }
-        if (keepcomments)                   /* If writing comments  */
-        {
-            PUTCHAR('/');                   /* Write out the        */
-            /*   initializer        */
-            if( '*' == c )
-                PUTCHAR('*');
-            else
-                PUTCHAR('/');
-        }
-        if( '*' == c )
-        {
-            for (;;)                         /* Eat a comment        */
-            {
-                c = get();
-              test:
-                if (keepcomments && c != EOF_CHAR)
-                    cput(c);
-                switch (c)
-                {
-                case EOF_CHAR:
-                    cerror("EOF in comment", NULLST);
-                    return EOF_CHAR;
-
-                case '/':
-                    if ((c = get()) != '*')     /* Don't let comments   */
-                        goto test;              /* Nest.                */
-#ifdef STRICT_COMMENTS
-                    cwarn("Nested comments", NULLST);
-#endif
-                    /* fall through *//* into * stuff */
-                case '*':
-                    if ((c = get()) != '/')     /* If comment doesn't   */
-                        goto test;              /* end, look at next    */
-                    instring = FALSE;           /* End of comment,      */
-                    if (keepcomments)           /* Put out the comment  */
-                    {
-                        cput(c);                /* terminator, too      */
-                    }
-                    /*
-                     * A comment is syntactically "whitespace" --
-                     * however, there are certain strange sequences
-                     * such as
-                     *          #define foo(x)  (something)
-                     *                  foo|* comment *|(123)
-                     *       these are '/' ^           ^
-                     * where just returning space (or COM_SEP) will cause
-                     * problems.  This can be "fixed" by overwriting the
-                     * '/' in the input line buffer with ' ' (or COM_SEP)
-                     * but that may mess up an error message.
-                     * So, we peek ahead -- if the next character is
-                     * "whitespace" we just get another character, if not,
-                     * we modify the buffer.  All in the name of purity.
-                     */
-                    if (*file->bptr == '\n' || type[*file->bptr & 0xFF] == SPA)
-                        goto newline;
-                    return (file->bptr[-1] = ' ');
-
-                case '\n':                      /* we'll need a #line   */
-                    if (!keepcomments)
-                        wrongline = TRUE;       /* later...             */
-                default:                        /* Anything else is     */
-                    break;                      /* Just a character     */
-                }                               /* End switch           */
-            }                                   /* End comment loop     */
-        }
-        else                                    /* c++ comment          */
-        {
-            for (;;)                            /* Eat a comment        */
-            {
-                c = get();
-                if (keepcomments && c != EOF_CHAR)
-                    cput(c);
-                if( EOF_CHAR == c )
-                    return EOF_CHAR;
-                else if( '\n' == c )
-                {
-                    instring = FALSE;           /* End of comment,      */
-                    return c;
-                }
-            }
-        }
-    }                                       /* End if in comment    */
-    else if (!inmacro && c == '\\')         /* If backslash, peek   */
-    {
-        if ((c = get()) == '\n')            /* for a <nl>.  If so,  */
-        {
-            wrongline = TRUE;
-            goto newline;
-        }
-        else                                /* Backslash anything   */
-        {
-            unget();                        /* Get it later         */
-            return '\\';                    /* Return the backslash */
-        }
-    }
-    else if (c == '\f' || c == VT)          /* Form Feed, Vertical  */
-    {
-        c = ' ';                            /* Tab are whitespace   */
-    }
-    else if (c == 0xef)                     /* eat up UTF-8 BOM */
-    {
-        if((c = get()) == 0xbb)
-        {
-            if((c = get()) == 0xbf)
-            {
-                c = get();
-                return c;
-            }
-            else
-            {
-                unget();
-                unget();
-                return 0xef;
-            }
-        }
-        else
-        {
-            unget();
-            return 0xef;
-        }
-    }
-    return c;                             /* Just return the char */
-}
-
-/*
- * Backup the pointer to reread the last character.  Fatal error
- * (code bug) if we backup too far.  unget() may be called,
- * without problems, at end of file.  Only one character may
- * be ungotten.  If you need to unget more, call ungetstring().
- */
-void unget()
-{
-    FILEINFO* file;
-
-    if ((file = infile) == NULL)
-        return;                     /* Unget after EOF              */
-    if (--file->bptr < file->buffer)
-        cfatal("Too much pushback", NULLST);
-    if (*file->bptr == '\n')        /* Ungetting a newline?         */
-        --line;                     /* Unget the line number, too   */
-}
-
-/*
- * Push a string back on the input stream.  This is done by treating
- * the text as if it were a macro.
- */
-void ungetstring(char* text)
-{
-    FILEINFO* file;
-    file = getfile(strlen(text) + 1, "");
-    strcpy(file->buffer, text);
-}
-
-/*
- * Get one character, absorb "funny space" after comments or
- * token concatenation
- */
-int cget()
-{
-    int c;
-
-    do
-    {
-        c = get();
-    }
-    while (c == TOK_SEP);
-    return c;
-}
-
-/*
- * Error messages and other hacks.  The first byte of severity
- * is 'S' for string arguments and 'I' for int arguments.  This
- * is needed for portability with machines that have int's that
- * are shorter than  char *'s.
- */
-
-/*
- * Print filenames, macro names, and line numbers for error messages.
- */
-static void domsg(char* severity, char* format, void* arg)
-{
-    char* tp;
-    FILEINFO* file;
-
-    fprintf(stderr, "%sline %d, %s: ", MSG_PREFIX, line, &severity[1]);
-    if (*severity == 'S')
-        fprintf(stderr, format, (char*)arg);
-    else
-        fprintf(stderr, format, *((int*)arg) );
-    putc('\n', stderr);
-    if ((file = infile) == NULL)
-        return;                             /* At end of file       */
-    if (file->fp != NULL)
-    {
-        tp = file->buffer;                  /* Print current file   */
-        fprintf(stderr, "%s", tp);          /* name, making sure    */
-        if (tp[strlen(tp) - 1] != '\n')     /* there's a newline    */
-            putc('\n', stderr);
-    }
-    while ((file = file->parent) != NULL)   /* Print #includes, too */
-    {
-        if (file->fp == NULL)
-            fprintf(stderr, "from macro %s\n", file->filename);
-        else
-        {
-            tp = file->buffer;
-            fprintf(stderr, "from file %s, line %d:\n%s",
-                    (file->progname != NULL)
-                    ? file->progname : file->filename,
-                    file->line, tp);
-            if (tp[strlen(tp) - 1] != '\n')
-                putc('\n', stderr);
-        }
-    }
-}
-
-/*
- * Print a normal error message, string argument.
- */
-void cerror(char* format, char* sarg)
-{
-    domsg("SError", format, sarg);
-    errors++;
-}
-
-/*
- * Print a normal error message, numeric argument.
- */
-void cierror(char* format, int narg)
-{
-    domsg("IError", format, &narg);
-    errors++;
-}
-
-/*
- * A real disaster
- */
-void cfatal(char* format, char* sarg)
-{
-    domsg("SFatal error", format, sarg);
-    exit(IO_ERROR);
-}
-
-/*
- * A non-fatal error, string argument.
- */
-void cwarn(char* format, char* sarg)
-{
-    domsg("SWarning", format, sarg);
-}
-
-/*
- * A non-fatal error, numeric argument.
- */
-void ciwarn(char* format, int narg)
-{
-    domsg("IWarning", format, &narg);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
deleted file mode 100644
index 32d35a87d252..000000000000
--- a/rsc/source/rscpp/cppdef.h
+++ /dev/null
@@ -1,178 +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_RSC_SOURCE_RSCPP_CPPDEF_H
-#define INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H
-
-/*
- * This redundant definition of TRUE and FALSE works around
- * a limitation of Decus C.
- */
-#ifndef TRUE
-#define TRUE                    1
-#define FALSE                   0
-#endif
-
-/*
- * Define the HOST operating system.  This is needed so that
- * cpp can use appropriate filename conventions.
- */
-#define SYS_UNKNOWN             0
-#define SYS_UNIX                1
-
-#ifndef HOST
-#ifdef  unix
-#define HOST                    SYS_UNIX
-#else
-#endif
-#endif
-
-#ifndef HOST
-#define HOST                    SYS_UNKNOWN
-#endif
-
-/*
- * We assume that the target is the same as the host system
- */
-#ifndef TARGET
-#define TARGET                  HOST
-#endif
-
-/*
- * In order to predefine machine-dependent constants,
- * several strings are defined here:
- *
- * MACHINE      defines the target cpu (by name)
- * SYSTEM       defines the target operating system
- * COMPILER     defines the target compiler
- *
- *      The above may be #defined as "" if they are not wanted.
- *      They should not be #defined as NULL.
- *
- * LINE_PREFIX  defines the # output line prefix, if not "line"
- *              This should be defined as "" if cpp is to replace
- *              the "standard" C pre-processor.
- *
- * OK_DATE      Predefines the compilation date if set TRUE.
- *              Not permitted by the Nov. 12, 1984 Draft Standard.
- *
- * S_CHAR etc.  Define the sizeof the basic TARGET machine word types.
- *              By default, sizes are set to the values for the HOST
- *              computer.  If this is inappropriate, see the code in
- *              cpp3.c for details on what to change.  Also, if you
- *              have a machine where sizeof (signed int) differs from
- *              sizeof (unsigned int), you will have to edit code and
- *              tables in cpp3.c (and extend the -S option definition.)
- *
- * CPP_LIBRARY  May be defined if you have a site-specific include directory
- *              which is to be searched *before* the operating-system
- *              specific directories.
- */
-
-#if     TARGET == SYS_UNIX
-#define SYSTEM                  "unix"
-#endif
-
-/*
- * defaults
- */
-
-#ifndef MSG_PREFIX
-#define MSG_PREFIX              "cpp: "
-#endif
-
-#ifndef LINE_PREFIX
-#define LINE_PREFIX             ""
-#endif
-
-/*
- * RECURSION_LIMIT may be set to -1 to disable the macro recursion test.
- */
-#ifndef RECURSION_LIMIT
-#define RECURSION_LIMIT 1000
-#endif
-
-/*
- * BITS_CHAR may be defined to set the number of bits per character.
- * it is needed only for multi-byte character constants.
- */
-#ifndef BITS_CHAR
-#define BITS_CHAR               8
-#endif
-
-/*
- * OK_DATE may be enabled to predefine today's date as a string
- * at the start of each compilation.  This is apparently not permitted
- * by the Draft Ansi Standard.
- */
-#ifndef OK_DATE
-#define OK_DATE         TRUE
-#endif
-
-/*
- * The following definitions are used to allocate memory for
- * work buffers.  In general, they should not be modified
- * by implementors.
- *
- * PAR_MAC      The maximum number of #define parameters (31 per Standard)
- *              Note: we need another one for strings.
- * IDMAX        The longest identifier, 31 per Ansi Standard
- * NBUFF        Input buffer size
- * NWORK        Work buffer size -- the longest macro
- *              must fit here after expansion.
- * NEXP         The nesting depth of #if expressions
- * NINCLUDE     The number of directories that may be specified
- *              on a per-system basis, or by the -I option.
- * BLK_NEST     The number of nested #if's permitted.
- * NFWORK       FileNameWorkBuffer (added by erAck, was NWORK)
- */
-
-#ifndef IDMAX
-#define IDMAX                    127
-#endif
-#ifdef SOLAR
-#define PAR_MAC           (253 + 1)
-#else
-#define PAR_MAC            (31 + 1)
-#endif
-/*
- * NWORK increased due to large macros in *.src,
- * added a proper bunch right away, because we are soon going to have 10 languages.
- */
-#define NWORK                   128000
-#define NBUFF                   NWORK
-#define NFWORK                  1024
-#define NEXP                    128
-#define NINCLUDE        100
-#define NPARMWORK               (NWORK * 2)
-#define BLK_NEST                32
-
-
-#ifndef ALERT
-#define ALERT                   '\007'          /* '\a' is "Bell"       */
-#endif
-
-#ifndef VT
-#define VT                      '\013'          /* Vertical Tab CTRL/K  */
-#endif
-
-
-#endif // INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
deleted file mode 100644
index f081773344cc..000000000000
--- a/rsc/source/tools/rscchar.cxx
+++ /dev/null
@@ -1,172 +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 <stdio.h>
-#include <string.h>
-
-#include <rsctools.hxx>
-
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-#include <rtl/alloc.h>
-#include <rtl/character.hxx>
-
-char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding )
-{
-    std::size_t nMaxUniCodeBuf = strlen( pStr ) + 1;
-    if( nMaxUniCodeBuf * 6 > 0x0FFFFF )
-        RscExit( 10 );
-
-    char *          pOrgStr = new char[ nMaxUniCodeBuf ];
-    sal_uInt32      nOrgLen = 0;
-
-    char cOld = '1';
-    while( cOld != 0 )
-    {
-        char c;
-
-        if( *pStr == '\\' )
-        {
-            ++pStr;
-            switch( *pStr )
-            {
-                case 'a':
-                    c = '\a';
-                    break;
-                case 'b':
-                    c = '\b';
-                    break;
-                case 'f':
-                    c = '\f';
-                    break;
-                case 'n':
-                    c = '\n';
-                    break;
-                case 'r':
-                    c = '\r';
-                    break;
-                case 't':
-                    c = '\t';
-                    break;
-                case 'v':
-                    c = '\v';
-                    break;
-                case '\\':
-                    c = '\\';
-                    break;
-                case '?':
-                    c = '\?';
-                    break;
-                case '\'':
-                    c = '\'';
-                    break;
-                case '\"':
-                    c = '\"';
-                    break;
-                default:
-                {
-                    if( '0' <= *pStr && '7' >= *pStr )
-                    {
-                        sal_uInt16  nChar = 0;
-                        int  i = 0;
-                        while( '0' <= *pStr && '7' >= *pStr && i != 3 )
-                        {
-                            nChar = nChar * 8 + (sal_uInt8)*pStr - (sal_uInt8)'0';
-                            ++pStr;
-                            i++;
-                        }
-                        if( nChar > 255 )
-                        {
-                            // value is too big, or more than 3 digits
-                            delete [] pOrgStr;
-                            return nullptr;
-                        }
-                        c = (char)nChar;
-                        pStr--;
-                    }
-                    else if( 'x' == *pStr )
-                    {
-                        sal_uInt16  nChar = 0;
-                        int  i = 0;
-                        ++pStr;
-                        while( rtl::isAsciiHexDigit( static_cast<unsigned char>(*pStr) ) && i != 2 )
-                        {
-                            if( rtl::isAsciiDigit( static_cast<unsigned char>(*pStr) ) )
-                                nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'0';
-                            else if( rtl::isAsciiUpperCase( static_cast<unsigned char>(*pStr) ) )
-                                nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'A' +10;
-                            else
-                                nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'a' +10;
-                            ++pStr;
-                            i++;
-                        }
-                        c = (char)nChar;
-                        pStr--;
-                    }
-                    else
-                        c = *pStr;
-                };
-            }
-        }
-        else
-            c = *pStr;
-        pOrgStr[ nOrgLen++ ] = c;
-        cOld = *pStr;
-        pStr++;
-    }
-
-    sal_Unicode *   pUniCode = new sal_Unicode[ nMaxUniCodeBuf ];
-    rtl_TextToUnicodeConverter hConv = rtl_createTextToUnicodeConverter( nTextEncoding );
-
-    sal_uInt32 nInfo;
-    sal_Size   nSrcCvtBytes;
-    sal_Size nUniSize = rtl_convertTextToUnicode( hConv, nullptr,
-                                                pOrgStr, nOrgLen,
-                                                pUniCode, nMaxUniCodeBuf,
-                                                RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT
-                                                | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT
-                                                | RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT
-                                                | RTL_TEXTTOUNICODE_FLAGS_FLUSH,
-                                                &nInfo,
-                                                &nSrcCvtBytes );
-
-    rtl_destroyTextToUnicodeConverter( hConv );
-    delete[] pOrgStr;
-    pOrgStr = nullptr;
-
-    hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 );
-    // factor of 6 is the maximum size of an UNICODE character as utf8
-    char * pUtf8 = static_cast<char *>(rtl_allocateMemory( nUniSize * 6 ));
-    rtl_convertUnicodeToText( hConv, nullptr,
-                            pUniCode, nUniSize,
-                            pUtf8, nUniSize * 6,
-                            RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT
-                            | RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT
-                            | RTL_UNICODETOTEXT_FLAGS_FLUSH,
-                            &nInfo,
-                            &nSrcCvtBytes );
-
-    rtl_destroyTextToUnicodeConverter( hConv );
-    delete[] pUniCode;
-    pUniCode = nullptr;
-
-    return pUtf8;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
deleted file mode 100644
index f721e925fb5d..000000000000
--- a/rsc/source/tools/rscdef.cxx
+++ /dev/null
@@ -1,664 +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 .
- */
-
-
-// overall program includes
-#include <rscdef.hxx>
-
-#include <limits.h>
-
-bool RscId::bNames = true;
-
-void RscId::SetNames( bool bSet )
-{
-    bNames = bSet;
-}
-
-sal_Int32 RscId::GetNumber() const
-{
-    sal_Int32 lVal;
-    aExp.Evaluate( &lVal );
-    return lVal;
-}
-
-void RscId::Create( const RscExpType & rExpType )
-{
-    aExp = rExpType;
-    if( aExp.IsDefinition() )
-        aExp.aExp.pDef->IncRef();
-    else if( aExp.IsExpression() )
-    {
-        sal_Int32 lValue;
-
-        aExp.Evaluate( &lValue );
-        aExp.SetLong( lValue );
-    }
-}
-
-void RscId::Destroy()
-{
-    if( aExp.IsDefinition() )
-        aExp.aExp.pDef->DecRef();
-    aExp.cType = RSCEXP_NOTHING;
-}
-
-RscId::RscId( const RscId& rRscId )
-{
-    aExp = rRscId.aExp;
-    if( aExp.IsDefinition() )
-        aExp.aExp.pDef->IncRef();
-}
-
-RscId::RscId( RscDefine * pDef )
-{
-    RscExpType aExpType;
-
-    aExpType.aExp.pDef = pDef;
-    aExpType.cType = RSCEXP_DEF;
-    aExpType.cUnused = false;
-    Create( aExpType );
-}
-
-RscId& RscId::operator = ( const RscId& rRscId )
-{
-    if( rRscId.aExp.IsDefinition() )
-        rRscId.aExp.aExp.pDef->IncRef();
-    Destroy();
-    aExp = rRscId.aExp;
-    return *this;
-}
-
-bool RscId::operator == ( const RscId& rRscId ) const
-{
-    return GetNumber() == rRscId.GetNumber();
-}
-
-bool RscId::operator < ( const RscId& rRscId ) const
-{
-    return GetNumber() < rRscId.GetNumber();
-}
-
-bool RscId::operator > ( const RscId& rRscId ) const
-{
-    return GetNumber() > rRscId.GetNumber();
-}
-
-OString RscId::GetName() const
-{
-    OStringBuffer aStr;
-
-    if ( !aExp.IsNothing() )
-    {
-        if( bNames )
-            aExp.AppendMacro(aStr);
-        else
-            aStr.append(GetNumber());
-    }
-
-    return aStr.makeStringAndClear();
-}
-
-RscDefine::RscDefine( RscFileTab::Index lKey, const OString& rDefName, sal_Int32 lDefId )
-    : m_aName( rDefName )
-{
-    nRefCount = 0;
-    lFileKey  = lKey;
-    lId       = lDefId;
-    pExp      = nullptr;
-}
-
-RscDefine::RscDefine( RscFileTab::Index lKey, const OString& rDefName,
-                      RscExpression * pExpression  )
-    : lId(0), m_aName( rDefName )
-{
-    nRefCount = 0;
-    lFileKey  = lKey;
-    pExpression->Evaluate( &lId );
-    pExp      = pExpression;
-}
-
-RscDefine::~RscDefine()
-{
-    delete pExp;
-    if( nRefCount )
-        RscExit( 14 );
-}
-
-void RscDefine::DecRef()
-{
-    nRefCount--;
-    if( 0 == nRefCount )
-    {
-        delete this;
-    }
-}
-
-void RscDefine::DefineToNumber()
-{
-    delete pExp;
-    pExp = nullptr;
-    m_aName = OString::number(lId);
-}
-
-void RscDefine::Evaluate()
-{
-    if( pExp )
-        pExp->Evaluate( &lId );
-}
-
-RscDefine * RscDefine::Search( const char * pSearch ) const
-{
-    return static_cast<RscDefine *>(NameNode::Search( static_cast<const void *>(pSearch) ));
-}
-
-COMPARE RscDefine::Compare( const NameNode * pSearch ) const
-{
-    int nCmp = m_aName.compareTo( static_cast<const RscDefine *>(pSearch)->m_aName );
-    if( nCmp < 0 )
-        return LESS;
-    else if( nCmp > 0 )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-// pSearch is a pointer to const char *
-COMPARE RscDefine::Compare( const void * pSearch ) const
-{
-    int nCmp = m_aName.compareTo( static_cast<const char *>(pSearch) );
-
-    if( nCmp < 0 )
-        return LESS;
-    else if( nCmp > 0 )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-RscDefine * RscDefineList::New( RscFileTab::Index lFileKey, const OString& rDefName,
-                                sal_Int32 lDefId, size_t lPos )
-{
-    RscDefine * pDef;
-
-    pDef = new RscDefine( lFileKey, rDefName, lDefId );
-    pDef->IncRef();
-    if ( lPos < maList.size() )
-    {
-        RscSubDefList::iterator it = maList.begin();
-        ::std::advance( it, lPos );
-        maList.insert( it, pDef );
-    }
-    else
-    {
-        maList.push_back( pDef );
-    }
-    return pDef;
-}
-
-RscDefine * RscDefineList::New( RscFileTab::Index lFileKey, const OString& rDefName,
-                                RscExpression * pExpression, size_t lPos )
-{
-    RscDefine * pDef;
-
-    pDef = new RscDefine( lFileKey, rDefName, pExpression );
-    pDef->IncRef();
-    if ( lPos < maList.size() )
-    {
-        RscSubDefList::iterator it = maList.begin();
-        ::std::advance( it, lPos );
-        maList.insert( it, pDef );
-    }
-    else
-    {
-        maList.push_back( pDef );
-    }
-    return pDef;
-}
-
-bool RscDefineList::Remove()
-{
-    if ( maList.empty() )
-        return false;
-
-    maList[ 0 ]->DefineToNumber();
-    maList[ 0 ]->DecRef();
-    maList.erase( maList.begin() );
-    return true;
-}
-
-bool RscExpType::Evaluate( sal_Int32 * plValue ) const
-{
-    if( IsDefinition() )
-    {
-        aExp.pDef->Evaluate();
-        // ignore potential errors
-        *plValue = aExp.pDef->GetNumber();
-    }
-    else if( IsExpression() )
-        return aExp.pExp->Evaluate( plValue );
-    else if( IsNothing() )
-        *plValue = 0;
-    else
-        *plValue = GetLong();
-
-    return true;
-}
-
-void RscExpType::AppendMacro(OStringBuffer& rStr) const
-{
-    if( IsDefinition() )
-        rStr.append(aExp.pDef->GetName());
-    else if( IsExpression() )
-        rStr.append(aExp.pExp->GetMacro());
-    else if( IsNumber() )
-        rStr.append(GetLong());
-}
-
-
-RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE )
-{
-    aLeftExp   = aLE;
-    cOperation = cOp;
-    aRightExp  = aRE;
-    if( aLeftExp.IsDefinition() )
-        aLeftExp.aExp.pDef->IncRef();
-    if( aRightExp.IsDefinition() )
-        aRightExp.aExp.pDef->IncRef();
-}
-
-RscExpression::~RscExpression()
-{
-    if( aLeftExp.IsDefinition() )
-        aLeftExp.aExp.pDef->DecRef();
-    else if( aLeftExp.IsExpression() )
-        delete aLeftExp.aExp.pExp;
-
-    if( aRightExp.IsDefinition() )
-        aRightExp.aExp.pDef->DecRef();
-    else if( aRightExp.IsExpression() )
-        delete aRightExp.aExp.pExp;
-}
-
-bool RscExpression::Evaluate( sal_Int32 * plValue )
-{
-    sal_Int32 lLeft;
-    sal_Int32 lRight;
-
-    // interpret left and right branches
-    if( aLeftExp.Evaluate( &lLeft ) && aRightExp.Evaluate( &lRight ) )
-    {
-        if( cOperation == '&' )
-            *plValue = lLeft & lRight;
-        else if( cOperation == '|' )
-            *plValue = lLeft | lRight;
-        else if( cOperation == '+' )
-            *plValue = lLeft + lRight;
-        else if( cOperation == '-' )
-            *plValue = lLeft - lRight;
-        else if( cOperation == '*' )
-            *plValue = lLeft * lRight;
-        else if( cOperation == 'r' )
-            *plValue = lLeft >> lRight;
-        else if( cOperation == 'l' )
-            *plValue = lLeft << lRight;
-        else
-        {
-            if( 0 == lRight )
-                return false;
-            *plValue = lLeft / lRight;
-        }
-        return true;
-    }
-    return false;
-}
-
-OString RscExpression::GetMacro()
-{
-    OStringBuffer aLeft;
-
-    // output optimization
-    if( aLeftExp.IsNothing() )
-    {
-        if ( '-' == cOperation )
-        {
-            aLeft.append('(');
-            aLeft.append('-');
-        }
-        aRightExp.AppendMacro(aLeft);
-        if( '-' == cOperation )
-        {
-            aLeft.append(')');
-        }
-    }
-    else if( aRightExp.IsNothing() )
-        aLeftExp.AppendMacro(aLeft);
-    else
-    {
-        aLeft.append('(');
-        // interpret left branch
-        aLeftExp.AppendMacro(aLeft);
-
-        aLeft.append(cOperation);
-
-        aLeft.append('(');
-        // interpret right branch
-        aRightExp.AppendMacro(aLeft);
-        aLeft.append(')');
-
-        aLeft.append(')');
-    }
-
-    return aLeft.makeStringAndClear();
-}
-
-RscFile::RscFile()
-{
-    bLoaded  = false;
-    bIncFile = false;
-    bScanned = false;
-}
-
-RscFile::~RscFile()
-{
-    for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
-        delete aDepLst[ i ];
-    aDepLst.clear();
-
-    // from back to front is better because of dependencies
-    // objects are destroyed when reference counter is NULL
-    while( aDefLst.Remove() ) ;
-}
-
-bool RscFile::Depend( RscFileTab::Index lDepend, RscFileTab::Index lFree )
-{
-    for ( size_t i = aDepLst.size(); i > 0; )
-    {
-        RscDepend * pDep = aDepLst[ --i ];
-        if( pDep->GetFileKey() == lDepend )
-        {
-            for ( size_t j = i ? --i : 0; j > 0; )
-            {
-                pDep = aDepLst[ --j ];
-                if( pDep->GetFileKey() == lFree )
-                    return true;
-            }
-            return false;
-        }
-    }
-    return true;
-}
-
-void RscFile::InsertDependFile( RscFileTab::Index lIncFile )
-{
-    for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
-    {
-        RscDepend* pDep = aDepLst[ i ];
-        if( pDep->GetFileKey() == lIncFile )
-            return;
-    }
-
-    aDepLst.push_back( new RscDepend( lIncFile ) );
-}
-
-RscDefTree::~RscDefTree()
-{
-    Remove();
-}
-
-void RscDefTree::Remove()
-{
-    while( pDefRoot )
-    {
-        RscDefine * pDef = pDefRoot;
-        pDefRoot = static_cast<RscDefine *>(pDefRoot->Remove( pDefRoot ));
-        pDef->DecRef();
-    }
-}
-
-RscDefine * RscDefTree::Search( const char * pName )
-{
-    if( pDefRoot )
-        return pDefRoot->Search( pName );
-    return nullptr;
-}
-
-void RscDefTree::Insert( RscDefine * pDef )
-{
-    if( pDefRoot )
-        pDefRoot->Insert( pDef );
-    else
-        pDefRoot = pDef;
-    pDef->IncRef();
-}
-
-void RscDefTree::Remove( RscDefine * pDef )
-{
-    if( pDefRoot )
-    {
-        // in case pDef == pDefRoot
-        pDefRoot = static_cast<RscDefine *>(pDefRoot->Remove( pDef ));
-    }
-    pDef->DecRef();
-}
-
-bool RscDefTree::Evaluate( RscDefine * pDef )
-{
-    if( pDef )
-    {
-        if( !Evaluate( static_cast<RscDefine *>(pDef->Left()) ) )
-            return false;
-        if( !Evaluate( static_cast<RscDefine *>(pDef->Right()) ) )
-            return false;
-    }
-    return true;
-}
-
-RscFileTab::RscFileTab()
-{
-}
-
-RscFileTab::~RscFileTab()
-{
-
-    aDefTree.Remove();
-
-    Index aIndex = LastIndex();
-    while( aIndex != IndexNotFound )
-    {
-        delete Remove( aIndex );
-        aIndex = LastIndex();
-    };
-}
-
-RscFileTab::Index RscFileTab::Find( const OString& rName )
-{
-    Index aIndex = FirstIndex();
-    while( aIndex != IndexNotFound && (Get(aIndex)->aFileName != rName) )
-        aIndex = NextIndex(aIndex);
-
-    return aIndex;
-}
-
-RscDefine * RscFileTab::FindDef( const char * pName )
-{
-    return aDefTree.Search( pName );
-}
-
-/* This method gives back true when lDepend
-   exists and is behind lFree, or when lDepend does not exist. */
-bool RscFileTab::Depend( Index lDepend, Index lFree )
-{
-    if( lDepend == lFree )
-        return true;
-
-    Index aIndex = FirstIndex();
-    while( aIndex != IndexNotFound )
-    {
-        RscFile * pFile = Get(aIndex);
-        if( !pFile->IsIncFile() )
-        {
-            if( !pFile->Depend( lDepend, lFree ) )
-                return false;
-        }
-        aIndex = NextIndex(aIndex);
-    }
-
-    return true;
-}
-
-bool RscFileTab::TestDef( Index lFileKey, size_t lPos,
-                          const RscDefine * pDefDec )
-{
-    if( lFileKey == pDefDec->GetFileKey() )
-    {
-        RscFile * pFile = GetFile( pDefDec->GetFileKey() );
-        if( pFile && (lPos <= pFile->aDefLst.GetPos( const_cast<RscDefine *>(pDefDec) ))
-            && (lPos != ULONG_MAX ) )
-        {
-            return false;
-        }
-    }
-    else if( !Depend( lFileKey, pDefDec->GetFileKey() ) )
-        return false;
-
-    return TestDef( lFileKey, lPos, pDefDec->pExp );
-}
-
-bool RscFileTab::TestDef( Index lFileKey, size_t lPos,
-                          const RscExpression * pExpDec )
-{
-    if( !pExpDec )
-        return true;
-
-    if( pExpDec->aLeftExp.IsExpression() )
-        if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pExp ) )
-            return false;
-
-    if( pExpDec->aLeftExp.IsDefinition() )
-        if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pDef ) )
-            return false;
-
-    if( pExpDec->aRightExp.IsExpression() )
-        if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pExp ) )
-            return false;
-
-    if( pExpDec->aRightExp.IsDefinition() )
-        if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pDef ) )
-            return false;
-
-    return true;
-}
-
-RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
-                                sal_Int32 lId )
-{
-    RscDefine * pDef = FindDef( rDefName );
-
-    if( !pDef )
-    {
-        RscFile * pFile = GetFile( lFileKey );
-
-        if( pFile )
-        {
-            pDef = pFile->aDefLst.New( lFileKey, rDefName, lId, ULONG_MAX );
-            aDefTree.Insert( pDef );
-        }
-    }
-    else
-        pDef = nullptr;
-
-    return pDef;
-}
-
-RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName,
-                                RscExpression * pExp )
-{
-    RscDefine * pDef = FindDef( rDefName );
-
-    if( !pDef )
-    {
-        // are macros in expressions defined?
-        if( TestDef( lFileKey, ULONG_MAX, pExp ) )
-        {
-            RscFile * pFile = GetFile( lFileKey );
-
-            if( pFile )
-            {
-                pDef = pFile->aDefLst.New( lFileKey, rDefName, pExp, ULONG_MAX );
-                aDefTree.Insert( pDef );
-            }
-        }
-    }
-    else
-        pDef = nullptr;
-
-    if( !pDef )
-    {
-        // pExp is always owned and must be deleted after used
-        delete pExp;
-    }
-    return pDef;
-}
-
-void RscFileTab::DeleteFileContext( Index lFileKey )
-{
-    RscFile* pFName = GetFile( lFileKey );
-    if( pFName )
-    {
-        for ( size_t i = 0, n = pFName->aDefLst.maList.size(); i < n; ++i )
-        {
-            RscDefine * pDef = pFName->aDefLst.maList[ i ];
-            aDefTree.Remove( pDef );
-        };
-
-        while( pFName->aDefLst.Remove() ) ;
-    }
-}
-
-RscFileTab::Index RscFileTab::NewCodeFile( const OString& rName )
-{
-    Index lKey = Find( rName );
-    if( lKey == IndexNotFound )
-    {
-        RscFile * pFName = new RscFile();
-        pFName->aFileName = rName;
-        pFName->aPathName = rName;
-        lKey = Insert( pFName );
-        pFName->InsertDependFile( lKey );
-    }
-    return lKey;
-}
-
-RscFileTab::Index RscFileTab::NewIncFile(const OString& rName,
-                                    const OString& rPath)
-{
-    Index lKey = Find( rName );
-    if( lKey == IndexNotFound )
-    {
-        RscFile * pFName = new RscFile();
-        pFName->aFileName = rName;
-        pFName->aPathName = rPath;
-        pFName->SetIncFlag();
-        lKey = Insert( pFName );
-        pFName->InsertDependFile( lKey );
-    }
-    return lKey;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
deleted file mode 100644
index 65388ec91ca2..000000000000
--- a/rsc/source/tools/rschash.cxx
+++ /dev/null
@@ -1,59 +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 <rschash.hxx>
-
-
-AtomContainer::AtomContainer()
-{
-    m_aStringToID[ OString() ] = 0;
-    m_aIDToString[ 0 ].clear();
-    m_nNextID = 1;
-}
-
-AtomContainer::~AtomContainer()
-{
-}
-
-Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists )
-{
-    OString aKey = rStr.toAsciiLowerCase();
-    std::unordered_map< OString, Atom, OStringHash >::const_iterator it =
-        m_aStringToID.find( aKey );
-    if( it != m_aStringToID.end() )
-        return it->second;
-
-    if( bOnlyIfExists )
-        return InvalidAtom;
-
-    Atom aRet = m_nNextID;
-    m_aStringToID[ aKey ] = m_nNextID;
-    m_aIDToString[ m_nNextID ] = rStr;
-    m_nNextID++;
-    return aRet;
-}
-
-const OString& AtomContainer::getString( Atom nAtom )
-{
-    std::unordered_map< Atom, OString >::const_iterator it =
-        m_aIDToString.find( nAtom );
-    return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0];
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
deleted file mode 100644
index e65874a10b0e..000000000000
--- a/rsc/source/tools/rsctools.cxx
+++ /dev/null
@@ -1,255 +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 <stdlib.h>
-#include <stdio.h>
-#if defined(_WIN32)
-#include <direct.h>
-#endif
-#include <string.h>
-
-#include <rscdef.hxx>
-#include <rsctools.hxx>
-
-#include <osl/file.h>
-#include <rtl/alloc.h>
-#include <rtl/character.hxx>
-#include <sal/log.hxx>
-
-/* case insensitive compare of two strings up to a given length */
-int rsc_strnicmp( const char *string1, const char *string2, size_t count )
-{
-    return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
-                string1, strlen (string1), string2, strlen (string2), count);
-}
-
-/* case insensitive compare of two strings */
-int rsc_stricmp( const char *string1, const char *string2 )
-{
-    return rtl_str_compareIgnoreAsciiCase( string1, string2 );
-}
-
-char* rsc_strdup( const char* pStr )
-{
-    int nLen = strlen( pStr );
-    char* pBuffer = static_cast<char*>(rtl_allocateMemory( nLen+1 ));
-    memcpy( pBuffer, pStr, nLen+1 );
-    return pBuffer;
-}
-
-OString GetTmpFileName()
-{
-    OUString aTmpURL, aTmpFile;
-    osl_createTempFile( nullptr, nullptr, &aTmpURL.pData );
-    osl_getSystemPathFromFileURL( aTmpURL.pData, &aTmpFile.pData );
-    return OUStringToOString( aTmpFile, RTL_TEXTENCODING_MS_1252 );
-}
-
-/* replaces extension of a file name */
-OString OutputFile(const OString &rInput, const char * pExt)
-{
-    sal_Int32 nSepInd = rInput.lastIndexOf('.');
-
-    if( nSepInd != -1 )
-    {
-        return rInput.copy(0, nSepInd + 1).concat(OString(pExt));
-    }
-
-    return rInput.concat(OString(".")).concat(OString(pExt));
-}
-
-char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc )
-{
-    FILE    *fFile;
-    int     nItems;
-    char    szBuffer[4096];       // file buffer
-    sal_uInt32  i;
-    bool bInQuotes = false;
-
-    // program name
-    ppCmd->Append( rsc_strdup( *ppArgv ) );
-    for( i = 1; i < nArgc; i++ )
-    {
-        if( '@' == **(ppArgv +i) ){ // when @, then response file
-            if( nullptr == (fFile = fopen( (*(ppArgv +i)) +1, "r" )) )
-                return *(ppArgv +i);
-            nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile );
-            while( nItems )
-            {
-                if( !rtl::isAsciiWhiteSpace(
-                        static_cast<unsigned char>(szBuffer[ 0 ]) ) )
-                {
-                    /*
-                     *  #i27914# double ticks '"' now have a duplicate function:
-                     *  1. they define a string ( e.g. -DFOO="baz" )
-                     *  2. a string can contain spaces, so -DFOO="baz zum" defines one
-                     *  argument no two !
-                     */
-                    unsigned int n = 0;
-                    while( nItems &&
-                           (!rtl::isAsciiWhiteSpace(
-                               static_cast<unsigned char>(szBuffer[ n ]) ) ||
-                            bInQuotes) &&
-                           n +1 < sizeof( szBuffer )  )
-                    {
-                        n++;
-                        nItems = fread( &szBuffer[ n ], 1,
-                                        sizeof( char ), fFile );
-                        if( szBuffer[n] == '"' )
-                            bInQuotes = !bInQuotes;
-                    }
-                    szBuffer[ n ] = '\0';
-                    ppCmd->Append( rsc_strdup( szBuffer ) );
-                }
-                nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile );
-            }
-
-            fclose( fFile );
-        }
-        else
-            ppCmd->Append( rsc_strdup( *(ppArgv +i) ) );
-    }
-    ppCmd->Append( static_cast<void *>(nullptr) );
-    return nullptr;
-}
-
-
-RscPtrPtr::RscPtrPtr()
-{
-    nCount = 0;
-    pMem = nullptr;
-}
-
-RscPtrPtr::~RscPtrPtr()
-{
-    Reset();
-}
-
-void RscPtrPtr::Reset()
-{
-    sal_uInt32 i;
-
-    if( pMem )
-    {
-        for( i = 0; i < nCount; i++ )
-        {
-            if( pMem[ i ] )
-               rtl_freeMemory( pMem[ i ] );
-        }
-        rtl_freeMemory( static_cast<void *>(pMem) );
-    };
-    nCount = 0;
-    pMem = nullptr;
-}
-
-sal_uInt32 RscPtrPtr::Append( void * pBuffer )
-{
-    if( !pMem )
-        pMem = static_cast<void **>(rtl_allocateMemory( (nCount +1) * sizeof( void * ) ));
-    else
-        pMem = static_cast<void **>(rtl_reallocateMemory( static_cast<void *>(pMem),
-                         ((nCount +1) * sizeof( void * )
-                       ) ));
-    pMem[ nCount ] = pBuffer;
-    return nCount++;
-}
-
-void * RscPtrPtr::GetEntry( sal_uInt32 nEntry )
-{
-    if( nEntry < nCount )
-        return pMem[ nEntry ];
-    return nullptr;
-}
-
-RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
-{
-    bSwap = false;
-    if( nOrder != RSC_SYSTEMENDIAN )
-    {
-        RSCBYTEORDER_TYPE nMachineOrder;
-#if defined OSL_LITENDIAN
-        nMachineOrder = RSC_LITTLEENDIAN;
-#else
-        nMachineOrder = RSC_BIGENDIAN;
-#endif
-        bSwap = nOrder != nMachineOrder;
-    }
-    nLen = 0;
-    pMem = nullptr;
-}
-
-RscWriteRc::~RscWriteRc()
-{
-    if( pMem )
-        rtl_freeMemory( pMem );
-}
-
-sal_uInt32 RscWriteRc::IncSize( sal_uInt32 nSize )
-{
-    sal_uInt32 nOrigPos = nLen;
-    nLen += nSize;
-    if( pMem )
-        pMem = static_cast<char*>(rtl_reallocateMemory( pMem, nLen ));
-    if( pMem )
-        memset( pMem + nOrigPos, 0, nSize );
-    return nOrigPos;
-}
-
-char * RscWriteRc::GetPointer( sal_uInt32 nSize )
-{
-    if( !pMem )
-    {
-        pMem = static_cast<char *>(rtl_allocateMemory( nLen ));
-        memset( pMem, 0, nLen );
-    }
-    return pMem + nSize;
-}
-
-
-void RscWriteRc::Put( sal_uInt16 nVal )
-{
-    sal_uInt32  nOldLen;
-
-    nOldLen = IncSize( sizeof( nVal ) );
-    PutAt( nOldLen, nVal );
-}
-
-void RscWriteRc::PutUTF8( char * pStr )
-{
-    sal_uInt32 nStrLen = 0;
-    if( pStr )
-        nStrLen = strlen( pStr );
-
-    sal_uInt32  n = nStrLen +1;
-    if( n % 2 )
-        // align to 2
-        n++;
-
-    sal_uInt32  nOldLen = IncSize( n );
-    char * p = GetPointer( nOldLen );
-    if (nStrLen != 0)
-    {
-        memcpy( p, pStr, nStrLen );
-    }
-    // 0 terminated
-    pMem[ nOldLen + nStrLen ] = '\0';
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
deleted file mode 100644
index 6add08277267..000000000000
--- a/rsc/source/tools/rsctree.cxx
+++ /dev/null
@@ -1,359 +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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <tools/link.hxx>
-#include <rsctree.hxx>
-
-
-NameNode::NameNode()
-{
-    pLeft = pRight = nullptr;
-}
-
-NameNode::~NameNode()
-{
-}
-
-void NameNode::EnumNodes( Link<const NameNode&,void> aLink ) const
-{
-    if( Left() )
-        Left()->EnumNodes( aLink );
-    aLink.Call( *this );
-    if( Right() )
-        Right()->EnumNodes( aLink );
-}
-
-NameNode * NameNode::ChangeDLListBTree( NameNode * pList )
-{
-    NameNode * pMiddle;
-    NameNode * pTmp;
-    sal_uInt32 nEle, i;
-
-    if( pList )
-    {
-        while( pList->Left() )
-            pList = pList->Left();
-        pTmp = pList;
-
-        for( nEle = 0; pTmp->Right(); nEle++ )
-            pTmp = pTmp->Right();
-
-        pMiddle = pList;
-        if( nEle / 2 )
-        {
-            for( i = 0; i < (nEle / 2); i++ )
-            {
-                pMiddle = pMiddle->Right();
-            }
-        }
-        else
-        {
-            pList = nullptr;
-        }
-        if( nullptr != (pTmp = pMiddle->Left()) )  // set right pointer to NULL
-            pTmp->pRight = nullptr;
-
-        // set left pointer to NULL
-        NameNode * pRightNode = pMiddle->Right();
-        if (pRightNode)
-            pRightNode->pLeft = nullptr;
-
-        pMiddle->pLeft = ChangeDLListBTree( pList );
-        pMiddle->pRight = ChangeDLListBTree( pRightNode );
-
-        return pMiddle;
-    }
-    return pList;
-}
-
-NameNode * NameNode::ChangeBTreeDLList()
-{
-    NameNode * pList;
-    NameNode * pLL_RN;    // right node of left list
-
-    if( Right() )
-    {
-        pList = Right()->ChangeBTreeDLList();
-        pRight = pList;
-        pList->pLeft = this;
-    }
-    pList = this;
-    if( Left() )
-    {
-        pLL_RN = pList = Left()->ChangeBTreeDLList();
-
-        while( pLL_RN->Right() )
-            pLL_RN = pLL_RN->Right();
-
-        pLeft = pLL_RN;
-        pLL_RN->pRight = this;
-    }
-    return pList;
-}
-
-NameNode * NameNode::Remove( NameNode * pRemove )
-{
-    NameNode * pRoot = this;
-    NameNode * pParent = SearchParent( pRemove );
-
-    if( pParent )
-    {
-        if( pParent->Left() &&
-            (EQUAL == pRemove->Compare( pParent->Left() ) ) )
-        {
-            pParent->pLeft = pRemove->Left();
-            if( pRemove->Right() )
-                pParent->Insert( pRemove->Right() );
-        }
-        else if( pParent->Right() &&
-                 (EQUAL == pRemove->Compare( pParent->Right() ) ) )
-        {
-            pParent->pRight = pRemove->Right();
-            if( pRemove->Left() )
-                pParent->Insert( pRemove->Left() );
-        }
-    }
-    else if( EQUAL == this->Compare( pRemove ) )
-    {
-        if( Right() )
-        {
-            pRoot = Right();
-            if( Left() )
-                Right()->Insert( Left() );
-        }
-        else
-        {
-            pRoot = Left();
-        }
-    }
-    pRemove->pLeft = pRemove->pRight = nullptr;
-
-    return pRoot;
-}
-
-
-COMPARE NameNode::Compare( const NameNode * pCompare ) const
-{
-    if( reinterpret_cast<sal_uIntPtr>(this) < reinterpret_cast<sal_uIntPtr>(pCompare) )
-        return LESS;
-    else if( reinterpret_cast<sal_uIntPtr>(this) > reinterpret_cast<sal_uIntPtr>(pCompare) )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-COMPARE NameNode::Compare( const void * pCompare ) const
-{
-    if( reinterpret_cast<sal_uIntPtr>(this) < reinterpret_cast<sal_uIntPtr>(pCompare) )
-        return LESS;
-    else if( reinterpret_cast<sal_uIntPtr>(this) > reinterpret_cast<sal_uIntPtr>(pCompare) )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-// search for a parent node.
-// return a pointer to the parent node if found.
-// otherwise return 0.
-NameNode* NameNode::SearchParent( const NameNode * pSearch ) const
-{
-    int nCmp = Compare( pSearch );
-
-    if( nCmp == GREATER )
-    {
-        if( Left() )
-        {
-            if( Left()->Compare( pSearch ) == EQUAL )
-                return const_cast<NameNode *>(this);
-            return Left()->SearchParent( pSearch );
-        }
-    }
-    else if( nCmp == LESS )
-    {
-        if( Right() )
-        {
-            if( Right()->Compare( pSearch ) == EQUAL )
-                return const_cast<NameNode *>(this);
-            return Right()->SearchParent( pSearch );
-        }
-    }
-    return nullptr;
-}
-
-// search for a node.
-// return a pointer to the node if found.
-// otherwise return 0.
-NameNode* NameNode::Search( const NameNode * pSearch ) const
-{
-    int nCmp = Compare( pSearch );
-
-    if( nCmp == GREATER )
-    {
-        if( Left() )
-            return Left()->Search( pSearch );
-    }
-    else if( nCmp == LESS )
-    {
-        if( Right() )
-            return Right()->Search( pSearch );
-    }
-    else
-        return const_cast<NameNode *>(this);
-
-    return nullptr;
-}
-
-// search for a node.
-// return a pointer to the node if found.
-// otherwise return 0.
-NameNode* NameNode::Search( const void * pSearch ) const
-{
-    int nCmp = Compare( pSearch );
-
-    if( nCmp == GREATER )
-    {
-        if( Left() )
-            return Left()->Search( pSearch );
-    }
-    else if( nCmp == LESS )
-    {
-        if( Right() )
-            return Right()->Search( pSearch );
-    }
-    else
-        return const_cast<NameNode *>(this);
-
-    return nullptr;
-}
-
-// A node is inserted into the tree
-// If a node with the same name already exists, then returns false
-// otherwise, returns true, In any case, the node will be inserted
-bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth )
-{
-    bool bRet = true;
-    int nCmp = Compare( pTN );
-
-    *pnDepth += 1;
-    if( nCmp == GREATER )
-    {
-        if( Left() )
-            bRet =  Left()->Insert( pTN, pnDepth );
-        else
-            pLeft = pTN;
-    }
-    else
-    {
-        if( Right() )
-            bRet = Right()->Insert( pTN, pnDepth );
-        else
-            pRight = pTN;
-
-        if( nCmp == EQUAL )
-            bRet = false;
-    }
-    return bRet;
-}
-
-// insert a node in the tree.
-// if the node with the same name is in, return false and no insert.
-// if not return true.
-bool NameNode::Insert( NameNode * pTN )
-{
-    sal_uInt32  nDepth = 0;
-    bool        bRet;
-
-    bRet = Insert( pTN, &nDepth );
-    if( bRet )
-    {
-        if( nDepth > 20 )
-        {
-            if( Left() )
-                pLeft =  ChangeDLListBTree(  Left()->ChangeBTreeDLList() );
-            if( Right() )
-                pRight = ChangeDLListBTree( Right()->ChangeBTreeDLList() );
-        }
-    }
-
-    return bRet;
-}
-
-void NameNode::OrderTree()
-{
-    NameNode * pTmpLeft = Left();
-    NameNode * pTmpRight = Right();
-
-    pLeft = nullptr;
-    pRight = nullptr;
-    SubOrderTree( pTmpLeft );
-    SubOrderTree( pTmpRight );
-}
-
-void NameNode::SubOrderTree( NameNode * pOrderNode )
-{
-    if( pOrderNode )
-    {
-        NameNode * pTmpLeft = pOrderNode->Left();
-        NameNode * pTmpRight = pOrderNode->Right();
-        pOrderNode->pLeft = nullptr;
-        pOrderNode->pRight = nullptr;
-        Insert( pOrderNode );
-        SubOrderTree( pTmpLeft );
-        SubOrderTree( pTmpRight );
-    }
-}
-
-IdNode * IdNode::Search( sal_uInt32 nTypeName ) const
-{
-    return static_cast<IdNode *>(NameNode::Search( static_cast<const void *>(&nTypeName) ));
-}
-
-COMPARE IdNode::Compare( const NameNode * pSearch ) const
-{
-    if( GetId() < static_cast<const IdNode *>(pSearch)->GetId() )
-        return LESS;
-    else if( GetId() > static_cast<const IdNode *>(pSearch)->GetId() )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-// pSearch is a pointer to sal_uInt32
-COMPARE IdNode::Compare( const void * pSearch ) const
-{
-    if( GetId() < *static_cast<const sal_uInt32 *>(pSearch) )
-        return LESS;
-    else if( GetId() > *static_cast<const sal_uInt32 *>(pSearch) )
-        return GREATER;
-    else
-        return EQUAL;
-}
-
-sal_uInt32 IdNode::GetId() const
-{
-    return 0xFFFFFFFF;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 172a5a3e6952..1b66dbab5c78 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -375,7 +375,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
     }
     else
     {
-        SAL_WARN( "sal.bootstrap", "couldn't open file: " <<  _iniName );
+        SAL_INFO( "sal.bootstrap", "couldn't open file: " <<  _iniName );
     }
 }
 
diff --git a/sc/AllLangMoTarget_sc.mk b/sc/AllLangMoTarget_sc.mk
new file mode 100644
index 000000000000..c00e627ac9ee
--- /dev/null
+++ b/sc/AllLangMoTarget_sc.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,sc))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
deleted file mode 100644
index 05e0d4550341..000000000000
--- a/sc/AllLangResTarget_sc.mk
+++ /dev/null
@@ -1,47 +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,sc))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sc,\
-	sc/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sc/res))
-
-$(eval $(call gb_SrsTarget_set_include,sc/res,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/sc/inc \
-	-I$(SRCDIR)/sc/source/ui/inc \
-	-I$(SRCDIR)/sc/source/ui/navipi \
-	-I$(SRCDIR)/sc/source/ui/docshell \
-	-I$(SRCDIR)/sc/source/ui/dbgui \
-	-I$(SRCDIR)/sc/source/ui/formdlg \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sc/res,\
-    sc/source/ui/src/globstr.src \
-    sc/source/ui/src/toolbox.src \
-    sc/source/ui/src/scfuncs.src \
-    sc/source/ui/src/sc.src \
-    sc/source/ui/src/scerrors.src \
-    sc/source/ui/src/scstring.src \
-    sc/source/ui/cctrl/checklistmenu.src \
-    sc/source/ui/navipi/navipi.src \
-    sc/source/ui/styleui/scstyles.src \
-    sc/source/ui/dbgui/pvfundlg.src \
-    sc/source/ui/miscdlgs/retypepassdlg.src \
-    sc/source/ui/miscdlgs/conflictsdlg.src \
-    sc/source/ui/miscdlgs/acredlin.src \
-    sc/source/ui/StatisticsDialogs/StatisticsDialogs.src \
-    sc/source/core/src/compiler.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk
index fde5d149cdb3..5d1575440a73 100644
--- a/sc/CppunitTest_sc_screenshots.mk
+++ b/sc/CppunitTest_sc_screenshots.mk
@@ -62,6 +62,4 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sc_screenshots,\
 	modules/scalc \
 ))
 
-$(call gb_CppunitTest_get_target,sc_screenshots) : $(call gb_AllLangResTarget_get_target,sc)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tiledrendering.mk b/sc/CppunitTest_sc_tiledrendering.mk
index 3926e5fdcd23..c02453891c3f 100644
--- a/sc/CppunitTest_sc_tiledrendering.mk
+++ b/sc/CppunitTest_sc_tiledrendering.mk
@@ -54,6 +54,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_tiledrendering,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_tiledrendering))
 
-$(call gb_CppunitTest_get_target,sc_tiledrendering) : $(call gb_AllLangResTarget_get_target,sc)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index c9f54638e62e..87bd70ada626 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -713,7 +713,4 @@ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
     $$(INCLUDE) \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sc,sc))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index edb72275e6a9..338ad5cdf609 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -17,11 +17,11 @@ $(eval $(call gb_Module_add_targets,sc,\
 	$(call gb_Helper_optional,DESKTOP,Library_scui) \
 	$(call gb_Helper_optional,OPENCL,Package_opencl) \
 	Package_res_xml \
+	UIConfig_scalc \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sc,\
-	AllLangResTarget_sc \
-	UIConfig_scalc \
+	AllLangMoTarget_sc \
 ))
 
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
diff --git a/sc/inc/compiler.hrc b/sc/inc/compiler.hrc
new file mode 100644
index 000000000000..1df61083bbf9
--- /dev/null
+++ b/sc/inc/compiler.hrc
@@ -0,0 +1,42 @@
+/* -*- 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_SC_INC_COMPILER_HRC
+#define INCLUDED_SC_INC_COMPILER_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_FUNCTION_CATEGORIES[] =
+{
+    NC_("RID_FUNCTION_CATEGORIES", "Database"),
+    NC_("RID_FUNCTION_CATEGORIES", "Date&Time"),
+    NC_("RID_FUNCTION_CATEGORIES", "Financial"),
+    NC_("RID_FUNCTION_CATEGORIES", "Information"),
+    NC_("RID_FUNCTION_CATEGORIES", "Logical"),
+    NC_("RID_FUNCTION_CATEGORIES", "Mathematical"),
+    NC_("RID_FUNCTION_CATEGORIES", "Array"),
+    NC_("RID_FUNCTION_CATEGORIES", "Statistical"),
+    NC_("RID_FUNCTION_CATEGORIES", "Spreadsheet"),
+    NC_("RID_FUNCTION_CATEGORIES", "Text"),
+    NC_("RID_FUNCTION_CATEGORIES", "Add-in")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index e258720daef6..3623d0715f59 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -363,7 +363,7 @@ public:
     ScDPCollection(const ScDPCollection& r);
     ~ScDPCollection();
 
-    sal_uLong ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
+    const char* ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
     bool ReloadGroupsInCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
     SC_DLLPUBLIC bool GetReferenceGroups(const ScDPObject& rDPObj, const ScDPDimensionSaveData** pGroups) const;
 
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index c69cd479fc49..388522b8a213 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -73,10 +73,10 @@ public:
     /**
      * Check the sanity of the data source range.
      *
-     * @return 0 if the source range is sane, otherwise an error message ID is
+     * @return nullptr if the source range is sane, otherwise an error message ID is
      *         returned.
      */
-    sal_uLong CheckSourceRange() const;
+    const char* CheckSourceRange() const;
 
 private:
     mutable ScRange maSourceRange;
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 377f82ea8489..bb0361def4eb 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -22,7 +22,7 @@
 
 /* Function descriptions for function wizard / autopilot */
 
-#include "scfuncs.hrc"
+#include "scfuncs.hxx"
 
 #include <formula/IFunctionDescription.hxx>
 #include <sal/types.h>
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 7219b9bd2a04..97cd14bba08f 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -28,6 +28,7 @@
 #include "scdllapi.h"
 #include <rtl/ustring.hxx>
 
+#include <map>
 #include <vector>
 
 class Bitmap;
@@ -508,7 +509,7 @@ class ScGlobal
     static LegacyFuncCollection* pLegacyFuncCollection;
     static ScUnoAddInCollection* pAddInCollection;
     static ScUserList*      pUserList;
-    static OUString**       ppRscString;
+    static std::map<const char*, OUString>* pRscString;
     static OUString*        pStrScDoc;
     static OUString*        pEmptyOUString;
     static OUString*        pStrClipDocName;
@@ -568,7 +569,7 @@ public:
     SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
     SC_DLLPUBLIC static ScUserList*         GetUserList();
     static void                 SetUserList( const ScUserList* pNewList );
-    SC_DLLPUBLIC static const OUString&       GetRscString( sal_uInt16 nIndex );
+    SC_DLLPUBLIC static const OUString&       GetRscString(const char* pResId);
     /// Open the specified URL.
     static void                 OpenURL(const OUString& rURL, const OUString& rTarget);
     SC_DLLPUBLIC static OUString            GetAbsDocName( const OUString& rFileName,
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index b8e6e81991d1..af7c749baaee 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -20,654 +20,504 @@
 #ifndef SC_GLOBSTR_HRC
 #define SC_GLOBSTR_HRC
 
+#define NC_(Context, String) (Context "\004" u8##String)
+
 /*
  * This file is reserved for string IDs of permanently loaded resident string
  * resources for faster access in core and filter code (and some UI like
  * Undo/Redo or strings displayed in the status bar), they reside in resource
  * RID_GLOBSTR and are meant to be accessed via ScGlobal::GetRscString(). All
  * other string IDs of strings used in message boxes and elsewhere go into
- * sc/inc/sc.hrc if they need to be global, or if restricted to UI dialogs into
- * a proper sc/source/ui/xxx/yyy.hrc and corresponding .src PLEASE!
- *
- * When inserting or removing defines the entire file can be renumbered using
- * sc/util/number-defines-consecutively.awk
- * Hint: when inserting a define use some arbitrary large enough number such as
- * 9999 and then renumber the file, which you HAVE TO then since otherwise the
- * number would be greater than the count of resident strings.
+ * sc/inc/strings.hrc
  */
 
-#define STR_UNDO_DELETECELLS        1
-#define STR_UNDO_CUT                2
-#define STR_UNDO_PASTE              3
-#define STR_UNDO_MOVE               4
-#define STR_UNDO_COPY               5
-#define STR_UNDO_DELETECONTENTS     6
-#define STR_UNDO_SELATTR            7
-#define STR_UNDO_SELATTRLINES       8
-#define STR_UNDO_COLWIDTH           9
-#define STR_UNDO_OPTCOLWIDTH        10
-#define STR_UNDO_ROWHEIGHT          11
-#define STR_UNDO_OPTROWHEIGHT       12
-#define STR_UNDO_AUTOFILL           13
-#define STR_UNDO_MERGE              14
-#define STR_UNDO_REMERGE            15
-#define STR_UNDO_AUTOFORMAT         16
-#define STR_UNDO_REPLACE            17
-#define STR_UNDO_CURSORATTR         18
-#define STR_UNDO_ENTERDATA          19
-#define STR_UNDO_INSCOLBREAK        20
-#define STR_UNDO_DELCOLBREAK        21
-#define STR_UNDO_INSROWBREAK        22
-#define STR_UNDO_DELROWBREAK        23
-#define STR_UNDO_DOOUTLINE          24
-#define STR_UNDO_REDOOUTLINE        25
-#define STR_UNDO_MAKEOUTLINE        26
-#define STR_UNDO_REMAKEOUTLINE      27
-#define STR_UNDO_OUTLINELEVEL       28
-#define STR_UNDO_DOOUTLINEBLK       29
-#define STR_UNDO_REDOOUTLINEBLK     30
-#define STR_UNDO_REMOVEALLOTLNS     31
-#define STR_UNDO_AUTOOUTLINE        32
-#define STR_UNDO_SUBTOTALS          33
-#define STR_UNDO_SORT               34
-#define STR_UNDO_QUERY              35
-#define STR_UNDO_DBDATA             36
-#define STR_UNDO_IMPORTDATA         37
-#define STR_UNDO_REPEATDB           38
-
-#define STR_MSSG_DOSUBTOTALS_0      39
-#define STR_MSSG_DOSUBTOTALS_1      40
-#define STR_MSSG_DOSUBTOTALS_2      41
-#define STR_MSSG_REPEATDB_0         42
-#define STR_MSSG_MAKEAUTOFILTER_0   43
-#define STR_MSSG_IMPORTDATA_0       44
-#define STR_MSSG_MAKEOUTLINE_0      45
-#define STR_MSSG_REMOVEOUTLINE_0    46
-#define STR_MSSG_PASTEFROMCLIP_0    47
-#define STR_MSSG_MOVEBLOCKTO_0      48
-#define STR_MSSG_INSERTCELLS_0      49
-#define STR_MSSG_DELETECELLS_0      50
-#define STR_MSSG_MERGECELLS_0       51
-#define STR_MSSG_SOLVE_0            52
-#define STR_MSSG_SOLVE_1            53
-#define STR_MSSG_SOLVE_2            54
-#define STR_MSSG_SOLVE_3            55
-#define STR_MSSG_SOLVE_4            56
-
-#define STR_TABLE_GESAMTERGEBNIS    57
-#define STR_TABLE_ERGEBNIS          58
-#define STR_UNDO_SPELLING           59
-#define STR_TABLE_UND               60
-#define STR_TABLE_ODER              61
-#define STR_UNDO_INSERTCELLS        62
-#define STR_TABLE_DEF               63
-#define STR_MOVE_TO_END             64
-#define STR_NO_REF_TABLE            65
-
-#define STR_PIVOT_TOTAL             66
-#define STR_PIVOT_DATA              67
-
-#define STR_COLUMN                  68
-#define STR_ROW                     69
-#define STR_LOAD_DOC                70
-#define STR_SAVE_DOC                71
-
-#define STR_AREA_ALREADY_INSERTED   72
-#define STR_INVALID_TABREF          73
-#define STR_INVALID_QUERYAREA       74
-
-#define STR_REIMPORT_EMPTY          75
-#define STR_NOMULTISELECT           76
-#define STR_FILL_SERIES_PROGRESS    77 // documen3.cxx
-
-#define STR_COND_AND                78
-
-#define STR_UNDO_PRINTRANGES        79
-
-#define STR_UNDO_DEC_INDENT         80
-#define STR_UNDO_INC_INDENT         81
-#define STR_UNDO_THESAURUS          82
-
-#define STR_FILL_TAB                83
-#define STR_NO_VALUE                84     /* moved to compiler.src, keep define! */
-#define STR_UPDATE_SCENARIO         85
-#define STR_ERR_NEWSCENARIO         86
-#define STR_SCENARIO                87
-#define STR_PIVOT_TABLE             88
-#define STR_NEWTABNAMENOTUNIQUE     89
-
-#define STR_FUN_TEXT_SUM            90
-#define STR_FUN_TEXT_COUNT          91
-#define STR_FUN_TEXT_AVG            92
-#define STR_FUN_TEXT_MEDIAN         93
-#define STR_FUN_TEXT_MAX            94
-#define STR_FUN_TEXT_MIN            95
-#define STR_FUN_TEXT_PRODUCT        96
-#define STR_FUN_TEXT_STDDEV         97
-#define STR_FUN_TEXT_VAR            98
-#define STR_DOC_STAT                99
-
-#define STR_DBNAME_IMPORT           100
-
-#define STR_NOCHARTATCURSOR         101
-#define STR_NOAREASELECTED          102
-#define STR_INVALIDTABNAME          103
-
-#define STR_PIVOT_NOTFOUND          104
-#define STR_ERROR_STR               105
-#define STR_NV_STR                  106     /* moved to compiler.src, keep define! */
-#define STR_EMPTYDATA               107
-#define STR_PIVOT_NODATA            108
-#define STR_PIVOT_MOVENOTALLOWED    109
-
-#define STR_PRINT_INVALID_AREA      110
-
-#define STR_PAGESTYLE               111
-#define STR_HEADER                  112
-#define STR_FOOTER                  113
-
-#define STR_TEXTATTRS               114
-
-#define STR_HFCMD_DELIMITER         115
-#define STR_HFCMD_PAGE              116
-#define STR_HFCMD_PAGES             117
-#define STR_HFCMD_DATE              118
-#define STR_HFCMD_TIME              119
-#define STR_HFCMD_FILE              120
-#define STR_HFCMD_TABLE             121
-
-#define STR_PROTECTIONERR           122
-
-#define STR_PAGEHEADER              123
-#define STR_PAGEFOOTER              124
-#define STR_PAGE                    125
-#define STR_LONG_ERR_ILL_ARG        126
-#define STR_LONG_ERR_ILL_PAR        127
-#define STR_LONG_ERR_ILL_FPO        128
-#define STR_LONG_ERR_ILL_CHAR       129
-// empty
-#define STR_LONG_ERR_PAIR           130
-#define STR_LONG_ERR_OP_EXP         131
-#define STR_LONG_ERR_VAR_EXP        132
-#define STR_LONG_ERR_CODE_OVF       133
-#define STR_LONG_ERR_STR_OVF        134
-#define STR_LONG_ERR_STACK_OVF      135
-#define STR_LONG_ERR_MATRIX_SIZE    136
-#define STR_LONG_ERR_SYNTAX         137
-#define STR_LONG_ERR_CIRC_REF       138
-#define STR_LONG_ERR_NO_NAME        139
-#define STR_LONG_ERR_NO_REF         140
-#define STR_LONG_ERR_NO_CONV        141
-#define STR_LONG_ERR_NO_VALUE       142
-#define STR_LONG_ERR_NV             143
-
-#define STR_GRIDCOLOR               144
-#define STR_CELL_FILTER             145
-
-#define STR_TARGETNOTFOUND          146
-
-#define STR_INVALID_EPS             147
-#define STR_UNDO_TABOP              148
-
-#define STR_INVALID_AFNAME          149
-
-#define STR_AREA                    150
-#define STR_YES                     151
-#define STR_NO                      152
-#define STR_PROTECTION              153
-#define STR_FORMULAS                154
-#define STR_HIDE                    155
-#define STR_PRINT                   156
-
-#define STR_INVALID_AFAREA          157
-
-#define STR_OPTIONAL                158
-#define STR_REQUIRED                159
-
-#define STR_NOTES                   160
-#define STR_QUERY_DELTAB            161
-
-#define STR_UNDO_DETREFRESH         162
-
-#define STR_UNDO_SHOWNOTE           163
-#define STR_UNDO_HIDENOTE           164
-#define STR_UNDO_DRAGDROP           165
-#define STR_UNDO_SHOWALLNOTES       166
-#define STR_UNDO_HIDEALLNOTES       167
-
-#define STR_IMPORT_LOTUS            168
-#define STR_IMPORT_DBF              169
-#define STR_EXPORT_ASCII            170
-
-#define STR_STYLENAME_STANDARD      171
-#define STR_STYLENAME_RESULT        172
-#define STR_STYLENAME_RESULT1       173
-#define STR_STYLENAME_HEADLINE      174
-#define STR_STYLENAME_HEADLINE1     175
-#define STR_STYLENAME_REPORT        176
-
-#define STR_PIVOT_ERROR             177
-#define STR_SPELLING_STOP_OK        178
-#define STR_THESAURUS_NO_STRING     179
-#define STR_SPELLING_BEGIN_TAB      180
-#define STR_SPELLING_NO_LANG        181                         // can be removed later
-
-// empty
-
-#define STR_UNDO_INSERT_TAB         182
-#define STR_UNDO_DELETE_TAB         183
-#define STR_UNDO_RENAME_TAB         184
-#define STR_UNDO_MOVE_TAB           185
-#define STR_UNDO_COPY_TAB           186
-#define STR_UNDO_APPEND_TAB         187
-
-#define STR_ABSREFLOST              188
-#define STR_NAMECONFLICT            189
-
-#define STR_ERR_AUTOFILTER          190
-
-#define STR_CREATENAME_REPLACE      191
-#define STR_CREATENAME_MARKERR      192
-
-#define STR_UNDO_LISTNAMES          193
-#define STR_UNDO_PIVOT_NEW          194
-#define STR_UNDO_PIVOT_MODIFY       195
-#define STR_UNDO_PIVOT_DELETE       196
-#define STR_UNDO_CONSOLIDATE        197
-#define STR_UNDO_USESCENARIO        198
-#define STR_UNDO_MAKESCENARIO       199
-
-#define STR_CONSOLIDATE_ERR1        200
-#define STR_SCENARIO_NOTFOUND       201
-
-#define STR_UNDO_APPLYCELLSTYLE     202
-
-#define STR_UNDO_DETADDPRED         203
-#define STR_UNDO_DETDELPRED         204
-#define STR_UNDO_DETADDSUCC         205
-#define STR_UNDO_DETDELSUCC         206
-#define STR_UNDO_DETADDERROR        207
-#define STR_UNDO_DETDELALL          208
-
-#define STR_QUERY_DELENTRY          209
-
-#define STR_VOBJ_OBJECT             210
-#define STR_VOBJ_CHART              211
-#define STR_VOBJ_DRAWINGS           212
-#define STR_VOBJ_MODE_SHOW          213
-#define STR_VOBJ_MODE_HIDE          214
-
-#define STR_SCATTR_PAGE_TOPDOWN     215
-#define STR_SCATTR_PAGE_LEFTRIGHT   216
-#define STR_SCATTR_PAGE_NOTES       217
-#define STR_SCATTR_PAGE_GRID        218
-#define STR_SCATTR_PAGE_HEADERS     219
-#define STR_SCATTR_PAGE_FORMULAS    220
-#define STR_SCATTR_PAGE_NULLVALS    221
-#define STR_SCATTR_PAGE_PRINTDIR    222
-#define STR_SCATTR_PAGE_FIRSTPAGENO 223
-#define STR_SCATTR_PAGE_SCALE       224
-#define STR_SCATTR_PAGE_SCALETOPAGES 225
-
-#define STR_NOREF_STR               226     /* moved to compiler.src, keep define! */
-
-#define STR_UNDO_CHARTDATA          227
-#define STR_UNDO_ORIGINALSIZE       228
-
-#define STR_LINKERROR               229
-#define STR_LINKERRORFILE           230
-#define STR_LINKERRORTAB            231
-#define STR_UNDO_UPDATELINK         232
-
-#define STR_IMPORT_REPLACE          233
-
-#define STR_UNDO_REMOVELINK         234
-
-#define STR_OVERVIEW                235
-#define STR_DOC_INFO                236
-#define STR_DOC_PRINTED             237
-#define STR_BY                      238
-#define STR_ON                      239
-
-#define STR_RELOAD_TABLES           240
-
-#define STR_UNDO_ENTERMATRIX        241
-
-#define STR_INSERT_FULL             242
-#define STR_TABINSERT_ERROR         243
-#define STR_PASTE_ERROR             244
-#define STR_PASTE_FULL              245
-
-#define STR_ERR_INVALID_AREA        246
-
-#define STR_IMPORT_DIF              247
-#define STR_EXPORT_DIF              248
-
-#define STR_ERR_NOREF               249
-#define STR_FUN_TEXT_COUNT2         250
-#define STR_NO_NAME_REF             251     /* moved to compiler.src, keep define! */
-
-#define STR_MATRIXFRAGMENTERR       252
-
-#define STR_UNDO_SHOWTAB            253
-#define STR_UNDO_HIDETAB            254
-#define STR_UNDO_INSERTAREALINK     255
-
-#define STR_REIMPORT_AFTER_LOAD     256
-
-#define STR_DETINVALID_OVERFLOW     257
-#define STR_GRAPHICNAME             258
-#define STR_INVALIDNAME             259
-
-#define STR_VALID_MACRONOTFOUND     260
-#define STR_VALID_DEFERROR          261
-
-#define STR_UNDO_DETINVALID         262
-
-#define STR_PROGRESS_CALCULATING    263
-#define STR_PROGRESS_SORTING        264
-#define STR_PROGRESS_HEIGHTING      265
-
-#define STR_QUICKHELP_DELETE        266
-
-#define STR_FUNCTIONLIST_MORE       267
-
-#define STR_PIVOT_STYLE_INNER       268
-#define STR_PIVOT_STYLE_RESULT      269
-#define STR_PIVOT_STYLE_CATEGORY    270
-#define STR_PIVOT_STYLE_TITLE       271
-#define STR_PIVOT_STYLE_FIELDNAME   272
-#define STR_PIVOT_STYLE_TOP         273
-
-#define STR_OPERATION_FILTER        274
-#define STR_OPERATION_SORT          275
-#define STR_OPERATION_SUBTOTAL      276
-#define STR_OPERATION_NONE          277
-
-#define STR_UNDO_PROTECT_TAB        278
-#define STR_UNDO_UNPROTECT_TAB      279
-#define STR_UNDO_PROTECT_DOC        280
-#define STR_UNDO_UNPROTECT_DOC      281
-
-#define STR_PROGRESS_IMPORT         282
-
-#define STR_SORT_ERR_MERGED         283
-
-#define STR_TIP_WIDTH               284
-#define STR_TIP_HEIGHT              285
-#define STR_TIP_HIDE                286
-
-#define STR_UNDO_REMOVEBREAKS       287
-#define STR_UNDO_PRINTSCALE         288
-#define STR_UNDO_DRAG_BREAK         289
-
-#define STR_QUICKHELP_REF           290
-
-#define STR_PIVOT_NOTEMPTY          291
-#define STR_PIVOT_REMOVE_PIVOTCHART 292
-
-#define STR_PROGRESS_COMPARING      293
-
-#define STR_CHANGED_BLANK           294
-#define STR_CHANGED_CELL            295
-#define STR_CHANGED_INSERT          296
-#define STR_CHANGED_DELETE          297
-#define STR_CHANGED_MOVE            298
-
-#define STR_QUERY_DELSCENARIO       299
-#define STR_UNDO_EDITSCENARIO       300
-
-#define STR_END_REDLINING           301
-
-#define STR_UNDO_EDITNOTE           302
-#define STR_TABREMOVE_ERROR         303
-#define STR_CLOSE_ERROR_LINK        304
-#define STR_UNDO_RANGENAMES         305
-
-#define STR_UNDO_RESIZEMATRIX       306
-#define STR_TIP_RESIZEMATRIX        307
-
-#define STR_READONLYERR             308
-
-#define STR_PASTE_BIGGER            309
-
-#define STR_EXPORT_DBF              310
-
-#define STR_UNDO_APPLYPAGESTYLE     311
-#define STR_UNDO_EDITCELLSTYLE      312
-#define STR_UNDO_EDITPAGESTYLE      313
-
-#define STR_DATAPILOT_SUBTOTAL      314
-
-#define STR_UNDO_TRANSLITERATE      315
-
-#define STR_NO_ADDIN                316
-#define STR_LONG_ERR_NO_ADDIN       317
-#define STR_NO_MACRO                318
-#define STR_LONG_ERR_NO_MACRO       319
-
-#define STR_SCATTR_PAGE_SCALETO         320
-#define STR_SCATTR_PAGE_SCALE_WIDTH     321
-#define STR_SCATTR_PAGE_SCALE_HEIGHT    322
-#define STR_SCATTR_PAGE_SCALE_PAGES     323
-#define STR_SCATTR_PAGE_SCALE_AUTO      324
-
-#define STR_UNDO_TAB_RTL                325
-#define STR_UNDO_HANGULHANJA            326
-#define STR_UNDO_CHINESE_TRANSLATION    327
-
-#define STR_NAME_INPUT_CELL         328
-#define STR_NAME_INPUT_RANGE        329
-#define STR_NAME_INPUT_DBRANGE      330
-#define STR_NAME_INPUT_ROW          331
-#define STR_NAME_INPUT_SHEET        332
-#define STR_NAME_INPUT_DEFINE       333
-#define STR_NAME_ERROR_SELECTION    334
-#define STR_NAME_ERROR_NAME         335
-
-#define STR_CHANGED_MOVE_REJECTION_WARNING      336
-#define STR_CHANGED_DELETE_REJECTION_WARNING    337
-
-#define STR_ERR_DATAPILOT_INPUT     338
-
-#define STR_DIV_ZERO                339     /* moved to compiler.src, keep define! */
-#define STR_LONG_ERR_DIV_ZERO       340
-#define STR_NUM_ERROR               341     /* moved to compiler.src, keep define! */
-#define STR_NULL_ERROR              342     /* moved to compiler.src, keep define! */
-
-#define STR_RECALC_MANUAL           343
-#define STR_RECALC_AUTO             344
-
-#define STR_ERR_LONG_NESTED_ARRAY   345
-#define STR_UNDO_TEXTTOCOLUMNS      346
-
-#define STR_DOC_UPDATED             347
-#define STR_DOC_WILLBESAVED         348
-#define STR_DOC_WILLNOTBESAVED      349
-#define STR_DOC_DISABLESHARED       350
-#define STR_DOC_NOLONGERSHARED      351
-#define STR_SHARED_DOC_WARNING      352
-#define STR_FILE_LOCKED_TRY_LATER   353
-#define STR_FILE_LOCKED_SAVE_LATER  354
-#define STR_UNKNOWN_USER            355
-
-#define STR_UNDO_INSERTNOTE         356
-#define STR_UNDO_DELETENOTE         357
-#define STR_STYLE_FAMILY_CELL       358
-#define STR_STYLE_FAMILY_PAGE       359
-
-#define STR_ERR_DATAPILOTSOURCE     360
-
-#define STR_UNDO_SET_TAB_BG_COLOR       361
-#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 362
-#define STR_UNDO_INSERT_CURRENT_DATE    363
-#define STR_UNDO_INSERT_CURRENT_TIME    364
-
-#define STR_OPTIONS_WARN_SEPARATORS 365
-#define STR_SHAPE_AUTOSHAPE         366
-#define STR_SHAPE_RECTANGLE         367
-#define STR_SHAPE_LINE              368
-#define STR_SHAPE_OVAL              369
-
-#define STR_FORM_BUTTON             370
-#define STR_FORM_CHECKBOX           371
-#define STR_FORM_OPTIONBUTTON       372
-#define STR_FORM_LABEL              373
-#define STR_FORM_LISTBOX            374
-#define STR_FORM_GROUPBOX           375
-#define STR_FORM_DROPDOWN           376
-#define STR_FORM_SPINNER            377
-#define STR_FORM_SCROLLBAR          378
-
-#define STR_PGNUM                   379
-
-#define STR_MANAGE_NAMES            380
-
-#define STR_HEADER_NAME             381
-#define STR_HEADER_RANGE_OR_EXPR    382
-#define STR_HEADER_SCOPE            383
-#define STR_GLOBAL_SCOPE            384
-#define STR_ERR_NAME_EXISTS         385
-#define STR_ERR_NAME_INVALID        386
-#define STR_ERR_NAME_INVALID_CELL_REF   387
-
-#define STR_UNSAVED_EXT_REF         388
-#define STR_CLOSE_WITH_UNSAVED_REFS 389
-#define STR_PIVOT_GROUP             390
-#define STR_HEADER_RANGE            391
-#define STR_HEADER_COND             392
-
-#define STR_COND_CONDITION          393
-#define STR_COND_COLORSCALE         394
-#define STR_COND_DATABAR            395
-#define STR_COND_ICONSET            396
-#define STR_COND_FORMULA            397
-#define STR_COND_BETWEEN            398
-#define STR_COND_NOTBETWEEN         399
-#define STR_COND_UNIQUE             400
-#define STR_COND_DUPLICATE          401
-#define STR_COND_TOP10              402
-#define STR_COND_BOTTOM10           403
-#define STR_COND_TOP_PERCENT        404
-#define STR_COND_BOTTOM_PERCENT     405
-#define STR_COND_ABOVE_AVERAGE      406
-#define STR_COND_BELOW_AVERAGE      407
-#define STR_COND_ERROR              408
-#define STR_COND_NOERROR            409
-#define STR_COND_BEGINS_WITH        410
-#define STR_COND_ENDS_WITH          411
-#define STR_COND_CONTAINS           412
-#define STR_COND_NOT_CONTAINS       413
-#define STR_COND_DATE               414
-/* Values from STR_COND_TODAY to STR_COND_NEXTYEAR must be in sequence for
- * sc/source/ui/condformat/condformathelper.cxx getDateString() */
-#define STR_COND_TODAY              415
-#define STR_COND_YESTERDAY          416
-#define STR_COND_TOMORROW           417
-#define STR_COND_LAST7DAYS          418
-#define STR_COND_THISWEEK           419
-#define STR_COND_LASTWEEK           420
-#define STR_COND_NEXTWEEK           421
-#define STR_COND_THISMONTH          422
-#define STR_COND_LASTMONTH          423
-#define STR_COND_NEXTMONTH          424
-#define STR_COND_THISYEAR           425
-#define STR_COND_LASTYEAR           426
-#define STR_COND_NEXTYEAR           427
-
-#define STR_ERR_CONDFORMAT_PROTECTED   428
-#define STR_EDIT_EXISTING_COND_FORMATS 429
-
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 430
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 431
-#define STR_ALWAYS_PERFORM_SELECTED         432
-
-#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE 433
-
-#define STR_CHG_INSERT_COLS         434
-#define STR_CHG_INSERT_ROWS         435
-#define STR_CHG_INSERT_TABS         436
-#define STR_CHG_DELETE_COLS         437
-#define STR_CHG_DELETE_ROWS         438
-#define STR_CHG_DELETE_TABS         439
-#define STR_CHG_MOVE                440
-#define STR_CHG_CONTENT             441
-#define STR_CHG_REJECT              442
-#define STR_CHG_ACCEPTED            443
-#define STR_CHG_REJECTED            444
-#define STR_CHG_NO_ENTRY            445
-#define STR_CHG_CONTENT_WITH_CHILD  446
-#define STR_CHG_CHILD_CONTENT       447
-#define STR_CHG_CHILD_ORGCONTENT    448
-#define STR_CHG_EMPTY               449
-
-#define STR_UNDO_HIDETABS           450
-#define STR_UNDO_SHOWTABS           451
-
-#define STR_DPFIELD_GROUP_BY_SECONDS     452
-#define STR_DPFIELD_GROUP_BY_MINUTES     453
-#define STR_DPFIELD_GROUP_BY_HOURS       454
-#define STR_DPFIELD_GROUP_BY_DAYS        455
-#define STR_DPFIELD_GROUP_BY_MONTHS      456
-#define STR_DPFIELD_GROUP_BY_QUARTERS    457
-#define STR_DPFIELD_GROUP_BY_YEARS       458
-
-#define STR_COND_ABOVE_EQUAL_AVERAGE 459
-#define STR_COND_BELOW_EQUAL_AVERAGE 460
-
-#define STR_MULTI_SELECT            461
-
-#define STR_INVALIDVAL              462
-#define STR_INVALIDVAR              463
-#define STR_INVALIDFORM             464
-#define STR_NOFORMULA               465
-
-#define STR_INVALIDINPUT            466
-#define STR_INVALIDCONDITION        467
-
-#define STR_FUN_TEXT_SELECTION_COUNT 468
-
-#define STR_QUERYREMOVE             469
-#define STR_COPYLIST                470
-#define STR_COPYFROM                471
-#define STR_COPYERR                 472
-
-#define STR_CTRLCLICKHYPERLINK      473
-#define STR_CLICKHYPERLINK          474
-
-#define STR_ROWCOL_SELCOUNT         475
-
-#define STR_PRINT_PREVIEW_NODATA        476
-#define STR_PRINT_PREVIEW_EMPTY_RANGE   477
-
-#define STR_UNDO_CONDFORMAT             478
-#define STR_UNDO_FORMULA_TO_VALUE       479
-
-#define STR_UNQUOTED_STRING             480
-#define STR_ENTER_VALUE                 481
-
-#define STR_TABLE_COUNT                 482
-
-#define STR_FUNCTIONS_FOUND             483
-
-#define STR_FILTER_SELCOUNT             484
-
-#define STR_GENERAL                     485
-#define STR_NUMBER                      486
-#define STR_PERCENT                     487
-#define STR_CURRENCY                    488
-#define STR_DATE                        489
-#define STR_TIME                        490
-#define STR_SCIENTIFIC                  491
-#define STR_FRACTION                    492
-#define STR_BOOLEAN_VALUE               493
-#define STR_TEXT                        494
-
-#define STR_QUERY_PIVOTTABLE_DELTAB     495
-
-#define STR_UNDO_CONDFORMAT_LIST        496
-
-#define SC_GLOBSTR_STR_COUNT            497     /**< the count of permanently resident strings */
+#define STR_UNDO_INSERTCELLS                    NC_("STR_UNDO_INSERTCELLS", "Insert")
+#define STR_UNDO_DELETECELLS                    NC_("STR_UNDO_DELETECELLS", "Delete")
+#define STR_UNDO_CUT                            NC_("STR_UNDO_CUT", "Cut")
+#define STR_UNDO_PASTE                          NC_("STR_UNDO_PASTE", "Insert")
+#define STR_UNDO_DRAGDROP                       NC_("STR_UNDO_DRAGDROP", "Drag and Drop")
+#define STR_UNDO_MOVE                           NC_("STR_UNDO_MOVE", "Move")
+#define STR_UNDO_COPY                           NC_("STR_UNDO_COPY", "Copy")
+#define STR_UNDO_DELETECONTENTS                 NC_("STR_UNDO_DELETECONTENTS", "Delete")
+#define STR_UNDO_SELATTR                        NC_("STR_UNDO_SELATTR", "Attributes")
+#define STR_UNDO_SELATTRLINES                   NC_("STR_UNDO_SELATTRLINES", "Attributes/Lines")
+#define STR_UNDO_COLWIDTH                       NC_("STR_UNDO_COLWIDTH", "Column Width")
+#define STR_UNDO_OPTCOLWIDTH                    NC_("STR_UNDO_OPTCOLWIDTH", "Optimal Column Width")
+#define STR_UNDO_ROWHEIGHT                      NC_("STR_UNDO_ROWHEIGHT", "Row height")
+#define STR_UNDO_OPTROWHEIGHT                   NC_("STR_UNDO_OPTROWHEIGHT", "Optimal Row Height")
+#define STR_UNDO_AUTOFILL                       NC_("STR_UNDO_AUTOFILL", "Fill")
+#define STR_UNDO_MERGE                          NC_("STR_UNDO_MERGE", "Merge")
+#define STR_UNDO_REMERGE                        NC_("STR_UNDO_REMERGE", "Split")
+#define STR_UNDO_AUTOFORMAT                     NC_("STR_UNDO_AUTOFORMAT", "AutoFormat")
+#define STR_UNDO_REPLACE                        NC_("STR_UNDO_REPLACE", "Replace")
+#define STR_UNDO_CURSORATTR                     NC_("STR_UNDO_CURSORATTR", "Attributes")
+#define STR_UNDO_ENTERDATA                      NC_("STR_UNDO_ENTERDATA", "Input")
+#define STR_UNDO_INSCOLBREAK                    NC_("STR_UNDO_INSCOLBREAK", "Insert Column Break")
+#define STR_UNDO_DELCOLBREAK                    NC_("STR_UNDO_DELCOLBREAK", "Delete column break")
+#define STR_UNDO_INSROWBREAK                    NC_("STR_UNDO_INSROWBREAK", "Insert Row Break")
+#define STR_UNDO_DELROWBREAK                    NC_("STR_UNDO_DELROWBREAK", "Delete row break")
+#define STR_UNDO_DOOUTLINE                      NC_("STR_UNDO_DOOUTLINE", "View Details")
+#define STR_UNDO_REDOOUTLINE                    NC_("STR_UNDO_REDOOUTLINE", "Hide details")
+#define STR_UNDO_MAKEOUTLINE                    NC_("STR_UNDO_MAKEOUTLINE", "Group")
+#define STR_UNDO_REMAKEOUTLINE                  NC_("STR_UNDO_REMAKEOUTLINE", "Ungroup")
+#define STR_UNDO_OUTLINELEVEL                   NC_("STR_UNDO_OUTLINELEVEL", "Select outline level")
+#define STR_UNDO_DOOUTLINEBLK                   NC_("STR_UNDO_DOOUTLINEBLK", "View Details")
+#define STR_UNDO_REDOOUTLINEBLK                 NC_("STR_UNDO_REDOOUTLINEBLK", "Hide details")
+#define STR_UNDO_REMOVEALLOTLNS                 NC_("STR_UNDO_REMOVEALLOTLNS", "Clear Outline")
+#define STR_UNDO_AUTOOUTLINE                    NC_("STR_UNDO_AUTOOUTLINE", "AutoOutline")
+#define STR_UNDO_SUBTOTALS                      NC_("STR_UNDO_SUBTOTALS", "Subtotals")
+#define STR_UNDO_SORT                           NC_("STR_UNDO_SORT", "Sort")
+#define STR_UNDO_QUERY                          NC_("STR_UNDO_QUERY", "Filter")
+#define STR_UNDO_DBDATA                         NC_("STR_UNDO_DBDATA", "Change Database Range")
+#define STR_UNDO_IMPORTDATA                     NC_("STR_UNDO_IMPORTDATA", "Importing")
+#define STR_UNDO_REPEATDB                       NC_("STR_UNDO_REPEATDB", "Refresh range")
+#define STR_UNDO_LISTNAMES                      NC_("STR_UNDO_LISTNAMES", "List names")
+#define STR_UNDO_PIVOT_NEW                      NC_("STR_UNDO_PIVOT_NEW", "Create pivot table")
+#define STR_UNDO_PIVOT_MODIFY                   NC_("STR_UNDO_PIVOT_MODIFY", "Edit pivot table")
+#define STR_UNDO_PIVOT_DELETE                   NC_("STR_UNDO_PIVOT_DELETE", "Delete pivot table")
+#define STR_UNDO_CONSOLIDATE                    NC_("STR_UNDO_CONSOLIDATE", "Consolidate")
+#define STR_UNDO_USESCENARIO                    NC_("STR_UNDO_USESCENARIO", "Use scenario")
+#define STR_UNDO_MAKESCENARIO                   NC_("STR_UNDO_MAKESCENARIO", "Create scenario")
+#define STR_UNDO_EDITSCENARIO                   NC_("STR_UNDO_EDITSCENARIO", "Edit scenario")
+#define STR_UNDO_APPLYCELLSTYLE                 NC_("STR_UNDO_APPLYCELLSTYLE", "Apply Cell Style")
+#define STR_UNDO_EDITCELLSTYLE                  NC_("STR_UNDO_EDITCELLSTYLE", "Edit Cell Style")
+#define STR_UNDO_APPLYPAGESTYLE                 NC_("STR_UNDO_APPLYPAGESTYLE", "Apply Page Style")
+#define STR_UNDO_EDITPAGESTYLE                  NC_("STR_UNDO_EDITPAGESTYLE", "Edit Page Style")
+#define STR_UNDO_DETADDPRED                     NC_("STR_UNDO_DETADDPRED", "Trace Precedents")
+#define STR_UNDO_DETDELPRED                     NC_("STR_UNDO_DETDELPRED", "Remove Precedent")
+#define STR_UNDO_DETADDSUCC                     NC_("STR_UNDO_DETADDSUCC", "Trace Dependents")
+#define STR_UNDO_DETDELSUCC                     NC_("STR_UNDO_DETDELSUCC", "Remove Dependent")
+#define STR_UNDO_DETADDERROR                    NC_("STR_UNDO_DETADDERROR", "Trace Error")
+#define STR_UNDO_DETDELALL                      NC_("STR_UNDO_DETDELALL", "Remove all Traces")
+#define STR_UNDO_DETINVALID                     NC_("STR_UNDO_DETINVALID", "Mark invalid data")
+#define STR_UNDO_DETREFRESH                     NC_("STR_UNDO_DETREFRESH", "Refresh Traces")
+#define STR_UNDO_CHARTDATA                      NC_("STR_UNDO_CHARTDATA", "Modify chart data range")
+#define STR_UNDO_ORIGINALSIZE                   NC_("STR_UNDO_ORIGINALSIZE", "Original Size")
+#define STR_UNDO_UPDATELINK                     NC_("STR_UNDO_UPDATELINK", "Update Link")
+#define STR_UNDO_REMOVELINK                     NC_("STR_UNDO_REMOVELINK", "Unlink")
+#define STR_UNDO_INSERTAREALINK                 NC_("STR_UNDO_INSERTAREALINK", "Insert Link")
+#define STR_UNDO_ENTERMATRIX                    NC_("STR_UNDO_ENTERMATRIX", "Insert Array Formula")
+#define STR_UNDO_INSERTNOTE                     NC_("STR_UNDO_INSERTNOTE", "Insert Comment")
+#define STR_UNDO_DELETENOTE                     NC_("STR_UNDO_DELETENOTE", "Delete Comment")
+#define STR_UNDO_SHOWNOTE                       NC_("STR_UNDO_SHOWNOTE", "Show Comment")
+#define STR_UNDO_HIDENOTE                       NC_("STR_UNDO_HIDENOTE", "Hide Comment")
+#define STR_UNDO_SHOWALLNOTES                   NC_("STR_UNDO_SHOWALLNOTES", "Show All Comments")
+#define STR_UNDO_HIDEALLNOTES                   NC_("STR_UNDO_HIDEALLNOTES", "Hide All Comments")
+#define STR_UNDO_EDITNOTE                       NC_("STR_UNDO_EDITNOTE", "Edit Comment")
+#define STR_UNDO_DEC_INDENT                     NC_("STR_UNDO_DEC_INDENT", "Decrease Indent")
+#define STR_UNDO_INC_INDENT                     NC_("STR_UNDO_INC_INDENT", "Increase Indent")
+#define STR_UNDO_PROTECT_TAB                    NC_("STR_UNDO_PROTECT_TAB", "Protect sheet")
+#define STR_UNDO_UNPROTECT_TAB                  NC_("STR_UNDO_UNPROTECT_TAB", "Unprotect sheet")
+#define STR_UNDO_PROTECT_DOC                    NC_("STR_UNDO_PROTECT_DOC", "Protect document")
+#define STR_UNDO_UNPROTECT_DOC                  NC_("STR_UNDO_UNPROTECT_DOC", "Unprotect document")
+#define STR_UNDO_PRINTRANGES                    NC_("STR_UNDO_PRINTRANGES", "Print range")
+#define STR_UNDO_REMOVEBREAKS                   NC_("STR_UNDO_REMOVEBREAKS", "Delete Page Breaks")
+#define STR_UNDO_PRINTSCALE                     NC_("STR_UNDO_PRINTSCALE", "Change Scale")
+#define STR_UNDO_DRAG_BREAK                     NC_("STR_UNDO_DRAG_BREAK", "Move Page Break")
+#define STR_UNDO_RANGENAMES                     NC_("STR_UNDO_RANGENAMES", "Edit range names")
+#define STR_UNDO_TRANSLITERATE                  NC_("STR_UNDO_TRANSLITERATE", "Change Case")
+#define STR_DBNAME_IMPORT                       NC_("STR_DBNAME_IMPORT", "Import")
+#define STR_MSSG_DOSUBTOTALS_0                  NC_("STR_MSSG_DOSUBTOTALS_0", "%PRODUCTNAME Calc")
+#define STR_MSSG_DOSUBTOTALS_1                  NC_("STR_MSSG_DOSUBTOTALS_1", "Delete data?")
+#define STR_MSSG_DOSUBTOTALS_2                  NC_("STR_MSSG_DOSUBTOTALS_2", "Unable to insert rows")
+#define STR_MSSG_REPEATDB_0                     NC_("STR_MSSG_REPEATDB_0", "No operations to execute")
+#define STR_MSSG_MAKEAUTOFILTER_0               NC_("STR_MSSG_MAKEAUTOFILTER_0", "The range does not contain column headers.\nDo you want the first line to be used as column header?")
+#define STR_MSSG_IMPORTDATA_0                   NC_("STR_MSSG_IMPORTDATA_0", "Error while importing data!")
+#define STR_PROGRESS_IMPORT                     NC_("STR_PROGRESS_IMPORT", "# records imported...")
+#define STR_MSSG_MAKEOUTLINE_0                  NC_("STR_MSSG_MAKEOUTLINE_0", "Grouping not possible")
+#define STR_MSSG_REMOVEOUTLINE_0                NC_("STR_MSSG_REMOVEOUTLINE_0", "Ungrouping not possible")
+#define STR_MSSG_PASTEFROMCLIP_0                NC_("STR_MSSG_PASTEFROMCLIP_0", "Insert into multiple selection not possible")
+#define STR_MSSG_MOVEBLOCKTO_0                  NC_("STR_MSSG_MOVEBLOCKTO_0", "Cell merge not possible if cells already merged!")
+#define STR_MSSG_INSERTCELLS_0                  NC_("STR_MSSG_INSERTCELLS_0", "Inserting into merged ranges not possible")
+#define STR_MSSG_DELETECELLS_0                  NC_("STR_MSSG_DELETECELLS_0", "Deleting in merged ranges not possible")
+#define STR_MSSG_MERGECELLS_0                   NC_("STR_MSSG_MERGECELLS_0", "Cell merge not possible if cells already merged")
+#define STR_SORT_ERR_MERGED                     NC_("STR_SORT_ERR_MERGED", "Ranges containing merged cells can only be sorted without formats.")
+#define STR_MSSG_SOLVE_0                        NC_("STR_MSSG_SOLVE_0", "Goal Seek succeeded. Result: ")
+#define STR_MSSG_SOLVE_1                        NC_("STR_MSSG_SOLVE_1", "\n\nInsert the result into the variable cell?")
+#define STR_MSSG_SOLVE_2                        NC_("STR_MSSG_SOLVE_2", "Goal Seek failed.\n\n")
+#define STR_MSSG_SOLVE_3                        NC_("STR_MSSG_SOLVE_3", "Insert the closest value (")
+#define STR_MSSG_SOLVE_4                        NC_("STR_MSSG_SOLVE_4", ") into the variable cell anyway?")
+#define STR_TABLE_GESAMTERGEBNIS                NC_("STR_TABLE_GESAMTERGEBNIS", "Grand Total")
+#define STR_TABLE_ERGEBNIS                      NC_("STR_TABLE_ERGEBNIS", "Result")
+#define STR_UNDO_SPELLING                       NC_("STR_UNDO_SPELLING", "Spellcheck")
+#define STR_TABLE_UND                           NC_("STR_TABLE_UND", "AND")
+#define STR_TABLE_ODER                          NC_("STR_TABLE_ODER", "OR")
+#define STR_TABLE_DEF                           NC_("STR_TABLE_DEF", "Sheet")
+#define STR_MOVE_TO_END                         NC_("STR_MOVE_TO_END", "- move to end position -")
+#define STR_NO_REF_TABLE                        NC_("STR_NO_REF_TABLE", "#REF!")
+#define STR_PIVOT_NODATA                        NC_("STR_PIVOT_NODATA", "The pivot table must contain at least one entry.")
+#define STR_PIVOT_MOVENOTALLOWED                NC_("STR_PIVOT_MOVENOTALLOWED", "The data range can not be deleted.")
+#define STR_PIVOT_ERROR                         NC_("STR_PIVOT_ERROR", "Error creating the pivot table.")
+#define STR_PIVOT_NOTEMPTY                      NC_("STR_PIVOT_NOTEMPTY", "The destination range is not empty. Overwrite existing contents?")
+#define STR_PIVOT_REMOVE_PIVOTCHART             NC_("STR_PIVOT_REMOVE_PIVOTCHART", "There is at least one pivot chart associated with this pivot table. Should remove all or abort?")
+#define STR_DATAPILOT_SUBTOTAL                  NC_("STR_DATAPILOT_SUBTOTAL", "The source range contains subtotals which may distort the results. Use it anyway?")
+#define STR_PIVOT_TOTAL                         NC_("STR_PIVOT_TOTAL", "Total")
+#define STR_PIVOT_DATA                          NC_("STR_PIVOT_DATA", "Data")
+#define STR_PIVOT_GROUP                         NC_("STR_PIVOT_GROUP", "Group")
+#define STR_ROWCOL_SELCOUNT                     NC_("STR_ROWCOL_SELCOUNT", "$1 rows, $2 columns selected")
+#define STR_FILTER_SELCOUNT                     NC_("STR_FILTER_SELCOUNT", "$1 of $2 records found")
+#define STR_COLUMN                              NC_("STR_COLUMN", "Column")
+#define STR_ROW                                 NC_("STR_ROW", "Row")
+#define STR_PAGE                                NC_("STR_PAGE", "Page")
+#define STR_PGNUM                               NC_("STR_PGNUM", "Page %1")
+#define STR_LOAD_DOC                            NC_("STR_LOAD_DOC", "Load document")
+#define STR_SAVE_DOC                            NC_("STR_SAVE_DOC", "Save document")
+#define STR_AREA_ALREADY_INSERTED               NC_("STR_AREA_ALREADY_INSERTED", "This range has already been inserted.")
+#define STR_INVALID_TABREF                      NC_("STR_INVALID_TABREF", "Invalid sheet reference.")
+#define STR_INVALID_QUERYAREA                   NC_("STR_INVALID_QUERYAREA", "This range does not contain a valid query.")
+#define STR_REIMPORT_EMPTY                      NC_("STR_REIMPORT_EMPTY", "This range does not contain imported data.")
+#define STR_NOMULTISELECT                       NC_("STR_NOMULTISELECT", "This function cannot be used with multiple selections.")
+#define STR_FILL_SERIES_PROGRESS                NC_("STR_FILL_SERIES_PROGRESS", "Fill Row...")
+#define STR_UNDO_THESAURUS                      NC_("STR_UNDO_THESAURUS", "Thesaurus")
+#define STR_FILL_TAB                            NC_("STR_FILL_TAB", "Fill Sheets")
+#define STR_UPDATE_SCENARIO                     NC_("STR_UPDATE_SCENARIO", "Add selected ranges to current scenario?")
+#define STR_ERR_NEWSCENARIO                     NC_("STR_ERR_NEWSCENARIO", "The scenario ranges must be selected in order to be able to create a new scenario.")
+#define STR_NOAREASELECTED                      NC_("STR_NOAREASELECTED", "A range has not been selected.")
+#define STR_NEWTABNAMENOTUNIQUE                 NC_("STR_NEWTABNAMENOTUNIQUE", "This name already exists.")
+#define STR_INVALIDTABNAME                      NC_("STR_INVALIDTABNAME", "Invalid sheet name.\nThe sheet name must not be a duplicate of an existing name \nand may not contain the characters [ ] * ? : / \\")
+#define STR_SCENARIO                            NC_("STR_SCENARIO", "Scenario")
+#define STR_PIVOT_TABLE                         NC_("STR_PIVOT_TABLE", "Pivot Table")
+ // Text strings for captions of subtotal functions.
+#define STR_FUN_TEXT_SUM                        NC_("STR_FUN_TEXT_SUM", "Sum")
+#define STR_FUN_TEXT_SELECTION_COUNT            NC_("STR_FUN_TEXT_SELECTION_COUNT", "Selection count")
+#define STR_FUN_TEXT_COUNT                      NC_("STR_FUN_TEXT_COUNT", "Count")
+#define STR_FUN_TEXT_COUNT2                     NC_("STR_FUN_TEXT_COUNT2", "CountA")
+#define STR_FUN_TEXT_AVG                        NC_("STR_FUN_TEXT_AVG", "Average")
+#define STR_FUN_TEXT_MEDIAN                     NC_("STR_FUN_TEXT_MEDIAN", "Median")
+#define STR_FUN_TEXT_MAX                        NC_("STR_FUN_TEXT_MAX", "Max")
+#define STR_FUN_TEXT_MIN                        NC_("STR_FUN_TEXT_MIN", "Min")
+#define STR_FUN_TEXT_PRODUCT                    NC_("STR_FUN_TEXT_PRODUCT", "Product")
+#define STR_FUN_TEXT_STDDEV                     NC_("STR_FUN_TEXT_STDDEV", "StDev")
+#define STR_FUN_TEXT_VAR                        NC_("STR_FUN_TEXT_VAR", "Var")
+#define STR_NOCHARTATCURSOR                     NC_("STR_NOCHARTATCURSOR", "No chart found at this position.")
+#define STR_PIVOT_NOTFOUND                      NC_("STR_PIVOT_NOTFOUND", "No pivot table found at this position.")
+#define STR_EMPTYDATA                           NC_("STR_EMPTYDATA", "(empty)")
+#define STR_PRINT_INVALID_AREA                  NC_("STR_PRINT_INVALID_AREA", "Invalid print range")
+#define STR_PAGESTYLE                           NC_("STR_PAGESTYLE", "Page Style")
+#define STR_HEADER                              NC_("STR_HEADER", "Header")
+#define STR_FOOTER                              NC_("STR_FOOTER", "Footer")
+#define STR_TEXTATTRS                           NC_("STR_TEXTATTRS", "Text Attributes")
+#define STR_HFCMD_DELIMITER                     NC_("STR_HFCMD_DELIMITER", "\\")
+#define STR_HFCMD_PAGE                          NC_("STR_HFCMD_PAGE", "PAGE")
+#define STR_HFCMD_PAGES                         NC_("STR_HFCMD_PAGES", "PAGES")
+#define STR_HFCMD_DATE                          NC_("STR_HFCMD_DATE", "DATE")
+#define STR_HFCMD_TIME                          NC_("STR_HFCMD_TIME", "TIME")
+#define STR_HFCMD_FILE                          NC_("STR_HFCMD_FILE", "FILE")
+#define STR_HFCMD_TABLE                         NC_("STR_HFCMD_TABLE", "SHEET")
+#define STR_PROTECTIONERR                       NC_("STR_PROTECTIONERR", "Protected cells can not be modified.")
+#define STR_READONLYERR                         NC_("STR_READONLYERR", "Document opened in read-only mode.")
+#define STR_MATRIXFRAGMENTERR                   NC_("STR_MATRIXFRAGMENTERR", "You cannot change only part of an array.")
+#define STR_PAGEHEADER                          NC_("STR_PAGEHEADER", "Header")
+#define STR_PAGEFOOTER                          NC_("STR_PAGEFOOTER", "Footer")
+
+/* BEGIN error constants and error strings. */
+#define STR_ERROR_STR                           NC_("STR_ERROR_STR", "Err:")
+/* BEGIN defined ERROR.TYPE() values. */
+/* ERROR.TYPE( #DIV/0! ) == 2 */
+#define STR_LONG_ERR_DIV_ZERO                   NC_("STR_LONG_ERR_DIV_ZERO", "Error: Division by zero")
+/* ERROR.TYPE( #VALUE! ) == 3 */
+#define STR_LONG_ERR_NO_VALUE                   NC_("STR_LONG_ERR_NO_VALUE", "Error: Wrong data type")
+/* ERROR.TYPE( #REF! ) == 4 */
+#define STR_LONG_ERR_NO_REF                     NC_("STR_LONG_ERR_NO_REF", "Error: Not a valid reference")
+/* ERROR.TYPE( #NAME! ) == 5 */
+#define STR_LONG_ERR_NO_NAME                    NC_("STR_LONG_ERR_NO_NAME", "Error: Invalid name")
+/* ERROR.TYPE( #NUM! ) == 6 */
+#define STR_LONG_ERR_ILL_FPO                    NC_("STR_LONG_ERR_ILL_FPO", "Error: Invalid numeric value")
+/* ERROR.TYPE( #N/A ) == 7 */
+#define STR_LONG_ERR_NV                         NC_("STR_LONG_ERR_NV", "Error: Value not available")
+/* END defined ERROR.TYPE() values. */
+#define STR_NO_ADDIN                            NC_("STR_NO_ADDIN", "#ADDIN?")
+#define STR_LONG_ERR_NO_ADDIN                   NC_("STR_LONG_ERR_NO_ADDIN", "Error: Add-in not found")
+#define STR_NO_MACRO                            NC_("STR_NO_MACRO", "#MACRO?")
+#define STR_LONG_ERR_NO_MACRO                   NC_("STR_LONG_ERR_NO_MACRO", "Error: Macro not found")
+#define STR_LONG_ERR_SYNTAX                     NC_("STR_LONG_ERR_SYNTAX", "Internal syntactical error")
+#define STR_LONG_ERR_ILL_ARG                    NC_("STR_LONG_ERR_ILL_ARG", "Error: Invalid argument")
+#define STR_LONG_ERR_ILL_PAR                    NC_("STR_LONG_ERR_ILL_PAR", "Error in parameter list")
+#define STR_LONG_ERR_ILL_CHAR                   NC_("STR_LONG_ERR_ILL_CHAR", "Error: Invalid character")
+#define STR_LONG_ERR_PAIR                       NC_("STR_LONG_ERR_PAIR", "Error: in bracketing")
+#define STR_LONG_ERR_OP_EXP                     NC_("STR_LONG_ERR_OP_EXP", "Error: Operator missing")
+#define STR_LONG_ERR_VAR_EXP                    NC_("STR_LONG_ERR_VAR_EXP", "Error: Variable missing")
+#define STR_LONG_ERR_CODE_OVF                   NC_("STR_LONG_ERR_CODE_OVF", "Error: Formula overflow")
+#define STR_LONG_ERR_STR_OVF                    NC_("STR_LONG_ERR_STR_OVF", "Error: String overflow")
+#define STR_LONG_ERR_STACK_OVF                  NC_("STR_LONG_ERR_STACK_OVF", "Error: Internal overflow")
+#define STR_LONG_ERR_MATRIX_SIZE                NC_("STR_LONG_ERR_MATRIX_SIZE", "Error: Array or matrix size")
+#define STR_LONG_ERR_CIRC_REF                   NC_("STR_LONG_ERR_CIRC_REF", "Error: Circular reference")
+#define STR_LONG_ERR_NO_CONV                    NC_("STR_LONG_ERR_NO_CONV", "Error: Calculation does not converge")
+/* END error constants and error strings. */
+
+#define STR_GRIDCOLOR                           NC_("STR_GRIDCOLOR", "Grid color")
+#define STR_CELL_FILTER                         NC_("STR_CELL_FILTER", "Filter")
+#define STR_TARGETNOTFOUND                      NC_("STR_TARGETNOTFOUND", "The target database range does not exist.")
+#define STR_INVALID_EPS                         NC_("STR_INVALID_EPS", "Invalid increment")
+#define STR_UNDO_TABOP                          NC_("STR_UNDO_TABOP", "Multiple operations")
+#define STR_INVALID_AFNAME                      NC_("STR_INVALID_AFNAME", "You have entered an invalid name.\nAutoFormat could not be created. \nTry again using a different name.")
+#define STR_AREA                                NC_("STR_AREA", "Range")
+#define STR_YES                                 NC_("STR_YES", "Yes")
+#define STR_NO                                  NC_("STR_NO", "No")
+#define STR_PROTECTION                          NC_("STR_PROTECTION", "Protection")
+#define STR_FORMULAS                            NC_("STR_FORMULAS", "Formulas")
+#define STR_HIDE                                NC_("STR_HIDE", "Hide")
+#define STR_PRINT                               NC_("STR_PRINT", "Print")
+#define STR_INVALID_AFAREA                      NC_("STR_INVALID_AFAREA", "To apply an AutoFormat,\na table range of at least\n3x3 cells must be selected.")
+#define STR_OPTIONAL                            NC_("STR_OPTIONAL", "(optional)")
+#define STR_REQUIRED                            NC_("STR_REQUIRED", "(required)")
+#define STR_NOTES                               NC_("STR_NOTES", "Comments")
+#define STR_QUERY_DELTAB                        NC_("STR_QUERY_DELTAB", "Are you sure you want to delete the selected sheet(s)?")
+#define STR_QUERY_DELSCENARIO                   NC_("STR_QUERY_DELSCENARIO", "Are you sure you want to delete the selected scenario?")
+#define STR_EXPORT_ASCII                        NC_("STR_EXPORT_ASCII", "Export Text File")
+#define STR_IMPORT_LOTUS                        NC_("STR_IMPORT_LOTUS", "Import Lotus files")
+#define STR_IMPORT_DBF                          NC_("STR_IMPORT_DBF", "Import DBase files")
+#define STR_EXPORT_DBF                          NC_("STR_EXPORT_DBF", "DBase export")
+#define STR_EXPORT_DIF                          NC_("STR_EXPORT_DIF", "Dif Export")
+#define STR_IMPORT_DIF                          NC_("STR_IMPORT_DIF", "Dif Import")
+#define STR_STYLENAME_STANDARD                  NC_("STR_STYLENAME_STANDARD", "Default")
+#define STR_STYLENAME_RESULT                    NC_("STR_STYLENAME_RESULT", "Result")
+#define STR_STYLENAME_RESULT1                   NC_("STR_STYLENAME_RESULT1", "Result2")
+#define STR_STYLENAME_HEADLINE                  NC_("STR_STYLENAME_HEADLINE", "Heading")
+#define STR_STYLENAME_HEADLINE1                 NC_("STR_STYLENAME_HEADLINE1", "Heading1")
+#define STR_STYLENAME_REPORT                    NC_("STR_STYLENAME_REPORT", "Report")
+#define STR_THESAURUS_NO_STRING                 NC_("STR_THESAURUS_NO_STRING", "Thesaurus can only be used in text cells!")
+#define STR_SPELLING_BEGIN_TAB                  NC_("STR_SPELLING_BEGIN_TAB", "Should the spellcheck be continued at the beginning of the current sheet?")
+#define STR_SPELLING_NO_LANG                    NC_("STR_SPELLING_NO_LANG", "is not available for the thesaurus.\nPlease check your installation and install \nthe desired language if necessary")
+#define STR_SPELLING_STOP_OK                    NC_("STR_SPELLING_STOP_OK", "The spellcheck of this sheet has been completed.")
+#define STR_UNDO_INSERT_TAB                     NC_("STR_UNDO_INSERT_TAB", "Insert Sheet")
+#define STR_UNDO_DELETE_TAB                     NC_("STR_UNDO_DELETE_TAB", "Delete Sheets")
+#define STR_UNDO_RENAME_TAB                     NC_("STR_UNDO_RENAME_TAB", "Rename Sheet")
+#define STR_UNDO_SET_TAB_BG_COLOR               NC_("STR_UNDO_SET_TAB_BG_COLOR", "Color Tab")
+#define STR_UNDO_SET_MULTI_TAB_BG_COLOR         NC_("STR_UNDO_SET_MULTI_TAB_BG_COLOR", "Color Tabs")
+#define STR_UNDO_MOVE_TAB                       NC_("STR_UNDO_MOVE_TAB", "Move Sheets")
+#define STR_UNDO_COPY_TAB                       NC_("STR_UNDO_COPY_TAB", "Copy Sheet")
+#define STR_UNDO_APPEND_TAB                     NC_("STR_UNDO_APPEND_TAB", "Append sheet")
+#define STR_UNDO_SHOWTAB                        NC_("STR_UNDO_SHOWTAB", "Show Sheet")
+#define STR_UNDO_SHOWTABS                       NC_("STR_UNDO_SHOWTABS", "Show Sheets")
+#define STR_UNDO_HIDETAB                        NC_("STR_UNDO_HIDETAB", "Hide sheet")
+#define STR_UNDO_HIDETABS                       NC_("STR_UNDO_HIDETABS", "Hide sheets")
+#define STR_UNDO_TAB_RTL                        NC_("STR_UNDO_TAB_RTL", "Flip sheet")
+#define STR_ABSREFLOST                          NC_("STR_ABSREFLOST", "The new table contains absolute references to other tables which may be incorrect!")
+#define STR_NAMECONFLICT                        NC_("STR_NAMECONFLICT", "Due to identical names, an existing range name in the destination document has been altered!")
+#define STR_ERR_AUTOFILTER                      NC_("STR_ERR_AUTOFILTER", "AutoFilter not possible")
+#define STR_CREATENAME_REPLACE                  NC_("STR_CREATENAME_REPLACE", "Replace existing definition of #?")
+#define STR_CREATENAME_MARKERR                  NC_("STR_CREATENAME_MARKERR", "Invalid selection for range names")
+#define STR_CONSOLIDATE_ERR1                    NC_("STR_CONSOLIDATE_ERR1", "References can not be inserted above the source data.")
+#define STR_SCENARIO_NOTFOUND                   NC_("STR_SCENARIO_NOTFOUND", "Scenario not found")
+#define STR_QUERY_DELENTRY                      NC_("STR_QUERY_DELENTRY", "Do you really want to delete the entry #?")
+#define STR_VOBJ_OBJECT                         NC_("STR_VOBJ_OBJECT", "Objects/Images")
+#define STR_VOBJ_CHART                          NC_("STR_VOBJ_CHART", "Charts")
+#define STR_VOBJ_DRAWINGS                       NC_("STR_VOBJ_DRAWINGS", "Drawing Objects")
+#define STR_VOBJ_MODE_SHOW                      NC_("STR_VOBJ_MODE_SHOW", "Show")
+#define STR_VOBJ_MODE_HIDE                      NC_("STR_VOBJ_MODE_HIDE", "Hide")
+#define STR_SCATTR_PAGE_TOPDOWN                 NC_("STR_SCATTR_PAGE_TOPDOWN", "Top to bottom")
+#define STR_SCATTR_PAGE_LEFTRIGHT               NC_("STR_SCATTR_PAGE_LEFTRIGHT", "Left-to-right")
+#define STR_SCATTR_PAGE_NOTES                   NC_("STR_SCATTR_PAGE_NOTES", "Comments")
+#define STR_SCATTR_PAGE_GRID                    NC_("STR_SCATTR_PAGE_GRID", "Grid")
+#define STR_SCATTR_PAGE_HEADERS                 NC_("STR_SCATTR_PAGE_HEADERS", "Row & Column Headers")
+#define STR_SCATTR_PAGE_FORMULAS                NC_("STR_SCATTR_PAGE_FORMULAS", "Formulas")
+#define STR_SCATTR_PAGE_NULLVALS                NC_("STR_SCATTR_PAGE_NULLVALS", "Zero Values")
+#define STR_SCATTR_PAGE_PRINTDIR                NC_("STR_SCATTR_PAGE_PRINTDIR", "Print direction")
+#define STR_SCATTR_PAGE_FIRSTPAGENO             NC_("STR_SCATTR_PAGE_FIRSTPAGENO", "First page number")
+#define STR_SCATTR_PAGE_SCALE                   NC_("STR_SCATTR_PAGE_SCALE", "Reduce/enlarge printout")
+#define STR_SCATTR_PAGE_SCALETOPAGES            NC_("STR_SCATTR_PAGE_SCALETOPAGES", "Fit print range(s) on number of pages")
+#define STR_SCATTR_PAGE_SCALETO                 NC_("STR_SCATTR_PAGE_SCALETO", "Fit print range(s) to width/height")
+#define STR_SCATTR_PAGE_SCALE_WIDTH             NC_("STR_SCATTR_PAGE_SCALE_WIDTH", "Width")
+#define STR_SCATTR_PAGE_SCALE_HEIGHT            NC_("STR_SCATTR_PAGE_SCALE_HEIGHT", "Height")
+#define STR_SCATTR_PAGE_SCALE_PAGES             NC_("STR_SCATTR_PAGE_SCALE_PAGES", "%1 page(s)")
+#define STR_SCATTR_PAGE_SCALE_AUTO              NC_("STR_SCATTR_PAGE_SCALE_AUTO", "automatic")
+#define STR_DOC_STAT                            NC_("STR_DOC_STAT", "Statistics")
+#define STR_LINKERROR                           NC_("STR_LINKERROR", "The link could not be updated.")
+#define STR_LINKERRORFILE                       NC_("STR_LINKERRORFILE", "File:")
+#define STR_LINKERRORTAB                        NC_("STR_LINKERRORTAB", "Sheet:")
+#define STR_OVERVIEW                            NC_("STR_OVERVIEW", "Overview")
+#define STR_DOC_INFO                            NC_("STR_DOC_INFO", "Doc.Information")
+#define STR_DOC_PRINTED                         NC_("STR_DOC_PRINTED", "Printed")
+#define STR_BY                                  NC_("STR_BY", "by")
+#define STR_ON                                  NC_("STR_ON", "on")
+#define STR_RELOAD_TABLES                       NC_("STR_RELOAD_TABLES", "This file contains links to other files.\nShould they be updated?")
+#define STR_REIMPORT_AFTER_LOAD                 NC_("STR_REIMPORT_AFTER_LOAD", "This file contains queries. The results of these queries were not saved.\nDo you want these queries to be repeated?")
+#define STR_INSERT_FULL                         NC_("STR_INSERT_FULL", "Filled cells cannot be shifted\nbeyond the sheet.")
+#define STR_TABINSERT_ERROR                     NC_("STR_TABINSERT_ERROR", "The table could not be inserted.")
+#define STR_TABREMOVE_ERROR                     NC_("STR_TABREMOVE_ERROR", "The sheets could not be deleted.")
+#define STR_PASTE_ERROR                         NC_("STR_PASTE_ERROR", "The contents of the clipboard could not be pasted.")
+#define STR_PASTE_FULL                          NC_("STR_PASTE_FULL", "There is not enough space on the sheet to insert here.")
+#define STR_PASTE_BIGGER                        NC_("STR_PASTE_BIGGER", "The content of the clipboard is bigger than the range selected.\nDo you want to insert it anyway?")
+#define STR_ERR_NOREF                           NC_("STR_ERR_NOREF", "No cell references are found in the selected cells.")
+#define STR_GRAPHICNAME                         NC_("STR_GRAPHICNAME", "Image")
+#define STR_INVALIDNAME                         NC_("STR_INVALIDNAME", "Invalid name.")
+#define STR_VALID_MACRONOTFOUND                 NC_("STR_VALID_MACRONOTFOUND", "Selected macro not found.")
+#define STR_VALID_DEFERROR                      NC_("STR_VALID_DEFERROR", "Invalid value.")
+#define STR_PROGRESS_CALCULATING                NC_("STR_PROGRESS_CALCULATING", "calculating")
+#define STR_PROGRESS_SORTING                    NC_("STR_PROGRESS_SORTING", "sorting")
+#define STR_PROGRESS_HEIGHTING                  NC_("STR_PROGRESS_HEIGHTING", "Adapt row height")
+#define STR_PROGRESS_COMPARING                  NC_("STR_PROGRESS_COMPARING", "Compare #")
+#define STR_DETINVALID_OVERFLOW                 NC_("STR_DETINVALID_OVERFLOW", "The maximum number of invalid cells has been exceeded.\nNot all invalid cells have been marked.")
+#define STR_QUICKHELP_DELETE                    NC_("STR_QUICKHELP_DELETE", "Delete contents")
+#define STR_QUICKHELP_REF                       NC_("STR_QUICKHELP_REF", "%1 R  x %2 C")
+#define STR_FUNCTIONLIST_MORE                   NC_("STR_FUNCTIONLIST_MORE", "More...")
+#define STR_ERR_INVALID_AREA                    NC_("STR_ERR_INVALID_AREA", "Invalid range")
+// Templates for data pilot tables.
+#define STR_PIVOT_STYLE_INNER                   NC_("STR_PIVOT_STYLE_INNER", "Pivot Table Value")
+#define STR_PIVOT_STYLE_RESULT                  NC_("STR_PIVOT_STYLE_RESULT", "Pivot Table Result")
+#define STR_PIVOT_STYLE_CATEGORY                NC_("STR_PIVOT_STYLE_CATEGORY", "Pivot Table Category")
+#define STR_PIVOT_STYLE_TITLE                   NC_("STR_PIVOT_STYLE_TITLE", "Pivot Table Title")
+#define STR_PIVOT_STYLE_FIELDNAME               NC_("STR_PIVOT_STYLE_FIELDNAME", "Pivot Table Field")
+#define STR_PIVOT_STYLE_TOP                     NC_("STR_PIVOT_STYLE_TOP", "Pivot Table Corner")
+#define STR_OPERATION_FILTER                    NC_("STR_OPERATION_FILTER", "Filter")
+#define STR_OPERATION_SORT                      NC_("STR_OPERATION_SORT", "Sort")
+#define STR_OPERATION_SUBTOTAL                  NC_("STR_OPERATION_SUBTOTAL", "Subtotals")
+#define STR_OPERATION_NONE                      NC_("STR_OPERATION_NONE", "None")
+#define STR_IMPORT_REPLACE                      NC_("STR_IMPORT_REPLACE", "Do you want to replace the contents of #?")
+#define STR_TIP_WIDTH                           NC_("STR_TIP_WIDTH", "Width:")
+#define STR_TIP_HEIGHT                          NC_("STR_TIP_HEIGHT", "Height:")
+#define STR_TIP_HIDE                            NC_("STR_TIP_HIDE", "Hide")
+#define STR_CHANGED_BLANK                       NC_("STR_CHANGED_BLANK", "<empty>")
+#define STR_CHANGED_CELL                        NC_("STR_CHANGED_CELL", "Cell #1 changed from '#2' to '#3'")
+#define STR_CHANGED_INSERT                      NC_("STR_CHANGED_INSERT", "#1 inserted")
+#define STR_CHANGED_DELETE                      NC_("STR_CHANGED_DELETE", "#1 deleted")
+#define STR_CHANGED_MOVE                        NC_("STR_CHANGED_MOVE", "Range moved from #1 to #2")
+#define STR_END_REDLINING                       NC_("STR_END_REDLINING", "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n")
+#define STR_CLOSE_ERROR_LINK                    NC_("STR_CLOSE_ERROR_LINK", "The document can not be closed while a link is being updated.")
+#define STR_UNDO_RESIZEMATRIX                   NC_("STR_UNDO_RESIZEMATRIX", "Adapt array area")
+#define STR_TIP_RESIZEMATRIX                    NC_("STR_TIP_RESIZEMATRIX", "Array formula  %1 R x %2 C")
+#define STR_UNDO_HANGULHANJA                    NC_("STR_UNDO_HANGULHANJA", "Hangul/Hanja Conversion")
+#define STR_NAME_INPUT_CELL                     NC_("STR_NAME_INPUT_CELL", "Select Cell")
+#define STR_NAME_INPUT_RANGE                    NC_("STR_NAME_INPUT_RANGE", "Select Range")
+#define STR_NAME_INPUT_DBRANGE                  NC_("STR_NAME_INPUT_DBRANGE", "Select Database Range")
+#define STR_NAME_INPUT_ROW                      NC_("STR_NAME_INPUT_ROW", "Go To Row")
+#define STR_NAME_INPUT_SHEET                    NC_("STR_NAME_INPUT_SHEET", "Go To Sheet")
+#define STR_NAME_INPUT_DEFINE                   NC_("STR_NAME_INPUT_DEFINE", "Define Name for Range")
+#define STR_NAME_ERROR_SELECTION                NC_("STR_NAME_ERROR_SELECTION", "The selection needs to be rectangular in order to name it.")
+#define STR_NAME_ERROR_NAME                     NC_("STR_NAME_ERROR_NAME", "You must enter a valid reference or type a valid name for the selected range.")
+#define STR_CHANGED_MOVE_REJECTION_WARNING      NC_("STR_CHANGED_MOVE_REJECTION_WARNING", "WARNING: This action may have resulted in unintended changes to cell references in formulas.")
+#define STR_CHANGED_DELETE_REJECTION_WARNING    NC_("STR_CHANGED_DELETE_REJECTION_WARNING", "WARNING: This action may have resulted in references to the deleted area not being restored.")
+#define STR_UNDO_CHINESE_TRANSLATION            NC_("STR_UNDO_CHINESE_TRANSLATION", "Chinese conversion")
+#define STR_ERR_DATAPILOT_INPUT                 NC_("STR_ERR_DATAPILOT_INPUT", "You cannot change this part of the pivot table.")
+#define STR_RECALC_MANUAL                       NC_("STR_RECALC_MANUAL", "Manual")
+#define STR_RECALC_AUTO                         NC_("STR_RECALC_AUTO", "Automatic")
+#define STR_ERR_LONG_NESTED_ARRAY               NC_("STR_ERR_LONG_NESTED_ARRAY", "Nested arrays are not supported.")
+#define STR_UNDO_TEXTTOCOLUMNS                  NC_("STR_UNDO_TEXTTOCOLUMNS", "Text to Columns")
+#define STR_DOC_UPDATED                         NC_("STR_DOC_UPDATED", "Your spreadsheet has been updated with changes saved by other users.")
+#define STR_DOC_WILLBESAVED                     NC_("STR_DOC_WILLBESAVED", "The spreadsheet must be saved now to activate sharing mode.\n\nDo you want to continue?")
+#define STR_DOC_WILLNOTBESAVED                  NC_("STR_DOC_WILLNOTBESAVED", "Already resolved merge conflicts will be lost and your changes to the shared spreadsheet will not be saved.\n\nDo you want to continue?")
+#define STR_DOC_DISABLESHARED                   NC_("STR_DOC_DISABLESHARED", "Disabling shared mode of a spreadsheet hinders all other users of the shared spreadsheet to merge back their work.\n\nDo you want to continue?")
+#define STR_DOC_NOLONGERSHARED                  NC_("STR_DOC_NOLONGERSHARED", "This spreadsheet is no longer in shared mode.\n\nSave your spreadsheet to a separate file and merge your changes to the shared spreadsheet manually.")
+#define STR_SHARED_DOC_WARNING                  NC_("STR_SHARED_DOC_WARNING", "The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time.\n\nChanges to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.")
+#define STR_FILE_LOCKED_TRY_LATER               NC_("STR_FILE_LOCKED_TRY_LATER", "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nSharing mode of a locked file cannot be disabled. Try again later.")
+#define STR_FILE_LOCKED_SAVE_LATER              NC_("STR_FILE_LOCKED_SAVE_LATER", "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nTry again later to save your changes.")
+#define STR_UNKNOWN_USER                        NC_("STR_UNKNOWN_USER", "Unknown User")
+#define STR_SHAPE_AUTOSHAPE                     NC_("STR_SHAPE_AUTOSHAPE", "AutoShape")
+#define STR_SHAPE_RECTANGLE                     NC_("STR_SHAPE_RECTANGLE", "Rectangle")
+#define STR_SHAPE_LINE                          NC_("STR_SHAPE_LINE", "Line")
+#define STR_SHAPE_OVAL                          NC_("STR_SHAPE_OVAL", "Oval")
+#define STR_FORM_BUTTON                         NC_("STR_FORM_BUTTON", "Button")
+#define STR_FORM_CHECKBOX                       NC_("STR_FORM_CHECKBOX", "Check Box")
+#define STR_FORM_OPTIONBUTTON                   NC_("STR_FORM_OPTIONBUTTON", "Option Button")
+#define STR_FORM_LABEL                          NC_("STR_FORM_LABEL", "Label")
+#define STR_FORM_LISTBOX                        NC_("STR_FORM_LISTBOX", "List Box")
+#define STR_FORM_GROUPBOX                       NC_("STR_FORM_GROUPBOX", "Group Box")
+#define STR_FORM_DROPDOWN                       NC_("STR_FORM_DROPDOWN", "Drop Down")
+#define STR_FORM_SPINNER                        NC_("STR_FORM_SPINNER", "Spinner")
+#define STR_FORM_SCROLLBAR                      NC_("STR_FORM_SCROLLBAR", "Scroll Bar")
+#define STR_STYLE_FAMILY_CELL                   NC_("STR_STYLE_FAMILY_CELL", "Cell Styles")
+#define STR_STYLE_FAMILY_PAGE                   NC_("STR_STYLE_FAMILY_PAGE", "Page Styles")
+#define STR_ERR_DATAPILOTSOURCE                 NC_("STR_ERR_DATAPILOTSOURCE", "Pivot table source data is invalid.")
+#define STR_OPTIONS_WARN_SEPARATORS             NC_("STR_OPTIONS_WARN_SEPARATORS", "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.")
+#define STR_UNDO_INSERT_CURRENT_DATE            NC_("STR_UNDO_INSERT_CURRENT_DATE", "Insert Current Date")
+#define STR_UNDO_INSERT_CURRENT_TIME            NC_("STR_UNDO_INSERT_CURRENT_TIME", "Insert Current Time")
+#define STR_MANAGE_NAMES                        NC_("STR_MANAGE_NAMES", "Manage Names...")
+#define STR_HEADER_NAME                         NC_("STR_HEADER_NAME", "Name")
+#define STR_HEADER_RANGE_OR_EXPR                NC_("STR_HEADER_RANGE_OR_EXPR", "Range or formula expression")
+#define STR_HEADER_SCOPE                        NC_("STR_HEADER_SCOPE", "Scope")
+#define STR_MULTI_SELECT                        NC_("STR_MULTI_SELECT", "(multiple)")
+#define STR_GLOBAL_SCOPE                        NC_("STR_GLOBAL_SCOPE", "Document (Global)")
+#define STR_ERR_NAME_EXISTS                     NC_("STR_ERR_NAME_EXISTS", "Invalid name. Already in use for the selected scope.")
+#define STR_ERR_NAME_INVALID                    NC_("STR_ERR_NAME_INVALID", "Invalid name. Only use letters, numbers and underscore.")
+#define STR_UNSAVED_EXT_REF                     NC_("STR_UNSAVED_EXT_REF", "This Document contains external references to unsaved documents.\n\nDo you want to continue?")
+#define STR_CLOSE_WITH_UNSAVED_REFS             NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss.")
+#define STR_HEADER_RANGE                        NC_("STR_HEADER_RANGE", "Range")
+#define STR_HEADER_COND                         NC_("STR_HEADER_COND", "First Condition")
+#define STR_COND_CONDITION                      NC_("STR_COND_CONDITION", "Cell value is")
+#define STR_COND_COLORSCALE                     NC_("STR_COND_COLORSCALE", "ColorScale")
+#define STR_COND_DATABAR                        NC_("STR_COND_DATABAR", "DataBar")
+#define STR_COND_ICONSET                        NC_("STR_COND_ICONSET", "IconSet")
+#define STR_COND_BETWEEN                        NC_("STR_COND_BETWEEN", "between")
+#define STR_COND_NOTBETWEEN                     NC_("STR_COND_NOTBETWEEN", "not between")
+#define STR_COND_UNIQUE                         NC_("STR_COND_UNIQUE", "unique")
+#define STR_COND_DUPLICATE                      NC_("STR_COND_DUPLICATE", "duplicate")
+#define STR_COND_FORMULA                        NC_("STR_COND_FORMULA", "Formula is")
+#define STR_COND_TOP10                          NC_("STR_COND_TOP10", "Top Elements")
+#define STR_COND_BOTTOM10                       NC_("STR_COND_BOTTOM10", "Bottom Elements")
+#define STR_COND_TOP_PERCENT                    NC_("STR_COND_TOP_PERCENT", "Top Percent")
+#define STR_COND_DATE                           NC_("STR_COND_DATE", "Date is")
+#define STR_COND_BOTTOM_PERCENT                 NC_("STR_COND_BOTTOM_PERCENT", "Bottom Percent")
+#define STR_COND_ABOVE_AVERAGE                  NC_("STR_COND_ABOVE_AVERAGE", "Above Average")
+#define STR_COND_BELOW_AVERAGE                  NC_("STR_COND_BELOW_AVERAGE", "Below Average")
+#define STR_COND_ABOVE_EQUAL_AVERAGE            NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "Above or equal Average")
+#define STR_COND_BELOW_EQUAL_AVERAGE            NC_("STR_COND_BELOW_EQUAL_AVERAGE", "Below or equal Average")
+#define STR_COND_ERROR                          NC_("STR_COND_ERROR", "an Error code")
+#define STR_COND_NOERROR                        NC_("STR_COND_NOERROR", "not an Error code")
+#define STR_COND_BEGINS_WITH                    NC_("STR_COND_BEGINS_WITH", "Begins with")
+#define STR_COND_ENDS_WITH                      NC_("STR_COND_ENDS_WITH", "Ends with")
+#define STR_COND_CONTAINS                       NC_("STR_COND_CONTAINS", "Contains")
+#define STR_COND_NOT_CONTAINS                   NC_("STR_COND_NOT_CONTAINS", "Not Contains")
+#define STR_COND_TODAY                          NC_("STR_COND_TODAY", "today")
+#define STR_COND_YESTERDAY                      NC_("STR_COND_YESTERDAY", "yesterday")
+#define STR_COND_TOMORROW                       NC_("STR_COND_TOMORROW", "tomorrow")
+#define STR_COND_LAST7DAYS                      NC_("STR_COND_LAST7DAYS", "in the last 7 days")
+#define STR_COND_THISWEEK                       NC_("STR_COND_THISWEEK", "this week")
+#define STR_COND_LASTWEEK                       NC_("STR_COND_LASTWEEK", "last week")
+#define STR_COND_NEXTWEEK                       NC_("STR_COND_NEXTWEEK", "next week")
+#define STR_COND_THISMONTH                      NC_("STR_COND_THISMONTH", "this month")
+#define STR_COND_LASTMONTH                      NC_("STR_COND_LASTMONTH", "last month")
+#define STR_COND_NEXTMONTH                      NC_("STR_COND_NEXTMONTH", "next month")
+#define STR_COND_THISYEAR                       NC_("STR_COND_THISYEAR", "this year")
+#define STR_COND_LASTYEAR                       NC_("STR_COND_LASTYEAR", "last year")
+#define STR_COND_NEXTYEAR                       NC_("STR_COND_NEXTYEAR", "next year")
+#define STR_COND_AND                            NC_("STR_COND_AND", "and")
+#define STR_ERR_CONDFORMAT_PROTECTED            NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created, deleted or changed in protected sheets!")
+#define STR_EDIT_EXISTING_COND_FORMATS          NC_("STR_EDIT_EXISTING_COND_FORMATS", "The selected cell already contains conditional formatting. You can either edit the existing conditional format or you define a new overlapping conditional format.\n\n Do you want to edit the existing conditional format?")
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS     NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_ODS", "This document was last saved by an application other than %PRODUCTNAME.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?")
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS     NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_XLS", "This document was last saved by Excel.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells now?")
+#define STR_ALWAYS_PERFORM_SELECTED             NC_("STR_ALWAYS_PERFORM_SELECTED", "Always perform this without prompt in the future.")
+#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE   NC_("STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE", "You cannot insert or delete cells when the affected range intersects with pivot table.")
+#define STR_DPFIELD_GROUP_BY_SECONDS            NC_("STR_DPFIELD_GROUP_BY_SECONDS", "Seconds")
+#define STR_DPFIELD_GROUP_BY_MINUTES            NC_("STR_DPFIELD_GROUP_BY_MINUTES", "Minutes")
+#define STR_DPFIELD_GROUP_BY_HOURS              NC_("STR_DPFIELD_GROUP_BY_HOURS", "Hours")
+#define STR_DPFIELD_GROUP_BY_DAYS               NC_("STR_DPFIELD_GROUP_BY_DAYS", "Days")
+#define STR_DPFIELD_GROUP_BY_MONTHS             NC_("STR_DPFIELD_GROUP_BY_MONTHS", "Months")
+#define STR_DPFIELD_GROUP_BY_QUARTERS           NC_("STR_DPFIELD_GROUP_BY_QUARTERS", "Quarters")
+#define STR_DPFIELD_GROUP_BY_YEARS              NC_("STR_DPFIELD_GROUP_BY_YEARS", "Years")
+#define STR_INVALIDVAL                          NC_("STR_INVALIDVAL", "Invalid target value.")
+#define STR_INVALIDVAR                          NC_("STR_INVALIDVAR", "Undefined name for variable cell.")
+#define STR_INVALIDFORM                         NC_("STR_INVALIDFORM", "Undefined name as formula cell.")
+#define STR_NOFORMULA                           NC_("STR_NOFORMULA", "Formula cell must contain a formula.")
+#define STR_INVALIDINPUT                        NC_("STR_INVALIDINPUT", "Invalid input.")
+#define STR_INVALIDCONDITION                    NC_("STR_INVALIDCONDITION", "Invalid condition.")
+#define STR_QUERYREMOVE                         NC_("STR_QUERYREMOVE", "Should the entry\n#\nbe deleted?")
+#define STR_COPYLIST                            NC_("STR_COPYLIST", "Copy List")
+#define STR_COPYFROM                            NC_("STR_COPYFROM", "List from")
+#define STR_COPYERR                             NC_("STR_COPYERR", "Cells without text have been ignored.")
+#define STR_CTRLCLICKHYPERLINK                  NC_("STR_CTRLCLICKHYPERLINK", "%s-click to follow hyperlink:")
+#define STR_CLICKHYPERLINK                      NC_("STR_CLICKHYPERLINK", "click to open hyperlink:")
+#define STR_PRINT_PREVIEW_NODATA                NC_("STR_PRINT_PREVIEW_NODATA", "No Data")
+#define STR_PRINT_PREVIEW_EMPTY_RANGE           NC_("STR_PRINT_PREVIEW_EMPTY_RANGE", "Print Range Empty")
+#define STR_UNDO_CONDFORMAT                     NC_("STR_UNDO_CONDFORMAT", "Conditional Format")
+#define STR_UNDO_CONDFORMAT_LIST                NC_("STR_UNDO_CONDFORMAT_LIST", "Conditional Formats")
+#define STR_UNDO_FORMULA_TO_VALUE               NC_("STR_UNDO_FORMULA_TO_VALUE", "Convert Formula To Value")
+#define STR_UNQUOTED_STRING                     NC_("STR_UNQUOTED_STRING", "Strings without quotes are interpreted as column/row labels.")
+#define STR_ENTER_VALUE                         NC_("STR_ENTER_VALUE", "Enter a value!")
+#define STR_TABLE_COUNT                         NC_("STR_TABLE_COUNT", "Sheet %1 of %2")
+#define STR_FUNCTIONS_FOUND                     NC_("STR_FUNCTIONS_FOUND", "%1 and %2 more")
+#define STR_GENERAL                             NC_("STR_GENERAL", "General")
+#define STR_NUMBER                              NC_("STR_NUMBER", "Number")
+#define STR_PERCENT                             NC_("STR_PERCENT", "Percent")
+#define STR_CURRENCY                            NC_("STR_CURRENCY", "Currency")
+#define STR_DATE                                NC_("STR_DATE", "Date")
+#define STR_TIME                                NC_("STR_TIME", "Time")
+#define STR_SCIENTIFIC                          NC_("STR_SCIENTIFIC", "Scientific")
+#define STR_FRACTION                            NC_("STR_FRACTION", "Fraction")
+#define STR_BOOLEAN_VALUE                       NC_("STR_BOOLEAN_VALUE", "Boolean Value")
+#define STR_TEXT                                NC_("STR_TEXT", "Text")
+#define STR_QUERY_PIVOTTABLE_DELTAB             NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s) contain source data of related pivot tables that will be lost. Are you sure you want to delete the selected sheet(s)?")
+#define STR_ERR_NAME_INVALID_CELL_REF           NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a range of cells not allowed.")
 
 #endif
 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index a4c1c77d3fe3..869df6bbc266 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -408,8 +408,6 @@
 #include <rechead.hxx>
 #include <refupdatecontext.hxx>
 #include <rowheightcontext.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sax/tools/converter.hxx>
 #include <scabstdlg.hxx>
 #include <scerrors.hxx>
@@ -564,7 +562,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 4430b8f68e95..da96e05ed651 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -220,7 +220,6 @@
 #include <postit.hxx>
 #include <rangelst.hxx>
 #include <rangenam.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sax/fastattribs.hxx>
 #include <sax/fshelper.hxx>
 #include <scerrors.hxx>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index b85b551e1e4e..7dee266ad3e9 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -158,8 +158,6 @@
 #include <svx/xtable.hxx>
 #include <tablink.hxx>
 #include <tools/color.hxx>
-#include <tools/resary.hxx>
-#include <tools/resid.hxx>
 #include <tools/urlobj.hxx>
 #include <typedstrdata.hxx>
 #include <unotools/collatorwrapper.hxx>
diff --git a/sc/inc/pvfundlg.hrc b/sc/inc/pvfundlg.hrc
new file mode 100644
index 000000000000..5759cb3656fb
--- /dev/null
+++ b/sc/inc/pvfundlg.hrc
@@ -0,0 +1,43 @@
+/* -*- 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_SC_INC_PVFUNDLG_HRC
+#define INCLUDED_SC_INC_PVFUNDLG_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* SCSTR_DPFUNCLISTBOX[] =
+{
+    NC_("SCSTR_DPFUNCLISTBOX", "Sum"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Count"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Average"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Median"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Max"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Min"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Product"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Count (Numbers only)"),
+    NC_("SCSTR_DPFUNCLISTBOX", "StDev (Sample)"),
+    NC_("SCSTR_DPFUNCLISTBOX", "StDevP (Population)"),
+    NC_("SCSTR_DPFUNCLISTBOX", "Var (Sample)"),
+    NC_("SCSTR_DPFUNCLISTBOX", "VarP (Population)")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 23e4094193ea..9b5925b5e4ff 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -21,7 +21,7 @@
 #define SC_SC_HRC
 
 #include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include "svx/svxcommands.h"
 #include "helpids.h"
@@ -650,8 +650,6 @@
 #define SID_INSERT_CURRENT_TIME (SC_RESOURCE_START+17)
 #define FID_TAB_TOGGLE_GRID     (SC_RESOURCE_START+18) // toggle sheet grid
 #define WID_SIMPLE_REF          (SC_RESOURCE_START+20)
-#define RID_ERRHDLSC            (SC_RESOURCE_START+23)
-#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
 
 #endif
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 96d154991f4e..fa613e0c5a13 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -24,7 +24,7 @@
 #include <sfx2/sfxdlg.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/field.hxx>
-#include "scres.hrc"
+#include "sc.hrc"
 #include "global.hxx"
 #include "pivot.hxx"
 #include <i18nlangtag/lang.h>
diff --git a/sc/inc/scerrors.hrc b/sc/inc/scerrors.hrc
new file mode 100644
index 000000000000..9e8b89d4d6f2
--- /dev/null
+++ b/sc/inc/scerrors.hrc
@@ -0,0 +1,111 @@
+/* -*- 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_SC_INC_SCERRORS_HRC
+#define INCLUDED_SC_INC_SCERRORS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#include "scerrors.hxx"
+
+const ErrMsgCode RID_ERRHDLSC[] =
+{
+    // ERRORS -----------------------------------------------------
+    { NC_("RID_ERRHDLSC", "Impossible to connect to the file.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_CONNECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "File could not be opened.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_OPEN) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "An unknown error has occurred.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Not enough memory while importing.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_OUTOFMEM) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Unknown Lotus1-2-3 file format.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_WK) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Error in file structure while importing.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "There is no filter available for this file type.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_NI) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Unknown or unsupported Excel file format.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_BIFF) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Excel file format not yet implemented.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_NI_BIFF) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "This file is password-protected.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_FILEPASSWD) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Internal import error.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_INTERNAL) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The file contains data after row 8192 and therefore can not be read.") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_8K_LIMIT) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."),
+      ErrCode(sal_uInt32(SCERR_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "File format error found at $(ARG1)(row,col).") ,
+      ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT_ROWCOL) & ERRCODE_RES_MASK) },
+
+    // Export ----------------------------------------------------
+    { NC_("RID_ERRHDLSC", "Connection to the file could not be established.") ,
+      ErrCode(sal_uInt32(SCERR_EXPORT_CONNECT) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Data could not be written.") ,
+      ErrCode(sal_uInt32(SCERR_EXPORT_DATA) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "$(ARG1)") ,
+      ErrCode(sal_uInt32(SCERR_EXPORT_SQLEXCEPTION) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\".") ,
+      ErrCode(sal_uInt32(SCERR_EXPORT_ENCODING) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width.") ,
+      ErrCode(sal_uInt32(SCERR_EXPORT_FIELDWIDTH) & ERRCODE_RES_MASK) },
+
+    // WARNINGS ---------------------------------------------------
+    { NC_("RID_ERRHDLSC", "Only the active sheet was saved.") ,
+      ErrCode(sal_uInt32(SCWARN_EXPORT_ASCII) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The maximum number of rows has been exceeded. Excess rows were not imported!") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_RANGE_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of rows per sheet was exceeded.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_ROW_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of columns per sheet was exceeded.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_COLUMN_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_SHEET_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of characters per cell was exceeded.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_CELL_OVERFLOW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Corresponding FM3-File could not be opened.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_OPEN_FM3) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Error in file structure of corresponding FM3-File.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_WRONG_FM3) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Document too complex for automatic calculation. Press F9 to recalculate.") ,
+      ErrCode(sal_uInt32(SCWARN_CORE_HARD_RECALC) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The document contains more rows than supported in the selected format.\nAdditional rows were not saved.") ,
+      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXROW) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The document contains more columns than supported in the selected format.\nAdditional columns were not saved.") ,
+      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXCOL) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved.") ,
+      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXTAB) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The document contains information not recognized by this program version.\nResaving the document will delete this information!") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_INFOLOST) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Not all cell contents could be saved in the specified format.") ,
+      ErrCode(sal_uInt32(SCWARN_EXPORT_DATALOST) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "The following characters could not be converted to the selected character set\nand were written as &#1234; surrogates:\n\n$(ARG1)"),
+      ErrCode(sal_uInt32(SCWARN_EXPORT_NONCONVERTIBLE_CHARS) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."),
+      ErrCode(sal_uInt32(SCWARN_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) },
+    { NC_("RID_ERRHDLSC", "Not all attributes could be read.") ,
+      ErrCode(sal_uInt32(SCWARN_IMPORT_FEATURES_LOST) & ERRCODE_RES_MASK) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 5a4f016e6c7a..37e78ffc401e 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -16,18 +16,4070 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "scres.hrc"
-
-#define ID_FUNCTION_GRP_DATABASE    1
-#define ID_FUNCTION_GRP_DATETIME    2
-#define ID_FUNCTION_GRP_FINANZ      3
-#define ID_FUNCTION_GRP_INFO        4
-#define ID_FUNCTION_GRP_LOGIC       5
-#define ID_FUNCTION_GRP_MATH        6
-#define ID_FUNCTION_GRP_MATRIX      7
-#define ID_FUNCTION_GRP_STATISTIC   8
-#define ID_FUNCTION_GRP_TABLE       9
-#define ID_FUNCTION_GRP_TEXT        10
-#define ID_FUNCTION_GRP_ADDINS      11
+#ifndef INCLUDED_SC_INC_SCFUNCS_HRC
+#define INCLUDED_SC_INC_SCFUNCS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+/* Resource file for the function wizard / autopilot.
+ *
+ *  For every function there is a StringArray with a resource id (offset by
+ *  RID_SC_FUNC_DESCRIPTIONS_START) with the OpCode of the function
+ *
+ *  In this stringarray, the description of the function is given as the first
+ *  entry, followed by two entries for each parameter, first the type or name
+ *  of the parameter, second a description of the parameter.
+ */
+
+// -=*# Resource for function DCOUNT #*=-
+const char* SC_OPCODE_DB_COUNT_ARY[] =
+{
+    NC_("SC_OPCODE_DB_COUNT", "Counts the cells of a data range whose contents match the search criteria."),
+    NC_("SC_OPCODE_DB_COUNT", "Database"),
+    NC_("SC_OPCODE_DB_COUNT", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_COUNT", "Database field"),
+    NC_("SC_OPCODE_DB_COUNT", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_COUNT", "Search criteria"),
+    NC_("SC_OPCODE_DB_COUNT", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DCOUNTA #*=-
+const char* SC_OPCODE_DB_COUNT_2_ARY[] =
+{
+    NC_("SC_OPCODE_DB_COUNT_2", "Counts all non-blank cells of a data range where the content corresponds to the search criteria."),
+    NC_("SC_OPCODE_DB_COUNT_2", "Database"),
+    NC_("SC_OPCODE_DB_COUNT_2", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_COUNT_2", "Database field"),
+    NC_("SC_OPCODE_DB_COUNT_2", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_COUNT_2", "Search criteria"),
+    NC_("SC_OPCODE_DB_COUNT_2", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DAVERAGE #*=-
+const char* SC_OPCODE_DB_AVERAGE_ARY[] =
+{
+    NC_("SC_OPCODE_DB_AVERAGE", "Returns the average value of all the cells of a data range whose contents match the search criteria."),
+    NC_("SC_OPCODE_DB_AVERAGE", "Database"),
+    NC_("SC_OPCODE_DB_AVERAGE", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_AVERAGE", "Database field"),
+    NC_("SC_OPCODE_DB_AVERAGE", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_AVERAGE", "Search criteria"),
+    NC_("SC_OPCODE_DB_AVERAGE", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DGET #*=-
+const char* SC_OPCODE_DB_GET_ARY[] =
+{
+    NC_("SC_OPCODE_DB_GET", "Defines the contents of the cell of a data range which matches the search criteria."),
+    NC_("SC_OPCODE_DB_GET", "Database"),
+    NC_("SC_OPCODE_DB_GET", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_GET", "Database field"),
+    NC_("SC_OPCODE_DB_GET", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_GET", "Search criteria"),
+    NC_("SC_OPCODE_DB_GET", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DMAX #*=-
+const char* SC_OPCODE_DB_MAX_ARY[] =
+{
+    NC_("SC_OPCODE_DB_MAX", "Returns the maximum value from all of the cells of a data range which correspond to the search criteria."),
+    NC_("SC_OPCODE_DB_MAX", "Database"),
+    NC_("SC_OPCODE_DB_MAX", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_MAX", "Database field"),
+    NC_("SC_OPCODE_DB_MAX", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_MAX", "Search criteria"),
+    NC_("SC_OPCODE_DB_MAX", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DMIN #*=-
+const char* SC_OPCODE_DB_MIN_ARY[] =
+{
+    NC_("SC_OPCODE_DB_MIN", "Returns the minimum of all cells of a data range where the contents correspond to the search criteria."),
+    NC_("SC_OPCODE_DB_MIN", "Database"),
+    NC_("SC_OPCODE_DB_MIN", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_MIN", "Database field"),
+    NC_("SC_OPCODE_DB_MIN", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_MIN", "Search criteria"),
+    NC_("SC_OPCODE_DB_MIN", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DPRODUCT #*=-
+const char* SC_OPCODE_DB_PRODUCT_ARY[] =
+{
+    NC_("SC_OPCODE_DB_PRODUCT", "Multiplies all cells of a data range where the contents match the search criteria."),
+    NC_("SC_OPCODE_DB_PRODUCT", "Database"),
+    NC_("SC_OPCODE_DB_PRODUCT", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_PRODUCT", "Database field"),
+    NC_("SC_OPCODE_DB_PRODUCT", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_PRODUCT", "Search criteria"),
+    NC_("SC_OPCODE_DB_PRODUCT", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DSTDEV #*=-
+const char* SC_OPCODE_DB_STD_DEV_ARY[] =
+{
+    NC_("SC_OPCODE_DB_STD_DEV", "Calculates the standard deviation of all cells in a data range whose contents match the search criteria."),
+    NC_("SC_OPCODE_DB_STD_DEV", "Database"),
+    NC_("SC_OPCODE_DB_STD_DEV", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_STD_DEV", "Database field"),
+    NC_("SC_OPCODE_DB_STD_DEV", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_STD_DEV", "Search criteria"),
+    NC_("SC_OPCODE_DB_STD_DEV", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DSTDEVP #*=-
+const char* SC_OPCODE_DB_STD_DEV_P_ARY[] =
+{
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria."),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Database"),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Database field"),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Search criteria"),
+    NC_("SC_OPCODE_DB_STD_DEV_P", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DSUM #*=-
+const char* SC_OPCODE_DB_SUM_ARY[] =
+{
+    NC_("SC_OPCODE_DB_SUM", "Adds all the cells of a data range where the contents match the search criteria."),
+    NC_("SC_OPCODE_DB_SUM", "Database"),
+    NC_("SC_OPCODE_DB_SUM", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_SUM", "Database field"),
+    NC_("SC_OPCODE_DB_SUM", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_SUM", "Search criteria"),
+    NC_("SC_OPCODE_DB_SUM", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DVAR #*=-
+const char* SC_OPCODE_DB_VAR_ARY[] =
+{
+    NC_("SC_OPCODE_DB_VAR", "Determines the variance of all the cells in a data range where the contents match the search criteria."),
+    NC_("SC_OPCODE_DB_VAR", "Database"),
+    NC_("SC_OPCODE_DB_VAR", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_VAR", "Database field"),
+    NC_("SC_OPCODE_DB_VAR", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_VAR", "Search criteria"),
+    NC_("SC_OPCODE_DB_VAR", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DVARP #*=-
+const char* SC_OPCODE_DB_VAR_P_ARY[] =
+{
+    NC_("SC_OPCODE_DB_VAR_P", "Determines variance of a population based on all cells in a data range where contents match the search criteria."),
+    NC_("SC_OPCODE_DB_VAR_P", "Database"),
+    NC_("SC_OPCODE_DB_VAR_P", "The range of cells containing data."),
+    NC_("SC_OPCODE_DB_VAR_P", "Database field"),
+    NC_("SC_OPCODE_DB_VAR_P", "Indicates which database field (column) is to be used for the search criteria."),
+    NC_("SC_OPCODE_DB_VAR_P", "Search criteria"),
+    NC_("SC_OPCODE_DB_VAR_P", "Defines the cell range containing the search criteria.")
+};
+
+// -=*# Resource for function DATE #*=-
+const char* SC_OPCODE_GET_DATE_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DATE", "Provides an internal number for the date given."),
+    NC_("SC_OPCODE_GET_DATE", "year"),
+    NC_("SC_OPCODE_GET_DATE", "An integer between 1583 and 9956 or 0 and 99 (19xx or 20xx depending on the defined option)."),
+    NC_("SC_OPCODE_GET_DATE", "month"),
+    NC_("SC_OPCODE_GET_DATE", "An integer between 1 and 12 representing the month."),
+    NC_("SC_OPCODE_GET_DATE", "day"),
+    NC_("SC_OPCODE_GET_DATE", "An integer between 1 and 31 representing the day of the month.")
+};
+
+// -=*# Resource for function DATE_VALUE #*=-
+const char* SC_OPCODE_GET_DATE_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DATE_VALUE", "Returns an internal number for a text having a possible date format."),
+    NC_("SC_OPCODE_GET_DATE_VALUE", "text"),
+    NC_("SC_OPCODE_GET_DATE_VALUE", "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format.")
+};
+
+// -=*# Resource for function DAY #*=-
+const char* SC_OPCODE_GET_DAY_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DAY", "Returns the sequential date of the month as an integer (1-31) in relation to the date value."),
+    NC_("SC_OPCODE_GET_DAY", "Number"),
+    NC_("SC_OPCODE_GET_DAY", "The internal number for the date.")
+};
+
+// -=*# Resource for function DAYS360 #*=-
+const char* SC_OPCODE_GET_DIFF_DATE_360_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "Calculates the number of days between two dates based on a 360-day year."),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "Date_1"),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "The start date for calculating the difference in days."),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "Date_2"),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "The end date for calculating the difference in days."),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "Type"),
+    NC_("SC_OPCODE_GET_DIFF_DATE_360", "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method.")
+};
+
+// -=*# Resource for function NETWORKDAYS #*=-
+const char* SC_OPCODE_NETWORKDAYS_ARY[] =
+{
+    NC_("SC_OPCODE_NETWORKDAYS", "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays."),
+    NC_("SC_OPCODE_NETWORKDAYS", "Start Date"),
+    NC_("SC_OPCODE_NETWORKDAYS", "Start date for calculation."),
+    NC_("SC_OPCODE_NETWORKDAYS", "End Date"),
+    NC_("SC_OPCODE_NETWORKDAYS", "End date for calculation."),
+    NC_("SC_OPCODE_NETWORKDAYS", "list of dates"),
+    NC_("SC_OPCODE_NETWORKDAYS", "Optional set of one or more dates to be considered as holiday."),
+    NC_("SC_OPCODE_NETWORKDAYS", "array"),
+    NC_("SC_OPCODE_NETWORKDAYS", "Optional list of numbers to indicate working (0) and weekend (non-zero) days. When omitted, weekend is Saturday and Sunday.")
+};
+
+// -=*# Resource for function NETWORKDAYS.INTL #*=-
+const char* SC_OPCODE_NETWORKDAYS_MS_ARY[] =
+{
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays."),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "Start Date"),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "Start date for calculation."),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "End Date"),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "End date for calculation."),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "number or string"),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "array"),
+    NC_("SC_OPCODE_NETWORKDAYS_MS", "Optional set of one or more dates to be considered as holiday.")
+};
+
+// -=*# Resource for function WORKDAY.INTL #*=-
+const char* SC_OPCODE_WORKDAY_MS_ARY[] =
+{
+    NC_("SC_OPCODE_WORKDAY_MS", "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays."),
+    NC_("SC_OPCODE_WORKDAY_MS", "Start Date"),
+    NC_("SC_OPCODE_WORKDAY_MS", "Start date for calculation."),
+    NC_("SC_OPCODE_WORKDAY_MS", "Days"),
+    NC_("SC_OPCODE_WORKDAY_MS", "The number of workdays before or after start date."),
+    NC_("SC_OPCODE_WORKDAY_MS", "number or string"),
+    NC_("SC_OPCODE_WORKDAY_MS", "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."),
+    NC_("SC_OPCODE_WORKDAY_MS", "array"),
+    NC_("SC_OPCODE_WORKDAY_MS", "Optional set of one or more dates to be considered as holiday.")
+};
+
+// -=*# Resource for function HOUR #*=-
+const char* SC_OPCODE_GET_HOUR_ARY[] =
+{
+    NC_("SC_OPCODE_GET_HOUR", "Determines the sequential number of the hour of the day (0-23) for the time value."),
+    NC_("SC_OPCODE_GET_HOUR", "Number"),
+    NC_("SC_OPCODE_GET_HOUR", "Internal time value")
+};
+
+// -=*# Resource for function MINUTE #*=-
+const char* SC_OPCODE_GET_MIN_ARY[] =
+{
+    NC_("SC_OPCODE_GET_MIN", "Determines the sequential number for the minute of the hour (0-59) for the time value."),
+    NC_("SC_OPCODE_GET_MIN", "Number"),
+    NC_("SC_OPCODE_GET_MIN", "Internal time value.")
+};
+
+// -=*# Resource for function MONTH #*=-
+const char* SC_OPCODE_GET_MONTH_ARY[] =
+{
+    NC_("SC_OPCODE_GET_MONTH", "Determines the sequential number of a month of the year (1-12) for the date value."),
+    NC_("SC_OPCODE_GET_MONTH", "Number"),
+    NC_("SC_OPCODE_GET_MONTH", "The internal number of the date.")
+};
+
+// -=*# Resource for function NOW #*=-
+const char* SC_OPCODE_GET_ACT_TIME_ARY[] =
+{
+    NC_("SC_OPCODE_GET_ACT_TIME", "Determines the current time of the computer.")
+};
+
+// -=*# Resource for function SECOND #*=-
+const char*SC_OPCODE_GET_SEC_ARY[] =
+{
+    NC_("SC_OPCODE_GET_SEC", "Determines the sequential number of the second of a minute (0-59) for the time value."),
+    NC_("SC_OPCODE_GET_SEC", "Number"),
+    NC_("SC_OPCODE_GET_SEC", "The internal time value.")
+};
+
+// -=*# Resource for function TIME #*=-
+const char* SC_OPCODE_GET_TIME_ARY[] =
+{
+    NC_("SC_OPCODE_GET_TIME", "Determines a time value from the details for hour, minute and second."),
+    NC_("SC_OPCODE_GET_TIME", "hour"),
+    NC_("SC_OPCODE_GET_TIME", "The integer for the hour."),
+    NC_("SC_OPCODE_GET_TIME", "minute"),
+    NC_("SC_OPCODE_GET_TIME", "The integer for the minute."),
+    NC_("SC_OPCODE_GET_TIME", "second"),
+    NC_("SC_OPCODE_GET_TIME", "The integer for the second.")
+};
+
+// -=*# Resource for function TIMEVALUE #*=-
+const char* SC_OPCODE_GET_TIME_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_GET_TIME_VALUE", "Returns a sequential number for a text shown in a possible time entry format."),
+    NC_("SC_OPCODE_GET_TIME_VALUE", "text"),
+    NC_("SC_OPCODE_GET_TIME_VALUE", "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format.")
+};
+
+// -=*# Resource for function TODAY #*=-
+const char* SC_OPCODE_GET_ACT_DATE_ARY[] =
+{
+    NC_("SC_OPCODE_GET_ACT_DATE", "Determines the current date of the computer.")
+};
+
+// -=*# Resource for function WEEKDAY #*=-
+const char* SC_OPCODE_GET_DAY_OF_WEEK_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Returns the day of the week for the date value as an integer."),
+    NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Number"),
+    NC_("SC_OPCODE_GET_DAY_OF_WEEK", "The internal number for the date."),
+    NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Type"),
+    NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Fixes the beginning of the week and the type of calculation to be used.")
+};
+
+// -=*# Resource for function YEAR #*=-
+const char* SC_OPCODE_GET_YEAR_ARY[] =
+{
+    NC_("SC_OPCODE_GET_YEAR", "Returns the year of a date value as an integer."),
+    NC_("SC_OPCODE_GET_YEAR", "Number"),
+    NC_("SC_OPCODE_GET_YEAR", "Internal number of the date.")
+};
+
+// -=*# Resource for function DAYS #*=-
+const char* SC_OPCODE_GET_DIFF_DATE_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DIFF_DATE", "Calculates the number of days between two dates."),
+    NC_("SC_OPCODE_GET_DIFF_DATE", "Date_2"),
+    NC_("SC_OPCODE_GET_DIFF_DATE", "The end date for calculating the difference in days."),
+    NC_("SC_OPCODE_GET_DIFF_DATE", "Date_1"),
+    NC_("SC_OPCODE_GET_DIFF_DATE", "The start date for calculating the difference in days.")
+};
+
+// -=*# Resource for function DATEDIF #*=-
+const char* SC_OPCODE_GET_DATEDIF_ARY[] =
+{
+    NC_("SC_OPCODE_GET_DATEDIF", "Returns the number of whole days, months or years between 'start date' and 'end date'."),
+    NC_("SC_OPCODE_GET_DATEDIF", "Start date"),
+    NC_("SC_OPCODE_GET_DATEDIF", "The start date."),
+    NC_("SC_OPCODE_GET_DATEDIF", "End date"),
+    NC_("SC_OPCODE_GET_DATEDIF", "The end date."),
+    NC_("SC_OPCODE_GET_DATEDIF", "Interval"),
+    NC_("SC_OPCODE_GET_DATEDIF", "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\".")
+};
+
+// -=*# Resource for function WEEKNUM #*=-
+const char* SC_OPCODE_WEEK_ARY[] =
+{
+    NC_("SC_OPCODE_WEEK", "Calculates the calendar week corresponding to the given date."),
+    NC_("SC_OPCODE_WEEK", "Number"),
+    NC_("SC_OPCODE_WEEK", "The internal number of the date."),
+    NC_("SC_OPCODE_WEEK", "mode"),
+    NC_("SC_OPCODE_WEEK", "Indicates the first day of the week and when week 1 starts.")
+};
+
+// -=*# Resource for function ISOWEEKNUM #*=-
+const char* SC_OPCODE_ISOWEEKNUM_ARY[] =
+{
+    NC_("SC_OPCODE_ISOWEEKNUM", "Calculates the ISO 8601 calendar week for the given date."),
+    NC_("SC_OPCODE_ISOWEEKNUM", "Number"),
+    NC_("SC_OPCODE_ISOWEEKNUM", "The internal number of the date.")
+};
+
+const char* SC_OPCODE_WEEKNUM_OOO_ARY[] =
+{
+    NC_("SC_OPCODE_WEEKNUM_OOO", "Calculates the calendar week corresponding to the given date.\nThis function only provides interoperability with %PRODUCTNAME 5.0 and earlier and OpenOffice.org."),
+    NC_("SC_OPCODE_WEEKNUM_OOO", "Number"),
+    NC_("SC_OPCODE_WEEKNUM_OOO", "The internal number of the date."),
+    NC_("SC_OPCODE_WEEKNUM_OOO", "mode"),
+    NC_("SC_OPCODE_WEEKNUM_OOO", "Indicates the first day of the week (1 = Sunday, other values = Monday).")
+};
+
+// -=*# Resource for function EASTERSUNDAY #*=-
+const char* SC_OPCODE_EASTERSUNDAY_ARY[] =
+{
+    NC_("SC_OPCODE_EASTERSUNDAY", "Calculates the date of Easter Sunday in a given year."),
+    NC_("SC_OPCODE_EASTERSUNDAY", "year"),
+    NC_("SC_OPCODE_EASTERSUNDAY", "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set).")
+};
+
+// -=*# Resource for function PV #*=-
+const char* SC_OPCODE_PV_ARY[] =
+{
+    NC_("SC_OPCODE_PV", "Present value. Calculates the present value of an investment."),
+    NC_("SC_OPCODE_PV", "Rate"),
+    NC_("SC_OPCODE_PV", "The rate of interest for the period given."),
+    NC_("SC_OPCODE_PV", "NPER"),
+    NC_("SC_OPCODE_PV", "The payment period. The total number of periods in which the annuity is paid."),
+    NC_("SC_OPCODE_PV", "PMT"),
+    NC_("SC_OPCODE_PV", "Regular payments. The constant amount of annuity that is paid in each period."),
+    NC_("SC_OPCODE_PV", "FV"),
+    NC_("SC_OPCODE_PV", "Future value. The value (final value) to be attained after the last payment."),
+    NC_("SC_OPCODE_PV", "Type"),
+    NC_("SC_OPCODE_PV", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function FV #*=-
+const char* SC_OPCODE_FV_ARY[] =
+{
+    NC_("SC_OPCODE_FV", "Future value. Returns the future value of an investment based on regular payments and a constant interest rate."),
+    NC_("SC_OPCODE_FV", "Rate"),
+    NC_("SC_OPCODE_FV", "The rate of interest per period."),
+    NC_("SC_OPCODE_FV", "NPER"),
+    NC_("SC_OPCODE_FV", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_FV", "PMT"),
+    NC_("SC_OPCODE_FV", "Regular payments. The constant annuity to be paid in each period."),
+    NC_("SC_OPCODE_FV", "PV"),
+    NC_("SC_OPCODE_FV", "Present value. The current value of a series of payments"),
+    NC_("SC_OPCODE_FV", "Type"),
+    NC_("SC_OPCODE_FV", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function NPER #*=-
+const char* SC_OPCODE_NPER_ARY[] =
+{
+    NC_("SC_OPCODE_NPER", "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate."),
+    NC_("SC_OPCODE_NPER", "Rate"),
+    NC_("SC_OPCODE_NPER", "The rate of interest per period."),
+    NC_("SC_OPCODE_NPER", "PMT"),
+    NC_("SC_OPCODE_NPER", "Regular payments. The constant annuity to be paid in each period."),
+    NC_("SC_OPCODE_NPER", "PV"),
+    NC_("SC_OPCODE_NPER", "Present value. The current value of a series of payments"),
+    NC_("SC_OPCODE_NPER", "FV"),
+    NC_("SC_OPCODE_NPER", "Future value. The value (end value) to be attained after the final payment."),
+    NC_("SC_OPCODE_NPER", "Type"),
+    NC_("SC_OPCODE_NPER", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function PMT #*=-
+const char* SC_OPCODE_PMT_ARY[] =
+{
+    NC_("SC_OPCODE_PMT", "Regular payments. Returns the periodic payment of an annuity, based on regular payments and a fixed periodic interest rate."),
+    NC_("SC_OPCODE_PMT", "Rate"),
+    NC_("SC_OPCODE_PMT", "The rate of interest per period."),
+    NC_("SC_OPCODE_PMT", "NPER"),
+    NC_("SC_OPCODE_PMT", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_PMT", "PV"),
+    NC_("SC_OPCODE_PMT", "Present value. The current value of a series of payments"),
+    NC_("SC_OPCODE_PMT", "FV"),
+    NC_("SC_OPCODE_PMT", "Future value. The value (end value) to be attained after the final payment."),
+    NC_("SC_OPCODE_PMT", "Type"),
+    NC_("SC_OPCODE_PMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function RATE #*=-
+const char* SC_OPCODE_RATE_ARY[] =
+{
+    NC_("SC_OPCODE_RATE", "Calculates the constant interest rate of an investment with regular payments."),
+    NC_("SC_OPCODE_RATE", "NPER"),
+    NC_("SC_OPCODE_RATE", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_RATE", "PMT"),
+    NC_("SC_OPCODE_RATE", "Regular payments. The constant annuity to be paid in each period."),
+    NC_("SC_OPCODE_RATE", "PV"),
+    NC_("SC_OPCODE_RATE", "Present value. The current value of a series of payments"),
+    NC_("SC_OPCODE_RATE", "FV"),
+    NC_("SC_OPCODE_RATE", "Future value. The value (end value) to be attained after the final payment."),
+    NC_("SC_OPCODE_RATE", "Type"),
+    NC_("SC_OPCODE_RATE", "Type = 1 denotes due at the beginning of the period, = 0 at the end."),
+    NC_("SC_OPCODE_RATE", "Guess"),
+    NC_("SC_OPCODE_RATE", "Guess. The estimate of the interest rate for the iterative calculating method.")
+};
+
+// -=*# Resource for function IPMT #*=-
+const char* SC_OPCODE_IPMT_ARY[] =
+{
+    NC_("SC_OPCODE_IPMT", "Compounded interest. Calculates the interest payment on the principal for an investment with regular payments and a constant interest rate for a given period."),
+    NC_("SC_OPCODE_IPMT", "Rate"),
+    NC_("SC_OPCODE_IPMT", "The rate of interest per period."),
+    NC_("SC_OPCODE_IPMT", "Period"),
+    NC_("SC_OPCODE_IPMT", "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one."),
+    NC_("SC_OPCODE_IPMT", "NPER"),
+    NC_("SC_OPCODE_IPMT", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_IPMT", "pv"),
+    NC_("SC_OPCODE_IPMT", "Present value. The current value of a series of payments"),
+    NC_("SC_OPCODE_IPMT", "FV"),
+    NC_("SC_OPCODE_IPMT", "Future value. The value (end value) to be attained after the final payment."),
+    NC_("SC_OPCODE_IPMT", "Type"),
+    NC_("SC_OPCODE_IPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function PPMT #*=-
+const char* SC_OPCODE_PPMT_ARY[] =
+{
+    NC_("SC_OPCODE_PPMT", "Repayment. Calculates the repayment amount for a period for an investment whereby the payments are at regular intervals and the interest rate constant."),
+    NC_("SC_OPCODE_PPMT", "Rate"),
+    NC_("SC_OPCODE_PPMT", "The interest rate per period."),
+    NC_("SC_OPCODE_PPMT", "Period"),
+    NC_("SC_OPCODE_PPMT", "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last"),
+    NC_("SC_OPCODE_PPMT", "NPER"),
+    NC_("SC_OPCODE_PPMT", "The payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_PPMT", "PV"),
+    NC_("SC_OPCODE_PPMT", "The present value. The present value or the amount the annuity is currently worth."),
+    NC_("SC_OPCODE_PPMT", "FV"),
+    NC_("SC_OPCODE_PPMT", "Future value. The value (end value) attained after the last payment has been made."),
+    NC_("SC_OPCODE_PPMT", "Type"),
+    NC_("SC_OPCODE_PPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function CUMPRINC #*=-
+const char* SC_OPCODE_CUM_PRINC_ARY[] =
+{
+    NC_("SC_OPCODE_CUM_PRINC", "Cumulative Capital. Calculates the total amount of the repayment share in a period for an investment with constant interest rate."),
+    NC_("SC_OPCODE_CUM_PRINC", "Rate"),
+    NC_("SC_OPCODE_CUM_PRINC", "The rate of interest per period."),
+    NC_("SC_OPCODE_CUM_PRINC", "NPER"),
+    NC_("SC_OPCODE_CUM_PRINC", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_CUM_PRINC", "PV"),
+    NC_("SC_OPCODE_CUM_PRINC", "The present value. The present value or the amount the annuity is currently worth."),
+    NC_("SC_OPCODE_CUM_PRINC", "S"),
+    NC_("SC_OPCODE_CUM_PRINC", "The start period. The first period to be taken into account. S = 1 denotes the very first period."),
+    NC_("SC_OPCODE_CUM_PRINC", "E"),
+    NC_("SC_OPCODE_CUM_PRINC", "End period. The last period to be taken into account."),
+    NC_("SC_OPCODE_CUM_PRINC", "Type"),
+    NC_("SC_OPCODE_CUM_PRINC", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function CUMIPMT #*=-
+const char* SC_OPCODE_CUM_IPMT_ARY[] =
+{
+    NC_("SC_OPCODE_CUM_IPMT", "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate."),
+    NC_("SC_OPCODE_CUM_IPMT", "Rate"),
+    NC_("SC_OPCODE_CUM_IPMT", "The rate of interest per period."),
+    NC_("SC_OPCODE_CUM_IPMT", "NPER"),
+    NC_("SC_OPCODE_CUM_IPMT", "Payment period. The total number of periods in which the annuity (pension) is paid."),
+    NC_("SC_OPCODE_CUM_IPMT", "pv"),
+    NC_("SC_OPCODE_CUM_IPMT", "The present value. The present value or the amount the annuity is currently worth."),
+    NC_("SC_OPCODE_CUM_IPMT", "S"),
+    NC_("SC_OPCODE_CUM_IPMT", "The start period. The first period to be taken into account. S = 1 denotes the very first period."),
+    NC_("SC_OPCODE_CUM_IPMT", "E"),
+    NC_("SC_OPCODE_CUM_IPMT", "The end period. The last period to be taken into account."),
+    NC_("SC_OPCODE_CUM_IPMT", "Type"),
+    NC_("SC_OPCODE_CUM_IPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.")
+};
+
+// -=*# Resource for function SYD #*=-
+const char* SC_OPCODE_SYD_ARY[] =
+{
+    NC_("SC_OPCODE_SYD", "Calculates the arithmetically declining value of an asset (depreciation) for a specified period."),
+    NC_("SC_OPCODE_SYD", "Cost"),
+    NC_("SC_OPCODE_SYD", "Acquisition costs. The initial cost of the asset."),
+    NC_("SC_OPCODE_SYD", "Salvage"),
+    NC_("SC_OPCODE_SYD", "Salvage: The remaining value of the asset at the end of its life."),
+    NC_("SC_OPCODE_SYD", "Life"),
+    NC_("SC_OPCODE_SYD", "Useful life. The number of periods in the useful life of the asset."),
+    NC_("SC_OPCODE_SYD", "Period"),
+    NC_("SC_OPCODE_SYD", "Period. The depreciation period which must have the same time unit as average useful life.")
+};
+
+// -=*# Resource for function SLN #*=-
+const char* SC_OPCODE_SLN_ARY[] =
+{
+    NC_("SC_OPCODE_SLN", "Calculates the linear depreciation per period."),
+    NC_("SC_OPCODE_SLN", "Cost"),
+    NC_("SC_OPCODE_SLN", "Acquisition cost. The initial cost of an asset."),
+    NC_("SC_OPCODE_SLN", "Salvage"),
+    NC_("SC_OPCODE_SLN", "Salvage: The remaining value of the asset at the end of its life."),
+    NC_("SC_OPCODE_SLN", "Life"),
+    NC_("SC_OPCODE_SLN", "Useful life. The number of periods in the useful life of the asset.")
+};
+
+// -=*# Resource for function DDB #*=-
+const char* SC_OPCODE_DDB_ARY[] =
+{
+    NC_("SC_OPCODE_DDB", "Calculates the depreciation of an asset for a specific period using the double-declining balance method or declining balance factor."),
+    NC_("SC_OPCODE_DDB", "Cost"),
+    NC_("SC_OPCODE_DDB", "Acquisition costs. The initial cost of the asset."),
+    NC_("SC_OPCODE_DDB", "Salvage"),
+    NC_("SC_OPCODE_DDB", "Salvage: The remaining value of the asset at the end of its life."),
+    NC_("SC_OPCODE_DDB", "Life"),
+    NC_("SC_OPCODE_DDB", "Useful life. The number of periods in the useful life of the asset."),
+    NC_("SC_OPCODE_DDB", "Period"),
+    NC_("SC_OPCODE_DDB", "Period. The depreciation period in the same time unit as the average useful life entry."),
+    NC_("SC_OPCODE_DDB", "Factor"),
+    NC_("SC_OPCODE_DDB", "Factor. The factor for balance decline. F = 2 means a double declining balance factor")
+};
+
+// -=*# Resource for function DB #*=-
+const char* SC_OPCODE_DB_ARY[] =
+{
+    NC_("SC_OPCODE_DB", "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method."),
+    NC_("SC_OPCODE_DB", "Cost"),
+    NC_("SC_OPCODE_DB", "Acquisition costs: The initial cost of the asset."),
+    NC_("SC_OPCODE_DB", "Salvage"),
+    NC_("SC_OPCODE_DB", "Salvage: The remaining value of the asset at the end of its life."),
+    NC_("SC_OPCODE_DB", "Life"),
+    NC_("SC_OPCODE_DB", "Useful life. The number of periods in the useful life of the asset."),
+    NC_("SC_OPCODE_DB", "Period"),
+    NC_("SC_OPCODE_DB", "Periods: The period for which the depreciation is calculated. The time unit used for period must be the same as that for the useful life."),
+    NC_("SC_OPCODE_DB", "month"),
+    NC_("SC_OPCODE_DB", "Months: The number of months in the first year of depreciation.")
+};
+
+// -=*# Resource for function VDB #*=-
+const char* SC_OPCODE_VBD_ARY[] =
+{
+    NC_("SC_OPCODE_VBD", "Variable declining balance. Returns the declining balance depreciation for a particular period."),
+    NC_("SC_OPCODE_VBD", "Cost"),
+    NC_("SC_OPCODE_VBD", "Cost. The initial cost of the asset."),
+    NC_("SC_OPCODE_VBD", "Salvage"),
+    NC_("SC_OPCODE_VBD", "Salvage. The salvage value of an asset at the end of its useful life."),
+    NC_("SC_OPCODE_VBD", "Life"),
+    NC_("SC_OPCODE_VBD", "Useful life. The number of periods in the useful life of the asset."),
+    NC_("SC_OPCODE_VBD", "S"),
+    NC_("SC_OPCODE_VBD", "Start. The first period for depreciation in the same time unit as the useful life."),
+    NC_("SC_OPCODE_VBD", "end"),
+    NC_("SC_OPCODE_VBD", "End. The last period of the depreciation using the same time unit as for the useful life."),
+    NC_("SC_OPCODE_VBD", "Factor"),
+    NC_("SC_OPCODE_VBD", "Factor. The factor for the reduction of the depreciation. F = 2 denotes double rate depreciation."),
+    NC_("SC_OPCODE_VBD", "Type"),
+    NC_("SC_OPCODE_VBD", "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch.")
+};
+
+// -=*# Resource for function EFFECT #*=-
+const char* SC_OPCODE_EFFECT_ARY[] =
+{
+    NC_("SC_OPCODE_EFFECT", "Calculates the annual net interest rate for a nominal interest rate."),
+    NC_("SC_OPCODE_EFFECT", "NOM"),
+    NC_("SC_OPCODE_EFFECT", "Nominal Interest"),
+    NC_("SC_OPCODE_EFFECT", "P"),
+    NC_("SC_OPCODE_EFFECT", "Periods. The number of interest payments per year.")
+};
+
+// -=*# Resource for function NOMINAL #*=-
+const char* SC_OPCODE_NOMINAL_ARY[] =
+{
+    NC_("SC_OPCODE_NOMINAL", "Calculates the yearly nominal interest rate as an effective interest rate."),
+    NC_("SC_OPCODE_NOMINAL", "effect_rate"),
+    NC_("SC_OPCODE_NOMINAL", "The effective interest rate"),
+    NC_("SC_OPCODE_NOMINAL", "npery"),
+    NC_("SC_OPCODE_NOMINAL", "Periods. The number of interest payment per year.")
+};
+
+// -=*# Resource for function NPV #*=-
+const char* SC_OPCODE_NPV_ARY[] =
+{
+    NC_("SC_OPCODE_NPV", "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate."),
+    NC_("SC_OPCODE_NPV", "RATE"),
+    NC_("SC_OPCODE_NPV", "The rate of discount for one period."),
+    NC_("SC_OPCODE_NPV", "value "),
+    NC_("SC_OPCODE_NPV", "Value 1, value 2,... are arguments representing payments and income.")
+};
+
+// -=*# Resource for function IRR #*=-
+const char* SC_OPCODE_IRR_ARY[] =
+{
+    NC_("SC_OPCODE_IRR", "Returns the actuarial rate of interest of an investment excluding costs or profits."),
+    NC_("SC_OPCODE_IRR", "Values"),
+    NC_("SC_OPCODE_IRR", "An array or reference to cells whose contents correspond to the payments."),
+    NC_("SC_OPCODE_IRR", "Guess"),
+    NC_("SC_OPCODE_IRR", "Guess. An estimated value of the rate of return to be used for the iteration calculation.")
+};
+
+// -=*# Resource for function MIRR #*=-
+const char* SC_OPCODE_MIRR_ARY[] =
+{
+    NC_("SC_OPCODE_MIRR", "Returns the modified internal rate of return for a series of investments."),
+    NC_("SC_OPCODE_MIRR", "Values"),
+    NC_("SC_OPCODE_MIRR", "An array or reference to cells whose contents correspond to the payments."),
+    NC_("SC_OPCODE_MIRR", "investment"),
+    NC_("SC_OPCODE_MIRR", "Interest rate for investments (the negative values in the array)."),
+    NC_("SC_OPCODE_MIRR", "reinvest_rate"),
+    NC_("SC_OPCODE_MIRR", "interest rate for reinvestments (the positive values in the array).")
+};
+
+// -=*# Resource for function ISPMT #*=-
+const char* SC_OPCODE_ISPMT_ARY[] =
+{
+    NC_("SC_OPCODE_ISPMT", "Returns the amount of interest for constant amortization rates."),
+    NC_("SC_OPCODE_ISPMT", "rate"),
+    NC_("SC_OPCODE_ISPMT", "Interest rate for a single amortization rate."),
+    NC_("SC_OPCODE_ISPMT", "Period"),
+    NC_("SC_OPCODE_ISPMT", "Number of amortization periods for the calculation of the interest."),
+    NC_("SC_OPCODE_ISPMT", "total_periods"),
+    NC_("SC_OPCODE_ISPMT", "Sum total of amortization periods."),
+    NC_("SC_OPCODE_ISPMT", "invest"),
+    NC_("SC_OPCODE_ISPMT", "Amount of the investment.")
+};
+
+// -=*# Resource for function PDURATION #*=-
+const char* SC_OPCODE_PDURATION_ARY[] =
+{
+    NC_("SC_OPCODE_PDURATION", "Duration. Calculates the number of periods required by an investment to attain the desired value."),
+    NC_("SC_OPCODE_PDURATION", "RATE"),
+    NC_("SC_OPCODE_PDURATION", "The constant rate of interest."),
+    NC_("SC_OPCODE_PDURATION", "pv"),
+    NC_("SC_OPCODE_PDURATION", "The present value. The current value of the investment."),
+    NC_("SC_OPCODE_PDURATION", "FV"),
+    NC_("SC_OPCODE_PDURATION", "The future value of the investment.")
+};
+
+// -=*# Resource for function RRI #*=-
+const char* SC_OPCODE_RRI_ARY[] =
+{
+    NC_("SC_OPCODE_RRI", "Interest. Calculates the interest rate which represents the rate of return from an investment."),
+    NC_("SC_OPCODE_RRI", "P"),
+    NC_("SC_OPCODE_RRI", "The number of periods used in the calculation."),
+    NC_("SC_OPCODE_RRI", "pv"),
+    NC_("SC_OPCODE_RRI", "Present value. The current value of the investment."),
+    NC_("SC_OPCODE_RRI", "FV"),
+    NC_("SC_OPCODE_RRI", "The future value of the investment.")
+};
+
+// -=*# Resource for function ISREF #*=-
+const char* SC_OPCODE_IS_REF_ARY[] =
+{
+    NC_("SC_OPCODE_IS_REF", "Returns TRUE if value is a reference."),
+    NC_("SC_OPCODE_IS_REF", "value"),
+    NC_("SC_OPCODE_IS_REF", "The value to be tested.")
+};
+
+// -=*# Resource for function ISERR #*=-
+const char* SC_OPCODE_IS_ERR_ARY[] =
+{
+    NC_("SC_OPCODE_IS_ERR", "Returns TRUE if the value is an error value not equal to #N/A."),
+    NC_("SC_OPCODE_IS_ERR", "value"),
+    NC_("SC_OPCODE_IS_ERR", "The value to be tested.")
+};
+
+// -=*# Resource for function ISERROR #*=-
+const char* SC_OPCODE_IS_ERROR_ARY[] =
+{
+    NC_("SC_OPCODE_IS_ERROR", "Returns TRUE if the value is an error value."),
+    NC_("SC_OPCODE_IS_ERROR", "value"),
+    NC_("SC_OPCODE_IS_ERROR", "The value to be tested.")
+};
+
+// -=*# Resource for function ISBLANK #*=-
+const char* SC_OPCODE_IS_EMPTY_ARY[] =
+{
+    NC_("SC_OPCODE_IS_EMPTY", "Returns TRUE if value refers to an empty cell."),
+    NC_("SC_OPCODE_IS_EMPTY", "value"),
+    NC_("SC_OPCODE_IS_EMPTY", "The value to be tested.")
+};
+
+// -=*# Resource for function ISLOGICAL #*=-
+const char* SC_OPCODE_IS_LOGICAL_ARY[] =
+{
+    NC_("SC_OPCODE_IS_LOGICAL", "Returns TRUE if the value carries a logical number format."),
+    NC_("SC_OPCODE_IS_LOGICAL", "value"),
+    NC_("SC_OPCODE_IS_LOGICAL", "The value to be tested.")
+};
+
+// -=*# Resource for function ISNA #*=-
+const char* SC_OPCODE_IS_NV_ARY[] =
+{
+    NC_("SC_OPCODE_IS_NV", "Returns TRUE if value equals #N/A."),
+    NC_("SC_OPCODE_IS_NV", "value"),
+    NC_("SC_OPCODE_IS_NV", "The value to be tested.")
+};
+
+// -=*# Resource for function ISNONTEXT #*=-
+const char* SC_OPCODE_IS_NON_STRING_ARY[] =
+{
+    NC_("SC_OPCODE_IS_NON_STRING", "Returns TRUE if the value is not text."),
+    NC_("SC_OPCODE_IS_NON_STRING", "value"),
+    NC_("SC_OPCODE_IS_NON_STRING", "The value to be tested.")
+};
+
+// -=*# Resource for function ISTEXT #*=-
+const char* SC_OPCODE_IS_STRING_ARY[] =
+{
+    NC_("SC_OPCODE_IS_STRING", "Returns TRUE if value is text."),
+    NC_("SC_OPCODE_IS_STRING", "value"),
+    NC_("SC_OPCODE_IS_STRING", "The value to be tested.")
+};
+
+// -=*# Resource for function ISNUMBER #*=-
+const char* SC_OPCODE_IS_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_IS_VALUE", "Returns TRUE if value is a number."),
+    NC_("SC_OPCODE_IS_VALUE", "value"),
+    NC_("SC_OPCODE_IS_VALUE", "The value to be tested.")
+};
+
+// -=*# Resource for function ISFORMULA #*=-
+const char* SC_OPCODE_IS_FORMULA_ARY[] =
+{
+    NC_("SC_OPCODE_IS_FORMULA", "Returns TRUE if the cell is a formula cell."),
+    NC_("SC_OPCODE_IS_FORMULA", "reference"),
+    NC_("SC_OPCODE_IS_FORMULA", "The cell to be checked.")
+};
+
+// -=*# Resource for function FORMULA #*=-
+const char* SC_OPCODE_FORMULA_ARY[] =
+{
+    NC_("SC_OPCODE_FORMULA", "Returns the formula of a formula cell."),
+    NC_("SC_OPCODE_FORMULA", "Reference"),
+    NC_("SC_OPCODE_FORMULA", "The formula cell.")
+};
+
+// -=*# Resource for function N #*=-
+const char* SC_OPCODE_N_ARY[] =
+{
+    NC_("SC_OPCODE_N", "Converts a value to a number."),
+    NC_("SC_OPCODE_N", "value"),
+    NC_("SC_OPCODE_N", "The value to be interpreted as a number.")
+};
+
+// -=*# Resource for function NA #*=-
+const char* SC_OPCODE_NO_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_NO_VALUE", "Not available. Returns the error value #N/A.")
+};
+
+// -=*# Resource for function TYPE #*=-
+const char* SC_OPCODE_TYPE_ARY[] =
+{
+    NC_("SC_OPCODE_TYPE", "Returns the data type of a value (1 = number, 2 = text, 4 = Boolean value, 8 = formula, 16 = error value, 64 = array)."),
+    NC_("SC_OPCODE_TYPE", "value"),
+    NC_("SC_OPCODE_TYPE", "The value for which the data type is to be determined.")
+};
+
+// -=*# Resource for function CELL #*=-
+const char* SC_OPCODE_CELL_ARY[] =
+{
+    NC_("SC_OPCODE_CELL", "Determines information about address, formatting or contents of a cell."),
+    NC_("SC_OPCODE_CELL", "info_type"),
+    NC_("SC_OPCODE_CELL", "String that specifies the type of information."),
+    NC_("SC_OPCODE_CELL", "Reference"),
+    NC_("SC_OPCODE_CELL", "The position of the cell you want to examine.")
+};
+
+// -=*# Resource for function CURRENT #*=-
+const char* SC_OPCODE_CURRENT_ARY[] =
+{
+    NC_("SC_OPCODE_CURRENT", "Calculates the current value of the formula at the present location.")
+};
+
+// -=*# Resource for function FALSE #*=-
+const char* SC_OPCODE_FALSE_ARY[] =
+{
+    NC_("SC_OPCODE_FALSE", "Defines the logical value as FALSE.")
+};
+
+// -=*# Resource for function NOT #*=-
+const char* SC_OPCODE_NOT_ARY[] =
+{
+    NC_("SC_OPCODE_NOT", "Reverses the value of the argument."),
+    NC_("SC_OPCODE_NOT", "Logical value"),
+    NC_("SC_OPCODE_NOT", "An expression that can be either TRUE or FALSE.")
+};
+
+// -=*# Resource for function TRUE #*=-
+const char* SC_OPCODE_TRUE_ARY[] =
+{
+    NC_("SC_OPCODE_TRUE", "Returns the logical value TRUE.")
+};
+
+// -=*# Resource for function IF #*=-
+const char* SC_OPCODE_IF_ARY[] =
+{
+    NC_("SC_OPCODE_IF", "Specifies a logical test to be performed."),
+    NC_("SC_OPCODE_IF", "Test"),
+    NC_("SC_OPCODE_IF", "Any value or expression which can be either TRUE or FALSE."),
+    NC_("SC_OPCODE_IF", "Then_value"),
+    NC_("SC_OPCODE_IF", "The result of the function if the logical test returns a TRUE."),
+    NC_("SC_OPCODE_IF", "Otherwise_value"),
+    NC_("SC_OPCODE_IF", "The result of the function if the logical test returns FALSE.")
+};
+
+// -=*# Resource for function IFERROR #*=-
+const char* SC_OPCODE_IF_ERROR_ARY[] =
+{
+    NC_("SC_OPCODE_IF_ERROR", "Returns value if not an error value, else alternative."),
+    NC_("SC_OPCODE_IF_ERROR", "value"),
+    NC_("SC_OPCODE_IF_ERROR", "The value to be calculated."),
+    NC_("SC_OPCODE_IF_ERROR", "alternative value"),
+    NC_("SC_OPCODE_IF_ERROR", "The alternative to be returned, should value be an error value.")
+};
+
+// -=*# Resource for function IFNA #*=-
+const char* SC_OPCODE_IF_NA_ARY[] =
+{
+    NC_("SC_OPCODE_IF_NA", "Returns value if not a #N/A error, else alternative."),
+    NC_("SC_OPCODE_IF_NA", "value"),
+    NC_("SC_OPCODE_IF_NA", "The value to be calculated."),
+    NC_("SC_OPCODE_IF_NA", "alternative value"),
+    NC_("SC_OPCODE_IF_NA", "The alternative to be returned, should value be a #N/A error.")
+};
+
+// -=*# Resource for function OR #*=-
+const char* SC_OPCODE_OR_ARY[] =
+{
+    NC_("SC_OPCODE_OR", "Returns TRUE if an argument is TRUE."),
+    NC_("SC_OPCODE_OR", "Logical value "),
+    NC_("SC_OPCODE_OR", "Logical value 1, logical value 2,... are conditions to be tested and which return either TRUE or FALSE.")
+};
+
+// -=*# Resource for function XOR #*=-
+const char* SC_OPCODE_XOR_ARY[] =
+{
+    NC_("SC_OPCODE_XOR", "Returns TRUE if an odd number of arguments evaluates to TRUE."),
+    NC_("SC_OPCODE_XOR", "Logical value "),
+    NC_("SC_OPCODE_XOR", "Logical value 1, logical value 2, ... are conditions to be tested and which return either TRUE or FALSE.")
+};
+
+// -=*# Resource for function AND #*=-
+const char* SC_OPCODE_AND_ARY[] =
+{
+    NC_("SC_OPCODE_AND", "Returns TRUE if all arguments are TRUE."),
+    NC_("SC_OPCODE_AND", "Logical value "),
+    NC_("SC_OPCODE_AND", "Logical value 1, logical value 2;...are conditions to be tested and each returns either TRUE or FALSE.")
+};
+
+// -=*# Resource for function ABS #*=-
+const char* SC_OPCODE_ABS_ARY[] =
+{
+    NC_("SC_OPCODE_ABS", "Absolute value of a number."),
+    NC_("SC_OPCODE_ABS", "Number"),
+    NC_("SC_OPCODE_ABS", "The number whose absolute value is to be returned.")
+};
+
+// -=*# Resource for function POWER #*=-
+const char* SC_OPCODE_POWER_ARY[] =
+{
+    NC_("SC_OPCODE_POWER", "Returns a^b, base a raised to the power of exponent b."),
+    NC_("SC_OPCODE_POWER", "Base"),
+    NC_("SC_OPCODE_POWER", "The base a of the power a^b."),
+    NC_("SC_OPCODE_POWER", "Exponent"),
+    NC_("SC_OPCODE_POWER", "The exponent b of the power a^b.")
+};
+
+// -=*# Resource for function COUNTBLANK #*=-
+const char* SC_OPCODE_COUNT_EMPTY_CELLS_ARY[] =
+{
+    NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "Counts the blank cells in a specified range."),
+    NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "range"),
+    NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "The range in which empty cells are to be counted.")
+};
+
+// -=*# Resource for function PI #*=-
+const char* SC_OPCODE_PI_ARY[] =
+{
+    NC_("SC_OPCODE_PI", "Returns the value of the number Pi.")
+};
+
+// -=*# Resource for function SUM #*=-
+const char* SC_OPCODE_SUM_ARY[] =
+{
+    NC_("SC_OPCODE_SUM", "Returns the sum of all arguments."),
+    NC_("SC_OPCODE_SUM", "number "),
+    NC_("SC_OPCODE_SUM", "Number 1, number 2, ... are arguments whose total is to be calculated.")
+};
+
+// -=*# Resource for function SUMSQ #*=-
+const char* SC_OPCODE_SUM_SQ_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_SQ", "Returns the sum of the squares of the arguments."),
+    NC_("SC_OPCODE_SUM_SQ", "number "),
+    NC_("SC_OPCODE_SUM_SQ", "Number 1, number 2,... are arguments for which the sum of the squares is to be calculated.")
+};
+
+// -=*# Resource for function PRODUCT #*=-
+const char* SC_OPCODE_PRODUCT_ARY[] =
+{
+    NC_("SC_OPCODE_PRODUCT", "Multiplies the arguments."),
+    NC_("SC_OPCODE_PRODUCT", "Number "),
+    NC_("SC_OPCODE_PRODUCT", "Number 1, number 2, ... are arguments to be multiplied and a result returned.")
+};
+
+// -=*# Resource for function SUMIF #*=-
+const char* SC_OPCODE_SUM_IF_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_IF", "Totals the arguments that meet the condition."),
+    NC_("SC_OPCODE_SUM_IF", "range"),
+    NC_("SC_OPCODE_SUM_IF", "The range to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_SUM_IF", "criteria"),
+    NC_("SC_OPCODE_SUM_IF", "The criteria to be applied to the range."),
+    NC_("SC_OPCODE_SUM_IF", "sum_range"),
+    NC_("SC_OPCODE_SUM_IF", "The range from which the values are to be totalled.")
+};
+
+// -=*# Resource for function AVERAGEIF #*=-
+const char* SC_OPCODE_AVERAGE_IF_ARY[] =
+{
+    NC_("SC_OPCODE_AVERAGE_IF", "Averages the arguments that meet the conditions."),
+    NC_("SC_OPCODE_AVERAGE_IF", "range"),
+    NC_("SC_OPCODE_AVERAGE_IF", "The range to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_AVERAGE_IF", "criteria"),
+    NC_("SC_OPCODE_AVERAGE_IF", "The criteria to be applied to the range."),
+    NC_("SC_OPCODE_AVERAGE_IF", "average_range"),
+    NC_("SC_OPCODE_AVERAGE_IF", "The range from which the values are to be averaged.")
+};
+
+const char* SC_OPCODE_SUM_IFS_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_IFS", "Totals the values of cells in a range that meet multiple criteria in multiple ranges."),
+    NC_("SC_OPCODE_SUM_IFS", "sum_range"),
+    NC_("SC_OPCODE_SUM_IFS", "The range from which the values are to be totalled."),
+    NC_("SC_OPCODE_SUM_IFS", "range "),
+    NC_("SC_OPCODE_SUM_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_SUM_IFS", "criteria "),
+    NC_("SC_OPCODE_SUM_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.")
+};
+
+// -=*# Resource for function AVERAGEIFS #*=-
+const char* SC_OPCODE_AVERAGE_IFS_ARY[] =
+{
+    NC_("SC_OPCODE_AVERAGE_IFS", "Averages the value of the cells that meet multiple criteria in multiple ranges."),
+    NC_("SC_OPCODE_AVERAGE_IFS", "average_range"),
+    NC_("SC_OPCODE_AVERAGE_IFS", "The range from which the values are to be averaged."),
+    NC_("SC_OPCODE_AVERAGE_IFS", "range "),
+    NC_("SC_OPCODE_AVERAGE_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_AVERAGE_IFS", "criteria "),
+    NC_("SC_OPCODE_AVERAGE_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.")
+};
+
+// -=*# Resource for function COUNTIFS #*=-
+const char* SC_OPCODE_COUNT_IFS_ARY[] =
+{
+    NC_("SC_OPCODE_COUNT_IFS", "Counts the cells that meet multiple criteria in multiple ranges."),
+    NC_("SC_OPCODE_COUNT_IFS", "range "),
+    NC_("SC_OPCODE_COUNT_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_COUNT_IFS", "criteria "),
+    NC_("SC_OPCODE_COUNT_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.")
+};
+
+// -=*# Resource for function COUNTIF #*=-
+const char* SC_OPCODE_COUNT_IF_ARY[] =
+{
+    NC_("SC_OPCODE_COUNT_IF", "Counts the arguments which meet the set conditions."),
+    NC_("SC_OPCODE_COUNT_IF", "range"),
+    NC_("SC_OPCODE_COUNT_IF", "The range of cells to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_COUNT_IF", "criteria"),
+    NC_("SC_OPCODE_COUNT_IF", "The criteria to be applied to the range.")
+};
+
+// -=*# Resource for function SQRT #*=-
+const char* SC_OPCODE_SQRT_ARY[] =
+{
+    NC_("SC_OPCODE_SQRT", "Returns the square root of a number."),
+    NC_("SC_OPCODE_SQRT", "number"),
+    NC_("SC_OPCODE_SQRT", "A positive value for which the square root is to be calculated.")
+};
+
+// -=*# Resource for function RAND #*=-
+const char* SC_OPCODE_RANDOM_ARY[] =
+{
+    NC_("SC_OPCODE_RANDOM", "Returns a random number between 0 and 1.")
+};
+
+// -=*# Resource for function ISEVEN #*=-
+const char* SC_OPCODE_IS_EVEN_ARY[] =
+{
+    NC_("SC_OPCODE_IS_EVEN", "Returns TRUE if value is an even integer."),
+    NC_("SC_OPCODE_IS_EVEN", "value"),
+    NC_("SC_OPCODE_IS_EVEN", "The value to be tested.")
+};
+
+// -=*# Resource for function ISODD #*=-
+const char* SC_OPCODE_IS_ODD_ARY[] =
+{
+    NC_("SC_OPCODE_IS_ODD", "Returns TRUE if value is an odd integer."),
+    NC_("SC_OPCODE_IS_ODD", "value"),
+    NC_("SC_OPCODE_IS_ODD", "The value to be tested.")
+};
+
+// -=*# Resource for function COMBIN #*=-
+const char* SC_OPCODE_COMBIN_ARY[] =
+{
+    NC_("SC_OPCODE_COMBIN", "Calculates the number of combinations for elements without repetition."),
+    NC_("SC_OPCODE_COMBIN", "number_1"),
+    NC_("SC_OPCODE_COMBIN", "The total number of elements."),
+    NC_("SC_OPCODE_COMBIN", "number_2"),
+    NC_("SC_OPCODE_COMBIN", "The number of elements selected.")
+};
+
+// -=*# Resource for function COMBINA #*=-
+const char* SC_OPCODE_COMBIN_A_ARY[] =
+{
+    NC_("SC_OPCODE_COMBIN_A", "Calculates the number of combinations of elements including repetition."),
+    NC_("SC_OPCODE_COMBIN_A", "number_1"),
+    NC_("SC_OPCODE_COMBIN_A", "The total number of elements."),
+    NC_("SC_OPCODE_COMBIN_A", "number_2"),
+    NC_("SC_OPCODE_COMBIN_A", "The number of elements selected.")
+};
+
+// -=*# Resource for function ARCCOS #*=-
+const char* SC_OPCODE_ARC_COS_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_COS", "Returns the arccosine of a number."),
+    NC_("SC_OPCODE_ARC_COS", "Number"),
+    NC_("SC_OPCODE_ARC_COS", "A value between -1 and 1 for which the arccosine is to be returned.")
+};
+
+// -=*# Resource for function ARCSIN #*=-
+const char* SC_OPCODE_ARC_SIN_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_SIN", "Returns the arcsine of a number."),
+    NC_("SC_OPCODE_ARC_SIN", "Number"),
+    NC_("SC_OPCODE_ARC_SIN", "A value between -1 and 1 for which the arcsine is to be returned.")
+};
+
+// -=*# Resource for function ARCCOSHYP #*=-
+const char* SC_OPCODE_ARC_COS_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_COS_HYP", "Returns the inverse hyperbolic cosine of a number."),
+    NC_("SC_OPCODE_ARC_COS_HYP", "Number"),
+    NC_("SC_OPCODE_ARC_COS_HYP", "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned.")
+};
+
+// -=*# Resource for function ARCSINHYP #*=-
+const char* SC_OPCODE_ARC_SIN_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_SIN_HYP", "Returns the inverse hyperbolic sine of a number."),
+    NC_("SC_OPCODE_ARC_SIN_HYP", "Number"),
+    NC_("SC_OPCODE_ARC_SIN_HYP", "The value for which the inverse hyperbolic sine is to be returned.")
+};
+
+// -=*# Resource for function ARCCOT #*=-
+const char* SC_OPCODE_ARC_COT_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_COT", "Returns the inverse cotangent of a number."),
+    NC_("SC_OPCODE_ARC_COT", "Number"),
+    NC_("SC_OPCODE_ARC_COT", "The value for which the inverse cotangent is to be returned.")
+};
+
+// -=*# Resource for function ARCTAN #*=-
+const char* SC_OPCODE_ARC_TAN_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_TAN", "Returns the arctangent of a number."),
+    NC_("SC_OPCODE_ARC_TAN", "Number"),
+    NC_("SC_OPCODE_ARC_TAN", "The value for which the arctangent is to be returned.")
+};
+
+// -=*# Resource for function ARCCOTHYP #*=-
+const char* SC_OPCODE_ARC_COT_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_COT_HYP", "Returns the inverse hyperbolic cotangent of a number."),
+    NC_("SC_OPCODE_ARC_COT_HYP", "Number"),
+    NC_("SC_OPCODE_ARC_COT_HYP", "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned.")
+};
+
+// -=*# Resource for function ARCTANHYP #*=-
+const char* SC_OPCODE_ARC_TAN_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_TAN_HYP", "Returns the inverse hyperbolic tangent of a number."),
+    NC_("SC_OPCODE_ARC_TAN_HYP", "Number"),
+    NC_("SC_OPCODE_ARC_TAN_HYP", "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned.")
+};
+
+// -=*# Resource for function COS #*=-
+const char* SC_OPCODE_COS_ARY[] =
+{
+    NC_("SC_OPCODE_COS", "Returns the cosine of a number."),
+    NC_("SC_OPCODE_COS", "Number"),
+    NC_("SC_OPCODE_COS", "The angle in the radians for which the cosine is to be returned.")
+};
+
+// -=*# Resource for function SIN #*=-
+const char* SC_OPCODE_SIN_ARY[] =
+{
+    NC_("SC_OPCODE_SIN", "Returns the sine of a number."),
+    NC_("SC_OPCODE_SIN", "number"),
+    NC_("SC_OPCODE_SIN", "The angle in radians for which the sine is to be calculated.")
+};
+
+// -=*# Resource for function COT #*=-
+const char* SC_OPCODE_COT_ARY[] =
+{
+    NC_("SC_OPCODE_COT", "Returns the cotangent of a number."),
+    NC_("SC_OPCODE_COT", "Number"),
+    NC_("SC_OPCODE_COT", "The angle in radians whose cotangent value is to be returned.")
+};
+
+// -=*# Resource for function TAN #*=-
+const char* SC_OPCODE_TAN_ARY[] =
+{
+    NC_("SC_OPCODE_TAN", "Returns the tangent of a number."),
+    NC_("SC_OPCODE_TAN", "number"),
+    NC_("SC_OPCODE_TAN", "The angle in radians for which the tangent is to be calculated.")
+};
+
+// -=*# Resource for function COSHYP #*=-
+const char* SC_OPCODE_COS_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_COS_HYP", "Returns the hyperbolic cosine of a number."),
+    NC_("SC_OPCODE_COS_HYP", "Number"),
+    NC_("SC_OPCODE_COS_HYP", "The value for which the hyperbolic cosine is to be returned.")
+};
+
+// -=*# Resource for function SINHYP #*=-
+const char* SC_OPCODE_SIN_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_SIN_HYP", "Returns the hyperbolic sine of a number."),
+    NC_("SC_OPCODE_SIN_HYP", "number"),
+    NC_("SC_OPCODE_SIN_HYP", "The value for which the hyperbolic sine is to be calculated.")
+};
+
+// -=*# Resource for function COTHYP #*=-
+const char* SC_OPCODE_COT_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_COT_HYP", "Returns the hyperbolic cotangent of a number."),
+    NC_("SC_OPCODE_COT_HYP", "Number"),
+    NC_("SC_OPCODE_COT_HYP", "A value not equal to 0 for which the hyperbolic cotangent is to be returned.")
+};
+
+// -=*# Resource for function TANHYP #*=-
+const char* SC_OPCODE_TAN_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_TAN_HYP", "Returns the hyperbolic tangent of a number."),
+    NC_("SC_OPCODE_TAN_HYP", "number"),
+    NC_("SC_OPCODE_TAN_HYP", "The value for which the hyperbolic tangent is to be calculated.")
+};
+
+// -=*# Resource for function ARCTAN2 #*=-
+const char* SC_OPCODE_ARC_TAN_2_ARY[] =
+{
+    NC_("SC_OPCODE_ARC_TAN_2", "Returns the arctangent for the specified coordinates."),
+    NC_("SC_OPCODE_ARC_TAN_2", "number_x"),
+    NC_("SC_OPCODE_ARC_TAN_2", "The value for the x coordinate."),
+    NC_("SC_OPCODE_ARC_TAN_2", "number_y"),
+    NC_("SC_OPCODE_ARC_TAN_2", "The value for the y coordinate.")
+};
+
+// -=*# Resource for function CSC #*=-
+const char* SC_OPCODE_COSECANT_ARY[] =
+{
+    NC_("SC_OPCODE_COSECANT", "Return the cosecant of an angle. CSC(x)=1/SIN(x)"),
+    NC_("SC_OPCODE_COSECANT", "Angle"),
+    NC_("SC_OPCODE_COSECANT", "The angle in radians for which the cosecant is to be calculated.")
+};
+
+// -=*# Resource for function SEC #*=-
+const char* SC_OPCODE_SECANT_ARY[] =
+{
+    NC_("SC_OPCODE_SECANT", "Return the secant of an angle. SEC(x)=1/COS(x)"),
+    NC_("SC_OPCODE_SECANT", "Angle"),
+    NC_("SC_OPCODE_SECANT", "The angle in radians for which the secant is to be calculated.")
+};
+
+// -=*# Resource for function CSCH #*=-
+const char* SC_OPCODE_COSECANT_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_COSECANT_HYP", "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)"),
+    NC_("SC_OPCODE_COSECANT_HYP", "Angle"),
+    NC_("SC_OPCODE_COSECANT_HYP", "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated.")
+};
+
+// -=*# Resource for function SECH #*=-
+const char* SC_OPCODE_SECANT_HYP_ARY[] =
+{
+    NC_("SC_OPCODE_SECANT_HYP", "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)"),
+    NC_("SC_OPCODE_SECANT_HYP", "Angle"),
+    NC_("SC_OPCODE_SECANT_HYP", "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated.")
+};
+
+// -=*# Resource for function DEG #*=-
+const char* SC_OPCODE_DEG_ARY[] =
+{
+    NC_("SC_OPCODE_DEG", "Converts a radian to degrees"),
+    NC_("SC_OPCODE_DEG", "Number"),
+    NC_("SC_OPCODE_DEG", "The angle in a radian")
+};
+
+// -=*# Resource for function RAD #*=-
+const char* SC_OPCODE_RAD_ARY[] =
+{
+    NC_("SC_OPCODE_RAD", "Converts degrees to radians"),
+    NC_("SC_OPCODE_RAD", "Number"),
+    NC_("SC_OPCODE_RAD", "The angle in degrees.")
+};
+
+// -=*# Resource for function EXP #*=-
+const char* SC_OPCODE_EXP_ARY[] =
+{
+    NC_("SC_OPCODE_EXP", "Calculates the exponent for basis e."),
+    NC_("SC_OPCODE_EXP", "Number"),
+    NC_("SC_OPCODE_EXP", "The exponent applied to base e.")
+};
+
+// -=*# Resource for function LOG #*=-
+const char* SC_OPCODE_LOG_ARY[] =
+{
+    NC_("SC_OPCODE_LOG", "Calculates the logarithm to any specified base."),
+    NC_("SC_OPCODE_LOG", "Number"),
+    NC_("SC_OPCODE_LOG", "A value greater than 0 for which the logarithm is to be calculated."),
+    NC_("SC_OPCODE_LOG", "Base"),
+    NC_("SC_OPCODE_LOG", "The base of the logarithm. If omitted, the base is regarded as 10.")
+};
+
+// -=*# Resource for function LN #*=-
+const char* SC_OPCODE_LN_ARY[] =
+{
+    NC_("SC_OPCODE_LN", "Calculates the natural logarithm of a number."),
+    NC_("SC_OPCODE_LN", "Number"),
+    NC_("SC_OPCODE_LN", "A value greater than 0 for which the natural logarithm is to be calculated.")
+};
+
+// -=*# Resource for function LOG10 #*=-
+const char* SC_OPCODE_LOG10_ARY[] =
+{
+    NC_("SC_OPCODE_LOG10", "Calculates the base-10 logarithm of a number."),
+    NC_("SC_OPCODE_LOG10", "Number"),
+    NC_("SC_OPCODE_LOG10", "A value greater than 0 for which the logarithm is to be calculated.")
+};
+
+// -=*# Resource for function FACT #*=-
+const char* SC_OPCODE_FACT_ARY[] =
+{
+    NC_("SC_OPCODE_FACT", "Calculates the factorial of a number."),
+    NC_("SC_OPCODE_FACT", "Number"),
+    NC_("SC_OPCODE_FACT", "The number for which the factorial is to be calculated.")
+};
+
+// -=*# Resource for function MOD #*=-
+const char* SC_OPCODE_MOD_ARY[] =
+{
+    NC_("SC_OPCODE_MOD", "Calculates the remainder of a division."),
+    NC_("SC_OPCODE_MOD", "Dividend"),
+    NC_("SC_OPCODE_MOD", "The number to be divided."),
+    NC_("SC_OPCODE_MOD", "Divisor"),
+    NC_("SC_OPCODE_MOD", "The number by which the dividend is divided.")
+};
+
+// -=*# Resource for function SIGN #*=-
+const char* SC_OPCODE_PLUS_MINUS_ARY[] =
+{
+    NC_("SC_OPCODE_PLUS_MINUS", "Returns the algebraic sign of a number."),
+    NC_("SC_OPCODE_PLUS_MINUS", "Number"),
+    NC_("SC_OPCODE_PLUS_MINUS", "The number for which the algebraic sign is to be determined.")
+};
+
+// -=*# Resource for function SUBTOTAL #*=-
+const char* SC_OPCODE_SUB_TOTAL_ARY[] =
+{
+    NC_("SC_OPCODE_SUB_TOTAL", "Calculates subtotals in a spreadsheet."),
+    NC_("SC_OPCODE_SUB_TOTAL", "Function"),
+    NC_("SC_OPCODE_SUB_TOTAL", "Function index. Is an index of the possible functions Total, Max, ..."),
+    NC_("SC_OPCODE_SUB_TOTAL", "range"),
+    NC_("SC_OPCODE_SUB_TOTAL", "The cells of the range which are to be taken into account.")
+};
+
+// -=*# Resource for function AGGREGATE #*=-
+const char* SC_OPCODE_AGGREGATE_ARY[] =
+{
+    NC_("SC_OPCODE_AGGREGATE", "Calculates an aggregate in a spreadsheet."),
+    NC_("SC_OPCODE_AGGREGATE", "Function"),
+    NC_("SC_OPCODE_AGGREGATE", "Function index. Is an index of the possible functions Total, Max, ..."),
+    NC_("SC_OPCODE_AGGREGATE", "Options"),
+    NC_("SC_OPCODE_AGGREGATE", "Option index. Is an index of the possible ignore options."),
+    NC_("SC_OPCODE_AGGREGATE", "Ref1 or array "),
+    NC_("SC_OPCODE_AGGREGATE", "The cell(s) of the range which are to be taken into account."),
+    NC_("SC_OPCODE_AGGREGATE", "Ref2..n or k "),
+    NC_("SC_OPCODE_AGGREGATE", "The cells of the range which are to be taken into account or mandatory 2nd argument for certain functions.")
+};
+
+// -=*# Resource for function INT #*=-
+const char* SC_OPCODE_INT_ARY[] =
+{
+    NC_("SC_OPCODE_INT", "Rounds a number down to the nearest integer."),
+    NC_("SC_OPCODE_INT", "Number"),
+    NC_("SC_OPCODE_INT", "The number to be rounded down.")
+};
+
+// -=*# Resource for function TRUNC #*=-
+const char* SC_OPCODE_TRUNC_ARY[] =
+{
+    NC_("SC_OPCODE_TRUNC", "Truncates the decimal places of a number."),
+    NC_("SC_OPCODE_TRUNC", "number"),
+    NC_("SC_OPCODE_TRUNC", "The number to be truncated."),
+    NC_("SC_OPCODE_TRUNC", "count"),
+    NC_("SC_OPCODE_TRUNC", "The number of places after the decimal point that are not to be truncated.")
+};
+
+// -=*# Resource for function ROUND #*=-
+const char* SC_OPCODE_ROUND_ARY[] =
+{
+    NC_("SC_OPCODE_ROUND", "Rounds a number to a predefined accuracy."),
+    NC_("SC_OPCODE_ROUND", "number"),
+    NC_("SC_OPCODE_ROUND", "The number to be rounded."),
+    NC_("SC_OPCODE_ROUND", "count"),
+    NC_("SC_OPCODE_ROUND", "The number of places to which a number is to be rounded.")
+};
+
+// -=*# Resource for function ROUNDUP #*=-
+const char* SC_OPCODE_ROUND_UP_ARY[] =
+{
+    NC_("SC_OPCODE_ROUND_UP", "Rounds a number up to the predefined accuracy."),
+    NC_("SC_OPCODE_ROUND_UP", "number"),
+    NC_("SC_OPCODE_ROUND_UP", "The number to be rounded up."),
+    NC_("SC_OPCODE_ROUND_UP", "count"),
+    NC_("SC_OPCODE_ROUND_UP", "The number of places to which a number is to be rounded.")
+};
+
+// -=*# Resource for function ROUNDDOWN #*=-
+const char* SC_OPCODE_ROUND_DOWN_ARY[] =
+{
+    NC_("SC_OPCODE_ROUND_DOWN", "Rounds a number down to a predefined accuracy."),
+    NC_("SC_OPCODE_ROUND_DOWN", "number"),
+    NC_("SC_OPCODE_ROUND_DOWN", "The number to be rounded down."),
+    NC_("SC_OPCODE_ROUND_DOWN", "count"),
+    NC_("SC_OPCODE_ROUND_DOWN", "The number of places down to which a number is to be rounded.")
+};
+
+// -=*# Resource for function EVEN #*=-
+const char* SC_OPCODE_EVEN_ARY[] =
+{
+    NC_("SC_OPCODE_EVEN", "Rounds a positive number up and negative number down to the nearest even integer."),
+    NC_("SC_OPCODE_EVEN", "Number"),
+    NC_("SC_OPCODE_EVEN", "The number to be rounded up.")
+};
+
+// -=*# Resource for function ODD #*=-
+const char* SC_OPCODE_ODD_ARY[] =
+{
+    NC_("SC_OPCODE_ODD", "Rounds a positive number up and negative number down to the nearest odd integer."),
+    NC_("SC_OPCODE_ODD", "Number"),
+    NC_("SC_OPCODE_ODD", "The number to be rounded up.")
+};
+
+// -=*# Resource for function CEILING.XCL #*=-
+const char* SC_OPCODE_CEIL_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CEIL_MS", "Rounds a number away from zero to the nearest multiple of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions."),
+    NC_("SC_OPCODE_CEIL_MS", "Number"),
+    NC_("SC_OPCODE_CEIL_MS", "The number to be rounded up."),
+    NC_("SC_OPCODE_CEIL_MS", "Significance"),
+    NC_("SC_OPCODE_CEIL_MS", "The number to whose multiple the value is rounded.")
+};
+
+// -=*# Resource for function CEILING.PRECISE #*=-
+const char* SC_OPCODE_CEIL_PRECISE_ARY[] =
+{
+    NC_("SC_OPCODE_CEIL_PRECISE", "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."),
+    NC_("SC_OPCODE_CEIL_PRECISE", "Number"),
+    NC_("SC_OPCODE_CEIL_PRECISE", "The number to be rounded up."),
+    NC_("SC_OPCODE_CEIL_PRECISE", "Significance"),
+    NC_("SC_OPCODE_CEIL_PRECISE", "The number to whose multiple the value is rounded.")
+};
+
+// -=*# Resource for function ISO.CEILING #*=-
+const char* SC_OPCODE_CEIL_ISO_ARY[] =
+{
+    NC_("SC_OPCODE_CEIL_ISO", "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."),
+    NC_("SC_OPCODE_CEIL_ISO", "Number"),
+    NC_("SC_OPCODE_CEIL_ISO", "The number to be rounded up."),
+    NC_("SC_OPCODE_CEIL_ISO", "Significance"),
+    NC_("SC_OPCODE_CEIL_ISO", "The number to whose multiple the value is rounded.")
+};
+
+// -=*# Resource for function CEILING #*=-
+const char* SC_OPCODE_CEIL_ARY[] =
+{
+    NC_("SC_OPCODE_CEIL", "Rounds a number up to the nearest multiple of significance."),
+    NC_("SC_OPCODE_CEIL", "Number"),
+    NC_("SC_OPCODE_CEIL", "The number to be rounded up."),
+    NC_("SC_OPCODE_CEIL", "Significance"),
+    NC_("SC_OPCODE_CEIL", "If given the number to whose multiple the value is rounded, else -1 or 1 depending on sign of Number."),
+    NC_("SC_OPCODE_CEIL", "Mode"),
+    NC_("SC_OPCODE_CEIL", "If given and not equal to zero then rounded up according to amount when a negative number and significance.")
+};
+
+// -=*# Resource for function CEILING.MATH #*=-
+const char* SC_OPCODE_CEIL_MATH_ARY[] =
+{
+    NC_("SC_OPCODE_CEIL_MATH", "Rounds a number up to the nearest multiple of significance."),
+    NC_("SC_OPCODE_CEIL_MATH", "Number"),
+    NC_("SC_OPCODE_CEIL_MATH", "The number to be rounded up."),
+    NC_("SC_OPCODE_CEIL_MATH", "Significance"),
+    NC_("SC_OPCODE_CEIL_MATH", "If given the number to whose multiple the value is rounded, else 1."),
+    NC_("SC_OPCODE_CEIL_MATH", "Mode"),
+    NC_("SC_OPCODE_CEIL_MATH", "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero.")
+};
+
+// -=*# Resource for function FLOOR #*=-
+const char* SC_OPCODE_FLOOR_ARY[] =
+{
+    NC_("SC_OPCODE_FLOOR", "Rounds number down to the nearest multiple of significance."),
+    NC_("SC_OPCODE_FLOOR", "Number"),
+    NC_("SC_OPCODE_FLOOR", "The number to be rounded down."),
+    NC_("SC_OPCODE_FLOOR", "Significance"),
+    NC_("SC_OPCODE_FLOOR", "The number to whose multiple the value is to be rounded down."),
+    NC_("SC_OPCODE_FLOOR", "Mode"),
+    NC_("SC_OPCODE_FLOOR", "If given and not equal to zero then rounded towards zero with negative number and significance.")
+};
+
+// -=*# Resource for function FLOOR.XCL #*=-
+const char* SC_OPCODE_FLOOR_MS_ARY[] =
+{
+    NC_("SC_OPCODE_FLOOR_MS", "Rounds number towards zero to the nearest multiple of absolute value of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions."),
+    NC_("SC_OPCODE_FLOOR_MS", "Number"),
+    NC_("SC_OPCODE_FLOOR_MS", "The number to be rounded down."),
+    NC_("SC_OPCODE_FLOOR_MS", "Significance"),
+    NC_("SC_OPCODE_FLOOR_MS", "The number to whose multiple the value is to be rounded down.")
+};
+
+// -=*# Resource for function FLOOR.MATH #*=-
+const char* SC_OPCODE_FLOOR_MATH_ARY[] =
+{
+    NC_("SC_OPCODE_FLOOR_MATH", "Rounds number down to the nearest multiple of significance, regardless of sign of significance."),
+    NC_("SC_OPCODE_FLOOR_MATH", "Number"),
+    NC_("SC_OPCODE_FLOOR_MATH", "The number to be rounded down."),
+    NC_("SC_OPCODE_FLOOR_MATH", "Significance"),
+    NC_("SC_OPCODE_FLOOR_MATH", "The number to whose multiple the value is to be rounded down."),
+    NC_("SC_OPCODE_FLOOR_MATH", "Mode"),
+    NC_("SC_OPCODE_FLOOR_MATH", "For negative numbers; if given and not equal to or less than zero rounds towards zero.")
+};
+
+// -=*# Resource for function FLOOR.PRECISE #*=-
+const char* SC_OPCODE_FLOOR_PRECISE_ARY[] =
+{
+    NC_("SC_OPCODE_FLOOR_PRECISE", "Rounds number down (towards -∞) to the nearest multiple of significance."),
+    NC_("SC_OPCODE_FLOOR_PRECISE", "Number"),
+    NC_("SC_OPCODE_FLOOR_PRECISE", "The number to be rounded down."),
+    NC_("SC_OPCODE_FLOOR_PRECISE", "Significance"),
+    NC_("SC_OPCODE_FLOOR_PRECISE", "The number to whose multiple the value is to be rounded down. Sign has no meaning.")
+};
+
+// -=*# Resource for function GCD #*=-
+const char* SC_OPCODE_GCD_ARY[] =
+{
+    NC_("SC_OPCODE_GCD", "Greatest Common Divisor"),
+    NC_("SC_OPCODE_GCD", "Integer "),
+    NC_("SC_OPCODE_GCD", "Integer 1; integer 2,... are integers for which the greatest common divisor is to be calculated.")
+};
+
+// -=*# Resource for function LCM #*=-
+const char* SC_OPCODE_LCM_ARY[] =
+{
+    NC_("SC_OPCODE_LCM", "Lowest common multiple"),
+    NC_("SC_OPCODE_LCM", "Integer "),
+    NC_("SC_OPCODE_LCM", "Integer 1; integer 2,... are integers whose smallest common multiple is to be calculated.")
+};
+
+// -=*# Resource for function TRANSPOSE #*=-
+const char* SC_OPCODE_MAT_TRANS_ARY[] =
+{
+    NC_("SC_OPCODE_MAT_TRANS", "Array transposition. Exchanges the rows and columns of an array."),
+    NC_("SC_OPCODE_MAT_TRANS", "array"),
+    NC_("SC_OPCODE_MAT_TRANS", "The array in which the rows and columns have been transposed.")
+};
+
+// -=*# Resource for function MMULT #*=-
+const char* SC_OPCODE_MAT_MULT_ARY[] =
+{
+    NC_("SC_OPCODE_MAT_MULT", "Array multiplication. Returns the product of two arrays."),
+    NC_("SC_OPCODE_MAT_MULT", "array_1"),
+    NC_("SC_OPCODE_MAT_MULT", "The first array for the array product."),
+    NC_("SC_OPCODE_MAT_MULT", "array_2"),
+    NC_("SC_OPCODE_MAT_MULT", "The second array having the same number of rows as the first array has columns.")
+};
+
+// -=*# Resource for function MDETERM #*=-
+const char* SC_OPCODE_MAT_DET_ARY[] =
+{
+    NC_("SC_OPCODE_MAT_DET", "Returns the array determinant."),
+    NC_("SC_OPCODE_MAT_DET", "array"),
+    NC_("SC_OPCODE_MAT_DET", "The array for which the determinant is to be determined.")
+};
+
+// -=*# Resource for function MINVERSE #*=-
+const char* SC_OPCODE_MAT_INV_ARY[] =
+{
+    NC_("SC_OPCODE_MAT_INV", "Returns the inverse of an array."),
+    NC_("SC_OPCODE_MAT_INV", "array"),
+    NC_("SC_OPCODE_MAT_INV", "The array to be inverted.")
+};
+
+// -=*# Resource for function MUNIT #*=-
+const char* SC_OPCODE_MATRIX_UNIT_ARY[] =
+{
+    NC_("SC_OPCODE_MATRIX_UNIT", "Returns the unitary square array of a certain size."),
+    NC_("SC_OPCODE_MATRIX_UNIT", "Dimensions"),
+    NC_("SC_OPCODE_MATRIX_UNIT", "The size of the unitary array.")
+};
+
+// -=*# Resource for function SUMPRODUCT #*=-
+const char* SC_OPCODE_SUM_PRODUCT_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_PRODUCT", "(Inner products) Returns the sum of the products of array arguments."),
+    NC_("SC_OPCODE_SUM_PRODUCT", "Array "),
+    NC_("SC_OPCODE_SUM_PRODUCT", "Array 1, array 2, ... are arrays whose arguments are to be multiplied.")
+};
+
+// -=*# Resource for function SUMX2MY2 #*=-
+const char* SC_OPCODE_SUM_X2MY2_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_X2MY2", "Returns the sum of the difference of squares of two arrays."),
+    NC_("SC_OPCODE_SUM_X2MY2", "array_x"),
+    NC_("SC_OPCODE_SUM_X2MY2", "First array where the square of the arguments are totalled."),
+    NC_("SC_OPCODE_SUM_X2MY2", "array_y"),
+    NC_("SC_OPCODE_SUM_X2MY2", "Second array where the square of the arguments is to be subtracted.")
+};
+
+// -=*# Resource for function SUMX2PY2 #*=-
+const char* SC_OPCODE_SUM_X2DY2_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_X2DY2", "Returns the total of the square sum of two arrays."),
+    NC_("SC_OPCODE_SUM_X2DY2", "array_x"),
+    NC_("SC_OPCODE_SUM_X2DY2", "First array where the square of the arguments are totalled."),
+    NC_("SC_OPCODE_SUM_X2DY2", "array_y"),
+    NC_("SC_OPCODE_SUM_X2DY2", "Second array where the square of the arguments is to be totalled.")
+};
+
+// -=*# Resource for function SUMXMY2 #*=-
+const char* SC_OPCODE_SUM_XMY2_ARY[] =
+{
+    NC_("SC_OPCODE_SUM_XMY2", "Returns the sum of squares of differences of two arrays."),
+    NC_("SC_OPCODE_SUM_XMY2", "array_x"),
+    NC_("SC_OPCODE_SUM_XMY2", "First array for forming argument differences."),
+    NC_("SC_OPCODE_SUM_XMY2", "array_y"),
+    NC_("SC_OPCODE_SUM_XMY2", "Second array for forming the argument differences.")
+};
+
+// -=*# Resource for function FREQUENCY #*=-
+const char* SC_OPCODE_FREQUENCY_ARY[] =
+{
+    NC_("SC_OPCODE_FREQUENCY", "Returns a frequency distribution as a vertical array."),
+    NC_("SC_OPCODE_FREQUENCY", "data"),
+    NC_("SC_OPCODE_FREQUENCY", "The array of the data."),
+    NC_("SC_OPCODE_FREQUENCY", "classes"),
+    NC_("SC_OPCODE_FREQUENCY", "The array for forming classes.")
+};
+
+// -=*# Resource for function LINEST #*=-
+const char* SC_OPCODE_LINEST_ARY[] =
+{
+    NC_("SC_OPCODE_LINEST", "Calculates parameters of the linear regression as an array."),
+    NC_("SC_OPCODE_LINEST", "data_Y"),
+    NC_("SC_OPCODE_LINEST", "The Y data array."),
+    NC_("SC_OPCODE_LINEST", "data_X"),
+    NC_("SC_OPCODE_LINEST", "The X data array."),
+    NC_("SC_OPCODE_LINEST", "Linear_type"),
+    NC_("SC_OPCODE_LINEST", "If type = 0 the linears will be calculated through the zero point, or else moved linears."),
+    NC_("SC_OPCODE_LINEST", "stats"),
+    NC_("SC_OPCODE_LINEST", "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well.")
+};
+
+// -=*# Resource for function LOGEST #*=-
+const char* SC_OPCODE_LOGEST_ARY[] =
+{
+    NC_("SC_OPCODE_LOGEST", "Calculates the parameters of the exponential regression curve as an array."),
+    NC_("SC_OPCODE_LOGEST", "data_Y"),
+    NC_("SC_OPCODE_LOGEST", "The Y data array."),
+    NC_("SC_OPCODE_LOGEST", "data_X"),
+    NC_("SC_OPCODE_LOGEST", "The X data array."),
+    NC_("SC_OPCODE_LOGEST", "Function_type"),
+    NC_("SC_OPCODE_LOGEST", "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x."),
+    NC_("SC_OPCODE_LOGEST", "stats"),
+    NC_("SC_OPCODE_LOGEST", "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well.")
+};
+
+// -=*# Resource for function TREND #*=-
+const char* SC_OPCODE_TREND_ARY[] =
+{
+    NC_("SC_OPCODE_TREND", "Calculates points along a regression line."),
+    NC_("SC_OPCODE_TREND", "data_Y"),
+    NC_("SC_OPCODE_TREND", "The Y data array."),
+    NC_("SC_OPCODE_TREND", "data_X"),
+    NC_("SC_OPCODE_TREND", "The X data array as the basis for the regression."),
+    NC_("SC_OPCODE_TREND", "new data_X"),
+    NC_("SC_OPCODE_TREND", "The array of X data for recalculating the values."),
+    NC_("SC_OPCODE_TREND", "Linear_type"),
+    NC_("SC_OPCODE_TREND", "If type = 0 the linears will be calculated through the zero point, or else moved linears.")
+};
+
+// -=*# Resource for function GROWTH #*=-
+const char* SC_OPCODE_GROWTH_ARY[] =
+{
+    NC_("SC_OPCODE_GROWTH", "Calculates points on the exponential regression function."),
+    NC_("SC_OPCODE_GROWTH", "data_Y"),
+    NC_("SC_OPCODE_GROWTH", "The Y data array."),
+    NC_("SC_OPCODE_GROWTH", "data_X"),
+    NC_("SC_OPCODE_GROWTH", "The X data array as the basis for the regression."),
+    NC_("SC_OPCODE_GROWTH", "new_data_X"),
+    NC_("SC_OPCODE_GROWTH", "The array of X data for recalculating the values."),
+    NC_("SC_OPCODE_GROWTH", "Function_type"),
+    NC_("SC_OPCODE_GROWTH", "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x.")
+};
+
+// -=*# Resource for function COUNT #*=-
+const char* SC_OPCODE_COUNT_ARY[] =
+{
+    NC_("SC_OPCODE_COUNT", "Counts how many numbers are in the list of arguments."),
+    NC_("SC_OPCODE_COUNT", "value "),
+    NC_("SC_OPCODE_COUNT", "Value 1, value 2, ... are arguments containing different data types but where only numbers are counted.")
+};
+
+// -=*# Resource for function COUNTA #*=-
+const char* SC_OPCODE_COUNT_2_ARY[] =
+{
+    NC_("SC_OPCODE_COUNT_2", "Counts how many values are in the list of arguments."),
+    NC_("SC_OPCODE_COUNT_2", "value "),
+    NC_("SC_OPCODE_COUNT_2", "Value 1, value 2, ... are arguments representing the values to be counted.")
+};
+
+// -=*# Resource for function MAX #*=-
+const char* SC_OPCODE_MAX_ARY[] =
+{
+    NC_("SC_OPCODE_MAX", "Returns the maximum value in a list of arguments."),
+    NC_("SC_OPCODE_MAX", "number "),
+    NC_("SC_OPCODE_MAX", "Number 1, number 2, ... are numerical arguments for which the largest number is to be determined.")
+};
+
+// -=*# Resource for function MAXA #*=-
+const char* SC_OPCODE_MAX_A_ARY[] =
+{
+    NC_("SC_OPCODE_MAX_A", "Returns the maximum value in a list of arguments. Text is evaluated as Zero."),
+    NC_("SC_OPCODE_MAX_A", "value "),
+    NC_("SC_OPCODE_MAX_A", "Value 1, value 2,    are arguments whose largest value is to be determined.")
+};
+
+// -=*# Resource for function MIN #*=-
+const char* SC_OPCODE_MIN_ARY[] =
+{
+    NC_("SC_OPCODE_MIN", "Returns the minimum value in a list of arguments."),
+    NC_("SC_OPCODE_MIN", "number "),
+    NC_("SC_OPCODE_MIN", "Number 1, number 2, ... are numerical arguments for which the smallest number is to be determined.")
+};
+
+// -=*# Resource for function MINA #*=-
+const char* SC_OPCODE_MIN_A_ARY[] =
+{
+    NC_("SC_OPCODE_MIN_A", "Returns the smallest value in a list of arguments. Text is evaluated as zero."),
+    NC_("SC_OPCODE_MIN_A", "value "),
+    NC_("SC_OPCODE_MIN_A", "Value 1; value 2;... are arguments whose smallest number is to be determined.")
+};
+
+// -=*# Resource for function VAR #*=-
+const char* SC_OPCODE_VAR_ARY[] =
+{
+    NC_("SC_OPCODE_VAR", "Calculates the variance based on a sample."),
+    NC_("SC_OPCODE_VAR", "number "),
+    NC_("SC_OPCODE_VAR", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.")
+};
+
+// -=*# Resource for function VAR.S #*=-
+const char* SC_OPCODE_VAR_S_ARY[] =
+{
+    NC_("SC_OPCODE_VAR_S", "Calculates the variance based on a sample."),
+    NC_("SC_OPCODE_VAR_S", "number "),
+    NC_("SC_OPCODE_VAR_S", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.")
+};
+
+// -=*# Resource for function VARA #*=-
+const char* SC_OPCODE_VAR_A_ARY[] =
+{
+    NC_("SC_OPCODE_VAR_A", "Returns the variance based on a sample. Text is evaluated as zero."),
+    NC_("SC_OPCODE_VAR_A", "value "),
+    NC_("SC_OPCODE_VAR_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.")
+};
+
+// -=*# Resource for function VARP #*=-
+const char* SC_OPCODE_VAR_P_ARY[] =
+{
+    NC_("SC_OPCODE_VAR_P", "Calculates variance based on the entire population."),
+    NC_("SC_OPCODE_VAR_P", "number "),
+    NC_("SC_OPCODE_VAR_P", "Number 1, number 2, ... are numerical arguments which represent a population.")
+};
+
+// -=*# Resource for function VAR.P #*=-
+const char* SC_OPCODE_VAR_P_MS_ARY[] =
+{
+    NC_("SC_OPCODE_VAR_P_MS", "Calculates variance based on the entire population."),
+    NC_("SC_OPCODE_VAR_P_MS", "number "),
+    NC_("SC_OPCODE_VAR_P_MS", "Number 1, number 2, ... are numerical arguments which represent a population.")
+};
+
+// -=*# Resource for function VARPA #*=-
+const char* SC_OPCODE_VAR_P_A_ARY[] =
+{
+    NC_("SC_OPCODE_VAR_P_A", "Returns the variance based on the entire population. Text is evaluated as zero."),
+    NC_("SC_OPCODE_VAR_P_A", "value "),
+    NC_("SC_OPCODE_VAR_P_A", "Value 1; value 2;... are arguments representing a population.")
+};
+
+// -=*# Resource for function STDEV #*=-
+const char* SC_OPCODE_ST_DEV_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV", "Calculates the standard deviation based on a sample."),
+    NC_("SC_OPCODE_ST_DEV", "number "),
+    NC_("SC_OPCODE_ST_DEV", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.")
+};
+
+// -=*# Resource for function STDEV.S #*=-
+const char* SC_OPCODE_ST_DEV_S_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV_S", "Calculates the standard deviation based on a sample."),
+    NC_("SC_OPCODE_ST_DEV_S", "number "),
+    NC_("SC_OPCODE_ST_DEV_S", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.")
+};
+
+// -=*# Resource for function STDEVA #*=-
+const char* SC_OPCODE_ST_DEV_A_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV_A", "Returns the standard deviation based on a sample. Text is evaluated as zero."),
+    NC_("SC_OPCODE_ST_DEV_A", "value "),
+    NC_("SC_OPCODE_ST_DEV_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.")
+};
+
+// -=*# Resource for function STDEVP #*=-
+const char* SC_OPCODE_ST_DEV_P_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV_P", "Calculates the standard deviation based on the entire population."),
+    NC_("SC_OPCODE_ST_DEV_P", "number "),
+    NC_("SC_OPCODE_ST_DEV_P", "Number 1, number 2, ... are numerical arguments which portray a population.")
+};
+
+// -=*# Resource for function STDEV.P #*=-
+const char* SC_OPCODE_ST_DEV_P_MS_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV_P_MS", "Calculates the standard deviation based on the entire population."),
+    NC_("SC_OPCODE_ST_DEV_P_MS", "number "),
+    NC_("SC_OPCODE_ST_DEV_P_MS", "Number 1, number 2, ... are numerical arguments which portray a population.")
+};
+
+// -=*# Resource for function STDEVPA #*=-
+const char* SC_OPCODE_ST_DEV_P_A_ARY[] =
+{
+    NC_("SC_OPCODE_ST_DEV_P_A", "Returns the standard deviation based on the entire population. Text is evaluated as zero."),
+    NC_("SC_OPCODE_ST_DEV_P_A", "value "),
+    NC_("SC_OPCODE_ST_DEV_P_A", "Value 1; value 2;... are arguments corresponding to a population.")
+};
+
+// -=*# Resource for function AVERAGE #*=-
+const char* SC_OPCODE_AVERAGE_ARY[] =
+{
+    NC_("SC_OPCODE_AVERAGE", "Returns the average of a sample."),
+    NC_("SC_OPCODE_AVERAGE", "number "),
+    NC_("SC_OPCODE_AVERAGE", "Number 1, number 2;...are numeric arguments representing a population sample.")
+};
+
+// -=*# Resource for function AVERAGEA #*=-
+const char* SC_OPCODE_AVERAGE_A_ARY[] =
+{
+    NC_("SC_OPCODE_AVERAGE_A", "Returns the average value for a sample. Text is evaluated as zero."),
+    NC_("SC_OPCODE_AVERAGE_A", "value "),
+    NC_("SC_OPCODE_AVERAGE_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.")
+};
+
+// -=*# Resource for function DEVSQ #*=-
+const char* SC_OPCODE_DEV_SQ_ARY[] =
+{
+    NC_("SC_OPCODE_DEV_SQ", "Returns the sum of squares of deviations from the sample mean value"),
+    NC_("SC_OPCODE_DEV_SQ", "number "),
+    NC_("SC_OPCODE_DEV_SQ", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function AVEDEV #*=-
+const char* SC_OPCODE_AVE_DEV_ARY[] =
+{
+    NC_("SC_OPCODE_AVE_DEV", "Returns the average of the absolute deviations of a sample from the mean."),
+    NC_("SC_OPCODE_AVE_DEV", "number "),
+    NC_("SC_OPCODE_AVE_DEV", "Number 1, number 2;...are numerical arguments representing a sample.")
+};
+
+// -=*# Resource for function SKEW #*=-
+const char* SC_OPCODE_SKEW_ARY[] =
+{
+    NC_("SC_OPCODE_SKEW", "Returns the skewness of a distribution."),
+    NC_("SC_OPCODE_SKEW", "number "),
+    NC_("SC_OPCODE_SKEW", "Number 1, number 2, ... are numerical arguments portraying a sample of the distribution.")
+};
+
+// -=*# Resource for function SKEWP #*=-
+const char* SC_OPCODE_SKEWP_ARY[] =
+{
+    NC_("SC_OPCODE_SKEWP", "Returns the skewness of a distribution using the population of a random variable."),
+    NC_("SC_OPCODE_SKEWP", "number "),
+    NC_("SC_OPCODE_SKEWP", "Number 1, number 2, ... are numerical arguments portraying the population.")
+};
+
+// -=*# Resource for function KURT #*=-
+const char* SC_OPCODE_KURT_ARY[] =
+{
+    NC_("SC_OPCODE_KURT", "Returns the kurtosis of a distribution."),
+    NC_("SC_OPCODE_KURT", "number "),
+    NC_("SC_OPCODE_KURT", "Number 1, number 2, ... are numerical arguments, representing a sample of the distribution.")
+};
+
+// -=*# Resource for function GEOMEAN #*=-
+const char* SC_OPCODE_GEO_MEAN_ARY[] =
+{
+    NC_("SC_OPCODE_GEO_MEAN", "Returns the geometric mean of a sample."),
+    NC_("SC_OPCODE_GEO_MEAN", "number "),
+    NC_("SC_OPCODE_GEO_MEAN", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function HARMEAN #*=-
+const char* SC_OPCODE_HAR_MEAN_ARY[] =
+{
+    NC_("SC_OPCODE_HAR_MEAN", "Returns the harmonic mean of a sample."),
+    NC_("SC_OPCODE_HAR_MEAN", "number "),
+    NC_("SC_OPCODE_HAR_MEAN", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function MODE #*=-
+const char* SC_OPCODE_MODAL_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_MODAL_VALUE", "Returns the most common value in a sample."),
+    NC_("SC_OPCODE_MODAL_VALUE", "number "),
+    NC_("SC_OPCODE_MODAL_VALUE", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function MODE.SNGL #*=-
+const char* SC_OPCODE_MODAL_VALUE_MS_ARY[] =
+{
+    NC_("SC_OPCODE_MODAL_VALUE_MS", "Returns the most common value in a sample."),
+    NC_("SC_OPCODE_MODAL_VALUE_MS", "number "),
+    NC_("SC_OPCODE_MODAL_VALUE_MS", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function MODE.MULT #*=-
+const char* SC_OPCODE_MODAL_VALUE_MULTI_ARY[] =
+{
+    NC_("SC_OPCODE_MODAL_VALUE_MULTI", "Returns the most common value in a sample."),
+    NC_("SC_OPCODE_MODAL_VALUE_MULTI", "number "),
+    NC_("SC_OPCODE_MODAL_VALUE_MULTI", "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function MEDIAN #*=-
+const char* SC_OPCODE_MEDIAN_ARY[] =
+{
+    NC_("SC_OPCODE_MEDIAN", "Returns the median of a given sample."),
+    NC_("SC_OPCODE_MEDIAN", "number "),
+    NC_("SC_OPCODE_MEDIAN", "Number 1, number 2, ... are numerical arguments which portray a sample.")
+};
+
+// -=*# Resource for function PERCENTILE #*=-
+const char* SC_OPCODE_PERCENTILE_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENTILE", "Returns the alpha quantile of a sample."),
+    NC_("SC_OPCODE_PERCENTILE", "data"),
+    NC_("SC_OPCODE_PERCENTILE", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENTILE", "Alpha"),
+    NC_("SC_OPCODE_PERCENTILE", "The percentage rate of the quantile between 0 and 1.")
+};
+
+// -=*# Resource for function PERCENTILE.EXC #*=-
+const char* SC_OPCODE_PERCENTILE_EXC_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENTILE_EXC", "Returns the alpha percentile of a sample."),
+    NC_("SC_OPCODE_PERCENTILE_EXC", "data"),
+    NC_("SC_OPCODE_PERCENTILE_EXC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENTILE_EXC", "Alpha"),
+    NC_("SC_OPCODE_PERCENTILE_EXC", "The percentile value, range 0...1, exclusive.")
+};
+
+// -=*# Resource for function PERCENTILE.INC #*=-
+const char* SC_OPCODE_PERCENTILE_INC_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENTILE_INC", "Returns the alpha percentile of a sample."),
+    NC_("SC_OPCODE_PERCENTILE_INC", "data"),
+    NC_("SC_OPCODE_PERCENTILE_INC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENTILE_INC", "Alpha"),
+    NC_("SC_OPCODE_PERCENTILE_INC", "The percentile value, range 0...1, inclusive.")
+};
+
+// -=*# Resource for function QUARTILE #*=-
+const char* SC_OPCODE_QUARTILE_ARY[] =
+{
+    NC_("SC_OPCODE_QUARTILE", "Returns the quartile of a sample."),
+    NC_("SC_OPCODE_QUARTILE", "data"),
+    NC_("SC_OPCODE_QUARTILE", "The array of the data in the sample."),
+    NC_("SC_OPCODE_QUARTILE", "Type"),
+    NC_("SC_OPCODE_QUARTILE", "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX).")
+};
+
+// -=*# Resource for function QUARTILE.EXC #*=-
+const char* SC_OPCODE_QUARTILE_EXC_ARY[] =
+{
+    NC_("SC_OPCODE_QUARTILE_EXC", "Returns the quartile of a sample."),
+    NC_("SC_OPCODE_QUARTILE_EXC", "data"),
+    NC_("SC_OPCODE_QUARTILE_EXC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_QUARTILE_EXC", "Type"),
+    NC_("SC_OPCODE_QUARTILE_EXC", "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%).")
+};
+
+// -=*# Resource for function QUARTILE.INC #*=-
+const char* SC_OPCODE_QUARTILE_INC_ARY[] =
+{
+    NC_("SC_OPCODE_QUARTILE_INC", "Returns the quartile of a sample."),
+    NC_("SC_OPCODE_QUARTILE_INC", "data"),
+    NC_("SC_OPCODE_QUARTILE_INC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_QUARTILE_INC", "Type"),
+    NC_("SC_OPCODE_QUARTILE_INC", "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX).")
+};
+
+// -=*# Resource for function LARGE #*=-
+const char* SC_OPCODE_LARGE_ARY[] =
+{
+    NC_("SC_OPCODE_LARGE", "Returns the k-th largest value of a sample."),
+    NC_("SC_OPCODE_LARGE", "data"),
+    NC_("SC_OPCODE_LARGE", "The array of the data in the sample."),
+    NC_("SC_OPCODE_LARGE", "Rank_c"),
+    NC_("SC_OPCODE_LARGE", "The ranking of the value.")
+};
+
+// -=*# Resource for function SMALL #*=-
+const char* SC_OPCODE_SMALL_ARY[] =
+{
+    NC_("SC_OPCODE_SMALL", "Returns the k-th smallest value of a sample."),
+    NC_("SC_OPCODE_SMALL", "data"),
+    NC_("SC_OPCODE_SMALL", "The array of the data in the sample."),
+    NC_("SC_OPCODE_SMALL", "Rank_c"),
+    NC_("SC_OPCODE_SMALL", "The ranking of the value.")
+};
+
+// -=*# Resource for function PERCENTRANK #*=-
+const char* SC_OPCODE_PERCENT_RANK_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENT_RANK", "Returns the percentage rank of a value in a sample."),
+    NC_("SC_OPCODE_PERCENT_RANK", "data"),
+    NC_("SC_OPCODE_PERCENT_RANK", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENT_RANK", "value"),
+    NC_("SC_OPCODE_PERCENT_RANK", "The value for which percentage ranking is to be determined."),
+    NC_("SC_OPCODE_PERCENT_RANK", "significance"),
+    NC_("SC_OPCODE_PERCENT_RANK", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.")
+};
+
+// -=*# Resource for function PERCENTRANK.EXC #*=-
+const char* SC_OPCODE_PERCENT_RANK_EXC_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "Returns the percentage rank (0..1, exclusive) of a value in a sample."),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "data"),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "value"),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "The value for which percentage ranking is to be determined."),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "significance"),
+    NC_("SC_OPCODE_PERCENT_RANK_EXC", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.")
+};
+
+// -=*# Resource for function PERCENTRANK.INC #*=-
+const char* SC_OPCODE_PERCENT_RANK_INC_ARY[] =
+{
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "Returns the percentage rank (0..1, inclusive) of a value in a sample."),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "data"),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "The array of the data in the sample."),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "value"),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "The value for which percentage ranking is to be determined."),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "significance"),
+    NC_("SC_OPCODE_PERCENT_RANK_INC", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.")
+};
+
+// -=*# Resource for function RANK #*=-
+const char* SC_OPCODE_RANK_ARY[] =
+{
+    NC_("SC_OPCODE_RANK", "Returns the ranking of a value in a sample."),
+    NC_("SC_OPCODE_RANK", "value"),
+    NC_("SC_OPCODE_RANK", "The value for which the rank is to be determined."),
+    NC_("SC_OPCODE_RANK", "Data"),
+    NC_("SC_OPCODE_RANK", "The array of the data in the sample."),
+    NC_("SC_OPCODE_RANK", "Type"),
+    NC_("SC_OPCODE_RANK", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.")
+};
+
+// -=*# Resource for function RANK.EQ #*=-
+const char* SC_OPCODE_RANK_EQ_ARY[] =
+{
+    NC_("SC_OPCODE_RANK_EQ", "Returns the ranking of a value in a sample; if more than one value has the same rank, the top rank of that set of values is returned."),
+    NC_("SC_OPCODE_RANK_EQ", "value"),
+    NC_("SC_OPCODE_RANK_EQ", "The value for which the rank is to be determined."),
+    NC_("SC_OPCODE_RANK_EQ", "Data"),
+    NC_("SC_OPCODE_RANK_EQ", "The array of the data in the sample."),
+    NC_("SC_OPCODE_RANK_EQ", "Type"),
+    NC_("SC_OPCODE_RANK_EQ", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.")
+};
+
+// -=*# Resource for function RANK.AVG #*=-
+const char* SC_OPCODE_RANK_AVG_ARY[] =
+{
+    NC_("SC_OPCODE_RANK_AVG", "Returns the ranking of a value in a sample; if more than one value has the same rank, the average rank is returned."),
+    NC_("SC_OPCODE_RANK_AVG", "value"),
+    NC_("SC_OPCODE_RANK_AVG", "The value for which the rank is to be determined."),
+    NC_("SC_OPCODE_RANK_AVG", "Data"),
+    NC_("SC_OPCODE_RANK_AVG", "The array of the data in the sample."),
+    NC_("SC_OPCODE_RANK_AVG", "Type"),
+    NC_("SC_OPCODE_RANK_AVG", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.")
+};
+
+// -=*# Resource for function TRIMMEAN #*=-
+const char* SC_OPCODE_TRIM_MEAN_ARY[] =
+{
+    NC_("SC_OPCODE_TRIM_MEAN", "Returns the mean of a sample without including the marginal values."),
+    NC_("SC_OPCODE_TRIM_MEAN", "data"),
+    NC_("SC_OPCODE_TRIM_MEAN", "The array of the data in the sample."),
+    NC_("SC_OPCODE_TRIM_MEAN", "Alpha"),
+    NC_("SC_OPCODE_TRIM_MEAN", "The percentage of marginal data that is not to be taken into account.")
+};
+
+// -=*# Resource for function PROB #*=-
+const char* SC_OPCODE_PROB_ARY[] =
+{
+    NC_("SC_OPCODE_PROB", "Returns the discrete probability of an interval."),
+    NC_("SC_OPCODE_PROB", "data"),
+    NC_("SC_OPCODE_PROB", "The sample data array."),
+    NC_("SC_OPCODE_PROB", "probability"),
+    NC_("SC_OPCODE_PROB", "The array of the associated probabilities."),
+    NC_("SC_OPCODE_PROB", "Start"),
+    NC_("SC_OPCODE_PROB", "The start of the value interval whose probabilities is to be totalled."),
+    NC_("SC_OPCODE_PROB", "End"),
+    NC_("SC_OPCODE_PROB", "The end of the value interval where the probabilities are to be totalled.")
+};
+
+// -=*# Resource for function B #*=-
+const char* SC_OPCODE_B_ARY[] =
+{
+    NC_("SC_OPCODE_B", "Returns the probability of a trial result using binomial distribution."),
+    NC_("SC_OPCODE_B", "trials"),
+    NC_("SC_OPCODE_B", "The number of trials."),
+    NC_("SC_OPCODE_B", "SP"),
+    NC_("SC_OPCODE_B", "The individual probability of a trial result."),
+    NC_("SC_OPCODE_B", "T_1"),
+    NC_("SC_OPCODE_B", "Lower limit for the number of trials."),
+    NC_("SC_OPCODE_B", "T_2"),
+    NC_("SC_OPCODE_B", "Upper limit for the number of trials.")
+};
+
+// -=*# Resource for function PHI #*=-
+const char* SC_OPCODE_PHI_ARY[] =
+{
+    NC_("SC_OPCODE_PHI", "Values of the distribution function for a standard normal distribution."),
+    NC_("SC_OPCODE_PHI", "number"),
+    NC_("SC_OPCODE_PHI", "The value for which the standard normal distribution is to be calculated.")
+};
+
+// -=*# Resource for function GAUSS #*=-
+const char* SC_OPCODE_GAUSS_ARY[] =
+{
+    NC_("SC_OPCODE_GAUSS", "Returns the integral values of the standard normal cumulative distribution."),
+    NC_("SC_OPCODE_GAUSS", "Number"),
+    NC_("SC_OPCODE_GAUSS", "The value for which the integral value of the standard normal distribution is to be calculated.")
+};
+
+// -=*# Resource for function FISHER #*=-
+const char* SC_OPCODE_FISHER_ARY[] =
+{
+    NC_("SC_OPCODE_FISHER", "Returns the Fisher transformation."),
+    NC_("SC_OPCODE_FISHER", "Number"),
+    NC_("SC_OPCODE_FISHER", "The value to be transformed (-1 < VALUE < 1).")
+};
+
+// -=*# Resource for function FISHERINV #*=-
+const char* SC_OPCODE_FISHER_INV_ARY[] =
+{
+    NC_("SC_OPCODE_FISHER_INV", "Returns the inverse of the Fisher transformation."),
+    NC_("SC_OPCODE_FISHER_INV", "Number"),
+    NC_("SC_OPCODE_FISHER_INV", "The value that is to be transformed back.")
+};
+
+// -=*# Resource for function BINOMDIST #*=-
+const char* SC_OPCODE_BINOM_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_BINOM_DIST", "Values of the binomial distribution."),
+    NC_("SC_OPCODE_BINOM_DIST", "X"),
+    NC_("SC_OPCODE_BINOM_DIST", "The number of successes in a series of trials."),
+    NC_("SC_OPCODE_BINOM_DIST", "trials"),
+    NC_("SC_OPCODE_BINOM_DIST", "The total number of trials."),
+    NC_("SC_OPCODE_BINOM_DIST", "SP"),
+    NC_("SC_OPCODE_BINOM_DIST", "The success probability of a trial."),
+    NC_("SC_OPCODE_BINOM_DIST", "C"),
+    NC_("SC_OPCODE_BINOM_DIST", "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability.")
+};
+
+// -=*# Resource for function BINOM.DIST #*=-
+const char* SC_OPCODE_BINOM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_BINOM_DIST_MS", "Values of the binomial distribution."),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "X"),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "The number of successes in a series of trials."),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "trials"),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "The total number of trials."),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "SP"),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "The success probability of a trial."),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "C"),
+    NC_("SC_OPCODE_BINOM_DIST_MS", "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability.")
+};
+
+// -=*# Resource for function NEGBINOMDIST #*=-
+const char* SC_OPCODE_NEG_BINOM_VERT_ARY[] =
+{
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "Values of the negative binomial distribution."),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "X"),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "The number of failures in the trial range."),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "R"),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "The number of successes in the trial sequence."),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "SP"),
+    NC_("SC_OPCODE_NEG_BINOM_VERT", "The success probability of a trial.")
+};
+
+// -=*# Resource for function NEGBINOM.DIST #*=-
+const char* SC_OPCODE_NEG_BINOM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "Values of the negative binomial distribution."),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "X"),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The number of failures in the trial range."),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "R"),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The number of successes in the trial sequence."),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "SP"),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The success probability of a trial."),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function CRITBINOM #*=-
+const char* SC_OPCODE_CRIT_BINOM_ARY[] =
+{
+    NC_("SC_OPCODE_CRIT_BINOM", "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."),
+    NC_("SC_OPCODE_CRIT_BINOM", "trials"),
+    NC_("SC_OPCODE_CRIT_BINOM", "The total number of trials."),
+    NC_("SC_OPCODE_CRIT_BINOM", "SP"),
+    NC_("SC_OPCODE_CRIT_BINOM", "The success probability of a trial."),
+    NC_("SC_OPCODE_CRIT_BINOM", "alpha"),
+    NC_("SC_OPCODE_CRIT_BINOM", "The border probability that is attained or exceeded.")
+};
+
+// -=*# Resource for function BINOM.INV #*=-
+const char* SC_OPCODE_BINOM_INV_ARY[] =
+{
+    NC_("SC_OPCODE_BINOM_INV", "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."),
+    NC_("SC_OPCODE_BINOM_INV", "trials"),
+    NC_("SC_OPCODE_BINOM_INV", "The total number of trials."),
+    NC_("SC_OPCODE_BINOM_INV", "SP"),
+    NC_("SC_OPCODE_BINOM_INV", "The success probability of a trial."),
+    NC_("SC_OPCODE_BINOM_INV", "alpha"),
+    NC_("SC_OPCODE_BINOM_INV", "The border probability that is attained or exceeded.")
+};
+
+// -=*# Resource for function POISSON #*=-
+const char* SC_OPCODE_POISSON_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_POISSON_DIST", "Returns the Poisson distribution."),
+    NC_("SC_OPCODE_POISSON_DIST", "Number"),
+    NC_("SC_OPCODE_POISSON_DIST", "The value for which the Poisson distribution is to be calculated."),
+    NC_("SC_OPCODE_POISSON_DIST", "mean"),
+    NC_("SC_OPCODE_POISSON_DIST", "Mean. The mean value of the Poisson distribution."),
+    NC_("SC_OPCODE_POISSON_DIST", "Cumulative"),
+    NC_("SC_OPCODE_POISSON_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function POISSON.DIST #*=-
+const char* SC_OPCODE_POISSON_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_POISSON_DIST_MS", "Returns the Poisson distribution."),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "Number"),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "The value for which the Poisson distribution is to be calculated."),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "mean"),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "Mean. The mean value of the Poisson distribution."),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_POISSON_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function NORMDIST #*=-
+const char* SC_OPCODE_NORM_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_NORM_DIST", "Values of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST", "Number"),
+    NC_("SC_OPCODE_NORM_DIST", "The value for which the normal distribution is to be calculated."),
+    NC_("SC_OPCODE_NORM_DIST", "Mean"),
+    NC_("SC_OPCODE_NORM_DIST", "The mean value. The mean value of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST", "STDEV"),
+    NC_("SC_OPCODE_NORM_DIST", "Standard deviation. The standard deviation of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST", "C"),
+    NC_("SC_OPCODE_NORM_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function NORM.DIST #*=-
+const char* SC_OPCODE_NORM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_NORM_DIST_MS", "Values of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST_MS", "Number"),
+    NC_("SC_OPCODE_NORM_DIST_MS", "The value for which the normal distribution is to be calculated."),
+    NC_("SC_OPCODE_NORM_DIST_MS", "Mean"),
+    NC_("SC_OPCODE_NORM_DIST_MS", "The mean value. The mean value of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST_MS", "STDEV"),
+    NC_("SC_OPCODE_NORM_DIST_MS", "Standard deviation. The standard deviation of the normal distribution."),
+    NC_("SC_OPCODE_NORM_DIST_MS", "C"),
+    NC_("SC_OPCODE_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function NORMINV #*=-
+const char* SC_OPCODE_NORM_INV_ARY[] =
+{
+    NC_("SC_OPCODE_NORM_INV", "Values of the inverse normal distribution."),
+    NC_("SC_OPCODE_NORM_INV", "number"),
+    NC_("SC_OPCODE_NORM_INV", "The probability value for which the inverse normal distribution is to be calculated."),
+    NC_("SC_OPCODE_NORM_INV", "mean"),
+    NC_("SC_OPCODE_NORM_INV", "The mean value. The mean value of the normal distribution."),
+    NC_("SC_OPCODE_NORM_INV", "STDEV"),
+    NC_("SC_OPCODE_NORM_INV", "Standard deviation. The standard deviation of the normal distribution.")
+};
+
+// -=*# Resource for function NORM.INV #*=-
+const char* SC_OPCODE_NORM_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_NORM_INV_MS", "Values of the inverse normal distribution."),
+    NC_("SC_OPCODE_NORM_INV_MS", "number"),
+    NC_("SC_OPCODE_NORM_INV_MS", "The probability value for which the inverse normal distribution is to be calculated."),
+    NC_("SC_OPCODE_NORM_INV_MS", "mean"),
+    NC_("SC_OPCODE_NORM_INV_MS", "The mean value. The mean value of the normal distribution."),
+    NC_("SC_OPCODE_NORM_INV_MS", "STDEV"),
+    NC_("SC_OPCODE_NORM_INV_MS", "Standard deviation. The standard deviation of the normal distribution.")
+};
+
+// -=*# Resource for function NORMSDIST #*=-
+const char* SC_OPCODE_STD_NORM_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_STD_NORM_DIST", "The values of the standard normal cumulative distribution."),
+    NC_("SC_OPCODE_STD_NORM_DIST", "Number"),
+    NC_("SC_OPCODE_STD_NORM_DIST", "The value for which the standard normal distribution is to be calculated.")
+};
+
+// -=*# Resource for function NORM.S.DIST #*=-
+const char* SC_OPCODE_STD_NORM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_STD_NORM_DIST_MS", "The values of the standard normal distribution."),
+    NC_("SC_OPCODE_STD_NORM_DIST_MS", "Number"),
+    NC_("SC_OPCODE_STD_NORM_DIST_MS", "The value for which the standard normal distribution is to be calculated."),
+    NC_("SC_OPCODE_STD_NORM_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_STD_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function NORMSINV #*=-
+const char* SC_OPCODE_S_NORM_INV_ARY[] =
+{
+    NC_("SC_OPCODE_S_NORM_INV", "Values of the inverse standard normal distribution."),
+    NC_("SC_OPCODE_S_NORM_INV", "number"),
+    NC_("SC_OPCODE_S_NORM_INV", "The probability value for which the inverse standard normal distribution is to be calculated.")
+};
+
+// -=*# Resource for function NORM.S.INV #*=-
+const char* SC_OPCODE_S_NORM_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_S_NORM_INV_MS", "Values of the inverse standard normal distribution."),
+    NC_("SC_OPCODE_S_NORM_INV_MS", "number"),
+    NC_("SC_OPCODE_S_NORM_INV_MS", "The probability value for which the inverse standard normal distribution is to be calculated.")
+};
+
+// -=*# Resource for function LOGNORMDIST #*=-
+const char* SC_OPCODE_LOG_NORM_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_LOG_NORM_DIST", "Values of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "Number"),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "The value for which the log normal distribution is to be calculated."),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "mean"),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "The mean value of the log normal distribution. It is set to 0 if omitted."),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "STDEV"),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "The standard deviation of the log normal distribution. It is set to 1 if omitted."),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "Cumulative"),
+    NC_("SC_OPCODE_LOG_NORM_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function LOGNORM.DIST #*=-
+const char* SC_OPCODE_LOG_NORM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Values of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Number"),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The value for which the log normal distribution is to be calculated."),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "mean"),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The mean value of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "STDEV"),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The standard deviation of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_LOG_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function LOGINV #*=-
+const char* SC_OPCODE_LOG_INV_ARY[] =
+{
+    NC_("SC_OPCODE_LOG_INV", "Values of the inverse of the lognormal distribution."),
+    NC_("SC_OPCODE_LOG_INV", "number"),
+    NC_("SC_OPCODE_LOG_INV", "The probability value for which the inverse log normal distribution is to be calculated."),
+    NC_("SC_OPCODE_LOG_INV", "mean"),
+    NC_("SC_OPCODE_LOG_INV", "Mean value. The mean value of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_INV", "STDEV"),
+    NC_("SC_OPCODE_LOG_INV", "Standard deviation. The standard deviation of the log normal distribution.")
+};
+
+// -=*# Resource for function LOGNORM.INV #*=-
+const char* SC_OPCODE_LOG_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_LOG_INV_MS", "Values of the inverse of the lognormal distribution."),
+    NC_("SC_OPCODE_LOG_INV_MS", "number"),
+    NC_("SC_OPCODE_LOG_INV_MS", "The probability value for which the inverse log normal distribution is to be calculated."),
+    NC_("SC_OPCODE_LOG_INV_MS", "mean"),
+    NC_("SC_OPCODE_LOG_INV_MS", "Mean value. The mean value of the log normal distribution."),
+    NC_("SC_OPCODE_LOG_INV_MS", "STDEV"),
+    NC_("SC_OPCODE_LOG_INV_MS", "Standard deviation. The standard deviation of the log normal distribution.")
+};
+
+// -=*# Resource for function EXPONDIST #*=-
+const char* SC_OPCODE_EXP_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_EXP_DIST", "Values of the exponential distribution."),
+    NC_("SC_OPCODE_EXP_DIST", "Number"),
+    NC_("SC_OPCODE_EXP_DIST", "The value to which the exponential distribution is to be calculated."),
+    NC_("SC_OPCODE_EXP_DIST", "lambda"),
+    NC_("SC_OPCODE_EXP_DIST", "The parameters of the exponential distribution."),
+    NC_("SC_OPCODE_EXP_DIST", "C"),
+    NC_("SC_OPCODE_EXP_DIST", "Cumulated. C=0 calculates the density function, C=1 the distribution.")
+};
+
+// -=*# Resource for function EXPON.DIST #*=-
+const char* SC_OPCODE_EXP_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_EXP_DIST_MS", "Values of the exponential distribution."),
+    NC_("SC_OPCODE_EXP_DIST_MS", "Number"),
+    NC_("SC_OPCODE_EXP_DIST_MS", "The value to which the exponential distribution is to be calculated."),
+    NC_("SC_OPCODE_EXP_DIST_MS", "lambda"),
+    NC_("SC_OPCODE_EXP_DIST_MS", "The parameters of the exponential distribution."),
+    NC_("SC_OPCODE_EXP_DIST_MS", "C"),
+    NC_("SC_OPCODE_EXP_DIST_MS", "Cumulated. C=0 calculates the density function, C=1 the distribution.")
+};
+
+// -=*# Resource for function GAMMADIST #*=-
+const char* SC_OPCODE_GAMMA_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_DIST", "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST", "Number"),
+    NC_("SC_OPCODE_GAMMA_DIST", "The value for which the gamma distribution is to be calculated."),
+    NC_("SC_OPCODE_GAMMA_DIST", "alpha"),
+    NC_("SC_OPCODE_GAMMA_DIST", "The Alpha parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST", "beta"),
+    NC_("SC_OPCODE_GAMMA_DIST", "The Beta parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST", "Cumulative"),
+    NC_("SC_OPCODE_GAMMA_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function GAMMA.DIST #*=-
+const char* SC_OPCODE_GAMMA_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "Number"),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "The value for which the gamma distribution is to be calculated."),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "alpha"),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "The Alpha parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "beta"),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "The Beta parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_GAMMA_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+// -=*# Resource for function GAMMAINV #*=-
+const char* SC_OPCODE_GAMMA_INV_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_INV", "Values of the inverse gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_INV", "Number"),
+    NC_("SC_OPCODE_GAMMA_INV", "The probability value for which the inverse gamma distribution is to be calculated."),
+    NC_("SC_OPCODE_GAMMA_INV", "alpha"),
+    NC_("SC_OPCODE_GAMMA_INV", "The Alpha (shape) parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_INV", "beta"),
+    NC_("SC_OPCODE_GAMMA_INV", "The Beta (scale) parameter of the Gamma distribution.")
+};
+
+// -=*# Resource for function GAMMA.INV #*=-
+const char* SC_OPCODE_GAMMA_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_INV_MS", "Values of the inverse gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "Number"),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "The probability value for which the inverse gamma distribution is to be calculated."),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "alpha"),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "The Alpha (shape) parameter of the Gamma distribution."),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "beta"),
+    NC_("SC_OPCODE_GAMMA_INV_MS", "The Beta (scale) parameter of the Gamma distribution.")
+};
+
+// -=*# Resource for function GAMMALN #*=-
+const char* SC_OPCODE_GAMMA_LN_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_LN", "Returns the natural logarithm of the gamma function."),
+    NC_("SC_OPCODE_GAMMA_LN", "Number"),
+    NC_("SC_OPCODE_GAMMA_LN", "The value for which the natural logarithm of the gamma function is to be calculated.")
+};
+
+// -=*# Resource for function GAMMALN.PRECISE #*=-
+const char* SC_OPCODE_GAMMA_LN_MS_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA_LN_MS", "Returns the natural logarithm of the gamma function."),
+    NC_("SC_OPCODE_GAMMA_LN_MS", "Number"),
+    NC_("SC_OPCODE_GAMMA_LN_MS", "The value for which the natural logarithm of the gamma function is to be calculated.")
+};
+
+
+// -=*# Resource for function GAMMA #*=-
+const char* SC_OPCODE_GAMMA_ARY[] =
+{
+    NC_("SC_OPCODE_GAMMA", "Returns the value of the Gamma function."),
+    NC_("SC_OPCODE_GAMMA", "Number"),
+    NC_("SC_OPCODE_GAMMA", "The value for which the Gamma function is to be calculated.")
+};
+
+
+// -=*# Resource for function BETADIST #*=-
+const char* SC_OPCODE_BETA_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_BETA_DIST", "Values of the beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST", "number"),
+    NC_("SC_OPCODE_BETA_DIST", "The value for which the beta distribution is to be calculated."),
+    NC_("SC_OPCODE_BETA_DIST", "alpha"),
+    NC_("SC_OPCODE_BETA_DIST", "The Alpha parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST", "beta"),
+    NC_("SC_OPCODE_BETA_DIST", "The Beta parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST", "Start"),
+    NC_("SC_OPCODE_BETA_DIST", "The starting value for the value interval of the distribution."),
+    NC_("SC_OPCODE_BETA_DIST", "End"),
+    NC_("SC_OPCODE_BETA_DIST", "The final value for the value interval of the distribution."),
+    NC_("SC_OPCODE_BETA_DIST", "Cumulative"),
+    NC_("SC_OPCODE_BETA_DIST", "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function.")
+};
+
+// -=*# Resource for function BETAINV #*=-
+const char* SC_OPCODE_BETA_INV_ARY[] =
+{
+    NC_("SC_OPCODE_BETA_INV", "Values of the inverse beta distribution."),
+    NC_("SC_OPCODE_BETA_INV", "number"),
+    NC_("SC_OPCODE_BETA_INV", "The probability value for which the inverse beta distribution is to be calculated."),
+    NC_("SC_OPCODE_BETA_INV", "alpha"),
+    NC_("SC_OPCODE_BETA_INV", "The Alpha parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_INV", "beta"),
+    NC_("SC_OPCODE_BETA_INV", "The Beta parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_INV", "Start"),
+    NC_("SC_OPCODE_BETA_INV", "The starting value for the value interval of the distribution."),
+    NC_("SC_OPCODE_BETA_INV", "End"),
+    NC_("SC_OPCODE_BETA_INV", "The final value for the value interval of the distribution.")
+};
+
+// -=*# Resource for function BETA.DIST #*=-
+const char* SC_OPCODE_BETA_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_BETA_DIST_MS", "Values of the beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "number"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "The value for which the beta distribution is to be calculated."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "alpha"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "The Alpha parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "beta"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "The Beta parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "Start"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "The starting value for the value interval of the distribution."),
+    NC_("SC_OPCODE_BETA_DIST_MS", "End"),
+    NC_("SC_OPCODE_BETA_DIST_MS", "The final value for the value interval of the distribution.")
+};
+
+// -=*# Resource for function BETA.INV #*=-
+const char* SC_OPCODE_BETA_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_BETA_INV_MS", "Values of the inverse beta distribution."),
+    NC_("SC_OPCODE_BETA_INV_MS", "number"),
+    NC_("SC_OPCODE_BETA_INV_MS", "The probability value for which the inverse beta distribution is to be calculated."),
+    NC_("SC_OPCODE_BETA_INV_MS", "alpha"),
+    NC_("SC_OPCODE_BETA_INV_MS", "The Alpha parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_INV_MS", "beta"),
+    NC_("SC_OPCODE_BETA_INV_MS", "The Beta parameter of the Beta distribution."),
+    NC_("SC_OPCODE_BETA_INV_MS", "Start"),
+    NC_("SC_OPCODE_BETA_INV_MS", "The starting value for the value interval of the distribution."),
+    NC_("SC_OPCODE_BETA_INV_MS", "End"),
+    NC_("SC_OPCODE_BETA_INV_MS", "The final value for the value interval of the distribution.")
+};
+
+// -=*# Resource for function WEIBULL #*=-
+const char* SC_OPCODE_WEIBULL_ARY[] =
+{
+    NC_("SC_OPCODE_WEIBULL", "Returns the values of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL", "Number"),
+    NC_("SC_OPCODE_WEIBULL", "The value for which the Weibull distribution is to be calculated."),
+    NC_("SC_OPCODE_WEIBULL", "Alpha"),
+    NC_("SC_OPCODE_WEIBULL", "The Alpha parameter of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL", "beta"),
+    NC_("SC_OPCODE_WEIBULL", "The Beta parameter of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL", "C"),
+    NC_("SC_OPCODE_WEIBULL", "Cumulated. C=0 calculates the density function, C=1 the distribution.")
+};
+
+// -=*# Resource for function WEIBULL.DIST #*=-
+const char* SC_OPCODE_WEIBULL_MS_ARY[] =
+{
+    NC_("SC_OPCODE_WEIBULL_MS", "Returns the values of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL_MS", "Number"),
+    NC_("SC_OPCODE_WEIBULL_MS", "The value for which the Weibull distribution is to be calculated."),
+    NC_("SC_OPCODE_WEIBULL_MS", "Alpha"),
+    NC_("SC_OPCODE_WEIBULL_MS", "The Alpha parameter of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL_MS", "beta"),
+    NC_("SC_OPCODE_WEIBULL_MS", "The Beta parameter of the Weibull distribution."),
+    NC_("SC_OPCODE_WEIBULL_MS", "C"),
+    NC_("SC_OPCODE_WEIBULL_MS", "Cumulated. C=0 calculates the density function, C=1 the distribution.")
+};
+
+// -=*# Resource for function HYPGEOMDIST #*=-
+const char* SC_OPCODE_HYP_GEOM_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "Values of the hypergeometric distribution."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "X"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "The number of successes in the sample."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "n_sample"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "The size of the sample."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "successes"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "The number of successes in the population."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "n_population"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "The population size."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "Cumulative"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST", "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function.")
+};
+
+// -=*# Resource for function HYPGEOM.DIST #*=-
+const char* SC_OPCODE_HYP_GEOM_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Values of the hypergeometric distribution."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "X"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The number of successes in the sample."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "n_sample"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The size of the sample."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "successes"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The number of successes in the population."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "n_population"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The population size."),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function.")
+};
+
+// -=*# Resource for function TDIST #*=-
+const char* SC_OPCODE_T_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_T_DIST", "Returns the t-distribution."),
+    NC_("SC_OPCODE_T_DIST", "Number"),
+    NC_("SC_OPCODE_T_DIST", "The value for which the T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_DIST", "degrees_freedom"),
+    NC_("SC_OPCODE_T_DIST", "The degrees of freedom of the T distribution."),
+    NC_("SC_OPCODE_T_DIST", "mode"),
+    NC_("SC_OPCODE_T_DIST", "Mode = 1 calculates the one-tailed test, 2 = two-tailed distribution.")
+};
+
+// -=*# Resource for function T.DIST.2T #*=-
+const char* SC_OPCODE_T_DIST_2T_ARY[] =
+{
+    NC_("SC_OPCODE_T_DIST_2T", "Returns the two-tailed t-distribution."),
+    NC_("SC_OPCODE_T_DIST_2T", "Number"),
+    NC_("SC_OPCODE_T_DIST_2T", "The value for which the T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_DIST_2T", "degrees_freedom"),
+    NC_("SC_OPCODE_T_DIST_2T", "The degrees of freedom of the T distribution.")
+};
+
+// -=*# Resource for function T.DIST #*=-
+const char* SC_OPCODE_T_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_T_DIST_MS", "Returns the t-distribution."),
+    NC_("SC_OPCODE_T_DIST_MS", "Number"),
+    NC_("SC_OPCODE_T_DIST_MS", "The value for which the T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_DIST_MS", "degrees_freedom"),
+    NC_("SC_OPCODE_T_DIST_MS", "The degrees of freedom of the T distribution."),
+    NC_("SC_OPCODE_T_DIST_MS", "cumulative"),
+    NC_("SC_OPCODE_T_DIST_MS", "True calculates the cumulative distribution function, false the probability density function.")
+};
+
+// -=*# Resource for function T.DIST.RT #*=-
+const char* SC_OPCODE_T_DIST_RT_ARY[] =
+{
+    NC_("SC_OPCODE_T_DIST_RT", "Returns the right-tailed t-distribution."),
+    NC_("SC_OPCODE_T_DIST_RT", "Number"),
+    NC_("SC_OPCODE_T_DIST_RT", "The value for which the T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_DIST_RT", "degrees_freedom"),
+    NC_("SC_OPCODE_T_DIST_RT", "The degrees of freedom of the T distribution.")
+};
+
+// -=*# Resource for function TINV #*=-
+const char* SC_OPCODE_T_INV_ARY[] =
+{
+    NC_("SC_OPCODE_T_INV", "Values of the inverse t-distribution."),
+    NC_("SC_OPCODE_T_INV", "number"),
+    NC_("SC_OPCODE_T_INV", "The probability value for which the inverse T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_INV", "degrees_freedom"),
+    NC_("SC_OPCODE_T_INV", "The degrees of freedom of the T distribution.")
+};
+
+// -=*# Resource for function T.INV #*=-
+const char* SC_OPCODE_T_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_T_INV_MS", "Values of the left-tailed inverse t-distribution."),
+    NC_("SC_OPCODE_T_INV_MS", "number"),
+    NC_("SC_OPCODE_T_INV_MS", "The probability value for which the inverse T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_INV_MS", "degrees_freedom"),
+    NC_("SC_OPCODE_T_INV_MS", "The degrees of freedom of the T distribution.")
+};
+
+// -=*# Resource for function T.INV.2T #*=-
+const char* SC_OPCODE_T_INV_2T_ARY[] =
+{
+    NC_("SC_OPCODE_T_INV_2T", "Values of the two-tailed inverse t-distribution."),
+    NC_("SC_OPCODE_T_INV_2T", "number"),
+    NC_("SC_OPCODE_T_INV_2T", "The probability value for which the inverse T distribution is to be calculated."),
+    NC_("SC_OPCODE_T_INV_2T", "degrees_freedom"),
+    NC_("SC_OPCODE_T_INV_2T", "The degrees of freedom of the T distribution.")
+};
+
+// -=*# Resource for function FDIST #*=-
+const char* SC_OPCODE_F_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_F_DIST", "Values of the F probability distribution."),
+    NC_("SC_OPCODE_F_DIST", "Number"),
+    NC_("SC_OPCODE_F_DIST", "The value for which the F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_DIST", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_DIST", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_DIST", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_DIST", "The degrees of freedom in the denominator of the F distribution.")
+};
+
+// -=*# Resource for function F.DIST #*=-
+const char* SC_OPCODE_F_DIST_LT_ARY[] =
+{
+    NC_("SC_OPCODE_F_DIST_LT", "Values of the left tail F probability distribution."),
+    NC_("SC_OPCODE_F_DIST_LT", "Number"),
+    NC_("SC_OPCODE_F_DIST_LT", "The value for which the F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_DIST_LT", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_DIST_LT", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_DIST_LT", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_DIST_LT", "The degrees of freedom in the denominator of the F distribution."),
+    NC_("SC_OPCODE_F_DIST_LT", "cumulative"),
+    NC_("SC_OPCODE_F_DIST_LT", "Cumulative distribution function (TRUE) or probability density function (FALSE).")
+};
+
+// -=*# Resource for function F.DIST.RT #*=-
+const char* SC_OPCODE_F_DIST_RT_ARY[] =
+{
+    NC_("SC_OPCODE_F_DIST_RT", "Values of the right tail F probability distribution."),
+    NC_("SC_OPCODE_F_DIST_RT", "Number"),
+    NC_("SC_OPCODE_F_DIST_RT", "The value for which the F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_DIST_RT", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_DIST_RT", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_DIST_RT", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_DIST_RT", "The degrees of freedom in the denominator of the F distribution.")
+};
+
+// -=*# Resource for function FINV #*=-
+const char* SC_OPCODE_F_INV_ARY[] =
+{
+    NC_("SC_OPCODE_F_INV", "Values of the inverse F distribution."),
+    NC_("SC_OPCODE_F_INV", "number"),
+    NC_("SC_OPCODE_F_INV", "The probability value for which the inverse F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_INV", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_INV", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_INV", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_INV", "The degrees of freedom in the denominator of the F distribution.")
+};
+
+// -=*# Resource for function F.INV #*=-
+const char* SC_OPCODE_F_INV_LT_ARY[] =
+{
+    NC_("SC_OPCODE_F_INV_LT", "Values of the inverse left tail F distribution."),
+    NC_("SC_OPCODE_F_INV_LT", "number"),
+    NC_("SC_OPCODE_F_INV_LT", "The probability value for which the inverse F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_INV_LT", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_INV_LT", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_INV_LT", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_INV_LT", "The degrees of freedom in the denominator of the F distribution.")
+};
+
+// -=*# Resource for function F.INV.RT #*=-
+const char* SC_OPCODE_F_INV_RT_ARY[] =
+{
+    NC_("SC_OPCODE_F_INV_RT", "Values of the inverse right tail F distribution."),
+    NC_("SC_OPCODE_F_INV_RT", "number"),
+    NC_("SC_OPCODE_F_INV_RT", "The probability value for which the inverse F distribution is to be calculated."),
+    NC_("SC_OPCODE_F_INV_RT", "degrees_freedom_1"),
+    NC_("SC_OPCODE_F_INV_RT", "The degrees of freedom in the numerator of the F distribution."),
+    NC_("SC_OPCODE_F_INV_RT", "degrees_freedom_2"),
+    NC_("SC_OPCODE_F_INV_RT", "The degrees of freedom in the denominator of the F distribution.")
+};
+
+// -=*# Resource for function CHIDIST #*=-
+const char* SC_OPCODE_CHI_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_DIST", "Returns the right-tail probability of the chi-square distribution."),
+    NC_("SC_OPCODE_CHI_DIST", "Number"),
+    NC_("SC_OPCODE_CHI_DIST", "The value for which the chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHI_DIST", "degrees_freedom"),
+    NC_("SC_OPCODE_CHI_DIST", "The degrees of freedom of the chi square distribution.")
+};
+
+// -=*# Resource for function CHISQ.DIST.RT #*=-
+const char* SC_OPCODE_CHI_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_DIST_MS", "Returns the right-tail probability of the chi-square distribution."),
+    NC_("SC_OPCODE_CHI_DIST_MS", "Number"),
+    NC_("SC_OPCODE_CHI_DIST_MS", "The value for which the chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHI_DIST_MS", "degrees_freedom"),
+    NC_("SC_OPCODE_CHI_DIST_MS", "The degrees of freedom of the chi square distribution.")
+};
+
+
+// -=*# Resource for function CHISQDIST #*=-
+const char* SC_OPCODE_CHISQ_DIST_ARY[] =
+{
+    NC_("SC_OPCODE_CHISQ_DIST", "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."),
+    NC_("SC_OPCODE_CHISQ_DIST", "Number"),
+    NC_("SC_OPCODE_CHISQ_DIST", "The value for which the probability density function or cumulative distribution function is to be calculated."),
+    NC_("SC_OPCODE_CHISQ_DIST", "Degrees of Freedom"),
+    NC_("SC_OPCODE_CHISQ_DIST", "The degrees of freedom of the chi-square distribution."),
+    NC_("SC_OPCODE_CHISQ_DIST", "Cumulative"),
+    NC_("SC_OPCODE_CHISQ_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.")
+};
+
+
+// -=*# Resource for function CHISQ.DIST #*=-
+const char* SC_OPCODE_CHISQ_DIST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "Number"),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "The value for which the probability density function or cumulative distribution function is to be calculated."),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "Degrees of Freedom"),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "The degrees of freedom of the chi-square distribution."),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "Cumulative"),
+    NC_("SC_OPCODE_CHISQ_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.")
+};
+
+
+// -=*# Resource for function CHIINV #*=-
+const char* SC_OPCODE_CHI_INV_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_INV", "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."),
+    NC_("SC_OPCODE_CHI_INV", "number"),
+    NC_("SC_OPCODE_CHI_INV", "The probability value for which the inverse chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHI_INV", "degrees_freedom"),
+    NC_("SC_OPCODE_CHI_INV", "The degrees of freedom of the chi square distribution.")
+};
+
+
+// -=*# Resource for function CHISQ.INV.RT #*=-
+const char* SC_OPCODE_CHI_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_INV_MS", "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."),
+    NC_("SC_OPCODE_CHI_INV_MS", "number"),
+    NC_("SC_OPCODE_CHI_INV_MS", "The probability value for which the inverse chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHI_INV_MS", "degrees_freedom"),
+    NC_("SC_OPCODE_CHI_INV_MS", "The degrees of freedom of the chi square distribution.")
+};
+
+
+// -=*# Resource for function CHISQINV #*=-
+const char* SC_OPCODE_CHISQ_INV_ARY[] =
+{
+    NC_("SC_OPCODE_CHISQ_INV", "Values of the inverse of CHISQDIST(x;DegreesOfFreedom;TRUE())."),
+    NC_("SC_OPCODE_CHISQ_INV", "Probability"),
+    NC_("SC_OPCODE_CHISQ_INV", "The probability value for which the inverse of the chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHISQ_INV", "Degrees of Freedom"),
+    NC_("SC_OPCODE_CHISQ_INV", "The degrees of freedom of the chi square distribution.")
+};
+
+
+// -=*# Resource for function CHISQ.INV #*=-
+const char* SC_OPCODE_CHISQ_INV_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CHISQ_INV_MS", "Values of the inverse of CHISQ.DIST(x;DegreesOfFreedom;TRUE())."),
+    NC_("SC_OPCODE_CHISQ_INV_MS", "Probability"),
+    NC_("SC_OPCODE_CHISQ_INV_MS", "The probability value for which the inverse of the chi square distribution is to be calculated."),
+    NC_("SC_OPCODE_CHISQ_INV_MS", "Degrees of Freedom"),
+    NC_("SC_OPCODE_CHISQ_INV_MS", "The degrees of freedom of the chi square distribution.")
+};
+
+
+// -=*# Resource for function STANDARDIZE #*=-
+const char* SC_OPCODE_STANDARD_ARY[] =
+{
+    NC_("SC_OPCODE_STANDARD", "Converts a random variable to a normalized value."),
+    NC_("SC_OPCODE_STANDARD", "Number"),
+    NC_("SC_OPCODE_STANDARD", "The value to be standardized."),
+    NC_("SC_OPCODE_STANDARD", "mean"),
+    NC_("SC_OPCODE_STANDARD", "The mean value used for moving."),
+    NC_("SC_OPCODE_STANDARD", "STDEV"),
+    NC_("SC_OPCODE_STANDARD", "The standard deviation used for scaling.")
+};
+
+// -=*# Resource for function PERMUT #*=-
+const char* SC_OPCODE_PERMUT_ARY[] =
+{
+    NC_("SC_OPCODE_PERMUT", "Returns the number of permutations for a given number of elements without repetition."),
+    NC_("SC_OPCODE_PERMUT", "Count_1"),
+    NC_("SC_OPCODE_PERMUT", "The total number of elements."),
+    NC_("SC_OPCODE_PERMUT", "Count_2"),
+    NC_("SC_OPCODE_PERMUT", "The selection number taken from the elements.")
+};
+
+// -=*# Resource for function PERMUTATIONA #*=-
+const char* SC_OPCODE_PERMUTATION_A_ARY[] =
+{
+    NC_("SC_OPCODE_PERMUTATION_A", "Returns the number of permutations for a given number of objects (repetition allowed)."),
+    NC_("SC_OPCODE_PERMUTATION_A", "Count_1"),
+    NC_("SC_OPCODE_PERMUTATION_A", "The total number of elements."),
+    NC_("SC_OPCODE_PERMUTATION_A", "Count_2"),
+    NC_("SC_OPCODE_PERMUTATION_A", "The selection number taken from the elements.")
+};
+
+// -=*# Resource for function CONFIDENCE #*=-
+const char* SC_OPCODE_CONFIDENCE_ARY[] =
+{
+    NC_("SC_OPCODE_CONFIDENCE", "Returns a (1-alpha) confidence interval for a normal distribution."),
+    NC_("SC_OPCODE_CONFIDENCE", "alpha"),
+    NC_("SC_OPCODE_CONFIDENCE", "The level of the confidence interval."),
+    NC_("SC_OPCODE_CONFIDENCE", "STDEV"),
+    NC_("SC_OPCODE_CONFIDENCE", "The standard deviation of the population."),
+    NC_("SC_OPCODE_CONFIDENCE", "size"),
+    NC_("SC_OPCODE_CONFIDENCE", "The size of the population.")
+};
+
+// -=*# Resource for function CONFIDENCE.NORM #*=-
+const char* SC_OPCODE_CONFIDENCE_N_ARY[] =
+{
+    NC_("SC_OPCODE_CONFIDENCE_N", "Returns a (1-alpha) confidence interval for a normal distribution."),
+    NC_("SC_OPCODE_CONFIDENCE_N", "alpha"),
+    NC_("SC_OPCODE_CONFIDENCE_N", "The level of the confidence interval."),
+    NC_("SC_OPCODE_CONFIDENCE_N", "STDEV"),
+    NC_("SC_OPCODE_CONFIDENCE_N", "The standard deviation of the population."),
+    NC_("SC_OPCODE_CONFIDENCE_N", "size"),
+    NC_("SC_OPCODE_CONFIDENCE_N", "The size of the population.")
+};
+
+// -=*# Resource for function CONFIDENCE.T #*=-
+const char* SC_OPCODE_CONFIDENCE_T_ARY[] =
+{
+    NC_("SC_OPCODE_CONFIDENCE_T", "Returns a (1-alpha) confidence interval for a Student's t distribution."),
+    NC_("SC_OPCODE_CONFIDENCE_T", "alpha"),
+    NC_("SC_OPCODE_CONFIDENCE_T", "The level of the confidence interval."),
+    NC_("SC_OPCODE_CONFIDENCE_T", "STDEV"),
+    NC_("SC_OPCODE_CONFIDENCE_T", "The standard deviation of the population."),
+    NC_("SC_OPCODE_CONFIDENCE_T", "size"),
+    NC_("SC_OPCODE_CONFIDENCE_T", "The size of the population.")
+};
+
+// -=*# Resource for function ZTEST #*=-
+const char* SC_OPCODE_Z_TEST_ARY[] =
+{
+    NC_("SC_OPCODE_Z_TEST", "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."),
+    NC_("SC_OPCODE_Z_TEST", "data"),
+    NC_("SC_OPCODE_Z_TEST", "The given sample, drawn from a normally distributed population."),
+    NC_("SC_OPCODE_Z_TEST", "mu"),
+    NC_("SC_OPCODE_Z_TEST", "The known mean of the population."),
+    NC_("SC_OPCODE_Z_TEST", "sigma"),
+    NC_("SC_OPCODE_Z_TEST", "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used.")
+};
+
+// -=*# Resource for function Z.TEST #*=-
+const char* SC_OPCODE_Z_TEST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_Z_TEST_MS", "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."),
+    NC_("SC_OPCODE_Z_TEST_MS", "data"),
+    NC_("SC_OPCODE_Z_TEST_MS", "The given sample, drawn from a normally distributed population."),
+    NC_("SC_OPCODE_Z_TEST_MS", "mu"),
+    NC_("SC_OPCODE_Z_TEST_MS", "The known mean of the population."),
+    NC_("SC_OPCODE_Z_TEST_MS", "sigma"),
+    NC_("SC_OPCODE_Z_TEST_MS", "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used.")
+};
+
+// -=*# Resource for function CHITEST #*=-
+const char* SC_OPCODE_CHI_TEST_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_TEST", "Returns the chi square independence test."),
+    NC_("SC_OPCODE_CHI_TEST", "Data_B"),
+    NC_("SC_OPCODE_CHI_TEST", "The observed data array."),
+    NC_("SC_OPCODE_CHI_TEST", "data_E"),
+    NC_("SC_OPCODE_CHI_TEST", "The expected data array.")
+};
+
+// -=*# Resource for function CHISQ.TEST #*=-
+const char* SC_OPCODE_CHI_TEST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CHI_TEST_MS", "Returns the chi square independence test."),
+    NC_("SC_OPCODE_CHI_TEST_MS", "Data_B"),
+    NC_("SC_OPCODE_CHI_TEST_MS", "The observed data array."),
+    NC_("SC_OPCODE_CHI_TEST_MS", "data_E"),
+    NC_("SC_OPCODE_CHI_TEST_MS", "The expected data array.")
+};
+
+// -=*# Resource for function FTEST #*=-
+const char* SC_OPCODE_F_TEST_ARY[] =
+{
+    NC_("SC_OPCODE_F_TEST", "Calculates the F test."),
+    NC_("SC_OPCODE_F_TEST", "data_1"),
+    NC_("SC_OPCODE_F_TEST", "The first record array."),
+    NC_("SC_OPCODE_F_TEST", "data_2"),
+    NC_("SC_OPCODE_F_TEST", "The second record array.")
+};
+
+// -=*# Resource for function F.TEST #*=-
+const char* SC_OPCODE_F_TEST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_F_TEST_MS", "Calculates the F test."),
+    NC_("SC_OPCODE_F_TEST_MS", "data_1"),
+    NC_("SC_OPCODE_F_TEST_MS", "The first record array."),
+    NC_("SC_OPCODE_F_TEST_MS", "data_2"),
+    NC_("SC_OPCODE_F_TEST_MS", "The second record array.")
+};
+
+// -=*# Resource for function TTEST #*=-
+const char* SC_OPCODE_T_TEST_ARY[] =
+{
+    NC_("SC_OPCODE_T_TEST", "Calculates the T test."),
+    NC_("SC_OPCODE_T_TEST", "data_1"),
+    NC_("SC_OPCODE_T_TEST", "The first record array."),
+    NC_("SC_OPCODE_T_TEST", "data_2"),
+    NC_("SC_OPCODE_T_TEST", "The second record array."),
+    NC_("SC_OPCODE_T_TEST", "mode"),
+    NC_("SC_OPCODE_T_TEST", "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"),
+    NC_("SC_OPCODE_T_TEST", "Type"),
+    NC_("SC_OPCODE_T_TEST", "The type of the T test.")
+};
+
+// -=*# Resource for function T.TEST #*=-
+const char* SC_OPCODE_T_TEST_MS_ARY[] =
+{
+    NC_("SC_OPCODE_T_TEST_MS", "Calculates the T test."),
+    NC_("SC_OPCODE_T_TEST_MS", "data_1"),
+    NC_("SC_OPCODE_T_TEST_MS", "The first record array."),
+    NC_("SC_OPCODE_T_TEST_MS", "data_2"),
+    NC_("SC_OPCODE_T_TEST_MS", "The second record array."),
+    NC_("SC_OPCODE_T_TEST_MS", "mode"),
+    NC_("SC_OPCODE_T_TEST_MS", "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"),
+    NC_("SC_OPCODE_T_TEST_MS", "Type"),
+    NC_("SC_OPCODE_T_TEST_MS", "The type of the T test.")
+};
+
+// -=*# Resource for function RSQ #*=-
+const char* SC_OPCODE_RSQ_ARY[] =
+{
+    NC_("SC_OPCODE_RSQ", "Returns the square of the Pearson product moment correlation coefficient."),
+    NC_("SC_OPCODE_RSQ", "data_Y"),
+    NC_("SC_OPCODE_RSQ", "The Y data array."),
+    NC_("SC_OPCODE_RSQ", "data_X"),
+    NC_("SC_OPCODE_RSQ", "The X data array.")
+};
+
+// -=*# Resource for function INTERCEPT #*=-
+const char* SC_OPCODE_INTERCEPT_ARY[] =
+{
+    NC_("SC_OPCODE_INTERCEPT", "Returns the intercept of the linear regression line and the Y axis."),
+    NC_("SC_OPCODE_INTERCEPT", "data_Y"),
+    NC_("SC_OPCODE_INTERCEPT", "The Y data array."),
+    NC_("SC_OPCODE_INTERCEPT", "data_X"),
+    NC_("SC_OPCODE_INTERCEPT", "The X data array.")
+};
+
+// -=*# Resource for function SLOPE #*=-
+const char* SC_OPCODE_SLOPE_ARY[] =
+{
+    NC_("SC_OPCODE_SLOPE", "Returns the slope of the linear regression line."),
+    NC_("SC_OPCODE_SLOPE", "data_Y"),
+    NC_("SC_OPCODE_SLOPE", "The Y data array."),
+    NC_("SC_OPCODE_SLOPE", "data_X"),
+    NC_("SC_OPCODE_SLOPE", "The X data array.")
+};
+
+// -=*# Resource for function STEYX #*=-
+const char* SC_OPCODE_STEYX_ARY[] =
+{
+    NC_("SC_OPCODE_STEYX", "Returns the standard error of the linear regression."),
+    NC_("SC_OPCODE_STEYX", "data_Y"),
+    NC_("SC_OPCODE_STEYX", "The Y data array."),
+    NC_("SC_OPCODE_STEYX", "data_X"),
+    NC_("SC_OPCODE_STEYX", "The X data array.")
+};
+
+// -=*# Resource for function PEARSON #*=-
+const char* SC_OPCODE_PEARSON_ARY[] =
+{
+    NC_("SC_OPCODE_PEARSON", "Returns the Pearson product moment correlation coefficient."),
+    NC_("SC_OPCODE_PEARSON", "Data_1"),
+    NC_("SC_OPCODE_PEARSON", "The first record array."),
+    NC_("SC_OPCODE_PEARSON", "Data_2"),
+    NC_("SC_OPCODE_PEARSON", "The second record array.")
+};
+
+// -=*# Resource for function CORREL #*=-
+const char* SC_OPCODE_CORREL_ARY[] =
+{
+    NC_("SC_OPCODE_CORREL", "Returns the correlation coefficient."),
+    NC_("SC_OPCODE_CORREL", "Data_1"),
+    NC_("SC_OPCODE_CORREL", "The first record array."),
+    NC_("SC_OPCODE_CORREL", "Data_2"),
+    NC_("SC_OPCODE_CORREL", "The second record array.")
+};
+
+// -=*# Resource for function COVAR #*=-
+const char* SC_OPCODE_COVAR_ARY[] =
+{
+    NC_("SC_OPCODE_COVAR", "Calculates the population covariance."),
+    NC_("SC_OPCODE_COVAR", "Data_1"),
+    NC_("SC_OPCODE_COVAR", "The first record array."),
+    NC_("SC_OPCODE_COVAR", "Data_2"),
+    NC_("SC_OPCODE_COVAR", "The second record array.")
+};
+
+// -=*# Resource for function COVARIANCE.P #*=-
+const char* SC_OPCODE_COVARIANCE_P_ARY[] =
+{
+    NC_("SC_OPCODE_COVARIANCE_P", "Calculates the population covariance."),
+    NC_("SC_OPCODE_COVARIANCE_P", "Data_1"),
+    NC_("SC_OPCODE_COVARIANCE_P", "The first record array."),
+    NC_("SC_OPCODE_COVARIANCE_P", "Data_2"),
+    NC_("SC_OPCODE_COVARIANCE_P", "The second record array.")
+};
+
+// -=*# Resource for function COVARIANCE.S #*=-
+const char* SC_OPCODE_COVARIANCE_S_ARY[] =
+{
+    NC_("SC_OPCODE_COVARIANCE_S", "Calculates the sample covariance."),
+    NC_("SC_OPCODE_COVARIANCE_S", "Data_1"),
+    NC_("SC_OPCODE_COVARIANCE_S", "The first record array."),
+    NC_("SC_OPCODE_COVARIANCE_S", "Data_2"),
+    NC_("SC_OPCODE_COVARIANCE_S", "The second record array.")
+};
+
+// -=*# Resource for function FORECAST #*=-
+const char* SC_OPCODE_FORECAST_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST", "Returns a value along a linear regression"),
+    NC_("SC_OPCODE_FORECAST", "value"),
+    NC_("SC_OPCODE_FORECAST", "The X value for which the Y value on the regression linear is to be calculated."),
+    NC_("SC_OPCODE_FORECAST", "data_Y"),
+    NC_("SC_OPCODE_FORECAST", "The Y data array."),
+    NC_("SC_OPCODE_FORECAST", "data_X"),
+    NC_("SC_OPCODE_FORECAST", "The X data array.")
+};
+
+// -=*# Resource for function FORECAST.ETS #*=-
+const char* SC_OPCODE_FORECAST_ETS_ADD_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "Calculates future value(s) using additive Exponential Smoothing algorithm."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "target"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "The date (array) for which you want to predict a value."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "Number of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_ADD", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.MULT #*=-
+const char* SC_OPCODE_FORECAST_ETS_MUL_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "Calculates future value(s) using multiplicative Exponential Smoothing algorithm."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "target"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "The date (array) for which you want to predict a value."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "Number of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_MUL", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.CONFINT #*=-
+const char* SC_OPCODE_FORECAST_ETS_PIA_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "Returns a prediction interval at the specified target value(s) for additive Exponential Smoothing method"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "target"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "The date (array) for which you want to predict a value."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "confidence level"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "Number of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.PI.MULT #*=-
+const char* SC_OPCODE_FORECAST_ETS_PIM_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "Returns a prediction interval at the specified target value(s) for multiplicative Exponential Smoothing method"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "target"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "The date (array) for which you want to predict a value."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "confidence level"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "Number of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_PIM", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.SEASONALITY #*=-
+const char* SC_OPCODE_FORECAST_ETS_SEA_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "Calculates the number of samples in period (season) using additive Exponential Triple Smoothing algorithm."),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_SEA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.STAT #*=-
+const char* SC_OPCODE_FORECAST_ETS_STA_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "Returns statistical value(s) using additive Exponential Smoothing algorithm."),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "statistic type"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "Number of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_STA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.ETS.STAT.MULT #*=-
+const char* SC_OPCODE_FORECAST_ETS_STM_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "Returns statistical value(s) using multiplicative Exponential Smoothing algorithm."),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "values"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "The data array from which you want to forecast."),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "timeline"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "The date or numeric array; a consistent step between values is needed."),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "statistic type"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "period length"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "Number Of Samples in Period (default 1); length of the seasonal pattern."),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "data completion"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "aggregation"),
+    NC_("SC_OPCODE_FORECAST_ETS_STM", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.")
+};
+
+// -=*# Resource for function FORECAST.LINEAR #*=-
+const char* SC_OPCODE_FORECAST_LIN_ARY[] =
+{
+    NC_("SC_OPCODE_FORECAST_LIN", "Returns a value along a linear regression"),
+    NC_("SC_OPCODE_FORECAST_LIN", "value"),
+    NC_("SC_OPCODE_FORECAST_LIN", "The X value for which the Y value on the regression linear is to be calculated."),
+    NC_("SC_OPCODE_FORECAST_LIN", "data_Y"),
+    NC_("SC_OPCODE_FORECAST_LIN", "The Y data array."),
+    NC_("SC_OPCODE_FORECAST_LIN", "data_X"),
+    NC_("SC_OPCODE_FORECAST_LIN", "The X data array.")
+};
+
+// -=*# Resource for function ADDRESS #*=-
+const char* SC_OPCODE_ADDRESS_ARY[] =
+{
+    NC_("SC_OPCODE_ADDRESS", "Returns the reference to a cell as text."),
+    NC_("SC_OPCODE_ADDRESS", "row"),
+    NC_("SC_OPCODE_ADDRESS", "The row number of the cell."),
+    NC_("SC_OPCODE_ADDRESS", "column"),
+    NC_("SC_OPCODE_ADDRESS", "The column number of the cell."),
+    NC_("SC_OPCODE_ADDRESS", "ABS"),
+    NC_("SC_OPCODE_ADDRESS", "Specifies whether absolute or relative referencing is to be used."),
+    NC_("SC_OPCODE_ADDRESS", "A1"),
+    NC_("SC_OPCODE_ADDRESS", "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style."),
+    NC_("SC_OPCODE_ADDRESS", "sheet"),
+    NC_("SC_OPCODE_ADDRESS", "The spreadsheet name of the cell reference.")
+};
+
+// -=*# Resource for function AREAS #*=-
+const char* SC_OPCODE_AREAS_ARY[] =
+{
+    NC_("SC_OPCODE_AREAS", "Returns the number of individual ranges that belong to a (multiple) range."),
+    NC_("SC_OPCODE_AREAS", "reference"),
+    NC_("SC_OPCODE_AREAS", "The reference to a (multiple) range.")
+};
+
+// -=*# Resource for function CHOOSE #*=-
+const char* SC_OPCODE_CHOOSE_ARY[] =
+{
+    NC_("SC_OPCODE_CHOOSE", "Selects a value from a list of up to 30 value arguments."),
+    NC_("SC_OPCODE_CHOOSE", "Index"),
+    NC_("SC_OPCODE_CHOOSE", "The index of the value (1..30) selected."),
+    NC_("SC_OPCODE_CHOOSE", "value "),
+    NC_("SC_OPCODE_CHOOSE", "Value 1, value 2,... The list of arguments from which a value is chosen.")
+};
+
+// -=*# Resource for function COLUMNS #*=-
+const char* SC_OPCODE_COLUMN_ARY[] =
+{
+    NC_("SC_OPCODE_COLUMN", "Returns the internal column number of a reference."),
+    NC_("SC_OPCODE_COLUMN", "reference"),
+    NC_("SC_OPCODE_COLUMN", "The reference to a cell or a range.")
+};
+
+// -=*# Resource for function ROW #*=-
+const char* SC_OPCODE_ROW_ARY[] =
+{
+    NC_("SC_OPCODE_ROW", "Defines the internal row number of a reference."),
+    NC_("SC_OPCODE_ROW", "reference"),
+    NC_("SC_OPCODE_ROW", "The reference to a cell or a range.")
+};
+
+// -=*# Resource for function SHEET #*=-
+const char* SC_OPCODE_SHEET_ARY[] =
+{
+    NC_("SC_OPCODE_SHEET", "Returns the internal sheet number of a reference or a string."),
+    NC_("SC_OPCODE_SHEET", "reference"),
+    NC_("SC_OPCODE_SHEET", "The reference to a cell or a range or the character string of a sheet name.")
+};
+
+// -=*# Resource for function COLUMNS #*=-
+const char* SC_OPCODE_COLUMNS_ARY[] =
+{
+    NC_("SC_OPCODE_COLUMNS", "Returns the number of columns in an array or reference."),
+    NC_("SC_OPCODE_COLUMNS", "array"),
+    NC_("SC_OPCODE_COLUMNS", "The array (reference) for which the number of columns is to be determined.")
+};
+
+// -=*# Resource for function ROWS #*=-
+const char* SC_OPCODE_ROWS_ARY[] =
+{
+    NC_("SC_OPCODE_ROWS", "Returns the number of rows in a reference or array."),
+    NC_("SC_OPCODE_ROWS", "array"),
+    NC_("SC_OPCODE_ROWS", "The array (reference) for which the number of rows is to be determined.")
+};
+
+// -=*# Resource for function SHEETS #*=-
+const char* SC_OPCODE_SHEETS_ARY[] =
+{
+    NC_("SC_OPCODE_SHEETS", "Returns the number of sheets of a given reference. If no parameter has been entered, the total number of sheets in the document is returned."),
+    NC_("SC_OPCODE_SHEETS", "reference"),
+    NC_("SC_OPCODE_SHEETS", "The reference to a cell or a range.")
+};
+
+// -=*# Resource for function HLOOKUP #*=-
+const char* SC_OPCODE_H_LOOKUP_ARY[] =
+{
+    NC_("SC_OPCODE_H_LOOKUP", "Horizontal search and reference to the cells located below."),
+    NC_("SC_OPCODE_H_LOOKUP", "search_criteria"),
+    NC_("SC_OPCODE_H_LOOKUP", "The value to be found in the first row."),
+    NC_("SC_OPCODE_H_LOOKUP", "array"),
+    NC_("SC_OPCODE_H_LOOKUP", "The array or the range for the reference."),
+    NC_("SC_OPCODE_H_LOOKUP", "Index"),
+    NC_("SC_OPCODE_H_LOOKUP", "The row index in the array."),
+    NC_("SC_OPCODE_H_LOOKUP", "sorted"),
+    NC_("SC_OPCODE_H_LOOKUP", "If the value is TRUE or not given, the search row of the array must be sorted in ascending order.")
+};
+
+// -=*# Resource for function VLOOKUP #*=-
+const char* SC_OPCODE_V_LOOKUP_ARY[] =
+{
+    NC_("SC_OPCODE_V_LOOKUP", "Vertical search and reference to indicated cells."),
+    NC_("SC_OPCODE_V_LOOKUP", "Search criterion"),
+    NC_("SC_OPCODE_V_LOOKUP", "The value to be found in the first column."),
+    NC_("SC_OPCODE_V_LOOKUP", "array"),
+    NC_("SC_OPCODE_V_LOOKUP", "The array or range for referencing."),
+    NC_("SC_OPCODE_V_LOOKUP", "Index"),
+    NC_("SC_OPCODE_V_LOOKUP", "Column index number in the array."),
+    NC_("SC_OPCODE_V_LOOKUP", "sort order"),
+    NC_("SC_OPCODE_V_LOOKUP", "If the value is TRUE or not given, the search column of the array must be sorted in ascending order.")
+};
+
+// -=*# Resource for function INDEX #*=-
+const char* SC_OPCODE_INDEX_ARY[] =
+{
+    NC_("SC_OPCODE_INDEX", "Returns a reference to a cell from a defined range."),
+    NC_("SC_OPCODE_INDEX", "reference"),
+    NC_("SC_OPCODE_INDEX", "The reference to a (multiple) range."),
+    NC_("SC_OPCODE_INDEX", "row"),
+    NC_("SC_OPCODE_INDEX", "The row in the range."),
+    NC_("SC_OPCODE_INDEX", "column"),
+    NC_("SC_OPCODE_INDEX", "The column in the range."),
+    NC_("SC_OPCODE_INDEX", "range"),
+    NC_("SC_OPCODE_INDEX", "The index of the subrange if referring to a multiple range.")
+};
+
+// -=*# Resource for function INDIRECT #*=-
+const char* SC_OPCODE_INDIRECT_ARY[] =
+{
+    NC_("SC_OPCODE_INDIRECT", "Returns the contents of a cell that is referenced in text form."),
+    NC_("SC_OPCODE_INDIRECT", "ref"),
+    NC_("SC_OPCODE_INDIRECT", "The cell whose contents are to be evaluated is to be referenced in text form (e.g. \"A1\")."),
+    NC_("SC_OPCODE_INDIRECT", "A1"),
+    NC_("SC_OPCODE_INDIRECT", "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style.")
+};
+
+// -=*# Resource for function LOOKUP #*=-
+const char* SC_OPCODE_LOOKUP_ARY[] =
+{
+    NC_("SC_OPCODE_LOOKUP", "Determines a value in a vector by comparison to values in another vector."),
+    NC_("SC_OPCODE_LOOKUP", "Search criterion"),
+    NC_("SC_OPCODE_LOOKUP", "The value to be used for comparison."),
+    NC_("SC_OPCODE_LOOKUP", "Search vector"),
+    NC_("SC_OPCODE_LOOKUP", "The vector (row or column) in which to search."),
+    NC_("SC_OPCODE_LOOKUP", "result_vector"),
+    NC_("SC_OPCODE_LOOKUP", "The vector (row or range) from which the value is to be determined.")
+};
+
+// -=*# Resource for function MATCH #*=-
+const char* SC_OPCODE_MATCH_ARY[] =
+{
+    NC_("SC_OPCODE_MATCH", "Defines a position in a array after comparing values."),
+    NC_("SC_OPCODE_MATCH", "Search criterion"),
+    NC_("SC_OPCODE_MATCH", "The value to be used for comparison."),
+    NC_("SC_OPCODE_MATCH", "lookup_array"),
+    NC_("SC_OPCODE_MATCH", "The array (range) in which the search is made."),
+    NC_("SC_OPCODE_MATCH", "Type"),
+    NC_("SC_OPCODE_MATCH", "Type can take the value 1, 0 or -1 and determines the criteria are to be used for comparison purposes.")
+};
+
+// -=*# Resource for function OFFSET #*=-
+const char* SC_OPCODE_OFFSET_ARY[] =
+{
+    NC_("SC_OPCODE_OFFSET", "Returns a reference which has been moved in relation to the starting point."),
+    NC_("SC_OPCODE_OFFSET", "reference"),
+    NC_("SC_OPCODE_OFFSET", "The reference (cell) from which to base the movement."),
+    NC_("SC_OPCODE_OFFSET", "rows"),
+    NC_("SC_OPCODE_OFFSET", "The number of rows to be moved either up or down."),
+    NC_("SC_OPCODE_OFFSET", "columns"),
+    NC_("SC_OPCODE_OFFSET", "The number of columns that are to be moved to the left or to the right."),
+    NC_("SC_OPCODE_OFFSET", "height"),
+    NC_("SC_OPCODE_OFFSET", "The number of rows of the moved reference."),
+    NC_("SC_OPCODE_OFFSET", "width"),
+    NC_("SC_OPCODE_OFFSET", "The number of columns in the moved reference.")
+};
+
+// -=*# Resource for function ERRORTYPE #*=-
+const char* SC_OPCODE_ERROR_TYPE_ARY[] =
+{
+    NC_("SC_OPCODE_ERROR_TYPE", "Returns a number corresponding to an error type"),
+    NC_("SC_OPCODE_ERROR_TYPE", "reference"),
+    NC_("SC_OPCODE_ERROR_TYPE", "The reference (cell) in which the error occurred.")
+};
+
+// -=*# Resource for function ERROR.TYPE #*=-
+const char* SC_OPCODE_ERROR_TYPE_ODF_ARY[] =
+{
+    NC_("SC_OPCODE_ERROR_TYPE_ODF", "Returns a number corresponding to one of the error values or #N/A if no error exists"),
+    NC_("SC_OPCODE_ERROR_TYPE_ODF", "expression"),
+    NC_("SC_OPCODE_ERROR_TYPE_ODF", "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test.")
+};
+
+// -=*# Resource for function STYLE #*=-
+const char* SC_OPCODE_STYLE_ARY[] =
+{
+    NC_("SC_OPCODE_STYLE", "Applies a Style to the formula cell."),
+    NC_("SC_OPCODE_STYLE", "Style"),
+    NC_("SC_OPCODE_STYLE", "The name of the Style to be applied."),
+    NC_("SC_OPCODE_STYLE", "Time"),
+    NC_("SC_OPCODE_STYLE", "The time (in seconds) that the Style is to remain valid."),
+    NC_("SC_OPCODE_STYLE", "Style2"),
+    NC_("SC_OPCODE_STYLE", "The Style to be applied after time expires.")
+};
+
+// -=*# Resource for function DDE #*=-
+const char* SC_OPCODE_DDE_ARY[] =
+{
+    NC_("SC_OPCODE_DDE", "Result of a DDE link."),
+    NC_("SC_OPCODE_DDE", "server"),
+    NC_("SC_OPCODE_DDE", "The name of the server application."),
+    NC_("SC_OPCODE_DDE", "File"),
+    NC_("SC_OPCODE_DDE", "The name of the file."),
+    NC_("SC_OPCODE_DDE", "range"),
+    NC_("SC_OPCODE_DDE", "The range from which data is to be taken."),
+    NC_("SC_OPCODE_DDE", "mode"),
+    NC_("SC_OPCODE_DDE", "Defines how data is to be converted to numbers.")
+};
+
+// -=*# Resource for function HYPERLINK #*=-
+const char* SC_OPCODE_HYPERLINK_ARY[] =
+{
+    NC_("SC_OPCODE_HYPERLINK", "Hyperlink."),
+    NC_("SC_OPCODE_HYPERLINK", "URL"),
+    NC_("SC_OPCODE_HYPERLINK", "URL"),
+    NC_("SC_OPCODE_HYPERLINK", "CellText"),
+    NC_("SC_OPCODE_HYPERLINK", "Cell Text")
+};
+
+// -=*# Resource for function GETPIVOTDATA #*=-
+const char* SC_OPCODE_GET_PIVOT_DATA_ARY[] =
+{
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "Extracts value(s) from a pivot table."),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "Data Field"),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "The name of the pivot table field to extract."),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "Pivot Table"),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "A reference to a cell or range in the pivot table."),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "Field Name / Item"),
+    NC_("SC_OPCODE_GET_PIVOT_DATA", "Field name/value pair to filter the target data.")
+};
+
+// -=*# Resource for function BAHTTEXT #*=-
+const char* SC_OPCODE_BAHTTEXT_ARY[] =
+{
+    NC_("SC_OPCODE_BAHTTEXT", "Converts a number to text (Baht)."),
+    NC_("SC_OPCODE_BAHTTEXT", "Number"),
+    NC_("SC_OPCODE_BAHTTEXT", "The number to convert.")
+};
+
+// -=*# Resource for function JIS #*=-
+const char* SC_OPCODE_JIS_ARY[] =
+{
+    NC_("SC_OPCODE_JIS", "Converts half-width ASCII and katakana characters to full-width."),
+    NC_("SC_OPCODE_JIS", "text"),
+    NC_("SC_OPCODE_JIS", "The text to convert.")
+};
+
+// -=*# Resource for function ASC #*=-
+const char* SC_OPCODE_ASC_ARY[] =
+{
+    NC_("SC_OPCODE_ASC", "Converts full-width ASCII and katakana characters to half-width."),
+    NC_("SC_OPCODE_ASC", "text"),
+    NC_("SC_OPCODE_ASC", "The text to convert.")
+};
+
+// -=*# Resource for function CODE #*=-
+const char* SC_OPCODE_CODE_ARY[] =
+{
+    NC_("SC_OPCODE_CODE", "Returns a numeric code for the first character in a text string."),
+    NC_("SC_OPCODE_CODE", "text"),
+    NC_("SC_OPCODE_CODE", "This is the text for which the code of the first character is to be found.")
+};
+
+// -=*# Resource for function DOLLAR #*=-
+const char* SC_OPCODE_CURRENCY_ARY[] =
+{
+    NC_("SC_OPCODE_CURRENCY", "Converts a number to text in currency format."),
+    NC_("SC_OPCODE_CURRENCY", "value"),
+    NC_("SC_OPCODE_CURRENCY", "Value is a number, a reference to a cell containing a number or a formula that results in a number."),
+    NC_("SC_OPCODE_CURRENCY", "decimals"),
+    NC_("SC_OPCODE_CURRENCY", "Decimal places. Denotes the number of digits to the right of the decimal point.")
+};
+
+// -=*# Resource for function CHAR #*=-
+const char* SC_OPCODE_CHAR_ARY[] =
+{
+    NC_("SC_OPCODE_CHAR", "Converts a code number into a character or letter."),
+    NC_("SC_OPCODE_CHAR", "number"),
+    NC_("SC_OPCODE_CHAR", "The code value for the character.")
+};
+
+// -=*# Resource for function CLEAN #*=-
+const char* SC_OPCODE_CLEAN_ARY[] =
+{
+    NC_("SC_OPCODE_CLEAN", "Removes all nonprintable characters from text."),
+    NC_("SC_OPCODE_CLEAN", "text"),
+    NC_("SC_OPCODE_CLEAN", "The text from which nonprintable characters are to be removed.")
+};
+
+// -=*# Resource for function CONCATENATE #*=-
+const char* SC_OPCODE_CONCAT_ARY[] =
+{
+    NC_("SC_OPCODE_CONCAT", "Combines several text items into one."),
+    NC_("SC_OPCODE_CONCAT", "text"),
+    NC_("SC_OPCODE_CONCAT", "Text for the concatenation.")
+};
+
+// -=*# Resource for function CONCAT #*=-
+const char* SC_OPCODE_CONCAT_MS_ARY[] =
+{
+    NC_("SC_OPCODE_CONCAT_MS", "Combines several text items into one, accepts cell ranges as arguments."),
+    NC_("SC_OPCODE_CONCAT_MS", "text"),
+    NC_("SC_OPCODE_CONCAT_MS", "Text and/or cell ranges for the concatenation.")
+};
+
+// -=*# Resource for function TEXTJOIN #*=-
+const char* SC_OPCODE_TEXTJOIN_MS_ARY[] =
+{
+    NC_("SC_OPCODE_TEXTJOIN_MS", "Combines several text items into one, accepts cell ranges as arguments. Uses delimiter between items."),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "delimiter"),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "Text string to be used as delimiter."),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "skip empty cells"),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "If TRUE, empty cells will be ignored."),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "text"),
+    NC_("SC_OPCODE_TEXTJOIN_MS", "Text and/or cell ranges for the concatenation.")
+};
+
+// -=*# Resource for function IFS #*=-
+const char* SC_OPCODE_IFS_MS_ARY[] =
+{
+    NC_("SC_OPCODE_IFS_MS", "Checks 1 or more conditions and returns a value corresponding to the first true condition."),
+    NC_("SC_OPCODE_IFS_MS", "test"),
+    NC_("SC_OPCODE_IFS_MS", "Any value or expression which can be either TRUE or FALSE."),
+    NC_("SC_OPCODE_IFS_MS", "result"),
+    NC_("SC_OPCODE_IFS_MS", "The result of the function if test is TRUE.")
+};
+
+// -=*# Resource for function SWITCH #*=-
+const char* SC_OPCODE_SWITCH_MS_ARY[] =
+{
+    NC_("SC_OPCODE_SWITCH_MS", "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression."),
+    NC_("SC_OPCODE_SWITCH_MS", "expression"),
+    NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against value1-valueN."),
+    NC_("SC_OPCODE_SWITCH_MS", "value"),
+    NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against expression."),
+    NC_("SC_OPCODE_SWITCH_MS", "result"),
+    NC_("SC_OPCODE_SWITCH_MS", "Value to return when corresponding value argument matches expression.")
+};
+
+const char* SC_OPCODE_MINIFS_MS_ARY[] =
+{
+    NC_("SC_OPCODE_MINIFS_MS", "Returns the minimum value in a range that meet multiple criteria in multiple ranges."),
+    NC_("SC_OPCODE_MINIFS_MS", "min_range"),
+    NC_("SC_OPCODE_MINIFS_MS", "The range from which the minimum will be determined."),
+    NC_("SC_OPCODE_MINIFS_MS", "range"),
+    NC_("SC_OPCODE_MINIFS_MS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_MINIFS_MS", "criteria"),
+    NC_("SC_OPCODE_MINIFS_MS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.")
+};
+
+const char* SC_OPCODE_MAXIFS_MS_ARY[] =
+{
+    NC_("SC_OPCODE_MAXIFS_MS", "Returns the maximum value in a range that meet multiple criteria in multiple ranges."),
+    NC_("SC_OPCODE_MAXIFS_MS", "max_range"),
+    NC_("SC_OPCODE_MAXIFS_MS", "The range from which the maximum will be determined."),
+    NC_("SC_OPCODE_MAXIFS_MS", "range"),
+    NC_("SC_OPCODE_MAXIFS_MS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."),
+    NC_("SC_OPCODE_MAXIFS_MS", "criteria"),
+    NC_("SC_OPCODE_MAXIFS_MS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.")
+};
+
+// -=*# Resource for function EXACT #*=-
+const char* SC_OPCODE_EXACT_ARY[] =
+{
+    NC_("SC_OPCODE_EXACT", "Specifies whether two texts are identical."),
+    NC_("SC_OPCODE_EXACT", "text_1"),
+    NC_("SC_OPCODE_EXACT", "The first text to be used for comparing texts."),
+    NC_("SC_OPCODE_EXACT", "text_2"),
+    NC_("SC_OPCODE_EXACT", "The second text for comparing texts.")
+};
+
+// -=*# Resource for function FIND #*=-
+const char* SC_OPCODE_FIND_ARY[] =
+{
+    NC_("SC_OPCODE_FIND", "Looks for a string of text within another (case sensitive)"),
+    NC_("SC_OPCODE_FIND", "find_text"),
+    NC_("SC_OPCODE_FIND", "The text to be found."),
+    NC_("SC_OPCODE_FIND", "text"),
+    NC_("SC_OPCODE_FIND", "The text in which a search is to be made."),
+    NC_("SC_OPCODE_FIND", "position"),
+    NC_("SC_OPCODE_FIND", "The position in the text from which the search starts.")
+};
+
+// -=*# Resource for function SEARCH #*=-
+const char* SC_OPCODE_SEARCH_ARY[] =
+{
+    NC_("SC_OPCODE_SEARCH", "Looks for one text value within another (not case-sensitive)."),
+    NC_("SC_OPCODE_SEARCH", "find_text"),
+    NC_("SC_OPCODE_SEARCH", "The text to be found."),
+    NC_("SC_OPCODE_SEARCH", "text"),
+    NC_("SC_OPCODE_SEARCH", "The text in which a search is to be made."),
+    NC_("SC_OPCODE_SEARCH", "position"),
+    NC_("SC_OPCODE_SEARCH", "The position in the text where the search is started.")
+};
+
+// -=*# Resource for function TRIM #*=-
+const char* SC_OPCODE_TRIM_ARY[] =
+{
+    NC_("SC_OPCODE_TRIM", "Removes extra spaces from text."),
+    NC_("SC_OPCODE_TRIM", "text"),
+    NC_("SC_OPCODE_TRIM", "The text in which extra spaces between words are to be deleted.")
+};
+
+// -=*# Resource for function PROPER #*=-
+const char* SC_OPCODE_PROPER_ARY[] =
+{
+    NC_("SC_OPCODE_PROPER", "Capitalizes the first letter in all words."),
+    NC_("SC_OPCODE_PROPER", "text"),
+    NC_("SC_OPCODE_PROPER", "The text in which the beginning of words are to be replaced by capital letters.")
+};
+
+// -=*# Resource for function UPPER #*=-
+const char* SC_OPCODE_UPPER_ARY[] =
+{
+    NC_("SC_OPCODE_UPPER", "Converts text to uppercase."),
+    NC_("SC_OPCODE_UPPER", "text"),
+    NC_("SC_OPCODE_UPPER", "The text in which lower case letters are to be converted to capitals.")
+};
+
+// -=*# Resource for function LOWER #*=-
+const char* SC_OPCODE_LOWER_ARY[] =
+{
+    NC_("SC_OPCODE_LOWER", "Converts text to lowercase."),
+    NC_("SC_OPCODE_LOWER", "text"),
+    NC_("SC_OPCODE_LOWER", "The text in which capitals are converted to lower case letters.")
+};
+
+// -=*# Resource for function VALUE #*=-
+const char* SC_OPCODE_VALUE_ARY[] =
+{
+    NC_("SC_OPCODE_VALUE", "Converts text to a number."),
+    NC_("SC_OPCODE_VALUE", "text"),
+    NC_("SC_OPCODE_VALUE", "The text to be converted to a number.")
+};
+
+// -=*# Resource for function TEXT #*=-
+const char* SC_OPCODE_TEXT_ARY[] =
+{
+    NC_("SC_OPCODE_TEXT", "Converts a number to text according to a given format."),
+    NC_("SC_OPCODE_TEXT", "number"),
+    NC_("SC_OPCODE_TEXT", "The numeric value to be converted."),
+    NC_("SC_OPCODE_TEXT", "Format"),
+    NC_("SC_OPCODE_TEXT", "The text that describes the format.")
+};
+
+// -=*# Resource for function T #*=-
+const char* SC_OPCODE_T_ARY[] =
+{
+    NC_("SC_OPCODE_T", "Returns a value if it is text, otherwise an empty string."),
+    NC_("SC_OPCODE_T", "value"),
+    NC_("SC_OPCODE_T", "The value to be checked and returned if it is text.")
+};
+
+// -=*# Resource for function REPLACE #*=-
+const char* SC_OPCODE_REPLACE_ARY[] =
+{
+    NC_("SC_OPCODE_REPLACE", "Replaces characters within a text string with a different text string."),
+    NC_("SC_OPCODE_REPLACE", "Text"),
+    NC_("SC_OPCODE_REPLACE", "The text in which some characters are to be replaced."),
+    NC_("SC_OPCODE_REPLACE", "position"),
+    NC_("SC_OPCODE_REPLACE", "The character position from which text is to be replaced."),
+    NC_("SC_OPCODE_REPLACE", "length"),
+    NC_("SC_OPCODE_REPLACE", "The number of characters to be replaced."),
+    NC_("SC_OPCODE_REPLACE", "new text"),
+    NC_("SC_OPCODE_REPLACE", "The text to be inserted.")
+};
+
+// -=*# Resource for function FIXED #*=-
+const char* SC_OPCODE_FIXED_ARY[] =
+{
+    NC_("SC_OPCODE_FIXED", "Formats a number with a fixed number of places after the decimal point and thousands separator."),
+    NC_("SC_OPCODE_FIXED", "number"),
+    NC_("SC_OPCODE_FIXED", "The number to be formatted."),
+    NC_("SC_OPCODE_FIXED", "Decimals"),
+    NC_("SC_OPCODE_FIXED", "Decimal places. The number of fixed decimal places that are to be displayed."),
+    NC_("SC_OPCODE_FIXED", "No thousands separators"),
+    NC_("SC_OPCODE_FIXED", "Thousands separator. If 0 or omitted the locale group separator is used else the separator is suppressed.")
+};
+
+// -=*# Resource for function LEN #*=-
+const char* SC_OPCODE_LEN_ARY[] =
+{
+    NC_("SC_OPCODE_LEN", "Calculates length of a text string."),
+    NC_("SC_OPCODE_LEN", "text"),
+    NC_("SC_OPCODE_LEN", "The text in which the length is to be determined.")
+};
+
+// -=*# Resource for function LEFT #*=-
+const char* SC_OPCODE_LEFT_ARY[] =
+{
+    NC_("SC_OPCODE_LEFT", "Returns the first character or characters of a text."),
+    NC_("SC_OPCODE_LEFT", "text"),
+    NC_("SC_OPCODE_LEFT", "The text where the initial partial words are to be determined."),
+    NC_("SC_OPCODE_LEFT", "number"),
+    NC_("SC_OPCODE_LEFT", "The number of characters for the start text.")
+};
+
+// -=*# Resource for function RIGHT #*=-
+const char* SC_OPCODE_RIGHT_ARY[] =
+{
+    NC_("SC_OPCODE_RIGHT", "Returns the last character or characters of a text."),
+    NC_("SC_OPCODE_RIGHT", "text"),
+    NC_("SC_OPCODE_RIGHT", "The text in which the end partial words are to be determined."),
+    NC_("SC_OPCODE_RIGHT", "number"),
+    NC_("SC_OPCODE_RIGHT", "The number of characters for the end text.")
+};
+
+// -=*# Resource for function MID #*=-
+const char* SC_OPCODE_MID_ARY[] =
+{
+    NC_("SC_OPCODE_MID", "Returns a partial text string of a text."),
+    NC_("SC_OPCODE_MID", "text"),
+    NC_("SC_OPCODE_MID", "The text in which partial words are to be determined."),
+    NC_("SC_OPCODE_MID", "start"),
+    NC_("SC_OPCODE_MID", "The position from which the part word is to be determined."),
+    NC_("SC_OPCODE_MID", "number"),
+    NC_("SC_OPCODE_MID", "The number of characters for the text.")
+};
+
+// -=*# Resource for function REPT #*=-
+const char* SC_OPCODE_REPT_ARY[] =
+{
+    NC_("SC_OPCODE_REPT", "Repeats text a given number of times."),
+    NC_("SC_OPCODE_REPT", "text"),
+    NC_("SC_OPCODE_REPT", "The text to be repeated."),
+    NC_("SC_OPCODE_REPT", "number"),
+    NC_("SC_OPCODE_REPT", "The number of times the text is to be repeated.")
+};
+
+// -=*# Resource for function SUBSTITUTE #*=-
+const char* SC_OPCODE_SUBSTITUTE_ARY[] =
+{
+    NC_("SC_OPCODE_SUBSTITUTE", "Substitutes new text for old text in a string."),
+    NC_("SC_OPCODE_SUBSTITUTE", "text"),
+    NC_("SC_OPCODE_SUBSTITUTE", "The text in which partial words are to be replaced."),
+    NC_("SC_OPCODE_SUBSTITUTE", "search_text"),
+    NC_("SC_OPCODE_SUBSTITUTE", "The partial string to be (repeatedly) replaced."),
+    NC_("SC_OPCODE_SUBSTITUTE", "new text"),
+    NC_("SC_OPCODE_SUBSTITUTE", "The text which is to replace the text string."),
+    NC_("SC_OPCODE_SUBSTITUTE", "occurrence"),
+    NC_("SC_OPCODE_SUBSTITUTE", "Which occurrence of the old text is to be replaced.")
+};
+
+// -=*# Resource for function BASE #*=-
+const char* SC_OPCODE_BASE_ARY[] =
+{
+    NC_("SC_OPCODE_BASE", "Converts a positive integer to text from a number system to the base defined."),
+    NC_("SC_OPCODE_BASE", "number"),
+    NC_("SC_OPCODE_BASE", "The number to be converted."),
+    NC_("SC_OPCODE_BASE", "radix"),
+    NC_("SC_OPCODE_BASE", "The base number for conversion must be in the range 2 - 36."),
+    NC_("SC_OPCODE_BASE", "Minimum length"),
+    NC_("SC_OPCODE_BASE", "If the text is shorter than the specified length, zeros are added to the left of the string.")
+};
+
+// -=*# Resource for function DECIMAL #*=-
+const char* SC_OPCODE_DECIMAL_ARY[] =
+{
+    NC_("SC_OPCODE_DECIMAL", "Converts a text of a specified number system to a positive integer in the base given."),
+    NC_("SC_OPCODE_DECIMAL", "text"),
+    NC_("SC_OPCODE_DECIMAL", "The text to be converted."),
+    NC_("SC_OPCODE_DECIMAL", "radix"),
+    NC_("SC_OPCODE_DECIMAL", "The base number for conversion must be in the range 2 - 36.")
+};
+
+// -=*# Resource for function CONVERT_OOO #*=-
+const char* SC_OPCODE_CONVERT_OOO_ARY[] =
+{
+    NC_("SC_OPCODE_CONVERT_OOO", "Converts a value according to a conversion table in the configuration (main.xcd)."),
+    NC_("SC_OPCODE_CONVERT_OOO", "value"),
+    NC_("SC_OPCODE_CONVERT_OOO", "The value to be converted."),
+    NC_("SC_OPCODE_CONVERT_OOO", "text"),
+    NC_("SC_OPCODE_CONVERT_OOO", "Unit from which something is converted, case-sensitive."),
+    NC_("SC_OPCODE_CONVERT_OOO", "text"),
+    NC_("SC_OPCODE_CONVERT_OOO", "Unit into which something is converted, case-sensitive.")
+};
+
+// -=*# Resource for function ROMAN #*=-
+const char* SC_OPCODE_ROMAN_ARY[] =
+{
+    NC_("SC_OPCODE_ROMAN", "Converts a number to a Roman numeral."),
+    NC_("SC_OPCODE_ROMAN", "Number"),
+    NC_("SC_OPCODE_ROMAN", "The number to be converted to a Roman numeral must be in the 0 - 3999 range."),
+    NC_("SC_OPCODE_ROMAN", "Mode"),
+    NC_("SC_OPCODE_ROMAN", "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range.")
+};
+
+// -=*# Resource for function ARABIC #*=-
+const char* SC_OPCODE_ARABIC_ARY[] =
+{
+    NC_("SC_OPCODE_ARABIC", "Calculates the value of a Roman numeral."),
+    NC_("SC_OPCODE_ARABIC", "Text"),
+    NC_("SC_OPCODE_ARABIC", "The text that represents a Roman numeral.")
+};
+
+const char* SC_OPCODE_INFO_ARY[] =
+{
+    NC_("SC_OPCODE_INFO", "Returns information about the environment."),
+    NC_("SC_OPCODE_INFO", "Text"),
+    NC_("SC_OPCODE_INFO", "Can be \"osversion\", \"system\", \"release\", \"numfile\", and \"recalc\".")
+};
+
+const char* SC_OPCODE_UNICODE_ARY[] =
+{
+    NC_("SC_OPCODE_UNICODE", "Returns the numeric code for the first Unicode character in a text string."),
+    NC_("SC_OPCODE_UNICODE", "text"),
+    NC_("SC_OPCODE_UNICODE", "This is the text for which the code of the first character is to be found.")
+};
+
+const char* SC_OPCODE_UNICHAR_ARY[] =
+{
+    NC_("SC_OPCODE_UNICHAR", "Converts a code number into a Unicode character or letter."),
+    NC_("SC_OPCODE_UNICHAR", "number"),
+    NC_("SC_OPCODE_UNICHAR", "The code value for the character.")
+};
+
+const char* SC_OPCODE_EUROCONVERT_ARY[] =
+{
+    NC_("SC_OPCODE_EUROCONVERT", "Converts a value from one to another Euro currency."),
+    NC_("SC_OPCODE_EUROCONVERT", "value"),
+    NC_("SC_OPCODE_EUROCONVERT", "The value to be converted."),
+    NC_("SC_OPCODE_EUROCONVERT", "from_currency"),
+    NC_("SC_OPCODE_EUROCONVERT", "ISO 4217 code of the currency from which is converted, case-sensitive."),
+    NC_("SC_OPCODE_EUROCONVERT", "to_currency"),
+    NC_("SC_OPCODE_EUROCONVERT", "ISO 4217 code of the currency into which is converted, case-sensitive."),
+    NC_("SC_OPCODE_EUROCONVERT", "full_precision"),
+    NC_("SC_OPCODE_EUROCONVERT", "If omitted or 0 or FALSE, the result is rounded to the decimals of to_currency. Else the result is not rounded."),
+    NC_("SC_OPCODE_EUROCONVERT", "triangulation_precision"),
+    /* This description uses almost all available space in the dialog, make sure translations fit in size */
+    NC_("SC_OPCODE_EUROCONVERT", "If given and >=3, the intermediate result of a triangular conversion is rounded to that precision. If omitted, the result is not rounded.")
+};
+
+const char* SC_OPCODE_NUMBERVALUE_ARY[] =
+{
+    NC_("SC_OPCODE_NUMBERVALUE", "Converts text to a number, in a locale-independent way."),
+    NC_("SC_OPCODE_NUMBERVALUE", "text"),
+    NC_("SC_OPCODE_NUMBERVALUE", "The text to be converted to a number."),
+    NC_("SC_OPCODE_NUMBERVALUE", "decimal_separator"),
+    NC_("SC_OPCODE_NUMBERVALUE", "Defines the character used as the decimal separator."),
+    NC_("SC_OPCODE_NUMBERVALUE", "group_separator"),
+    NC_("SC_OPCODE_NUMBERVALUE", "Defines the character(s) used as the group separator.")
+};
+
+
+const char* SC_OPCODE_BITAND_ARY[] =
+{
+    NC_("SC_OPCODE_BITAND", "Bitwise \"AND\" of two integers."),
+    NC_("SC_OPCODE_BITAND", "Number1"),
+    NC_("SC_OPCODE_BITAND", "Positive integer less than 2^48."),
+    NC_("SC_OPCODE_BITAND", "Number2"),
+    NC_("SC_OPCODE_BITAND", "Positive integer less than 2^48.")
+};
+
+const char* SC_OPCODE_BITOR_ARY[] =
+{
+    NC_("SC_OPCODE_BITOR", "Bitwise \"OR\" of two integers."),
+    NC_("SC_OPCODE_BITOR", "Number1"),
+    NC_("SC_OPCODE_BITOR", "Positive integer less than 2^48."),
+    NC_("SC_OPCODE_BITOR", "Number2"),
+    NC_("SC_OPCODE_BITOR", "Positive integer less than 2^48.")
+};
+
+const char* SC_OPCODE_BITXOR_ARY[] =
+{
+    NC_("SC_OPCODE_BITXOR", "Bitwise \"exclusive OR\" of two integers."),
+    NC_("SC_OPCODE_BITXOR", "Number1"),
+    NC_("SC_OPCODE_BITXOR", "Positive integer less than 2^48."),
+    NC_("SC_OPCODE_BITXOR", "Number2"),
+    NC_("SC_OPCODE_BITXOR", "Positive integer less than 2^48.")
+};
+
+const char* SC_OPCODE_BITRSHIFT_ARY[] =
+{
+    NC_("SC_OPCODE_BITRSHIFT", "Bitwise right shift of an integer value."),
+    NC_("SC_OPCODE_BITRSHIFT", "Number"),
+    NC_("SC_OPCODE_BITRSHIFT", "The value to be shifted. Positive integer less than 2^48."),
+    NC_("SC_OPCODE_BITRSHIFT", "Shift"),
+    NC_("SC_OPCODE_BITRSHIFT", "The integer number of bits the value is to be shifted.")
+};
+
+const char* SC_OPCODE_BITLSHIFT_ARY[] =
+{
+    NC_("SC_OPCODE_BITLSHIFT", "Bitwise left shift of an integer value."),
+    NC_("SC_OPCODE_BITLSHIFT", "Number"),
+    NC_("SC_OPCODE_BITLSHIFT", "The value to be shifted. Positive integer less than 2^48."),
+    NC_("SC_OPCODE_BITLSHIFT", "Shift"),
+    NC_("SC_OPCODE_BITLSHIFT", "The integer number of bits the value is to be shifted.")
+};
+
+const char* SC_OPCODE_LENB_ARY[] =
+{
+    NC_("SC_OPCODE_LENB", "Calculates length of a text string, with DBCS"),
+    NC_("SC_OPCODE_LENB", "text"),
+    NC_("SC_OPCODE_LENB", "The text in which the length is to be determined.")
+};
+
+const char* SC_OPCODE_RIGHTB_ARY[] =
+{
+    NC_("SC_OPCODE_RIGHTB", "Returns the last character or characters of a text,with DBCS"),
+    NC_("SC_OPCODE_RIGHTB", "text"),
+    NC_("SC_OPCODE_RIGHTB", "The text in which the end partial words are to be determined."),
+    NC_("SC_OPCODE_RIGHTB", "number"),
+    NC_("SC_OPCODE_RIGHTB", "The number of characters for the end text.")
+};
+
+const char* SC_OPCODE_LEFTB_ARY[] =
+{
+    NC_("SC_OPCODE_LEFTB", "Returns the first character or characters of a text,with DBCS"),
+    NC_("SC_OPCODE_LEFTB", "text"),
+    NC_("SC_OPCODE_LEFTB", "The text where the initial partial words are to be determined."),
+    NC_("SC_OPCODE_LEFTB", "number"),
+    NC_("SC_OPCODE_LEFTB", "The number of characters for the start text.")
+};
+
+const char* SC_OPCODE_MIDB_ARY[] =
+{
+    NC_("SC_OPCODE_MIDB", "Returns a partial text string of a text, with DBCS"),
+    NC_("SC_OPCODE_MIDB", "text"),
+    NC_("SC_OPCODE_MIDB", "The text in which partial words are to be determined."),
+    NC_("SC_OPCODE_MIDB", "start"),
+    NC_("SC_OPCODE_MIDB", "The position from which the part word is to be determined."),
+    NC_("SC_OPCODE_MIDB", "number"),
+    NC_("SC_OPCODE_MIDB", "The number of characters for the text.")
+};
+
+const char* SC_OPCODE_FILTERXML_ARY[] =
+{
+    NC_("SC_OPCODE_FILTERXML", "Apply an XPath expression to an XML document"),
+    NC_("SC_OPCODE_FILTERXML", "XML Document"),
+    NC_("SC_OPCODE_FILTERXML", "String containing a valid XML stream"),
+    NC_("SC_OPCODE_FILTERXML", "XPath expression"),
+    NC_("SC_OPCODE_FILTERXML", "String containing a valid XPath expression")
+};
+
+const char* SC_OPCODE_COLOR_ARY[] =
+{
+    NC_("SC_OPCODE_COLOR", "Returns an implementation defined value representing a RGBA color"),
+    NC_("SC_OPCODE_COLOR", "Red"),
+    NC_("SC_OPCODE_COLOR", "Value of red"),
+    NC_("SC_OPCODE_COLOR", "Green"),
+    NC_("SC_OPCODE_COLOR", "Value of green"),
+    NC_("SC_OPCODE_COLOR", "Blue"),
+    NC_("SC_OPCODE_COLOR", "Value of blue"),
+    NC_("SC_OPCODE_COLOR", "Alpha"),
+    NC_("SC_OPCODE_COLOR", "Value of alpha")
+};
+
+const char* SC_OPCODE_WEBSERVICE_ARY[] =
+{
+    NC_("SC_OPCODE_WEBSERVICE", "Get some webcontent from an URI."),
+    NC_("SC_OPCODE_WEBSERVICE", "URI"),
+    NC_("SC_OPCODE_WEBSERVICE", "URI of the webservice")
+};
+
+const char* SC_OPCODE_ENCODEURL_ARY[] =
+{
+    NC_("SC_OPCODE_ENCODEURL", "Return a URL-encoded string."),
+    NC_("SC_OPCODE_ENCODEURL", "Text"),
+    NC_("SC_OPCODE_ENCODEURL", "A string to be URL-encoded")
+};
+
+const char* SC_OPCODE_ERF_MS_ARY[] =
+{
+    NC_("SC_OPCODE_ERF_MS", "Returns the error function."),
+    NC_("SC_OPCODE_ERF_MS", "Lower Limit"),
+    NC_("SC_OPCODE_ERF_MS", "The lower limit for integration")
+};
+
+const char* SC_OPCODE_ERFC_MS_ARY[] =
+{
+    NC_("SC_OPCODE_ERFC_MS", "Returns the complementary error function."),
+    NC_("SC_OPCODE_ERFC_MS", "Lower Limit"),
+    NC_("SC_OPCODE_ERFC_MS", "The lower limit for integration")
+};
+
+const char* SC_OPCODE_RAWSUBTRACT_ARY[] =
+{
+    NC_("SC_OPCODE_RAWSUBTRACT", "Returns the subtraction of numbers. Like a-b-c but without eliminating small roundoff errors."),
+    NC_("SC_OPCODE_RAWSUBTRACT", "minuend"),
+    NC_("SC_OPCODE_RAWSUBTRACT", "Number from which following arguments are subtracted."),
+    NC_("SC_OPCODE_RAWSUBTRACT", "subtrahend "),
+    NC_("SC_OPCODE_RAWSUBTRACT", "Subtrahend 1, subtrahend 2, ... are numerical arguments subtracted from the minuend.")
+};
+
+// -=*# Resource for function ROUNDSIG #*=-
+const char* SC_OPCODE_ROUNDSIG_ARY[] =
+{
+    NC_("SC_OPCODE_ROUNDSIG", "Rounds a number to predefined significant digits."),
+    NC_("SC_OPCODE_ROUNDSIG", "value"),
+    NC_("SC_OPCODE_ROUNDSIG", "The number to be rounded."),
+    NC_("SC_OPCODE_ROUNDSIG", "digits"),
+    NC_("SC_OPCODE_ROUNDSIG", "The number of significant digits to which value is to be rounded.")
+};
+
+const char* SC_OPCODE_REPLACEB_ARY[] =
+{
+    NC_("SC_OPCODE_REPLACEB", "Replaces characters within a text string with a different text string, with DBCS."),
+    NC_("SC_OPCODE_REPLACEB", "Text"),
+    NC_("SC_OPCODE_REPLACEB", "The text in which some characters are to be replaced."),
+    NC_("SC_OPCODE_REPLACEB", "position"),
+    NC_("SC_OPCODE_REPLACEB", "The character position from which text is to be replaced."),
+    NC_("SC_OPCODE_REPLACEB", "length"),
+    NC_("SC_OPCODE_REPLACEB", "The number of characters to be replaced."),
+    NC_("SC_OPCODE_REPLACEB", "new text"),
+    NC_("SC_OPCODE_REPLACEB", "The text to be inserted.")
+};
+
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/sc/inc/scfuncs.hxx
index 467b98963e3e..820fcc96a4c2 100644
--- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx
+++ b/sc/inc/scfuncs.hxx
@@ -16,19 +16,21 @@
  *   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_SC_INC_SCFUNCS_HXX
+#define INCLUDED_SC_INC_SCFUNCS_HXX
 
-#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
-#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
+#define ID_FUNCTION_GRP_DATABASE    1
+#define ID_FUNCTION_GRP_DATETIME    2
+#define ID_FUNCTION_GRP_FINANZ      3
+#define ID_FUNCTION_GRP_INFO        4
+#define ID_FUNCTION_GRP_LOGIC       5
+#define ID_FUNCTION_GRP_MATH        6
+#define ID_FUNCTION_GRP_MATRIX      7
+#define ID_FUNCTION_GRP_STATISTIC   8
+#define ID_FUNCTION_GRP_TABLE       9
+#define ID_FUNCTION_GRP_TEXT        10
+#define ID_FUNCTION_GRP_ADDINS      11
 
-#include <unotools/componentresmodule.hxx>
-
-namespace sdbtools
-{
-
-    DEFINE_MODULE( SdbtModule, SdbtClient, SdbtRes )
-
-} // namespace sdbtools
-
-#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index 139e84001023..dfc56306c8be 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -24,350 +24,8 @@
 #include "formula/compiler.hrc"
 
 #define STR_START               (SC_RESOURCE_START+100)
-#define SCSTR_UNDEFINED         (STR_START + 8)
-#define SCSTR_NONAME            (STR_START + 9)
-#define SCSTR_NONE              (STR_START + 10)
-#define SCSTR_FILTER_EMPTY      (STR_START + 11)
-#define SCSTR_FILTER_NOTEMPTY   (STR_START + 12)
-#define SCSTR_COLUMN            (STR_START + 13)
-#define SCSTR_ROW               (STR_START + 14)
 
-#define SCSTR_TABLE             (STR_START + 24)
-#define SCSTR_NAME              (STR_START + 25)
-#define SCSTR_APDTABLE          (STR_START + 27)
-#define SCSTR_RENAMETAB         (STR_START + 28)
-#define STR_INSERTGRAPHIC       (STR_START + 29)
-
-#define SCSTR_PROTECTDOC        (STR_START + 39)
-#define SCSTR_UNPROTECTDOC      (STR_START + 40)
-#define SCSTR_UNPROTECTTAB      (STR_START + 42)
-#define SCSTR_PASSWORD          (STR_START + 43)
-#define SCSTR_PASSWORDOPT       (STR_START + 44)
-#define SCSTR_WRONGPASSWORD     (STR_START + 45)
-
-#define SCSTR_END               (STR_START + 47)
-
-#define SCSTR_UNKNOWN           (STR_START + 49)
-#define SCSTR_ALL               (STR_START + 51)
-#define SCSTR_STDFILTER         (STR_START + 52)
-
-#define SCSTR_CHARSET_USER      (STR_START + 59)
-#define SCSTR_COLUMN_USER       (STR_START + 60)
-//free
-//free
-#define SCSTR_MULTIPLE          (STR_START + 63)
-
-#define SCSTR_TOP10FILTER       (STR_START + 66)
-
-#define SCSTR_UNDO_GRAFFILTER        (STR_START + 83)
-
-#define SCSTR_COL_LABEL              (STR_START + 84)
-#define SCSTR_ROW_LABEL              (STR_START + 85)
-
-#define SCSTR_CHG_PROTECT       (STR_START + 86)
-#define SCSTR_CHG_UNPROTECT     (STR_START + 87)
-
-#define STR_CAPTION_DEFAULT_TEXT    (STR_START + 88)
-
-// dialog: select sheets
-#define STR_DLG_SELECTTABLES_TITLE  (STR_START + 89)
-#define STR_DLG_SELECTTABLES_LBNAME (STR_START + 90)
-
-// replace cell contents warning
-#define STR_REPLCELLSWARN           (STR_START + 91)
-
-#define SCSTR_DPFUNCLISTBOX         (STR_START + 92)
-
-//free
-#define SCSTR_UNIT                  (STR_START + 114)
-
-// print options
-#define SCSTR_PRINTOPT_PAGES            (STR_START + 120)
-#define SCSTR_PRINTOPT_SUPPRESSEMPTY    (STR_START + 121)
-#define SCSTR_PRINTOPT_PRNTCONTENT      (STR_START + 122)
-#define SCSTR_PRINTOPT_ALLSHEETS        (STR_START + 123)
-#define SCSTR_PRINTOPT_SELECTEDSHEETS   (STR_START + 124)
-#define SCSTR_PRINTOPT_SELECTEDCELLS    (STR_START + 125)
-#define SCSTR_PRINTOPT_FROMWHICH        (STR_START + 126)
-#define SCSTR_PRINTOPT_ALLPAGES         (STR_START + 127)
-#define SCSTR_PRINTOPT_PAGES_           (STR_START + 128)
-#define SCSTR_PRINTOPT_PRODNAME         (STR_START + 129)
-
-// accessibility
-
-// CSV import
-#define STR_ACC_CSVRULER_NAME       (STR_START + 150)
-#define STR_ACC_CSVRULER_DESCR      (STR_START + 151)
-#define STR_ACC_CSVGRID_NAME        (STR_START + 152)
-#define STR_ACC_CSVGRID_DESCR       (STR_START + 153)
-
-// document
-#define STR_ACC_DOC_NAME            (STR_START + 154)
-//free
-#define STR_ACC_TABLE_NAME          (STR_START + 156)
-//free
-#define STR_ACC_CELL_NAME           (STR_START + 158)
-//free
-
-// preview
-#define STR_ACC_PREVIEWDOC_NAME     (STR_START + 160)
-//free
-//free
-//free
-#define STR_ACC_LEFTAREA_NAME       (STR_START + 164)
-//free
-#define STR_ACC_CENTERAREA_NAME     (STR_START + 166)
-//free
-#define STR_ACC_RIGHTAREA_NAME      (STR_START + 168)
-//free
-#define STR_ACC_HEADER_NAME         (STR_START + 170)
-//free
-#define STR_ACC_FOOTER_NAME         (STR_START + 172)
-//free
-
-// Editline
-#define STR_ACC_EDITLINE_NAME       (STR_START + 174)
-#define STR_ACC_EDITLINE_DESCR      (STR_START + 175)
-
-#define STR_ACC_TOOLBAR_FORMULA     (STR_START + 184)
-#define STR_ACC_DOC_SPREADSHEET     (STR_START + 185)
-#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
-#define STR_ACC_DOC_SPREADSHEET_READONLY        (STR_START + 187)
-
-#define SCSTR_SHORT_SCDOC_NAME          (STR_START + 211)
-#define SCSTR_LONG_SCDOC_NAME           (STR_START + 212)
-
-#define SCSTR_FORMULA_AUTOCORRECTION    (STR_START + 214)
-
-#define SCSTR_RENAMEOBJECT              (STR_START + 215)
-#define SCSTR_CONDITION                 (STR_START + 216)
-#define SCSTR_WARN_ME_IN_FUTURE_CHECK   (STR_START + 217)
-
-// header of search result dialog
-
-#define STR_SHEET   (STR_START + 218)
-#define STR_CELL    (STR_START + 219)
-#define STR_CONTENT (STR_START + 220)
-
-// Undo Anchor
-
-#define SCSTR_UNDO_PAGE_ANCHOR   (STR_START + 221)
-#define SCSTR_UNDO_CELL_ANCHOR   (STR_START + 222)
-
-// navigator - in the same order as SC_CONTENT_...
-#define SCSTR_CONTENT_ROOT      (STR_START + 250)
-#define SCSTR_CONTENT_TABLE     (STR_START + 251)
-#define SCSTR_CONTENT_RANGENAME (STR_START + 252)
-#define SCSTR_CONTENT_DBAREA    (STR_START + 253)
-#define SCSTR_CONTENT_GRAPHIC   (STR_START + 254)
-#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255)
-#define SCSTR_CONTENT_NOTE      (STR_START + 256)
-#define SCSTR_CONTENT_AREALINK  (STR_START + 257)
-#define SCSTR_CONTENT_DRAWING   (STR_START + 258)
-#define SCSTR_DRAGMODE          (STR_START + 259)
-#define SCSTR_DISPLAY           (STR_START + 260)
-#define SCSTR_ACTIVE            (STR_START + 261)
-#define SCSTR_NOTACTIVE         (STR_START + 262)
-#define SCSTR_HIDDEN            (STR_START + 263)
-#define SCSTR_ACTIVEWIN         (STR_START + 264)
-#define SCSTR_QHLP_SCEN_LISTBOX (STR_START + 265)
-#define SCSTR_QHLP_SCEN_COMMENT (STR_START + 266)
-
-//  some space for extensions
-
-// input, quickhelp strings (HelpText now using HelpId from help)
-#define SCSTR_QHELP_INPUTWND    (STR_START + 307)
-#define SCSTR_QHELP_POSWND      (STR_START + 308)
-#define SCSTR_QHELP_BTNCALC     (STR_START + 309)
-#define SCSTR_QHELP_BTNOK       (STR_START + 310)
-#define SCSTR_QHELP_BTNCANCEL   (STR_START + 311)
-#define SCSTR_QHELP_BTNSUM      (STR_START + 312)
-#define SCSTR_QHELP_BTNEQUAL    (STR_START + 313)
-
-// validator
-#define SCSTR_VALID_MINIMUM     (STR_START + 314)
-#define SCSTR_VALID_MAXIMUM     (STR_START + 315)
-#define SCSTR_VALID_VALUE       (STR_START + 316)
-#define SCSTR_VALID_RANGE       (STR_START + 317)
-#define SCSTR_VALID_LIST        (STR_START + 318)
-
-// media shell
-#define SCSTR_MEDIASHELL        (STR_START + 401)
-
-#define RID_SCSTR_ONCLICK       (STR_START + 402)
-
-#define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
-#define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
-#define SCSTR_DDEDOC_NOT_LOADED (STR_START + 405)
-#define SCSTR_QHELP_EXPAND_FORMULA   (STR_START + 406)
-#define SCSTR_QHELP_COLLAPSE_FORMULA (STR_START + 407)
-#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 408)
-
-#define SCSTR_FORMULA_SYNTAX_CALC_A1 (STR_START + 409)
-#define SCSTR_FORMULA_SYNTAX_XL_A1   (STR_START + 410)
-#define SCSTR_FORMULA_SYNTAX_XL_R1C1 (STR_START + 411)
-
-#define SCSTR_FIELDSEP_TAB      (STR_START + 412)
-#define SCSTR_FIELDSEP_SPACE    (STR_START + 413)
-
-#define SCSTR_VALERR            (STR_START + 414)
-
-#define STR_NOFORMULASPECIFIED  (STR_START + 415)
-#define STR_NOCOLROW            (STR_START + 416)
-#define STR_WRONGFORMULA        (STR_START + 417)
-#define STR_WRONGROWCOL         (STR_START + 418)
-#define STR_NOCOLFORMULA        (STR_START + 419)
-#define STR_NOROWFORMULA        (STR_START + 420)
-#define STR_ADD_AUTOFORMAT_TITLE (STR_START + 421)
-#define STR_RENAME_AUTOFORMAT_TITLE (STR_START + 422)
-#define STR_ADD_AUTOFORMAT_LABEL (STR_START + 423)
-#define STR_DEL_AUTOFORMAT_TITLE (STR_START + 424)
-#define STR_DEL_AUTOFORMAT_MSG  (STR_START + 425)
-#define STR_BTN_AUTOFORMAT_CLOSE (STR_START + 426)
-#define STR_JAN                 (STR_START + 427)
-#define STR_FEB                 (STR_START + 428)
-#define STR_MAR                 (STR_START + 429)
-#define STR_NORTH               (STR_START + 430)
-#define STR_MID                 (STR_START + 431)
-#define STR_SOUTH               (STR_START + 432)
-#define STR_SUM                 (STR_START + 433)
-#define SCSTR_UPDATE_EXTDOCS    (STR_START + 434)
-#define STR_NOT_PROTECTED       (STR_START + 435)
-#define STR_NOT_PASS_PROTECTED  (STR_START + 436)
-#define STR_HASH_BAD            (STR_START + 437)
-#define STR_HASH_GOOD           (STR_START + 438)
-#define STR_RETYPE              (STR_START + 440)
-
-#define STR_TITLE_CONFLICT      (STR_START + 441)
-#define STR_TITLE_AUTHOR        (STR_START + 442)
-#define STR_TITLE_DATE          (STR_START + 443)
-#define STR_UNKNOWN_USER_CONFLICT    (STR_START + 444)
-
-#define STR_UNDO_DISTRIBUTION_TEMPLATE              (STR_START + 445)
-#define STR_DISTRIBUTION_UNIFORM_REAL               (STR_START + 446)
-#define STR_DISTRIBUTION_UNIFORM_INTEGER            (STR_START + 447)
-#define STR_DISTRIBUTION_NORMAL                     (STR_START + 448)
-#define STR_DISTRIBUTION_CAUCHY                     (STR_START + 449)
-#define STR_DISTRIBUTION_BERNOULLI                  (STR_START + 450)
-#define STR_DISTRIBUTION_BINOMIAL                   (STR_START + 451)
-#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL          (STR_START + 452)
-#define STR_DISTRIBUTION_CHI_SQUARED                (STR_START + 453)
-#define STR_DISTRIBUTION_GEOMETRIC                  (STR_START + 454)
-
-#define STR_RNG_PARAMETER_MINIMUM                   (STR_START + 455)
-#define STR_RNG_PARAMETER_MAXIMUM                   (STR_START + 456)
-#define STR_RNG_PARAMETER_MEAN                      (STR_START + 457)
-#define STR_RNG_PARAMETER_STANDARD_DEVIATION        (STR_START + 458)
-#define STR_RNG_PARAMETER_STANDARD_MEDIAN           (STR_START + 459)
-#define STR_RNG_PARAMETER_STANDARD_SIGMA            (STR_START + 460)
-#define STR_RNG_PARAMETER_STANDARD_PROBABILITY      (STR_START + 461)
-#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS (STR_START + 462)
-#define STR_RNG_PARAMETER_STANDARD_NU_VALUE         (STR_START + 463)
-
-#define STR_SAMPLING_UNDO_NAME                      (STR_START + 464)
-
-#define STRID_CALC_MEAN                             (STR_START + 465)
-#define STRID_CALC_STD_ERROR                        (STR_START + 466)
-#define STRID_CALC_MODE                             (STR_START + 467)
-#define STRID_CALC_MEDIAN                           (STR_START + 468)
-#define STRID_CALC_VARIANCE                         (STR_START + 469)
-#define STRID_CALC_STD_DEVIATION                    (STR_START + 470)
-#define STRID_CALC_KURTOSIS                         (STR_START + 471)
-#define STRID_CALC_SKEWNESS                         (STR_START + 472)
-#define STRID_CALC_RANGE                            (STR_START + 473)
-#define STRID_CALC_MIN                              (STR_START + 474)
-#define STRID_CALC_MAX                              (STR_START + 475)
-#define STRID_CALC_SUM                              (STR_START + 476)
-#define STRID_CALC_COUNT                            (STR_START + 477)
-#define STRID_CALC_FIRST_QUARTILE                   (STR_START + 478)
-#define STRID_CALC_THIRD_QUARTILE                   (STR_START + 479)
-
-#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME        (STR_START + 480)
-#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME          (STR_START + 481)
-#define STR_CORRELATION_UNDO_NAME                   (STR_START + 482)
-#define STR_COVARIANCE_UNDO_NAME                    (STR_START + 483)
-#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME         (STR_START + 484)
-#define STR_MOVING_AVERAGE_UNDO_NAME                (STR_START + 485)
-#define STR_REGRESSION                              (STR_START + 486)
-#define STR_REGRESSION_UNDO_NAME                    (STR_START + 487)
-#define STR_TTEST                                   (STR_START + 488)
-#define STR_TTEST_UNDO_NAME                         (STR_START + 489)
-#define STR_FTEST                                   (STR_START + 490)
-#define STR_FTEST_UNDO_NAME                         (STR_START + 491)
-#define STR_ZTEST                                   (STR_START + 492)
-#define STR_ZTEST_UNDO_NAME                         (STR_START + 493)
-#define STR_CHI_SQUARE_TEST                         (STR_START + 494)
-
-#define STR_COLUMN_LABEL_TEMPLATE                   (STR_START + 495)
-#define STR_ROW_LABEL_TEMPLATE                      (STR_START + 496)
-
-#define STR_ANOVA_SINGLE_FACTOR_LABEL               (STR_START + 497)
-#define STR_ANOVA_LABEL_GROUPS                      (STR_START + 498)
-#define STR_ANOVA_LABEL_BETWEEN_GROUPS              (STR_START + 499)
-#define STR_ANOVA_LABEL_WITHIN_GROUPS               (STR_START + 500)
-#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION         (STR_START + 501)
-#define STR_ANOVA_LABEL_SS                          (STR_START + 502)
-#define STR_ANOVA_LABEL_DF                          (STR_START + 503)
-#define STR_ANOVA_LABEL_MS                          (STR_START + 504)
-#define STR_ANOVA_LABEL_F                           (STR_START + 505)
-#define STR_ANOVA_LABEL_P_VALUE                     (STR_START + 506)
-#define STR_ANOVA_LABEL_F_CRITICAL                  (STR_START + 507)
-#define STR_ANOVA_LABEL_TOTAL                       (STR_START + 508)
-#define STR_ANOVA_TWO_FACTOR_LABEL                  (STR_START + 509)
-
-#define STR_CORRELATION_LABEL                       (STR_START + 510)
-#define STR_COVARIANCE_LABEL                        (STR_START + 511)
-#define STR_LABEL_ALPHA                             (STR_START + 512)
-#define STR_VARIABLE_1_LABEL                        (STR_START + 513)
-#define STR_VARIABLE_2_LABEL                        (STR_START + 514)
-#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL      (STR_START + 515)
-#define STR_OBSERVATIONS_LABEL                      (STR_START + 516)
-#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL          (STR_START + 517)
-#define STR_DEGREES_OF_FREEDOM_LABEL                (STR_START + 518)
-#define STR_P_VALUE_LABEL                           (STR_START + 519)
-#define STR_CRITICAL_VALUE_LABEL                    (STR_START + 520)
-#define STR_TEST_STATISTIC_LABEL                    (STR_START + 521)
-
-#define STR_LABEL_LINEAR                            (STR_START + 522)
-#define STR_LABEL_LOGARITHMIC                       (STR_START + 523)
-#define STR_LABEL_POWER                             (STR_START + 524)
-
-#define STR_LABEL_REGRESSION_MODEL                  (STR_START + 525)
-#define STR_LABEL_RSQUARED                          (STR_START + 526)
-#define STR_LABEL_SLOPE                             (STR_START + 527)
-#define STR_LABEL_INTERCEPT                         (STR_START + 528)
-
-#define STR_FTEST_P_RIGHT_TAIL                      (STR_START + 529)
-#define STR_FTEST_F_CRITICAL_RIGHT_TAIL             (STR_START + 530)
-#define STR_FTEST_P_LEFT_TAIL                       (STR_START + 531)
-#define STR_FTEST_F_CRITICAL_LEFT_TAIL              (STR_START + 532)
-#define STR_FTEST_P_TWO_TAIL                        (STR_START + 533)
-#define STR_FTEST_F_CRITICAL_TWO_TAIL               (STR_START + 534)
-
-#define STR_TTEST_PEARSON_CORRELATION               (STR_START + 535)
-#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES       (STR_START + 536)
-#define STR_TTEST_T_STAT                            (STR_START + 537)
-#define STR_TTEST_P_ONE_TAIL                        (STR_START + 538)
-#define STR_TTEST_T_CRITICAL_ONE_TAIL               (STR_START + 539)
-#define STR_TTEST_P_TWO_TAIL                        (STR_START + 540)
-#define STR_TTEST_T_CRITICAL_TWO_TAIL               (STR_START + 541)
-
-#define STR_ZTEST_KNOWN_VARIANCE                    (STR_START + 542)
-#define STR_ZTEST_Z_VALUE                           (STR_START + 543)
-#define STR_ZTEST_P_ONE_TAIL                        (STR_START + 544)
-#define STR_ZTEST_Z_CRITICAL_ONE_TAIL               (STR_START + 545)
-#define STR_ZTEST_P_TWO_TAIL                        (STR_START + 546)
-#define STR_ZTEST_Z_CRITICAL_TWO_TAIL               (STR_START + 547)
-
-#define STR_MENU_SORT_ASC           (STR_START + 548)
-#define STR_MENU_SORT_DESC          (STR_START + 549)
-#define STR_MENU_SORT_CUSTOM        (STR_START + 550)
-#define STR_BTN_TOGGLE_ALL          (STR_START + 551)
-#define STR_BTN_SELECT_CURRENT      (STR_START + 552)
-#define STR_BTN_UNSELECT_CURRENT    (STR_START + 553)
-#define STR_EDIT_SEARCH_ITEMS       (STR_START + 554)
-
-#define STR_END                 (STR_EDIT_SEARCH_ITEMS)
+#define STR_END                 (STR_START + 554)
 
 #define SC_DIALOGS_START        (STR_END + 100)
 
@@ -388,20 +46,8 @@
 #define RID_SCDLG_HFEDIT_HEADER         (SC_DIALOGS_START + 68)
 #define RID_SCDLG_HFEDIT_FOOTER         (SC_DIALOGS_START + 69)
 
-#define RID_CELLSTYLEFAMILY             (SC_DIALOGS_START + 138)
-#define RID_PAGESTYLEFAMILY             (SC_DIALOGS_START + 139)
-
 #define WID_CONDFRMT_REF                (SC_DIALOGS_START + 163)
 
-//put new things here and adjust SC_DIALOGS_END to match
-
-#define SC_DIALOGS_END                  (WID_CONDFRMT_REF + 1)
-
-#define RID_SC_FUNC_DESCRIPTIONS_START  SC_DIALOGS_END
-#define RID_SC_FUNC_DESCRIPTIONS_END    (RID_SC_FUNC_DESCRIPTIONS_START + SC_OPCODE_LAST_OPCODE_ID + 1)
-
-#define RID_GLOBSTR_OFFSET              (RID_SC_FUNC_DESCRIPTIONS_END + 1)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index d754f8eeea8f..e7bdb167ca5d 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include "scdllapi.h"
 
-OUString SC_DLLPUBLIC ScResId(sal_uInt16 nId);
+OUString SC_DLLPUBLIC ScResId(const char* pId);
 
 #endif // SC_SCRESMGR_HXX
 
diff --git a/cui/source/dialogs/svuidlg.src b/sc/inc/scstyles.hrc
index 81f89aa27707..08919cfbc44f 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/sc/inc/scstyles.hrc
@@ -17,39 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/controldims.hrc>
-#include "svuidlg.hrc"
+#ifndef INCLUDED_SC_INC_SCSTYLES_HRC
+#define INCLUDED_SC_INC_SCSTYLES_HRC
 
+#include <svl/style.hxx>
 
-String STR_AUTOLINK
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
-String STR_MANUALLINK
-{
-    Text [ en-US ] = "Manual" ;
-};
-
-String STR_BROKENLINK
-{
-    Text [ en-US ] = "Not available" ;
-};
-
-String STR_CLOSELINKMSG
-{
-    Text [ en-US ] = "Are you sure you want to remove the selected link?" ;
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String STR_CLOSELINKMSG_MULTI
+const std::pair<const char*, int> RID_CELLSTYLEFAMILY[] =
 {
-    Text [ en-US ] = "Are you sure you want to remove the selected link?" ;
+    { NC_("RID_CELLSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_CELLSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+    { NC_("RID_CELLSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+    { NC_("RID_CELLSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+    { nullptr, 0 }
 };
 
-String STR_WAITINGLINK
+const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] =
 {
-    Text [ en-US ] = "Waiting";
+    { NC_("RID_PAGESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL },
+    { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+    { NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+    { nullptr, 0 }
 };
 
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
new file mode 100644
index 000000000000..26a6d5e4f2d3
--- /dev/null
+++ b/sc/inc/strings.hrc
@@ -0,0 +1,331 @@
+/* -*- 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_SC_INC_STRINGS_HRC
+#define INCLUDED_SC_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// Strings for interface names -------------------------------------------
+
+#define SCSTR_LONG_SCDOC_NAME                       NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME %PRODUCTVERSION Spreadsheet")
+#define SCSTR_SHORT_SCDOC_NAME                      NC_("SCSTR_SHORT_SCDOC_NAME", "Spreadsheet")
+#define SCSTR_UNDEFINED                             NC_("SCSTR_UNDEFINED", "- undefined -")
+#define SCSTR_NONE                                  NC_("SCSTR_NONE", "- none -")
+#define SCSTR_ALL                                   NC_("SCSTR_ALL", "- all -")
+#define SCSTR_MULTIPLE                              NC_("SCSTR_MULTIPLE", "- multiple -")
+#define SCSTR_STDFILTER                             NC_("SCSTR_STDFILTER", "Standard Filter...")
+#define SCSTR_TOP10FILTER                           NC_("SCSTR_TOP10FILTER", "Top 10")
+#define SCSTR_FILTER_EMPTY                          NC_("SCSTR_FILTER_EMPTY", "Empty")
+#define SCSTR_FILTER_NOTEMPTY                       NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty")
+#define SCSTR_NONAME                                NC_("SCSTR_NONAME", "unnamed")
+// "%1 is replaced to column letter, such as 'Column A'"
+#define SCSTR_COLUMN                                NC_("SCSTR_COLUMN", "Column %1")
+// "%1 is replaced to row number, such as 'Row 1'"
+#define SCSTR_ROW                                   NC_("SCSTR_ROW", "Row %1")
+#define SCSTR_TABLE                                 NC_("SCSTR_TABLE", "Sheet")
+#define SCSTR_NAME                                  NC_("SCSTR_NAME", "Name")
+#define SCSTR_APDTABLE                              NC_("SCSTR_APDTABLE", "Append Sheet")
+#define SCSTR_RENAMETAB                             NC_("SCSTR_RENAMETAB", "Rename Sheet")
+#define SCSTR_SET_TAB_BG_COLOR                      NC_("SCSTR_SET_TAB_BG_COLOR", "Tab Color")
+#define SCSTR_NO_TAB_BG_COLOR                       NC_("SCSTR_NO_TAB_BG_COLOR", "Default")
+#define SCSTR_RENAMEOBJECT                          NC_("SCSTR_RENAMEOBJECT", "Name Object")
+#define STR_INSERTGRAPHIC                           NC_("STR_INSERTGRAPHIC", "Insert Image")
+// Attribute
+#define SCSTR_PROTECTDOC                            NC_("SCSTR_PROTECTDOC", "Protect Document")
+#define SCSTR_UNPROTECTDOC                          NC_("SCSTR_UNPROTECTDOC", "Unprotect document")
+#define SCSTR_UNPROTECTTAB                          NC_("SCSTR_UNPROTECTTAB", "Unprotect sheet")
+#define SCSTR_CHG_PROTECT                           NC_("SCSTR_CHG_PROTECT", "Protect Records")
+#define SCSTR_CHG_UNPROTECT                         NC_("SCSTR_CHG_UNPROTECT", "Unprotect Records")
+#define SCSTR_PASSWORD                              NC_("SCSTR_PASSWORD", "Password:")
+#define SCSTR_PASSWORDOPT                           NC_("SCSTR_PASSWORDOPT", "Password (optional):")
+#define SCSTR_WRONGPASSWORD                         NC_("SCSTR_WRONGPASSWORD", "Incorrect Password")
+#define SCSTR_END                                   NC_("SCSTR_END", "~End")
+#define SCSTR_UNKNOWN                               NC_("SCSTR_UNKNOWN", "Unknown")
+#define SCSTR_VALID_MINIMUM                         NC_("SCSTR_VALID_MINIMUM", "~Minimum")
+#define SCSTR_VALID_MAXIMUM                         NC_("SCSTR_VALID_MAXIMUM", "~Maximum")
+#define SCSTR_VALID_VALUE                           NC_("SCSTR_VALID_VALUE", "~Value")
+#define SCSTR_VALID_RANGE                           NC_("SCSTR_VALID_RANGE", "~Source")
+#define SCSTR_VALID_LIST                            NC_("SCSTR_VALID_LIST", "~Entries")
+// for dialogues:
+#define SCSTR_CHARSET_USER                          NC_("SCSTR_CHARSET_USER", "System")
+#define SCSTR_COLUMN_USER                           NC_("SCSTR_COLUMN_USER", "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide")
+#define SCSTR_FIELDSEP_TAB                          NC_("SCSTR_FIELDSEP_TAB", "Tab")
+#define SCSTR_FIELDSEP_SPACE                        NC_("SCSTR_FIELDSEP_SPACE", "space")
+#define SCSTR_FORMULA_AUTOCORRECTION                NC_("SCSTR_FORMULA_AUTOCORRECTION", "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n")
+#define SCSTR_UNDO_GRAFFILTER                       NC_("SCSTR_UNDO_GRAFFILTER", "Image Filter")
+#define STR_CAPTION_DEFAULT_TEXT                    NC_("STR_CAPTION_DEFAULT_TEXT", "Text")
+// Select tables dialog title
+#define STR_DLG_SELECTTABLES_TITLE                  NC_("STR_DLG_SELECTTABLES_TITLE", "Select Sheets")
+// Select tables dialog listbox
+#define STR_DLG_SELECTTABLES_LBNAME                 NC_("STR_DLG_SELECTTABLES_LBNAME", "~Selected sheets")
+#define STR_REPLCELLSWARN                           NC_("STR_REPLCELLSWARN", "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?")
+#define STR_ACC_CSVRULER_NAME                       NC_("STR_ACC_CSVRULER_NAME", "Ruler")
+#define STR_ACC_CSVRULER_DESCR                      NC_("STR_ACC_CSVRULER_DESCR", "This ruler manages objects at fixed positions.")
+#define STR_ACC_CSVGRID_NAME                        NC_("STR_ACC_CSVGRID_NAME", "Preview")
+#define STR_ACC_CSVGRID_DESCR                       NC_("STR_ACC_CSVGRID_DESCR", "This sheet shows how the data will be arranged in the document.")
+#define STR_ACC_DOC_NAME                            NC_("STR_ACC_DOC_NAME", "Document view")
+#define STR_ACC_TABLE_NAME                          NC_("STR_ACC_TABLE_NAME", "Sheet %1")
+#define STR_ACC_CELL_NAME                           NC_("STR_ACC_CELL_NAME", "Cell %1")
+#define STR_ACC_LEFTAREA_NAME                       NC_("STR_ACC_LEFTAREA_NAME", "Left area")
+#define STR_ACC_PREVIEWDOC_NAME                     NC_("STR_ACC_PREVIEWDOC_NAME", "Page preview")
+#define STR_ACC_CENTERAREA_NAME                     NC_("STR_ACC_CENTERAREA_NAME", "Center area")
+#define STR_ACC_RIGHTAREA_NAME                      NC_("STR_ACC_RIGHTAREA_NAME", "Right area")
+#define STR_ACC_HEADER_NAME                         NC_("STR_ACC_HEADER_NAME", "Header of page %1")
+#define STR_ACC_FOOTER_NAME                         NC_("STR_ACC_FOOTER_NAME", "Footer of page %1")
+#define STR_ACC_EDITLINE_NAME                       NC_("STR_ACC_EDITLINE_NAME", "Input line")
+#define STR_ACC_EDITLINE_DESCR                      NC_("STR_ACC_EDITLINE_DESCR", "This is where you enter or edit text, numbers and formulas.")
+#define SCSTR_MEDIASHELL                            NC_("SCSTR_MEDIASHELL", "Media Playback")
+#define RID_SCSTR_ONCLICK                           NC_("RID_SCSTR_ONCLICK", "Mouse button pressed")
+#define STR_ACC_TOOLBAR_FORMULA                     NC_("STR_ACC_TOOLBAR_FORMULA", "Formula Tool Bar")
+#define STR_ACC_DOC_SPREADSHEET                     NC_("STR_ACC_DOC_SPREADSHEET", "%PRODUCTNAME Spreadsheets")
+#define STR_ACC_DOC_SPREADSHEET_READONLY            NC_("STR_ACC_DOC_SPREADSHEET_READONLY", "(read-only)")
+#define STR_ACC_DOC_PREVIEW_SUFFIX                  NC_("STR_ACC_DOC_PREVIEW_SUFFIX", "(Preview mode)")
+#define SCSTR_PRINTOPT_PAGES                        NC_("SCSTR_PRINTOPT_PAGES", "Pages")
+#define SCSTR_PRINTOPT_SUPPRESSEMPTY                NC_("SCSTR_PRINTOPT_SUPPRESSEMPTY", "~Suppress output of empty pages")
+#define SCSTR_PRINTOPT_PRNTCONTENT                  NC_("SCSTR_PRINTOPT_PRNTCONTENT", "Print content")
+#define SCSTR_PRINTOPT_ALLSHEETS                    NC_("SCSTR_PRINTOPT_ALLSHEETS", "~All sheets")
+#define SCSTR_PRINTOPT_SELECTEDSHEETS               NC_("SCSTR_PRINTOPT_SELECTEDSHEETS", "~Selected sheets")
+#define SCSTR_PRINTOPT_SELECTEDCELLS                NC_("SCSTR_PRINTOPT_SELECTEDCELLS", "Selected cells")
+#define SCSTR_PRINTOPT_FROMWHICH                    NC_("SCSTR_PRINTOPT_FROMWHICH", "From which print")
+#define SCSTR_PRINTOPT_ALLPAGES                     NC_("SCSTR_PRINTOPT_ALLPAGES", "All ~pages")
+#define SCSTR_PRINTOPT_PAGES_                       NC_("SCSTR_PRINTOPT_PAGES_", "Pa~ges")
+#define SCSTR_PRINTOPT_PRODNAME                     NC_("SCSTR_PRINTOPT_PRODNAME", "%PRODUCTNAME %s")
+#define SCSTR_WARN_ME_IN_FUTURE_CHECK               NC_("SCSTR_WARN_ME_IN_FUTURE_CHECK", "Warn me about this in the future.")
+#define SCSTR_DDEDOC_NOT_LOADED                     NC_("SCSTR_DDEDOC_NOT_LOADED", "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." )
+#define SCSTR_EXTDOC_NOT_LOADED                     NC_("SCSTR_EXTDOC_NOT_LOADED", "The following external file could not be loaded. Data linked from this file did not get updated." )
+#define SCSTR_UPDATE_EXTDOCS                        NC_("SCSTR_UPDATE_EXTDOCS", "Updating external links.")
+#define SCSTR_FORMULA_SYNTAX_CALC_A1                NC_("SCSTR_FORMULA_SYNTAX_CALC_A1", "Calc A1")
+#define SCSTR_FORMULA_SYNTAX_XL_A1                  NC_("SCSTR_FORMULA_SYNTAX_XL_A1", "Excel A1")
+#define SCSTR_FORMULA_SYNTAX_XL_R1C1                NC_("SCSTR_FORMULA_SYNTAX_XL_R1C1", "Excel R1C1")
+#define SCSTR_COL_LABEL                             NC_("SCSTR_COL_LABEL", "Range contains column la~bels" )
+#define SCSTR_ROW_LABEL                             NC_("SCSTR_ROW_LABEL", "Range contains ~row labels" )
+#define SCSTR_VALERR                                NC_("SCSTR_VALERR", "Invalid value" )
+#define STR_NOFORMULASPECIFIED                      NC_("STR_NOFORMULASPECIFIED", "No formula specified." )
+#define STR_NOCOLROW                                NC_("STR_NOCOLROW", "Neither row or column specified." )
+#define STR_WRONGFORMULA                            NC_("STR_WRONGFORMULA", "Undefined name or range." )
+#define STR_WRONGROWCOL                             NC_("STR_WRONGROWCOL", "Undefined name or wrong cell reference." )
+#define STR_NOCOLFORMULA                            NC_("STR_NOCOLFORMULA", "Formulas don't form a column." )
+#define STR_NOROWFORMULA                            NC_("STR_NOROWFORMULA", "Formulas don't form a row." )
+#define STR_ADD_AUTOFORMAT_TITLE                    NC_("STR_ADD_AUTOFORMAT_TITLE", "Add AutoFormat" )
+#define STR_RENAME_AUTOFORMAT_TITLE                 NC_("STR_RENAME_AUTOFORMAT_TITLE", "Rename AutoFormat" )
+#define STR_ADD_AUTOFORMAT_LABEL                    NC_("STR_ADD_AUTOFORMAT_LABEL", "Name" )
+#define STR_DEL_AUTOFORMAT_TITLE                    NC_("STR_DEL_AUTOFORMAT_TITLE", "Delete AutoFormat" )
+#define STR_DEL_AUTOFORMAT_MSG                      NC_("STR_DEL_AUTOFORMAT_MSG", "Do you really want to delete the # AutoFormat?" )
+#define STR_BTN_AUTOFORMAT_CLOSE                    NC_("STR_BTN_AUTOFORMAT_CLOSE", "~Close" )
+#define STR_JAN                                     NC_("STR_JAN", "Jan" )
+#define STR_FEB                                     NC_("STR_FEB", "Feb" )
+#define STR_MAR                                     NC_("STR_MAR", "Mar" )
+#define STR_NORTH                                   NC_("STR_NORTH", "North" )
+#define STR_MID                                     NC_("STR_MID", "Mid" )
+#define STR_SOUTH                                   NC_("STR_SOUTH", "South" )
+#define STR_SUM                                     NC_("STR_SUM", "Total" )
+#define STR_SHEET                                   NC_("STR_SHEET", "Sheet" )
+#define STR_CELL                                    NC_("STR_CELL", "Cell" )
+#define STR_CONTENT                                 NC_("STR_CONTENT", "Content" )
+#define SCSTR_UNDO_PAGE_ANCHOR                      NC_("SCSTR_UNDO_PAGE_ANCHOR", "Page Anchor" )
+#define SCSTR_UNDO_CELL_ANCHOR                      NC_("SCSTR_UNDO_CELL_ANCHOR", "Cell Anchor" )
+#define SCSTR_CONDITION                             NC_("SCSTR_CONDITION", "Condition ")
+
+//  content description strings are also use        d in ScLinkTargetsObj
+#define SCSTR_CONTENT_ROOT                          NC_("SCSTR_CONTENT_ROOT", "Contents" )
+#define SCSTR_CONTENT_TABLE                         NC_("SCSTR_CONTENT_TABLE", "Sheets" )
+#define SCSTR_CONTENT_RANGENAME                     NC_("SCSTR_CONTENT_RANGENAME", "Range names" )
+#define SCSTR_CONTENT_DBAREA                        NC_("SCSTR_CONTENT_DBAREA", "Database ranges" )
+#define SCSTR_CONTENT_GRAPHIC                       NC_("SCSTR_CONTENT_GRAPHIC", "Images" )
+#define SCSTR_CONTENT_OLEOBJECT                     NC_("SCSTR_CONTENT_OLEOBJECT", "OLE objects" )
+#define SCSTR_CONTENT_NOTE                          NC_("SCSTR_CONTENT_NOTE", "Comments" )
+#define SCSTR_CONTENT_AREALINK                      NC_("SCSTR_CONTENT_AREALINK", "Linked areas" )
+#define SCSTR_CONTENT_DRAWING                       NC_("SCSTR_CONTENT_DRAWING", "Drawing objects")
+#define SCSTR_DRAGMODE                              NC_("SCSTR_DRAGMODE", "Drag Mode" )
+#define SCSTR_DISPLAY                               NC_("SCSTR_DISPLAY", "Display" )
+#define SCSTR_ACTIVE                                NC_("SCSTR_ACTIVE", "active" )
+#define SCSTR_NOTACTIVE                             NC_("SCSTR_NOTACTIVE", "inactive" )
+#define SCSTR_HIDDEN                                NC_("SCSTR_HIDDEN", "hidden" )
+#define SCSTR_ACTIVEWIN                             NC_("SCSTR_ACTIVEWIN", "Active Window" )
+#define SCSTR_QHLP_SCEN_LISTBOX                     NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name")
+#define SCSTR_QHLP_SCEN_COMMENT                     NC_("SCSTR_QHLP_SCEN_COMMENT", "Comment")
+
+#define STR_MENU_SORT_ASC                           NC_("STR_MENU_SORT_ASC", "Sort Ascending")
+#define STR_MENU_SORT_DESC                          NC_("STR_MENU_SORT_DESC", "Sort Descending")
+#define STR_MENU_SORT_CUSTOM                        NC_("STR_MENU_SORT_CUSTOM", "Custom Sort")
+#define STR_BTN_TOGGLE_ALL                          NC_("STR_BTN_TOGGLE_ALL", "All")
+#define STR_BTN_SELECT_CURRENT                      NC_("STR_BTN_SELECT_CURRENT", "Show only the current item.")
+#define STR_BTN_UNSELECT_CURRENT                    NC_("STR_BTN_UNSELECT_CURRENT", "Hide only the current item.")
+#define STR_EDIT_SEARCH_ITEMS                       NC_("STR_EDIT_SEARCH_ITEMS", "Search items...")
+
+#define SCSTR_QHELP_POSWND                          NC_("SCSTR_QHELP_POSWND", "Name Box")
+#define SCSTR_QHELP_INPUTWND                        NC_("SCSTR_QHELP_INPUTWND", "Input line")
+#define SCSTR_QHELP_BTNCALC                         NC_("SCSTR_QHELP_BTNCALC", "Function Wizard")
+#define SCSTR_QHELP_BTNOK                           NC_("SCSTR_QHELP_BTNOK", "Accept")
+#define SCSTR_QHELP_BTNCANCEL                       NC_("SCSTR_QHELP_BTNCANCEL", "Cancel")
+#define SCSTR_QHELP_BTNSUM                          NC_("SCSTR_QHELP_BTNSUM", "Sum")
+#define SCSTR_QHELP_BTNEQUAL                        NC_("SCSTR_QHELP_BTNEQUAL", "Function")
+#define SCSTR_QHELP_EXPAND_FORMULA                  NC_("SCSTR_QHELP_EXPAND_FORMULA", "Expand Formula Bar")
+#define SCSTR_QHELP_COLLAPSE_FORMULA                NC_("SCSTR_QHELP_COLLAPSE_FORMULA", "Collapse Formula Bar")
+
+#define STR_TITLE_CONFLICT                          NC_("STR_TITLE_CONFLICT", "Conflict")
+#define STR_TITLE_AUTHOR                            NC_("STR_TITLE_AUTHOR", "Author")
+#define STR_TITLE_DATE                              NC_("STR_TITLE_DATE", "Date")
+#define STR_UNKNOWN_USER_CONFLICT                   NC_("STR_UNKNOWN_USER_CONFLICT", "Unknown User")
+
+#define STR_CHG_INSERT_COLS                         NC_("STR_CHG_INSERT_COLS", "Column inserted")
+#define STR_CHG_INSERT_ROWS                         NC_("STR_CHG_INSERT_ROWS", "Row inserted ")
+#define STR_CHG_INSERT_TABS                         NC_("STR_CHG_INSERT_TABS", "Sheet inserted ")
+#define STR_CHG_DELETE_COLS                         NC_("STR_CHG_DELETE_COLS", "Column deleted")
+#define STR_CHG_DELETE_ROWS                         NC_("STR_CHG_DELETE_ROWS", "Row deleted")
+#define STR_CHG_DELETE_TABS                         NC_("STR_CHG_DELETE_TABS", "Sheet deleted")
+#define STR_CHG_MOVE                                NC_("STR_CHG_MOVE", "Range moved")
+#define STR_CHG_CONTENT                             NC_("STR_CHG_CONTENT", "Changed contents")
+#define STR_CHG_CONTENT_WITH_CHILD                  NC_("STR_CHG_CONTENT_WITH_CHILD", "Changed contents")
+#define STR_CHG_CHILD_CONTENT                       NC_("STR_CHG_CHILD_CONTENT", "Changed to ")
+#define STR_CHG_CHILD_ORGCONTENT                    NC_("STR_CHG_CHILD_ORGCONTENT", "Original")
+#define STR_CHG_REJECT                              NC_("STR_CHG_REJECT", "Changes rejected")
+#define STR_CHG_ACCEPTED                            NC_("STR_CHG_ACCEPTED", "Accepted")
+#define STR_CHG_REJECTED                            NC_("STR_CHG_REJECTED", "Rejected")
+#define STR_CHG_NO_ENTRY                            NC_("STR_CHG_NO_ENTRY", "No Entry")
+#define STR_CHG_EMPTY                               NC_("STR_CHG_EMPTY", "<empty>")
+
+#define STR_NOT_PROTECTED                           NC_("STR_NOT_PROTECTED", "Not protected")
+#define STR_NOT_PASS_PROTECTED                      NC_("STR_NOT_PASS_PROTECTED", "Not password-protected")
+#define STR_HASH_BAD                                NC_("STR_HASH_BAD", "Hash incompatible")
+#define STR_HASH_GOOD                               NC_("STR_HASH_GOOD", "Hash compatible")
+#define STR_RETYPE                                  NC_("STR_RETYPE", "Re-type")
+
+/* MovingAverageDialog */
+#define STR_MOVING_AVERAGE_UNDO_NAME                NC_("STR_MOVING_AVERAGE_UNDO_NAME", "Moving Average")
+/* ExponentialSmoothingDialog */
+#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME         NC_("STR_EXPONENTIAL_SMOOTHING_UNDO_NAME", "Exponential Smoothing")
+/* AnalysisOfVarianceDialog */
+#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME          NC_("STR_ANALYSIS_OF_VARIANCE_UNDO_NAME", "Analysis of Variance")
+#define STR_ANOVA_SINGLE_FACTOR_LABEL               NC_("STR_ANOVA_SINGLE_FACTOR_LABEL", "ANOVA - Single Factor")
+#define STR_ANOVA_TWO_FACTOR_LABEL                  NC_("STR_ANOVA_TWO_FACTOR_LABEL", "ANOVA - Two Factor")
+#define STR_ANOVA_LABEL_GROUPS                      NC_("STR_ANOVA_LABEL_GROUPS", "Groups")
+#define STR_ANOVA_LABEL_BETWEEN_GROUPS              NC_("STR_ANOVA_LABEL_BETWEEN_GROUPS", "Between Groups")
+#define STR_ANOVA_LABEL_WITHIN_GROUPS               NC_("STR_ANOVA_LABEL_WITHIN_GROUPS", "Within Groups")
+#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION         NC_("STR_ANOVA_LABEL_SOURCE_OF_VARIATION", "Source of Variation")
+#define STR_ANOVA_LABEL_SS                          NC_("STR_ANOVA_LABEL_SS", "SS")
+#define STR_ANOVA_LABEL_DF                          NC_("STR_ANOVA_LABEL_DF", "df")
+#define STR_ANOVA_LABEL_MS                          NC_("STR_ANOVA_LABEL_MS", "MS")
+#define STR_ANOVA_LABEL_F                           NC_("STR_ANOVA_LABEL_F", "F")
+#define STR_ANOVA_LABEL_P_VALUE                     NC_("STR_ANOVA_LABEL_P_VALUE", "P-value")
+#define STR_ANOVA_LABEL_F_CRITICAL                  NC_("STR_ANOVA_LABEL_F_CRITICAL", "F critical")
+#define STR_ANOVA_LABEL_TOTAL                       NC_("STR_ANOVA_LABEL_TOTAL", "Total")
+/* CorrelationDialog */
+#define STR_CORRELATION_UNDO_NAME                   NC_("STR_CORRELATION_UNDO_NAME", "Correlation")
+#define STR_CORRELATION_LABEL                       NC_("STR_CORRELATION_LABEL", "Correlations")
+/* CovarianceDialog */
+#define STR_COVARIANCE_UNDO_NAME                    NC_("STR_COVARIANCE_UNDO_NAME", "Covariance")
+#define STR_COVARIANCE_LABEL                        NC_("STR_COVARIANCE_LABEL", "Covariances")
+/* DescriptiveStatisticsDialog */
+#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME        NC_("STR_DESCRIPTIVE_STATISTICS_UNDO_NAME", "Descriptive Statistics")
+#define STRID_CALC_MEAN                             NC_("STRID_CALC_MEAN", "Mean")
+#define STRID_CALC_STD_ERROR                        NC_("STRID_CALC_STD_ERROR", "Standard Error")
+#define STRID_CALC_MODE                             NC_("STRID_CALC_MODE", "Mode")
+#define STRID_CALC_MEDIAN                           NC_("STRID_CALC_MEDIAN", "Median")
+#define STRID_CALC_VARIANCE                         NC_("STRID_CALC_VARIANCE", "Variance")
+#define STRID_CALC_STD_DEVIATION                    NC_("STRID_CALC_STD_DEVIATION", "Standard Deviation")
+#define STRID_CALC_KURTOSIS                         NC_("STRID_CALC_KURTOSIS", "Kurtosis")
+#define STRID_CALC_SKEWNESS                         NC_("STRID_CALC_SKEWNESS", "Skewness")
+#define STRID_CALC_RANGE                            NC_("STRID_CALC_RANGE", "Range")
+#define STRID_CALC_MIN                              NC_("STRID_CALC_MIN", "Minimum")
+#define STRID_CALC_MAX                              NC_("STRID_CALC_MAX", "Maximum")
+#define STRID_CALC_SUM                              NC_("STRID_CALC_SUM", "Sum")
+#define STRID_CALC_COUNT                            NC_("STRID_CALC_COUNT", "Count")
+#define STRID_CALC_FIRST_QUARTILE                   NC_("STRID_CALC_FIRST_QUARTILE", "First Quartile ")
+#define STRID_CALC_THIRD_QUARTILE                   NC_("STRID_CALC_THIRD_QUARTILE", "Third Quartile")
+/* RandomNumberGeneratorDialog */
+#define STR_UNDO_DISTRIBUTION_TEMPLATE              NC_("STR_UNDO_DISTRIBUTION_TEMPLATE", "Random ($(DISTRIBUTION))")
+#define STR_DISTRIBUTION_UNIFORM_REAL               NC_("STR_DISTRIBUTION_UNIFORM_REAL", "Uniform")
+#define STR_DISTRIBUTION_UNIFORM_INTEGER            NC_("STR_DISTRIBUTION_UNIFORM_INTEGER", "Uniform Integer")
+#define STR_DISTRIBUTION_NORMAL                     NC_("STR_DISTRIBUTION_NORMAL", "Normal")
+#define STR_DISTRIBUTION_CAUCHY                     NC_("STR_DISTRIBUTION_CAUCHY", "Cauchy")
+#define STR_DISTRIBUTION_BERNOULLI                  NC_("STR_DISTRIBUTION_BERNOULLI", "Bernoulli")
+#define STR_DISTRIBUTION_BINOMIAL                   NC_("STR_DISTRIBUTION_BINOMIAL", "Binomial")
+#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL          NC_("STR_DISTRIBUTION_NEGATIVE_BINOMIAL", "Negative Binomial")
+#define STR_DISTRIBUTION_CHI_SQUARED                NC_("STR_DISTRIBUTION_CHI_SQUARED", "Chi Squared")
+#define STR_DISTRIBUTION_GEOMETRIC                  NC_("STR_DISTRIBUTION_GEOMETRIC", "Geometric")
+#define STR_RNG_PARAMETER_MINIMUM                   NC_("STR_RNG_PARAMETER_MINIMUM", "Minimum")
+#define STR_RNG_PARAMETER_MAXIMUM                   NC_("STR_RNG_PARAMETER_MAXIMUM", "Maximum")
+#define STR_RNG_PARAMETER_MEAN                      NC_("STR_RNG_PARAMETER_MEAN", "Mean")
+#define STR_RNG_PARAMETER_STANDARD_DEVIATION        NC_("STR_RNG_PARAMETER_STANDARD_DEVIATION", "Standard Deviation")
+#define STR_RNG_PARAMETER_STANDARD_MEDIAN           NC_("STR_RNG_PARAMETER_STANDARD_MEDIAN", "Median")
+#define STR_RNG_PARAMETER_STANDARD_SIGMA            NC_("STR_RNG_PARAMETER_STANDARD_SIGMA", "Sigma")
+#define STR_RNG_PARAMETER_STANDARD_PROBABILITY      NC_("STR_RNG_PARAMETER_STANDARD_PROBABILITY", "p Value")
+#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS NC_("STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS", "Number of Trials")
+#define STR_RNG_PARAMETER_STANDARD_NU_VALUE         NC_("STR_RNG_PARAMETER_STANDARD_NU_VALUE", "nu Value")
+/* SamplingDialog */
+#define STR_SAMPLING_UNDO_NAME                      NC_("STR_SAMPLING_UNDO_NAME", "Sampling")
+/* Names of dialogs */
+#define STR_FTEST                                   NC_("STR_FTEST", "F-test")
+#define STR_FTEST_UNDO_NAME                         NC_("STR_FTEST_UNDO_NAME", "F-test")
+#define STR_TTEST                                   NC_("STR_TTEST", "t-test")
+#define STR_TTEST_UNDO_NAME                         NC_("STR_TTEST_UNDO_NAME", "t-test")
+#define STR_ZTEST                                   NC_("STR_ZTEST", "z-test")
+#define STR_ZTEST_UNDO_NAME                         NC_("STR_ZTEST_UNDO_NAME", "z-test")
+#define STR_CHI_SQUARE_TEST                         NC_("STR_CHI_SQUARE_TEST", "Test of Independence (Chi-Square)")
+#define STR_REGRESSION_UNDO_NAME                    NC_("STR_REGRESSION_UNDO_NAME", "Regression")
+#define STR_REGRESSION                              NC_("STR_REGRESSION", "Regression")
+/* Common */
+#define STR_COLUMN_LABEL_TEMPLATE                   NC_("STR_COLUMN_LABEL_TEMPLATE", "Column %NUMBER%")
+#define STR_ROW_LABEL_TEMPLATE                      NC_("STR_ROW_LABEL_TEMPLATE", "Row %NUMBER%")
+#define STR_LABEL_ALPHA                             NC_("STR_LABEL_ALPHA", "Alpha")
+#define STR_VARIABLE_1_LABEL                        NC_("STR_VARIABLE_1_LABEL", "Variable 1")
+#define STR_VARIABLE_2_LABEL                        NC_("STR_VARIABLE_2_LABEL", "Variable 2")
+#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL      NC_("STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL", "Hypothesized Mean Difference")
+#define STR_OBSERVATIONS_LABEL                      NC_("STR_OBSERVATIONS_LABEL", "Observations")
+#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL          NC_("STR_OBSERVED_MEAN_DIFFERENCE_LABEL", "Observed Mean Difference")
+#define STR_DEGREES_OF_FREEDOM_LABEL                NC_("STR_DEGREES_OF_FREEDOM_LABEL", "df")
+#define STR_P_VALUE_LABEL                           NC_("STR_P_VALUE_LABEL", "P-value")
+#define STR_CRITICAL_VALUE_LABEL                    NC_("STR_CRITICAL_VALUE_LABEL", "Critical Value")
+#define STR_TEST_STATISTIC_LABEL                    NC_("STR_TEST_STATISTIC_LABEL", "Test Statistic")
+/* RegressionDialog */
+#define STR_LABEL_LINEAR                            NC_("STR_LABEL_LINEAR", "Linear")
+#define STR_LABEL_LOGARITHMIC                       NC_("STR_LABEL_LOGARITHMIC", "Logarithmic")
+#define STR_LABEL_POWER                             NC_("STR_LABEL_POWER", "Power")
+#define STR_LABEL_REGRESSION_MODEL                  NC_("STR_LABEL_REGRESSION_MODEL", "Regression Model")
+#define STR_LABEL_RSQUARED                          NC_("STR_LABEL_RSQUARED", "R^2")
+#define STR_LABEL_SLOPE                             NC_("STR_LABEL_SLOPE", "Slope")
+#define STR_LABEL_INTERCEPT                         NC_("STR_LABEL_INTERCEPT", "Intercept")
+/*F Test */
+#define STR_FTEST_P_RIGHT_TAIL                      NC_("STR_FTEST_P_RIGHT_TAIL", "P (F<=f) right-tail")
+#define STR_FTEST_F_CRITICAL_RIGHT_TAIL             NC_("STR_FTEST_F_CRITICAL_RIGHT_TAIL", "F Critical right-tail")
+#define STR_FTEST_P_LEFT_TAIL                       NC_("STR_FTEST_P_LEFT_TAIL", "P (F<=f) left-tail")
+#define STR_FTEST_F_CRITICAL_LEFT_TAIL              NC_("STR_FTEST_F_CRITICAL_LEFT_TAIL", "F Critical left-tail")
+#define STR_FTEST_P_TWO_TAIL                        NC_("STR_FTEST_P_TWO_TAIL", "P two-tail")
+#define STR_FTEST_F_CRITICAL_TWO_TAIL               NC_("STR_FTEST_F_CRITICAL_TWO_TAIL", "F Critical two-tail")
+/*t Test*/
+#define STR_TTEST_PEARSON_CORRELATION               NC_("STR_TTEST_PEARSON_CORRELATION", "Pearson Correlation")
+#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES       NC_("STR_TTEST_VARIANCE_OF_THE_DIFFERENCES", "Variance of the Differences")
+#define STR_TTEST_T_STAT                            NC_("STR_TTEST_T_STAT", "t Stat")
+#define STR_TTEST_P_ONE_TAIL                        NC_("STR_TTEST_P_ONE_TAIL", "P (T<=t) one-tail")
+#define STR_TTEST_T_CRITICAL_ONE_TAIL               NC_("STR_TTEST_T_CRITICAL_ONE_TAIL", "t Critical one-tail")
+#define STR_TTEST_P_TWO_TAIL                        NC_("STR_TTEST_P_TWO_TAIL", "P (T<=t) two-tail")
+#define STR_TTEST_T_CRITICAL_TWO_TAIL               NC_("STR_TTEST_T_CRITICAL_TWO_TAIL", "t Critical two-tail")
+/*Z Test*/
+#define STR_ZTEST_Z_VALUE                           NC_("STR_ZTEST_Z_VALUE", "z")
+#define STR_ZTEST_KNOWN_VARIANCE                    NC_("STR_ZTEST_KNOWN_VARIANCE", "Known Variance")
+#define STR_ZTEST_P_ONE_TAIL                        NC_("STR_ZTEST_P_ONE_TAIL", "P (Z<=z) one-tail")
+#define STR_ZTEST_Z_CRITICAL_ONE_TAIL               NC_("STR_ZTEST_Z_CRITICAL_ONE_TAIL", "z Critical one-tail")
+#define STR_ZTEST_P_TWO_TAIL                        NC_("STR_ZTEST_P_TWO_TAIL", "P (Z<=z) two-tail")
+#define STR_ZTEST_Z_CRITICAL_TWO_TAIL               NC_("STR_ZTEST_Z_CRITICAL_TWO_TAIL", "z Critical two-tail")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index f0a6408b7efc..57cf51bcdeff 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -22,7 +22,7 @@
 
 #include <svl/itemprop.hxx>
 #include <svl/lstner.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleLoader2.hpp>
diff --git a/include/rsc/rscsfx.hxx b/sc/inc/units.hrc
index dad816a48740..acec84dc7865 100644
--- a/include/rsc/rscsfx.hxx
+++ b/sc/inc/units.hrc
@@ -16,22 +16,23 @@
  *   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_RSC_RSCSFX_HXX
-#define INCLUDED_RSC_RSCSFX_HXX
 
-//========== S F X =======================================
-// This is used as a flags enum in sw/, but only there,
-// so I don't pull in o3tl::typed_flags here
-enum class SfxStyleFamily {
-    None    = 0x00,
-    Char    = 0x01,
-    Para    = 0x02,
-    Frame   = 0x04,
-    Page    = 0x08,
-    Pseudo  = 0x10,
-    Table   = 0x20,
-    Cell    = 0x40,
-    All     = 0x7fff
+#ifndef INCLUDED_SC_INC_UNITS_HRC
+#define INCLUDED_SC_INC_UNITS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, FieldUnit> SCSTR_UNIT[] =
+{
+    { NC_("SCSTR_UNIT", "Millimeter") , FUNIT_MM },
+    { NC_("SCSTR_UNIT", "Centimeter") , FUNIT_CM },
+    { NC_("SCSTR_UNIT", "Meter") , FUNIT_M },
+    { NC_("SCSTR_UNIT", "Kilometer") , FUNIT_KM },
+    { NC_("SCSTR_UNIT", "Inch") , FUNIT_INCH },
+    { NC_("SCSTR_UNIT", "Foot") , FUNIT_FOOT },
+    { NC_("SCSTR_UNIT", "Miles") , FUNIT_MILE },
+    { NC_("SCSTR_UNIT", "Pica") , FUNIT_PICA },
+    { NC_("SCSTR_UNIT", "Point") , FUNIT_POINT }
 };
 
 #endif
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index e78065c11258..0b80e89f2207 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -300,8 +300,8 @@ void Test::testPivotTable()
     // This time clear the cache to refresh the data from the source range.
     CPPUNIT_ASSERT_MESSAGE("This datapilot should be based on sheet data.", pDPObj2->IsSheetData());
     std::set<ScDPObject*> aRefs;
-    sal_uLong nErrId = pDPs->ReloadCache(pDPObj2, aRefs);
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Cache reload failed.", sal_uLong(0), nErrId);
+    const char* pErrId = pDPs->ReloadCache(pDPObj2, aRefs);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Cache reload failed.", static_cast<const char*>(nullptr), pErrId);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Reloading a cache shouldn't remove any cache.",
                            static_cast<size_t>(1), pDPs->GetSheetCaches().size());
 
@@ -1541,8 +1541,8 @@ void Test::testPivotTableEmptyRows()
     m_pDoc->SetString(1, 2, 0, "B");
 
     std::set<ScDPObject*> aRefs;
-    sal_uLong nErr = pDPs->ReloadCache(pDPObj, aRefs);
-    CPPUNIT_ASSERT_MESSAGE("Failed to reload cache.", !nErr);
+    const char* pErr = pDPs->ReloadCache(pDPObj, aRefs);
+    CPPUNIT_ASSERT_MESSAGE("Failed to reload cache.", !pErr);
     CPPUNIT_ASSERT_MESSAGE("There should only be one pivot table linked to this cache.",
                            aRefs.size() == 1 && *aRefs.begin() == pDPObj);
 
diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc
index f0dae70102f2..1dc2fc803cd0 100644
--- a/sc/sdi/scslots.hrc
+++ b/sc/sdi/scslots.hrc
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
 #include <editeng/editids.hrc>
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 729ad9486e7f..89bc7a80460c 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -700,7 +700,7 @@ static bool lcl_HFPresentation
                 nTmp = rLRItem.GetRight();
                 nRightMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp);
 
-                aText = EditResId::GetString(RID_SVXITEMS_LRSPACE_LEFT);
+                aText = EditResId(RID_SVXITEMS_LRSPACE_LEFT);
                 if ( 100 != nPropLeftMargin )
                 {
                     aText = aText + unicode::formatPercent(nPropLeftMargin,
@@ -710,12 +710,12 @@ static bool lcl_HFPresentation
                 {
                     aText += GetMetricText( (long)nLeftMargin,
                                            eCoreMetric, ePresentationMetric, pIntl );
-                    aText += " " + EditResId::GetString(GetMetricId(ePresentationMetric));
+                    aText += " " + EditResId(GetMetricId(ePresentationMetric));
                 }
                 aText += cpDelim;
 
                 // We don't have a nPropFirstLineOfst
-                aText += EditResId::GetString(RID_SVXITEMS_LRSPACE_RIGHT);
+                aText += EditResId(RID_SVXITEMS_LRSPACE_RIGHT);
                 if ( 100 != nPropRightMargin )
                 {
                     aText = aText + unicode::formatPercent(nPropLeftMargin,
@@ -725,7 +725,7 @@ static bool lcl_HFPresentation
                 {
                     aText += GetMetricText( (long)nRightMargin,
                                             eCoreMetric, ePresentationMetric, pIntl );
-                    aText += " " + EditResId::GetString(GetMetricId(ePresentationMetric));
+                    aText += " " + EditResId(GetMetricId(ePresentationMetric));
                 }
             }
             break;
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 1dec3d68cd75..24fcdc64084e 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -75,7 +75,8 @@
 #include "printopt.hxx"
 #include "externalrefmgr.hxx"
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
+#include "sc.hrc"
 #include "charthelper.hxx"
 #include "macromgr.hxx"
 #include "dpobject.hxx"
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index fa785fdf4925..539ee2c7b16c 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -809,7 +809,7 @@ OUString ScDPDimensionSaveData::CreateGroupDimName(
 
 namespace
 {
-    static const sal_uInt16 nDatePartIds[] =
+    static const char* aDatePartIds[] =
     {
         STR_DPFIELD_GROUP_BY_SECONDS,
         STR_DPFIELD_GROUP_BY_MINUTES,
@@ -829,13 +829,13 @@ OUString ScDPDimensionSaveData::CreateDateGroupDimName(
     OUString aPartName;
     switch( nDatePart )
     {
-        case SECONDS:  aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break;
-        case MINUTES:  aPartName = ScGlobal::GetRscString( nDatePartIds[1] ); break;
-        case HOURS:    aPartName = ScGlobal::GetRscString( nDatePartIds[2] ); break;
-        case DAYS:     aPartName = ScGlobal::GetRscString( nDatePartIds[3] ); break;
-        case MONTHS:   aPartName = ScGlobal::GetRscString( nDatePartIds[4] ); break;
-        case QUARTERS: aPartName = ScGlobal::GetRscString( nDatePartIds[5] ); break;
-        case YEARS:    aPartName = ScGlobal::GetRscString( nDatePartIds[6] ); break;
+        case SECONDS:  aPartName = ScGlobal::GetRscString(aDatePartIds[0]); break;
+        case MINUTES:  aPartName = ScGlobal::GetRscString(aDatePartIds[1]); break;
+        case HOURS:    aPartName = ScGlobal::GetRscString(aDatePartIds[2]); break;
+        case DAYS:     aPartName = ScGlobal::GetRscString(aDatePartIds[3]); break;
+        case MONTHS:   aPartName = ScGlobal::GetRscString(aDatePartIds[4]); break;
+        case QUARTERS: aPartName = ScGlobal::GetRscString(aDatePartIds[5]); break;
+        case YEARS:    aPartName = ScGlobal::GetRscString(aDatePartIds[6]); break;
     }
     OSL_ENSURE(!aPartName.isEmpty(), "ScDPDimensionSaveData::CreateDateGroupDimName - invalid date part");
     return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 3e07c82eddf1..5a646bb17947 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -3401,7 +3401,7 @@ public:
 
 }
 
-sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs)
+const char* ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs)
 {
     if (!pDPObj)
         return STR_ERR_DATAPILOTSOURCE;
@@ -3413,9 +3413,9 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>&
         if (!pDesc)
             return STR_ERR_DATAPILOTSOURCE;
 
-        sal_uLong nErrId = pDesc->CheckSourceRange();
-        if (nErrId)
-            return nErrId;
+        const char* pErrId = pDesc->CheckSourceRange();
+        if (pErrId)
+            return pErrId;
 
         if (pDesc->HasRangeName())
         {
@@ -3462,7 +3462,7 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>&
             GetAllTables(pDesc->GetCommandType(), pDesc->aDBName, pDesc->aObject, rRefs);
         }
     }
-    return 0;
+    return nullptr;
 }
 
 bool ScDPCollection::ReloadGroupsInCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs)
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 366538a354a4..d5b465c8a502 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -40,7 +40,7 @@
 #include "stlsheet.hxx"
 #include "scresid.hxx"
 #include "unonames.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "stringutil.hxx"
 #include "dputil.hxx"
 
@@ -279,9 +279,9 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL
 
 }
 
-void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
-                    SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    sal_uInt16 nStrId )
+void lcl_SetStyleById(ScDocument* pDoc, SCTAB nTab,
+                      SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                      const char* pStrId)
 {
     if ( nCol1 > nCol2 || nRow1 > nRow2 )
     {
@@ -289,7 +289,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
         return;
     }
 
-    OUString aStyleName = ScGlobal::GetRscString( nStrId );
+    OUString aStyleName = ScGlobal::GetRscString(pStrId);
     ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
     ScStyleSheet* pStyle = static_cast<ScStyleSheet*>( pStlPool->Find( aStyleName, SfxStyleFamily::Para ) );
     if (!pStyle)
@@ -300,9 +300,9 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
                                                     SFXSTYLEBIT_USERDEF ) );
         pStyle->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
         SfxItemSet& rSet = pStyle->GetItemSet();
-        if ( nStrId==STR_PIVOT_STYLE_RESULT || nStrId==STR_PIVOT_STYLE_TITLE )
+        if (strcmp(pStrId, STR_PIVOT_STYLE_RESULT) == 0 || strcmp(pStrId, STR_PIVOT_STYLE_TITLE) == 0)
             rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
-        if ( nStrId==STR_PIVOT_STYLE_CATEGORY || nStrId==STR_PIVOT_STYLE_TITLE )
+        if (strcmp(pStrId, STR_PIVOT_STYLE_CATEGORY) == 0 || strcmp(pStrId, STR_PIVOT_STYLE_TITLE) == 0)
             rSet.Put( SvxHorJustifyItem( SvxCellHorJustify::Left, ATTR_HOR_JUSTIFY ) );
     }
 
@@ -1497,21 +1497,21 @@ namespace {
 
 OUString lcl_GetDataFieldName( const OUString& rSourceName, sal_Int16 eFunc )
 {
-    sal_uInt16 nStrId = 0;
+    const char* pStrId = nullptr;
     switch ( eFunc )
     {
-        case sheet::GeneralFunction2::SUM:        nStrId = STR_FUN_TEXT_SUM;      break;
+        case sheet::GeneralFunction2::SUM:        pStrId = STR_FUN_TEXT_SUM;      break;
         case sheet::GeneralFunction2::COUNT:
-        case sheet::GeneralFunction2::COUNTNUMS:  nStrId = STR_FUN_TEXT_COUNT;    break;
-        case sheet::GeneralFunction2::AVERAGE:    nStrId = STR_FUN_TEXT_AVG;      break;
-        case sheet::GeneralFunction2::MEDIAN:     nStrId = STR_FUN_TEXT_MEDIAN;   break;
-        case sheet::GeneralFunction2::MAX:        nStrId = STR_FUN_TEXT_MAX;      break;
-        case sheet::GeneralFunction2::MIN:        nStrId = STR_FUN_TEXT_MIN;      break;
-        case sheet::GeneralFunction2::PRODUCT:    nStrId = STR_FUN_TEXT_PRODUCT;  break;
+        case sheet::GeneralFunction2::COUNTNUMS:  pStrId = STR_FUN_TEXT_COUNT;    break;
+        case sheet::GeneralFunction2::AVERAGE:    pStrId = STR_FUN_TEXT_AVG;      break;
+        case sheet::GeneralFunction2::MEDIAN:     pStrId = STR_FUN_TEXT_MEDIAN;   break;
+        case sheet::GeneralFunction2::MAX:        pStrId = STR_FUN_TEXT_MAX;      break;
+        case sheet::GeneralFunction2::MIN:        pStrId = STR_FUN_TEXT_MIN;      break;
+        case sheet::GeneralFunction2::PRODUCT:    pStrId = STR_FUN_TEXT_PRODUCT;  break;
         case sheet::GeneralFunction2::STDEV:
-        case sheet::GeneralFunction2::STDEVP:     nStrId = STR_FUN_TEXT_STDDEV;   break;
+        case sheet::GeneralFunction2::STDEVP:     pStrId = STR_FUN_TEXT_STDDEV;   break;
         case sheet::GeneralFunction2::VAR:
-        case sheet::GeneralFunction2::VARP:       nStrId = STR_FUN_TEXT_VAR;      break;
+        case sheet::GeneralFunction2::VARP:       pStrId = STR_FUN_TEXT_VAR;      break;
         case sheet::GeneralFunction2::NONE:
         case sheet::GeneralFunction2::AUTO:                                       break;
         default:
@@ -1519,10 +1519,10 @@ OUString lcl_GetDataFieldName( const OUString& rSourceName, sal_Int16 eFunc )
             assert(false);
         }
     }
-    if ( !nStrId )
+    if (!pStrId)
         return OUString();
 
-    OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) );
+    OUStringBuffer aRet(ScGlobal::GetRscString(pStrId));
     aRet.append(" - ");
     aRet.append(rSourceName);
     return aRet.makeStringAndClear();
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index a42443da47a1..74088de9832d 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -283,8 +283,8 @@ const ScDPCache* ScSheetSourceDesc::CreateCache(const ScDPDimensionSaveData* pDi
     if (!mpDoc)
         return nullptr;
 
-    sal_uLong nErrId = CheckSourceRange();
-    if (nErrId)
+    const char* pErrId = CheckSourceRange();
+    if (pErrId)
     {
         OSL_FAIL( "Error Create Cache" );
         return nullptr;
@@ -303,7 +303,7 @@ const ScDPCache* ScSheetSourceDesc::CreateCache(const ScDPDimensionSaveData* pDi
     return rCaches.getCache(GetSourceRange(), pDimData);
 }
 
-sal_uLong ScSheetSourceDesc::CheckSourceRange() const
+const char* ScSheetSourceDesc::CheckSourceRange() const
 {
     if (!mpDoc)
         return STR_ERR_DATAPILOTSOURCE;
@@ -316,7 +316,7 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const
     if (rSrcRange.aStart.Col() > rSrcRange.aEnd.Col() || rSrcRange.aStart.Row() > rSrcRange.aEnd.Row())
         return STR_ERR_DATAPILOTSOURCE;
 
-    return 0;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index f0bb00f03039..89996fa66984 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -56,9 +56,9 @@ using ::com::sun::star::uno::Sequence;
 
 namespace {
 
-sal_uInt16 nFuncStrIds[] =     // matching enum ScSubTotalFunc
+const char* aFuncStrIds[] =     // matching enum ScSubTotalFunc
 {
-    0,                              // SUBTOTAL_FUNC_NONE
+    nullptr,                        // SUBTOTAL_FUNC_NONE
     STR_FUN_TEXT_AVG,               // SUBTOTAL_FUNC_AVE
     STR_FUN_TEXT_COUNT,             // SUBTOTAL_FUNC_CNT
     STR_FUN_TEXT_COUNT,             // SUBTOTAL_FUNC_CNT2
@@ -71,7 +71,7 @@ sal_uInt16 nFuncStrIds[] =     // matching enum ScSubTotalFunc
     STR_FUN_TEXT_VAR,               // SUBTOTAL_FUNC_VAR
     STR_FUN_TEXT_VAR,               // SUBTOTAL_FUNC_VARP
     STR_FUN_TEXT_MEDIAN,            // SUBTOTAL_FUNC_MED
-    0                               // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table
+    nullptr                         // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table
 };
 
 bool lcl_SearchMember( const std::vector <ScDPResultMember *>& list, SCROW nOrder, SCROW& rIndex)
@@ -837,9 +837,9 @@ OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotal
     {
         //  for user-specified subtotal function with all measures,
         //  display only function name
-        assert(eForceFunc < SAL_N_ELEMENTS(nFuncStrIds));
+        assert(eForceFunc < SAL_N_ELEMENTS(aFuncStrIds));
         if ( eForceFunc != SUBTOTAL_FUNC_NONE )
-            return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]);
+            return ScGlobal::GetRscString(aFuncStrIds[eForceFunc]);
 
         rbTotalResult = true;
         return ScGlobal::GetRscString(STR_TABLE_ERGEBNIS);
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 30272169f1cc..00b8b26d335c 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -368,8 +368,8 @@ sal_Int32 ScDPUtil::getDatePartValue(
 
 namespace {
 
-sal_uInt16 nFuncStrIds[] = {
-    0,                              // SUBTOTAL_FUNC_NONE
+const char* aFuncStrIds[] = {
+    nullptr,                        // SUBTOTAL_FUNC_NONE
     STR_FUN_TEXT_AVG,               // SUBTOTAL_FUNC_AVE
     STR_FUN_TEXT_COUNT,             // SUBTOTAL_FUNC_CNT
     STR_FUN_TEXT_COUNT,             // SUBTOTAL_FUNC_CNT2
@@ -382,7 +382,7 @@ sal_uInt16 nFuncStrIds[] = {
     STR_FUN_TEXT_VAR,               // SUBTOTAL_FUNC_VAR
     STR_FUN_TEXT_VAR,               // SUBTOTAL_FUNC_VARP
     STR_FUN_TEXT_MEDIAN,            // SUBTOTAL_FUNC_MED
-    0                               // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table
+    nullptr                         // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table
 };
 
 }
@@ -390,11 +390,11 @@ sal_uInt16 nFuncStrIds[] = {
 OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc eFunc)
 {
     OUStringBuffer aRet;
-    assert(eFunc < SAL_N_ELEMENTS(nFuncStrIds));
-    sal_uInt16 nId = nFuncStrIds[eFunc];
-    if (nId)
+    assert(eFunc < SAL_N_ELEMENTS(aFuncStrIds));
+    const char* pId = aFuncStrIds[eFunc];
+    if (pId)
     {
-        aRet.append(ScGlobal::GetRscString(nId));        // function name
+        aRet.append(ScGlobal::GetRscString(pId));        // function name
         aRet.append(" - ");
     }
     aRet.append(rName);                   // field name
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 34898e116c9e..68071edbafba 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -23,15 +23,16 @@
 #include "appoptio.hxx"
 #include "callform.hxx"
 #include "compiler.hxx"
+#include "compiler.hrc"
 #include "global.hxx"
 #include "sc.hrc"
+#include "scfuncs.hrc"
 #include "scmod.hxx"
 #include "scresid.hxx"
+#include "helpids.h"
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/rcid.h>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <formula/funcvarargs.h>
@@ -46,6 +47,14 @@ struct ScFuncDescCore
      */
     sal_uInt16 nOpCode;
     /*
+     * Pointer to list of strings
+     */
+    const char** pResource;
+    /*
+     * Count of list of strings
+     */
+    size_t nResourceLen;
+    /*
      * 16-bit value:
      *
      * Bit 1: boolean flag whether function is suppressed. Usually 0. This
@@ -84,7 +93,7 @@ struct ScFuncDescCore
 class ScFuncRes
 {
 public:
-    ScFuncRes(ResId&, const ScFuncDescCore &rEntry, ScFuncDesc*, bool & rbSuppressed);
+    ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc*, bool& rbSuppressed);
 };
 
 // class ScFuncDesc:
@@ -402,6 +411,8 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b)
     return (ScGlobal::GetCaseCollator()->compareString(*a->pFuncName, *b->pFuncName ) < 0);
 }
 
+#define ENTRY(CODE) CODE, SAL_N_ELEMENTS(CODE)
+
 // class ScFunctionList:
 ScFunctionList::ScFunctionList()
     : nMaxFuncNameLen(0)
@@ -411,395 +422,395 @@ ScFunctionList::ScFunctionList()
     // which will concept check that the list is sorted on first use to ensure this holds
     ScFuncDescCore aDescs[] =
     {
-        { SC_OPCODE_IF, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WENN, 3, { 0, 1, 1 } },
-        { SC_OPCODE_IF_ERROR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFERROR, 2, { 0, 0 } },
-        { SC_OPCODE_IF_NA, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFNA, 2, { 0, 0 } },
-        { SC_OPCODE_CHOOSE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WAHL, VAR_ARGS+1, { 0, 0 } },
-        { SC_OPCODE_AND, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_UND, VAR_ARGS, { 0 } },
-        { SC_OPCODE_OR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_ODER, VAR_ARGS, { 0 } },
-        { SC_OPCODE_NOT, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_NICHT, 1, { 0 } },
-        { SC_OPCODE_PI, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PI, 0, { } },
-        { SC_OPCODE_RANDOM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ZUFALLSZAHL, 0, { } },
-        { SC_OPCODE_TRUE, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WAHR, 0, { } },
-        { SC_OPCODE_FALSE, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_FALSCH, 0, { } },
-        { SC_OPCODE_GET_ACT_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_HEUTE, 0, { } },
-        { SC_OPCODE_GET_ACT_TIME, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JETZT, 0, { } },
-        { SC_OPCODE_NO_VALUE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_NV, 0, { } },
-        { SC_OPCODE_CURRENT, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_AKTUELL, 0, { } },
-        { SC_OPCODE_DEG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_DEG, 1, { 0 } },
-        { SC_OPCODE_RAD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAD, 1, { 0 } },
-        { SC_OPCODE_SIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SIN, 1, { 0 } },
-        { SC_OPCODE_COS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COS, 1, { 0 } },
-        { SC_OPCODE_TAN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TAN, 1, { 0 } },
-        { SC_OPCODE_COT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COT, 1, { 0 } },
-        { SC_OPCODE_ARC_SIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCSIN, 1, { 0 } },
-        { SC_OPCODE_ARC_COS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOS, 1, { 0 } },
-        { SC_OPCODE_ARC_TAN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN, 1, { 0 } },
-        { SC_OPCODE_ARC_COT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOT, 1, { 0 } },
-        { SC_OPCODE_SIN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SINHYP, 1, { 0 } },
-        { SC_OPCODE_COS_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSHYP, 1, { 0 } },
-        { SC_OPCODE_TAN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TANHYP, 1, { 0 } },
-        { SC_OPCODE_COT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COTHYP, 1, { 0 } },
-        { SC_OPCODE_ARC_SIN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARSINHYP, 1, { 0 } },
-        { SC_OPCODE_ARC_COS_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOSHYP, 1, { 0 } },
-        { SC_OPCODE_ARC_TAN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARTANHYP, 1, { 0 } },
-        { SC_OPCODE_ARC_COT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOTHYP, 1, { 0 } },
-        { SC_OPCODE_COSECANT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANT, 1, { 0 } },
-        { SC_OPCODE_SECANT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANT, 1, { 0 } },
-        { SC_OPCODE_COSECANT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANTHYP, 1, { 0 } },
-        { SC_OPCODE_SECANT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANTHYP, 1, { 0 } },
-        { SC_OPCODE_EXP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EXP, 1, { 0 } },
-        { SC_OPCODE_LN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LN, 1, { 0 } },
-        { SC_OPCODE_SQRT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_WURZEL, 1, { 0 } },
-        { SC_OPCODE_FACT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FAKULTAET, 1, { 0 } },
-        { SC_OPCODE_GET_YEAR, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JAHR, 1, { 0 } },
-        { SC_OPCODE_GET_MONTH, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MONAT, 1, { 0 } },
-        { SC_OPCODE_GET_DAY, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAG, 1, { 0 } },
-        { SC_OPCODE_GET_HOUR, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_STUNDE, 1, { 0 } },
-        { SC_OPCODE_GET_MIN, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MINUTE, 1, { 0 } },
-        { SC_OPCODE_GET_SEC, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_SEKUNDE, 1, { 0 } },
-        { SC_OPCODE_PLUS_MINUS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_VORZEICHEN, 1, { 0 } },
-        { SC_OPCODE_ABS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABS, 1, { 0 } },
-        { SC_OPCODE_INT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GANZZAHL, 1, { 0 } },
-        { SC_OPCODE_PHI, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PHI, 1, { 0 } },
-        { SC_OPCODE_GAUSS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAUSS, 1, { 0 } },
-        { SC_OPCODE_IS_EMPTY, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLEER, 1, { 0 } },
-        { SC_OPCODE_IS_STRING, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTTEXT, 1, { 0 } },
-        { SC_OPCODE_IS_NON_STRING, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTKTEXT, 1, { 0 } },
-        { SC_OPCODE_IS_LOGICAL, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLOG, 1, { 0 } },
-        { SC_OPCODE_TYPE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_TYP, 1, { 0 } },
-        { SC_OPCODE_IS_REF, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTBEZUG, 1, { 0 } },
-        { SC_OPCODE_IS_VALUE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTZAHL, 1, { 0 } },
-        { SC_OPCODE_IS_FORMULA, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFORMEL, 1, { 0 } },
-        { SC_OPCODE_IS_NV, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTNV, 1, { 0 } },
-        { SC_OPCODE_IS_ERR, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHL, 1, { 0 } },
-        { SC_OPCODE_IS_ERROR, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHLER, 1, { 0 } },
-        { SC_OPCODE_IS_EVEN, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTGERADE, 1, { 0 } },
-        { SC_OPCODE_IS_ODD, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTUNGERADE, 1, { 0 } },
-        { SC_OPCODE_N, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_N, 1, { 0 } },
-        { SC_OPCODE_GET_DATE_VALUE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATWERT, 1, { 0 } },
-        { SC_OPCODE_GET_TIME_VALUE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEITWERT, 1, { 0 } },
-        { SC_OPCODE_CODE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CODE, 1, { 0 } },
-        { SC_OPCODE_TRIM, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GLAETTEN, 1, { 0 } },
-        { SC_OPCODE_UPPER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS, 1, { 0 } },
-        { SC_OPCODE_PROPER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS2, 1, { 0 } },
-        { SC_OPCODE_LOWER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_KLEIN, 1, { 0 } },
-        { SC_OPCODE_LEN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LAENGE, 1, { 0 } },
-        { SC_OPCODE_T, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_T, 1, { 0 } },
-        { SC_OPCODE_VALUE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WERT, 1, { 0 } },
-        { SC_OPCODE_CLEAN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SAEUBERN, 1, { 0 } },
-        { SC_OPCODE_CHAR, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ZEICHEN, 1, { 0 } },
-        { SC_OPCODE_LOG10, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG10, 1, { 0 } },
-        { SC_OPCODE_EVEN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GERADE, 1, { 0 } },
-        { SC_OPCODE_ODD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNGERADE, 1, { 0 } },
-        { SC_OPCODE_STD_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMVERT, 1, { 0 } },
-        { SC_OPCODE_FISHER, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHER, 1, { 0 } },
-        { SC_OPCODE_FISHER_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHERINV, 1, { 0 } },
-        { SC_OPCODE_S_NORM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMINV, 1, { 0 } },
-        { SC_OPCODE_GAMMA_LN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN, 1, { 0 } },
-        { SC_OPCODE_ERROR_TYPE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_FEHLERTYP, 1, { 0 } },
-        { SC_OPCODE_FORMULA, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_FORMEL, 1, { 0 } },
-        { SC_OPCODE_ARABIC, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ARABISCH, 1, { 0 } },
-        { SC_OPCODE_INFO, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_INFO, 1, { 0 } },
-        { SC_OPCODE_BAHTTEXT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BAHTTEXT, 1, { 0 } },
-        { SC_OPCODE_JIS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_JIS, 1, { 0 } },
-        { SC_OPCODE_ASC, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ASC, 1, { 0 } },
-        { SC_OPCODE_UNICODE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICODE, 1, { 0 } },
-        { SC_OPCODE_UNICHAR, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICHAR, 1, { 0 } },
-        { SC_OPCODE_GAMMA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMA, 1, { 0 } },
-        { SC_OPCODE_GAMMA_LN_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN_MS, 1, { 0 } },
-        { SC_OPCODE_ERF_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERF_MS, 1, { 0 } },
-        { SC_OPCODE_ERFC_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERFC_MS, 1, { 0 } },
-        { SC_OPCODE_ERROR_TYPE_ODF, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ERROR_TYPE_ODF, 1, { 0 } },
-        { SC_OPCODE_ENCODEURL, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ENCODEURL, 1, { 0 } },
-        { SC_OPCODE_ISOWEEKNUM, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ISOWEEKNUM, 1, { 0 } },
-        { SC_OPCODE_ARC_TAN_2, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN2, 2, { 0, 0 } },
-        { SC_OPCODE_CEIL, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_OBERGRENZE, 3, { 0, 1, 1 } },
-        { SC_OPCODE_FLOOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNTERGRENZE, 3, { 0, 1, 1 } },
-        { SC_OPCODE_ROUND, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RUNDEN, 2, { 0, 1 } },
-        { SC_OPCODE_ROUND_UP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AUFRUNDEN, 2, { 0, 1 } },
-        { SC_OPCODE_ROUND_DOWN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABRUNDEN, 2, { 0, 1 } },
-        { SC_OPCODE_TRUNC, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KUERZEN, 2, { 0, 0 } },
-        { SC_OPCODE_LOG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG, 2, { 0, 1 } },
-        { SC_OPCODE_POWER, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_POTENZ, 2, { 0, 0 } },
-        { SC_OPCODE_GCD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GGT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_LCM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KGV, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MOD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_REST, 2, { 0, 0 } },
-        { SC_OPCODE_SUM_PRODUCT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMENPRODUKT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_SUM_SQ, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_QUADRATESUMME, VAR_ARGS, { 0 } },
-        { SC_OPCODE_SUM_X2MY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2MY2, 2, { 0, 0 } },
-        { SC_OPCODE_SUM_X2DY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2PY2, 2, { 0, 0 } },
-        { SC_OPCODE_SUM_XMY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEXMY2, 2, { 0, 0 } },
-        { SC_OPCODE_GET_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATUM, 3, { 0, 0, 0 } },
-        { SC_OPCODE_GET_TIME, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEIT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_GET_DIFF_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE, 2, { 0, 0 } },
-        { SC_OPCODE_GET_DIFF_DATE_360, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE360, 3, { 0, 0, 1 } },
-        { SC_OPCODE_MIN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MIN, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MAX, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAX, VAR_ARGS, { 0 } },
-        { SC_OPCODE_SUM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMME, VAR_ARGS, { 0 } },
-        { SC_OPCODE_PRODUCT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PRODUKT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_AVERAGE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_COUNT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL, VAR_ARGS, { 0 } },
-        { SC_OPCODE_COUNT_2, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL2, VAR_ARGS, { 0 } },
-        { SC_OPCODE_NPV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NBW, VAR_ARGS+1, { 0, 0 } },
-        { SC_OPCODE_IRR, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_IKV, 2, { 0, 1 } },
-        { SC_OPCODE_VAR, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZ, VAR_ARGS, { 0 } },
-        { SC_OPCODE_VAR_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZEN, VAR_ARGS, { 0 } },
-        { SC_OPCODE_ST_DEV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABW, VAR_ARGS, { 0 } },
-        { SC_OPCODE_ST_DEV_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWN, VAR_ARGS, { 0 } },
-        { SC_OPCODE_B, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_B, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMVERT, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_EXP_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXPONVERT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_BINOM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOMVERT, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_POISSON_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON, 3, { 0, 0, 1 } },
-        { SC_OPCODE_COMBIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN, 2, { 0, 0 } },
-        { SC_OPCODE_COMBIN_A, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN2, 2, { 0, 0 } },
-        { SC_OPCODE_PERMUT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN, 2, { 0, 0 } },
-        { SC_OPCODE_PERMUTATION_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN2, 2, { 0, 0 } },
-        { SC_OPCODE_PV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_BW, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_SYD, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_DIA, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_DDB, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA, 5, { 0, 0, 0, 0, 1 } },
-        { SC_OPCODE_DB, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA2, 5, { 0, 0, 0, 0, 1 } },
-        { SC_OPCODE_VBD , 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_VDB, 7, { 0, 0, 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_PDURATION, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LAUFZEIT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_SLN, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LIA, 3, { 0, 0, 0 } },
-        { SC_OPCODE_PMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_RMZ, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_COLUMNS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTEN, 1, { 0 } },
-        { SC_OPCODE_ROWS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILEN, 1, { 0 } },
-        { SC_OPCODE_COLUMN, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTE, 1, { 1 } },
-        { SC_OPCODE_ROW, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILE, 1, { 1 } },
-        { SC_OPCODE_RRI, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZGZ, 3, { 0, 0, 0 } },
-        { SC_OPCODE_FV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZW, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_NPER, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZZR, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_RATE, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINS, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_IPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINSZ, 6, { 0, 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_PPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KAPZ, 6, { 0, 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_CUM_IPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMZINSZ, 6, { 0, 0, 0, 0, 0, 0 } },
-        { SC_OPCODE_CUM_PRINC, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMKAPITAL, 6, { 0, 0, 0, 0, 0, 0 } },
-        { SC_OPCODE_EFFECT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_EFFEKTIV, 2, { 0, 0 } },
-        { SC_OPCODE_NOMINAL, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NOMINAL, 2, { 0, 0 } },
-        { SC_OPCODE_SUB_TOTAL, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TEILERGEBNIS, 2, { 0, 0 } },
-        { SC_OPCODE_DB_SUM, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSUMME, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_COUNT, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_COUNT_2, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL2, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_AVERAGE, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMITTELWERT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_GET, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBAUSZUG, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_MAX, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMAX, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_MIN, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMIN, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_PRODUCT, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBPRODUKT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_STD_DEV, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABW, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_STD_DEV_P, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABWN, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_VAR, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZ, 3, { 0, 0, 0 } },
-        { SC_OPCODE_DB_VAR_P, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZEN, 3, { 0, 0, 0 } },
-        { SC_OPCODE_INDIRECT, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDIREKT, 2, { 0, 1 } },
-        { SC_OPCODE_ADDRESS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ADRESSE, 5, { 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_MATCH, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERGLEICH, 3, { 0, 0, 1 } },
-        { SC_OPCODE_COUNT_EMPTY_CELLS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHLLEEREZELLEN, 1, { 0 } },
-        { SC_OPCODE_COUNT_IF, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ZAEHLENWENN, 2, { 0, 0 } },
-        { SC_OPCODE_SUM_IF, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMMEWENN, 3, { 0, 0, 1 } },
-        { SC_OPCODE_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERWEIS, 3, { 0, 0, 1 } },
-        { SC_OPCODE_V_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SVERWEIS, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_H_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WVERWEIS, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_OFFSET, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERSCHIEBUNG, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_INDEX, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDEX, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_AREAS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_BEREICHE, 1, { 0 } },
-        { SC_OPCODE_CURRENCY, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DM, 2, { 0, 1 } },
-        { SC_OPCODE_REPLACE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ERSETZEN, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_FIXED, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FEST, 3, { 0, 0, 1 } },
-        { SC_OPCODE_FIND, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FINDEN, 3, { 0, 0, 1 } },
-        { SC_OPCODE_EXACT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_IDENTISCH, 2, { 0, 0 } },
-        { SC_OPCODE_LEFT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LINKS, 2, { 0, 1 } },
-        { SC_OPCODE_RIGHT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RECHTS, 2, { 0, 1 } },
-        { SC_OPCODE_SEARCH, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SUCHEN, 3, { 0, 0, 1 } },
-        { SC_OPCODE_MID, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEIL, 3, { 0, 0, 0 } },
-        { SC_OPCODE_TEXT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXT, 2, { 0, 0 } },
-        { SC_OPCODE_SUBSTITUTE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WECHSELN, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_REPT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WIEDERHOLEN, 2, { 0, 0 } },
-        { SC_OPCODE_CONCAT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_VERKETTEN, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MAT_DET, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MDET, 1, { 0 } },
-        { SC_OPCODE_MAT_INV, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MINV, 1, { 0 } },
-        { SC_OPCODE_MAT_MULT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MMULT, 2, { 0, 0 } },
-        { SC_OPCODE_MAT_TRANS, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MTRANS, 1, { 0 } },
-        { SC_OPCODE_MATRIX_UNIT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_EINHEITSMATRIX, 1, { 0 } },
-        { SC_OPCODE_HYP_GEOM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYPGEOMVERT, 5, { 0, 0, 0, 0, 1 } },
-        { SC_OPCODE_LOG_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMVERT, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_T_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TVERT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FVERT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CHI_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT, 2, { 0, 0 } },
-        { SC_OPCODE_WEIBULL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_NEG_BINOM_VERT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMVERT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CRIT_BINOM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KRITBINOM, 3, { 0, 0, 0 } },
-        { SC_OPCODE_KURT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KURT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_HAR_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HARMITTEL, VAR_ARGS, { 0 } },
-        { SC_OPCODE_GEO_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GEOMITTEL, VAR_ARGS, { 0 } },
-        { SC_OPCODE_STANDARD, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDARDISIERUNG, 3, { 0, 0, 0 } },
-        { SC_OPCODE_AVE_DEV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELABW, VAR_ARGS, { 0 } },
-        { SC_OPCODE_SKEW, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHIEFE, VAR_ARGS, { 0 } },
-        { SC_OPCODE_DEV_SQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SUMQUADABW, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MEDIAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MEDIAN, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MODAL_VALUE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODALWERT, VAR_ARGS, { 0 } },
-        { SC_OPCODE_Z_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GTEST, 3, { 0, 0, 1 } },
-        { SC_OPCODE_T_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_RANK, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANG, 3, { 0, 0, 1 } },
-        { SC_OPCODE_PERCENTILE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTIL, 2, { 0, 0 } },
-        { SC_OPCODE_PERCENT_RANK, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTILSRANG, 3, { 0, 0, 1 } },
-        { SC_OPCODE_LARGE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KGROESSTE, 2, { 0, 0 } },
-        { SC_OPCODE_SMALL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KKLEINSTE, 2, { 0, 0 } },
-        { SC_OPCODE_FREQUENCY, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_HAEUFIGKEIT, 2, { 0, 0 } },
-        { SC_OPCODE_QUARTILE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE, 2, { 0, 0 } },
-        { SC_OPCODE_NORM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CONFIDENCE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KONFIDENZ, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FTEST, 2, { 0, 0 } },
-        { SC_OPCODE_TRIM_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GESTUTZTMITTEL, 2, { 0, 0 } },
-        { SC_OPCODE_PROB, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WAHRSCHBEREICH, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_CORREL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KORREL, 2, { 0, 0 } },
-        { SC_OPCODE_COVAR, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KOVAR, 2, { 0, 0 } },
-        { SC_OPCODE_PEARSON, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PEARSON, 2, { 0, 0 } },
-        { SC_OPCODE_RSQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BESTIMMTHEITSMASS, 2, { 0, 0 } },
-        { SC_OPCODE_STEYX, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STFEHLERYX, 2, { 0, 0 } },
-        { SC_OPCODE_SLOPE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STEIGUNG, 2, { 0, 0 } },
-        { SC_OPCODE_INTERCEPT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ACHSENABSCHNITT, 2, { 0, 0 } },
-        { SC_OPCODE_TREND, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_TREND, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_GROWTH, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_VARIATION, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_LINEST, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RGP, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_LOGEST, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RKP, 4, { 0, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHAETZER, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CHI_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV, 2, { 0, 0 } },
-        { SC_OPCODE_GAMMA_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAVERT, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_GAMMA_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV, 3, { 0, 0, 0 } },
-        { SC_OPCODE_T_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV, 2, { 0, 0 } },
-        { SC_OPCODE_F_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FINV, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CHI_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST, 2, { 0, 0 } },
-        { SC_OPCODE_LOG_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 1, 1 } },
-        { SC_OPCODE_BETA_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAVERT, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_BETA_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_WEEK, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_KALENDERWOCHE, 2, { 0, 1 } },
-        { SC_OPCODE_GET_DAY_OF_WEEK, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WOCHENTAG, 2, { 0, 1 } },
-        { SC_OPCODE_STYLE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VORLAGE, 3, { 0, 1, 1 } },
-        { SC_OPCODE_DDE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_DDE, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_BASE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BASIS, 3, { 0, 0, 1 } },
-        { SC_OPCODE_SHEET, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLE, 1, { 1 } },
-        { SC_OPCODE_SHEETS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLEN, 1, { 1 } },
-        { SC_OPCODE_MIN_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MAX_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_AVERAGE_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERTA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_ST_DEV_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_ST_DEV_P_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWNA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_VAR_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_VAR_P_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZENA, VAR_ARGS, { 0 } },
-        { SC_OPCODE_EASTERSUNDAY, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_OSTERSONNTAG, 1, { 0 } },
-        { SC_OPCODE_DECIMAL, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DEZIMAL, 2, { 0, 0 } },
-        { SC_OPCODE_CONVERT_OOO, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UMRECHNEN, 3, { 0, 0, 0 } },
-        { SC_OPCODE_ROMAN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ROEMISCH, 2, { 0, 1 } },
-        { SC_OPCODE_MIRR, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_QIKV, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CELL, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ZELLE, 2, { 0, 1 } },
-        { SC_OPCODE_ISPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ISPMT, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_HYPERLINK, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_HYPERLINK, 2, { 0, 1 } },
-        { SC_OPCODE_GET_PIVOT_DATA, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_GETPIVOTDATA, VAR_ARGS+2, { 0, 0, 1 } },
-        { SC_OPCODE_EUROCONVERT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EUROCONVERT, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_NUMBERVALUE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_NUMBERVALUE, 3, { 0, 1, 1 } },
-        { SC_OPCODE_CHISQ_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST, 3, { 0, 0, 1 } },
-        { SC_OPCODE_CHISQ_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV, 2, { 0, 0 } },
-        { SC_OPCODE_BITAND, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITAND, 2, { 0, 0 } },
-        { SC_OPCODE_BITOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITOR, 2, { 0, 0 } },
-        { SC_OPCODE_BITXOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITXOR, 2, { 0, 0 } },
-        { SC_OPCODE_BITRSHIFT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITRSHIFT, 2, { 0, 0 } },
-        { SC_OPCODE_BITLSHIFT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITLSHIFT, 2, { 0, 0 } },
-        { SC_OPCODE_GET_DATEDIF, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATEDIF, 3, { 0, 0, 0 } },
-        { SC_OPCODE_XOR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_XOR, VAR_ARGS, { 0 } },
-        { SC_OPCODE_AVERAGE_IF, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIF, 3, { 0, 0, 1 } },
-        { SC_OPCODE_SUM_IFS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } },
-        { SC_OPCODE_AVERAGE_IFS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } },
-        { SC_OPCODE_COUNT_IFS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COUNTIFS, PAIRED_VAR_ARGS, { 0, 0 } },
-        { SC_OPCODE_SKEWP, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SKEWP, VAR_ARGS, { 0 } },
-        { SC_OPCODE_LENB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LENB, 1, { 0 } },
-        { SC_OPCODE_RIGHTB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RIGHTB, 2, { 0, 1 } },
-        { SC_OPCODE_LEFTB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LEFTB, 2, { 0, 1 } },
-        { SC_OPCODE_MIDB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_MIDB, 3, { 0, 0, 0 } },
-        { SC_OPCODE_FILTERXML, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FILTERXML, 2, { 0, 0 } },
-        { SC_OPCODE_WEBSERVICE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WEBSERVICE, 1, { 0, 0 } },
-        { SC_OPCODE_COVARIANCE_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_S, 2, { 0, 0 } },
-        { SC_OPCODE_COVARIANCE_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_P, 2, { 0, 0 } },
-        { SC_OPCODE_ST_DEV_P_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_P_MS, VAR_ARGS, { 0 } },
-        { SC_OPCODE_ST_DEV_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_S, VAR_ARGS, { 0 } },
-        { SC_OPCODE_VAR_P_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_P_MS, VAR_ARGS, { 0 } },
-        { SC_OPCODE_VAR_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_S, VAR_ARGS, { 0 } },
-        { SC_OPCODE_BETA_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETADIST_MS, 6, { 0, 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_BETA_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV_MS, 5, { 0, 0, 0, 1, 1 } },
-        { SC_OPCODE_BINOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_DIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_BINOM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_INV_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CHI_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT_MS, 2, { 0, 0 } },
-        { SC_OPCODE_CHI_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV_MS, 2, { 0, 0 } },
-        { SC_OPCODE_CHI_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST_MS, 2, { 0, 0 } },
-        { SC_OPCODE_CHISQ_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CHISQ_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV_MS, 2, { 0, 0 } },
-        { SC_OPCODE_CONFIDENCE_N, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_N, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CONFIDENCE_T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_T, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_DIST_LT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_LT, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_F_DIST_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_RT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_INV_LT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_LT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_INV_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_RT, 3, { 0, 0, 0 } },
-        { SC_OPCODE_F_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_TEST_MS, 2, { 0, 0 } },
-        { SC_OPCODE_EXP_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXP_DIST_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_HYP_GEOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYP_GEOM_DIST_MS, 5, { 0, 0, 0, 0, 0 } },
-        { SC_OPCODE_POISSON_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON_DIST_MS, 3, { 0, 0, 1 } },
-        { SC_OPCODE_WEIBULL_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL_DIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_GAMMA_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMADIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_GAMMA_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_LOG_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMDIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_LOG_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 0, 0 } },
-        { SC_OPCODE_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMDIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_NORM_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_STD_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMDIST_MS, 2, { 0, 0 } },
-        { SC_OPCODE_S_NORM_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMINV_MS, 1, { 0 } },
-        { SC_OPCODE_T_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_MS, 3, { 0, 0, 0 } },
-        { SC_OPCODE_T_DIST_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_RT, 2, { 0, 0 } },
-        { SC_OPCODE_T_DIST_2T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_2T, 2, { 0, 0 } },
-        { SC_OPCODE_T_INV_2T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_2T, 2, { 0, 0 } },
-        { SC_OPCODE_T_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_MS, 2, { 0, 0 } },
-        { SC_OPCODE_T_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_PERCENTILE_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_INC, 2, { 0, 0 } },
-        { SC_OPCODE_PERCENT_RANK_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_INC, 3, { 0, 0, 1 } },
-        { SC_OPCODE_QUARTILE_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_INC, 2, { 0, 0 } },
-        { SC_OPCODE_RANK_EQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_EQ, 3, { 0, 0, 1 } },
-        { SC_OPCODE_PERCENTILE_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_EXC, 2, { 0, 0 } },
-        { SC_OPCODE_PERCENT_RANK_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_EXC, 3, { 0, 0, 1 } },
-        { SC_OPCODE_QUARTILE_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_EXC, 2, { 0, 0 } },
-        { SC_OPCODE_RANK_AVG, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_AVG, 3, { 0, 0, 1 } },
-        { SC_OPCODE_MODAL_VALUE_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MS, VAR_ARGS, { 0 } },
-        { SC_OPCODE_MODAL_VALUE_MULTI, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MULTI, VAR_ARGS, { 0 } },
-        { SC_OPCODE_NEG_BINOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMDIST_MS, 4, { 0, 0, 0, 0 } },
-        { SC_OPCODE_Z_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_Z_TEST_MS, 3, { 0, 0, 1 } },
-        { SC_OPCODE_CEIL_MS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MS, 2, { 0, 0 } },
-        { SC_OPCODE_CEIL_ISO, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_ISO, 2, { 0, 1 } },
-        { SC_OPCODE_FLOOR_MS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MS, 2, { 0, 0 } },
-        { SC_OPCODE_NETWORKDAYS_MS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS_MS, 4, { 0, 0, 1, 1 } },
-        { SC_OPCODE_WORKDAY_MS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WORKDAY_MS, 4, { 0, 0, 1, 1 } },
-        { SC_OPCODE_AGGREGATE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AGGREGATE, VAR_ARGS+3, { 0, 0, 0, 1 } },
-        { SC_OPCODE_COLOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COLOR, 4, { 0, 0, 0, 1 } },
-        { SC_OPCODE_CEIL_MATH, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MATH, 3, { 0, 1, 1 } },
-        { SC_OPCODE_CEIL_PRECISE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_PRECISE, 2, { 0, 1 } },
-        { SC_OPCODE_NETWORKDAYS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS, 4, { 0, 0, 1, 1 } },
-        { SC_OPCODE_FLOOR_MATH, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MATH, 3, { 0, 1, 1 } },
-        { SC_OPCODE_FLOOR_PRECISE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_PRECISE, 2, { 0, 1 } },
-        { SC_OPCODE_RAWSUBTRACT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAWSUBTRACT, VAR_ARGS+2, { 0, 0, 1 } },
-        { SC_OPCODE_WEEKNUM_OOO, 2, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WEEKNUM_OOO, 2, { 0, 0 } },
-        { SC_OPCODE_FORECAST_ETS_ADD, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_ADD, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_SEA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_SEA, 4, { 0, 0, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_MUL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_MUL, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_PIA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIA, 7, { 0, 0, 0, 1, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_PIM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIM, 7, { 0, 0, 0, 1, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_STA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STA, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_ETS_STM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STM, 6, { 0, 0, 0, 1, 1, 1 } },
-        { SC_OPCODE_FORECAST_LIN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_LIN, 3, { 0, 0, 0 } },
-        { SC_OPCODE_CONCAT_MS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CONCAT_MS, VAR_ARGS, { 0 } },
-        { SC_OPCODE_TEXTJOIN_MS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXTJOIN_MS, VAR_ARGS + 2, { 0, 0, 0 } },
-        { SC_OPCODE_IFS_MS, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFS_MS, PAIRED_VAR_ARGS, { 0, 0 } },
-        { SC_OPCODE_SWITCH_MS, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_SWITCH_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
-        { SC_OPCODE_MINIFS_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
-        { SC_OPCODE_MAXIFS_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
-        { SC_OPCODE_ROUNDSIG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ROUNDSIG, 2, { 0, 0 } },
-        { SC_OPCODE_REPLACEB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_REPLACEB, 4, { 0, 0, 0, 0 } }
+        { SC_OPCODE_IF, ENTRY(SC_OPCODE_IF_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WENN, 3, { 0, 1, 1 } },
+        { SC_OPCODE_IF_ERROR, ENTRY(SC_OPCODE_IF_ERROR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFERROR, 2, { 0, 0 } },
+        { SC_OPCODE_IF_NA, ENTRY(SC_OPCODE_IF_NA_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFNA, 2, { 0, 0 } },
+        { SC_OPCODE_CHOOSE, ENTRY(SC_OPCODE_CHOOSE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WAHL, VAR_ARGS+1, { 0, 0 } },
+        { SC_OPCODE_AND, ENTRY(SC_OPCODE_AND_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_UND, VAR_ARGS, { 0 } },
+        { SC_OPCODE_OR, ENTRY(SC_OPCODE_OR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_ODER, VAR_ARGS, { 0 } },
+        { SC_OPCODE_NOT, ENTRY(SC_OPCODE_NOT_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_NICHT, 1, { 0 } },
+        { SC_OPCODE_PI, ENTRY(SC_OPCODE_PI_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PI, 0, { } },
+        { SC_OPCODE_RANDOM, ENTRY(SC_OPCODE_RANDOM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ZUFALLSZAHL, 0, { } },
+        { SC_OPCODE_TRUE, ENTRY(SC_OPCODE_TRUE_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WAHR, 0, { } },
+        { SC_OPCODE_FALSE, ENTRY(SC_OPCODE_FALSE_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_FALSCH, 0, { } },
+        { SC_OPCODE_GET_ACT_DATE, ENTRY(SC_OPCODE_GET_ACT_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_HEUTE, 0, { } },
+        { SC_OPCODE_GET_ACT_TIME, ENTRY(SC_OPCODE_GET_ACT_TIME_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JETZT, 0, { } },
+        { SC_OPCODE_NO_VALUE, ENTRY(SC_OPCODE_NO_VALUE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_NV, 0, { } },
+        { SC_OPCODE_CURRENT, ENTRY(SC_OPCODE_CURRENT_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_AKTUELL, 0, { } },
+        { SC_OPCODE_DEG, ENTRY(SC_OPCODE_DEG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_DEG, 1, { 0 } },
+        { SC_OPCODE_RAD, ENTRY(SC_OPCODE_RAD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAD, 1, { 0 } },
+        { SC_OPCODE_SIN, ENTRY(SC_OPCODE_SIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SIN, 1, { 0 } },
+        { SC_OPCODE_COS, ENTRY(SC_OPCODE_COS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COS, 1, { 0 } },
+        { SC_OPCODE_TAN, ENTRY(SC_OPCODE_TAN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TAN, 1, { 0 } },
+        { SC_OPCODE_COT, ENTRY(SC_OPCODE_COT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COT, 1, { 0 } },
+        { SC_OPCODE_ARC_SIN, ENTRY(SC_OPCODE_ARC_SIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCSIN, 1, { 0 } },
+        { SC_OPCODE_ARC_COS, ENTRY(SC_OPCODE_ARC_COS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOS, 1, { 0 } },
+        { SC_OPCODE_ARC_TAN, ENTRY(SC_OPCODE_ARC_TAN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN, 1, { 0 } },
+        { SC_OPCODE_ARC_COT, ENTRY(SC_OPCODE_ARC_COT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOT, 1, { 0 } },
+        { SC_OPCODE_SIN_HYP, ENTRY(SC_OPCODE_SIN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SINHYP, 1, { 0 } },
+        { SC_OPCODE_COS_HYP, ENTRY(SC_OPCODE_COS_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSHYP, 1, { 0 } },
+        { SC_OPCODE_TAN_HYP, ENTRY(SC_OPCODE_TAN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TANHYP, 1, { 0 } },
+        { SC_OPCODE_COT_HYP, ENTRY(SC_OPCODE_COT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COTHYP, 1, { 0 } },
+        { SC_OPCODE_ARC_SIN_HYP, ENTRY(SC_OPCODE_ARC_SIN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARSINHYP, 1, { 0 } },
+        { SC_OPCODE_ARC_COS_HYP, ENTRY(SC_OPCODE_ARC_COS_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOSHYP, 1, { 0 } },
+        { SC_OPCODE_ARC_TAN_HYP, ENTRY(SC_OPCODE_ARC_TAN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARTANHYP, 1, { 0 } },
+        { SC_OPCODE_ARC_COT_HYP, ENTRY(SC_OPCODE_ARC_COT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOTHYP, 1, { 0 } },
+        { SC_OPCODE_COSECANT, ENTRY(SC_OPCODE_COSECANT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANT, 1, { 0 } },
+        { SC_OPCODE_SECANT, ENTRY(SC_OPCODE_SECANT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANT, 1, { 0 } },
+        { SC_OPCODE_COSECANT_HYP, ENTRY(SC_OPCODE_COSECANT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANTHYP, 1, { 0 } },
+        { SC_OPCODE_SECANT_HYP, ENTRY(SC_OPCODE_SECANT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANTHYP, 1, { 0 } },
+        { SC_OPCODE_EXP, ENTRY(SC_OPCODE_EXP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EXP, 1, { 0 } },
+        { SC_OPCODE_LN, ENTRY(SC_OPCODE_LN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LN, 1, { 0 } },
+        { SC_OPCODE_SQRT, ENTRY(SC_OPCODE_SQRT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_WURZEL, 1, { 0 } },
+        { SC_OPCODE_FACT, ENTRY(SC_OPCODE_FACT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FAKULTAET, 1, { 0 } },
+        { SC_OPCODE_GET_YEAR, ENTRY(SC_OPCODE_GET_YEAR_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JAHR, 1, { 0 } },
+        { SC_OPCODE_GET_MONTH, ENTRY(SC_OPCODE_GET_MONTH_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MONAT, 1, { 0 } },
+        { SC_OPCODE_GET_DAY, ENTRY(SC_OPCODE_GET_DAY_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAG, 1, { 0 } },
+        { SC_OPCODE_GET_HOUR, ENTRY(SC_OPCODE_GET_HOUR_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_STUNDE, 1, { 0 } },
+        { SC_OPCODE_GET_MIN, ENTRY(SC_OPCODE_GET_MIN_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MINUTE, 1, { 0 } },
+        { SC_OPCODE_GET_SEC, ENTRY(SC_OPCODE_GET_SEC_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_SEKUNDE, 1, { 0 } },
+        { SC_OPCODE_PLUS_MINUS, ENTRY(SC_OPCODE_PLUS_MINUS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_VORZEICHEN, 1, { 0 } },
+        { SC_OPCODE_ABS, ENTRY(SC_OPCODE_ABS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABS, 1, { 0 } },
+        { SC_OPCODE_INT, ENTRY(SC_OPCODE_INT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GANZZAHL, 1, { 0 } },
+        { SC_OPCODE_PHI, ENTRY(SC_OPCODE_PHI_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PHI, 1, { 0 } },
+        { SC_OPCODE_GAUSS, ENTRY(SC_OPCODE_GAUSS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAUSS, 1, { 0 } },
+        { SC_OPCODE_IS_EMPTY, ENTRY(SC_OPCODE_IS_EMPTY_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLEER, 1, { 0 } },
+        { SC_OPCODE_IS_STRING, ENTRY(SC_OPCODE_IS_STRING_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTTEXT, 1, { 0 } },
+        { SC_OPCODE_IS_NON_STRING, ENTRY(SC_OPCODE_IS_NON_STRING_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTKTEXT, 1, { 0 } },
+        { SC_OPCODE_IS_LOGICAL, ENTRY(SC_OPCODE_IS_LOGICAL_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLOG, 1, { 0 } },
+        { SC_OPCODE_TYPE, ENTRY(SC_OPCODE_TYPE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_TYP, 1, { 0 } },
+        { SC_OPCODE_IS_REF, ENTRY(SC_OPCODE_IS_REF_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTBEZUG, 1, { 0 } },
+        { SC_OPCODE_IS_VALUE, ENTRY(SC_OPCODE_IS_VALUE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTZAHL, 1, { 0 } },
+        { SC_OPCODE_IS_FORMULA, ENTRY(SC_OPCODE_IS_FORMULA_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFORMEL, 1, { 0 } },
+        { SC_OPCODE_IS_NV, ENTRY(SC_OPCODE_IS_NV_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTNV, 1, { 0 } },
+        { SC_OPCODE_IS_ERR, ENTRY(SC_OPCODE_IS_ERR_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHL, 1, { 0 } },
+        { SC_OPCODE_IS_ERROR, ENTRY(SC_OPCODE_IS_ERROR_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHLER, 1, { 0 } },
+        { SC_OPCODE_IS_EVEN, ENTRY(SC_OPCODE_IS_EVEN_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTGERADE, 1, { 0 } },
+        { SC_OPCODE_IS_ODD, ENTRY(SC_OPCODE_IS_ODD_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTUNGERADE, 1, { 0 } },
+        { SC_OPCODE_N, ENTRY(SC_OPCODE_N_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_N, 1, { 0 } },
+        { SC_OPCODE_GET_DATE_VALUE, ENTRY(SC_OPCODE_GET_DATE_VALUE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATWERT, 1, { 0 } },
+        { SC_OPCODE_GET_TIME_VALUE, ENTRY(SC_OPCODE_GET_TIME_VALUE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEITWERT, 1, { 0 } },
+        { SC_OPCODE_CODE, ENTRY(SC_OPCODE_CODE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CODE, 1, { 0 } },
+        { SC_OPCODE_TRIM, ENTRY(SC_OPCODE_TRIM_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GLAETTEN, 1, { 0 } },
+        { SC_OPCODE_UPPER, ENTRY(SC_OPCODE_UPPER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS, 1, { 0 } },
+        { SC_OPCODE_PROPER, ENTRY(SC_OPCODE_PROPER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS2, 1, { 0 } },
+        { SC_OPCODE_LOWER, ENTRY(SC_OPCODE_LOWER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_KLEIN, 1, { 0 } },
+        { SC_OPCODE_LEN, ENTRY(SC_OPCODE_LEN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LAENGE, 1, { 0 } },
+        { SC_OPCODE_T, ENTRY(SC_OPCODE_T_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_T, 1, { 0 } },
+        { SC_OPCODE_VALUE, ENTRY(SC_OPCODE_VALUE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WERT, 1, { 0 } },
+        { SC_OPCODE_CLEAN, ENTRY(SC_OPCODE_CLEAN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SAEUBERN, 1, { 0 } },
+        { SC_OPCODE_CHAR, ENTRY(SC_OPCODE_CHAR_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ZEICHEN, 1, { 0 } },
+        { SC_OPCODE_LOG10, ENTRY(SC_OPCODE_LOG10_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG10, 1, { 0 } },
+        { SC_OPCODE_EVEN, ENTRY(SC_OPCODE_EVEN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GERADE, 1, { 0 } },
+        { SC_OPCODE_ODD, ENTRY(SC_OPCODE_ODD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNGERADE, 1, { 0 } },
+        { SC_OPCODE_STD_NORM_DIST, ENTRY(SC_OPCODE_STD_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMVERT, 1, { 0 } },
+        { SC_OPCODE_FISHER, ENTRY(SC_OPCODE_FISHER_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHER, 1, { 0 } },
+        { SC_OPCODE_FISHER_INV, ENTRY(SC_OPCODE_FISHER_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHERINV, 1, { 0 } },
+        { SC_OPCODE_S_NORM_INV, ENTRY(SC_OPCODE_S_NORM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMINV, 1, { 0 } },
+        { SC_OPCODE_GAMMA_LN, ENTRY(SC_OPCODE_GAMMA_LN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN, 1, { 0 } },
+        { SC_OPCODE_ERROR_TYPE, ENTRY(SC_OPCODE_ERROR_TYPE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_FEHLERTYP, 1, { 0 } },
+        { SC_OPCODE_FORMULA, ENTRY(SC_OPCODE_FORMULA_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_FORMEL, 1, { 0 } },
+        { SC_OPCODE_ARABIC, ENTRY(SC_OPCODE_ARABIC_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ARABISCH, 1, { 0 } },
+        { SC_OPCODE_INFO, ENTRY(SC_OPCODE_INFO_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_INFO, 1, { 0 } },
+        { SC_OPCODE_BAHTTEXT, ENTRY(SC_OPCODE_BAHTTEXT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BAHTTEXT, 1, { 0 } },
+        { SC_OPCODE_JIS, ENTRY(SC_OPCODE_JIS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_JIS, 1, { 0 } },
+        { SC_OPCODE_ASC, ENTRY(SC_OPCODE_ASC_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ASC, 1, { 0 } },
+        { SC_OPCODE_UNICODE, ENTRY(SC_OPCODE_UNICODE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICODE, 1, { 0 } },
+        { SC_OPCODE_UNICHAR, ENTRY(SC_OPCODE_UNICHAR_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICHAR, 1, { 0 } },
+        { SC_OPCODE_GAMMA, ENTRY(SC_OPCODE_GAMMA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMA, 1, { 0 } },
+        { SC_OPCODE_GAMMA_LN_MS, ENTRY(SC_OPCODE_GAMMA_LN_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN_MS, 1, { 0 } },
+        { SC_OPCODE_ERF_MS, ENTRY(SC_OPCODE_ERF_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERF_MS, 1, { 0 } },
+        { SC_OPCODE_ERFC_MS, ENTRY(SC_OPCODE_ERFC_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERFC_MS, 1, { 0 } },
+        { SC_OPCODE_ERROR_TYPE_ODF, ENTRY(SC_OPCODE_ERROR_TYPE_ODF_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ERROR_TYPE_ODF, 1, { 0 } },
+        { SC_OPCODE_ENCODEURL, ENTRY(SC_OPCODE_ENCODEURL_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ENCODEURL, 1, { 0 } },
+        { SC_OPCODE_ISOWEEKNUM, ENTRY(SC_OPCODE_ISOWEEKNUM_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ISOWEEKNUM, 1, { 0 } },
+        { SC_OPCODE_ARC_TAN_2, ENTRY(SC_OPCODE_ARC_TAN_2_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN2, 2, { 0, 0 } },
+        { SC_OPCODE_CEIL, ENTRY(SC_OPCODE_CEIL_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_OBERGRENZE, 3, { 0, 1, 1 } },
+        { SC_OPCODE_FLOOR, ENTRY(SC_OPCODE_FLOOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNTERGRENZE, 3, { 0, 1, 1 } },
+        { SC_OPCODE_ROUND, ENTRY(SC_OPCODE_ROUND_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RUNDEN, 2, { 0, 1 } },
+        { SC_OPCODE_ROUND_UP, ENTRY(SC_OPCODE_ROUND_UP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AUFRUNDEN, 2, { 0, 1 } },
+        { SC_OPCODE_ROUND_DOWN, ENTRY(SC_OPCODE_ROUND_DOWN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABRUNDEN, 2, { 0, 1 } },
+        { SC_OPCODE_TRUNC, ENTRY(SC_OPCODE_TRUNC_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KUERZEN, 2, { 0, 0 } },
+        { SC_OPCODE_LOG, ENTRY(SC_OPCODE_LOG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG, 2, { 0, 1 } },
+        { SC_OPCODE_POWER, ENTRY(SC_OPCODE_POWER_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_POTENZ, 2, { 0, 0 } },
+        { SC_OPCODE_GCD, ENTRY(SC_OPCODE_GCD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GGT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_LCM, ENTRY(SC_OPCODE_LCM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KGV, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MOD, ENTRY(SC_OPCODE_MOD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_REST, 2, { 0, 0 } },
+        { SC_OPCODE_SUM_PRODUCT, ENTRY(SC_OPCODE_SUM_PRODUCT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMENPRODUKT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_SUM_SQ, ENTRY(SC_OPCODE_SUM_SQ_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_QUADRATESUMME, VAR_ARGS, { 0 } },
+        { SC_OPCODE_SUM_X2MY2, ENTRY(SC_OPCODE_SUM_X2MY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2MY2, 2, { 0, 0 } },
+        { SC_OPCODE_SUM_X2DY2, ENTRY(SC_OPCODE_SUM_X2DY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2PY2, 2, { 0, 0 } },
+        { SC_OPCODE_SUM_XMY2, ENTRY(SC_OPCODE_SUM_XMY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEXMY2, 2, { 0, 0 } },
+        { SC_OPCODE_GET_DATE, ENTRY(SC_OPCODE_GET_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATUM, 3, { 0, 0, 0 } },
+        { SC_OPCODE_GET_TIME, ENTRY(SC_OPCODE_GET_TIME_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEIT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_GET_DIFF_DATE, ENTRY(SC_OPCODE_GET_DIFF_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE, 2, { 0, 0 } },
+        { SC_OPCODE_GET_DIFF_DATE_360, ENTRY(SC_OPCODE_GET_DIFF_DATE_360_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE360, 3, { 0, 0, 1 } },
+        { SC_OPCODE_MIN, ENTRY(SC_OPCODE_MIN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MIN, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MAX, ENTRY(SC_OPCODE_MAX_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAX, VAR_ARGS, { 0 } },
+        { SC_OPCODE_SUM, ENTRY(SC_OPCODE_SUM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMME, VAR_ARGS, { 0 } },
+        { SC_OPCODE_PRODUCT, ENTRY(SC_OPCODE_PRODUCT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PRODUKT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_AVERAGE, ENTRY(SC_OPCODE_AVERAGE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_COUNT, ENTRY(SC_OPCODE_COUNT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL, VAR_ARGS, { 0 } },
+        { SC_OPCODE_COUNT_2, ENTRY(SC_OPCODE_COUNT_2_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL2, VAR_ARGS, { 0 } },
+        { SC_OPCODE_NPV, ENTRY(SC_OPCODE_NPV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NBW, VAR_ARGS+1, { 0, 0 } },
+        { SC_OPCODE_IRR, ENTRY(SC_OPCODE_IRR_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_IKV, 2, { 0, 1 } },
+        { SC_OPCODE_VAR, ENTRY(SC_OPCODE_VAR_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZ, VAR_ARGS, { 0 } },
+        { SC_OPCODE_VAR_P, ENTRY(SC_OPCODE_VAR_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZEN, VAR_ARGS, { 0 } },
+        { SC_OPCODE_ST_DEV, ENTRY(SC_OPCODE_ST_DEV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABW, VAR_ARGS, { 0 } },
+        { SC_OPCODE_ST_DEV_P, ENTRY(SC_OPCODE_ST_DEV_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWN, VAR_ARGS, { 0 } },
+        { SC_OPCODE_B, ENTRY(SC_OPCODE_B_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_B, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_NORM_DIST, ENTRY(SC_OPCODE_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMVERT, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_EXP_DIST, ENTRY(SC_OPCODE_EXP_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXPONVERT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_BINOM_DIST, ENTRY(SC_OPCODE_BINOM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOMVERT, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_POISSON_DIST, ENTRY(SC_OPCODE_POISSON_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON, 3, { 0, 0, 1 } },
+        { SC_OPCODE_COMBIN, ENTRY(SC_OPCODE_COMBIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN, 2, { 0, 0 } },
+        { SC_OPCODE_COMBIN_A, ENTRY(SC_OPCODE_COMBIN_A_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN2, 2, { 0, 0 } },
+        { SC_OPCODE_PERMUT, ENTRY(SC_OPCODE_PERMUT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN, 2, { 0, 0 } },
+        { SC_OPCODE_PERMUTATION_A, ENTRY(SC_OPCODE_PERMUTATION_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN2, 2, { 0, 0 } },
+        { SC_OPCODE_PV, ENTRY(SC_OPCODE_PV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_BW, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_SYD, ENTRY(SC_OPCODE_SYD_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_DIA, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_DDB, ENTRY(SC_OPCODE_DDB_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA, 5, { 0, 0, 0, 0, 1 } },
+        { SC_OPCODE_DB, ENTRY(SC_OPCODE_DB_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA2, 5, { 0, 0, 0, 0, 1 } },
+        { SC_OPCODE_VBD , ENTRY(SC_OPCODE_VBD_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_VDB, 7, { 0, 0, 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_PDURATION, ENTRY(SC_OPCODE_PDURATION_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LAUFZEIT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_SLN, ENTRY(SC_OPCODE_SLN_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LIA, 3, { 0, 0, 0 } },
+        { SC_OPCODE_PMT, ENTRY(SC_OPCODE_PMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_RMZ, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_COLUMNS, ENTRY(SC_OPCODE_COLUMNS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTEN, 1, { 0 } },
+        { SC_OPCODE_ROWS, ENTRY(SC_OPCODE_ROWS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILEN, 1, { 0 } },
+        { SC_OPCODE_COLUMN, ENTRY(SC_OPCODE_COLUMN_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTE, 1, { 1 } },
+        { SC_OPCODE_ROW, ENTRY(SC_OPCODE_ROW_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILE, 1, { 1 } },
+        { SC_OPCODE_RRI, ENTRY(SC_OPCODE_RRI_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZGZ, 3, { 0, 0, 0 } },
+        { SC_OPCODE_FV, ENTRY(SC_OPCODE_FV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZW, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_NPER, ENTRY(SC_OPCODE_NPER_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZZR, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_RATE, ENTRY(SC_OPCODE_RATE_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINS, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_IPMT, ENTRY(SC_OPCODE_IPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINSZ, 6, { 0, 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_PPMT, ENTRY(SC_OPCODE_PPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KAPZ, 6, { 0, 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_CUM_IPMT, ENTRY(SC_OPCODE_CUM_IPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMZINSZ, 6, { 0, 0, 0, 0, 0, 0 } },
+        { SC_OPCODE_CUM_PRINC, ENTRY(SC_OPCODE_CUM_PRINC_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMKAPITAL, 6, { 0, 0, 0, 0, 0, 0 } },
+        { SC_OPCODE_EFFECT, ENTRY(SC_OPCODE_EFFECT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_EFFEKTIV, 2, { 0, 0 } },
+        { SC_OPCODE_NOMINAL, ENTRY(SC_OPCODE_NOMINAL_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NOMINAL, 2, { 0, 0 } },
+        { SC_OPCODE_SUB_TOTAL, ENTRY(SC_OPCODE_SUB_TOTAL_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TEILERGEBNIS, 2, { 0, 0 } },
+        { SC_OPCODE_DB_SUM, ENTRY(SC_OPCODE_DB_SUM_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSUMME, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_COUNT, ENTRY(SC_OPCODE_DB_COUNT_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_COUNT_2, ENTRY(SC_OPCODE_DB_COUNT_2_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL2, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_AVERAGE, ENTRY(SC_OPCODE_DB_AVERAGE_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMITTELWERT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_GET, ENTRY(SC_OPCODE_DB_GET_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBAUSZUG, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_MAX, ENTRY(SC_OPCODE_DB_MAX_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMAX, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_MIN, ENTRY(SC_OPCODE_DB_MIN_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMIN, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_PRODUCT, ENTRY(SC_OPCODE_DB_PRODUCT_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBPRODUKT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_STD_DEV, ENTRY(SC_OPCODE_DB_STD_DEV_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABW, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_STD_DEV_P, ENTRY(SC_OPCODE_DB_STD_DEV_P_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABWN, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_VAR, ENTRY(SC_OPCODE_DB_VAR_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZ, 3, { 0, 0, 0 } },
+        { SC_OPCODE_DB_VAR_P, ENTRY(SC_OPCODE_DB_VAR_P_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZEN, 3, { 0, 0, 0 } },
+        { SC_OPCODE_INDIRECT, ENTRY(SC_OPCODE_INDIRECT_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDIREKT, 2, { 0, 1 } },
+        { SC_OPCODE_ADDRESS, ENTRY(SC_OPCODE_ADDRESS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ADRESSE, 5, { 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_MATCH, ENTRY(SC_OPCODE_MATCH_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERGLEICH, 3, { 0, 0, 1 } },
+        { SC_OPCODE_COUNT_EMPTY_CELLS, ENTRY(SC_OPCODE_COUNT_EMPTY_CELLS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHLLEEREZELLEN, 1, { 0 } },
+        { SC_OPCODE_COUNT_IF, ENTRY(SC_OPCODE_COUNT_IF_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ZAEHLENWENN, 2, { 0, 0 } },
+        { SC_OPCODE_SUM_IF, ENTRY(SC_OPCODE_SUM_IF_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMMEWENN, 3, { 0, 0, 1 } },
+        { SC_OPCODE_LOOKUP, ENTRY(SC_OPCODE_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERWEIS, 3, { 0, 0, 1 } },
+        { SC_OPCODE_V_LOOKUP, ENTRY(SC_OPCODE_V_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SVERWEIS, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_H_LOOKUP, ENTRY(SC_OPCODE_H_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WVERWEIS, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_OFFSET, ENTRY(SC_OPCODE_OFFSET_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERSCHIEBUNG, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_INDEX, ENTRY(SC_OPCODE_INDEX_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDEX, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_AREAS, ENTRY(SC_OPCODE_AREAS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_BEREICHE, 1, { 0 } },
+        { SC_OPCODE_CURRENCY, ENTRY(SC_OPCODE_CURRENCY_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DM, 2, { 0, 1 } },
+        { SC_OPCODE_REPLACE, ENTRY(SC_OPCODE_REPLACE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ERSETZEN, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_FIXED, ENTRY(SC_OPCODE_FIXED_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FEST, 3, { 0, 0, 1 } },
+        { SC_OPCODE_FIND, ENTRY(SC_OPCODE_FIND_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FINDEN, 3, { 0, 0, 1 } },
+        { SC_OPCODE_EXACT, ENTRY(SC_OPCODE_EXACT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_IDENTISCH, 2, { 0, 0 } },
+        { SC_OPCODE_LEFT, ENTRY(SC_OPCODE_LEFT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LINKS, 2, { 0, 1 } },
+        { SC_OPCODE_RIGHT, ENTRY(SC_OPCODE_RIGHT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RECHTS, 2, { 0, 1 } },
+        { SC_OPCODE_SEARCH, ENTRY(SC_OPCODE_SEARCH_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SUCHEN, 3, { 0, 0, 1 } },
+        { SC_OPCODE_MID, ENTRY(SC_OPCODE_MID_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEIL, 3, { 0, 0, 0 } },
+        { SC_OPCODE_TEXT, ENTRY(SC_OPCODE_TEXT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXT, 2, { 0, 0 } },
+        { SC_OPCODE_SUBSTITUTE, ENTRY(SC_OPCODE_SUBSTITUTE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WECHSELN, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_REPT, ENTRY(SC_OPCODE_REPT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WIEDERHOLEN, 2, { 0, 0 } },
+        { SC_OPCODE_CONCAT, ENTRY(SC_OPCODE_CONCAT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_VERKETTEN, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MAT_DET, ENTRY(SC_OPCODE_MAT_DET_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MDET, 1, { 0 } },
+        { SC_OPCODE_MAT_INV, ENTRY(SC_OPCODE_MAT_INV_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MINV, 1, { 0 } },
+        { SC_OPCODE_MAT_MULT, ENTRY(SC_OPCODE_MAT_MULT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MMULT, 2, { 0, 0 } },
+        { SC_OPCODE_MAT_TRANS, ENTRY(SC_OPCODE_MAT_TRANS_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MTRANS, 1, { 0 } },
+        { SC_OPCODE_MATRIX_UNIT, ENTRY(SC_OPCODE_MATRIX_UNIT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_EINHEITSMATRIX, 1, { 0 } },
+        { SC_OPCODE_HYP_GEOM_DIST, ENTRY(SC_OPCODE_HYP_GEOM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYPGEOMVERT, 5, { 0, 0, 0, 0, 1 } },
+        { SC_OPCODE_LOG_NORM_DIST, ENTRY(SC_OPCODE_LOG_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMVERT, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_T_DIST, ENTRY(SC_OPCODE_T_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TVERT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_DIST, ENTRY(SC_OPCODE_F_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FVERT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CHI_DIST, ENTRY(SC_OPCODE_CHI_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT, 2, { 0, 0 } },
+        { SC_OPCODE_WEIBULL, ENTRY(SC_OPCODE_WEIBULL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_NEG_BINOM_VERT, ENTRY(SC_OPCODE_NEG_BINOM_VERT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMVERT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CRIT_BINOM, ENTRY(SC_OPCODE_CRIT_BINOM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KRITBINOM, 3, { 0, 0, 0 } },
+        { SC_OPCODE_KURT, ENTRY(SC_OPCODE_KURT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KURT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_HAR_MEAN, ENTRY(SC_OPCODE_HAR_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HARMITTEL, VAR_ARGS, { 0 } },
+        { SC_OPCODE_GEO_MEAN, ENTRY(SC_OPCODE_GEO_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GEOMITTEL, VAR_ARGS, { 0 } },
+        { SC_OPCODE_STANDARD, ENTRY(SC_OPCODE_STANDARD_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDARDISIERUNG, 3, { 0, 0, 0 } },
+        { SC_OPCODE_AVE_DEV, ENTRY(SC_OPCODE_AVE_DEV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELABW, VAR_ARGS, { 0 } },
+        { SC_OPCODE_SKEW, ENTRY(SC_OPCODE_SKEW_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHIEFE, VAR_ARGS, { 0 } },
+        { SC_OPCODE_DEV_SQ, ENTRY(SC_OPCODE_DEV_SQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SUMQUADABW, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MEDIAN, ENTRY(SC_OPCODE_MEDIAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MEDIAN, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MODAL_VALUE, ENTRY(SC_OPCODE_MODAL_VALUE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODALWERT, VAR_ARGS, { 0 } },
+        { SC_OPCODE_Z_TEST, ENTRY(SC_OPCODE_Z_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GTEST, 3, { 0, 0, 1 } },
+        { SC_OPCODE_T_TEST, ENTRY(SC_OPCODE_T_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_RANK, ENTRY(SC_OPCODE_RANK_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANG, 3, { 0, 0, 1 } },
+        { SC_OPCODE_PERCENTILE, ENTRY(SC_OPCODE_PERCENTILE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTIL, 2, { 0, 0 } },
+        { SC_OPCODE_PERCENT_RANK, ENTRY(SC_OPCODE_PERCENT_RANK_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTILSRANG, 3, { 0, 0, 1 } },
+        { SC_OPCODE_LARGE, ENTRY(SC_OPCODE_LARGE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KGROESSTE, 2, { 0, 0 } },
+        { SC_OPCODE_SMALL, ENTRY(SC_OPCODE_SMALL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KKLEINSTE, 2, { 0, 0 } },
+        { SC_OPCODE_FREQUENCY, ENTRY(SC_OPCODE_FREQUENCY_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_HAEUFIGKEIT, 2, { 0, 0 } },
+        { SC_OPCODE_QUARTILE, ENTRY(SC_OPCODE_QUARTILE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE, 2, { 0, 0 } },
+        { SC_OPCODE_NORM_INV, ENTRY(SC_OPCODE_NORM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CONFIDENCE, ENTRY(SC_OPCODE_CONFIDENCE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KONFIDENZ, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_TEST, ENTRY(SC_OPCODE_F_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FTEST, 2, { 0, 0 } },
+        { SC_OPCODE_TRIM_MEAN, ENTRY(SC_OPCODE_TRIM_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GESTUTZTMITTEL, 2, { 0, 0 } },
+        { SC_OPCODE_PROB, ENTRY(SC_OPCODE_PROB_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WAHRSCHBEREICH, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_CORREL, ENTRY(SC_OPCODE_CORREL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KORREL, 2, { 0, 0 } },
+        { SC_OPCODE_COVAR, ENTRY(SC_OPCODE_COVAR_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KOVAR, 2, { 0, 0 } },
+        { SC_OPCODE_PEARSON, ENTRY(SC_OPCODE_PEARSON_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PEARSON, 2, { 0, 0 } },
+        { SC_OPCODE_RSQ, ENTRY(SC_OPCODE_RSQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BESTIMMTHEITSMASS, 2, { 0, 0 } },
+        { SC_OPCODE_STEYX, ENTRY(SC_OPCODE_STEYX_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STFEHLERYX, 2, { 0, 0 } },
+        { SC_OPCODE_SLOPE, ENTRY(SC_OPCODE_SLOPE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STEIGUNG, 2, { 0, 0 } },
+        { SC_OPCODE_INTERCEPT, ENTRY(SC_OPCODE_INTERCEPT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ACHSENABSCHNITT, 2, { 0, 0 } },
+        { SC_OPCODE_TREND, ENTRY(SC_OPCODE_TREND_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_TREND, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_GROWTH, ENTRY(SC_OPCODE_GROWTH_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_VARIATION, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_LINEST, ENTRY(SC_OPCODE_LINEST_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RGP, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_LOGEST, ENTRY(SC_OPCODE_LOGEST_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RKP, 4, { 0, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST, ENTRY(SC_OPCODE_FORECAST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHAETZER, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CHI_INV, ENTRY(SC_OPCODE_CHI_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV, 2, { 0, 0 } },
+        { SC_OPCODE_GAMMA_DIST, ENTRY(SC_OPCODE_GAMMA_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAVERT, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_GAMMA_INV, ENTRY(SC_OPCODE_GAMMA_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV, 3, { 0, 0, 0 } },
+        { SC_OPCODE_T_INV, ENTRY(SC_OPCODE_T_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV, 2, { 0, 0 } },
+        { SC_OPCODE_F_INV, ENTRY(SC_OPCODE_F_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FINV, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CHI_TEST, ENTRY(SC_OPCODE_CHI_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST, 2, { 0, 0 } },
+        { SC_OPCODE_LOG_INV, ENTRY(SC_OPCODE_LOG_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 1, 1 } },
+        { SC_OPCODE_BETA_DIST, ENTRY(SC_OPCODE_BETA_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAVERT, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_BETA_INV, ENTRY(SC_OPCODE_BETA_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_WEEK, ENTRY(SC_OPCODE_WEEK_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_KALENDERWOCHE, 2, { 0, 1 } },
+        { SC_OPCODE_GET_DAY_OF_WEEK, ENTRY(SC_OPCODE_GET_DAY_OF_WEEK_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WOCHENTAG, 2, { 0, 1 } },
+        { SC_OPCODE_STYLE, ENTRY(SC_OPCODE_STYLE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VORLAGE, 3, { 0, 1, 1 } },
+        { SC_OPCODE_DDE, ENTRY(SC_OPCODE_DDE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_DDE, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_BASE, ENTRY(SC_OPCODE_BASE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BASIS, 3, { 0, 0, 1 } },
+        { SC_OPCODE_SHEET, ENTRY(SC_OPCODE_SHEET_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLE, 1, { 1 } },
+        { SC_OPCODE_SHEETS, ENTRY(SC_OPCODE_SHEETS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLEN, 1, { 1 } },
+        { SC_OPCODE_MIN_A, ENTRY(SC_OPCODE_MIN_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MAX_A, ENTRY(SC_OPCODE_MAX_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_AVERAGE_A, ENTRY(SC_OPCODE_AVERAGE_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERTA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_ST_DEV_A, ENTRY(SC_OPCODE_ST_DEV_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_ST_DEV_P_A, ENTRY(SC_OPCODE_ST_DEV_P_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWNA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_VAR_A, ENTRY(SC_OPCODE_VAR_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_VAR_P_A, ENTRY(SC_OPCODE_VAR_P_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZENA, VAR_ARGS, { 0 } },
+        { SC_OPCODE_EASTERSUNDAY, ENTRY(SC_OPCODE_EASTERSUNDAY_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_OSTERSONNTAG, 1, { 0 } },
+        { SC_OPCODE_DECIMAL, ENTRY(SC_OPCODE_DECIMAL_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DEZIMAL, 2, { 0, 0 } },
+        { SC_OPCODE_CONVERT_OOO, ENTRY(SC_OPCODE_CONVERT_OOO_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UMRECHNEN, 3, { 0, 0, 0 } },
+        { SC_OPCODE_ROMAN, ENTRY(SC_OPCODE_ROMAN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ROEMISCH, 2, { 0, 1 } },
+        { SC_OPCODE_MIRR, ENTRY(SC_OPCODE_MIRR_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_QIKV, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CELL, ENTRY(SC_OPCODE_CELL_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ZELLE, 2, { 0, 1 } },
+        { SC_OPCODE_ISPMT, ENTRY(SC_OPCODE_ISPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ISPMT, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_HYPERLINK, ENTRY(SC_OPCODE_HYPERLINK_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_HYPERLINK, 2, { 0, 1 } },
+        { SC_OPCODE_GET_PIVOT_DATA, ENTRY(SC_OPCODE_GET_PIVOT_DATA_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_GETPIVOTDATA, VAR_ARGS+2, { 0, 0, 1 } },
+        { SC_OPCODE_EUROCONVERT, ENTRY(SC_OPCODE_EUROCONVERT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EUROCONVERT, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_NUMBERVALUE, ENTRY(SC_OPCODE_NUMBERVALUE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_NUMBERVALUE, 3, { 0, 1, 1 } },
+        { SC_OPCODE_CHISQ_DIST, ENTRY(SC_OPCODE_CHISQ_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST, 3, { 0, 0, 1 } },
+        { SC_OPCODE_CHISQ_INV, ENTRY(SC_OPCODE_CHISQ_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV, 2, { 0, 0 } },
+        { SC_OPCODE_BITAND, ENTRY(SC_OPCODE_BITAND_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITAND, 2, { 0, 0 } },
+        { SC_OPCODE_BITOR, ENTRY(SC_OPCODE_BITOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITOR, 2, { 0, 0 } },
+        { SC_OPCODE_BITXOR, ENTRY(SC_OPCODE_BITXOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITXOR, 2, { 0, 0 } },
+        { SC_OPCODE_BITRSHIFT, ENTRY(SC_OPCODE_BITRSHIFT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITRSHIFT, 2, { 0, 0 } },
+        { SC_OPCODE_BITLSHIFT, ENTRY(SC_OPCODE_BITLSHIFT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITLSHIFT, 2, { 0, 0 } },
+        { SC_OPCODE_GET_DATEDIF, ENTRY(SC_OPCODE_GET_DATEDIF_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATEDIF, 3, { 0, 0, 0 } },
+        { SC_OPCODE_XOR, ENTRY(SC_OPCODE_XOR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_XOR, VAR_ARGS, { 0 } },
+        { SC_OPCODE_AVERAGE_IF, ENTRY(SC_OPCODE_AVERAGE_IF_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIF, 3, { 0, 0, 1 } },
+        { SC_OPCODE_SUM_IFS, ENTRY(SC_OPCODE_SUM_IFS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } },
+        { SC_OPCODE_AVERAGE_IFS, ENTRY(SC_OPCODE_AVERAGE_IFS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } },
+        { SC_OPCODE_COUNT_IFS, ENTRY(SC_OPCODE_COUNT_IFS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COUNTIFS, PAIRED_VAR_ARGS, { 0, 0 } },
+        { SC_OPCODE_SKEWP, ENTRY(SC_OPCODE_SKEWP_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SKEWP, VAR_ARGS, { 0 } },
+        { SC_OPCODE_LENB, ENTRY(SC_OPCODE_LENB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LENB, 1, { 0 } },
+        { SC_OPCODE_RIGHTB, ENTRY(SC_OPCODE_RIGHTB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RIGHTB, 2, { 0, 1 } },
+        { SC_OPCODE_LEFTB, ENTRY(SC_OPCODE_LEFTB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LEFTB, 2, { 0, 1 } },
+        { SC_OPCODE_MIDB, ENTRY(SC_OPCODE_MIDB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_MIDB, 3, { 0, 0, 0 } },
+        { SC_OPCODE_FILTERXML, ENTRY(SC_OPCODE_FILTERXML_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FILTERXML, 2, { 0, 0 } },
+        { SC_OPCODE_WEBSERVICE, ENTRY(SC_OPCODE_WEBSERVICE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WEBSERVICE, 1, { 0, 0 } },
+        { SC_OPCODE_COVARIANCE_S, ENTRY(SC_OPCODE_COVARIANCE_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_S, 2, { 0, 0 } },
+        { SC_OPCODE_COVARIANCE_P, ENTRY(SC_OPCODE_COVARIANCE_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_P, 2, { 0, 0 } },
+        { SC_OPCODE_ST_DEV_P_MS, ENTRY(SC_OPCODE_ST_DEV_P_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_P_MS, VAR_ARGS, { 0 } },
+        { SC_OPCODE_ST_DEV_S, ENTRY(SC_OPCODE_ST_DEV_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_S, VAR_ARGS, { 0 } },
+        { SC_OPCODE_VAR_P_MS, ENTRY(SC_OPCODE_VAR_P_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_P_MS, VAR_ARGS, { 0 } },
+        { SC_OPCODE_VAR_S, ENTRY(SC_OPCODE_VAR_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_S, VAR_ARGS, { 0 } },
+        { SC_OPCODE_BETA_DIST_MS, ENTRY(SC_OPCODE_BETA_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETADIST_MS, 6, { 0, 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_BETA_INV_MS, ENTRY(SC_OPCODE_BETA_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV_MS, 5, { 0, 0, 0, 1, 1 } },
+        { SC_OPCODE_BINOM_DIST_MS, ENTRY(SC_OPCODE_BINOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_DIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_BINOM_INV, ENTRY(SC_OPCODE_BINOM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_INV_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CHI_DIST_MS, ENTRY(SC_OPCODE_CHI_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT_MS, 2, { 0, 0 } },
+        { SC_OPCODE_CHI_INV_MS, ENTRY(SC_OPCODE_CHI_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV_MS, 2, { 0, 0 } },
+        { SC_OPCODE_CHI_TEST_MS, ENTRY(SC_OPCODE_CHI_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST_MS, 2, { 0, 0 } },
+        { SC_OPCODE_CHISQ_DIST_MS, ENTRY(SC_OPCODE_CHISQ_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CHISQ_INV_MS, ENTRY(SC_OPCODE_CHISQ_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV_MS, 2, { 0, 0 } },
+        { SC_OPCODE_CONFIDENCE_N, ENTRY(SC_OPCODE_CONFIDENCE_N_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_N, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CONFIDENCE_T, ENTRY(SC_OPCODE_CONFIDENCE_T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_T, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_DIST_LT, ENTRY(SC_OPCODE_F_DIST_LT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_LT, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_F_DIST_RT, ENTRY(SC_OPCODE_F_DIST_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_RT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_INV_LT, ENTRY(SC_OPCODE_F_INV_LT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_LT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_INV_RT, ENTRY(SC_OPCODE_F_INV_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_RT, 3, { 0, 0, 0 } },
+        { SC_OPCODE_F_TEST_MS, ENTRY(SC_OPCODE_F_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_TEST_MS, 2, { 0, 0 } },
+        { SC_OPCODE_EXP_DIST_MS, ENTRY(SC_OPCODE_EXP_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXP_DIST_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_HYP_GEOM_DIST_MS, ENTRY(SC_OPCODE_HYP_GEOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYP_GEOM_DIST_MS, 5, { 0, 0, 0, 0, 0 } },
+        { SC_OPCODE_POISSON_DIST_MS, ENTRY(SC_OPCODE_POISSON_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON_DIST_MS, 3, { 0, 0, 1 } },
+        { SC_OPCODE_WEIBULL_MS, ENTRY(SC_OPCODE_WEIBULL_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL_DIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_GAMMA_DIST_MS, ENTRY(SC_OPCODE_GAMMA_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMADIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_GAMMA_INV_MS, ENTRY(SC_OPCODE_GAMMA_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_LOG_NORM_DIST_MS, ENTRY(SC_OPCODE_LOG_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMDIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_LOG_INV_MS, ENTRY(SC_OPCODE_LOG_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 0, 0 } },
+        { SC_OPCODE_NORM_DIST_MS, ENTRY(SC_OPCODE_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMDIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_NORM_INV_MS, ENTRY(SC_OPCODE_NORM_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_STD_NORM_DIST_MS, ENTRY(SC_OPCODE_STD_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMDIST_MS, 2, { 0, 0 } },
+        { SC_OPCODE_S_NORM_INV_MS, ENTRY(SC_OPCODE_S_NORM_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMINV_MS, 1, { 0 } },
+        { SC_OPCODE_T_DIST_MS, ENTRY(SC_OPCODE_T_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_MS, 3, { 0, 0, 0 } },
+        { SC_OPCODE_T_DIST_RT, ENTRY(SC_OPCODE_T_DIST_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_RT, 2, { 0, 0 } },
+        { SC_OPCODE_T_DIST_2T, ENTRY(SC_OPCODE_T_DIST_2T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_2T, 2, { 0, 0 } },
+        { SC_OPCODE_T_INV_2T, ENTRY(SC_OPCODE_T_INV_2T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_2T, 2, { 0, 0 } },
+        { SC_OPCODE_T_INV_MS, ENTRY(SC_OPCODE_T_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_MS, 2, { 0, 0 } },
+        { SC_OPCODE_T_TEST_MS, ENTRY(SC_OPCODE_T_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_PERCENTILE_INC, ENTRY(SC_OPCODE_PERCENTILE_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_INC, 2, { 0, 0 } },
+        { SC_OPCODE_PERCENT_RANK_INC, ENTRY(SC_OPCODE_PERCENT_RANK_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_INC, 3, { 0, 0, 1 } },
+        { SC_OPCODE_QUARTILE_INC, ENTRY(SC_OPCODE_QUARTILE_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_INC, 2, { 0, 0 } },
+        { SC_OPCODE_RANK_EQ, ENTRY(SC_OPCODE_RANK_EQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_EQ, 3, { 0, 0, 1 } },
+        { SC_OPCODE_PERCENTILE_EXC, ENTRY(SC_OPCODE_PERCENTILE_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_EXC, 2, { 0, 0 } },
+        { SC_OPCODE_PERCENT_RANK_EXC, ENTRY(SC_OPCODE_PERCENT_RANK_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_EXC, 3, { 0, 0, 1 } },
+        { SC_OPCODE_QUARTILE_EXC, ENTRY(SC_OPCODE_QUARTILE_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_EXC, 2, { 0, 0 } },
+        { SC_OPCODE_RANK_AVG, ENTRY(SC_OPCODE_RANK_AVG_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_AVG, 3, { 0, 0, 1 } },
+        { SC_OPCODE_MODAL_VALUE_MS, ENTRY(SC_OPCODE_MODAL_VALUE_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MS, VAR_ARGS, { 0 } },
+        { SC_OPCODE_MODAL_VALUE_MULTI, ENTRY(SC_OPCODE_MODAL_VALUE_MULTI_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MULTI, VAR_ARGS, { 0 } },
+        { SC_OPCODE_NEG_BINOM_DIST_MS, ENTRY(SC_OPCODE_NEG_BINOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMDIST_MS, 4, { 0, 0, 0, 0 } },
+        { SC_OPCODE_Z_TEST_MS, ENTRY(SC_OPCODE_Z_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_Z_TEST_MS, 3, { 0, 0, 1 } },
+        { SC_OPCODE_CEIL_MS, ENTRY(SC_OPCODE_CEIL_MS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MS, 2, { 0, 0 } },
+        { SC_OPCODE_CEIL_ISO, ENTRY(SC_OPCODE_CEIL_ISO_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_ISO, 2, { 0, 1 } },
+        { SC_OPCODE_FLOOR_MS, ENTRY(SC_OPCODE_FLOOR_MS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MS, 2, { 0, 0 } },
+        { SC_OPCODE_NETWORKDAYS_MS, ENTRY(SC_OPCODE_NETWORKDAYS_MS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS_MS, 4, { 0, 0, 1, 1 } },
+        { SC_OPCODE_WORKDAY_MS, ENTRY(SC_OPCODE_WORKDAY_MS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WORKDAY_MS, 4, { 0, 0, 1, 1 } },
+        { SC_OPCODE_AGGREGATE, ENTRY(SC_OPCODE_AGGREGATE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AGGREGATE, VAR_ARGS+3, { 0, 0, 0, 1 } },
+        { SC_OPCODE_COLOR, ENTRY(SC_OPCODE_COLOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COLOR, 4, { 0, 0, 0, 1 } },
+        { SC_OPCODE_CEIL_MATH, ENTRY(SC_OPCODE_CEIL_MATH_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MATH, 3, { 0, 1, 1 } },
+        { SC_OPCODE_CEIL_PRECISE, ENTRY(SC_OPCODE_CEIL_PRECISE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_PRECISE, 2, { 0, 1 } },
+        { SC_OPCODE_NETWORKDAYS, ENTRY(SC_OPCODE_NETWORKDAYS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS, 4, { 0, 0, 1, 1 } },
+        { SC_OPCODE_FLOOR_MATH, ENTRY(SC_OPCODE_FLOOR_MATH_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MATH, 3, { 0, 1, 1 } },
+        { SC_OPCODE_FLOOR_PRECISE, ENTRY(SC_OPCODE_FLOOR_PRECISE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_PRECISE, 2, { 0, 1 } },
+        { SC_OPCODE_RAWSUBTRACT, ENTRY(SC_OPCODE_RAWSUBTRACT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAWSUBTRACT, VAR_ARGS+2, { 0, 0, 1 } },
+        { SC_OPCODE_WEEKNUM_OOO, ENTRY(SC_OPCODE_WEEKNUM_OOO_ARY), 2, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WEEKNUM_OOO, 2, { 0, 0 } },
+        { SC_OPCODE_FORECAST_ETS_ADD, ENTRY(SC_OPCODE_FORECAST_ETS_ADD_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_ADD, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_SEA, ENTRY(SC_OPCODE_FORECAST_ETS_SEA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_SEA, 4, { 0, 0, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_MUL, ENTRY(SC_OPCODE_FORECAST_ETS_MUL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_MUL, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_PIA, ENTRY(SC_OPCODE_FORECAST_ETS_PIA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIA, 7, { 0, 0, 0, 1, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_PIM, ENTRY(SC_OPCODE_FORECAST_ETS_PIM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIM, 7, { 0, 0, 0, 1, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_STA, ENTRY(SC_OPCODE_FORECAST_ETS_STA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STA, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_ETS_STM, ENTRY(SC_OPCODE_FORECAST_ETS_STM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STM, 6, { 0, 0, 0, 1, 1, 1 } },
+        { SC_OPCODE_FORECAST_LIN, ENTRY(SC_OPCODE_FORECAST_LIN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_LIN, 3, { 0, 0, 0 } },
+        { SC_OPCODE_CONCAT_MS, ENTRY(SC_OPCODE_CONCAT_MS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CONCAT_MS, VAR_ARGS, { 0 } },
+        { SC_OPCODE_TEXTJOIN_MS, ENTRY(SC_OPCODE_TEXTJOIN_MS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXTJOIN_MS, VAR_ARGS + 2, { 0, 0, 0 } },
+        { SC_OPCODE_IFS_MS, ENTRY(SC_OPCODE_IFS_MS_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFS_MS, PAIRED_VAR_ARGS, { 0, 0 } },
+        { SC_OPCODE_SWITCH_MS, ENTRY(SC_OPCODE_SWITCH_MS_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_SWITCH_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
+        { SC_OPCODE_MINIFS_MS, ENTRY(SC_OPCODE_MINIFS_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
+        { SC_OPCODE_MAXIFS_MS, ENTRY(SC_OPCODE_MAXIFS_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } },
+        { SC_OPCODE_ROUNDSIG, ENTRY(SC_OPCODE_ROUNDSIG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ROUNDSIG, 2, { 0, 0 } },
+        { SC_OPCODE_REPLACEB, ENTRY(SC_OPCODE_REPLACEB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_REPLACEB, 4, { 0, 0, 0, 0 } }
     };
 
     ScFuncDesc* pDesc = nullptr;
@@ -810,23 +821,23 @@ ScFunctionList::ScFunctionList()
     // otherwise the sub resources within the resource blocks and the
     // resource blocks themselves would had to be ordered according to
     // OpCodes, which is utopian...
+    ScFuncDescCore* pDescsEnd = aDescs + SAL_N_ELEMENTS(aDescs);
     for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
     {
-        ResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i, *SC_MOD()->GetResMgr());
-        aRes.SetRT(RSC_STRINGARRAY);
+        ScFuncDescCore *pEntry = std::lower_bound(aDescs, pDescsEnd, i,
+            [](const ScFuncDescCore &rItem, sal_uInt16 key)
+            {
+                return rItem.nOpCode < key;
+            }
+        );
+
         // Opcode Resource available?
-        if (SC_MOD()->GetResMgr()->IsAvailable(aRes))
+        if (pEntry != pDescsEnd && pEntry->nOpCode == i && pEntry->pResource)
         {
             pDesc = new ScFuncDesc;
             bool bSuppressed = false;
 
-            ScFuncDescCore *pEntry = std::lower_bound(aDescs, aDescs + SAL_N_ELEMENTS(aDescs), i,
-                [](const ScFuncDescCore &rItem, sal_uInt16 key)
-                {
-                    return rItem.nOpCode < key;
-                }
-            );
-            ScFuncRes aSubRes(aRes, *pEntry, pDesc, bSuppressed);
+            ScFuncRes aSubRes(*pEntry, pDesc, bSuppressed);
             // Instead of dealing with this exceptional case at 1001 places
             // we simply don't add an entirely suppressed function to the
             // list and delete it.
@@ -1181,8 +1192,7 @@ OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
         return OUString();
     }
 
-    ResStringArray aStringArray(ResId(RID_FUNCTION_CATEGORIES, *SC_MOD()->GetResMgr()));
-    return aStringArray.GetString(_nCategoryNumber);
+    return ScResId(RID_FUNCTION_CATEGORIES[_nCategoryNumber]);
 }
 
 sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const
@@ -1204,9 +1214,9 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke
 }
 
 // class ScFuncRes:
-ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDesc, bool & rbSuppressed)
+ScFuncRes::ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc* pDesc, bool& rbSuppressed)
 {
-    const sal_uInt16 nOpCode = aRes.GetId() - RID_SC_FUNC_DESCRIPTIONS_START;
+    const sal_uInt16 nOpCode = rEntry.nOpCode;
     sal_uInt16 nFunctionFlags = rEntry.nFunctionFlags;
     // Bit 1: entirely suppressed
     // Bit 2: hidden unless used
@@ -1239,8 +1249,7 @@ ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDes
     }
 
     pDesc->pFuncName = new OUString(ScCompiler::GetNativeSymbol(static_cast<OpCode>(nOpCode)));
-    ResStringArray aArr(aRes);
-    pDesc->pFuncDesc = new OUString(aArr.GetString(0));
+    pDesc->pFuncDesc = new OUString(ScResId(rEntry.pResource[0]));
 
     if (nArgs)
     {
@@ -1250,8 +1259,11 @@ ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDes
         pDesc->maDefArgDescs.resize(nArgs);
         for (sal_uInt16 i = 0; i < nArgs; ++i)
         {
-            pDesc->maDefArgNames[i] = aArr.GetString((i*2)+1);
-            pDesc->maDefArgDescs[i] = aArr.GetString((i*2)+2);
+            size_t nIndex = (i * 2) + 1;
+            if (nIndex < rEntry.nResourceLen)
+                pDesc->maDefArgNames[i] = ScResId(rEntry.pResource[nIndex]);
+            if (nIndex + 1 < rEntry.nResourceLen)
+                pDesc->maDefArgDescs[i] = ScResId(rEntry.pResource[nIndex + 1]);
             // If empty and variable number of arguments and last parameter and
             // parameter is optional and the previous is not optional, repeat
             // previous parameter name and description.
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0bbe0c7fd0cf..73af65a3e149 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -37,7 +37,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
 #include <sal/macros.h>
-#include <tools/rcid.h>
 #include <unotools/charclass.hxx>
 #include <unotools/securityoptions.hxx>
 #include <stdlib.h>
@@ -74,8 +73,7 @@
 #include "parclass.hxx"
 #include "funcdesc.hxx"
 #include "globstr.hrc"
-#include "scfuncs.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include "appoptio.hxx"
 #include "editutil.hxx"
@@ -87,7 +85,7 @@ ScAutoFormat*   ScGlobal::pAutoFormat = nullptr;
 LegacyFuncCollection* ScGlobal::pLegacyFuncCollection = nullptr;
 ScUnoAddInCollection* ScGlobal::pAddInCollection = nullptr;
 ScUserList*     ScGlobal::pUserList = nullptr;
-OUString**      ScGlobal::ppRscString = nullptr;
+std::map<const char*, OUString>* ScGlobal::pRscString = nullptr;
 LanguageType    ScGlobal::eLnge = LANGUAGE_SYSTEM;
 css::lang::Locale*     ScGlobal::pLocale = nullptr;
 SvtSysLocale*   ScGlobal::pSysLocale = nullptr;
@@ -313,109 +311,87 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
     }
 }
 
-const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
+const OUString& ScGlobal::GetRscString(const char* pResId)
 {
-    assert( nIndex < SC_GLOBSTR_STR_COUNT);
-    if( !ppRscString[ nIndex ] )
-    {
-        OpCode eOp = ocNone;
-        // Map former globstr.src strings moved to compiler.src
-        switch (nIndex)
-        {
-            case STR_NULL_ERROR:
-                eOp = ocErrNull;
-                break;
-            case STR_DIV_ZERO:
-                eOp = ocErrDivZero;
-                break;
-            case STR_NO_VALUE:
-                eOp = ocErrValue;
-                break;
-            case STR_NOREF_STR:
-                eOp = ocErrRef;
-                break;
-            case STR_NO_NAME_REF:
-                eOp = ocErrName;
-                break;
-            case STR_NUM_ERROR:
-                eOp = ocErrNum;
-                break;
-            case STR_NV_STR:
-                eOp = ocErrNA;
-                break;
-            default:
-                ;   // nothing
-        }
-        if (eOp != ocNone)
-            ppRscString[ nIndex ] = new OUString(ScCompiler::GetNativeSymbol(eOp));
-        else
-            ppRscString[ nIndex ] = new OUString(ScResId(nIndex + RID_GLOBSTR_OFFSET));
-    }
-    return *ppRscString[ nIndex ];
+    if (pRscString->find(pResId) == pRscString->end())
+        (*pRscString)[pResId] = ScResId(pResId);
+    return (*pRscString)[pResId];
 }
 
 OUString ScGlobal::GetErrorString(FormulaError nErr)
 {
-    sal_uInt16 nErrNumber;
+    const char* pErrNumber;
     switch (nErr)
     {
-        case FormulaError::NotAvailable       : nErrNumber = STR_NV_STR; break;
-        case FormulaError::NoRef              : nErrNumber = STR_NO_REF_TABLE; break;
-        case FormulaError::NoName             : nErrNumber = STR_NO_NAME_REF; break;
-        case FormulaError::NoAddin            : nErrNumber = STR_NO_ADDIN; break;
-        case FormulaError::NoMacro            : nErrNumber = STR_NO_MACRO; break;
-        case FormulaError::NoValue            : nErrNumber = STR_NO_VALUE; break;
-        case FormulaError::NoCode             : nErrNumber = STR_NULL_ERROR; break;
-        case FormulaError::DivisionByZero     : nErrNumber = STR_DIV_ZERO; break;
-        case FormulaError::IllegalFPOperation : nErrNumber = STR_NUM_ERROR; break;
-
-        default          : return GetRscString(STR_ERROR_STR) + OUString::number( (int)nErr );
+        case FormulaError::NoRef:
+            pErrNumber = STR_NO_REF_TABLE;
+            break;
+        case FormulaError::NoAddin:
+            pErrNumber = STR_NO_ADDIN;
+            break;
+        case FormulaError::NoMacro:
+            pErrNumber = STR_NO_MACRO;
+            break;
+        case FormulaError::NotAvailable:
+            return ScCompiler::GetNativeSymbol(ocErrNA);
+        case FormulaError::NoName:
+            return ScCompiler::GetNativeSymbol(ocErrName);
+        case FormulaError::NoValue:
+            return ScCompiler::GetNativeSymbol(ocErrValue);
+        case FormulaError::NoCode:
+            return ScCompiler::GetNativeSymbol(ocErrNull);
+        case FormulaError::DivisionByZero:
+            return ScCompiler::GetNativeSymbol(ocErrDivZero);
+        case FormulaError::IllegalFPOperation:
+            return ScCompiler::GetNativeSymbol(ocErrNum);
+        default:
+            return GetRscString(STR_ERROR_STR) + OUString::number( (int)nErr );
     }
-    return GetRscString( nErrNumber );
+    return GetRscString(pErrNumber);
 }
 
 OUString ScGlobal::GetLongErrorString(FormulaError nErr)
 {
-    sal_uInt16 nErrNumber;
+    const char* pErrNumber;
     switch (nErr)
     {
         case FormulaError::NONE:
-            nErrNumber = 0;
+            pErrNumber = nullptr;
             break;
         case FormulaError::IllegalArgument:
-            nErrNumber = STR_LONG_ERR_ILL_ARG;
+            pErrNumber = STR_LONG_ERR_ILL_ARG;
         break;
         case FormulaError::IllegalFPOperation:
-            nErrNumber = STR_LONG_ERR_ILL_FPO;
+            pErrNumber = STR_LONG_ERR_ILL_FPO;
         break;
         case FormulaError::IllegalChar:
-            nErrNumber = STR_LONG_ERR_ILL_CHAR;
+            pErrNumber = STR_LONG_ERR_ILL_CHAR;
         break;
         case FormulaError::IllegalParameter:
-            nErrNumber = STR_LONG_ERR_ILL_PAR;
+            pErrNumber = STR_LONG_ERR_ILL_PAR;
         break;
         case FormulaError::Pair:
         case FormulaError::PairExpected:
-            nErrNumber = STR_LONG_ERR_PAIR;
+            pErrNumber = STR_LONG_ERR_PAIR;
         break;
         case FormulaError::OperatorExpected:
-            nErrNumber = STR_LONG_ERR_OP_EXP;
+            pErrNumber = STR_LONG_ERR_OP_EXP;
         break;
         case FormulaError::VariableExpected:
         case FormulaError::ParameterExpected:
-            nErrNumber = STR_LONG_ERR_VAR_EXP;
+            pErrNumber = STR_LONG_ERR_VAR_EXP;
         break;
         case FormulaError::CodeOverflow:
-            nErrNumber = STR_LONG_ERR_CODE_OVF;
+            pErrNumber = STR_LONG_ERR_CODE_OVF;
         break;
         case FormulaError::StringOverflow:
-            nErrNumber = STR_LONG_ERR_STR_OVF;
+            pErrNumber = STR_LONG_ERR_STR_OVF;
         break;
         case FormulaError::StackOverflow:
-            nErrNumber = STR_LONG_ERR_STACK_OVF;
+            pErrNumber = STR_LONG_ERR_STACK_OVF;
         break;
         case FormulaError::MatrixSize:
-            nErrNumber = STR_LONG_ERR_MATRIX_SIZE;
+            pErrNumber = STR_LONG_ERR_MATRIX_SIZE;
         break;
         case FormulaError::UnknownState:
         case FormulaError::UnknownVariable:
@@ -423,44 +399,43 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
         case FormulaError::UnknownStackVariable:
         case FormulaError::UnknownToken:
         case FormulaError::NoCode:
-            nErrNumber = STR_LONG_ERR_SYNTAX;
+            pErrNumber = STR_LONG_ERR_SYNTAX;
         break;
         case FormulaError::CircularReference:
-            nErrNumber = STR_LONG_ERR_CIRC_REF;
+            pErrNumber = STR_LONG_ERR_CIRC_REF;
         break;
         case FormulaError::NoConvergence:
-            nErrNumber = STR_LONG_ERR_NO_CONV;
+            pErrNumber = STR_LONG_ERR_NO_CONV;
         break;
         case FormulaError::NoRef:
-            nErrNumber = STR_LONG_ERR_NO_REF;
+            pErrNumber = STR_LONG_ERR_NO_REF;
         break;
         case FormulaError::NoName:
-            nErrNumber = STR_LONG_ERR_NO_NAME;
+            pErrNumber = STR_LONG_ERR_NO_NAME;
         break;
         case FormulaError::NoAddin:
-            nErrNumber = STR_LONG_ERR_NO_ADDIN;
+            pErrNumber = STR_LONG_ERR_NO_ADDIN;
         break;
         case FormulaError::NoMacro:
-            nErrNumber = STR_LONG_ERR_NO_MACRO;
+            pErrNumber = STR_LONG_ERR_NO_MACRO;
         break;
         case FormulaError::DivisionByZero:
-            nErrNumber = STR_LONG_ERR_DIV_ZERO;
+            pErrNumber = STR_LONG_ERR_DIV_ZERO;
         break;
         case FormulaError::NestedArray:
-            nErrNumber = STR_ERR_LONG_NESTED_ARRAY;
+            pErrNumber = STR_ERR_LONG_NESTED_ARRAY;
         break;
         case FormulaError::NoValue:
-            nErrNumber = STR_LONG_ERR_NO_VALUE;
+            pErrNumber = STR_LONG_ERR_NO_VALUE;
         break;
         case FormulaError::NotAvailable:
-            nErrNumber = STR_LONG_ERR_NV;
+            pErrNumber = STR_LONG_ERR_NV;
         break;
         default:
-            nErrNumber = STR_ERROR_STR;
+            pErrNumber = STR_ERROR_STR;
         break;
     }
-    OUString aRes( GetRscString( nErrNumber ) );
-    return aRes;
+    return GetRscString(pErrNumber);
 }
 
 SvxBrushItem* ScGlobal::GetButtonBrushItem()
@@ -489,8 +464,7 @@ void ScGlobal::Init()
     pCharClass = pSysLocale->GetCharClassPtr();
     pLocaleData = pSysLocale->GetLocaleDataPtr();
 
-    ppRscString = new OUString *[ SC_GLOBSTR_STR_COUNT ];
-    for( sal_uInt16 nC = 0 ; nC < SC_GLOBSTR_STR_COUNT ; nC++ ) ppRscString[ nC ] = nullptr;
+    pRscString = new std::map<const char*, OUString>();
 
     pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND );
     pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND );
@@ -580,15 +554,7 @@ void ScGlobal::Clear()
     DELETEZ(pLegacyFuncCollection);
     DELETEZ(pAddInCollection);
     DELETEZ(pUserList);
-
-    if (ppRscString)
-    {
-        for (sal_uInt16 nC = 0; nC < SC_GLOBSTR_STR_COUNT; ++nC)
-            delete ppRscString[nC];
-        delete[] ppRscString;
-        ppRscString = nullptr;
-    }
-
+    DELETEZ(pRscString);
     DELETEZ(pStarCalcFunctionList); // Destroy before ResMgr!
     DELETEZ(pStarCalcFunctionMgr);
     ScParameterClassification::Exit();
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index cda78f27dd2b..1bd97dcb8e91 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2119,27 +2119,27 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
                             if (aOutString.isEmpty())
                                 aOutString = ScGlobal::GetRscString( STR_EMPTYDATA );
                             aOutString += " ";
-                            sal_uInt16 nStrId = STR_TABLE_ERGEBNIS;
+                            const char* pStrId = STR_TABLE_ERGEBNIS;
                             if ( nResCount == 1 )
                                 switch ( eResFunc[0] )
                                 {
-                                    case SUBTOTAL_FUNC_AVE:     nStrId = STR_FUN_TEXT_AVG;      break;
+                                    case SUBTOTAL_FUNC_AVE:     pStrId = STR_FUN_TEXT_AVG;      break;
                                     case SUBTOTAL_FUNC_CNT:
-                                    case SUBTOTAL_FUNC_CNT2:    nStrId = STR_FUN_TEXT_COUNT;    break;
-                                    case SUBTOTAL_FUNC_MAX:     nStrId = STR_FUN_TEXT_MAX;      break;
-                                    case SUBTOTAL_FUNC_MIN:     nStrId = STR_FUN_TEXT_MIN;      break;
-                                    case SUBTOTAL_FUNC_PROD:    nStrId = STR_FUN_TEXT_PRODUCT;  break;
+                                    case SUBTOTAL_FUNC_CNT2:    pStrId = STR_FUN_TEXT_COUNT;    break;
+                                    case SUBTOTAL_FUNC_MAX:     pStrId = STR_FUN_TEXT_MAX;      break;
+                                    case SUBTOTAL_FUNC_MIN:     pStrId = STR_FUN_TEXT_MIN;      break;
+                                    case SUBTOTAL_FUNC_PROD:    pStrId = STR_FUN_TEXT_PRODUCT;  break;
                                     case SUBTOTAL_FUNC_STD:
-                                    case SUBTOTAL_FUNC_STDP:    nStrId = STR_FUN_TEXT_STDDEV;   break;
-                                    case SUBTOTAL_FUNC_SUM:     nStrId = STR_FUN_TEXT_SUM;      break;
+                                    case SUBTOTAL_FUNC_STDP:    pStrId = STR_FUN_TEXT_STDDEV;   break;
+                                    case SUBTOTAL_FUNC_SUM:     pStrId = STR_FUN_TEXT_SUM;      break;
                                     case SUBTOTAL_FUNC_VAR:
-                                    case SUBTOTAL_FUNC_VARP:    nStrId = STR_FUN_TEXT_VAR;      break;
+                                    case SUBTOTAL_FUNC_VARP:    pStrId = STR_FUN_TEXT_VAR;      break;
                                     default:
                                     {
                                         // added to avoid warnings
                                     }
                                 }
-                            aOutString += ScGlobal::GetRscString( nStrId );
+                            aOutString += ScGlobal::GetRscString(pStrId);
                         }
                         SetString( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, aOutString );
                         ApplyStyle( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, pStyle );
diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src
deleted file mode 100644
index dd3199eda97d..000000000000
--- a/sc/source/core/src/compiler.src
+++ /dev/null
@@ -1,41 +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 "sc.hrc"
-#include <formula/compiler.hrc>
-
-StringArray RID_FUNCTION_CATEGORIES
-{
-    ItemList [ en-US ] =
-    {
-        < "Database" ; >;
-        < "Date&Time" ; >;
-        < "Financial" ; >;
-        < "Information" ; >;
-        < "Logical" ; >;
-        < "Mathematical" ; >;
-        < "Array" ; >;
-        < "Statistical" ; >;
-        < "Spreadsheet" ; >;
-        < "Text" ; >;
-        < "Add-in" ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 67252a1b22a0..085448a2aa1c 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -45,7 +45,7 @@
 #include "addinlis.hxx"
 #include <formula/errorcodes.hxx>
 #include <formula/funcvarargs.h>
-#include "scfuncs.hrc"
+#include "sc.hrc"
 #include "optutil.hxx"
 #include "addincfg.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 5d830cd69999..4dc6b2305bf8 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2007,7 +2007,7 @@ template<typename T > inline void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO
     {
         if ( nTab < 0 || nTab >= pDoc->GetTableCount() )
         {
-            lcl_string_append(r, ScGlobal::GetRscString( STR_NOREF_STR ));
+            lcl_string_append(r, ScCompiler::GetNativeSymbol(ocErrRef));
             return;
         }
         if( nFlags & ScRefFlags::TAB_3D )
@@ -2199,7 +2199,7 @@ OUString ScRange::Format( ScRefFlags nFlags, const ScDocument* pDoc,
 {
     if( !( nFlags & ScRefFlags::VALID ) )
     {
-        return ScGlobal::GetRscString( STR_NOREF_STR );
+        return ScCompiler::GetNativeSymbol(ocErrRef);
     }
 
     OUStringBuffer r;
@@ -2451,7 +2451,7 @@ OUString ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab,
     if ( !pDoc )
         return EMPTY_OUSTRING;
     if ( Tab()+1 > pDoc->GetTableCount() )
-        return ScGlobal::GetRscString( STR_NOREF_STR );
+        return ScCompiler::GetNativeSymbol(ocErrRef);
 
     ScRefFlags nFlags = ScRefFlags::VALID;
     if ( nActTab != Tab() )
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index eb4fe52f3ebc..874321b9becd 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -28,6 +28,7 @@
 #include <vcl/outdev.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <editeng/langitem.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
@@ -744,6 +745,26 @@ void ScAutoFormatData::GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rIte
     rField.SetRotateMode    ( static_cast<const SvxRotateModeItem&>    (rItemSet.Get( ATTR_ROTATE_MODE )) );
 }
 
+static const char* RID_SVXSTR_TBLAFMT[] =
+{
+    RID_SVXSTR_TBLAFMT_3D,
+    RID_SVXSTR_TBLAFMT_BLACK1,
+    RID_SVXSTR_TBLAFMT_BLACK2,
+    RID_SVXSTR_TBLAFMT_BLUE,
+    RID_SVXSTR_TBLAFMT_BROWN,
+    RID_SVXSTR_TBLAFMT_CURRENCY,
+    RID_SVXSTR_TBLAFMT_CURRENCY_3D,
+    RID_SVXSTR_TBLAFMT_CURRENCY_GRAY,
+    RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER,
+    RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE,
+    RID_SVXSTR_TBLAFMT_GRAY,
+    RID_SVXSTR_TBLAFMT_GREEN,
+    RID_SVXSTR_TBLAFMT_LAVENDER,
+    RID_SVXSTR_TBLAFMT_RED,
+    RID_SVXSTR_TBLAFMT_TURQUOISE,
+    RID_SVXSTR_TBLAFMT_YELLOW
+};
+
 bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
 {
     sal_uInt16  nVer = 0;
@@ -764,12 +785,8 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
         if( AUTOFORMAT_DATA_ID_552 <= nVer )
         {
             rStream.ReadUInt16( nStrResId );
-            sal_uInt16 nId = RID_SVXSTR_TBLAFMT_BEGIN + nStrResId;
-            if( RID_SVXSTR_TBLAFMT_BEGIN <= nId &&
-                nId < RID_SVXSTR_TBLAFMT_END )
-            {
-                aName = SvxResId( nId );
-            }
+            if (nStrResId < SAL_N_ELEMENTS(RID_SVXSTR_TBLAFMT))
+                aName = SvxResId(RID_SVXSTR_TBLAFMT[nStrResId]);
             else
                 nStrResId = USHRT_MAX;
         }
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 5177a29189f3..dcf95153c636 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "chgtrack.hxx"
+#include "compiler.hxx"
 #include "formulacell.hxx"
 #include "document.hxx"
 #include "dociter.hxx"
@@ -504,7 +505,7 @@ OUString ScChangeAction::GetRefString(
     OUStringBuffer aBuf;
     ScRefFlags nFlags = ( rRange.IsValid( pDoc ) ? ScRefFlags::VALID : ScRefFlags::ZERO );
     if ( nFlags == ScRefFlags::ZERO )
-        aBuf.append(ScGlobal::GetRscString(STR_NOREF_STR));
+        aBuf.append(ScCompiler::GetNativeSymbol(ocErrRef));
     else
     {
         ScRange aTmpRange( rRange.MakeRange() );
@@ -700,17 +701,17 @@ void ScChangeActionIns::GetDescription(
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
-    sal_uInt16 nWhatId;
+    const char* pWhatId;
     switch ( GetType() )
     {
         case SC_CAT_INSERT_COLS :
-            nWhatId = STR_COLUMN;
+            pWhatId = STR_COLUMN;
         break;
         case SC_CAT_INSERT_ROWS :
-            nWhatId = STR_ROW;
+            pWhatId = STR_ROW;
         break;
         default:
-            nWhatId = STR_AREA;
+            pWhatId = STR_AREA;
     }
 
     OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT);
@@ -718,7 +719,7 @@ void ScChangeActionIns::GetDescription(
     if (nPos >= 0)
     {
         // Construct a range string to replace '#1' first.
-        OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId));
+        OUStringBuffer aBuf(ScGlobal::GetRscString(pWhatId));
         aBuf.append(' ');
         aBuf.append(GetRefString(GetBigRange(), pDoc));
         OUString aRangeStr = aBuf.makeStringAndClear();
@@ -937,17 +938,17 @@ void ScChangeActionDel::GetDescription(
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
-    sal_uInt16 nWhatId;
+    const char* pWhatId;
     switch ( GetType() )
     {
         case SC_CAT_DELETE_COLS :
-            nWhatId = STR_COLUMN;
+            pWhatId = STR_COLUMN;
         break;
         case SC_CAT_DELETE_ROWS :
-            nWhatId = STR_ROW;
+            pWhatId = STR_ROW;
         break;
         default:
-            nWhatId = STR_AREA;
+            pWhatId = STR_AREA;
     }
 
     ScBigRange aTmpRange( GetBigRange() );
@@ -968,7 +969,7 @@ void ScChangeActionDel::GetDescription(
     {
         // Build a string to replace with.
         OUStringBuffer aBuf;
-        aBuf.append(ScGlobal::GetRscString(nWhatId));
+        aBuf.append(ScGlobal::GetRscString(pWhatId));
         aBuf.append(' ');
         aBuf.append(GetRefString(aTmpRange, pDoc));
         OUString aRangeStr = aBuf.makeStringAndClear();
@@ -1521,7 +1522,7 @@ void ScChangeActionContent::GetRefString(
         }
     }
     else
-        rStr = ScGlobal::GetRscString( STR_NOREF_STR );
+        rStr = ScCompiler::GetNativeSymbol(ocErrRef);
 }
 
 bool ScChangeActionContent::Reject( ScDocument* pDoc )
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 0939e8e115c6..870d928b026b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -28,7 +28,6 @@
 #include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <sal/macros.h>
-#include <tools/rcid.h>
 #include <tools/solar.h>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -5015,7 +5014,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu
         }
         else
         {
-            rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+            rBuffer.append(ScCompiler::GetNativeSymbol(ocErrName));
             pConv->makeRefStr(rBuffer, meGrammar, aPos, aErrRef,
                               GetSetupTabNames(), aRef, true, (pArr && pArr->IsFromRangeName()));
         }
@@ -5081,7 +5080,7 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo
                         aBuffer.append( aName);
                     }
                     else
-                        aBuffer.append( ScGlobal::GetRscString( STR_NO_NAME_REF));
+                        aBuffer.append(ScCompiler::GetNativeSymbol(ocErrName));
                     aBuffer.append( pConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR));
                 }
                 aBuffer.append(pData->GetName());
@@ -5141,7 +5140,7 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo
     if ( !aBuffer.isEmpty() )
         rBuffer.append(aBuffer.makeStringAndClear());
     else
-        rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+        rBuffer.append(ScCompiler::GetNativeSymbol(ocErrName));
 }
 
 void ScCompiler::LocalizeString( OUString& rName ) const
diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx
index e8fece39eef2..fb6a2447ec3d 100644
--- a/sc/source/core/tool/stylehelper.cxx
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <osl/diagnose.h>
 
 #include "stylehelper.hxx"
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 46a33554f318..39ddeae9ac9e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -4952,7 +4952,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                         NameType::const_iterator it = rCxt.maGlobalRangeNames.find(nIndex);
                         if (it == rCxt.maGlobalRangeNames.end())
                         {
-                            rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+                            rBuf.append(ScCompiler::GetNativeSymbol(ocErrName));
                             break;
                         }
 
@@ -4973,14 +4973,14 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                                 rBuf.append( aName);
                             }
                             else
-                                rBuf.append( ScGlobal::GetRscString( STR_NO_NAME_REF));
+                                rBuf.append(ScCompiler::GetNativeSymbol(ocErrName));
                             rBuf.append( rCxt.mpRefConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR));
                         }
 
                         sc::TokenStringContext::TabIndexMapType::const_iterator itTab = rCxt.maSheetRangeNames.find(nTab);
                         if (itTab == rCxt.maSheetRangeNames.end())
                         {
-                            rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+                            rBuf.append(ScCompiler::GetNativeSymbol(ocErrName));
                             break;
                         }
 
@@ -4988,7 +4988,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                         NameType::const_iterator it = rNames.find(nIndex);
                         if (it == rNames.end())
                         {
-                            rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+                            rBuf.append(ScCompiler::GetNativeSymbol(ocErrName));
                             break;
                         }
 
@@ -5005,7 +5005,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                 }
                 break;
                 default:
-                    rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
+                    rBuf.append(ScCompiler::GetNativeSymbol(ocErrName));
             }
         }
         break;
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 91f97ec2f626..653fd6f945fe 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -864,24 +864,24 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, ScGeneralFunction e
 {
     OUString aCaption;
 
-    sal_uInt16 nResIdx = 0;
+    const char* pResIdx = nullptr;
     switch( eFunc )
     {
-        case ScGeneralFunction::SUM:       nResIdx = STR_FUN_TEXT_SUM;     break;
-        case ScGeneralFunction::COUNT:     nResIdx = STR_FUN_TEXT_COUNT;   break;
-        case ScGeneralFunction::AVERAGE:   nResIdx = STR_FUN_TEXT_AVG;     break;
-        case ScGeneralFunction::MAX:       nResIdx = STR_FUN_TEXT_MAX;     break;
-        case ScGeneralFunction::MIN:       nResIdx = STR_FUN_TEXT_MIN;     break;
-        case ScGeneralFunction::PRODUCT:   nResIdx = STR_FUN_TEXT_PRODUCT; break;
-        case ScGeneralFunction::COUNTNUMS: nResIdx = STR_FUN_TEXT_COUNT;   break;
-        case ScGeneralFunction::STDEV:     nResIdx = STR_FUN_TEXT_STDDEV;  break;
-        case ScGeneralFunction::STDEVP:    nResIdx = STR_FUN_TEXT_STDDEV;  break;
-        case ScGeneralFunction::VAR:       nResIdx = STR_FUN_TEXT_VAR;     break;
-        case ScGeneralFunction::VARP:      nResIdx = STR_FUN_TEXT_VAR;     break;
+        case ScGeneralFunction::SUM:       pResIdx = STR_FUN_TEXT_SUM;     break;
+        case ScGeneralFunction::COUNT:     pResIdx = STR_FUN_TEXT_COUNT;   break;
+        case ScGeneralFunction::AVERAGE:   pResIdx = STR_FUN_TEXT_AVG;     break;
+        case ScGeneralFunction::MAX:       pResIdx = STR_FUN_TEXT_MAX;     break;
+        case ScGeneralFunction::MIN:       pResIdx = STR_FUN_TEXT_MIN;     break;
+        case ScGeneralFunction::PRODUCT:   pResIdx = STR_FUN_TEXT_PRODUCT; break;
+        case ScGeneralFunction::COUNTNUMS: pResIdx = STR_FUN_TEXT_COUNT;   break;
+        case ScGeneralFunction::STDEV:     pResIdx = STR_FUN_TEXT_STDDEV;  break;
+        case ScGeneralFunction::STDEVP:    pResIdx = STR_FUN_TEXT_STDDEV;  break;
+        case ScGeneralFunction::VAR:       pResIdx = STR_FUN_TEXT_VAR;     break;
+        case ScGeneralFunction::VARP:      pResIdx = STR_FUN_TEXT_VAR;     break;
         default:;
     }
-    if( nResIdx )
-        aCaption = ScGlobal::GetRscString( nResIdx ) + " - ";
+    if (pResIdx)
+        aCaption = ScGlobal::GetRscString(pResIdx) + " - ";
     aCaption += rFieldName;
     return aCaption;
 }
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 823c3b22b251..3a0c121d355b 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -41,8 +41,8 @@ ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText
     Init( pDocShell );
 }
 
-ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ) :
-    maText( ScGlobal::GetRscString( nResId ) )
+ScfProgressBar::ScfProgressBar(SfxObjectShell* pDocShell, const char* pResId)
+    : maText(ScGlobal::GetRscString(pResId))
 {
     Init( pDocShell );
 }
@@ -199,8 +199,8 @@ ScfSimpleProgressBar::ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* p
     Init( nSize );
 }
 
-ScfSimpleProgressBar::ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ) :
-    maProgress( pDocShell, nResId )
+ScfSimpleProgressBar::ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const char* pResId)
+    : maProgress(pDocShell, pResId)
 {
     Init( nSize );
 }
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 75b7899c686b..e319a5c1a0c9 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -70,12 +70,12 @@
 #include <editeng/borderline.hxx>
 #include <unotools/syslocale.hxx>
 
-// Without scres.hrc: error C2679: binary '=' : no operator defined which takes a
+// Without strings.hrc: error C2679: binary '=' : no operator defined which takes a
 // right-hand operand of type 'const class String (__stdcall *)(class ScResId)'
 // at
 // const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable;
 // ?!???
-#include "scres.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 
 #include <com/sun/star/uno/Reference.h>
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 6919831bb004..f00db4ce3842 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -106,8 +106,8 @@ public:
     ScfProgressBar(const ScfProgressBar&) = delete;
     const ScfProgressBar operator=(const ScfProgressBar&) = delete;
 
-    explicit            ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText );
-    explicit            ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId );
+    explicit            ScfProgressBar(SfxObjectShell* pDocShell, const OUString& rText);
+    explicit            ScfProgressBar(SfxObjectShell* pDocShell, const char* pResId);
                         ~ScfProgressBar();
 
     /** Adds a new segment to the progress bar.
@@ -187,8 +187,8 @@ private:
 class ScfSimpleProgressBar
 {
 public:
-    explicit            ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, const OUString& rText );
-    explicit            ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId );
+    explicit            ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const OUString& rText);
+    explicit            ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const char* pResId);
 
     /** Set progress bar to the specified position. */
     void         ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); }
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 832dbb395b72..2112829cf425 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 538bdcd60ebe..392f420ca8a6 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/errinf.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 27440b9dee71..b83acae7751f 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -26,7 +26,7 @@
 #include "docsh.hxx"
 #include "formulacell.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "unonames.hxx"
 #include "detfunc.hxx"
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index ed0fca0877b0..91f6f29ae956 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -45,7 +45,7 @@
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 76bd1b0774d0..5ae0237824aa 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -30,7 +30,7 @@
 #include "AccessibleEditObject.hxx"
 #include "userdat.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "table.hxx"
 #include "markdata.hxx"
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f7f709add1f5..b05d88c05e2e 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -28,7 +28,7 @@
 #include "drwlayer.hxx"
 #include "editsrc.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "DrawModelBroadcaster.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 80f33b6e9516..e610539c4dc8 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -28,7 +28,7 @@
 #include "scitems.hxx"
 #include "attrib.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index da2c3bcc02c3..baa827e18c0d 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -27,7 +27,7 @@
 #include "prevwsh.hxx"
 #include "prevloc.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index d13dfe1e072b..9cabb1f49b5f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -31,7 +31,7 @@
 #include "miscuno.hxx"
 #include "prevloc.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 8d9ee27c0070..a8a51dd51091 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -28,7 +28,7 @@
 #include "attrib.hxx"
 #include "document.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index c456a42f685b..79ba53882d7f 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -38,7 +38,7 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx>
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 #include <algorithm>
 
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index e9c22a9d8e0e..4dd5e0347213 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -21,7 +21,7 @@
 #include "miscuno.hxx"
 #include "document.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "table.hxx"
 
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 4c62091840f8..2b44b67061aa 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -22,29 +22,29 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "AnalysisOfVarianceDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
 
 struct StatisticCalculation {
-    sal_Int16   aLabelId;
+    const char* aLabelId;
     const char* aFormula;
     const char* aResultRangeName;
 };
 
 static StatisticCalculation lclBasicStatistics[] =
 {
-    { STR_ANOVA_LABEL_GROUPS, nullptr,                nullptr          },
+    { STR_ANOVA_LABEL_GROUPS, nullptr,             nullptr       },
     { STRID_CALC_COUNT,       "=COUNT(%RANGE%)",   "COUNT_RANGE" },
     { STRID_CALC_SUM,         "=SUM(%RANGE%)",     "SUM_RANGE"   },
     { STRID_CALC_MEAN,        "=AVERAGE(%RANGE%)", "MEAN_RANGE"  },
     { STRID_CALC_VARIANCE,    "=VAR(%RANGE%)",     "VAR_RANGE"   },
-    { 0,                      nullptr,                nullptr          }
+    { nullptr,                nullptr,             nullptr       }
 };
 
-static sal_Int16 lclAnovaLabels[] =
+static const char* lclAnovaLabels[] =
 {
     STR_ANOVA_LABEL_SOURCE_OF_VARIATION,
     STR_ANOVA_LABEL_SS,
@@ -53,7 +53,7 @@ static sal_Int16 lclAnovaLabels[] =
     STR_ANOVA_LABEL_F,
     STR_ANOVA_LABEL_P_VALUE,
     STR_ANOVA_LABEL_F_CRITICAL,
-    0
+    nullptr
 };
 
 static const char strWildcardRange[] = "%RANGE%";
@@ -133,7 +133,7 @@ bool ScAnalysisOfVarianceDialog::Close()
     return DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId()
+const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
 {
     return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME;
 }
@@ -181,8 +181,8 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
     }
     else
     {
-        sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
-        OUString aLabelTemplate(ScResId(aLabelId));
+        const char* pLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
+        OUString aLabelTemplate(ScResId(pLabelId));
 
         for (size_t i = 0; i < rRangeList.size(); i++)
         {
@@ -210,7 +210,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     output.newLine();
 
     // Write labels
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
@@ -224,7 +224,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     output.push();
 
     // Write values
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -242,7 +242,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
 
     // Write ANOVA labels
     output.resetColumn();
-    for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
+    for(sal_Int32 i = 0; lclAnovaLabels[i]; i++)
     {
         output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
@@ -358,7 +358,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     output.newLine();
 
     // Write labels
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
@@ -373,7 +373,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
 
     // Write ColumnX values
     output.push();
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -390,7 +390,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
 
     // Write RowX values
     output.push();
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -407,7 +407,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     output.newLine();
 
     // Write ANOVA labels
-    for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
+    for(sal_Int32 i = 0; lclAnovaLabels[i]; i++)
     {
         output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 1a7591a121e1..96b2fffac7c8 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -21,8 +21,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ChiSquareTestDialog.hxx"
+#include "strings.hrc"
 
 ScChiSquareTestDialog::ScChiSquareTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -42,7 +42,7 @@ bool ScChiSquareTestDialog::Close()
     return DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
 }
 
-sal_Int16 ScChiSquareTestDialog::GetUndoNameId()
+const char* ScChiSquareTestDialog::GetUndoNameId()
 {
     return STR_CHI_SQUARE_TEST;
 }
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 7eafe239aa40..446bf8a5e14e 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -10,8 +10,8 @@
 
 #include "docsh.hxx"
 #include "reffact.hxx"
-
 #include "CorrelationDialog.hxx"
+#include "strings.hrc"
 
 ScCorrelationDialog::ScCorrelationDialog(
                         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index 5506444bfd41..c4cfff7b1501 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -10,8 +10,8 @@
 
 #include "docsh.hxx"
 #include "reffact.hxx"
-
 #include "CovarianceDialog.hxx"
+#include "strings.hrc"
 
 ScCovarianceDialog::ScCovarianceDialog(
                         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -21,7 +21,7 @@ ScCovarianceDialog::ScCovarianceDialog(
             "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" )
 {}
 
-sal_Int16 ScCovarianceDialog::GetUndoNameId()
+const char* ScCovarianceDialog::GetUndoNameId()
 {
     return STR_COVARIANCE_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 2dcc463a840e..38c412f5da09 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -22,14 +22,14 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "DescriptiveStatisticsDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
 
 struct StatisticCalculation {
-    sal_Int16   aCalculationNameId;
+    const char* aCalculationNameId;
     const char* aFormula;
 };
 
@@ -50,7 +50,7 @@ static const StatisticCalculation lclCalcDefinitions[] =
     { STRID_CALC_MAX,            "=MAX(%RANGE%)"},
     { STRID_CALC_SUM,            "=SUM(%RANGE%)"},
     { STRID_CALC_COUNT,          "=COUNT(%RANGE%)" },
-    { 0,                         nullptr }
+    { nullptr,                   nullptr }
 };
 
 }
@@ -71,7 +71,7 @@ bool ScDescriptiveStatisticsDialog::Close()
     return DoClose( ScDescriptiveStatisticsDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScDescriptiveStatisticsDialog::GetUndoNameId()
+const char* ScDescriptiveStatisticsDialog::GetUndoNameId()
 {
     return STR_DESCRIPTIVE_STATISTICS_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index f5d679c3d339..2bad4e9e702a 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ExponentialSmoothingDialog.hxx"
+#include "strings.hrc"
 
 ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -51,7 +51,7 @@ bool ScExponentialSmoothingDialog::Close()
     return DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScExponentialSmoothingDialog::GetUndoNameId()
+const char* ScExponentialSmoothingDialog::GetUndoNameId()
 {
     return STR_EXPONENTIAL_SMOOTHING_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index a3cc2cb8b2b1..7461cec85d0c 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "FTestDialog.hxx"
+#include "strings.hrc"
 
 ScFTestDialog::ScFTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScFTestDialog::Close()
     return DoClose( ScFTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScFTestDialog::GetUndoNameId()
+const char* ScFTestDialog::GetUndoNameId()
 {
     return STR_FTEST_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 5d02286c98e9..984740e178c2 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -21,8 +21,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "MatrixComparisonGenerator.hxx"
+#include "strings.hrc"
 
 namespace
 {
@@ -59,7 +59,7 @@ ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
 ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator()
 {}
 
-sal_Int16 ScMatrixComparisonGenerator::GetUndoNameId()
+const char* ScMatrixComparisonGenerator::GetUndoNameId()
 {
     return STR_CORRELATION_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 540dd33e721c..af892c2bee43 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "MovingAverageDialog.hxx"
+#include "strings.hrc"
 
 ScMovingAverageDialog::ScMovingAverageDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -51,7 +51,7 @@ bool ScMovingAverageDialog::Close()
     return DoClose( ScMovingAverageDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScMovingAverageDialog::GetUndoNameId()
+const char* ScMovingAverageDialog::GetUndoNameId()
 {
     return STR_MOVING_AVERAGE_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 1c6e40b5a60a..af5431197000 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -20,6 +20,7 @@
 #include "uiitems.hxx"
 #include "reffact.hxx"
 #include "docfunc.hxx"
+#include "strings.hrc"
 
 #include <random>
 
@@ -279,10 +280,10 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 }
 
 template<class RNG>
-void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
+void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
 {
     OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE);
-    OUString aDistributionName = ScResId(aDistributionStringId);
+    OUString aDistributionName = ScResId(pDistributionStringId);
     aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
 
     ScDocShell* pDocShell = mpViewData->GetDocShell();
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 6950c8dea61f..1438548cd007 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -22,12 +22,12 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "RegressionDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
-    sal_Int16 constRegressionModel[] =
+    const char* constRegressionModel[] =
     {
         STR_LABEL_LINEAR,
         STR_LABEL_LOGARITHMIC,
@@ -101,7 +101,7 @@ void ScRegressionDialog::dispose()
     ScStatisticsTwoVariableDialog::dispose();
 }
 
-sal_Int16 ScRegressionDialog::GetUndoNameId()
+const char* ScRegressionDialog::GetUndoNameId()
 {
     return STR_REGRESSION_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 7f683556bb65..a8f3a2a77fe1 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -19,8 +19,8 @@
 #include "uiitems.hxx"
 #include "reffact.hxx"
 #include "docfunc.hxx"
-
 #include "SamplingDialog.hxx"
+#include "strings.hrc"
 
 ScSamplingDialog::ScSamplingDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
deleted file mode 100644
index 3289f306a246..000000000000
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ /dev/null
@@ -1,478 +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 "scres.hrc"
-
-/* MovingAverageDialog */
-
-String STR_MOVING_AVERAGE_UNDO_NAME
-{
-    Text [ en-US ] = "Moving Average";
-};
-
-/* ExponentialSmoothingDialog */
-
-String STR_EXPONENTIAL_SMOOTHING_UNDO_NAME
-{
-    Text [ en-US ] = "Exponential Smoothing";
-};
-
-/* AnalysisOfVarianceDialog */
-
-String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Analysis of Variance";
-};
-
-String STR_ANOVA_SINGLE_FACTOR_LABEL
-{
-    Text [ en-US ] = "ANOVA - Single Factor";
-};
-
-String STR_ANOVA_TWO_FACTOR_LABEL
-{
-    Text [ en-US ] = "ANOVA - Two Factor";
-};
-
-String STR_ANOVA_LABEL_GROUPS
-{
-    Text [ en-US ] = "Groups";
-};
-
-String STR_ANOVA_LABEL_BETWEEN_GROUPS
-{
-    Text [ en-US ] = "Between Groups";
-};
-
-String STR_ANOVA_LABEL_WITHIN_GROUPS
-{
-    Text [ en-US ] = "Within Groups";
-};
-
-String STR_ANOVA_LABEL_SOURCE_OF_VARIATION
-{
-    Text [ en-US ] = "Source of Variation";
-};
-
-String STR_ANOVA_LABEL_SS
-{
-    Text [ en-US ] = "SS";
-};
-
-String STR_ANOVA_LABEL_DF
-{
-    Text [ en-US ] = "df";
-};
-
-String STR_ANOVA_LABEL_MS
-{
-    Text [ en-US ] = "MS";
-};
-
-String STR_ANOVA_LABEL_F
-{
-    Text [ en-US ] = "F";
-};
-
-String STR_ANOVA_LABEL_P_VALUE
-{
-    Text [ en-US ] = "P-value";
-};
-
-String STR_ANOVA_LABEL_F_CRITICAL
-{
-    Text [ en-US ] = "F critical";
-};
-
-String STR_ANOVA_LABEL_TOTAL
-{
-    Text [ en-US ] = "Total";
-};
-
-/* CorrelationDialog */
-
-String STR_CORRELATION_UNDO_NAME
-{
-    Text [ en-US ] = "Correlation";
-};
-
-String STR_CORRELATION_LABEL
-{
-    Text [ en-US ] = "Correlations";
-};
-
-/* CovarianceDialog */
-
-String STR_COVARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Covariance";
-};
-
-String STR_COVARIANCE_LABEL
-{
-    Text [ en-US ] = "Covariances";
-};
-
-/* DescriptiveStatisticsDialog */
-
-String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME
-{
-    Text [ en-US ] = "Descriptive Statistics";
-};
-String STRID_CALC_MEAN
-{
-    Text [ en-US ] = "Mean";
-};
-String STRID_CALC_STD_ERROR
-{
-    Text [ en-US ] = "Standard Error";
-};
-String STRID_CALC_MODE
-{
-    Text [ en-US ] = "Mode";
-};
-String STRID_CALC_MEDIAN
-{
-    Text [ en-US ] = "Median";
-};
-String STRID_CALC_VARIANCE
-{
-    Text [ en-US ] = "Variance";
-};
-String STRID_CALC_STD_DEVIATION
-{
-    Text [ en-US ] = "Standard Deviation";
-};
-String STRID_CALC_KURTOSIS
-{
-    Text [ en-US ] = "Kurtosis";
-};
-String STRID_CALC_SKEWNESS
-{
-    Text [ en-US ] = "Skewness";
-};
-String STRID_CALC_RANGE
-{
-    Text [ en-US ] = "Range";
-};
-String STRID_CALC_MIN
-{
-    Text [ en-US ] = "Minimum";
-};
-String STRID_CALC_MAX
-{
-    Text [ en-US ] = "Maximum";
-};
-String STRID_CALC_SUM
-{
-    Text [ en-US ] = "Sum";
-};
-String STRID_CALC_COUNT
-{
-    Text [ en-US ] = "Count";
-};
-String STRID_CALC_FIRST_QUARTILE
-{
-    Text [ en-US ] = "First Quartile ";
-};
-String STRID_CALC_THIRD_QUARTILE
-{
-    Text [ en-US ] = "Third Quartile";
-};
-
-/* RandomNumberGeneratorDialog */
-
-String STR_UNDO_DISTRIBUTION_TEMPLATE
-{
-    Text [ en-US ] = "Random ($(DISTRIBUTION))";
-};
-String STR_DISTRIBUTION_UNIFORM_REAL
-{
-    Text [ en-US ] = "Uniform";
-};
-String STR_DISTRIBUTION_UNIFORM_INTEGER
-{
-    Text [ en-US ] = "Uniform Integer";
-};
-String STR_DISTRIBUTION_NORMAL
-{
-    Text [ en-US ] = "Normal";
-};
-String STR_DISTRIBUTION_CAUCHY
-{
-    Text [ en-US ] = "Cauchy";
-};
-String STR_DISTRIBUTION_BERNOULLI
-{
-    Text [ en-US ] = "Bernoulli";
-};
-String STR_DISTRIBUTION_BINOMIAL
-{
-    Text [ en-US ] = "Binomial";
-};
-String STR_DISTRIBUTION_NEGATIVE_BINOMIAL
-{
-    Text [ en-US ] = "Negative Binomial";
-};
-String STR_DISTRIBUTION_CHI_SQUARED
-{
-    Text [ en-US ] = "Chi Squared";
-};
-String STR_DISTRIBUTION_GEOMETRIC
-{
-    Text [ en-US ] = "Geometric";
-};
-String STR_RNG_PARAMETER_MINIMUM
-{
-    Text [ en-US ] = "Minimum";
-};
-String STR_RNG_PARAMETER_MAXIMUM
-{
-    Text [ en-US ] = "Maximum";
-};
-String STR_RNG_PARAMETER_MEAN
-{
-    Text [ en-US ] = "Mean";
-};
-String STR_RNG_PARAMETER_STANDARD_DEVIATION
-{
-    Text [ en-US ] = "Standard Deviation";
-};
-String STR_RNG_PARAMETER_STANDARD_MEDIAN
-{
-    Text [ en-US ] = "Median";
-};
-String STR_RNG_PARAMETER_STANDARD_SIGMA
-{
-    Text [ en-US ] = "Sigma";
-};
-String STR_RNG_PARAMETER_STANDARD_PROBABILITY
-{
-    Text [ en-US ] = "p Value";
-};
-String STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS
-{
-    Text [ en-US ] = "Number of Trials";
-};
-String STR_RNG_PARAMETER_STANDARD_NU_VALUE
-{
-    Text [ en-US ] = "nu Value";
-};
-
-/* SamplingDialog */
-
-String STR_SAMPLING_UNDO_NAME
-{
-    Text [ en-US ] = "Sampling";
-};
-
-/* Names of dialogs */
-String STR_FTEST
-{
-    Text [ en-US ] = "F-test";
-};
-String STR_FTEST_UNDO_NAME
-{
-    Text [ en-US ] = "F-test";
-};
-String STR_TTEST
-{
-    Text [ en-US ] = "t-test";
-};
-String STR_TTEST_UNDO_NAME
-{
-    Text [ en-US ] = "t-test";
-};
-String STR_ZTEST
-{
-    Text [ en-US ] = "z-test";
-};
-String STR_ZTEST_UNDO_NAME
-{
-    Text [ en-US ] = "z-test";
-};
-String STR_CHI_SQUARE_TEST
-{
-    Text [ en-US ] = "Test of Independence (Chi-Square)";
-};
-String STR_REGRESSION_UNDO_NAME
-{
-    Text [ en-US ] = "Regression";
-};
-String STR_REGRESSION
-{
-    Text [ en-US ] = "Regression";
-};
-
-/* Common */
-String STR_COLUMN_LABEL_TEMPLATE
-{
-    Text [ en-US ] = "Column %NUMBER%";
-};
-String STR_ROW_LABEL_TEMPLATE
-{
-    Text [ en-US ] = "Row %NUMBER%";
-};
-String STR_LABEL_ALPHA
-{
-    Text [ en-US ] = "Alpha";
-};
-String STR_VARIABLE_1_LABEL
-{
-    Text [ en-US ] = "Variable 1";
-};
-String STR_VARIABLE_2_LABEL
-{
-    Text [ en-US ] = "Variable 2";
-};
-String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL
-{
-    Text [ en-US ] = "Hypothesized Mean Difference";
-};
-String STR_OBSERVATIONS_LABEL
-{
-    Text [ en-US ] = "Observations";
-};
-String STR_OBSERVED_MEAN_DIFFERENCE_LABEL
-{
-    Text [ en-US ] = "Observed Mean Difference";
-};
-String STR_DEGREES_OF_FREEDOM_LABEL
-{
-    Text [ en-US ] = "df";
-};
-String STR_P_VALUE_LABEL
-{
-    Text [ en-US ] = "P-value";
-};
-String STR_CRITICAL_VALUE_LABEL
-{
-    Text [ en-US ] = "Critical Value";
-};
-String STR_TEST_STATISTIC_LABEL
-{
-    Text [ en-US ] = "Test Statistic";
-};
-
-/* RegressionDialog */
-
-String STR_LABEL_LINEAR
-{
-    Text [ en-US ] = "Linear";
-};
-String STR_LABEL_LOGARITHMIC
-{
-    Text [ en-US ] = "Logarithmic";
-};
-String STR_LABEL_POWER
-{
-    Text [ en-US ] = "Power";
-};
-
-String STR_LABEL_REGRESSION_MODEL
-{
-    Text [ en-US ] = "Regression Model";
-};
-String STR_LABEL_RSQUARED
-{
-    Text [ en-US ] = "R^2";
-};
-String STR_LABEL_SLOPE
-{
-    Text [ en-US ] = "Slope";
-};
-String STR_LABEL_INTERCEPT
-{
-    Text [ en-US ] = "Intercept";
-};
-
-/*F Test */
-String STR_FTEST_P_RIGHT_TAIL
-{
-    Text [ en-US ] = "P (F<=f) right-tail";
-};
-String STR_FTEST_F_CRITICAL_RIGHT_TAIL
-{
-    Text [ en-US ] = "F Critical right-tail";
-};
-String STR_FTEST_P_LEFT_TAIL
-{
-    Text [ en-US ] = "P (F<=f) left-tail";
-};
-String STR_FTEST_F_CRITICAL_LEFT_TAIL
-{
-    Text [ en-US ] = "F Critical left-tail";
-};
-String STR_FTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P two-tail";
-};
-String STR_FTEST_F_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "F Critical two-tail";
-};
-
-/*t Test*/
-String STR_TTEST_PEARSON_CORRELATION
-{
-    Text [ en-US ] = "Pearson Correlation";
-};
-String STR_TTEST_VARIANCE_OF_THE_DIFFERENCES
-{
-    Text [ en-US ] = "Variance of the Differences";
-};
-String STR_TTEST_T_STAT
-{
-    Text [ en-US ] = "t Stat";
-};
-String STR_TTEST_P_ONE_TAIL
-{
-    Text [ en-US ] = "P (T<=t) one-tail";
-};
-String STR_TTEST_T_CRITICAL_ONE_TAIL
-{
-    Text [ en-US ] = "t Critical one-tail";
-};
-String STR_TTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P (T<=t) two-tail";
-};
-String STR_TTEST_T_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "t Critical two-tail";
-};
-
-/*Z Test*/
-String STR_ZTEST_Z_VALUE
-{
-    Text [ en-US ] = "z";
-};
-String STR_ZTEST_KNOWN_VARIANCE
-{
-    Text [ en-US ] = "Known Variance";
-};
-String STR_ZTEST_P_ONE_TAIL
-{
-    Text [ en-US ] = "P (Z<=z) one-tail";
-};
-String STR_ZTEST_Z_CRITICAL_ONE_TAIL
-{
-    Text [ en-US ] = "z Critical one-tail";
-};
-String STR_ZTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P (Z<=z) two-tail";
-};
-String STR_ZTEST_Z_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "z Critical two-tail";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index a94c82943dd6..46f3cd226170 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "TTestDialog.hxx"
+#include "strings.hrc"
 
 ScTTestDialog::ScTTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScTTestDialog::Close()
     return DoClose( ScTTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScTTestDialog::GetUndoNameId()
+const char* ScTTestDialog::GetUndoNameId()
 {
     return STR_TTEST_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index b7a3f67ebd71..475a5f705f2a 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ZTestDialog.hxx"
+#include "strings.hrc"
 
 ScZTestDialog::ScZTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScZTestDialog::Close()
     return DoClose( ScZTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScZTestDialog::GetUndoNameId()
+const char* ScZTestDialog::GetUndoNameId()
 {
     return STR_ZTEST_UNDO_NAME;
 }
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d8ea6d85540b..9e491efe425e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2053,7 +2053,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
             // whether it's part of an array or not or whether explicit cell
             // activation is requested (double-click or F2) or a click in input
             // line.
-            bool bShowError = (!bInputActivated || aTester.GetMessageId() != STR_PROTECTIONERR) &&
+            bool bShowError = (!bInputActivated || !aTester.GetMessageId() || strcmp(aTester.GetMessageId(), STR_PROTECTIONERR) != 0) &&
                 !pActiveViewSh->GetViewData().GetDocShell()->IsReadOnly();
             if (bShowError)
             {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 96f0fb41da9f..2d9646a21150 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -47,7 +47,7 @@
 #include "uiitems.hxx"
 #include "global.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 #include "bitmaps.hlst"
 #include "reffact.hxx"
@@ -2008,37 +2008,36 @@ void ScPosWnd::Modify()
         // determine the action that would be taken for the current input
 
         ScNameInputType eType = lcl_GetInputType( GetText() );      // uses current view
-        sal_uInt16 nStrId = 0;
+        const char* pStrId = nullptr;
         switch ( eType )
         {
             case SC_NAME_INPUT_CELL:
-                nStrId = STR_NAME_INPUT_CELL;
+                pStrId = STR_NAME_INPUT_CELL;
                 break;
             case SC_NAME_INPUT_RANGE:
             case SC_NAME_INPUT_NAMEDRANGE:
-                nStrId = STR_NAME_INPUT_RANGE;      // named range or range reference
+                pStrId = STR_NAME_INPUT_RANGE;      // named range or range reference
                 break;
             case SC_NAME_INPUT_DATABASE:
-                nStrId = STR_NAME_INPUT_DBRANGE;
+                pStrId = STR_NAME_INPUT_DBRANGE;
                 break;
             case SC_NAME_INPUT_ROW:
-                nStrId = STR_NAME_INPUT_ROW;
+                pStrId = STR_NAME_INPUT_ROW;
                 break;
             case SC_NAME_INPUT_SHEET:
-                nStrId = STR_NAME_INPUT_SHEET;
+                pStrId = STR_NAME_INPUT_SHEET;
                 break;
             case SC_NAME_INPUT_DEFINE:
-                nStrId = STR_NAME_INPUT_DEFINE;
+                pStrId = STR_NAME_INPUT_DEFINE;
                 break;
             default:
                 // other cases (error): no tip help
                 break;
         }
 
-        if ( nStrId )
+        if (pStrId)
         {
             // show the help tip at the text cursor position
-
             vcl::Window* pWin = GetSubEdit();
             if (!pWin)
                 pWin = this;
@@ -2049,7 +2048,7 @@ void ScPosWnd::Modify()
             aPos = pWin->OutputToScreenPixel( aPos );
             tools::Rectangle aRect( aPos, aPos );
 
-            OUString aText = ScGlobal::GetRscString( nStrId );
+            OUString aText = ScGlobal::GetRscString(pStrId);
             QuickHelpFlags const nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom;
             nTipVisible = Help::ShowPopover(pWin, aRect, aText, nAlign);
         }
@@ -2107,8 +2106,8 @@ void ScPosWnd::DoEnter()
                 ScNameInputType eType = lcl_GetInputType( aText );
                 if ( eType == SC_NAME_INPUT_BAD_NAME || eType == SC_NAME_INPUT_BAD_SELECTION )
                 {
-                    sal_uInt16 nId = ( eType == SC_NAME_INPUT_BAD_NAME ) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION;
-                    pViewSh->ErrorMessage( nId );
+                    const char* pId = (eType == SC_NAME_INPUT_BAD_NAME) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION;
+                    pViewSh->ErrorMessage(pId);
                 }
                 else if ( eType == SC_NAME_INPUT_DEFINE )
                 {
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 0d062b10a1be..8dc2efb70498 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -38,6 +38,7 @@
 #include <NumberFormatControl.hxx>
 
 #include <svtools/parhtml.hxx>
+#include <tools/resmgr.hxx>
 #include <sot/formats.hxx>
 
 #include "scitems.hxx"
@@ -107,9 +108,9 @@
 #include <o3tl/make_unique.hxx>
 #include "scabstdlg.hxx"
 
-OUString ScResId(sal_uInt16 nId)
+OUString ScResId(const char* pId)
 {
-    return ResId(nId, *SC_MOD()->GetResMgr());
+    return Translate::get(pId, SC_MOD()->GetResLocale());
 }
 
 void ScDLL::Init()
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index e14cf65c7cf7..f2b78808cc35 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -50,6 +50,7 @@
 #include <svtools/colorcfg.hxx>
 
 #include <svl/whiter.hxx>
+#include <svx/dialogs.hrc>
 #include <svx/selctrl.hxx>
 #include <svx/insctrl.hxx>
 #include <svx/zoomctrl.hxx>
@@ -61,6 +62,7 @@
 #include <vcl/waitobj.hxx>
 #include <svx/svxerr.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/resmgr.hxx>
 
 #include <editeng/unolingu.hxx>
 #include <unotools/lingucfg.hxx>
@@ -86,8 +88,11 @@
 #include "docsh.hxx"
 #include "drwlayer.hxx"
 #include "uiitems.hxx"
+#include "sc.hrc"
+#include "scerrors.hrc"
+#include "scstyles.hrc"
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "cfgids.hxx"
 #include "inputhdl.hxx"
@@ -134,7 +139,7 @@ void ScModule::InitInterface_Impl()
 }
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
-    SfxModule( ResMgr::CreateResMgr( "sc" ), {pFact} ),
+    SfxModule( Translate::Create("sc", Application::GetSettings().GetUILanguageTag()), {pFact} ),
     aIdleTimer("sc ScModule IdleTimer"),
     aSpellIdle("sc ScModule SpellIdle"),
     mpDragData(new ScDragData),
@@ -175,10 +180,10 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
     // Create ErrorHandler - was in Init()
     // Between OfficeApplication::Init and ScGlobal::Init
     SvxErrorHandler::ensure();
-    pErrorHdl    = new SfxErrorHandler( RID_ERRHDLSC,
-                                        ErrCode(ERRCODE_AREA_SC),
-                                        ErrCode(ERRCODE_AREA_APP2-1),
-                                        GetResMgr() );
+    pErrorHdl    = new SfxErrorHandler(RID_ERRHDLSC,
+                                       ErrCode(ERRCODE_AREA_SC),
+                                       ErrCode(ERRCODE_AREA_APP2-1),
+                                       &GetResLocale());
 
     aSpellIdle.SetInvokeHandler( LINK( this, ScModule, SpellTimerHdl ) );
     aSpellIdle.SetDebugName( "sc::ScModule aSpellIdle" );
@@ -2275,12 +2280,12 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies()
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
                                                     ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_CELL)),
-                                                    ResId(RID_CELLSTYLEFAMILY, *SC_MOD()->GetResMgr())));
+                                                    RID_CELLSTYLEFAMILY, SC_MOD()->GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
                                                     ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
-                                                    ResId(RID_PAGESTYLEFAMILY, *SC_MOD()->GetResMgr())));
+                                                    RID_PAGESTYLEFAMILY, SC_MOD()->GetResLocale()));
 
     return pStyleFamilies;
 }
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 74f9bb1aeb38..302e6d0ccbc0 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -72,6 +72,8 @@
 #include "condformatmgr.hxx"
 #include "xmlsourcedlg.hxx"
 #include "editutil.hxx"
+#include "scres.hrc"
+#include <svx/dialogs.hrc>
 
 IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index b1e49d5a8cf8..137a07fb8791 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -59,8 +59,6 @@ namespace scui
     {
         if ( !pFactory )
             pFactory = new ScAbstractDialogFactory_Impl;
-        //if ( !pSwResMgr)
-        //  ScDialogsResMgr::GetResMgr();
         return pFactory;
     }
 }
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index b52ff6bf86b8..9a04bad76bc1 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -20,7 +20,7 @@
 #include "checklistmenu.hxx"
 #include "globstr.hrc"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 #include <vcl/decoview.hxx>
diff --git a/sc/source/ui/cctrl/checklistmenu.src b/sc/source/ui/cctrl/checklistmenu.src
deleted file mode 100644
index 41c4c8618c40..000000000000
--- a/sc/source/ui/cctrl/checklistmenu.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 "scres.hrc"
-
-String STR_MENU_SORT_ASC
-{
-    Text [ en-US ] = "Sort Ascending" ;
-};
-
-String STR_MENU_SORT_DESC
-{
-    Text [ en-US ] = "Sort Descending" ;
-};
-
-String STR_MENU_SORT_CUSTOM
-{
-    Text [ en-US ] = "Custom Sort" ;
-};
-
-String STR_BTN_TOGGLE_ALL
-{
-    Text [ en-US ] = "All" ;
-};
-
-String STR_BTN_SELECT_CURRENT
-{
-    Text [ en-US ] = "Show only the current item." ;
-};
-
-String STR_BTN_UNSELECT_CURRENT
-{
-    Text [ en-US ] = "Hide only the current item." ;
-};
-
-String STR_EDIT_SEARCH_ITEMS
-{
-    Text [ en-US ] = "Search items..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 9369c617812b..8d01f93716c4 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -34,7 +34,7 @@
 #include "colorformat.hxx"
 
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 
 #include <set>
 
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index 0935b05648ff..c96cfdcd9656 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -98,10 +98,25 @@ OUString getExpression(sal_Int32 nIndex)
 
 OUString getDateString(sal_Int32 nIndex)
 {
-    sal_Int32 nStringIndex = STR_COND_TODAY + nIndex;
-    if(nStringIndex <= STR_COND_NEXTYEAR)
-        return ScGlobal::GetRscString(nStringIndex);
+    const char* aCondStrs[] =
+    {
+        STR_COND_TODAY,
+        STR_COND_YESTERDAY,
+        STR_COND_TOMORROW,
+        STR_COND_LAST7DAYS,
+        STR_COND_THISWEEK,
+        STR_COND_LASTWEEK,
+        STR_COND_NEXTWEEK,
+        STR_COND_THISMONTH,
+        STR_COND_LASTMONTH,
+        STR_COND_NEXTMONTH,
+        STR_COND_THISYEAR,
+        STR_COND_LASTYEAR,
+        STR_COND_NEXTYEAR
+    };
 
+    if (nIndex >= 0 && static_cast<sal_uInt32>(nIndex) < SAL_N_ELEMENTS(aCondStrs))
+        return ScGlobal::GetRscString(aCondStrs[nIndex]);
     assert(false);
     return OUString();
 }
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 59dc0e18723d..7d8ea4e3563e 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -465,7 +465,7 @@ void ScPivotLayoutDialog::UpdateSourceRange()
                 return;
 
         aSourceSheet.SetSourceRange(aSourceRange);
-        if (aSourceSheet.CheckSourceRange() != 0)
+        if (aSourceSheet.CheckSourceRange() != nullptr)
         {
             mpSourceEdit->SetRefValid(false);
             return;
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index ab9139692b9f..9a15b12bdb30 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -28,27 +28,27 @@ namespace
 
 OUString lclGetFunctionMaskName(const PivotFunc nFunctionMask)
 {
-    sal_uInt16 nStrId = 0;
+    const char* pStrId = nullptr;
     switch (nFunctionMask)
     {
-        case PivotFunc::Sum:        nStrId = STR_FUN_TEXT_SUM;      break;
-        case PivotFunc::Count:      nStrId = STR_FUN_TEXT_COUNT;    break;
-        case PivotFunc::Average:    nStrId = STR_FUN_TEXT_AVG;      break;
-        case PivotFunc::Median:     nStrId = STR_FUN_TEXT_MEDIAN;   break;
-        case PivotFunc::Max:        nStrId = STR_FUN_TEXT_MAX;      break;
-        case PivotFunc::Min:        nStrId = STR_FUN_TEXT_MIN;      break;
-        case PivotFunc::Product:    nStrId = STR_FUN_TEXT_PRODUCT;  break;
-        case PivotFunc::CountNum:   nStrId = STR_FUN_TEXT_COUNT;    break;
-        case PivotFunc::StdDev:     nStrId = STR_FUN_TEXT_STDDEV;   break;
-        case PivotFunc::StdDevP:    nStrId = STR_FUN_TEXT_STDDEV;   break;
-        case PivotFunc::StdVar:     nStrId = STR_FUN_TEXT_VAR;      break;
-        case PivotFunc::StdVarP:    nStrId = STR_FUN_TEXT_VAR;      break;
+        case PivotFunc::Sum:        pStrId = STR_FUN_TEXT_SUM;      break;
+        case PivotFunc::Count:      pStrId = STR_FUN_TEXT_COUNT;    break;
+        case PivotFunc::Average:    pStrId = STR_FUN_TEXT_AVG;      break;
+        case PivotFunc::Median:     pStrId = STR_FUN_TEXT_MEDIAN;   break;
+        case PivotFunc::Max:        pStrId = STR_FUN_TEXT_MAX;      break;
+        case PivotFunc::Min:        pStrId = STR_FUN_TEXT_MIN;      break;
+        case PivotFunc::Product:    pStrId = STR_FUN_TEXT_PRODUCT;  break;
+        case PivotFunc::CountNum:   pStrId = STR_FUN_TEXT_COUNT;    break;
+        case PivotFunc::StdDev:     pStrId = STR_FUN_TEXT_STDDEV;   break;
+        case PivotFunc::StdDevP:    pStrId = STR_FUN_TEXT_STDDEV;   break;
+        case PivotFunc::StdVar:     pStrId = STR_FUN_TEXT_VAR;      break;
+        case PivotFunc::StdVarP:    pStrId = STR_FUN_TEXT_VAR;      break;
         default:
             assert(false);
             break;
     }
-    if (nStrId != 0)
-        return ScGlobal::GetRscString(nStrId);
+    if (pStrId)
+        return ScGlobal::GetRscString(pStrId);
     else
         return OUString();
 }
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index b104af3b7979..67afc817eb69 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -19,7 +19,6 @@
 
 #include "global.hxx"
 #include "asciiopt.hxx"
-#include "asciiopt.hrc"
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
deleted file mode 100644
index 91eb70e3ae33..000000000000
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ /dev/null
@@ -1,24 +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 "scres.hrc"
-
-#define BTN_OK                      1
-#define BTN_CANCEL                  2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index e45c2cb31b63..a175220c62ea 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -29,7 +29,7 @@
 #include "scresid.hxx"
 
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 
 #include "consdlg.hxx"
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 725311e816d4..e29cf9360f83 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -42,7 +42,7 @@ static const sal_Int32 spnDateParts[] =
     css::sheet::DataPilotFieldGroupBy::YEARS
 };
 
-static const sal_uInt16 nDatePartResIds[] =
+static const char* aDatePartResIds[] =
 {
     STR_DPFIELD_GROUP_BY_SECONDS,
     STR_DPFIELD_GROUP_BY_MINUTES,
@@ -227,9 +227,9 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent,
     maStartHelper   ( mpRbAutoStart, mpRbManStart, mpEdStart, rNullDate ),
     maEndHelper     ( mpRbAutoEnd, mpRbManEnd, mpEdEnd, rNullDate )
 {
-    static const size_t nCount = SAL_N_ELEMENTS( nDatePartResIds );
-    for(sal_uInt16 nDatePartResId : nDatePartResIds)
-        mpLbUnits->InsertEntry( ScGlobal::GetRscString( nDatePartResId ) );
+    static const size_t nCount = SAL_N_ELEMENTS(aDatePartResIds);
+    for (const char* pDatePartResId : aDatePartResIds)
+        mpLbUnits->InsertEntry(ScGlobal::GetRscString(pDatePartResId));
 
     mpEdStart->SetShowDateCentury( true );
     mpEdEnd->SetShowDateCentury( true );
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 12fbf3d4964e..1570e05dffcf 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -33,6 +33,7 @@
 #include "foptmgr.hxx"
 
 #include "globstr.hrc"
+#include "strings.hrc"
 
 #include "filtdlg.hxx"
 #include <vcl/layout.hxx>
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
deleted file mode 100644
index 9c274a048016..000000000000
--- a/sc/source/ui/dbgui/outline.src
+++ /dev/null
@@ -1,25 +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 "scres.hrc"
-
-// Image list here, so that there is no interruption during assembly
-// of the "real" image list in ui.src
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index c8087c3e90f0..aab52b766df9 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -31,7 +31,8 @@
 #include "queryentry.hxx"
 #include "typedstrdata.hxx"
 
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 
 #include "pfiltdlg.hxx"
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7a956c22a602..d0e68d7eb950 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -27,14 +27,14 @@
 #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
 #include <com/sun/star/sheet/DataPilotFieldShowItemsMode.hpp>
 
-#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "scresid.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
-#include "scres.hrc"
+#include "pvfundlg.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include "globstr.hrc"
 #include "dputil.hxx"
@@ -181,9 +181,8 @@ void ScDPFunctionListBox::FillFunctionNames()
 {
     OSL_ENSURE( !GetEntryCount(), "ScDPMultiFuncListBox::FillFunctionNames - do not add texts to resource" );
     Clear();
-    ResStringArray aArr(ResId(SCSTR_DPFUNCLISTBOX, *SC_MOD()->GetResMgr()));
-    for( sal_uInt16 nIndex = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIndex < nCount; ++nIndex )
-        InsertEntry( aArr.GetString( nIndex ) );
+    for (size_t nIndex = 0; nIndex < SAL_N_ELEMENTS(SCSTR_DPFUNCLISTBOX); ++nIndex)
+        InsertEntry(ScResId(SCSTR_DPFUNCLISTBOX[nIndex]));
     assert(GetEntryCount() == SAL_N_ELEMENTS(spnFunctions));
 }
 
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
deleted file mode 100644
index c922eddd4d7f..000000000000
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ /dev/null
@@ -1,26 +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 "sc.hrc"
-
-#define BTN_OK          1
-#define BTN_CANCEL      2
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
deleted file mode 100644
index c7cba3b428d7..000000000000
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ /dev/null
@@ -1,41 +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 "scres.hrc"
-
-StringArray SCSTR_DPFUNCLISTBOX
-{
-    ItemList [ en-US ] =
-    {
-        < "Sum" ; Default ; > ;
-        < "Count" ; Default ; > ;
-        < "Average" ; Default ; > ;
-        < "Median" ; Default ; > ;
-        < "Max" ; Default ; > ;
-        < "Min" ; Default ; > ;
-        < "Product" ; Default ; > ;
-        < "Count (Numbers only)" ; Default ; > ;
-        < "StDev (Sample)" ; Default ; > ;
-        < "StDevP (Population)" ; Default ; > ;
-        < "Var (Sample)" ; Default ; > ;
-        < "VarP (Population)" ; Default ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 4ab94073c79e..15a7088e238a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -31,7 +31,7 @@
 #include "scresid.hxx"
 #include "impex.hxx"
 #include "scuiasciiopt.hxx"
-#include "asciiopt.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "csvtablebox.hxx"
 #include <comphelper/string.hxx>
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index cb45ed52b803..13f002294af9 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -22,7 +22,7 @@
 #include "scuiimoptdlg.hxx"
 #include "tabvwsh.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Calc.hxx>
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 59a7caceb59c..a9bbf8b00443 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -32,6 +32,7 @@
 #include "foptmgr.hxx"
 
 #include "globstr.hrc"
+#include "strings.hrc"
 
 #include "filtdlg.hxx"
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 3ee1093e18a3..9ae6c8ecae24 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -36,7 +36,8 @@
 #include "userlist.hxx"
 #include "rangeutl.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 
 #include "sortkeydlg.hxx"
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 43f574740e78..70199ffcc796 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -26,7 +26,8 @@
 #include "viewdata.hxx"
 #include "document.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 
 #include "subtdlg.hxx"
 #include "tpsubt.hxx"
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 6d04a06745f6..fb5bf5954e50 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/app.hxx>
 
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 #include "stringutil.hxx"
 #include "validat.hxx"
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index d0f343035a72..6d49a01661d3 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -17,7 +17,8 @@
 #include "document.hxx"
 #include "rangeutl.hxx"
 #include "tabvwsh.hxx"
-#include <scres.hrc>
+#include <strings.hrc>
+#include "sc.hrc"
 #include "scresid.hxx"
 
 namespace sc {
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 5f1eb7acde8a..72dbe61b9e57 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1587,8 +1587,8 @@ void ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi)
         return;
 
     std::set<ScDPObject*> aRefs;
-    sal_uLong nErrId = pDPs->ReloadCache(pDPObj, aRefs);
-    if (nErrId)
+    const char* pErrId = pDPs->ReloadCache(pDPObj, aRefs);
+    if (pErrId)
         return;
 
     std::set<ScDPObject*>::iterator it = aRefs.begin(), itEnd = aRefs.end();
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 3c928301af6b..60c379ed0174 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -142,7 +142,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
     bool bSuccess = false;
     bool bApi = false;                      //! pass as argument
     bool bTruncated = false;                // for warning
-    sal_uInt16 nErrStringId = 0;
+    const char* pErrStringId = nullptr;
     OUString aErrorMessage;
 
     SCCOL nCol = rParam.nCol1;
@@ -402,7 +402,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         aTester.TestBlock( &rDoc, nTab, rParam.nCol1,rParam.nRow1,nEndCol,nEndRow );
         if ( !aTester.IsEditable() )
         {
-            nErrStringId = aTester.GetMessageId();
+            pErrStringId = aTester.GetMessageId();
             bSuccess = false;
         }
         else if ( (pChangeTrack = rDoc.GetChangeTrack()) != nullptr )
@@ -418,7 +418,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                         nEndCol+nFormulaCols, nEndRow, nTab );
         if (!rDoc.CanFitBlock( aOld, aNew ))
         {
-            nErrStringId = STR_MSSG_DOSUBTOTALS_2;      // can't insert cells
+            pErrStringId = STR_MSSG_DOSUBTOTALS_2;      // can't insert cells
             bSuccess = false;
         }
     }
@@ -612,9 +612,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
 
         if (aErrorMessage.isEmpty())
         {
-            if (!nErrStringId)
-                nErrStringId = STR_MSSG_IMPORTDATA_0;
-            aErrorMessage = ScGlobal::GetRscString( nErrStringId );
+            if (!pErrStringId)
+                pErrStringId = STR_MSSG_IMPORTDATA_0;
+            aErrorMessage = ScGlobal::GetRscString(pErrStringId);
         }
         ScopedVclPtrInstance< InfoBox > aInfoBox( ScDocShell::GetActiveDialogParent(), aErrorMessage );
         aInfoBox->Execute();
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index e7f6af5cee32..0a170c4b96e5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -37,7 +37,8 @@
 
 #include "docfunc.hxx"
 
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 
 #include "arealink.hxx"
 #include "attrib.hxx"
@@ -5580,9 +5581,9 @@ void ScDocFunc::ConvertFormulaToValue( const ScRange& rRange, bool bInteraction
     aModificator.SetDocumentModified();
 }
 
-void ScDocFunc::EnterListAction( sal_uInt16 nNameResId )
+void ScDocFunc::EnterListAction(const char* pNameResId)
 {
-    OUString aUndo( ScGlobal::GetRscString( nNameResId ) );
+    OUString aUndo(ScGlobal::GetRscString(pNameResId));
     ViewShellId nViewShellId(-1);
     if (ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell())
         nViewShellId = pViewSh->GetViewShellId();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index adb16f10827d..3242b15b0a0d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -68,6 +68,7 @@
 
 #include "scabstdlg.hxx"
 #include <sot/formats.hxx>
+#include <svx/dialogs.hrc>
 
 #include "formulacell.hxx"
 #include "postit.hxx"
@@ -79,7 +80,7 @@
 #include "imoptdlg.hxx"
 #include "impex.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 #include "scerrors.hxx"
 #include "brdcst.hxx"
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6233fa671711..030b7b476104 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -63,6 +63,7 @@ using namespace ::com::sun::star;
 #include "docshimp.hxx"
 #include "docfunc.hxx"
 #include "scres.hrc"
+#include "strings.hrc"
 #include "stlsheet.hxx"
 #include "stlpool.hxx"
 #include "appoptio.hxx"
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index c3ed10e48c14..90fbe83b80d5 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -66,7 +66,7 @@ using ::std::vector;
 
 //  former viewfunc/dbfunc methods
 
-void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId )
+void ScDocShell::ErrorMessage(const char* pGlobStrId)
 {
     //! StopMarking at the (active) view?
 
@@ -74,15 +74,15 @@ void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId )
     ScWaitCursorOff aWaitOff( pParent );
     bool bFocus = pParent && pParent->HasFocus();
 
-    if(nGlobStrId==STR_PROTECTIONERR)
+    if (pGlobStrId && strcmp(pGlobStrId, STR_PROTECTIONERR) == 0)
     {
-        if(IsReadOnly())
+        if (IsReadOnly())
         {
-            nGlobStrId=STR_READONLYERR;
+            pGlobStrId = STR_READONLYERR;
         }
     }
 
-    ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString( nGlobStrId ) );
+    ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString(pGlobStrId));
     aBox->Execute();
     if (bFocus)
         pParent->GrabFocus();
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 2f5b104ee18c..47b58ab1c08f 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -1081,8 +1081,8 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
                 else
                     bTest = true;
             }
-            OUString sPosition( ScAddress( nDocCol, nDocRow, nTab).GetColRowString());
-            OUString sEncoding( SvxTextEncodingTable().GetTextString( eCharSet));
+            OUString sPosition(ScAddress(nDocCol, nDocRow, nTab).GetColRowString());
+            OUString sEncoding(SvxTextEncodingTable::GetTextString(eCharSet));
             nErr = *new TwoStringErrorInfo( (bEncErr ? SCERR_EXPORT_ENCODING :
                         SCERR_EXPORT_FIELDWIDTH), sPosition, sEncoding,
                     DialogMask::ButtonsOk | DialogMask::MessageError);
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx
index e1418d1d3422..c8ba3a48b6d4 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -20,7 +20,7 @@
 #include <documentlinkmgr.hxx>
 #include <datastream.hxx>
 #include <ddelink.hxx>
-#include <scres.hrc>
+#include <strings.hrc>
 #include <scresid.hxx>
 
 #include <svx/svdoole2.hxx>
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index 2a06c82dc322..feb34d0b41bf 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -146,10 +146,10 @@ void ScEditableTester::TestBlockForAction(
     }
 }
 
-sal_uInt16 ScEditableTester::GetMessageId() const
+const char* ScEditableTester::GetMessageId() const
 {
     if (mbIsEditable)
-        return 0;
+        return nullptr;
     else if (mbOnlyMatrix)
         return STR_MATRIXFRAGMENTERR;
     else
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 670d713774b7..05c8288a8fa2 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -19,6 +19,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include "sc.hrc"
 
 #include "scitems.hxx"
 
@@ -36,7 +37,7 @@
 
 #include "drawsh.hxx"
 #include "drwlayer.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "viewdata.hxx"
 #include "document.hxx"
 #include "docpool.hxx"
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 3e0742bc5c6f..9646401a3dc9 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -27,6 +27,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
@@ -57,14 +58,14 @@ FuConstRectangle::~FuConstRectangle()
 
 namespace {
 
-::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc )
+::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc)
 {
     ::basegfx::B2DPolyPolygon aRetval;
     XLineEndListRef pLineEndList = pDoc->GetLineEndList();
 
     if( pLineEndList.is() )
     {
-        OUString aArrowName( SvxResId(nResId) );
+        OUString aArrowName( SvxResId(pResId) );
         long nCount = pLineEndList->Count();
         long nIndex;
         for( nIndex = 0L; nIndex < nCount; nIndex++ )
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index ba26384d9f55..71474a37b6e1 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -38,7 +38,7 @@
 #include "document.hxx"
 #include "scresid.hxx"
 #include "progress.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 
 using namespace ::com::sun::star;
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index f0cd3b57da20..22af1f211fde 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -32,7 +32,7 @@
 #include <vcl/msgbox.hxx>
 
 #include "graphsh.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "viewdata.hxx"
 #include "drawview.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 1d15b8cb720f..aabc12dea701 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -28,7 +28,7 @@
 #include <vcl/EnumContext.hxx>
 
 #include "mediash.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "viewdata.hxx"
 #include "drawview.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index 49b1efab696c..b29bbeb891c0 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -61,7 +61,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx b/sc/source/ui/inc/ChiSquareTestDialog.hxx
index eb5ca54c4520..849914d57f6e 100644
--- a/sc/source/ui/inc/ChiSquareTestDialog.hxx
+++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx
@@ -25,7 +25,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx
index e127be99fc2e..3bd5a9e2657b 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -25,7 +25,7 @@ public:
 protected:
     virtual const OUString getLabel() override;
     virtual const OUString getTemplate() override;
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
 };
 
 #endif
diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
index be891a6c013c..bbdc727b06e4 100644
--- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
+++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
@@ -25,7 +25,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
index 0162b0cd577d..1393c09b215f 100644
--- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
+++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
@@ -37,7 +37,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx
index d4ef1cfd5541..04c7f40e2d89 100644
--- a/sc/source/ui/inc/FTestDialog.hxx
+++ b/sc/source/ui/inc/FTestDialog.hxx
@@ -25,7 +25,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index 3745357fa26b..3fb40c43f913 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~ScMatrixComparisonGenerator() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 
     virtual const OUString getLabel() = 0;
diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx
index c1f15ea7fea5..a6b62243f798 100644
--- a/sc/source/ui/inc/MovingAverageDialog.hxx
+++ b/sc/source/ui/inc/MovingAverageDialog.hxx
@@ -37,7 +37,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index 87821f4e6341..82967424215a 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -66,7 +66,7 @@ private:
 
     template<class RNG>
 
-    void GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, const boost::optional<sal_Int8> aDecimalPlaces);
+    void GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, const boost::optional<sal_Int8> aDecimalPlaces);
 
     void SelectGeneratorAndGenerateNumbers();
 
diff --git a/sc/source/ui/inc/RegressionDialog.hxx b/sc/source/ui/inc/RegressionDialog.hxx
index 8b6d114024bd..254562e93dbc 100644
--- a/sc/source/ui/inc/RegressionDialog.hxx
+++ b/sc/source/ui/inc/RegressionDialog.hxx
@@ -30,7 +30,7 @@ public:
 
 protected:
     void dispose() override;
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 8a55f5dd9857..a551ed320600 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -42,7 +42,7 @@ protected:
     void CalculateInputAndWriteToOutput();
 
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0;
-    virtual sal_Int16 GetUndoNameId() = 0;
+    virtual const char* GetUndoNameId() = 0;
 
     // Widgets
     VclPtr<FixedText>          mpInputRangeLabel;
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index ac15249d25c5..ba20289fcfcf 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -42,7 +42,7 @@ protected:
     void CalculateInputAndWriteToOutput();
 
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0;
-    virtual sal_Int16 GetUndoNameId() = 0;
+    virtual const char* GetUndoNameId() = 0;
 
     // Widgets
     VclPtr<FixedText>          mpVariable1RangeLabel;
diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx
index 3d08b94f0214..6c068a87a0e8 100644
--- a/sc/source/ui/inc/TTestDialog.hxx
+++ b/sc/source/ui/inc/TTestDialog.hxx
@@ -25,7 +25,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index 84281a652083..6fd8496c814b 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -25,7 +25,7 @@ public:
     virtual bool Close() override;
 
 protected:
-    virtual sal_Int16 GetUndoNameId() override;
+    virtual const char* GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 215341a0fcef..e0364a6f616b 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -166,17 +166,10 @@ template<  class TWindow, bool bBindRef = true >
 class ScRefHdlrImplBase: public TWindow, public ScRefHandler
 {
 private:
-    template<class TBindings, class TChildWindow, class TParentWindow, class TResId>
-    ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
-        TParentWindow* pParent, TResId nResId );
-
     template<class TBindings, class TChildWindow, class TParentWindow >
     ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
         TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription );
 
-    template<class TParentWindow, class TResId, class TArg>
-    ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB );
-
     template<class TParentWindow, class TArg>
     ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB );
 
@@ -186,15 +179,6 @@ private:
 };
 
 template<class TWindow, bool bBindRef>
-template<class TBindings, class TChildWindow, class TParentWindow, class TResId>
-ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
-                 TParentWindow* pParent, TResId nResId)
-    : TWindow(pB, pCW, pParent, ScResId(static_cast<sal_uInt16>( nResId ) ) )
-    , ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
-{
-}
-
-template<class TWindow, bool bBindRef>
 template<class TBindings, class TChildWindow, class TParentWindow>
 ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
                  TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription )
@@ -204,14 +188,6 @@ ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWi
 }
 
 template<class TWindow, bool bBindRef >
-template<class TParentWindow, class TResId, class TArg>
-ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, TResId nResIdP, const TArg &rArg, SfxBindings *pB )
-    : TWindow( pParent, ScResId(static_cast<sal_uInt16>( nResIdP )), rArg ),
-    ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
-{
-}
-
-template<class TWindow, bool bBindRef >
 template<class TParentWindow, class TArg>
 ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB )
     : TWindow( pParent, rID, rUIXMLDescription, rArg ),
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index a2010c4ac6c3..10deed238c9e 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -72,7 +72,7 @@ public:
     DECL_LINK( NotifyDrawUndo, SdrUndoAction*, void );
 
     // for grouping multiple operations into one with a new name
-    void            EnterListAction( sal_uInt16 nNameResId );
+    void            EnterListAction(const char* pNameResId);
     void            EndListAction();
 
     bool            DetectiveAddPred(const ScAddress& rPos);
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b7f1016c8f49..b6beb2cfc11d 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -255,7 +255,7 @@ public:
     void            DoAutoStyle( const ScRange& rRange, const OUString& rStyle );
 
     static vcl::Window*  GetActiveDialogParent();
-    void            ErrorMessage( sal_uInt16 nGlobStrId );
+    void            ErrorMessage(const char* pGlobStrId);
     bool            IsEditable() const;
 
     bool            AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index e47e2d473060..6e2fb0bd5e88 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -79,7 +79,7 @@ public:
 
     bool IsEditable() const { return mbIsEditable; }
     bool IsFormatEditable() const { return mbIsEditable || mbOnlyMatrix; }
-    sal_uInt16  GetMessageId() const;
+    const char* GetMessageId() const;
 };
 
 #endif
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 3fab54c6373b..39e61e2b9343 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -25,7 +25,7 @@
 
 #include "dbfunc.hxx"
 
-#include "scres.hrc"
+#include "sc.hrc"
 
 #define DECL_WRAPPER_WITHID(Class) \
     class Class : public SfxChildWindow                                         \
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 2a7e67994b74..a605535369ec 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -571,7 +571,7 @@ public:
     void            SplitAtPixel( const Point& rPixel );
     void            InvalidateSplit();
 
-    void            ErrorMessage( sal_uInt16 nGlobStrId );
+    void            ErrorMessage(const char* pGlobStrId);
 
     void            EnableRefInput(bool bFlag);
 
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 480d82432442..6ac52a2d1cd6 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -105,8 +105,6 @@ class ScTpLayoutOptions : public SfxTabPage
     VclPtr<CheckBox>       m_pReplWarnCB;
     VclPtr<CheckBox>       m_pLegacyCellSelectionCB;
 
-    SvxStringArray  aUnitArr;
-
     DECL_LINK(MetricHdl, ListBox&, void );
     DECL_LINK( AlignHdl, Button*, void );
 
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index ac63b0ab7063..972905cd031f 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_UNDOSTYL_HXX
 
 #include <memory>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include "undobase.hxx"
 
 class ScDocShell;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index fd76c74a8bf1..9829a1922ed9 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -29,6 +29,7 @@
 #include <svtools/svmedit.hxx>
 
 #include "anyrefdg.hxx"
+#include "sc.hrc"
 
 struct ScRefHandlerCaller : public virtual VclReferenceBase {
 };
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index ae1dbd9c5630..eca4369b36c7 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -33,7 +33,7 @@
 #include "docsh.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "simpref.hxx"
 #include "scmod.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src
deleted file mode 100644
index 3c0dbcae18f2..000000000000
--- a/sc/source/ui/miscdlgs/acredlin.src
+++ /dev/null
@@ -1,86 +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 "globstr.hrc"
-
-String STR_CHG_INSERT_COLS
-{
-    Text [ en-US ] = "Column inserted" ;
-};
-String STR_CHG_INSERT_ROWS
-{
-    Text [ en-US ] = "Row inserted " ;
-};
-String STR_CHG_INSERT_TABS
-{
-    Text [ en-US ] = "Sheet inserted " ;
-};
-String STR_CHG_DELETE_COLS
-{
-    Text [ en-US ] = "Column deleted" ;
-};
-String STR_CHG_DELETE_ROWS
-{
-    Text [ en-US ] = "Row deleted" ;
-};
-String STR_CHG_DELETE_TABS
-{
-    Text [ en-US ] = "Sheet deleted" ;
-};
-String STR_CHG_MOVE
-{
-    Text [ en-US ] = "Range moved" ;
-};
-String STR_CHG_CONTENT
-{
-    Text [ en-US ] = "Changed contents" ;
-};
-String STR_CHG_CONTENT_WITH_CHILD
-{
-    Text [ en-US ] = "Changed contents" ;
-};
-String STR_CHG_CHILD_CONTENT
-{
-    Text [ en-US ] = "Changed to " ;
-};
-String STR_CHG_CHILD_ORGCONTENT
-{
-    Text [ en-US ] = "Original" ;
-};
-String STR_CHG_REJECT
-{
-    Text [ en-US ] = "Changes rejected" ;
-};
-String STR_CHG_ACCEPTED
-{
-    Text [ en-US ] = "Accepted" ;
-};
-String STR_CHG_REJECTED
-{
-    Text [ en-US ] = "Rejected" ;
-};
-String STR_CHG_NO_ENTRY
-{
-    Text [ en-US ] = "No Entry" ;
-};
-String STR_CHG_EMPTY
-{
-    Text [ en-US ] = "<empty>" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index c228e2f8f4d5..0a7f9de81a50 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include "attrib.hxx"
 #include "zforauto.hxx"
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index bbab72f1827d..c88ed6023e47 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -21,7 +21,7 @@
 #include <vcl/msgbox.hxx>
 
 #include "conflictsdlg.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scresid.hxx"
 #include "viewdata.hxx"
 #include "dbfunc.hxx"
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
deleted file mode 100644
index e22979e85da7..000000000000
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ /dev/null
@@ -1,42 +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 "scres.hrc"
-
-String STR_TITLE_CONFLICT
-{
-    Text [ en-US ] = "Conflict" ;
-};
-
-String STR_TITLE_AUTHOR
-{
-    Text [ en-US ] = "Author" ;
-};
-
-String STR_TITLE_DATE
-{
-    Text [ en-US ] = "Date" ;
-};
-
-String STR_UNKNOWN_USER_CONFLICT
-{
-    Text [ en-US ] = "Unknown User" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 41c2992860f9..77520bbb9778 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -21,7 +21,7 @@
 
 #include "crdlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle,
     const OUString& rStrLabel)
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index 7eecf2d1b292..31528b1b2899 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -21,7 +21,7 @@
 
 #include "delcldlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 static sal_uInt8 nDelItemChecked=0;
 
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 79fac75b8859..fa862b1378c8 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -21,7 +21,7 @@
 
 #include "delcodlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 bool       ScDeleteContentsDlg::bPreviousAllCheck = false;
 InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks   = (InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING  |
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 4c8ca4c158fc..c5e16bfa7c73 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -26,7 +26,7 @@
 #include "scresid.hxx"
 #include "document.hxx"
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "filldlg.hxx"
 
 // class ScFillSeriesDlg
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 977358b5c4b7..891d3ae9b7f9 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -21,7 +21,7 @@
 
 #include "inscldlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 static sal_uInt8 nInsItemChecked=0;
 
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 190d108e9e63..eb99aff262cb 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -21,7 +21,7 @@
 
 #include "inscodlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 bool       ScInsertContentsDlg::bPreviousAllCheck = false;
 InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks   = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING);
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index d9adb2d426c9..ff59830c1926 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -23,7 +23,7 @@
 
 #include "lbseldlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 ScSelEntryDlg::ScSelEntryDlg(vcl::Window*  pParent, const std::vector<OUString> &rEntryList)
     : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui")
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 7a81c54c67ed..b38bc98a6d58 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -21,7 +21,7 @@
 
 #include "mtrindlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 ScMetricInputDlg::ScMetricInputDlg( vcl::Window*         pParent,
                                     const OString&  sDialogName,
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 0d3abf9fd624..820c4affe618 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -24,7 +24,7 @@
 #include "mvtabdlg.hxx"
 #include "document.hxx"
 #include "docsh.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "global.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 92afddb5b14c..e193e023f453 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scres.hrc"
+#include "strings.hrc"
 #include "retypepassdlg.hxx"
 #include "scresid.hxx"
 #include "document.hxx"
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
deleted file mode 100644
index a2cc62ee2bc1..000000000000
--- a/sc/source/ui/miscdlgs/retypepassdlg.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 "scres.hrc"
-
-String STR_NOT_PROTECTED
-{
-    Text [ en-US ] = "Not protected" ;
-};
-
-String STR_NOT_PASS_PROTECTED
-{
-    Text [ en-US ] = "Not password-protected" ;
-};
-
-String STR_HASH_BAD
-{
-    Text [ en-US ] = "Hash incompatible" ;
-};
-
-String STR_HASH_GOOD
-{
-    Text [ en-US ] = "Hash compatible" ;
-};
-
-String STR_RETYPE
-{
-    Text [ en-US ] = "Re-type" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index fbf1245de8d1..da465ae23774 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -34,8 +34,9 @@
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include "attrib.hxx"
 #include "zforauto.hxx"
@@ -46,6 +47,7 @@
 #include "scuiautofmt.hxx"
 #include "scresid.hxx"
 #include "document.hxx"
+#include "helpids.h"
 
 // AutoFormat-Dialog:
 
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index db473dca0ccb..747351aef56e 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -23,7 +23,7 @@
 
 #include "shtabdlg.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent)
     : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui")
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 69f6a4e5a7d0..bc63af0afc9e 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -20,15 +20,15 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include "tabbgcolordlg.hxx"
+#include "sc.hrc"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 
 #include <tools/color.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/resid.hxx>
 #include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index daf684dac704..101293a867d4 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -26,6 +26,7 @@
 #include "document.hxx"
 #include "scresid.hxx"
 #include "sc.hrc"
+#include "strings.hrc"
 #include "reffact.hxx"
 
 #include "tabopdlg.hxx"
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 578681598940..c1416798f247 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -20,6 +20,7 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <svx/svxids.hrc>
+#include <svx/dialogs.hrc>
 
 #include <editeng/flstitem.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 20b4bdb6f10a..9cd98b09f60c 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -22,7 +22,8 @@
 #include "scmod.hxx"
 #include "inputopt.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
+#include "helpids.h"
 
 ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) :
     WarningBox( pParent, WB_YES_NO | WB_DEF_YES, ScResId( STR_REPLCELLSWARN ) )
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 92cdc070a24a..beae45add424 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -22,7 +22,7 @@
 #include "namepast.hxx"
 #include "scresid.hxx"
 #include "docsh.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "rangenam.hxx"
 #include "viewdata.hxx"
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 28f8d77987be..380f18084913 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -48,7 +48,7 @@
 #include "lnktrans.hxx"
 #include "formulacell.hxx"
 #include "dociter.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scresid.hxx"
 #include "globstr.hrc"
 #include "bitmaps.hlst"
@@ -224,6 +224,19 @@ OUString ScContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
     return getAltLongDescText( pEntry, false );
 }
 
+static const char* SCSTR_CONTENT_ARY[] =
+{
+    SCSTR_CONTENT_ROOT,
+    SCSTR_CONTENT_TABLE,
+    SCSTR_CONTENT_RANGENAME,
+    SCSTR_CONTENT_DBAREA,
+    SCSTR_CONTENT_GRAPHIC,
+    SCSTR_CONTENT_OLEOBJECT,
+    SCSTR_CONTENT_NOTE,
+    SCSTR_CONTENT_AREALINK,
+    SCSTR_CONTENT_DRAWING
+};
+
 void ScContentTree::InitRoot( ScContentId nType )
 {
     if ( nType == ScContentId::ROOT )
@@ -237,7 +250,7 @@ void ScContentTree::InitRoot( ScContentId nType )
 
     BitmapEx aBitmap(aContentBmps[(int)nType - 1]);
     Image aImage(aBitmap);
-    OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType));
+    OUString aName(ScResId(SCSTR_CONTENT_ARY[(int)nType]));
     // back to the correct position:
     sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1;
     SvTreeListEntry* pNew = InsertEntry( aName, aImage, aImage, nullptr, false, nPos );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index af2b0c5778fc..5a70da276730 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -37,7 +37,8 @@
 #include "dbdata.hxx"
 #include "rangenam.hxx"
 #include "rangeutl.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "scresid.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
deleted file mode 100644
index 1838bb535788..000000000000
--- a/sc/source/ui/navipi/navipi.src
+++ /dev/null
@@ -1,109 +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 "scres.hrc"
-
-//  content description strings are also used in ScLinkTargetsObj
-
-String SCSTR_CONTENT_ROOT
-{
-    Text [ en-US ] = "Contents" ;
-};
-
-String SCSTR_CONTENT_TABLE
-{
-    Text [ en-US ] = "Sheets" ;
-};
-
-String SCSTR_CONTENT_RANGENAME
-{
-    Text [ en-US ] = "Range names" ;
-};
-
-String SCSTR_CONTENT_DBAREA
-{
-    Text [ en-US ] = "Database ranges" ;
-};
-
-String SCSTR_CONTENT_GRAPHIC
-{
-    Text [ en-US ] = "Images" ;
-};
-
-String SCSTR_CONTENT_OLEOBJECT
-{
-    Text [ en-US ] = "OLE objects" ;
-};
-
-String SCSTR_CONTENT_NOTE
-{
-    Text [ en-US ] = "Comments" ;
-};
-
-String SCSTR_CONTENT_AREALINK
-{
-    Text [ en-US ] = "Linked areas" ;
-};
-
-String SCSTR_CONTENT_DRAWING
-{
-    Text [ en-US ] = "Drawing objects";
-};
-
-String SCSTR_DRAGMODE
-{
-    Text [ en-US ] = "Drag Mode" ;
-};
-
-String SCSTR_DISPLAY
-{
-    Text [ en-US ] = "Display" ;
-};
-
-String SCSTR_ACTIVE
-{
-    Text [ en-US ] = "active" ;
-};
-
-String SCSTR_NOTACTIVE
-{
-    Text [ en-US ] = "inactive" ;
-};
-
-String SCSTR_HIDDEN
-{
-    Text [ en-US ] = "hidden" ;
-};
-
-String SCSTR_ACTIVEWIN
-{
-    Text [ en-US ] = "Active Window" ;
-};
-
-String SCSTR_QHLP_SCEN_LISTBOX
-{
-    Text [ en-US ] = "Scenario Name";
-};
-
-String SCSTR_QHLP_SCEN_COMMENT
-{
-    Text [ en-US ] = "Comment";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 3246d3abb08d..e10fff290086 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -27,7 +27,8 @@
 #include <vcl/settings.hxx>
 #include "navipi.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
 
 // class ScScenarioWindow ------------------------------------------------
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index ffa726a7c27a..5aa63a7bacec 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -24,7 +24,8 @@
 #include <svl/stritem.hxx>
 #include "tpformula.hxx"
 #include "formulaopt.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "scresid.hxx"
 #include <formula/grammar.hxx>
 #include "calcoptionsdlg.hxx"
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index bf47a82f5b62..d8e242474293 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -27,8 +27,10 @@
 #include "uiitems.hxx"
 #include "scresid.hxx"
 #include "docsh.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "globstr.hrc"
+#include "units.hrc"
 #include <appoptio.hxx>
 #include <scmod.hxx>
 #include <svx/colorbox.hxx>
@@ -329,7 +331,6 @@ ScTpLayoutOptions::ScTpLayoutOptions(   vcl::Window* pParent,
                                         const SfxItemSet&   rArgSet ) :
     SfxTabPage( pParent, "ScGeneralPage",
                 "modules/scalc/ui/scgeneralpage.ui", &rArgSet),
-    aUnitArr(ResId(SCSTR_UNIT, *SC_MOD()->GetResMgr())),
     pDoc(nullptr)
 {
     get( m_pUnitLB, "unitlb");
@@ -356,10 +357,10 @@ ScTpLayoutOptions::ScTpLayoutOptions(   vcl::Window* pParent,
 
     m_pAlignCB->SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
 
-    for ( sal_uInt32 i = 0; i < aUnitArr.Count(); ++i )
+    for (size_t i = 0; i < SAL_N_ELEMENTS(SCSTR_UNIT); ++i)
     {
-        OUString sMetric = aUnitArr.GetStringByPos( i );
-        FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i );
+        OUString sMetric = ScResId(SCSTR_UNIT[i].first);
+        FieldUnit eFUnit = SCSTR_UNIT[i].second;
 
         switch ( eFUnit )
         {
@@ -380,7 +381,6 @@ ScTpLayoutOptions::ScTpLayoutOptions(   vcl::Window* pParent,
             }
         }
     }
-
 }
 
 ScTpLayoutOptions::~ScTpLayoutOptions()
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 9c5cac6a5692..df331676d935 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -40,6 +40,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include "globstr.hrc"
+#include "strings.hrc"
 #include "tabvwsh.hxx"
 #include "prevwsh.hxx"
 #include "AccessibleEditObject.hxx"
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index f629d7b3e574..61e68d32f505 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -20,7 +20,8 @@
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include "CellAppearancePropertyPanel.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "scresid.hxx"
 #include <sfx2/bindings.hxx>
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
deleted file mode 100644
index 349a33030a6b..000000000000
--- a/sc/source/ui/src/globstr.src
+++ /dev/null
@@ -1,1962 +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 "globstr.hrc"
-#include "scres.hrc"
-
-String STR_UNDO_INSERTCELLS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert" ;
-};
-String STR_UNDO_DELETECELLS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete" ;
-};
-String STR_UNDO_CUT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cut" ;
-};
-String STR_UNDO_PASTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert" ;
-};
-String STR_UNDO_DRAGDROP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Drag and Drop" ;
-};
-String STR_UNDO_MOVE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Move" ;
-};
-String STR_UNDO_COPY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Copy" ;
-};
-String STR_UNDO_DELETECONTENTS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete" ;
-};
-String STR_UNDO_SELATTR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Attributes" ;
-};
-String STR_UNDO_SELATTRLINES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Attributes/Lines" ;
-};
-String STR_UNDO_COLWIDTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Column Width" ;
-};
-String STR_UNDO_OPTCOLWIDTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Optimal Column Width" ;
-};
-String STR_UNDO_ROWHEIGHT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Row height" ;
-};
-String STR_UNDO_OPTROWHEIGHT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Optimal Row Height" ;
-};
-String STR_UNDO_AUTOFILL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fill" ;
-};
-String STR_UNDO_MERGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Merge" ;
-};
-String STR_UNDO_REMERGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Split" ;
-};
-String STR_UNDO_AUTOFORMAT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "AutoFormat" ;
-};
-String STR_UNDO_REPLACE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Replace" ;
-};
-String STR_UNDO_CURSORATTR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Attributes" ;
-};
-String STR_UNDO_ENTERDATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Input" ;
-};
-String STR_UNDO_INSCOLBREAK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Column Break" ;
-};
-String STR_UNDO_DELCOLBREAK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete column break" ;
-};
-String STR_UNDO_INSROWBREAK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Row Break" ;
-};
-String STR_UNDO_DELROWBREAK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete row break" ;
-};
-String STR_UNDO_DOOUTLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "View Details" ;
-};
-String STR_UNDO_REDOOUTLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide details" ;
-};
-String STR_UNDO_MAKEOUTLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Group" ;
-};
-String STR_UNDO_REMAKEOUTLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Ungroup" ;
-};
-String STR_UNDO_OUTLINELEVEL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Select outline level" ;
-};
-String STR_UNDO_DOOUTLINEBLK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "View Details" ;
-};
-String STR_UNDO_REDOOUTLINEBLK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide details" ;
-};
-String STR_UNDO_REMOVEALLOTLNS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Clear Outline" ;
-};
-String STR_UNDO_AUTOOUTLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "AutoOutline" ;
-};
-String STR_UNDO_SUBTOTALS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Subtotals" ;
-};
-String STR_UNDO_SORT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sort" ;
-};
-String STR_UNDO_QUERY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Filter" ;
-};
-String STR_UNDO_DBDATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Change Database Range" ;
-};
-String STR_UNDO_IMPORTDATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Importing" ;
-};
-String STR_UNDO_REPEATDB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Refresh range" ;
-};
-String STR_UNDO_LISTNAMES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "List names" ;
-};
-String STR_UNDO_PIVOT_NEW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Create pivot table" ;
-};
-String STR_UNDO_PIVOT_MODIFY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit pivot table" ;
-};
-String STR_UNDO_PIVOT_DELETE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete pivot table" ;
-};
-String STR_UNDO_CONSOLIDATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Consolidate" ;
-};
-String STR_UNDO_USESCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Use scenario" ;
-};
-String STR_UNDO_MAKESCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Create scenario" ;
-};
-String STR_UNDO_EDITSCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit scenario" ;
-};
-String STR_UNDO_APPLYCELLSTYLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Apply Cell Style" ;
-};
-String STR_UNDO_EDITCELLSTYLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit Cell Style";
-};
-String STR_UNDO_APPLYPAGESTYLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Apply Page Style";
-};
-String STR_UNDO_EDITPAGESTYLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit Page Style";
-};
-String STR_UNDO_DETADDPRED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Trace Precedents" ;
-};
-String STR_UNDO_DETDELPRED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Remove Precedent" ;
-};
-String STR_UNDO_DETADDSUCC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Trace Dependents" ;
-};
-String STR_UNDO_DETDELSUCC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Remove Dependent" ;
-};
-String STR_UNDO_DETADDERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Trace Error" ;
-};
-String STR_UNDO_DETDELALL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Remove all Traces" ;
-};
-String STR_UNDO_DETINVALID+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Mark invalid data" ;
-};
-String STR_UNDO_DETREFRESH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Refresh Traces" ;
-};
-String STR_UNDO_CHARTDATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Modify chart data range" ;
-};
-String STR_UNDO_ORIGINALSIZE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Original Size" ;
-};
-String STR_UNDO_UPDATELINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Update Link" ;
-};
-String STR_UNDO_REMOVELINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Unlink" ;
-};
-String STR_UNDO_INSERTAREALINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Link" ;
-};
-String STR_UNDO_ENTERMATRIX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Array Formula" ;
-};
-String STR_UNDO_INSERTNOTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Comment" ;
-};
-String STR_UNDO_DELETENOTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete Comment" ;
-};
-String STR_UNDO_SHOWNOTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Show Comment" ;
-};
-String STR_UNDO_HIDENOTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide Comment" ;
-};
-String STR_UNDO_SHOWALLNOTES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Show All Comments" ;
-};
-String STR_UNDO_HIDEALLNOTES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide All Comments" ;
-};
-String STR_UNDO_EDITNOTE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit Comment" ;
-};
-String STR_UNDO_DEC_INDENT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Decrease Indent" ;
-};
-String STR_UNDO_INC_INDENT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Increase Indent" ;
-};
-String STR_UNDO_PROTECT_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Protect sheet" ;
-};
-String STR_UNDO_UNPROTECT_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Unprotect sheet" ;
-};
-String STR_UNDO_PROTECT_DOC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Protect document" ;
-};
-String STR_UNDO_UNPROTECT_DOC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Unprotect document" ;
-};
-String STR_UNDO_PRINTRANGES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Print range" ;
-};
-String STR_UNDO_REMOVEBREAKS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete Page Breaks" ;
-};
-String STR_UNDO_PRINTSCALE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Change Scale" ;
-};
-String STR_UNDO_DRAG_BREAK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Move Page Break" ;
-};
-String STR_UNDO_RANGENAMES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Edit range names" ;
-};
-String STR_UNDO_TRANSLITERATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Change Case";
-};
-String STR_DBNAME_IMPORT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Import" ;
-};
-String STR_MSSG_DOSUBTOTALS_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "%PRODUCTNAME Calc" ;
-};
-String STR_MSSG_DOSUBTOTALS_1+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete data?" ;
-};
-String STR_MSSG_DOSUBTOTALS_2+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Unable to insert rows" ;
-};
-String STR_MSSG_REPEATDB_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No operations to execute" ;
-};
-String STR_MSSG_MAKEAUTOFILTER_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The range does not contain column headers.\nDo you want the first line to be used as column header?" ;
-};
-String STR_MSSG_IMPORTDATA_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error while importing data!" ;
-};
-String STR_PROGRESS_IMPORT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "# records imported..." ;
-};
-String STR_MSSG_MAKEOUTLINE_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Grouping not possible" ;
-};
-String STR_MSSG_REMOVEOUTLINE_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Ungrouping not possible" ;
-};
-String STR_MSSG_PASTEFROMCLIP_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert into multiple selection not possible" ;
-};
-String STR_MSSG_MOVEBLOCKTO_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cell merge not possible if cells already merged!" ;
-};
-String STR_MSSG_INSERTCELLS_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Inserting into merged ranges not possible" ;
-};
-String STR_MSSG_DELETECELLS_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Deleting in merged ranges not possible" ;
-};
-String STR_MSSG_MERGECELLS_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cell merge not possible if cells already merged" ;
-};
-String STR_SORT_ERR_MERGED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Ranges containing merged cells can only be sorted without formats." ;
-};
-String STR_MSSG_SOLVE_0+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Goal Seek succeeded. Result: " ;
-};
-String STR_MSSG_SOLVE_1+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "\n\nInsert the result into the variable cell?" ;
-};
-String STR_MSSG_SOLVE_2+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Goal Seek failed.\n\n" ;
-};
-String STR_MSSG_SOLVE_3+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert the closest value (" ;
-};
-String STR_MSSG_SOLVE_4+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = ") into the variable cell anyway?" ;
-};
-String STR_TABLE_GESAMTERGEBNIS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Grand Total" ;
-};
-String STR_TABLE_ERGEBNIS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Result" ;
-};
-String STR_UNDO_SPELLING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Spellcheck" ;
-};
-String STR_TABLE_UND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "AND" ;
-};
-String STR_TABLE_ODER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "OR" ;
-};
-String STR_TABLE_DEF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sheet" ;
-};
-String STR_MOVE_TO_END+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "- move to end position -" ;
-};
-String STR_NO_REF_TABLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "#REF!" ;
-};
-String STR_PIVOT_NODATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The pivot table must contain at least one entry." ;
-};
-String STR_PIVOT_MOVENOTALLOWED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The data range can not be deleted." ;
-};
-String STR_PIVOT_ERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error creating the pivot table." ;
-};
-String STR_PIVOT_NOTEMPTY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The destination range is not empty. Overwrite existing contents?" ;
-};
-String STR_PIVOT_REMOVE_PIVOTCHART+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "There is at least one pivot chart associated with this pivot table. Should remove all or abort?" ;
-};
-String STR_DATAPILOT_SUBTOTAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The source range contains subtotals which may distort the results. Use it anyway?";
-};
-String STR_PIVOT_TOTAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Total" ;
-};
-String STR_PIVOT_DATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Data" ;
-};
-String STR_PIVOT_GROUP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Group" ;
-};
-String STR_ROWCOL_SELCOUNT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "$1 rows, $2 columns selected";
-};
-String STR_FILTER_SELCOUNT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "$1 of $2 records found";
-};
-String STR_COLUMN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Column" ;
-};
-String STR_ROW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Row" ;
-};
-String STR_PAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Page" ;
-};
-String STR_PGNUM+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Page %1" ;
-};
-String STR_LOAD_DOC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Load document" ;
-};
-String STR_SAVE_DOC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Save document" ;
-};
-String STR_AREA_ALREADY_INSERTED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This range has already been inserted." ;
-};
-String STR_INVALID_TABREF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid sheet reference." ;
-};
-String STR_INVALID_QUERYAREA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This range does not contain a valid query." ;
-};
-String STR_REIMPORT_EMPTY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This range does not contain imported data." ;
-};
-String STR_NOMULTISELECT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This function cannot be used with multiple selections." ;
-};
-String STR_FILL_SERIES_PROGRESS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fill Row..." ;
-};
-String STR_UNDO_THESAURUS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Thesaurus" ;
-};
-String STR_FILL_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fill Sheets" ;
-};
-String STR_UPDATE_SCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Add selected ranges to current scenario?" ;
-};
-String STR_ERR_NEWSCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The scenario ranges must be selected in order to be able to create a new scenario." ;
-};
-String STR_NOAREASELECTED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "A range has not been selected." ;
-};
-String STR_NEWTABNAMENOTUNIQUE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This name already exists." ;
-};
-String STR_INVALIDTABNAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid sheet name.\nThe sheet name must not be a duplicate of an existing name \nand may not contain the characters [ ] * ? : / \\" ;
-};
-String STR_SCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Scenario" ;
-};
-String STR_PIVOT_TABLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table" ;
-};
- // Text strings for captions of subtotal functions.
-String STR_FUN_TEXT_SUM+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sum" ;
-};
-String STR_FUN_TEXT_SELECTION_COUNT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Selection count" ;
-};
-String STR_FUN_TEXT_COUNT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Count" ;
-};
-String STR_FUN_TEXT_COUNT2+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "CountA" ;
-};
-String STR_FUN_TEXT_AVG+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Average" ;
-};
-String STR_FUN_TEXT_MEDIAN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Median" ;
-};
-String STR_FUN_TEXT_MAX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Max" ;
-};
-String STR_FUN_TEXT_MIN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Min" ;
-};
-String STR_FUN_TEXT_PRODUCT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Product" ;
-};
-String STR_FUN_TEXT_STDDEV+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "StDev" ;
-};
-String STR_FUN_TEXT_VAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Var" ;
-};
-String STR_NOCHARTATCURSOR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No chart found at this position." ;
-};
-String STR_PIVOT_NOTFOUND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No pivot table found at this position." ;
-};
-String STR_EMPTYDATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "(empty)" ;
-};
-String STR_PRINT_INVALID_AREA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid print range" ;
-};
-String STR_PAGESTYLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Page Style" ;
-};
-String STR_HEADER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Header" ;
-};
-String STR_FOOTER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Footer" ;
-};
-String STR_TEXTATTRS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Text Attributes" ;
-};
-String STR_HFCMD_DELIMITER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "\\" ;
-};
-String STR_HFCMD_PAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "PAGE" ;
-};
-String STR_HFCMD_PAGES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "PAGES" ;
-};
-String STR_HFCMD_DATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "DATE" ;
-};
-String STR_HFCMD_TIME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "TIME" ;
-};
-String STR_HFCMD_FILE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "FILE" ;
-};
-String STR_HFCMD_TABLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "SHEET" ;
-};
-String STR_PROTECTIONERR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Protected cells can not be modified." ;
-};
-String STR_READONLYERR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Document opened in read-only mode.";
-};
-String STR_MATRIXFRAGMENTERR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "You cannot change only part of an array." ;
-};
-String STR_PAGEHEADER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Header" ;
-};
-String STR_PAGEFOOTER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Footer" ;
-};
-
-/* BEGIN error constants and error strings. */
-
-String STR_ERROR_STR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Err:" ;
-};
-/* BEGIN defined ERROR.TYPE() values. */
-/* ERROR.TYPE( #DIV/0! ) == 2 */
-String STR_LONG_ERR_DIV_ZERO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Division by zero" ;
-};
-/* ERROR.TYPE( #VALUE! ) == 3 */
-String STR_LONG_ERR_NO_VALUE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Wrong data type" ;
-};
-/* ERROR.TYPE( #REF! ) == 4 */
-String STR_LONG_ERR_NO_REF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Not a valid reference" ;
-};
-/* ERROR.TYPE( #NAME! ) == 5 */
-String STR_LONG_ERR_NO_NAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Invalid name" ;
-};
-/* ERROR.TYPE( #NUM! ) == 6 */
-String STR_LONG_ERR_ILL_FPO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Invalid numeric value" ;
-};
-/* ERROR.TYPE( #N/A ) == 7 */
-String STR_LONG_ERR_NV+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Value not available" ;
-};
-/* END defined ERROR.TYPE() values. */
-String STR_NO_ADDIN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "#ADDIN?" ;
-};
-String STR_LONG_ERR_NO_ADDIN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Add-in not found" ;
-};
-String STR_NO_MACRO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "#MACRO?" ;
-};
-String STR_LONG_ERR_NO_MACRO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Macro not found" ;
-};
-String STR_LONG_ERR_SYNTAX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Internal syntactical error" ;
-};
-String STR_LONG_ERR_ILL_ARG+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Invalid argument" ;
-};
-String STR_LONG_ERR_ILL_PAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error in parameter list" ;
-};
-String STR_LONG_ERR_ILL_CHAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Invalid character" ;
-};
-String STR_LONG_ERR_PAIR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: in bracketing" ;
-};
-String STR_LONG_ERR_OP_EXP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Operator missing" ;
-};
-String STR_LONG_ERR_VAR_EXP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Variable missing" ;
-};
-String STR_LONG_ERR_CODE_OVF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Formula overflow" ;
-};
-String STR_LONG_ERR_STR_OVF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: String overflow" ;
-};
-String STR_LONG_ERR_STACK_OVF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Internal overflow" ;
-};
-String STR_LONG_ERR_MATRIX_SIZE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Array or matrix size" ;
-};
-String STR_LONG_ERR_CIRC_REF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Circular reference" ;
-};
-String STR_LONG_ERR_NO_CONV+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Error: Calculation does not converge" ;
-};
-
-/* END error constants and error strings. */
-
-String STR_GRIDCOLOR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Grid color" ;
-};
-String STR_CELL_FILTER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Filter" ;
-};
-String STR_TARGETNOTFOUND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The target database range does not exist." ;
-};
-String STR_INVALID_EPS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid increment" ;
-};
-String STR_UNDO_TABOP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Multiple operations" ;
-};
-String STR_INVALID_AFNAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "You have entered an invalid name.\nAutoFormat could not be created. \nTry again using a different name." ;
-};
-String STR_AREA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Range" ;
-};
-String STR_YES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Yes" ;
-};
-String STR_NO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No" ;
-};
-String STR_PROTECTION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Protection" ;
-};
-String STR_FORMULAS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Formulas" ;
-};
-String STR_HIDE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide" ;
-};
-String STR_PRINT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Print" ;
-};
-String STR_INVALID_AFAREA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "To apply an AutoFormat,\na table range of at least\n3x3 cells must be selected." ;
-};
-String STR_OPTIONAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "(optional)" ;
-};
-String STR_REQUIRED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "(required)" ;
-};
-String STR_NOTES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Comments" ;
-};
-String STR_QUERY_DELTAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Are you sure you want to delete the selected sheet(s)?" ;
-};
-String STR_QUERY_DELSCENARIO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Are you sure you want to delete the selected scenario?" ;
-};
-String STR_EXPORT_ASCII+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Export Text File" ;
-};
-String STR_IMPORT_LOTUS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Import Lotus files" ;
-};
-String STR_IMPORT_DBF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Import DBase files" ;
-};
-String STR_EXPORT_DBF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "DBase export";
-};
-String STR_EXPORT_DIF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Dif Export" ;
-};
-String STR_IMPORT_DIF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Dif Import" ;
-};
-String STR_STYLENAME_STANDARD+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Default" ;
-};
-String STR_STYLENAME_RESULT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Result" ;
-};
-String STR_STYLENAME_RESULT1+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Result2" ;
-};
-String STR_STYLENAME_HEADLINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Heading" ;
-};
-String STR_STYLENAME_HEADLINE1+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Heading1" ;
-};
-String STR_STYLENAME_REPORT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Report" ;
-};
-String STR_THESAURUS_NO_STRING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Thesaurus can only be used in text cells!" ;
-};
-String STR_SPELLING_BEGIN_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Should the spellcheck be continued at the beginning of the current sheet?" ;
-};
-String STR_SPELLING_NO_LANG+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "is not available for the thesaurus.\nPlease check your installation and install \nthe desired language if necessary" ;
-};
-String STR_SPELLING_STOP_OK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The spellcheck of this sheet has been completed." ;
-};
-String STR_UNDO_INSERT_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Sheet" ;
-};
-String STR_UNDO_DELETE_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete Sheets" ;
-};
-String STR_UNDO_RENAME_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Rename Sheet" ;
-};
-String STR_UNDO_SET_TAB_BG_COLOR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Color Tab" ;
-};
-String STR_UNDO_SET_MULTI_TAB_BG_COLOR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Color Tabs" ;
-};
-String STR_UNDO_MOVE_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Move Sheets" ;
-};
-String STR_UNDO_COPY_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Copy Sheet" ;
-};
-String STR_UNDO_APPEND_TAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Append sheet" ;
-};
-String STR_UNDO_SHOWTAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Show Sheet" ;
-};
-String STR_UNDO_SHOWTABS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Show Sheets" ;
-};
-String STR_UNDO_HIDETAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide sheet" ;
-};
-String STR_UNDO_HIDETABS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide sheets" ;
-};
-String STR_UNDO_TAB_RTL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Flip sheet" ;
-};
-String STR_ABSREFLOST+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The new table contains absolute references to other tables which may be incorrect!" ;
-};
-String STR_NAMECONFLICT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Due to identical names, an existing range name in the destination document has been altered!" ;
-};
-String STR_ERR_AUTOFILTER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "AutoFilter not possible" ;
-};
-String STR_CREATENAME_REPLACE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Replace existing definition of #?" ;
-};
-String STR_CREATENAME_MARKERR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid selection for range names" ;
-};
-String STR_CONSOLIDATE_ERR1+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "References can not be inserted above the source data." ;
-};
-String STR_SCENARIO_NOTFOUND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Scenario not found" ;
-};
-String STR_QUERY_DELENTRY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Do you really want to delete the entry #?" ;
-};
-String STR_VOBJ_OBJECT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Objects/Images" ;
-};
-String STR_VOBJ_CHART+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Charts" ;
-};
-String STR_VOBJ_DRAWINGS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Drawing Objects" ;
-};
-String STR_VOBJ_MODE_SHOW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Show" ;
-};
-String STR_VOBJ_MODE_HIDE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide" ;
-};
-String STR_SCATTR_PAGE_TOPDOWN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Top to bottom" ;
-};
-String STR_SCATTR_PAGE_LEFTRIGHT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Left-to-right" ;
-};
-String STR_SCATTR_PAGE_NOTES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Comments" ;
-};
-String STR_SCATTR_PAGE_GRID+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Grid" ;
-};
-String STR_SCATTR_PAGE_HEADERS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Row & Column Headers" ;
-};
-String STR_SCATTR_PAGE_FORMULAS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Formulas" ;
-};
-String STR_SCATTR_PAGE_NULLVALS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Zero Values" ;
-};
-String STR_SCATTR_PAGE_PRINTDIR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Print direction" ;
-};
-String STR_SCATTR_PAGE_FIRSTPAGENO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "First page number" ;
-};
-String STR_SCATTR_PAGE_SCALE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Reduce/enlarge printout" ;
-};
-String STR_SCATTR_PAGE_SCALETOPAGES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fit print range(s) on number of pages" ;
-};
-String STR_SCATTR_PAGE_SCALETO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fit print range(s) to width/height" ;
-};
-String STR_SCATTR_PAGE_SCALE_WIDTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Width" ;
-};
-String STR_SCATTR_PAGE_SCALE_HEIGHT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Height" ;
-};
-String STR_SCATTR_PAGE_SCALE_PAGES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "%1 page(s)" ;
-};
-String STR_SCATTR_PAGE_SCALE_AUTO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "automatic" ;
-};
-String STR_DOC_STAT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Statistics" ;
-};
-String STR_LINKERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The link could not be updated." ;
-};
-String STR_LINKERRORFILE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "File:" ;
-};
-String STR_LINKERRORTAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sheet:" ;
-};
-String STR_OVERVIEW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Overview" ;
-};
-String STR_DOC_INFO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Doc.Information" ;
-};
-String STR_DOC_PRINTED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Printed" ;
-};
-String STR_BY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "by" ;
-};
-String STR_ON+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "on" ;
-};
-String STR_RELOAD_TABLES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This file contains links to other files.\nShould they be updated?" ;
-};
-String STR_REIMPORT_AFTER_LOAD+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This file contains queries. The results of these queries were not saved.\nDo you want these queries to be repeated?" ;
-};
-String STR_INSERT_FULL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Filled cells cannot be shifted\nbeyond the sheet." ;
-};
-String STR_TABINSERT_ERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The table could not be inserted." ;
-};
-String STR_TABREMOVE_ERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The sheets could not be deleted." ;
-};
-String STR_PASTE_ERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The contents of the clipboard could not be pasted." ;
-};
-String STR_PASTE_FULL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "There is not enough space on the sheet to insert here." ;
-};
-String STR_PASTE_BIGGER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The content of the clipboard is bigger than the range selected.\nDo you want to insert it anyway?";
-};
-String STR_ERR_NOREF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No cell references are found in the selected cells." ;
-};
-String STR_GRAPHICNAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_INVALIDNAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid name." ;
-};
-String STR_VALID_MACRONOTFOUND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Selected macro not found." ;
-};
-String STR_VALID_DEFERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid value." ;
-};
-String STR_PROGRESS_CALCULATING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "calculating" ;
-};
-String STR_PROGRESS_SORTING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "sorting" ;
-};
-String STR_PROGRESS_HEIGHTING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Adapt row height" ;
-};
-String STR_PROGRESS_COMPARING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Compare #" ;
-};
-String STR_DETINVALID_OVERFLOW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The maximum number of invalid cells has been exceeded.\nNot all invalid cells have been marked." ;
-};
-String STR_QUICKHELP_DELETE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Delete contents" ;
-};
-String STR_QUICKHELP_REF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "%1 R  x %2 C" ;
-};
-String STR_FUNCTIONLIST_MORE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "More..." ;
-};
-String STR_ERR_INVALID_AREA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid range" ;
-};
- // Templates for data pilot tables.
-String STR_PIVOT_STYLE_INNER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Value" ;
-};
-String STR_PIVOT_STYLE_RESULT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Result" ;
-};
-String STR_PIVOT_STYLE_CATEGORY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Category" ;
-};
-String STR_PIVOT_STYLE_TITLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Title" ;
-};
-String STR_PIVOT_STYLE_FIELDNAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Field" ;
-};
-String STR_PIVOT_STYLE_TOP+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot Table Corner" ;
-};
-String STR_OPERATION_FILTER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Filter" ;
-};
-String STR_OPERATION_SORT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sort" ;
-};
-String STR_OPERATION_SUBTOTAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Subtotals" ;
-};
-String STR_OPERATION_NONE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "None" ;
-};
-String STR_IMPORT_REPLACE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Do you want to replace the contents of #?" ;
-};
-String STR_TIP_WIDTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Width:" ;
-};
-String STR_TIP_HEIGHT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Height:" ;
-};
-String STR_TIP_HIDE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hide" ;
-};
-String STR_CHANGED_BLANK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "<empty>" ;
-};
-String STR_CHANGED_CELL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cell #1 changed from '#2' to '#3'" ;
-};
-String STR_CHANGED_INSERT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "#1 inserted" ;
-};
-String STR_CHANGED_DELETE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "#1 deleted" ;
-};
-String STR_CHANGED_MOVE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Range moved from #1 to #2" ;
-};
-String STR_END_REDLINING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ;
-};
-String STR_CLOSE_ERROR_LINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The document can not be closed while a link is being updated." ;
-};
-String STR_UNDO_RESIZEMATRIX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Adapt array area";
-};
-String STR_TIP_RESIZEMATRIX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Array formula  %1 R x %2 C";
-};
-
-String STR_UNDO_HANGULHANJA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hangul/Hanja Conversion";
-};
-
-String STR_NAME_INPUT_CELL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Select Cell";
-};
-String STR_NAME_INPUT_RANGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Select Range";
-};
-String STR_NAME_INPUT_DBRANGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Select Database Range";
-};
-String STR_NAME_INPUT_ROW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Go To Row";
-};
-String STR_NAME_INPUT_SHEET+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Go To Sheet";
-};
-String STR_NAME_INPUT_DEFINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Define Name for Range";
-};
-String STR_NAME_ERROR_SELECTION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The selection needs to be rectangular in order to name it.";
-};
-String STR_NAME_ERROR_NAME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "You must enter a valid reference or type a valid name for the selected range.";
-};
-
-String STR_CHANGED_MOVE_REJECTION_WARNING+RID_GLOBSTR_OFFSET
-{
-    Text[ en-US ] = "WARNING: This action may have resulted in unintended changes to cell references in formulas.";
-};
-
-String STR_CHANGED_DELETE_REJECTION_WARNING+RID_GLOBSTR_OFFSET
-{
-    Text[ en-US ] = "WARNING: This action may have resulted in references to the deleted area not being restored.";
-};
-
-String STR_UNDO_CHINESE_TRANSLATION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Chinese conversion";
-};
-
-String STR_ERR_DATAPILOT_INPUT+RID_GLOBSTR_OFFSET
-{
-    Text[ en-US ] = "You cannot change this part of the pivot table.";
-};
-
-String STR_RECALC_MANUAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Manual";
-};
-String STR_RECALC_AUTO+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Automatic";
-};
-String STR_ERR_LONG_NESTED_ARRAY+RID_GLOBSTR_OFFSET
-{
-Text [ en-US ] = "Nested arrays are not supported." ;
-};
-String STR_UNDO_TEXTTOCOLUMNS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Text to Columns";
-};
-String STR_DOC_UPDATED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Your spreadsheet has been updated with changes saved by other users.";
-};
-String STR_DOC_WILLBESAVED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The spreadsheet must be saved now to activate sharing mode.\n\nDo you want to continue?";
-};
-String STR_DOC_WILLNOTBESAVED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Already resolved merge conflicts will be lost and your changes to the shared spreadsheet will not be saved.\n\nDo you want to continue?";
-};
-String STR_DOC_DISABLESHARED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Disabling shared mode of a spreadsheet hinders all other users of the shared spreadsheet to merge back their work.\n\nDo you want to continue?";
-};
-String STR_DOC_NOLONGERSHARED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This spreadsheet is no longer in shared mode.\n\nSave your spreadsheet to a separate file and merge your changes to the shared spreadsheet manually.";
-};
-String STR_SHARED_DOC_WARNING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time.\n\nChanges to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.";
-};
-String STR_FILE_LOCKED_TRY_LATER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nSharing mode of a locked file cannot be disabled. Try again later.";
-};
-String STR_FILE_LOCKED_SAVE_LATER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nTry again later to save your changes.";
-};
-String STR_UNKNOWN_USER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Unknown User";
-};
-
-String STR_SHAPE_AUTOSHAPE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "AutoShape";
-};
-
-String STR_SHAPE_RECTANGLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Rectangle";
-};
-
-String STR_SHAPE_LINE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Line";
-};
-
-String STR_SHAPE_OVAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Oval";
-};
-
-String STR_FORM_BUTTON+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Button";
-};
-
-String STR_FORM_CHECKBOX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Check Box";
-};
-
-String STR_FORM_OPTIONBUTTON+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Option Button";
-};
-
-String STR_FORM_LABEL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Label";
-};
-
-String STR_FORM_LISTBOX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "List Box";
-};
-
-String STR_FORM_GROUPBOX+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Group Box";
-};
-
-String STR_FORM_DROPDOWN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Drop Down";
-};
-
-String STR_FORM_SPINNER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Spinner";
-};
-
-String STR_FORM_SCROLLBAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Scroll Bar";
-};
-
-String STR_STYLE_FAMILY_CELL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cell Styles";
-};
-String STR_STYLE_FAMILY_PAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Page Styles";
-};
-String STR_ERR_DATAPILOTSOURCE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Pivot table source data is invalid.";
-};
-String STR_OPTIONS_WARN_SEPARATORS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.";
-};
-String STR_UNDO_INSERT_CURRENT_DATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Current Date";
-};
-String STR_UNDO_INSERT_CURRENT_TIME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Insert Current Time";
-};
-String STR_MANAGE_NAMES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Manage Names...";
-};
-String STR_HEADER_NAME+RID_GLOBSTR_OFFSET
-{
-    Text [en-US] = "Name";
-};
-String STR_HEADER_RANGE_OR_EXPR+RID_GLOBSTR_OFFSET
-{
-    Text [en-US] = "Range or formula expression";
-};
-String STR_HEADER_SCOPE+RID_GLOBSTR_OFFSET
-{
-    Text [en-US] = "Scope";
-};
-String STR_MULTI_SELECT+RID_GLOBSTR_OFFSET
-{
-    Text [en-US] = "(multiple)";
-};
-String STR_GLOBAL_SCOPE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Document (Global)" ;
-};
-String STR_ERR_NAME_EXISTS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid name. Already in use for the selected scope.";
-};
-String STR_ERR_NAME_INVALID+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore.";
-};
-String STR_UNSAVED_EXT_REF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This Document contains external references to unsaved documents.\n\nDo you want to continue?";
-};
-String STR_CLOSE_WITH_UNSAVED_REFS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss.";
-};
-String STR_HEADER_RANGE+RID_GLOBSTR_OFFSET
-{
-    Text [en-US] = "Range";
-};
-String STR_HEADER_COND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "First Condition";
-};
-String STR_COND_CONDITION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cell value is";
-};
-String STR_COND_COLORSCALE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "ColorScale";
-};
-String STR_COND_DATABAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "DataBar";
-};
-String STR_COND_ICONSET+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "IconSet";
-};
-String STR_COND_BETWEEN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "between";
-};
-String STR_COND_NOTBETWEEN+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "not between";
-};
-String STR_COND_UNIQUE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "unique";
-};
-String STR_COND_DUPLICATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "duplicate";
-};
-String STR_COND_FORMULA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Formula is";
-};
-String STR_COND_TOP10+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Top Elements";
-};
-String STR_COND_BOTTOM10+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Bottom Elements";
-};
-String STR_COND_TOP_PERCENT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Top Percent";
-};
-String STR_COND_DATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Date is";
-};
-String STR_COND_BOTTOM_PERCENT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Bottom Percent";
-};
-String STR_COND_ABOVE_AVERAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Above Average";
-};
-String STR_COND_BELOW_AVERAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Below Average";
-};
-String STR_COND_ABOVE_EQUAL_AVERAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Above or equal Average";
-};
-String STR_COND_BELOW_EQUAL_AVERAGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Below or equal Average";
-};
-String STR_COND_ERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "an Error code";
-};
-String STR_COND_NOERROR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "not an Error code";
-};
-String STR_COND_BEGINS_WITH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Begins with";
-};
-String STR_COND_ENDS_WITH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Ends with";
-};
-String STR_COND_CONTAINS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Contains";
-};
-String STR_COND_NOT_CONTAINS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Not Contains";
-};
-String STR_COND_TODAY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "today";
-};
-String STR_COND_YESTERDAY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "yesterday";
-};
-String STR_COND_TOMORROW+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "tomorrow";
-};
-String STR_COND_LAST7DAYS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "in the last 7 days";
-};
-String STR_COND_THISWEEK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "this week";
-};
-String STR_COND_LASTWEEK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "last week";
-};
-String STR_COND_NEXTWEEK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "next week";
-};
-String STR_COND_THISMONTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "this month";
-};
-String STR_COND_LASTMONTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "last month";
-};
-String STR_COND_NEXTMONTH+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "next month";
-};
-String STR_COND_THISYEAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "this year";
-};
-String STR_COND_LASTYEAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "last year";
-};
-String STR_COND_NEXTYEAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "next year";
-};
-String STR_COND_AND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "and";
-};
-String STR_ERR_CONDFORMAT_PROTECTED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Conditional Formats can not be created, deleted or changed in protected sheets!";
-};
-String STR_EDIT_EXISTING_COND_FORMATS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The selected cell already contains conditional formatting. You can either edit the existing conditional format or you define a new overlapping conditional format.\n\n Do you want to edit the existing conditional format?";
-};
-
-String STR_QUERY_FORMULA_RECALC_ONLOAD_ODS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This document was last saved by an application other than %PRODUCTNAME.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?";
-};
-
-String STR_QUERY_FORMULA_RECALC_ONLOAD_XLS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "This document was last saved by Excel.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells now?";
-};
-
-String STR_ALWAYS_PERFORM_SELECTED+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Always perform this without prompt in the future.";
-};
-
-String STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "You cannot insert or delete cells when the affected range intersects with pivot table.";
-};
-
-String  STR_DPFIELD_GROUP_BY_SECONDS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Seconds" ;
-};
-String  STR_DPFIELD_GROUP_BY_MINUTES+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Minutes" ;
-};
-String  STR_DPFIELD_GROUP_BY_HOURS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Hours" ;
-};
-String  STR_DPFIELD_GROUP_BY_DAYS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Days" ;
-};
-String  STR_DPFIELD_GROUP_BY_MONTHS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Months" ;
-};
-String  STR_DPFIELD_GROUP_BY_QUARTERS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Quarters" ;
-};
-String  STR_DPFIELD_GROUP_BY_YEARS+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Years" ;
-};
-String STR_INVALIDVAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid target value." ;
-};
-String STR_INVALIDVAR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Undefined name for variable cell." ;
-};
-String STR_INVALIDFORM+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Undefined name as formula cell." ;
-};
-String STR_NOFORMULA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Formula cell must contain a formula." ;
-};
-String STR_INVALIDINPUT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid input." ;
-};
-String STR_INVALIDCONDITION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid condition." ;
-};
-String STR_QUERYREMOVE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Should the entry\n#\nbe deleted?" ;
-};
-String STR_COPYLIST+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Copy List" ;
-};
-String STR_COPYFROM+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "List from" ;
-};
-String STR_COPYERR+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Cells without text have been ignored." ;
-};
-String STR_CTRLCLICKHYPERLINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "%s-click to follow hyperlink:";
-};
-String STR_CLICKHYPERLINK+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "click to open hyperlink:";
-};
-
-String STR_PRINT_PREVIEW_NODATA+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "No Data";
-};
-
-String STR_PRINT_PREVIEW_EMPTY_RANGE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Print Range Empty";
-};
-
-String STR_UNDO_CONDFORMAT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Conditional Format";
-};
-
-String STR_UNDO_CONDFORMAT_LIST+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Conditional Formats";
-};
-
-String STR_UNDO_FORMULA_TO_VALUE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Convert Formula To Value";
-};
-String STR_UNQUOTED_STRING+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Strings without quotes are interpreted as column/row labels.";
-};
-String STR_ENTER_VALUE+RID_GLOBSTR_OFFSET
-{
-    Text[ en-US ] = "Enter a value!";
-};
-String STR_TABLE_COUNT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Sheet %1 of %2";
-};
-String STR_FUNCTIONS_FOUND+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "%1 and %2 more";
-};
-String STR_GENERAL+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "General";
-};
-String STR_NUMBER+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Number";
-};
-String STR_PERCENT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Percent";
-};
-String STR_CURRENCY+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Currency";
-};
-String STR_DATE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Date";
-};
-String STR_TIME+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Time";
-};
-String STR_SCIENTIFIC+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Scientific";
-};
-String STR_FRACTION+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Fraction";
-};
-String STR_BOOLEAN_VALUE+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Boolean Value";
-};
-String STR_TEXT+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Text";
-};
-String STR_QUERY_PIVOTTABLE_DELTAB+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "The selected sheet(s) contain source data of related pivot tables that will be lost. Are you sure you want to delete the selected sheet(s)?";
-};
-String STR_ERR_NAME_INVALID_CELL_REF+RID_GLOBSTR_OFFSET
-{
-    Text [ en-US ] = "Invalid name. Reference to a cell, or a range of cells not allowed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
deleted file mode 100644
index 7cc96981288f..000000000000
--- a/sc/source/ui/src/sc.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 "sc.hrc"
-
- // ???
-String 30001 { Text = "Dummy1" ; };
-String 30002 { Text = "Dummy2" ; };
-String 30006 { Text = "Dummy3" ; };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
deleted file mode 100644
index f9ad6237b843..000000000000
--- a/sc/source/ui/src/scerrors.src
+++ /dev/null
@@ -1,106 +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 "scerrors.hxx"
-#include "sc.hrc"
-
-StringArray RID_ERRHDLSC
-{
-    ItemList [ en-US ] =
-    {
-        // ERRORS -----------------------------------------------------
-        < "Impossible to connect to the file." ;
-          SCERR_IMPORT_CONNECT & ERRCODE_RES_MASK ; >;
-        < "File could not be opened." ;
-          SCERR_IMPORT_OPEN & ERRCODE_RES_MASK ; >;
-        < "An unknown error has occurred." ;
-          SCERR_IMPORT_UNKNOWN & ERRCODE_RES_MASK ; >;
-        < "Not enough memory while importing." ;
-          SCERR_IMPORT_OUTOFMEM & ERRCODE_RES_MASK ; >;
-        < "Unknown Lotus1-2-3 file format." ;
-          SCERR_IMPORT_UNKNOWN_WK & ERRCODE_RES_MASK ; >;
-        < "Error in file structure while importing." ;
-          SCERR_IMPORT_FORMAT & ERRCODE_RES_MASK ; >;
-        < "There is no filter available for this file type." ;
-          SCERR_IMPORT_NI & ERRCODE_RES_MASK ; >;
-        < "Unknown or unsupported Excel file format." ;
-          SCERR_IMPORT_UNKNOWN_BIFF & ERRCODE_RES_MASK ; >;
-        < "Excel file format not yet implemented." ;
-          SCERR_IMPORT_NI_BIFF & ERRCODE_RES_MASK ; >;
-        < "This file is password-protected." ;
-          SCERR_IMPORT_FILEPASSWD & ERRCODE_RES_MASK ; >;
-        < "Internal import error." ;
-          SCERR_IMPORT_INTERNAL & ERRCODE_RES_MASK ; >;
-        < "The file contains data after row 8192 and therefore can not be read." ;
-          SCERR_IMPORT_8K_LIMIT & ERRCODE_RES_MASK ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col).";
-          SCERR_IMPORT_FILE_ROWCOL & ERRCODE_RES_MASK ; >;
-        < "File format error found at $(ARG1)(row,col)." ;
-          SCERR_IMPORT_FORMAT_ROWCOL & ERRCODE_RES_MASK ; >;
-
-        // Export ----------------------------------------------------
-        < "Connection to the file could not be established." ;
-          SCERR_EXPORT_CONNECT & ERRCODE_RES_MASK ; >;
-        < "Data could not be written." ;
-          SCERR_EXPORT_DATA & ERRCODE_RES_MASK ; >;
-        < "$(ARG1)" ;
-          SCERR_EXPORT_SQLEXCEPTION & ERRCODE_RES_MASK ; >;
-        < "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\"." ;
-          SCERR_EXPORT_ENCODING & ERRCODE_RES_MASK ; >;
-        < "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width." ;
-          SCERR_EXPORT_FIELDWIDTH & ERRCODE_RES_MASK ; >;
-
-        // WARNINGS ---------------------------------------------------
-        < "Only the active sheet was saved." ;
-          SCWARN_EXPORT_ASCII & ERRCODE_RES_MASK ; >;
-        < "The maximum number of rows has been exceeded. Excess rows were not imported!" ;
-          SCWARN_IMPORT_RANGE_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "The data could not be loaded completely because the maximum number of rows per sheet was exceeded." ;
-          SCWARN_IMPORT_ROW_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "The data could not be loaded completely because the maximum number of columns per sheet was exceeded." ;
-          SCWARN_IMPORT_COLUMN_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!" ;
-          SCWARN_IMPORT_SHEET_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "The data could not be loaded completely because the maximum number of characters per cell was exceeded." ;
-          SCWARN_IMPORT_CELL_OVERFLOW & ERRCODE_RES_MASK ; >;
-        < "Corresponding FM3-File could not be opened." ;
-          SCWARN_IMPORT_OPEN_FM3 & ERRCODE_RES_MASK ; >;
-        < "Error in file structure of corresponding FM3-File." ;
-          SCWARN_IMPORT_WRONG_FM3 & ERRCODE_RES_MASK ; >;
-        < "Document too complex for automatic calculation. Press F9 to recalculate." ;
-          SCWARN_CORE_HARD_RECALC & ERRCODE_RES_MASK ; >;
-        < "The document contains more rows than supported in the selected format.\nAdditional rows were not saved." ;
-          SCWARN_EXPORT_MAXROW & ERRCODE_RES_MASK ; >;
-        < "The document contains more columns than supported in the selected format.\nAdditional columns were not saved." ;
-          SCWARN_EXPORT_MAXCOL & ERRCODE_RES_MASK ; >;
-        < "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved." ;
-          SCWARN_EXPORT_MAXTAB & ERRCODE_RES_MASK ; >;
-        < "The document contains information not recognized by this program version.\nResaving the document will delete this information!" ;
-          SCWARN_IMPORT_INFOLOST & ERRCODE_RES_MASK ; >;
-        < "Not all cell contents could be saved in the specified format." ;
-          SCWARN_EXPORT_DATALOST & ERRCODE_RES_MASK ; >;
-        < "The following characters could not be converted to the selected character set\nand were written as &#1234; surrogates:\n\n$(ARG1)";
-          SCWARN_EXPORT_NONCONVERTIBLE_CHARS & ERRCODE_RES_MASK ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col).";
-          SCWARN_IMPORT_FILE_ROWCOL & ERRCODE_RES_MASK ; >;
-        < "Not all attributes could be read." ;
-          SCWARN_IMPORT_FEATURES_LOST & ERRCODE_RES_MASK ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
deleted file mode 100644
index 82b369afacc5..000000000000
--- a/sc/source/ui/src/scfuncs.src
+++ /dev/null
@@ -1,4875 +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 .
- */
-
-/* Resource file for the function wizard / autopilot.
- *
- *  For every function there is a StringArray with a resource id (offset by
- *  RID_SC_FUNC_DESCRIPTIONS_START) with the OpCode of the function
- *
- *  In this stringarray, the description of the function is given as the first
- *  entry, followed by two entries for each parameter, first the type or name
- *  of the parameter, second a description of the parameter.
- */
-
-#include "scfuncs.hrc"
-#include "formula/compiler.hrc"
-
- // -=*# Resource for function DCOUNT #*=-
-StringArray SC_OPCODE_DB_COUNT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts the cells of a data range whose contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DCOUNTA #*=-
-StringArray SC_OPCODE_DB_COUNT_2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts all non-blank cells of a data range where the content corresponds to the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DAVERAGE #*=-
-StringArray SC_OPCODE_DB_AVERAGE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the average value of all the cells of a data range whose contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DGET #*=-
-StringArray SC_OPCODE_DB_GET+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Defines the contents of the cell of a data range which matches the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DMAX #*=-
-StringArray SC_OPCODE_DB_MAX+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the maximum value from all of the cells of a data range which correspond to the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DMIN #*=-
-StringArray SC_OPCODE_DB_MIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the minimum of all cells of a data range where the contents correspond to the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DPRODUCT #*=-
-StringArray SC_OPCODE_DB_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Multiplies all cells of a data range where the contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DSTDEV #*=-
-StringArray SC_OPCODE_DB_STD_DEV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the standard deviation of all cells in a data range whose contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DSTDEVP #*=-
-StringArray SC_OPCODE_DB_STD_DEV_P+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DSUM #*=-
-StringArray SC_OPCODE_DB_SUM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Adds all the cells of a data range where the contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DVAR #*=-
-StringArray SC_OPCODE_DB_VAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the variance of all the cells in a data range where the contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DVARP #*=-
-StringArray SC_OPCODE_DB_VAR_P+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines variance of a population based on all cells in a data range where contents match the search criteria." ; >;
-        < "Database" ; >;
-        < "The range of cells containing data." ; >;
-        < "Database field" ; >;
-        < "Indicates which database field (column) is to be used for the search criteria." ; >;
-        < "Search criteria" ; >;
-        < "Defines the cell range containing the search criteria." ; >;
-    };
-};
- // -=*# Resource for function DATE #*=-
-StringArray SC_OPCODE_GET_DATE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Provides an internal number for the date given." ; >;
-        < "year" ; >;
-        < "An integer between 1583 and 9956 or 0 and 99 (19xx or 20xx depending on the defined option)." ; >;
-        < "month" ; >;
-        < "An integer between 1 and 12 representing the month." ; >;
-        < "day" ; >;
-        < "An integer between 1 and 31 representing the day of the month." ; >;
-    };
-};
- // -=*# Resource for function DATE_VALUE #*=-
-StringArray SC_OPCODE_GET_DATE_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns an internal number for a text having a possible date format." ; >;
-        < "text" ; >;
-        < "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format." ; >;
-    };
-};
- // -=*# Resource for function DAY #*=-
-StringArray SC_OPCODE_GET_DAY+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sequential date of the month as an integer (1-31) in relation to the date value." ; >;
-        < "Number" ; >;
-        < "The internal number for the date." ; >;
-    };
-};
- // -=*# Resource for function DAYS360 #*=-
-StringArray SC_OPCODE_GET_DIFF_DATE_360+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of days between two dates based on a 360-day year." ; >;
-        < "Date_1" ; >;
-        < "The start date for calculating the difference in days." ; >;
-        < "Date_2" ; >;
-        < "The end date for calculating the difference in days." ; >;
-        < "Type" ; >;
-        < "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method." ; >;
-    };
-};
- // -=*# Resource for function NETWORKDAYS #*=-
-StringArray SC_OPCODE_NETWORKDAYS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays." ; >;
-        < "Start Date" ; >;
-        < "Start date for calculation." ; >;
-        < "End Date" ; >;
-        < "End date for calculation." ; >;
-        < "list of dates" ; >;
-        < "Optional set of one or more dates to be considered as holiday." ; >;
-        < "array" ; >;
-        < "Optional list of numbers to indicate working (0) and weekend (non-zero) days. When omitted, weekend is Saturday and Sunday." ; >;
-    };
-};
- // -=*# Resource for function NETWORKDAYS.INTL #*=-
-StringArray SC_OPCODE_NETWORKDAYS_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays." ; >;
-        < "Start Date" ; >;
-        < "Start date for calculation." ; >;
-        < "End Date" ; >;
-        < "End date for calculation." ; >;
-        < "number or string" ; >;
-        < "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday." ; >;
-        < "array" ; >;
-        < "Optional set of one or more dates to be considered as holiday." ; >;
-    };
-};
- // -=*# Resource for function WORKDAY.INTL #*=-
-StringArray SC_OPCODE_WORKDAY_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays." ; >;
-        < "Start Date" ; >;
-        < "Start date for calculation." ; >;
-        < "Days" ; >;
-        < "The number of workdays before or after start date." ; >;
-        < "number or string" ; >;
-        < "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday." ; >;
-        < "array" ; >;
-        < "Optional set of one or more dates to be considered as holiday." ; >;
-    };
-};
- // -=*# Resource for function HOUR #*=-
-StringArray SC_OPCODE_GET_HOUR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the sequential number of the hour of the day (0-23) for the time value." ; >;
-        < "Number" ; >;
-        < "Internal time value" ; >;
-    };
-};
- // -=*# Resource for function MINUTE #*=-
-StringArray SC_OPCODE_GET_MIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the sequential number for the minute of the hour (0-59) for the time value." ; >;
-        < "Number" ; >;
-        < "Internal time value." ; >;
-    };
-};
- // -=*# Resource for function MONTH #*=-
-StringArray SC_OPCODE_GET_MONTH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the sequential number of a month of the year (1-12) for the date value." ; >;
-        < "Number" ; >;
-        < "The internal number of the date." ; >;
-    };
-};
- // -=*# Resource for function NOW #*=-
-StringArray SC_OPCODE_GET_ACT_TIME+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the current time of the computer." ; >;
-    };
-};
- // -=*# Resource for function SECOND #*=-
-StringArray SC_OPCODE_GET_SEC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the sequential number of the second of a minute (0-59) for the time value." ; >;
-        < "Number" ; >;
-        < "The internal time value." ; >;
-    };
-};
- // -=*# Resource for function TIME #*=-
-StringArray SC_OPCODE_GET_TIME+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines a time value from the details for hour, minute and second." ; >;
-        < "hour" ; >;
-        < "The integer for the hour." ; >;
-        < "minute" ; >;
-        < "The integer for the minute." ; >;
-        < "second" ; >;
-        < "The integer for the second." ; >;
-    };
-};
- // -=*# Resource for function TIMEVALUE #*=-
-StringArray SC_OPCODE_GET_TIME_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a sequential number for a text shown in a possible time entry format." ; >;
-        < "text" ; >;
-        < "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format." ; >;
-    };
-};
- // -=*# Resource for function TODAY #*=-
-StringArray SC_OPCODE_GET_ACT_DATE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the current date of the computer." ; >;
-    };
-};
- // -=*# Resource for function WEEKDAY #*=-
-StringArray SC_OPCODE_GET_DAY_OF_WEEK+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the day of the week for the date value as an integer." ; >;
-        < "Number" ; >;
-        < "The internal number for the date." ; >;
-        < "Type" ; >;
-        < "Fixes the beginning of the week and the type of calculation to be used." ; >;
-    };
-};
- // -=*# Resource for function YEAR #*=-
-StringArray SC_OPCODE_GET_YEAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the year of a date value as an integer." ; >;
-        < "Number" ; >;
-        < "Internal number of the date." ; >;
-    };
-};
- // -=*# Resource for function DAYS #*=-
-StringArray SC_OPCODE_GET_DIFF_DATE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of days between two dates." ; >;
-        < "Date_2" ; >;
-        < "The end date for calculating the difference in days." ; >;
-        < "Date_1" ; >;
-        < "The start date for calculating the difference in days." ; >;
-    };
-};
- // -=*# Resource for function DATEDIF #*=-
-StringArray SC_OPCODE_GET_DATEDIF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of whole days, months or years between 'start date' and 'end date'."; >;
-
-        < "Start date"; >;
-
-        < "The start date."; >;
-
-        < "End date"; >;
-
-        < "The end date."; >;
-
-        < "Interval"; >;
-
-        < "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\"."; >;
-    };
-};
- // -=*# Resource for function WEEKNUM #*=-
-StringArray SC_OPCODE_WEEK+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the calendar week corresponding to the given date." ; >;
-        < "Number" ; >;
-        < "The internal number of the date." ; >;
-        < "mode" ; >;
-        < "Indicates the first day of the week and when week 1 starts." ; >;
-    };
-};
- // -=*# Resource for function ISOWEEKNUM #*=-
-StringArray SC_OPCODE_ISOWEEKNUM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the ISO 8601 calendar week for the given date." ; >;
-        < "Number" ; >;
-        < "The internal number of the date." ; >;
-    };
-};
-StringArray SC_OPCODE_WEEKNUM_OOO+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the calendar week corresponding to the given date.\nThis function only provides interoperability with %PRODUCTNAME 5.0 and earlier and OpenOffice.org." ; >;
-        < "Number" ; >;
-        < "The internal number of the date." ; >;
-        < "mode" ; >;
-        < "Indicates the first day of the week (1 = Sunday, other values = Monday)." ; >;
-    };
-};
- // -=*# Resource for function EASTERSUNDAY #*=-
-StringArray SC_OPCODE_EASTERSUNDAY+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the date of Easter Sunday in a given year."; >;
-        < "year"; >;
-        < "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set)."; >;
-    };
-};
- // -=*# Resource for function PV #*=-
-StringArray SC_OPCODE_PV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Present value. Calculates the present value of an investment." ; >;
-        < "Rate" ; >;
-        < "The rate of interest for the period given." ; >;
-        < "NPER" ; >;
-        < "The payment period. The total number of periods in which the annuity is paid." ; >;
-        < "PMT" ; >;
-        < "Regular payments. The constant amount of annuity that is paid in each period." ; >;
-        < "FV" ; >;
-        < "Future value. The value (final value) to be attained after the last payment." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function FV #*=-
-StringArray SC_OPCODE_FV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Future value. Returns the future value of an investment based on regular payments and a constant interest rate." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "PMT" ; >;
-        < "Regular payments. The constant annuity to be paid in each period." ; >;
-        < "PV" ; >;
-        < "Present value. The current value of a series of payments" ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function NPER #*=-
-StringArray SC_OPCODE_NPER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "PMT" ; >;
-        < "Regular payments. The constant annuity to be paid in each period." ; >;
-        < "PV" ; >;
-        < "Present value. The current value of a series of payments" ; >;
-        < "FV" ; >;
-        < "Future value. The value (end value) to be attained after the final payment." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function PMT #*=-
-StringArray SC_OPCODE_PMT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Regular payments. Returns the periodic payment of an annuity, based on regular payments and a fixed periodic interest rate." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "PV" ; >;
-        < "Present value. The current value of a series of payments" ; >;
-        < "FV" ; >;
-        < "Future value. The value (end value) to be attained after the final payment." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function RATE #*=-
-StringArray SC_OPCODE_RATE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the constant interest rate of an investment with regular payments." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "PMT" ; >;
-        < "Regular payments. The constant annuity to be paid in each period." ; >;
-        < "PV" ; >;
-        < "Present value. The current value of a series of payments" ; >;
-        < "FV" ; >;
-        < "Future value. The value (end value) to be attained after the final payment." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-        < "Guess" ; >;
-        < "Guess. The estimate of the interest rate for the iterative calculating method." ; >;
-    };
-};
- // -=*# Resource for function IPMT #*=-
-StringArray SC_OPCODE_IPMT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Compounded interest. Calculates the interest payment on the principal for an investment with regular payments and a constant interest rate for a given period." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "Period" ; >;
-        < "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "pv" ; >;
-        < "Present value. The current value of a series of payments" ; >;
-        < "FV" ; >;
-        < "Future value. The value (end value) to be attained after the final payment." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function PPMT #*=-
-StringArray SC_OPCODE_PPMT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Repayment. Calculates the repayment amount for a period for an investment whereby the payments are at regular intervals and the interest rate constant." ; >;
-        < "Rate" ; >;
-        < "The interest rate per period." ; >;
-        < "Period" ; >;
-        < "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last" ; >;
-        < "NPER" ; >;
-        < "The payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "PV" ; >;
-        < "The present value. The present value or the amount the annuity is currently worth." ; >;
-        < "FV" ; >;
-        < "Future value. The value (end value) attained after the last payment has been made." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function CUMPRINC #*=-
-StringArray SC_OPCODE_CUM_PRINC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Cumulative Capital. Calculates the total amount of the repayment share in a period for an investment with constant interest rate." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "PV" ; >;
-        < "The present value. The present value or the amount the annuity is currently worth." ; >;
-        < "S" ; >;
-        < "The start period. The first period to be taken into account. S = 1 denotes the very first period." ; >;
-        < "E" ; >;
-        < "End period. The last period to be taken into account." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function CUMIPMT #*=-
-StringArray SC_OPCODE_CUM_IPMT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate." ; >;
-        < "Rate" ; >;
-        < "The rate of interest per period." ; >;
-        < "NPER" ; >;
-        < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >;
-        < "pv" ; >;
-        < "The present value. The present value or the amount the annuity is currently worth." ; >;
-        < "S" ; >;
-        < "The start period. The first period to be taken into account. S = 1 denotes the very first period." ; >;
-        < "E" ; >;
-        < "The end period. The last period to be taken into account." ; >;
-        < "Type" ; >;
-        < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >;
-    };
-};
- // -=*# Resource for function SYD #*=-
-StringArray SC_OPCODE_SYD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the arithmetically declining value of an asset (depreciation) for a specified period." ; >;
-        < "Cost" ; >;
-        < "Acquisition costs. The initial cost of the asset." ; >;
-        < "Salvage" ; >;
-        < "Salvage: The remaining value of the asset at the end of its life." ; >;
-        < "Life" ; >;
-        < "Useful life. The number of periods in the useful life of the asset." ; >;
-        < "Period" ; >;
-        < "Period. The depreciation period which must have the same time unit as average useful life." ; >;
-    };
-};
- // -=*# Resource for function SLN #*=-
-StringArray SC_OPCODE_SLN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the linear depreciation per period." ; >;
-        < "Cost" ; >;
-        < "Acquisition cost. The initial cost of an asset." ; >;
-        < "Salvage" ; >;
-        < "Salvage: The remaining value of the asset at the end of its life." ; >;
-        < "Life" ; >;
-        < "Useful life. The number of periods in the useful life of the asset." ; >;
-    };
-};
- // -=*# Resource for function DDB #*=-
-StringArray SC_OPCODE_DDB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the depreciation of an asset for a specific period using the double-declining balance method or declining balance factor." ; >;
-        < "Cost" ; >;
-        < "Acquisition costs. The initial cost of the asset." ; >;
-        < "Salvage" ; >;
-        < "Salvage: The remaining value of the asset at the end of its life." ; >;
-        < "Life" ; >;
-        < "Useful life. The number of periods in the useful life of the asset." ; >;
-        < "Period" ; >;
-        < "Period. The depreciation period in the same time unit as the average useful life entry." ; >;
-        < "Factor" ; >;
-        < "Factor. The factor for balance decline. F = 2 means a double declining balance factor" ; >;
-    };
-};
- // -=*# Resource for function DB #*=-
-StringArray SC_OPCODE_DB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method." ; >;
-        < "Cost" ; >;
-        < "Acquisition costs: The initial cost of the asset." ; >;
-        < "Salvage" ; >;
-        < "Salvage: The remaining value of the asset at the end of its life." ; >;
-        < "Life" ; >;
-        < "Useful life. The number of periods in the useful life of the asset." ; >;
-        < "Period" ; >;
-        < "Periods: The period for which the depreciation is calculated. The time unit used for period must be the same as that for the useful life." ; >;
-        < "month" ; >;
-        < "Months: The number of months in the first year of depreciation." ; >;
-    };
-};
- // -=*# Resource for function VDB #*=-
-StringArray SC_OPCODE_VBD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Variable declining balance. Returns the declining balance depreciation for a particular period." ; >;
-        < "Cost" ; >;
-        < "Cost. The initial cost of the asset." ; >;
-        < "Salvage" ; >;
-        < "Salvage. The salvage value of an asset at the end of its useful life." ; >;
-        < "Life" ; >;
-        < "Useful life. The number of periods in the useful life of the asset." ; >;
-        < "S" ; >;
-        < "Start. The first period for depreciation in the same time unit as the useful life." ; >;
-        < "end" ; >;
-        < "End. The last period of the depreciation using the same time unit as for the useful life." ; >;
-        < "Factor" ; >;
-        < "Factor. The factor for the reduction of the depreciation. F = 2 denotes double rate depreciation." ; >;
-        < "Type" ; >;
-        < "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch." ; >;
-    };
-};
- // -=*# Resource for function EFFECT #*=-
-StringArray SC_OPCODE_EFFECT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the annual net interest rate for a nominal interest rate." ; >;
-        < "NOM" ; >;
-        < "Nominal Interest" ; >;
-        < "P" ; >;
-        < "Periods. The number of interest payments per year." ; >;
-    };
-};
- // -=*# Resource for function NOMINAL #*=-
-StringArray SC_OPCODE_NOMINAL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the yearly nominal interest rate as an effective interest rate." ; >;
-        < "effect_rate" ; >;
-        < "The effective interest rate" ; >;
-        < "npery" ; >;
-        < "Periods. The number of interest payment per year." ; >;
-    };
-};
- // -=*# Resource for function NPV #*=-
-StringArray SC_OPCODE_NPV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate." ; >;
-        < "RATE" ; >;
-        < "The rate of discount for one period." ; >;
-        < "value " ; >;
-        < "Value 1, value 2,... are arguments representing payments and income." ; >;
-    };
-};
- // -=*# Resource for function IRR #*=-
-StringArray SC_OPCODE_IRR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the actuarial rate of interest of an investment excluding costs or profits." ; >;
-        < "Values" ; >;
-        < "An array or reference to cells whose contents correspond to the payments." ; >;
-        < "Guess" ; >;
-        < "Guess. An estimated value of the rate of return to be used for the iteration calculation." ; >;
-    };
-};
- // -=*# Resource for function MIRR #*=-
-StringArray SC_OPCODE_MIRR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the modified internal rate of return for a series of investments."; >;
-        < "Values"; >;
-        < "An array or reference to cells whose contents correspond to the payments."; >;
-        < "investment"; >;
-        < "Interest rate for investments (the negative values in the array)."; >;
-        < "reinvest_rate"; >;
-        < "interest rate for reinvestments (the positive values in the array)."; >;
-    };
-};
- // -=*# Resource for function ISPMT #*=-
-StringArray SC_OPCODE_ISPMT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the amount of interest for constant amortization rates."; >;
-        < "rate"; >;
-        < "Interest rate for a single amortization rate."; >;
-        < "Period"; >;
-        < "Number of amortization periods for the calculation of the interest."; >;
-        < "total_periods"; >;
-        < "Sum total of amortization periods."; >;
-        < "invest"; >;
-        < "Amount of the investment."; >;
-    };
-};
- // -=*# Resource for function PDURATION #*=-
-StringArray SC_OPCODE_PDURATION+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Duration. Calculates the number of periods required by an investment to attain the desired value." ; >;
-        < "RATE" ; >;
-        < "The constant rate of interest." ; >;
-        < "pv" ; >;
-        < "The present value. The current value of the investment." ; >;
-        < "FV" ; >;
-        < "The future value of the investment." ; >;
-    };
-};
- // -=*# Resource for function RRI #*=-
-StringArray SC_OPCODE_RRI+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Interest. Calculates the interest rate which represents the rate of return from an investment." ; >;
-        < "P" ; >;
-        < "The number of periods used in the calculation." ; >;
-        < "pv" ; >;
-        < "Present value. The current value of the investment." ; >;
-        < "FV" ; >;
-        < "The future value of the investment." ; >;
-    };
-};
- // -=*# Resource for function ISREF #*=-
-StringArray SC_OPCODE_IS_REF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value is a reference." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISERR #*=-
-StringArray SC_OPCODE_IS_ERR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if the value is an error value not equal to #N/A." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISERROR #*=-
-StringArray SC_OPCODE_IS_ERROR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if the value is an error value." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISBLANK #*=-
-StringArray SC_OPCODE_IS_EMPTY+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value refers to an empty cell." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISLOGICAL #*=-
-StringArray SC_OPCODE_IS_LOGICAL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if the value carries a logical number format." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISNA #*=-
-StringArray SC_OPCODE_IS_NV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value equals #N/A." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISNONTEXT #*=-
-StringArray SC_OPCODE_IS_NON_STRING+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if the value is not text." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISTEXT #*=-
-StringArray SC_OPCODE_IS_STRING+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value is text." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISNUMBER #*=-
-StringArray SC_OPCODE_IS_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value is a number." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISFORMULA #*=-
-StringArray SC_OPCODE_IS_FORMULA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if the cell is a formula cell." ; >;
-        < "reference" ; >;
-        < "The cell to be checked." ; >;
-    };
-};
- // -=*# Resource for function FORMULA #*=-
-StringArray SC_OPCODE_FORMULA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the formula of a formula cell."; >;
-        < "Reference"; >;
-        < "The formula cell."; >;
-    };
-};
- // -=*# Resource for function N #*=-
-StringArray SC_OPCODE_N+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a value to a number." ; >;
-        < "value" ; >;
-        < "The value to be interpreted as a number." ; >;
-    };
-};
- // -=*# Resource for function NA #*=-
-StringArray SC_OPCODE_NO_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Not available. Returns the error value #N/A." ; >;
-    };
-};
- // -=*# Resource for function TYPE #*=-
-StringArray SC_OPCODE_TYPE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the data type of a value (1 = number, 2 = text, 4 = Boolean value, 8 = formula, 16 = error value, 64 = array)." ; >;
-        < "value" ; >;
-        < "The value for which the data type is to be determined." ; >;
-    };
-};
- // -=*# Resource for function CELL #*=-
-StringArray SC_OPCODE_CELL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines information about address, formatting or contents of a cell."; >;
-        < "info_type"; >;
-        < "String that specifies the type of information."; >;
-        < "Reference"; >;
-        < "The position of the cell you want to examine."; >;
-    };
-};
- // -=*# Resource for function CURRENT #*=-
-StringArray SC_OPCODE_CURRENT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the current value of the formula at the present location." ; >;
-    };
-};
- // -=*# Resource for function FALSE #*=-
-StringArray SC_OPCODE_FALSE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Defines the logical value as FALSE." ; >;
-    };
-};
- // -=*# Resource for function NOT #*=-
-StringArray SC_OPCODE_NOT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Reverses the value of the argument." ; >;
-        < "Logical value" ; >;
-        < "An expression that can be either TRUE or FALSE." ; >;
-    };
-};
- // -=*# Resource for function TRUE #*=-
-StringArray SC_OPCODE_TRUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the logical value TRUE." ; >;
-    };
-};
- // -=*# Resource for function IF #*=-
-StringArray SC_OPCODE_IF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Specifies a logical test to be performed." ; >;
-        < "Test" ; >;
-        < "Any value or expression which can be either TRUE or FALSE." ; >;
-        < "Then_value" ; >;
-        < "The result of the function if the logical test returns a TRUE." ; >;
-        < "Otherwise_value" ; >;
-        < "The result of the function if the logical test returns FALSE." ; >;
-    };
-};
- // -=*# Resource for function IFERROR #*=-
-StringArray SC_OPCODE_IF_ERROR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns value if not an error value, else alternative." ; >;
-        < "value" ; >;
-        < "The value to be calculated." ; >;
-        < "alternative value" ; >;
-        < "The alternative to be returned, should value be an error value." ; >;
-    };
-};
- // -=*# Resource for function IFNA #*=-
-StringArray SC_OPCODE_IF_NA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns value if not a #N/A error, else alternative." ; >;
-        < "value" ; >;
-        < "The value to be calculated." ; >;
-        < "alternative value" ; >;
-        < "The alternative to be returned, should value be a #N/A error." ; >;
-    };
-};
- // -=*# Resource for function OR #*=-
-StringArray SC_OPCODE_OR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if an argument is TRUE." ; >;
-        < "Logical value " ; >;
-        < "Logical value 1, logical value 2,... are conditions to be tested and which return either TRUE or FALSE." ; >;
-    };
-};
- // -=*# Resource for function XOR #*=-
-StringArray SC_OPCODE_XOR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if an odd number of arguments evaluates to TRUE." ; >;
-        < "Logical value " ; >;
-        < "Logical value 1, logical value 2, ... are conditions to be tested and which return either TRUE or FALSE." ; >;
-    };
-};
- // -=*# Resource for function AND #*=-
-StringArray SC_OPCODE_AND+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if all arguments are TRUE." ; >;
-        < "Logical value " ; >;
-        < "Logical value 1, logical value 2;...are conditions to be tested and each returns either TRUE or FALSE." ; >;
-    };
-};
- // -=*# Resource for function ABS #*=-
-StringArray SC_OPCODE_ABS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Absolute value of a number." ; >;
-        < "Number" ; >;
-        < "The number whose absolute value is to be returned." ; >;
-    };
-};
- // -=*# Resource for function POWER #*=-
-StringArray SC_OPCODE_POWER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a^b, base a raised to the power of exponent b." ; >;
-        < "Base" ; >;
-        < "The base a of the power a^b." ; >;
-        < "Exponent" ; >;
-        < "The exponent b of the power a^b." ; >;
-    };
-};
- // -=*# Resource for function COUNTBLANK #*=-
-StringArray SC_OPCODE_COUNT_EMPTY_CELLS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts the blank cells in a specified range." ; >;
-        < "range" ; >;
-        < "The range in which empty cells are to be counted." ; >;
-    };
-};
- // -=*# Resource for function PI #*=-
-StringArray SC_OPCODE_PI+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value of the number Pi." ; >;
-    };
-};
- // -=*# Resource for function SUM #*=-
-StringArray SC_OPCODE_SUM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of all arguments." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are arguments whose total is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function SUMSQ #*=-
-StringArray SC_OPCODE_SUM_SQ+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of the squares of the arguments." ; >;
-        < "number " ; >;
-        < "Number 1, number 2,... are arguments for which the sum of the squares is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function PRODUCT #*=-
-StringArray SC_OPCODE_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Multiplies the arguments." ; >;
-        < "Number " ; >;
-        < "Number 1, number 2, ... are arguments to be multiplied and a result returned." ; >;
-    };
-};
- // -=*# Resource for function SUMIF #*=-
-StringArray SC_OPCODE_SUM_IF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Totals the arguments that meet the condition." ; >;
-        < "range" ; >;
-        < "The range to be evaluated by the criteria given." ; >;
-        < "criteria" ; >;
-        < "The criteria to be applied to the range." ; >;
-        < "sum_range" ; >;
-        < "The range from which the values are to be totalled." ; >;
-    };
-};
-
-// -=*# Resource for function AVERAGEIF #*=-
-StringArray SC_OPCODE_AVERAGE_IF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Averages the arguments that meet the conditions." ; >;
-        < "range" ; >;
-        < "The range to be evaluated by the criteria given." ; >;
-        < "criteria" ; >;
-        < "The criteria to be applied to the range." ; >;
-        < "average_range" ; >;
-        < "The range from which the values are to be averaged." ; >;
-    };
-};
-
-StringArray SC_OPCODE_SUM_IFS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Totals the values of cells in a range that meet multiple criteria in multiple ranges." ; >;
-        < "sum_range" ; >;
-        < "The range from which the values are to be totalled." ; >;
-        < "range " ; >;
-        < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >;
-        < "criteria " ; >;
-        < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >;
-    };
-};
-
-// -=*# Resource for function AVERAGEIFS #*=-
-StringArray SC_OPCODE_AVERAGE_IFS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Averages the value of the cells that meet multiple criteria in multiple ranges." ; >;
-        < "average_range" ; >;
-        < "The range from which the values are to be averaged." ; >;
-        < "range " ; >;
-        < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >;
-        < "criteria " ; >;
-        < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >;
-    };
-};
-
-// -=*# Resource for function COUNTIFS #*=-
-StringArray SC_OPCODE_COUNT_IFS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts the cells that meet multiple criteria in multiple ranges." ; >;
-        < "range " ; >;
-        < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >;
-        < "criteria " ; >;
-        < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >;
-    };
-};
-
- // -=*# Resource for function COUNTIF #*=-
-StringArray SC_OPCODE_COUNT_IF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts the arguments which meet the set conditions." ; >;
-        < "range" ; >;
-        < "The range of cells to be evaluated by the criteria given." ; >;
-        < "criteria" ; >;
-        < "The criteria to be applied to the range." ; >;
-    };
-};
- // -=*# Resource for function SQRT #*=-
-StringArray SC_OPCODE_SQRT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the square root of a number." ; >;
-        < "number" ; >;
-        < "A positive value for which the square root is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function RAND #*=-
-StringArray SC_OPCODE_RANDOM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a random number between 0 and 1." ; >;
-    };
-};
- // -=*# Resource for function ISEVEN #*=-
-StringArray SC_OPCODE_IS_EVEN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value is an even integer." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function ISODD #*=-
-StringArray SC_OPCODE_IS_ODD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns TRUE if value is an odd integer." ; >;
-        < "value" ; >;
-        < "The value to be tested." ; >;
-    };
-};
- // -=*# Resource for function COMBIN #*=-
-StringArray SC_OPCODE_COMBIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of combinations for elements without repetition." ; >;
-        < "number_1" ; >;
-        < "The total number of elements." ; >;
-        < "number_2" ; >;
-        < "The number of elements selected." ; >;
-    };
-};
- // -=*# Resource for function COMBINA #*=-
-StringArray SC_OPCODE_COMBIN_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of combinations of elements including repetition." ; >;
-        < "number_1" ; >;
-        < "The total number of elements." ; >;
-        < "number_2" ; >;
-        < "The number of elements selected." ; >;
-    };
-};
- // -=*# Resource for function ARCCOS #*=-
-StringArray SC_OPCODE_ARC_COS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the arccosine of a number." ; >;
-        < "Number" ; >;
-        < "A value between -1 and 1 for which the arccosine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCSIN #*=-
-StringArray SC_OPCODE_ARC_SIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the arcsine of a number." ; >;
-        < "Number" ; >;
-        < "A value between -1 and 1 for which the arcsine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCCOSHYP #*=-
-StringArray SC_OPCODE_ARC_COS_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse hyperbolic cosine of a number." ; >;
-        < "Number" ; >;
-        < "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCSINHYP #*=-
-StringArray SC_OPCODE_ARC_SIN_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse hyperbolic sine of a number." ; >;
-        < "Number" ; >;
-        < "The value for which the inverse hyperbolic sine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCCOT #*=-
-StringArray SC_OPCODE_ARC_COT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse cotangent of a number." ; >;
-        < "Number" ; >;
-        < "The value for which the inverse cotangent is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCTAN #*=-
-StringArray SC_OPCODE_ARC_TAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the arctangent of a number." ; >;
-        < "Number" ; >;
-        < "The value for which the arctangent is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCCOTHYP #*=-
-StringArray SC_OPCODE_ARC_COT_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse hyperbolic cotangent of a number." ; >;
-        < "Number" ; >;
-        < "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned." ; >;
-    };
-};
- // -=*# Resource for function ARCTANHYP #*=-
-StringArray SC_OPCODE_ARC_TAN_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse hyperbolic tangent of a number." ; >;
-        < "Number" ; >;
-        < "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned." ; >;
-    };
-};
- // -=*# Resource for function COS #*=-
-StringArray SC_OPCODE_COS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cosine of a number." ; >;
-        < "Number" ; >;
-        < "The angle in the radians for which the cosine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function SIN #*=-
-StringArray SC_OPCODE_SIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sine of a number." ; >;
-        < "number" ; >;
-        < "The angle in radians for which the sine is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function COT #*=-
-StringArray SC_OPCODE_COT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cotangent of a number." ; >;
-        < "Number" ; >;
-        < "The angle in radians whose cotangent value is to be returned." ; >;
-    };
-};
- // -=*# Resource for function TAN #*=-
-StringArray SC_OPCODE_TAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the tangent of a number." ; >;
-        < "number" ; >;
-        < "The angle in radians for which the tangent is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function COSHYP #*=-
-StringArray SC_OPCODE_COS_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic cosine of a number." ; >;
-        < "Number" ; >;
-        < "The value for which the hyperbolic cosine is to be returned." ; >;
-    };
-};
- // -=*# Resource for function SINHYP #*=-
-StringArray SC_OPCODE_SIN_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic sine of a number." ; >;
-        < "number" ; >;
-        < "The value for which the hyperbolic sine is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function COTHYP #*=-
-StringArray SC_OPCODE_COT_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic cotangent of a number." ; >;
-        < "Number" ; >;
-        < "A value not equal to 0 for which the hyperbolic cotangent is to be returned." ; >;
-    };
-};
- // -=*# Resource for function TANHYP #*=-
-StringArray SC_OPCODE_TAN_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic tangent of a number." ; >;
-        < "number" ; >;
-        < "The value for which the hyperbolic tangent is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function ARCTAN2 #*=-
-StringArray SC_OPCODE_ARC_TAN_2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the arctangent for the specified coordinates." ; >;
-        < "number_x" ; >;
-        < "The value for the x coordinate." ; >;
-        < "number_y" ; >;
-        < "The value for the y coordinate." ; >;
-    };
-};
-
-// -=*# Resource for function CSC #*=-
-StringArray SC_OPCODE_COSECANT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Return the cosecant of an angle. CSC(x)=1/SIN(x)" ; >;
-        < "Angle" ; >;
-        < "The angle in radians for which the cosecant is to be calculated." ; >;
-    };
-};
-
-// -=*# Resource for function SEC #*=-
-StringArray SC_OPCODE_SECANT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Return the secant of an angle. SEC(x)=1/COS(x)" ; >;
-        < "Angle" ; >;
-        < "The angle in radians for which the secant is to be calculated." ; >;
-    };
-};
-// -=*# Resource for function CSCH #*=-
-StringArray SC_OPCODE_COSECANT_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)" ; >;
-        < "Angle" ; >;
-        < "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated." ; >;
-    };
-};
-// -=*# Resource for function SECH #*=-
-StringArray SC_OPCODE_SECANT_HYP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)" ; >;
-        < "Angle" ; >;
-        < "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated." ; >;
-    };
-};
-
- // -=*# Resource for function DEG #*=-
-StringArray SC_OPCODE_DEG+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a radian to degrees" ; >;
-        < "Number" ; >;
-        < "The angle in a radian" ; >;
-    };
-};
- // -=*# Resource for function RAD #*=-
-StringArray SC_OPCODE_RAD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts degrees to radians" ; >;
-        < "Number" ; >;
-        < "The angle in degrees." ; >;
-    };
-};
- // -=*# Resource for function EXP #*=-
-StringArray SC_OPCODE_EXP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the exponent for basis e." ; >;
-        < "Number" ; >;
-        < "The exponent applied to base e." ; >;
-    };
-};
- // -=*# Resource for function LOG #*=-
-StringArray SC_OPCODE_LOG+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the logarithm to any specified base." ; >;
-        < "Number" ; >;
-        < "A value greater than 0 for which the logarithm is to be calculated." ; >;
-        < "Base" ; >;
-        < "The base of the logarithm. If omitted, the base is regarded as 10." ; >;
-    };
-};
- // -=*# Resource for function LN #*=-
-StringArray SC_OPCODE_LN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the natural logarithm of a number." ; >;
-        < "Number" ; >;
-        < "A value greater than 0 for which the natural logarithm is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function LOG10 #*=-
-StringArray SC_OPCODE_LOG10+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the base-10 logarithm of a number." ; >;
-        < "Number" ; >;
-        < "A value greater than 0 for which the logarithm is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function FACT #*=-
-StringArray SC_OPCODE_FACT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the factorial of a number." ; >;
-        < "Number" ; >;
-        < "The number for which the factorial is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function MOD #*=-
-StringArray SC_OPCODE_MOD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the remainder of a division." ; >;
-        < "Dividend" ; >;
-        < "The number to be divided." ; >;
-        < "Divisor" ; >;
-        < "The number by which the dividend is divided." ; >;
-    };
-};
- // -=*# Resource for function SIGN #*=-
-StringArray SC_OPCODE_PLUS_MINUS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the algebraic sign of a number." ; >;
-        < "Number" ; >;
-        < "The number for which the algebraic sign is to be determined." ; >;
-    };
-};
- // -=*# Resource for function SUBTOTAL #*=-
-StringArray SC_OPCODE_SUB_TOTAL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates subtotals in a spreadsheet." ; >;
-        < "Function" ; >;
-        < "Function index. Is an index of the possible functions Total, Max, ..." ; >;
-        < "range" ; >;
-        < "The cells of the range which are to be taken into account." ; >;
-    };
-};
- // -=*# Resource for function AGGREGATE #*=-
-StringArray SC_OPCODE_AGGREGATE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates an aggregate in a spreadsheet." ; >;
-        < "Function" ; >;
-        < "Function index. Is an index of the possible functions Total, Max, ..." ; >;
-        < "Options" ; >;
-        < "Option index. Is an index of the possible ignore options." ; >;
-        < "Ref1 or array " ; >;
-        < "The cell(s) of the range which are to be taken into account." ; >;
-        < "Ref2..n or k " ; >;
-        < "The cells of the range which are to be taken into account or mandatory 2nd argument for certain functions." ; >;
-    };
-};
- // -=*# Resource for function INT #*=-
-StringArray SC_OPCODE_INT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number down to the nearest integer." ; >;
-        < "Number" ; >;
-        < "The number to be rounded down." ; >;
-    };
-};
- // -=*# Resource for function TRUNC #*=-
-StringArray SC_OPCODE_TRUNC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Truncates the decimal places of a number." ; >;
-        < "number" ; >;
-        < "The number to be truncated." ; >;
-        < "count" ; >;
-        < "The number of places after the decimal point that are not to be truncated." ; >;
-    };
-};
- // -=*# Resource for function ROUND #*=-
-StringArray SC_OPCODE_ROUND+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number to a predefined accuracy." ; >;
-        < "number" ; >;
-        < "The number to be rounded." ; >;
-        < "count" ; >;
-        < "The number of places to which a number is to be rounded." ; >;
-    };
-};
- // -=*# Resource for function ROUNDUP #*=-
-StringArray SC_OPCODE_ROUND_UP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number up to the predefined accuracy." ; >;
-        < "number" ; >;
-        < "The number to be rounded up." ; >;
-        < "count" ; >;
-        < "The number of places to which a number is to be rounded." ; >;
-    };
-};
- // -=*# Resource for function ROUNDDOWN #*=-
-StringArray SC_OPCODE_ROUND_DOWN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number down to a predefined accuracy." ; >;
-        < "number" ; >;
-        < "The number to be rounded down." ; >;
-        < "count" ; >;
-        < "The number of places down to which a number is to be rounded." ; >;
-    };
-};
- // -=*# Resource for function EVEN #*=-
-StringArray SC_OPCODE_EVEN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a positive number up and negative number down to the nearest even integer."; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-    };
-};
- // -=*# Resource for function ODD #*=-
-StringArray SC_OPCODE_ODD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a positive number up and negative number down to the nearest odd integer."; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-    };
-};
- // -=*# Resource for function CEILING.XCL #*=-
-StringArray SC_OPCODE_CEIL_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number away from zero to the nearest multiple of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions." ; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is rounded." ; >;
-    };
-};
- // -=*# Resource for function CEILING.PRECISE #*=-
-StringArray SC_OPCODE_CEIL_PRECISE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number up to the nearest multiple of significance, regardless of sign of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is rounded." ; >;
-    };
-};
- // -=*# Resource for function ISO.CEILING #*=-
-StringArray SC_OPCODE_CEIL_ISO+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number up to the nearest multiple of significance, regardless of sign of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is rounded." ; >;
-    };
-};
- // -=*# Resource for function CEILING #*=-
-StringArray SC_OPCODE_CEIL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number up to the nearest multiple of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-        < "Significance" ; >;
-        < "If given the number to whose multiple the value is rounded, else -1 or 1 depending on sign of Number." ; >;
-        < "Mode" ; >;
-        < "If given and not equal to zero then rounded up according to amount when a negative number and significance." ; >;
-    };
-};
- // -=*# Resource for function CEILING.MATH #*=-
-StringArray SC_OPCODE_CEIL_MATH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number up to the nearest multiple of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded up." ; >;
-        < "Significance" ; >;
-        < "If given the number to whose multiple the value is rounded, else 1." ; >;
-        < "Mode" ; >;
-        < "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero." ; >;
-    };
-};
- // -=*# Resource for function FLOOR #*=-
-StringArray SC_OPCODE_FLOOR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds number down to the nearest multiple of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded down." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is to be rounded down." ; >;
-        < "Mode" ; >;
-        < "If given and not equal to zero then rounded towards zero with negative number and significance." ; >;
-    };
-};
- // -=*# Resource for function FLOOR.XCL #*=-
-StringArray SC_OPCODE_FLOOR_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds number towards zero to the nearest multiple of absolute value of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions." ; >;
-        < "Number" ; >;
-        < "The number to be rounded down." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is to be rounded down." ; >;
-    };
-};
- // -=*# Resource for function FLOOR.MATH #*=-
-StringArray SC_OPCODE_FLOOR_MATH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds number down to the nearest multiple of significance, regardless of sign of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded down." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is to be rounded down." ; >;
-        < "Mode" ; >;
-        < "For negative numbers; if given and not equal to or less than zero rounds towards zero." ; >;
-    };
-};
- // -=*# Resource for function FLOOR.PRECISE #*=-
-StringArray SC_OPCODE_FLOOR_PRECISE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds number down (towards -∞) to the nearest multiple of significance." ; >;
-        < "Number" ; >;
-        < "The number to be rounded down." ; >;
-        < "Significance" ; >;
-        < "The number to whose multiple the value is to be rounded down. Sign has no meaning." ; >;
-    };
-};
- // -=*# Resource for function GCD #*=-
-StringArray SC_OPCODE_GCD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Greatest Common Divisor" ; >;
-        < "Integer " ; >;
-        < "Integer 1; integer 2,... are integers for which the greatest common divisor is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function LCM #*=-
-StringArray SC_OPCODE_LCM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Lowest common multiple" ; >;
-        < "Integer " ; >;
-        < "Integer 1; integer 2,... are integers whose smallest common multiple is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function TRANSPOSE #*=-
-StringArray SC_OPCODE_MAT_TRANS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Array transposition. Exchanges the rows and columns of an array." ; >;
-        < "array" ; >;
-        < "The array in which the rows and columns have been transposed." ; >;
-    };
-};
- // -=*# Resource for function MMULT #*=-
-StringArray SC_OPCODE_MAT_MULT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Array multiplication. Returns the product of two arrays." ; >;
-        < "array_1" ; >;
-        < "The first array for the array product." ; >;
-        < "array_2" ; >;
-        < "The second array having the same number of rows as the first array has columns." ; >;
-    };
-};
- // -=*# Resource for function MDETERM #*=-
-StringArray SC_OPCODE_MAT_DET+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the array determinant." ; >;
-        < "array" ; >;
-        < "The array for which the determinant is to be determined." ; >;
-    };
-};
- // -=*# Resource for function MINVERSE #*=-
-StringArray SC_OPCODE_MAT_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse of an array." ; >;
-        < "array" ; >;
-        < "The array to be inverted." ; >;
-    };
-};
- // -=*# Resource for function MUNIT #*=-
-StringArray SC_OPCODE_MATRIX_UNIT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the unitary square array of a certain size." ; >;
-        < "Dimensions" ; >;
-        < "The size of the unitary array." ; >;
-    };
-};
- // -=*# Resource for function SUMPRODUCT #*=-
-StringArray SC_OPCODE_SUM_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "(Inner products) Returns the sum of the products of array arguments." ; >;
-        < "Array " ; >;
-        < "Array 1, array 2, ... are arrays whose arguments are to be multiplied." ; >;
-    };
-};
- // -=*# Resource for function SUMX2MY2 #*=-
-StringArray SC_OPCODE_SUM_X2MY2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of the difference of squares of two arrays." ; >;
-        < "array_x" ; >;
-        < "First array where the square of the arguments are totalled." ; >;
-        < "array_y" ; >;
-        < "Second array where the square of the arguments is to be subtracted." ; >;
-    };
-};
- // -=*# Resource for function SUMX2PY2 #*=-
-StringArray SC_OPCODE_SUM_X2DY2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the total of the square sum of two arrays." ; >;
-        < "array_x" ; >;
-        < "First array where the square of the arguments are totalled." ; >;
-        < "array_y" ; >;
-        < "Second array where the square of the arguments is to be totalled." ; >;
-    };
-};
- // -=*# Resource for function SUMXMY2 #*=-
-StringArray SC_OPCODE_SUM_XMY2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of squares of differences of two arrays." ; >;
-        < "array_x" ; >;
-        < "First array for forming argument differences." ; >;
-        < "array_y" ; >;
-        < "Second array for forming the argument differences." ; >;
-    };
-};
-
- // -=*# Resource for function FREQUENCY #*=-
-StringArray SC_OPCODE_FREQUENCY+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a frequency distribution as a vertical array." ; >;
-        < "data" ; >;
-        < "The array of the data." ; >;
-        < "classes" ; >;
-        < "The array for forming classes." ; >;
-    };
-};
- // -=*# Resource for function LINEST #*=-
-StringArray SC_OPCODE_LINEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates parameters of the linear regression as an array." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-        < "Linear_type" ; >;
-        < "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; >;
-        < "stats" ; >;
-        < "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; >;
-    };
-};
- // -=*# Resource for function LOGEST #*=-
-StringArray SC_OPCODE_LOGEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the parameters of the exponential regression curve as an array." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-        < "Function_type" ; >;
-        < "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; >;
-        < "stats" ; >;
-        < "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; >;
-    };
-};
- // -=*# Resource for function TREND #*=-
-StringArray SC_OPCODE_TREND+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates points along a regression line." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array as the basis for the regression." ; >;
-        < "new data_X" ; >;
-        < "The array of X data for recalculating the values." ; >;
-        < "Linear_type" ; >;
-        < "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; >;
-    };
-};
- // -=*# Resource for function GROWTH #*=-
-StringArray SC_OPCODE_GROWTH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates points on the exponential regression function." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array as the basis for the regression." ; >;
-        < "new_data_X" ; >;
-        < "The array of X data for recalculating the values." ; >;
-        < "Function_type" ; >;
-        < "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; >;
-    };
-};
- // -=*# Resource for function COUNT #*=-
-StringArray SC_OPCODE_COUNT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts how many numbers are in the list of arguments." ; >;
-        < "value " ; >;
-        < "Value 1, value 2, ... are arguments containing different data types but where only numbers are counted." ; >;
-    };
-};
- // -=*# Resource for function COUNTA #*=-
-StringArray SC_OPCODE_COUNT_2+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Counts how many values are in the list of arguments." ; >;
-        < "value " ; >;
-        < "Value 1, value 2, ... are arguments representing the values to be counted." ; >;
-    };
-};
- // -=*# Resource for function MAX #*=-
-StringArray SC_OPCODE_MAX+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the maximum value in a list of arguments." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments for which the largest number is to be determined." ; >;
-    };
-};
- // -=*# Resource for function MAXA #*=-
-StringArray SC_OPCODE_MAX_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the maximum value in a list of arguments. Text is evaluated as Zero."; >;
-        < "value "; >;
-        < "Value 1, value 2,    are arguments whose largest value is to be determined."; >;
-    };
-};
- // -=*# Resource for function MIN #*=-
-StringArray SC_OPCODE_MIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the minimum value in a list of arguments." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments for which the smallest number is to be determined." ; >;
-    };
-};
- // -=*# Resource for function MINA #*=-
-StringArray SC_OPCODE_MIN_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the smallest value in a list of arguments. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2;... are arguments whose smallest number is to be determined."; >;
-    };
-};
- // -=*# Resource for function VAR #*=-
-StringArray SC_OPCODE_VAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the variance based on a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >;
-    };
-};
- // -=*# Resource for function VAR.S #*=-
-StringArray SC_OPCODE_VAR_S+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the variance based on a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >;
-    };
-};
- // -=*# Resource for function VARA #*=-
-StringArray SC_OPCODE_VAR_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the variance based on a sample. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >;
-    };
-};
- // -=*# Resource for function VARP #*=-
-StringArray SC_OPCODE_VAR_P+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates variance based on the entire population." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which represent a population." ; >;
-    };
-};
- // -=*# Resource for function VAR.P #*=-
-StringArray SC_OPCODE_VAR_P_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates variance based on the entire population." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which represent a population." ; >;
-    };
-};
- // -=*# Resource for function VARPA #*=-
-StringArray SC_OPCODE_VAR_P_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the variance based on the entire population. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2;... are arguments representing a population."; >;
-    };
-};
- // -=*# Resource for function STDEV #*=-
-StringArray SC_OPCODE_ST_DEV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the standard deviation based on a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >;
-    };
-};
- // -=*# Resource for function STDEV.S #*=-
-StringArray SC_OPCODE_ST_DEV_S+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the standard deviation based on a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >;
-    };
-};
- // -=*# Resource for function STDEVA #*=-
-StringArray SC_OPCODE_ST_DEV_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the standard deviation based on a sample. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >;
-    };
-};
- // -=*# Resource for function STDEVP #*=-
-StringArray SC_OPCODE_ST_DEV_P+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the standard deviation based on the entire population." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a population." ; >;
-    };
-};
- // -=*# Resource for function STDEV.P #*=-
-StringArray SC_OPCODE_ST_DEV_P_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the standard deviation based on the entire population." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a population." ; >;
-    };
-};
- // -=*# Resource for function STDEVPA #*=-
-StringArray SC_OPCODE_ST_DEV_P_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the standard deviation based on the entire population. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2;... are arguments corresponding to a population."; >;
-    };
-};
- // -=*# Resource for function AVERAGE #*=-
-StringArray SC_OPCODE_AVERAGE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the average of a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2;...are numeric arguments representing a population sample." ; >;
-    };
-};
- // -=*# Resource for function AVERAGEA #*=-
-StringArray SC_OPCODE_AVERAGE_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the average value for a sample. Text is evaluated as zero."; >;
-        < "value "; >;
-        < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >;
-    };
-};
- // -=*# Resource for function DEVSQ #*=-
-StringArray SC_OPCODE_DEV_SQ+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of squares of deviations from the sample mean value" ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function AVEDEV #*=-
-StringArray SC_OPCODE_AVE_DEV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the average of the absolute deviations of a sample from the mean." ; >;
-        < "number " ; >;
-        < "Number 1, number 2;...are numerical arguments representing a sample." ; >;
-    };
-};
- // -=*# Resource for function SKEW #*=-
-StringArray SC_OPCODE_SKEW+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the skewness of a distribution." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments portraying a sample of the distribution." ; >;
-    };
-};
- // -=*# Resource for function SKEWP #*=-
-StringArray SC_OPCODE_SKEWP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the skewness of a distribution using the population of a random variable." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments portraying the population." ; >;
-    };
-};
- // -=*# Resource for function KURT #*=-
-StringArray SC_OPCODE_KURT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the kurtosis of a distribution." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments, representing a sample of the distribution." ; >;
-    };
-};
- // -=*# Resource for function GEOMEAN #*=-
-StringArray SC_OPCODE_GEO_MEAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the geometric mean of a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function HARMEAN #*=-
-StringArray SC_OPCODE_HAR_MEAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the harmonic mean of a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function MODE #*=-
-StringArray SC_OPCODE_MODAL_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the most common value in a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function MODE.SNGL #*=-
-StringArray SC_OPCODE_MODAL_VALUE_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the most common value in a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function MODE.MULT #*=-
-StringArray SC_OPCODE_MODAL_VALUE_MULTI+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the most common value in a sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function MEDIAN #*=-
-StringArray SC_OPCODE_MEDIAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the median of a given sample." ; >;
-        < "number " ; >;
-        < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >;
-    };
-};
- // -=*# Resource for function PERCENTILE #*=-
-StringArray SC_OPCODE_PERCENTILE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the alpha quantile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Alpha" ; >;
-        < "The percentage rate of the quantile between 0 and 1." ; >;
-    };
-};
- // -=*# Resource for function PERCENTILE.EXC #*=-
-StringArray SC_OPCODE_PERCENTILE_EXC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the alpha percentile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Alpha" ; >;
-        < "The percentile value, range 0...1, exclusive." ; >;
-    };
-};
- // -=*# Resource for function PERCENTILE.INC #*=-
-StringArray SC_OPCODE_PERCENTILE_INC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the alpha percentile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Alpha" ; >;
-        < "The percentile value, range 0...1, inclusive." ; >;
-    };
-};
- // -=*# Resource for function QUARTILE #*=-
-StringArray SC_OPCODE_QUARTILE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the quartile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)." ; >;
-    };
-};
- // -=*# Resource for function QUARTILE.EXC #*=-
-StringArray SC_OPCODE_QUARTILE_EXC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the quartile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%)." ; >;
-    };
-};
- // -=*# Resource for function QUARTILE.INC #*=-
-StringArray SC_OPCODE_QUARTILE_INC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the quartile of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)." ; >;
-    };
-};
- // -=*# Resource for function LARGE #*=-
-StringArray SC_OPCODE_LARGE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the k-th largest value of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Rank_c" ; >;
-        < "The ranking of the value." ; >;
-    };
-};
- // -=*# Resource for function SMALL #*=-
-StringArray SC_OPCODE_SMALL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the k-th smallest value of a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Rank_c" ; >;
-        < "The ranking of the value." ; >;
-    };
-};
- // -=*# Resource for function PERCENTRANK #*=-
-StringArray SC_OPCODE_PERCENT_RANK+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the percentage rank of a value in a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "value" ; >;
-        < "The value for which percentage ranking is to be determined." ; >;
-        < "significance" ; >;
-        < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >;
-    };
-};
- // -=*# Resource for function PERCENTRANK.EXC #*=-
-StringArray SC_OPCODE_PERCENT_RANK_EXC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the percentage rank (0..1, exclusive) of a value in a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "value" ; >;
-        < "The value for which percentage ranking is to be determined." ; >;
-        < "significance" ; >;
-        < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >;
-    };
-};
- // -=*# Resource for function PERCENTRANK.INC #*=-
-StringArray SC_OPCODE_PERCENT_RANK_INC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the percentage rank (0..1, inclusive) of a value in a sample." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "value" ; >;
-        < "The value for which percentage ranking is to be determined." ; >;
-        < "significance" ; >;
-        < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >;
-    };
-};
- // -=*# Resource for function RANK #*=-
-StringArray SC_OPCODE_RANK+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the ranking of a value in a sample." ; >;
-        < "value" ; >;
-        < "The value for which the rank is to be determined." ; >;
-        < "Data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >;
-    };
-};
- // -=*# Resource for function RANK.EQ #*=-
-StringArray SC_OPCODE_RANK_EQ+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the ranking of a value in a sample; if more than one value has the same rank, the top rank of that set of values is returned." ; >;
-        < "value" ; >;
-        < "The value for which the rank is to be determined." ; >;
-        < "Data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >;
-    };
-};
- // -=*# Resource for function RANK.AVG #*=-
-StringArray SC_OPCODE_RANK_AVG+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the ranking of a value in a sample; if more than one value has the same rank, the average rank is returned." ; >;
-        < "value" ; >;
-        < "The value for which the rank is to be determined." ; >;
-        < "Data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Type" ; >;
-        < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >;
-    };
-};
- // -=*# Resource for function TRIMMEAN #*=-
-StringArray SC_OPCODE_TRIM_MEAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the mean of a sample without including the marginal values." ; >;
-        < "data" ; >;
-        < "The array of the data in the sample." ; >;
-        < "Alpha" ; >;
-        < "The percentage of marginal data that is not to be taken into account." ; >;
-    };
-};
- // -=*# Resource for function PROB #*=-
-StringArray SC_OPCODE_PROB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the discrete probability of an interval." ; >;
-        < "data" ; >;
-        < "The sample data array." ; >;
-        < "probability" ; >;
-        < "The array of the associated probabilities." ; >;
-        < "Start" ; >;
-        < "The start of the value interval whose probabilities is to be totalled." ; >;
-        < "End" ; >;
-        < "The end of the value interval where the probabilities are to be totalled." ; >;
-    };
-};
- // -=*# Resource for function B #*=-
-StringArray SC_OPCODE_B+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the probability of a trial result using binomial distribution." ; >;
-        < "trials" ; >;
-        < "The number of trials." ; >;
-        < "SP" ; >;
-        < "The individual probability of a trial result." ; >;
-        < "T_1" ; >;
-        < "Lower limit for the number of trials." ; >;
-        < "T_2" ; >;
-        < "Upper limit for the number of trials." ; >;
-    };
-};
- // -=*# Resource for function PHI #*=-
-StringArray SC_OPCODE_PHI+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the distribution function for a standard normal distribution." ; >;
-        < "number" ; >;
-        < "The value for which the standard normal distribution is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function GAUSS #*=-
-StringArray SC_OPCODE_GAUSS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the integral values of the standard normal cumulative distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the integral value of the standard normal distribution is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function FISHER #*=-
-StringArray SC_OPCODE_FISHER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Fisher transformation." ; >;
-        < "Number" ; >;
-        < "The value to be transformed (-1 < VALUE < 1)." ; >;
-    };
-};
- // -=*# Resource for function FISHERINV #*=-
-StringArray SC_OPCODE_FISHER_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the inverse of the Fisher transformation." ; >;
-        < "Number" ; >;
-        < "The value that is to be transformed back." ; >;
-    };
-};
- // -=*# Resource for function BINOMDIST #*=-
-StringArray SC_OPCODE_BINOM_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the binomial distribution." ; >;
-        < "X" ; >;
-        < "The number of successes in a series of trials." ; >;
-        < "trials" ; >;
-        < "The total number of trials." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability." ; >;
-    };
-};
- // -=*# Resource for function BINOM.DIST #*=-
-StringArray SC_OPCODE_BINOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the binomial distribution." ; >;
-        < "X" ; >;
-        < "The number of successes in a series of trials." ; >;
-        < "trials" ; >;
-        < "The total number of trials." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability." ; >;
-    };
-};
- // -=*# Resource for function NEGBINOMDIST #*=-
-StringArray SC_OPCODE_NEG_BINOM_VERT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the negative binomial distribution." ; >;
-        < "X" ; >;
-        < "The number of failures in the trial range." ; >;
-        < "R" ; >;
-        < "The number of successes in the trial sequence." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-    };
-};
- // -=*# Resource for function NEGBINOM.DIST #*=-
-StringArray SC_OPCODE_NEG_BINOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the negative binomial distribution." ; >;
-        < "X" ; >;
-        < "The number of failures in the trial range." ; >;
-        < "R" ; >;
-        < "The number of successes in the trial sequence." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function CRITBINOM #*=-
-StringArray SC_OPCODE_CRIT_BINOM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." ; >;
-        < "trials" ; >;
-        < "The total number of trials." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-        < "alpha" ; >;
-        < "The border probability that is attained or exceeded." ; >;
-    };
-};
- // -=*# Resource for function BINOM.INV #*=-
-StringArray SC_OPCODE_BINOM_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." ; >;
-        < "trials" ; >;
-        < "The total number of trials." ; >;
-        < "SP" ; >;
-        < "The success probability of a trial." ; >;
-        < "alpha" ; >;
-        < "The border probability that is attained or exceeded." ; >;
-    };
-};
- // -=*# Resource for function POISSON #*=-
-StringArray SC_OPCODE_POISSON_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Poisson distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the Poisson distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "Mean. The mean value of the Poisson distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function POISSON.DIST #*=-
-StringArray SC_OPCODE_POISSON_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Poisson distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the Poisson distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "Mean. The mean value of the Poisson distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function NORMDIST #*=-
-StringArray SC_OPCODE_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the normal distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the normal distribution is to be calculated." ; >;
-        < "Mean" ; >;
-        < "The mean value. The mean value of the normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the normal distribution." ; >;
-        < "C" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function NORM.DIST #*=-
-StringArray SC_OPCODE_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the normal distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the normal distribution is to be calculated." ; >;
-        < "Mean" ; >;
-        < "The mean value. The mean value of the normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the normal distribution." ; >;
-        < "C" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function NORMINV #*=-
-StringArray SC_OPCODE_NORM_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse normal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "The mean value. The mean value of the normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the normal distribution." ; >;
-    };
-};
- // -=*# Resource for function NORM.INV #*=-
-StringArray SC_OPCODE_NORM_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse normal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "The mean value. The mean value of the normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the normal distribution." ; >;
-    };
-};
- // -=*# Resource for function NORMSDIST #*=-
-StringArray SC_OPCODE_STD_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "The values of the standard normal cumulative distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the standard normal distribution is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function NORM.S.DIST #*=-
-StringArray SC_OPCODE_STD_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "The values of the standard normal distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the standard normal distribution is to be calculated." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function NORMSINV #*=-
-StringArray SC_OPCODE_S_NORM_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse standard normal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse standard normal distribution is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function NORM.S.INV #*=-
-StringArray SC_OPCODE_S_NORM_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse standard normal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse standard normal distribution is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function LOGNORMDIST #*=-
-StringArray SC_OPCODE_LOG_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the log normal distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the log normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "The mean value of the log normal distribution. It is set to 0 if omitted." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation of the log normal distribution. It is set to 1 if omitted." ; >;
-        < "Cumulative"; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function LOGNORM.DIST #*=-
-StringArray SC_OPCODE_LOG_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the log normal distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the log normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "The mean value of the log normal distribution." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation of the log normal distribution." ; >;
-        < "Cumulative"; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function LOGINV #*=-
-StringArray SC_OPCODE_LOG_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of the lognormal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse log normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "Mean value. The mean value of the log normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the log normal distribution." ; >;
-    };
-};
- // -=*# Resource for function LOGNORM.INV #*=-
-StringArray SC_OPCODE_LOG_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of the lognormal distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse log normal distribution is to be calculated." ; >;
-        < "mean" ; >;
-        < "Mean value. The mean value of the log normal distribution." ; >;
-        < "STDEV" ; >;
-        < "Standard deviation. The standard deviation of the log normal distribution." ; >;
-    };
-};
- // -=*# Resource for function EXPONDIST #*=-
-StringArray SC_OPCODE_EXP_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the exponential distribution." ; >;
-        < "Number" ; >;
-        < "The value to which the exponential distribution is to be calculated." ; >;
-        < "lambda" ; >;
-        < "The parameters of the exponential distribution." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >;
-    };
-};
- // -=*# Resource for function EXPON.DIST #*=-
-StringArray SC_OPCODE_EXP_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the exponential distribution." ; >;
-        < "Number" ; >;
-        < "The value to which the exponential distribution is to be calculated." ; >;
-        < "lambda" ; >;
-        < "The parameters of the exponential distribution." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >;
-    };
-};
- // -=*# Resource for function GAMMADIST #*=-
-StringArray SC_OPCODE_GAMMA_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the gamma distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Gamma distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Gamma distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function GAMMA.DIST #*=-
-StringArray SC_OPCODE_GAMMA_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the gamma distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Gamma distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Gamma distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
- // -=*# Resource for function GAMMAINV #*=-
-StringArray SC_OPCODE_GAMMA_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse gamma distribution." ; >;
-        < "Number" ; >;
-        < "The probability value for which the inverse gamma distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha (shape) parameter of the Gamma distribution." ; >;
-        < "beta" ; >;
-        < "The Beta (scale) parameter of the Gamma distribution." ; >;
-    };
-};
- // -=*# Resource for function GAMMA.INV #*=-
-StringArray SC_OPCODE_GAMMA_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse gamma distribution." ; >;
-        < "Number" ; >;
-        < "The probability value for which the inverse gamma distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha (shape) parameter of the Gamma distribution." ; >;
-        < "beta" ; >;
-        < "The Beta (scale) parameter of the Gamma distribution." ; >;
-    };
-};
- // -=*# Resource for function GAMMALN #*=-
-StringArray SC_OPCODE_GAMMA_LN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the natural logarithm of the gamma function." ; >;
-        < "Number" ; >;
-        < "The value for which the natural logarithm of the gamma function is to be calculated." ; >;
-    };
-};
- // -=*# Resource for function GAMMALN.PRECISE #*=-
-StringArray SC_OPCODE_GAMMA_LN_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the natural logarithm of the gamma function." ; >;
-        < "Number" ; >;
-        < "The value for which the natural logarithm of the gamma function is to be calculated." ; >;
-    };
-};
-
- // -=*# Resource for function GAMMA #*=-
-StringArray SC_OPCODE_GAMMA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value of the Gamma function." ; >;
-        < "Number" ; >;
-        < "The value for which the Gamma function is to be calculated." ; >;
-    };
-};
-
- // -=*# Resource for function BETADIST #*=-
-StringArray SC_OPCODE_BETA_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the beta distribution." ; >;
-        < "number" ; >;
-        < "The value for which the beta distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Beta distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Beta distribution." ; >;
-        < "Start" ; >;
-        < "The starting value for the value interval of the distribution." ; >;
-        < "End" ; >;
-        < "The final value for the value interval of the distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."; >;
-    };
-};
- // -=*# Resource for function BETAINV #*=-
-StringArray SC_OPCODE_BETA_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse beta distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse beta distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Beta distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Beta distribution." ; >;
-        < "Start" ; >;
-        < "The starting value for the value interval of the distribution." ; >;
-        < "End" ; >;
-        < "The final value for the value interval of the distribution." ; >;
-    };
-};
- // -=*# Resource for function BETA.DIST #*=-
-StringArray SC_OPCODE_BETA_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the beta distribution." ; >;
-        < "number" ; >;
-        < "The value for which the beta distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Beta distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Beta distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."; >;
-        < "Start" ; >;
-        < "The starting value for the value interval of the distribution." ; >;
-        < "End" ; >;
-        < "The final value for the value interval of the distribution." ; >;
-    };
-};
- // -=*# Resource for function BETA.INV #*=-
-StringArray SC_OPCODE_BETA_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse beta distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse beta distribution is to be calculated." ; >;
-        < "alpha" ; >;
-        < "The Alpha parameter of the Beta distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Beta distribution." ; >;
-        < "Start" ; >;
-        < "The starting value for the value interval of the distribution." ; >;
-        < "End" ; >;
-        < "The final value for the value interval of the distribution." ; >;
-    };
-};
- // -=*# Resource for function WEIBULL #*=-
-StringArray SC_OPCODE_WEIBULL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the values of the Weibull distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the Weibull distribution is to be calculated." ; >;
-        < "Alpha" ; >;
-        < "The Alpha parameter of the Weibull distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Weibull distribution." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >;
-    };
-};
- // -=*# Resource for function WEIBULL.DIST #*=-
-StringArray SC_OPCODE_WEIBULL_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the values of the Weibull distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the Weibull distribution is to be calculated." ; >;
-        < "Alpha" ; >;
-        < "The Alpha parameter of the Weibull distribution." ; >;
-        < "beta" ; >;
-        < "The Beta parameter of the Weibull distribution." ; >;
-        < "C" ; >;
-        < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >;
-    };
-};
- // -=*# Resource for function HYPGEOMDIST #*=-
-StringArray SC_OPCODE_HYP_GEOM_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the hypergeometric distribution." ; >;
-        < "X" ; >;
-        < "The number of successes in the sample." ; >;
-        < "n_sample" ; >;
-        < "The size of the sample." ; >;
-        < "successes" ; >;
-        < "The number of successes in the population." ; >;
-        < "n_population" ; >;
-        < "The population size." ; >;
-        < "Cumulative" ; >;
-        < "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function." ; >;
-    };
-};
- // -=*# Resource for function HYPGEOM.DIST #*=-
-StringArray SC_OPCODE_HYP_GEOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the hypergeometric distribution." ; >;
-        < "X" ; >;
-        < "The number of successes in the sample." ; >;
-        < "n_sample" ; >;
-        < "The size of the sample." ; >;
-        < "successes" ; >;
-        < "The number of successes in the population." ; >;
-        < "n_population" ; >;
-        < "The population size." ; >;
-        < "Cumulative" ; >;
-        < "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function." ; >;
-    };
-};
- // -=*# Resource for function TDIST #*=-
-StringArray SC_OPCODE_T_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the t-distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-        < "mode" ; >;
-        < "Mode = 1 calculates the one-tailed test, 2 = two-tailed distribution." ; >;
-    };
-};
- // -=*# Resource for function T.DIST.2T #*=-
-StringArray SC_OPCODE_T_DIST_2T+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the two-tailed t-distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-    };
-};
- // -=*# Resource for function T.DIST #*=-
-StringArray SC_OPCODE_T_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the t-distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-        < "cumulative" ; >;
-        < "True calculates the cumulative distribution function, false the probability density function." ; >;
-    };
-};
- // -=*# Resource for function T.DIST.RT #*=-
-StringArray SC_OPCODE_T_DIST_RT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the right-tailed t-distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-    };
-};
- // -=*# Resource for function TINV #*=-
-StringArray SC_OPCODE_T_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse t-distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-    };
-};
- // -=*# Resource for function T.INV #*=-
-StringArray SC_OPCODE_T_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the left-tailed inverse t-distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-    };
-};
- // -=*# Resource for function T.INV.2T #*=-
-StringArray SC_OPCODE_T_INV_2T+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the two-tailed inverse t-distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse T distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the T distribution." ; >;
-    };
-};
- // -=*# Resource for function FDIST #*=-
-StringArray SC_OPCODE_F_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the F probability distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-    };
-};
- // -=*# Resource for function F.DIST #*=-
-StringArray SC_OPCODE_F_DIST_LT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the left tail F probability distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-        < "cumulative" ; >;
-        < "Cumulative distribution function (TRUE) or probability density function (FALSE)." ; >;
-    };
-};
- // -=*# Resource for function F.DIST.RT #*=-
-StringArray SC_OPCODE_F_DIST_RT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the right tail F probability distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-    };
-};
- // -=*# Resource for function FINV #*=-
-StringArray SC_OPCODE_F_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse F distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-    };
-};
- // -=*# Resource for function F.INV #*=-
-StringArray SC_OPCODE_F_INV_LT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse left tail F distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-    };
-};
- // -=*# Resource for function F.INV.RT #*=-
-StringArray SC_OPCODE_F_INV_RT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse right tail F distribution." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse F distribution is to be calculated." ; >;
-        < "degrees_freedom_1" ; >;
-        < "The degrees of freedom in the numerator of the F distribution." ; >;
-        < "degrees_freedom_2" ; >;
-        < "The degrees of freedom in the denominator of the F distribution." ; >;
-    };
-};
- // -=*# Resource for function CHIDIST #*=-
-StringArray SC_OPCODE_CHI_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the right-tail probability of the chi-square distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the chi square distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
- // -=*# Resource for function CHISQ.DIST.RT #*=-
-StringArray SC_OPCODE_CHI_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the right-tail probability of the chi-square distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the chi square distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
-
- // -=*# Resource for function CHISQDIST #*=-
-StringArray SC_OPCODE_CHISQ_DIST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the probability density function or cumulative distribution function is to be calculated." ; >;
-        < "Degrees of Freedom" ; >;
-        < "The degrees of freedom of the chi-square distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >;
-    };
-};
-
- // -=*# Resource for function CHISQ.DIST #*=-
-StringArray SC_OPCODE_CHISQ_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution." ; >;
-        < "Number" ; >;
-        < "The value for which the probability density function or cumulative distribution function is to be calculated." ; >;
-        < "Degrees of Freedom" ; >;
-        < "The degrees of freedom of the chi-square distribution." ; >;
-        < "Cumulative" ; >;
-        < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >;
-    };
-};
-
- // -=*# Resource for function CHIINV #*=-
-StringArray SC_OPCODE_CHI_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of CHIDIST(x; DegreesOfFreedom)." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse chi square distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
-
- // -=*# Resource for function CHISQ.INV.RT #*=-
-StringArray SC_OPCODE_CHI_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of CHIDIST(x; DegreesOfFreedom)." ; >;
-        < "number" ; >;
-        < "The probability value for which the inverse chi square distribution is to be calculated." ; >;
-        < "degrees_freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
-
- // -=*# Resource for function CHISQINV #*=-
-StringArray SC_OPCODE_CHISQ_INV+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of CHISQDIST(x;DegreesOfFreedom;TRUE())." ; >;
-        < "Probability" ; >;
-        < "The probability value for which the inverse of the chi square distribution is to be calculated." ; >;
-        < "Degrees of Freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
-
- // -=*# Resource for function CHISQ.INV #*=-
-StringArray SC_OPCODE_CHISQ_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Values of the inverse of CHISQ.DIST(x;DegreesOfFreedom;TRUE())." ; >;
-        < "Probability" ; >;
-        < "The probability value for which the inverse of the chi square distribution is to be calculated." ; >;
-        < "Degrees of Freedom" ; >;
-        < "The degrees of freedom of the chi square distribution." ; >;
-    };
-};
-
- // -=*# Resource for function STANDARDIZE #*=-
-StringArray SC_OPCODE_STANDARD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a random variable to a normalized value." ; >;
-        < "Number" ; >;
-        < "The value to be standardized." ; >;
-        < "mean" ; >;
-        < "The mean value used for moving." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation used for scaling." ; >;
-    };
-};
- // -=*# Resource for function PERMUT #*=-
-StringArray SC_OPCODE_PERMUT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of permutations for a given number of elements without repetition." ; >;
-        < "Count_1" ; >;
-        < "The total number of elements." ; >;
-        < "Count_2" ; >;
-        < "The selection number taken from the elements." ; >;
-    };
-};
- // -=*# Resource for function PERMUTATIONA #*=-
-StringArray SC_OPCODE_PERMUTATION_A+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of permutations for a given number of objects (repetition allowed)." ; >;
-        < "Count_1" ; >;
-        < "The total number of elements." ; >;
-        < "Count_2" ; >;
-        < "The selection number taken from the elements." ; >;
-    };
-};
- // -=*# Resource for function CONFIDENCE #*=-
-StringArray SC_OPCODE_CONFIDENCE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a (1-alpha) confidence interval for a normal distribution." ; >;
-        < "alpha" ; >;
-        < "The level of the confidence interval." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation of the population." ; >;
-        < "size" ; >;
-        < "The size of the population." ; >;
-    };
-};
- // -=*# Resource for function CONFIDENCE.NORM #*=-
-StringArray SC_OPCODE_CONFIDENCE_N+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a (1-alpha) confidence interval for a normal distribution." ; >;
-        < "alpha" ; >;
-        < "The level of the confidence interval." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation of the population." ; >;
-        < "size" ; >;
-        < "The size of the population." ; >;
-    };
-};
- // -=*# Resource for function CONFIDENCE.T #*=-
-StringArray SC_OPCODE_CONFIDENCE_T+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a (1-alpha) confidence interval for a Student's t distribution." ; >;
-        < "alpha" ; >;
-        < "The level of the confidence interval." ; >;
-        < "STDEV" ; >;
-        < "The standard deviation of the population." ; >;
-        < "size" ; >;
-        < "The size of the population." ; >;
-    };
-};
- // -=*# Resource for function ZTEST #*=-
-StringArray SC_OPCODE_Z_TEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the probability of observing a z-statistic greater than the one computed based on a sample." ; >;
-        < "data" ; >;
-        < "The given sample, drawn from a normally distributed population." ; >;
-        < "mu" ; >;
-        < "The known mean of the population." ; >;
-        < "sigma" ; >;
-        < "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used." ; >;
-    };
-};
- // -=*# Resource for function Z.TEST #*=-
-StringArray SC_OPCODE_Z_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the probability of observing a z-statistic greater than the one computed based on a sample." ; >;
-        < "data" ; >;
-        < "The given sample, drawn from a normally distributed population." ; >;
-        < "mu" ; >;
-        < "The known mean of the population." ; >;
-        < "sigma" ; >;
-        < "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used." ; >;
-    };
-};
- // -=*# Resource for function CHITEST #*=-
-StringArray SC_OPCODE_CHI_TEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the chi square independence test." ; >;
-        < "Data_B" ; >;
-        < "The observed data array." ; >;
-        < "data_E" ; >;
-        < "The expected data array." ; >;
-    };
-};
- // -=*# Resource for function CHISQ.TEST #*=-
-StringArray SC_OPCODE_CHI_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the chi square independence test." ; >;
-        < "Data_B" ; >;
-        < "The observed data array." ; >;
-        < "data_E" ; >;
-        < "The expected data array." ; >;
-    };
-};
- // -=*# Resource for function FTEST #*=-
-StringArray SC_OPCODE_F_TEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the F test." ; >;
-        < "data_1" ; >;
-        < "The first record array." ; >;
-        < "data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function F.TEST #*=-
-StringArray SC_OPCODE_F_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the F test." ; >;
-        < "data_1" ; >;
-        < "The first record array." ; >;
-        < "data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function TTEST #*=-
-StringArray SC_OPCODE_T_TEST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the T test." ; >;
-        < "data_1" ; >;
-        < "The first record array." ; >;
-        < "data_2" ; >;
-        < "The second record array." ; >;
-        < "mode" ; >;
-        < "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution" ; >;
-        < "Type" ; >;
-        < "The type of the T test." ; >;
-    };
-};
- // -=*# Resource for function T.TEST #*=-
-StringArray SC_OPCODE_T_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the T test." ; >;
-        < "data_1" ; >;
-        < "The first record array." ; >;
-        < "data_2" ; >;
-        < "The second record array." ; >;
-        < "mode" ; >;
-        < "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution" ; >;
-        < "Type" ; >;
-        < "The type of the T test." ; >;
-    };
-};
- // -=*# Resource for function RSQ #*=-
-StringArray SC_OPCODE_RSQ+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the square of the Pearson product moment correlation coefficient." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function INTERCEPT #*=-
-StringArray SC_OPCODE_INTERCEPT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the intercept of the linear regression line and the Y axis." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function SLOPE #*=-
-StringArray SC_OPCODE_SLOPE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the slope of the linear regression line." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function STEYX #*=-
-StringArray SC_OPCODE_STEYX+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the standard error of the linear regression." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function PEARSON #*=-
-StringArray SC_OPCODE_PEARSON+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Pearson product moment correlation coefficient." ; >;
-        < "Data_1" ; >;
-        < "The first record array." ; >;
-        < "Data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function CORREL #*=-
-StringArray SC_OPCODE_CORREL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the correlation coefficient." ; >;
-        < "Data_1" ; >;
-        < "The first record array." ; >;
-        < "Data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function COVAR #*=-
-StringArray SC_OPCODE_COVAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the population covariance." ; >;
-        < "Data_1" ; >;
-        < "The first record array." ; >;
-        < "Data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function COVARIANCE.P #*=-
-StringArray SC_OPCODE_COVARIANCE_P+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the population covariance." ; >;
-        < "Data_1" ; >;
-        < "The first record array." ; >;
-        < "Data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function COVARIANCE.S #*=-
-StringArray SC_OPCODE_COVARIANCE_S+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the sample covariance." ; >;
-        < "Data_1" ; >;
-        < "The first record array." ; >;
-        < "Data_2" ; >;
-        < "The second record array." ; >;
-    };
-};
- // -=*# Resource for function FORECAST #*=-
-StringArray SC_OPCODE_FORECAST+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a value along a linear regression" ; >;
-        < "value" ; >;
-        < "The X value for which the Y value on the regression linear is to be calculated." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS #*=-
-StringArray SC_OPCODE_FORECAST_ETS_ADD+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates future value(s) using additive Exponential Smoothing algorithm." ; >;
-        < "target" ; >;
-        < "The date (array) for which you want to predict a value." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "period length" ; >;
-        < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.MULT #*=-
-StringArray SC_OPCODE_FORECAST_ETS_MUL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates future value(s) using multiplicative Exponential Smoothing algorithm." ; >;
-        < "target" ; >;
-        < "The date (array) for which you want to predict a value." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "period length" ; >;
-        < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.CONFINT #*=-
-StringArray SC_OPCODE_FORECAST_ETS_PIA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a prediction interval at the specified target value(s) for additive Exponential Smoothing method" ; >;
-        < "target" ; >;
-        < "The date (array) for which you want to predict a value." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "confidence level" ; >;
-        < "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval." ; >;
-        < "period length" ; >;
-        < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.PI.MULT #*=-
-StringArray SC_OPCODE_FORECAST_ETS_PIM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a prediction interval at the specified target value(s) for multiplicative Exponential Smoothing method" ; >;
-        < "target" ; >;
-        < "The date (array) for which you want to predict a value." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "confidence level" ; >;
-        < "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval." ; >;
-        < "period length" ; >;
-        < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.SEASONALITY #*=-
-StringArray SC_OPCODE_FORECAST_ETS_SEA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of samples in period (season) using additive Exponential Triple Smoothing algorithm." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.STAT #*=-
-StringArray SC_OPCODE_FORECAST_ETS_STA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns statistical value(s) using additive Exponential Smoothing algorithm." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "statistic type" ; >;
-        < "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast" ; >;
-        < "period length" ; >;
-        < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.ETS.STAT.MULT #*=-
-StringArray SC_OPCODE_FORECAST_ETS_STM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns statistical value(s) using multiplicative Exponential Smoothing algorithm." ; >;
-        < "values" ; >;
-        < "The data array from which you want to forecast." ; >;
-        < "timeline" ; >;
-        < "The date or numeric array; a consistent step between values is needed." ; >;
-        < "statistic type" ; >;
-        < "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast" ; >;
-        < "period length" ; >;
-        < "Number Of Samples in Period (default 1); length of the seasonal pattern." ; >;
-        < "data completion" ; >;
-        < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >;
-        < "aggregation" ; >;
-        < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >;
-    };
-};
- // -=*# Resource for function FORECAST.LINEAR #*=-
-StringArray SC_OPCODE_FORECAST_LIN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a value along a linear regression" ; >;
-        < "value" ; >;
-        < "The X value for which the Y value on the regression linear is to be calculated." ; >;
-        < "data_Y" ; >;
-        < "The Y data array." ; >;
-        < "data_X" ; >;
-        < "The X data array." ; >;
-    };
-};
- // -=*# Resource for function ADDRESS #*=-
-StringArray SC_OPCODE_ADDRESS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the reference to a cell as text." ; >;
-        < "row" ; >;
-        < "The row number of the cell." ; >;
-        < "column" ; >;
-        < "The column number of the cell." ; >;
-        < "ABS" ; >;
-        < "Specifies whether absolute or relative referencing is to be used." ; >;
-        < "A1" ; >;
-        < "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style." ; >;
-        < "sheet" ; >; // previously to OOo3.0 this was String resource RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ADDRESS 8
-        < "The spreadsheet name of the cell reference." ; >; // previously to OOo3.0 this was String resource RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ADDRESS 9
-    };
-};
- // -=*# Resource for function AREAS #*=-
-StringArray SC_OPCODE_AREAS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of individual ranges that belong to a (multiple) range." ; >;
-        < "reference" ; >;
-        < "The reference to a (multiple) range." ; >;
-    };
-};
- // -=*# Resource for function CHOOSE #*=-
-StringArray SC_OPCODE_CHOOSE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Selects a value from a list of up to 30 value arguments." ; >;
-        < "Index" ; >;
-        < "The index of the value (1..30) selected." ; >;
-        < "value " ; >;
-        < "Value 1, value 2,... The list of arguments from which a value is chosen." ; >;
-    };
-};
- // -=*# Resource for function COLUMNS #*=-
-StringArray SC_OPCODE_COLUMN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the internal column number of a reference." ; >;
-        < "reference" ; >;
-        < "The reference to a cell or a range." ; >;
-    };
-};
- // -=*# Resource for function ROW #*=-
-StringArray SC_OPCODE_ROW+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Defines the internal row number of a reference." ; >;
-        < "reference" ; >;
-        < "The reference to a cell or a range." ; >;
-    };
-};
- // -=*# Resource for function SHEET #*=-
-StringArray SC_OPCODE_SHEET+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the internal sheet number of a reference or a string." ; >;
-        < "reference" ; >;
-        < "The reference to a cell or a range or the character string of a sheet name." ; >;
-    };
-};
- // -=*# Resource for function COLUMNS #*=-
-StringArray SC_OPCODE_COLUMNS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of columns in an array or reference." ; >;
-        < "array" ; >;
-        < "The array (reference) for which the number of columns is to be determined." ; >;
-    };
-};
- // -=*# Resource for function ROWS #*=-
-StringArray SC_OPCODE_ROWS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of rows in a reference or array." ; >;
-        < "array" ; >;
-        < "The array (reference) for which the number of rows is to be determined." ; >;
-    };
-};
- // -=*# Resource for function SHEETS #*=-
-StringArray SC_OPCODE_SHEETS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of sheets of a given reference. If no parameter has been entered, the total number of sheets in the document is returned." ; >;
-        < "reference" ; >;
-        < "The reference to a cell or a range." ; >;
-    };
-};
- // -=*# Resource for function HLOOKUP #*=-
-StringArray SC_OPCODE_H_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Horizontal search and reference to the cells located below." ; >;
-        < "search_criteria" ; >;
-        < "The value to be found in the first row." ; >;
-        < "array" ; >;
-        < "The array or the range for the reference." ; >;
-        < "Index" ; >;
-        < "The row index in the array." ; >;
-        < "sorted" ; >;
-        < "If the value is TRUE or not given, the search row of the array must be sorted in ascending order." ; >;
-    };
-};
- // -=*# Resource for function VLOOKUP #*=-
-StringArray SC_OPCODE_V_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Vertical search and reference to indicated cells." ; >;
-        < "Search criterion" ; >;
-        < "The value to be found in the first column." ; >;
-        < "array" ; >;
-        < "The array or range for referencing." ; >;
-        < "Index" ; >;
-        < "Column index number in the array." ; >;
-        < "sort order" ; >;
-        < "If the value is TRUE or not given, the search column of the array must be sorted in ascending order." ; >;
-    };
-};
- // -=*# Resource for function INDEX #*=-
-StringArray SC_OPCODE_INDEX+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a reference to a cell from a defined range." ; >;
-        < "reference" ; >;
-        < "The reference to a (multiple) range." ; >;
-        < "row" ; >;
-        < "The row in the range." ; >;
-        < "column" ; >;
-        < "The column in the range." ; >;
-        < "range" ; >;
-        < "The index of the subrange if referring to a multiple range." ; >;
-    };
-};
- // -=*# Resource for function INDIRECT #*=-
-StringArray SC_OPCODE_INDIRECT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the contents of a cell that is referenced in text form." ; >;
-        < "ref" ; >;
-        < "The cell whose contents are to be evaluated is to be referenced in text form (e.g. \"A1\")." ; >;
-        < "A1" ; >;
-        < "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style." ; >;
-    };
-};
- // -=*# Resource for function LOOKUP #*=-
-StringArray SC_OPCODE_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines a value in a vector by comparison to values in another vector." ; >;
-        < "Search criterion" ; >;
-        < "The value to be used for comparison." ; >;
-        < "Search vector" ; >;
-        < "The vector (row or column) in which to search." ; >;
-        < "result_vector" ; >;
-        < "The vector (row or range) from which the value is to be determined." ; >;
-    };
-};
- // -=*# Resource for function MATCH #*=-
-StringArray SC_OPCODE_MATCH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Defines a position in a array after comparing values." ; >;
-        < "Search criterion" ; >;
-        < "The value to be used for comparison." ; >;
-        < "lookup_array" ; >;
-        < "The array (range) in which the search is made." ; >;
-        < "Type" ; >;
-        < "Type can take the value 1, 0 or -1 and determines the criteria are to be used for comparison purposes." ; >;
-    };
-};
- // -=*# Resource for function OFFSET #*=-
-StringArray SC_OPCODE_OFFSET+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a reference which has been moved in relation to the starting point." ; >;
-        < "reference" ; >;
-        < "The reference (cell) from which to base the movement." ; >;
-        < "rows" ; >;
-        < "The number of rows to be moved either up or down." ; >;
-        < "columns" ; >;
-        < "The number of columns that are to be moved to the left or to the right." ; >;
-        < "height" ; >;
-        < "The number of rows of the moved reference." ; >;
-        < "width" ; >;
-        < "The number of columns in the moved reference." ; >;
-    };
-};
- // -=*# Resource for function ERRORTYPE #*=-
-StringArray SC_OPCODE_ERROR_TYPE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a number corresponding to an error type" ; >;
-        < "reference" ; >;
-        < "The reference (cell) in which the error occurred." ; >;
-    };
-};
- // -=*# Resource for function ERROR.TYPE #*=-
-StringArray SC_OPCODE_ERROR_TYPE_ODF+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a number corresponding to one of the error values or #N/A if no error exists" ; >;
-        < "expression" ; >;
-        < "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test." ; >;
-    };
-};
- // -=*# Resource for function STYLE #*=-
-StringArray SC_OPCODE_STYLE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Applies a Style to the formula cell." ; >;
-        < "Style" ; >;
-        < "The name of the Style to be applied." ; >;
-        < "Time" ; >;
-        < "The time (in seconds) that the Style is to remain valid." ; >;
-        < "Style2" ; >;
-        < "The Style to be applied after time expires." ; >;
-    };
-};
- // -=*# Resource for function DDE #*=-
-StringArray SC_OPCODE_DDE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Result of a DDE link." ; >;
-        < "server" ; >;
-        < "The name of the server application." ; >;
-        < "File" ; >;
-        < "The name of the file." ; >;
-        < "range" ; >;
-        < "The range from which data is to be taken." ; >;
-        < "mode" ; >;
-        < "Defines how data is to be converted to numbers." ; >;
-    };
-};
- // -=*# Resource for function HYPERLINK #*=-
-StringArray SC_OPCODE_HYPERLINK+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Hyperlink." ; >;
-        < "URL" ; >;
-        < "URL"; >;
-        < "CellText" ; >;
-        < "Cell Text"; >;
-    };
-};
- // -=*# Resource for function GETPIVOTDATA #*=-
-StringArray SC_OPCODE_GET_PIVOT_DATA+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Extracts value(s) from a pivot table."; >;
-        < "Data Field"; >;
-        < "The name of the pivot table field to extract."; >;
-        < "Pivot Table"; >;
-        < "A reference to a cell or range in the pivot table."; >;
-        < "Field Name / Item"; >;
-        < "Field name/value pair to filter the target data."; >;
-    };
-};
- // -=*# Resource for function BAHTTEXT #*=-
-StringArray SC_OPCODE_BAHTTEXT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a number to text (Baht)." ; >;
-        < "Number" ; >;
-        < "The number to convert."; >;
-    };
-};
- // -=*# Resource for function JIS #*=-
-StringArray SC_OPCODE_JIS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts half-width ASCII and katakana characters to full-width." ; >;
-        < "text" ; >;
-        < "The text to convert."; >;
-    };
-};
- // -=*# Resource for function ASC #*=-
-StringArray SC_OPCODE_ASC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts full-width ASCII and katakana characters to half-width." ; >;
-        < "text" ; >;
-        < "The text to convert."; >;
-    };
-};
- // -=*# Resource for function CODE #*=-
-StringArray SC_OPCODE_CODE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a numeric code for the first character in a text string." ; >;
-        < "text" ; >;
-        < "This is the text for which the code of the first character is to be found." ; >;
-    };
-};
- // -=*# Resource for function DOLLAR #*=-
-StringArray SC_OPCODE_CURRENCY+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a number to text in currency format." ; >;
-        < "value" ; >;
-        < "Value is a number, a reference to a cell containing a number or a formula that results in a number." ; >;
-        < "decimals" ; >;
-        < "Decimal places. Denotes the number of digits to the right of the decimal point." ; >;
-    };
-};
- // -=*# Resource for function CHAR #*=-
-StringArray SC_OPCODE_CHAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a code number into a character or letter." ; >;
-        < "number" ; >;
-        < "The code value for the character." ; >;
-    };
-};
- // -=*# Resource for function CLEAN #*=-
-StringArray SC_OPCODE_CLEAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Removes all nonprintable characters from text." ; >;
-        < "text" ; >;
-        < "The text from which nonprintable characters are to be removed." ; >;
-    };
-};
- // -=*# Resource for function CONCATENATE #*=-
-StringArray SC_OPCODE_CONCAT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Combines several text items into one." ; >;
-        < "text" ; >;
-        < "Text for the concatenation." ; >;
-    };
-};
- // -=*# Resource for function CONCAT #*=-
-StringArray SC_OPCODE_CONCAT_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Combines several text items into one, accepts cell ranges as arguments." ; >;
-        < "text" ; >;
-        < "Text and/or cell ranges for the concatenation." ; >;
-    };
-};
- // -=*# Resource for function TEXTJOIN #*=-
-StringArray SC_OPCODE_TEXTJOIN_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Combines several text items into one, accepts cell ranges as arguments. Uses delimiter between items." ; >;
-        < "delimiter" ; >;
-        < "Text string to be used as delimiter." ; >;
-        < "skip empty cells" ; >;
-        < "If TRUE, empty cells will be ignored." ; >;
-        < "text" ; >;
-        < "Text and/or cell ranges for the concatenation." ; >;
-    };
-};
- // -=*# Resource for function IFS #*=-
-StringArray SC_OPCODE_IFS_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Checks 1 or more conditions and returns a value corresponding to the first true condition." ; >;
-        < "test" ; >;
-        < "Any value or expression which can be either TRUE or FALSE." ; >;
-        < "result" ; >;
-        < "The result of the function if test is TRUE." ; >;
-    };
-};
- // -=*# Resource for function SWITCH #*=-
-StringArray SC_OPCODE_SWITCH_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression." ; >;
-        < "expression" ; >;
-        < "Value that will be compared against value1-valueN." ; >;
-        < "value" ; >;
-        < "Value that will be compared against expression." ; >;
-        < "result" ; >;
-        < "Value to return when corresponding value argument matches expression." ; >;
-    };
-};
-StringArray SC_OPCODE_MINIFS_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the minimum value in a range that meet multiple criteria in multiple ranges." ; >;
-        < "min_range" ; >;
-        < "The range from which the minimum will be determined." ; >;
-        < "range" ; >;
-        < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >;
-        < "criteria" ; >;
-        < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >;
-    };
-};
-StringArray SC_OPCODE_MAXIFS_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the maximum value in a range that meet multiple criteria in multiple ranges." ; >;
-        < "max_range" ; >;
-        < "The range from which the maximum will be determined." ; >;
-        < "range" ; >;
-        < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >;
-        < "criteria" ; >;
-        < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >;
-    };
-};
- // -=*# Resource for function EXACT #*=-
-StringArray SC_OPCODE_EXACT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Specifies whether two texts are identical." ; >;
-        < "text_1" ; >;
-        < "The first text to be used for comparing texts." ; >;
-        < "text_2" ; >;
-        < "The second text for comparing texts." ; >;
-    };
-};
- // -=*# Resource for function FIND #*=-
-StringArray SC_OPCODE_FIND+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Looks for a string of text within another (case sensitive)" ; >;
-        < "find_text" ; >;
-        < "The text to be found." ; >;
-        < "text" ; >;
-        < "The text in which a search is to be made." ; >;
-        < "position" ; >;
-        < "The position in the text from which the search starts." ; >;
-    };
-};
- // -=*# Resource for function SEARCH #*=-
-StringArray SC_OPCODE_SEARCH+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Looks for one text value within another (not case-sensitive)." ; >;
-        < "find_text" ; >;
-        < "The text to be found." ; >;
-        < "text" ; >;
-        < "The text in which a search is to be made." ; >;
-        < "position" ; >;
-        < "The position in the text where the search is started." ; >;
-    };
-};
- // -=*# Resource for function TRIM #*=-
-StringArray SC_OPCODE_TRIM+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Removes extra spaces from text." ; >;
-        < "text" ; >;
-        < "The text in which extra spaces between words are to be deleted." ; >;
-    };
-};
- // -=*# Resource for function PROPER #*=-
-StringArray SC_OPCODE_PROPER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Capitalizes the first letter in all words." ; >;
-        < "text" ; >;
-        < "The text in which the beginning of words are to be replaced by capital letters." ; >;
-    };
-};
- // -=*# Resource for function UPPER #*=-
-StringArray SC_OPCODE_UPPER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts text to uppercase." ; >;
-        < "text" ; >;
-        < "The text in which lower case letters are to be converted to capitals." ; >;
-    };
-};
- // -=*# Resource for function LOWER #*=-
-StringArray SC_OPCODE_LOWER+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts text to lowercase." ; >;
-        < "text" ; >;
-        < "The text in which capitals are converted to lower case letters." ; >;
-    };
-};
- // -=*# Resource for function VALUE #*=-
-StringArray SC_OPCODE_VALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts text to a number." ; >;
-        < "text" ; >;
-        < "The text to be converted to a number." ; >;
-    };
-};
- // -=*# Resource for function TEXT #*=-
-StringArray SC_OPCODE_TEXT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a number to text according to a given format." ; >;
-        < "number" ; >;
-        < "The numeric value to be converted." ; >;
-        < "Format" ; >;
-        < "The text that describes the format." ; >;
-    };
-};
- // -=*# Resource for function T #*=-
-StringArray SC_OPCODE_T+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a value if it is text, otherwise an empty string." ; >;
-        < "value" ; >;
-        < "The value to be checked and returned if it is text." ; >;
-    };
-};
- // -=*# Resource for function REPLACE #*=-
-StringArray SC_OPCODE_REPLACE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Replaces characters within a text string with a different text string." ; >;
-        < "Text" ; >;
-        < "The text in which some characters are to be replaced." ; >;
-        < "position" ; >;
-        < "The character position from which text is to be replaced." ; >;
-        < "length" ; >;
-        < "The number of characters to be replaced." ; >;
-        < "new text" ; >;
-        < "The text to be inserted." ; >;
-    };
-};
- // -=*# Resource for function FIXED #*=-
-StringArray SC_OPCODE_FIXED+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Formats a number with a fixed number of places after the decimal point and thousands separator." ; >;
-        < "number" ; >;
-        < "The number to be formatted." ; >;
-        < "Decimals" ; >;
-        < "Decimal places. The number of fixed decimal places that are to be displayed." ; >;
-        < "No thousands separators" ; >;
-        < "Thousands separator. If 0 or omitted the locale group separator is used else the separator is suppressed." ; >;
-    };
-};
- // -=*# Resource for function LEN #*=-
-StringArray SC_OPCODE_LEN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates length of a text string." ; >;
-        < "text" ; >;
-        < "The text in which the length is to be determined." ; >;
-    };
-};
- // -=*# Resource for function LEFT #*=-
-StringArray SC_OPCODE_LEFT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the first character or characters of a text." ; >;
-        < "text" ; >;
-        < "The text where the initial partial words are to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the start text." ; >;
-    };
-};
- // -=*# Resource for function RIGHT #*=-
-StringArray SC_OPCODE_RIGHT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the last character or characters of a text." ; >;
-        < "text" ; >;
-        < "The text in which the end partial words are to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the end text." ; >;
-    };
-};
- // -=*# Resource for function MID #*=-
-StringArray SC_OPCODE_MID+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a partial text string of a text." ; >;
-        < "text" ; >;
-        < "The text in which partial words are to be determined." ; >;
-        < "start" ; >;
-        < "The position from which the part word is to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the text." ; >;
-    };
-};
- // -=*# Resource for function REPT #*=-
-StringArray SC_OPCODE_REPT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Repeats text a given number of times." ; >;
-        < "text" ; >;
-        < "The text to be repeated." ; >;
-        < "number" ; >;
-        < "The number of times the text is to be repeated." ; >;
-    };
-};
- // -=*# Resource for function SUBSTITUTE #*=-
-StringArray SC_OPCODE_SUBSTITUTE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Substitutes new text for old text in a string." ; >;
-        < "text" ; >;
-        < "The text in which partial words are to be replaced." ; >;
-        < "search_text" ; >;
-        < "The partial string to be (repeatedly) replaced." ; >;
-        < "new text" ; >;
-        < "The text which is to replace the text string." ; >;
-        < "occurrence" ; >;
-        < "Which occurrence of the old text is to be replaced." ; >;
-    };
-};
- // -=*# Resource for function BASE #*=-
-StringArray SC_OPCODE_BASE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a positive integer to text from a number system to the base defined." ; >;
-        < "number" ; >;
-        < "The number to be converted." ; >;
-        < "radix" ; >;
-        < "The base number for conversion must be in the range 2 - 36." ; >;
-        < "Minimum length" ; >;
-        < "If the text is shorter than the specified length, zeros are added to the left of the string." ; >;
-    };
-};
- // -=*# Resource for function DECIMAL #*=-
-StringArray SC_OPCODE_DECIMAL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a text of a specified number system to a positive integer in the base given." ; >;
-        < "text" ; >;
-        < "The text to be converted." ; >;
-        < "radix" ; >;
-        < "The base number for conversion must be in the range 2 - 36." ; >;
-    };
-};
- // -=*# Resource for function CONVERT_OOO #*=-
-StringArray SC_OPCODE_CONVERT_OOO+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a value according to a conversion table in the configuration (main.xcd)."; >;
-        < "value" ; >;
-        < "The value to be converted."; >;
-        < "text" ; >;
-        < "Unit from which something is converted, case-sensitive."; >;
-        < "text" ; >;
-        < "Unit into which something is converted, case-sensitive."; >;
-    };
-};
- // -=*# Resource for function ROMAN #*=-
-StringArray SC_OPCODE_ROMAN+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a number to a Roman numeral."; >;
-        < "Number"; >;
-        < "The number to be converted to a Roman numeral must be in the 0 - 3999 range."; >;
-        < "Mode"; >;
-        < "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range."; >;
-    };
-};
- // -=*# Resource for function ARABIC #*=-
-StringArray SC_OPCODE_ARABIC+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the value of a Roman numeral."; >;
-        < "Text"; >;
-        < "The text that represents a Roman numeral."; >;
-    };
-};
-StringArray SC_OPCODE_INFO+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns information about the environment."; >;
-        < "Text"; >;
-        < "Can be \"osversion\", \"system\", \"release\", \"numfile\", and \"recalc\"."; >;
-    };
-};
-StringArray SC_OPCODE_UNICODE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the numeric code for the first Unicode character in a text string." ; >;
-        < "text" ; >;
-        < "This is the text for which the code of the first character is to be found." ; >;
-    };
-};
-StringArray SC_OPCODE_UNICHAR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a code number into a Unicode character or letter." ; >;
-        < "number" ; >;
-        < "The code value for the character." ; >;
-    };
-};
-StringArray SC_OPCODE_EUROCONVERT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a value from one to another Euro currency."; >;
-        < "value" ; >;
-        < "The value to be converted."; >;
-        < "from_currency" ; >;
-        < "ISO 4217 code of the currency from which is converted, case-sensitive."; >;
-        < "to_currency" ; >;
-        < "ISO 4217 code of the currency into which is converted, case-sensitive."; >;
-        < "full_precision" ; >;
-        < "If omitted or 0 or FALSE, the result is rounded to the decimals of to_currency. Else the result is not rounded."; >;
-        < "triangulation_precision" ; >;
-        < "If given and >=3, the intermediate result of a triangular conversion is rounded to that precision. If omitted, the result is not rounded."; >; // This description uses almost all available space in the dialog, make sure translations fit in size.
-    };
-};
-StringArray SC_OPCODE_NUMBERVALUE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts text to a number, in a locale-independent way." ; >;
-        < "text" ; >;
-        < "The text to be converted to a number." ; >;
-        < "decimal_separator" ; >;
-        < "Defines the character used as the decimal separator." ; >;
-        < "group_separator" ; >;
-        < "Defines the character(s) used as the group separator." ; >;
-    };
-};
-
-StringArray SC_OPCODE_BITAND+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Bitwise \"AND\" of two integers."; >;
-        < "Number1" ; >;
-        < "Positive integer less than 2^48." ; >;
-        < "Number2" ; >;
-        < "Positive integer less than 2^48." ; >;
-    };
-};
-StringArray SC_OPCODE_BITOR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Bitwise \"OR\" of two integers."; >;
-        < "Number1" ; >;
-        < "Positive integer less than 2^48." ; >;
-        < "Number2" ; >;
-        < "Positive integer less than 2^48." ; >;
-    };
-};
-StringArray SC_OPCODE_BITXOR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Bitwise \"exclusive OR\" of two integers."; >;
-        < "Number1" ; >;
-        < "Positive integer less than 2^48." ; >;
-        < "Number2" ; >;
-        < "Positive integer less than 2^48." ; >;
-    };
-};
-StringArray SC_OPCODE_BITRSHIFT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Bitwise right shift of an integer value."; >;
-        < "Number" ; >;
-        < "The value to be shifted. Positive integer less than 2^48." ; >;
-        < "Shift" ; >;
-        < "The integer number of bits the value is to be shifted." ; >;
-    };
-};
-StringArray SC_OPCODE_BITLSHIFT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Bitwise left shift of an integer value."; >;
-        < "Number" ; >;
-        < "The value to be shifted. Positive integer less than 2^48." ; >;
-        < "Shift" ; >;
-        < "The integer number of bits the value is to be shifted." ; >;
-    };
-};
-StringArray SC_OPCODE_LENB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates length of a text string, with DBCS" ; >;
-        < "text" ; >;
-        < "The text in which the length is to be determined." ; >;
-    };
-};
-StringArray SC_OPCODE_RIGHTB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the last character or characters of a text,with DBCS" ; >;
-        < "text" ; >;
-        < "The text in which the end partial words are to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the end text." ; >;
-    };
-};
-StringArray SC_OPCODE_LEFTB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the first character or characters of a text,with DBCS" ; >;
-        < "text" ; >;
-        < "The text where the initial partial words are to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the start text." ; >;
-    };
-};
-StringArray SC_OPCODE_MIDB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a partial text string of a text, with DBCS" ; >;
-        < "text" ; >;
-        < "The text in which partial words are to be determined." ; >;
-        < "start" ; >;
-        < "The position from which the part word is to be determined." ; >;
-        < "number" ; >;
-        < "The number of characters for the text." ; >;
-    };
-};
-StringArray SC_OPCODE_FILTERXML+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Apply an XPath expression to an XML document"; >;
-        < "XML Document"; >;
-        < "String containing a valid XML stream"; >;
-        < "XPath expression"; >;
-        < "String containing a valid XPath expression"; >;
-    };
-};
-StringArray SC_OPCODE_COLOR+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns an implementation defined value representing a RGBA color"; >;
-        < "Red"; >;
-        < "Value of red"; >;
-        < "Green"; >;
-        < "Value of green"; >;
-        < "Blue"; >;
-        < "Value of blue"; >;
-        < "Alpha"; >;
-        < "Value of alpha"; >;
-    };
-};
-StringArray SC_OPCODE_WEBSERVICE+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Get some webcontent from an URI."; >;
-        < "URI"; >;
-        < "URI of the webservice"; >;
-    };
-};
-StringArray SC_OPCODE_ENCODEURL+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Return a URL-encoded string."; >;
-        < "Text"; >;
-        < "A string to be URL-encoded"; >;
-    };
-};
-StringArray SC_OPCODE_ERF_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the error function."; >;
-        < "Lower Limit"; >;
-        < "The lower limit for integration"; >;
-    };
-};
-StringArray SC_OPCODE_ERFC_MS+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the complementary error function."; >;
-        < "Lower Limit"; >;
-        < "The lower limit for integration"; >;
-    };
-};
-StringArray SC_OPCODE_RAWSUBTRACT+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the subtraction of numbers. Like a-b-c but without eliminating small roundoff errors." ; >;
-        < "minuend" ; >;
-        < "Number from which following arguments are subtracted." ; >;
-        < "subtrahend " ; >;
-        < "Subtrahend 1, subtrahend 2, ... are numerical arguments subtracted from the minuend." ; >;
-    };
-};
- // -=*# Resource for function ROUNDSIG #*=-
-StringArray SC_OPCODE_ROUNDSIG+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Rounds a number to predefined significant digits." ; >;
-        < "value" ; >;
-        < "The number to be rounded." ; >;
-        < "digits" ; >;
-        < "The number of significant digits to which value is to be rounded." ; >;
-    };
-};
-StringArray SC_OPCODE_REPLACEB+RID_SC_FUNC_DESCRIPTIONS_START
-{
-    ItemList [ en-US ] =
-    {
-        < "Replaces characters within a text string with a different text string, with DBCS." ; >;
-        < "Text" ; >;
-        < "The text in which some characters are to be replaced." ; >;
-        < "position" ; >;
-        < "The character position from which text is to be replaced." ; >;
-        < "length" ; >;
-        < "The number of characters to be replaced." ; >;
-        < "new text" ; >;
-        < "The text to be inserted." ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
deleted file mode 100644
index 4ca3e92fb35b..000000000000
--- a/sc/source/ui/src/scstring.src
+++ /dev/null
@@ -1,605 +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 "scres.hrc"
-
- // Strings for interface names -------------------------------------------
-
-String SCSTR_LONG_SCDOC_NAME
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Spreadsheet";
-};
-
-String SCSTR_SHORT_SCDOC_NAME
-{
-    Text [ en-US ] = "Spreadsheet" ;
-};
-
-String SCSTR_UNDEFINED
-{
-    Text [ en-US ] = "- undefined -" ;
-};
-
-String SCSTR_NONE
-{
-    Text [ en-US ] = "- none -" ;
-};
-
-String SCSTR_ALL
-{
-    Text [ en-US ] = "- all -" ;
-};
-
-String SCSTR_MULTIPLE
-{
-    Text [ en-US ] = "- multiple -" ;
-};
-
-String SCSTR_STDFILTER
-{
-    Text [ en-US ] = "Standard Filter..." ;
-};
-
-String SCSTR_TOP10FILTER
-{
-    Text [ en-US ] = "Top 10" ;
-};
-
-String SCSTR_FILTER_EMPTY
-{
-    Text [ en-US ] = "Empty" ;
-};
-
-String SCSTR_FILTER_NOTEMPTY
-{
-    Text [ en-US ] = "Not Empty" ;
-};
-
-String SCSTR_NONAME
-{
-    Text [ en-US ] = "unnamed" ;
-};
-
-String SCSTR_COLUMN
-{
-    Text [ x-comment ] = "%1 is replaced to column letter, such as 'Column A'" ;
-    Text [ en-US ] = "Column %1" ;
-};
-
-String SCSTR_ROW
-{
-    Text [ x-comment ] = "%1 is replaced to row number, such as 'Row 1'" ;
-    Text [ en-US ] = "Row %1" ;
-};
-
-String SCSTR_TABLE
-{
-    Text [ en-US ] = "Sheet" ;
-};
-
-String SCSTR_NAME
-{
-    Text [ en-US ] = "Name" ;
-};
-
-String SCSTR_APDTABLE
-{
-    Text [ en-US ] = "Append Sheet" ;
-};
-
-String SCSTR_RENAMETAB
-{
-    Text [ en-US ] = "Rename Sheet" ;
-};
-
-String SCSTR_SET_TAB_BG_COLOR
-{
-    Text [ en-US ] = "Tab Color" ;
-};
-
-String SCSTR_NO_TAB_BG_COLOR
-{
-    Text [ en-US ] = "Default" ;
-};
-
-String SCSTR_RENAMEOBJECT
-{
-    Text [ en-US ] = "Name Object";
-};
-
-String STR_INSERTGRAPHIC
-{
-    Text [ en-US ] = "Insert Image" ;
-};
-
- //      Attribute
-
-String SCSTR_PROTECTDOC
-{
-    Text [ en-US ] = "Protect Document" ;
-};
-
-String SCSTR_UNPROTECTDOC
-{
-    Text [ en-US ] = "Unprotect document" ;
-};
-
-String SCSTR_UNPROTECTTAB
-{
-    Text [ en-US ] = "Unprotect sheet" ;
-};
-
-String SCSTR_CHG_PROTECT
-{
-    Text [ en-US ] = "Protect Records" ;
-};
-
-String SCSTR_CHG_UNPROTECT
-{
-    Text [ en-US ] = "Unprotect Records" ;
-};
-
-String SCSTR_PASSWORD
-{
-    Text [ en-US ] = "Password:" ;
-};
-
-String SCSTR_PASSWORDOPT
-{
-    Text [ en-US ] = "Password (optional):" ;
-};
-
-String SCSTR_WRONGPASSWORD
-{
-    Text [ en-US ] = "Incorrect Password" ;
-};
-
-String SCSTR_END
-{
-    Text [ en-US ] = "~End" ;
-};
-
-String SCSTR_UNKNOWN
-{
-    Text [ en-US ] = "Unknown" ;
-};
-
-String SCSTR_VALID_MINIMUM
-{
-    Text [ en-US ] = "~Minimum" ;
-};
-
-String SCSTR_VALID_MAXIMUM
-{
-    Text [ en-US ] = "~Maximum" ;
-};
-
-String SCSTR_VALID_VALUE
-{
-    Text [ en-US ] = "~Value" ;
-};
-
-String SCSTR_VALID_RANGE
-{
-    Text [ en-US ] = "~Source" ;
-};
-
-String SCSTR_VALID_LIST
-{
-    Text [ en-US ] = "~Entries" ;
-};
-
- // for dialogues:
-
-String SCSTR_CHARSET_USER
-{
-    Text [ en-US ] = "System" ;
-};
-
-String SCSTR_COLUMN_USER
-{
-    Text [ en-US ] = "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide" ;
-};
-
-String SCSTR_FIELDSEP_TAB
-{
-    Text [ en-US ] = "Tab" ;
-};
-
-String SCSTR_FIELDSEP_SPACE
-{
-    Text [ en-US ] = "space" ;
-};
-
-String SCSTR_FORMULA_AUTOCORRECTION
-{
-    Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ;
-};
-
-String SCSTR_UNDO_GRAFFILTER
-{
-    Text [ en-US ] = "Image Filter" ;
-};
-
-String STR_CAPTION_DEFAULT_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-
-// Select tables dialog title
-String STR_DLG_SELECTTABLES_TITLE
-{
-    Text [ en-US ] = "Select Sheets";
-};
-
-// Select tables dialog listbox
-String STR_DLG_SELECTTABLES_LBNAME
-{
-    Text [ en-US ] = "~Selected sheets";
-};
-
-String STR_REPLCELLSWARN
-{
-    Text [ en-US ] = "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?";
-};
-
-String STR_ACC_CSVRULER_NAME
-{
-    Text [ en-US ] = "Ruler";
-};
-
-String STR_ACC_CSVRULER_DESCR
-{
-    Text [ en-US ] = "This ruler manages objects at fixed positions.";
-};
-
-String STR_ACC_CSVGRID_NAME
-{
-    Text [ en-US ] = "Preview";
-};
-
-String STR_ACC_CSVGRID_DESCR
-{
-    Text [ en-US ] = "This sheet shows how the data will be arranged in the document.";
-};
-
-String STR_ACC_DOC_NAME
-{
-    Text [ en-US ] = "Document view";
-};
-
-String STR_ACC_TABLE_NAME
-{
-    Text [ en-US ] = "Sheet %1";
-};
-
-String STR_ACC_CELL_NAME
-{
-    Text [ en-US ] = "Cell %1";
-};
-
-String STR_ACC_LEFTAREA_NAME
-{
-    Text [ en-US ] = "Left area";
-};
-
-String STR_ACC_PREVIEWDOC_NAME
-{
-    Text [ en-US ] = "Page preview";
-};
-
-String STR_ACC_CENTERAREA_NAME
-{
-    Text [ en-US ] = "Center area";
-};
-
-String STR_ACC_RIGHTAREA_NAME
-{
-    Text [ en-US ] = "Right area";
-};
-
-String STR_ACC_HEADER_NAME
-{
-    Text [ en-US ] = "Header of page %1";
-};
-
-String STR_ACC_FOOTER_NAME
-{
-    Text [ en-US ] = "Footer of page %1";
-};
-
-String STR_ACC_EDITLINE_NAME
-{
-    Text [ en-US ] = "Input line";
-};
-
-String STR_ACC_EDITLINE_DESCR
-{
-    Text [ en-US ] = "This is where you enter or edit text, numbers and formulas.";
-};
-
-String SCSTR_MEDIASHELL
-{
-    Text [ en-US ] = "Media Playback";
-};
-
-String RID_SCSTR_ONCLICK
-{
-    Text [ en-US ] = "Mouse button pressed";
-};
-
-String STR_ACC_TOOLBAR_FORMULA
-{
-    Text [ en-US ] = "Formula Tool Bar";
-};
-String STR_ACC_DOC_SPREADSHEET
-{
-    Text [ en-US ] = "%PRODUCTNAME Spreadsheets";
-};
-String STR_ACC_DOC_SPREADSHEET_READONLY
-{
-    Text [ en-US ] = "(read-only)";
-};
-String STR_ACC_DOC_PREVIEW_SUFFIX
-{
-    Text [ en-US ] = "(Preview mode)";
-};
-
-String SCSTR_PRINTOPT_PAGES
-{
-    Text [ en-US ] = "Pages";
-};
-
-String SCSTR_PRINTOPT_SUPPRESSEMPTY
-{
-    Text [ en-US ] = "~Suppress output of empty pages";
-};
-
-String SCSTR_PRINTOPT_PRNTCONTENT
-{
-    Text [ en-US ] = "Print content";
-};
-
-String SCSTR_PRINTOPT_ALLSHEETS
-{
-    Text [ en-US ] = "~All sheets";
-};
-
-String SCSTR_PRINTOPT_SELECTEDSHEETS
-{
-    Text [ en-US ] = "~Selected sheets";
-};
-
-String SCSTR_PRINTOPT_SELECTEDCELLS
-{
-    Text [ en-US ] = "Selected cells";
-};
-
-String SCSTR_PRINTOPT_FROMWHICH
-{
-    Text [ en-US ] = "From which print";
-};
-
-String SCSTR_PRINTOPT_ALLPAGES
-{
-    Text [ en-US ] = "All ~pages";
-};
-
-String SCSTR_PRINTOPT_PAGES_
-{
-    Text [ en-US ] = "Pa~ges";
-};
-
-String SCSTR_PRINTOPT_PRODNAME
-{
-    Text [ en-US ] = "%PRODUCTNAME %s";
-};
-
-String SCSTR_WARN_ME_IN_FUTURE_CHECK
-{
-    Text [ en-US ] = "Warn me about this in the future.";
-};
-
-String SCSTR_DDEDOC_NOT_LOADED
-{
-    Text [ en-US ] = "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ;
-};
-
-String SCSTR_EXTDOC_NOT_LOADED
-{
-    Text [ en-US ] = "The following external file could not be loaded. Data linked from this file did not get updated." ;
-};
-
-String SCSTR_UPDATE_EXTDOCS
-{
-    Text [ en-US ] = "Updating external links.";
-};
-
-String SCSTR_FORMULA_SYNTAX_CALC_A1
-{
-    Text [ en-US ] = "Calc A1";
-};
-
-String SCSTR_FORMULA_SYNTAX_XL_A1
-{
-    Text [ en-US ] = "Excel A1";
-};
-
-String SCSTR_FORMULA_SYNTAX_XL_R1C1
-{
-    Text [ en-US ] = "Excel R1C1";
-};
-
-String SCSTR_COL_LABEL
-{
-    Text [ en-US ] = "Range contains column la~bels" ;
-};
-
-String SCSTR_ROW_LABEL
-{
-    Text [ en-US ] = "Range contains ~row labels" ;
-};
-
-StringArray SCSTR_UNIT
-{
-    ItemList [ en-US ] =
-    {
-        < "Millimeter" ; FUNIT_MM ; > ;
-        < "Centimeter" ; FUNIT_CM ; > ;
-        < "Meter" ; FUNIT_M ; > ;
-        < "Kilometer" ; FUNIT_KM ; > ;
-        < "Inch" ; FUNIT_INCH ; > ;
-        < "Foot" ; FUNIT_FOOT ; > ;
-        < "Miles" ; FUNIT_MILE ; > ;
-        < "Pica" ; FUNIT_PICA ; > ;
-        < "Point" ; FUNIT_POINT ; > ;
-    };
-};
-
-String SCSTR_VALERR
-{
-    Text [ en-US ] = "Invalid value" ;
-};
-
-String STR_NOFORMULASPECIFIED
-{
-    Text [ en-US ] = "No formula specified." ;
-};
-
-String STR_NOCOLROW
-{
-    Text [ en-US ] = "Neither row or column specified." ;
-};
-
-String STR_WRONGFORMULA
-{
-    Text [ en-US ] = "Undefined name or range." ;
-};
-
-String STR_WRONGROWCOL
-{
-    Text [ en-US ] = "Undefined name or wrong cell reference." ;
-};
-
-String STR_NOCOLFORMULA
-{
-    Text [ en-US ] = "Formulas don't form a column." ;
-};
-
-String STR_NOROWFORMULA
-{
-    Text [ en-US ] = "Formulas don't form a row." ;
-};
-
-String STR_ADD_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Add AutoFormat" ;
-};
-
-String STR_RENAME_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Rename AutoFormat" ;
-};
-
-String STR_ADD_AUTOFORMAT_LABEL
-{
-    Text [ en-US ] = "Name" ;
-};
-
-String STR_DEL_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Delete AutoFormat" ;
-};
-
-String STR_DEL_AUTOFORMAT_MSG
-{
-    Text [ en-US ] = "Do you really want to delete the # AutoFormat?" ;
-};
-
-String STR_BTN_AUTOFORMAT_CLOSE
-{
-    Text [ en-US ] = "~Close" ;
-};
-
-String STR_JAN
-{
-    Text [ en-US ] = "Jan" ;
-};
-
-String STR_FEB
-{
-    Text [ en-US ] = "Feb" ;
-};
-
-String STR_MAR
-{
-    Text [ en-US ] = "Mar" ;
-};
-
-String STR_NORTH
-{
-    Text [ en-US ] = "North" ;
-};
-
-String STR_MID
-{
-    Text [ en-US ] = "Mid" ;
-};
-
-String STR_SOUTH
-{
-    Text [ en-US ] = "South" ;
-};
-
-String STR_SUM
-{
-    Text [ en-US ] = "Total" ;
-};
-
-String STR_SHEET
-{
-    Text [ en-US ] = "Sheet" ;
-};
-
-String STR_CELL
-{
-    Text [ en-US ] = "Cell" ;
-};
-
-String STR_CONTENT
-{
-    Text [ en-US ] = "Content" ;
-};
-
-String SCSTR_UNDO_PAGE_ANCHOR
-{
-    Text [ en-US ] = "Page Anchor" ;
-};
-
-String SCSTR_UNDO_CELL_ANCHOR
-{
-    Text [ en-US ] = "Cell Anchor" ;
-};
-
-String SCSTR_CONDITION
-{
-    Text [ en-US ] = "Condition ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
deleted file mode 100644
index 9cc4f70a0218..000000000000
--- a/sc/source/ui/src/toolbox.src
+++ /dev/null
@@ -1,67 +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 "scres.hrc"
-
-String SCSTR_QHELP_POSWND
-{
-    Text [ en-US ] = "Name Box" ;
-};
-
-String SCSTR_QHELP_INPUTWND
-{
-    Text [ en-US ] = "Input line" ;
-};
-
-String SCSTR_QHELP_BTNCALC
-{
-    Text [ en-US ] = "Function Wizard" ;
-};
-
-String SCSTR_QHELP_BTNOK
-{
-    Text [ en-US ] = "Accept" ;
-};
-
-String SCSTR_QHELP_BTNCANCEL
-{
-    Text [ en-US ] = "Cancel" ;
-};
-
-String SCSTR_QHELP_BTNSUM
-{
-    Text [ en-US ] = "Sum" ;
-};
-
-String SCSTR_QHELP_BTNEQUAL
-{
-    Text [ en-US ] = "Function" ;
-};
-
-String SCSTR_QHELP_EXPAND_FORMULA
-{
-    Text [ en-US ] = "Expand Formula Bar" ;
-};
-
-String SCSTR_QHELP_COLLAPSE_FORMULA
-{
-    Text [ en-US ] = "Collapse Formula Bar" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
deleted file mode 100644
index 45e7c6073da2..000000000000
--- a/sc/source/ui/styleui/scstyles.src
+++ /dev/null
@@ -1,44 +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 "scres.hrc"
-#include <svl/style.hrc>
-
-StringArray RID_CELLSTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
-        < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-        < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; >  ;
-    };
-};
-
-StringArray RID_PAGESTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
-        < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
-        < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 34e3ab1d5e35..0f0c43cce8fa 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -31,6 +31,7 @@
 #include "tptable.hxx"
 #include "scresid.hxx"
 #include "scres.hrc"
+#include "strings.hrc"
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index f4ad5170139a..8573e1768485 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1934,8 +1934,8 @@ ScUndoIndent::~ScUndoIndent()
 
 OUString ScUndoIndent::GetComment() const
 {
-    sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
-    return ScGlobal::GetRscString( nId );
+    const char* pId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
+    return ScGlobal::GetRscString(pId);
 }
 
 void ScUndoIndent::Undo()
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index df07b286bd04..173a569a8002 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -874,18 +874,18 @@ ScUndoDetective::~ScUndoDetective()
 
 OUString ScUndoDetective::GetComment() const
 {
-    sal_uInt16 nId = STR_UNDO_DETDELALL;
+    const char* pId = STR_UNDO_DETDELALL;
     if ( !bIsDelete )
         switch ( (ScDetOpType) nAction )
         {
-            case SCDETOP_ADDSUCC:   nId = STR_UNDO_DETADDSUCC;  break;
-            case SCDETOP_DELSUCC:   nId = STR_UNDO_DETDELSUCC;  break;
-            case SCDETOP_ADDPRED:   nId = STR_UNDO_DETADDPRED;  break;
-            case SCDETOP_DELPRED:   nId = STR_UNDO_DETDELPRED;  break;
-            case SCDETOP_ADDERROR:  nId = STR_UNDO_DETADDERROR; break;
+            case SCDETOP_ADDSUCC:   pId = STR_UNDO_DETADDSUCC;  break;
+            case SCDETOP_DELSUCC:   pId = STR_UNDO_DETDELSUCC;  break;
+            case SCDETOP_ADDPRED:   pId = STR_UNDO_DETADDPRED;  break;
+            case SCDETOP_DELPRED:   pId = STR_UNDO_DETDELPRED;  break;
+            case SCDETOP_ADDERROR:  pId = STR_UNDO_DETADDERROR; break;
         }
 
-    return ScGlobal::GetRscString( nId );
+    return ScGlobal::GetRscString(pId);
 }
 
 void ScUndoDetective::Undo()
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index c1a19e9ec490..965fcf6f912e 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1376,15 +1376,15 @@ ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
 
 OUString ScUndoDataPilot::GetComment() const
 {
-    sal_uInt16 nIndex;
+    const char* pResId;
     if (xOldUndoDoc && xNewUndoDoc)
-        nIndex = STR_UNDO_PIVOT_MODIFY;
+        pResId = STR_UNDO_PIVOT_MODIFY;
     else if (xNewUndoDoc)
-        nIndex = STR_UNDO_PIVOT_NEW;
+        pResId = STR_UNDO_PIVOT_NEW;
     else
-        nIndex = STR_UNDO_PIVOT_DELETE;
+        pResId = STR_UNDO_PIVOT_DELETE;
 
-    return ScGlobal::GetRscString( nIndex );
+    return ScGlobal::GetRscString(pResId);
 }
 
 void ScUndoDataPilot::Undo()
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index a021422bdf25..1af29c7bc135 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -80,10 +80,10 @@ ScUndoModifyStyle::~ScUndoModifyStyle()
 
 OUString ScUndoModifyStyle::GetComment() const
 {
-    sal_uInt16 nId = (eFamily == SfxStyleFamily::Para) ?
+    const char* pId = (eFamily == SfxStyleFamily::Para) ?
                                 STR_UNDO_EDITCELLSTYLE :
                                 STR_UNDO_EDITPAGESTYLE;
-    return ScGlobal::GetRscString( nId );
+    return ScGlobal::GetRscString(pId);
 }
 
 static void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, bool bRemoved )
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index f3dc9aa6fe5d..09bcd659431b 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -28,7 +28,8 @@
 #include "tabvwsh.hxx"
 #include "globstr.hrc"
 #include "global.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "undoolk.hxx"
 #include "target.hxx"
 #include "uiitems.hxx"
@@ -1143,17 +1144,17 @@ bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
 
 OUString ScUndoShowHideTab::GetComment() const
 {
-    sal_uInt16 nId;
+    const char* pId;
     if (undoTabs.size() > 1)
     {
-        nId = bShow ? STR_UNDO_SHOWTABS : STR_UNDO_HIDETABS;
+        pId = bShow ? STR_UNDO_SHOWTABS : STR_UNDO_HIDETABS;
     }
     else
     {
-        nId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
+        pId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
     }
 
-    return ScGlobal::GetRscString( nId );
+    return ScGlobal::GetRscString(pId);
 }
 
 ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, unique_ptr<ScDocProtection> && pProtectSettings) :
@@ -1219,8 +1220,8 @@ bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 OUString ScUndoDocProtect::GetComment() const
 {
-    sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
-    return ScGlobal::GetRscString( nId );
+    const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
+    return ScGlobal::GetRscString(pId);
 }
 
 ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, unique_ptr<ScTableProtection> && pProtectSettings) :
@@ -1287,8 +1288,8 @@ bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 OUString ScUndoTabProtect::GetComment() const
 {
-    sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
-    return ScGlobal::GetRscString( nId );
+    const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
+    return ScGlobal::GetRscString(pId);
 }
 
 ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 7247e49495d4..90450c17c51d 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -20,7 +20,7 @@
 #include "docsh.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "dpobject.hxx"
 #include "hints.hxx"
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 84f46138e8d5..b6eeca6fc39a 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -47,7 +47,6 @@
 #include <vcl/waitobj.hxx>
 #include <unotools/charclass.hxx>
 #include <tools/multisel.hxx>
-#include <tools/resary.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <unotools/saveopt.hxx>
 
@@ -122,7 +121,7 @@
 #include "transobj.hxx"
 #include "chgtrack.hxx"
 
-#include "scres.hrc"
+#include "strings.hrc"
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index f8a10d2abb25..44cb888ff183 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -866,19 +866,19 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN
     if ( sPropertyName == "DisplayName" )
     {
         SolarMutexGuard aGuard;
-        sal_uInt32 nResId = 0;
+        const char* pResId = nullptr;
         switch ( eFamily )
         {
             case SfxStyleFamily::Para:
-                nResId = STR_STYLE_FAMILY_CELL; break;
+                pResId = STR_STYLE_FAMILY_CELL; break;
             case SfxStyleFamily::Page:
-                nResId = STR_STYLE_FAMILY_PAGE; break;
+                pResId = STR_STYLE_FAMILY_PAGE; break;
             default:
                 OSL_FAIL( "ScStyleFamilyObj::getPropertyValue(): invalid family" );
         }
-        if ( nResId > 0 )
+        if (pResId)
         {
-            OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) );
+            OUString sDisplayName(ScGlobal::GetRscString(pResId));
             aRet <<= sDisplayName;
         }
     }
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 569a054419d3..74ed4fd1681d 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -34,13 +34,13 @@
 #include "docsh.hxx"
 #include "content.hxx"
 #include "scresid.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "unonames.hxx"
 
 using  namespace ::com::sun::star;
 
-sal_uInt16 const nTypeResIds[SC_LINKTARGETTYPE_COUNT] =
+static const char* aTypeResIds[SC_LINKTARGETTYPE_COUNT] =
 {
     SCSTR_CONTENT_TABLE,        // SC_LINKTARGETTYPE_SHEET
     SCSTR_CONTENT_RANGENAME,    // SC_LINKTARGETTYPE_RANGENAME
@@ -71,7 +71,7 @@ ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) :
     pDocShell->GetDocument().AddUnoObject(*this);
 
     for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++)
-        aNames[i] = ScResId( nTypeResIds[i] );
+        aNames[i] = ScResId(aTypeResIds[i]);
 }
 
 ScLinkTargetTypesObj::~ScLinkTargetTypesObj()
@@ -136,7 +136,7 @@ ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) :
     nType( nT )
 {
     pDocShell->GetDocument().AddUnoObject(*this);
-    aName = ScResId( nTypeResIds[nType] );    //! on demand?
+    aName = ScResId(aTypeResIds[nType]);    //! on demand?
 }
 
 ScLinkTargetTypeObj::~ScLinkTargetTypeObj()
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1ffb68bcb209..c576d27c8cad 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2844,7 +2844,7 @@ void ScCellShell::ExecuteDataPilotDialog()
     }
     else            // create new table
     {
-        sal_uLong nSrcErrorId = 0;
+        const char* pSrcErrorId = nullptr;
 
         //  select database range or data
         pTabViewShell->GetDBData( true, SC_DB_OLD );
@@ -2921,8 +2921,8 @@ void ScCellShell::ExecuteDataPilotDialog()
                 OUString aName = pTypeDlg->GetSelectedNamedRange();
                 ScSheetSourceDesc aShtDesc(pDoc);
                 aShtDesc.SetRangeName(aName);
-                nSrcErrorId = aShtDesc.CheckSourceRange();
-                if (!nSrcErrorId)
+                pSrcErrorId = aShtDesc.CheckSourceRange();
+                if (!pSrcErrorId)
                 {
                     pNewDPObject.reset(new ScDPObject(pDoc));
                     pNewDPObject->SetSheetDesc(aShtDesc);
@@ -2963,8 +2963,8 @@ void ScCellShell::ExecuteDataPilotDialog()
                     {
                         ScSheetSourceDesc aShtDesc(pDoc);
                         aShtDesc.SetSourceRange(aRange);
-                        nSrcErrorId = aShtDesc.CheckSourceRange();
-                        if (!nSrcErrorId)
+                        pSrcErrorId = aShtDesc.CheckSourceRange();
+                        if (!pSrcErrorId)
                         {
                             pNewDPObject.reset(new ScDPObject(pDoc));
                             pNewDPObject->SetSheetDesc( aShtDesc );
@@ -2980,10 +2980,10 @@ void ScCellShell::ExecuteDataPilotDialog()
             }
         }
 
-        if (nSrcErrorId)
+        if (pSrcErrorId)
         {
             // Error occurred during data creation.  Launch an error and bail out.
-            ScopedVclPtrInstance< InfoBox > aBox(pTabViewShell->GetDialogParent(), ScGlobal::GetRscString(nSrcErrorId));
+            ScopedVclPtrInstance< InfoBox > aBox(pTabViewShell->GetDialogParent(), ScGlobal::GetRscString(pSrcErrorId));
             aBox->Execute();
             return;
         }
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 51f028f5503d..c0b91e6d1056 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1328,7 +1328,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
         return;
     }
 
-    sal_uInt16 nErrorId = 0;
+    const char* pErrorId = nullptr;
 
     pDPObj->BuildAllDimensionMembers();
     ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1359,7 +1359,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                     bChange = true;
                 }
                 else
-                    nErrorId = STR_INVALIDNAME;
+                    pErrorId = STR_INVALIDNAME;
             }
         }
         else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
@@ -1382,10 +1382,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                         bChange = true;
                     }
                     else
-                        nErrorId = STR_INVALIDNAME;
+                        pErrorId = STR_INVALIDNAME;
                 }
                 else
-                    nErrorId = STR_INVALIDNAME;
+                    pErrorId = STR_INVALIDNAME;
             }
         }
     }
@@ -1408,10 +1408,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                     bChange = true;
                 }
                 else
-                    nErrorId = STR_INVALIDNAME;
+                    pErrorId = STR_INVALIDNAME;
             }
             else
-                nErrorId = STR_INVALIDNAME;
+                pErrorId = STR_INVALIDNAME;
         }
     }
     else
@@ -1455,7 +1455,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                         bChange = true;
                     }
                     else
-                        nErrorId = STR_INVALIDNAME;
+                        pErrorId = STR_INVALIDNAME;
                  }
             }
             else if (aPosData.Flags & MemberResultFlags::GRANDTOTAL)
@@ -1481,7 +1481,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
 
                         if (rString.isEmpty())
                         {
-                            nErrorId = STR_INVALIDNAME;
+                            pErrorId = STR_INVALIDNAME;
                             break;
                         }
 
@@ -1496,7 +1496,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                             bChange = true;
                         }
                         else
-                            nErrorId = STR_INVALIDNAME;
+                            pErrorId = STR_INVALIDNAME;
                     }
                     while (false);
                 }
@@ -1554,10 +1554,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
                                     bChange = true;
                                 }
                                 else
-                                    nErrorId = STR_INVALIDNAME;
+                                    pErrorId = STR_INVALIDNAME;
                             }
                             else
-                                nErrorId = STR_INVALIDNAME;
+                                pErrorId = STR_INVALIDNAME;
                         }
                     }
                     while (false);
@@ -1575,9 +1575,9 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString )
     }
     else
     {
-        if ( !nErrorId )
-            nErrorId = STR_ERR_DATAPILOT_INPUT;
-        ErrorMessage( nErrorId );
+        if (!pErrorId)
+            pErrorId = STR_ERR_DATAPILOT_INPUT;
+        ErrorMessage(pErrorId);
     }
 }
 
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index daf4666a15ab..3a541afe5530 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scresid.hxx"
 #include "drawview.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 8475c7c400e0..01007fc205d3 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -60,6 +60,7 @@
 
 #include "formatsh.hxx"
 #include "sc.hrc"
+#include "scres.hrc"
 #include "globstr.hrc"
 #include "docsh.hxx"
 #include "patattr.hxx"
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6725ffb5ef8c..b37b6d1f2e99 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -83,6 +83,7 @@
 #include "cbutton.hxx"
 #include "sc.hrc"
 #include "globstr.hrc"
+#include "strings.hrc"
 #include "editutil.hxx"
 #include "scresid.hxx"
 #include "inputhdl.hxx"
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 632ef881a1d4..e5d007bc8d71 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -31,6 +31,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include "globstr.hrc"
+#include "strings.hrc"
 #include "pagedata.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 6e1d9174dd4d..63851cff97a0 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -25,7 +25,7 @@
 #include "olinetab.hxx"
 #include "document.hxx"
 #include "dbfunc.hxx"
-#include "scres.hrc"
+#include "strings.hrc"
 #include "scresid.hxx"
 #include "bitmaps.hlst"
 
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index d843cb50fbcc..9be4c1747916 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -29,6 +29,7 @@
 #include "acredlin.hxx"
 #include "simpref.hxx"
 #include "scmod.hxx"
+#include "scres.hrc"
 #include "validate.hxx"
 
 SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME )
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 84f6babcb0d3..84f19b96ff46 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1414,7 +1414,7 @@ void ScTabView::MakeDrawLayer()
     }
 }
 
-void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
+void ScTabView::ErrorMessage(const char* pGlobStrId)
 {
     if ( SC_MOD()->IsInExecuteDrop() )
     {
@@ -1428,15 +1428,15 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
     ScWaitCursorOff aWaitOff( pParent );
     bool bFocus = pParent && pParent->HasFocus();
 
-    if(nGlobStrId==STR_PROTECTIONERR)
+    if (pGlobStrId && strcmp(pGlobStrId, STR_PROTECTIONERR) == 0)
     {
-        if(aViewData.GetDocShell()->IsReadOnly())
+        if (aViewData.GetDocShell()->IsReadOnly())
         {
-            nGlobStrId=STR_READONLYERR;
+            pGlobStrId = STR_READONLYERR;
         }
     }
 
-    ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString( nGlobStrId ) );
+    ScopedVclPtrInstance<InfoBox> aBox(pParent, ScGlobal::GetRscString(pGlobStrId));
     aBox->Execute();
     if (bFocus)
         pParent->GrabFocus();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 559aa45506bc..f477bf941440 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -34,6 +34,7 @@
 #include <vcl/vclenum.hxx>
 
 #include "globstr.hrc"
+#include "strings.hrc"
 #include "scmod.hxx"
 #include "appoptio.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index c43b968b7ab5..4401d7cc57c0 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -23,6 +23,7 @@
 #include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
+#include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <editeng/boxitem.hxx>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 8320d32aabb4..49754e374a06 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -87,30 +87,30 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode )
             return true;
         }
 
-        sal_uInt16 nGlobStrId = 0;
+        const char* pGlobStrId = nullptr;
         switch (eFunc)
         {
-            case SUBTOTAL_FUNC_AVE:  nGlobStrId = STR_FUN_TEXT_AVG; break;
-            case SUBTOTAL_FUNC_CNT:  nGlobStrId = STR_FUN_TEXT_COUNT; break;
-            case SUBTOTAL_FUNC_CNT2: nGlobStrId = STR_FUN_TEXT_COUNT2; break;
-            case SUBTOTAL_FUNC_MAX:  nGlobStrId = STR_FUN_TEXT_MAX; break;
-            case SUBTOTAL_FUNC_MIN:  nGlobStrId = STR_FUN_TEXT_MIN; break;
-            case SUBTOTAL_FUNC_SUM:  nGlobStrId = STR_FUN_TEXT_SUM; break;
-            case SUBTOTAL_FUNC_SELECTION_COUNT: nGlobStrId = STR_FUN_TEXT_SELECTION_COUNT; break;
+            case SUBTOTAL_FUNC_AVE:  pGlobStrId = STR_FUN_TEXT_AVG; break;
+            case SUBTOTAL_FUNC_CNT:  pGlobStrId = STR_FUN_TEXT_COUNT; break;
+            case SUBTOTAL_FUNC_CNT2: pGlobStrId = STR_FUN_TEXT_COUNT2; break;
+            case SUBTOTAL_FUNC_MAX:  pGlobStrId = STR_FUN_TEXT_MAX; break;
+            case SUBTOTAL_FUNC_MIN:  pGlobStrId = STR_FUN_TEXT_MIN; break;
+            case SUBTOTAL_FUNC_SUM:  pGlobStrId = STR_FUN_TEXT_SUM; break;
+            case SUBTOTAL_FUNC_SELECTION_COUNT: pGlobStrId = STR_FUN_TEXT_SELECTION_COUNT; break;
 
             default:
             {
                 // added to avoid warnings
             }
         }
-        if (nGlobStrId)
+        if (pGlobStrId)
         {
             ScDocument* pDoc        = rViewData.GetDocument();
             SCCOL       nPosX       = rViewData.GetCurX();
             SCROW       nPosY       = rViewData.GetCurY();
             SCTAB       nTab        = rViewData.GetTabNo();
 
-            aStr = ScGlobal::GetRscString(nGlobStrId);
+            aStr = ScGlobal::GetRscString(pGlobStrId);
             aStr += ": ";
 
             ScAddress aCursor( nPosX, nPosY, nTab );
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 53ad7ede5038..a2df0116562f 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -28,6 +28,7 @@
 
 #include "tabvwsh.hxx"
 #include "sc.hrc"
+#include "scres.hrc"
 #include "globstr.hrc"
 #include "global.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 5a2449cca069..ad32a62964d8 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -41,6 +41,7 @@
 #include "shtabdlg.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
+#include "strings.hrc"
 #include "docfunc.hxx"
 #include "eventuno.hxx"
 #include "dpobject.hxx"
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index d287ba5fe63f..8175d3b767de 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -47,7 +47,8 @@
 #include "patattr.hxx"
 #include "docpool.hxx"
 #include "uiitems.hxx"
-#include "scres.hrc"
+#include "sc.hrc"
+#include "strings.hrc"
 #include "undocell.hxx"
 #include "undoblk.hxx"
 #include "undotab.hxx"
@@ -1611,9 +1612,9 @@ void ScViewFunc::DeleteMulti( bool bRows )
 
     //  test if allowed
 
-    sal_uInt16 nErrorId = 0;
+    const char* pErrorId = nullptr;
     bool bNeedRefresh = false;
-    for (size_t i = 0, n = aSpans.size(); i < n && !nErrorId; ++i)
+    for (size_t i = 0, n = aSpans.size(); i < n && !pErrorId; ++i)
     {
         SCCOLROW nStart = aSpans[i].mnStart;
         SCCOLROW nEnd = aSpans[i].mnEnd;
@@ -1641,7 +1642,7 @@ void ScViewFunc::DeleteMulti( bool bRows )
             // test to the end of the sheet
             ScEditableTester aTester( &rDoc, nTab, nStartCol, nStartRow, MAXCOL, MAXROW );
             if (!aTester.IsEditable())
-                nErrorId = aTester.GetMessageId();
+                pErrorId = aTester.GetMessageId();
         }
 
         // merged cells
@@ -1657,7 +1658,7 @@ void ScViewFunc::DeleteMulti( bool bRows )
             // Disallow deleting parts of a merged cell.
             // Deleting the start is allowed (merge is removed), so the end doesn't have to be checked.
 
-            nErrorId = STR_MSSG_DELETECELLS_0;
+            pErrorId = STR_MSSG_DELETECELLS_0;
         }
         if ( nMergeEndX != nEndCol || nMergeEndY != nEndRow )
         {
@@ -1667,9 +1668,9 @@ void ScViewFunc::DeleteMulti( bool bRows )
         }
     }
 
-    if ( nErrorId )
+    if (pErrorId)
     {
-        ErrorMessage( nErrorId );
+        ErrorMessage(pErrorId);
         return;
     }
 
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
index 30b511d186ec..4667716b5bab 100644
--- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AdvancedFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Advanced Filter</property>
+    <property name="title" translatable="yes" context="advancedfilterdialog|AdvancedFilterDialog">Advanced Filter</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -148,7 +148,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Read _Filter Criteria From</property>
+                <property name="label" translatable="yes" context="advancedfilterdialog|label1">Read _Filter Criteria From</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lbfilterarea</property>
                 <attributes>
@@ -189,7 +189,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="case">
-                        <property name="label" translatable="yes">_Case sensitive</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|case">_Case sensitive</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -205,7 +205,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="header">
-                        <property name="label" translatable="yes">Range c_ontains column labels</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|header">Range c_ontains column labels</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="regexp">
-                        <property name="label" translatable="yes">Regular _expressions</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|regexp">Regular _expressions</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="unique">
-                        <property name="label" translatable="yes">_No duplications</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|unique">_No duplications</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -253,7 +253,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="copyresult">
-                        <property name="label" translatable="yes">Co_py results to:</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|copyresult">Co_py results to:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -273,7 +273,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="destpers">
-                        <property name="label" translatable="yes">_Keep filter criteria</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|destpers">_Keep filter criteria</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -312,7 +312,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="lbcopyarea-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Copy results to:</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="advancedfilterdialog|lbcopyarea-atkobject">Copy results to:</property>
                           </object>
                         </child>
                       </object>
@@ -334,7 +334,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="edcopyarea-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Copy results to:</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="advancedfilterdialog|edcopyarea-atkobject">Copy results to:</property>
                           </object>
                         </child>
                       </object>
@@ -372,7 +372,7 @@
                       <object class="GtkLabel" id="dbarealabel">
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Data range:</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|dbarealabel">Data range:</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -385,7 +385,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">dummy</property>
+                        <property name="label" translatable="yes" context="advancedfilterdialog|dbarea">dummy</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -405,7 +405,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Op_tions</property>
+                <property name="label" translatable="yes" context="advancedfilterdialog|label2">Op_tions</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
index 82b822d25aea..a5b9dadd123f 100644
--- a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AllHeaderFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Headers/Footers</property>
+    <property name="title" translatable="yes" context="allheaderfooterdialog|AllHeaderFooterDialog">Headers/Footers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="headerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (right)</property>
+                <property name="label" translatable="yes" context="allheaderfooterdialog|headerright">Header (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="headerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (left)</property>
+                <property name="label" translatable="yes" context="allheaderfooterdialog|headerleft">Header (left)</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="footerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (right)</property>
+                <property name="label" translatable="yes" context="allheaderfooterdialog|footerright">Footer (right)</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="footerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (left)</property>
+                <property name="label" translatable="yes" context="allheaderfooterdialog|footerleft">Footer (left)</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
index e4e6bf865e77..e125af995bed 100644
--- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="alpha-adjustment">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="AnalysisOfVarianceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Analysis of Variance (ANOVA)</property>
+    <property name="title" translatable="yes" context="analysisofvariancedialog|AnalysisOfVarianceDialog">Analysis of Variance (ANOVA)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -105,7 +105,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -119,7 +119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -186,7 +186,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="analysisofvariancedialog|label4">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -221,7 +221,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="radio-single-factor">
-                        <property name="label" translatable="yes">Single factor</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|radio-single-factor">Single factor</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radio-two-factor">
-                        <property name="label" translatable="yes">Two factor</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|radio-two-factor">Two factor</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -259,7 +259,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="analysisofvariancedialog|label3">Type</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -294,7 +294,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -311,7 +311,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -334,7 +334,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="analysisofvariancedialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -372,7 +372,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Alpha:</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|alpha-label">Alpha:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">alpha-spin</property>
                       </object>
@@ -386,7 +386,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="text" translatable="yes">0,05</property>
+                        <property name="text" translatable="yes" context="analysisofvariancedialog|alpha-spin">0,05</property>
                         <property name="adjustment">alpha-adjustment</property>
                         <property name="digits">2</property>
                         <property name="value">0.050000000000000003</property>
@@ -401,7 +401,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Rows per sample:</property>
+                        <property name="label" translatable="yes" context="analysisofvariancedialog|rows-per-sample-label">Rows per sample:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">rows-per-sample-spin</property>
                       </object>
@@ -431,7 +431,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="analysisofvariancedialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/autoformattable.ui b/sc/uiconfig/scalc/ui/autoformattable.ui
index 707b8b6db719..0e9e01ae848c 100644
--- a/sc/uiconfig/scalc/ui/autoformattable.ui
+++ b/sc/uiconfig/scalc/ui/autoformattable.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AutoFormatTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">AutoFormat</property>
+    <property name="title" translatable="yes" context="autoformattable|AutoFormatTableDialog">AutoFormat</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rename">
-                <property name="label" translatable="yes">Rename</property>
+                <property name="label" translatable="yes" context="autoformattable|rename">Rename</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -183,7 +183,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="autoformattable|label1">Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -216,7 +216,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="numformatcb">
-                            <property name="label" translatable="yes">_Number format</property>
+                            <property name="label" translatable="yes" context="autoformattable|numformatcb">_Number format</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -233,7 +233,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="bordercb">
-                            <property name="label" translatable="yes">_Borders</property>
+                            <property name="label" translatable="yes" context="autoformattable|bordercb">_Borders</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -250,7 +250,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="fontcb">
-                            <property name="label" translatable="yes">F_ont</property>
+                            <property name="label" translatable="yes" context="autoformattable|fontcb">F_ont</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -267,7 +267,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="patterncb">
-                            <property name="label" translatable="yes">_Pattern</property>
+                            <property name="label" translatable="yes" context="autoformattable|patterncb">_Pattern</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -284,7 +284,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="alignmentcb">
-                            <property name="label" translatable="yes">Alignmen_t</property>
+                            <property name="label" translatable="yes" context="autoformattable|alignmentcb">Alignmen_t</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -301,7 +301,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="autofitcb">
-                            <property name="label" translatable="yes">A_utoFit width and height</property>
+                            <property name="label" translatable="yes" context="autoformattable|autofitcb">A_utoFit width and height</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -324,7 +324,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Formatting</property>
+                    <property name="label" translatable="yes" context="autoformattable|label2">Formatting</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
index 83e0bc3220a4..eb7e117a944d 100644
--- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui
+++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="CellProtectionPage">
     <property name="visible">True</property>
@@ -32,7 +32,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkProtected">
-                    <property name="label" translatable="yes">_Protected</property>
+                    <property name="label" translatable="yes" context="cellprotectionpage|checkProtected">_Protected</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -52,7 +52,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkHideFormula">
-                    <property name="label" translatable="yes">Hide _formula</property>
+                    <property name="label" translatable="yes" context="cellprotectionpage|checkHideFormula">Hide _formula</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkHideAll">
-                    <property name="label" translatable="yes">Hide _all</property>
+                    <property name="label" translatable="yes" context="cellprotectionpage|checkHideAll">Hide _all</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
                     <property name="halign">end</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Cell protection is only effective after the current sheet has been protected.
+                    <property name="label" translatable="yes" context="cellprotectionpage|label1">Cell protection is only effective after the current sheet has been protected.
 
 Select 'Protect Sheet' from the 'Tools' menu.</property>
                     <property name="wrap">True</property>
@@ -117,7 +117,7 @@ Select 'Protect Sheet' from the 'Tools' menu.</property>
           <object class="GtkLabel" id="LabelProtection">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Protection</property>
+            <property name="label" translatable="yes" context="cellprotectionpage|LabelProtection">Protection</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -151,7 +151,7 @@ Select 'Protect Sheet' from the 'Tools' menu.</property>
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkHidePrinting">
-                    <property name="label" translatable="yes">Hide _when printing</property>
+                    <property name="label" translatable="yes" context="cellprotectionpage|checkHidePrinting">Hide _when printing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -174,7 +174,7 @@ Select 'Protect Sheet' from the 'Tools' menu.</property>
                     <property name="halign">end</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">The cells selected will be omitted when printing.</property>
+                    <property name="label" translatable="yes" context="cellprotectionpage|label4">The cells selected will be omitted when printing.</property>
                     <property name="wrap">True</property>
                     <property name="width_chars">52</property>
                   </object>
@@ -193,7 +193,7 @@ Select 'Protect Sheet' from the 'Tools' menu.</property>
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Print</property>
+            <property name="label" translatable="yes" context="cellprotectionpage|label3">Print</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/changesourcedialog.ui b/sc/uiconfig/scalc/ui/changesourcedialog.ui
index c3906dc41bc7..79b5c13a5942 100644
--- a/sc/uiconfig/scalc/ui/changesourcedialog.ui
+++ b/sc/uiconfig/scalc/ui/changesourcedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ChangeSourceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Change Source Data Range</property>
+    <property name="title" translatable="yes" context="changesourcedialog|ChangeSourceDialog">Change Source Data Range</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="col">
-                        <property name="label" translatable="yes">First _column as label</property>
+                        <property name="label" translatable="yes" context="changesourcedialog|col">First _column as label</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -104,7 +104,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="row">
-                        <property name="label" translatable="yes">First _row as label</property>
+                        <property name="label" translatable="yes" context="changesourcedialog|row">First _row as label</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Labels</property>
+                <property name="label" translatable="yes" context="changesourcedialog|label1">Labels</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/chardialog.ui b/sc/uiconfig/scalc/ui/chardialog.ui
index 2790aede6d54..dcc8881e396c 100644
--- a/sc/uiconfig/scalc/ui/chardialog.ui
+++ b/sc/uiconfig/scalc/ui/chardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CharDialog">
     <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="chardialog|CharDialog">Character</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,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="chardialog|font">Font</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,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="chardialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="chardialog|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
index 6c77b5af0fae..d8ae6880ffa8 100644
--- a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
+++ b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ChiSquareTestDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Chi Square Test</property>
+    <property name="title" translatable="yes" context="chisquaretestdialog|ChiSquareTestDialog">Chi Square Test</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -39,7 +39,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="chisquaretestdialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -78,7 +78,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="chisquaretestdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -120,7 +120,7 @@
               <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="chisquaretestdialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -214,7 +214,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">_Columns</property>
+                        <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-columns-radio">_Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -230,7 +230,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">_Rows</property>
+                        <property name="label" translatable="yes" context="chisquaretestdialog|groupedby-rows-radio">_Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="chisquaretestdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/colorrowdialog.ui b/sc/uiconfig/scalc/ui/colorrowdialog.ui
index e3007f48d816..a3737a742345 100644
--- a/sc/uiconfig/scalc/ui/colorrowdialog.ui
+++ b/sc/uiconfig/scalc/ui/colorrowdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ColOrRowDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Copy List</property>
+    <property name="title" translatable="yes" context="colorrowdialog|ColOrRowDialog">Copy List</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="columns">
-                        <property name="label" translatable="yes">_Columns</property>
+                        <property name="label" translatable="yes" context="colorrowdialog|columns">_Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="rows">
-                        <property name="label" translatable="yes">_Rows</property>
+                        <property name="label" translatable="yes" context="colorrowdialog|rows">_Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List From</property>
+                <property name="label" translatable="yes" context="colorrowdialog|label">List From</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/colwidthdialog.ui b/sc/uiconfig/scalc/ui/colwidthdialog.ui
index a829a5eded18..a97a439834d6 100644
--- a/sc/uiconfig/scalc/ui/colwidthdialog.ui
+++ b/sc/uiconfig/scalc/ui/colwidthdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ColWidthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Column Width</property>
+    <property name="title" translatable="yes" context="colwidthdialog|ColWidthDialog">Column Width</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -85,7 +85,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Width</property>
+                <property name="label" translatable="yes" context="colwidthdialog|label1">Width</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="default">
-                <property name="label" translatable="yes">_Default value</property>
+                <property name="label" translatable="yes" context="colwidthdialog|default">_Default value</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/condformatmanager.ui b/sc/uiconfig/scalc/ui/condformatmanager.ui
index b4b34d05ff79..5e5582342652 100644
--- a/sc/uiconfig/scalc/ui/condformatmanager.ui
+++ b/sc/uiconfig/scalc/ui/condformatmanager.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CondFormatManager">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Manage Conditional Formatting</property>
+    <property name="title" translatable="yes" context="condformatmanager|CondFormatManager">Manage Conditional Formatting</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -59,7 +59,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add">
-                            <property name="label" translatable="yes">Add</property>
+                            <property name="label" translatable="yes" context="condformatmanager|add">Add</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="GtkButton" id="edit">
-                            <property name="label" translatable="yes">Edit...</property>
+                            <property name="label" translatable="yes" context="condformatmanager|edit">Edit...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -87,7 +87,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="remove">
-                            <property name="label" translatable="yes">Remove</property>
+                            <property name="label" translatable="yes" context="condformatmanager|remove">Remove</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -114,7 +114,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Conditional Formats</property>
+                <property name="label" translatable="yes" context="condformatmanager|label1">Conditional Formats</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 88ec9b39069a..96b66543b9e1 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="grid">
@@ -55,10 +55,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">All Cells</item>
-              <item translatable="yes">Cell value is</item>
-              <item translatable="yes">Formula is</item>
-              <item translatable="yes">Date is</item>
+              <item translatable="yes" context="conditionalentry|type">All Cells</item>
+              <item translatable="yes" context="conditionalentry|type">Cell value is</item>
+              <item translatable="yes" context="conditionalentry|type">Formula is</item>
+              <item translatable="yes" context="conditionalentry|type">Date is</item>
             </items>
           </object>
           <packing>
@@ -69,7 +69,7 @@
         <child>
           <object class="GtkLabel" id="styleft">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Apply Style:</property>
+            <property name="label" translatable="yes" context="conditionalentry|styleft">Apply Style:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">style</property>
             <property name="xalign">0</property>
@@ -83,7 +83,7 @@
           <object class="GtkComboBoxText" id="style">
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">New Style...</item>
+              <item translatable="yes" context="conditionalentry|style">New Style...</item>
             </items>
           </object>
           <packing>
@@ -94,7 +94,7 @@
         <child>
           <object class="GtkLabel" id="valueft">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Enter a value:</property>
+            <property name="label" translatable="yes" context="conditionalentry|valueft">Enter a value:</property>
             <property name="xalign">0</property>
           </object>
           <packing>
@@ -159,7 +159,7 @@
         </child>
         <child>
           <object class="GtkButton" id="options">
-            <property name="label" translatable="yes">More Options...</property>
+            <property name="label" translatable="yes" context="conditionalentry|options">More Options...</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
           </object>
@@ -172,13 +172,13 @@
           <object class="GtkComboBoxText" id="colscalemin">
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">Automatic</item>
-              <item translatable="yes">Min</item>
-              <item translatable="yes">Max</item>
-              <item translatable="yes">Percentile</item>
-              <item translatable="yes">Value</item>
-              <item translatable="yes">Percent</item>
-              <item translatable="yes">Formula</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Automatic</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Min</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Max</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Percentile</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Value</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Percent</item>
+              <item translatable="yes" context="conditionalentry|colscalemin">Formula</item>
             </items>
           </object>
           <packing>
@@ -190,13 +190,13 @@
           <object class="GtkComboBoxText" id="colscalemiddle">
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">Automatic</item>
-              <item translatable="yes">Min</item>
-              <item translatable="yes">Max</item>
-              <item translatable="yes">Percentile</item>
-              <item translatable="yes">Value</item>
-              <item translatable="yes">Percent</item>
-              <item translatable="yes">Formula</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Automatic</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Min</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Max</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Percentile</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Value</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Percent</item>
+              <item translatable="yes" context="conditionalentry|colscalemiddle">Formula</item>
             </items>
           </object>
           <packing>
@@ -208,13 +208,13 @@
           <object class="GtkComboBoxText" id="colscalemax">
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">Automatic</item>
-              <item translatable="yes">Min</item>
-              <item translatable="yes">Max</item>
-              <item translatable="yes">Percentile</item>
-              <item translatable="yes">Value</item>
-              <item translatable="yes">Percent</item>
-              <item translatable="yes">Formula</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Automatic</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Min</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Max</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Percentile</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Value</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Percent</item>
+              <item translatable="yes" context="conditionalentry|colscalemax">Formula</item>
             </items>
           </object>
           <packing>
@@ -225,7 +225,7 @@
         <child>
           <object class="svxlo-SvxFontPrevWindow" id="preview:border">
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Example</property>
+            <property name="tooltip_text" translatable="yes" context="conditionalentry|preview|tooltip_text">Example</property>
             <property name="hexpand">True</property>
           </object>
           <packing>
@@ -248,30 +248,30 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">equal to</item>
-                      <item translatable="yes">less than</item>
-                      <item translatable="yes">greater than</item>
-                      <item translatable="yes">less than or equal to</item>
-                      <item translatable="yes">greater than or equal to</item>
-                      <item translatable="yes">not equal to</item>
-                      <item translatable="yes">between</item>
-                      <item translatable="yes">not between</item>
-                      <item translatable="yes">duplicate</item>
-                      <item translatable="yes">not duplicate</item>
-                      <item translatable="yes">top 10 elements</item>
-                      <item translatable="yes">bottom 10 elements</item>
-                      <item translatable="yes">top 10 percent</item>
-                      <item translatable="yes">bottom 10 percent</item>
-                      <item translatable="yes">above average</item>
-                      <item translatable="yes">below average</item>
-                      <item translatable="yes">above or equal average</item>
-                      <item translatable="yes">below or equal average</item>
-                      <item translatable="yes">Error</item>
-                      <item translatable="yes">No Error</item>
-                      <item translatable="yes">Begins with</item>
-                      <item translatable="yes">Ends with</item>
-                      <item translatable="yes">Contains</item>
-                      <item translatable="yes">Not Contains</item>
+                      <item translatable="yes" context="conditionalentry|typeis">equal to</item>
+                      <item translatable="yes" context="conditionalentry|typeis">less than</item>
+                      <item translatable="yes" context="conditionalentry|typeis">greater than</item>
+                      <item translatable="yes" context="conditionalentry|typeis">less than or equal to</item>
+                      <item translatable="yes" context="conditionalentry|typeis">greater than or equal to</item>
+                      <item translatable="yes" context="conditionalentry|typeis">not equal to</item>
+                      <item translatable="yes" context="conditionalentry|typeis">between</item>
+                      <item translatable="yes" context="conditionalentry|typeis">not between</item>
+                      <item translatable="yes" context="conditionalentry|typeis">duplicate</item>
+                      <item translatable="yes" context="conditionalentry|typeis">not duplicate</item>
+                      <item translatable="yes" context="conditionalentry|typeis">top 10 elements</item>
+                      <item translatable="yes" context="conditionalentry|typeis">bottom 10 elements</item>
+                      <item translatable="yes" context="conditionalentry|typeis">top 10 percent</item>
+                      <item translatable="yes" context="conditionalentry|typeis">bottom 10 percent</item>
+                      <item translatable="yes" context="conditionalentry|typeis">above average</item>
+                      <item translatable="yes" context="conditionalentry|typeis">below average</item>
+                      <item translatable="yes" context="conditionalentry|typeis">above or equal average</item>
+                      <item translatable="yes" context="conditionalentry|typeis">below or equal average</item>
+                      <item translatable="yes" context="conditionalentry|typeis">Error</item>
+                      <item translatable="yes" context="conditionalentry|typeis">No Error</item>
+                      <item translatable="yes" context="conditionalentry|typeis">Begins with</item>
+                      <item translatable="yes" context="conditionalentry|typeis">Ends with</item>
+                      <item translatable="yes" context="conditionalentry|typeis">Contains</item>
+                      <item translatable="yes" context="conditionalentry|typeis">Not Contains</item>
                     </items>
                   </object>
                   <packing>
@@ -284,19 +284,19 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">Today</item>
-                      <item translatable="yes">Yesterday</item>
-                      <item translatable="yes">Tomorrow</item>
-                      <item translatable="yes">Last 7 days</item>
-                      <item translatable="yes">This week</item>
-                      <item translatable="yes">Last week</item>
-                      <item translatable="yes">Next week</item>
-                      <item translatable="yes">This month</item>
-                      <item translatable="yes">Last month</item>
-                      <item translatable="yes">Next month</item>
-                      <item translatable="yes">This year</item>
-                      <item translatable="yes">Last year</item>
-                      <item translatable="yes">Next year</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Today</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Yesterday</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Tomorrow</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Last 7 days</item>
+                      <item translatable="yes" context="conditionalentry|datetype">This week</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Last week</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Next week</item>
+                      <item translatable="yes" context="conditionalentry|datetype">This month</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Last month</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Next month</item>
+                      <item translatable="yes" context="conditionalentry|datetype">This year</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Last year</item>
+                      <item translatable="yes" context="conditionalentry|datetype">Next year</item>
                     </items>
                   </object>
                   <packing>
@@ -309,10 +309,10 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">Color Scale (2 Entries)</item>
-                      <item translatable="yes">Color Scale (3 Entries)</item>
-                      <item translatable="yes">Data Bar</item>
-                      <item translatable="yes">Icon Set</item>
+                      <item translatable="yes" context="conditionalentry|colorformat">Color Scale (2 Entries)</item>
+                      <item translatable="yes" context="conditionalentry|colorformat">Color Scale (3 Entries)</item>
+                      <item translatable="yes" context="conditionalentry|colorformat">Data Bar</item>
+                      <item translatable="yes" context="conditionalentry|colorformat">Icon Set</item>
                     </items>
                   </object>
                   <packing>
@@ -356,28 +356,28 @@
                   <object class="GtkComboBoxText" id="iconsettype">
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">3 Arrows</item>
-                      <item translatable="yes">3 Gray Arrows</item>
-                      <item translatable="yes">3 Flags</item>
-                      <item translatable="yes">3 Traffic Lights 1</item>
-                      <item translatable="yes">3 Traffic Lights 2</item>
-                      <item translatable="yes">3 Signs</item>
-                      <item translatable="yes">3 Symbols 1</item>
-                      <item translatable="yes">3 Symbols 2</item>
-                      <item translatable="yes">3 Smileys</item>
-                      <item translatable="yes">3 Stars</item>
-                      <item translatable="yes">3 Triangles</item>
-                      <item translatable="yes">3 Colored Smileys</item>
-                      <item translatable="yes">4 Arrows</item>
-                      <item translatable="yes">4 Gray Arrows</item>
-                      <item translatable="yes">4 Circles Red to Black</item>
-                      <item translatable="yes">4 Ratings</item>
-                      <item translatable="yes">4 Traffic Lights</item>
-                      <item translatable="yes">5 Arrows</item>
-                      <item translatable="yes">5 Gray Arrows</item>
-                      <item translatable="yes">5 Ratings</item>
-                      <item translatable="yes">5 Quarters</item>
-                      <item translatable="yes">5 Boxes</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Gray Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Flags</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Traffic Lights 1</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Traffic Lights 2</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Signs</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Symbols 1</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Symbols 2</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Smileys</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Stars</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Triangles</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">3 Colored Smileys</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">4 Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">4 Gray Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">4 Circles Red to Black</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">4 Ratings</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">4 Traffic Lights</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">5 Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">5 Gray Arrows</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">5 Ratings</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">5 Quarters</item>
+                      <item translatable="yes" context="conditionalentry|iconsettype">5 Boxes</item>
                     </items>
                   </object>
                   <packing>
diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui
index c7797cb0542c..783814fe501c 100644
--- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui
+++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="ConditionalFormatDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Conditional Formatting for</property>
+    <property name="title" translatable="yes" context="conditionalformatdialog|ConditionalFormatDialog">Conditional Formatting for</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Conditions</property>
+                <property name="label" translatable="yes" context="conditionalformatdialog|label1">Conditions</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -220,7 +220,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
-                        <property name="label" translatable="yes">Range:</property>
+                        <property name="label" translatable="yes" context="conditionalformatdialog|ftassign">Range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">edassign</property>
                       </object>
@@ -265,7 +265,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Cell Range</property>
+                <property name="label" translatable="yes" context="conditionalformatdialog|label2">Cell Range</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/conditionaliconset.ui b/sc/uiconfig/scalc/ui/conditionaliconset.ui
index fb2048f12fd1..491bffeb8147 100644
--- a/sc/uiconfig/scalc/ui/conditionaliconset.ui
+++ b/sc/uiconfig/scalc/ui/conditionaliconset.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="ConditionalIconSet">
     <property name="visible">True</property>
@@ -17,7 +17,7 @@
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes"> &gt;= </property>
+            <property name="label" translatable="yes" context="conditionaliconset|label"> &gt;= </property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -40,10 +40,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">Value</item>
-              <item translatable="yes">Percent</item>
-              <item translatable="yes">Percentile</item>
-              <item translatable="yes">Formula</item>
+              <item translatable="yes" context="conditionaliconset|listbox">Value</item>
+              <item translatable="yes" context="conditionaliconset|listbox">Percent</item>
+              <item translatable="yes" context="conditionaliconset|listbox">Percentile</item>
+              <item translatable="yes" context="conditionaliconset|listbox">Formula</item>
             </items>
           </object>
           <packing>
diff --git a/sc/uiconfig/scalc/ui/conflictsdialog.ui b/sc/uiconfig/scalc/ui/conflictsdialog.ui
index 912482e61d54..894e1c42b2d0 100644
--- a/sc/uiconfig/scalc/ui/conflictsdialog.ui
+++ b/sc/uiconfig/scalc/ui/conflictsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ConflictsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Resolve Conflicts</property>
+    <property name="title" translatable="yes" context="conflictsdialog|ConflictsDialog">Resolve Conflicts</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="keepallmine">
-                <property name="label" translatable="yes">_Keep All Mine</property>
+                <property name="label" translatable="yes" context="conflictsdialog|keepallmine">_Keep All Mine</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="keepallothers">
-                <property name="label" translatable="yes">Keep _All Others</property>
+                <property name="label" translatable="yes" context="conflictsdialog|keepallothers">Keep _All Others</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -99,7 +99,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes.</property>
+                <property name="label" translatable="yes" context="conflictsdialog|label1">There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">120</property>
               </object>
@@ -134,7 +134,7 @@
                 <property name="layout_style">center</property>
                 <child>
                   <object class="GtkButton" id="keepmine">
-                    <property name="label" translatable="yes">Keep _Mine</property>
+                    <property name="label" translatable="yes" context="conflictsdialog|keepmine">Keep _Mine</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -149,7 +149,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="keepother">
-                    <property name="label" translatable="yes">Keep _Other</property>
+                    <property name="label" translatable="yes" context="conflictsdialog|keepother">Keep _Other</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui
index deec922eaf27..f075c4b95772 100644
--- a/sc/uiconfig/scalc/ui/consolidatedialog.ui
+++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="ConsolidateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Consolidate</property>
+    <property name="title" translatable="yes" context="consolidatedialog|ConsolidateDialog">Consolidate</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -88,7 +88,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Function:</property>
+                <property name="label" translatable="yes" context="consolidatedialog|label1">_Function:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">func</property>
               </object>
@@ -105,7 +105,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Consolidation ranges:</property>
+                <property name="label" translatable="yes" context="consolidatedialog|label2">_Consolidation ranges:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">consareas:border</property>
               </object>
@@ -122,17 +122,17 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <items>
-                  <item translatable="yes">Sum</item>
-                  <item translatable="yes">Count</item>
-                  <item translatable="yes">Average</item>
-                  <item translatable="yes">Max</item>
-                  <item translatable="yes">Min</item>
-                  <item translatable="yes">Product</item>
-                  <item translatable="yes">Count (numbers only)</item>
-                  <item translatable="yes">StDev (sample)</item>
-                  <item translatable="yes">StDevP (population)</item>
-                  <item translatable="yes">Var (sample)</item>
-                  <item translatable="yes">VarP (population)</item>
+                  <item translatable="yes" context="consolidatedialog|func">Sum</item>
+                  <item translatable="yes" context="consolidatedialog|func">Count</item>
+                  <item translatable="yes" context="consolidatedialog|func">Average</item>
+                  <item translatable="yes" context="consolidatedialog|func">Max</item>
+                  <item translatable="yes" context="consolidatedialog|func">Min</item>
+                  <item translatable="yes" context="consolidatedialog|func">Product</item>
+                  <item translatable="yes" context="consolidatedialog|func">Count (numbers only)</item>
+                  <item translatable="yes" context="consolidatedialog|func">StDev (sample)</item>
+                  <item translatable="yes" context="consolidatedialog|func">StDevP (population)</item>
+                  <item translatable="yes" context="consolidatedialog|func">Var (sample)</item>
+                  <item translatable="yes" context="consolidatedialog|func">VarP (population)</item>
                 </items>
               </object>
               <packing>
@@ -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">_Source data ranges:</property>
+                <property name="label" translatable="yes" context="consolidatedialog|ftdataarea">_Source data ranges:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lbdataarea</property>
               </object>
@@ -357,7 +357,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Copy results _to:</property>
+                <property name="label" translatable="yes" context="consolidatedialog|ftdestarea">Copy results _to:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lbdestarea</property>
               </object>
@@ -414,7 +414,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="byrow">
-                                <property name="label" translatable="yes">_Row labels</property>
+                                <property name="label" translatable="yes" context="consolidatedialog|byrow">_Row labels</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -432,7 +432,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="bycol">
-                                <property name="label" translatable="yes">C_olumn labels</property>
+                                <property name="label" translatable="yes" context="consolidatedialog|bycol">C_olumn labels</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -456,7 +456,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Consolidate by</property>
+                        <property name="label" translatable="yes" context="consolidatedialog|label3">Consolidate by</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -488,7 +488,7 @@
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="refs">
-                            <property name="label" translatable="yes">_Link to source data</property>
+                            <property name="label" translatable="yes" context="consolidatedialog|refs">_Link to source data</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -504,7 +504,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Options</property>
+                        <property name="label" translatable="yes" context="consolidatedialog|label4">Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -523,7 +523,7 @@
               <object class="GtkLabel" id="more_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="consolidatedialog|more_label">Options</property>
               </object>
             </child>
           </object>
diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui
index 2312d24359bf..83a08ecdf519 100644
--- a/sc/uiconfig/scalc/ui/correlationdialog.ui
+++ b/sc/uiconfig/scalc/ui/correlationdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CorrelationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Correlation</property>
+    <property name="title" translatable="yes" context="correlationdialog|CorrelationDialog">Correlation</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="correlationdialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -111,7 +111,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="correlationdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -178,7 +178,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="correlationdialog|label4">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -213,7 +213,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="correlationdialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -228,7 +228,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="correlationdialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -249,7 +249,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="correlationdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui
index 6fb73387ebfb..11ccaab113a1 100644
--- a/sc/uiconfig/scalc/ui/covariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/covariancedialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CovarianceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Covariance</property>
+    <property name="title" translatable="yes" context="covariancedialog|CovarianceDialog">Covariance</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -39,7 +39,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="covariancedialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -78,7 +78,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="covariancedialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -120,7 +120,7 @@
               <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="covariancedialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -214,7 +214,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="covariancedialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -229,7 +229,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="covariancedialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -250,7 +250,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="covariancedialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui
index 90db355bca55..1879ac49bca8 100644
--- a/sc/uiconfig/scalc/ui/createnamesdialog.ui
+++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CreateNamesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Names</property>
+    <property name="title" translatable="yes" context="createnamesdialog|CreateNamesDialog">Create Names</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -93,7 +93,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="top">
-                        <property name="label" translatable="yes">_Top row</property>
+                        <property name="label" translatable="yes" context="createnamesdialog|top">_Top row</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="left">
-                        <property name="label" translatable="yes">_Left column</property>
+                        <property name="label" translatable="yes" context="createnamesdialog|left">_Left column</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -125,7 +125,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="bottom">
-                        <property name="label" translatable="yes">_Bottom row</property>
+                        <property name="label" translatable="yes" context="createnamesdialog|bottom">_Bottom row</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="right">
-                        <property name="label" translatable="yes">_Right column</property>
+                        <property name="label" translatable="yes" context="createnamesdialog|right">_Right column</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.49000000953674316</property>
-                <property name="label" translatable="yes">Create Names From</property>
+                <property name="label" translatable="yes" context="createnamesdialog|label1">Create Names From</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/dapiservicedialog.ui b/sc/uiconfig/scalc/ui/dapiservicedialog.ui
index 167defd0295c..a00d14b4b5d7 100644
--- a/sc/uiconfig/scalc/ui/dapiservicedialog.ui
+++ b/sc/uiconfig/scalc/ui/dapiservicedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="DapiserviceDialog">
     <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">External Source</property>
+    <property name="title" translatable="yes" context="dapiservicedialog|DapiserviceDialog">External Source</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -105,7 +105,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Service</property>
+                        <property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -121,7 +121,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">So_urce</property>
+                        <property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -137,7 +137,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Name</property>
+                        <property name="label" translatable="yes" context="dapiservicedialog|label4">_Name</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -153,7 +153,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Us_er</property>
+                        <property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -169,7 +169,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Password</property>
+                        <property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -256,7 +256,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="dapiservicedialog|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui
index 580f3053f5d5..b3d242c693f6 100644
--- a/sc/uiconfig/scalc/ui/databaroptions.ui
+++ b/sc/uiconfig/scalc/ui/databaroptions.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DataBarOptions">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Bar</property>
+    <property name="title" translatable="yes" context="databaroptions|DataBarOptions">Data Bar</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Minimum:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label4">Minimum:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">min</property>
                           </object>
@@ -100,7 +100,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Maximum:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label5">Maximum:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">max</property>
                           </object>
@@ -115,13 +115,13 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Minimum</item>
-                              <item translatable="yes">Maximum</item>
-                              <item translatable="yes">Percentile</item>
-                              <item translatable="yes">Value</item>
-                              <item translatable="yes">Percent</item>
-                              <item translatable="yes">Formula</item>
+                              <item translatable="yes" context="databaroptions|min">Automatic</item>
+                              <item translatable="yes" context="databaroptions|min">Minimum</item>
+                              <item translatable="yes" context="databaroptions|min">Maximum</item>
+                              <item translatable="yes" context="databaroptions|min">Percentile</item>
+                              <item translatable="yes" context="databaroptions|min">Value</item>
+                              <item translatable="yes" context="databaroptions|min">Percent</item>
+                              <item translatable="yes" context="databaroptions|min">Formula</item>
                             </items>
                           </object>
                           <packing>
@@ -135,13 +135,13 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Minimum</item>
-                              <item translatable="yes">Maximum</item>
-                              <item translatable="yes">Percentile</item>
-                              <item translatable="yes">Value</item>
-                              <item translatable="yes">Percent</item>
-                              <item translatable="yes">Formula</item>
+                              <item translatable="yes" context="databaroptions|max">Automatic</item>
+                              <item translatable="yes" context="databaroptions|max">Minimum</item>
+                              <item translatable="yes" context="databaroptions|max">Maximum</item>
+                              <item translatable="yes" context="databaroptions|max">Percentile</item>
+                              <item translatable="yes" context="databaroptions|max">Value</item>
+                              <item translatable="yes" context="databaroptions|max">Percent</item>
+                              <item translatable="yes" context="databaroptions|max">Formula</item>
                             </items>
                           </object>
                           <packing>
@@ -179,7 +179,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Entry Values</property>
+                    <property name="label" translatable="yes" context="databaroptions|label1">Entry Values</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -217,7 +217,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Positive:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label6">Positive:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">positive_colour</property>
                           </object>
@@ -231,7 +231,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Negative:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label7">Negative:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">negative_colour</property>
                           </object>
@@ -267,7 +267,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Fill:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label10">Fill:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -279,8 +279,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Color</item>
-                              <item translatable="yes">Gradient</item>
+                              <item translatable="yes" context="databaroptions|fill_type">Color</item>
+                              <item translatable="yes" context="databaroptions|fill_type">Gradient</item>
                             </items>
                           </object>
                           <packing>
@@ -296,7 +296,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Bar Colors</property>
+                    <property name="label" translatable="yes" context="databaroptions|label2">Bar Colors</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -334,7 +334,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Position of vertical axis:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label8">Position of vertical axis:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">axis_pos</property>
                           </object>
@@ -348,7 +348,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Color of vertical axis:</property>
+                            <property name="label" translatable="yes" context="databaroptions|label9">Color of vertical axis:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">axis_colour</property>
                           </object>
@@ -363,9 +363,9 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Automatic</item>
-                              <item translatable="yes">Middle</item>
-                              <item translatable="yes">None</item>
+                              <item translatable="yes" context="databaroptions|axis_pos">Automatic</item>
+                              <item translatable="yes" context="databaroptions|axis_pos">Middle</item>
+                              <item translatable="yes" context="databaroptions|axis_pos">None</item>
                             </items>
                           </object>
                           <packing>
@@ -392,7 +392,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Axis</property>
+                    <property name="label" translatable="yes" context="databaroptions|label3">Axis</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -430,7 +430,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Minimum bar length (%):</property>
+                            <property name="label" translatable="yes" context="databaroptions|label12">Minimum bar length (%):</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">min_length</property>
                           </object>
@@ -444,7 +444,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes">Maximum bar length (%):</property>
+                            <property name="label" translatable="yes" context="databaroptions|label13">Maximum bar length (%):</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">max_length</property>
                           </object>
@@ -483,7 +483,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Bar Lengths</property>
+                    <property name="label" translatable="yes" context="databaroptions|label11">Bar Lengths</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -498,7 +498,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="only_bar">
-                <property name="label" translatable="yes">Display bar only</property>
+                <property name="label" translatable="yes" context="databaroptions|only_bar">Display bar only</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -515,7 +515,7 @@
               <object class="GtkLabel" id="str_same_value">
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The minimum value must be less than the maximum value.</property>
+                <property name="label" translatable="yes" context="databaroptions|str_same_value">The minimum value must be less than the maximum value.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/datafielddialog.ui b/sc/uiconfig/scalc/ui/datafielddialog.ui
index 8ca7c634cb9c..91fe0d0ee189 100644
--- a/sc/uiconfig/scalc/ui/datafielddialog.ui
+++ b/sc/uiconfig/scalc/ui/datafielddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DataFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Field</property>
+    <property name="title" translatable="yes" context="datafielddialog|DataFieldDialog">Data Field</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -127,7 +127,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Function</property>
+                    <property name="label" translatable="yes" context="datafielddialog|label1">Function</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -141,7 +141,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Show it_ems without data</property>
+                <property name="label" translatable="yes" context="datafielddialog|checkbutton1">Show it_ems without data</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -164,7 +164,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="datafielddialog|label2">Name:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -212,7 +212,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Type:</property>
+                            <property name="label" translatable="yes" context="datafielddialog|label4">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">type</property>
                             <property name="ellipsize">end</property>
@@ -227,7 +227,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Base field:</property>
+                            <property name="label" translatable="yes" context="datafielddialog|basefieldft">_Base field:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">basefield</property>
                             <property name="ellipsize">end</property>
@@ -242,7 +242,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Ba_se item:</property>
+                            <property name="label" translatable="yes" context="datafielddialog|baseitemft">Ba_se item:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">baseitem</property>
                             <property name="ellipsize">end</property>
@@ -257,15 +257,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Normal</item>
-                              <item translatable="yes">Difference from</item>
-                              <item translatable="yes">% of</item>
-                              <item translatable="yes">% difference from</item>
-                              <item translatable="yes">Running total in</item>
-                              <item translatable="yes">% of row</item>
-                              <item translatable="yes">% of column</item>
-                              <item translatable="yes">% of total</item>
-                              <item translatable="yes">Index</item>
+                              <item translatable="yes" context="datafielddialog|type">Normal</item>
+                              <item translatable="yes" context="datafielddialog|type">Difference from</item>
+                              <item translatable="yes" context="datafielddialog|type">% of</item>
+                              <item translatable="yes" context="datafielddialog|type">% difference from</item>
+                              <item translatable="yes" context="datafielddialog|type">Running total in</item>
+                              <item translatable="yes" context="datafielddialog|type">% of row</item>
+                              <item translatable="yes" context="datafielddialog|type">% of column</item>
+                              <item translatable="yes" context="datafielddialog|type">% of total</item>
+                              <item translatable="yes" context="datafielddialog|type">Index</item>
                             </items>
                           </object>
                           <packing>
@@ -288,8 +288,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">- previous item -</item>
-                              <item translatable="yes">- next item -</item>
+                              <item translatable="yes" context="datafielddialog|baseitem">- previous item -</item>
+                              <item translatable="yes" context="datafielddialog|baseitem">- next item -</item>
                             </items>
                           </object>
                           <packing>
@@ -305,7 +305,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Displayed value</property>
+                    <property name="label" translatable="yes" context="datafielddialog|label3">Displayed value</property>
                   </object>
                 </child>
               </object>
diff --git a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui
index 26f7b8fea307..b4091b8e98bb 100644
--- a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui
+++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="DataFieldOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Field Options</property>
+    <property name="title" translatable="yes" context="datafieldoptionsdialog|DataFieldOptionsDialog">Data Field Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -107,7 +107,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="ascending">
-                            <property name="label" translatable="yes">_Ascending</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|ascending">_Ascending</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="descending">
-                            <property name="label" translatable="yes">_Descending</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|descending">_Descending</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -140,7 +140,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="manual">
-                            <property name="label" translatable="yes">_Manual</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|manual">_Manual</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -178,7 +178,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sort by</property>
+                    <property name="label" translatable="yes" context="datafieldoptionsdialog|label1">Sort by</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -210,7 +210,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="repeatitemlabels">
-                            <property name="label" translatable="yes">_Repeat item labels</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|repeatitemlabels">_Repeat item labels</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="emptyline">
-                            <property name="label" translatable="yes">_Empty line after each item</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|emptyline">_Empty line after each item</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -245,7 +245,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Layout:</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|label3">_Layout:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">layout</property>
                           </object>
@@ -260,9 +260,9 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Tabular layout</item>
-                              <item translatable="yes">Outline layout with subtotals at the top</item>
-                              <item translatable="yes">Outline layout with subtotals at the bottom</item>
+                              <item translatable="yes" context="datafieldoptionsdialog|layout">Tabular layout</item>
+                              <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the top</item>
+                              <item translatable="yes" context="datafieldoptionsdialog|layout">Outline layout with subtotals at the bottom</item>
                             </items>
                           </object>
                           <packing>
@@ -278,7 +278,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Display Options</property>
+                    <property name="label" translatable="yes" context="datafieldoptionsdialog|label2">Display Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -310,7 +310,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="show">
-                            <property name="label" translatable="yes">_Show:</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|show">_Show:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -331,7 +331,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_From:</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|showfromft">_From:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">from</property>
                           </object>
@@ -345,7 +345,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Using field:</property>
+                            <property name="label" translatable="yes" context="datafieldoptionsdialog|usingft">_Using field:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">using</property>
                           </object>
@@ -364,7 +364,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">items</property>
+                                <property name="label" translatable="yes" context="datafieldoptionsdialog|showft">items</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">layout</property>
                               </object>
@@ -398,8 +398,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Top</item>
-                              <item translatable="yes">Bottom</item>
+                              <item translatable="yes" context="datafieldoptionsdialog|from">Top</item>
+                              <item translatable="yes" context="datafieldoptionsdialog|from">Bottom</item>
                             </items>
                           </object>
                           <packing>
@@ -425,7 +425,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Show Automatically</property>
+                    <property name="label" translatable="yes" context="datafieldoptionsdialog|label4">Show Automatically</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -470,7 +470,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Hide Items</property>
+                    <property name="label" translatable="yes" context="datafieldoptionsdialog|label9">Hide Items</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -502,7 +502,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Hierarch_y:</property>
+                    <property name="label" translatable="yes" context="datafieldoptionsdialog|hierarchyft">Hierarch_y:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">hierarchy</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/dataform.ui b/sc/uiconfig/scalc/ui/dataform.ui
index b7abf26c4f6e..92c0322b5fbe 100644
--- a/sc/uiconfig/scalc/ui/dataform.ui
+++ b/sc/uiconfig/scalc/ui/dataform.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DataFormDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Form</property>
+    <property name="title" translatable="yes" context="dataform|DataFormDialog">Data Form</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -22,7 +22,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">New Record</property>
+                <property name="label" translatable="yes" context="dataform|label">New Record</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -32,7 +32,7 @@
             </child>
             <child>
               <object class="GtkButton" id="new">
-                <property name="label" translatable="yes">_New</property>
+                <property name="label" translatable="yes" context="dataform|new">_New</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -48,7 +48,7 @@
             </child>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">_Delete</property>
+                <property name="label" translatable="yes" context="dataform|delete">_Delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -62,7 +62,7 @@
             </child>
             <child>
               <object class="GtkButton" id="restore">
-                <property name="label" translatable="yes">_Restore</property>
+                <property name="label" translatable="yes" context="dataform|restore">_Restore</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -76,7 +76,7 @@
             </child>
             <child>
               <object class="GtkButton" id="prev">
-                <property name="label" translatable="yes">_Previous Record</property>
+                <property name="label" translatable="yes" context="dataform|prev">_Previous Record</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="next">
-                <property name="label" translatable="yes">Ne_xt Record</property>
+                <property name="label" translatable="yes" context="dataform|next">Ne_xt Record</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -121,7 +121,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label" translatable="yes">_Close</property>
+                <property name="label" translatable="yes" context="dataform|close">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui b/sc/uiconfig/scalc/ui/datastreams.ui
index 18915175f38e..8063776c7af4 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DataStreamDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Live Data Streams</property>
+    <property name="title" translatable="yes" context="datastreams|DataStreamDialog">Live Data Streams</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -47,7 +47,7 @@
                               <object class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">URL:</property>
+                                <property name="label" translatable="yes" context="datastreams|label6">URL:</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -60,7 +60,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Enter the URL of the source document in the local file system or Internet here.</property>
+                                <property name="tooltip_text" translatable="yes" context="datastreams|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property>
                                 <property name="hexpand">True</property>
                                 <property name="has_entry">True</property>
                                 <property name="max_width_chars">48</property>
@@ -78,7 +78,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="browse">
-                                <property name="label" translatable="yes">_Browse...</property>
+                                <property name="label" translatable="yes" context="datastreams|browse">_Browse...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -105,7 +105,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="directdata">
-                                <property name="label" translatable="yes">Direct data feed</property>
+                                <property name="label" translatable="yes" context="datastreams|directdata">Direct data feed</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -122,7 +122,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="scriptdata">
-                                <property name="label" translatable="yes">Script to execute to obtain the data</property>
+                                <property name="label" translatable="yes" context="datastreams|scriptdata">Script to execute to obtain the data</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -163,7 +163,7 @@
                                     <property name="column_spacing">6</property>
                                     <child>
                                       <object class="GtkRadioButton" id="valuesinline">
-                                        <property name="label" translatable="yes">value1,value2,...,valueN, and fill into range:</property>
+                                        <property name="label" translatable="yes" context="datastreams|valuesinline">value1,value2,...,valueN, and fill into range:</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -180,7 +180,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="addressvalue">
-                                        <property name="label" translatable="yes">address,value</property>
+                                        <property name="label" translatable="yes" context="datastreams|addressvalue">address,value</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -217,7 +217,7 @@
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Interpret stream data as</property>
+                                <property name="label" translatable="yes" context="datastreams|label4">Interpret stream data as</property>
                               </object>
                             </child>
                           </object>
@@ -230,7 +230,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="refresh_ui">
-                            <property name="label" translatable="yes">Empty lines trigger UI refresh</property>
+                            <property name="label" translatable="yes" context="datastreams|refresh_ui">Empty lines trigger UI refresh</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
                   <object class="GtkLabel" id="label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Source Stream</property>
+                    <property name="label" translatable="yes" context="datastreams|label">Source Stream</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -293,7 +293,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="datadown">
-                                <property name="label" translatable="yes">Move existing data down</property>
+                                <property name="label" translatable="yes" context="datastreams|datadown">Move existing data down</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -310,7 +310,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="rangedown">
-                                <property name="label" translatable="yes">Move the range down</property>
+                                <property name="label" translatable="yes" context="datastreams|rangedown">Move the range down</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -328,7 +328,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="nomove">
-                                <property name="label" translatable="yes">Overwrite existing data</property>
+                                <property name="label" translatable="yes" context="datastreams|nomove">Overwrite existing data</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -351,7 +351,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">When New Data Arrives</property>
+                        <property name="label" translatable="yes" context="datastreams|label2">When New Data Arrives</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -385,7 +385,7 @@
                             <property name="column_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="maxlimit">
-                                <property name="label" translatable="yes">Limit to:</property>
+                                <property name="label" translatable="yes" context="datastreams|maxlimit">Limit to:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -415,7 +415,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="unlimited">
-                                <property name="label" translatable="yes">_Unlimited</property>
+                                <property name="label" translatable="yes" context="datastreams|unlimited">_Unlimited</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -441,7 +441,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Maximal Amount of Rows</property>
+                        <property name="label" translatable="yes" context="datastreams|label3">Maximal Amount of Rows</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui
index 0d1a5666d3f5..772a2fff1940 100644
--- a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui
+++ b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DefineDatabaseRangeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Define Database Range</property>
+    <property name="title" translatable="yes" context="definedatabaserangedialog|DefineDatabaseRangeDialog">Define Database Range</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -58,7 +58,7 @@
                   <object class="GtkLabel" id="Name">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Name</property>
+                    <property name="label" translatable="yes" context="definedatabaserangedialog|Name">Name</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -122,7 +122,7 @@
                   <object class="GtkLabel" id="Range">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Range</property>
+                    <property name="label" translatable="yes" context="definedatabaserangedialog|Range">Range</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="modify">
-                    <property name="label" translatable="yes">M_odify</property>
+                    <property name="label" translatable="yes" context="definedatabaserangedialog|modify">M_odify</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="no_show_all">True</property>
@@ -210,7 +210,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="ContainsColumnLabels">
-                            <property name="label" translatable="yes">Co_ntains column labels</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsColumnLabels">Co_ntains column labels</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="ContainsTotalsRow">
-                            <property name="label" translatable="yes">Contains _totals row</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|ContainsTotalsRow">Contains _totals row</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -242,7 +242,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="InsertOrDeleteCells">
-                            <property name="label" translatable="yes">Insert or delete _cells</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|InsertOrDeleteCells">Insert or delete _cells</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -258,7 +258,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="KeepFormatting">
-                            <property name="label" translatable="yes">Keep _formatting</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|KeepFormatting">Keep _formatting</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -274,7 +274,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="DontSaveImportedData">
-                            <property name="label" translatable="yes">Don't save _imported data</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|DontSaveImportedData">Don't save _imported data</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -293,7 +293,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Source:</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|Source">Source:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -306,7 +306,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Operations:</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|Operations">Operations:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -319,7 +319,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Invalid range</property>
+                            <property name="label" translatable="yes" context="definedatabaserangedialog|invalid">Invalid range</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -335,7 +335,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="definedatabaserangedialog|label1">Options</property>
                   </object>
                 </child>
               </object>
diff --git a/sc/uiconfig/scalc/ui/definename.ui b/sc/uiconfig/scalc/ui/definename.ui
index 01a6a69210fe..75bc7b1b8d41 100644
--- a/sc/uiconfig/scalc/ui/definename.ui
+++ b/sc/uiconfig/scalc/ui/definename.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DefineNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Define Name</property>
+    <property name="title" translatable="yes" context="definename|DefineNameDialog">Define Name</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="definename|label2">Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">edit</property>
                   </object>
@@ -100,7 +100,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Range or formula expression:</property>
+                    <property name="label" translatable="yes" context="definename|label3">Range or formula expression:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">range</property>
                   </object>
@@ -114,7 +114,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Scope:</property>
+                    <property name="label" translatable="yes" context="definename|label4">Scope:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">scope</property>
                   </object>
@@ -187,7 +187,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Define the name and range or formula expression.</property>
+                    <property name="label" translatable="yes" context="definename|label">Define the name and range or formula expression.</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -217,7 +217,7 @@
                     <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="printarea">
-                        <property name="label" translatable="yes">_Print range</property>
+                        <property name="label" translatable="yes" context="definename|printarea">_Print range</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -232,7 +232,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="filter">
-                        <property name="label" translatable="yes">_Filter</property>
+                        <property name="label" translatable="yes" context="definename|filter">_Filter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -247,7 +247,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="colheader">
-                        <property name="label" translatable="yes">Repeat _column</property>
+                        <property name="label" translatable="yes" context="definename|colheader">Repeat _column</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -262,7 +262,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rowheader">
-                        <property name="label" translatable="yes">Repeat _row</property>
+                        <property name="label" translatable="yes" context="definename|rowheader">Repeat _row</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -281,7 +281,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Range _Options</property>
+                    <property name="label" translatable="yes" context="definename|label5">Range _Options</property>
                     <property name="use_underline">True</property>
                   </object>
                 </child>
diff --git a/sc/uiconfig/scalc/ui/deletecells.ui b/sc/uiconfig/scalc/ui/deletecells.ui
index eb8f5b29daeb..f9dc0dd886b8 100644
--- a/sc/uiconfig/scalc/ui/deletecells.ui
+++ b/sc/uiconfig/scalc/ui/deletecells.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DeleteCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Cells</property>
+    <property name="title" translatable="yes" context="deletecells|DeleteCellsDialog">Delete Cells</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="up">
-                        <property name="label" translatable="yes">Shift cells _up</property>
+                        <property name="label" translatable="yes" context="deletecells|up">Shift cells _up</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="left">
-                        <property name="label" translatable="yes">Shift cells _left</property>
+                        <property name="label" translatable="yes" context="deletecells|left">Shift cells _left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -125,7 +125,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="rows">
-                        <property name="label" translatable="yes">Delete entire _row(s)</property>
+                        <property name="label" translatable="yes" context="deletecells|rows">Delete entire _row(s)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -142,7 +142,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="cols">
-                        <property name="label" translatable="yes">Delete entire _column(s)</property>
+                        <property name="label" translatable="yes" context="deletecells|cols">Delete entire _column(s)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="deletecells|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui
index 11d1d139f3b6..57171e188050 100644
--- a/sc/uiconfig/scalc/ui/deletecontents.ui
+++ b/sc/uiconfig/scalc/ui/deletecontents.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DeleteContentsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete Contents</property>
+    <property name="title" translatable="yes" context="deletecontents|DeleteContentsDialog">Delete Contents</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="deleteall">
-                        <property name="label" translatable="yes">Delete _all</property>
+                        <property name="label" translatable="yes" context="deletecontents|deleteall">Delete _all</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                         <property name="column_homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="text">
-                            <property name="label" translatable="yes">_Text</property>
+                            <property name="label" translatable="yes" context="deletecontents|text">_Text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -128,7 +128,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="numbers">
-                            <property name="label" translatable="yes">_Numbers</property>
+                            <property name="label" translatable="yes" context="deletecontents|numbers">_Numbers</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="datetime">
-                            <property name="label" translatable="yes">_Date &amp; time</property>
+                            <property name="label" translatable="yes" context="deletecontents|datetime">_Date &amp; time</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="formulas">
-                            <property name="label" translatable="yes">_Formulas</property>
+                            <property name="label" translatable="yes" context="deletecontents|formulas">_Formulas</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -173,7 +173,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="comments">
-                            <property name="label" translatable="yes">_Comments</property>
+                            <property name="label" translatable="yes" context="deletecontents|comments">_Comments</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -188,7 +188,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="formats">
-                            <property name="label" translatable="yes">For_mats</property>
+                            <property name="label" translatable="yes" context="deletecontents|formats">For_mats</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -203,7 +203,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="objects">
-                            <property name="label" translatable="yes">_Objects</property>
+                            <property name="label" translatable="yes" context="deletecontents|objects">_Objects</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="deletecontents|label2">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
index 6a1054d097d0..490a9bbd6dad 100644
--- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
+++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DescriptiveStatisticsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Descriptive Statistics</property>
+    <property name="title" translatable="yes" context="descriptivestatisticsdialog|DescriptiveStatisticsDialog">Descriptive Statistics</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -39,7 +39,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="descriptivestatisticsdialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -78,7 +78,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="descriptivestatisticsdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -120,7 +120,7 @@
               <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="descriptivestatisticsdialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -214,7 +214,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">_Columns</property>
+                        <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-columns-radio">_Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -230,7 +230,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">_Rows</property>
+                        <property name="label" translatable="yes" context="descriptivestatisticsdialog|groupedby-rows-radio">_Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="descriptivestatisticsdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/doubledialog.ui b/sc/uiconfig/scalc/ui/doubledialog.ui
index 39ac15ecf0e9..f90be37f4672 100644
--- a/sc/uiconfig/scalc/ui/doubledialog.ui
+++ b/sc/uiconfig/scalc/ui/doubledialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="DoubleDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Setting</property>
+    <property name="title" translatable="yes" context="doubledialog|DoubleDialog">Edit Setting</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/sc/uiconfig/scalc/ui/dropmenu.ui b/sc/uiconfig/scalc/ui/dropmenu.ui
index 5cd023b0c577..051fa1c4ad3f 100644
--- a/sc/uiconfig/scalc/ui/dropmenu.ui
+++ b/sc/uiconfig/scalc/ui/dropmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkRadioMenuItem" id="hyperlink">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert as Hyperlink</property>
+        <property name="label" translatable="yes" context="dropmenu|hyperlink">Insert as Hyperlink</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkRadioMenuItem" id="link">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert as Link</property>
+        <property name="label" translatable="yes" context="dropmenu|link">Insert as Link</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkRadioMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert as Copy</property>
+        <property name="label" translatable="yes" context="dropmenu|copy">Insert as Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
index 5209904241d7..74d3e9112423 100644
--- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui
+++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="ErrorAlertTabPage">
     <property name="visible">True</property>
@@ -11,7 +11,7 @@
     <property name="spacing">12</property>
     <child>
       <object class="GtkCheckButton" id="tsbshow">
-        <property name="label" translatable="yes">Show error _message when invalid values are entered</property>
+        <property name="label" translatable="yes" context="erroralerttabpage|tsbshow">Show error _message when invalid values are entered</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -56,7 +56,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Action:</property>
+                    <property name="label" translatable="yes" context="erroralerttabpage|action_label">_Action:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">actionCB</property>
                   </object>
@@ -73,7 +73,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">_Title:</property>
+                    <property name="label" translatable="yes" context="erroralerttabpage|title_label">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">title</property>
                   </object>
@@ -125,7 +125,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">_Error message:</property>
+                    <property name="label" translatable="yes" context="erroralerttabpage|errormsg_label">_Error message:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">errorMsg:border</property>
                   </object>
@@ -138,7 +138,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browseBtn">
-                    <property name="label" translatable="yes">_Browse...</property>
+                    <property name="label" translatable="yes" context="erroralerttabpage|browseBtn">_Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -157,10 +157,10 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">Stop</item>
-                      <item translatable="yes">Warning</item>
-                      <item translatable="yes">Information</item>
-                      <item translatable="yes">Macro</item>
+                      <item translatable="yes" context="erroralerttabpage|actionCB">Stop</item>
+                      <item translatable="yes" context="erroralerttabpage|actionCB">Warning</item>
+                      <item translatable="yes" context="erroralerttabpage|actionCB">Information</item>
+                      <item translatable="yes" context="erroralerttabpage|actionCB">Macro</item>
                     </items>
                   </object>
                   <packing>
@@ -178,7 +178,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="erroralerttabpage|label1">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
index 93a5884e338d..b6de19c1c9fe 100644
--- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
+++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="smoothing-factor-adjustment">
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="ExponentialSmoothingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Exponential Smoothing</property>
+    <property name="title" translatable="yes" context="exponentialsmoothingdialog|ExponentialSmoothingDialog">Exponential Smoothing</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -45,7 +45,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="exponentialsmoothingdialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -84,7 +84,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="exponentialsmoothingdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -126,7 +126,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="exponentialsmoothingdialog|label5">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -220,7 +220,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -236,7 +236,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="exponentialsmoothingdialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -258,7 +258,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="exponentialsmoothingdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -296,7 +296,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Smoothing factor:</property>
+                        <property name="label" translatable="yes" context="exponentialsmoothingdialog|smoothing-factor-label">Smoothing factor:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">smoothing-factor-spin</property>
                       </object>
@@ -328,7 +328,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="exponentialsmoothingdialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/externaldata.ui b/sc/uiconfig/scalc/ui/externaldata.ui
index 96c1e7f90768..1da3ed8b81a5 100644
--- a/sc/uiconfig/scalc/ui/externaldata.ui
+++ b/sc/uiconfig/scalc/ui/externaldata.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="ExternalDataDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">External Data</property>
+    <property name="title" translatable="yes" context="externaldata|ExternalDataDialog">External Data</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -115,7 +115,7 @@
                               <object class="svtlo-SvtURLBox" id="url">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="tooltip_text" translatable="yes">Enter the URL of the source document in the local file system or Internet here.</property>
+                                <property name="tooltip_text" translatable="yes" context="externaldata|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property>
                                 <property name="hexpand">True</property>
                                 <property name="has_entry">True</property>
                                 <property name="max_width_chars">48</property>
@@ -133,7 +133,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="browse">
-                                <property name="label" translatable="yes">_Browse...</property>
+                                <property name="label" translatable="yes" context="externaldata|browse">_Browse...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -160,7 +160,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">URL of _External Data Source</property>
+                    <property name="label" translatable="yes" context="externaldata|label1">URL of _External Data Source</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -230,7 +230,7 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="reload">
-                                <property name="label" translatable="yes">_Update every:</property>
+                                <property name="label" translatable="yes" context="externaldata|reload">_Update every:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -272,7 +272,7 @@
                                   <object class="GtkLabel" id="secondsft">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_seconds</property>
+                                    <property name="label" translatable="yes" context="externaldata|secondsft">_seconds</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -304,7 +304,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0.47999998927116394</property>
-                    <property name="label" translatable="yes">_Available Tables/Ranges</property>
+                    <property name="label" translatable="yes" context="externaldata|label2">_Available Tables/Ranges</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
diff --git a/sc/uiconfig/scalc/ui/filldlg.ui b/sc/uiconfig/scalc/ui/filldlg.ui
index cf23243dfb05..fc71a32888f6 100644
--- a/sc/uiconfig/scalc/ui/filldlg.ui
+++ b/sc/uiconfig/scalc/ui/filldlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FillSeriesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fill Series</property>
+    <property name="title" translatable="yes" context="filldlg|FillSeriesDialog">Fill Series</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="down">
-                            <property name="label" translatable="yes">_Down</property>
+                            <property name="label" translatable="yes" context="filldlg|down">_Down</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="right">
-                            <property name="label" translatable="yes">_Right</property>
+                            <property name="label" translatable="yes" context="filldlg|right">_Right</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -132,7 +132,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="up">
-                            <property name="label" translatable="yes">_Up</property>
+                            <property name="label" translatable="yes" context="filldlg|up">_Up</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -149,7 +149,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="left">
-                            <property name="label" translatable="yes">_Left</property>
+                            <property name="label" translatable="yes" context="filldlg|left">_Left</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -173,7 +173,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Direction</property>
+                    <property name="label" translatable="yes" context="filldlg|label1">Direction</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -208,7 +208,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="linear">
-                            <property name="label" translatable="yes">Li_near</property>
+                            <property name="label" translatable="yes" context="filldlg|linear">Li_near</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="growth">
-                            <property name="label" translatable="yes">_Growth</property>
+                            <property name="label" translatable="yes" context="filldlg|growth">_Growth</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -243,7 +243,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="date">
-                            <property name="label" translatable="yes">Da_te</property>
+                            <property name="label" translatable="yes" context="filldlg|date">Da_te</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -260,7 +260,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="autofill">
-                            <property name="label" translatable="yes">_AutoFill</property>
+                            <property name="label" translatable="yes" context="filldlg|autofill">_AutoFill</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -284,7 +284,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Series Type</property>
+                    <property name="label" translatable="yes" context="filldlg|label2">Series Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -319,7 +319,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="day">
-                            <property name="label" translatable="yes">Da_y</property>
+                            <property name="label" translatable="yes" context="filldlg|day">Da_y</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -337,7 +337,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="week">
-                            <property name="label" translatable="yes">_Weekday</property>
+                            <property name="label" translatable="yes" context="filldlg|week">_Weekday</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -355,7 +355,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="month">
-                            <property name="label" translatable="yes">_Month</property>
+                            <property name="label" translatable="yes" context="filldlg|month">_Month</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -372,7 +372,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="year">
-                            <property name="label" translatable="yes">Y_ear</property>
+                            <property name="label" translatable="yes" context="filldlg|year">Y_ear</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -396,7 +396,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Time Unit</property>
+                    <property name="label" translatable="yes" context="filldlg|tuL">Time Unit</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -419,7 +419,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Start value:</property>
+                    <property name="label" translatable="yes" context="filldlg|startL">_Start value:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">startValue</property>
                   </object>
@@ -433,7 +433,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">End _value:</property>
+                    <property name="label" translatable="yes" context="filldlg|endL">End _value:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">endValue</property>
                   </object>
@@ -447,7 +447,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">In_crement:</property>
+                    <property name="label" translatable="yes" context="filldlg|incrementL">In_crement:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">increment</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/floatingborderstyle.ui b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
index e397aafbd76a..e3f56b9a5af1 100644
--- a/sc/uiconfig/scalc/ui/floatingborderstyle.ui
+++ b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingBorderStyle">
     <property name="can_focus">False</property>
@@ -29,7 +29,7 @@
               <object class="GtkToolButton" id="none">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">No Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|none|tooltip_text">No Border</property>
                 <property name="action_name">none</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Empty_18x18.png</property>
               </object>
@@ -42,7 +42,7 @@
               <object class="GtkToolButton" id="all">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">All Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|all|tooltip_text">All Borders</property>
                 <property name="action_name">all</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_All_18x18.png</property>
               </object>
@@ -55,7 +55,7 @@
               <object class="GtkToolButton" id="outside">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Outside Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|outside|tooltip_text">Outside Borders</property>
                 <property name="action_name">outside</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_18x18.png</property>
               </object>
@@ -68,7 +68,7 @@
               <object class="GtkToolButton" id="thickbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Thick Box Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|thickbox|tooltip_text">Thick Box Border</property>
                 <property name="action_name">thickbox</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png</property>
               </object>
@@ -92,7 +92,7 @@
               <object class="GtkToolButton" id="thickbottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Thick Bottom Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|thickbottom|tooltip_text">Thick Bottom Border</property>
                 <property name="action_name">thickbottom</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png</property>
               </object>
@@ -105,7 +105,7 @@
               <object class="GtkToolButton" id="doublebottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Double Bottom Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|doublebottom|tooltip_text">Double Bottom Border</property>
                 <property name="action_name">doublebottom</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Double_18x18.png</property>
               </object>
@@ -118,7 +118,7 @@
               <object class="GtkToolButton" id="topthickbottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Top and Thick Bottom Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topthickbottom|tooltip_text">Top and Thick Bottom Borders</property>
                 <property name="action_name">topthickbottom</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png</property>
               </object>
@@ -131,7 +131,7 @@
               <object class="GtkToolButton" id="topdoublebottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Top and Double Bottom Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topdoublebottom|tooltip_text">Top and Double Bottom Borders</property>
                 <property name="action_name">topdoublebottom</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png</property>
               </object>
@@ -155,7 +155,7 @@
               <object class="GtkToolButton" id="left">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Left Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|left|tooltip_text">Left Border</property>
                 <property name="action_name">left</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Left_18x18.png</property>
               </object>
@@ -168,7 +168,7 @@
               <object class="GtkToolButton" id="right">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Right Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|right|tooltip_text">Right Border</property>
                 <property name="action_name">right</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Right_18x18.png</property>
               </object>
@@ -181,7 +181,7 @@
               <object class="GtkToolButton" id="top">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Top Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|top|tooltip_text">Top Border</property>
                 <property name="action_name">top</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Top_18x18.png</property>
               </object>
@@ -194,7 +194,7 @@
               <object class="GtkToolButton" id="bottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Bottom Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|bottom|tooltip_text">Bottom Border</property>
                 <property name="action_name">bottom</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_18x18.png</property>
               </object>
@@ -207,7 +207,7 @@
               <object class="GtkToolButton" id="diagup">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Diagonal Up Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|diagup|tooltip_text">Diagonal Up Border</property>
                 <property name="action_name">diagup</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_RightDiagonal_18x18.png</property>
@@ -221,7 +221,7 @@
               <object class="GtkToolButton" id="diagdown">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Diagonal Down Border</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|diagdown|tooltip_text">Diagonal Down Border</property>
                 <property name="action_name">diagdown</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png</property>
@@ -235,7 +235,7 @@
               <object class="GtkToolButton" id="topbottom">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Top and Bottom Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|topbottom|tooltip_text">Top and Bottom Borders</property>
                 <property name="action_name">topbottom</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_TopAndBottom_18x18.png</property>
@@ -249,7 +249,7 @@
               <object class="GtkToolButton" id="leftright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Left and Right Borders</property>
+                <property name="tooltip_text" translatable="yes" context="floatingborderstyle|leftright|tooltip_text">Left and Right Borders</property>
                 <property name="action_name">leftright</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">sc/res/sidebar/CellBorder_LeftAndRight_18x18.png</property>
diff --git a/sc/uiconfig/scalc/ui/floatinglinestyle.ui b/sc/uiconfig/scalc/ui/floatinglinestyle.ui
index d6c6f0b029c2..a6d584c22d8a 100644
--- a/sc/uiconfig/scalc/ui/floatinglinestyle.ui
+++ b/sc/uiconfig/scalc/ui/floatinglinestyle.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingLineStyle">
     <property name="can_focus">False</property>
@@ -38,7 +38,7 @@
         </child>
         <child>
           <object class="GtkButton" id="more">
-            <property name="label" translatable="yes">_More Options...</property>
+            <property name="label" translatable="yes" context="floatinglinestyle|more">_More Options...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/footerdialog.ui b/sc/uiconfig/scalc/ui/footerdialog.ui
index 3b3102e347ea..88a7f9466a82 100644
--- a/sc/uiconfig/scalc/ui/footerdialog.ui
+++ b/sc/uiconfig/scalc/ui/footerdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Footers</property>
+    <property name="title" translatable="yes" context="footerdialog|FooterDialog">Footers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="footerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (right)</property>
+                <property name="label" translatable="yes" context="footerdialog|footerright">Footer (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="footerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (left)</property>
+                <property name="label" translatable="yes" context="footerdialog|footerleft">Footer (left)</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
index 135e0bbd3522..8618f7c0b2c1 100644
--- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FormatCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Format Cells</property>
+    <property name="title" translatable="yes" context="formatcellsdialog|FormatCellsDialog">Format Cells</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="numbers">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbers</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|numbers">Numbers</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,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="formatcellsdialog|font">Font</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,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="formatcellsdialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|alignment">Alignment</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="asiantypography">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|asiantypography">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="cellprotection">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Cell Protection</property>
+                <property name="label" translatable="yes" context="formatcellsdialog|cellprotection">Cell Protection</property>
               </object>
               <packing>
                 <property name="position">7</property>
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index ffeda7079a0e..502c45e68cff 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
     <property name="can_focus">False</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Detailed Calculation Settings</property>
+    <property name="title" translatable="yes" context="formulacalculationoptions|FormulaCalculationOptions">Detailed Calculation Settings</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">Conversion from text to number:</property>
+                        <property name="label" translatable="yes" context="formulacalculationoptions|labelConvT2N">Conversion from text to number:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -52,7 +52,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkEmptyAsZero">
-                        <property name="label" translatable="yes">Treat _empty string as zero</property>
+                        <property name="label" translatable="yes" context="formulacalculationoptions|checkEmptyAsZero">Treat _empty string as zero</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
                       <object class="GtkLabel" id="labelSyntaxRef">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Reference syntax for string reference:</property>
+                        <property name="label" translatable="yes" context="formulacalculationoptions|labelSyntaxRef">Reference syntax for string reference:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -82,7 +82,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item id="0" translatable="yes">Use formula syntax</item>
+                          <item id="0" translatable="yes" context="formulacalculationoptions|comboSyntaxRef">Use formula syntax</item>
                           <item id="1">Calc A1</item>
                           <item id="2">Excel A1</item>
                           <item id="3">Excel R1C1</item>
@@ -99,10 +99,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item id="0" translatable="yes">Generate #VALUE! error</item>
-                          <item id="1" translatable="yes">Treat as zero</item>
-                          <item id="2" translatable="yes">Convert only if unambiguous</item>
-                          <item id="3" translatable="yes">Convert also locale dependent</item>
+                          <item id="0" translatable="yes" context="formulacalculationoptions|comboConversion">Generate #VALUE! error</item>
+                          <item id="1" translatable="yes" context="formulacalculationoptions|comboConversion">Treat as zero</item>
+                          <item id="2" translatable="yes" context="formulacalculationoptions|comboConversion">Convert only if unambiguous</item>
+                          <item id="3" translatable="yes" context="formulacalculationoptions|comboConversion">Convert also locale dependent</item>
                         </items>
                       </object>
                       <packing>
@@ -112,7 +112,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="current_doc">
-                        <property name="label" translatable="yes">Apply those settings to current document only</property>
+                        <property name="label" translatable="yes" context="formulacalculationoptions|current_doc">Apply those settings to current document only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Contents to Numbers</property>
+                <property name="label" translatable="yes" context="formulacalculationoptions|label3">Contents to Numbers</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/functionpanel.ui b/sc/uiconfig/scalc/ui/functionpanel.ui
index 1f367cee0535..65be2e18eecf 100644
--- a/sc/uiconfig/scalc/ui/functionpanel.ui
+++ b/sc/uiconfig/scalc/ui/functionpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="FunctionPanel">
     <property name="visible">True</property>
@@ -42,7 +42,7 @@
                         <property name="can_default">True</property>
                         <property name="has_default">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Insert Function into calculation sheet</property>
+                        <property name="tooltip_text" translatable="yes" context="functionpanel|insert|tooltip_text">Insert Function into calculation sheet</property>
                         <property name="image">image1</property>
                       </object>
                       <packing>
@@ -56,19 +56,19 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">Last Used</item>
-                          <item translatable="yes">All</item>
-                          <item translatable="yes">Database</item>
-                          <item translatable="yes">Date&amp;Time</item>
-                          <item translatable="yes">Financial</item>
-                          <item translatable="yes">Information</item>
-                          <item translatable="yes">Logical</item>
-                          <item translatable="yes">Mathematical</item>
-                          <item translatable="yes">Array</item>
-                          <item translatable="yes">Statistical</item>
-                          <item translatable="yes">Spreadsheet</item>
-                          <item translatable="yes">Text</item>
-                          <item translatable="yes">Add-in</item>
+                          <item translatable="yes" context="functionpanel|category">Last Used</item>
+                          <item translatable="yes" context="functionpanel|category">All</item>
+                          <item translatable="yes" context="functionpanel|category">Database</item>
+                          <item translatable="yes" context="functionpanel|category">Date&amp;Time</item>
+                          <item translatable="yes" context="functionpanel|category">Financial</item>
+                          <item translatable="yes" context="functionpanel|category">Information</item>
+                          <item translatable="yes" context="functionpanel|category">Logical</item>
+                          <item translatable="yes" context="functionpanel|category">Mathematical</item>
+                          <item translatable="yes" context="functionpanel|category">Array</item>
+                          <item translatable="yes" context="functionpanel|category">Statistical</item>
+                          <item translatable="yes" context="functionpanel|category">Spreadsheet</item>
+                          <item translatable="yes" context="functionpanel|category">Text</item>
+                          <item translatable="yes" context="functionpanel|category">Add-in</item>
                         </items>
                       </object>
                       <packing>
@@ -109,7 +109,7 @@
                 <property name="width_request">0</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">label</property>
+                <property name="label" translatable="yes" context="functionpanel|funcdesc">label</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
diff --git a/sc/uiconfig/scalc/ui/goalseekdlg.ui b/sc/uiconfig/scalc/ui/goalseekdlg.ui
index 1514cafecbb5..e2f983bf5745 100644
--- a/sc/uiconfig/scalc/ui/goalseekdlg.ui
+++ b/sc/uiconfig/scalc/ui/goalseekdlg.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="GoalSeekDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Goal Seek</property>
+    <property name="title" translatable="yes" context="goalseekdlg|GoalSeekDialog">Goal Seek</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -94,7 +94,7 @@
                       <object class="GtkLabel" id="formulatext">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Formula cell:</property>
+                        <property name="label" translatable="yes" context="goalseekdlg|formulatext">_Formula cell:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">formulaedit</property>
                       </object>
@@ -107,7 +107,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Target _value:</property>
+                        <property name="label" translatable="yes" context="goalseekdlg|label3">Target _value:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">target</property>
                       </object>
@@ -120,7 +120,7 @@
                       <object class="GtkLabel" id="vartext">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Variable _cell:</property>
+                        <property name="label" translatable="yes" context="goalseekdlg|vartext">Variable _cell:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">varedit</property>
                       </object>
@@ -226,7 +226,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Default Settings</property>
+                <property name="label" translatable="yes" context="goalseekdlg|label1">Default Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/groupbydate.ui b/sc/uiconfig/scalc/ui/groupbydate.ui
index 83db3a49e012..b7f27003c1ed 100644
--- a/sc/uiconfig/scalc/ui/groupbydate.ui
+++ b/sc/uiconfig/scalc/ui/groupbydate.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PivotTableGroupByDate">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Grouping</property>
+    <property name="title" translatable="yes" context="groupbydate|PivotTableGroupByDate">Grouping</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -96,7 +96,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="auto_start">
-                            <property name="label" translatable="yes">_Automatically</property>
+                            <property name="label" translatable="yes" context="groupbydate|auto_start">_Automatically</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="manual_start">
-                            <property name="label" translatable="yes">_Manually at:</property>
+                            <property name="label" translatable="yes" context="groupbydate|manual_start">_Manually at:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -150,7 +150,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Start</property>
+                    <property name="label" translatable="yes" context="groupbydate|label1">Start</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -185,7 +185,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="auto_end">
-                            <property name="label" translatable="yes">A_utomatically</property>
+                            <property name="label" translatable="yes" context="groupbydate|auto_end">A_utomatically</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -202,7 +202,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="manual_end">
-                            <property name="label" translatable="yes">Ma_nually at:</property>
+                            <property name="label" translatable="yes" context="groupbydate|manual_end">Ma_nually at:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -239,7 +239,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">End</property>
+                    <property name="label" translatable="yes" context="groupbydate|label2">End</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -274,7 +274,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="days">
-                            <property name="label" translatable="yes">Number of _days:</property>
+                            <property name="label" translatable="yes" context="groupbydate|days">Number of _days:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -291,7 +291,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="intervals">
-                            <property name="label" translatable="yes">_Intervals:</property>
+                            <property name="label" translatable="yes" context="groupbydate|intervals">_Intervals:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -341,7 +341,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Group by</property>
+                    <property name="label" translatable="yes" context="groupbydate|label3">Group by</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/groupbynumber.ui b/sc/uiconfig/scalc/ui/groupbynumber.ui
index f9c3bfeb5c20..ee31440fde58 100644
--- a/sc/uiconfig/scalc/ui/groupbynumber.ui
+++ b/sc/uiconfig/scalc/ui/groupbynumber.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="PivotTableGroupByNumber">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Grouping</property>
+    <property name="title" translatable="yes" context="groupbynumber|PivotTableGroupByNumber">Grouping</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="auto_start">
-                            <property name="label" translatable="yes">_Automatically</property>
+                            <property name="label" translatable="yes" context="groupbynumber|auto_start">_Automatically</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="manual_start">
-                            <property name="label" translatable="yes">_Manually at:</property>
+                            <property name="label" translatable="yes" context="groupbynumber|manual_start">_Manually at:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Start</property>
+                    <property name="label" translatable="yes" context="groupbynumber|label1">Start</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -187,7 +187,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="auto_end">
-                            <property name="label" translatable="yes">A_utomatically</property>
+                            <property name="label" translatable="yes" context="groupbynumber|auto_end">A_utomatically</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -204,7 +204,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="manual_end">
-                            <property name="label" translatable="yes">Ma_nually at:</property>
+                            <property name="label" translatable="yes" context="groupbynumber|manual_end">Ma_nually at:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -242,7 +242,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">End</property>
+                    <property name="label" translatable="yes" context="groupbynumber|label2">End</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -280,7 +280,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Group by</property>
+                    <property name="label" translatable="yes" context="groupbynumber|label3">Group by</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/groupdialog.ui b/sc/uiconfig/scalc/ui/groupdialog.ui
index 6d35a9a18568..3274a4e0ed69 100644
--- a/sc/uiconfig/scalc/ui/groupdialog.ui
+++ b/sc/uiconfig/scalc/ui/groupdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GroupDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Group</property>
+    <property name="title" translatable="yes" context="groupdialog|GroupDialog">Group</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -95,7 +95,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="rows">
-                        <property name="label" translatable="yes">_Rows</property>
+                        <property name="label" translatable="yes" context="groupdialog|rows">_Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="cols">
-                        <property name="label" translatable="yes">_Columns</property>
+                        <property name="label" translatable="yes" context="groupdialog|cols">_Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -138,7 +138,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Include</property>
+                <property name="label" translatable="yes" context="groupdialog|includeLabel">Include</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/headerdialog.ui b/sc/uiconfig/scalc/ui/headerdialog.ui
index 73703f3a4c7b..92b487d1e5aa 100644
--- a/sc/uiconfig/scalc/ui/headerdialog.ui
+++ b/sc/uiconfig/scalc/ui/headerdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="HeaderDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Headers</property>
+    <property name="title" translatable="yes" context="headerdialog|HeaderDialog">Headers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="headerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (right)</property>
+                <property name="label" translatable="yes" context="headerdialog|headerright">Header (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="headerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (left)</property>
+                <property name="label" translatable="yes" context="headerdialog|headerleft">Header (left)</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sc/uiconfig/scalc/ui/headerfootercontent.ui b/sc/uiconfig/scalc/ui/headerfootercontent.ui
index c0609951a000..e67a66400bac 100644
--- a/sc/uiconfig/scalc/ui/headerfootercontent.ui
+++ b/sc/uiconfig/scalc/ui/headerfootercontent.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkVBox" id="HeaderFooterContent">
@@ -19,7 +19,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Left area</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelFT_LEFT">_Left area</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -34,7 +34,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Center area</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelFT_CENTER">_Center area</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -49,7 +49,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">R_ight area</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelFT_RIGHT">R_ight area</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -120,7 +120,7 @@
                 <property name="can_focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Header</property>
+                <property name="label" translatable="yes" context="headerfootercontent|labelFT_H_DEFINED">_Header</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -134,7 +134,7 @@
                 <property name="can_focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Footer</property>
+                <property name="label" translatable="yes" context="headerfootercontent|labelFT_F_DEFINED">_Footer</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -161,7 +161,7 @@
                 <property name="can_focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Custom header</property>
+                <property name="label" translatable="yes" context="headerfootercontent|labelFT_H_CUSTOM">Custom header</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -174,7 +174,7 @@
                 <property name="can_focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Custom footer</property>
+                <property name="label" translatable="yes" context="headerfootercontent|labelFT_F_CUSTOM">Custom footer</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -201,7 +201,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Text Attributes</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_TEXT|tooltip_text">Text Attributes</property>
                 <property name="image">imageBTN_TEXT</property>
               </object>
               <packing>
@@ -215,7 +215,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Title</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_FILE|tooltip_text">Title</property>
                 <property name="image">imageBTN_FILE</property>
               </object>
               <packing>
@@ -230,7 +230,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Sheet Name</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_TABLE|tooltip_text">Sheet Name</property>
                 <property name="image">imageBTN_TABLE</property>
                 <property name="yalign">0.47999998927116394</property>
               </object>
@@ -246,7 +246,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Page</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_PAGE|tooltip_text">Page</property>
                 <property name="image">imageBTN_PAGE</property>
               </object>
               <packing>
@@ -261,7 +261,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Pages</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_PAGES|tooltip_text">Pages</property>
                 <property name="image">imageBTN_PAGES</property>
                 <property name="yalign">0.49000000953674316</property>
               </object>
@@ -277,7 +277,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Date</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_DATE|tooltip_text">Date</property>
                 <property name="image">imageBTN_DATE</property>
                 <property name="yalign">0.37000000476837158</property>
               </object>
@@ -293,7 +293,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Time</property>
+                <property name="tooltip_text" translatable="yes" context="headerfootercontent|buttonBTN_TIME|tooltip_text">Time</property>
                 <property name="image">imageBTN_TIME</property>
                 <property name="yalign">0.41999998688697815</property>
               </object>
@@ -346,7 +346,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Use the buttons to change the font or insert field commands such as date, time, etc.</property>
+                <property name="label" translatable="yes" context="headerfootercontent|label2">Use the buttons to change the font or insert field commands such as date, time, etc.</property>
               </object>
             </child>
           </object>
@@ -355,7 +355,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Note</property>
+            <property name="label" translatable="yes" context="headerfootercontent|label1">Note</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -376,7 +376,7 @@
           <object class="GtkLabel" id="labelSTR_HF_NONE_IN_BRACKETS">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">(none)</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_NONE_IN_BRACKETS">(none)</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -388,7 +388,7 @@
           <object class="GtkLabel" id="labelSTR_PAGE">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_PAGE">Page</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -400,7 +400,7 @@
           <object class="GtkLabel" id="labelSTR_HF_OF_QUESTION">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">of ?</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_OF_QUESTION">of ?</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -412,7 +412,7 @@
           <object class="GtkLabel" id="labelSTR_HF_CONFIDENTIAL">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Confidential</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_CONFIDENTIAL">Confidential</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -424,7 +424,7 @@
           <object class="GtkLabel" id="labelSTR_HF_CREATED_BY">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Created by</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_CREATED_BY">Created by</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -436,7 +436,7 @@
           <object class="GtkLabel" id="labelSTR_HF_CUSTOMIZED">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Customized</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_CUSTOMIZED">Customized</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -448,7 +448,7 @@
           <object class="GtkLabel" id="labelSTR_HF_OF">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">of</property>
+            <property name="label" translatable="yes" context="headerfootercontent|labelSTR_HF_OF">of</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -506,7 +506,7 @@
       <object class="GtkMenuItem" id="title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title</property>
+        <property name="label" translatable="yes" context="headerfootercontent|title">Title</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -514,7 +514,7 @@
       <object class="GtkMenuItem" id="filename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">File Name</property>
+        <property name="label" translatable="yes" context="headerfootercontent|filename">File Name</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -522,7 +522,7 @@
       <object class="GtkMenuItem" id="pathname">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Path/File Name</property>
+        <property name="label" translatable="yes" context="headerfootercontent|pathname">Path/File Name</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/headerfooterdialog.ui b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
index 2bcfd98d8324..9fe800299573 100644
--- a/sc/uiconfig/scalc/ui/headerfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/headerfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="HeaderFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Headers/Footers</property>
+    <property name="title" translatable="yes" context="headerfooterdialog|HeaderFooterDialog">Headers/Footers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="header">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header</property>
+                <property name="label" translatable="yes" context="headerfooterdialog|header">Header</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="footer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer</property>
+                <property name="label" translatable="yes" context="headerfooterdialog|footer">Footer</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui
index c8883ff2f695..f1930a9fe3ac 100644
--- a/sc/uiconfig/scalc/ui/imoptdialog.ui
+++ b/sc/uiconfig/scalc/ui/imoptdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ImOptDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Import File</property>
+    <property name="title" translatable="yes" context="imoptdialog|ImOptDialog">Import File</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -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">_Character set:</property>
+                        <property name="label" translatable="yes" context="imoptdialog|charsetft">_Character set:</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="xalign">0</property>
-                        <property name="label" translatable="yes">_Field delimiter:</property>
+                        <property name="label" translatable="yes" context="imoptdialog|fieldft">_Field delimiter:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">field</property>
                       </object>
@@ -121,7 +121,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Text delimiter:</property>
+                        <property name="label" translatable="yes" context="imoptdialog|textft">_Text delimiter:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">text</property>
                       </object>
@@ -132,7 +132,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="asshown">
-                        <property name="label" translatable="yes">Save cell content as _shown</property>
+                        <property name="label" translatable="yes" context="imoptdialog|asshown">Save cell content as _shown</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -148,7 +148,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="formulas">
-                        <property name="label" translatable="yes">Save cell fo_rmulas instead of calculated values</property>
+                        <property name="label" translatable="yes" context="imoptdialog|formulas">Save cell fo_rmulas instead of calculated values</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -164,7 +164,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="quoteall">
-                        <property name="label" translatable="yes">_Quote all text cells</property>
+                        <property name="label" translatable="yes" context="imoptdialog|quoteall">_Quote all text cells</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -180,7 +180,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fixedwidth">
-                        <property name="label" translatable="yes">Fixed column _width</property>
+                        <property name="label" translatable="yes" context="imoptdialog|fixedwidth">Fixed column _width</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -269,7 +269,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Field Options</property>
+                <property name="label" translatable="yes" context="imoptdialog|label">Field Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/inputstringdialog.ui b/sc/uiconfig/scalc/ui/inputstringdialog.ui
index 8e542abe31b0..2cb2700ebc51 100644
--- a/sc/uiconfig/scalc/ui/inputstringdialog.ui
+++ b/sc/uiconfig/scalc/ui/inputstringdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InputStringDialog">
     <property name="can_focus">False</property>
diff --git a/sc/uiconfig/scalc/ui/insertcells.ui b/sc/uiconfig/scalc/ui/insertcells.ui
index b1b45583d58e..3d6884bba97c 100644
--- a/sc/uiconfig/scalc/ui/insertcells.ui
+++ b/sc/uiconfig/scalc/ui/insertcells.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Cells</property>
+    <property name="title" translatable="yes" context="insertcells|InsertCellsDialog">Insert Cells</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -95,7 +95,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="down">
-                        <property name="label" translatable="yes">Shift cells _down</property>
+                        <property name="label" translatable="yes" context="insertcells|down">Shift cells _down</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -114,7 +114,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="right">
-                        <property name="label" translatable="yes">Shift cells _right</property>
+                        <property name="label" translatable="yes" context="insertcells|right">Shift cells _right</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -132,7 +132,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="rows">
-                        <property name="label" translatable="yes">Entire ro_w</property>
+                        <property name="label" translatable="yes" context="insertcells|rows">Entire ro_w</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -150,7 +150,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="cols">
-                        <property name="label" translatable="yes">Entire _column</property>
+                        <property name="label" translatable="yes" context="insertcells|cols">Entire _column</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -174,7 +174,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="insertcells|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/insertname.ui b/sc/uiconfig/scalc/ui/insertname.ui
index 6f2daae7a011..81ad58dad5ae 100644
--- a/sc/uiconfig/scalc/ui/insertname.ui
+++ b/sc/uiconfig/scalc/ui/insertname.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paste Names</property>
+    <property name="title" translatable="yes" context="insertname|InsertNameDialog">Paste Names</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="pasteall">
-                <property name="label" translatable="yes">_Paste All</property>
+                <property name="label" translatable="yes" context="insertname|pasteall">_Paste All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui
index ecc94244379d..5174eac8d732 100644
--- a/sc/uiconfig/scalc/ui/insertsheet.ui
+++ b/sc/uiconfig/scalc/ui/insertsheet.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="InsertSheetDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Sheet</property>
+    <property name="title" translatable="yes" context="insertsheet|InsertSheetDialog">Insert Sheet</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -102,7 +102,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="before">
-                            <property name="label" translatable="yes">B_efore current sheet</property>
+                            <property name="label" translatable="yes" context="insertsheet|before">B_efore current sheet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="after">
-                            <property name="label" translatable="yes">_After current sheet</property>
+                            <property name="label" translatable="yes" context="insertsheet|after">_After current sheet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="insertsheet|label1">Position</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -189,7 +189,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="new">
-                                <property name="label" translatable="yes">_New sheet</property>
+                                <property name="label" translatable="yes" context="insertsheet|new">_New sheet</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">N_o. of sheets:</property>
+                                        <property name="label" translatable="yes" context="insertsheet|countft">N_o. of sheets:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">countnf</property>
                                       </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">Na_me:</property>
+                                        <property name="label" translatable="yes" context="insertsheet|nameft">Na_me:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">nameed</property>
                                       </object>
@@ -272,7 +272,7 @@
                                         <property name="hexpand">True</property>
                                         <property name="invisible_char">•</property>
                                         <property name="width_chars">52</property>
-                                        <property name="text" translatable="yes">Sheet...</property>
+                                        <property name="text" translatable="yes" context="insertsheet|nameed">Sheet...</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -307,7 +307,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="fromfile">
-                                <property name="label" translatable="yes">_From file</property>
+                                <property name="label" translatable="yes" context="insertsheet|fromfile">_From file</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -368,7 +368,7 @@
                                             </child>
                                             <child internal-child="accessible">
                                               <object class="AtkObject" id="tables:border-atkobject">
-                                                <property name="AtkObject::accessible-name" translatable="yes">Tables in file</property>
+                                                <property name="AtkObject::accessible-name" translatable="yes" context="insertsheet|tables-atkobject">Tables in file</property>
                                               </object>
                                             </child>
                                           </object>
@@ -388,7 +388,7 @@
                                         <property name="row_spacing">12</property>
                                         <child>
                                           <object class="GtkButton" id="browse">
-                                            <property name="label" translatable="yes">_Browse...</property>
+                                            <property name="label" translatable="yes" context="insertsheet|browse">_Browse...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -403,7 +403,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkCheckButton" id="link">
-                                            <property name="label" translatable="yes">Lin_k</property>
+                                            <property name="label" translatable="yes" context="insertsheet|link">Lin_k</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
@@ -452,7 +452,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sheet</property>
+                    <property name="label" translatable="yes" context="insertsheet|label2">Sheet</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/integerdialog.ui b/sc/uiconfig/scalc/ui/integerdialog.ui
index 340214751930..939645bb5d48 100644
--- a/sc/uiconfig/scalc/ui/integerdialog.ui
+++ b/sc/uiconfig/scalc/ui/integerdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">2147483647</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="IntegerDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Setting</property>
+    <property name="title" translatable="yes" context="integerdialog|IntegerDialog">Edit Setting</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/sc/uiconfig/scalc/ui/leftfooterdialog.ui b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
index f8c31d2e9095..8ac633186472 100644
--- a/sc/uiconfig/scalc/ui/leftfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/leftfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LeftFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Footer (left)</property>
+    <property name="title" translatable="yes" context="leftfooterdialog|LeftFooterDialog">Footer (left)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="footerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (left)</property>
+                <property name="label" translatable="yes" context="leftfooterdialog|footerleft">Footer (left)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/sc/uiconfig/scalc/ui/leftheaderdialog.ui b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
index 4d6a7c544fbd..95b591d2155b 100644
--- a/sc/uiconfig/scalc/ui/leftheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/leftheaderdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="Left Header">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Header (left)</property>
+    <property name="title" translatable="yes" context="leftheaderdialog|Left Header">Header (left)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="headerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (left)</property>
+                <property name="label" translatable="yes" context="leftheaderdialog|headerleft">Header (left)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui
index e4b2a8e42651..058918e7efa5 100644
--- a/sc/uiconfig/scalc/ui/managenamesdialog.ui
+++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="0" version="0.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ManageNamesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Manage Names</property>
+    <property name="title" translatable="yes" context="managenamesdialog|ManageNamesDialog">Manage Names</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -112,7 +112,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Select cells in the document to update the range.</property>
+                <property name="label" translatable="yes" context="managenamesdialog|info">Select cells in the document to update the range.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -133,7 +133,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="managenamesdialog|label2">Name:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -147,7 +147,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Scope:</property>
+                    <property name="label" translatable="yes" context="managenamesdialog|label4">Scope:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">scope</property>
                   </object>
@@ -211,7 +211,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Range or formula expression:</property>
+                    <property name="label" translatable="yes" context="managenamesdialog|label3">Range or formula expression:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">range</property>
                   </object>
@@ -258,7 +258,7 @@
                         <property name="column_homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="printrange">
-                            <property name="label" translatable="yes">_Print range</property>
+                            <property name="label" translatable="yes" context="managenamesdialog|printrange">_Print range</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -273,7 +273,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="filter">
-                            <property name="label" translatable="yes">_Filter</property>
+                            <property name="label" translatable="yes" context="managenamesdialog|filter">_Filter</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -288,7 +288,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="colheader">
-                            <property name="label" translatable="yes">Repeat _column</property>
+                            <property name="label" translatable="yes" context="managenamesdialog|colheader">Repeat _column</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -303,7 +303,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="rowheader">
-                            <property name="label" translatable="yes">Repeat _row</property>
+                            <property name="label" translatable="yes" context="managenamesdialog|rowheader">Repeat _row</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -324,7 +324,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Range _Options</property>
+                    <property name="label" translatable="yes" context="managenamesdialog|label1">Range _Options</property>
                     <property name="use_underline">True</property>
                   </object>
                 </child>
@@ -392,6 +392,6 @@
     </action-widgets>
   </object>
   <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-    <property name="title" translatable="yes">column</property>
+    <property name="title" translatable="yes" context="managenamesdialog|treeviewcolumn1">column</property>
   </object>
 </interface>
diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index ac45f304def5..8c957dba6f8f 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MergeCellsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Merge Cells</property>
+    <property name="title" translatable="yes" context="mergecellsdialog|MergeCellsDialog">Merge Cells</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Some cells are not empty.</property>
+                <property name="label" translatable="yes" context="mergecellsdialog|label">Some cells are not empty.</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -92,7 +92,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="move-cells-radio">
-                <property name="label" translatable="yes">Move the contents of the hidden cells into the first cell</property>
+                <property name="label" translatable="yes" context="mergecellsdialog|move-cells-radio">Move the contents of the hidden cells into the first cell</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="keep-content-radio">
-                <property name="label" translatable="yes">Keep the contents of the hidden cells</property>
+                <property name="label" translatable="yes" context="mergecellsdialog|keep-content-radio">Keep the contents of the hidden cells</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -126,7 +126,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="empty-cells-radio">
-                <property name="label" translatable="yes">Empty the contents of the hidden cells</property>
+                <property name="label" translatable="yes" context="mergecellsdialog|empty-cells-radio">Empty the contents of the hidden cells</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui b/sc/uiconfig/scalc/ui/movecopysheet.ui
index 24ffed59faee..2e1e86b8ada6 100644
--- a/sc/uiconfig/scalc/ui/movecopysheet.ui
+++ b/sc/uiconfig/scalc/ui/movecopysheet.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MoveCopySheetDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Move/Copy Sheet</property>
+    <property name="title" translatable="yes" context="movecopysheet|MoveCopySheetDialog">Move/Copy Sheet</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkRadioButton" id="move">
-                        <property name="label" translatable="yes">_Move</property>
+                        <property name="label" translatable="yes" context="movecopysheet|move">_Move</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="copy">
-                        <property name="label" translatable="yes">C_opy</property>
+                        <property name="label" translatable="yes" context="movecopysheet|copy">C_opy</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xpad">1</property>
-                <property name="label" translatable="yes">Action</property>
+                <property name="label" translatable="yes" context="movecopysheet|label1">Action</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -181,7 +181,7 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">To _document</property>
+                            <property name="label" translatable="yes" context="movecopysheet|toDocumentLabel">To _document</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">toDocument</property>
                           </object>
@@ -196,8 +196,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">(current document)</item>
-                              <item translatable="yes">- new document -</item>
+                              <item translatable="yes" context="movecopysheet|toDocument">(current document)</item>
+                              <item translatable="yes" context="movecopysheet|toDocument">- new document -</item>
                             </items>
                           </object>
                           <packing>
@@ -226,7 +226,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Insert before</property>
+                            <property name="label" translatable="yes" context="movecopysheet|insertBeforeLabel">_Insert before</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">insertBefore:before</property>
                           </object>
@@ -276,7 +276,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Location</property>
+                <property name="label" translatable="yes" context="movecopysheet|label2">Location</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -345,7 +345,7 @@
                             <property name="valign">start</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">This name is already used.</property>
+                            <property name="label" translatable="yes" context="movecopysheet|warnunused">This name is already used.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -360,7 +360,7 @@
                             <property name="valign">start</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Name is empty.</property>
+                            <property name="label" translatable="yes" context="movecopysheet|warnempty">Name is empty.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -375,7 +375,7 @@
                             <property name="valign">start</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Name contains one or more invalid characters.</property>
+                            <property name="label" translatable="yes" context="movecopysheet|warninvalid">Name contains one or more invalid characters.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -400,7 +400,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">5</property>
                 <property name="xpad">2</property>
-                <property name="label" translatable="yes">New _name</property>
+                <property name="label" translatable="yes" context="movecopysheet|newNameLabel">New _name</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
index c16f4aded5c7..39806c4fe14f 100644
--- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui
+++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="interval-adjustment">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="MovingAverageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Moving Average</property>
+    <property name="title" translatable="yes" context="movingaveragedialog|MovingAverageDialog">Moving Average</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -46,7 +46,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="movingaveragedialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -85,7 +85,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="movingaveragedialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -127,7 +127,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="movingaveragedialog|label3">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -221,7 +221,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="movingaveragedialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -236,7 +236,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="movingaveragedialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -257,7 +257,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="movingaveragedialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -295,7 +295,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Interval:</property>
+                        <property name="label" translatable="yes" context="movingaveragedialog|interval-label">Interval:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -325,7 +325,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Parameters</property>
+                <property name="label" translatable="yes" context="movingaveragedialog|label1">Parameters</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui
index bb664fe90952..a67e90115b23 100644
--- a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui
+++ b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="MultipleOperationsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Multiple operations</property>
+    <property name="title" translatable="yes" context="multipleoperationsdialog|MultipleOperationsDialog">Multiple operations</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -39,7 +39,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Formulas:</property>
+                        <property name="label" translatable="yes" context="multipleoperationsdialog|formulasft">_Formulas:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">formulas</property>
                       </object>
@@ -53,7 +53,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Row input cell:</property>
+                        <property name="label" translatable="yes" context="multipleoperationsdialog|rowft">_Row input cell:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">row</property>
                       </object>
@@ -67,7 +67,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Column input cell:</property>
+                        <property name="label" translatable="yes" context="multipleoperationsdialog|colft">_Column input cell:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">col</property>
                       </object>
@@ -156,7 +156,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Default Settings</property>
+                <property name="label" translatable="yes" context="multipleoperationsdialog|label1">Default Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui b/sc/uiconfig/scalc/ui/namerangesdialog.ui
index 3bdd96ac6a0a..40c2538dacce 100644
--- a/sc/uiconfig/scalc/ui/namerangesdialog.ui
+++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="NameRangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Define Label Range</property>
+    <property name="title" translatable="yes" context="namerangesdialog|NameRangesDialog">Define Label Range</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -144,7 +144,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="colhead">
-                            <property name="label" translatable="yes">Contains _column labels</property>
+                            <property name="label" translatable="yes" context="namerangesdialog|colhead">Contains _column labels</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="rowhead">
-                            <property name="label" translatable="yes">Contains _row labels</property>
+                            <property name="label" translatable="yes" context="namerangesdialog|rowhead">Contains _row labels</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -189,7 +189,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">For _data range</property>
+                        <property name="label" translatable="yes" context="namerangesdialog|datarange">For _data range</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">edassign2</property>
                       </object>
@@ -300,7 +300,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Range</property>
+                <property name="label" translatable="yes" context="namerangesdialog|label1">Range</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui b/sc/uiconfig/scalc/ui/navigatorpanel.ui
index f17825a123c7..8e9d8733e670 100644
--- a/sc/uiconfig/scalc/ui/navigatorpanel.ui
+++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="NavigatorPanel">
     <property name="visible">True</property>
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Column:</property>
+                <property name="label" translatable="yes" context="navigatorpanel|label1">Column:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">column</property>
               </object>
@@ -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">Row:</property>
+                <property name="label" translatable="yes" context="navigatorpanel|label2">Row:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">row</property>
               </object>
@@ -55,7 +55,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="tooltip_text" translatable="yes">Column</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|column|tooltip_text">Column</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="tooltip_text" translatable="yes">Row</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|row|tooltip_text">Row</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -83,7 +83,7 @@
                   <object class="GtkToolButton" id="datarange">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Data Range</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|datarange|tooltip_text">Data Range</property>
                     <property name="action_name">datarange</property>
                     <property name="icon_name">sc/res/na03.png</property>
                   </object>
@@ -96,7 +96,7 @@
                   <object class="GtkToolButton" id="start">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Start</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|start|tooltip_text">Start</property>
                     <property name="action_name">start</property>
                     <property name="icon_name">sc/res/na05.png</property>
                   </object>
@@ -109,7 +109,7 @@
                   <object class="GtkToolButton" id="end">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">End</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|end|tooltip_text">End</property>
                     <property name="action_name">end</property>
                     <property name="icon_name">sc/res/na06.png</property>
                   </object>
@@ -122,7 +122,7 @@
                   <object class="GtkToolButton" id="contents">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Contents</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|contents|tooltip_text">Contents</property>
                     <property name="action_name">contents</property>
                     <property name="icon_name">sc/res/na011.png</property>
                   </object>
@@ -135,7 +135,7 @@
                   <object class="GtkToolButton" id="toggle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Toggle</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|toggle|tooltip_text">Toggle</property>
                     <property name="action_name">toggle</property>
                     <property name="icon_name">sc/res/na010.png</property>
                   </object>
@@ -148,7 +148,7 @@
                   <object class="GtkToolButton" id="scenarios">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Scenarios</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|scenarios|tooltip_text">Scenarios</property>
                     <property name="action_name">scenarios</property>
                     <property name="icon_name">sc/res/na07.png</property>
                   </object>
@@ -161,7 +161,7 @@
                   <object class="GtkMenuToolButton" id="dragmode">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Drag Mode</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|dragmode|tooltip_text">Drag Mode</property>
                     <property name="action_name">dragmode</property>
                     <property name="icon_name">sc/res/na09.png</property>
                   </object>
@@ -187,10 +187,10 @@
           <object class="GtkComboBox" id="documents">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Document</property>
+            <property name="tooltip_text" translatable="yes" context="navigatorpanel|documents|tooltip_text">Document</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="documents-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Active Window</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="navigatorpanel|documents-atkobject">Active Window</property>
               </object>
             </child>
           </object>
diff --git a/sc/uiconfig/scalc/ui/nosolutiondialog.ui b/sc/uiconfig/scalc/ui/nosolutiondialog.ui
index fefffdd59b59..9a99cb8b5145 100644
--- a/sc/uiconfig/scalc/ui/nosolutiondialog.ui
+++ b/sc/uiconfig/scalc/ui/nosolutiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="NoSolutionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No Solution</property>
+    <property name="title" translatable="yes" context="nosolutiondialog|NoSolutionDialog">No Solution</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -52,7 +52,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">No solution was found.</property>
+                <property name="label" translatable="yes" context="nosolutiondialog|label1">No solution was found.</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index b35d37a82bd7..c37d6ff40d38 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="BringToFrontImg">
@@ -383,7 +383,7 @@
               <object class="GtkLabel" id="FileLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar|FileLabel">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -460,7 +460,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="vcllo-SmallButton" id="FormatPaintbrush">
-                        <property name="label" translatable="yes">Clone</property>
+                        <property name="label" translatable="yes" context="notebookbar|FormatPaintbrush">Clone</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -659,7 +659,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
                                 <property name="halign">start</property>
                                 <property name="action_name">.uno:SetBorderStyle</property>
                                 <property name="label" translatable="no">toolbutton1</property>
@@ -897,7 +897,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|verticalalignment|tooltip_text">Vertical Alignment</property>
                                     <property name="halign">end</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_arrow">False</property>
@@ -1043,7 +1043,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|horizontalalignment|tooltip_text">Horizontal Alignment</property>
                                     <property name="halign">start</property>
                                     <property name="show_arrow">False</property>
                                     <child>
@@ -1106,14 +1106,14 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Indent</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|indent|tooltip_text">Indent</property>
                                     <child>
                                       <object class="GtkToolButton" id="increaseindent1">
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                                        <property name="tooltip_text" translatable="yes" context="notebookbar|increaseindent1|tooltip_text">Increase Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:IncrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -1129,7 +1129,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                                        <property name="tooltip_text" translatable="yes" context="notebookbar|decreaseindent1|tooltip_text">Decrease Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:DecrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -1663,7 +1663,7 @@
               <object class="GtkLabel" id="CalcLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Home</property>
+                <property name="label" translatable="yes" context="notebookbar|CalcLabel">Home</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-default"/>
@@ -1747,7 +1747,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Insert Audio or Video</property>
+                            <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
                             <property name="image">InsertAVMediaImg</property>
                             <property name="relief">none</property>
@@ -1902,7 +1902,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="vcllo-SmallButton" id="InsertSymbol">
-                        <property name="label" translatable="yes">Symbol</property>
+                        <property name="label" translatable="yes" context="notebookbar|InsertSymbol">Symbol</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2005,7 +2005,7 @@
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -2073,7 +2073,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="ToggleSheetGrid">
-                            <property name="label" translatable="yes">Toggle Grid Lines</property>
+                            <property name="label" translatable="yes" context="notebookbar|ToggleSheetGrid">Toggle Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -2229,7 +2229,7 @@
               <object class="GtkLabel" id="PageLayoutLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page Layout</property>
+                <property name="label" translatable="yes" context="notebookbar|PageLayoutLabel">Page Layout</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -2705,7 +2705,7 @@
               <object class="GtkLabel" id="DataLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="notebookbar|DataLabel">Data</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -2735,7 +2735,7 @@
                 </child>
                 <child>
                   <object class="vcllo-SmallButton" id="SpellOnline">
-                    <property name="label" translatable="yes">Auto Spellcheck</property>
+                    <property name="label" translatable="yes" context="notebookbar|SpellOnline">Auto Spellcheck</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -3018,7 +3018,7 @@
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Review</property>
+                <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -3095,7 +3095,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkButton" id="ToggleSheetGrid2">
-                            <property name="label" translatable="yes">Toggle Grid Lines</property>
+                            <property name="label" translatable="yes" context="notebookbar|ToggleSheetGrid2">Toggle Grid Lines</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -3319,7 +3319,7 @@
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">View</property>
+                <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -3832,7 +3832,7 @@
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
index 71fd26ff02e1..e17b27c62e2a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -37,7 +37,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HyperlinkDialog</property>
-        <property name="label" translatable="yes">Hyperlink</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|hyperlink">Hyperlink</property>
       </object>
     </child>
     <child>
@@ -51,7 +51,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnote</property>
-        <property name="label" translatable="yes">Footnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|footnote">Footnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -60,7 +60,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEndnote</property>
-        <property name="label" translatable="yes">Endnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|endnote">Endnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -75,7 +75,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertBookmark</property>
-        <property name="label" translatable="yes">Bookmark</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|bookmark">Bookmark</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -84,7 +84,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertReferenceField</property>
-        <property name="label" translatable="yes">Cross-Reference</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|crossreference">Cross-Reference</property>
       </object>
     </child>
   </object>
@@ -149,7 +149,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Default&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Default</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenudefault">Default</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -164,7 +164,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 1&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Accent 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenuacc1">Accent 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -173,7 +173,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 2&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Accent 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenuacc2">Accent 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -182,7 +182,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Accent 3&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Accent 3</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenuacc3">Accent 3</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -197,7 +197,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Heading 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenuhed1">Heading 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -206,7 +206,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Heading 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenuhed2">Heading 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -221,7 +221,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Good&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Good</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenustatg">Good</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -230,7 +230,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Neutral&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Neutral</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenustatn">Neutral</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -239,7 +239,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Bad&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Bad</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenustatb">Bad</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -248,7 +248,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Warning&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Warning</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenustatw">Warning</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -257,7 +257,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Error&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Error</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenustate">Error</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -272,7 +272,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Note&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Note</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenutxtn">Note</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -281,7 +281,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:StyleApply?Style:string=Footnote&amp;FamilyName:string=CellStyles</property>
-        <property name="label" translatable="yes">Footnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|stylemenutxtf">Footnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -293,7 +293,7 @@
       <object class="GtkMenuItem" id="tablestylenone">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestylenone">None</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -301,7 +301,7 @@
       <object class="GtkMenuItem" id="tablestyledefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyledefault">Default</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -309,7 +309,7 @@
       <object class="GtkMenuItem" id="tablestyle1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle1">Style 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -317,7 +317,7 @@
       <object class="GtkMenuItem" id="tablestyle2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle2">Style 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -325,7 +325,7 @@
       <object class="GtkMenuItem" id="tablestyle3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 3</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle3">Style 3</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -333,7 +333,7 @@
       <object class="GtkMenuItem" id="tablestyle4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 4</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle4">Style 4</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -527,7 +527,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|filegrouplabel">File</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -680,7 +680,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Clipboard</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|clipboardgrouplabel">Clipboard</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -726,7 +726,7 @@
                 <property name="spacing">3</property>
                 <child>
                   <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:stylemenu">
-                    <property name="label" translatable="yes">Style</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|paragraphstyleb">Style</property>
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -968,7 +968,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="growb">
-                            <property name="label" translatable="yes"> </property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|growb"> </property>
                             <property name="width_request">35</property>
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
@@ -990,7 +990,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="shrinkb">
-                            <property name="label" translatable="yes"> </property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|shrinkb"> </property>
                             <property name="width_request">35</property>
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
@@ -1031,7 +1031,7 @@
                     <property name="spacing">3</property>
                     <child>
                       <object class="GtkButton" id="leftb">
-                        <property name="label" translatable="yes">Left</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|leftb">Left</property>
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1049,7 +1049,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="centerb">
-                        <property name="label" translatable="yes">Center</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|centerb">Center</property>
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1066,7 +1066,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="rightb">
-                        <property name="label" translatable="yes">Right</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|rightb">Right</property>
                         <property name="height_request">24</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1272,7 +1272,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|formatgrouplabel">Text</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -1373,7 +1373,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="mergeb">
-                            <property name="label" translatable="yes">Merge</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|mergeb">Merge</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1391,7 +1391,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="splitb">
-                            <property name="label" translatable="yes">Split</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|splitb">Split</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1454,7 +1454,7 @@
                         </child>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="conditionalb">
-                            <property name="label" translatable="yes">Conditional</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|conditionalb">Conditional</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1580,7 +1580,7 @@
                         <property name="spacing">1</property>
                         <child>
                           <object class="GtkButton" id="topb">
-                            <property name="label" translatable="yes">Top</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|topb">Top</property>
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1597,7 +1597,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="vcenterb">
-                            <property name="label" translatable="yes">Center</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|vcenterb">Center</property>
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1614,7 +1614,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="bottomb">
-                            <property name="label" translatable="yes">Bottom</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|bottomb">Bottom</property>
                             <property name="height_request">25</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1660,7 +1660,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Spreadsheet</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|tablegrouplabel">Spreadsheet</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1737,7 +1737,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
                                 <property name="action_name">.uno:BasicShapes</property>
-                                <property name="label" translatable="yes">Shapes</property>
+                                <property name="label" translatable="yes" context="notebookbar_groups|shapesb">Shapes</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -1753,7 +1753,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="linksb:linksmenu">
-                            <property name="label" translatable="yes">Links</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|linksb">Links</property>
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1861,7 +1861,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|insertgrouplabel">Insert</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1897,7 +1897,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="imagestyleb">
-                        <property name="label" translatable="yes">Style</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|imagestyleb">Style</property>
                         <property name="width_request">70</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
@@ -1937,7 +1937,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="resetb">
-                            <property name="label" translatable="yes">Reset</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|resetb">Reset</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1981,7 +1981,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="wrapb:wrapmenu">
-                            <property name="label" translatable="yes">Wrap</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|wrapb">Wrap</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1996,7 +1996,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="lockb">
-                            <property name="label" translatable="yes">Lock</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|lockb">Lock</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2040,7 +2040,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Image</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|imagegrouplabel">Image</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -2096,7 +2096,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOff</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapoff">None</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2105,7 +2105,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapIdeal</property>
-        <property name="label" translatable="yes">Optimal</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapideal">Optimal</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2114,7 +2114,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOn</property>
-        <property name="label" translatable="yes">Parallel</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapon">Parallel</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2123,7 +2123,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapLeft</property>
-        <property name="label" translatable="yes">Before</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapleft">Before</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2132,7 +2132,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapRight</property>
-        <property name="label" translatable="yes">After</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapright">After</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2141,7 +2141,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapThrough</property>
-        <property name="label" translatable="yes">Through</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapthrough">Through</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2156,7 +2156,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapContour</property>
-        <property name="label" translatable="yes">Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapcontour">Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2165,7 +2165,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ContourDialog</property>
-        <property name="label" translatable="yes">Edit Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|contourdialog">Edit Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
index ebc9c031a3e6..14153f079709 100644
--- a/sc/uiconfig/scalc/ui/optcalculatepage.ui
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -45,11 +45,11 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="case">
-                    <property name="label" translatable="yes">Case se_nsitive</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|case">Case se_nsitive</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Disable case sensitivity for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|case|tooltip_text">Disable case sensitivity for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -62,7 +62,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="calc">
-                    <property name="label" translatable="yes">_Precision as shown</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|calc">_Precision as shown</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -78,11 +78,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="match">
-                    <property name="label" translatable="yes">Search criteria = and &lt;&gt; must apply to _whole cells</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|match">Search criteria = and &lt;&gt; must apply to _whole cells</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Enable this for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|match|tooltip_text">Enable this for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -95,11 +95,11 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="formulawildcards">
-                    <property name="label" translatable="yes">Enable w_ildcards in formulas</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|formulawildcards">Enable w_ildcards in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Enable wildcards for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|formulawildcards|tooltip_text">Enable wildcards for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -114,7 +114,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="formularegex">
-                    <property name="label" translatable="yes">Enable r_egular expressions in formulas</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|formularegex">Enable r_egular expressions in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -132,7 +132,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="formulaliteral">
-                    <property name="label" translatable="yes">No wildcards or regular expressions in formulas</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|formulaliteral">No wildcards or regular expressions in formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -150,7 +150,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="lookup">
-                    <property name="label" translatable="yes">_Automatically find column and row labels</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|lookup">_Automatically find column and row labels</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="generalprec">
-                    <property name="label" translatable="yes">_Limit decimals for general number format</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|generalprec">_Limit decimals for general number format</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -190,7 +190,7 @@
                       <object class="GtkLabel" id="precft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Decimal places:</property>
+                        <property name="label" translatable="yes" context="optcalculatepage|precft">_Decimal places:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">prec</property>
                       </object>
@@ -227,7 +227,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">General Calculations</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label1">General Calculations</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -261,7 +261,7 @@
                 <property name="row_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="iterate">
-                    <property name="label" translatable="yes">_Iterations</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|iterate">_Iterations</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -281,7 +281,7 @@
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Steps:</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|stepsft">_Steps:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">steps</property>
                   </object>
@@ -296,7 +296,7 @@
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Minimum change:</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|minchangeft">_Minimum change:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">minchange</property>
                   </object>
@@ -338,7 +338,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Iterative References</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label2">Iterative References</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -369,11 +369,11 @@
                 <property name="row_homogeneous">True</property>
                 <child>
                   <object class="GtkRadioButton" id="datestd">
-                    <property name="label" translatable="yes">12/30/1899 (defa_ult)</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|datestd">12/30/1899 (defa_ult)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Value 0 corresponds to 12/30/1899</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datestd|tooltip_text">Value 0 corresponds to 12/30/1899</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -387,11 +387,11 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="datesc10">
-                    <property name="label" translatable="yes">01/01/1900 (Star_Calc 1.0)</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|datesc10">01/01/1900 (Star_Calc 1.0)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Value 0 corresponds to 01/01/1900</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|datesc10|tooltip_text">Value 0 corresponds to 01/01/1900</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -404,11 +404,11 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="date1904">
-                    <property name="label" translatable="yes">_01/01/1904</property>
+                    <property name="label" translatable="yes" context="optcalculatepage|date1904">_01/01/1904</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">0 corresponds to 01/01/1904</property>
+                    <property name="tooltip_text" translatable="yes" context="optcalculatepage|date1904|tooltip_text">0 corresponds to 01/01/1904</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -427,7 +427,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Date</property>
+            <property name="label" translatable="yes" context="optcalculatepage|label3">Date</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optchangespage.ui b/sc/uiconfig/scalc/ui/optchangespage.ui
index c64f8726b2e0..138784855720 100644
--- a/sc/uiconfig/scalc/ui/optchangespage.ui
+++ b/sc/uiconfig/scalc/ui/optchangespage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="OptChangesPage">
@@ -35,7 +35,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Chan_ges:</property>
+                    <property name="label" translatable="yes" context="optchangespage|label2">Chan_ges:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">changes</property>
                   </object>
@@ -49,7 +49,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Deletions:</property>
+                    <property name="label" translatable="yes" context="optchangespage|label3">_Deletions:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">deletions</property>
                   </object>
@@ -63,7 +63,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Insertions:</property>
+                    <property name="label" translatable="yes" context="optchangespage|label4">_Insertions:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">insertions</property>
                   </object>
@@ -77,7 +77,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Moved entries:</property>
+                    <property name="label" translatable="yes" context="optchangespage|label5">_Moved entries:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entries</property>
                   </object>
@@ -134,7 +134,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Colors for Changes</property>
+            <property name="label" translatable="yes" context="optchangespage|label1">Colors for Changes</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index 8e2c94f9413a..ab8da41624b6 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Wed Jan  8 18:42:59 2014 -->
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptCompatibilityPage">
     <property name="visible">True</property>
@@ -40,7 +40,7 @@
                     <property name="vexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property>
+                    <property name="label" translatable="yes" context="optcompatibilitypage|label2">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property>
                     <property name="use_underline">True</property>
                     <property name="wrap">True</property>
                     <property name="mnemonic_widget">keybindings</property>
@@ -59,8 +59,8 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <items>
-                      <item translatable="yes">Default</item>
-                      <item translatable="yes">OpenOffice.org legacy</item>
+                      <item translatable="yes" context="optcompatibilitypage|keybindings">Default</item>
+                      <item translatable="yes" context="optcompatibilitypage|keybindings">OpenOffice.org legacy</item>
                     </items>
                   </object>
                   <packing>
@@ -78,7 +78,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Key Bindings</property>
+            <property name="label" translatable="yes" context="optcompatibilitypage|label1">Key Bindings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optdefaultpage.ui b/sc/uiconfig/scalc/ui/optdefaultpage.ui
index be3fd05cc73d..11743b5ac6ad 100644
--- a/sc/uiconfig/scalc/ui/optdefaultpage.ui
+++ b/sc/uiconfig/scalc/ui/optdefaultpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -37,7 +37,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Number of worksheets in new document:</property>
+                    <property name="label" translatable="yes" context="optdefaultpage|textsheetsnumber">_Number of worksheets in new document:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">sheetsnumber</property>
                   </object>
@@ -51,7 +51,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Prefix name for new worksheet:</property>
+                    <property name="label" translatable="yes" context="optdefaultpage|textsheetprefix">_Prefix name for new worksheet:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">sheetprefix</property>
                   </object>
@@ -95,7 +95,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">New Spreadsheet</property>
+            <property name="label" translatable="yes" context="optdefaultpage|label1">New Spreadsheet</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optdlg.ui b/sc/uiconfig/scalc/ui/optdlg.ui
index 50dc6f5d4417..60fe46946066 100644
--- a/sc/uiconfig/scalc/ui/optdlg.ui
+++ b/sc/uiconfig/scalc/ui/optdlg.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="optCalcPrintPage">
     <property name="visible">True</property>
@@ -27,7 +27,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="suppressCB">
-                    <property name="label" translatable="yes">_Suppress output of empty pages</property>
+                    <property name="label" translatable="yes" context="optdlg|suppressCB">_Suppress output of empty pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -43,7 +43,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="forceBreaksCB">
-                    <property name="label" translatable="yes">_Always apply manual breaks</property>
+                    <property name="label" translatable="yes" context="optdlg|forceBreaksCB">_Always apply manual breaks</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -65,7 +65,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Pages</property>
+            <property name="label" translatable="yes" context="optdlg|label1">Pages</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -98,7 +98,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printCB">
-                    <property name="label" translatable="yes">_Print only selected sheets</property>
+                    <property name="label" translatable="yes" context="optdlg|printCB">_Print only selected sheets</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -121,7 +121,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="yalign">0.47999998927116394</property>
-            <property name="label" translatable="yes">Sheets</property>
+            <property name="label" translatable="yes" context="optdlg|label2">Sheets</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui
index 686fbd0b5663..4e37a1e9b9ec 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -33,7 +33,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="englishfuncname">
-                    <property name="label" translatable="yes">Use English function names</property>
+                    <property name="label" translatable="yes" context="optformula|englishfuncname">Use English function names</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
                       <object class="GtkLabel" id="formulasyntaxlabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Formula _syntax:</property>
+                        <property name="label" translatable="yes" context="optformula|formulasyntaxlabel">Formula _syntax:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">formulasyntax</property>
                       </object>
@@ -98,7 +98,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Formula Options</property>
+            <property name="label" translatable="yes" context="optformula|label1">Formula Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -135,7 +135,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Excel 2007 and newer:</property>
+                    <property name="label" translatable="yes" context="optformula|label9">Excel 2007 and newer:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ooxmlrecalc</property>
                   </object>
@@ -151,7 +151,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">ODF spreadsheet (not saved by %PRODUCTNAME):</property>
+                    <property name="label" translatable="yes" context="optformula|label10">ODF spreadsheet (not saved by %PRODUCTNAME):</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">odfrecalc</property>
                   </object>
@@ -170,9 +170,9 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Always recalculate</item>
-                      <item translatable="yes">Never recalculate</item>
-                      <item translatable="yes">Prompt user</item>
+                      <item translatable="yes" context="optformula|ooxmlrecalc">Always recalculate</item>
+                      <item translatable="yes" context="optformula|ooxmlrecalc">Never recalculate</item>
+                      <item translatable="yes" context="optformula|ooxmlrecalc">Prompt user</item>
                     </items>
                   </object>
                   <packing>
@@ -190,9 +190,9 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Always recalculate</item>
-                      <item translatable="yes">Never recalculate</item>
-                      <item translatable="yes">Prompt user</item>
+                      <item translatable="yes" context="optformula|odfrecalc">Always recalculate</item>
+                      <item translatable="yes" context="optformula|odfrecalc">Never recalculate</item>
+                      <item translatable="yes" context="optformula|odfrecalc">Prompt user</item>
                     </items>
                   </object>
                   <packing>
@@ -210,7 +210,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Recalculation on File Load</property>
+            <property name="label" translatable="yes" context="optformula|label4">Recalculation on File Load</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -246,7 +246,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="calcdefault">
-                    <property name="label" translatable="yes">Default settings</property>
+                    <property name="label" translatable="yes" context="optformula|calcdefault">Default settings</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -269,7 +269,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="calccustom">
-                        <property name="label" translatable="yes">Custom (conversion of text to numbers and more):</property>
+                        <property name="label" translatable="yes" context="optformula|calccustom">Custom (conversion of text to numbers and more):</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -287,7 +287,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="details">
-                        <property name="label" translatable="yes">Details…</property>
+                        <property name="label" translatable="yes" context="optformula|details">Details…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -316,7 +316,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Detailed Calculation Settings</property>
+            <property name="label" translatable="yes" context="optformula|label2">Detailed Calculation Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -356,7 +356,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Function:</property>
+                    <property name="label" translatable="yes" context="optformula|label6">_Function:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">function</property>
                   </object>
@@ -372,7 +372,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Array co_lumn:</property>
+                    <property name="label" translatable="yes" context="optformula|label7">Array co_lumn:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">arraycolumn</property>
                   </object>
@@ -388,7 +388,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Array _row:</property>
+                    <property name="label" translatable="yes" context="optformula|label8">Array _row:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">arrayrow</property>
                   </object>
@@ -449,7 +449,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="reset">
-                    <property name="label" translatable="yes">Rese_t Separators Settings</property>
+                    <property name="label" translatable="yes" context="optformula|reset">Rese_t Separators Settings</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -477,7 +477,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Separators</property>
+            <property name="label" translatable="yes" context="optformula|label3">Separators</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui b/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
index c7e4d2fa64d6..df5763be78a5 100644
--- a/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
+++ b/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="OptimalColWidthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Optimal Column Width</property>
+    <property name="title" translatable="yes" context="optimalcolwidthdialog|OptimalColWidthDialog">Optimal Column Width</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -85,7 +85,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Add:</property>
+                <property name="label" translatable="yes" context="optimalcolwidthdialog|label1">Add:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="default">
-                <property name="label" translatable="yes">_Default value</property>
+                <property name="label" translatable="yes" context="optimalcolwidthdialog|default">_Default value</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui b/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
index 178fdff9a60d..66b50ff5dad3 100644
--- a/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
+++ b/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="OptimalRowHeightDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Optimal Row Height</property>
+    <property name="title" translatable="yes" context="optimalrowheightdialog|OptimalRowHeightDialog">Optimal Row Height</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -85,7 +85,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Add:</property>
+                <property name="label" translatable="yes" context="optimalrowheightdialog|label1">Add:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="default">
-                <property name="label" translatable="yes">_Default value</property>
+                <property name="label" translatable="yes" context="optimalrowheightdialog|default">_Default value</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/optsortlists.ui b/sc/uiconfig/scalc/ui/optsortlists.ui
index 3f47ed968e02..343ab278c0e5 100644
--- a/sc/uiconfig/scalc/ui/optsortlists.ui
+++ b/sc/uiconfig/scalc/ui/optsortlists.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptSortLists">
     <property name="visible">True</property>
@@ -19,7 +19,7 @@
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkButton" id="copy">
-            <property name="label" translatable="yes">_Copy</property>
+            <property name="label" translatable="yes" context="optsortlists|copy">_Copy</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -42,7 +42,7 @@
               <object class="GtkLabel" id="copyfromlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Copy list _from:</property>
+                <property name="label" translatable="yes" context="optsortlists|copyfromlabel">Copy list _from:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">copyfrom</property>
               </object>
@@ -88,7 +88,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Lists</property>
+                <property name="label" translatable="yes" context="optsortlists|listslabel">_Lists</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">lists:border</property>
               </object>
@@ -104,7 +104,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Entries</property>
+                <property name="label" translatable="yes" context="optsortlists|entrieslabel">_Entries</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entries:border</property>
               </object>
@@ -163,7 +163,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="new">
-                <property name="label" translatable="yes">_New</property>
+                <property name="label" translatable="yes" context="optsortlists|new">_New</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -177,7 +177,7 @@
             </child>
             <child>
               <object class="GtkButton" id="discard">
-                <property name="label" translatable="yes">_Discard</property>
+                <property name="label" translatable="yes" context="optsortlists|discard">_Discard</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -191,7 +191,7 @@
             </child>
             <child>
               <object class="GtkButton" id="add">
-                <property name="label" translatable="yes">_Add</property>
+                <property name="label" translatable="yes" context="optsortlists|add">_Add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -205,7 +205,7 @@
             </child>
             <child>
               <object class="GtkButton" id="modify">
-                <property name="label" translatable="yes">Modif_y</property>
+                <property name="label" translatable="yes" context="optsortlists|modify">Modif_y</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -219,7 +219,7 @@
             </child>
             <child>
               <object class="GtkButton" id="delete">
-                <property name="label" translatable="yes">_Delete</property>
+                <property name="label" translatable="yes" context="optsortlists|delete">_Delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index 759c7813b460..22233faab7b0 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PageTemplateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Page Style</property>
+    <property name="title" translatable="yes" context="pagetemplatedialog|PageTemplateDialog">Page Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="page">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|page">Page</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="header">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|header">Header</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="footer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|footer">Footer</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="sheet">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sheet</property>
+                <property name="label" translatable="yes" context="pagetemplatedialog|sheet">Sheet</property>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/sc/uiconfig/scalc/ui/paradialog.ui b/sc/uiconfig/scalc/ui/paradialog.ui
index 690ba8c2723a..66931924ef87 100644
--- a/sc/uiconfig/scalc/ui/paradialog.ui
+++ b/sc/uiconfig/scalc/ui/paradialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ParagraphDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph</property>
+    <property name="title" translatable="yes" context="paradialog|ParagraphDialog">Paragraph</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="labelTP_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index 4c6fc09d914b..33244866cce5 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ParaTemplateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Cell Style</property>
+    <property name="title" translatable="yes" context="paratemplatedialog|ParaTemplateDialog">Cell Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -78,7 +78,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">_Standard</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="numbers">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbers</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|numbers">Numbers</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -138,7 +138,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="paratemplatedialog|font">Font</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -152,7 +152,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="paratemplatedialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|alignment">Alignment</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="asiantypo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|asiantypo">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -208,7 +208,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -222,7 +222,7 @@
               <object class="GtkLabel" id="protection">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Cell Protection</property>
+                <property name="label" translatable="yes" context="paratemplatedialog|protection">Cell Protection</property>
               </object>
               <packing>
                 <property name="position">8</property>
diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui
index b40f85ebdd6c..2aa9b48de62b 100644
--- a/sc/uiconfig/scalc/ui/pastespecial.ui
+++ b/sc/uiconfig/scalc/ui/pastespecial.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="img_paste_transpose">
     <property name="visible">True</property>
@@ -20,7 +20,7 @@
   <object class="GtkDialog" id="PasteSpecial">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paste Special</property>
+    <property name="title" translatable="yes" context="pastespecial|PasteSpecial">Paste Special</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -95,7 +95,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Values Only</property>
+                <property name="tooltip_text" translatable="yes" context="pastespecial|paste_values_only|tooltip_text">Values Only</property>
                 <property name="image">img_paste_values_only</property>
               </object>
               <packing>
@@ -110,7 +110,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Values &amp; Formats</property>
+                <property name="tooltip_text" translatable="yes" context="pastespecial|paste_values_formats|tooltip_text">Values &amp; Formats</property>
                 <property name="image">img_paste_values_formats</property>
               </object>
               <packing>
@@ -125,7 +125,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Transpose</property>
+                <property name="tooltip_text" translatable="yes" context="pastespecial|paste_transpose|tooltip_text">Transpose</property>
                 <property name="image">img_paste_transpose</property>
               </object>
               <packing>
@@ -169,7 +169,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="paste_all">
-                            <property name="label" translatable="yes">_Paste all</property>
+                            <property name="label" translatable="yes" context="pastespecial|paste_all">_Paste all</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="has_focus">True</property>
@@ -186,7 +186,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="text">
-                            <property name="label" translatable="yes">Te_xt</property>
+                            <property name="label" translatable="yes" context="pastespecial|text">Te_xt</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -202,7 +202,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="numbers">
-                            <property name="label" translatable="yes">_Numbers</property>
+                            <property name="label" translatable="yes" context="pastespecial|numbers">_Numbers</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -218,7 +218,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="datetime">
-                            <property name="label" translatable="yes">_Date &amp; time</property>
+                            <property name="label" translatable="yes" context="pastespecial|datetime">_Date &amp; time</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="formulas">
-                            <property name="label" translatable="yes">_Formulas</property>
+                            <property name="label" translatable="yes" context="pastespecial|formulas">_Formulas</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -250,7 +250,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="comments">
-                            <property name="label" translatable="yes">_Comments</property>
+                            <property name="label" translatable="yes" context="pastespecial|comments">_Comments</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -266,7 +266,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="formats">
-                            <property name="label" translatable="yes">For_mats</property>
+                            <property name="label" translatable="yes" context="pastespecial|formats">For_mats</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -282,7 +282,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="objects">
-                            <property name="label" translatable="yes">_Objects</property>
+                            <property name="label" translatable="yes" context="pastespecial|objects">_Objects</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -304,7 +304,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Selection</property>
+                    <property name="label" translatable="yes" context="pastespecial|label1">Selection</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -338,7 +338,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="none">
-                            <property name="label" translatable="yes">Non_e</property>
+                            <property name="label" translatable="yes" context="pastespecial|none">Non_e</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -356,7 +356,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="add">
-                            <property name="label" translatable="yes">_Add</property>
+                            <property name="label" translatable="yes" context="pastespecial|add">_Add</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -374,7 +374,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="subtract">
-                            <property name="label" translatable="yes">_Subtract</property>
+                            <property name="label" translatable="yes" context="pastespecial|subtract">_Subtract</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -392,7 +392,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="multiply">
-                            <property name="label" translatable="yes">Multipl_y</property>
+                            <property name="label" translatable="yes" context="pastespecial|multiply">Multipl_y</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -410,7 +410,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="divide">
-                            <property name="label" translatable="yes">Di_vide</property>
+                            <property name="label" translatable="yes" context="pastespecial|divide">Di_vide</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -434,7 +434,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Operations</property>
+                    <property name="label" translatable="yes" context="pastespecial|label2">Operations</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -468,7 +468,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="skip_empty">
-                            <property name="label" translatable="yes">S_kip empty cells</property>
+                            <property name="label" translatable="yes" context="pastespecial|skip_empty">S_kip empty cells</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -485,7 +485,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="transpose">
-                            <property name="label" translatable="yes">_Transpose</property>
+                            <property name="label" translatable="yes" context="pastespecial|transpose">_Transpose</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -502,7 +502,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="link">
-                            <property name="label" translatable="yes">_Link</property>
+                            <property name="label" translatable="yes" context="pastespecial|link">_Link</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -525,7 +525,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="pastespecial|label3">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -559,7 +559,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="no_shift">
-                            <property name="label" translatable="yes">Don't sh_ift</property>
+                            <property name="label" translatable="yes" context="pastespecial|no_shift">Don't sh_ift</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -577,7 +577,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="move_down">
-                            <property name="label" translatable="yes">Do_wn</property>
+                            <property name="label" translatable="yes" context="pastespecial|move_down">Do_wn</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -595,7 +595,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="move_right">
-                            <property name="label" translatable="yes">_Right</property>
+                            <property name="label" translatable="yes" context="pastespecial|move_right">_Right</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -620,7 +620,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Shift Cells</property>
+                    <property name="label" translatable="yes" context="pastespecial|label4">Shift Cells</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
index bc4972a75f0e..3e663ae39b30 100644
--- a/sc/uiconfig/scalc/ui/pivotfielddialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Fri Jan 17 11:22:49 2014 -->
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="PivotFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Field</property>
+    <property name="title" translatable="yes" context="pivotfielddialog|PivotFieldDialog">Data Field</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -66,7 +66,7 @@
             </child>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">_Options...</property>
+                <property name="label" translatable="yes" context="pivotfielddialog|options">_Options...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -120,7 +120,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="none">
-                            <property name="label" translatable="yes">_None</property>
+                            <property name="label" translatable="yes" context="pivotfielddialog|none">_None</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="auto">
-                            <property name="label" translatable="yes">_Automatic</property>
+                            <property name="label" translatable="yes" context="pivotfielddialog|auto">_Automatic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -157,7 +157,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="user">
-                            <property name="label" translatable="yes">_User-defined</property>
+                            <property name="label" translatable="yes" context="pivotfielddialog|user">_User-defined</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -200,7 +200,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Subtotals</property>
+                    <property name="label" translatable="yes" context="pivotfielddialog|label1">Subtotals</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -216,7 +216,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="showall">
-                <property name="label" translatable="yes">Show it_ems without data</property>
+                <property name="label" translatable="yes" context="pivotfielddialog|showall">Show it_ems without data</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -241,7 +241,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="pivotfielddialog|label2">Name:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
index 9ab6c1b11d65..0eeaf9d1d500 100644
--- a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PivotFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Filter</property>
+    <property name="title" translatable="yes" context="pivotfilterdialog|PivotFilterDialog">Filter</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -101,8 +101,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="pivotfilterdialog|connect1">AND</item>
+                          <item translatable="yes" context="pivotfilterdialog|connect1">OR</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label2"/>
@@ -118,8 +118,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="pivotfilterdialog|connect2">AND</item>
+                          <item translatable="yes" context="pivotfilterdialog|connect2">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -131,7 +131,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Operator</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|label2">Operator</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -142,7 +142,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Field name</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|label3">Field name</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -153,7 +153,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|label4">Condition</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -164,7 +164,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Value</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|label5">Value</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -344,7 +344,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Filter Criteria</property>
+                <property name="label" translatable="yes" context="pivotfilterdialog|label1">Filter Criteria</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -382,7 +382,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="case">
-                        <property name="label" translatable="yes">_Case sensitive</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|case">_Case sensitive</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -398,7 +398,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="regexp">
-                        <property name="label" translatable="yes">Regular _expressions</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|regexp">Regular _expressions</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -414,7 +414,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="unique">
-                        <property name="label" translatable="yes">_No duplications</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|unique">_No duplications</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -447,7 +447,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Data range:</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|dbarealabel">Data range:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -460,7 +460,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">dummy</property>
+                        <property name="label" translatable="yes" context="pivotfilterdialog|dbarea">dummy</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -479,7 +479,7 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Op_tions</property>
+                <property name="label" translatable="yes" context="pivotfilterdialog|label6">Op_tions</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index ddaf80726d15..5d08c53889d1 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="PivotTableLayout">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Pivot Table Layout</property>
+    <property name="title" translatable="yes" context="pivottablelayoutdialog|PivotTableLayout">Pivot Table Layout</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -107,7 +107,7 @@
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="xpad">4</property>
-                            <property name="label" translatable="yes">Column Fields:</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label3">Column Fields:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">listbox-column</property>
                             <attributes>
@@ -159,7 +159,7 @@
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="xpad">4</property>
-                            <property name="label" translatable="yes">Data Fields:</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label5">Data Fields:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">listbox-data</property>
                             <attributes>
@@ -211,7 +211,7 @@
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="xpad">4</property>
-                            <property name="label" translatable="yes">Row Fields:</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label4">Row Fields:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">listbox-row</property>
                             <attributes>
@@ -262,7 +262,7 @@
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="xpad">4</property>
-                            <property name="label" translatable="yes">Page Fields:</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label2">Page Fields:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">listbox-page</property>
                             <attributes>
@@ -323,7 +323,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">4</property>
-                        <property name="label" translatable="yes">Available Fields:</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|label1">Available Fields:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">listbox-fields</property>
                         <attributes>
@@ -373,7 +373,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">Drag the Items into the Desired Position</property>
+                <property name="label" translatable="yes" context="pivottablelayoutdialog|label6">Drag the Items into the Desired Position</property>
                 <attributes>
                   <attribute name="underline" value="True"/>
                 </attributes>
@@ -398,7 +398,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="check-ignore-empty-rows">
-                        <property name="label" translatable="yes">Ignore empty rows</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-ignore-empty-rows">Ignore empty rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -413,7 +413,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="check-identify-categories">
-                        <property name="label" translatable="yes">Identify categories</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-identify-categories">Identify categories</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -428,7 +428,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="check-total-rows">
-                        <property name="label" translatable="yes">Total rows</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-total-rows">Total rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -443,7 +443,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="check-total-columns">
-                        <property name="label" translatable="yes">Total columns</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-total-columns">Total columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -458,7 +458,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="check-add-filter">
-                        <property name="label" translatable="yes">Add filter</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-add-filter">Add filter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -473,7 +473,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="check-drill-to-details">
-                        <property name="label" translatable="yes">Enable drill to details</property>
+                        <property name="label" translatable="yes" context="pivottablelayoutdialog|check-drill-to-details">Enable drill to details</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -492,7 +492,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="pivottablelayoutdialog|label11">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -543,7 +543,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="destination-radio-new-sheet">
-                                    <property name="label" translatable="yes">New sheet</property>
+                                    <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-new-sheet">New sheet</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -559,7 +559,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="destination-radio-selection">
-                                    <property name="label" translatable="yes">Selection</property>
+                                    <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-selection">Selection</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -608,7 +608,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="destination-radio-named-range">
-                                    <property name="label" translatable="yes">Named range</property>
+                                    <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-named-range">Named range</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -629,7 +629,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Destination</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label8">Destination</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -665,7 +665,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="source-radio-selection">
-                                    <property name="label" translatable="yes">Selection</property>
+                                    <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-selection">Selection</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -703,7 +703,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="source-radio-named-range">
-                                    <property name="label" translatable="yes">Named range</property>
+                                    <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-named-range">Named range</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -735,7 +735,7 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Source</property>
+                            <property name="label" translatable="yes" context="pivottablelayoutdialog|label9">Source</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -753,7 +753,7 @@
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Source and Destination</property>
+                    <property name="label" translatable="yes" context="pivottablelayoutdialog|label7">Source and Destination</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui b/sc/uiconfig/scalc/ui/printareasdialog.ui
index fa59396f723f..f591e66201db 100644
--- a/sc/uiconfig/scalc/ui/printareasdialog.ui
+++ b/sc/uiconfig/scalc/ui/printareasdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="PrintAreasDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Print Ranges</property>
+    <property name="title" translatable="yes" context="printareasdialog|PrintAreasDialog">Edit Print Ranges</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -131,10 +131,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">- none -</item>
-                              <item translatable="yes">- entire sheet -</item>
-                              <item translatable="yes">- user defined -</item>
-                              <item translatable="yes">- selection -</item>
+                              <item translatable="yes" context="printareasdialog|lbprintarea">- none -</item>
+                              <item translatable="yes" context="printareasdialog|lbprintarea">- entire sheet -</item>
+                              <item translatable="yes" context="printareasdialog|lbprintarea">- user defined -</item>
+                              <item translatable="yes" context="printareasdialog|lbprintarea">- selection -</item>
                             </items>
                           </object>
                           <packing>
@@ -150,7 +150,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Print Range</property>
+                    <property name="label" translatable="yes" context="printareasdialog|label1">Print Range</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -216,8 +216,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">- none -</item>
-                              <item translatable="yes">- user defined -</item>
+                              <item translatable="yes" context="printareasdialog|lbrepeatrow">- none -</item>
+                              <item translatable="yes" context="printareasdialog|lbrepeatrow">- user defined -</item>
                             </items>
                           </object>
                           <packing>
@@ -233,7 +233,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Rows to Repeat</property>
+                    <property name="label" translatable="yes" context="printareasdialog|label2">Rows to Repeat</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -299,8 +299,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">- none -</item>
-                              <item translatable="yes">- user defined -</item>
+                              <item translatable="yes" context="printareasdialog|lbrepeatcol">- none -</item>
+                              <item translatable="yes" context="printareasdialog|lbrepeatcol">- user defined -</item>
                             </items>
                           </object>
                           <packing>
@@ -316,7 +316,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Columns to Repeat</property>
+                    <property name="label" translatable="yes" context="printareasdialog|label3">Columns to Repeat</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/printeroptions.ui b/sc/uiconfig/scalc/ui/printeroptions.ui
index 2a0b1c0ce825..a001940a86a7 100644
--- a/sc/uiconfig/scalc/ui/printeroptions.ui
+++ b/sc/uiconfig/scalc/ui/printeroptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -22,7 +22,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="suppressemptypages">
-                <property name="label" translatable="yes">Suppress output of empty pages</property>
+                <property name="label" translatable="yes" context="printeroptions|suppressemptypages">Suppress output of empty pages</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -37,7 +37,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Pages</property>
+            <property name="label" translatable="yes" context="printeroptions|label6">Pages</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
index 0b520b9752ae..ef2b1aee58c5 100644
--- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ProtectSheetDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Protect Sheet</property>
+    <property name="title" translatable="yes" context="protectsheetdlg|ProtectSheetDialog">Protect Sheet</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="protect">
-                    <property name="label" translatable="yes">P_rotect this sheet and the contents of protected cells</property>
+                    <property name="label" translatable="yes" context="protectsheetdlg|protect">P_rotect this sheet and the contents of protected cells</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">_Password:</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|label1">_Password:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">password1</property>
                         <property name="xalign">1</property>
@@ -128,7 +128,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">_Confirm:</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|label2">_Confirm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">password2</property>
                         <property name="xalign">1</property>
@@ -192,7 +192,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Allow all users of this sheet to:</property>
+                    <property name="label" translatable="yes" context="protectsheetdlg|label4">Allow all users of this sheet to:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">checklist:border</property>
                     <property name="xalign">0</property>
@@ -228,7 +228,7 @@
                       <object class="GtkLabel" id="protected">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Select protected cells</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|protected">Select protected cells</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -240,7 +240,7 @@
                       <object class="GtkLabel" id="unprotected">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Select unprotected cells</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|unprotected">Select unprotected cells</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -252,7 +252,7 @@
                       <object class="GtkLabel" id="insert-columns">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Insert columns</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|insert-columns">Insert columns</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -264,7 +264,7 @@
                       <object class="GtkLabel" id="insert-rows">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Insert rows</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|insert-rows">Insert rows</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -276,7 +276,7 @@
                       <object class="GtkLabel" id="delete-columns">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Delete columns</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|delete-columns">Delete columns</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -288,7 +288,7 @@
                       <object class="GtkLabel" id="delete-rows">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Delete rows</property>
+                        <property name="label" translatable="yes" context="protectsheetdlg|delete-rows">Delete rows</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui b/sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui
index a6fcf37740ee..a46d426f18f1 100644
--- a/sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui
+++ b/sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryRunStreamScriptDialog">
     <property name="can_focus">False</property>
@@ -10,7 +10,7 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">This data stream is generated by a script. Do you want to execute %URL?</property>
+    <property name="text" translatable="yes" context="queryrunstreamscriptdialog|QueryRunStreamScriptDialog">This data stream is generated by a script. Do you want to execute %URL?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
index 002b8488214d..ae762341c947 100644
--- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
+++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="decimal-places-adjustment">
@@ -19,39 +19,39 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Uniform</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Uniform Integer</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform Integer</col>
         <col id="1">8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Normal</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Normal</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cauchy</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Cauchy</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bernoulli</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Bernoulli</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Binomial</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Binomial</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Chi Squared</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Chi Squared</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Geometric</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Geometric</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Negative Binomial</col>
+        <col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Negative Binomial</col>
         <col id="1">7</col>
       </row>
     </data>
@@ -70,7 +70,7 @@
   <object class="GtkDialog" id="RandomNumberGeneratorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Random Number Generator</property>
+    <property name="title" translatable="yes" context="randomnumbergenerator|RandomNumberGeneratorDialog">Random Number Generator</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -177,7 +177,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Cell range:</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|cell-range-label">Cell range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">cell-range-edit</property>
                       </object>
@@ -222,7 +222,7 @@
               <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="randomnumbergenerator|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -260,7 +260,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Distribution:</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|distribution-label">Distribution:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -285,7 +285,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">...</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|parameter1-label">...</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">parameter1-spin</property>
                       </object>
@@ -300,7 +300,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">...</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|parameter2-label">...</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">parameter2-spin</property>
                       </object>
@@ -348,7 +348,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Random Number Generator</property>
+                <property name="label" translatable="yes" context="randomnumbergenerator|label2">Random Number Generator</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -383,7 +383,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="enable-seed-check">
-                        <property name="label" translatable="yes">Enable custom seed</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|enable-seed-check">Enable custom seed</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -403,7 +403,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Seed:</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|seed-label">Seed:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">seed-spin</property>
                       </object>
@@ -426,7 +426,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="enable-rounding-check">
-                        <property name="label" translatable="yes">Enable rounding</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|enable-rounding-check">Enable rounding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -447,7 +447,7 @@
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Decimal places:</property>
+                        <property name="label" translatable="yes" context="randomnumbergenerator|decimal-places-label">Decimal places:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -478,7 +478,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="randomnumbergenerator|label4">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/regressiondialog.ui b/sc/uiconfig/scalc/ui/regressiondialog.ui
index eee5af894009..71acf97e4983 100644
--- a/sc/uiconfig/scalc/ui/regressiondialog.ui
+++ b/sc/uiconfig/scalc/ui/regressiondialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="RegressionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Regression</property>
+    <property name="title" translatable="yes" context="regressiondialog|RegressionDialog">Regression</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="variable1-range-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Variable 1 range:</property>
+                        <property name="label" translatable="yes" context="regressiondialog|variable1-range-label">Variable 1 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable1-range-edit</property>
                         <property name="xalign">0</property>
@@ -135,7 +135,7 @@
                       <object class="GtkLabel" id="variable2-range-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Variable 2 range:</property>
+                        <property name="label" translatable="yes" context="regressiondialog|variable2-range-label">Variable 2 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                         <property name="xalign">0</property>
@@ -174,7 +174,7 @@
                       <object class="GtkLabel" id="output-range-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="regressiondialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                         <property name="xalign">0</property>
@@ -217,7 +217,7 @@
               <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="regressiondialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -252,7 +252,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="regressiondialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -268,7 +268,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="regressiondialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -290,7 +290,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="regressiondialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -325,7 +325,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="linear-check">
-                        <property name="label" translatable="yes">Linear Regression</property>
+                        <property name="label" translatable="yes" context="regressiondialog|linear-check">Linear Regression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -340,7 +340,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="logarithmic-check">
-                        <property name="label" translatable="yes">Logarithmic Regression</property>
+                        <property name="label" translatable="yes" context="regressiondialog|logarithmic-check">Logarithmic Regression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -354,7 +354,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="power-check">
-                        <property name="label" translatable="yes">Power Regression</property>
+                        <property name="label" translatable="yes" context="regressiondialog|power-check">Power Regression</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -374,7 +374,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Output Regression Types</property>
+                <property name="label" translatable="yes" context="regressiondialog|label3">Output Regression Types</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/retypepassdialog.ui b/sc/uiconfig/scalc/ui/retypepassdialog.ui
index 378e9f5c2045..4e3218cb1b4a 100644
--- a/sc/uiconfig/scalc/ui/retypepassdialog.ui
+++ b/sc/uiconfig/scalc/ui/retypepassdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RetypePass">
     <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">Re-type Password</property>
+    <property name="title" translatable="yes" context="retypepassdialog|RetypePass">Re-type Password</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -90,7 +90,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document.</property>
+                <property name="label" translatable="yes" context="retypepassdialog|descLabel">The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">60</property>
               </object>
@@ -121,7 +121,7 @@
                           <object class="GtkLabel" id="docStatusLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Status unknown</property>
+                            <property name="label" translatable="yes" context="retypepassdialog|docStatusLabel">Status unknown</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -131,7 +131,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="retypeDocButton">
-                            <property name="label" translatable="yes">_Re-type</property>
+                            <property name="label" translatable="yes" context="retypepassdialog|retypeDocButton">_Re-type</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Document protection</property>
+                    <property name="label" translatable="yes" context="retypepassdialog|label2">Document protection</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -214,7 +214,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sheet protection</property>
+                    <property name="label" translatable="yes" context="retypepassdialog|label3">Sheet protection</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/retypepassworddialog.ui b/sc/uiconfig/scalc/ui/retypepassworddialog.ui
index da7a51521285..a6097b0255d3 100644
--- a/sc/uiconfig/scalc/ui/retypepassworddialog.ui
+++ b/sc/uiconfig/scalc/ui/retypepassworddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RetypePasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Re-type Password</property>
+    <property name="title" translatable="yes" context="retypepassworddialog|RetypePasswordDialog">Re-type Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -78,7 +78,7 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkRadioButton" id="retypepassword">
-                <property name="label" translatable="yes">Re-type password</property>
+                <property name="label" translatable="yes" context="retypepassworddialog|retypepassword">Re-type password</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Pa_ssword:</property>
+                        <property name="label" translatable="yes" context="retypepassworddialog|label4">Pa_ssword:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">newpassEntry</property>
                       </object>
@@ -151,7 +151,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Confi_rm:</property>
+                        <property name="label" translatable="yes" context="retypepassworddialog|label5">Confi_rm:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">confirmpassEntry</property>
                       </object>
@@ -162,7 +162,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="mustmatch">
-                        <property name="label" translatable="yes">New password must match the original password</property>
+                        <property name="label" translatable="yes" context="retypepassworddialog|mustmatch">New password must match the original password</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -187,7 +187,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="removepassword">
-                <property name="label" translatable="yes">Remove password from this protected item</property>
+                <property name="label" translatable="yes" context="retypepassworddialog|removepassword">Remove password from this protected item</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/rightfooterdialog.ui b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
index 1b21caf88e61..c00b7e105cdd 100644
--- a/sc/uiconfig/scalc/ui/rightfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/rightfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RightFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Footer (right)</property>
+    <property name="title" translatable="yes" context="rightfooterdialog|RightFooterDialog">Footer (right)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="footerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (right)</property>
+                <property name="label" translatable="yes" context="rightfooterdialog|footerright">Footer (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/sc/uiconfig/scalc/ui/rightheaderdialog.ui b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
index a7f3dd6a2f8a..51d2b2060e1b 100644
--- a/sc/uiconfig/scalc/ui/rightheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/rightheaderdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RightHeaderDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Header (right)</property>
+    <property name="title" translatable="yes" context="rightheaderdialog|RightHeaderDialog">Header (right)</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="headerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (right)</property>
+                <property name="label" translatable="yes" context="rightheaderdialog|headerright">Header (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/sc/uiconfig/scalc/ui/rowheightdialog.ui b/sc/uiconfig/scalc/ui/rowheightdialog.ui
index 42b0ab936c17..24afabaaad8b 100644
--- a/sc/uiconfig/scalc/ui/rowheightdialog.ui
+++ b/sc/uiconfig/scalc/ui/rowheightdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RowHeightDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Row Height</property>
+    <property name="title" translatable="yes" context="rowheightdialog|RowHeightDialog">Row Height</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -85,7 +85,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Height:</property>
+                <property name="label" translatable="yes" context="rowheightdialog|label1">Height:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value:0.00cm</property>
               </object>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="default">
-                <property name="label" translatable="yes">_Default value</property>
+                <property name="label" translatable="yes" context="rowheightdialog|default">_Default value</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui b/sc/uiconfig/scalc/ui/samplingdialog.ui
index 7689beccfb8e..cba7616a8470 100644
--- a/sc/uiconfig/scalc/ui/samplingdialog.ui
+++ b/sc/uiconfig/scalc/ui/samplingdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="period-adjustment">
@@ -18,7 +18,7 @@
   <object class="GtkDialog" id="SamplingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sampling</property>
+    <property name="title" translatable="yes" context="samplingdialog|SamplingDialog">Sampling</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -110,7 +110,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Input range:</property>
+                        <property name="label" translatable="yes" context="samplingdialog|input-range-label">Input range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">input-range-edit</property>
                       </object>
@@ -149,7 +149,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="samplingdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">output-range-edit</property>
                       </object>
@@ -191,7 +191,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Data</property>
+                <property name="label" translatable="yes" context="samplingdialog|label4">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -247,7 +247,7 @@
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Sample size:</property>
+                        <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
                         <property name="mnemonic_widget">sample-size-spin</property>
@@ -259,7 +259,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="random-method-radio">
-                        <property name="label" translatable="yes">Random</property>
+                        <property name="label" translatable="yes" context="samplingdialog|random-method-radio">Random</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -275,7 +275,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="periodic-method-radio">
-                        <property name="label" translatable="yes">Periodic</property>
+                        <property name="label" translatable="yes" context="samplingdialog|periodic-method-radio">Periodic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -312,7 +312,7 @@
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Period:</property>
+                        <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">period-spin</property>
                       </object>
@@ -329,7 +329,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sampling Method</property>
+                <property name="label" translatable="yes" context="samplingdialog|label2">Sampling Method</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui b/sc/uiconfig/scalc/ui/scenariodialog.ui
index 56b8186de491..d8f3be4db4ca 100644
--- a/sc/uiconfig/scalc/ui/scenariodialog.ui
+++ b/sc/uiconfig/scalc/ui/scenariodialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ScenarioDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Scenario</property>
+    <property name="title" translatable="yes" context="scenariodialog|ScenarioDialog">Create Scenario</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -108,7 +108,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Name of Scenario</property>
+                    <property name="label" translatable="yes" context="scenariodialog|label1">Name of Scenario</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Comment</property>
+                    <property name="label" translatable="yes" context="scenariodialog|label2">Comment</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -186,7 +186,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="copyback">
-                            <property name="label" translatable="yes">Copy _back</property>
+                            <property name="label" translatable="yes" context="scenariodialog|copyback">Copy _back</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -201,7 +201,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="copysheet">
-                            <property name="label" translatable="yes">Copy _entire sheet</property>
+                            <property name="label" translatable="yes" context="scenariodialog|copysheet">Copy _entire sheet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="preventchanges">
-                            <property name="label" translatable="yes">_Prevent changes</property>
+                            <property name="label" translatable="yes" context="scenariodialog|preventchanges">_Prevent changes</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -236,7 +236,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="showframe">
-                                <property name="label" translatable="yes">_Display border</property>
+                                <property name="label" translatable="yes" context="scenariodialog|showframe">_Display border</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -261,7 +261,7 @@
                                 </accessibility>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="bordercolor-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Display border in</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="scenariodialog|bordercolor-atkobject">Display border in</property>
                                   </object>
                                 </child>
                               </object>
@@ -284,7 +284,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Settings</property>
+                    <property name="label" translatable="yes" context="scenariodialog|label3">Settings</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -300,7 +300,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Edit Scenario</property>
+                <property name="label" translatable="yes" context="scenariodialog|alttitle">Edit Scenario</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -316,7 +316,7 @@
                   <object class="GtkLabel" id="createdft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Created by</property>
+                    <property name="label" translatable="yes" context="scenariodialog|createdft">Created by</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -327,7 +327,7 @@
                   <object class="GtkLabel" id="onft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">on</property>
+                    <property name="label" translatable="yes" context="scenariodialog|onft">on</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/sc/uiconfig/scalc/ui/scenariomenu.ui b/sc/uiconfig/scalc/ui/scenariomenu.ui
index 834a2b2c61cd..08c8f5ee976a 100644
--- a/sc/uiconfig/scalc/ui/scenariomenu.ui
+++ b/sc/uiconfig/scalc/ui/scenariomenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes" context="scenariomenu|delete">Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Properties...</property>
+        <property name="label" translatable="yes" context="scenariomenu|edit">Properties...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index ed77ca6f64ff..ada709b85805 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.5</property>
@@ -45,7 +45,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0.039999999105930328</property>
-                        <property name="label" translatable="yes">Measurement _unit:</property>
+                        <property name="label" translatable="yes" context="scgeneralpage|label4">Measurement _unit:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">unitlb</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">_Tab stops:</property>
+                        <property name="label" translatable="yes" context="scgeneralpage|label5">_Tab stops:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">tabmf:0.00cm</property>
                       </object>
@@ -99,7 +99,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Metrics</property>
+                <property name="label" translatable="yes" context="scgeneralpage|label1">Metrics</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -135,7 +135,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Update links when opening</property>
+                        <property name="label" translatable="yes" context="scgeneralpage|label6">Update links when opening</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -154,7 +154,7 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkRadioButton" id="alwaysrb">
-                                <property name="label" translatable="yes">_Always</property>
+                                <property name="label" translatable="yes" context="scgeneralpage|alwaysrb">_Always</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="requestrb">
-                                <property name="label" translatable="yes">_On request</property>
+                                <property name="label" translatable="yes" context="scgeneralpage|requestrb">_On request</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -190,7 +190,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="neverrb">
-                                <property name="label" translatable="yes">_Never</property>
+                                <property name="label" translatable="yes" context="scgeneralpage|neverrb">_Never</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -222,7 +222,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Updating</property>
+                <property name="label" translatable="yes" context="scgeneralpage|label2">Updating</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -262,7 +262,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="editmodecb">
-                    <property name="label" translatable="yes">Press Enter to switch to _edit mode</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|editmodecb">Press Enter to switch to _edit mode</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -278,7 +278,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="formatcb">
-                    <property name="label" translatable="yes">Expand _formatting</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|formatcb">Expand _formatting</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -294,7 +294,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="exprefcb">
-                    <property name="label" translatable="yes">Expand _references when new columns/rows are inserted</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|exprefcb">Expand _references when new columns/rows are inserted</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -315,10 +315,10 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">Down</item>
-                      <item translatable="yes">Right</item>
-                      <item translatable="yes">Up</item>
-                      <item translatable="yes">Left</item>
+                      <item translatable="yes" context="scgeneralpage|alignlb">Down</item>
+                      <item translatable="yes" context="scgeneralpage|alignlb">Right</item>
+                      <item translatable="yes" context="scgeneralpage|alignlb">Up</item>
+                      <item translatable="yes" context="scgeneralpage|alignlb">Left</item>
                     </items>
                   </object>
                   <packing>
@@ -328,7 +328,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="aligncb">
-                    <property name="label" translatable="yes">Press Enter to _move selection</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|aligncb">Press Enter to _move selection</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -343,7 +343,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="legacy_cell_selection_cb">
-                    <property name="label" translatable="yes">Use legacy cursor movement behavior when selecting</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|legacy_cell_selection_cb">Use legacy cursor movement behavior when selecting</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -358,7 +358,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="replwarncb">
-                    <property name="label" translatable="yes">Show overwrite _warning when pasting data</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|replwarncb">Show overwrite _warning when pasting data</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -373,7 +373,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="textfmtcb">
-                    <property name="label" translatable="yes">Use printer metrics for text formatting</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|textfmtcb">Use printer metrics for text formatting</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -387,7 +387,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="markhdrcb">
-                    <property name="label" translatable="yes">Highlight sele_ction in column/row headers</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|markhdrcb">Highlight sele_ction in column/row headers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -402,7 +402,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="sortrefupdatecb">
-                    <property name="label" translatable="yes">Update references when sorting range of cells</property>
+                    <property name="label" translatable="yes" context="scgeneralpage|sortrefupdatecb">Update references when sorting range of cells</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -437,7 +437,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Input Settings</property>
+            <property name="label" translatable="yes" context="scgeneralpage|label3">Input Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/searchresults.ui b/sc/uiconfig/scalc/ui/searchresults.ui
index 9ae863770ba7..7146a03a2117 100644
--- a/sc/uiconfig/scalc/ui/searchresults.ui
+++ b/sc/uiconfig/scalc/ui/searchresults.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="SearchResultsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Search Results</property>
+    <property name="title" translatable="yes" context="searchresults|SearchResultsDialog">Search Results</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -57,7 +57,7 @@
           <object class="GtkLabel" id="skipped">
             <property name="visible">False</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">skipped $1 ...</property>
+            <property name="label" translatable="yes" context="searchresults|skipped">skipped $1 ...</property>
           </object>
         </child>
       </object>
diff --git a/sc/uiconfig/scalc/ui/selectdatasource.ui b/sc/uiconfig/scalc/ui/selectdatasource.ui
index a713120ffdc1..ffdd1266968b 100644
--- a/sc/uiconfig/scalc/ui/selectdatasource.ui
+++ b/sc/uiconfig/scalc/ui/selectdatasource.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectDataSourceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Data Source</property>
+    <property name="title" translatable="yes" context="selectdatasource|SelectDataSourceDialog">Select Data Source</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -96,7 +96,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Database:</property>
+                        <property name="label" translatable="yes" context="selectdatasource|label2">_Database:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">database</property>
                       </object>
@@ -112,7 +112,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Type:</property>
+                        <property name="label" translatable="yes" context="selectdatasource|label4">_Type:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">type</property>
                       </object>
@@ -142,10 +142,10 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">Table</item>
-                          <item translatable="yes">Query</item>
-                          <item translatable="yes">Sql</item>
-                          <item translatable="yes">Sql [Native]</item>
+                          <item translatable="yes" context="selectdatasource|type">Table</item>
+                          <item translatable="yes" context="selectdatasource|type">Query</item>
+                          <item translatable="yes" context="selectdatasource|type">Sql</item>
+                          <item translatable="yes" context="selectdatasource|type">Sql [Native]</item>
                         </items>
                       </object>
                       <packing>
@@ -160,7 +160,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Data so_urce:</property>
+                        <property name="label" translatable="yes" context="selectdatasource|label3">Data so_urce:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">datasource</property>
                       </object>
@@ -198,7 +198,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="selectdatasource|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/selectrange.ui b/sc/uiconfig/scalc/ui/selectrange.ui
index 2a4a7d99c7bd..9bbb09486454 100644
--- a/sc/uiconfig/scalc/ui/selectrange.ui
+++ b/sc/uiconfig/scalc/ui/selectrange.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="SelectRangeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Database Range</property>
+    <property name="title" translatable="yes" context="selectrange|SelectRangeDialog">Select Database Range</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="SelectRange">
@@ -104,7 +104,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Ranges</property>
+                <property name="label" translatable="yes" context="selectrange|label1">Ranges</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/selectsource.ui b/sc/uiconfig/scalc/ui/selectsource.ui
index 92acd65e2c68..24d8d5ccc88a 100644
--- a/sc/uiconfig/scalc/ui/selectsource.ui
+++ b/sc/uiconfig/scalc/ui/selectsource.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectSourceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Source</property>
+    <property name="title" translatable="yes" context="selectsource|SelectSourceDialog">Select Source</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -91,7 +91,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="selection">
-                        <property name="label" translatable="yes">_Current selection</property>
+                        <property name="label" translatable="yes" context="selectsource|selection">_Current selection</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -114,7 +114,7 @@
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="namedrange">
-                            <property name="label" translatable="yes">_Named range:</property>
+                            <property name="label" translatable="yes" context="selectsource|namedrange">_Named range:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -155,7 +155,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="database">
-                        <property name="label" translatable="yes">_Data source registered in %PRODUCTNAME</property>
+                        <property name="label" translatable="yes" context="selectsource|database">_Data source registered in %PRODUCTNAME</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="external">
-                        <property name="label" translatable="yes">_External source/interface</property>
+                        <property name="label" translatable="yes" context="selectsource|external">_External source/interface</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -195,7 +195,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="selectsource|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/sharedfooterdialog.ui b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
index 6d529e7a3059..db46ca5b0528 100644
--- a/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SharedFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Headers/Footers</property>
+    <property name="title" translatable="yes" context="sharedfooterdialog|SharedFooterDialog">Headers/Footers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="headerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (right)</property>
+                <property name="label" translatable="yes" context="sharedfooterdialog|headerright">Header (right)</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="headerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header (left)</property>
+                <property name="label" translatable="yes" context="sharedfooterdialog|headerleft">Header (left)</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="footer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer</property>
+                <property name="label" translatable="yes" context="sharedfooterdialog|footer">Footer</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sc/uiconfig/scalc/ui/sharedheaderdialog.ui b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
index dffa8a56d451..d2ebf71ac512 100644
--- a/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
+++ b/sc/uiconfig/scalc/ui/sharedheaderdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SharedHeaderDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Headers/Footers</property>
+    <property name="title" translatable="yes" context="sharedheaderdialog|SharedHeaderDialog">Headers/Footers</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="header">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header</property>
+                <property name="label" translatable="yes" context="sharedheaderdialog|header">Header</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="footerright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (right)</property>
+                <property name="label" translatable="yes" context="sharedheaderdialog|footerright">Footer (right)</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="footerleft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer (left)</property>
+                <property name="label" translatable="yes" context="sharedheaderdialog|footerleft">Footer (left)</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
index 1b6e7be9adb0..89df17e1ec97 100644
--- a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
+++ b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ShareDocumentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Share Document</property>
+    <property name="title" translatable="yes" context="sharedocumentdlg|ShareDocumentDialog">Share Document</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -87,7 +87,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="share">
-                    <property name="label" translatable="yes">_Share this spreadsheet with other users</property>
+                    <property name="label" translatable="yes" context="sharedocumentdlg|share">_Share this spreadsheet with other users</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Note: Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.</property>
+                        <property name="label" translatable="yes" context="sharedocumentdlg|warning">Note: Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">72</property>
                       </object>
@@ -166,7 +166,7 @@
                               <object class="GtkLabel" id="name">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Name</property>
+                                <property name="label" translatable="yes" context="sharedocumentdlg|name">Name</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -178,7 +178,7 @@
                               <object class="GtkLabel" id="accessed">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Accessed</property>
+                                <property name="label" translatable="yes" context="sharedocumentdlg|accessed">Accessed</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -219,7 +219,7 @@
                               <object class="GtkLabel" id="nouserdata">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">No user data available.</property>
+                                <property name="label" translatable="yes" context="sharedocumentdlg|nouserdata">No user data available.</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -231,7 +231,7 @@
                               <object class="GtkLabel" id="unknownuser">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Unknown User</property>
+                                <property name="label" translatable="yes" context="sharedocumentdlg|unknownuser">Unknown User</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -243,7 +243,7 @@
                               <object class="GtkLabel" id="exclusive">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">(exclusive access)</property>
+                                <property name="label" translatable="yes" context="sharedocumentdlg|exclusive">(exclusive access)</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -266,7 +266,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Users Currently Accessing This Spreadsheet</property>
+                    <property name="label" translatable="yes" context="sharedocumentdlg|label1">Users Currently Accessing This Spreadsheet</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui b/sc/uiconfig/scalc/ui/sheetprintpage.ui
index d651a577c088..83330ca7f31c 100644
--- a/sc/uiconfig/scalc/ui/sheetprintpage.ui
+++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustmentFirstPage">
     <property name="lower">1.05</property>
@@ -59,7 +59,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_TOPDOWN">
-                        <property name="label" translatable="yes">_Top to bottom, then right</property>
+                        <property name="label" translatable="yes" context="sheetprintpage|radioBTN_TOPDOWN">_Top to bottom, then right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -78,7 +78,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioBTN_LEFTRIGHT">
-                        <property name="label" translatable="yes">_Left to right, then down</property>
+                        <property name="label" translatable="yes" context="sheetprintpage|radioBTN_LEFTRIGHT">_Left to right, then down</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -99,7 +99,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkBTN_PAGENO">
-                        <property name="label" translatable="yes">First _page number:</property>
+                        <property name="label" translatable="yes" context="sheetprintpage|checkBTN_PAGENO">First _page number:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
           <object class="GtkLabel" id="labelPageOrder">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page Order</property>
+            <property name="label" translatable="yes" context="sheetprintpage|labelPageOrder">Page Order</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -202,7 +202,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_HEADER">
-                    <property name="label" translatable="yes">_Column and row headers</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_HEADER">_Column and row headers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -219,7 +219,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_GRID">
-                    <property name="label" translatable="yes">_Grid</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_GRID">_Grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_NOTES">
-                    <property name="label" translatable="yes">_Comments</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NOTES">_Comments</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -254,7 +254,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_OBJECTS">
-                    <property name="label" translatable="yes">_Objects/Images</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_OBJECTS">_Objects/Images</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -271,7 +271,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_CHARTS">
-                    <property name="label" translatable="yes">Charts</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_CHARTS">Charts</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -288,7 +288,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_DRAWINGS">
-                    <property name="label" translatable="yes">_Drawing objects</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_DRAWINGS">_Drawing objects</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -305,7 +305,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_FORMULAS">
-                    <property name="label" translatable="yes">_Formulas</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_FORMULAS">_Formulas</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -322,7 +322,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkBTN_NULLVALS">
-                    <property name="label" translatable="yes">_Zero values</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|checkBTN_NULLVALS">_Zero values</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -357,7 +357,7 @@
           <object class="GtkLabel" id="labelPrint">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Print</property>
+            <property name="label" translatable="yes" context="sheetprintpage|labelPrint">Print</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -393,7 +393,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Scaling _mode:</property>
+                    <property name="label" translatable="yes" context="sheetprintpage|labelScalingMode">Scaling _mode:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboLB_SCALEMODE</property>
                   </object>
@@ -420,7 +420,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Scaling factor:</property>
+                            <property name="label" translatable="yes" context="sheetprintpage|labelSF">_Scaling factor:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_SCALEALL:0%</property>
                           </object>
@@ -463,7 +463,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Width in pages:</property>
+                            <property name="label" translatable="yes" context="sheetprintpage|labelWP">_Width in pages:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_SCALEPAGEWIDTH</property>
                           </object>
@@ -479,7 +479,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Height in pages:</property>
+                            <property name="label" translatable="yes" context="sheetprintpage|labelHP">_Height in pages:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_SCALEPAGEHEIGHT</property>
                           </object>
@@ -538,7 +538,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">N_umber of pages:</property>
+                            <property name="label" translatable="yes" context="sheetprintpage|labelNP">N_umber of pages:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinED_SCALEPAGENUM</property>
                           </object>
@@ -588,9 +588,9 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Reduce/enlarge printout</item>
-                      <item translatable="yes">Fit print range(s) to width/height</item>
-                      <item translatable="yes">Fit print range(s) on number of pages</item>
+                      <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Reduce/enlarge printout</item>
+                      <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) to width/height</item>
+                      <item translatable="yes" context="sheetprintpage|comboLB_SCALEMODE">Fit print range(s) on number of pages</item>
                     </items>
                   </object>
                   <packing>
@@ -608,7 +608,7 @@
           <object class="GtkLabel" id="labelScale">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Scale</property>
+            <property name="label" translatable="yes" context="sheetprintpage|labelScale">Scale</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/showchangesdialog.ui b/sc/uiconfig/scalc/ui/showchangesdialog.ui
index 3421a8f97a7d..aa143c70cb60 100644
--- a/sc/uiconfig/scalc/ui/showchangesdialog.ui
+++ b/sc/uiconfig/scalc/ui/showchangesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ShowChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Show Changes</property>
+    <property name="title" translatable="yes" context="showchangesdialog|ShowChangesDialog">Show Changes</property>
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="showchanges">
-                    <property name="label" translatable="yes">_Show changes in spreadsheet</property>
+                    <property name="label" translatable="yes" context="showchangesdialog|showchanges">_Show changes in spreadsheet</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="showaccepted">
-                                <property name="label" translatable="yes">Show _accepted changes</property>
+                                <property name="label" translatable="yes" context="showchangesdialog|showaccepted">Show _accepted changes</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -130,7 +130,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="showrejected">
-                                <property name="label" translatable="yes">Show _rejected changes</property>
+                                <property name="label" translatable="yes" context="showchangesdialog|showrejected">Show _rejected changes</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -165,7 +165,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Filter Settings</property>
+                        <property name="label" translatable="yes" context="showchangesdialog|label1">Filter Settings</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sc/uiconfig/scalc/ui/showdetaildialog.ui b/sc/uiconfig/scalc/ui/showdetaildialog.ui
index 3cabda9f5dfa..f80c04056cf1 100644
--- a/sc/uiconfig/scalc/ui/showdetaildialog.ui
+++ b/sc/uiconfig/scalc/ui/showdetaildialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ShowDetail">
     <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">Show Detail</property>
+    <property name="title" translatable="yes" context="showdetaildialog|ShowDetail">Show Detail</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Choose the field containing the detail you want to show</property>
+                <property name="label" translatable="yes" context="showdetaildialog|label1">_Choose the field containing the detail you want to show</property>
                 <property name="use_underline">True</property>
                 <property name="wrap">True</property>
                 <property name="mnemonic_widget">dimsTreeview</property>
diff --git a/sc/uiconfig/scalc/ui/showsheetdialog.ui b/sc/uiconfig/scalc/ui/showsheetdialog.ui
index c27593ab83fe..de02bd56569f 100644
--- a/sc/uiconfig/scalc/ui/showsheetdialog.ui
+++ b/sc/uiconfig/scalc/ui/showsheetdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ShowSheetDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Show Sheet</property>
+    <property name="title" translatable="yes" context="showsheetdialog|ShowSheetDialog">Show Sheet</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -105,7 +105,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hidden Sheets</property>
+                <property name="label" translatable="yes" context="showsheetdialog|label1">Hidden Sheets</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index f396fd0d9720..aefacb7babb7 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -40,7 +40,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                <property name="tooltip_text" translatable="yes" context="sidebaralignment|horizontalalignment|tooltip_text">Horizontal Alignment</property>
                 <property name="halign">start</property>
                 <property name="show_arrow">False</property>
                 <child>
@@ -103,7 +103,7 @@
               <object class="sfxlo-SidebarToolBox" id="verticalalignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+                <property name="tooltip_text" translatable="yes" context="sidebaralignment|verticalalignment|tooltip_text">Vertical Alignment</property>
                 <property name="halign">end</property>
                 <property name="show_arrow">False</property>
                 <child>
@@ -253,7 +253,7 @@
                       <object class="GtkLabel" id="leftindentlabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Indent:</property>
+                        <property name="label" translatable="yes" context="sidebaralignment|leftindentlabel">_Indent:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">leftindent:0pt</property>
                         <property name="xalign">0</property>
@@ -275,14 +275,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Indents from the left edge.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|leftindent|tooltip_text">Indents from the left edge.</property>
                     <property name="invisible_char">•</property>
                     <accessibility>
                       <relation type="labelled-by" target="leftindentlabel"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="leftindent:0pt-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Left Indent</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebaralignment|leftindent-atkobject">Left Indent</property>
                       </object>
                     </child>
                   </object>
@@ -307,12 +307,12 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="mergecells">
-                    <property name="label" translatable="yes">Merge cells</property>
+                    <property name="label" translatable="yes" context="sidebaralignment|mergecells">Merge cells</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Joins the selected cells into one.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|mergecells|tooltip_text">Joins the selected cells into one.</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
                     <property name="image_position">right</property>
@@ -326,12 +326,12 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wraptext">
-                    <property name="label" translatable="yes">Wrap text</property>
+                    <property name="label" translatable="yes" context="sidebaralignment|wraptext">Wrap text</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Wrap texts automatically.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|wraptext|tooltip_text">Wrap texts automatically.</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -366,7 +366,7 @@
               <object class="GtkLabel" id="orientationlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text _orientation:</property>
+                <property name="label" translatable="yes" context="sidebaralignment|orientationlabel">Text _orientation:</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
               </object>
@@ -381,13 +381,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebaralignment|orientationdegrees|tooltip_text">Select the angle for rotation.</property>
                 <accessibility>
                   <relation type="labelled-by" target="orientationlabel"/>
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="orientationdegrees:0degrees-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Text Orientation</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebaralignment|orientationdegrees-atkobject">Text Orientation</property>
                   </object>
                 </child>
               </object>
@@ -408,7 +408,7 @@
                     <property name="can_focus">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Text Extension From Lower Cell Border</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|bottom|tooltip_text">Text Extension From Lower Cell Border</property>
                     <property name="image">image3</property>
                     <property name="xalign">0</property>
                     <property name="always_show_image">True</property>
@@ -426,7 +426,7 @@
                     <property name="can_focus">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Text Extension From Upper Cell Border</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|top|tooltip_text">Text Extension From Upper Cell Border</property>
                     <property name="image">image2</property>
                     <property name="xalign">0</property>
                     <property name="always_show_image">True</property>
@@ -444,7 +444,7 @@
                     <property name="can_focus">True</property>
                     <property name="focus_on_click">False</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Text Extension Inside Cell</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebaralignment|standard|tooltip_text">Text Extension Inside Cell</property>
                     <property name="image">image1</property>
                     <property name="xalign">0</property>
                     <property name="always_show_image">True</property>
@@ -473,7 +473,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="stacked">
-            <property name="label" translatable="yes">Vertically stacked</property>
+            <property name="label" translatable="yes" context="sidebaralignment|stacked">Vertically stacked</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index d3dd5a90208b..9583656eb62e 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="CellAppearancePropertyPanel">
@@ -23,7 +23,7 @@
               <object class="GtkLabel" id="cellbackgroundlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Background:</property>
+                <property name="label" translatable="yes" context="sidebarcellappearance|cellbackgroundlabel">_Background:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">cellbackgroundcolor</property>
                 <property name="xalign">0</property>
@@ -39,7 +39,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|cellbackgroundcolor|tooltip_text">Select the background color of the selected cells.</property>
                 <child>
                   <object class="GtkMenuToolButton" id="cellbackground">
                     <property name="use_action_appearance">False</property>
@@ -47,7 +47,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|cellbackground|tooltip_text">Select the background color of the selected cells.</property>
                     <property name="halign">start</property>
                     <property name="action_name">.uno:BackgroundColor</property>
                     <property name="use_underline">True</property>
@@ -88,7 +88,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
                     <property name="halign">start</property>
                     <property name="action_name">.uno:SetBorderStyle</property>
                     <property name="label" translatable="no">toolbutton1</property>
@@ -123,7 +123,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|linestyle|tooltip_text">Select the line style of the borders.</property>
                         <property name="halign">end</property>
                         <property name="action_name">.uno:LineStyle</property>
                         <property name="label" translatable="no">toolbutton2</property>
@@ -136,7 +136,7 @@
                     </child>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="borderlinestyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Border Line Style</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarcellappearance|borderlinestyle-atkobject">Border Line Style</property>
                       </object>
                     </child>
                   </object>
@@ -151,7 +151,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|borderlinecolor|tooltip_text">Select the line color of the borders.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="linecolor">
                         <property name="use_action_appearance">False</property>
@@ -159,7 +159,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarcellappearance|linecolor|tooltip_text">Select the line color of the borders.</property>
                         <property name="halign">end</property>
                         <property name="hexpand">True</property>
                         <property name="action_name">.uno:FrameLineColor</property>
@@ -172,7 +172,7 @@
                     </child>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="borderlinecolor-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Border Line Color</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarcellappearance|borderlinecolor-atkobject">Border Line Color</property>
                       </object>
                     </child>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index d2e2abac8eb8..abeeb2d20b17 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -35,23 +35,23 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|category|tooltip_text">Select a category of contents.</property>
                 <property name="hexpand">True</property>
                 <items>
-                  <item translatable="yes">General</item>
-                  <item translatable="yes">Number</item>
-                  <item translatable="yes">Percent</item>
-                  <item translatable="yes">Currency</item>
-                  <item translatable="yes">Date </item>
-                  <item translatable="yes">Time</item>
-                  <item translatable="yes">Scientific</item>
-                  <item translatable="yes">Fraction</item>
-                  <item translatable="yes">Boolean Value</item>
-                  <item translatable="yes">Text</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">General</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Number</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Percent</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Currency</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Date </item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Time</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Scientific</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Fraction</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Boolean Value</item>
+                  <item translatable="yes" context="sidebarnumberformat|category">Text</item>
                 </items>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="category-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|category-atkobject">Category</property>
                   </object>
                 </child>
               </object>
@@ -132,7 +132,7 @@
                   <object class="GtkLabel" id="decimalplaceslabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Decimal places:</property>
+                    <property name="label" translatable="yes" context="sidebarnumberformat|decimalplaceslabel">_Decimal places:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">decimalplaces</property>
                   </object>
@@ -147,12 +147,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|decimalplaces|tooltip_text">Enter the number of decimal places that you want to display.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="decimalplaces-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Decimal Places</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|decimalplaces-atkobject">Decimal Places</property>
                       </object>
                     </child>
                   </object>
@@ -166,7 +166,7 @@
                   <object class="GtkLabel" id="denominatorplaceslabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Den_ominator places:</property>
+                    <property name="label" translatable="yes" context="sidebarnumberformat|denominatorplaceslabel">Den_ominator places:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">denominatorplaces</property>
                   </object>
@@ -181,12 +181,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter the number of places for the denominator that you want to display.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|denominatorplaces|tooltip_text">Enter the number of places for the denominator that you want to display.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="denominatorplaces-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Denominator Places</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|denominatorplaces-atkobject">Denominator Places</property>
                       </object>
                     </child>
                   </object>
@@ -213,7 +213,7 @@
                   <object class="GtkLabel" id="leadingzeroeslabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Leading _zeroes:</property>
+                    <property name="label" translatable="yes" context="sidebarnumberformat|leadingzeroeslabel">Leading _zeroes:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">leadingzeroes</property>
                     <property name="xalign">0</property>
@@ -229,12 +229,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|leadingzeroes|tooltip_text">Enter the maximum number of zeroes to display before the decimal point.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="leadingzeroes-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Leading Zeroes</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|leadingzeroes-atkobject">Leading Zeroes</property>
                       </object>
                     </child>
                   </object>
@@ -261,13 +261,13 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="negativenumbersred">
-            <property name="label" translatable="yes">_Negative numbers in red</property>
+            <property name="label" translatable="yes" context="sidebarnumberformat|negativenumbersred">_Negative numbers in red</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
+            <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|negativenumbersred|tooltip_text">Changes the font color of negative numbers to red.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -280,13 +280,13 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="thousandseparator">
-            <property name="label" translatable="yes">_Thousands separator</property>
+            <property name="label" translatable="yes" context="sidebarnumberformat|thousandseparator">_Thousands separator</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
+            <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|thousandseparator|tooltip_text">Inserts a separator between thousands.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -299,13 +299,13 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="engineeringnotation">
-            <property name="label" translatable="yes">_Engineering notation</property>
+            <property name="label" translatable="yes" context="sidebarnumberformat|engineeringnotation">_Engineering notation</property>
             <property name="use_action_appearance">False</property>
             <property name="visible">False</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Ensures that exponent is a multiple of 3.</property>
+            <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|engineeringnotation|tooltip_text">Ensures that exponent is a multiple of 3.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
diff --git a/sc/uiconfig/scalc/ui/simplerefdialog.ui b/sc/uiconfig/scalc/ui/simplerefdialog.ui
index 04a33749e54c..af989513987c 100644
--- a/sc/uiconfig/scalc/ui/simplerefdialog.ui
+++ b/sc/uiconfig/scalc/ui/simplerefdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SimpleRefDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Set range</property>
+    <property name="title" translatable="yes" context="simplerefdialog|SimpleRefDialog">Set range</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -27,7 +27,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Area:</property>
+                <property name="label" translatable="yes" context="simplerefdialog|area">Area:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">assign</property>
               </object>
diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui
index fb2ae2ab0256..211d718d1acb 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SolverDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Solver</property>
+    <property name="title" translatable="yes" context="solverdlg|SolverDialog">Solver</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">O_ptions...</property>
+                <property name="label" translatable="yes" context="solverdlg|options">O_ptions...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -62,7 +62,7 @@
             </child>
             <child>
               <object class="GtkButton" id="solve">
-                <property name="label" translatable="yes">_Solve</property>
+                <property name="label" translatable="yes" context="solverdlg|solve">_Solve</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -104,7 +104,7 @@
                   <object class="GtkLabel" id="targetlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Target cell</property>
+                    <property name="label" translatable="yes" context="solverdlg|targetlabel">_Target cell</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -117,7 +117,7 @@
                   <object class="GtkLabel" id="result">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Optimize result to</property>
+                    <property name="label" translatable="yes" context="solverdlg|result">Optimize result to</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0.029999999329447746</property>
                   </object>
@@ -130,7 +130,7 @@
                   <object class="GtkLabel" id="changelabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_By changing cells</property>
+                    <property name="label" translatable="yes" context="solverdlg|changelabel">_By changing cells</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -141,7 +141,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="min">
-                    <property name="label" translatable="yes">Minim_um</property>
+                    <property name="label" translatable="yes" context="solverdlg|min">Minim_um</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="max">
-                    <property name="label" translatable="yes">_Maximum</property>
+                    <property name="label" translatable="yes" context="solverdlg|max">_Maximum</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -260,7 +260,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="value">
-                        <property name="label" translatable="yes">_Value of</property>
+                        <property name="label" translatable="yes" context="solverdlg|value">_Value of</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -363,7 +363,7 @@
                           <object class="GtkLabel" id="cellreflabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Cell reference</property>
+                            <property name="label" translatable="yes" context="solverdlg|cellreflabel">_Cell reference</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -377,7 +377,7 @@
                           <object class="GtkLabel" id="oplabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Operator</property>
+                            <property name="label" translatable="yes" context="solverdlg|oplabel">_Operator</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -391,7 +391,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">6</property>
-                            <property name="label" translatable="yes">V_alue</property>
+                            <property name="label" translatable="yes" context="solverdlg|constraintlabel">V_alue</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -410,7 +410,7 @@
                             <property name="width_chars">20</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="ref1edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref1edit-atkobject">Cell reference</property>
                               </object>
                             </child>
                           </object>
@@ -428,7 +428,7 @@
                             <property name="width_chars">20</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="ref2edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref2edit-atkobject">Cell reference</property>
                               </object>
                             </child>
                           </object>
@@ -446,7 +446,7 @@
                             <property name="width_chars">20</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="ref3edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref3edit-atkobject">Cell reference</property>
                               </object>
                             </child>
                           </object>
@@ -464,7 +464,7 @@
                             <property name="width_chars">20</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="ref4edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Cell reference</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|ref4edit-atkobject">Cell reference</property>
                               </object>
                             </child>
                           </object>
@@ -524,15 +524,15 @@
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
                             <items>
-                              <item translatable="yes">&lt;=</item>
-                              <item translatable="yes">=</item>
-                              <item translatable="yes">=&gt;</item>
-                              <item translatable="yes">Integer</item>
-                              <item translatable="yes">Binary</item>
+                              <item translatable="yes" context="solverdlg|op1list">&lt;=</item>
+                              <item translatable="yes" context="solverdlg|op1list">=</item>
+                              <item translatable="yes" context="solverdlg|op1list">=&gt;</item>
+                              <item translatable="yes" context="solverdlg|op1list">Integer</item>
+                              <item translatable="yes" context="solverdlg|op1list">Binary</item>
                             </items>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="op1list-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Operator</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op1list-atkobject">Operator</property>
                               </object>
                             </child>
                           </object>
@@ -548,15 +548,15 @@
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
                             <items>
-                              <item translatable="yes">&lt;=</item>
-                              <item translatable="yes">=</item>
-                              <item translatable="yes">=&gt;</item>
-                              <item translatable="yes">Integer</item>
-                              <item translatable="yes">Binary</item>
+                              <item translatable="yes" context="solverdlg|op2list">&lt;=</item>
+                              <item translatable="yes" context="solverdlg|op2list">=</item>
+                              <item translatable="yes" context="solverdlg|op2list">=&gt;</item>
+                              <item translatable="yes" context="solverdlg|op2list">Integer</item>
+                              <item translatable="yes" context="solverdlg|op2list">Binary</item>
                             </items>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="op2list-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Operator</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op2list-atkobject">Operator</property>
                               </object>
                             </child>
                           </object>
@@ -572,15 +572,15 @@
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
                             <items>
-                              <item translatable="yes">&lt;=</item>
-                              <item translatable="yes">=</item>
-                              <item translatable="yes">=&gt;</item>
-                              <item translatable="yes">Integer</item>
-                              <item translatable="yes">Binary</item>
+                              <item translatable="yes" context="solverdlg|op3list">&lt;=</item>
+                              <item translatable="yes" context="solverdlg|op3list">=</item>
+                              <item translatable="yes" context="solverdlg|op3list">=&gt;</item>
+                              <item translatable="yes" context="solverdlg|op3list">Integer</item>
+                              <item translatable="yes" context="solverdlg|op3list">Binary</item>
                             </items>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="op3list-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Operator</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op3list-atkobject">Operator</property>
                               </object>
                             </child>
                           </object>
@@ -596,15 +596,15 @@
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
                             <items>
-                              <item translatable="yes">&lt;=</item>
-                              <item translatable="yes">=</item>
-                              <item translatable="yes">=&gt;</item>
-                              <item translatable="yes">Integer</item>
-                              <item translatable="yes">Binary</item>
+                              <item translatable="yes" context="solverdlg|op4list">&lt;=</item>
+                              <item translatable="yes" context="solverdlg|op4list">=</item>
+                              <item translatable="yes" context="solverdlg|op4list">=&gt;</item>
+                              <item translatable="yes" context="solverdlg|op4list">Integer</item>
+                              <item translatable="yes" context="solverdlg|op4list">Binary</item>
                             </items>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="op4list-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Operator</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|op4list-atkobject">Operator</property>
                               </object>
                             </child>
                           </object>
@@ -623,7 +623,7 @@
                             <property name="width_chars">15</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="val1edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val1edit-atkobject">Value</property>
                               </object>
                             </child>
                           </object>
@@ -642,7 +642,7 @@
                             <property name="width_chars">15</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="val2edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val2edit-atkobject">Value</property>
                               </object>
                             </child>
                           </object>
@@ -661,7 +661,7 @@
                             <property name="width_chars">15</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="val3edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val3edit-atkobject">Value</property>
                               </object>
                             </child>
                           </object>
@@ -680,7 +680,7 @@
                             <property name="width_chars">15</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="val4edit-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="solverdlg|val4edit-atkobject">Value</property>
                               </object>
                             </child>
                           </object>
@@ -739,7 +739,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Remove</property>
+                            <property name="tooltip_text" translatable="yes" context="solverdlg|del2|tooltip_text">Remove</property>
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
@@ -752,7 +752,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Remove</property>
+                            <property name="tooltip_text" translatable="yes" context="solverdlg|del1|tooltip_text">Remove</property>
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
@@ -765,7 +765,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Remove</property>
+                            <property name="tooltip_text" translatable="yes" context="solverdlg|del3|tooltip_text">Remove</property>
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
@@ -778,7 +778,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Remove</property>
+                            <property name="tooltip_text" translatable="yes" context="solverdlg|del4|tooltip_text">Remove</property>
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
@@ -806,7 +806,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Limiting Conditions</property>
+                    <property name="label" translatable="yes" context="solverdlg|label1">Limiting Conditions</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/solveroptionsdialog.ui b/sc/uiconfig/scalc/ui/solveroptionsdialog.ui
index bbe05bbaffe0..8b9ce4dd15b8 100644
--- a/sc/uiconfig/scalc/ui/solveroptionsdialog.ui
+++ b/sc/uiconfig/scalc/ui/solveroptionsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SolverOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Options</property>
+    <property name="title" translatable="yes" context="solveroptionsdialog|SolverOptionsDialog">Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -30,7 +30,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Solver engine:</property>
+                    <property name="label" translatable="yes" context="solveroptionsdialog|label2">Solver engine:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">engine</property>
                   </object>
@@ -67,7 +67,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Settings:</property>
+                    <property name="label" translatable="yes" context="solveroptionsdialog|label1">Settings:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">settings:border</property>
                   </object>
@@ -93,7 +93,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="edit">
-                    <property name="label" translatable="yes">Edit...</property>
+                    <property name="label" translatable="yes" context="solveroptionsdialog|edit">Edit...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/solverprogressdialog.ui b/sc/uiconfig/scalc/ui/solverprogressdialog.ui
index 71baf978db4a..08f968e0eb6b 100644
--- a/sc/uiconfig/scalc/ui/solverprogressdialog.ui
+++ b/sc/uiconfig/scalc/ui/solverprogressdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SolverProgressDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Solving...</property>
+    <property name="title" translatable="yes" context="solverprogressdialog|SolverProgressDialog">Solving...</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -23,7 +23,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Solving in progress...</property>
+                <property name="label" translatable="yes" context="solverprogressdialog|label2">Solving in progress...</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -35,7 +35,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(time limit # seconds)</property>
+                <property name="label" translatable="yes" context="solverprogressdialog|progress">(time limit # seconds)</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/solversuccessdialog.ui b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
index 7ded5cfd3b7e..8f2fdb20e4ef 100644
--- a/sc/uiconfig/scalc/ui/solversuccessdialog.ui
+++ b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SolverSuccessDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Solving Result</property>
+    <property name="title" translatable="yes" context="solversuccessdialog|SolverSuccessDialog">Solving Result</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -23,7 +23,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Do you want to keep the result or do you want to restore previous values?</property>
+                <property name="label" translatable="yes" context="solversuccessdialog|label1">Do you want to keep the result or do you want to restore previous values?</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">40</property>
               </object>
@@ -37,7 +37,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Solving successfully finished.</property>
+                <property name="label" translatable="yes" context="solversuccessdialog|label2">Solving successfully finished.</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -49,7 +49,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Result:</property>
+                <property name="label" translatable="yes" context="solversuccessdialog|result">Result:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -69,7 +69,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Keep Result</property>
+                <property name="label" translatable="yes" context="solversuccessdialog|ok">Keep Result</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -85,7 +85,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Restore Previous</property>
+                <property name="label" translatable="yes" context="solversuccessdialog|cancel">Restore Previous</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
index c7347ef18510..a7862d776d34 100644
--- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkScrolledWindow" id="SortCriteriaPage">
     <property name="visible">True</property>
diff --git a/sc/uiconfig/scalc/ui/sortdialog.ui b/sc/uiconfig/scalc/ui/sortdialog.ui
index 878ad6c22ee4..af816a438fd7 100644
--- a/sc/uiconfig/scalc/ui/sortdialog.ui
+++ b/sc/uiconfig/scalc/ui/sortdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SortDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sort</property>
+    <property name="title" translatable="yes" context="sortdialog|SortDialog">Sort</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="criteria">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sort Criteria</property>
+                <property name="label" translatable="yes" context="sortdialog|criteria">Sort Criteria</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="sortdialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sc/uiconfig/scalc/ui/sortkey.ui b/sc/uiconfig/scalc/ui/sortkey.ui
index bde36db08002..29f5c5f8e09f 100644
--- a/sc/uiconfig/scalc/ui/sortkey.ui
+++ b/sc/uiconfig/scalc/ui/sortkey.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="SortKeyFrame">
     <property name="visible">True</property>
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="up">
-                <property name="label" translatable="yes">_Ascending</property>
+                <property name="label" translatable="yes" context="sortkey|up">_Ascending</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="down">
-                <property name="label" translatable="yes">_Descending</property>
+                <property name="label" translatable="yes" context="sortkey|down">_Descending</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -78,7 +78,7 @@
       <object class="GtkLabel" id="sortft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sort Key </property>
+        <property name="label" translatable="yes" context="sortkey|sortft">Sort Key </property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 6a1a1579400e..d861eeab3e35 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="SortOptionsPage">
@@ -29,7 +29,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="case">
-                    <property name="label" translatable="yes">Case _sensitive</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|case">Case _sensitive</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -44,7 +44,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="header">
-                    <property name="label" translatable="yes">Range contains...</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|header">Range contains...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -58,7 +58,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="formats">
-                    <property name="label" translatable="yes">Include formats</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|formats">Include formats</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -72,7 +72,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="naturalsort">
-                    <property name="label" translatable="yes">Enable natural sort</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|naturalsort">Enable natural sort</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -86,7 +86,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="includenotes">
-                    <property name="label" translatable="yes">Include comments-only boundary column(s)</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|includenotes">Include comments-only boundary column(s)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -100,7 +100,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="copyresult">
-                    <property name="label" translatable="yes">Copy sort results to:</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|copyresult">Copy sort results to:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -126,7 +126,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="outarealb-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Copy sort results to:</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outarealb-atkobject">Copy sort results to:</property>
                       </object>
                     </child>
                   </object>
@@ -146,7 +146,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="outareaed-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Copy sort results to:</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|outareaed-atkobject">Copy sort results to:</property>
                       </object>
                     </child>
                   </object>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="sortuser">
-                    <property name="label" translatable="yes">Custom sort order</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|sortuser">Custom sort order</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="sortuserlb-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Custom sort order</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|sortuserlb-atkobject">Custom sort order</property>
                       </object>
                     </child>
                   </object>
@@ -198,7 +198,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Language</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|label6">Language</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">language</property>
                   </object>
@@ -212,7 +212,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|algorithmft">Options</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">algorithmlb</property>
                   </object>
@@ -267,7 +267,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sort Options</property>
+            <property name="label" translatable="yes" context="sortoptionspage|label2">Sort Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -298,7 +298,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkRadioButton" id="topdown">
-                    <property name="label" translatable="yes">_Top to bottom (sort rows)</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|topdown">_Top to bottom (sort rows)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -315,7 +315,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="leftright">
-                    <property name="label" translatable="yes">L_eft to right (sort columns)</property>
+                    <property name="label" translatable="yes" context="sortoptionspage|leftright">L_eft to right (sort columns)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -337,7 +337,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Direction</property>
+            <property name="label" translatable="yes" context="sortoptionspage|label1">Direction</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/sortwarning.ui b/sc/uiconfig/scalc/ui/sortwarning.ui
index 1b00910850e3..e57134a5a5e0 100644
--- a/sc/uiconfig/scalc/ui/sortwarning.ui
+++ b/sc/uiconfig/scalc/ui/sortwarning.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="SortWarning">
     <property name="can_focus">False</property>
     <property name="valign">start</property>
-    <property name="title" translatable="yes">Sort Range</property>
+    <property name="title" translatable="yes" context="sortwarning|SortWarning">Sort Range</property>
     <property name="default_height">200</property>
     <property name="type_hint">dialog</property>
     <child>
@@ -32,7 +32,7 @@
                 <property name="margin_top">6</property>
                 <property name="margin_bottom">6</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The cells next to the current selection also contain data. Do you want to extend the sort range to %1, or sort the currently selected range, %2?</property>
+                <property name="label" translatable="yes" context="sortwarning|sorttext">The cells next to the current selection also contain data. Do you want to extend the sort range to %1, or sort the currently selected range, %2?</property>
                 <property name="wrap">True</property>
                 <property name="wrap_mode">word-char</property>
                 <property name="max_width_chars">72</property>
@@ -52,7 +52,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="extend">
-                    <property name="label" translatable="yes">_Extend selection</property>
+                    <property name="label" translatable="yes" context="sortwarning|extend">_Extend selection</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
@@ -68,7 +68,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="current">
-                    <property name="label" translatable="yes">Current selection</property>
+                    <property name="label" translatable="yes" context="sortwarning|current">Current selection</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -112,7 +112,7 @@
                 <property name="margin_top">6</property>
                 <property name="margin_bottom">6</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tip: The sort range can be detected automatically. Place the cell cursor inside a list and execute sort. The whole range of neighboring non-empty cells will then be sorted.</property>
+                <property name="label" translatable="yes" context="sortwarning|sorttip">Tip: The sort range can be detected automatically. Place the cell cursor inside a list and execute sort. The whole range of neighboring non-empty cells will then be sorted.</property>
                 <property name="wrap">True</property>
                 <property name="wrap_mode">word-char</property>
                 <property name="max_width_chars">72</property>
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 384874ab8f95..13052c5d5883 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="StandardFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Standard Filter</property>
+    <property name="title" translatable="yes" context="standardfilterdialog|StandardFilterDialog">Standard Filter</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -116,15 +116,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="standardfilterdialog|connect1">AND</item>
+                          <item translatable="yes" context="standardfilterdialog|connect1">OR</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label2"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Operator 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect1-atkobject">Operator 1</property>
                           </object>
                         </child>
                       </object>
@@ -138,15 +138,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="standardfilterdialog|connect2">AND</item>
+                          <item translatable="yes" context="standardfilterdialog|connect2">OR</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label2"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Operator 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect2-atkobject">Operator 2</property>
                           </object>
                         </child>
                       </object>
@@ -160,12 +160,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="standardfilterdialog|connect3">AND</item>
+                          <item translatable="yes" context="standardfilterdialog|connect3">OR</item>
                         </items>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Operator 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect3-atkobject">Operator 3</property>
                           </object>
                         </child>
                       </object>
@@ -179,12 +179,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">AND</item>
-                          <item translatable="yes">OR</item>
+                          <item translatable="yes" context="standardfilterdialog|connect4">AND</item>
+                          <item translatable="yes" context="standardfilterdialog|connect4">OR</item>
                         </items>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Operator 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|connect4-atkobject">Operator 4</property>
                           </object>
                         </child>
                       </object>
@@ -197,7 +197,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Operator</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|label2">Operator</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -208,7 +208,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Field name</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|label3">Field name</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -219,7 +219,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|label4">Condition</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -230,7 +230,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Value</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|label5">Value</property>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -246,7 +246,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="field1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Field Name 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field1-atkobject">Field Name 1</property>
                           </object>
                         </child>
                       </object>
@@ -264,7 +264,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="field2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Field Name 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field2-atkobject">Field Name 2</property>
                           </object>
                         </child>
                       </object>
@@ -282,7 +282,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="field3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Field Name 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field3-atkobject">Field Name 3</property>
                           </object>
                         </child>
                       </object>
@@ -297,7 +297,7 @@
                         <property name="can_focus">False</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="field4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Field Name 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|field4-atkobject">Field Name 4</property>
                           </object>
                         </child>
                       </object>
@@ -317,23 +317,23 @@
                           <item translatable="no">&lt;=</item>
                           <item translatable="no">&gt;=</item>
                           <item translatable="no">&lt;&gt;</item>
-                          <item translatable="yes">Largest</item>
-                          <item translatable="yes">Smallest</item>
-                          <item translatable="yes">Largest %</item>
-                          <item translatable="yes">Smallest %</item>
-                          <item translatable="yes">Contains</item>
-                          <item translatable="yes">Does not contain</item>
-                          <item translatable="yes">Begins with</item>
-                          <item translatable="yes">Does not begin with</item>
-                          <item translatable="yes">Ends with</item>
-                          <item translatable="yes">Does not end with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Largest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Smallest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Largest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Smallest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Contains</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Does not contain</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Begins with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Does not begin with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Ends with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond1">Does not end with</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cond1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Condition 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond1-atkobject">Condition 1</property>
                           </object>
                         </child>
                       </object>
@@ -353,23 +353,23 @@
                           <item translatable="no">&lt;=</item>
                           <item translatable="no">&gt;=</item>
                           <item translatable="no">&lt;&gt;</item>
-                          <item translatable="yes">Largest</item>
-                          <item translatable="yes">Smallest</item>
-                          <item translatable="yes">Largest %</item>
-                          <item translatable="yes">Smallest %</item>
-                          <item translatable="yes">Contains</item>
-                          <item translatable="yes">Does not contain</item>
-                          <item translatable="yes">Begins with</item>
-                          <item translatable="yes">Does not begin with</item>
-                          <item translatable="yes">Ends with</item>
-                          <item translatable="yes">Does not end with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Largest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Smallest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Largest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Smallest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Contains</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Does not contain</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Begins with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Does not begin with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Ends with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond2">Does not end with</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cond2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Condition 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond2-atkobject">Condition 2</property>
                           </object>
                         </child>
                       </object>
@@ -389,23 +389,23 @@
                           <item translatable="no">&lt;=</item>
                           <item translatable="no">&gt;=</item>
                           <item translatable="no">&lt;&gt;</item>
-                          <item translatable="yes">Largest</item>
-                          <item translatable="yes">Smallest</item>
-                          <item translatable="yes">Largest %</item>
-                          <item translatable="yes">Smallest %</item>
-                          <item translatable="yes">Contains</item>
-                          <item translatable="yes">Does not contain</item>
-                          <item translatable="yes">Begins with</item>
-                          <item translatable="yes">Does not begin with</item>
-                          <item translatable="yes">Ends with</item>
-                          <item translatable="yes">Does not end with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Largest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Smallest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Largest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Smallest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Contains</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Does not contain</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Begins with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Does not begin with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Ends with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond3">Does not end with</item>
                         </items>
                         <accessibility>
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cond3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Condition 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond3-atkobject">Condition 3</property>
                           </object>
                         </child>
                       </object>
@@ -425,20 +425,20 @@
                           <item translatable="no">&lt;=</item>
                           <item translatable="no">&gt;=</item>
                           <item translatable="no">&lt;&gt;</item>
-                          <item translatable="yes">Largest</item>
-                          <item translatable="yes">Smallest</item>
-                          <item translatable="yes">Largest %</item>
-                          <item translatable="yes">Smallest %</item>
-                          <item translatable="yes">Contains</item>
-                          <item translatable="yes">Does not contain</item>
-                          <item translatable="yes">Begins with</item>
-                          <item translatable="yes">Does not begin with</item>
-                          <item translatable="yes">Ends with</item>
-                          <item translatable="yes">Does not end with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Largest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Smallest</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Largest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Smallest %</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Contains</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Does not contain</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Begins with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Does not begin with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Ends with</item>
+                          <item translatable="yes" context="standardfilterdialog|cond4">Does not end with</item>
                         </items>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cond4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Condition 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|cond4-atkobject">Condition 4</property>
                           </object>
                         </child>
                       </object>
@@ -463,7 +463,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="val1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Value 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val1-atkobject">Value 1</property>
                           </object>
                         </child>
                       </object>
@@ -488,7 +488,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="val2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Value 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val2-atkobject">Value 2</property>
                           </object>
                         </child>
                       </object>
@@ -513,7 +513,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="val3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Value 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val3-atkobject">Value 3</property>
                           </object>
                         </child>
                       </object>
@@ -535,7 +535,7 @@
                         </child>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="val4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Value 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|val4-atkobject">Value 4</property>
                           </object>
                         </child>
                       </object>
@@ -552,7 +552,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Filter Criteria</property>
+                <property name="label" translatable="yes" context="standardfilterdialog|label1">Filter Criteria</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -590,7 +590,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="case">
-                        <property name="label" translatable="yes">_Case sensitive</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|case">_Case sensitive</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -606,7 +606,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="header">
-                        <property name="label" translatable="yes">Range c_ontains column labels</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|header">Range c_ontains column labels</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -622,7 +622,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="regexp">
-                        <property name="label" translatable="yes">Regular _expressions</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|regexp">Regular _expressions</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -638,7 +638,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="unique">
-                        <property name="label" translatable="yes">_No duplications</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|unique">_No duplications</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -654,7 +654,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="copyresult">
-                        <property name="label" translatable="yes">Co_py results to:</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|copyresult">Co_py results to:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -674,7 +674,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="destpers">
-                        <property name="label" translatable="yes">_Keep filter criteria</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|destpers">_Keep filter criteria</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -710,7 +710,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="lbcopyarea-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Copy results to</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|lbcopyarea-atkobject">Copy results to</property>
                           </object>
                         </child>
                       </object>
@@ -732,7 +732,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="edcopyarea-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Copy results to</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="standardfilterdialog|edcopyarea-atkobject">Copy results to</property>
                           </object>
                         </child>
                       </object>
@@ -770,7 +770,7 @@
                       <object class="GtkLabel" id="dbarealabel">
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Data range:</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|dbarealabel">Data range:</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -783,7 +783,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">dummy</property>
+                        <property name="label" translatable="yes" context="standardfilterdialog|dbarea">dummy</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -803,7 +803,7 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Op_tions</property>
+                <property name="label" translatable="yes" context="standardfilterdialog|label6">Op_tions</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/sc/uiconfig/scalc/ui/statisticsinfopage.ui b/sc/uiconfig/scalc/ui/statisticsinfopage.ui
index a94e5dff1511..7bdb53658347 100644
--- a/sc/uiconfig/scalc/ui/statisticsinfopage.ui
+++ b/sc/uiconfig/scalc/ui/statisticsinfopage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="StatisticsInfoPage">
     <property name="visible">True</property>
@@ -24,7 +24,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Pages:</property>
+                <property name="label" translatable="yes" context="statisticsinfopage|label6">Pages:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nopages</property>
               </object>
@@ -50,7 +50,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Cells:</property>
+                <property name="label" translatable="yes" context="statisticsinfopage|label5">Cells:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nocells</property>
               </object>
@@ -76,7 +76,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Sheets:</property>
+                <property name="label" translatable="yes" context="statisticsinfopage|label2">Sheets:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nosheets</property>
               </object>
@@ -103,7 +103,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Formula groups:</property>
+                <property name="label" translatable="yes" context="statisticsinfopage|label3">Formula groups:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">noformula</property>
               </object>
@@ -133,7 +133,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Document: </property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label1">Document: </property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sc/uiconfig/scalc/ui/subtotaldialog.ui b/sc/uiconfig/scalc/ui/subtotaldialog.ui
index c987e8e30c32..6035465b73fa 100644
--- a/sc/uiconfig/scalc/ui/subtotaldialog.ui
+++ b/sc/uiconfig/scalc/ui/subtotaldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SubTotalDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Subtotals</property>
+    <property name="title" translatable="yes" context="subtotaldialog|SubTotalDialog">Subtotals</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -112,7 +112,7 @@
               <object class="GtkLabel" id="1stgroup">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">1st Group</property>
+                <property name="label" translatable="yes" context="subtotaldialog|1stgroup">1st Group</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="2ndgroup">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">2nd Group</property>
+                <property name="label" translatable="yes" context="subtotaldialog|2ndgroup">2nd Group</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="3rdgroup">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">3rd Group</property>
+                <property name="label" translatable="yes" context="subtotaldialog|3rdgroup">3rd Group</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -153,7 +153,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="subtotaldialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index d8085ec92afb..a10a47b05f35 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkListStore" id="liststore1">
@@ -9,37 +9,37 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Sum</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Sum</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Count</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Count</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Average</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Average</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Max</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Max</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Min</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Min</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Product</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Product</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Count (numbers only)</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Count (numbers only)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">StDev (Sample)</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">StDev (Sample)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">StDevP (Population)</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">StDevP (Population)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Var (Sample)</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">Var (Sample)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">VarP (Population)</col>
+        <col id="0" translatable="yes" context="subtotalgrppage|liststore1">VarP (Population)</col>
       </row>
     </data>
   </object>
@@ -59,7 +59,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Group by:</property>
+            <property name="label" translatable="yes" context="subtotalgrppage|label1">Group by:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">group_by</property>
           </object>
@@ -100,7 +100,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Calculate subtotals for:</property>
+            <property name="label" translatable="yes" context="subtotalgrppage|label2">Calculate subtotals for:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">columns:border</property>
           </object>
@@ -116,7 +116,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Use function:</property>
+            <property name="label" translatable="yes" context="subtotalgrppage|label3">Use function:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">functions:border</property>
           </object>
diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
index 447e8e19e7c5..b1b3dd97d2f2 100644
--- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
+++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="SubTotalOptionsPage">
@@ -32,7 +32,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="pagebreak">
-                    <property name="label" translatable="yes">_Page break between groups</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|pagebreak">_Page break between groups</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -50,7 +50,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="case">
-                    <property name="label" translatable="yes">_Case sensitive</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|case">_Case sensitive</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="sort">
-                    <property name="label" translatable="yes">Pre-_sort area according to groups</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|sort">Pre-_sort area according to groups</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -92,7 +92,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Groups</property>
+            <property name="label" translatable="yes" context="subtotaloptionspage|label1">Groups</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -130,7 +130,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="ascending">
-                    <property name="label" translatable="yes">_Ascending</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|ascending">_Ascending</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -150,7 +150,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="descending">
-                    <property name="label" translatable="yes">D_escending</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|descending">D_escending</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -170,7 +170,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="formats">
-                    <property name="label" translatable="yes">I_nclude formats</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|formats">I_nclude formats</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -188,7 +188,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="btnuserdef">
-                    <property name="label" translatable="yes">C_ustom sort order</property>
+                    <property name="label" translatable="yes" context="subtotaloptionspage|btnuserdef">C_ustom sort order</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sort</property>
+            <property name="label" translatable="yes" context="subtotaloptionspage|label2">Sort</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/tabcolordialog.ui b/sc/uiconfig/scalc/ui/tabcolordialog.ui
index 0a52a01fc42d..b7af31b2d34f 100644
--- a/sc/uiconfig/scalc/ui/tabcolordialog.ui
+++ b/sc/uiconfig/scalc/ui/tabcolordialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="TabColorDialog">
diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 6a19d661e4f4..85f2bf7125bd 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="TextImportCsvDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Text Import</property>
+    <property name="title" translatable="yes" context="textimportcsv|TextImportCsvDialog">Text Import</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -107,7 +107,7 @@
                           <object class="GtkLabel" id="textcharset">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Ch_aracter set:</property>
+                            <property name="label" translatable="yes" context="textimportcsv|textcharset">Ch_aracter set:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">charset</property>
                             <property name="xalign">0</property>
@@ -121,7 +121,7 @@
                           <object class="GtkLabel" id="textlanguage">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Language:</property>
+                            <property name="label" translatable="yes" context="textimportcsv|textlanguage">_Language:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">language</property>
                             <property name="xalign">0</property>
@@ -135,7 +135,7 @@
                           <object class="GtkLabel" id="textfromrow">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">From ro_w:</property>
+                            <property name="label" translatable="yes" context="textimportcsv|textfromrow">From ro_w:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">fromrow</property>
                             <property name="xalign">0</property>
@@ -186,7 +186,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Import</property>
+                    <property name="label" translatable="yes" context="textimportcsv|label1">Import</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -228,7 +228,7 @@
                             <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkRadioButton" id="tofixedwidth">
-                                <property name="label" translatable="yes">_Fixed width</property>
+                                <property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -245,7 +245,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="toseparatedby">
-                                <property name="label" translatable="yes">_Separated by</property>
+                                <property name="label" translatable="yes" context="textimportcsv|toseparatedby">_Separated by</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -283,7 +283,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkCheckButton" id="tab">
-                                    <property name="label" translatable="yes">_Tab</property>
+                                    <property name="label" translatable="yes" context="textimportcsv|tab">_Tab</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -299,7 +299,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="mergedelimiters">
-                                    <property name="label" translatable="yes">Merge _delimiters</property>
+                                    <property name="label" translatable="yes" context="textimportcsv|mergedelimiters">Merge _delimiters</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -317,7 +317,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="comma">
-                                    <property name="label" translatable="yes">_Comma</property>
+                                    <property name="label" translatable="yes" context="textimportcsv|comma">_Comma</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -333,7 +333,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="semicolon">
-                                    <property name="label" translatable="yes">S_emicolon</property>
+                                    <property name="label" translatable="yes" context="textimportcsv|semicolon">S_emicolon</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -349,7 +349,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="space">
-                                    <property name="label" translatable="yes">S_pace</property>
+                                    <property name="label" translatable="yes" context="textimportcsv|space">S_pace</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -371,7 +371,7 @@
                                     <property name="column_spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="other">
-                                        <property name="label" translatable="yes">Othe_r</property>
+                                        <property name="label" translatable="yes" context="textimportcsv|other">Othe_r</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -400,7 +400,7 @@
                                         </accessibility>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" id="inputother-atkobject">
-                                            <property name="AtkObject::accessible-name" translatable="yes">Other</property>
+                                            <property name="AtkObject::accessible-name" translatable="yes" context="textimportcsv|inputother-atkobject">Other</property>
                                           </object>
                                         </child>
                                       </object>
@@ -425,7 +425,7 @@
                                       <object class="GtkLabel" id="texttextdelimiter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Te_xt delimiter:</property>
+                                        <property name="label" translatable="yes" context="textimportcsv|texttextdelimiter">Te_xt delimiter:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">textdelimiter</property>
                                         <property name="xalign">0</property>
@@ -476,7 +476,7 @@
                   <object class="GtkLabel" id="separatoroptions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Separator Options</property>
+                    <property name="label" translatable="yes" context="textimportcsv|separatoroptions">Separator Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -510,7 +510,7 @@
                         <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="quotedfieldastext">
-                            <property name="label" translatable="yes">_Quoted field as text</property>
+                            <property name="label" translatable="yes" context="textimportcsv|quotedfieldastext">_Quoted field as text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -526,7 +526,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="detectspecialnumbers">
-                            <property name="label" translatable="yes">Detect special _numbers</property>
+                            <property name="label" translatable="yes" context="textimportcsv|detectspecialnumbers">Detect special _numbers</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -548,7 +548,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Other Options</property>
+                    <property name="label" translatable="yes" context="textimportcsv|label3">Other Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -590,7 +590,7 @@
                               <object class="GtkLabel" id="textcolumntype">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Column t_ype:</property>
+                                <property name="label" translatable="yes" context="textimportcsv|textcolumntype">Column t_ype:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">columntype</property>
                               </object>
@@ -635,7 +635,7 @@
                           <object class="GtkLabel" id="textalttitle">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes">Text to Columns</property>
+                            <property name="label" translatable="yes" context="textimportcsv|textalttitle">Text to Columns</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -651,7 +651,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Fields</property>
+                    <property name="label" translatable="yes" context="textimportcsv|label4">Fields</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui b/sc/uiconfig/scalc/ui/textimportoptions.ui
index 5c44c9200877..cb13885ec750 100644
--- a/sc/uiconfig/scalc/ui/textimportoptions.ui
+++ b/sc/uiconfig/scalc/ui/textimportoptions.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="TextImportOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Import Options</property>
+    <property name="title" translatable="yes" context="textimportoptions|TextImportOptionsDialog">Import Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="custom">
-                            <property name="label" translatable="yes">Custom:</property>
+                            <property name="label" translatable="yes" context="textimportoptions|custom">Custom:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -110,7 +110,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="automatic">
-                            <property name="label" translatable="yes">Automatic</property>
+                            <property name="label" translatable="yes" context="textimportoptions|automatic">Automatic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -142,7 +142,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Select the Language to Use for Import</property>
+                    <property name="label" translatable="yes" context="textimportoptions|label2">Select the Language to Use for Import</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -169,7 +169,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="convertdata">
-                        <property name="label" translatable="yes">Detect special numbers (such as dates)</property>
+                        <property name="label" translatable="yes" context="textimportoptions|convertdata">Detect special numbers (such as dates)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="textimportoptions|label3">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 1f3ef716cb5e..349a28a2d999 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Thu Jan  9 10:47:53 2014 -->
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="TpViewPage">
@@ -34,7 +34,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="formula">
-                        <property name="label" translatable="yes">_Formulas</property>
+                        <property name="label" translatable="yes" context="tpviewpage|formula">_Formulas</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="nil">
-                        <property name="label" translatable="yes">Zero val_ues</property>
+                        <property name="label" translatable="yes" context="tpviewpage|nil">Zero val_ues</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="annot">
-                        <property name="label" translatable="yes">_Comment indicator</property>
+                        <property name="label" translatable="yes" context="tpviewpage|annot">_Comment indicator</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -85,7 +85,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="value">
-                        <property name="label" translatable="yes">Value h_ighlighting</property>
+                        <property name="label" translatable="yes" context="tpviewpage|value">Value h_ighlighting</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -102,7 +102,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="anchor">
-                        <property name="label" translatable="yes">_Anchor</property>
+                        <property name="label" translatable="yes" context="tpviewpage|anchor">_Anchor</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -119,7 +119,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="clipmark">
-                        <property name="label" translatable="yes">Te_xt overflow</property>
+                        <property name="label" translatable="yes" context="tpviewpage|clipmark">Te_xt overflow</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -136,7 +136,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rangefind">
-                        <property name="label" translatable="yes">_Show references in color</property>
+                        <property name="label" translatable="yes" context="tpviewpage|rangefind">_Show references in color</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Display</property>
+                <property name="label" translatable="yes" context="tpviewpage|label4">Display</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -195,7 +195,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="rowcolheader">
-                        <property name="label" translatable="yes">Colu_mn/row headers</property>
+                        <property name="label" translatable="yes" context="tpviewpage|rowcolheader">Colu_mn/row headers</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -212,7 +212,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hscroll">
-                        <property name="label" translatable="yes">Hori_zontal scroll bar</property>
+                        <property name="label" translatable="yes" context="tpviewpage|hscroll">Hori_zontal scroll bar</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -229,7 +229,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="vscroll">
-                        <property name="label" translatable="yes">_Vertical scroll bar</property>
+                        <property name="label" translatable="yes" context="tpviewpage|vscroll">_Vertical scroll bar</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -246,7 +246,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="tblreg">
-                        <property name="label" translatable="yes">Sh_eet tabs</property>
+                        <property name="label" translatable="yes" context="tpviewpage|tblreg">Sh_eet tabs</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -263,7 +263,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="outline">
-                        <property name="label" translatable="yes">_Outline symbols</property>
+                        <property name="label" translatable="yes" context="tpviewpage|outline">_Outline symbols</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -286,7 +286,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Window</property>
+                <property name="label" translatable="yes" context="tpviewpage|label5">Window</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -362,7 +362,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Grid lines:</property>
+                            <property name="label" translatable="yes" context="tpviewpage|grid_label">_Grid lines:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">grid</property>
                           </object>
@@ -379,7 +379,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Color:</property>
+                            <property name="label" translatable="yes" context="tpviewpage|color_label">_Color:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">color</property>
                           </object>
@@ -396,9 +396,9 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">Show</item>
-                              <item translatable="yes">Show on colored cells</item>
-                              <item translatable="yes">Hide</item>
+                              <item translatable="yes" context="tpviewpage|grid">Show</item>
+                              <item translatable="yes" context="tpviewpage|grid">Show on colored cells</item>
+                              <item translatable="yes" context="tpviewpage|grid">Hide</item>
                             </items>
                           </object>
                           <packing>
@@ -418,7 +418,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="break">
-                        <property name="label" translatable="yes">_Page breaks</property>
+                        <property name="label" translatable="yes" context="tpviewpage|break">_Page breaks</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -435,7 +435,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="guideline">
-                        <property name="label" translatable="yes">Helplines _while moving</property>
+                        <property name="label" translatable="yes" context="tpviewpage|guideline">Helplines _while moving</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -458,7 +458,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Visual Aids</property>
+                <property name="label" translatable="yes" context="tpviewpage|label1">Visual Aids</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -497,7 +497,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Ob_jects/Images:</property>
+                        <property name="label" translatable="yes" context="tpviewpage|objgrf_label">Ob_jects/Images:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">objgrf</property>
                       </object>
@@ -513,7 +513,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Cha_rts:</property>
+                        <property name="label" translatable="yes" context="tpviewpage|diagram_label">Cha_rts:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">diagram</property>
                       </object>
@@ -529,7 +529,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Drawing objects:</property>
+                        <property name="label" translatable="yes" context="tpviewpage|draw_label">_Drawing objects:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">draw</property>
                       </object>
@@ -545,8 +545,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Show</item>
-                          <item translatable="yes">Hide</item>
+                          <item translatable="yes" context="tpviewpage|objgrf">Show</item>
+                          <item translatable="yes" context="tpviewpage|objgrf">Hide</item>
                         </items>
                       </object>
                       <packing>
@@ -561,8 +561,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Show</item>
-                          <item translatable="yes">Hide</item>
+                          <item translatable="yes" context="tpviewpage|diagram">Show</item>
+                          <item translatable="yes" context="tpviewpage|diagram">Hide</item>
                         </items>
                       </object>
                       <packing>
@@ -577,8 +577,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Show</item>
-                          <item translatable="yes">Hide</item>
+                          <item translatable="yes" context="tpviewpage|draw">Show</item>
+                          <item translatable="yes" context="tpviewpage|draw">Hide</item>
                         </items>
                       </object>
                       <packing>
@@ -596,7 +596,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Objects</property>
+                <property name="label" translatable="yes" context="tpviewpage|label2">Objects</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -626,7 +626,7 @@
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkCheckButton" id="synczoom">
-                    <property name="label" translatable="yes">S_ynchronize sheets</property>
+                    <property name="label" translatable="yes" context="tpviewpage|synczoom">S_ynchronize sheets</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -641,7 +641,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Zoom</property>
+                <property name="label" translatable="yes" context="tpviewpage|label3">Zoom</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/ttestdialog.ui b/sc/uiconfig/scalc/ui/ttestdialog.ui
index 8ddd55d13ba5..dfa9bf1ebdb4 100644
--- a/sc/uiconfig/scalc/ui/ttestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ttestdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="TTestDialog">
@@ -37,7 +37,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Variable 1 range:</property>
+                        <property name="label" translatable="yes" context="ttestdialog|variable1-range-label">Variable 1 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable1-range-edit</property>
                       </object>
@@ -76,7 +76,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Variable 2 range:</property>
+                        <property name="label" translatable="yes" context="ttestdialog|variable2-range-label">Variable 2 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                       </object>
@@ -115,7 +115,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="ttestdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                       </object>
@@ -157,7 +157,7 @@
               <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="ttestdialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -251,7 +251,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="ttestdialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -267,7 +267,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="ttestdialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -289,7 +289,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="ttestdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/ungroupdialog.ui b/sc/uiconfig/scalc/ui/ungroupdialog.ui
index dfb3283729fb..e204e7e4bfbf 100644
--- a/sc/uiconfig/scalc/ui/ungroupdialog.ui
+++ b/sc/uiconfig/scalc/ui/ungroupdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="UngroupDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Ungroup</property>
+    <property name="title" translatable="yes" context="ungroupdialog|UngroupDialog">Ungroup</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -95,7 +95,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="rows">
-                        <property name="label" translatable="yes">_Rows</property>
+                        <property name="label" translatable="yes" context="ungroupdialog|rows">_Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="cols">
-                        <property name="label" translatable="yes">_Columns</property>
+                        <property name="label" translatable="yes" context="ungroupdialog|cols">_Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -138,7 +138,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Deactivate for</property>
+                <property name="label" translatable="yes" context="ungroupdialog|includeLabel">Deactivate for</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sc/uiconfig/scalc/ui/validationcriteriapage.ui b/sc/uiconfig/scalc/ui/validationcriteriapage.ui
index 9c5efefdb16b..22345e0dfa99 100644
--- a/sc/uiconfig/scalc/ui/validationcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/validationcriteriapage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststore1">
@@ -12,35 +12,35 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">All values</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">All values</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Whole Numbers</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Whole Numbers</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Decimal</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Decimal</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Date</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Time</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Time</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cell range</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Cell range</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">List</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">List</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Text length</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore1">Text length</col>
         <col id="1">7</col>
       </row>
     </data>
@@ -54,35 +54,35 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">equal</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">equal</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">less than</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">less than</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">greater than</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">greater than</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">less than or equal</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">less than or equal</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">greater than or equal to</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">greater than or equal to</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">not equal</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">not equal</col>
         <col id="1">5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">valid range</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">valid range</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">invalid range</col>
+        <col id="0" translatable="yes" context="validationcriteriapage|liststore2">invalid range</col>
         <col id="1">7</col>
       </row>
     </data>
@@ -100,7 +100,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">_Allow:</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|label1">_Allow:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">allow</property>
       </object>
@@ -114,7 +114,7 @@
         <property name="can_focus">False</property>
         <property name="no_show_all">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">_Data:</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|valueft">_Data:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">data</property>
       </object>
@@ -150,7 +150,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">_Minimum:</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|minft">_Minimum:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">mingrid</property>
       </object>
@@ -232,7 +232,7 @@
         <property name="can_focus">False</property>
         <property name="no_show_all">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Ma_ximum:</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|maxft">Ma_ximum:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">max</property>
       </object>
@@ -243,7 +243,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="allowempty">
-        <property name="label" translatable="yes">Allow _empty cells</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|allowempty">Allow _empty cells</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -258,7 +258,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="showlist">
-        <property name="label" translatable="yes">Show selection _list</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|showlist">Show selection _list</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -273,7 +273,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="sortascend">
-        <property name="label" translatable="yes">Sor_t entries ascending</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|sortascend">Sor_t entries ascending</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -294,7 +294,7 @@
         <property name="no_show_all">True</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
-        <property name="label" translatable="yes">A valid source can only consist of a contiguous selection of rows and columns, or a formula that results in an area or array.</property>
+        <property name="label" translatable="yes" context="validationcriteriapage|hintft">A valid source can only consist of a contiguous selection of rows and columns, or a formula that results in an area or array.</property>
         <property name="wrap">True</property>
         <property name="max_width_chars">50</property>
       </object>
diff --git a/sc/uiconfig/scalc/ui/validationdialog.ui b/sc/uiconfig/scalc/ui/validationdialog.ui
index 9caae9e28973..95b9a690cee2 100644
--- a/sc/uiconfig/scalc/ui/validationdialog.ui
+++ b/sc/uiconfig/scalc/ui/validationdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ValidationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Validity</property>
+    <property name="title" translatable="yes" context="validationdialog|ValidationDialog">Validity</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -102,7 +102,7 @@
                   <object class="GtkLabel" id="criteria">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Criteria</property>
+                    <property name="label" translatable="yes" context="validationdialog|criteria">Criteria</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -115,7 +115,7 @@
                   <object class="GtkLabel" id="inputhelp">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Input Help</property>
+                    <property name="label" translatable="yes" context="validationdialog|inputhelp">Input Help</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -129,7 +129,7 @@
                   <object class="GtkLabel" id="erroralert">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Error Alert</property>
+                    <property name="label" translatable="yes" context="validationdialog|erroralert">Error Alert</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
diff --git a/sc/uiconfig/scalc/ui/validationhelptabpage.ui b/sc/uiconfig/scalc/ui/validationhelptabpage.ui
index d124b4552dc3..284027062626 100644
--- a/sc/uiconfig/scalc/ui/validationhelptabpage.ui
+++ b/sc/uiconfig/scalc/ui/validationhelptabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="ValidationHelpTabPage">
     <property name="visible">True</property>
@@ -11,7 +11,7 @@
     <property name="spacing">12</property>
     <child>
       <object class="GtkCheckButton" id="tsbhelp">
-        <property name="label" translatable="yes">_Show input help when cell is selected</property>
+        <property name="label" translatable="yes" context="validationhelptabpage|tsbhelp">_Show input help when cell is selected</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Title:</property>
+                    <property name="label" translatable="yes" context="validationhelptabpage|title_label">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">title</property>
                   </object>
@@ -87,7 +87,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">_Input help:</property>
+                    <property name="label" translatable="yes" context="validationhelptabpage|inputhelp_label">_Input help:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">inputhelp:border</property>
                   </object>
@@ -129,7 +129,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="validationhelptabpage|label1">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
index f3b6d725da98..8dcd44b95bdf 100644
--- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
+++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="XMLSourceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">XML Source</property>
+    <property name="title" translatable="yes" context="xmlsourcedialog|XMLSourceDialog">XML Source</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -44,7 +44,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Browse to set source file.</property>
+                        <property name="tooltip_text" translatable="yes" context="xmlsourcedialog|selectsource|tooltip_text">Browse to set source file.</property>
                         <property name="image">image1</property>
                       </object>
                       <packing>
@@ -58,7 +58,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">- not set -</property>
+                        <property name="label" translatable="yes" context="xmlsourcedialog|sourcefile">- not set -</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -73,7 +73,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Source File</property>
+                <property name="label" translatable="yes" context="xmlsourcedialog|label1">Source File</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -135,7 +135,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Mapped cell:</property>
+                            <property name="label" translatable="yes" context="xmlsourcedialog|label5">Mapped cell:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Map to Document</property>
+                <property name="label" translatable="yes" context="xmlsourcedialog|label4">Map to Document</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -199,7 +199,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Import</property>
+                <property name="label" translatable="yes" context="xmlsourcedialog|ok">_Import</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/ztestdialog.ui b/sc/uiconfig/scalc/ui/ztestdialog.ui
index efe00addccaa..82043a71f6f1 100644
--- a/sc/uiconfig/scalc/ui/ztestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ztestdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ZTestDialog">
@@ -37,7 +37,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Variable 1 range:</property>
+                        <property name="label" translatable="yes" context="ztestdialog|variable1-range-label">Variable 1 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable1-range-edit</property>
                       </object>
@@ -76,7 +76,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Variable 2 range:</property>
+                        <property name="label" translatable="yes" context="ztestdialog|variable2-range-label">Variable 2 range:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                       </object>
@@ -115,7 +115,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Results to:</property>
+                        <property name="label" translatable="yes" context="ztestdialog|output-range-label">Results to:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">variable2-range-edit</property>
                       </object>
@@ -157,7 +157,7 @@
               <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="ztestdialog|label1">Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -251,7 +251,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-columns-radio">
-                        <property name="label" translatable="yes">Columns</property>
+                        <property name="label" translatable="yes" context="ztestdialog|groupedby-columns-radio">Columns</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -267,7 +267,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="groupedby-rows-radio">
-                        <property name="label" translatable="yes">Rows</property>
+                        <property name="label" translatable="yes" context="ztestdialog|groupedby-rows-radio">Rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -289,7 +289,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Grouped by</property>
+                <property name="label" translatable="yes" context="ztestdialog|label2">Grouped by</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/scaddins/AllLangMoTarget_sca.mk b/scaddins/AllLangMoTarget_sca.mk
new file mode 100644
index 000000000000..830e2b4f1a62
--- /dev/null
+++ b/scaddins/AllLangMoTarget_sca.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,sca))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,sca,scaddins))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk
deleted file mode 100644
index 874e96fdad7a..000000000000
--- a/scaddins/AllLangResTarget_analysis.mk
+++ /dev/null
@@ -1,38 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,analysis))
-
-$(eval $(call gb_AllLangResTarget_add_srs,analysis,\
-    scaddins/analysis \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,scaddins/analysis))
-
-$(eval $(call gb_SrsTarget_set_include,scaddins/analysis,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/scaddins/source/analysis \
-))
-
-$(eval $(call gb_SrsTarget_add_files,scaddins/analysis,\
-    scaddins/source/analysis/analysis.src \
-    scaddins/source/analysis/analysis_funcnames.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scaddins/AllLangResTarget_date.mk b/scaddins/AllLangResTarget_date.mk
deleted file mode 100644
index 6b9377866d5b..000000000000
--- a/scaddins/AllLangResTarget_date.mk
+++ /dev/null
@@ -1,37 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,date))
-
-$(eval $(call gb_AllLangResTarget_add_srs,date,\
-    scaddins/date \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,scaddins/date))
-
-$(eval $(call gb_SrsTarget_set_include,scaddins/date,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/scaddins/source/datefunc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,scaddins/date,\
-    scaddins/source/datefunc/datefunc.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scaddins/AllLangResTarget_pricing.mk b/scaddins/AllLangResTarget_pricing.mk
deleted file mode 100644
index e4f6eb26069d..000000000000
--- a/scaddins/AllLangResTarget_pricing.mk
+++ /dev/null
@@ -1,37 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,pricing))
-
-$(eval $(call gb_AllLangResTarget_add_srs,pricing,\
-    scaddins/pricing \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,scaddins/pricing))
-
-$(eval $(call gb_SrsTarget_set_include,scaddins/pricing,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/scaddins/source/pricing \
-))
-
-$(eval $(call gb_SrsTarget_add_files,scaddins/pricing,\
-    scaddins/source/pricing/pricing.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 1185c4dd3683..2c56e9daa9ee 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -21,6 +21,11 @@ $(eval $(call gb_Library_Library,analysis))
 
 $(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis))
 
+$(eval $(call gb_Library_set_include,analysis,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/scaddins/inc \
+))
+
 $(eval $(call gb_Library_use_external,analysis,boost_headers))
 
 $(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\
@@ -45,7 +50,4 @@ $(eval $(call gb_Library_add_exception_objects,analysis,\
 	scaddins/source/analysis/financial \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,analysis,analysis))
-
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index dbc76688bc9d..71c3db9ccb5d 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -21,6 +21,11 @@ $(eval $(call gb_Library_Library,date))
 
 $(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
 
+$(eval $(call gb_Library_set_include,date,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/scaddins/inc \
+))
+
 $(eval $(call gb_Library_use_external,date,boost_headers))
 
 $(eval $(call gb_Library_use_internal_comprehensive_api,date,\
@@ -41,7 +46,4 @@ $(eval $(call gb_Library_add_exception_objects,date,\
 	scaddins/source/datefunc/datefunc \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,date,date))
-
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk
index ea12d2fdb7b6..2f221c9964fd 100644
--- a/scaddins/Library_pricing.mk
+++ b/scaddins/Library_pricing.mk
@@ -21,6 +21,11 @@ $(eval $(call gb_Library_Library,pricing))
 
 $(eval $(call gb_Library_set_componentfile,pricing,scaddins/source/pricing/pricing))
 
+$(eval $(call gb_Library_set_include,pricing,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/scaddins/inc \
+))
+
 $(eval $(call gb_Library_use_external,pricing,boost_headers))
 
 $(eval $(call gb_Library_use_internal_comprehensive_api,pricing,\
@@ -42,7 +47,4 @@ $(eval $(call gb_Library_add_exception_objects,pricing,\
 	scaddins/source/pricing/black_scholes \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,pricing,pricing))
-
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk
index 3c89952f323b..a927385b276c 100644
--- a/scaddins/Module_scaddins.mk
+++ b/scaddins/Module_scaddins.mk
@@ -27,9 +27,7 @@ $(eval $(call gb_Module_add_targets,scaddins,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,scaddins,\
-    AllLangResTarget_analysis \
-    AllLangResTarget_date \
-    AllLangResTarget_pricing \
+    AllLangMoTarget_sca \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/inc/analysis.hrc b/scaddins/inc/analysis.hrc
new file mode 100644
index 000000000000..07878a7954f9
--- /dev/null
+++ b/scaddins/inc/analysis.hrc
@@ -0,0 +1,1106 @@
+/* -*- 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_SCADDINS_INC_ANALYSIS_HRC
+#define INCLUDED_SCADDINS_INC_ANALYSIS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* ANALYSIS_Workday[] =
+{
+    NC_("ANALYSIS_Workday", "Returns the serial number of the date before or after a specified number of workdays"),
+    NC_("ANALYSIS_Workday", "Start date"),
+    NC_("ANALYSIS_Workday", "The start date"),
+    NC_("ANALYSIS_Workday", "Days"),
+    NC_("ANALYSIS_Workday", "The number of workdays before or after the start date"),
+    NC_("ANALYSIS_Workday", "Holidays"),
+    NC_("ANALYSIS_Workday", "List of date values of days off (vacation, holidays, etc.)")
+};
+
+const char* ANALYSIS_Yearfrac[] =
+{
+    NC_("ANALYSIS_Yearfrac", "Returns the number of years (including fractional part) between two dates"),
+    NC_("ANALYSIS_Yearfrac", "Start date"),
+    NC_("ANALYSIS_Yearfrac", "The start date"),
+    NC_("ANALYSIS_Yearfrac", "End date"),
+    NC_("ANALYSIS_Yearfrac", "The end date"),
+    NC_("ANALYSIS_Yearfrac", "Basis"),
+    NC_("ANALYSIS_Yearfrac", "Basis indicates the day-count convention to use in the calculation")
+};
+
+const char* ANALYSIS_Edate[] =
+{
+    NC_("ANALYSIS_Edate", "Returns the serial number of the date that is a specified number of months before or after the start date"),
+    NC_("ANALYSIS_Edate", "Start date"),
+    NC_("ANALYSIS_Edate", "The start date"),
+    NC_("ANALYSIS_Edate", "Months"),
+    NC_("ANALYSIS_Edate", "Number of months before or after the start date")
+};
+
+const char* ANALYSIS_Weeknum[] =
+{
+    NC_("ANALYSIS_Weeknum", "Returns the number of the calendar week in which the specified date occurs.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use WEEKNUM instead."),
+    NC_("ANALYSIS_Weeknum", "Date"),
+    NC_("ANALYSIS_Weeknum", "The date or date serial number"),
+    NC_("ANALYSIS_Weeknum", "Return type"),
+    NC_("ANALYSIS_Weeknum", "Indicates the first day of the week (1 = Sunday, 2 = Monday)")
+};
+
+const char* ANALYSIS_Eomonth[] =
+{
+    NC_("ANALYSIS_Eomonth", "Returns the serial number of the last day of the month that comes a certain number of months before or after the start date"),
+    NC_("ANALYSIS_Eomonth", "Start date"),
+    NC_("ANALYSIS_Eomonth", "The start date"),
+    NC_("ANALYSIS_Eomonth", "Months"),
+    NC_("ANALYSIS_Eomonth", "Number of months before or after the start date")
+};
+
+const char* ANALYSIS_Networkdays[] =
+{
+    NC_("ANALYSIS_Networkdays", "Returns the number of workdays between two dates.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use NETWORKDAYS instead."),
+    NC_("ANALYSIS_Networkdays", "Start date"),
+    NC_("ANALYSIS_Networkdays", "The start date"),
+    NC_("ANALYSIS_Networkdays", "End date"),
+    NC_("ANALYSIS_Networkdays", "The end date"),
+    NC_("ANALYSIS_Networkdays", "Holidays"),
+    NC_("ANALYSIS_Networkdays", "List of date values representing days off (vacation, holidays, etc.)")
+};
+
+const char* ANALYSIS_Iseven[] =
+{
+    NC_("ANALYSIS_Iseven", "Returns the value 'true' if the number is even"),
+    NC_("ANALYSIS_Iseven", "Number"),
+    NC_("ANALYSIS_Iseven", "The number")
+};
+
+const char* ANALYSIS_Isodd[] =
+{
+    NC_("ANALYSIS_Isodd", "Returns the value 'true' if the number is odd"),
+    NC_("ANALYSIS_Isodd", "Number"),
+    NC_("ANALYSIS_Isodd", "The number")
+};
+
+const char* ANALYSIS_Multinomial[] =
+{
+    NC_("ANALYSIS_Multinomial", "Returns the multinomial coefficient of a set of numbers"),
+    NC_("ANALYSIS_Multinomial", "Number"),
+    NC_("ANALYSIS_Multinomial", "Number or list of numbers for which you want the multinomial coefficient")
+};
+
+const char* ANALYSIS_Seriessum[] =
+{
+    NC_("ANALYSIS_Seriessum", "Returns the sum of a power series"),
+    NC_("ANALYSIS_Seriessum", "X"),
+    NC_("ANALYSIS_Seriessum", "The independent variable of the power series"),
+    NC_("ANALYSIS_Seriessum", "N"),
+    NC_("ANALYSIS_Seriessum", "The initial power to which x is to be raised"),
+    NC_("ANALYSIS_Seriessum", "M"),
+    NC_("ANALYSIS_Seriessum", "The increment by which to increase n for each term in the series"),
+    NC_("ANALYSIS_Seriessum", "Coefficients"),
+    NC_("ANALYSIS_Seriessum", "Set of coefficients by which each successive power of the variable x is multiplied")
+};
+
+const char* ANALYSIS_Quotient[] =
+{
+    NC_("ANALYSIS_Quotient", "Returns the integer portion of a division"),
+    NC_("ANALYSIS_Quotient", "Numerator"),
+    NC_("ANALYSIS_Quotient", "The dividend"),
+    NC_("ANALYSIS_Quotient", "Denominator"),
+    NC_("ANALYSIS_Quotient", "The divisor")
+};
+
+const char* ANALYSIS_Mround[] =
+{
+    NC_("ANALYSIS_Mround", "Returns a number rounded to a specified multiple"),
+    NC_("ANALYSIS_Mround", "Number"),
+    NC_("ANALYSIS_Mround", "The number to round off"),
+    NC_("ANALYSIS_Mround", "Multiple"),
+    NC_("ANALYSIS_Mround", "The multiple to which you want to round number")
+};
+
+const char* ANALYSIS_Sqrtpi[] =
+{
+    NC_("ANALYSIS_Sqrtpi", "Returns the square root of a number which has been multiplied by pi"),
+    NC_("ANALYSIS_Sqrtpi", "Number"),
+    NC_("ANALYSIS_Sqrtpi", "The number by which pi is multiplied")
+};
+
+const char* ANALYSIS_Randbetween[] =
+{
+    NC_("ANALYSIS_Randbetween", "Returns a random integer between the numbers you specify"),
+    NC_("ANALYSIS_Randbetween", "Bottom"),
+    NC_("ANALYSIS_Randbetween", "The smallest integer returned"),
+    NC_("ANALYSIS_Randbetween", "Top"),
+    NC_("ANALYSIS_Randbetween", "The largest integer returned")
+};
+
+const char* ANALYSIS_Gcd[] =
+{
+    NC_("ANALYSIS_Gcd", "Returns the greatest common divisor.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use GCD instead."),
+    NC_("ANALYSIS_Gcd", "Number"),
+    NC_("ANALYSIS_Gcd", "Number or list of numbers")
+};
+
+const char* ANALYSIS_Lcm[] =
+{
+    NC_("ANALYSIS_Lcm", "Returns the least common multiple.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use LCM instead."),
+    NC_("ANALYSIS_Lcm", "Number"),
+    NC_("ANALYSIS_Lcm", "Number or list of numbers")
+};
+
+const char* ANALYSIS_Besseli[] =
+{
+    NC_("ANALYSIS_Besseli", "Returns the modified Bessel function In(x)"),
+    NC_("ANALYSIS_Besseli", "X"),
+    NC_("ANALYSIS_Besseli", "The value at which the function is to be evaluated"),
+    NC_("ANALYSIS_Besseli", "N"),
+    NC_("ANALYSIS_Besseli", "The order of the Bessel function")
+};
+
+const char* ANALYSIS_Besselj[] =
+{
+    NC_("ANALYSIS_Besselj", "Returns the Bessel function Jn(x)"),
+    NC_("ANALYSIS_Besselj", "X"),
+    NC_("ANALYSIS_Besselj", "The value at which the function is to be evaluated"),
+    NC_("ANALYSIS_Besselj", "N"),
+    NC_("ANALYSIS_Besselj", "The order of the Bessel function")
+};
+
+const char* ANALYSIS_Besselk[] =
+{
+    NC_("ANALYSIS_Besselk", "Returns the Bessel function Kn(x)"),
+    NC_("ANALYSIS_Besselk", "X"),
+    NC_("ANALYSIS_Besselk", "The value at which the function is to be evaluated"),
+    NC_("ANALYSIS_Besselk", "N"),
+    NC_("ANALYSIS_Besselk", "The order of the Bessel function")
+};
+
+const char* ANALYSIS_Bessely[] =
+{
+    NC_("ANALYSIS_Bessely", "Returns the Bessel function Yn(x)"),
+    NC_("ANALYSIS_Bessely", "X"),
+    NC_("ANALYSIS_Bessely", "The value at which the function is to be evaluated"),
+    NC_("ANALYSIS_Bessely", "N"),
+    NC_("ANALYSIS_Bessely", "The order of the Bessel function")
+};
+
+const char* ANALYSIS_Bin2Oct[] =
+{
+    NC_("ANALYSIS_Bin2Oct", "Converts a binary number to an octal number"),
+    NC_("ANALYSIS_Bin2Oct", "Number"),
+    NC_("ANALYSIS_Bin2Oct", "The binary number to be converted (as text)"),
+    NC_("ANALYSIS_Bin2Oct", "Places"),
+    NC_("ANALYSIS_Bin2Oct", "Number of places used")
+};
+
+const char* ANALYSIS_Bin2Dec[] =
+{
+    NC_("ANALYSIS_Bin2Dec", "Converts a binary number to a decimal number"),
+    NC_("ANALYSIS_Bin2Dec", "Number"),
+    NC_("ANALYSIS_Bin2Dec", "The binary number to be converted (as text)")
+};
+
+const char* ANALYSIS_Bin2Hex[] =
+{
+    NC_("ANALYSIS_Bin2Hex", "Converts a binary number to a hexadecimal number"),
+    NC_("ANALYSIS_Bin2Hex", "Number"),
+    NC_("ANALYSIS_Bin2Hex", "The binary number to be converted (as text)"),
+    NC_("ANALYSIS_Bin2Hex", "Places"),
+    NC_("ANALYSIS_Bin2Hex", "Number of places used.")
+};
+
+const char* ANALYSIS_Oct2Bin[] =
+{
+    NC_("ANALYSIS_Oct2Bin", "Converts an octal number to a binary number"),
+    NC_("ANALYSIS_Oct2Bin", "Number"),
+    NC_("ANALYSIS_Oct2Bin", "The octal number to be converted (as text)"),
+    NC_("ANALYSIS_Oct2Bin", "Places"),
+    NC_("ANALYSIS_Oct2Bin", "Number of places used")
+};
+
+const char* ANALYSIS_Oct2Dec[] =
+{
+    NC_("ANALYSIS_Oct2Dec", "Converts an octal number to a decimal number"),
+    NC_("ANALYSIS_Oct2Dec", "Number"),
+    NC_("ANALYSIS_Oct2Dec", "The octal number to be converted (as text)")
+};
+
+const char* ANALYSIS_Oct2Hex[] =
+{
+    NC_("ANALYSIS_Oct2Hex", "Converts an octal number to a hexadecimal number"),
+    NC_("ANALYSIS_Oct2Hex", "Number"),
+    NC_("ANALYSIS_Oct2Hex", "The octal number to be converted (as text)"),
+    NC_("ANALYSIS_Oct2Hex", "Places"),
+    NC_("ANALYSIS_Oct2Hex", "Number of places used")
+};
+
+const char* ANALYSIS_Dec2Bin[] =
+{
+    NC_("ANALYSIS_Dec2Bin", "Converts a decimal number to a binary number"),
+    NC_("ANALYSIS_Dec2Bin", "Number"),
+    NC_("ANALYSIS_Dec2Bin", "The decimal integer to be converted"),
+    NC_("ANALYSIS_Dec2Bin", "Places"),
+    NC_("ANALYSIS_Dec2Bin", "Number of places used")
+};
+
+const char* ANALYSIS_Dec2Hex[] =
+{
+    NC_("ANALYSIS_Dec2Hex", "Converts a decimal number to a hexadecimal number"),
+    NC_("ANALYSIS_Dec2Hex", "Number"),
+    NC_("ANALYSIS_Dec2Hex", "The decimal integer to be converted"),
+    NC_("ANALYSIS_Dec2Hex", "Places"),
+    NC_("ANALYSIS_Dec2Hex", "Number of places used")
+};
+
+const char* ANALYSIS_Dec2Oct[] =
+{
+    NC_("ANALYSIS_Dec2Oct", "Converts a decimal number into an octal number"),
+    NC_("ANALYSIS_Dec2Oct", "Number"),
+    NC_("ANALYSIS_Dec2Oct", "The decimal number"),
+    NC_("ANALYSIS_Dec2Oct", "Places"),
+    NC_("ANALYSIS_Dec2Oct", "Number of places used")
+};
+
+const char* ANALYSIS_Hex2Bin[] =
+{
+    NC_("ANALYSIS_Hex2Bin", "Converts a hexadecimal number to a binary number"),
+    NC_("ANALYSIS_Hex2Bin", "Number"),
+    NC_("ANALYSIS_Hex2Bin", "The hexadecimal number to be converted (as text)"),
+    NC_("ANALYSIS_Hex2Bin", "Places"),
+    NC_("ANALYSIS_Hex2Bin", "Number of places used")
+};
+
+const char* ANALYSIS_Hex2Dec[] =
+{
+    NC_("ANALYSIS_Hex2Dec", "Converts a hexadecimal number to a decimal number"),
+    NC_("ANALYSIS_Hex2Dec", "Number"),
+    NC_("ANALYSIS_Hex2Dec", "The hexadecimal number to be converted (as text)")
+};
+
+const char* ANALYSIS_Hex2Oct[] =
+{
+    NC_("ANALYSIS_Hex2Oct", "Converts a hexadecimal number to an octal number"),
+    NC_("ANALYSIS_Hex2Oct", "Number"),
+    NC_("ANALYSIS_Hex2Oct", "The hexadecimal number to be converted (as text)"),
+    NC_("ANALYSIS_Hex2Oct", "Places"),
+    NC_("ANALYSIS_Hex2Oct", "Number of places used")
+};
+
+const char* ANALYSIS_Delta[] =
+{
+    NC_("ANALYSIS_Delta", "Tests whether two values are equal"),
+    NC_("ANALYSIS_Delta", "Number 1"),
+    NC_("ANALYSIS_Delta", "The first number"),
+    NC_("ANALYSIS_Delta", "Number 2"),
+    NC_("ANALYSIS_Delta", "The second number")
+};
+
+const char* ANALYSIS_Erf[] =
+{
+    NC_("ANALYSIS_Erf", "Returns the error function"),
+    NC_("ANALYSIS_Erf", "Lower limit"),
+    NC_("ANALYSIS_Erf", "The lower limit for integration"),
+    NC_("ANALYSIS_Erf", "Upper limit"),
+    NC_("ANALYSIS_Erf", "The upper limit for integration")
+};
+
+const char* ANALYSIS_Erfc[] =
+{
+    NC_("ANALYSIS_Erfc", "Returns the complementary error function"),
+    NC_("ANALYSIS_Erfc", "Lower limit"),
+    NC_("ANALYSIS_Erfc", "The lower limit for integration")
+};
+
+const char* ANALYSIS_Gestep[] =
+{
+    NC_("ANALYSIS_Gestep", "Tests whether a number is greater than a threshold value"),
+    NC_("ANALYSIS_Gestep", "Number"),
+    NC_("ANALYSIS_Gestep", "The value to test against step"),
+    NC_("ANALYSIS_Gestep", "Step"),
+    NC_("ANALYSIS_Gestep", "The threshold value")
+};
+
+const char* ANALYSIS_Factdouble[] =
+{
+    NC_("ANALYSIS_Factdouble", "Returns the double factorial of Number"),
+    NC_("ANALYSIS_Factdouble", "Number"),
+    NC_("ANALYSIS_Factdouble", "The number")
+};
+
+const char* ANALYSIS_Imabs[] =
+{
+    NC_("ANALYSIS_Imabs", "Returns the absolute value (modulus) of a complex number"),
+    NC_("ANALYSIS_Imabs", "Complex number"),
+    NC_("ANALYSIS_Imabs", "The complex number")
+};
+
+const char* ANALYSIS_Imaginary[] =
+{
+    NC_("ANALYSIS_Imaginary", "Returns the imaginary coefficient of a complex number"),
+    NC_("ANALYSIS_Imaginary", "Complex number"),
+    NC_("ANALYSIS_Imaginary", "The complex number")
+};
+
+const char* ANALYSIS_Impower[] =
+{
+    NC_("ANALYSIS_Impower", "Returns a complex number raised to a real power"),
+    NC_("ANALYSIS_Impower", "Complex number"),
+    NC_("ANALYSIS_Impower", "The complex number"),
+    NC_("ANALYSIS_Impower", "Number"),
+    NC_("ANALYSIS_Impower", "Power to which the complex number is raised")
+};
+
+const char* ANALYSIS_Imargument[] =
+{
+    NC_("ANALYSIS_Imargument", "Returns the argument theta, an angle expressed in radians"),
+    NC_("ANALYSIS_Imargument", "Complex number"),
+    NC_("ANALYSIS_Imargument", "A complex number")
+};
+
+const char* ANALYSIS_Imcos[] =
+{
+    NC_("ANALYSIS_Imcos", "Returns the cosine of a complex number"),
+    NC_("ANALYSIS_Imcos", "Complex number"),
+    NC_("ANALYSIS_Imcos", "A complex number")
+};
+
+const char* ANALYSIS_Imdiv[] =
+{
+    NC_("ANALYSIS_Imdiv", "Returns the quotient of two complex numbers"),
+    NC_("ANALYSIS_Imdiv", "Numerator"),
+    NC_("ANALYSIS_Imdiv", "The dividend"),
+    NC_("ANALYSIS_Imdiv", "Denominator"),
+    NC_("ANALYSIS_Imdiv", "The divisor")
+};
+
+const char* ANALYSIS_Imexp[] =
+{
+    NC_("ANALYSIS_Imexp", "Returns the algebraic form of the exponential of a complex number"),
+    NC_("ANALYSIS_Imexp", "Complex number"),
+    NC_("ANALYSIS_Imexp", "The complex number")
+};
+
+const char* ANALYSIS_Imconjugate[] =
+{
+    NC_("ANALYSIS_Imconjugate", "Returns the complex conjugate of a complex number"),
+    NC_("ANALYSIS_Imconjugate", "Complex number"),
+    NC_("ANALYSIS_Imconjugate", "The complex number")
+};
+
+const char* ANALYSIS_Imln[] =
+{
+    NC_("ANALYSIS_Imln", "Returns the natural logarithm of a complex number"),
+    NC_("ANALYSIS_Imln", "Complex number"),
+    NC_("ANALYSIS_Imln", "The complex number")
+};
+
+const char* ANALYSIS_Imlog10[] =
+{
+    NC_("ANALYSIS_Imlog10", "Returns the base-10 logarithm of a complex number"),
+    NC_("ANALYSIS_Imlog10", "Complex number"),
+    NC_("ANALYSIS_Imlog10", "The complex number")
+};
+
+const char* ANALYSIS_Imlog2[] =
+{
+    NC_("ANALYSIS_Imlog2", "Returns the base-2 logarithm of a complex number"),
+    NC_("ANALYSIS_Imlog2", "Complex number"),
+    NC_("ANALYSIS_Imlog2", "The complex number")
+};
+
+const char* ANALYSIS_Improduct[] =
+{
+    NC_("ANALYSIS_Improduct", "Returns the product of several complex numbers"),
+    NC_("ANALYSIS_Improduct", "Complex number"),
+    NC_("ANALYSIS_Improduct", "The first complex number"),
+    NC_("ANALYSIS_Improduct", "Complex number"),
+    NC_("ANALYSIS_Improduct", "Another complex number")
+};
+
+const char* ANALYSIS_Imreal[] =
+{
+    NC_("ANALYSIS_Imreal", "Returns the real coefficient of a complex number"),
+    NC_("ANALYSIS_Imreal", "Complex number"),
+    NC_("ANALYSIS_Imreal", "The complex number")
+};
+
+const char* ANALYSIS_Imsin[] =
+{
+    NC_("ANALYSIS_Imsin", "Returns the sine of a complex number"),
+    NC_("ANALYSIS_Imsin", "Complex number"),
+    NC_("ANALYSIS_Imsin", "The complex number")
+};
+
+const char* ANALYSIS_Imsub[] =
+{
+    NC_("ANALYSIS_Imsub", "Returns the difference of two complex numbers"),
+    NC_("ANALYSIS_Imsub", "Complex number 1"),
+    NC_("ANALYSIS_Imsub", "Complex number 1"),
+    NC_("ANALYSIS_Imsub", "Complex number 2"),
+    NC_("ANALYSIS_Imsub", "Complex number 2")
+};
+
+const char* ANALYSIS_Imsqrt[] =
+{
+    NC_("ANALYSIS_Imsqrt", "Returns the square root of a complex number"),
+    NC_("ANALYSIS_Imsqrt", "Complex number"),
+    NC_("ANALYSIS_Imsqrt", "The complex number")
+};
+
+const char* ANALYSIS_Imsum[] =
+{
+    NC_("ANALYSIS_Imsum", "Returns the sum of complex numbers"),
+    NC_("ANALYSIS_Imsum", "Complex number"),
+    NC_("ANALYSIS_Imsum", "The complex number")
+};
+
+const char* ANALYSIS_Imtan[] =
+{
+    NC_("ANALYSIS_Imtan", "Returns the tangent of a complex number"),
+    NC_("ANALYSIS_Imtan", "Complex number"),
+    NC_("ANALYSIS_Imtan", "A complex number")
+};
+
+const char* ANALYSIS_Imsec[] =
+{
+    NC_("ANALYSIS_Imsec", "Returns the secant of a complex number"),
+    NC_("ANALYSIS_Imsec", "Complex number"),
+    NC_("ANALYSIS_Imsec", "A complex number")
+};
+
+const char* ANALYSIS_Imcsc[] =
+{
+    NC_("ANALYSIS_Imcsc", "Returns the cosecant of a complex number"),
+    NC_("ANALYSIS_Imcsc", "Complex number"),
+    NC_("ANALYSIS_Imcsc", "A complex number")
+};
+
+const char* ANALYSIS_Imcot[] =
+{
+    NC_("ANALYSIS_Imcot", "Returns the cotangent of a complex number"),
+    NC_("ANALYSIS_Imcot", "Complex number"),
+    NC_("ANALYSIS_Imcot", "A complex number")
+};
+
+const char* ANALYSIS_Imsinh[] =
+{
+    NC_("ANALYSIS_Imsinh", "Returns the hyperbolic sine of a complex number"),
+    NC_("ANALYSIS_Imsinh", "Complex number"),
+    NC_("ANALYSIS_Imsinh", "A complex number")
+};
+
+const char* ANALYSIS_Imcosh[] =
+{
+    NC_("ANALYSIS_Imcosh", "Returns the hyperbolic cosine of a complex number"),
+    NC_("ANALYSIS_Imcosh", "Complex number"),
+    NC_("ANALYSIS_Imcosh", "A complex number")
+};
+
+const char* ANALYSIS_Imsech[] =
+{
+    NC_("ANALYSIS_Imsech", "Returns the hyperbolic secant of a complex number"),
+    NC_("ANALYSIS_Imsech", "Complex number"),
+    NC_("ANALYSIS_Imsech", "A complex number")
+};
+
+const char* ANALYSIS_Imcsch[] =
+{
+    NC_("ANALYSIS_Imcsch", "Returns the hyperbolic cosecant of a complex number"),
+    NC_("ANALYSIS_Imcsch", "Complex number"),
+    NC_("ANALYSIS_Imcsch", "A complex number")
+};
+
+const char* ANALYSIS_Complex[] =
+{
+    NC_("ANALYSIS_Complex", "Converts real and imaginary coefficients into a complex number"),
+    NC_("ANALYSIS_Complex", "Real num"),
+    NC_("ANALYSIS_Complex", "The real coefficient"),
+    NC_("ANALYSIS_Complex", "I num"),
+    NC_("ANALYSIS_Complex", "The imaginary coefficient"),
+    NC_("ANALYSIS_Complex", "Suffix"),
+    NC_("ANALYSIS_Complex", "The suffix")
+};
+
+const char* ANALYSIS_Convert[] =
+{
+    NC_("ANALYSIS_Convert", "Converts a number from one measurement system to another"),
+    NC_("ANALYSIS_Convert", "Number"),
+    NC_("ANALYSIS_Convert", "The number"),
+    NC_("ANALYSIS_Convert", "From unit"),
+    NC_("ANALYSIS_Convert", "Unit of measure for number"),
+    NC_("ANALYSIS_Convert", "To unit"),
+    NC_("ANALYSIS_Convert", "Unit of measure for the result")
+};
+
+const char* ANALYSIS_Amordegrc[] =
+{
+    NC_("ANALYSIS_Amordegrc", "Returns the prorated linear depreciation of an asset for each accounting period"),
+    NC_("ANALYSIS_Amordegrc", "Cost"),
+    NC_("ANALYSIS_Amordegrc", "Cost of the asset"),
+    NC_("ANALYSIS_Amordegrc", "Date purchased"),
+    NC_("ANALYSIS_Amordegrc", "Purchase date of the asset"),
+    NC_("ANALYSIS_Amordegrc", "First period"),
+    NC_("ANALYSIS_Amordegrc", "Date the first period ends"),
+    NC_("ANALYSIS_Amordegrc", "Salvage"),
+    NC_("ANALYSIS_Amordegrc", "Salvage value of an asset at the end of its life"),
+    NC_("ANALYSIS_Amordegrc", "Period"),
+    NC_("ANALYSIS_Amordegrc", "The period"),
+    NC_("ANALYSIS_Amordegrc", "Rate"),
+    NC_("ANALYSIS_Amordegrc", "The rate of depreciation"),
+    NC_("ANALYSIS_Amordegrc", "Basis"),
+    NC_("ANALYSIS_Amordegrc", "The year basis to be used")
+};
+
+const char* ANALYSIS_Amorlinc[] =
+{
+    NC_("ANALYSIS_Amorlinc", "Returns the prorated linear depreciation of an asset for each accounting period"),
+    NC_("ANALYSIS_Amorlinc", "Cost"),
+    NC_("ANALYSIS_Amorlinc", "Cost of the asset"),
+    NC_("ANALYSIS_Amorlinc", "Date purchased"),
+    NC_("ANALYSIS_Amorlinc", "Purchase date of the asset"),
+    NC_("ANALYSIS_Amorlinc", "First period"),
+    NC_("ANALYSIS_Amorlinc", "The date the first period ends"),
+    NC_("ANALYSIS_Amorlinc", "Salvage"),
+    NC_("ANALYSIS_Amorlinc", "The salvage value of an asset at the end of its life"),
+    NC_("ANALYSIS_Amorlinc", "Period"),
+    NC_("ANALYSIS_Amorlinc", "The period"),
+    NC_("ANALYSIS_Amorlinc", "Rate"),
+    NC_("ANALYSIS_Amorlinc", "The rate of depreciation"),
+    NC_("ANALYSIS_Amorlinc", "Basis"),
+    NC_("ANALYSIS_Amorlinc", "The year basis to be used")
+};
+
+const char* ANALYSIS_Accrint[] =
+{
+    NC_("ANALYSIS_Accrint", "Returns the accrued interest for a security that pays periodic interest"),
+    NC_("ANALYSIS_Accrint", "Issue"),
+    NC_("ANALYSIS_Accrint", "Issue date of the security"),
+    NC_("ANALYSIS_Accrint", "First interest"),
+    NC_("ANALYSIS_Accrint", "First interest date of the security"),
+    NC_("ANALYSIS_Accrint", "Settlement"),
+    NC_("ANALYSIS_Accrint", "The settlement"),
+    NC_("ANALYSIS_Accrint", "Rate"),
+    NC_("ANALYSIS_Accrint", "The rate"),
+    NC_("ANALYSIS_Accrint", "Par"),
+    NC_("ANALYSIS_Accrint", "The par value"),
+    NC_("ANALYSIS_Accrint", "Frequency"),
+    NC_("ANALYSIS_Accrint", "The frequency"),
+    NC_("ANALYSIS_Accrint", "Basis"),
+    NC_("ANALYSIS_Accrint", "The basis")
+};
+
+const char* ANALYSIS_Accrintm[] =
+{
+    NC_("ANALYSIS_Accrintm", "Returns the accrued interest for a security that pays interest at maturity"),
+    NC_("ANALYSIS_Accrintm", "Issue"),
+    NC_("ANALYSIS_Accrintm", "The issue date"),
+    NC_("ANALYSIS_Accrintm", "Settlement"),
+    NC_("ANALYSIS_Accrintm", "The settlement"),
+    NC_("ANALYSIS_Accrintm", "Rate"),
+    NC_("ANALYSIS_Accrintm", "The rate"),
+    NC_("ANALYSIS_Accrintm", "Par"),
+    NC_("ANALYSIS_Accrintm", "The par value"),
+    NC_("ANALYSIS_Accrintm", "Basis"),
+    NC_("ANALYSIS_Accrintm", "The basis")
+};
+
+const char* ANALYSIS_Received[] =
+{
+    NC_("ANALYSIS_Received", "Returns the amount paid out at maturity for a fully invested security"),
+    NC_("ANALYSIS_Received", "Settlement"),
+    NC_("ANALYSIS_Received", "The settlement"),
+    NC_("ANALYSIS_Received", "Maturity"),
+    NC_("ANALYSIS_Received", "The maturity"),
+    NC_("ANALYSIS_Received", "Investment"),
+    NC_("ANALYSIS_Received", "The investment"),
+    NC_("ANALYSIS_Received", "Discount"),
+    NC_("ANALYSIS_Received", "The discount"),
+    NC_("ANALYSIS_Received", "Basis"),
+    NC_("ANALYSIS_Received", "The basis")
+};
+
+const char* ANALYSIS_Disc[] =
+{
+    NC_("ANALYSIS_Disc", "Returns the discount rate for a security"),
+    NC_("ANALYSIS_Disc", "Settlement"),
+    NC_("ANALYSIS_Disc", "The settlement"),
+    NC_("ANALYSIS_Disc", "Maturity"),
+    NC_("ANALYSIS_Disc", "The maturity"),
+    NC_("ANALYSIS_Disc", "Price"),
+    NC_("ANALYSIS_Disc", "The price"),
+    NC_("ANALYSIS_Disc", "Redemption"),
+    NC_("ANALYSIS_Disc", "The redemption value"),
+    NC_("ANALYSIS_Disc", "Basis"),
+    NC_("ANALYSIS_Disc", "The basis")
+};
+
+const char* ANALYSIS_Duration[] =
+{
+    NC_("ANALYSIS_Duration", "Returns the annual Macaulay duration of a security with periodic interest payments"),
+    NC_("ANALYSIS_Duration", "Settlement"),
+    NC_("ANALYSIS_Duration", "The settlement"),
+    NC_("ANALYSIS_Duration", "Maturity"),
+    NC_("ANALYSIS_Duration", "The maturity"),
+    NC_("ANALYSIS_Duration", "Coupon"),
+    NC_("ANALYSIS_Duration", "The coupon rate"),
+    NC_("ANALYSIS_Duration", "Yield"),
+    NC_("ANALYSIS_Duration", "The yield"),
+    NC_("ANALYSIS_Duration", "Frequency"),
+    NC_("ANALYSIS_Duration", "The frequency"),
+    NC_("ANALYSIS_Duration", "Basis"),
+    NC_("ANALYSIS_Duration", "The basis")
+};
+
+const char* ANALYSIS_Effect[] =
+{
+    NC_("ANALYSIS_Effect", "Returns the effective annual interest rate"),
+    NC_("ANALYSIS_Effect", "Nominal rate"),
+    NC_("ANALYSIS_Effect", "The nominal rate"),
+    NC_("ANALYSIS_Effect", "Npery"),
+    NC_("ANALYSIS_Effect", "The periods")
+};
+
+const char* ANALYSIS_Cumprinc[] =
+{
+    NC_("ANALYSIS_Cumprinc", "Returns the cumulative principal on a loan to be paid between two periods"),
+    NC_("ANALYSIS_Cumprinc", "Rate"),
+    NC_("ANALYSIS_Cumprinc", "The rate"),
+    NC_("ANALYSIS_Cumprinc", "Nper"),
+    NC_("ANALYSIS_Cumprinc", "Number of payment periods"),
+    NC_("ANALYSIS_Cumprinc", "Pv"),
+    NC_("ANALYSIS_Cumprinc", "The present value"),
+    NC_("ANALYSIS_Cumprinc", "Start period"),
+    NC_("ANALYSIS_Cumprinc", "The start period"),
+    NC_("ANALYSIS_Cumprinc", "End period"),
+    NC_("ANALYSIS_Cumprinc", "The end period"),
+    NC_("ANALYSIS_Cumprinc", "Type"),
+    NC_("ANALYSIS_Cumprinc", "The type of maturity")
+};
+
+const char* ANALYSIS_Cumipmt[] =
+{
+    NC_("ANALYSIS_Cumipmt", "Returns the cumulative interest to be paid between two periods"),
+    NC_("ANALYSIS_Cumipmt", "Rate"),
+    NC_("ANALYSIS_Cumipmt", "The rate"),
+    NC_("ANALYSIS_Cumipmt", "Nper"),
+    NC_("ANALYSIS_Cumipmt", "Number of payment periods"),
+    NC_("ANALYSIS_Cumipmt", "Pv"),
+    NC_("ANALYSIS_Cumipmt", "The present value"),
+    NC_("ANALYSIS_Cumipmt", "Start period"),
+    NC_("ANALYSIS_Cumipmt", "The start period"),
+    NC_("ANALYSIS_Cumipmt", "End period"),
+    NC_("ANALYSIS_Cumipmt", "The end period"),
+    NC_("ANALYSIS_Cumipmt", "Type"),
+    NC_("ANALYSIS_Cumipmt", "The type of maturity")
+};
+
+const char* ANALYSIS_Price[] =
+{
+    NC_("ANALYSIS_Price", "Returns the price per 100 currency units face value of a security that pays periodic interest"),
+    NC_("ANALYSIS_Price", "Settlement"),
+    NC_("ANALYSIS_Price", "The settlement"),
+    NC_("ANALYSIS_Price", "Maturity"),
+    NC_("ANALYSIS_Price", "The maturity"),
+    NC_("ANALYSIS_Price", "Rate"),
+    NC_("ANALYSIS_Price", "The rate"),
+    NC_("ANALYSIS_Price", "Yield"),
+    NC_("ANALYSIS_Price", "The yield"),
+    NC_("ANALYSIS_Price", "Redemption"),
+    NC_("ANALYSIS_Price", "The redemption value"),
+    NC_("ANALYSIS_Price", "Frequency"),
+    NC_("ANALYSIS_Price", "The frequency"),
+    NC_("ANALYSIS_Price", "Basis"),
+    NC_("ANALYSIS_Price", "The basis")
+};
+
+const char* ANALYSIS_Pricedisc[] =
+{
+    NC_("ANALYSIS_Pricedisc", "Returns the price per 100 currency units face value of a discounted security"),
+    NC_("ANALYSIS_Pricedisc", "Settlement"),
+    NC_("ANALYSIS_Pricedisc", "The settlement"),
+    NC_("ANALYSIS_Pricedisc", "Maturity"),
+    NC_("ANALYSIS_Pricedisc", "The maturity"),
+    NC_("ANALYSIS_Pricedisc", "Discount"),
+    NC_("ANALYSIS_Pricedisc", "The discount"),
+    NC_("ANALYSIS_Pricedisc", "Redemption"),
+    NC_("ANALYSIS_Pricedisc", "The redemption value"),
+    NC_("ANALYSIS_Pricedisc", "Basis"),
+    NC_("ANALYSIS_Pricedisc", "The basis")
+};
+
+const char* ANALYSIS_Pricemat[] =
+{
+    NC_("ANALYSIS_Pricemat", "Returns the price per 100 currency units face value of a security that pays interest at maturity"),
+    NC_("ANALYSIS_Pricemat", "Settlement"),
+    NC_("ANALYSIS_Pricemat", "The settlement"),
+    NC_("ANALYSIS_Pricemat", "Maturity"),
+    NC_("ANALYSIS_Pricemat", "The maturity"),
+    NC_("ANALYSIS_Pricemat", "Issue"),
+    NC_("ANALYSIS_Pricemat", "The issue date"),
+    NC_("ANALYSIS_Pricemat", "Rate"),
+    NC_("ANALYSIS_Pricemat", "The rate"),
+    NC_("ANALYSIS_Pricemat", "Yield"),
+    NC_("ANALYSIS_Pricemat", "The yield"),
+    NC_("ANALYSIS_Pricemat", "Basis"),
+    NC_("ANALYSIS_Pricemat", "The basis")
+};
+
+const char* ANALYSIS_Mduration[] =
+{
+    NC_("ANALYSIS_Mduration", "Returns the Macaulay modified duration for a security with an assumed par value of 100 currency units"),
+    NC_("ANALYSIS_Mduration", "Settlement"),
+    NC_("ANALYSIS_Mduration", "The settlement"),
+    NC_("ANALYSIS_Mduration", "Maturity"),
+    NC_("ANALYSIS_Mduration", "The maturity"),
+    NC_("ANALYSIS_Mduration", "Coupon"),
+    NC_("ANALYSIS_Mduration", "The coupon rate"),
+    NC_("ANALYSIS_Mduration", "Yield"),
+    NC_("ANALYSIS_Mduration", "The yield"),
+    NC_("ANALYSIS_Mduration", "Frequency"),
+    NC_("ANALYSIS_Mduration", "The frequency"),
+    NC_("ANALYSIS_Mduration", "Basis"),
+    NC_("ANALYSIS_Mduration", "The basis")
+};
+
+const char* ANALYSIS_Nominal[] =
+{
+    NC_("ANALYSIS_Nominal", "Returns the annual nominal interest rate"),
+    NC_("ANALYSIS_Nominal", "Effective rate"),
+    NC_("ANALYSIS_Nominal", "The effective interest rate"),
+    NC_("ANALYSIS_Nominal", "Npery"),
+    NC_("ANALYSIS_Nominal", "The periods")
+};
+
+const char* ANALYSIS_Dollarfr[] =
+{
+    NC_("ANALYSIS_Dollarfr", "Converts a price expressed as a decimal into a price expressed as a fraction"),
+    NC_("ANALYSIS_Dollarfr", "Decimal dollar"),
+    NC_("ANALYSIS_Dollarfr", "The decimal number"),
+    NC_("ANALYSIS_Dollarfr", "Fraction"),
+    NC_("ANALYSIS_Dollarfr", "The divisor")
+};
+
+const char* ANALYSIS_Dollarde[] =
+{
+    NC_("ANALYSIS_Dollarde", "Converts a price expressed as a fraction into a price expressed as a decimal"),
+    NC_("ANALYSIS_Dollarde", "Fractional dollar"),
+    NC_("ANALYSIS_Dollarde", "The number as a fraction"),
+    NC_("ANALYSIS_Dollarde", "Fraction"),
+    NC_("ANALYSIS_Dollarde", "The divisor")
+};
+
+const char* ANALYSIS_Yield[] =
+{
+    NC_("ANALYSIS_Yield", "Returns the yield on a security that pays periodic interest"),
+    NC_("ANALYSIS_Yield", "Settlement"),
+    NC_("ANALYSIS_Yield", "The settlement"),
+    NC_("ANALYSIS_Yield", "Maturity"),
+    NC_("ANALYSIS_Yield", "The maturity"),
+    NC_("ANALYSIS_Yield", "Rate"),
+    NC_("ANALYSIS_Yield", "The rate"),
+    NC_("ANALYSIS_Yield", "Price"),
+    NC_("ANALYSIS_Yield", "The price"),
+    NC_("ANALYSIS_Yield", "Redemption"),
+    NC_("ANALYSIS_Yield", "The redemption value"),
+    NC_("ANALYSIS_Yield", "Frequency"),
+    NC_("ANALYSIS_Yield", "The frequency"),
+    NC_("ANALYSIS_Yield", "Basis"),
+    NC_("ANALYSIS_Yield", "The basis")
+};
+
+const char* ANALYSIS_Yielddisc[] =
+{
+    NC_("ANALYSIS_Yielddisc", "Returns the annual yield for a discounted security"),
+    NC_("ANALYSIS_Yielddisc", "Settlement"),
+    NC_("ANALYSIS_Yielddisc", "The settlement"),
+    NC_("ANALYSIS_Yielddisc", "Maturity"),
+    NC_("ANALYSIS_Yielddisc", "The maturity"),
+    NC_("ANALYSIS_Yielddisc", "Price"),
+    NC_("ANALYSIS_Yielddisc", "The price"),
+    NC_("ANALYSIS_Yielddisc", "Redemption"),
+    NC_("ANALYSIS_Yielddisc", "The redemption value"),
+    NC_("ANALYSIS_Yielddisc", "Basis"),
+    NC_("ANALYSIS_Yielddisc", "The basis")
+};
+
+const char* ANALYSIS_Yieldmat[] =
+{
+    NC_("ANALYSIS_Yieldmat", "Returns the annual yield of a security that pays interest at maturity"),
+    NC_("ANALYSIS_Yieldmat", "Settlement"),
+    NC_("ANALYSIS_Yieldmat", "The settlement"),
+    NC_("ANALYSIS_Yieldmat", "Maturity"),
+    NC_("ANALYSIS_Yieldmat", "The maturity"),
+    NC_("ANALYSIS_Yieldmat", "Issue"),
+    NC_("ANALYSIS_Yieldmat", "The issue date"),
+    NC_("ANALYSIS_Yieldmat", "Rate"),
+    NC_("ANALYSIS_Yieldmat", "The rate"),
+    NC_("ANALYSIS_Yieldmat", "Price"),
+    NC_("ANALYSIS_Yieldmat", "The price"),
+    NC_("ANALYSIS_Yieldmat", "Basis"),
+    NC_("ANALYSIS_Yieldmat", "The basis")
+};
+
+const char* ANALYSIS_Tbilleq[] =
+{
+    NC_("ANALYSIS_Tbilleq", "Returns the bond-equivalent yield for a treasury bill"),
+    NC_("ANALYSIS_Tbilleq", "Settlement"),
+    NC_("ANALYSIS_Tbilleq", "The settlement"),
+    NC_("ANALYSIS_Tbilleq", "Maturity"),
+    NC_("ANALYSIS_Tbilleq", "The maturity"),
+    NC_("ANALYSIS_Tbilleq", "Discount"),
+    NC_("ANALYSIS_Tbilleq", "The discount rate")
+};
+
+const char* ANALYSIS_Tbillprice[] =
+{
+    NC_("ANALYSIS_Tbillprice", "Returns the price of 100 currency units face value for a treasury bill"),
+    NC_("ANALYSIS_Tbillprice", "Settlement"),
+    NC_("ANALYSIS_Tbillprice", "The settlement"),
+    NC_("ANALYSIS_Tbillprice", "Maturity"),
+    NC_("ANALYSIS_Tbillprice", "The maturity"),
+    NC_("ANALYSIS_Tbillprice", "Discount"),
+    NC_("ANALYSIS_Tbillprice", "The discount rate")
+};
+
+const char* ANALYSIS_Tbillyield[] =
+{
+    NC_("ANALYSIS_Tbillyield", "Returns the yield for a treasury bill"),
+    NC_("ANALYSIS_Tbillyield", "Settlement"),
+    NC_("ANALYSIS_Tbillyield", "The settlement"),
+    NC_("ANALYSIS_Tbillyield", "Maturity"),
+    NC_("ANALYSIS_Tbillyield", "The maturity"),
+    NC_("ANALYSIS_Tbillyield", "Price"),
+    NC_("ANALYSIS_Tbillyield", "The price")
+};
+
+const char* ANALYSIS_Oddfprice[] =
+{
+    NC_("ANALYSIS_Oddfprice", "Returns the price per $100 face value of a security with an odd first period"),
+    NC_("ANALYSIS_Oddfprice", "Settlement"),
+    NC_("ANALYSIS_Oddfprice", "The settlement"),
+    NC_("ANALYSIS_Oddfprice", "Maturity"),
+    NC_("ANALYSIS_Oddfprice", "The maturity"),
+    NC_("ANALYSIS_Oddfprice", "Issue"),
+    NC_("ANALYSIS_Oddfprice", "The issue date"),
+    NC_("ANALYSIS_Oddfprice", "First coupon"),
+    NC_("ANALYSIS_Oddfprice", "The first coupon date"),
+    NC_("ANALYSIS_Oddfprice", "Rate"),
+    NC_("ANALYSIS_Oddfprice", "The rate"),
+    NC_("ANALYSIS_Oddfprice", "Yield"),
+    NC_("ANALYSIS_Oddfprice", "The yield"),
+    NC_("ANALYSIS_Oddfprice", "Redemption"),
+    NC_("ANALYSIS_Oddfprice", "The redemption value"),
+    NC_("ANALYSIS_Oddfprice", "Frequency"),
+    NC_("ANALYSIS_Oddfprice", "The frequency"),
+    NC_("ANALYSIS_Oddfprice", "Basis"),
+    NC_("ANALYSIS_Oddfprice", "The basis")
+};
+
+const char* ANALYSIS_Oddfyield[] =
+{
+    NC_("ANALYSIS_Oddfyield", "Returns the yield of a security with an odd first period"),
+    NC_("ANALYSIS_Oddfyield", "Settlement"),
+    NC_("ANALYSIS_Oddfyield", "The settlement"),
+    NC_("ANALYSIS_Oddfyield", "Maturity"),
+    NC_("ANALYSIS_Oddfyield", "The maturity"),
+    NC_("ANALYSIS_Oddfyield", "Issue"),
+    NC_("ANALYSIS_Oddfyield", "The issue date"),
+    NC_("ANALYSIS_Oddfyield", "First coupon"),
+    NC_("ANALYSIS_Oddfyield", "The first coupon date"),
+    NC_("ANALYSIS_Oddfyield", "Rate"),
+    NC_("ANALYSIS_Oddfyield", "The rate"),
+    NC_("ANALYSIS_Oddfyield", "Price"),
+    NC_("ANALYSIS_Oddfyield", "The price"),
+    NC_("ANALYSIS_Oddfyield", "Redemption"),
+    NC_("ANALYSIS_Oddfyield", "The redemption value"),
+    NC_("ANALYSIS_Oddfyield", "Frequency"),
+    NC_("ANALYSIS_Oddfyield", "The frequency"),
+    NC_("ANALYSIS_Oddfyield", "Basis"),
+    NC_("ANALYSIS_Oddfyield", "The basis")
+};
+
+const char* ANALYSIS_Oddlprice[] =
+{
+    NC_("ANALYSIS_Oddlprice", "Returns the price per $100 face value of a security with an odd last period"),
+    NC_("ANALYSIS_Oddlprice", "Settlement"),
+    NC_("ANALYSIS_Oddlprice", "The settlement"),
+    NC_("ANALYSIS_Oddlprice", "Maturity"),
+    NC_("ANALYSIS_Oddlprice", "The maturity"),
+    NC_("ANALYSIS_Oddlprice", "Last interest"),
+    NC_("ANALYSIS_Oddlprice", "The last interest date"),
+    NC_("ANALYSIS_Oddlprice", "Rate"),
+    NC_("ANALYSIS_Oddlprice", "The rate"),
+    NC_("ANALYSIS_Oddlprice", "Yield"),
+    NC_("ANALYSIS_Oddlprice", "The yield"),
+    NC_("ANALYSIS_Oddlprice", "Redemption"),
+    NC_("ANALYSIS_Oddlprice", "The redemption value"),
+    NC_("ANALYSIS_Oddlprice", "Frequency"),
+    NC_("ANALYSIS_Oddlprice", "The frequency"),
+    NC_("ANALYSIS_Oddlprice", "Basis"),
+    NC_("ANALYSIS_Oddlprice", "The basis")
+};
+
+const char* ANALYSIS_Oddlyield[] =
+{
+    NC_("ANALYSIS_Oddlyield", "Returns the yield of a security with an odd last period"),
+    NC_("ANALYSIS_Oddlyield", "Settlement"),
+    NC_("ANALYSIS_Oddlyield", "The settlement"),
+    NC_("ANALYSIS_Oddlyield", "Maturity"),
+    NC_("ANALYSIS_Oddlyield", "The maturity"),
+    NC_("ANALYSIS_Oddlyield", "Last interest"),
+    NC_("ANALYSIS_Oddlyield", "The last interest date"),
+    NC_("ANALYSIS_Oddlyield", "Rate"),
+    NC_("ANALYSIS_Oddlyield", "The rate"),
+    NC_("ANALYSIS_Oddlyield", "Price"),
+    NC_("ANALYSIS_Oddlyield", "The price"),
+    NC_("ANALYSIS_Oddlyield", "Redemption"),
+    NC_("ANALYSIS_Oddlyield", "The redemption value"),
+    NC_("ANALYSIS_Oddlyield", "Frequency"),
+    NC_("ANALYSIS_Oddlyield", "The frequency"),
+    NC_("ANALYSIS_Oddlyield", "Basis"),
+    NC_("ANALYSIS_Oddlyield", "The basis")
+};
+
+const char* ANALYSIS_Xirr[] =
+{
+    NC_("ANALYSIS_Xirr", "Returns the internal rate of return for a non-periodic schedule of payments"),
+    NC_("ANALYSIS_Xirr", "Values"),
+    NC_("ANALYSIS_Xirr", "The values"),
+    NC_("ANALYSIS_Xirr", "Dates"),
+    NC_("ANALYSIS_Xirr", "The dates"),
+    NC_("ANALYSIS_Xirr", "Guess"),
+    NC_("ANALYSIS_Xirr", "The guess")
+};
+
+const char* ANALYSIS_Xnpv[] =
+{
+    NC_("ANALYSIS_Xnpv", "Returns the net present value for a non-periodic schedule of payments"),
+    NC_("ANALYSIS_Xnpv", "Rate"),
+    NC_("ANALYSIS_Xnpv", "The rate"),
+    NC_("ANALYSIS_Xnpv", "Values"),
+    NC_("ANALYSIS_Xnpv", "The values"),
+    NC_("ANALYSIS_Xnpv", "Dates"),
+    NC_("ANALYSIS_Xnpv", "The dates")
+};
+
+const char* ANALYSIS_Intrate[] =
+{
+    NC_("ANALYSIS_Intrate", "Returns the interest rate for a fully invested security"),
+    NC_("ANALYSIS_Intrate", "Settlement"),
+    NC_("ANALYSIS_Intrate", "The settlement"),
+    NC_("ANALYSIS_Intrate", "Maturity"),
+    NC_("ANALYSIS_Intrate", "The maturity"),
+    NC_("ANALYSIS_Intrate", "Investment"),
+    NC_("ANALYSIS_Intrate", "The investment"),
+    NC_("ANALYSIS_Intrate", "Redemption"),
+    NC_("ANALYSIS_Intrate", "The redemption value"),
+    NC_("ANALYSIS_Intrate", "Basis"),
+    NC_("ANALYSIS_Intrate", "The basis")
+};
+
+const char* ANALYSIS_Coupncd[] =
+{
+    NC_("ANALYSIS_Coupncd", "Returns the first coupon date after the settlement date"),
+    NC_("ANALYSIS_Coupncd", "Settlement"),
+    NC_("ANALYSIS_Coupncd", "The settlement"),
+    NC_("ANALYSIS_Coupncd", "Maturity"),
+    NC_("ANALYSIS_Coupncd", "The maturity"),
+    NC_("ANALYSIS_Coupncd", "Frequency"),
+    NC_("ANALYSIS_Coupncd", "The frequency"),
+    NC_("ANALYSIS_Coupncd", "Basis"),
+    NC_("ANALYSIS_Coupncd", "The basis")
+};
+
+const char* ANALYSIS_Coupdays[] =
+{
+    NC_("ANALYSIS_Coupdays", "Returns the number of days in the coupon period containing the settlement date"),
+    NC_("ANALYSIS_Coupdays", "Settlement"),
+    NC_("ANALYSIS_Coupdays", "The settlement"),
+    NC_("ANALYSIS_Coupdays", "Maturity"),
+    NC_("ANALYSIS_Coupdays", "The maturity"),
+    NC_("ANALYSIS_Coupdays", "Frequency"),
+    NC_("ANALYSIS_Coupdays", "The frequency"),
+    NC_("ANALYSIS_Coupdays", "Basis"),
+    NC_("ANALYSIS_Coupdays", "The basis")
+};
+
+const char* ANALYSIS_Coupdaysnc[] =
+{
+    NC_("ANALYSIS_Coupdaysnc", "Returns the number of days from the settlement date to the next coupon date"),
+    NC_("ANALYSIS_Coupdaysnc", "Settlement"),
+    NC_("ANALYSIS_Coupdaysnc", "The settlement"),
+    NC_("ANALYSIS_Coupdaysnc", "Maturity"),
+    NC_("ANALYSIS_Coupdaysnc", "The maturity"),
+    NC_("ANALYSIS_Coupdaysnc", "Frequency"),
+    NC_("ANALYSIS_Coupdaysnc", "The frequency"),
+    NC_("ANALYSIS_Coupdaysnc", "Basis"),
+    NC_("ANALYSIS_Coupdaysnc", "The basis")
+};
+
+const char* ANALYSIS_Coupdaybs[] =
+{
+    NC_("ANALYSIS_Coupdaybs", "Returns the number of days from the beginning of the coupon period to the settlement date"),
+    NC_("ANALYSIS_Coupdaybs", "Settlement"),
+    NC_("ANALYSIS_Coupdaybs", "The settlement"),
+    NC_("ANALYSIS_Coupdaybs", "Maturity"),
+    NC_("ANALYSIS_Coupdaybs", "The maturity"),
+    NC_("ANALYSIS_Coupdaybs", "Frequency"),
+    NC_("ANALYSIS_Coupdaybs", "The frequency"),
+    NC_("ANALYSIS_Coupdaybs", "Basis"),
+    NC_("ANALYSIS_Coupdaybs", "The basis")
+};
+
+const char* ANALYSIS_Couppcd[] =
+{
+    NC_("ANALYSIS_Couppcd", "Returns the last coupon date preceding the settlement date"),
+    NC_("ANALYSIS_Couppcd", "Settlement"),
+    NC_("ANALYSIS_Couppcd", "The settlement"),
+    NC_("ANALYSIS_Couppcd", "Maturity"),
+    NC_("ANALYSIS_Couppcd", "The maturity"),
+    NC_("ANALYSIS_Couppcd", "Frequency"),
+    NC_("ANALYSIS_Couppcd", "The frequency"),
+    NC_("ANALYSIS_Couppcd", "Basis"),
+    NC_("ANALYSIS_Couppcd", "The basis")
+};
+
+const char* ANALYSIS_Coupnum[] =
+{
+    NC_("ANALYSIS_Coupnum", "Returns the number of coupons payable between the settlement and maturity dates"),
+    NC_("ANALYSIS_Coupnum", "Settlement"),
+    NC_("ANALYSIS_Coupnum", "The settlement"),
+    NC_("ANALYSIS_Coupnum", "Maturity"),
+    NC_("ANALYSIS_Coupnum", "The maturity"),
+    NC_("ANALYSIS_Coupnum", "Frequency"),
+    NC_("ANALYSIS_Coupnum", "The frequency"),
+    NC_("ANALYSIS_Coupnum", "Basis"),
+    NC_("ANALYSIS_Coupnum", "The basis")
+};
+
+const char* ANALYSIS_Fvschedule[] =
+{
+    NC_("ANALYSIS_Fvschedule", "Returns the future value of the initial principal after a series of compound interest rates are applied"),
+    NC_("ANALYSIS_Fvschedule", "Principal"),
+    NC_("ANALYSIS_Fvschedule", "The principal"),
+    NC_("ANALYSIS_Fvschedule", "Schedule"),
+    NC_("ANALYSIS_Fvschedule", "The schedule")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/inc/datefunc.hrc b/scaddins/inc/datefunc.hrc
new file mode 100644
index 000000000000..f5401fb299df
--- /dev/null
+++ b/scaddins/inc/datefunc.hrc
@@ -0,0 +1,95 @@
+/* -*- 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_SCADDINS_INC_PRICING_HRC
+#define INCLUDED_SCADDINS_INC_PRICING_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* DATE_FUNCDESC_DiffWeeks[] =
+{
+    NC_("DATE_FUNCDESC_DiffWeeks", "Calculates the number of weeks in a specific period"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "Start date"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "First day of the period"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "End date"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "Last day of the period"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "Type"),
+    NC_("DATE_FUNCDESC_DiffWeeks", "Type of calculation: Type=0 means the time interval, Type=1 means calendar weeks.")
+};
+
+const char* DATE_FUNCDESC_DiffMonths[] =
+{
+    NC_("DATE_FUNCDESC_DiffMonths", "Determines the number of months in a specific period."),
+    NC_("DATE_FUNCDESC_DiffMonths", "Start date"),
+    NC_("DATE_FUNCDESC_DiffMonths", "First day of the period."),
+    NC_("DATE_FUNCDESC_DiffMonths", "End date"),
+    NC_("DATE_FUNCDESC_DiffMonths", "Last day of the period."),
+    NC_("DATE_FUNCDESC_DiffMonths", "Type"),
+    NC_("DATE_FUNCDESC_DiffMonths", "Type of calculation: Type=0 means the time interval, Type=1 means calendar months.")
+};
+
+const char* DATE_FUNCDESC_DiffYears[] =
+{
+    NC_("DATE_FUNCDESC_DiffYears", "Calculates the number of years in a specific period."),
+    NC_("DATE_FUNCDESC_DiffYears", "Start date"),
+    NC_("DATE_FUNCDESC_DiffYears", "First day of the period"),
+    NC_("DATE_FUNCDESC_DiffYears", "End date"),
+    NC_("DATE_FUNCDESC_DiffYears", "Last day of the period"),
+    NC_("DATE_FUNCDESC_DiffYears", "Type"),
+    NC_("DATE_FUNCDESC_DiffYears", "Type of calculation: Type=0 means the time interval, Type=1 means calendar years.")
+};
+
+const char* DATE_FUNCDESC_IsLeapYear[] =
+{
+    NC_("DATE_FUNCDESC_IsLeapYear", "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE)."),
+    NC_("DATE_FUNCDESC_IsLeapYear", "Date"),
+    NC_("DATE_FUNCDESC_IsLeapYear", "Any day in the desired year")
+};
+
+const char* DATE_FUNCDESC_DaysInMonth[] =
+{
+    NC_("DATE_FUNCDESC_DaysInMonth", "Returns the number of days of the month in which the date entered occurs"),
+    NC_("DATE_FUNCDESC_DaysInMonth", "Date"),
+    NC_("DATE_FUNCDESC_DaysInMonth", "Any day in the desired month")
+};
+
+const char* DATE_FUNCDESC_DaysInYear[] =
+{
+    NC_("DATE_FUNCDESC_DaysInYear", "Returns the number of days of the year in which the date entered occurs."),
+    NC_("DATE_FUNCDESC_DaysInYear", "Date"),
+    NC_("DATE_FUNCDESC_DaysInYear", "Any day in the desired year")
+};
+
+const char* DATE_FUNCDESC_WeeksInYear[] =
+{
+    NC_("DATE_FUNCDESC_WeeksInYear", "Returns the number of weeks of the year in which the date entered occurs"),
+    NC_("DATE_FUNCDESC_WeeksInYear", "Date"),
+    NC_("DATE_FUNCDESC_WeeksInYear", "Any day in the desired year")
+};
+
+const char* DATE_FUNCDESC_Rot13[] =
+{
+    NC_("DATE_FUNCDESC_Rot13", "Encrypts or decrypts a text using the ROT13 algorithm"),
+    NC_("DATE_FUNCDESC_Rot13", "Text"),
+    NC_("DATE_FUNCDESC_Rot13", "Text to be encrypted or text already encrypted")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/inc/pricing.hrc b/scaddins/inc/pricing.hrc
new file mode 100644
index 000000000000..c54a387a86fc
--- /dev/null
+++ b/scaddins/inc/pricing.hrc
@@ -0,0 +1,124 @@
+/* -*- 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_SCADDINS_INC_PRICING_HRC
+#define INCLUDED_SCADDINS_INC_PRICING_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// function and parameter description
+const char* PRICING_FUNCDESC_OptBarrier[] =
+{
+    NC_("PRICING_FUNCDESC_OptBarrier", "Pricing of a barrier option"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "spot"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Price/value of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "vol"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Annual volatility of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "r"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Interest rate (continuously compounded)"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "rf"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Foreign interest rate (continuously compounded)"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "T"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Time to maturity of the option in years"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "strike"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Strike level of the option"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "barrier_low"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Lower barrier (set to 0 for no lower barrier)"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "barrier_up"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Upper barrier (set to 0 for no upper barrier)"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "rebate"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Amount of money paid at maturity if barrier was hit"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "put/call"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "String to define if the option is a (p)ut or a (c)all"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "knock in/out"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "String to define if the option is of type knock-(i)n or knock-(o)ut"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "barrier_type"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "greek"),
+    NC_("PRICING_FUNCDESC_OptBarrier", "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)")
+};
+
+const char* PRICING_FUNCDESC_OptTouch[] =
+{
+    NC_("PRICING_FUNCDESC_OptTouch", "Pricing of a touch/no-touch option"),
+    NC_("PRICING_FUNCDESC_OptTouch", "spot"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Price/value of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptTouch", "vol"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Annual volatility of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptTouch", "r"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Interest rate (continuously compounded)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "rf"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Foreign interest rate (continuously compounded)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "T"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Time to maturity of the option in years"),
+    NC_("PRICING_FUNCDESC_OptTouch", "barrier_low"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Lower barrier (set to 0 for no lower barrier)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "barrier_up"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Upper barrier (set to 0 for no upper barrier)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "foreign/domestic"),
+    NC_("PRICING_FUNCDESC_OptTouch", "String to define if the option pays one unit of (d)omestic currency (cash or nothing) or (f)oreign currency (asset or nothing)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "knock in/out"),
+    NC_("PRICING_FUNCDESC_OptTouch", "String to define if the option is of type knock-(i)n (touch) or knock-(o)ut (no-touch)"),
+    NC_("PRICING_FUNCDESC_OptTouch", "barrier_type"),
+    NC_("PRICING_FUNCDESC_OptTouch", "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"),
+    NC_("PRICING_FUNCDESC_OptTouch", "greek"),
+    NC_("PRICING_FUNCDESC_OptTouch", "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)")
+};
+
+const char* PRICING_FUNCDESC_OptProbHit[] =
+{
+    NC_("PRICING_FUNCDESC_OptProbHit", "Probability that an asset hits a barrier assuming it follows dS/S = mu dt + vol dW"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "spot"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Price/value S of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "vol"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Annual volatility of the underlying asset"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "drift"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Parameter mu in dS/S = mu dt + vol dW"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "T"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Time to maturity"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "barrier_low"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Lower barrier (set to 0 for no lower barrier)"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "barrier_up"),
+    NC_("PRICING_FUNCDESC_OptProbHit", "Upper barrier (set to 0 for no upper barrier)")
+};
+
+const char* PRICING_FUNCDESC_OptProbInMoney[] =
+{
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Probability that an asset will at maturity end up between two barrier levels, assuming it follows dS/S = mu dt + vol dW (if the last two optional parameters (strike, put/call) are specified, the probability of S_T in [strike, upper barrier] for a call and S_T in [lower barrier, strike] for a put will be returned)"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "spot"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Price/value of the asset"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "vol"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Annual volatility of the asset"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "drift"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Parameter mu from dS/S = mu dt + vol dW"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "T"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Time to maturity in years"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "barrier_low"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Lower barrier (set to 0 for no lower barrier)"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "barrier_up"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Upper barrier (set to 0 for no upper barrier)"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "put/call"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Optional (p)ut/(c)all indicator"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "strike"),
+    NC_("PRICING_FUNCDESC_OptProbInMoney", "Optional strike level")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/inc/strings.hrc b/scaddins/inc/strings.hrc
new file mode 100644
index 000000000000..b7ab057e4f8e
--- /dev/null
+++ b/scaddins/inc/strings.hrc
@@ -0,0 +1,144 @@
+/* -*- 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_SCADDINS_INC_STRINGS_HRC
+#define INCLUDED_SCADDINS_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// function names as accessible from cells
+#define PRICING_FUNCNAME_OptBarrier                     NC_("PRICING_FUNCNAME_OptBarrier", "OPT_BARRIER")
+#define PRICING_FUNCNAME_OptTouch                       NC_("PRICING_FUNCNAME_OptTouch", "OPT_TOUCH")
+#define PRICING_FUNCNAME_OptProbHit                     NC_("PRICING_FUNCNAME_OptProbHit", "OPT_PROB_HIT")
+#define PRICING_FUNCNAME_OptProbInMoney                 NC_("PRICING_FUNCNAME_OptProbInMoney", "OPT_PROB_INMONEY")
+
+#define DATE_FUNCNAME_DiffWeeks                         NC_("DATE_FUNCNAME_DiffWeeks", "WEEKS")
+#define DATE_FUNCNAME_DiffMonths                        NC_("DATE_FUNCNAME_DiffMonths", "MONTHS")
+#define DATE_FUNCNAME_DiffYears                         NC_("DATE_FUNCNAME_DiffYears", "YEARS")
+#define DATE_FUNCNAME_IsLeapYear                        NC_("DATE_FUNCNAME_IsLeapYear", "ISLEAPYEAR")
+#define DATE_FUNCNAME_DaysInMonth                       NC_("DATE_FUNCNAME_DaysInMonth", "DAYSINMONTH")
+#define DATE_FUNCNAME_DaysInYear                        NC_("DATE_FUNCNAME_DaysInYear", "DAYSINYEAR")
+#define DATE_FUNCNAME_WeeksInYear                       NC_("DATE_FUNCNAME_WeeksInYear", "WEEKSINYEAR")
+#define DATE_FUNCNAME_Rot13                             NC_("DATE_FUNCNAME_Rot13", "ROT13")
+
+#define ANALYSIS_FUNCNAME_Workday                       NC_("ANALYSIS_FUNCNAME_Workday", "WORKDAY")
+#define ANALYSIS_FUNCNAME_Yearfrac                      NC_("ANALYSIS_FUNCNAME_Yearfrac", "YEARFRAC")
+#define ANALYSIS_FUNCNAME_Edate                         NC_("ANALYSIS_FUNCNAME_Edate", "EDATE")
+#define ANALYSIS_FUNCNAME_Weeknum                       NC_("ANALYSIS_FUNCNAME_Weeknum", "WEEKNUM")
+#define ANALYSIS_FUNCNAME_Eomonth                       NC_("ANALYSIS_FUNCNAME_Eomonth", "EOMONTH")
+#define ANALYSIS_FUNCNAME_Networkdays                   NC_("ANALYSIS_FUNCNAME_Networkdays", "NETWORKDAYS")
+#define ANALYSIS_FUNCNAME_Amordegrc                     NC_("ANALYSIS_FUNCNAME_Amordegrc", "AMORDEGRC")
+#define ANALYSIS_FUNCNAME_Amorlinc                      NC_("ANALYSIS_FUNCNAME_Amorlinc", "AMORLINC")
+#define ANALYSIS_FUNCNAME_Accrint                       NC_("ANALYSIS_FUNCNAME_Accrint", "ACCRINT")
+#define ANALYSIS_FUNCNAME_Accrintm                      NC_("ANALYSIS_FUNCNAME_Accrintm", "ACCRINTM")
+#define ANALYSIS_FUNCNAME_Received                      NC_("ANALYSIS_FUNCNAME_Received", "RECEIVED")
+#define ANALYSIS_FUNCNAME_Disc                          NC_("ANALYSIS_FUNCNAME_Disc", "DISC")
+#define ANALYSIS_FUNCNAME_Duration                      NC_("ANALYSIS_FUNCNAME_Duration", "DURATION")
+#define ANALYSIS_FUNCNAME_Effect                        NC_("ANALYSIS_FUNCNAME_Effect", "EFFECT")
+#define ANALYSIS_FUNCNAME_Cumprinc                      NC_("ANALYSIS_FUNCNAME_Cumprinc", "CUMPRINC")
+#define ANALYSIS_FUNCNAME_Cumipmt                       NC_("ANALYSIS_FUNCNAME_Cumipmt", "CUMIPMT")
+#define ANALYSIS_FUNCNAME_Price                         NC_("ANALYSIS_FUNCNAME_Price", "PRICE")
+#define ANALYSIS_FUNCNAME_Pricedisc                     NC_("ANALYSIS_FUNCNAME_Pricedisc", "PRICEDISC")
+#define ANALYSIS_FUNCNAME_Pricemat                      NC_("ANALYSIS_FUNCNAME_Pricemat", "PRICEMAT")
+#define ANALYSIS_FUNCNAME_Mduration                     NC_("ANALYSIS_FUNCNAME_Mduration", "MDURATION")
+#define ANALYSIS_FUNCNAME_Nominal                       NC_("ANALYSIS_FUNCNAME_Nominal", "NOMINAL")
+#define ANALYSIS_FUNCNAME_Dollarfr                      NC_("ANALYSIS_FUNCNAME_Dollarfr", "DOLLARFR")
+#define ANALYSIS_FUNCNAME_Dollarde                      NC_("ANALYSIS_FUNCNAME_Dollarde", "DOLLARDE")
+#define ANALYSIS_FUNCNAME_Yield                         NC_("ANALYSIS_FUNCNAME_Yield", "YIELD")
+#define ANALYSIS_FUNCNAME_Yielddisc                     NC_("ANALYSIS_FUNCNAME_Yielddisc", "YIELDDISC")
+#define ANALYSIS_FUNCNAME_Yieldmat                      NC_("ANALYSIS_FUNCNAME_Yieldmat", "YIELDMAT")
+#define ANALYSIS_FUNCNAME_Tbilleq                       NC_("ANALYSIS_FUNCNAME_Tbilleq", "TBILLEQ")
+#define ANALYSIS_FUNCNAME_Tbillprice                    NC_("ANALYSIS_FUNCNAME_Tbillprice", "TBILLPRICE")
+#define ANALYSIS_FUNCNAME_Tbillyield                    NC_("ANALYSIS_FUNCNAME_Tbillyield", "TBILLYIELD")
+#define ANALYSIS_FUNCNAME_Oddfprice                     NC_("ANALYSIS_FUNCNAME_Oddfprice", "ODDFPRICE")
+#define ANALYSIS_FUNCNAME_Oddfyield                     NC_("ANALYSIS_FUNCNAME_Oddfyield", "ODDFYIELD")
+#define ANALYSIS_FUNCNAME_Oddlprice                     NC_("ANALYSIS_FUNCNAME_Oddlprice", "ODDLPRICE")
+#define ANALYSIS_FUNCNAME_Oddlyield                     NC_("ANALYSIS_FUNCNAME_Oddlyield", "ODDLYIELD")
+#define ANALYSIS_FUNCNAME_Xirr                          NC_("ANALYSIS_FUNCNAME_Xirr", "XIRR")
+#define ANALYSIS_FUNCNAME_Xnpv                          NC_("ANALYSIS_FUNCNAME_Xnpv", "XNPV")
+#define ANALYSIS_FUNCNAME_Intrate                       NC_("ANALYSIS_FUNCNAME_Intrate", "INTRATE")
+#define ANALYSIS_FUNCNAME_Coupncd                       NC_("ANALYSIS_FUNCNAME_Coupncd", "COUPNCD")
+#define ANALYSIS_FUNCNAME_Coupdays                      NC_("ANALYSIS_FUNCNAME_Coupdays", "COUPDAYS")
+#define ANALYSIS_FUNCNAME_Coupdaysnc                    NC_("ANALYSIS_FUNCNAME_Coupdaysnc", "COUPDAYSNC")
+#define ANALYSIS_FUNCNAME_Coupdaybs                     NC_("ANALYSIS_FUNCNAME_Coupdaybs", "COUPDAYBS")
+#define ANALYSIS_FUNCNAME_Couppcd                       NC_("ANALYSIS_FUNCNAME_Couppcd", "COUPPCD")
+#define ANALYSIS_FUNCNAME_Coupnum                       NC_("ANALYSIS_FUNCNAME_Coupnum", "COUPNUM")
+#define ANALYSIS_FUNCNAME_Fvschedule                    NC_("ANALYSIS_FUNCNAME_Fvschedule", "FVSCHEDULE")
+#define ANALYSIS_FUNCNAME_Iseven                        NC_("ANALYSIS_FUNCNAME_Iseven", "ISEVEN")
+#define ANALYSIS_FUNCNAME_Isodd                         NC_("ANALYSIS_FUNCNAME_Isodd", "ISODD")
+#define ANALYSIS_FUNCNAME_Gcd                           NC_("ANALYSIS_FUNCNAME_Gcd", "GCD")
+#define ANALYSIS_FUNCNAME_Lcm                           NC_("ANALYSIS_FUNCNAME_Lcm", "LCM")
+#define ANALYSIS_FUNCNAME_Multinomial                   NC_("ANALYSIS_FUNCNAME_Multinomial", "MULTINOMIAL")
+#define ANALYSIS_FUNCNAME_Seriessum                     NC_("ANALYSIS_FUNCNAME_Seriessum", "SERIESSUM")
+#define ANALYSIS_FUNCNAME_Quotient                      NC_("ANALYSIS_FUNCNAME_Quotient", "QUOTIENT")
+#define ANALYSIS_FUNCNAME_Mround                        NC_("ANALYSIS_FUNCNAME_Mround", "MROUND")
+#define ANALYSIS_FUNCNAME_Sqrtpi                        NC_("ANALYSIS_FUNCNAME_Sqrtpi", "SQRTPI")
+#define ANALYSIS_FUNCNAME_Randbetween                   NC_("ANALYSIS_FUNCNAME_Randbetween", "RANDBETWEEN")
+#define ANALYSIS_FUNCNAME_Besseli                       NC_("ANALYSIS_FUNCNAME_Besseli", "BESSELI")
+#define ANALYSIS_FUNCNAME_Besselj                       NC_("ANALYSIS_FUNCNAME_Besselj", "BESSELJ")
+#define ANALYSIS_FUNCNAME_Besselk                       NC_("ANALYSIS_FUNCNAME_Besselk", "BESSELK")
+#define ANALYSIS_FUNCNAME_Bessely                       NC_("ANALYSIS_FUNCNAME_Bessely", "BESSELY")
+#define ANALYSIS_FUNCNAME_Bin2Dec                       NC_("ANALYSIS_FUNCNAME_Bin2Dec", "BIN2DEC")
+#define ANALYSIS_FUNCNAME_Bin2Hex                       NC_("ANALYSIS_FUNCNAME_Bin2Hex", "BIN2HEX")
+#define ANALYSIS_FUNCNAME_Bin2Oct                       NC_("ANALYSIS_FUNCNAME_Bin2Oct", "BIN2OCT")
+#define ANALYSIS_FUNCNAME_Delta                         NC_("ANALYSIS_FUNCNAME_Delta", "DELTA")
+#define ANALYSIS_FUNCNAME_Dec2Bin                       NC_("ANALYSIS_FUNCNAME_Dec2Bin", "DEC2BIN")
+#define ANALYSIS_FUNCNAME_Dec2Hex                       NC_("ANALYSIS_FUNCNAME_Dec2Hex", "DEC2HEX")
+#define ANALYSIS_FUNCNAME_Dec2Oct                       NC_("ANALYSIS_FUNCNAME_Dec2Oct", "DEC2OCT")
+#define ANALYSIS_FUNCNAME_Erf                           NC_("ANALYSIS_FUNCNAME_Erf", "ERF")
+#define ANALYSIS_FUNCNAME_Erfc                          NC_("ANALYSIS_FUNCNAME_Erfc", "ERFC")
+#define ANALYSIS_FUNCNAME_Gestep                        NC_("ANALYSIS_FUNCNAME_Gestep", "GESTEP")
+#define ANALYSIS_FUNCNAME_Hex2Bin                       NC_("ANALYSIS_FUNCNAME_Hex2Bin", "HEX2BIN")
+#define ANALYSIS_FUNCNAME_Hex2Dec                       NC_("ANALYSIS_FUNCNAME_Hex2Dec", "HEX2DEC")
+#define ANALYSIS_FUNCNAME_Hex2Oct                       NC_("ANALYSIS_FUNCNAME_Hex2Oct", "HEX2OCT")
+#define ANALYSIS_FUNCNAME_Imabs                         NC_("ANALYSIS_FUNCNAME_Imabs", "IMABS")
+#define ANALYSIS_FUNCNAME_Imaginary                     NC_("ANALYSIS_FUNCNAME_Imaginary", "IMAGINARY")
+#define ANALYSIS_FUNCNAME_Impower                       NC_("ANALYSIS_FUNCNAME_Impower", "IMPOWER")
+#define ANALYSIS_FUNCNAME_Imargument                    NC_("ANALYSIS_FUNCNAME_Imargument", "IMARGUMENT")
+#define ANALYSIS_FUNCNAME_Imcos                         NC_("ANALYSIS_FUNCNAME_Imcos", "IMCOS")
+#define ANALYSIS_FUNCNAME_Imdiv                         NC_("ANALYSIS_FUNCNAME_Imdiv", "IMDIV")
+#define ANALYSIS_FUNCNAME_Imexp                         NC_("ANALYSIS_FUNCNAME_Imexp", "IMEXP")
+#define ANALYSIS_FUNCNAME_Imconjugate                   NC_("ANALYSIS_FUNCNAME_Imconjugate", "IMCONJUGATE")
+#define ANALYSIS_FUNCNAME_Imln                          NC_("ANALYSIS_FUNCNAME_Imln", "IMLN")
+#define ANALYSIS_FUNCNAME_Imlog10                       NC_("ANALYSIS_FUNCNAME_Imlog10", "IMLOG10")
+#define ANALYSIS_FUNCNAME_Imlog2                        NC_("ANALYSIS_FUNCNAME_Imlog2", "IMLOG2")
+#define ANALYSIS_FUNCNAME_Improduct                     NC_("ANALYSIS_FUNCNAME_Improduct", "IMPRODUCT")
+#define ANALYSIS_FUNCNAME_Imreal                        NC_("ANALYSIS_FUNCNAME_Imreal", "IMREAL")
+#define ANALYSIS_FUNCNAME_Imsin                         NC_("ANALYSIS_FUNCNAME_Imsin", "IMSIN")
+#define ANALYSIS_FUNCNAME_Imsub                         NC_("ANALYSIS_FUNCNAME_Imsub", "IMSUB")
+#define ANALYSIS_FUNCNAME_Imsum                         NC_("ANALYSIS_FUNCNAME_Imsum", "IMSUM")
+#define ANALYSIS_FUNCNAME_Imsqrt                        NC_("ANALYSIS_FUNCNAME_Imsqrt", "IMSQRT")
+#define ANALYSIS_FUNCNAME_Imtan                         NC_("ANALYSIS_FUNCNAME_Imtan", "IMTAN")
+#define ANALYSIS_FUNCNAME_Imsec                         NC_("ANALYSIS_FUNCNAME_Imsec", "IMSEC")
+#define ANALYSIS_FUNCNAME_Imcsc                         NC_("ANALYSIS_FUNCNAME_Imcsc", "IMCSC")
+#define ANALYSIS_FUNCNAME_Imcot                         NC_("ANALYSIS_FUNCNAME_Imcot", "IMCOT")
+#define ANALYSIS_FUNCNAME_Imsinh                        NC_("ANALYSIS_FUNCNAME_Imsinh", "IMSINH")
+#define ANALYSIS_FUNCNAME_Imcosh                        NC_("ANALYSIS_FUNCNAME_Imcosh", "IMCOSH")
+#define ANALYSIS_FUNCNAME_Imsech                        NC_("ANALYSIS_FUNCNAME_Imsech", "IMSECH")
+#define ANALYSIS_FUNCNAME_Imcsch                        NC_("ANALYSIS_FUNCNAME_Imcsch", "IMCSCH")
+#define ANALYSIS_FUNCNAME_Complex                       NC_("ANALYSIS_FUNCNAME_Complex", "COMPLEX")
+#define ANALYSIS_FUNCNAME_Oct2Bin                       NC_("ANALYSIS_FUNCNAME_Oct2Bin", "OCT2BIN")
+#define ANALYSIS_FUNCNAME_Oct2Dec                       NC_("ANALYSIS_FUNCNAME_Oct2Dec", "OCT2DEC")
+#define ANALYSIS_FUNCNAME_Oct2Hex                       NC_("ANALYSIS_FUNCNAME_Oct2Hex", "OCT2HEX")
+#define ANALYSIS_FUNCNAME_Convert                       NC_("ANALYSIS_FUNCNAME_Convert", "CONVERT")
+#define ANALYSIS_FUNCNAME_Factdouble                    NC_("ANALYSIS_FUNCNAME_Factdouble", "FACTDOUBLE")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 14a9b6b89481..4d98db9a1ea3 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "analysis.hxx"
-#include "analysis.hrc"
+#include "strings.hrc"
 #include "bessel.hxx"
 #include <cppuhelper/factory.hxx>
 #include <comphelper/processfactory.hxx>
@@ -29,9 +29,7 @@
 #include <rtl/math.hxx>
 #include <sal/macros.h>
 #include <string.h>
-#include <tools/resary.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/rcid.h>
 #include <algorithm>
 #include <cmath>
 
@@ -66,29 +64,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
     return pRet;
 }
 
-ResMgr& AnalysisAddIn::GetResMgr()
+OUString AnalysisAddIn::GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex)
 {
-    if( !pResMgr )
-    {
-        InitData();     // try to get resource manager
-
-        if( !pResMgr )
-            throw uno::RuntimeException();
-    }
-
-    return *pResMgr;
-}
-
-OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
-{
-    ResStringArray aArr(AnalysisResId(nResId, GetResMgr()));
-    return aArr.GetString(nStrIndex - 1);
+    return AnalysisResId(pResId[nStrIndex - 1]);
 }
 
 void AnalysisAddIn::InitData()
 {
-    delete pResMgr;
-    pResMgr = ResMgr::CreateResMgr("analysis", LanguageTag(aFuncLoc));
+    aResLocale = Translate::Create("analysis", LanguageTag(aFuncLoc));
 
     delete pFD;
     pFD = new FuncDataList;
@@ -103,14 +86,12 @@ AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xC
     pFD( nullptr ),
     pFactDoubles( nullptr ),
     pCDL( nullptr ),
-    pResMgr( nullptr ),
     aAnyConv( xContext )
 {
 }
 
 AnalysisAddIn::~AnalysisAddIn()
 {
-    delete pResMgr;
     delete pCDL;
     delete pFD;
     delete[] pDefLocales;
@@ -240,7 +221,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra
     auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticName ) );
     if( it != pFD->end() )
     {
-        aRet = AnalysisResId(it->GetUINameID(), GetResMgr());
+        aRet = AnalysisResId(it->GetUINameID());
         if( it->IsDouble() )
         {
             const OUString& rSuffix = it->GetSuffix();
@@ -1124,4 +1105,9 @@ double SAL_CALL AnalysisAddIn::getConvert( double f, const OUString& aFU, const
     RETURN_FINITE( fRet );
 }
 
+OUString AnalysisAddIn::AnalysisResId(const char* pResId)
+{
+    return Translate::get(pResId, aResLocale);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysis.hrc b/scaddins/source/analysis/analysis.hrc
deleted file mode 100644
index 75d4bfe28363..000000000000
--- a/scaddins/source/analysis/analysis.hrc
+++ /dev/null
@@ -1,234 +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 SCADDINS_ANALYSIS_HRC
-#define SCADDINS_ANALYSIS_HRC
-
-#define ANALYSIS_RESOURCE_START             1000
-
-#define ANALYSIS_FUNCDESC_START             (ANALYSIS_RESOURCE_START)
-
-#define ANALYSIS_Workday                    (ANALYSIS_FUNCDESC_START)
-#define ANALYSIS_Yearfrac                   (ANALYSIS_FUNCDESC_START+1)
-#define ANALYSIS_Edate                      (ANALYSIS_FUNCDESC_START+2)
-#define ANALYSIS_Weeknum                    (ANALYSIS_FUNCDESC_START+3)
-#define ANALYSIS_Eomonth                    (ANALYSIS_FUNCDESC_START+4)
-#define ANALYSIS_Networkdays                (ANALYSIS_FUNCDESC_START+5)
-#define ANALYSIS_Iseven                     (ANALYSIS_FUNCDESC_START+6)
-#define ANALYSIS_Isodd                      (ANALYSIS_FUNCDESC_START+7)
-#define ANALYSIS_Multinomial                (ANALYSIS_FUNCDESC_START+8)
-#define ANALYSIS_Seriessum                  (ANALYSIS_FUNCDESC_START+9)
-#define ANALYSIS_Quotient                   (ANALYSIS_FUNCDESC_START+10)
-#define ANALYSIS_Mround                     (ANALYSIS_FUNCDESC_START+11)
-#define ANALYSIS_Sqrtpi                     (ANALYSIS_FUNCDESC_START+12)
-#define ANALYSIS_Randbetween                (ANALYSIS_FUNCDESC_START+13)
-#define ANALYSIS_Gcd                        (ANALYSIS_FUNCDESC_START+14)
-#define ANALYSIS_Lcm                        (ANALYSIS_FUNCDESC_START+15)
-#define ANALYSIS_Besseli                    (ANALYSIS_FUNCDESC_START+16)
-#define ANALYSIS_Besselj                    (ANALYSIS_FUNCDESC_START+17)
-#define ANALYSIS_Besselk                    (ANALYSIS_FUNCDESC_START+18)
-#define ANALYSIS_Bessely                    (ANALYSIS_FUNCDESC_START+19)
-#define ANALYSIS_Bin2Oct                    (ANALYSIS_FUNCDESC_START+20)
-#define ANALYSIS_Bin2Dec                    (ANALYSIS_FUNCDESC_START+21)
-#define ANALYSIS_Bin2Hex                    (ANALYSIS_FUNCDESC_START+22)
-#define ANALYSIS_Oct2Bin                    (ANALYSIS_FUNCDESC_START+23)
-#define ANALYSIS_Oct2Dec                    (ANALYSIS_FUNCDESC_START+24)
-#define ANALYSIS_Oct2Hex                    (ANALYSIS_FUNCDESC_START+25)
-#define ANALYSIS_Dec2Bin                    (ANALYSIS_FUNCDESC_START+26)
-#define ANALYSIS_Dec2Hex                    (ANALYSIS_FUNCDESC_START+27)
-#define ANALYSIS_Dec2Oct                    (ANALYSIS_FUNCDESC_START+28)
-#define ANALYSIS_Hex2Bin                    (ANALYSIS_FUNCDESC_START+29)
-#define ANALYSIS_Hex2Dec                    (ANALYSIS_FUNCDESC_START+30)
-#define ANALYSIS_Hex2Oct                    (ANALYSIS_FUNCDESC_START+31)
-#define ANALYSIS_Delta                      (ANALYSIS_FUNCDESC_START+32)
-#define ANALYSIS_Erf                        (ANALYSIS_FUNCDESC_START+33)
-#define ANALYSIS_Erfc                       (ANALYSIS_FUNCDESC_START+34)
-#define ANALYSIS_Gestep                     (ANALYSIS_FUNCDESC_START+35)
-#define ANALYSIS_Factdouble                 (ANALYSIS_FUNCDESC_START+36)
-#define ANALYSIS_Imabs                      (ANALYSIS_FUNCDESC_START+37)
-#define ANALYSIS_Imaginary                  (ANALYSIS_FUNCDESC_START+38)
-#define ANALYSIS_Impower                    (ANALYSIS_FUNCDESC_START+39)
-#define ANALYSIS_Imargument                 (ANALYSIS_FUNCDESC_START+40)
-#define ANALYSIS_Imcos                      (ANALYSIS_FUNCDESC_START+41)
-#define ANALYSIS_Imdiv                      (ANALYSIS_FUNCDESC_START+42)
-#define ANALYSIS_Imexp                      (ANALYSIS_FUNCDESC_START+43)
-#define ANALYSIS_Imconjugate                (ANALYSIS_FUNCDESC_START+44)
-#define ANALYSIS_Imln                       (ANALYSIS_FUNCDESC_START+45)
-#define ANALYSIS_Imlog10                    (ANALYSIS_FUNCDESC_START+46)
-#define ANALYSIS_Imlog2                     (ANALYSIS_FUNCDESC_START+47)
-#define ANALYSIS_Improduct                  (ANALYSIS_FUNCDESC_START+48)
-#define ANALYSIS_Imreal                     (ANALYSIS_FUNCDESC_START+49)
-#define ANALYSIS_Imsin                      (ANALYSIS_FUNCDESC_START+50)
-#define ANALYSIS_Imsub                      (ANALYSIS_FUNCDESC_START+51)
-#define ANALYSIS_Imsqrt                     (ANALYSIS_FUNCDESC_START+52)
-#define ANALYSIS_Imsum                      (ANALYSIS_FUNCDESC_START+53)
-#define ANALYSIS_Complex                    (ANALYSIS_FUNCDESC_START+54)
-#define ANALYSIS_Convert                    (ANALYSIS_FUNCDESC_START+55)
-#define ANALYSIS_Amordegrc                  (ANALYSIS_FUNCDESC_START+56)
-#define ANALYSIS_Amorlinc                   (ANALYSIS_FUNCDESC_START+57)
-#define ANALYSIS_Accrint                    (ANALYSIS_FUNCDESC_START+58)
-#define ANALYSIS_Accrintm                   (ANALYSIS_FUNCDESC_START+59)
-#define ANALYSIS_Received                   (ANALYSIS_FUNCDESC_START+60)
-#define ANALYSIS_Disc                       (ANALYSIS_FUNCDESC_START+61)
-#define ANALYSIS_Duration                   (ANALYSIS_FUNCDESC_START+62)
-#define ANALYSIS_Effect                     (ANALYSIS_FUNCDESC_START+63)
-#define ANALYSIS_Cumprinc                   (ANALYSIS_FUNCDESC_START+64)
-#define ANALYSIS_Cumipmt                    (ANALYSIS_FUNCDESC_START+65)
-#define ANALYSIS_Price                      (ANALYSIS_FUNCDESC_START+66)
-#define ANALYSIS_Pricedisc                  (ANALYSIS_FUNCDESC_START+67)
-#define ANALYSIS_Pricemat                   (ANALYSIS_FUNCDESC_START+68)
-#define ANALYSIS_Mduration                  (ANALYSIS_FUNCDESC_START+69)
-#define ANALYSIS_Nominal                    (ANALYSIS_FUNCDESC_START+70)
-#define ANALYSIS_Dollarfr                   (ANALYSIS_FUNCDESC_START+71)
-#define ANALYSIS_Dollarde                   (ANALYSIS_FUNCDESC_START+72)
-#define ANALYSIS_Yield                      (ANALYSIS_FUNCDESC_START+73)
-#define ANALYSIS_Yielddisc                  (ANALYSIS_FUNCDESC_START+74)
-#define ANALYSIS_Yieldmat                   (ANALYSIS_FUNCDESC_START+75)
-#define ANALYSIS_Tbilleq                    (ANALYSIS_FUNCDESC_START+76)
-#define ANALYSIS_Tbillprice                 (ANALYSIS_FUNCDESC_START+77)
-#define ANALYSIS_Tbillyield                 (ANALYSIS_FUNCDESC_START+78)
-#define ANALYSIS_Oddfprice                  (ANALYSIS_FUNCDESC_START+79)
-#define ANALYSIS_Oddfyield                  (ANALYSIS_FUNCDESC_START+80)
-#define ANALYSIS_Oddlprice                  (ANALYSIS_FUNCDESC_START+81)
-#define ANALYSIS_Oddlyield                  (ANALYSIS_FUNCDESC_START+82)
-#define ANALYSIS_Xirr                       (ANALYSIS_FUNCDESC_START+83)
-#define ANALYSIS_Xnpv                       (ANALYSIS_FUNCDESC_START+84)
-#define ANALYSIS_Intrate                    (ANALYSIS_FUNCDESC_START+85)
-#define ANALYSIS_Coupncd                    (ANALYSIS_FUNCDESC_START+86)
-#define ANALYSIS_Coupdays                   (ANALYSIS_FUNCDESC_START+87)
-#define ANALYSIS_Coupdaysnc                 (ANALYSIS_FUNCDESC_START+88)
-#define ANALYSIS_Coupdaybs                  (ANALYSIS_FUNCDESC_START+89)
-#define ANALYSIS_Couppcd                    (ANALYSIS_FUNCDESC_START+90)
-#define ANALYSIS_Coupnum                    (ANALYSIS_FUNCDESC_START+91)
-#define ANALYSIS_Fvschedule                 (ANALYSIS_FUNCDESC_START+92)
-#define ANALYSIS_Imtan                      (ANALYSIS_FUNCDESC_START+93)
-#define ANALYSIS_Imsec                      (ANALYSIS_FUNCDESC_START+94)
-#define ANALYSIS_Imcsc                      (ANALYSIS_FUNCDESC_START+95)
-#define ANALYSIS_Imcot                      (ANALYSIS_FUNCDESC_START+96)
-#define ANALYSIS_Imsinh                     (ANALYSIS_FUNCDESC_START+97)
-#define ANALYSIS_Imcosh                     (ANALYSIS_FUNCDESC_START+98)
-#define ANALYSIS_Imsech                     (ANALYSIS_FUNCDESC_START+99)
-#define ANALYSIS_Imcsch                     (ANALYSIS_FUNCDESC_START+100)
-
-#define ANALYSIS_FUNCNAME_START             (ANALYSIS_RESOURCE_START+2000)
-
-#define ANALYSIS_FUNCNAME_Workday           (ANALYSIS_FUNCNAME_START)
-#define ANALYSIS_FUNCNAME_Yearfrac          (ANALYSIS_FUNCNAME_START+1)
-#define ANALYSIS_FUNCNAME_Edate             (ANALYSIS_FUNCNAME_START+2)
-#define ANALYSIS_FUNCNAME_Weeknum           (ANALYSIS_FUNCNAME_START+3)
-#define ANALYSIS_FUNCNAME_Eomonth           (ANALYSIS_FUNCNAME_START+4)
-#define ANALYSIS_FUNCNAME_Networkdays       (ANALYSIS_FUNCNAME_START+5)
-#define ANALYSIS_FUNCNAME_Iseven            (ANALYSIS_FUNCNAME_START+6)
-#define ANALYSIS_FUNCNAME_Isodd             (ANALYSIS_FUNCNAME_START+7)
-#define ANALYSIS_FUNCNAME_Multinomial       (ANALYSIS_FUNCNAME_START+8)
-#define ANALYSIS_FUNCNAME_Seriessum         (ANALYSIS_FUNCNAME_START+9)
-#define ANALYSIS_FUNCNAME_Quotient          (ANALYSIS_FUNCNAME_START+10)
-#define ANALYSIS_FUNCNAME_Mround            (ANALYSIS_FUNCNAME_START+11)
-#define ANALYSIS_FUNCNAME_Sqrtpi            (ANALYSIS_FUNCNAME_START+12)
-#define ANALYSIS_FUNCNAME_Randbetween       (ANALYSIS_FUNCNAME_START+13)
-#define ANALYSIS_FUNCNAME_Gcd               (ANALYSIS_FUNCNAME_START+14)
-#define ANALYSIS_FUNCNAME_Lcm               (ANALYSIS_FUNCNAME_START+15)
-#define ANALYSIS_FUNCNAME_Besseli           (ANALYSIS_FUNCNAME_START+16)
-#define ANALYSIS_FUNCNAME_Besselj           (ANALYSIS_FUNCNAME_START+17)
-#define ANALYSIS_FUNCNAME_Besselk           (ANALYSIS_FUNCNAME_START+18)
-#define ANALYSIS_FUNCNAME_Bessely           (ANALYSIS_FUNCNAME_START+19)
-#define ANALYSIS_FUNCNAME_Bin2Oct           (ANALYSIS_FUNCNAME_START+20)
-#define ANALYSIS_FUNCNAME_Bin2Dec           (ANALYSIS_FUNCNAME_START+21)
-#define ANALYSIS_FUNCNAME_Bin2Hex           (ANALYSIS_FUNCNAME_START+22)
-#define ANALYSIS_FUNCNAME_Oct2Bin           (ANALYSIS_FUNCNAME_START+23)
-#define ANALYSIS_FUNCNAME_Oct2Dec           (ANALYSIS_FUNCNAME_START+24)
-#define ANALYSIS_FUNCNAME_Oct2Hex           (ANALYSIS_FUNCNAME_START+25)
-#define ANALYSIS_FUNCNAME_Dec2Bin           (ANALYSIS_FUNCNAME_START+26)
-#define ANALYSIS_FUNCNAME_Dec2Hex           (ANALYSIS_FUNCNAME_START+27)
-#define ANALYSIS_FUNCNAME_Dec2Oct           (ANALYSIS_FUNCNAME_START+28)
-#define ANALYSIS_FUNCNAME_Hex2Bin           (ANALYSIS_FUNCNAME_START+29)
-#define ANALYSIS_FUNCNAME_Hex2Dec           (ANALYSIS_FUNCNAME_START+30)
-#define ANALYSIS_FUNCNAME_Hex2Oct           (ANALYSIS_FUNCNAME_START+31)
-#define ANALYSIS_FUNCNAME_Delta             (ANALYSIS_FUNCNAME_START+32)
-#define ANALYSIS_FUNCNAME_Erf               (ANALYSIS_FUNCNAME_START+33)
-#define ANALYSIS_FUNCNAME_Erfc              (ANALYSIS_FUNCNAME_START+34)
-#define ANALYSIS_FUNCNAME_Gestep            (ANALYSIS_FUNCNAME_START+35)
-#define ANALYSIS_FUNCNAME_Factdouble        (ANALYSIS_FUNCNAME_START+36)
-#define ANALYSIS_FUNCNAME_Imabs             (ANALYSIS_FUNCNAME_START+37)
-#define ANALYSIS_FUNCNAME_Imaginary         (ANALYSIS_FUNCNAME_START+38)
-#define ANALYSIS_FUNCNAME_Impower           (ANALYSIS_FUNCNAME_START+39)
-#define ANALYSIS_FUNCNAME_Imargument        (ANALYSIS_FUNCNAME_START+40)
-#define ANALYSIS_FUNCNAME_Imcos             (ANALYSIS_FUNCNAME_START+41)
-#define ANALYSIS_FUNCNAME_Imdiv             (ANALYSIS_FUNCNAME_START+42)
-#define ANALYSIS_FUNCNAME_Imexp             (ANALYSIS_FUNCNAME_START+43)
-#define ANALYSIS_FUNCNAME_Imconjugate       (ANALYSIS_FUNCNAME_START+44)
-#define ANALYSIS_FUNCNAME_Imln              (ANALYSIS_FUNCNAME_START+45)
-#define ANALYSIS_FUNCNAME_Imlog10           (ANALYSIS_FUNCNAME_START+46)
-#define ANALYSIS_FUNCNAME_Imlog2            (ANALYSIS_FUNCNAME_START+47)
-#define ANALYSIS_FUNCNAME_Improduct         (ANALYSIS_FUNCNAME_START+48)
-#define ANALYSIS_FUNCNAME_Imreal            (ANALYSIS_FUNCNAME_START+49)
-#define ANALYSIS_FUNCNAME_Imsin             (ANALYSIS_FUNCNAME_START+50)
-#define ANALYSIS_FUNCNAME_Imsub             (ANALYSIS_FUNCNAME_START+51)
-#define ANALYSIS_FUNCNAME_Imsqrt            (ANALYSIS_FUNCNAME_START+52)
-#define ANALYSIS_FUNCNAME_Imsum             (ANALYSIS_FUNCNAME_START+53)
-#define ANALYSIS_FUNCNAME_Complex           (ANALYSIS_FUNCNAME_START+54)
-#define ANALYSIS_FUNCNAME_Convert           (ANALYSIS_FUNCNAME_START+55)
-#define ANALYSIS_FUNCNAME_Amordegrc         (ANALYSIS_FUNCNAME_START+56)
-#define ANALYSIS_FUNCNAME_Amorlinc          (ANALYSIS_FUNCNAME_START+57)
-#define ANALYSIS_FUNCNAME_Accrint           (ANALYSIS_FUNCNAME_START+58)
-#define ANALYSIS_FUNCNAME_Accrintm          (ANALYSIS_FUNCNAME_START+59)
-#define ANALYSIS_FUNCNAME_Received          (ANALYSIS_FUNCNAME_START+60)
-#define ANALYSIS_FUNCNAME_Disc              (ANALYSIS_FUNCNAME_START+61)
-#define ANALYSIS_FUNCNAME_Duration          (ANALYSIS_FUNCNAME_START+62)
-#define ANALYSIS_FUNCNAME_Effect            (ANALYSIS_FUNCNAME_START+63)
-#define ANALYSIS_FUNCNAME_Cumprinc          (ANALYSIS_FUNCNAME_START+64)
-#define ANALYSIS_FUNCNAME_Cumipmt           (ANALYSIS_FUNCNAME_START+65)
-#define ANALYSIS_FUNCNAME_Price             (ANALYSIS_FUNCNAME_START+66)
-#define ANALYSIS_FUNCNAME_Pricedisc         (ANALYSIS_FUNCNAME_START+67)
-#define ANALYSIS_FUNCNAME_Pricemat          (ANALYSIS_FUNCNAME_START+68)
-#define ANALYSIS_FUNCNAME_Mduration         (ANALYSIS_FUNCNAME_START+69)
-#define ANALYSIS_FUNCNAME_Nominal           (ANALYSIS_FUNCNAME_START+70)
-#define ANALYSIS_FUNCNAME_Dollarfr          (ANALYSIS_FUNCNAME_START+71)
-#define ANALYSIS_FUNCNAME_Dollarde          (ANALYSIS_FUNCNAME_START+72)
-#define ANALYSIS_FUNCNAME_Yield             (ANALYSIS_FUNCNAME_START+73)
-#define ANALYSIS_FUNCNAME_Yielddisc         (ANALYSIS_FUNCNAME_START+74)
-#define ANALYSIS_FUNCNAME_Yieldmat          (ANALYSIS_FUNCNAME_START+75)
-#define ANALYSIS_FUNCNAME_Tbilleq           (ANALYSIS_FUNCNAME_START+76)
-#define ANALYSIS_FUNCNAME_Tbillprice        (ANALYSIS_FUNCNAME_START+77)
-#define ANALYSIS_FUNCNAME_Tbillyield        (ANALYSIS_FUNCNAME_START+78)
-#define ANALYSIS_FUNCNAME_Oddfprice         (ANALYSIS_FUNCNAME_START+79)
-#define ANALYSIS_FUNCNAME_Oddfyield         (ANALYSIS_FUNCNAME_START+80)
-#define ANALYSIS_FUNCNAME_Oddlprice         (ANALYSIS_FUNCNAME_START+81)
-#define ANALYSIS_FUNCNAME_Oddlyield         (ANALYSIS_FUNCNAME_START+82)
-#define ANALYSIS_FUNCNAME_Xirr              (ANALYSIS_FUNCNAME_START+83)
-#define ANALYSIS_FUNCNAME_Xnpv              (ANALYSIS_FUNCNAME_START+84)
-#define ANALYSIS_FUNCNAME_Intrate           (ANALYSIS_FUNCNAME_START+85)
-#define ANALYSIS_FUNCNAME_Coupncd           (ANALYSIS_FUNCNAME_START+86)
-#define ANALYSIS_FUNCNAME_Coupdays          (ANALYSIS_FUNCNAME_START+87)
-#define ANALYSIS_FUNCNAME_Coupdaysnc        (ANALYSIS_FUNCNAME_START+88)
-#define ANALYSIS_FUNCNAME_Coupdaybs         (ANALYSIS_FUNCNAME_START+89)
-#define ANALYSIS_FUNCNAME_Couppcd           (ANALYSIS_FUNCNAME_START+90)
-#define ANALYSIS_FUNCNAME_Coupnum           (ANALYSIS_FUNCNAME_START+91)
-#define ANALYSIS_FUNCNAME_Fvschedule        (ANALYSIS_FUNCNAME_START+92)
-#define ANALYSIS_FUNCNAME_Imtan             (ANALYSIS_FUNCNAME_START+93)
-#define ANALYSIS_FUNCNAME_Imsec             (ANALYSIS_FUNCNAME_START+94)
-#define ANALYSIS_FUNCNAME_Imcsc             (ANALYSIS_FUNCNAME_START+95)
-#define ANALYSIS_FUNCNAME_Imcot             (ANALYSIS_FUNCNAME_START+96)
-#define ANALYSIS_FUNCNAME_Imsinh            (ANALYSIS_FUNCNAME_START+97)
-#define ANALYSIS_FUNCNAME_Imcosh            (ANALYSIS_FUNCNAME_START+98)
-#define ANALYSIS_FUNCNAME_Imsech            (ANALYSIS_FUNCNAME_START+99)
-#define ANALYSIS_FUNCNAME_Imcsch            (ANALYSIS_FUNCNAME_START+100)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index c38c65759148..22e82cddfe15 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -40,8 +40,6 @@
 namespace sca { namespace analysis {
     class ConvertDataList;
 } }
-class ResMgr;
-
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
 
@@ -59,14 +57,12 @@ private:
     sca::analysis::FuncDataList* pFD;
     std::unique_ptr<double[]>   pFactDoubles;
     sca::analysis::ConvertDataList* pCDL;
-    ResMgr*                     pResMgr;
+    std::locale                 aResLocale;
 
     sca::analysis::ScaAnyConverter aAnyConv;
 
     /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr();
-    /// @throws css::uno::RuntimeException
-    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
+    OUString                    GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex);
     void                        InitDefLocales();
     inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
     void                        InitData();
@@ -82,6 +78,9 @@ private:
 public:
     explicit                    AnalysisAddIn(
                                     const css::uno::Reference< css::uno::XComponentContext >& xContext );
+
+    OUString AnalysisResId(const char* pId);
+
     virtual                     ~AnalysisAddIn() override;
 
     /// @throws css::uno::RuntimeException
diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src
deleted file mode 100644
index 14d15b9e3f5b..000000000000
--- a/scaddins/source/analysis/analysis.src
+++ /dev/null
@@ -1,1404 +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 "analysis.hrc"
-
-StringArray ANALYSIS_Workday
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the serial number of the date before or after a specified number of workdays"; > ;
-        < "Start date"; > ;
-        < "The start date"; > ;
-        < "Days"; > ;
-        < "The number of workdays before or after the start date"; > ;
-        < "Holidays"; > ;
-        < "List of date values of days off (vacation, holidays, etc.)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Yearfrac
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of years (including fractional part) between two dates"; > ;
-        < "Start date"; > ;
-        < "The start date"; > ;
-        < "End date"; > ;
-        < "The end date"; > ;
-        < "Basis"; > ;
-        < "Basis indicates the day-count convention to use in the calculation"; > ;
-    };
-};
-
-StringArray ANALYSIS_Edate
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the serial number of the date that is a specified number of months before or after the start date"; > ;
-        < "Start date"; > ;
-        < "The start date"; > ;
-        < "Months"; > ;
-        < "Number of months before or after the start date"; > ;
-    };
-};
-
-StringArray ANALYSIS_Weeknum
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of the calendar week in which the specified date occurs.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use WEEKNUM instead."; > ;
-        < "Date"; > ;
-        < "The date or date serial number"; > ;
-        < "Return type"; > ;
-        < "Indicates the first day of the week (1 = Sunday, 2 = Monday)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Eomonth
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the serial number of the last day of the month that comes a certain number of months before or after the start date"; > ;
-        < "Start date"; > ;
-        < "The start date"; > ;
-        < "Months"; > ;
-        < "Number of months before or after the start date"; > ;
-    };
-};
-
-StringArray ANALYSIS_Networkdays
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of workdays between two dates.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use NETWORKDAYS instead."; > ;
-        < "Start date"; > ;
-        < "The start date"; > ;
-        < "End date"; > ;
-        < "The end date"; > ;
-        < "Holidays"; > ;
-        < "List of date values representing days off (vacation, holidays, etc.)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Iseven
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value 'true' if the number is even"; > ;
-        < "Number"; > ;
-        < "The number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Isodd
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the value 'true' if the number is odd"; > ;
-        < "Number"; > ;
-        < "The number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Multinomial
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the multinomial coefficient of a set of numbers"; > ;
-        < "Number"; > ;
-        < "Number or list of numbers for which you want the multinomial coefficient"; > ;
-    };
-};
-
-StringArray ANALYSIS_Seriessum
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of a power series"; > ;
-        < "X"; > ;
-        < "The independent variable of the power series"; > ;
-        < "N"; > ;
-        < "The initial power to which x is to be raised"; > ;
-        < "M"; > ;
-        < "The increment by which to increase n for each term in the series"; > ;
-        < "Coefficients"; > ;
-        < "Set of coefficients by which each successive power of the variable x is multiplied"; > ;
-    };
-};
-
-StringArray ANALYSIS_Quotient
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the integer portion of a division"; > ;
-        < "Numerator"; > ;
-        < "The dividend"; > ;
-        < "Denominator"; > ;
-        < "The divisor"; > ;
-    };
-};
-
-StringArray ANALYSIS_Mround
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a number rounded to a specified multiple"; > ;
-        < "Number"; > ;
-        < "The number to round off"; > ;
-        < "Multiple"; > ;
-        < "The multiple to which you want to round number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Sqrtpi
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the square root of a number which has been multiplied by pi"; > ;
-        < "Number"; > ;
-        < "The number by which pi is multiplied"; > ;
-    };
-};
-
-StringArray ANALYSIS_Randbetween
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a random integer between the numbers you specify"; > ;
-        < "Bottom"; > ;
-        < "The smallest integer returned"; > ;
-        < "Top"; > ;
-        < "The largest integer returned"; > ;
-    };
-};
-
-StringArray ANALYSIS_Gcd
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the greatest common divisor.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use GCD instead."; > ;
-        < "Number"; > ;
-        < "Number or list of numbers"; > ;
-    };
-};
-
-StringArray ANALYSIS_Lcm
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the least common multiple.\nThis function exists for interoperability with older Microsoft Excel documents, for new documents use LCM instead."; > ;
-        < "Number"; > ;
-        < "Number or list of numbers"; > ;
-    };
-};
-
-StringArray ANALYSIS_Besseli
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the modified Bessel function In(x)"; > ;
-        < "X"; > ;
-        < "The value at which the function is to be evaluated"; > ;
-        < "N"; > ;
-        < "The order of the Bessel function"; > ;
-    };
-};
-
-StringArray ANALYSIS_Besselj
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Bessel function Jn(x)"; > ;
-        < "X"; > ;
-        < "The value at which the function is to be evaluated"; > ;
-        < "N"; > ;
-        < "The order of the Bessel function"; > ;
-    };
-};
-
-StringArray ANALYSIS_Besselk
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Bessel function Kn(x)"; > ;
-        < "X"; > ;
-        < "The value at which the function is to be evaluated"; > ;
-        < "N"; > ;
-        < "The order of the Bessel function"; > ;
-    };
-};
-
-StringArray ANALYSIS_Bessely
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Bessel function Yn(x)"; > ;
-        < "X"; > ;
-        < "The value at which the function is to be evaluated"; > ;
-        < "N"; > ;
-        < "The order of the Bessel function"; > ;
-    };
-};
-
-StringArray ANALYSIS_Bin2Oct
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a binary number to an octal number"; > ;
-        < "Number"; > ;
-        < "The binary number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Bin2Dec
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a binary number to a decimal number"; > ;
-        < "Number"; > ;
-        < "The binary number to be converted (as text)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Bin2Hex
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a binary number to a hexadecimal number"; > ;
-        < "Number"; > ;
-        < "The binary number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used."; > ;
-    };
-};
-
-StringArray ANALYSIS_Oct2Bin
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts an octal number to a binary number"; > ;
-        < "Number"; > ;
-        < "The octal number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oct2Dec
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts an octal number to a decimal number"; > ;
-        < "Number"; > ;
-        < "The octal number to be converted (as text)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oct2Hex
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts an octal number to a hexadecimal number"; > ;
-        < "Number"; > ;
-        < "The octal number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Dec2Bin
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a decimal number to a binary number"; > ;
-        < "Number"; > ;
-        < "The decimal integer to be converted"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Dec2Hex
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a decimal number to a hexadecimal number"; > ;
-        < "Number"; > ;
-        < "The decimal integer to be converted"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Dec2Oct
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a decimal number into an octal number"; > ;
-        < "Number"; > ;
-        < "The decimal number"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Hex2Bin
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a hexadecimal number to a binary number"; > ;
-        < "Number"; > ;
-        < "The hexadecimal number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Hex2Dec
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a hexadecimal number to a decimal number"; > ;
-        < "Number"; > ;
-        < "The hexadecimal number to be converted (as text)"; > ;
-    };
-};
-
-StringArray ANALYSIS_Hex2Oct
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a hexadecimal number to an octal number"; > ;
-        < "Number"; > ;
-        < "The hexadecimal number to be converted (as text)"; > ;
-        < "Places"; > ;
-        < "Number of places used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Delta
-{
-    ItemList [ en-US ] =
-    {
-        < "Tests whether two values are equal"; > ;
-        < "Number 1"; > ;
-        < "The first number"; > ;
-        < "Number 2"; > ;
-        < "The second number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Erf
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the error function"; > ;
-        < "Lower limit"; > ;
-        < "The lower limit for integration"; > ;
-        < "Upper limit"; > ;
-        < "The upper limit for integration"; > ;
-    };
-};
-
-StringArray ANALYSIS_Erfc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the complementary error function"; > ;
-        < "Lower limit"; > ;
-        < "The lower limit for integration"; > ;
-    };
-};
-
-StringArray ANALYSIS_Gestep
-{
-    ItemList [ en-US ] =
-    {
-        < "Tests whether a number is greater than a threshold value"; > ;
-        < "Number"; > ;
-        < "The value to test against step"; > ;
-        < "Step"; > ;
-        < "The threshold value"; > ;
-    };
-};
-
-StringArray ANALYSIS_Factdouble
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the double factorial of Number"; > ;
-        < "Number"; > ;
-        < "The number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imabs
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the absolute value (modulus) of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imaginary
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the imaginary coefficient of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Impower
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns a complex number raised to a real power"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-        < "Number"; > ;
-        < "Power to which the complex number is raised"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imargument
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the argument theta, an angle expressed in radians"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imcos
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cosine of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imdiv
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the quotient of two complex numbers"; > ;
-        < "Numerator"; > ;
-        < "The dividend"; > ;
-        < "Denominator"; > ;
-        < "The divisor"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imexp
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the algebraic form of the exponential of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imconjugate
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the complex conjugate of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imln
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the natural logarithm of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imlog10
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the base-10 logarithm of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imlog2
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the base-2 logarithm of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Improduct
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the product of several complex numbers"; > ;
-        < "Complex number"; > ;
-        < "The first complex number"; > ;
-        < "Complex number"; > ;
-        < "Another complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imreal
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the real coefficient of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsin
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sine of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsub
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the difference of two complex numbers"; > ;
-        < "Complex number 1"; > ;
-        < "Complex number 1"; > ;
-        < "Complex number 2"; > ;
-        < "Complex number 2"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsqrt
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the square root of a complex number"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsum
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the sum of complex numbers"; > ;
-        < "Complex number"; > ;
-        < "The complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imtan
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the tangent of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsec
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the secant of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imcsc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cosecant of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imcot
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cotangent of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsinh
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic sine of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imcosh
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic cosine of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imsech
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic secant of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Imcsch
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the hyperbolic cosecant of a complex number"; > ;
-        < "Complex number"; > ;
-        < "A complex number"; > ;
-    };
-};
-
-StringArray ANALYSIS_Complex
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts real and imaginary coefficients into a complex number"; > ;
-        < "Real num"; > ;
-        < "The real coefficient"; > ;
-        < "I num"; > ;
-        < "The imaginary coefficient"; > ;
-        < "Suffix"; > ;
-        < "The suffix"; > ;
-    };
-};
-
-StringArray ANALYSIS_Convert
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a number from one measurement system to another"; > ;
-        < "Number"; > ;
-        < "The number"; > ;
-        < "From unit"; > ;
-        < "Unit of measure for number"; > ;
-        < "To unit"; > ;
-        < "Unit of measure for the result"; > ;
-    };
-};
-
-StringArray ANALYSIS_Amordegrc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the prorated linear depreciation of an asset for each accounting period"; > ;
-        < "Cost"; > ;
-        < "Cost of the asset"; > ;
-        < "Date purchased"; > ;
-        < "Purchase date of the asset"; > ;
-        < "First period"; > ;
-        < "Date the first period ends"; > ;
-        < "Salvage"; > ;
-        < "Salvage value of an asset at the end of its life"; > ;
-        < "Period"; > ;
-        < "The period"; > ;
-        < "Rate"; > ;
-        < "The rate of depreciation"; > ;
-        < "Basis"; > ;
-        < "The year basis to be used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Amorlinc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the prorated linear depreciation of an asset for each accounting period"; > ;
-        < "Cost"; > ;
-        < "Cost of the asset"; > ;
-        < "Date purchased"; > ;
-        < "Purchase date of the asset"; > ;
-        < "First period"; > ;
-        < "The date the first period ends"; > ;
-        < "Salvage"; > ;
-        < "The salvage value of an asset at the end of its life"; > ;
-        < "Period"; > ;
-        < "The period"; > ;
-        < "Rate"; > ;
-        < "The rate of depreciation"; > ;
-        < "Basis"; > ;
-        < "The year basis to be used"; > ;
-    };
-};
-
-StringArray ANALYSIS_Accrint
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the accrued interest for a security that pays periodic interest"; > ;
-        < "Issue"; > ;
-        < "Issue date of the security"; > ;
-        < "First interest"; > ;
-        < "First interest date of the security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Par"; > ;
-        < "The par value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Accrintm
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the accrued interest for a security that pays interest at maturity"; > ;
-        < "Issue"; > ;
-        < "The issue date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Par"; > ;
-        < "The par value"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Received
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the amount paid out at maturity for a fully invested security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Investment"; > ;
-        < "The investment"; > ;
-        < "Discount"; > ;
-        < "The discount"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Disc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the discount rate for a security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Duration
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the annual Macaulay duration of a security with periodic interest payments"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Coupon"; > ;
-        < "The coupon rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Effect
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the effective annual interest rate"; > ;
-        < "Nominal rate"; > ;
-        < "The nominal rate"; > ;
-        < "Npery"; > ;
-        < "The periods"; > ;
-    };
-};
-
-StringArray ANALYSIS_Cumprinc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cumulative principal on a loan to be paid between two periods"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Nper"; > ;
-        < "Number of payment periods"; > ;
-        < "Pv"; > ;
-        < "The present value"; > ;
-        < "Start period"; > ;
-        < "The start period"; > ;
-        < "End period"; > ;
-        < "The end period"; > ;
-        < "Type"; > ;
-        < "The type of maturity"; > ;
-    };
-};
-
-StringArray ANALYSIS_Cumipmt
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the cumulative interest to be paid between two periods"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Nper"; > ;
-        < "Number of payment periods"; > ;
-        < "Pv"; > ;
-        < "The present value"; > ;
-        < "Start period"; > ;
-        < "The start period"; > ;
-        < "End period"; > ;
-        < "The end period"; > ;
-        < "Type"; > ;
-        < "The type of maturity"; > ;
-    };
-};
-
-StringArray ANALYSIS_Price
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price per 100 currency units face value of a security that pays periodic interest"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Pricedisc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price per 100 currency units face value of a discounted security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Discount"; > ;
-        < "The discount"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Pricemat
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price per 100 currency units face value of a security that pays interest at maturity"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Issue"; > ;
-        < "The issue date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Mduration
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the Macaulay modified duration for a security with an assumed par value of 100 currency units"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Coupon"; > ;
-        < "The coupon rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Nominal
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the annual nominal interest rate"; > ;
-        < "Effective rate"; > ;
-        < "The effective interest rate"; > ;
-        < "Npery"; > ;
-        < "The periods"; > ;
-    };
-};
-
-StringArray ANALYSIS_Dollarfr
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a price expressed as a decimal into a price expressed as a fraction"; > ;
-        < "Decimal dollar"; > ;
-        < "The decimal number"; > ;
-        < "Fraction"; > ;
-        < "The divisor"; > ;
-    };
-};
-
-StringArray ANALYSIS_Dollarde
-{
-    ItemList [ en-US ] =
-    {
-        < "Converts a price expressed as a fraction into a price expressed as a decimal"; > ;
-        < "Fractional dollar"; > ;
-        < "The number as a fraction"; > ;
-        < "Fraction"; > ;
-        < "The divisor"; > ;
-    };
-};
-
-StringArray ANALYSIS_Yield
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the yield on a security that pays periodic interest"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Yielddisc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the annual yield for a discounted security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Yieldmat
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the annual yield of a security that pays interest at maturity"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Issue"; > ;
-        < "The issue date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Tbilleq
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the bond-equivalent yield for a treasury bill"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Discount"; > ;
-        < "The discount rate"; > ;
-    };
-};
-
-StringArray ANALYSIS_Tbillprice
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price of 100 currency units face value for a treasury bill"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Discount"; > ;
-        < "The discount rate"; > ;
-    };
-};
-
-StringArray ANALYSIS_Tbillyield
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the yield for a treasury bill"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oddfprice
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price per $100 face value of a security with an odd first period"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Issue"; > ;
-        < "The issue date"; > ;
-        < "First coupon"; > ;
-        < "The first coupon date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oddfyield
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the yield of a security with an odd first period"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Issue"; > ;
-        < "The issue date"; > ;
-        < "First coupon"; > ;
-        < "The first coupon date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oddlprice
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the price per $100 face value of a security with an odd last period"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Last interest"; > ;
-        < "The last interest date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Yield"; > ;
-        < "The yield"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Oddlyield
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the yield of a security with an odd last period"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Last interest"; > ;
-        < "The last interest date"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Price"; > ;
-        < "The price"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Xirr
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the internal rate of return for a non-periodic schedule of payments"; > ;
-        < "Values"; > ;
-        < "The values"; > ;
-        < "Dates"; > ;
-        < "The dates"; > ;
-        < "Guess"; > ;
-        < "The guess"; > ;
-    };
-};
-
-StringArray ANALYSIS_Xnpv
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the net present value for a non-periodic schedule of payments"; > ;
-        < "Rate"; > ;
-        < "The rate"; > ;
-        < "Values"; > ;
-        < "The values"; > ;
-        < "Dates"; > ;
-        < "The dates"; > ;
-    };
-};
-
-StringArray ANALYSIS_Intrate
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the interest rate for a fully invested security"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Investment"; > ;
-        < "The investment"; > ;
-        < "Redemption"; > ;
-        < "The redemption value"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Coupncd
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the first coupon date after the settlement date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Coupdays
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of days in the coupon period containing the settlement date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Coupdaysnc
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of days from the settlement date to the next coupon date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Coupdaybs
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of days from the beginning of the coupon period to the settlement date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Couppcd
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the last coupon date preceding the settlement date"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Coupnum
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of coupons payable between the settlement and maturity dates"; > ;
-        < "Settlement"; > ;
-        < "The settlement"; > ;
-        < "Maturity"; > ;
-        < "The maturity"; > ;
-        < "Frequency"; > ;
-        < "The frequency"; > ;
-        < "Basis"; > ;
-        < "The basis"; > ;
-    };
-};
-
-StringArray ANALYSIS_Fvschedule
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the future value of the initial principal after a series of compound interest rates are applied"; > ;
-        < "Principal"; > ;
-        < "The principal"; > ;
-        < "Schedule"; > ;
-        < "The schedule"; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src
deleted file mode 100644
index 540bf2c30207..000000000000
--- a/scaddins/source/analysis/analysis_funcnames.src
+++ /dev/null
@@ -1,527 +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 "analysis.hrc"
-
-String ANALYSIS_FUNCNAME_Workday
-{
-    Text [ en-US ] = "WORKDAY";
-};
-
-String ANALYSIS_FUNCNAME_Yearfrac
-{
-    Text [ en-US ] = "YEARFRAC";
-};
-
-String ANALYSIS_FUNCNAME_Edate
-{
-    Text [ en-US ] = "EDATE";
-};
-
-String ANALYSIS_FUNCNAME_Weeknum
-{
-    Text [ en-US ] = "WEEKNUM";
-};
-
-String ANALYSIS_FUNCNAME_Eomonth
-{
-    Text [ en-US ] = "EOMONTH";
-};
-
-String ANALYSIS_FUNCNAME_Networkdays
-{
-    Text [ en-US ] = "NETWORKDAYS";
-};
-
-String ANALYSIS_FUNCNAME_Amordegrc
-{
-    Text [ en-US ] = "AMORDEGRC";
-};
-
-String ANALYSIS_FUNCNAME_Amorlinc
-{
-    Text [ en-US ] = "AMORLINC";
-};
-
-String ANALYSIS_FUNCNAME_Accrint
-{
-    Text [ en-US ] = "ACCRINT";
-};
-
-String ANALYSIS_FUNCNAME_Accrintm
-{
-    Text [ en-US ] = "ACCRINTM";
-};
-
-String ANALYSIS_FUNCNAME_Received
-{
-    Text [ en-US ] = "RECEIVED";
-};
-
-String ANALYSIS_FUNCNAME_Disc
-{
-    Text [ en-US ] = "DISC";
-};
-
-String ANALYSIS_FUNCNAME_Duration
-{
-    Text [ en-US ] = "DURATION";
-};
-
-String ANALYSIS_FUNCNAME_Effect
-{
-    Text [ en-US ] = "EFFECT";
-};
-
-String ANALYSIS_FUNCNAME_Cumprinc
-{
-    Text [ en-US ] = "CUMPRINC";
-};
-
-String ANALYSIS_FUNCNAME_Cumipmt
-{
-    Text [ en-US ] = "CUMIPMT";
-};
-
-String ANALYSIS_FUNCNAME_Price
-{
-    Text [ en-US ] = "PRICE";
-};
-
-String ANALYSIS_FUNCNAME_Pricedisc
-{
-    Text [ en-US ] = "PRICEDISC";
-};
-
-String ANALYSIS_FUNCNAME_Pricemat
-{
-    Text [ en-US ] = "PRICEMAT";
-};
-
-String ANALYSIS_FUNCNAME_Mduration
-{
-    Text [ en-US ] = "MDURATION";
-};
-
-String ANALYSIS_FUNCNAME_Nominal
-{
-    Text [ en-US ] = "NOMINAL";
-};
-
-String ANALYSIS_FUNCNAME_Dollarfr
-{
-    Text [ en-US ] = "DOLLARFR";
-};
-
-String ANALYSIS_FUNCNAME_Dollarde
-{
-    Text [ en-US ] = "DOLLARDE";
-};
-
-String ANALYSIS_FUNCNAME_Yield
-{
-    Text [ en-US ] = "YIELD";
-};
-
-String ANALYSIS_FUNCNAME_Yielddisc
-{
-    Text [ en-US ] = "YIELDDISC";
-};
-
-String ANALYSIS_FUNCNAME_Yieldmat
-{
-    Text [ en-US ] = "YIELDMAT";
-};
-
-String ANALYSIS_FUNCNAME_Tbilleq
-{
-    Text [ en-US ] = "TBILLEQ";
-};
-
-String ANALYSIS_FUNCNAME_Tbillprice
-{
-    Text [ en-US ] = "TBILLPRICE";
-};
-
-String ANALYSIS_FUNCNAME_Tbillyield
-{
-    Text [ en-US ] = "TBILLYIELD";
-};
-
-String ANALYSIS_FUNCNAME_Oddfprice
-{
-    Text [ en-US ] = "ODDFPRICE";
-};
-
-String ANALYSIS_FUNCNAME_Oddfyield
-{
-    Text [ en-US ] = "ODDFYIELD";
-};
-
-String ANALYSIS_FUNCNAME_Oddlprice
-{
-    Text [ en-US ] = "ODDLPRICE";
-};
-
-String ANALYSIS_FUNCNAME_Oddlyield
-{
-    Text [ en-US ] = "ODDLYIELD";
-};
-
-String ANALYSIS_FUNCNAME_Xirr
-{
-    Text [ en-US ] = "XIRR";
-};
-
-String ANALYSIS_FUNCNAME_Xnpv
-{
-    Text [ en-US ] = "XNPV";
-};
-
-String ANALYSIS_FUNCNAME_Intrate
-{
-    Text [ en-US ] = "INTRATE";
-};
-
-String ANALYSIS_FUNCNAME_Coupncd
-{
-    Text [ en-US ] = "COUPNCD";
-};
-
-String ANALYSIS_FUNCNAME_Coupdays
-{
-    Text [ en-US ] = "COUPDAYS";
-};
-
-String ANALYSIS_FUNCNAME_Coupdaysnc
-{
-    Text [ en-US ] = "COUPDAYSNC";
-};
-
-String ANALYSIS_FUNCNAME_Coupdaybs
-{
-    Text [ en-US ] = "COUPDAYBS";
-};
-
-String ANALYSIS_FUNCNAME_Couppcd
-{
-    Text [ en-US ] = "COUPPCD";
-};
-
-String ANALYSIS_FUNCNAME_Coupnum
-{
-    Text [ en-US ] = "COUPNUM";
-};
-
-String ANALYSIS_FUNCNAME_Fvschedule
-{
-    Text [ en-US ] = "FVSCHEDULE";
-};
-
-String ANALYSIS_FUNCNAME_Iseven
-{
-    Text [ en-US ] = "ISEVEN";
-};
-
-String ANALYSIS_FUNCNAME_Isodd
-{
-    Text [ en-US ] = "ISODD";
-};
-
-String ANALYSIS_FUNCNAME_Gcd
-{
-    Text [ en-US ] = "GCD";
-};
-
-String ANALYSIS_FUNCNAME_Lcm
-{
-    Text [ en-US ] = "LCM";
-};
-
-String ANALYSIS_FUNCNAME_Multinomial
-{
-    Text [ en-US ] = "MULTINOMIAL";
-};
-
-String ANALYSIS_FUNCNAME_Seriessum
-{
-    Text [ en-US ] = "SERIESSUM";
-};
-
-String ANALYSIS_FUNCNAME_Quotient
-{
-    Text [ en-US ] = "QUOTIENT";
-};
-
-String ANALYSIS_FUNCNAME_Mround
-{
-    Text [ en-US ] = "MROUND";
-};
-
-String ANALYSIS_FUNCNAME_Sqrtpi
-{
-    Text [ en-US ] = "SQRTPI";
-};
-
-String ANALYSIS_FUNCNAME_Randbetween
-{
-    Text [ en-US ] = "RANDBETWEEN";
-};
-
-String ANALYSIS_FUNCNAME_Besseli
-{
-    Text [ en-US ] = "BESSELI";
-};
-
-String ANALYSIS_FUNCNAME_Besselj
-{
-    Text [ en-US ] = "BESSELJ";
-};
-
-String ANALYSIS_FUNCNAME_Besselk
-{
-    Text [ en-US ] = "BESSELK";
-};
-
-String ANALYSIS_FUNCNAME_Bessely
-{
-    Text [ en-US ] = "BESSELY";
-};
-
-String ANALYSIS_FUNCNAME_Bin2Dec
-{
-    Text [ en-US ] = "BIN2DEC";
-};
-
-String ANALYSIS_FUNCNAME_Bin2Hex
-{
-    Text [ en-US ] = "BIN2HEX";
-};
-
-String ANALYSIS_FUNCNAME_Bin2Oct
-{
-    Text [ en-US ] = "BIN2OCT";
-};
-
-String ANALYSIS_FUNCNAME_Delta
-{
-    Text [ en-US ] = "DELTA";
-};
-
-String ANALYSIS_FUNCNAME_Dec2Bin
-{
-    Text [ en-US ] = "DEC2BIN";
-};
-
-String ANALYSIS_FUNCNAME_Dec2Hex
-{
-    Text [ en-US ] = "DEC2HEX";
-};
-
-String ANALYSIS_FUNCNAME_Dec2Oct
-{
-    Text [ en-US ] = "DEC2OCT";
-};
-
-String ANALYSIS_FUNCNAME_Erf
-{
-    Text [ en-US ] = "ERF";
-};
-
-String ANALYSIS_FUNCNAME_Erfc
-{
-    Text [ en-US ] = "ERFC";
-};
-
-String ANALYSIS_FUNCNAME_Gestep
-{
-    Text [ en-US ] = "GESTEP";
-};
-
-String ANALYSIS_FUNCNAME_Hex2Bin
-{
-    Text [ en-US ] = "HEX2BIN";
-};
-
-String ANALYSIS_FUNCNAME_Hex2Dec
-{
-    Text [ en-US ] = "HEX2DEC";
-};
-
-String ANALYSIS_FUNCNAME_Hex2Oct
-{
-    Text [ en-US ] = "HEX2OCT";
-};
-
-String ANALYSIS_FUNCNAME_Imabs
-{
-    Text [ en-US ] = "IMABS";
-};
-
-String ANALYSIS_FUNCNAME_Imaginary
-{
-    Text [ en-US ] = "IMAGINARY";
-};
-
-String ANALYSIS_FUNCNAME_Impower
-{
-    Text [ en-US ] = "IMPOWER";
-};
-
-String ANALYSIS_FUNCNAME_Imargument
-{
-    Text [ en-US ] = "IMARGUMENT";
-};
-
-String ANALYSIS_FUNCNAME_Imcos
-{
-    Text [ en-US ] = "IMCOS";
-};
-
-String ANALYSIS_FUNCNAME_Imdiv
-{
-    Text [ en-US ] = "IMDIV";
-};
-
-String ANALYSIS_FUNCNAME_Imexp
-{
-    Text [ en-US ] = "IMEXP";
-};
-
-String ANALYSIS_FUNCNAME_Imconjugate
-{
-    Text [ en-US ] = "IMCONJUGATE";
-};
-
-String ANALYSIS_FUNCNAME_Imln
-{
-    Text [ en-US ] = "IMLN";
-};
-
-String ANALYSIS_FUNCNAME_Imlog10
-{
-    Text [ en-US ] = "IMLOG10";
-};
-
-String ANALYSIS_FUNCNAME_Imlog2
-{
-    Text [ en-US ] = "IMLOG2";
-};
-
-String ANALYSIS_FUNCNAME_Improduct
-{
-    Text [ en-US ] = "IMPRODUCT";
-};
-
-String ANALYSIS_FUNCNAME_Imreal
-{
-    Text [ en-US ] = "IMREAL";
-};
-
-String ANALYSIS_FUNCNAME_Imsin
-{
-    Text [ en-US ] = "IMSIN";
-};
-
-String ANALYSIS_FUNCNAME_Imsub
-{
-    Text [ en-US ] = "IMSUB";
-};
-
-String ANALYSIS_FUNCNAME_Imsum
-{
-    Text [ en-US ] = "IMSUM";
-};
-
-String ANALYSIS_FUNCNAME_Imsqrt
-{
-    Text [ en-US ] = "IMSQRT";
-};
-
-String ANALYSIS_FUNCNAME_Imtan
-{
-    Text [ en-US ] = "IMTAN";
-};
-
-String ANALYSIS_FUNCNAME_Imsec
-{
-    Text [ en-US ] = "IMSEC";
-};
-
-String ANALYSIS_FUNCNAME_Imcsc
-{
-    Text [ en-US ] = "IMCSC";
-};
-
-String ANALYSIS_FUNCNAME_Imcot
-{
-    Text [ en-US ] = "IMCOT";
-};
-
-String ANALYSIS_FUNCNAME_Imsinh
-{
-    Text [ en-US ] = "IMSINH";
-};
-
-String ANALYSIS_FUNCNAME_Imcosh
-{
-    Text [ en-US ] = "IMCOSH";
-};
-
-String ANALYSIS_FUNCNAME_Imsech
-{
-    Text [ en-US ] = "IMSECH";
-};
-
-String ANALYSIS_FUNCNAME_Imcsch
-{
-    Text [ en-US ] = "IMCSCH";
-};
-
-String ANALYSIS_FUNCNAME_Complex
-{
-    Text [ en-US ] = "COMPLEX";
-};
-
-String ANALYSIS_FUNCNAME_Oct2Bin
-{
-    Text [ en-US ] = "OCT2BIN";
-};
-
-String ANALYSIS_FUNCNAME_Oct2Dec
-{
-    Text [ en-US ] = "OCT2DEC";
-};
-
-String ANALYSIS_FUNCNAME_Oct2Hex
-{
-    Text [ en-US ] = "OCT2HEX";
-};
-
-String ANALYSIS_FUNCNAME_Convert
-{
-    Text [ en-US ] = "CONVERT";
-};
-
-String ANALYSIS_FUNCNAME_Factdouble
-{
-    Text [ en-US ] = "FACTDOUBLE";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 6b7e3dbe8501..1225f20027ee 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -23,13 +23,13 @@
 #include <string.h>
 #include <stdio.h>
 #include <o3tl/any.hxx>
-#include <tools/resary.hxx>
 #include <rtl/math.hxx>
 #include <sal/macros.h>
 #include <algorithm>
 #include <memory>
 #include "analysishelper.hxx"
 #include "analysis.hrc"
+#include "strings.hrc"
 #include "deffuncname.hxx"
 
 using namespace                 ::com::sun::star;
@@ -1375,8 +1375,8 @@ double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 
 FuncData::FuncData(const FuncDataBase& r) :
     aIntName( OUString::createFromAscii( r.pIntName ) ),
-    nUINameID( r.nUINameID ),
-    nDescrID( r.nDescrID ),
+    pUINameID( r.pUINameID ),
+    pDescrID( r.pDescrID ),
     bDouble( r.bDouble ),
     bWithOpt( r.bWithOpt ),
     nParam( r.nNumOfParams ),
@@ -1411,10 +1411,6 @@ void InitFuncDataList(FuncDataList& rList)
         rList.push_back(FuncData(rFuncData));
 }
 
-AnalysisResId::AnalysisResId( sal_uInt16 nId, ResMgr& rResMgr ) : ResId( nId, rResMgr )
-{
-}
-
 SortedIndividualInt32List::SortedIndividualInt32List()
 {
 }
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 8e4528339c39..591150aaaafa 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -32,15 +32,11 @@
 
 #include <math.h>
 
-#include <tools/resid.hxx>
-
 #include "analysisdefs.hxx"
 
 #include <vector>
 
 
-class ResMgr;
-
 namespace sca { namespace analysis {
 
 class SortedIndividualInt32List;
@@ -202,8 +198,8 @@ enum class FDCategory
 struct FuncDataBase
 {
     const sal_Char*         pIntName;
-    sal_uInt16              nUINameID;          // resource ID to UI name
-    sal_uInt16              nDescrID;           // resource ID to description, parameter names and ~ description
+    const char*             pUINameID;          // resource ID to UI name
+    const char**            pDescrID;           // resource ID to description, parameter names and ~ description
     bool                    bDouble;            // name already exist in Calc
     bool                    bWithOpt;           // first parameter is internal
     const char**            pCompListID;        // list of valid names
@@ -217,8 +213,8 @@ class FuncData final
 {
 private:
     OUString                aIntName;
-    sal_uInt16              nUINameID;
-    sal_uInt16              nDescrID;           // leads also to parameter descriptions!
+    const char*             pUINameID;
+    const char**            pDescrID;           // leads also to parameter descriptions!
     bool                    bDouble;            // flag for names that already exist in Calc
     bool                    bWithOpt;           // has internal parameter on first position
 
@@ -231,8 +227,8 @@ public:
                             FuncData(const FuncDataBase& rBaseData);
                             ~FuncData();
 
-    inline sal_uInt16       GetUINameID() const;
-    inline sal_uInt16       GetDescrID() const;
+    inline const char*      GetUINameID() const;
+    inline const char**     GetDescrID() const;
     inline bool             IsDouble() const;
     inline const OUString&  GetSuffix() const;
 
@@ -257,12 +253,6 @@ struct FindFuncData
     bool operator() ( FuncData const & rCandidate ) const { return rCandidate.Is(m_rId); }
 };
 
-class AnalysisResId : public ResId
-{
- public:
-                    AnalysisResId( sal_uInt16 nId, ResMgr& rResMgr );
-};
-
 /// sorted list with unique sal_Int32 values
 class SortedIndividualInt32List final
 {
@@ -626,15 +616,15 @@ inline double GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >
 }
 
 
-inline sal_uInt16 FuncData::GetUINameID() const
+inline const char* FuncData::GetUINameID() const
 {
-    return nUINameID;
+    return pUINameID;
 }
 
 
-inline sal_uInt16 FuncData::GetDescrID() const
+inline const char** FuncData::GetDescrID() const
 {
-    return nDescrID;
+    return pDescrID;
 }
 
 
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index d2a33ccf5398..ef73390c854b 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -19,11 +19,11 @@
 
 #include "datefunc.hxx"
 #include "datefunc.hrc"
+#include "strings.hrc"
 #include <com/sun/star/util/Date.hpp>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 #include <algorithm>
 #include "deffuncname.hxx"
@@ -34,11 +34,6 @@ using namespace ::com::sun::star;
 #define MY_SERVICE              "com.sun.star.sheet.addin.DateFunctions"
 #define MY_IMPLNAME             "com.sun.star.sheet.addin.DateFunctionsImpl"
 
-ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
-    ResId( nId, rResMgr )
-{
-}
-
 #define UNIQUE              false   // function name does not exist in Calc
 
 #define STDPAR              false   // all parameters are described
@@ -63,8 +58,8 @@ const ScaFuncDataBase pFuncDataArr[] =
 
 ScaFuncData::ScaFuncData(const ScaFuncDataBase& rBaseData) :
     aIntName( OUString::createFromAscii( rBaseData.pIntName ) ),
-    nUINameID( rBaseData.nUINameID ),
-    nDescrID( rBaseData.nDescrID ),
+    pUINameID( rBaseData.pUINameID ),
+    pDescrID( rBaseData.pDescrID ),
     nParamCount( rBaseData.nParamCount ),
     eCat( rBaseData.eCat ),
     bDouble( rBaseData.bDouble ),
@@ -129,7 +124,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory(
 //  "normal" service implementation
 ScaDateAddIn::ScaDateAddIn() :
     pDefLocales( nullptr ),
-    pResMgr( nullptr ),
     pFuncDataList( nullptr )
 {
 }
@@ -157,20 +151,9 @@ const lang::Locale& ScaDateAddIn::GetLocale( sal_uInt32 nIndex )
     return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
 }
 
-ResMgr& ScaDateAddIn::GetResMgr()
-{
-    if( !pResMgr )
-    {
-        InitData();     // try to get resource manager
-        if( !pResMgr )
-            throw uno::RuntimeException();
-    }
-    return *pResMgr;
-}
-
 void ScaDateAddIn::InitData()
 {
-    pResMgr.reset(ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc)));
+    aResLocale = Translate::Create("sca", LanguageTag(aFuncLoc));
     pFuncDataList.reset();
 
     pFuncDataList.reset(new ScaFuncDataList);
@@ -182,10 +165,9 @@ void ScaDateAddIn::InitData()
     }
 }
 
-OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
+OUString ScaDateAddIn::GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex)
 {
-    ResStringArray aArr(ScaResId(nResId, GetResMgr()));
-    return aArr.GetString(nStrIndex - 1);
+    return ScaResId(pResId[nStrIndex - 1]);
 }
 
 OUString ScaDateAddIn::getImplementationName_Static()
@@ -252,7 +234,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgram
                                 FindScaFuncData( aProgrammaticName ) );
     if( fDataIt != pFuncDataList->end() )
     {
-        aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr());
+        aRet = ScaResId(fDataIt->GetUINameID());
         if( fDataIt->IsDouble() )
             aRet += "_ADD";
     }
@@ -770,4 +752,9 @@ OUString SAL_CALL ScaDateAddIn::getRot13( const OUString& aSrcString )
     return aBuffer.makeStringAndClear();
 }
 
+OUString ScaDateAddIn::ScaResId(const char* pId)
+{
+    return Translate::get(pId, aResLocale);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc
deleted file mode 100644
index 44653ef848a2..000000000000
--- a/scaddins/source/datefunc/datefunc.hrc
+++ /dev/null
@@ -1,49 +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_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HRC
-#define INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HRC
-
-#define DATE_RESOURCE_START                 1000
-
-#define DATE_FUNCDESC_START                 DATE_RESOURCE_START
-
-#define DATE_FUNCDESC_DiffWeeks             (DATE_FUNCDESC_START)
-#define DATE_FUNCDESC_DiffMonths            (DATE_FUNCDESC_START+1)
-#define DATE_FUNCDESC_DiffYears             (DATE_FUNCDESC_START+2)
-#define DATE_FUNCDESC_IsLeapYear            (DATE_FUNCDESC_START+3)
-#define DATE_FUNCDESC_DaysInMonth           (DATE_FUNCDESC_START+4)
-#define DATE_FUNCDESC_DaysInYear            (DATE_FUNCDESC_START+5)
-#define DATE_FUNCDESC_WeeksInYear           (DATE_FUNCDESC_START+6)
-#define DATE_FUNCDESC_Rot13                 (DATE_FUNCDESC_START+7)
-
-#define DATE_FUNCNAME_START                 (DATE_RESOURCE_START+1000)
-
-#define DATE_FUNCNAME_DiffWeeks             (DATE_FUNCNAME_START)
-#define DATE_FUNCNAME_DiffMonths            (DATE_FUNCNAME_START+1)
-#define DATE_FUNCNAME_DiffYears             (DATE_FUNCNAME_START+2)
-#define DATE_FUNCNAME_IsLeapYear            (DATE_FUNCNAME_START+3)
-#define DATE_FUNCNAME_DaysInMonth           (DATE_FUNCNAME_START+4)
-#define DATE_FUNCNAME_DaysInYear            (DATE_FUNCNAME_START+5)
-#define DATE_FUNCNAME_WeeksInYear           (DATE_FUNCNAME_START+6)
-#define DATE_FUNCNAME_Rot13                 (DATE_FUNCNAME_START+7)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 816aaffd6c19..51b2899daeef 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -33,14 +33,6 @@
 #include <com/sun/star/sheet/addin/XDateFunctions.hpp>
 #include <com/sun/star/sheet/addin/XMiscFunctions.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <tools/resid.hxx>
-#include <tools/resary.hxx>
-
-class ScaResId : public ResId
-{
-public:
-    ScaResId(sal_uInt16 nResId, ResMgr& rResMgr);
-};
 
 enum class ScaCategory
 {
@@ -55,8 +47,8 @@ enum class ScaCategory
 struct ScaFuncDataBase
 {
     const sal_Char*             pIntName;           // internal name (get***)
-    sal_uInt16                  nUINameID;          // resource ID to UI name
-    sal_uInt16                  nDescrID;           // resource ID to description, parameter names and ~ description
+    const char*                 pUINameID;          // resource ID to UI name
+    const char**                pDescrID;           // resource ID to description, parameter names and ~ description
     const char**                pCompListID;        // list of valid names
     sal_uInt16                  nParamCount;        // number of named / described parameters
     ScaCategory                 eCat;               // function category
@@ -68,8 +60,8 @@ class ScaFuncData final
 {
 private:
     OUString                    aIntName;           // internal name (get***)
-    sal_uInt16                  nUINameID;          // resource ID to UI name
-    sal_uInt16                  nDescrID;           // leads also to parameter descriptions!
+    const char*                 pUINameID;          // resource ID to UI name
+    const char**                pDescrID;           // leads also to parameter descriptions!
     sal_uInt16                  nParamCount;        // num of parameters
     std::vector<OUString>       aCompList;          // list of all valid names
     ScaCategory                 eCat;               // function category
@@ -80,8 +72,8 @@ public:
                                 ScaFuncData(const ScaFuncDataBase& rBaseData);
                                 ~ScaFuncData();
 
-    sal_uInt16           GetUINameID() const     { return nUINameID; }
-    sal_uInt16           GetDescrID() const      { return nDescrID; }
+    const char*          GetUINameID() const     { return pUINameID; }
+    const char**         GetDescrID() const      { return pDescrID; }
     ScaCategory          GetCategory() const     { return eCat; }
     bool                 IsDouble() const        { return bDouble; }
 
@@ -120,22 +112,22 @@ class ScaDateAddIn : public ::cppu::WeakImplHelper<
 private:
     css::lang::Locale                          aFuncLoc;
     std::unique_ptr< css::lang::Locale[] >     pDefLocales;
-    std::unique_ptr< ResMgr >                  pResMgr;
+    std::locale                                aResLocale;
     std::unique_ptr< ScaFuncDataList >         pFuncDataList;
 
 
     void                        InitDefLocales();
     const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
-    /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr();
     void                        InitData();
 
     /// @throws css::uno::RuntimeException
-    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
+    OUString                    GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex);
 
 public:
                                 ScaDateAddIn();
 
+    OUString ScaResId(const char* pId);
+
     static OUString      getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src
deleted file mode 100644
index 9e8632995a37..000000000000
--- a/scaddins/source/datefunc/datefunc.src
+++ /dev/null
@@ -1,154 +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 "datefunc.hrc"
-
-StringArray DATE_FUNCDESC_DiffWeeks
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of weeks in a specific period"; > ;
-        < "Start date"; > ;
-        < "First day of the period"; > ;
-        < "End date"; > ;
-        < "Last day of the period"; > ;
-        < "Type"; > ;
-        < "Type of calculation: Type=0 means the time interval, Type=1 means calendar weeks."; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_DiffMonths
-{
-    ItemList [ en-US ] =
-    {
-        < "Determines the number of months in a specific period."; > ;
-        < "Start date"; > ;
-        < "First day of the period."; > ;
-        < "End date"; > ;
-        < "Last day of the period."; > ;
-        < "Type"; > ;
-        < "Type of calculation: Type=0 means the time interval, Type=1 means calendar months."; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_DiffYears
-{
-    ItemList [ en-US ] =
-    {
-        < "Calculates the number of years in a specific period."; > ;
-        < "Start date"; > ;
-        < "First day of the period"; > ;
-        < "End date"; > ;
-        < "Last day of the period"; > ;
-        < "Type"; > ;
-        < "Type of calculation: Type=0 means the time interval, Type=1 means calendar years."; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_IsLeapYear
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE)."; > ;
-        < "Date"; > ;
-        < "Any day in the desired year"; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_DaysInMonth
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of days of the month in which the date entered occurs"; > ;
-        < "Date"; > ;
-        < "Any day in the desired month"; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_DaysInYear
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of days of the year in which the date entered occurs."; > ;
-        < "Date"; > ;
-        < "Any day in the desired year"; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_WeeksInYear
-{
-    ItemList [ en-US ] =
-    {
-        < "Returns the number of weeks of the year in which the date entered occurs"; > ;
-        < "Date"; > ;
-        < "Any day in the desired year"; > ;
-    };
-};
-
-StringArray DATE_FUNCDESC_Rot13
-{
-    ItemList [ en-US ] =
-    {
-        < "Encrypts or decrypts a text using the ROT13 algorithm"; > ;
-        < "Text"; > ;
-        < "Text to be encrypted or text already encrypted"; > ;
-    };
-};
-
-String DATE_FUNCNAME_DiffWeeks
-{
-    Text [ en-US ] = "WEEKS";
-};
-
-String DATE_FUNCNAME_DiffMonths
-{
-    Text [ en-US ] = "MONTHS";
-};
-
-String DATE_FUNCNAME_DiffYears
-{
-    Text [ en-US ] = "YEARS";
-};
-
-String DATE_FUNCNAME_IsLeapYear
-{
-    Text [ en-US ] = "ISLEAPYEAR";
-};
-
-String DATE_FUNCNAME_DaysInMonth
-{
-    Text [ en-US ] = "DAYSINMONTH";
-};
-
-String DATE_FUNCNAME_DaysInYear
-{
-    Text [ en-US ] = "DAYSINYEAR";
-};
-
-String DATE_FUNCNAME_WeeksInYear
-{
-    Text [ en-US ] = "WEEKSINYEAR";
-};
-
-String DATE_FUNCNAME_Rot13
-{
-    Text [ en-US ] = "ROT13";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 466c0e78fd44..3df3fe78a061 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -25,6 +25,7 @@
 #include "pricing.hxx"
 #include "black_scholes.hxx"
 #include "pricing.hrc"
+#include "strings.hrc"
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -32,7 +33,6 @@
 #include <algorithm>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 
 using namespace ::com::sun::star;
@@ -43,11 +43,6 @@ using namespace sca::pricing;
 #define MY_SERVICE              "com.sun.star.sheet.addin.PricingFunctions"
 #define MY_IMPLNAME             "com.sun.star.sheet.addin.PricingFunctionsImpl"
 
-ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
-    ResId( nId, rResMgr )
-{
-}
-
 #define UNIQUE              false   // function name does not exist in Calc
 
 #define STDPAR              false   // all parameters are described
@@ -67,8 +62,8 @@ const ScaFuncDataBase pFuncDataArr[] =
 
 ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData ) :
     aIntName( OUString::createFromAscii( rBaseData.pIntName ) ),
-    nUINameID( rBaseData.nUINameID ),
-    nDescrID( rBaseData.nDescrID ),
+    pUINameID( rBaseData.pUINameID ),
+    pDescrID( rBaseData.pDescrID ),
     nParamCount( rBaseData.nParamCount ),
     eCat( rBaseData.eCat ),
     bDouble( rBaseData.bDouble ),
@@ -132,7 +127,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
 //  "normal" service implementation
 ScaPricingAddIn::ScaPricingAddIn() :
     pDefLocales( nullptr ),
-    pResMgr( nullptr ),
     pFuncDataList( nullptr )
 {
 }
@@ -140,7 +134,6 @@ ScaPricingAddIn::ScaPricingAddIn() :
 ScaPricingAddIn::~ScaPricingAddIn()
 {
     delete pFuncDataList;
-    delete pResMgr;
     delete[] pDefLocales;
 }
 
@@ -167,32 +160,13 @@ const lang::Locale& ScaPricingAddIn::GetLocale( sal_uInt32 nIndex )
     return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
 }
 
-ResMgr& ScaPricingAddIn::GetResMgr()
-{
-    if( !pResMgr )
-    {
-        InitData();     // try to get resource manager
-        if( !pResMgr )
-            throw uno::RuntimeException();
-    }
-    return *pResMgr;
-}
-
 void ScaPricingAddIn::InitData()
 {
-    delete pResMgr;
-    pResMgr = ResMgr::CreateResMgr("pricing", LanguageTag( aFuncLoc) );
+    aResLocale = Translate::Create("sca", LanguageTag(aFuncLoc));
     delete pFuncDataList;
 
-    if(pResMgr)
-    {
-        pFuncDataList = new ScaFuncDataList;
-        InitScaFuncDataList(*pFuncDataList);
-    }
-    else
-    {
-        pFuncDataList = nullptr;
-    }
+    pFuncDataList = new ScaFuncDataList;
+    InitScaFuncDataList(*pFuncDataList);
 
     if( pDefLocales )
     {
@@ -201,10 +175,9 @@ void ScaPricingAddIn::InitData()
     }
 }
 
-OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
+OUString ScaPricingAddIn::GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex)
 {
-    ResStringArray aArr(ScaResId(nResId, GetResMgr()));
-    return aArr.GetString(nStrIndex - 1);
+    return ScaResId(pResId[nStrIndex - 1]);
 }
 
 OUString ScaPricingAddIn::getImplementationName_Static()
@@ -271,9 +244,9 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProg
 
     auto fDataIt = std::find_if(pFuncDataList->begin(), pFuncDataList->end(),
                                 FindScaFuncData( aProgrammaticName ) );
-    if(fDataIt != pFuncDataList->end() )
+    if (fDataIt != pFuncDataList->end() )
     {
-        aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr());
+        aRet = ScaResId(fDataIt->GetUINameID());
         if( fDataIt->IsDouble() )
             aRet += "_ADD";
     }
@@ -583,5 +556,9 @@ double SAL_CALL ScaPricingAddIn::getOptProbInMoney( double spot, double vol,
     RETURN_FINITE( fRet );
 }
 
+OUString ScaPricingAddIn::ScaResId(const char* pResId)
+{
+    return Translate::get(pResId, aResLocale);
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/pricing/pricing.hrc b/scaddins/source/pricing/pricing.hrc
deleted file mode 100644
index af516650eb75..000000000000
--- a/scaddins/source/pricing/pricing.hrc
+++ /dev/null
@@ -1,41 +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_SCADDINS_SOURCE_PRICING_PRICING_HRC
-#define INCLUDED_SCADDINS_SOURCE_PRICING_PRICING_HRC
-
-#define PRICING_RESOURCE_START                 1000
-
-#define PRICING_FUNCDESC_START             PRICING_RESOURCE_START
-
-#define PRICING_FUNCDESC_OptBarrier        (PRICING_FUNCDESC_START)
-#define PRICING_FUNCDESC_OptTouch          (PRICING_FUNCDESC_START+1)
-#define PRICING_FUNCDESC_OptProbHit        (PRICING_FUNCDESC_START+2)
-#define PRICING_FUNCDESC_OptProbInMoney    (PRICING_FUNCDESC_START+3)
-
-#define PRICING_FUNCNAME_START             (PRICING_RESOURCE_START+1000)
-
-#define PRICING_FUNCNAME_OptBarrier        (PRICING_FUNCNAME_START)
-#define PRICING_FUNCNAME_OptTouch          (PRICING_FUNCNAME_START+1)
-#define PRICING_FUNCNAME_OptProbHit        (PRICING_FUNCNAME_START+2)
-#define PRICING_FUNCNAME_OptProbInMoney    (PRICING_FUNCNAME_START+3)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 18acc54c811f..82fbbb6cacc5 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -37,8 +37,6 @@
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>
 #include <com/sun/star/sheet/addin/XPricingFunctions.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <tools/resid.hxx>
-#include <tools/resary.hxx>
 
 #define RETURN_FINITE(d)    if( ::rtl::math::isFinite( d ) ) return d; else throw css::lang::IllegalArgumentException()
 
@@ -46,12 +44,6 @@
 namespace sca {
 namespace pricing {
 
-class ScaResId : public ResId
-{
-public:
-    ScaResId( sal_uInt16 nResId, ResMgr& rResMgr );
-};
-
 enum class ScaCategory
 {
     DateTime,
@@ -65,8 +57,8 @@ enum class ScaCategory
 struct ScaFuncDataBase
 {
     const sal_Char*             pIntName;           // internal name (get***)
-    sal_uInt16                  nUINameID;          // resource ID to UI name
-    sal_uInt16                  nDescrID;           // resource ID to description, parameter names and ~ description
+    const char*                 pUINameID;          // resource ID to UI name
+    const char**                pDescrID;           // resource ID to description, parameter names and ~ description
     // pCompName was originally meant to be able to load Excel documents that for
     // some time were stored with localized function names.
     // This is not relevant to this add-in, so we only supply the same
@@ -82,12 +74,12 @@ struct ScaFuncDataBase
 class ScaFuncData final
 {
 private:
-    OUString             aIntName;           // internal name (get***)
-    sal_uInt16                  nUINameID;          // resource ID to UI name
-    sal_uInt16                  nDescrID;           // leads also to parameter descriptions!
-    sal_uInt16                  nParamCount;        // num of parameters
-    std::vector<OUString>       aCompList;          // list of all valid names
-    ScaCategory                 eCat;               // function category
+    OUString                aIntName;           // internal name (get***)
+    const char*             pUINameID;          // resource ID to UI name
+    const char**            pDescrID;           // leads also to parameter descriptions!
+    sal_uInt16              nParamCount;        // num of parameters
+    std::vector<OUString>   aCompList;          // list of all valid names
+    ScaCategory             eCat;               // function category
     bool                    bDouble;            // name already exist in Calc
     bool                    bWithOpt;           // first parameter is internal
 
@@ -95,8 +87,8 @@ public:
     ScaFuncData(const ScaFuncDataBase& rBaseData);
     ~ScaFuncData();
 
-    sal_uInt16           GetUINameID() const     { return nUINameID; }
-    sal_uInt16           GetDescrID() const      { return nDescrID; }
+    const char*          GetUINameID() const     { return pUINameID; }
+    const char**         GetDescrID() const      { return pDescrID; }
     ScaCategory          GetCategory() const     { return eCat; }
     bool                 IsDouble() const        { return bDouble; }
 
@@ -140,23 +132,23 @@ class ScaPricingAddIn : public ::cppu::WeakImplHelper<
 private:
     css::lang::Locale  aFuncLoc;
     css::lang::Locale* pDefLocales;
-    ResMgr*                     pResMgr;
+    std::locale        aResLocale;
     sca::pricing::ScaFuncDataList*            pFuncDataList;
 
 
     void                        InitDefLocales();
     const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
-    /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr();
     void                        InitData();
 
     /// @throws css::uno::RuntimeException
-    OUString             GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
+    OUString             GetFuncDescrStr(const char** pResId, sal_uInt16 nStrIndex);
 
 public:
                                 ScaPricingAddIn();
     virtual                     ~ScaPricingAddIn() override;
 
+    OUString ScaResId(const char* pResId);
+
     static OUString      getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
diff --git a/scaddins/source/pricing/pricing.src b/scaddins/source/pricing/pricing.src
deleted file mode 100644
index d1ed46a08898..000000000000
--- a/scaddins/source/pricing/pricing.src
+++ /dev/null
@@ -1,153 +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 "pricing.hrc"
-
-// function and parameter description
-StringArray PRICING_FUNCDESC_OptBarrier
-{
-    ItemList [ en-US ] =
-    {
-        < "Pricing of a barrier option"; > ;
-        < "spot"; > ;
-        < "Price/value of the underlying asset"; > ;
-        < "vol"; > ;
-        < "Annual volatility of the underlying asset"; > ;
-        < "r"; > ;
-        < "Interest rate (continuously compounded)"; > ;
-        < "rf"; > ;
-        < "Foreign interest rate (continuously compounded)"; > ;
-        < "T"; > ;
-        < "Time to maturity of the option in years"; > ;
-        < "strike"; > ;
-        < "Strike level of the option"; > ;
-        < "barrier_low"; > ;
-        < "Lower barrier (set to 0 for no lower barrier)"; > ;
-        < "barrier_up"; > ;
-        < "Upper barrier (set to 0 for no upper barrier)"; > ;
-        < "rebate"; > ;
-        < "Amount of money paid at maturity if barrier was hit"; > ;
-        < "put/call"; > ;
-        < "String to define if the option is a (p)ut or a (c)all"; > ;
-        < "knock in/out"; > ;
-        < "String to define if the option is of type knock-(i)n or knock-(o)ut"; > ;
-        < "barrier_type"; > ;
-        < "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"; > ;
-        < "greek"; > ;
-        < "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"; > ;
-    };
-};
-
-StringArray PRICING_FUNCDESC_OptTouch
-{
-    ItemList [ en-US ] =
-    {
-        < "Pricing of a touch/no-touch option"; > ;
-        < "spot"; > ;
-        < "Price/value of the underlying asset"; > ;
-        < "vol"; > ;
-        < "Annual volatility of the underlying asset"; > ;
-        < "r"; > ;
-        < "Interest rate (continuously compounded)"; > ;
-        < "rf"; > ;
-        < "Foreign interest rate (continuously compounded)"; > ;
-        < "T"; > ;
-        < "Time to maturity of the option in years"; > ;
-        < "barrier_low"; > ;
-        < "Lower barrier (set to 0 for no lower barrier)"; > ;
-        < "barrier_up"; > ;
-        < "Upper barrier (set to 0 for no upper barrier)"; > ;
-        < "foreign/domestic"; > ;
-        < "String to define if the option pays one unit of (d)omestic currency (cash or nothing) or (f)oreign currency (asset or nothing)"; > ;
-        < "knock in/out"; > ;
-        < "String to define if the option is of type knock-(i)n (touch) or knock-(o)ut (no-touch)"; > ;
-        < "barrier_type"; > ;
-        < "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"; > ;
-        < "greek"; > ;
-        < "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"; > ;
-    };
-};
-
-StringArray PRICING_FUNCDESC_OptProbHit
-{
-    ItemList [ en-US ] =
-    {
-        < "Probability that an asset hits a barrier assuming it follows dS/S = mu dt + vol dW"; > ;
-        < "spot"; > ;
-        < "Price/value S of the underlying asset"; > ;
-        < "vol"; > ;
-        < "Annual volatility of the underlying asset"; > ;
-        < "drift"; > ;
-        < "Parameter mu in dS/S = mu dt + vol dW"; > ;
-        < "T"; > ;
-        < "Time to maturity"; > ;
-        < "barrier_low"; > ;
-        < "Lower barrier (set to 0 for no lower barrier)"; > ;
-        < "barrier_up"; > ;
-        < "Upper barrier (set to 0 for no upper barrier)"; > ;
-    };
-};
-
-StringArray PRICING_FUNCDESC_OptProbInMoney
-{
-    ItemList [ en-US ] =
-    {
-        < "Probability that an asset will at maturity end up between two barrier levels, assuming it follows dS/S = mu dt + vol dW (if the last two optional parameters (strike, put/call) are specified, the probability of S_T in [strike, upper barrier] for a call and S_T in [lower barrier, strike] for a put will be returned)"; > ;
-        < "spot"; > ;
-        < "Price/value of the asset"; > ;
-        < "vol"; > ;
-        < "Annual volatility of the asset"; > ;
-        < "drift"; > ;
-        < "Parameter mu from dS/S = mu dt + vol dW"; > ;
-        < "T"; > ;
-        < "Time to maturity in years"; > ;
-        < "barrier_low"; > ;
-        < "Lower barrier (set to 0 for no lower barrier)"; > ;
-        < "barrier_up"; > ;
-        < "Upper barrier (set to 0 for no upper barrier)"; > ;
-        < "put/call"; > ;
-        < "Optional (p)ut/(c)all indicator"; > ;
-        < "strike"; > ;
-        < "Optional strike level"; > ;
-    };
-};
-
-// function names as accessible from cells
-
-String PRICING_FUNCNAME_OptBarrier
-{
-    Text [ en-US ] = "OPT_BARRIER";
-};
-
-String PRICING_FUNCNAME_OptTouch
-{
-    Text [ en-US ] = "OPT_TOUCH";
-};
-
-String PRICING_FUNCNAME_OptProbHit
-{
-    Text [ en-US ] = "OPT_PROB_HIT";
-};
-
-String PRICING_FUNCNAME_OptProbInMoney
-{
-    Text [ en-US ] = "OPT_PROB_INMONEY";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sccomp/AllLangMoTarget_scc.mk b/sccomp/AllLangMoTarget_scc.mk
new file mode 100644
index 000000000000..9bbbb1b5c14a
--- /dev/null
+++ b/sccomp/AllLangMoTarget_scc.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,scc))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,scc,sccomp))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sccomp/AllLangResTarget_solver.mk b/sccomp/AllLangResTarget_solver.mk
deleted file mode 100644
index b04ee0fb052b..000000000000
--- a/sccomp/AllLangResTarget_solver.mk
+++ /dev/null
@@ -1,34 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,solver))
-
-$(eval $(call gb_AllLangResTarget_add_srs,solver,solver/res))
-$(eval $(call gb_SrsTarget_SrsTarget,solver/res))
-
-$(eval $(call gb_SrsTarget_set_include,solver/res,\
-	$$(INCLUDE) \
-    -I$(SRCDIR)/sccomp/source/solver \
-))
-
-$(eval $(call gb_SrsTarget_add_files,solver/res,\
-	sccomp/source/solver/solver.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index b79d8d2f2c33..2d30205fe4b0 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -24,12 +24,18 @@ $(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/
 
 $(eval $(call gb_Library_use_sdk_api,solver))
 
+$(eval $(call gb_Library_set_include,solver,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sccomp/inc \
+))
+
 $(eval $(call gb_Library_use_libraries,solver,\
 	comphelper \
 	cppu \
 	cppuhelper \
 	sal \
 	tl \
+	vcl \
 	i18nlangtag \
 ))
 
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 6960f5761c86..9ff09e8d70bd 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,sccomp,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sccomp,\
-	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), AllLangResTarget_solver) \
+	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), AllLangMoTarget_scc) \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sccomp,\
diff --git a/sccomp/inc/strings.hrc b/sccomp/inc/strings.hrc
new file mode 100644
index 000000000000..4f736374e619
--- /dev/null
+++ b/sccomp/inc/strings.hrc
@@ -0,0 +1,40 @@
+/* -*- 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_SCCOMP_INC_STRINGS_HRC
+#define INCLUDED_SCCOMP_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_SOLVER_COMPONENT        NC_("RID_SOLVER_COMPONENT", "%PRODUCTNAME Linear Solver")
+#define RID_COINMP_SOLVER_COMPONENT NC_("RID_COINMP_SOLVER_COMPONENT", "%PRODUCTNAME CoinMP Linear Solver")
+#define RID_PROPERTY_NONNEGATIVE    NC_("RID_PROPERTY_NONNEGATIVE", "Assume variables as non-negative")
+#define RID_PROPERTY_INTEGER        NC_("RID_PROPERTY_INTEGER", "Assume variables as integer")
+#define RID_PROPERTY_TIMEOUT        NC_("RID_PROPERTY_TIMEOUT", "Solving time limit (seconds)")
+#define RID_PROPERTY_EPSILONLEVEL   NC_("RID_PROPERTY_EPSILONLEVEL", "Epsilon level (0-3)")
+#define RID_PROPERTY_LIMITBBDEPTH   NC_("RID_PROPERTY_LIMITBBDEPTH", "Limit branch-and-bound depth")
+#define RID_ERROR_NONLINEAR         NC_("RID_ERROR_NONLINEAR", "The model is not linear.")
+#define RID_ERROR_EPSILONLEVEL      NC_("RID_ERROR_EPSILONLEVEL", "The epsilon level is invalid.")
+#define RID_ERROR_INFEASIBLE        NC_("RID_ERROR_INFEASIBLE", "The model is infeasible. Check limiting conditions.")
+#define RID_ERROR_UNBOUNDED         NC_("RID_ERROR_UNBOUNDED", "The model is unbounded.")
+#define RID_ERROR_TIMEOUT           NC_("RID_ERROR_TIMEOUT", "The time limit was reached.")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index 36cead8f116b..045fb5fa5aa1 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -21,7 +21,7 @@
 #include <CoinError.hpp>
 
 #include "SolverComponent.hxx"
-#include "solver.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index fbb0a60c1f4f..428d87d55916 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -53,7 +53,7 @@
 #undef LANGUAGE_NONE
 
 #include "SolverComponent.hxx"
-#include "solver.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx
index bac5e8dc2b2c..134226d02a55 100644
--- a/sccomp/source/solver/SolverComponent.cxx
+++ b/sccomp/source/solver/SolverComponent.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "SolverComponent.hxx"
-#include "solver.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -29,6 +29,8 @@
 #include <vector>
 
 #include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
 
@@ -42,14 +44,10 @@ using namespace com::sun::star;
 
 //  Resources from tools are used for translated strings
 
-ResMgr* SolverComponent::pSolverResMgr = nullptr;
-
-OUString SolverComponent::GetResourceString( sal_uInt32 nId )
+OUString SolverComponent::GetResourceString(const char* pId)
 {
-    if (!pSolverResMgr)
-        pSolverResMgr = ResMgr::CreateResMgr("solver");
-
-    return ResId(nId, *pSolverResMgr).toString();
+    static std::locale loc = Translate::Create("scc", Application::GetSettings().GetUILanguageTag());
+    return Translate::get(pId, loc);
 }
 
 size_t ScSolverCellHash::operator()( const css::table::CellAddress& rAddress ) const
@@ -146,24 +144,24 @@ OUString SAL_CALL SolverComponent::getStatusDescription()
 
 OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName )
 {
-    sal_uInt32 nResId = 0;
+    const char* pResId = nullptr;
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
     switch (nHandle)
     {
         case PROP_NONNEGATIVE:
-            nResId = RID_PROPERTY_NONNEGATIVE;
+            pResId = RID_PROPERTY_NONNEGATIVE;
             break;
         case PROP_INTEGER:
-            nResId = RID_PROPERTY_INTEGER;
+            pResId = RID_PROPERTY_INTEGER;
             break;
         case PROP_TIMEOUT:
-            nResId = RID_PROPERTY_TIMEOUT;
+            pResId = RID_PROPERTY_TIMEOUT;
             break;
         case PROP_EPSILONLEVEL:
-            nResId = RID_PROPERTY_EPSILONLEVEL;
+            pResId = RID_PROPERTY_EPSILONLEVEL;
             break;
         case PROP_LIMITBBDEPTH:
-            nResId = RID_PROPERTY_LIMITBBDEPTH;
+            pResId = RID_PROPERTY_LIMITBBDEPTH;
             break;
         default:
             {
@@ -171,8 +169,8 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rProp
             }
     }
     OUString aRet;
-    if ( nResId )
-        aRet = SolverComponent::GetResourceString( nResId );
+    if (pResId)
+        aRet = SolverComponent::GetResourceString(pResId);
     return aRet;
 }
 
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index 227d48de5822..21b646731e0c 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -32,8 +32,6 @@
 
 #include <unordered_map>
 
-class ResMgr;
-
 // hash map for the coefficients of a dependent cell (objective or constraint)
 // The size of each vector is the number of columns (variable cells) plus one, first entry is initial value.
 
@@ -66,8 +64,6 @@ class SolverComponent : public comphelper::OMutexAndBroadcastHelper,
                         public SolverComponent_Base
 {
 protected:
-    static ResMgr* pSolverResMgr;
-
     // settings
     css::uno::Reference< css::sheet::XSpreadsheetDocument > mxDoc;
     css::table::CellAddress                                 maObjective;
@@ -86,7 +82,7 @@ protected:
     css::uno::Sequence< double >                            maSolution;
     OUString                                                maStatus;
 
-    static OUString GetResourceString( sal_uInt32 nId );
+    static OUString GetResourceString(const char* pId);
     static css::uno::Reference<css::table::XCell> GetCell(
             const css::uno::Reference<css::sheet::XSpreadsheetDocument>& xDoc,
             const css::table::CellAddress& rPos );
diff --git a/sccomp/source/solver/solver.hrc b/sccomp/source/solver/solver.hrc
deleted file mode 100644
index 888739831ea9..000000000000
--- a/sccomp/source/solver/solver.hrc
+++ /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/.
- *
- * 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 SOLVER_HRC
-#define SOLVER_HRC
-
-#define SOLVER_RESOURCE_START       1000
-
-#define RID_SOLVER_COMPONENT        (SOLVER_RESOURCE_START)
-#define RID_PROPERTY_NONNEGATIVE    (SOLVER_RESOURCE_START + 1)
-#define RID_PROPERTY_INTEGER        (SOLVER_RESOURCE_START + 2)
-#define RID_PROPERTY_TIMEOUT        (SOLVER_RESOURCE_START + 3)
-#define RID_PROPERTY_EPSILONLEVEL   (SOLVER_RESOURCE_START + 4)
-#define RID_PROPERTY_LIMITBBDEPTH   (SOLVER_RESOURCE_START + 5)
-#define RID_ERROR_NONLINEAR         (SOLVER_RESOURCE_START + 6)
-#define RID_ERROR_EPSILONLEVEL      (SOLVER_RESOURCE_START + 7)
-#define RID_ERROR_INFEASIBLE        (SOLVER_RESOURCE_START + 8)
-#define RID_ERROR_UNBOUNDED         (SOLVER_RESOURCE_START + 9)
-#define RID_ERROR_TIMEOUT           (SOLVER_RESOURCE_START + 10)
-#define RID_COINMP_SOLVER_COMPONENT (SOLVER_RESOURCE_START + 11)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sccomp/source/solver/solver.src b/sccomp/source/solver/solver.src
deleted file mode 100644
index 05044003ff45..000000000000
--- a/sccomp/source/solver/solver.src
+++ /dev/null
@@ -1,82 +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 "solver.hrc"
-
-String RID_SOLVER_COMPONENT
-{
-    Text [ en-US ] = "%PRODUCTNAME Linear Solver";
-};
-
-String RID_COINMP_SOLVER_COMPONENT
-{
-    Text [ en-US ] = "%PRODUCTNAME CoinMP Linear Solver";
-};
-
-String RID_PROPERTY_NONNEGATIVE
-{
-    Text [ en-US ] = "Assume variables as non-negative";
-};
-
-String RID_PROPERTY_INTEGER
-{
-    Text [ en-US ] = "Assume variables as integer";
-};
-
-String RID_PROPERTY_TIMEOUT
-{
-    Text [ en-US ] = "Solving time limit (seconds)";
-};
-
-String RID_PROPERTY_EPSILONLEVEL
-{
-    Text [ en-US ] = "Epsilon level (0-3)";
-};
-
-String RID_PROPERTY_LIMITBBDEPTH
-{
-    Text [ en-US ] = "Limit branch-and-bound depth";
-};
-
-String RID_ERROR_NONLINEAR
-{
-    Text [ en-US ] = "The model is not linear.";
-};
-
-String RID_ERROR_EPSILONLEVEL
-{
-    Text [ en-US ] = "The epsilon level is invalid.";
-};
-
-String RID_ERROR_INFEASIBLE
-{
-    Text [ en-US ] = "The model is infeasible. Check limiting conditions.";
-};
-
-String RID_ERROR_UNBOUNDED
-{
-    Text [ en-US ] = "The model is unbounded.";
-};
-
-String RID_ERROR_TIMEOUT
-{
-    Text [ en-US ] = "The time limit was reached.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ce564a51c130..a832cb20f665 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/file_extra_ooo \
     scp2/source/ooo/file_library_ooo \
     scp2/source/ooo/file_ooo \
-    scp2/source/ooo/file_resource_ooo \
     scp2/source/ooo/installation_ooo \
     scp2/source/ooo/module_help_template \
     scp2/source/ooo/module_hidden_ooo \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7093a1c6f6b6..4f03fbe58d8e 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -515,12 +515,12 @@ End
 
 #include <langmacros.inc>
 
-#define UI_FILELIST_ALL_LANG(name, file) \
-    File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \
+#define MO_FILELIST_ALL_LANG(name) \
+    File CONCAT3(gid_File_Res_, name, _Lang) \
         TXT_FILE_BODY; \
         Styles = (PACKED); \
-        Dir = gid_Dir_Share_Config_Sofficecfg; \
-        UI_ALL_LANG_BUT_EN_US(file); \
+        Dir = gid_Dir_Resource; \
+        MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name); \
     End
 
 #define URE_PRIVATE_LIB(id,name) \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 4221315f924d..e034cfd98624 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -50,7 +50,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_EXTRA_ALL_LANG();
 write_EXTRA_ALL_LANG_BUT_EN_US();
-write_UI_ALL_LANG_BUT_EN_US();
+write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
 write_RESFILE_ALL_LANG();
 write_README_ALL_LANG();
@@ -167,16 +167,16 @@ sub write_EXTRA_ALL_LANG_BUT_EN_US
     print OUTFILE "\n\n";
 }
 
-sub write_UI_ALL_LANG_BUT_EN_US
+sub write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ
 {
-    print OUTFILE "#define UI_ALL_LANG_BUT_EN_US(name) ";
+    print OUTFILE "#define MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name) ";
     my $first = 1;
     foreach $lang (@completelangiso) {
-        if ($lang ne "en-US") {
+        if (($lang ne "en-US") and ($lang ne "qtz")) {
             print OUTFILE "; " unless $first;
             $first = 0;
             print OUTFILE
-                "\\\n\tName ($lang) = STRING(CONCAT2(name,/ui/res/$lang.zip))";
+                "\\\n\tName ($lang) = STRING(CONCAT3($lang/LC_MESSAGES/,name,.mo))";
         }
     }
     print OUTFILE "\n\n";
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index c8537dadcd06..5c50dd3b7af7 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -18,19 +18,6 @@
 
 #include "macros.inc"
 
-STD_RES_FILE( gid_File_Res_Abp, abp)
-
-STD_RES_FILE( gid_File_Res_Dbp, dbp)
-
-STD_RES_FILE( gid_File_Res_Dbu, dbu)
-
-STD_RES_FILE( gid_File_Res_Cnr, cnr)
-STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-
-STD_RES_FILE( gid_File_Res_Rpt, rpt)
-
-STD_RES_FILE( gid_File_Res_Rptui, rptui)
-
 #if defined WITH_HELP
 File gid_File_Help_Sdatabase_Zip
     Dir = FILELIST_DIR;
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index e8b71da7ab2a..783c8a49a01d 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -57,14 +57,7 @@ Module gid_Module_Langpack_Base_Template
     Name = "gid_Module_Langpack_Base_Template";
     Description = "gid_Module_Langpack_Base_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Abp,
-             gid_File_Res_Cnr,
-             gid_File_Res_Dbp,
-             gid_File_Res_Dbu,
-             gid_File_Res_Rpt,
-             gid_File_Res_Rptui,
-             gid_File_Res_Sdbcl,
-             gid_File_Res_Sdberr);
+    Files = ();
 End
 
 #include "alllangmodules_base.inc"
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index eae330c8989b..75cbbbc119b9 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -25,14 +25,6 @@ File gid_File_Share_Registry_Calc_Xcd
     Name = "calc.xcd";
 End
 
-STD_RES_FILE( gid_File_Res_Analysis, analysis)
-
-STD_RES_FILE( gid_File_Res_Date, date)
-
-STD_RES_FILE( gid_File_Res_Pricing, pricing)
-
-STD_RES_FILE( gid_File_Res_Sc, sc )
-
 #if defined WITH_HELP
 File gid_File_Help_Scalc_Zip
     Dir = FILELIST_DIR;
@@ -41,8 +33,3 @@ File gid_File_Help_Scalc_Zip
 End
 #endif
 
-#if defined(WITH_LPSOLVER)
-
-STD_RES_FILE( gid_File_Res_Solver, solver)
-
-#endif
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index b81da8e1f22d..dd31007bb5ca 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -66,11 +66,7 @@ Module gid_Module_Langpack_Calc_Template
     Name = "gid_Module_Langpack_Calc_Template";
     Description = "gid_Module_Langpack_Calc_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Analysis,
-             gid_File_Res_Date,
-             gid_File_Res_Pricing,
-             gid_File_Res_Sc,
-             gid_File_Res_Solver);
+    Files = ();
 End
 
 Module gid_Module_Prg_Calc_MSO_Reg
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index a7a75b5e643b..12877b8f1eda 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -18,8 +18,6 @@
 
 #include "macros.inc"
 
-STD_RES_FILE( gid_File_Res_Sm, sm )
-
 File gid_File_Share_Registry_Math_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index c45e6500c654..c3054845d9f5 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -58,7 +58,7 @@ Module gid_Module_Langpack_Math_Template
     Name = "gid_Module_Langpack_Math_Template";
     Description = "gid_Module_Langpack_Math_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Sm);
+    Files = ();
 End
 
 #include "alllangmodules_math.inc"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a9e53ab7906e..e39a65e19ef1 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -638,6 +638,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Share_Subdir
     Value = LIBO_SHARE_FOLDER;
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Resource_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_SHARE_RESOURCE_SUBDIR";
+    Value = LIBO_SHARE_RESOURCE_FOLDER;
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index bd57e8287ada..ea8eddc16635 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-STD_RES_FILE( gid_File_Res_Eps, eps )
-
 #if defined WITH_HELP
 File gid_File_Help_Common_Zip
     Dir = FILELIST_DIR;
@@ -177,33 +175,40 @@ UI_FILELIST(vcl, "UIConfig/vcl.filelist")
 UI_FILELIST(writerperfect, "UIConfig/writerperfect.filelist")
 UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist")
 
-UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)
-UI_FILELIST_ALL_LANG(cui, cui)
-#ifdef DBCONNECTIVITY
-UI_FILELIST_ALL_LANG(dbaccess, dbaccess)
-UI_FILELIST_ALL_LANG(dbreport, modules/dbreport)
-UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography)
-UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
-#endif
-UI_FILELIST_ALL_LANG(desktop, desktop)
-UI_FILELIST_ALL_LANG(editeng, editeng)
-UI_FILELIST_ALL_LANG(filter, filter)
-UI_FILELIST_ALL_LANG(formula, formula)
-UI_FILELIST_ALL_LANG(fps, fps)
-UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
-UI_FILELIST_ALL_LANG(scalc, modules/scalc)
-UI_FILELIST_ALL_LANG(scanner, modules/scanner)
-UI_FILELIST_ALL_LANG(schart, modules/schart)
-UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
-UI_FILELIST_ALL_LANG(sfx, sfx)
-UI_FILELIST_ALL_LANG(simpress, modules/simpress)
-UI_FILELIST_ALL_LANG(smath, modules/smath)
-UI_FILELIST_ALL_LANG(svt, svt)
-UI_FILELIST_ALL_LANG(svx, svx)
-UI_FILELIST_ALL_LANG(swriter, modules/swriter)
-UI_FILELIST_ALL_LANG(uui, uui)
-UI_FILELIST_ALL_LANG(vcl, vcl)
-UI_FILELIST_ALL_LANG(xmlsec, xmlsec)
+MO_FILELIST_ALL_LANG(acc)
+MO_FILELIST_ALL_LANG(avmedia)
+#ifndef DISABLE_SCRIPTING
+MO_FILELIST_ALL_LANG(basctl)
+#endif
+MO_FILELIST_ALL_LANG(chart)
+MO_FILELIST_ALL_LANG(cnr)
+MO_FILELIST_ALL_LANG(cui)
+MO_FILELIST_ALL_LANG(dba)
+MO_FILELIST_ALL_LANG(dkt)
+MO_FILELIST_ALL_LANG(editeng)
+MO_FILELIST_ALL_LANG(flt)
+MO_FILELIST_ALL_LANG(for)
+MO_FILELIST_ALL_LANG(fps)
+MO_FILELIST_ALL_LANG(frm)
+MO_FILELIST_ALL_LANG(fwk)
+MO_FILELIST_ALL_LANG(pcr)
+MO_FILELIST_ALL_LANG(rpt)
+MO_FILELIST_ALL_LANG(sb)
+MO_FILELIST_ALL_LANG(sc)
+MO_FILELIST_ALL_LANG(sca)
+MO_FILELIST_ALL_LANG(scc)
+MO_FILELIST_ALL_LANG(sd)
+MO_FILELIST_ALL_LANG(sfx)
+MO_FILELIST_ALL_LANG(sm)
+MO_FILELIST_ALL_LANG(svl)
+MO_FILELIST_ALL_LANG(svt)
+MO_FILELIST_ALL_LANG(svx)
+MO_FILELIST_ALL_LANG(sw)
+MO_FILELIST_ALL_LANG(uui)
+MO_FILELIST_ALL_LANG(vcl)
+MO_FILELIST_ALL_LANG(wiz)
+MO_FILELIST_ALL_LANG(wpt)
+MO_FILELIST_ALL_LANG(xsc)
 
 #if defined UNX && ! defined MACOSX
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
deleted file mode 100644
index ac90ee812f5a..000000000000
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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 "macros.inc"
-
-#ifndef DISABLE_SCRIPTING
-
-STD_RES_FILE( gid_File_Res_Basctl, basctl)
-
-#endif
-
-STD_RES_FILE( gid_File_Res_Bib, bib )
-
-STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller )
-
-STD_RES_FILE( gid_File_Res_Dba, dba)
-
-STD_RES_FILE( gid_File_Res_Sdbt, sdbt)
-
-STD_RES_FILE( gid_File_Res_Dbmm, dbmm)
-
-STD_RES_FILE( gid_File_Res_Dbw, dbw )
-
-STD_RES_FILE( gid_File_Res_Dkt, dkt)
-
-STD_RES_FILE( gid_File_Res_Frm, frm)
-
-STD_RES_FILE( gid_File_Res_Fwe, fwe)
-
-STD_RES_FILE( gid_File_Res_Fps_Office, fps_office)
-
-STD_RES_FILE( gid_File_Res_Gal, gal )
-
-STD_RES_FILE( gid_File_Res_Deployment, deployment )
-STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
-
-STD_RES_FILE( gid_File_Res_Pcr, pcr)
-
-STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
-
-#ifdef UNX
-
-STD_RES_FILE( gid_File_Res_San, scn )
-
-#endif
-
-STD_RES_FILE( gid_File_Res_Sd, sd )
-
-STD_RES_FILE( gid_File_Res_Sfx, sfx )
-
-STD_RES_FILE( gid_File_Res_Sb, sb )
-
-STD_RES_FILE( gid_File_Res_Svl, svl )
-
-STD_RES_FILE( gid_File_Res_Svt, svt )
-
-STD_RES_FILE( gid_File_Res_Svx, svx )
-STD_RES_FILE( gid_File_Res_Editeng, editeng )
-
-STD_RES_FILE( gid_File_Res_Cui, cui )
-
-STD_RES_FILE( gid_File_Res_Sw, sw )
-
-
-STD_RES_FILE( gid_File_Res_Acc, acc )
-
-STD_RES_FILE( gid_File_Res_Uui, uui )
-
-STD_RES_FILE( gid_File_Res_Vcl, vcl )
-
-STD_RES_FILE( gid_File_Res_Writerperfect, writerperfect )
-
-STD_RES_FILE( gid_File_Res_Xsltdlg, xsltdlg )
-
-STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
-
-STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
-
-STD_RES_FILE( gid_File_Res_Upd, upd )
-
-STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
-
-STD_RES_FILE( gid_File_Res_Forui, forui )
-STD_RES_FILE( gid_File_Res_For, for )
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 2b2f86f0342b..0455a4e75133 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -49,6 +49,38 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Share_Config_Sofficecfg_uiconfig_uui_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_vcl_Lang,
              gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec_Lang,
+             gid_File_Res_acc_Lang,
+             gid_File_Res_avmedia_Lang,
+             gid_File_Res_basctl_Lang,
+             gid_File_Res_chart_Lang,
+             gid_File_Res_cnr_Lang,
+             gid_File_Res_cui_Lang,
+             gid_File_Res_dba_Lang,
+             gid_File_Res_dkt_Lang,
+             gid_File_Res_editeng_Lang,
+             gid_File_Res_flt_Lang,
+             gid_File_Res_for_Lang,
+             gid_File_Res_fps_Lang,
+             gid_File_Res_frm_Lang,
+             gid_File_Res_fwk_Lang,
+             gid_File_Res_pcr_Lang,
+             gid_File_Res_rpt_Lang,
+             gid_File_Res_sb_Lang,
+             gid_File_Res_sc_Lang,
+             gid_File_Res_sca_Lang,
+             gid_File_Res_scc_Lang,
+             gid_File_Res_sd_Lang,
+             gid_File_Res_sfx_Lang,
+             gid_File_Res_sm_Lang,
+             gid_File_Res_svl_Lang,
+             gid_File_Res_svt_Lang,
+             gid_File_Res_svx_Lang,
+             gid_File_Res_sw_Lang,
+             gid_File_Res_uui_Lang,
+             gid_File_Res_vcl_Lang,
+             gid_File_Res_wiz_Lang,
+             gid_File_Res_wpt_Lang,
+             gid_File_Res_xsc_Lang,
              gid_File_Extra_Autotextshare_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
@@ -59,53 +91,6 @@ Module gid_Module_Langpack_Basis_Template
             gid_Dir_Autotext_Language);
 End
 
-Module gid_Module_Langpack_Resource_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Resource_Template";
-    Description = "gid_Module_Langpack_Resource_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Basctl,
-             gid_File_Res_Bib,
-             gid_File_Res_Chartcontroller,
-             gid_File_Res_Sdbt,
-             gid_File_Res_Dbmm,
-             gid_File_Res_Dba,
-             gid_File_Res_Dbw,
-             gid_File_Res_Dkt,
-             gid_File_Res_Editeng,
-             gid_File_Res_For,
-             gid_File_Res_Forui,
-             gid_File_Res_Fps_Office,
-             gid_File_Res_Frm,
-             gid_File_Res_Fwe,
-             gid_File_Res_Gal,
-             gid_File_Res_Deployment,
-             gid_File_Res_DeploymentGui,
-             gid_File_Res_Pcr,
-             gid_File_Res_Pdffilter,
-             gid_File_Res_San,
-             gid_File_Res_Sb,
-             gid_File_Res_Sd,
-             gid_File_Res_Sfx,
-             gid_File_Res_Spa,
-             gid_File_Res_Svl,
-             gid_File_Res_Svt,
-             gid_File_Res_Svx,
-             gid_File_Res_Cui,
-             gid_File_Res_Sw,
-             gid_File_Res_Tk,
-             gid_File_Res_Acc,
-             gid_File_Res_Uui,
-             gid_File_Res_Vcl,
-             gid_File_Res_Writerperfect,
-             gid_File_Res_Wzi,
-             gid_File_Res_Xsltdlg,
-             gid_File_Res_AVMedia,
-             gid_File_Res_XMLSecurity,
-             gid_File_Res_Eps,
-             gid_File_Res_UpdChk,
-             gid_File_Res_Upd);
-End
 Module gid_Module_Langpack_Fonts_Template
     ParentID = gid_Module_Langpack_Languageroot;
     Name = "gid_Module_Langpack_Fonts_Template";
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 48b96531d22f..eb0b7764bb82 100644
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -28,17 +28,6 @@ Module gid_Module_Langpack_Basis_<LANGUAGE_>
     Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 End
 
-Module gid_Module_Langpack_Resource_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "100";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Resource_Template;
-    Name = "gid_Module_Langpack_Resource_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Resource_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
 Module gid_Module_Langpack_Fonts_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "300";
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 917868951be9..9a0ed77ac4b8 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -57,7 +57,7 @@ Module gid_Module_Langpack_Writer_Template
     Name = "gid_Module_Langpack_Writer_Template";
     Description = "gid_Module_Langpack_Writer_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_T602Filter);
+    Files = ();
 End
 
 Module gid_Module_Prg_Wrt_MSO_Reg
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index f5bd7aa229f8..636fc923fdc6 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -22,7 +22,9 @@
 #include "dlgprov.hxx"
 
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <vcl/layout.hxx>
 #include <tools/diagnose_ex.h>
 
@@ -616,23 +618,19 @@ namespace dlgprov
         }
         else
         {
-            ResMgr* pResMgr = SfxApplication::GetSfxResManager();
-            if( pResMgr )
-            {
-                OUString aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
-                OUString aQuoteChar( "\"" );
+            OUString aRes(SfxResId(STR_ERRUNOEVENTBINDUNG));
+            OUString aQuoteChar( "\"" );
 
-                sal_Int32 nIndex = aRes.indexOf( '%' );
+            sal_Int32 nIndex = aRes.indexOf( '%' );
 
-                OUString aOUFinal;
-                aOUFinal += aRes.copy( 0, nIndex );
-                aOUFinal += aQuoteChar;
-                aOUFinal += aMethodName;
-                aOUFinal += aQuoteChar;
-                aOUFinal += aRes.copy( nIndex + 2 );
+            OUString aOUFinal;
+            aOUFinal += aRes.copy( 0, nIndex );
+            aOUFinal += aQuoteChar;
+            aOUFinal += aMethodName;
+            aOUFinal += aQuoteChar;
+            aOUFinal += aRes.copy( nIndex + 2 );
 
-                ScopedVclPtrInstance<MessageDialog>(nullptr, aOUFinal)->Execute();
-            }
+            ScopedVclPtrInstance<MessageDialog>(nullptr, aOUFinal)->Execute();
         }
     }
 
diff --git a/sd/AllLangMoTarget_sd.mk b/sd/AllLangMoTarget_sd.mk
new file mode 100644
index 000000000000..7ea813e5fa78
--- /dev/null
+++ b/sd/AllLangMoTarget_sd.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,sd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
deleted file mode 100644
index c44b37ea3fd3..000000000000
--- a/sd/AllLangResTarget_sd.mk
+++ /dev/null
@@ -1,39 +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,sd))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,sd,sd))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sd,\
-    sd/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sd/res))
-
-$(eval $(call gb_SrsTarget_set_include,sd/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/sd/inc \
-    -I$(SRCDIR)/sd/source/ui/inc \
-    -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sd/res,\
-    sd/source/core/glob.src \
-    sd/source/ui/accessibility/accessibility.src \
-    sd/source/ui/animations/CustomAnimation.src \
-    sd/source/ui/annotations/annotations.src \
-    sd/source/ui/app/res_bmp.src \
-    sd/source/ui/app/sdstring.src \
-    sd/source/ui/app/strings.src \
-    sd/source/ui/app/toolbox.src \
-    sd/source/ui/view/DocumentRenderer.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_export_ooxml1.mk b/sd/CppunitTest_sd_export_ooxml1.mk
index cd0a24c121de..71bddc1a63e9 100644
--- a/sd/CppunitTest_sd_export_ooxml1.mk
+++ b/sd/CppunitTest_sd_export_ooxml1.mk
@@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_ooxml1,\
 	-env:SVG_DISABLE_FONT_EMBEDDING= \
 ))
 
-$(call gb_CppunitTest_get_target,sd_export_ooxml1): \
-	$(call gb_AllLangResTarget_get_target,avmedia) \
-	$(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_export_ooxml2.mk b/sd/CppunitTest_sd_export_ooxml2.mk
index dd83f86eed15..6944e1e721f0 100644
--- a/sd/CppunitTest_sd_export_ooxml2.mk
+++ b/sd/CppunitTest_sd_export_ooxml2.mk
@@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_ooxml2,\
 	-env:SVG_DISABLE_FONT_EMBEDDING= \
 ))
 
-$(call gb_CppunitTest_get_target,sd_export_ooxml2): \
-	$(call gb_AllLangResTarget_get_target,avmedia) \
-	$(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk
index 4a6c8a979213..b1bec1029ec5 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\
     -env:SVG_DISABLE_FONT_EMBEDDING= \
 ))
 
-$(call gb_CppunitTest_get_target,sd_export_tests): \
-    $(call gb_AllLangResTarget_get_target,avmedia) \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index fe41918dff0a..66fa6f1b2cf7 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
 
 # sd dlopens libicg.so for cgm import, so ensure its built by now
 $(call gb_CppunitTest_get_target,sd_filters_test) : | \
-    $(call gb_AllLangResTarget_get_target,sd) \
     $(call gb_Library_get_target,icg) \
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 17aa7855f3a6..e041ef97e1fa 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -107,6 +107,4 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_html_export_tests))
 
-$(call gb_CppunitTest_get_target,sd_html_export_tests) : $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 7b8ae080c835..0307580ac9d7 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -121,6 +121,4 @@ ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport))
 endif
 
-$(call gb_CppunitTest_get_target,sd_import_tests) : $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index 8e6b278c771b..8dec5f351fcc 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -119,6 +119,4 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_misc_tests))
 
-$(call gb_CppunitTest_get_target,sd_misc_tests) : $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_svg_export_tests.mk b/sd/CppunitTest_sd_svg_export_tests.mk
index 62b97ad1f52a..4e9a6ca1f490 100644
--- a/sd/CppunitTest_sd_svg_export_tests.mk
+++ b/sd/CppunitTest_sd_svg_export_tests.mk
@@ -67,6 +67,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_svg_export_tests,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_svg_export_tests))
 
-$(call gb_CppunitTest_get_target,sd_svg_export_tests) : $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_tiledrendering.mk b/sd/CppunitTest_sd_tiledrendering.mk
index 495eeed9d2b2..ffdfbfeed551 100644
--- a/sd/CppunitTest_sd_tiledrendering.mk
+++ b/sd/CppunitTest_sd_tiledrendering.mk
@@ -55,6 +55,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_tiledrendering,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_tiledrendering))
 
-$(call gb_CppunitTest_get_target,sd_tiledrendering) : $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 683da42a92e6..3c5cd3318f2e 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -573,7 +573,4 @@ endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE
 
 endif # ENABLE_SDREMOTE=TRUE
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sd,sd))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index dde16d7c4c40..27b8b37dc79d 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,sd,\
     Package_opengl \
     Package_web \
     Package_xml \
+    UIConfig_sdraw \
+    UIConfig_simpress \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sd,\
-    AllLangResTarget_sd \
-    UIConfig_sdraw \
-    UIConfig_simpress \
+    AllLangMoTarget_sd \
 ))
 
 ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),)
diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc
new file mode 100644
index 000000000000..03c83f0f903f
--- /dev/null
+++ b/sd/inc/DocumentRenderer.hrc
@@ -0,0 +1,98 @@
+/* -*- 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_SD_INC_DOCUMENTRENDERER_HRC
+#define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* STR_IMPRESS_PRINT_UI_CONTENT_CHOICES[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Slides"),
+    NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Handouts"),
+    NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Notes"),
+    NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Outline")
+};
+
+const char* STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "According to layout"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "1"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "2"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "3"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "4"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "6"),
+    NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "9")
+};
+
+const char* STR_IMPRESS_PRINT_UI_ORDER_CHOICES[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_ORDER_CHOICES", "Left to right, then down"),
+    NC_("STR_IMPRESS_PRINT_UI_ORDER_CHOICES", "Top to bottom, then right")
+};
+
+const char* STR_IMPRESS_PRINT_UI_QUALITY_CHOICES[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Original colors"),
+    NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Grayscale"),
+    NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Black & white")
+};
+
+const char* STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Original size"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Fit to printable page"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Distribute on multiple sheets of paper"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Tile sheet of paper with repeated slides")
+};
+
+const char* STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Original size"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Fit to printable page"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Distribute on multiple sheets of paper"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Tile sheet of paper with repeated pages")
+};
+
+const char* STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "All pages"),
+    NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "Front sides / right pages"),
+    NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "Back sides / left pages")
+};
+
+const char* STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE[] =
+{
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~All slides"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Slides"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Se~lection")
+};
+
+const char* STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE[] =
+{
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~All pages"),
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Pa~ges"),
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Se~lection")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index a6f9845269c5..591fe2fedad1 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -29,7 +29,7 @@
 #include <svx/pageitem.hxx>
 #include <unotools/charclass.hxx>
 #include <sot/storage.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <com/sun/star/xml/dom/XNode.hpp>
 
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/app/res_bmp.src b/sd/inc/errhdl.hrc
index 88b5e9e33fe4..20fe07e02f34 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/inc/errhdl.hrc
@@ -17,29 +17,28 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sfx.hrc>
-#include <svl/style.hrc>
+#ifndef INCLUDED_SD_INC_ERRHDL_HRC
+#define INCLUDED_SD_INC_ERRHDL_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
 #include "glob.hrc"
-#include "res_bmp.hrc"
+#include "sderror.hxx"
 
-StringArray RID_GRAPHICSTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
-        < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-        < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
-    };
-};
+#define ERR_CODE( class, err )  ErrCode(class | (sal_uInt32(err) - ERROR_SD_BASE))
+#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - WARN_SD_BASE))
 
-StringArray RID_PRESENTATIONSTYLEFAMILY
+const ErrMsgCode RID_SD_ERRHDL[] =
 {
-    ItemList [ en-US ] =
-    {
-        < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
-    };
+    { NC_("RID_SD_ERRHDL", "File format error found at $(ARG1)(row,col)."),
+      ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) },
+    { NC_("RID_SD_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."),
+      ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) },
+    { NC_("RID_SD_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."),
+      ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) },
+    { nullptr, ERRCODE_NONE }
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/templdlg.src b/sd/inc/family.hrc
index d1c7fc510171..6e3d7114a8b4 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sd/inc/family.hrc
@@ -17,34 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sfx.hrc>
-#include "dialog.hrc"
-#include "helpid.hrc"
+#ifndef INCLUDED_SD_INC_FAMILY_HRC
+#define INCLUDED_SD_INC_FAMILY_HRC
 
-// Strings ---------------------------------------------------------------
-String STR_STYLE_ELEMTLIST
-{
-    Text [ en-US ] = "Style List" ;
-};
+#include <sfx2/sfx.hrc>
+#include <svl/style.hxx>
 
-String STR_STYLE_FILTER_HIERARCHICAL
-{
-    Text [ en-US ] = "Hierarchical" ;
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String STR_STYLE_FILL_FORMAT_MODE
+const std::pair<const char*, int> RID_GRAPHICSTYLEFAMILY[] =
 {
-    Text [ en-US ] = "Fill Format Mode" ;
+    { NC_("RID_GRAPHICSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_GRAPHICSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+    { NC_("RID_GRAPHICSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+    { NC_("RID_GRAPHICSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+    { nullptr, 0 }
 };
 
-String STR_STYLE_NEW_STYLE_FROM_SELECTION
+const std::pair<const char*, int> RID_PRESENTATIONSTYLEFAMILY[] =
 {
-    Text [ en-US ] = "New Style from Selection" ;
+    { NC_("RID_PRESENTATIONSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_PRESENTATIONSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+    { nullptr, 0 }
 };
 
-String STR_STYLE_UPDATE_STYLE
-{
-    Text [ en-US ] = "Update Style" ;
-};
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 6a89ca2d647b..1ad0a198134d 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -24,93 +24,8 @@
 
 #define RID_GLOB_START                          RID_APP_START+1000
 
-#define STR_LAYER_BCKGRND                       RID_GLOB_START
-#define STR_LAYER_BCKGRNDOBJ                    RID_GLOB_START+1
-#define STR_LAYER_LAYOUT                        RID_GLOB_START+2
-#define STR_LAYER_CONTROLS                      RID_GLOB_START+3
-#define STR_PAGE                                RID_GLOB_START+4
-#define STR_PRESOBJ_TITLE                       RID_GLOB_START+5
-#define STR_PRESOBJ_OUTLINE                     RID_GLOB_START+6
-#define STR_PRESOBJ_TEXT                        RID_GLOB_START+7
-#define STR_PRESOBJ_GRAPHIC                     RID_GLOB_START+8
-#define STR_PRESOBJ_OBJECT                      RID_GLOB_START+9
-#define STR_PRESOBJ_CHART                       RID_GLOB_START+10
-#define STR_PRESOBJ_ORGCHART                    RID_GLOB_START+11
-#define STR_PRESOBJ_TABLE                       RID_GLOB_START+12
-
-#define STR_PRESOBJ_MPTITLE                     RID_GLOB_START+32
-#define STR_PRESOBJ_MPOUTLINE                   RID_GLOB_START+33
-#define STR_PRESOBJ_MPOUTLLAYER2                RID_GLOB_START+34
-#define STR_PRESOBJ_MPOUTLLAYER3                RID_GLOB_START+35
-#define STR_PRESOBJ_MPOUTLLAYER4                RID_GLOB_START+36
-#define STR_PRESOBJ_MPOUTLLAYER5                RID_GLOB_START+37
-#define STR_PRESOBJ_MPOUTLLAYER6                RID_GLOB_START+38
-#define STR_PRESOBJ_MPOUTLLAYER7                RID_GLOB_START+39
-#define STR_PRESOBJ_MPNOTESTITLE                RID_GLOB_START+42
-#define STR_PRESOBJ_MPNOTESTEXT                 RID_GLOB_START+43
-#define STR_PRESOBJ_NOTESTEXT                   RID_GLOB_START+44
-#define STR_LAYOUT_DEFAULT_NAME                 RID_GLOB_START+45
-#define STR_STANDARD_STYLESHEET_NAME            RID_GLOB_START+46
-#define STR_NOTES                               RID_GLOB_START+47
-#define STR_HANDOUT                             RID_GLOB_START+48
-
-#define STR_UNDO_MOVEPAGES                      RID_GLOB_START+52
-//free
-#define STR_POOLSHEET_OBJWITHARROW              RID_GLOB_START+55
-#define STR_POOLSHEET_OBJWITHSHADOW             RID_GLOB_START+56
-#define STR_POOLSHEET_OBJWITHOUTFILL            RID_GLOB_START+57
-#define STR_POOLSHEET_TEXT                      RID_GLOB_START+58
-#define STR_POOLSHEET_TEXTBODY                  RID_GLOB_START+59
-#define STR_POOLSHEET_TEXTBODY_JUSTIFY          RID_GLOB_START+60
-#define STR_POOLSHEET_TEXTBODY_INDENT           RID_GLOB_START+61
-#define STR_POOLSHEET_TITLE                     RID_GLOB_START+62
-#define STR_POOLSHEET_TITLE1                    RID_GLOB_START+63
-#define STR_POOLSHEET_TITLE2                    RID_GLOB_START+64
-#define STR_POOLSHEET_HEADLINE                  RID_GLOB_START+65
-#define STR_POOLSHEET_HEADLINE1                 RID_GLOB_START+66
-#define STR_POOLSHEET_HEADLINE2                 RID_GLOB_START+67
-#define STR_POOLSHEET_MEASURE                   RID_GLOB_START+68
-
-#define STR_POOLSHEET_BANDED_CELL               RID_GLOB_START+70
-#define STR_POOLSHEET_HEADER                    RID_GLOB_START+71
-#define STR_POOLSHEET_TOTAL                     RID_GLOB_START+72
-#define STR_POOLSHEET_FIRST_COLUMN              RID_GLOB_START+73
-#define STR_POOLSHEET_LAST_COLUMN               RID_GLOB_START+74
-
-#define STR_POOLSHEET_OBJNOLINENOFILL           RID_GLOB_START+75
-
-#define STR_PSEUDOSHEET_TITLE                   RID_GLOB_START+80
-#define STR_PSEUDOSHEET_OUTLINE                 RID_GLOB_START+81
-#define STR_PSEUDOSHEET_BACKGROUNDOBJECTS       RID_GLOB_START+82
-#define STR_PSEUDOSHEET_BACKGROUND              RID_GLOB_START+83
-#define STR_PSEUDOSHEET_NOTES                   RID_GLOB_START+84
-#define STR_PSEUDOSHEET_SUBTITLE                RID_GLOB_START+85
-#define STR_LAYER_MEASURELINES                  RID_GLOB_START+92
-#define STR_LAYOUT_DEFAULT_TITLE_NAME           RID_GLOB_START+93
-
-#define STR_POWERPOINT_IMPORT                   RID_GLOB_START+95
-#define STR_LOAD_DOC                            RID_GLOB_START+99
-#define STR_SAVE_DOC                            RID_GLOB_START+100
-#define RID_SD_ERRHDL                           RID_GLOB_START+102
-
-#define STR_PAGE_NAME                           RID_GLOB_START+111
-#define STR_SLIDE_NAME                          RID_GLOB_START+112
-
-#define STR_ENTER_PIN                           RID_GLOB_START+115
-
 #define RID_CUSTOMANIMATION_START               RID_GLOB_START+120
 //      RID_CUSTOMANIMATION_END                 RID_GLOB_START+199
-#define RID_ANNOTATIONS_START                   RID_GLOB_START+200
-//      RID_ANNOTATIONS_END                     RID_GLOB_START+220
-#define STR_UNDO_ANIMATION                      RID_GLOB_START+221
-#define STR_UNDO_SLIDE_PARAMS                   RID_GLOB_START+222
-
-#define STR_DEAUTHORISE_CLIENT                  RID_GLOB_START+229
-#define STR_MASTERSLIDE_NAME                    RID_GLOB_START+230
-#define STR_MASTERPAGE_NAME                     RID_GLOB_START+231
-
-#define STR_SHRINK_FONT_SIZE                    RID_GLOB_START+232
-#define STR_GROW_FONT_SIZE                      RID_GLOB_START+233
 
 #endif
 
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 6df60e38889e..88743def8397 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_GLOB_HXX
 #define INCLUDED_SD_INC_GLOB_HXX
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <sal/types.h>
 
 #define SD_IF_SDAPP                     SFX_INTERFACE_SD_START + SfxInterfaceId(0)
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 2b9835cdbc07..b59e3b64638c 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -327,7 +327,6 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <pglink.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sdabstdlg.hxx>
 #include <sdattr.hxx>
 #include <sddll.hxx>
@@ -490,7 +489,6 @@
 #include <tools/link.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 8f4ecbba6edd..6b48d65e2659 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -348,8 +348,6 @@
 #include <i18nutil/paper.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sdattr.hxx>
 #include <sdmod.hxx>
 #include <sdpage.hxx>
@@ -500,7 +498,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 2fdb9e30d236..32f4b1301de2 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -20,14 +20,10 @@
 #ifndef INCLUDED_SD_INC_SDRESID_HXX
 #define INCLUDED_SD_INC_SDRESID_HXX
 
-#include <tools/resid.hxx>
 #include "sddllapi.h"
 #include "sdmod.hxx"
 
-inline OUString SdResId(sal_uInt16 nId)
-{
-    return ResId(nId, *SD_MOD()->GetResMgr());
-}
+SD_DLLPUBLIC OUString SdResId(const char* pId);
 
 #endif /* _SD_SDRESID_HXX */
 
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
new file mode 100644
index 000000000000..e4feaa27a0ae
--- /dev/null
+++ b/sd/inc/strings.hrc
@@ -0,0 +1,473 @@
+/* -*- 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_SD_INC_STRINGS_HRC
+#define INCLUDED_SD_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_NULL                                        NC_("STR_NULL", "None")
+#define STR_INSERTPAGE                                  NC_("STR_INSERTPAGE", "Insert Slide")
+#define STR_INSERTLAYER                                 NC_("STR_INSERTLAYER", "Insert Layer")
+#define STR_MODIFYLAYER                                 NC_("STR_MODIFYLAYER", "Modify Layer")
+#define STR_UNDO_SLIDE_PARAMS                           NC_("STR_UNDO_SLIDE_PARAMS", "Slide parameter")
+#define STR_UNDO_CUT                                    NC_("STR_UNDO_CUT", "Cut")
+#define STR_UNDO_REPLACE                                NC_("STR_UNDO_REPLACE", "Replace")
+#define STR_UNDO_DRAGDROP                               NC_("STR_UNDO_DRAGDROP", "Drag and Drop")
+#define STR_INSERTGRAPHIC                               NC_("STR_INSERTGRAPHIC", "Insert Image")
+#define STR_UNDO_BEZCLOSE                               NC_("STR_UNDO_BEZCLOSE", "Close Polygon")
+#define STR_SLIDE_SORTER_MODE                           NC_("STR_SLIDE_SORTER_MODE", "Slide Sorter")
+#define STR_NORMAL_MODE                                 NC_("STR_NORMAL_MODE", "Normal")
+#define STR_SLIDE_MASTER_MODE                           NC_("STR_SLIDE_MASTER_MODE", "Slide Master")
+#define STR_OUTLINE_MODE                                NC_("STR_OUTLINE_MODE", "Outline")
+#define STR_NOTES_MODE                                  NC_("STR_NOTES_MODE", "Notes")
+#define STR_NOTES_MASTER_MODE                           NC_("STR_NOTES_MASTER_MODE", "Notes Master")
+#define STR_HANDOUT_MASTER_MODE                         NC_("STR_HANDOUT_MASTER_MODE", "Handout")
+#define STR_AUTOLAYOUT_NONE                             NC_("STR_AUTOLAYOUT_NONE", "Blank Slide")
+#define STR_AUTOLAYOUT_ONLY_TITLE                       NC_("STR_AUTOLAYOUT_ONLY_TITLE", "Title Only")
+#define STR_AUTOLAYOUT_ONLY_TEXT                        NC_("STR_AUTOLAYOUT_ONLY_TEXT", "Centered Text")
+#define STR_AUTOLAYOUT_TITLE                            NC_("STR_AUTOLAYOUT_TITLE", "Title Slide")
+#define STR_AUTOLAYOUT_CONTENT                          NC_("STR_AUTOLAYOUT_CONTENT", "Title, Content")
+#define STR_AUTOLAYOUT_2CONTENT                         NC_("STR_AUTOLAYOUT_2CONTENT", "Title and 2 Content")
+#define STR_AUTOLAYOUT_CONTENT_2CONTENT                 NC_("STR_AUTOLAYOUT_CONTENT_2CONTENT", "Title, Content and 2 Content")
+#define STR_AUTOLAYOUT_2CONTENT_CONTENT                 NC_("STR_AUTOLAYOUT_2CONTENT_CONTENT", "Title, 2 Content and Content")
+#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT            NC_("STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT", "Title, 2 Content over Content")
+#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT             NC_("STR_AUTOLAYOUT_CONTENT_OVER_CONTENT", "Title, Content over Content")
+#define STR_AUTOLAYOUT_4CONTENT                         NC_("STR_AUTOLAYOUT_4CONTENT", "Title, 4 Content")
+#define STR_AUTOLAYOUT_6CONTENT                         NC_("STR_AUTOLAYOUT_6CONTENT", "Title, 6 Content")
+#define STR_AL_TITLE_VERT_OUTLINE                       NC_("STR_AL_TITLE_VERT_OUTLINE", "Title, Vertical Text")
+#define STR_AL_TITLE_VERT_OUTLINE_CLIPART               NC_("STR_AL_TITLE_VERT_OUTLINE_CLIPART", "Title, Vertical Text, Clipart")
+#define STR_AL_VERT_TITLE_TEXT_CHART                    NC_("STR_AL_VERT_TITLE_TEXT_CHART", "Vertical Title, Text, Chart")
+#define STR_AL_VERT_TITLE_VERT_OUTLINE                  NC_("STR_AL_VERT_TITLE_VERT_OUTLINE", "Vertical Title, Vertical Text")
+#define STR_AUTOLAYOUT_HANDOUT1                         NC_("STR_AUTOLAYOUT_HANDOUT1", "One Slide")
+#define STR_AUTOLAYOUT_HANDOUT2                         NC_("STR_AUTOLAYOUT_HANDOUT2", "Two Slides")
+#define STR_AUTOLAYOUT_HANDOUT3                         NC_("STR_AUTOLAYOUT_HANDOUT3", "Three Slides")
+#define STR_AUTOLAYOUT_HANDOUT4                         NC_("STR_AUTOLAYOUT_HANDOUT4", "Four Slides")
+#define STR_AUTOLAYOUT_HANDOUT6                         NC_("STR_AUTOLAYOUT_HANDOUT6", "Six Slides")
+#define STR_AUTOLAYOUT_HANDOUT9                         NC_("STR_AUTOLAYOUT_HANDOUT9", "Nine Slides")
+#define STR_DISPLAYMODE_EDITMODES                       NC_("STR_DISPLAYMODE_EDITMODES", "Edit Modes")
+#define STR_DISPLAYMODE_MASTERMODES                     NC_("STR_DISPLAYMODE_MASTERMODES", "Master Modes")
+#define STR_AUTOLAYOUT_NOTES                            NC_("STR_AUTOLAYOUT_NOTES", "Notes")
+#define STR_TRANSFORM                                   NC_("STR_TRANSFORM", "Transform")
+#define STR_LINEEND                                     NC_("STR_LINEEND", "Line Ends")
+#define STR_DESC_LINEEND                                NC_("STR_DESC_LINEEND", "Please enter a name for the new arrowhead:")
+#define STR_WARN_NAME_DUPLICATE                         NC_("STR_WARN_NAME_DUPLICATE", "The name chosen already exists. \nPlease enter another name.")
+#define STR_UNDO_ANIMATION                              NC_("STR_UNDO_ANIMATION", "Animation parameters")
+#define STR_EXPORT_HTML_NAME                            NC_("STR_EXPORT_HTML_NAME", "Web Page")
+#define STR_UNDO_COPYOBJECTS                            NC_("STR_UNDO_COPYOBJECTS", "Duplicate")
+#define STR_TITLE_NAMEGROUP                             NC_("STR_TITLE_NAMEGROUP", "Name Object")
+#define STR_DESC_NAMEGROUP                              NC_("STR_DESC_NAMEGROUP", "Name")
+#define STR_WARN_PAGE_EXISTS                            NC_("STR_WARN_PAGE_EXISTS", "The slide name already exists or is invalid. Please enter another name.")
+#define STR_SNAPDLG_SETLINE                             NC_("STR_SNAPDLG_SETLINE", "Edit Snap Line")
+#define STR_SNAPDLG_SETPOINT                            NC_("STR_SNAPDLG_SETPOINT", "Edit Snap Point")
+#define STR_POPUP_EDIT_SNAPLINE                         NC_("STR_POPUP_EDIT_SNAPLINE", "Edit Snap Line...")
+#define STR_POPUP_EDIT_SNAPPOINT                        NC_("STR_POPUP_EDIT_SNAPPOINT", "Edit Snap Point...")
+#define STR_POPUP_DELETE_SNAPLINE                       NC_("STR_POPUP_DELETE_SNAPLINE", "Delete Snap Line")
+#define STR_POPUP_DELETE_SNAPPOINT                      NC_("STR_POPUP_DELETE_SNAPPOINT", "Delete Snap Point")
+#define STR_IMPRESS                                     NC_("STR_IMPRESS", "StarImpress 4.0")
+#define STR_LAYER                                       NC_("STR_LAYER", "Layer")
+#define STR_UNDO_DELETEPAGES                            NC_("STR_UNDO_DELETEPAGES", "Delete slides")
+#define STR_UNDO_INSERTPAGES                            NC_("STR_UNDO_INSERTPAGES", "Insert slides")
+#define STR_ASK_DELETE_LAYER                            NC_("STR_ASK_DELETE_LAYER", "Are you sure you want to delete the level \"$\"?\nNote: All objects on this level will be deleted!")
+#define STR_ASK_DELETE_ALL_PICTURES                     NC_("STR_ASK_DELETE_ALL_PICTURES", "Do you really want to delete all images?")
+#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT                NC_("STR_UNDO_CHANGE_TITLE_AND_LAYOUT", "Modify title and outline")
+#define STR_WAV_FILE                                    NC_("STR_WAV_FILE", "Audio")
+#define STR_MIDI_FILE                                   NC_("STR_MIDI_FILE", "MIDI")
+#define STR_AU_FILE                                     NC_("STR_AU_FILE", "Sun/NeXT Audio")
+#define STR_VOC_FILE                                    NC_("STR_VOC_FILE", "Creative Labs Audio")
+#define STR_AIFF_FILE                                   NC_("STR_AIFF_FILE", "Apple/SGI Audio")
+#define STR_SVX_FILE                                    NC_("STR_SVX_FILE", "Amiga SVX Audio")
+#define STR_SD_PAGE                                     NC_("STR_SD_PAGE", "Slide")
+#define STR_SD_PAGE_COUNT                               NC_("STR_SD_PAGE_COUNT", "Slide %1 of %2")
+#define STR_SD_PAGE_COUNT_CUSTOM                        NC_("STR_SD_PAGE_COUNT_CUSTOM", "Slide %1 of %2 (%3)")
+#define STR_ALL_FILES                                   NC_("STR_ALL_FILES", "All files")
+#define STR_UNDO_INSERT_TEXTFRAME                       NC_("STR_UNDO_INSERT_TEXTFRAME", "Insert text frame")
+#define STR_ACTION_NOTPOSSIBLE                          NC_("STR_ACTION_NOTPOSSIBLE", "This function cannot be run \nwith the selected objects.")
+#define STR_DLG_INSERT_PAGES_FROM_FILE                  NC_("STR_DLG_INSERT_PAGES_FROM_FILE", "Insert File")
+#define STR_READ_DATA_ERROR                             NC_("STR_READ_DATA_ERROR", "The file could not be loaded!")
+#define STR_SCALE_OBJECTS                               NC_("STR_SCALE_OBJECTS", "The page size of the target document is different than the source document.\n\nDo you want to scale the copied objects to fit the new page size?")
+#define STR_CREATE_PAGES                                NC_("STR_CREATE_PAGES", "Create Slides")
+#define STR_UNDO_CHANGE_PAGEFORMAT                      NC_("STR_UNDO_CHANGE_PAGEFORMAT", "Modify page format")
+#define STR_UNDO_CHANGE_PAGEBORDER                      NC_("STR_UNDO_CHANGE_PAGEBORDER", "Modify page margins")
+#define STR_EDIT_OBJ                                    NC_("STR_EDIT_OBJ", "~Edit")
+#define STR_DELETE_PAGES                                NC_("STR_DELETE_PAGES", "Delete Slides")
+#define STR_WARN_PRINTFORMAT_FAILURE                    NC_("STR_WARN_PRINTFORMAT_FAILURE", "The document format could not be set on the specified printer.")
+#define STR_IMPORT_GRFILTER_OPENERROR                   NC_("STR_IMPORT_GRFILTER_OPENERROR", "Image file cannot be opened")
+#define STR_IMPORT_GRFILTER_IOERROR                     NC_("STR_IMPORT_GRFILTER_IOERROR", "Image file cannot be read")
+#define STR_IMPORT_GRFILTER_FORMATERROR                 NC_("STR_IMPORT_GRFILTER_FORMATERROR", "Unknown image format")
+#define STR_IMPORT_GRFILTER_VERSIONERROR                NC_("STR_IMPORT_GRFILTER_VERSIONERROR", "This image file version is not supported")
+#define STR_IMPORT_GRFILTER_FILTERERROR                 NC_("STR_IMPORT_GRFILTER_FILTERERROR", "Image filter not found")
+#define STR_IMPORT_GRFILTER_TOOBIG                      NC_("STR_IMPORT_GRFILTER_TOOBIG", "Not enough memory to import image")
+#define STR_OBJECTS                                     NC_("STR_OBJECTS", "Objects")
+#define STR_END_SPELLING                                NC_("STR_END_SPELLING", "Spellcheck of entire document has been completed.")
+#define STR_END_SPELLING_OBJ                            NC_("STR_END_SPELLING_OBJ", "The spellcheck for the selected objects has been completed.")
+#define STR_ASK_FOR_CONVERT_TO_BEZIER                   NC_("STR_ASK_FOR_CONVERT_TO_BEZIER", "Convert selected object to curve?")
+#define STR_UNDO_CHANGE_PRES_OBJECT                     NC_("STR_UNDO_CHANGE_PRES_OBJECT", "Modify presentation object '$'")
+#define STR_UNDO_MODIFY_PAGE                            NC_("STR_UNDO_MODIFY_PAGE", "Slide layout")
+#define STR_UNDO_INSERT_FILE                            NC_("STR_UNDO_INSERT_FILE", "Insert file")
+#define STR_UNDO_INSERT_SPECCHAR                        NC_("STR_UNDO_INSERT_SPECCHAR", "Insert special character")
+#define STR_UNDO_SET_PRESLAYOUT                         NC_("STR_UNDO_SET_PRESLAYOUT", "Apply presentation layout")
+#define STR_PLAY                                        NC_("STR_PLAY", "~Play")
+#define STR_STOP                                        NC_("STR_STOP", "Sto~p")
+#define STR_UNDO_ORIGINALSIZE                           NC_("STR_UNDO_ORIGINALSIZE", "Original Size")
+#define STR_WARN_SCALE_FAIL                             NC_("STR_WARN_SCALE_FAIL", "The specified scale is invalid.\nDo you want to enter a new one?")
+#define STR_CLICK_ACTION_NONE                           NC_("STR_CLICK_ACTION_NONE", "No action")
+#define STR_CLICK_ACTION_PREVPAGE                       NC_("STR_CLICK_ACTION_PREVPAGE", "Go to previous slide")
+#define STR_CLICK_ACTION_NEXTPAGE                       NC_("STR_CLICK_ACTION_NEXTPAGE", "Go to next slide")
+#define STR_CLICK_ACTION_FIRSTPAGE                      NC_("STR_CLICK_ACTION_FIRSTPAGE", "Go to first slide")
+#define STR_CLICK_ACTION_LASTPAGE                       NC_("STR_CLICK_ACTION_LASTPAGE", "Go to last slide")
+#define STR_CLICK_ACTION_BOOKMARK                       NC_("STR_CLICK_ACTION_BOOKMARK", "Go to page or object")
+#define STR_CLICK_ACTION_DOCUMENT                       NC_("STR_CLICK_ACTION_DOCUMENT", "Go to document")
+#define STR_CLICK_ACTION_SOUND                          NC_("STR_CLICK_ACTION_SOUND", "Play audio")
+#define STR_CLICK_ACTION_VERB                           NC_("STR_CLICK_ACTION_VERB", "Start object action")
+#define STR_CLICK_ACTION_PROGRAM                        NC_("STR_CLICK_ACTION_PROGRAM", "Run program")
+#define STR_CLICK_ACTION_MACRO                          NC_("STR_CLICK_ACTION_MACRO", "Run macro")
+#define STR_CLICK_ACTION_STOPPRESENTATION               NC_("STR_CLICK_ACTION_STOPPRESENTATION", "Exit presentation")
+#define STR_EFFECTDLG_JUMP                              NC_("STR_EFFECTDLG_JUMP", "Target")
+#define STR_EFFECTDLG_ACTION                            NC_("STR_EFFECTDLG_ACTION", "Act~ion")
+#define STR_EFFECTDLG_SOUND                             NC_("STR_EFFECTDLG_SOUND", "Audio")
+#define STR_EFFECTDLG_PAGE_OBJECT                       NC_("STR_EFFECTDLG_PAGE_OBJECT", "Slide / Object")
+#define STR_EFFECTDLG_DOCUMENT                          NC_("STR_EFFECTDLG_DOCUMENT", "Document")
+#define STR_EFFECTDLG_PROGRAM                           NC_("STR_EFFECTDLG_PROGRAM", "Program")
+#define STR_EFFECTDLG_MACRO                             NC_("STR_EFFECTDLG_MACRO", "Macro")
+// Strings for animation effects
+#define STR_INSERT_TEXT                                 NC_("STR_INSERT_TEXT", "Insert Text")
+#define STR_SLIDE_SINGULAR                              NC_("STR_SLIDE_SINGULAR", " Slide")
+#define STR_SLIDE_PLURAL                                NC_("STR_SLIDE_PLURAL", " Slides")
+#define STR_LOAD_PRESENTATION_LAYOUT                    NC_("STR_LOAD_PRESENTATION_LAYOUT", "Load Slide Design")
+#define STR_DRAGTYPE_URL                                NC_("STR_DRAGTYPE_URL", "Insert as Hyperlink")
+#define STR_DRAGTYPE_EMBEDDED                           NC_("STR_DRAGTYPE_EMBEDDED", "Insert as Copy")
+#define STR_DRAGTYPE_LINK                               NC_("STR_DRAGTYPE_LINK", "Insert as Link")
+#define STR_GLUE_ESCDIR_SMART                           NC_("STR_GLUE_ESCDIR_SMART", "Smart")
+#define STR_GLUE_ESCDIR_LEFT                            NC_("STR_GLUE_ESCDIR_LEFT", "Left")
+#define STR_GLUE_ESCDIR_RIGHT                           NC_("STR_GLUE_ESCDIR_RIGHT", "Right")
+#define STR_GLUE_ESCDIR_TOP                             NC_("STR_GLUE_ESCDIR_TOP", "Top")
+#define STR_GLUE_ESCDIR_BOTTOM                          NC_("STR_GLUE_ESCDIR_BOTTOM", "Bottom")
+#define STR_GLUE_ESCDIR_LO                              NC_("STR_GLUE_ESCDIR_LO", "Top Left?")
+#define STR_GLUE_ESCDIR_LU                              NC_("STR_GLUE_ESCDIR_LU", "Bottom Left?")
+#define STR_GLUE_ESCDIR_RO                              NC_("STR_GLUE_ESCDIR_RO", "Top Right?")
+#define STR_GLUE_ESCDIR_RU                              NC_("STR_GLUE_ESCDIR_RU", "Bottom Right?")
+#define STR_GLUE_ESCDIR_HORZ                            NC_("STR_GLUE_ESCDIR_HORZ", "Horizontal")
+#define STR_GLUE_ESCDIR_VERT                            NC_("STR_GLUE_ESCDIR_VERT", "Vertical")
+#define STR_GLUE_ESCDIR_ALL                             NC_("STR_GLUE_ESCDIR_ALL", "All?")
+#define STR_CANT_PERFORM_IN_LIVEMODE                    NC_("STR_CANT_PERFORM_IN_LIVEMODE", "This action can't be run in the live mode.")
+#define STR_PUBLISH_BACK                                NC_("STR_PUBLISH_BACK", "Back")
+#define STR_PUBLISH_NEXT                                NC_("STR_PUBLISH_NEXT", "Continue")
+#define STR_PUBLISH_OUTLINE                             NC_("STR_PUBLISH_OUTLINE", "Overview")
+#define STR_EYEDROPPER                                  NC_("STR_EYEDROPPER", "Color Replacer")
+#define STR_UNDO_MORPHING                               NC_("STR_UNDO_MORPHING", "Cross-fading")
+#define STR_UNDO_COLORRESOLUTION                        NC_("STR_UNDO_COLORRESOLUTION", "Color resolution")
+#define STR_UNDO_EXPAND_PAGE                            NC_("STR_UNDO_EXPAND_PAGE", "Expand Slide")
+#define STR_UNDO_SUMMARY_PAGE                           NC_("STR_UNDO_SUMMARY_PAGE", "Table of Contents Slide")
+#define STR_TWAIN_NO_SOURCE_UNX                         NC_("STR_TWAIN_NO_SOURCE_UNX", "No SANE source is available at the moment.")
+#define STR_TWAIN_NO_SOURCE                             NC_("STR_TWAIN_NO_SOURCE", "At present, no TWAIN source is available.")
+#define STR_FIX                                         NC_("STR_FIX", "Fixed")
+#define STR_VAR                                         NC_("STR_VAR", "Variable")
+#define STR_STANDARD_NORMAL                             NC_("STR_STANDARD_NORMAL", "Standard")
+#define STR_STANDARD_SMALL                              NC_("STR_STANDARD_SMALL", "Standard (short)")
+#define STR_STANDARD_BIG                                NC_("STR_STANDARD_BIG", "Standard (long)")
+#define STR_FILEFORMAT_NAME_EXT                         NC_("STR_FILEFORMAT_NAME_EXT", "File name")
+#define STR_FILEFORMAT_FULLPATH                         NC_("STR_FILEFORMAT_FULLPATH", "Path/File name")
+#define STR_FILEFORMAT_PATH                             NC_("STR_FILEFORMAT_PATH", "Path")
+#define STR_FILEFORMAT_NAME                             NC_("STR_FILEFORMAT_NAME", "File name without extension")
+#define STR_NEW_CUSTOMSHOW                              NC_("STR_NEW_CUSTOMSHOW", "New Custom Slide Show")
+#define STR_COPY_CUSTOMSHOW                             NC_("STR_COPY_CUSTOMSHOW", "Copy ")
+#define STR_IMPRESS_DOCUMENT                            NC_("STR_IMPRESS_DOCUMENT", "Presentation")
+#define STR_IMPRESS_DOCUMENT_FULLTYPE_60                NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION Presentation")
+#define STR_GRAPHIC_DOCUMENT                            NC_("STR_GRAPHIC_DOCUMENT", "Drawing")
+#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60                NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION Drawing")
+#define STR_BREAK_METAFILE                              NC_("STR_BREAK_METAFILE", "Ungroup Metafile(s)...")
+#define STR_BREAK_FAIL                                  NC_("STR_BREAK_FAIL", "It was not possible to ungroup all drawing objects.")
+// HtmlExport
+#define STR_PUBDLG_SAMENAME                             NC_("STR_PUBDLG_SAMENAME", "A design already exists with this name.\nDo you want to replace it?")
+#define STR_HTMLATTR_TEXT                               NC_("STR_HTMLATTR_TEXT", "Text")
+#define STR_HTMLATTR_LINK                               NC_("STR_HTMLATTR_LINK", "Hyperlink")
+#define STR_HTMLATTR_VLINK                              NC_("STR_HTMLATTR_VLINK", "Visited link")
+#define STR_HTMLATTR_ALINK                              NC_("STR_HTMLATTR_ALINK", "Active link")
+#define STR_HTMLEXP_NOTES                               NC_("STR_HTMLEXP_NOTES", "Notes")
+#define STR_HTMLEXP_CONTENTS                            NC_("STR_HTMLEXP_CONTENTS", "Table of contents")
+#define STR_HTMLEXP_CLICKSTART                          NC_("STR_HTMLEXP_CLICKSTART", "Click here to start")
+#define STR_HTMLEXP_AUTHOR                              NC_("STR_HTMLEXP_AUTHOR", "Author")
+#define STR_HTMLEXP_EMAIL                               NC_("STR_HTMLEXP_EMAIL", "E-mail")
+#define STR_HTMLEXP_HOMEPAGE                            NC_("STR_HTMLEXP_HOMEPAGE", "Homepage")
+#define STR_HTMLEXP_INFO                                NC_("STR_HTMLEXP_INFO", "Further information")
+#define STR_HTMLEXP_DOWNLOAD                            NC_("STR_HTMLEXP_DOWNLOAD", "Download presentation")
+#define STR_HTMLEXP_NOFRAMES                            NC_("STR_HTMLEXP_NOFRAMES", "Unfortunately your browser does not support floating frames.")
+#define STR_HTMLEXP_FIRSTPAGE                           NC_("STR_HTMLEXP_FIRSTPAGE", "First page")
+#define STR_HTMLEXP_LASTPAGE                            NC_("STR_HTMLEXP_LASTPAGE", "Last page")
+#define STR_HTMLEXP_SETTEXT                             NC_("STR_HTMLEXP_SETTEXT", "Text")
+#define STR_HTMLEXP_SETGRAPHIC                          NC_("STR_HTMLEXP_SETGRAPHIC", "Image")
+#define STR_HTMLEXP_OUTLINE                             NC_("STR_HTMLEXP_OUTLINE", "With contents")
+#define STR_HTMLEXP_NOOUTLINE                           NC_("STR_HTMLEXP_NOOUTLINE", "Without contents")
+#define STR_WEBVIEW_SAVE                                NC_("STR_WEBVIEW_SAVE", "To given page")
+#define STR_UNDO_VECTORIZE                              NC_("STR_UNDO_VECTORIZE", "Convert bitmap to polygon" )
+#define STR_PRES_SOFTEND                                NC_("STR_PRES_SOFTEND", "Click to exit presentation..." )
+#define STR_PRES_PAUSE                                  NC_("STR_PRES_PAUSE", "Pause..." )
+#define STR_UNDO_APPLY_3D_FAVOURITE                     NC_("STR_UNDO_APPLY_3D_FAVOURITE", "Apply 3D favorite")
+#define STR_UNDO_GRAFFILTER                             NC_("STR_UNDO_GRAFFILTER", "Image filter" )
+#define STR_WARNING_NOSOUNDFILE                         NC_("STR_WARNING_NOSOUNDFILE", "The file %\nis not a valid audio file !" )
+#define STR_UNDO_CONVERT_TO_METAFILE                    NC_("STR_UNDO_CONVERT_TO_METAFILE", "Convert to metafile" )
+#define STR_UNDO_CONVERT_TO_BITMAP                      NC_("STR_UNDO_CONVERT_TO_BITMAP", "Convert to bitmap")
+#define STR_HTMLEXP_ERROR_CREATE_FILE                   NC_("STR_HTMLEXP_ERROR_CREATE_FILE", "Cannot create the file $(URL1).")
+#define STR_HTMLEXP_ERROR_OPEN_FILE                     NC_("STR_HTMLEXP_ERROR_OPEN_FILE", "Could not open the file $(URL1).")
+#define STR_HTMLEXP_ERROR_COPY_FILE                     NC_("STR_HTMLEXP_ERROR_COPY_FILE", "The file $(URL1) could not be copied to $(URL2)")
+#define STR_PAGE_BACKGROUND_TITLE                       NC_("STR_PAGE_BACKGROUND_TITLE", "Page Settings" )
+#define STR_PAGE_BACKGROUND_TXT                         NC_("STR_PAGE_BACKGROUND_TXT", "Background settings for all pages?" )
+#define STR_STATUSBAR_MASTERPAGE                        NC_("STR_STATUSBAR_MASTERPAGE", "Slide Master name. Right-click for list and double-click for dialog.")
+#define STR_TITLE_RENAMESLIDE                           NC_("STR_TITLE_RENAMESLIDE", "Rename Slide")
+#define STR_DESC_RENAMESLIDE                            NC_("STR_DESC_RENAMESLIDE", "Name")
+#define STR_PLACEHOLDER_DESCRIPTION_TITLE               NC_("STR_PLACEHOLDER_DESCRIPTION_TITLE", "Title Area for AutoLayouts" )
+#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE             NC_("STR_PLACEHOLDER_DESCRIPTION_OUTLINE", "Object Area for AutoLayouts" )
+#define STR_PLACEHOLDER_DESCRIPTION_FOOTER              NC_("STR_PLACEHOLDER_DESCRIPTION_FOOTER", "Footer Area" )
+#define STR_PLACEHOLDER_DESCRIPTION_HEADER              NC_("STR_PLACEHOLDER_DESCRIPTION_HEADER", "Header Area" )
+#define STR_PLACEHOLDER_DESCRIPTION_DATETIME            NC_("STR_PLACEHOLDER_DESCRIPTION_DATETIME", "Date Area" )
+#define STR_PLACEHOLDER_DESCRIPTION_SLIDE               NC_("STR_PLACEHOLDER_DESCRIPTION_SLIDE", "Slide Number Area" )
+#define STR_PLACEHOLDER_DESCRIPTION_NUMBER              NC_("STR_PLACEHOLDER_DESCRIPTION_NUMBER", "Page Number Area" )
+#define STR_FIELD_PLACEHOLDER_HEADER                    NC_("STR_FIELD_PLACEHOLDER_HEADER", "<header>" )
+#define STR_FIELD_PLACEHOLDER_FOOTER                    NC_("STR_FIELD_PLACEHOLDER_FOOTER", "<footer>" )
+#define STR_FIELD_PLACEHOLDER_DATETIME                  NC_("STR_FIELD_PLACEHOLDER_DATETIME", "<date/time>" )
+#define STR_FIELD_PLACEHOLDER_NUMBER                    NC_("STR_FIELD_PLACEHOLDER_NUMBER", "<number>" )
+#define STR_FIELD_PLACEHOLDER_COUNT                     NC_("STR_FIELD_PLACEHOLDER_COUNT", "<count>" )
+#define STR_FIELD_PLACEHOLDER_SLIDENAME                 NC_("STR_FIELD_PLACEHOLDER_SLIDENAME", "<slide-name>" )
+#define STR_FIELD_PLACEHOLDER_PAGENAME                  NC_("STR_FIELD_PLACEHOLDER_PAGENAME", "<page-name>" )
+#define STR_PLACEHOLDER_DESCRIPTION_NOTES               NC_("STR_PLACEHOLDER_DESCRIPTION_NOTES", "Notes Area")
+#define STR_UNDO_HANGULHANJACONVERSION                  NC_("STR_UNDO_HANGULHANJACONVERSION", "Hangul/Hanja Conversion")
+#define STR_LEFT_PANE_IMPRESS_TITLE                     NC_("STR_LEFT_PANE_IMPRESS_TITLE", "Slides")
+#define STR_LEFT_PANE_DRAW_TITLE                        NC_("STR_LEFT_PANE_DRAW_TITLE", "Pages")
+#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION        NC_("STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION", "Preview not available")
+#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION    NC_("STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION", "Preparing preview")
+#define STR_TASKPANEL_LAYOUT_MENU_TITLE                 NC_("STR_TASKPANEL_LAYOUT_MENU_TITLE", "Layouts")
+#define STR_GRAPHICS_STYLE_FAMILY                       NC_("STR_GRAPHICS_STYLE_FAMILY", "Drawing Styles")
+#define STR_PRESENTATIONS_STYLE_FAMILY                  NC_("STR_PRESENTATIONS_STYLE_FAMILY", "Presentation Styles")
+#define STR_CELL_STYLE_FAMILY                           NC_("STR_CELL_STYLE_FAMILY", "Cell Styles")
+#define STR_NAVIGATOR_SHOW_NAMED_SHAPES                 NC_("STR_NAVIGATOR_SHOW_NAMED_SHAPES", "Named shapes")
+#define STR_NAVIGATOR_SHOW_ALL_SHAPES                   NC_("STR_NAVIGATOR_SHOW_ALL_SHAPES", "All shapes")
+#define STR_NAVIGATOR_SHAPE_BASE_NAME                   NC_("STR_NAVIGATOR_SHAPE_BASE_NAME", "Shape %1")
+#define STR_SET_BACKGROUND_PICTURE                      NC_("STR_SET_BACKGROUND_PICTURE", "Set Background Image for Slide ..." )
+#define RID_ANNOTATIONS_START                           NC_("RID_ANNOTATIONS_START", "Comments")
+#define STR_RESET_LAYOUT                                NC_("STR_RESET_LAYOUT", "Reset Slide Layout")
+#define STR_INSERT_TABLE                                NC_("STR_INSERT_TABLE", "Insert Table")
+#define STR_INSERT_CHART                                NC_("STR_INSERT_CHART", "Insert Chart")
+#define STR_INSERT_PICTURE                              NC_("STR_INSERT_PICTURE", "Insert Image")
+#define STR_INSERT_MOVIE                                NC_("STR_INSERT_MOVIE", "Insert Audio or Video")
+#define STRING_DRAG_AND_DROP_PAGES                      NC_("STRING_DRAG_AND_DROP_PAGES", "Drag and Drop Pages" )
+#define STRING_DRAG_AND_DROP_SLIDES                     NC_("STRING_DRAG_AND_DROP_SLIDES", "Drag and Drop Slides" )
+#define STR_PHOTO_ALBUM_EMPTY_WARNING                   NC_("STR_PHOTO_ALBUM_EMPTY_WARNING", "Please add Images to the Album." )
+#define STR_PHOTO_ALBUM_TEXTBOX                         NC_("STR_PHOTO_ALBUM_TEXTBOX", "Text Slide")
+#define STR_INSERT_3D_MODEL_TITLE                       NC_("STR_INSERT_3D_MODEL_TITLE", "Insert 3D Model")
+#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS       NC_("STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS", "All supported formats")
+#define STR_OBJECTS_TREE                                NC_("STR_OBJECTS_TREE", "Page Tree")
+#define STR_OVERWRITE_WARNING                           NC_("STR_OVERWRITE_WARNING", "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?")
+
+#define STR_LAYER_BCKGRND                               NC_("STR_LAYER_BCKGRND", "Background" )
+#define STR_LAYER_BCKGRNDOBJ                            NC_("STR_LAYER_BCKGRNDOBJ", "Background objects" )
+#define STR_LAYER_LAYOUT                                NC_("STR_LAYER_LAYOUT", "Layout" )
+#define STR_LAYER_CONTROLS                              NC_("STR_LAYER_CONTROLS", "Controls" )
+#define STR_LAYER_MEASURELINES                          NC_("STR_LAYER_MEASURELINES", "Dimension Lines" )
+#define STR_PAGE                                        NC_("STR_PAGE", "Slide" )
+#define STR_PAGE_NAME                                   NC_("STR_PAGE_NAME", "Page" )
+#define STR_SLIDE_NAME                                  NC_("STR_SLIDE_NAME", "Slide" )
+#define STR_MASTERSLIDE_NAME                            NC_("STR_MASTERSLIDE_NAME", "Master Slide")
+#define STR_MASTERPAGE_NAME                             NC_("STR_MASTERPAGE_NAME", "Master Page")
+#define STR_NOTES                                       NC_("STR_NOTES", "(Notes)" )
+#define STR_HANDOUT                                     NC_("STR_HANDOUT", "Handouts" )
+#define STR_PRESOBJ_MPTITLE                             NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" )
+#define STR_PRESOBJ_MPOUTLINE                           NC_("STR_PRESOBJ_MPOUTLINE", "Click to edit the outline text format" )
+#define STR_PRESOBJ_MPOUTLLAYER2                        NC_("STR_PRESOBJ_MPOUTLLAYER2", "Second Outline Level" )
+#define STR_PRESOBJ_MPOUTLLAYER3                        NC_("STR_PRESOBJ_MPOUTLLAYER3", "Third Outline Level" )
+#define STR_PRESOBJ_MPOUTLLAYER4                        NC_("STR_PRESOBJ_MPOUTLLAYER4", "Fourth Outline Level" )
+#define STR_PRESOBJ_MPOUTLLAYER5                        NC_("STR_PRESOBJ_MPOUTLLAYER5", "Fifth Outline Level" )
+#define STR_PRESOBJ_MPOUTLLAYER6                        NC_("STR_PRESOBJ_MPOUTLLAYER6", "Sixth Outline Level" )
+#define STR_PRESOBJ_MPOUTLLAYER7                        NC_("STR_PRESOBJ_MPOUTLLAYER7", "Seventh Outline Level" )
+#define STR_PRESOBJ_MPNOTESTITLE                        NC_("STR_PRESOBJ_MPNOTESTITLE", "Click to move the slide" )
+#define STR_PRESOBJ_MPNOTESTEXT                         NC_("STR_PRESOBJ_MPNOTESTEXT", "Click to edit the notes format" )
+#define STR_PRESOBJ_TITLE                               NC_("STR_PRESOBJ_TITLE", "Click to add Title" )
+#define STR_PRESOBJ_OUTLINE                             NC_("STR_PRESOBJ_OUTLINE", "Click to add Text" )
+#define STR_PRESOBJ_TEXT                                NC_("STR_PRESOBJ_TEXT", "Click to add Text" )
+#define STR_PRESOBJ_NOTESTEXT                           NC_("STR_PRESOBJ_NOTESTEXT", "Click to add Notes" )
+#define STR_PRESOBJ_GRAPHIC                             NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" )
+#define STR_PRESOBJ_OBJECT                              NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" )
+#define STR_PRESOBJ_CHART                               NC_("STR_PRESOBJ_CHART", "Double-click to add a Chart" )
+#define STR_PRESOBJ_ORGCHART                            NC_("STR_PRESOBJ_ORGCHART", "Double-click to add an Organization Chart" )
+#define STR_PRESOBJ_TABLE                               NC_("STR_PRESOBJ_TABLE", "Double-click to add a Spreadsheet" )
+#define STR_LAYOUT_DEFAULT_NAME                         NC_("STR_LAYOUT_DEFAULT_NAME", "Default" )
+#define STR_LAYOUT_DEFAULT_TITLE_NAME                   NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" )
+#define STR_STANDARD_STYLESHEET_NAME                    NC_("STR_STANDARD_STYLESHEET_NAME", "Default" )
+#define STR_UNDO_MOVEPAGES                              NC_("STR_UNDO_MOVEPAGES", "Move slides" )
+#define STR_POOLSHEET_MEASURE                           NC_("STR_POOLSHEET_MEASURE", "Dimension Line" )
+#define STR_POOLSHEET_OBJNOLINENOFILL                   NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" )
+#define STR_POOLSHEET_OBJWITHARROW                      NC_("STR_POOLSHEET_OBJWITHARROW", "Object with arrow" )
+#define STR_POOLSHEET_OBJWITHSHADOW                     NC_("STR_POOLSHEET_OBJWITHSHADOW", "Object with shadow" )
+#define STR_POOLSHEET_OBJWITHOUTFILL                    NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" )
+#define STR_POOLSHEET_TEXT                              NC_("STR_POOLSHEET_TEXT", "Text" )
+#define STR_POOLSHEET_TEXTBODY                          NC_("STR_POOLSHEET_TEXTBODY", "Text body" )
+#define STR_POOLSHEET_TEXTBODY_JUSTIFY                  NC_("STR_POOLSHEET_TEXTBODY_JUSTIFY", "Text body justified" )
+#define STR_POOLSHEET_TEXTBODY_INDENT                   NC_("STR_POOLSHEET_TEXTBODY_INDENT", "First line indent" )
+#define STR_POOLSHEET_TITLE                             NC_("STR_POOLSHEET_TITLE", "Title" )
+#define STR_POOLSHEET_TITLE1                            NC_("STR_POOLSHEET_TITLE1", "Title1" )
+#define STR_POOLSHEET_TITLE2                            NC_("STR_POOLSHEET_TITLE2", "Title2" )
+#define STR_POOLSHEET_HEADLINE                          NC_("STR_POOLSHEET_HEADLINE", "Heading" )
+#define STR_POOLSHEET_HEADLINE1                         NC_("STR_POOLSHEET_HEADLINE1", "Heading1" )
+#define STR_POOLSHEET_HEADLINE2                         NC_("STR_POOLSHEET_HEADLINE2", "Heading2" )
+#define STR_PSEUDOSHEET_TITLE                           NC_("STR_PSEUDOSHEET_TITLE", "Title" )
+#define STR_PSEUDOSHEET_SUBTITLE                        NC_("STR_PSEUDOSHEET_SUBTITLE", "Subtitle")
+#define STR_PSEUDOSHEET_OUTLINE                         NC_("STR_PSEUDOSHEET_OUTLINE", "Outline" )
+#define STR_PSEUDOSHEET_BACKGROUNDOBJECTS               NC_("STR_PSEUDOSHEET_BACKGROUNDOBJECTS", "Background objects" )
+#define STR_PSEUDOSHEET_BACKGROUND                      NC_("STR_PSEUDOSHEET_BACKGROUND", "Background" )
+#define STR_PSEUDOSHEET_NOTES                           NC_("STR_PSEUDOSHEET_NOTES", "Notes" )
+#define STR_POWERPOINT_IMPORT                           NC_("STR_POWERPOINT_IMPORT", "PowerPoint Import")
+#define STR_LOAD_DOC                                    NC_("STR_LOAD_DOC", "Load Document" )
+#define STR_SAVE_DOC                                    NC_("STR_SAVE_DOC", "Save Document" )
+#define STR_POOLSHEET_BANDED_CELL                       NC_("STR_POOLSHEET_BANDED_CELL", "Banding cell" )
+#define STR_POOLSHEET_HEADER                            NC_("STR_POOLSHEET_HEADER", "Header" )
+#define STR_POOLSHEET_TOTAL                             NC_("STR_POOLSHEET_TOTAL", "Total line" )
+#define STR_POOLSHEET_FIRST_COLUMN                      NC_("STR_POOLSHEET_FIRST_COLUMN", "First column" )
+#define STR_POOLSHEET_LAST_COLUMN                       NC_("STR_POOLSHEET_LAST_COLUMN", "Last column" )
+#define STR_ENTER_PIN                                   NC_("STR_ENTER_PIN", "Enter PIN:")
+#define STR_DEAUTHORISE_CLIENT                          NC_("STR_DEAUTHORISE_CLIENT", "Remove client authorisation")
+#define STR_SHRINK_FONT_SIZE                            NC_("STR_SHRINK_FONT_SIZE", "Shrink font size")
+#define STR_GROW_FONT_SIZE                              NC_("STR_GROW_FONT_SIZE", "Grow font size")
+
+/* Names and descriptions of the Draw/Impress accessibility views
+   ==============================================================
+*/
+#define SID_SD_A11Y_D_DRAWVIEW_N                        NC_("SID_SD_A11Y_D_DRAWVIEW_N", "Drawing View")
+#define SID_SD_A11Y_D_DRAWVIEW_D                        NC_("SID_SD_A11Y_D_DRAWVIEW_D", "This is where you create and edit drawings.")
+#define SID_SD_A11Y_I_DRAWVIEW_N                        NC_("SID_SD_A11Y_I_DRAWVIEW_N", "Drawing View")
+#define SID_SD_A11Y_I_DRAWVIEW_D                        NC_("SID_SD_A11Y_I_DRAWVIEW_D", "This is where you create and edit slides.")
+#define SID_SD_A11Y_I_OUTLINEVIEW_N                     NC_("SID_SD_A11Y_I_OUTLINEVIEW_N", "Outline View")
+#define SID_SD_A11Y_I_OUTLINEVIEW_D                     NC_("SID_SD_A11Y_I_OUTLINEVIEW_D", "This is where you enter or edit text in list form.")
+#define SID_SD_A11Y_I_SLIDEVIEW_N                       NC_("SID_SD_A11Y_I_SLIDEVIEW_N", "Slides View")
+#define SID_SD_A11Y_I_SLIDEVIEW_D                       NC_("SID_SD_A11Y_I_SLIDEVIEW_D", "This is where you sort slides.")
+#define SID_SD_A11Y_I_NOTESVIEW_N                       NC_("SID_SD_A11Y_I_NOTESVIEW_N", "Notes View")
+#define SID_SD_A11Y_I_NOTESVIEW_D                       NC_("SID_SD_A11Y_I_NOTESVIEW_D", "This is where you enter and view notes.")
+#define SID_SD_A11Y_I_HANDOUTVIEW_N                     NC_("SID_SD_A11Y_I_HANDOUTVIEW_N", "Handout View")
+#define SID_SD_A11Y_I_HANDOUTVIEW_D                     NC_("SID_SD_A11Y_I_HANDOUTVIEW_D", "This is where you decide on the layout for handouts.")
+#define SID_SD_A11Y_P_TITLE_N                           NC_("SID_SD_A11Y_P_TITLE_N", "PresentationTitle")
+#define SID_SD_A11Y_P_OUTLINER_N                        NC_("SID_SD_A11Y_P_OUTLINER_N", "PresentationOutliner")
+#define SID_SD_A11Y_P_SUBTITLE_N                        NC_("SID_SD_A11Y_P_SUBTITLE_N", "PresentationSubtitle")
+#define SID_SD_A11Y_P_PAGE_N                            NC_("SID_SD_A11Y_P_PAGE_N", "PresentationPage")
+#define SID_SD_A11Y_P_NOTES_N                           NC_("SID_SD_A11Y_P_NOTES_N", "PresentationNotes")
+#define SID_SD_A11Y_P_HANDOUT_N                         NC_("SID_SD_A11Y_P_HANDOUT_N", "Handout")
+#define SID_SD_A11Y_P_UNKNOWN_N                         NC_("SID_SD_A11Y_P_UNKNOWN_N", "UnknownAccessiblePresentationShape")
+#define SID_SD_A11Y_P_TITLE_D                           NC_("SID_SD_A11Y_P_TITLE_D", "PresentationTitleShape")
+#define SID_SD_A11Y_P_OUTLINER_D                        NC_("SID_SD_A11Y_P_OUTLINER_D", "PresentationOutlinerShape")
+#define SID_SD_A11Y_P_SUBTITLE_D                        NC_("SID_SD_A11Y_P_SUBTITLE_D", "PresentationSubtitleShape")
+#define SID_SD_A11Y_P_PAGE_D                            NC_("SID_SD_A11Y_P_PAGE_D", "PresentationPageShape")
+#define SID_SD_A11Y_P_NOTES_D                           NC_("SID_SD_A11Y_P_NOTES_D", "PresentationNotesShape")
+#define SID_SD_A11Y_P_HANDOUT_D                         NC_("SID_SD_A11Y_P_HANDOUT_D", "PresentationHandoutShape")
+#define SID_SD_A11Y_P_UNKNOWN_D                         NC_("SID_SD_A11Y_P_UNKNOWN_D", "Unknown accessible presentation shape")
+#define SID_SD_A11Y_P_FOOTER_N                          NC_("SID_SD_A11Y_P_FOOTER_N", "PresentationFooter")
+#define SID_SD_A11Y_P_FOOTER_D                          NC_("SID_SD_A11Y_P_FOOTER_D", "PresentationFooterShape")
+#define SID_SD_A11Y_P_HEADER_N                          NC_("SID_SD_A11Y_P_HEADER_N", "PresentationHeader")
+#define SID_SD_A11Y_P_HEADER_D                          NC_("SID_SD_A11Y_P_HEADER_D", "PresentationHeaderShape")
+#define SID_SD_A11Y_P_DATE_N                            NC_("SID_SD_A11Y_P_DATE_N", "PresentationDateAndTime")
+#define SID_SD_A11Y_P_DATE_D                            NC_("SID_SD_A11Y_P_DATE_D", "PresentationDateAndTimeShape")
+#define SID_SD_A11Y_P_NUMBER_N                          NC_("SID_SD_A11Y_P_NUMBER_N", "PresentationPageNumber")
+#define SID_SD_A11Y_P_NUMBER_D                          NC_("SID_SD_A11Y_P_NUMBER_D", "PresentationPageNumberShape")
+#define SID_SD_A11Y_D_PRESENTATION                      NC_("SID_SD_A11Y_D_PRESENTATION", "%PRODUCTNAME Presentation")
+#define SID_SD_A11Y_P_TITLE_N_STYLE                     NC_("SID_SD_A11Y_P_TITLE_N_STYLE", "Title")
+#define SID_SD_A11Y_P_OUTLINER_N_STYLE                  NC_("SID_SD_A11Y_P_OUTLINER_N_STYLE", "Outliner")
+#define SID_SD_A11Y_P_SUBTITLE_N_STYLE                  NC_("SID_SD_A11Y_P_SUBTITLE_N_STYLE", "Subtitle")
+#define SID_SD_A11Y_P_PAGE_N_STYLE                      NC_("SID_SD_A11Y_P_PAGE_N_STYLE", "Page")
+#define SID_SD_A11Y_P_NOTES_N_STYLE                     NC_("SID_SD_A11Y_P_NOTES_N_STYLE", "Notes")
+#define SID_SD_A11Y_P_HANDOUT_N_STYLE                   NC_("SID_SD_A11Y_P_HANDOUT_N_STYLE", "Handout")
+#define SID_SD_A11Y_P_UNKNOWN_N_STYLE                   NC_("SID_SD_A11Y_P_UNKNOWN_N_STYLE", "Unknown Accessible Presentation Shape")
+#define SID_SD_A11Y_P_FOOTER_N_STYLE                    NC_("SID_SD_A11Y_P_FOOTER_N_STYLE", "Footer")
+#define SID_SD_A11Y_P_HEADER_N_STYLE                    NC_("SID_SD_A11Y_P_HEADER_N_STYLE", "Header")
+#define SID_SD_A11Y_P_DATE_N_STYLE                      NC_("SID_SD_A11Y_P_DATE_N_STYLE", "Date")
+#define SID_SD_A11Y_P_NUMBER_N_STYLE                    NC_("SID_SD_A11Y_P_NUMBER_N_STYLE", "Number")
+#define SID_SD_A11Y_D_PRESENTATION_READONLY             NC_("SID_SD_A11Y_D_PRESENTATION_READONLY", "(read-only)")
+
+#define STR_CUSTOMANIMATION_REPEAT_NONE                 NC_("STR_CUSTOMANIMATION_REPEAT_NONE", "none")
+#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK     NC_("STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK", "Until next click")
+#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE   NC_("STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE", "Until end of slide")
+#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY          NC_("STR_CUSTOMANIMATION_DIRECTION_PROPERTY", "Direction:")
+#define STR_CUSTOMANIMATION_ZOOM_PROPERTY               NC_("STR_CUSTOMANIMATION_ZOOM_PROPERTY", "Zoom:")
+#define STR_CUSTOMANIMATION_SPOKES_PROPERTY             NC_("STR_CUSTOMANIMATION_SPOKES_PROPERTY", "Spokes:")
+#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY        NC_("STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY", "First color:")
+#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY       NC_("STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY", "Second color:")
+#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY         NC_("STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY", "Fill color:")
+#define STR_CUSTOMANIMATION_STYLE_PROPERTY              NC_("STR_CUSTOMANIMATION_STYLE_PROPERTY", "Style:")
+#define STR_CUSTOMANIMATION_FONT_PROPERTY               NC_("STR_CUSTOMANIMATION_FONT_PROPERTY", "Font:")
+#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY         NC_("STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY", "Font color:")
+#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY    NC_("STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY", "Style:")
+#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY         NC_("STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY", "Typeface:")
+#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY         NC_("STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY", "Line color:")
+#define STR_CUSTOMANIMATION_SIZE_PROPERTY               NC_("STR_CUSTOMANIMATION_SIZE_PROPERTY", "Font size:")
+#define STR_CUSTOMANIMATION_SCALE_PROPERTY              NC_("STR_CUSTOMANIMATION_SCALE_PROPERTY", "Size:")
+#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY             NC_("STR_CUSTOMANIMATION_AMOUNT_PROPERTY", "Amount:")
+#define STR_CUSTOMANIMATION_COLOR_PROPERTY              NC_("STR_CUSTOMANIMATION_COLOR_PROPERTY", "Color:")
+#define STR_CUSTOMANIMATION_NO_SOUND                    NC_("STR_CUSTOMANIMATION_NO_SOUND", "(No sound)")
+#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND         NC_("STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND", "(Stop previous sound)")
+#define STR_CUSTOMANIMATION_BROWSE_SOUND                NC_("STR_CUSTOMANIMATION_BROWSE_SOUND", "Other sound...")
+#define STR_CUSTOMANIMATION_SAMPLE                      NC_("STR_CUSTOMANIMATION_SAMPLE", "Sample")
+#define STR_CUSTOMANIMATION_TRIGGER                     NC_("STR_CUSTOMANIMATION_TRIGGER", "Trigger")
+#define STR_CUSTOMANIMATION_LIST_HELPTEXT               NC_("STR_CUSTOMANIMATION_LIST_HELPTEXT", "First select the slide element and then click 'Add...' to add an animation effect.")
+#define STR_CUSTOMANIMATION_USERPATH                    NC_("STR_CUSTOMANIMATION_USERPATH", "User paths")
+#define STR_CUSTOMANIMATION_ENTRANCE                    NC_("STR_CUSTOMANIMATION_ENTRANCE", "Entrance: %1")
+#define STR_CUSTOMANIMATION_EMPHASIS                    NC_("STR_CUSTOMANIMATION_EMPHASIS", "Emphasis: %1")
+#define STR_CUSTOMANIMATION_EXIT                        NC_("STR_CUSTOMANIMATION_EXIT", "Exit: %1")
+#define STR_CUSTOMANIMATION_MOTION_PATHS                NC_("STR_CUSTOMANIMATION_MOTION_PATHS", "Motion Paths: %1")
+#define STR_SLIDETRANSITION_NONE                        NC_("STR_SLIDETRANSITION_NONE", "None")
+
+#define STR_ANNOTATION_TODAY                            NC_("STR_ANNOTATION_TODAY", "Today," )
+#define STR_ANNOTATION_YESTERDAY                        NC_("STR_ANNOTATION_YESTERDAY", "Yesterday," )
+#define STR_ANNOTATION_NOAUTHOR                         NC_("STR_ANNOTATION_NOAUTHOR", "(no author)" )
+#define STR_ANNOTATION_WRAP_FORWARD                     NC_("STR_ANNOTATION_WRAP_FORWARD", "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?")
+#define STR_ANNOTATION_WRAP_BACKWARD                    NC_("STR_ANNOTATION_WRAP_BACKWARD", "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?")
+#define STR_ANNOTATION_WRAP_FORWARD_DRAW                NC_("STR_ANNOTATION_WRAP_FORWARD_DRAW", "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?")
+#define STR_ANNOTATION_WRAP_BACKWARD_DRAW               NC_("STR_ANNOTATION_WRAP_BACKWARD_DRAW", "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?")
+#define STR_ANNOTATION_UNDO_INSERT                      NC_("STR_ANNOTATION_UNDO_INSERT", "Insert Comment")
+#define STR_ANNOTATION_UNDO_DELETE                      NC_("STR_ANNOTATION_UNDO_DELETE", "Delete Comment(s)")
+#define STR_ANNOTATION_UNDO_MOVE                        NC_("STR_ANNOTATION_UNDO_MOVE", "Move Comment")
+#define STR_ANNOTATION_UNDO_EDIT                        NC_("STR_ANNOTATION_UNDO_EDIT", "Edit Comment")
+#define STR_ANNOTATION_REPLY                            NC_("STR_ANNOTATION_REPLY", "Reply to %1" )
+
+#define RID_DRAW_MEDIA_TOOLBOX                          NC_("RID_DRAW_MEDIA_TOOLBOX", "Media Playback" )
+#define RID_DRAW_TABLE_TOOLBOX                          NC_("RID_DRAW_TABLE_TOOLBOX", "Table" )
+
+#define STR_IMPRESS_PRINT_UI_GROUP_NAME                 NC_("STR_IMPRESS_PRINT_UI_GROUP_NAME", "%PRODUCTNAME %s")
+#define STR_IMPRESS_PRINT_UI_PRINT_GROUP                NC_("STR_IMPRESS_PRINT_UI_PRINT_GROUP", "Print")
+#define STR_IMPRESS_PRINT_UI_CONTENT                    NC_("STR_IMPRESS_PRINT_UI_CONTENT", "Document")
+#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE              NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE", "Slides per page" )
+#define STR_IMPRESS_PRINT_UI_ORDER                      NC_("STR_IMPRESS_PRINT_UI_ORDER", "Order" )
+#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT            NC_("STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT", "~Contents")
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME              NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_NAME", "~Slide name")
+#define STR_DRAW_PRINT_UI_IS_PRINT_NAME                 NC_("STR_DRAW_PRINT_UI_IS_PRINT_NAME", "P~age name")
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE              NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_DATE", "~Date and time")
+#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN            NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN", "Hidden pages")
+#define STR_IMPRESS_PRINT_UI_QUALITY                    NC_("STR_IMPRESS_PRINT_UI_QUALITY", "Color")
+#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS               NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS", "~Size")
+#define STR_IMPRESS_PRINT_UI_BROCHURE                   NC_("STR_IMPRESS_PRINT_UI_BROCHURE", "Brochure")
+#define STR_IMPRESS_PRINT_UI_PAGE_SIDES                 NC_("STR_IMPRESS_PRINT_UI_PAGE_SIDES", "Page sides")
+#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE           NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE", "Include")
+#define STR_IMPRESS_PRINT_UI_PAPER_TRAY                 NC_("STR_IMPRESS_PRINT_UI_PAPER_TRAY", "~Use only paper tray from printer preferences")
+#define STR_IMPRESS_PRINT_UI_PAGE_RANGE                 NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE", "Print range")
+
+#define STR_SAR_WRAP_FORWARD                            NC_("STR_SAR_WRAP_FORWARD", "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?")
+#define STR_SAR_WRAP_BACKWARD                           NC_("STR_SAR_WRAP_BACKWARD", "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?")
+#define STR_SAR_WRAP_FORWARD_DRAW                       NC_("STR_SAR_WRAP_FORWARD_DRAW", "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?")
+#define STR_SAR_WRAP_BACKWARD_DRAW                      NC_("STR_SAR_WRAP_BACKWARD_DRAW", "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?")
+
+#define STR_SD_NONE                                     NC_("STR_SD_NONE", "- None -")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx
index 3a5a9ef86ce9..47eb130897f0 100644
--- a/sd/inc/strings.hxx
+++ b/sd/inc/strings.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SD_INC_STRINGS_HRC
-#define INCLUDED_SD_INC_STRINGS_HRC
+#ifndef INCLUDED_SD_INC_STRINGS_HXX
+#define INCLUDED_SD_INC_STRINGS_HXX
 
 /* do not translate */
 #define STR_LAYOUT_TITLE                "Titel"
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index bb819c1a2247..a847352d2bb6 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -26,7 +26,7 @@
 
 #include <oox/drawingml/drawingmltypes.hxx>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/svdotext.hxx>
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 9d4a063a6e5c..f310309d0bf2 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -26,7 +26,7 @@
 
 #include <oox/drawingml/drawingmltypes.hxx>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/svdotext.hxx>
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 3d8341c0d76d..055d79bdf03e 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -26,7 +26,7 @@
 
 #include <oox/drawingml/drawingmltypes.hxx>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/svdotext.hxx>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b71b4aec4e8e..125656e218cb 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -24,7 +24,7 @@
 #include <editeng/numitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/postitem.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/sfxsids.hrc>
 #include <svx/svdotext.hxx>
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 0977fa5f1d9b..b418f1ed7a2c 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -83,7 +83,7 @@
 #include "sdpage.hxx"
 #include "pglink.hxx"
 #include "sdattr.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "sdiocmpt.hxx"
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 879c21425742..62d29944df2c 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -53,7 +53,7 @@
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "pglink.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "sdiocmpt.hxx"
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 16a33155df95..ff6a01e2f406 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -42,7 +42,7 @@
 #include <sot/formats.hxx>
 #include <xmloff/autolayout.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "stlpool.hxx"
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3b870da22f9e..7870ff056f3a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -43,7 +43,7 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/numdef.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/bulletitem.hxx>
 #include <svx/xtable.hxx>
@@ -97,7 +97,7 @@
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "helpids.h"
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
deleted file mode 100644
index 459e194381e1..000000000000
--- a/sd/source/core/glob.src
+++ /dev/null
@@ -1,324 +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 .
- */
-/* StarView resource file */
-
-#include "glob.hrc"
-#include "sderror.hxx"
-
-String STR_LAYER_BCKGRND
-{
-    Text [ en-US ] = "Background" ;
-};
-String STR_LAYER_BCKGRNDOBJ
-{
-    Text [ en-US ] = "Background objects" ;
-};
-String STR_LAYER_LAYOUT
-{
-    Text [ en-US ] = "Layout" ;
-};
-String STR_LAYER_CONTROLS
-{
-    Text [ en-US ] = "Controls" ;
-};
-String STR_LAYER_MEASURELINES
-{
-    Text [ en-US ] = "Dimension Lines" ;
-};
-String STR_PAGE
-{
-    Text [ en-US ] = "Slide" ;
-};
-String STR_PAGE_NAME
-{
-    Text [ en-US ] = "Page" ;
-};
-String STR_SLIDE_NAME
-{
-    Text [ en-US ] = "Slide" ;
-};
-String STR_MASTERSLIDE_NAME
-{
-    Text [ en-US ] = "Master Slide";
-};
-String STR_MASTERPAGE_NAME
-{
-    Text [ en-US ] = "Master Page";
-};
-String STR_NOTES
-{
-    Text [ en-US ] = "(Notes)" ;
-};
-String STR_HANDOUT
-{
-    Text [ en-US ] = "Handouts" ;
-};
-String STR_PRESOBJ_MPTITLE
-{
-    Text [ en-US ] = "Click to edit the title text format" ;
-};
-String STR_PRESOBJ_MPOUTLINE
-{
-    Text [ en-US ] = "Click to edit the outline text format" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER2
-{
-    Text [ en-US ] = "Second Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER3
-{
-    Text [ en-US ] = "Third Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER4
-{
-    Text [ en-US ] = "Fourth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER5
-{
-    Text [ en-US ] = "Fifth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER6
-{
-    Text [ en-US ] = "Sixth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER7
-{
-    Text [ en-US ] = "Seventh Outline Level" ;
-};
-String STR_PRESOBJ_MPNOTESTITLE
-{
-    Text [ en-US ] = "Click to move the slide" ;
-};
-String STR_PRESOBJ_MPNOTESTEXT
-{
-    Text [ en-US ] = "Click to edit the notes format" ;
-};
-String STR_PRESOBJ_TITLE
-{
-    Text [ en-US ] = "Click to add Title" ;
-};
-String STR_PRESOBJ_OUTLINE
-{
-    Text [ en-US ] = "Click to add Text" ;
-};
-String STR_PRESOBJ_TEXT
-{
-    Text [ en-US ] = "Click to add Text" ;
-};
-String STR_PRESOBJ_NOTESTEXT
-{
-    Text [ en-US ] = "Click to add Notes" ;
-};
-String STR_PRESOBJ_GRAPHIC
-{
-    Text [ en-US ] = "Double-click to add an Image" ;
-};
-String STR_PRESOBJ_OBJECT
-{
-    Text [ en-US ] = "Double-click to add an Object" ;
-};
-String STR_PRESOBJ_CHART
-{
-    Text [ en-US ] = "Double-click to add a Chart" ;
-};
-String STR_PRESOBJ_ORGCHART
-{
-    Text [ en-US ] = "Double-click to add an Organization Chart" ;
-};
-String STR_PRESOBJ_TABLE
-{
-    Text [ en-US ] = "Double-click to add a Spreadsheet" ;
-};
-String STR_LAYOUT_DEFAULT_NAME
-{
-    Text [ en-US ] = "Default" ;
-};
-String STR_LAYOUT_DEFAULT_TITLE_NAME
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_STANDARD_STYLESHEET_NAME
-{
-    Text [ en-US ] = "Default" ;
-};
-String STR_UNDO_MOVEPAGES
-{
-    Text [ en-US ] = "Move slides" ;
-};
-String STR_POOLSHEET_MEASURE
-{
-    Text [ en-US ] = "Dimension Line" ;
-};
-String STR_POOLSHEET_OBJNOLINENOFILL
-{
-    Text [ en-US ] = "Object with no fill and no line" ;
-};
-String STR_POOLSHEET_OBJWITHARROW
-{
-    Text [ en-US ] = "Object with arrow" ;
-};
-String STR_POOLSHEET_OBJWITHSHADOW
-{
-    Text [ en-US ] = "Object with shadow" ;
-};
-String STR_POOLSHEET_OBJWITHOUTFILL
-{
-    Text [ en-US ] = "Object without fill" ;
-};
-String STR_POOLSHEET_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String STR_POOLSHEET_TEXTBODY
-{
-    Text [ en-US ] = "Text body" ;
-};
-String STR_POOLSHEET_TEXTBODY_JUSTIFY
-{
-    Text [ en-US ] = "Text body justified" ;
-};
-String STR_POOLSHEET_TEXTBODY_INDENT
-{
-    Text [ en-US ] = "First line indent" ;
-};
-String STR_POOLSHEET_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_POOLSHEET_TITLE1
-{
-    Text [ en-US ] = "Title1" ;
-};
-String STR_POOLSHEET_TITLE2
-{
-    Text [ en-US ] = "Title2" ;
-};
-String STR_POOLSHEET_HEADLINE
-{
-    Text [ en-US ] = "Heading" ;
-};
-String STR_POOLSHEET_HEADLINE1
-{
-    Text [ en-US ] = "Heading1" ;
-};
-
-String STR_POOLSHEET_HEADLINE2
-{
-    Text [ en-US ] = "Heading2" ;
-};
-String STR_PSEUDOSHEET_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_PSEUDOSHEET_SUBTITLE
-{
-    Text [ en-US ] = "Subtitle";
-};
-String STR_PSEUDOSHEET_OUTLINE
-{
-    Text [ en-US ] = "Outline" ;
-};
-String STR_PSEUDOSHEET_BACKGROUNDOBJECTS
-{
-    Text [ en-US ] = "Background objects" ;
-};
-String STR_PSEUDOSHEET_BACKGROUND
-{
-    Text [ en-US ] = "Background" ;
-};
-String STR_PSEUDOSHEET_NOTES
-{
-    Text [ en-US ] = "Notes" ;
-};
-
-String STR_POWERPOINT_IMPORT
-{
-    Text [ en-US ] = "PowerPoint Import";
-};
-
-String STR_LOAD_DOC
-{
-    Text [ en-US ] = "Load Document" ;
-};
-String STR_SAVE_DOC
-{
-    Text [ en-US ] = "Save Document" ;
-};
-
-#define ERR_CODE( class, err )  (class | (err - ERROR_SD_BASE))
-#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE))
-
-StringArray RID_SD_ERRHDL
-{
-    ItemList [ en-US ] =
-    {
-        < "File format error found at $(ARG1)(row,col)." ;
-          ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col).";
-          ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col).";
-          ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) ; >;
-    };
-};
-
-String STR_POOLSHEET_BANDED_CELL
-{
-    Text [ en-US ] = "Banding cell" ;
-};
-
-String STR_POOLSHEET_HEADER
-{
-    Text [ en-US ] = "Header" ;
-};
-
-String STR_POOLSHEET_TOTAL
-{
-    Text [ en-US ] = "Total line" ;
-};
-
-String STR_POOLSHEET_FIRST_COLUMN
-{
-    Text [ en-US ] = "First column" ;
-};
-
-String STR_POOLSHEET_LAST_COLUMN
-{
-    Text [ en-US ] = "Last column" ;
-};
-
-String STR_ENTER_PIN
-{
-    Text [ en-US ] = "Enter PIN:";
-};
-
-String STR_DEAUTHORISE_CLIENT
-{
-    Text [ en-US ] = "Remove client authorisation";
-};
-
-String STR_SHRINK_FONT_SIZE
-{
-    Text [ en-US ] = "Shrink font size";
-};
-String STR_GROW_FONT_SIZE
-{
-    Text [ en-US ] = "Grow font size";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 65539844c4ed..15ba3c9fb9a1 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -69,7 +69,7 @@
 #include "pglink.hxx"
 #include "sdresid.hxx"
 #include "stlsheet.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "bitmaps.hlst"
 #include "glob.hxx"
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 6fbc8be11560..0c333b006999 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -35,7 +35,7 @@
 #include "sdresid.hxx"
 #include "sdpage.hxx"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "stlpool.hxx"
 #include "pglink.hxx"
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index fc6fdaa297b2..8d3d3b697b7b 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -58,7 +58,7 @@
 #include "stlpool.hxx"
 #include "sdresid.hxx"
 #include "stlsheet.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "drawdoc.hxx"
 #include "sdmod.hxx"
@@ -950,28 +950,28 @@ void SdStyleSheetPool::UpdateStdNames()
 
             bool bHelpKnown = true;
             OUString aNewName;
-            sal_uInt16 nNameId = 0;
+            const char* pNameId = nullptr;
             switch( nHelpId )
             {
-                case HID_STANDARD_STYLESHEET_NAME:  nNameId = STR_STANDARD_STYLESHEET_NAME; break;
-                case HID_POOLSHEET_OBJWITHARROW:    nNameId = STR_POOLSHEET_OBJWITHARROW;   break;
-                case HID_POOLSHEET_OBJWITHSHADOW:   nNameId = STR_POOLSHEET_OBJWITHSHADOW;  break;
-                case HID_POOLSHEET_OBJWITHOUTFILL:  nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break;
-                case HID_POOLSHEET_OBJNOLINENOFILL: nNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
-                case HID_POOLSHEET_TEXT:            nNameId = STR_POOLSHEET_TEXT;           break;
-                case HID_POOLSHEET_TEXTBODY:        nNameId = STR_POOLSHEET_TEXTBODY;       break;
-                case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;
-                case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break;
-                case HID_POOLSHEET_TITLE:           nNameId = STR_POOLSHEET_TITLE;          break;
-                case HID_POOLSHEET_TITLE1:          nNameId = STR_POOLSHEET_TITLE1;         break;
-                case HID_POOLSHEET_TITLE2:          nNameId = STR_POOLSHEET_TITLE2;         break;
-                case HID_POOLSHEET_HEADLINE:        nNameId = STR_POOLSHEET_HEADLINE;       break;
-                case HID_POOLSHEET_HEADLINE1:       nNameId = STR_POOLSHEET_HEADLINE1;      break;
-                case HID_POOLSHEET_HEADLINE2:       nNameId = STR_POOLSHEET_HEADLINE2;      break;
-                case HID_POOLSHEET_MEASURE:         nNameId = STR_POOLSHEET_MEASURE;        break;
-
-                case HID_PSEUDOSHEET_TITLE:         nNameId = STR_PSEUDOSHEET_TITLE;        break;
-                case HID_PSEUDOSHEET_SUBTITLE:      nNameId = STR_PSEUDOSHEET_SUBTITLE;     break;
+                case HID_STANDARD_STYLESHEET_NAME:  pNameId = STR_STANDARD_STYLESHEET_NAME; break;
+                case HID_POOLSHEET_OBJWITHARROW:    pNameId = STR_POOLSHEET_OBJWITHARROW;   break;
+                case HID_POOLSHEET_OBJWITHSHADOW:   pNameId = STR_POOLSHEET_OBJWITHSHADOW;  break;
+                case HID_POOLSHEET_OBJWITHOUTFILL:  pNameId = STR_POOLSHEET_OBJWITHOUTFILL; break;
+                case HID_POOLSHEET_OBJNOLINENOFILL: pNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
+                case HID_POOLSHEET_TEXT:            pNameId = STR_POOLSHEET_TEXT;           break;
+                case HID_POOLSHEET_TEXTBODY:        pNameId = STR_POOLSHEET_TEXTBODY;       break;
+                case HID_POOLSHEET_TEXTBODY_JUSTIFY:pNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;
+                case HID_POOLSHEET_TEXTBODY_INDENT: pNameId = STR_POOLSHEET_TEXTBODY_INDENT;break;
+                case HID_POOLSHEET_TITLE:           pNameId = STR_POOLSHEET_TITLE;          break;
+                case HID_POOLSHEET_TITLE1:          pNameId = STR_POOLSHEET_TITLE1;         break;
+                case HID_POOLSHEET_TITLE2:          pNameId = STR_POOLSHEET_TITLE2;         break;
+                case HID_POOLSHEET_HEADLINE:        pNameId = STR_POOLSHEET_HEADLINE;       break;
+                case HID_POOLSHEET_HEADLINE1:       pNameId = STR_POOLSHEET_HEADLINE1;      break;
+                case HID_POOLSHEET_HEADLINE2:       pNameId = STR_POOLSHEET_HEADLINE2;      break;
+                case HID_POOLSHEET_MEASURE:         pNameId = STR_POOLSHEET_MEASURE;        break;
+
+                case HID_PSEUDOSHEET_TITLE:         pNameId = STR_PSEUDOSHEET_TITLE;        break;
+                case HID_PSEUDOSHEET_SUBTITLE:      pNameId = STR_PSEUDOSHEET_SUBTITLE;     break;
                 case HID_PSEUDOSHEET_OUTLINE1:
                 case HID_PSEUDOSHEET_OUTLINE2:
                 case HID_PSEUDOSHEET_OUTLINE3:
@@ -980,17 +980,17 @@ void SdStyleSheetPool::UpdateStdNames()
                 case HID_PSEUDOSHEET_OUTLINE6:
                 case HID_PSEUDOSHEET_OUTLINE7:
                 case HID_PSEUDOSHEET_OUTLINE8:
-                case HID_PSEUDOSHEET_OUTLINE9:      nNameId = STR_PSEUDOSHEET_OUTLINE;      break;
-                case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break;
-                case HID_PSEUDOSHEET_BACKGROUND:    nNameId = STR_PSEUDOSHEET_BACKGROUND;   break;
-                case HID_PSEUDOSHEET_NOTES:         nNameId = STR_PSEUDOSHEET_NOTES;        break;
-
-                case HID_SD_CELL_STYLE_DEFAULT:         nNameId = STR_STANDARD_STYLESHEET_NAME; break;
-                case HID_SD_CELL_STYLE_BANDED:          nNameId = STR_POOLSHEET_BANDED_CELL; break;
-                case HID_SD_CELL_STYLE_HEADER:          nNameId = STR_POOLSHEET_HEADER; break;
-                case HID_SD_CELL_STYLE_TOTAL:           nNameId = STR_POOLSHEET_TOTAL; break;
-                case HID_SD_CELL_STYLE_FIRST_COLUMN:    nNameId = STR_POOLSHEET_FIRST_COLUMN; break;
-                case HID_SD_CELL_STYLE_LAST_COLUMN:     nNameId = STR_POOLSHEET_LAST_COLUMN; break;
+                case HID_PSEUDOSHEET_OUTLINE9:      pNameId = STR_PSEUDOSHEET_OUTLINE;      break;
+                case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: pNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break;
+                case HID_PSEUDOSHEET_BACKGROUND:    pNameId = STR_PSEUDOSHEET_BACKGROUND;   break;
+                case HID_PSEUDOSHEET_NOTES:         pNameId = STR_PSEUDOSHEET_NOTES;        break;
+
+                case HID_SD_CELL_STYLE_DEFAULT:         pNameId = STR_STANDARD_STYLESHEET_NAME; break;
+                case HID_SD_CELL_STYLE_BANDED:          pNameId = STR_POOLSHEET_BANDED_CELL; break;
+                case HID_SD_CELL_STYLE_HEADER:          pNameId = STR_POOLSHEET_HEADER; break;
+                case HID_SD_CELL_STYLE_TOTAL:           pNameId = STR_POOLSHEET_TOTAL; break;
+                case HID_SD_CELL_STYLE_FIRST_COLUMN:    pNameId = STR_POOLSHEET_FIRST_COLUMN; break;
+                case HID_SD_CELL_STYLE_LAST_COLUMN:     pNameId = STR_POOLSHEET_LAST_COLUMN; break;
 
                 default:
                     // 0 or wrong (old) HelpId
@@ -998,10 +998,10 @@ void SdStyleSheetPool::UpdateStdNames()
             }
             if( bHelpKnown )
             {
-                if( nNameId )
+                if (pNameId)
                 {
-                    aNewName = SdResId( nNameId );
-                    if( nNameId == STR_PSEUDOSHEET_OUTLINE )
+                    aNewName = SdResId(pNameId);
+                    if (strcmp(pNameId, STR_PSEUDOSHEET_OUTLINE) == 0)
                     {
                         aNewName += " " + OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ) );
                     }
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 8f7430a8cdd2..18a785284620 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -46,7 +46,7 @@
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "stlpool.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 #include "strings.hxx"
 #include "glob.hxx"
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index bc7215554e21..d9c7fc291a77 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -23,7 +23,7 @@
 #include "CustomAnimationCloner.hxx"
 
 #include "undoanim.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "sdresid.hxx"
 #include "CustomAnimationEffect.hxx"
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index e8813362b410..aca85dba64d0 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -124,34 +124,34 @@ SdGRFFilter::~SdGRFFilter()
 
 void SdGRFFilter::HandleGraphicFilterError( ErrCode nFilterError, ErrCode nStreamError )
 {
-    if( ERRCODE_NONE != nStreamError )
+    if (ERRCODE_NONE != nStreamError)
     {
-        ErrorHandler::HandleError( nStreamError );
+        ErrorHandler::HandleError(nStreamError);
         return;
     }
 
-    sal_uInt16 nId;
+    const char* pId;
 
     if( nFilterError == ERRCODE_GRFILTER_OPENERROR )
-        nId = STR_IMPORT_GRFILTER_OPENERROR;
+        pId = STR_IMPORT_GRFILTER_OPENERROR;
     else if( nFilterError == ERRCODE_GRFILTER_IOERROR )
-        nId = STR_IMPORT_GRFILTER_IOERROR;
+        pId = STR_IMPORT_GRFILTER_IOERROR;
     else if( nFilterError == ERRCODE_GRFILTER_FORMATERROR )
-        nId = STR_IMPORT_GRFILTER_FORMATERROR;
+        pId = STR_IMPORT_GRFILTER_FORMATERROR;
     else if( nFilterError == ERRCODE_GRFILTER_VERSIONERROR )
-        nId = STR_IMPORT_GRFILTER_VERSIONERROR;
+        pId = STR_IMPORT_GRFILTER_VERSIONERROR;
     else if( nFilterError == ERRCODE_GRFILTER_TOOBIG )
-        nId = STR_IMPORT_GRFILTER_TOOBIG;
+        pId = STR_IMPORT_GRFILTER_TOOBIG;
     else if( nFilterError == ERRCODE_NONE )
-        nId = 0;
+        pId = nullptr;
     else
-        nId = STR_IMPORT_GRFILTER_FILTERERROR;
+        pId = STR_IMPORT_GRFILTER_FILTERERROR;
 
-    if( STR_IMPORT_GRFILTER_IOERROR == nId )
+    if (pId && strcmp(pId, STR_IMPORT_GRFILTER_IOERROR) == 0)
         ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
     else
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(nId));
+        ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(pId));
         aErrorBox->Execute();
     }
 }
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 0c21bb966f11..334095989164 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -78,7 +78,7 @@
 #include "Outliner.hxx"
 #include "sdpage.hxx"
 #include "sdattr.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "anminfo.hxx"
 #include "imapinfo.hxx"
@@ -3193,18 +3193,18 @@ void EasyFile::close()
 
 // This class helps reporting errors during file i/o
 HtmlErrorContext::HtmlErrorContext()
-: ErrorContext(nullptr)
+    : ErrorContext(nullptr)
+    , mpResId(nullptr)
 {
-    mnResId = 0;
 }
 
 bool HtmlErrorContext::GetString( ErrCode, OUString& rCtxStr )
 {
-    DBG_ASSERT( mnResId != 0, "No error context set" );
-    if( mnResId == 0 )
+    DBG_ASSERT(mpResId, "No error context set");
+    if (!mpResId)
         return false;
 
-    rCtxStr = SdResId(mnResId);
+    rCtxStr = SdResId(mpResId);
 
     rCtxStr = rCtxStr.replaceAll( "$(URL1)", maURL1 );
     rCtxStr = rCtxStr.replaceAll( "$(URL2)", maURL2 );
@@ -3212,16 +3212,16 @@ bool HtmlErrorContext::GetString( ErrCode, OUString& rCtxStr )
     return true;
 }
 
-void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL )
+void HtmlErrorContext::SetContext(const char* pResId, const OUString& rURL)
 {
-    mnResId = nResId;
+    mpResId = pResId;
     maURL1 = rURL;
     maURL2.clear();
 }
 
-void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 )
+void HtmlErrorContext::SetContext(const char* pResId, const OUString& rURL1, const OUString& rURL2 )
 {
-    mnResId = nResId;
+    mpResId = pResId;
     maURL1 = rURL1;
     maURL2 = rURL2;
 }
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 8a470979330f..24e850abd132 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -61,7 +61,7 @@ class ButtonSet;
 class HtmlErrorContext : public ErrorContext
 {
 private:
-    sal_uInt16  mnResId;
+    const char* mpResId;
     OUString  maURL1;
     OUString  maURL2;
 
@@ -70,8 +70,8 @@ public:
 
     virtual bool    GetString( ErrCode nErrId, OUString& rCtxStr ) override;
 
-    void            SetContext( sal_uInt16 nResId, const OUString& rURL );
-    void            SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 );
+    void            SetContext(const char* pResId, const OUString& rURL);
+    void            SetContext(const char* pResId, const OUString& rURL1, const OUString& rURL2);
 };
 
 /// this class exports an Impress Document as a HTML Presentation.
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f458679c39bc..3fb0c9bc5a81 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -49,7 +49,7 @@
 
 #include <sfx2/docinf.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "pptin.hxx"
 #include "Outliner.hxx"
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 4eed0b02cc38..0017fcbb4006 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/sfxsids.hrc>
 #include "drawdoc.hxx"
 #include "Outliner.hxx"
 #include <unotools/streamwrap.hxx>
@@ -68,7 +69,7 @@
 #include "sderror.hxx"
 #include "sdresid.hxx"
 #include "sdtransform.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <sfx2/frame.hxx>
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 41380c4dc93b..48d8bdc45081 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -52,7 +52,7 @@
 #include "slideshow.hxx"
 #include "anminfo.hxx"
 
-#include "accessibility.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include <osl/mutex.hxx>
 
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 22b7d7752cdd..d54a3cab4dbb 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -44,7 +44,7 @@
 #include "AccessibleOutlineView.hxx"
 #include "AccessibleOutlineEditSource.hxx"
 #include <drawdoc.hxx>
-#include "accessibility.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 
 #include <memory>
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 410b3cd2e664..45c7f78799ea 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -21,7 +21,7 @@
 
 #include "SdShapeTypes.hxx"
 
-#include "accessibility.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include <svx/DescriptionGenerator.hxx>
 #include <rtl/ustring.h>
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index de850ce3564d..bdac0a469ece 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -41,7 +41,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 87341404435d..5fac67cbb8c3 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -35,7 +35,7 @@
 #include "drawdoc.hxx"
 
 #include "sdresid.hxx"
-#include "accessibility.hrc"
+#include "strings.hrc"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc
deleted file mode 100644
index b14413af5c27..000000000000
--- a/sd/source/ui/accessibility/accessibility.hrc
+++ /dev/null
@@ -1,80 +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_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC
-#define INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define SID_SD_A11Y_START               (SID_SD_START+600)
-
-#define SID_SD_A11Y_D_DRAWVIEW_N        (SID_SD_A11Y_START + 0)
-#define SID_SD_A11Y_D_DRAWVIEW_D        (SID_SD_A11Y_START + 1)
-
-#define SID_SD_A11Y_I_DRAWVIEW_N        (SID_SD_A11Y_START + 2)
-#define SID_SD_A11Y_I_DRAWVIEW_D        (SID_SD_A11Y_START + 3)
-#define SID_SD_A11Y_I_OUTLINEVIEW_N     (SID_SD_A11Y_START + 4)
-#define SID_SD_A11Y_I_OUTLINEVIEW_D     (SID_SD_A11Y_START + 5)
-#define SID_SD_A11Y_I_SLIDEVIEW_N       (SID_SD_A11Y_START + 6)
-#define SID_SD_A11Y_I_SLIDEVIEW_D       (SID_SD_A11Y_START + 7)
-#define SID_SD_A11Y_I_NOTESVIEW_N       (SID_SD_A11Y_START + 8)
-#define SID_SD_A11Y_I_NOTESVIEW_D       (SID_SD_A11Y_START + 9)
-#define SID_SD_A11Y_I_HANDOUTVIEW_N     (SID_SD_A11Y_START + 10)
-#define SID_SD_A11Y_I_HANDOUTVIEW_D     (SID_SD_A11Y_START + 11)
-
-#define SID_SD_A11Y_P_TITLE_N           (SID_SD_A11Y_START + 12)
-#define SID_SD_A11Y_P_TITLE_D           (SID_SD_A11Y_START + 13)
-#define SID_SD_A11Y_P_OUTLINER_N        (SID_SD_A11Y_START + 14)
-#define SID_SD_A11Y_P_OUTLINER_D        (SID_SD_A11Y_START + 15)
-#define SID_SD_A11Y_P_SUBTITLE_N        (SID_SD_A11Y_START + 16)
-#define SID_SD_A11Y_P_SUBTITLE_D        (SID_SD_A11Y_START + 17)
-#define SID_SD_A11Y_P_PAGE_N            (SID_SD_A11Y_START + 18)
-#define SID_SD_A11Y_P_PAGE_D            (SID_SD_A11Y_START + 19)
-#define SID_SD_A11Y_P_NOTES_N           (SID_SD_A11Y_START + 20)
-#define SID_SD_A11Y_P_NOTES_D           (SID_SD_A11Y_START + 21)
-#define SID_SD_A11Y_P_HANDOUT_N         (SID_SD_A11Y_START + 22)
-#define SID_SD_A11Y_P_HANDOUT_D         (SID_SD_A11Y_START + 23)
-#define SID_SD_A11Y_P_UNKNOWN_N         (SID_SD_A11Y_START + 24)
-#define SID_SD_A11Y_P_UNKNOWN_D         (SID_SD_A11Y_START + 25)
-#define SID_SD_A11Y_P_FOOTER_N          (SID_SD_A11Y_START + 26)
-#define SID_SD_A11Y_P_FOOTER_D          (SID_SD_A11Y_START + 27)
-#define SID_SD_A11Y_P_HEADER_N          (SID_SD_A11Y_START + 28)
-#define SID_SD_A11Y_P_HEADER_D          (SID_SD_A11Y_START + 29)
-#define SID_SD_A11Y_P_DATE_N            (SID_SD_A11Y_START + 30)
-#define SID_SD_A11Y_P_DATE_D            (SID_SD_A11Y_START + 31)
-#define SID_SD_A11Y_P_NUMBER_N          (SID_SD_A11Y_START + 32)
-#define SID_SD_A11Y_P_NUMBER_D          (SID_SD_A11Y_START + 33)
-#define SID_SD_A11Y_D_PRESENTATION      (SID_SD_A11Y_START + 34)
-#define SID_SD_A11Y_P_TITLE_N_STYLE       (SID_SD_A11Y_START + 35)
-#define SID_SD_A11Y_P_OUTLINER_N_STYLE    (SID_SD_A11Y_START + 36)
-#define SID_SD_A11Y_P_SUBTITLE_N_STYLE    (SID_SD_A11Y_START + 37)
-#define SID_SD_A11Y_P_PAGE_N_STYLE        (SID_SD_A11Y_START + 38)
-#define SID_SD_A11Y_P_NOTES_N_STYLE       (SID_SD_A11Y_START + 39)
-#define SID_SD_A11Y_P_HANDOUT_N_STYLE     (SID_SD_A11Y_START + 40)
-#define SID_SD_A11Y_P_UNKNOWN_N_STYLE     (SID_SD_A11Y_START + 41)
-#define SID_SD_A11Y_P_FOOTER_N_STYLE      (SID_SD_A11Y_START + 42)
-#define SID_SD_A11Y_P_HEADER_N_STYLE      (SID_SD_A11Y_START + 43)
-#define SID_SD_A11Y_P_DATE_N_STYLE        (SID_SD_A11Y_START + 44)
-#define SID_SD_A11Y_P_NUMBER_N_STYLE      (SID_SD_A11Y_START + 45)
-
-#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src
deleted file mode 100644
index a3511d913857..000000000000
--- a/sd/source/ui/accessibility/accessibility.src
+++ /dev/null
@@ -1,261 +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 "accessibility.hrc"
-
-/* Names and descriptions of the Draw/Impress accessibility views
-   ==============================================================
-*/
-
-String SID_SD_A11Y_D_DRAWVIEW_N
-{
-    Text [ en-US ] = "Drawing View";
-};
-
-String SID_SD_A11Y_D_DRAWVIEW_D
-{
-    Text [ en-US ] = "This is where you create and edit drawings.";
-};
-
-String SID_SD_A11Y_I_DRAWVIEW_N
-{
-    Text [ en-US ] = "Drawing View";
-};
-
-String SID_SD_A11Y_I_DRAWVIEW_D
-{
-    Text [ en-US ] = "This is where you create and edit slides.";
-};
-
-String SID_SD_A11Y_I_OUTLINEVIEW_N
-{
-    Text [ en-US ] = "Outline View";
-};
-
-String SID_SD_A11Y_I_OUTLINEVIEW_D
-{
-    Text [ en-US ] = "This is where you enter or edit text in list form.";
-};
-
-String SID_SD_A11Y_I_SLIDEVIEW_N
-{
-    Text [ en-US ] = "Slides View";
-};
-
-String SID_SD_A11Y_I_SLIDEVIEW_D
-{
-    Text [ en-US ] = "This is where you sort slides.";
-};
-
-String SID_SD_A11Y_I_NOTESVIEW_N
-{
-    Text [ en-US ] = "Notes View";
-};
-
-String SID_SD_A11Y_I_NOTESVIEW_D
-{
-    Text [ en-US ] = "This is where you enter and view notes.";
-};
-
-String SID_SD_A11Y_I_HANDOUTVIEW_N
-{
-    Text [ en-US ] = "Handout View";
-};
-
-String SID_SD_A11Y_I_HANDOUTVIEW_D
-{
-    Text [ en-US ] = "This is where you decide on the layout for handouts.";
-};
-
-String SID_SD_A11Y_P_TITLE_N
-{
-    Text [ en-US ] = "PresentationTitle";
-};
-
-String SID_SD_A11Y_P_OUTLINER_N
-{
-    Text [ en-US ] = "PresentationOutliner";
-};
-
-String SID_SD_A11Y_P_SUBTITLE_N
-{
-    Text [ en-US ] = "PresentationSubtitle";
-};
-
-String SID_SD_A11Y_P_PAGE_N
-{
-    Text [ en-US ] = "PresentationPage";
-};
-
-String SID_SD_A11Y_P_NOTES_N
-{
-    Text [ en-US ] = "PresentationNotes";
-};
-
-String SID_SD_A11Y_P_HANDOUT_N
-{
-    Text [ en-US ] = "Handout";
-};
-
-String SID_SD_A11Y_P_UNKNOWN_N
-{
-    Text [ en-US ] = "UnknownAccessiblePresentationShape";
-};
-
-String SID_SD_A11Y_P_TITLE_D
-{
-    Text [ en-US ] = "PresentationTitleShape";
-};
-
-String SID_SD_A11Y_P_OUTLINER_D
-{
-    Text [ en-US ] = "PresentationOutlinerShape";
-};
-
-String SID_SD_A11Y_P_SUBTITLE_D
-{
-    Text [ en-US ] = "PresentationSubtitleShape";
-};
-
-String SID_SD_A11Y_P_PAGE_D
-{
-    Text [ en-US ] = "PresentationPageShape";
-};
-
-String SID_SD_A11Y_P_NOTES_D
-{
-    Text [ en-US ] = "PresentationNotesShape";
-};
-
-String SID_SD_A11Y_P_HANDOUT_D
-{
-    Text [ en-US ] = "PresentationHandoutShape";
-};
-
-String SID_SD_A11Y_P_UNKNOWN_D
-{
-    Text [ en-US ] = "Unknown accessible presentation shape";
-};
-
-String SID_SD_A11Y_P_FOOTER_N
-{
-    Text [ en-US ] = "PresentationFooter";
-};
-
-String SID_SD_A11Y_P_FOOTER_D
-{
-    Text [ en-US ] = "PresentationFooterShape";
-};
-
-String SID_SD_A11Y_P_HEADER_N
-{
-    Text [ en-US ] = "PresentationHeader";
-};
-
-String SID_SD_A11Y_P_HEADER_D
-{
-    Text [ en-US ] = "PresentationHeaderShape";
-};
-
-String SID_SD_A11Y_P_DATE_N
-{
-    Text [ en-US ] = "PresentationDateAndTime";
-};
-
-String SID_SD_A11Y_P_DATE_D
-{
-    Text [ en-US ] = "PresentationDateAndTimeShape";
-};
-
-String SID_SD_A11Y_P_NUMBER_N
-{
-    Text [ en-US ] = "PresentationPageNumber";
-};
-
-String SID_SD_A11Y_P_NUMBER_D
-{
-    Text [ en-US ] = "PresentationPageNumberShape";
-};
-
-String SID_SD_A11Y_D_PRESENTATION
-{
-    Text [ en-US ] = "%PRODUCTNAME Presentation";
-};
-
-String SID_SD_A11Y_P_TITLE_N_STYLE
-{
-    Text [ en-US ] = "Title";
-};
-
-String  SID_SD_A11Y_P_OUTLINER_N_STYLE
-{
-    Text [ en-US ] = "Outliner";
-};
-
-String  SID_SD_A11Y_P_SUBTITLE_N_STYLE
-{
-    Text [ en-US ] = "Subtitle";
-};
-
-String  SID_SD_A11Y_P_PAGE_N_STYLE
-{
-    Text [ en-US ] = "Page";
-};
-
-String  SID_SD_A11Y_P_NOTES_N_STYLE
-{
-    Text [ en-US ] = "Notes";
-};
-
-String  SID_SD_A11Y_P_HANDOUT_N_STYLE
-{
-    Text [ en-US ] = "Handout";
-};
-
-String  SID_SD_A11Y_P_UNKNOWN_N_STYLE
-{
-    Text [ en-US ] = "Unknown Accessible Presentation Shape";
-};
-
-String  SID_SD_A11Y_P_FOOTER_N_STYLE
-{
-    Text [ en-US ] = "Footer";
-};
-
-String  SID_SD_A11Y_P_HEADER_N_STYLE
-{
-    Text [ en-US ] = "Header";
-};
-
-String  SID_SD_A11Y_P_DATE_N_STYLE
-{
-    Text [ en-US ] = "Date";
-};
-
-String  SID_SD_A11Y_P_NUMBER_N_STYLE
-{
-    Text [ en-US ] = "Number";
-};
-
-String SID_SD_A11Y_D_PRESENTATION_READONLY
-{
-    Text [ en-US ] = "(read-only)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
deleted file mode 100644
index 5f47546f238c..000000000000
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ /dev/null
@@ -1,63 +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_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
-#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
-
-#include "glob.hrc"
-
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// attention, we have 200 ids free after RID_CUSTOMANIMATION_START
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-#define STR_CUSTOMANIMATION_REPEAT_NONE                 RID_CUSTOMANIMATION_START+5
-#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK     RID_CUSTOMANIMATION_START+6
-#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE   RID_CUSTOMANIMATION_START+7
-#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY          RID_CUSTOMANIMATION_START+8
-#define STR_CUSTOMANIMATION_ZOOM_PROPERTY               RID_CUSTOMANIMATION_START+9
-#define STR_CUSTOMANIMATION_SPOKES_PROPERTY             RID_CUSTOMANIMATION_START+10
-#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY        RID_CUSTOMANIMATION_START+11
-#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY       RID_CUSTOMANIMATION_START+12
-#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+13
-#define STR_CUSTOMANIMATION_STYLE_PROPERTY              RID_CUSTOMANIMATION_START+14
-#define STR_CUSTOMANIMATION_FONT_PROPERTY               RID_CUSTOMANIMATION_START+15
-#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+16
-#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY    RID_CUSTOMANIMATION_START+17
-#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY         RID_CUSTOMANIMATION_START+18
-#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+19
-#define STR_CUSTOMANIMATION_SIZE_PROPERTY               RID_CUSTOMANIMATION_START+20
-#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY             RID_CUSTOMANIMATION_START+21
-#define STR_CUSTOMANIMATION_COLOR_PROPERTY              RID_CUSTOMANIMATION_START+22
-#define STR_CUSTOMANIMATION_NO_SOUND                    RID_CUSTOMANIMATION_START+23
-#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND         RID_CUSTOMANIMATION_START+24
-#define STR_CUSTOMANIMATION_SCALE_PROPERTY              RID_CUSTOMANIMATION_START+25
-#define STR_CUSTOMANIMATION_SAMPLE                      RID_CUSTOMANIMATION_START+26
-#define STR_CUSTOMANIMATION_BROWSE_SOUND                RID_CUSTOMANIMATION_START+27
-#define STR_CUSTOMANIMATION_TRIGGER                     RID_CUSTOMANIMATION_START+35
-#define STR_CUSTOMANIMATION_LIST_HELPTEXT               RID_CUSTOMANIMATION_START+36
-#define STR_CUSTOMANIMATION_USERPATH                    RID_CUSTOMANIMATION_START+37
-#define STR_SLIDETRANSITION_NONE                        RID_CUSTOMANIMATION_START+38
-#define STR_CUSTOMANIMATION_ENTRANCE                    RID_CUSTOMANIMATION_START+39
-#define STR_CUSTOMANIMATION_EMPHASIS                    RID_CUSTOMANIMATION_START+40
-#define STR_CUSTOMANIMATION_EXIT                        RID_CUSTOMANIMATION_START+41
-#define STR_CUSTOMANIMATION_MOTION_PATHS                RID_CUSTOMANIMATION_START+42
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
deleted file mode 100644
index e18c16da87cc..000000000000
--- a/sd/source/ui/animations/CustomAnimation.src
+++ /dev/null
@@ -1,177 +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 "CustomAnimation.hrc"
-
-String STR_CUSTOMANIMATION_REPEAT_NONE
-{
-    Text [ en-US ] = "none";
-};
-
-String STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK
-{
-    Text [ en-US ] = "Until next click";
-};
-
-String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
-{
-    Text [ en-US ] = "Until end of slide";
-};
-
-String STR_CUSTOMANIMATION_DIRECTION_PROPERTY
-{
-    Text [ en-US ] = "Direction:";
-};
-
-String STR_CUSTOMANIMATION_ZOOM_PROPERTY
-{
-    Text [ en-US ] = "Zoom:";
-};
-
-String STR_CUSTOMANIMATION_SPOKES_PROPERTY
-{
-    Text [ en-US ] = "Spokes:";
-};
-
-String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY
-{
-    Text [ en-US ] = "First color:";
-};
-
-String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Second color:";
-};
-
-String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Fill color:";
-};
-
-String STR_CUSTOMANIMATION_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Style:";
-};
-
-String STR_CUSTOMANIMATION_FONT_PROPERTY
-{
-    Text [ en-US ] = "Font:";
-};
-
-String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Font color:";
-};
-
-String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Style:";
-};
-
-String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Typeface:";
-};
-
-String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Line color:";
-};
-
-String STR_CUSTOMANIMATION_SIZE_PROPERTY
-{
-    Text [ en-US ] = "Font size:";
-};
-
-String STR_CUSTOMANIMATION_SCALE_PROPERTY
-{
-    Text [ en-US ] = "Size:";
-};
-
-String STR_CUSTOMANIMATION_AMOUNT_PROPERTY
-{
-    Text [ en-US ] = "Amount:";
-};
-
-String STR_CUSTOMANIMATION_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Color:";
-};
-
-String STR_CUSTOMANIMATION_NO_SOUND
-{
-    Text [ en-US ] = "(No sound)";
-};
-
-String STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND
-{
-    Text [ en-US ] = "(Stop previous sound)";
-};
-
-String STR_CUSTOMANIMATION_BROWSE_SOUND
-{
-    Text [ en-US ] = "Other sound...";
-};
-
-String STR_CUSTOMANIMATION_SAMPLE
-{
-    Text [ en-US ] = "Sample";
-};
-
-String STR_CUSTOMANIMATION_TRIGGER
-{
-    Text [ en-US ] = "Trigger";
-};
-
-String STR_CUSTOMANIMATION_LIST_HELPTEXT
-{
-    Text [ en-US ] = "First select the slide element and then click 'Add...' to add an animation effect.";
-};
-
-String STR_CUSTOMANIMATION_USERPATH
-{
-    Text [ en-US ] = "User paths";
-};
-
-String STR_CUSTOMANIMATION_ENTRANCE
-{
-    Text [ en-US ] = "Entrance: %1";
-};
-
-String STR_CUSTOMANIMATION_EMPHASIS
-{
-    Text [ en-US ] = "Emphasis: %1";
-};
-
-String STR_CUSTOMANIMATION_EXIT
-{
-    Text [ en-US ] = "Exit: %1";
-};
-
-String STR_CUSTOMANIMATION_MOTION_PATHS
-{
-    Text [ en-US ] = "Motion Paths: %1";
-};
-
-String STR_SLIDETRANSITION_NONE
-{
-    Text [ en-US ] = "None";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 474d3c6e0860..21b28406cfed 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -68,10 +68,9 @@
 #include <svx/dialogs.hrc>
 #include "sdresid.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "CustomAnimationDialog.hxx"
 #include "CustomAnimationPane.hxx"
-#include "CustomAnimation.hrc"
 #include "STLPropertySet.hxx"
 
 #include <avmedia/mediawindow.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 32553c5a4ca7..e76705c38141 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include "CustomAnimationList.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "CustomAnimationPreset.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -41,8 +41,8 @@
 #include "svtools/treelistentry.hxx"
 #include "svtools/viewdataentry.hxx"
 
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 #include <algorithm>
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index a029cd3e5b39..1e5839f16414 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -28,7 +28,7 @@
 #include <svtools/treelistbox.hxx>
 #include <CustomAnimationEffect.hxx>
 #include "CustomAnimationPreset.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 
 namespace sd {
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 6598d82377c6..62dea9da7497 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -41,7 +41,7 @@
 #include "STLPropertySet.hxx"
 #include "CustomAnimationPane.hxx"
 #include "CustomAnimationDialog.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "CustomAnimationList.hxx"
 #include "createcustomanimationpanel.hxx"
 #include <vcl/lstbox.hxx>
@@ -72,13 +72,13 @@
 
 #include "EventMultiplexer.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
 
 #include <svx/svdetc.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2039d405659a..98ca27c8c279 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 
 #include "SlideTransitionPane.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "createslidetransitionpanel.hxx"
 
 #include "TransitionPreset.hxx"
@@ -34,7 +34,7 @@
 #include "DrawController.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svx/gallery.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index d287a8e74e6c..fe6f8e0a2930 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -68,14 +68,14 @@
 #include "annotationmanager.hxx"
 #include "annotationmanagerimpl.hxx"
 #include "annotationwindow.hxx"
-#include "annotations.hrc"
+#include "strings.hrc"
 
 #include "Annotation.hxx"
 #include "ToolBarManager.hxx"
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "EventMultiplexer.hxx"
 #include "ViewShellManager.hxx"
@@ -831,15 +831,15 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
 
         // The question text depends on the search direction.
         bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress;
-        sal_uInt16 nStringId;
+        const char* pStringId;
         if(bForeward)
-            nStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW;
+            pStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW;
         else
-            nStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
+            pStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW;
 
         // Pop up question box that asks the user whether to wrap around.
         // The dialog is made modal with respect to the whole application.
-        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId));
+        ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(pStringId));
         aQuestionBox->SetImage( QueryBox::GetStandardImage() );
         if (aQuestionBox->Execute() != RET_YES)
             break;
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
deleted file mode 100644
index b14a1139552f..000000000000
--- a/sd/source/ui/annotations/annotations.hrc
+++ /dev/null
@@ -1,41 +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_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
-#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC
-
-#include "glob.hrc"
-
-// strings
-#define STR_ANNOTATION_TODAY                (RID_ANNOTATIONS_START+1)
-#define STR_ANNOTATION_YESTERDAY            (RID_ANNOTATIONS_START+2)
-#define STR_ANNOTATION_NOAUTHOR             (RID_ANNOTATIONS_START+3)
-#define STR_ANNOTATION_WRAP_FORWARD         (RID_ANNOTATIONS_START+4)
-#define STR_ANNOTATION_WRAP_BACKWARD        (RID_ANNOTATIONS_START+5)
-#define STR_ANNOTATION_WRAP_FORWARD_DRAW    (RID_ANNOTATIONS_START+6)
-#define STR_ANNOTATION_WRAP_BACKWARD_DRAW   (RID_ANNOTATIONS_START+7)
-#define STR_ANNOTATION_UNDO_INSERT          (RID_ANNOTATIONS_START+8)
-#define STR_ANNOTATION_UNDO_DELETE          (RID_ANNOTATIONS_START+9)
-#define STR_ANNOTATION_UNDO_MOVE            (RID_ANNOTATIONS_START+10)
-#define STR_ANNOTATION_UNDO_EDIT            (RID_ANNOTATIONS_START+11)
-#define STR_ANNOTATION_REPLY                (RID_ANNOTATIONS_START+13)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src
deleted file mode 100644
index 05bfe4820d44..000000000000
--- a/sd/source/ui/annotations/annotations.src
+++ /dev/null
@@ -1,85 +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 "annotations.hrc"
-#include "glob.hrc"
-#include <svx/svxids.hrc>
-#include "helpids.h"
-
-String STR_ANNOTATION_TODAY
-{
-    Text [ en-US ] = "Today," ;
-};
-
-String STR_ANNOTATION_YESTERDAY
-{
-    Text [ en-US ] = "Yesterday," ;
-};
-
-String STR_ANNOTATION_NOAUTHOR
-{
-    Text [ en-US ] = "(no author)" ;
-};
-
-String STR_ANNOTATION_WRAP_FORWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?";
-};
-
-String STR_ANNOTATION_WRAP_BACKWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?";
-};
-
-String STR_ANNOTATION_WRAP_FORWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?";
-};
-
-String STR_ANNOTATION_WRAP_BACKWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?";
-};
-
-String STR_ANNOTATION_UNDO_INSERT
-{
-    Text [ en-US ] = "Insert Comment";
-};
-
-String STR_ANNOTATION_UNDO_DELETE
-{
-    Text [ en-US ] = "Delete Comment(s)";
-};
-
-String STR_ANNOTATION_UNDO_MOVE
-{
-    Text [ en-US ] = "Move Comment";
-};
-
-String STR_ANNOTATION_UNDO_EDIT
-{
-    Text [ en-US ] = "Edit Comment";
-};
-
-String STR_ANNOTATION_REPLY
-{
-    Text [ en-US ] = "Reply to %1" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 00fddda8a313..659141df6968 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -36,7 +36,7 @@
 
 #include "View.hxx"
 #include "sdresid.hxx"
-#include "annotations.hrc"
+#include "strings.hrc"
 #include "annotationmanagerimpl.hxx"
 #include "annotationwindow.hxx"
 #include "annotationtag.hxx"
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index e3c30d990109..7b2349ac2493 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -73,7 +73,7 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
-#include "annotations.hrc"
+#include "strings.hrc"
 #include "annotationwindow.hxx"
 #include "annotationmanagerimpl.hxx"
 
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index f8d0ee660771..8719d29aa4e2 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -20,6 +20,7 @@
 #include <unotools/pathoptions.hxx>
 #include <svl/languageoptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/status.hxx>
@@ -49,9 +50,10 @@
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
+#include "errhdl.hrc"
 #include "cfgids.hxx"
 
 
@@ -67,7 +69,7 @@ void SdModule::InitInterface_Impl()
 
 // Ctor
 SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
-:   SfxModule( ResMgr::CreateResMgr("sd"), {pFact1, pFact2} ),
+:   SfxModule( Translate::Create("sd", Application::GetSettings().GetUILanguageTag()), {pFact1, pFact2} ),
     pTransferClip(nullptr),
     pTransferDrag(nullptr),
     pTransferSelection(nullptr),
@@ -84,10 +86,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
     pSearchItem->SetAppFlag(SvxSearchApp::DRAW);
     StartListening( *SfxGetpApp() );
     SvxErrorHandler::ensure();
-    mpErrorHdl = new SfxErrorHandler( RID_SD_ERRHDL,
-                                         ErrCode(ERRCODE_AREA_SD),
-                                         ErrCode(ERRCODE_AREA_SD_END),
-                                         GetResMgr() );
+    mpErrorHdl = new SfxErrorHandler(RID_SD_ERRHDL, ErrCode(ERRCODE_AREA_SD), ErrCode(ERRCODE_AREA_SD_END), &GetResLocale());
 
     // Create a new ref device and (by calling SetReferenceDevice())
     // set its resolution to 600 DPI.  This leads to a visually better
@@ -97,6 +96,11 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
     mpVirtualRefDevice->SetReferenceDevice ( VirtualDevice::RefDevMode::Dpi600 );
 }
 
+OUString SdResId(const char* pId)
+{
+    return Translate::get(pId, SD_MOD()->GetResLocale());
+}
+
 // Dtor
 SdModule::~SdModule()
 {
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 12945863ea8f..4c2295002487 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -40,9 +40,9 @@
 #include <com/sun/star/uno/Sequence.h>
 
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdmod.hxx"
 #include "pres.hxx"
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 6d72d1fd32e5..5a8b19bf842d 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -47,9 +47,9 @@
 
 #include "sdmod.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "family.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "ViewShell.hxx"
 #include "FrameView.hxx"
@@ -799,12 +799,12 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies()
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
                                                     SdResId(STR_GRAPHICS_STYLE_FAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)),
-                                                    ResId(RID_GRAPHICSTYLEFAMILY, *SD_MOD()->GetResMgr())));
+                                                    RID_GRAPHICSTYLEFAMILY, SD_MOD()->GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
                                                     SdResId(STR_PRESENTATIONS_STYLE_FAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)),
-                                                    ResId(RID_PRESENTATIONSTYLEFAMILY, *SD_MOD()->GetResMgr())));
+                                                    RID_PRESENTATIONSTYLEFAMILY, SD_MOD()->GetResLocale()));
 
     return pStyleFamilies;
 }
diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src
deleted file mode 100644
index 6751765441fd..000000000000
--- a/sd/source/ui/app/sdstring.src
+++ /dev/null
@@ -1,42 +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 "sdstring.hrc"
-
-String STR_SAR_WRAP_FORWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?";
-};
-
-String STR_SAR_WRAP_BACKWARD
-{
-    Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?";
-};
-
-String STR_SAR_WRAP_FORWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?";
-};
-
-String STR_SAR_WRAP_BACKWARD_DRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
deleted file mode 100644
index d1d9566cdf9f..000000000000
--- a/sd/source/ui/app/strings.src
+++ /dev/null
@@ -1,1090 +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 "strings.hrc"
-#include "glob.hrc"
-#include "helpids.h"
-
-String STR_NULL
-{
-    Text [ en-US ] = "None" ;
-};
-String STR_INSERTPAGE
-{
-    Text [ en-US ] = "Insert Slide" ;
-};
-String STR_INSERTLAYER
-{
-    Text [ en-US ] = "Insert Layer" ;
-};
-String STR_MODIFYLAYER
-{
-    Text [ en-US ] = "Modify Layer" ;
-};
-String STR_UNDO_SLIDE_PARAMS
-{
-    Text [ en-US ] = "Slide parameter" ;
-};
-String STR_UNDO_CUT
-{
-    Text [ en-US ] = "Cut" ;
-};
-String STR_UNDO_REPLACE
-{
-    Text [ en-US ] = "Replace" ;
-};
-String STR_UNDO_DRAGDROP
-{
-    Text [ en-US ] = "Drag and Drop" ;
-};
-String STR_INSERTGRAPHIC
-{
-    Text [ en-US ] = "Insert Image" ;
-};
-String STR_UNDO_BEZCLOSE
-{
-    Text [ en-US ] = "Close Polygon" ;
-};
-String STR_SLIDE_SORTER_MODE
-{
-    Text [ en-US ] = "Slide Sorter" ;
-};
-String STR_NORMAL_MODE
-{
-    Text [ en-US ] = "Normal" ;
-};
-String STR_SLIDE_MASTER_MODE
-{
-    Text [ en-US ] = "Slide Master" ;
-};
-String STR_OUTLINE_MODE
-{
-    Text [ en-US ] = "Outline" ;
-};
-String STR_NOTES_MODE
-{
-    Text [ en-US ] = "Notes" ;
-};
-String STR_NOTES_MASTER_MODE
-{
-    Text [ en-US ] = "Notes Master" ;
-};
-String STR_HANDOUT_MASTER_MODE
-{
-    Text [ en-US ] = "Handout" ;
-};
-
-String STR_AUTOLAYOUT_NONE
-{
-    Text [ en-US ] = "Blank Slide" ;
-};
-String STR_AUTOLAYOUT_ONLY_TITLE
-{
-    Text [ en-US ] = "Title Only" ;
-};
-String STR_AUTOLAYOUT_ONLY_TEXT
-{
-    Text [ en-US ] = "Centered Text" ;
-};
-String STR_AUTOLAYOUT_TITLE
-{
-    Text [ en-US ] = "Title Slide" ;
-};
-String STR_AUTOLAYOUT_CONTENT
-{
-    Text [ en-US ] = "Title, Content" ;
-};
-String STR_AUTOLAYOUT_2CONTENT
-{
-    Text [ en-US ] = "Title and 2 Content" ;
-};
-String STR_AUTOLAYOUT_CONTENT_2CONTENT
-{
-    Text [ en-US ] = "Title, Content and 2 Content" ;
-};
-String STR_AUTOLAYOUT_2CONTENT_CONTENT
-{
-    Text [ en-US ] = "Title, 2 Content and Content" ;
-};
-String STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT
-{
-    Text [ en-US ] = "Title, 2 Content over Content" ;
-};
-String STR_AUTOLAYOUT_CONTENT_OVER_CONTENT
-{
-    Text [ en-US ] = "Title, Content over Content" ;
-};
-String STR_AUTOLAYOUT_4CONTENT
-{
-    Text [ en-US ] = "Title, 4 Content" ;
-};
-String STR_AUTOLAYOUT_6CONTENT
-{
-    Text [ en-US ] = "Title, 6 Content" ;
-};
-String STR_AL_TITLE_VERT_OUTLINE
-{
-    Text [ en-US ] = "Title, Vertical Text" ;
-};
-String STR_AL_TITLE_VERT_OUTLINE_CLIPART
-{
-    Text [ en-US ] = "Title, Vertical Text, Clipart" ;
-};
-String STR_AL_VERT_TITLE_TEXT_CHART
-{
-    Text [ en-US ] = "Vertical Title, Text, Chart" ;
-};
-String STR_AL_VERT_TITLE_VERT_OUTLINE
-{
-    Text [ en-US ] = "Vertical Title, Vertical Text" ;
-};
-
-String STR_AUTOLAYOUT_HANDOUT1
-{
-    Text [ en-US ] = "One Slide" ;
-};
-String STR_AUTOLAYOUT_HANDOUT2
-{
-    Text [ en-US ] = "Two Slides" ;
-};
-String STR_AUTOLAYOUT_HANDOUT3
-{
-    Text [ en-US ] = "Three Slides" ;
-};
-String STR_AUTOLAYOUT_HANDOUT4
-{
-    Text [ en-US ] = "Four Slides" ;
-};
-String STR_AUTOLAYOUT_HANDOUT6
-{
-    Text [ en-US ] = "Six Slides" ;
-};
-String STR_AUTOLAYOUT_HANDOUT9
-{
-    Text [ en-US ] = "Nine Slides" ;
-};
-String STR_DISPLAYMODE_EDITMODES
-{
-    Text [ en-US ] = "Edit Modes" ;
-};
-String STR_DISPLAYMODE_MASTERMODES
-{
-    Text [ en-US ] = "Master Modes" ;
-};
-String STR_AUTOLAYOUT_NOTES
-{
-    Text [ en-US ] = "Notes" ;
-};
-String STR_TRANSFORM
-{
-    Text [ en-US ] = "Transform" ;
-};
-String STR_LINEEND
-{
-    Text [ en-US ] = "Line Ends" ;
-};
-String STR_DESC_LINEEND
-{
-    Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
-};
-String STR_WARN_NAME_DUPLICATE
-{
-    Text [ en-US ] = "The name chosen already exists. \nPlease enter another name." ;
-};
-String STR_UNDO_ANIMATION
-{
-    Text [ en-US ] = "Animation parameters" ;
-};
-String STR_EXPORT_HTML_NAME
-{
-    Text [ en-US ] = "Web Page";
-};
-String STR_UNDO_COPYOBJECTS
-{
-    Text [ en-US ] = "Duplicate" ;
-};
-String STR_TITLE_NAMEGROUP
-{
-    Text [ en-US ] = "Name Object";
-};
-String STR_DESC_NAMEGROUP
-{
-    Text [ en-US ] = "Name";
-};
-String STR_WARN_PAGE_EXISTS
-{
-    Text [ en-US ] = "The slide name already exists or is invalid. Please enter another name." ;
-};
-String STR_SNAPDLG_SETLINE
-{
-    Text [ en-US ] = "Edit Snap Line" ;
-};
-String STR_SNAPDLG_SETPOINT
-{
-    Text [ en-US ] = "Edit Snap Point" ;
-};
-String STR_POPUP_EDIT_SNAPLINE
-{
-    Text [ en-US ] = "Edit Snap Line..." ;
-};
-String STR_POPUP_EDIT_SNAPPOINT
-{
-    Text [ en-US ] = "Edit Snap Point..." ;
-};
-String STR_POPUP_DELETE_SNAPLINE
-{
-    Text [ en-US ] = "Delete Snap Line" ;
-};
-String STR_POPUP_DELETE_SNAPPOINT
-{
-    Text [ en-US ] = "Delete Snap Point" ;
-};
-String STR_IMPRESS
-{
-    Text [ en-US ] = "StarImpress 4.0" ;
-};
-String STR_LAYER
-{
-    Text [ en-US ] = "Layer" ;
-};
-String STR_UNDO_DELETEPAGES
-{
-    Text [ en-US ] = "Delete slides" ;
-};
-String STR_UNDO_INSERTPAGES
-{
-    Text [ en-US ] = "Insert slides" ;
-};
-String STR_ASK_DELETE_LAYER
-{
-    Text [ en-US ] = "Are you sure you want to delete the level \"$\"?\nNote: All objects on this level will be deleted!" ;
-};
-String STR_ASK_DELETE_ALL_PICTURES
-{
-    Text [ en-US ] = "Do you really want to delete all images?" ;
-};
-String STR_UNDO_CHANGE_TITLE_AND_LAYOUT
-{
-    Text [ en-US ] = "Modify title and outline" ;
-};
-String STR_WAV_FILE
-{
-    Text [ en-US ] = "Audio" ;
-};
-String STR_MIDI_FILE
-{
-    Text [ en-US ] = "MIDI" ;
-};
-String STR_AU_FILE
-{
-    Text [ en-US ] = "Sun/NeXT Audio" ;
-};
-String STR_VOC_FILE
-{
-    Text [ en-US ] = "Creative Labs Audio" ;
-};
-String STR_AIFF_FILE
-{
-    Text [ en-US ] = "Apple/SGI Audio" ;
-};
-String STR_SVX_FILE
-{
-    Text [ en-US ] = "Amiga SVX Audio" ;
-};
-String STR_SD_PAGE
-{
-    Text [ en-US ] = "Slide" ;
-};
-String STR_SD_PAGE_COUNT
-{
-    Text [ en-US ] = "Slide %1 of %2" ;
-};
-String STR_SD_PAGE_COUNT_CUSTOM
-{
-    Text [ en-US ] = "Slide %1 of %2 (%3)" ;
-};
-String STR_ALL_FILES
-{
-    Text [ en-US ] = "All files" ;
-};
-String STR_UNDO_INSERT_TEXTFRAME
-{
-    Text [ en-US ] = "Insert text frame" ;
-};
-String STR_ACTION_NOTPOSSIBLE
-{
-    Text [ en-US ] = "This function cannot be run \nwith the selected objects." ;
-};
-String STR_DLG_INSERT_PAGES_FROM_FILE
-{
-    Text [ en-US ] = "Insert File" ;
-};
-String STR_READ_DATA_ERROR
-{
-    Text [ en-US ] = "The file could not be loaded!" ;
-};
-String STR_SCALE_OBJECTS
-{
-    Text [ en-US ] = "The page size of the target document is different than the source document.\n\nDo you want to scale the copied objects to fit the new page size?" ;
-};
-String STR_CREATE_PAGES
-{
-    Text [ en-US ] = "Create Slides" ;
-};
-String STR_UNDO_CHANGE_PAGEFORMAT
-{
-    Text [ en-US ] = "Modify page format" ;
-};
-String STR_UNDO_CHANGE_PAGEBORDER
-{
-    Text [ en-US ] = "Modify page margins" ;
-};
-String STR_EDIT_OBJ
-{
-    Text [ en-US ] = "~Edit" ;
-};
-String STR_DELETE_PAGES
-{
-    Text [ en-US ] = "Delete Slides" ;
-};
-String STR_WARN_PRINTFORMAT_FAILURE
-{
-    Text [ en-US ] = "The document format could not be set on the specified printer." ;
-};
-String STR_IMPORT_GRFILTER_OPENERROR
-{
-    Text [ en-US ] = "Image file cannot be opened" ;
-};
-String STR_IMPORT_GRFILTER_IOERROR
-{
-    Text [ en-US ] = "Image file cannot be read" ;
-};
-String STR_IMPORT_GRFILTER_FORMATERROR
-{
-    Text [ en-US ] = "Unknown image format" ;
-};
-String STR_IMPORT_GRFILTER_VERSIONERROR
-{
-    Text [ en-US ] = "This image file version is not supported" ;
-};
-String STR_IMPORT_GRFILTER_FILTERERROR
-{
-    Text [ en-US ] = "Image filter not found" ;
-};
-String STR_IMPORT_GRFILTER_TOOBIG
-{
-    Text [ en-US ] = "Not enough memory to import image" ;
-};
-String STR_OBJECTS
-{
-    Text [ en-US ] = "Objects" ;
-};
-String STR_END_SPELLING
-{
-    Text [ en-US ] = "Spellcheck of entire document has been completed." ;
-};
-String STR_END_SPELLING_OBJ
-{
-    Text [ en-US ] = "The spellcheck for the selected objects has been completed." ;
-};
-String STR_ASK_FOR_CONVERT_TO_BEZIER
-{
-    Text [ en-US ] = "Convert selected object to curve?" ;
-};
-String STR_UNDO_CHANGE_PRES_OBJECT
-{
-    Text [ en-US ] = "Modify presentation object '$'" ;
-};
-String STR_UNDO_MODIFY_PAGE
-{
-    Text [ en-US ] = "Slide layout" ;
-};
-String STR_UNDO_INSERT_FILE
-{
-    Text [ en-US ] = "Insert file" ;
-};
-String STR_UNDO_INSERT_SPECCHAR
-{
-    Text [ en-US ] = "Insert special character" ;
-};
-String STR_UNDO_SET_PRESLAYOUT
-{
-    Text [ en-US ] = "Apply presentation layout" ;
-};
-String STR_PLAY
-{
-    Text [ en-US ] = "~Play" ;
-};
-String STR_STOP
-{
-    Text [ en-US ] = "Sto~p" ;
-};
-String STR_UNDO_ORIGINALSIZE
-{
-    Text [ en-US ] = "Original Size" ;
-};
-String STR_WARN_SCALE_FAIL
-{
-    Text [ en-US ] = "The specified scale is invalid.\nDo you want to enter a new one?" ;
-};
-String STR_CLICK_ACTION_NONE
-{
-    Text [ en-US ] = "No action" ;
-};
-String STR_CLICK_ACTION_PREVPAGE
-{
-    Text [ en-US ] = "Go to previous slide" ;
-};
-String STR_CLICK_ACTION_NEXTPAGE
-{
-    Text [ en-US ] = "Go to next slide" ;
-};
-String STR_CLICK_ACTION_FIRSTPAGE
-{
-    Text [ en-US ] = "Go to first slide" ;
-};
-String STR_CLICK_ACTION_LASTPAGE
-{
-    Text [ en-US ] = "Go to last slide" ;
-};
-String STR_CLICK_ACTION_BOOKMARK
-{
-    Text [ en-US ] = "Go to page or object" ;
-};
-String STR_CLICK_ACTION_DOCUMENT
-{
-    Text [ en-US ] = "Go to document" ;
-};
-String STR_CLICK_ACTION_SOUND
-{
-    Text [ en-US ] = "Play audio" ;
-};
-String STR_CLICK_ACTION_VERB
-{
-    Text [ en-US ] = "Start object action" ;
-};
-String STR_CLICK_ACTION_PROGRAM
-{
-    Text [ en-US ] = "Run program" ;
-};
-String STR_CLICK_ACTION_MACRO
-{
-    Text [ en-US ] = "Run macro" ;
-};
-String STR_CLICK_ACTION_STOPPRESENTATION
-{
-    Text [ en-US ] = "Exit presentation" ;
-};
-String STR_EFFECTDLG_JUMP
-{
-    Text [ en-US ] = "Target";
-};
-String STR_EFFECTDLG_ACTION
-{
-    Text [ en-US ] = "Act~ion";
-};
-String STR_EFFECTDLG_SOUND
-{
-    Text [ en-US ] = "Audio" ;
-};
-String STR_EFFECTDLG_PAGE_OBJECT
-{
-    Text [ en-US ] = "Slide / Object" ;
-};
-String STR_EFFECTDLG_DOCUMENT
-{
-    Text [ en-US ] = "Document" ;
-};
-String STR_EFFECTDLG_PROGRAM
-{
-    Text [ en-US ] = "Program" ;
-};
-String STR_EFFECTDLG_MACRO
-{
-    Text [ en-US ] = "Macro" ;
-};
- // Strings for animation effects
-String STR_INSERT_TEXT
-{
-    Text [ en-US ] = "Insert Text" ;
-};
-String STR_SLIDE_SINGULAR
-{
-    Text [ en-US ] = " Slide" ;
-};
-String STR_SLIDE_PLURAL
-{
-    Text [ en-US ] = " Slides" ;
-};
-String STR_LOAD_PRESENTATION_LAYOUT
-{
-    Text [ en-US ] = "Load Slide Design" ;
-};
-String STR_DRAGTYPE_URL
-{
-    Text [ en-US ] = "Insert as Hyperlink" ;
-};
-String STR_DRAGTYPE_EMBEDDED
-{
-    Text [ en-US ] = "Insert as Copy" ;
-};
-String STR_DRAGTYPE_LINK
-{
-    Text [ en-US ] = "Insert as Link" ;
-};
-String STR_GLUE_ESCDIR_SMART
-{
-    Text [ en-US ] = "Smart" ;
-};
-String STR_GLUE_ESCDIR_LEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String STR_GLUE_ESCDIR_RIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String STR_GLUE_ESCDIR_TOP
-{
-    Text [ en-US ] = "Top" ;
-};
-String STR_GLUE_ESCDIR_BOTTOM
-{
-    Text [ en-US ] = "Bottom" ;
-};
-String STR_GLUE_ESCDIR_LO
-{
-    Text [ en-US ] = "Top Left?" ;
-};
-String STR_GLUE_ESCDIR_LU
-{
-    Text [ en-US ] = "Bottom Left?" ;
-};
-String STR_GLUE_ESCDIR_RO
-{
-    Text [ en-US ] = "Top Right?" ;
-};
-String STR_GLUE_ESCDIR_RU
-{
-    Text [ en-US ] = "Bottom Right?" ;
-};
-String STR_GLUE_ESCDIR_HORZ
-{
-    Text [ en-US ] = "Horizontal" ;
-};
-String STR_GLUE_ESCDIR_VERT
-{
-    Text [ en-US ] = "Vertical" ;
-};
-String STR_GLUE_ESCDIR_ALL
-{
-    Text [ en-US ] = "All?" ;
-};
-String STR_CANT_PERFORM_IN_LIVEMODE
-{
-    Text [ en-US ] = "This action can't be run in the live mode." ;
-};
-String STR_PUBLISH_BACK
-{
-    Text [ en-US ] = "Back" ;
-};
-String STR_PUBLISH_NEXT
-{
-    Text [ en-US ] = "Continue" ;
-};
-String STR_PUBLISH_OUTLINE
-{
-    Text [ en-US ] = "Overview" ;
-};
-String STR_EYEDROPPER
-{
-    Text [ en-US ] = "Color Replacer" ;
-};
-String STR_UNDO_MORPHING
-{
-    Text [ en-US ] = "Cross-fading" ;
-};
-String STR_UNDO_COLORRESOLUTION
-{
-    Text [ en-US ] = "Color resolution" ;
-};
-String STR_UNDO_EXPAND_PAGE
-{
-    Text [ en-US ] = "Expand Slide" ;
-};
-String STR_UNDO_SUMMARY_PAGE
-{
-    Text [ en-US ] = "Table of Contents Slide" ;
-};
-String STR_TWAIN_NO_SOURCE_UNX
-{
-    Text [ en-US ] = "No SANE source is available at the moment." ;
-};
-
-String STR_TWAIN_NO_SOURCE
-{
-    Text [ en-US ] = "At present, no TWAIN source is available." ;
-};
-
-String STR_FIX
-{
-    Text [ en-US ] = "Fixed" ;
-};
-String STR_VAR
-{
-    Text [ en-US ] = "Variable" ;
-};
-String STR_STANDARD_NORMAL
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_STANDARD_SMALL
-{
-    Text [ en-US ] = "Standard (short)" ;
-};
-String STR_STANDARD_BIG
-{
-    Text [ en-US ] = "Standard (long)" ;
-};
-String STR_FILEFORMAT_NAME_EXT
-{
-    Text [ en-US ] = "File name" ;
-};
-String STR_FILEFORMAT_FULLPATH
-{
-    Text [ en-US ] = "Path/File name" ;
-};
-String STR_FILEFORMAT_PATH
-{
-    Text [ en-US ] = "Path" ;
-};
-String STR_FILEFORMAT_NAME
-{
-    Text [ en-US ] = "File name without extension" ;
-};
-String STR_NEW_CUSTOMSHOW
-{
-    Text [ en-US ] = "New Custom Slide Show" ;
-};
-String STR_COPY_CUSTOMSHOW
-{
-    Text [ en-US ] = "Copy " ;
-};
-String STR_IMPRESS_DOCUMENT
-{
-    Text [ en-US ] = "Presentation" ;
-};
-String STR_IMPRESS_DOCUMENT_FULLTYPE_60
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Presentation" ;
-};
-String STR_GRAPHIC_DOCUMENT
-{
-    Text [ en-US ] = "Drawing" ;
-};
-String STR_GRAPHIC_DOCUMENT_FULLTYPE_60
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Drawing" ;
-};
-String STR_BREAK_METAFILE
-{
-    Text [ en-US ] = "Ungroup Metafile(s)...";
-};
-String STR_BREAK_FAIL
-{
-    Text [ en-US ] = "It was not possible to ungroup all drawing objects.";
-};
-
-// HtmlExport
-String STR_PUBDLG_SAMENAME
-{
-    Text [ en-US ] = "A design already exists with this name.\nDo you want to replace it?";
-};
-
-String STR_HTMLATTR_TEXT
-{
-    Text [ en-US ] = "Text";
-};
-
-String STR_HTMLATTR_LINK
-{
-    Text [ en-US ] = "Hyperlink";
-};
-
-String STR_HTMLATTR_VLINK
-{
-    Text [ en-US ] = "Visited link";
-};
-
-String STR_HTMLATTR_ALINK
-{
-    Text [ en-US ] = "Active link";
-};
-
-String STR_HTMLEXP_NOTES
-{
-    Text [ en-US ] = "Notes";
-};
-
-String STR_HTMLEXP_CONTENTS
-{
-    Text [ en-US ] = "Table of contents";
-};
-
-String STR_HTMLEXP_CLICKSTART
-{
-    Text [ en-US ] = "Click here to start";
-};
-
-String STR_HTMLEXP_AUTHOR
-{
-    Text [ en-US ] = "Author";
-};
-
-String STR_HTMLEXP_EMAIL
-{
-    Text [ en-US ] = "E-mail";
-};
-
-String STR_HTMLEXP_HOMEPAGE
-{
-    Text [ en-US ] = "Homepage";
-};
-
-String STR_HTMLEXP_INFO
-{
-    Text [ en-US ] = "Further information";
-};
-
-String STR_HTMLEXP_DOWNLOAD
-{
-    Text [ en-US ] = "Download presentation";
-};
-
-String STR_HTMLEXP_NOFRAMES
-{
-    Text [ en-US ] = "Unfortunately your browser does not support floating frames.";
-};
-
-String STR_HTMLEXP_FIRSTPAGE
-{
-    Text [ en-US ] = "First page";
-};
-
-String STR_HTMLEXP_LASTPAGE
-{
-    Text [ en-US ] = "Last page";
-};
-
-String STR_HTMLEXP_SETTEXT
-{
-    Text [ en-US ] = "Text";
-};
-
-String STR_HTMLEXP_SETGRAPHIC
-{
-    Text [ en-US ] = "Image";
-};
-
-String STR_HTMLEXP_OUTLINE
-{
-    Text [ en-US ] = "With contents";
-};
-
-String STR_HTMLEXP_NOOUTLINE
-{
-    Text [ en-US ] = "Without contents";
-};
-
-String STR_WEBVIEW_SAVE
-{
-    Text [ en-US ] = "To given page";
-};
-
-String STR_UNDO_VECTORIZE
-{
-    Text [ en-US ] = "Convert bitmap to polygon" ;
-};
-
-String STR_PRES_SOFTEND
-{
-    Text [ en-US ] = "Click to exit presentation..." ;
-};
-
-String STR_PRES_PAUSE
-{
-    Text [ en-US ] = "Pause..." ;
-};
-
-String STR_UNDO_APPLY_3D_FAVOURITE
-{
-    Text [ en-US ] = "Apply 3D favorite";
-};
-
-String STR_UNDO_GRAFFILTER
-{
-    Text [ en-US ] = "Image filter" ;
-};
-
-String STR_WARNING_NOSOUNDFILE
-{
-    Text [ en-US ] = "The file %\nis not a valid audio file !" ;
-};
-
-String STR_UNDO_CONVERT_TO_METAFILE
-{
-    Text [ en-US ] = "Convert to metafile" ;
-};
-
-String STR_UNDO_CONVERT_TO_BITMAP
-{
-    Text [ en-US ] = "Convert to bitmap" ;
-};
-String STR_HTMLEXP_ERROR_CREATE_FILE
-{
-    Text [ en-US ] = "Cannot create the file $(URL1).";
-};
-String STR_HTMLEXP_ERROR_OPEN_FILE
-{
-    Text [ en-US ] = "Could not open the file $(URL1).";
-};
-String STR_HTMLEXP_ERROR_COPY_FILE
-{
-    Text [ en-US ] = "The file $(URL1) could not be copied to $(URL2)";
-};
-String STR_PAGE_BACKGROUND_TITLE
-{
-    Text [ en-US ] = "Page Settings" ;
-};
-String STR_PAGE_BACKGROUND_TXT
-{
-    Text [ en-US ] = "Background settings for all pages?" ;
-};
-
-String STR_STATUSBAR_MASTERPAGE
-{
-    Text [ en-US ] = "Slide Master name. Right-click for list and double-click for dialog.";
-};
-
-String STR_TITLE_RENAMESLIDE
-{
-    Text [ en-US ] = "Rename Slide";
-};
-String STR_DESC_RENAMESLIDE
-{
-    Text [ en-US ] = "Name";
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_TITLE
-{
-    Text [ en-US ] = "Title Area for AutoLayouts" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_OUTLINE
-{
-    Text [ en-US ] = "Object Area for AutoLayouts" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_FOOTER
-{
-    Text [ en-US ] = "Footer Area" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_HEADER
-{
-    Text [ en-US ] = "Header Area" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_DATETIME
-{
-    Text [ en-US ] = "Date Area" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_SLIDE
-{
-    Text [ en-US ] = "Slide Number Area" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_NUMBER
-{
-    Text [ en-US ] = "Page Number Area" ;
-};
-
-String STR_FIELD_PLACEHOLDER_HEADER
-{
-    Text [ en-US ] = "<header>" ;
-};
-
-String STR_FIELD_PLACEHOLDER_FOOTER
-{
-    Text [ en-US ] = "<footer>" ;
-};
-
-String STR_FIELD_PLACEHOLDER_DATETIME
-{
-    Text [ en-US ] = "<date/time>" ;
-};
-String STR_FIELD_PLACEHOLDER_NUMBER
-{
-    Text [ en-US ] = "<number>" ;
-};
-String STR_FIELD_PLACEHOLDER_COUNT
-{
-    Text [ en-US ] = "<count>" ;
-};
-
-String STR_FIELD_PLACEHOLDER_SLIDENAME
-{
-    Text [ en-US ] = "<slide-name>" ;
-};
-
-String STR_FIELD_PLACEHOLDER_PAGENAME
-{
-    Text [ en-US ] = "<page-name>" ;
-};
-
-String STR_PLACEHOLDER_DESCRIPTION_NOTES
-{
-    Text [ en-US ] = "Notes Area";
-};
-
-String STR_UNDO_HANGULHANJACONVERSION
-{
-    Text [ en-US ] = "Hangul/Hanja Conversion";
-};
-
-String STR_LEFT_PANE_IMPRESS_TITLE
-{
-    Text [ en-US ] = "Slides";
-};
-String STR_LEFT_PANE_DRAW_TITLE
-{
-    Text [ en-US ] = "Pages";
-};
-String STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION
-{
-    Text [ en-US ] = "Preview not available";
-};
-String STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION
-{
-    Text [ en-US ] = "Preparing preview";
-};
-String STR_TASKPANEL_LAYOUT_MENU_TITLE
-{
-    Text [ en-US ] = "Layouts";
-};
-String STR_GRAPHICS_STYLE_FAMILY
-{
-    Text [ en-US ] = "Drawing Styles";
-};
-String STR_PRESENTATIONS_STYLE_FAMILY
-{
-    Text [ en-US ] = "Presentation Styles";
-};
-String STR_CELL_STYLE_FAMILY
-{
-    Text [ en-US ] = "Cell Styles";
-};
-String STR_NAVIGATOR_SHOW_NAMED_SHAPES
-{
-    Text [ en-US ] = "Named shapes";
-};
-String STR_NAVIGATOR_SHOW_ALL_SHAPES
-{
-    Text [ en-US ] = "All shapes";
-};
-String STR_NAVIGATOR_SHAPE_BASE_NAME
-{
-    Text [ en-US ] = "Shape %1";
-};
-String STR_SET_BACKGROUND_PICTURE
-{
-    Text [ en-US ] = "Set Background Image for Slide ..." ;
-};
-
-String RID_ANNOTATIONS_START
-{
-     Text [ en-US ] = "Comments";
-};
-
-String STR_RESET_LAYOUT
-{
-    Text[ en-US ] = "Reset Slide Layout";
-};
-
-String STR_INSERT_TABLE
-{
-     Text [ en-US ] = "Insert Table";
-};
-
-String STR_INSERT_CHART
-{
-     Text [ en-US ] = "Insert Chart";
-};
-
-String STR_INSERT_PICTURE
-{
-     Text [ en-US ] = "Insert Image";
-};
-
-String STR_INSERT_MOVIE
-{
-     Text [ en-US ] = "Insert Audio or Video";
-};
-
-String STRING_DRAG_AND_DROP_PAGES
-{
-     Text [ en-US ] = "Drag and Drop Pages" ;
-};
-
-String STRING_DRAG_AND_DROP_SLIDES
-{
-     Text [ en-US ] = "Drag and Drop Slides" ;
-};
-
-String STR_PHOTO_ALBUM_EMPTY_WARNING
-{
-     Text [ en-US ] = "Please add Images to the Album." ;
-};
-
-String STR_PHOTO_ALBUM_TEXTBOX
-{
-    Text [ en-US ] = "Text Slide";
-};
-
-String STR_INSERT_3D_MODEL_TITLE
-{
-    Text [ en-US ] = "Insert 3D Model";
-};
-
-String STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS
-{
-    Text [ en-US ] = "All supported formats";
-};
-
-String STR_OBJECTS_TREE
-{
-    Text [ en-US ] = "Page Tree";
-};
-
-String STR_OVERWRITE_WARNING
-{
-    Text [ en-US  ] = "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src
deleted file mode 100644
index 30158180382c..000000000000
--- a/sd/source/ui/app/toolbox.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/.
- *
- * 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 "app.hrc"
-#include "cfgids.hxx"
-#include <svx/svxids.hrc>
-
-String RID_DRAW_MEDIA_TOOLBOX
-{
-    Text [ en-US ] = "Media Playback" ;
-};
-
-String RID_DRAW_TABLE_TOOLBOX
-{
-    Text [ en-US ] = "Table" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index 29748337eca4..8897fc61a634 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -14,7 +14,7 @@
 #include <vcl/toolbox.hxx>
 
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
 
@@ -71,7 +71,7 @@ struct snewfoil_value_info
 {
     sal_uInt16 mnId;
     const char* msBmpResId;
-    sal_uInt16 mnStrResId;
+    const char* mpStrResId;
     const char* msUnoCommand;
 };
 
@@ -93,7 +93,7 @@ static const snewfoil_value_info editmodes[] =
         BMP_DISPLAYMODE_SLIDE_SORTER,
         STR_SLIDE_SORTER_MODE,
         ".uno:DiaMode" },
-    {0, "", 0, "" }
+    {0, "", nullptr, "" }
 };
 
 static const snewfoil_value_info mastermodes[] =
@@ -110,7 +110,7 @@ static const snewfoil_value_info mastermodes[] =
         BMP_DISPLAYMODE_HANDOUT_MASTER,
         STR_HANDOUT_MASTER_MODE,
         ".uno:HandoutMode" },
-    {0, "", 0, "" }
+    {0, "", nullptr, "" }
 };
 
 
@@ -119,7 +119,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
     Size aLayoutItemSize;
     for( ; pInfo->mnId; pInfo++ )
     {
-        OUString aText( SdResId( pInfo->mnStrResId ) );
+        OUString aText(SdResId(pInfo->mpStrResId));
         BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
 
         pValue->InsertItem(pInfo->mnId, Image(aBmp), aText);
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b0fa04755aa9..5ebe1e8282ac 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -41,9 +41,9 @@
 
 #include "app.hrc"
 #include "facreg.hxx"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
 #include "pres.hxx"
@@ -82,14 +82,14 @@ private:
 struct snewfoil_value_info_layout
 {
     const char* msBmpResId;
-    sal_uInt16 mnStrResId;
+    const char* mpStrResId;
     AutoLayout maAutoLayout;
 };
 
 static const snewfoil_value_info_layout notes[] =
 {
     {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
-    {"", 0, AUTOLAYOUT_NONE},
+    {nullptr, nullptr, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info_layout handout[] =
@@ -100,7 +100,7 @@ static const snewfoil_value_info_layout handout[] =
     {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
     {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
     {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
-    {"", 0, AUTOLAYOUT_NONE},
+    {nullptr, nullptr, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info_layout standard[] =
@@ -117,7 +117,7 @@ static const snewfoil_value_info_layout standard[] =
     {BMP_LAYOUT_HEAD02B,  STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT },
     {BMP_LAYOUT_HEAD04,   STR_AUTOLAYOUT_4CONTENT,             AUTOLAYOUT_TITLE_4CONTENT },
     {BMP_LAYOUT_HEAD06,   STR_AUTOLAYOUT_6CONTENT,             AUTOLAYOUT_TITLE_6CONTENT },
-    {"", 0, AUTOLAYOUT_NONE}
+    {nullptr, nullptr, AUTOLAYOUT_NONE}
 };
 
 static const snewfoil_value_info_layout v_standard[] =
@@ -127,15 +127,15 @@ static const snewfoil_value_info_layout v_standard[] =
     {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,    AUTOLAYOUT_VTITLE_VCONTENT                 },
     {BMP_LAYOUT_HEAD02,     STR_AL_TITLE_VERT_OUTLINE,         AUTOLAYOUT_TITLE_VCONTENT                  },
     {BMP_LAYOUT_HEAD02A,    STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT                    },
-    {"", 0, AUTOLAYOUT_NONE}
+    {nullptr, nullptr, AUTOLAYOUT_NONE}
 };
 
 static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo )
 {
     Size aLayoutItemSize;
-    for( ; pInfo->mnStrResId; pInfo++ )
+    for( ; pInfo->mpStrResId; pInfo++ )
     {
-        OUString aText( SdResId( pInfo->mnStrResId ) );
+        OUString aText(SdResId(pInfo->mpStrResId));
         BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
 
         pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1,
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index a1481e44a36b..a7a9506f6821 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -27,9 +27,9 @@
 #include "sdmod.hxx"
 #include "helpids.h"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "DrawViewShell.hxx"
 #include "Window.hxx"
 #include "View.hxx"
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index cd83474c0af4..34db1be617a7 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -43,14 +43,14 @@ PaneChildWindow::PaneChildWindow (
     sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* pInfo,
-    const sal_uInt16 nTitleBarResId)
+    const char* pTitleBarResId)
     : SfxChildWindow (pParentWindow, nId)
 {
     SetWindow( VclPtr<PaneDockingWindow>::Create(
         pBindings,
         this,
         pParentWindow,
-        SdResId(nTitleBarResId)));
+        SdResId(pTitleBarResId)));
     SetAlignment(SfxChildAlignment::LEFT);
     static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo);
     SetHideNotDelete(true);
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 2dbe88d41039..769d5ee79f9a 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -22,7 +22,7 @@
 #include "ViewShellBase.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include "sdresid.hxx"
-#include "res_bmp.hrc"
+
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/taskpanelist.hxx>
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 6b3635e023b7..81487f00edee 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -21,7 +21,7 @@
 
 #include "PaneChildWindows.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 
 #include <sfx2/msg.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 8b3d06dcd829..c32fc284e896 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include "svtools/controldims.hrc"
+#include "svtools/controldims.hxx"
 
 #include "RemoteDialogClientBox.hxx"
 #include "RemoteServer.hxx"
@@ -31,7 +31,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 
 using namespace std;
 
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 4071cc1a023e..83f5b9929d2d 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -26,7 +26,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sfx2/doctempl.hxx>
-#include <sfx2/templatelocnames.hrc>
 #include <com/sun/star/frame/DocumentTemplates.hpp>
 #include <com/sun/star/frame/XDocumentTemplates.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 250bdee0c546..4388395321d9 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -35,7 +35,7 @@
 #include "View.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include "res_bmp.hrc"
+
 #include "ViewShell.hxx"
 
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 23f8b92d51cd..80209f44ddf1 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -35,7 +35,7 @@
 #include "View.hxx"
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
+
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index c70536b1dc76..5bcce5a073d0 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -26,7 +26,7 @@
 
 #include "sdresid.hxx"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 540ddbcf911b..f6ca37bee279 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -38,7 +38,7 @@
 
 #include "sdresid.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "bulmaper.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 296349f0d887..80379f718023 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -20,7 +20,7 @@
 #include "inspagob.hxx"
 
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 72fb0312b758..91df1ef2564b 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -43,7 +43,7 @@
 #include "pgjump.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
@@ -267,11 +267,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
 
         for (sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; ++nID)
         {
-            sal_uInt16 nRId = GetDragTypeSdStrId((NavigatorDragType)nID);
-            if( nRId > 0 )
+            const char* pRId = GetDragTypeSdStrId((NavigatorDragType)nID);
+            if (pRId)
             {
                 DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!");
-                pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK);
+                pMenu->InsertItem(nID, SdResId(pRId), MenuItemBits::RADIOCHECK);
                 pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]);
             }
 
@@ -617,12 +617,12 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
     maLbDocs->SelectEntryPos( nPos );
 }
 
-sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT)
+const char* SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT)
 {
     switch( eDT )
     {
         case NAVIGATOR_DRAGTYPE_NONE:
-                return STR_NONE;
+                return STR_SD_NONE;
         case NAVIGATOR_DRAGTYPE_URL:
                 return STR_DRAGTYPE_URL;
         case NAVIGATOR_DRAGTYPE_EMBEDDED:
@@ -631,7 +631,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT)
                 return STR_DRAGTYPE_LINK;
         default: OSL_FAIL( "No resource for DragType available!" );
     }
-    return 0;
+    return nullptr;
 }
 
 OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT)
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index df9f29096e2d..45eb2c5adcb0 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -31,7 +31,7 @@
 #include <editeng/outliner.hxx>
 #include "paragr.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdattr.hrc"
 
 class SdParagraphNumTabPage : public SfxTabPage
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index e88ad3551298..a288cd7a117b 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -35,7 +35,7 @@
 #include <svl/cjkoptions.hxx>
 
 #include "DrawDocShell.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "prltempl.hxx"
 #include "prltempl.hrc"
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 280856096549..6fe9e2b2b35b 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -22,7 +22,7 @@
 #include <vcl/msgbox.hxx>
 
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "sdpreslt.hxx"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index bf8eec60970d..942a391d4b04 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -40,7 +40,7 @@
 #include "sdresid.hxx"
 #include "navigatr.hxx"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "customshowlist.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index ef1529ac81bb..2aae8a2bd5ef 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -29,6 +29,7 @@
 
 #include "sdattr.hxx"
 #include <sfx2/sfxresid.hxx>
+#include <sfx2/strings.hrc>
 
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
@@ -59,7 +60,7 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "filedlg.hxx"
 
 #include <algorithm>
@@ -265,8 +266,8 @@ void SdTPAction::Construct()
     // fill Action-Listbox
     for (presentation::ClickAction & rAction : maCurrentActions)
     {
-        sal_uInt16 nRId = GetClickActionSdResId( rAction );
-        m_pLbAction->InsertEntry( SdResId( nRId ) );
+        const char* pRId = GetClickActionSdResId(rAction);
+        m_pLbAction->InsertEntry(SdResId(pRId));
     }
 
 }
@@ -843,7 +844,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
     return aStr;
 }
 
-sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
+const char* SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
 {
     switch( eCA )
     {
@@ -861,7 +862,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
         case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION;
         default: OSL_FAIL( "No StringResource for ClickAction available!" );
     }
-    return 0;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 8f3510bf7839..b05e705a11a9 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -239,12 +239,10 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr
     m_pScaleFrame->Hide();
 
     // fill ListBox with metrics
-    SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
-
-    for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+    for (sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i)
     {
-        OUString sMetric = aMetricArr.GetStringByPos( i );
-        sal_IntPtr nFieldUnit = aMetricArr.GetValue( i );
+        OUString sMetric = SvxFieldUnitTable::GetString(i);
+        sal_IntPtr nFieldUnit = SvxFieldUnitTable::GetValue(i);
         sal_Int32 nPos = m_pLbMetric->InsertEntry( sMetric );
         m_pLbMetric->SetEntryData( nPos, reinterpret_cast<void*>(nFieldUnit) );
     }
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 1e0b6d99a5a1..6fdcfd18d24c 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -32,7 +32,7 @@
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include "stlsheet.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 1062de5e6bdb..325b0750a2f5 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -34,7 +34,7 @@
 #include "ClientView.hxx"
 #include "Window.hxx"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "sdresid.hxx"
 #include "strmname.h"
 #include "fupoor.hxx"
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 35f8a38ebe0d..060b322f6b7d 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -45,8 +45,8 @@
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
 
 #include "strings.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdmod.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 13f0db45e22a..c124c564a5a1 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -57,7 +57,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "strmname.h"
 #include "FrameView.hxx"
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index e0e7791da206..b59e2c73eba7 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -58,8 +58,8 @@
 #include "View.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "fupoor.hxx"
 #include "fusearch.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index af6393990123..b74f23c41c0b 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -29,7 +29,7 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "GraphicDocShell.hxx"
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 07a946765bab..7db884efeefe 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -36,7 +36,7 @@
 #include <svx/camera3d.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "View.hxx"
 #include "Window.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 8860c006b2b7..1cb513f6ae60 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -33,7 +33,7 @@
 #include "app.hrc"
 #include "Window.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
+
 #include "View.hxx"
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 1de24b2bf9c9..ce8fbdde05c5 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -39,7 +39,7 @@
 #include "Window.hxx"
 #include "ToolBarManager.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 086163373eee..b91dccd0360d 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -62,8 +62,8 @@
 #include "Window.hxx"
 #include "stlpool.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 9add8904b85c..3871611bde24 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdpagv.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
@@ -59,8 +59,8 @@
 #include "Window.hxx"
 #include "stlpool.hxx"
 #include "drawdoc.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 
 namespace sd {
 
@@ -499,14 +499,14 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
 /**
  * set line starts and ends for the object to be created
  */
-::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc )
+::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc)
 {
     ::basegfx::B2DPolyPolygon aRetval;
     XLineEndListRef pLineEndList = pDoc->GetLineEndList();
 
     if( pLineEndList.is() )
     {
-        OUString aArrowName( SvxResId(nResId) );
+        OUString aArrowName(SvxResId(pResId));
         long nCount = pLineEndList->Count();
         long nIndex;
         for( nIndex = 0L; nIndex < nCount; nIndex++ )
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index d2edf1bbca02..b915f74e1233 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -28,7 +28,7 @@
 #include <sfx2/viewfrm.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "fudraw.hxx"
 #include "View.hxx"
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 45a3f0f1f5cf..214814626665 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -29,7 +29,7 @@
 #include <svx/dialogs.hrc>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "ViewShell.hxx"
 #include "View.hxx"
 #include "Window.hxx"
@@ -37,7 +37,7 @@
 #include "ToolBarManager.hxx"
 #include "drawdoc.hxx"
 #include "sdresid.hxx"
-#include "res_bmp.hrc"
+
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d1e023eed8c6..bb8db8ff8af5 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -41,9 +41,9 @@
 #include "anminfo.hxx"
 #include "imapinfo.hxx"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdmod.hxx"
 #include "GraphicDocShell.hxx"
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 53c6a8450b66..1142e77ae1f9 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -25,7 +25,7 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "Window.hxx"
 #include "drawdoc.hxx"
 #include "FrameView.hxx"
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 14487d300c3f..413e76224514 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
 #include <svl/globalnameitem.hxx>
@@ -85,7 +85,7 @@
 #include <vcl/svapp.hxx>
 #include "undo/undoobjects.hxx"
 #include <memory>
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <config_features.h>
 
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 9b15e53d8245..daf8b0a00c72 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -51,7 +51,7 @@
 #include "View.hxx"
 #include "strings.hrc"
 #include "stlpool.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "strmname.h"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 95a94b859c6b..0fbecf437dfa 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -33,7 +33,7 @@
 #include "svx/xtable.hxx"
 
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index f171a22cc1ec..24803eb84020 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -25,7 +25,7 @@
 #include <sfx2/request.hxx>
 #include <editeng/numitem.hxx>
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <editeng/editdata.hxx>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 2cd427f0b19b..f93561f116ad 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -43,7 +43,7 @@
 #include <editeng/lrspitem.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <sfx2/bindings.hxx>
-#include "glob.hrc"
+#include "strings.hrc"
 #include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/sizeitem.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index b2b09be755e5..d2e10546c104 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -35,7 +35,7 @@
 #include "FrameView.hxx"
 #include "stlpool.hxx"
 #include "View.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "strings.hrc"
 #include "strmname.h"
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 169dd4f237f3..86b104f84c54 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -25,9 +25,9 @@
 #include <svl/hint.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
 #include "prltempl.hrc"
 #include "strings.hxx"
 
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index f3df9d260562..8907eb159326 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -44,7 +44,7 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "GraphicDocShell.hxx"
 #include "sdmod.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index c0ab1580bf6c..329ddbaf849c 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -26,7 +26,7 @@
 #include "sdresid.hxx"
 #include "strings.hrc"
 #include "sdattr.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdmod.hxx"
 #include "ViewShell.hxx"
 #include "Window.hxx"
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 3a5ce9adb82e..1ec074ebfd7d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -57,8 +57,8 @@
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "ViewShell.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "prlayout.hxx"
 #include "prltempl.hrc"
 #include <svx/xfillit.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index f4ccb45eb6c2..1690404032ef 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -54,7 +54,7 @@
 
 #include "sdresid.hxx"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
 #include "View.hxx"
@@ -66,7 +66,7 @@
 #include "FrameView.hxx"
 #include "ToolBarManager.hxx"
 #include "DrawDocShell.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "pres.hxx"
 #include "optsitem.hxx"
 
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 1f361c0f4868..7675f474b3e3 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -67,7 +67,7 @@ rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell* pViewSh, ::sd::Window* pW
 void FuThesaurus::DoExecute( SfxRequest& )
 {
     SfxErrorContext aContext(ERRCTX_SVX_LINGU_THESAURUS, OUString(),
-                             mpWindow, RID_SVXERRCTX, &DIALOG_MGR() );
+                             mpWindow, getRID_SVXERRCTX(), &SvxResLocale());
 
     if (mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) !=  nullptr)
     {
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx
index 0d0d1c36b3ec..d277a808d6b7 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -33,7 +33,7 @@ public:
         sal_uInt16 nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo,
-        const sal_uInt16 nTitleBarResId);
+        const char* pTitleBarResId);
     virtual ~PaneChildWindow() override;
 };
 
diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx
index d56cc0a23b1d..44ccb06b75e7 100644
--- a/sd/source/ui/inc/cfgids.hxx
+++ b/sd/source/ui/inc/cfgids.hxx
@@ -29,10 +29,6 @@
 // Acceleratoren, Menus, ...
 #define RID_DRAW_STATUSBAR          (SFX_ITEMTYPE_SD_BEGIN + 7)
 
-// Toolbars
-#define RID_DRAW_TABLE_TOOLBOX      (SFX_ITEMTYPE_SD_BEGIN + 18)
-#define RID_DRAW_MEDIA_TOOLBOX      (SFX_ITEMTYPE_SD_BEGIN + 31)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index f8e2590a06db..9a57ad02d8e4 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -127,7 +127,7 @@ private:
     */
     //    bool                        mbShowAllShapes;
 
-    static sal_uInt16           GetDragTypeSdStrId(NavigatorDragType eDT);
+    static const char*          GetDragTypeSdStrId(NavigatorDragType eDT);
     static OUString             GetDragTypeSdBmpId(NavigatorDragType eDT);
     NavDocInfo*                 GetDocInfo();
 
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
deleted file mode 100644
index 724c976c5f3f..000000000000
--- a/sd/source/ui/inc/res_bmp.hrc
+++ /dev/null
@@ -1,25 +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 "sfx2/sfx.hrc"
-#include "cfgids.hxx"
-
-#define RID_GRAPHICSTYLEFAMILY      RID_APP_START+395
-#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc
deleted file mode 100644
index abf2acf68755..000000000000
--- a/sd/source/ui/inc/sdstring.hrc
+++ /dev/null
@@ -1,28 +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 <sfx2/sfx.hrc>
-#define SID_SD_STRING_START         RID_APP_START+300
-
-// Texts for search and replace info and question boxes.
-#define STR_SAR_WRAP_FORWARD        SID_SD_STRING_START+24
-#define STR_SAR_WRAP_BACKWARD       SID_SD_STRING_START+25
-#define STR_SAR_WRAP_FORWARD_DRAW   SID_SD_STRING_START+26
-#define STR_SAR_WRAP_BACKWARD_DRAW  SID_SD_STRING_START+27
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
deleted file mode 100644
index fccad3a6c8a9..000000000000
--- a/sd/source/ui/inc/strings.hrc
+++ /dev/null
@@ -1,392 +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 "sfx2/sfx.hrc"
-#include "cfgids.hxx"
-
-#define STR_NULL                (RID_APP_START+3)
-#define STR_INSERTPAGE          (RID_APP_START+35)
-#define STR_INSERTLAYER         (RID_APP_START+37)
-#define STR_MODIFYLAYER         (RID_APP_START+38)
-#define STR_UNDO_REPLACE        (RID_APP_START+42)
-
-/*
- *  Dummy-Strings, these ResourceIDs: should not be assigned to other strings
- *  as they're used for popup-menus (a popup-menu and its
- *  configurations string should have identical ResourceID's!).
- *  See also: res_bmp.hrc, popup.src
- */
-
-#define STR_UNDO_CUT            (RID_APP_START+59)
-#define STR_UNDO_DRAGDROP       (RID_APP_START+66)
-#define STR_INSERTGRAPHIC       (RID_APP_START+67)
-
-#define STR_DRAGTYPE_URL            (RID_APP_START+70)
-#define STR_DRAGTYPE_EMBEDDED       (RID_APP_START+71)
-#define STR_DRAGTYPE_LINK           (RID_APP_START+72)
-#define STR_GLUE_ESCDIR_SMART       (RID_APP_START+73)
-#define STR_GLUE_ESCDIR_LEFT        (RID_APP_START+74)
-#define STR_GLUE_ESCDIR_RIGHT       (RID_APP_START+75)
-#define STR_GLUE_ESCDIR_TOP         (RID_APP_START+76)
-#define STR_GLUE_ESCDIR_BOTTOM      (RID_APP_START+77)
-#define STR_GLUE_ESCDIR_LO          (RID_APP_START+78)
-#define STR_GLUE_ESCDIR_LU          (RID_APP_START+79)
-#define STR_GLUE_ESCDIR_RO          (RID_APP_START+80)
-#define STR_GLUE_ESCDIR_RU          (RID_APP_START+81)
-#define STR_GLUE_ESCDIR_HORZ        (RID_APP_START+82)
-#define STR_GLUE_ESCDIR_VERT        (RID_APP_START+83)
-#define STR_GLUE_ESCDIR_ALL         (RID_APP_START+84)
-
-#define STR_CANT_PERFORM_IN_LIVEMODE   (RID_APP_START+85)
-#define STR_PUBLISH_BACK            (RID_APP_START+86)
-#define STR_PUBLISH_NEXT            (RID_APP_START+87)
-#define STR_PUBLISH_OUTLINE         (RID_APP_START+88)
-#define STR_UNDO_COLORRESOLUTION    (RID_APP_START+89)
-
-/* keep 90 - 100 free for popup's */
-#define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92)
-#define STR_WARN_PAGE_EXISTS        (RID_APP_START+93)
-
-#define STR_SLIDE_SORTER_MODE       (RID_APP_START+121)
-#define STR_NORMAL_MODE             (RID_APP_START+122)
-#define STR_OUTLINE_MODE            (RID_APP_START+123)
-#define STR_SLIDE_MASTER_MODE       (RID_APP_START+124)
-#define STR_NOTES_MASTER_MODE       (RID_APP_START+125)
-
-#define STR_UNDO_BEZCLOSE           (RID_APP_START+127)
-
-#define STR_END_SPELLING_OBJ        (RID_APP_START+129)
-#define STR_NOTES_MODE              (RID_APP_START+135)
-#define STR_HANDOUT_MASTER_MODE     (RID_APP_START+136)
-
-#define STR_LINEEND                 (RID_APP_START+137)
-#define STR_DESC_LINEEND            (RID_APP_START+138)
-#define STR_WARN_NAME_DUPLICATE     (RID_APP_START+139)
-#define STR_UNDO_COPYOBJECTS        (RID_APP_START+140)
-#define STR_DESC_NAMEGROUP          (RID_APP_START+141)
-#define STR_TITLE_NAMEGROUP         (RID_APP_START+143)
-
-#define STR_SNAPDLG_SETLINE         (RID_APP_START+144)
-#define STR_SNAPDLG_SETPOINT        (RID_APP_START+145)
-#define STR_POPUP_EDIT_SNAPLINE     (RID_APP_START+146)
-#define STR_POPUP_EDIT_SNAPPOINT    (RID_APP_START+147)
-
-#define STR_IMPRESS                 (RID_APP_START+149)
-#define STR_IMPRESS_DOCUMENT        (RID_APP_START+154)
-#define STR_LAYER                   (RID_APP_START+158)
-
-#define STR_POPUP_DELETE_SNAPLINE   (RID_APP_START+160)
-#define STR_POPUP_DELETE_SNAPPOINT  (RID_APP_START+161)
-
-#define STR_EYEDROPPER              (RID_APP_START+163)
-
-#define STR_UNDO_MORPHING           (RID_APP_START+164)
-
-#define STR_IMPRESS_DOCUMENT_FULLTYPE_60  (RID_APP_START+170)
-
-// IDs for presentation slides
-#define STR_AUTOLAYOUT_NONE                     (RID_APP_START+210)
-#define STR_AUTOLAYOUT_ONLY_TITLE               (RID_APP_START+211)
-#define STR_AUTOLAYOUT_ONLY_TEXT                (RID_APP_START+212)
-#define STR_AUTOLAYOUT_TITLE                    (RID_APP_START+213)
-#define STR_AUTOLAYOUT_CONTENT                  (RID_APP_START+214)
-#define STR_AUTOLAYOUT_2CONTENT                 (RID_APP_START+215)
-#define STR_AUTOLAYOUT_CONTENT_2CONTENT         (RID_APP_START+217)
-#define STR_AUTOLAYOUT_2CONTENT_CONTENT         (RID_APP_START+218)
-#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT    (RID_APP_START+220)
-#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT     (RID_APP_START+221)
-#define STR_AUTOLAYOUT_4CONTENT                 (RID_APP_START+222)
-#define STR_AUTOLAYOUT_6CONTENT                 (RID_APP_START+223)
-    // FREE
-#define STR_AUTOLAYOUT_HANDOUT1             (RID_APP_START+231)
-#define STR_AUTOLAYOUT_HANDOUT2             (RID_APP_START+232)
-#define STR_AUTOLAYOUT_HANDOUT3             (RID_APP_START+233)
-#define STR_AUTOLAYOUT_HANDOUT4             (RID_APP_START+234)
-#define STR_AUTOLAYOUT_HANDOUT6             (RID_APP_START+235)
-#define STR_AUTOLAYOUT_NOTES                (RID_APP_START+236)
-#define STR_AUTOLAYOUT_HANDOUT9             (RID_APP_START+237)
-
-#define STR_DISPLAYMODE_EDITMODES           (RID_APP_START+238)
-#define STR_DISPLAYMODE_MASTERMODES         (RID_APP_START+239)
-
-#define STR_TRANSFORM                       (RID_APP_START+240)
-
-#define STR_EXPORT_HTML_NAME                (RID_APP_START+244)
-#define STR_TWAIN_NO_SOURCE_UNX             (RID_APP_START+262)
-#define STR_UNDO_DELETEPAGES                (RID_APP_START+265)
-#define STR_UNDO_INSERTPAGES                (RID_APP_START+266)
-
-#define STR_ASK_DELETE_LAYER                (RID_APP_START+267)
-#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT    (RID_APP_START+268)
-#define STR_WAV_FILE                        (RID_APP_START+269)
-#define STR_MIDI_FILE                       (RID_APP_START+270)
-#define STR_SD_PAGE                         (RID_APP_START+271)
-#define STR_SD_PAGE_COUNT                   (RID_APP_START+272)
-#define STR_SD_PAGE_COUNT_CUSTOM            (RID_APP_START+273)
-
-#define STR_ALL_FILES                       (RID_APP_START+274)
-#define STR_UNDO_INSERT_TEXTFRAME           (RID_APP_START+275)
-#define STR_ACTION_NOTPOSSIBLE              (RID_APP_START+278)
-#define STR_DLG_INSERT_PAGES_FROM_FILE      (RID_APP_START+279)
-#define STR_OVERWRITE_WARNING               (RID_APP_START+280)
-#define STR_SCALE_OBJECTS                   (RID_APP_START+281)
-#define STR_CREATE_PAGES                    (RID_APP_START+282)
-
-#define STR_UNDO_CHANGE_PAGEFORMAT          (RID_APP_START+283)
-#define STR_UNDO_CHANGE_PAGEBORDER          (RID_APP_START+284)
-
-#define STR_EDIT_OBJ                        (RID_APP_START+288)
-
-#define STR_READ_DATA_ERROR                 (RID_APP_START+290)
-
-/******************************************************************************
-* The Ids in sdstring.hrc start from (RID_APP_START+300) !
-******************************************************************************/
-
-#define STR_DELETE_PAGES                    (RID_APP_START+332)
-#define STR_WARN_PRINTFORMAT_FAILURE        (RID_APP_START+333)
-
-#define STR_IMPORT_GRFILTER_OPENERROR       (RID_APP_START+335)
-#define STR_IMPORT_GRFILTER_IOERROR         (RID_APP_START+336)
-#define STR_IMPORT_GRFILTER_FORMATERROR     (RID_APP_START+337)
-#define STR_IMPORT_GRFILTER_VERSIONERROR    (RID_APP_START+338)
-#define STR_IMPORT_GRFILTER_FILTERERROR     (RID_APP_START+339)
-#define STR_IMPORT_GRFILTER_TOOBIG          (RID_APP_START+340)
-
-#define STR_OBJECTS                         (RID_APP_START+341)
-#define STR_END_SPELLING                    (RID_APP_START+343)
-// empty
-#define STR_ASK_FOR_CONVERT_TO_BEZIER       (RID_APP_START+347)
-#define STR_UNDO_CHANGE_PRES_OBJECT         (RID_APP_START+349)
-#define STR_UNDO_MODIFY_PAGE                (RID_APP_START+350)
-// empty
-#define STR_UNDO_INSERT_FILE                (RID_APP_START+352)
-#define STR_UNDO_INSERT_SPECCHAR            (RID_APP_START+353)
-#define STR_UNDO_SET_PRESLAYOUT             (RID_APP_START+354)
-#define STR_PLAY                            (RID_APP_START+356)
-#define STR_STOP                            (RID_APP_START+357)
-#define STR_UNDO_ORIGINALSIZE               (RID_APP_START+359)
-#define STR_WARN_SCALE_FAIL                 (RID_APP_START+365)
-
-// strings for click-effects (Keep the sequence)
-#define STR_CLICK_ACTION_NONE               (RID_APP_START+366)
-#define STR_CLICK_ACTION_PREVPAGE           (RID_APP_START+367)
-#define STR_CLICK_ACTION_NEXTPAGE           (RID_APP_START+368)
-#define STR_CLICK_ACTION_FIRSTPAGE          (RID_APP_START+369)
-#define STR_CLICK_ACTION_LASTPAGE           (RID_APP_START+370)
-#define STR_CLICK_ACTION_BOOKMARK           (RID_APP_START+371)
-#define STR_CLICK_ACTION_DOCUMENT           (RID_APP_START+372)
-#define STR_CLICK_ACTION_SOUND              (RID_APP_START+375)
-#define STR_CLICK_ACTION_VERB               (RID_APP_START+376)
-#define STR_CLICK_ACTION_PROGRAM            (RID_APP_START+377)
-#define STR_CLICK_ACTION_MACRO              (RID_APP_START+378)
-// Keep free till at least 380
-
-#define STR_EFFECTDLG_SOUND                 (RID_APP_START+380)
-#define STR_EFFECTDLG_PAGE_OBJECT           (RID_APP_START+382)
-#define STR_EFFECTDLG_DOCUMENT              (RID_APP_START+383)
-#define STR_EFFECTDLG_PROGRAM               (RID_APP_START+384)
-#define STR_EFFECTDLG_MACRO                 (RID_APP_START+385)
-#define STR_EFFECTDLG_JUMP                  (RID_APP_START+386)
-#define STR_EFFECTDLG_ACTION                (RID_APP_START+387)
-
-/*  Continuation from RID_APP_START+43 to RID_APP_START+58:
- *  Dummy-Strings, these ResourceIDs should not be assigned to other strings,
- *  as they're used for popup-menu  (a popup-menu and its
- *  configurations string should have identical ResourceID!).
- *  See also: res_bmp.hrc, popup.src
- */
-
-#define STR_INSERT_TEXT                     (RID_APP_START+432)
-#define STR_SLIDE_SINGULAR                  (RID_APP_START+433)
-#define STR_SLIDE_PLURAL                    (RID_APP_START+434)
-#define STR_AU_FILE                         (RID_APP_START+435)
-#define STR_VOC_FILE                        (RID_APP_START+436)
-#define STR_AIFF_FILE                       (RID_APP_START+437)
-#define STR_SVX_FILE                        (RID_APP_START+438)
-
-/*           stringdefinitions for the Chart-texts
-*/
-#define STR_LOAD_PRESENTATION_LAYOUT        (RID_APP_START+448)
-
-#define STR_CLICK_ACTION_STOPPRESENTATION   (RID_APP_START+475)
-
-#define STR_UNDO_EXPAND_PAGE                (RID_APP_START+493)
-#define STR_UNDO_SUMMARY_PAGE               (RID_APP_START+494)
-
-#define STR_GRAPHIC_DOCUMENT                (RID_APP_START+499)
-#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60    (RID_APP_START+501)
-
-#define STR_FIX                             (RID_APP_START+502)
-#define STR_VAR                             (RID_APP_START+503)
-#define STR_STANDARD_NORMAL                 (RID_APP_START+504)
-#define STR_STANDARD_SMALL                  (RID_APP_START+505)
-#define STR_STANDARD_BIG                    (RID_APP_START+506)
-#define STR_FILEFORMAT_NAME_EXT             (RID_APP_START+507)
-#define STR_FILEFORMAT_FULLPATH             (RID_APP_START+508)
-#define STR_FILEFORMAT_PATH                 (RID_APP_START+509)
-#define STR_FILEFORMAT_NAME                 (RID_APP_START+510)
-
-#define STR_NEW_CUSTOMSHOW                  (RID_APP_START+512)
-#define STR_COPY_CUSTOMSHOW                 (RID_APP_START+513)
-
-#define STR_BREAK_METAFILE                  (RID_APP_START+521)
-#define STR_BREAK_FAIL                      (RID_APP_START+522)
-
-#define STR_PUBDLG_SAMENAME                 (RID_APP_START+523)
-
-#define STR_HTMLATTR_TEXT                   (RID_APP_START+524)
-#define STR_HTMLATTR_LINK                   (RID_APP_START+525)
-#define STR_HTMLATTR_VLINK                  (RID_APP_START+526)
-#define STR_HTMLATTR_ALINK                  (RID_APP_START+527)
-
-#define STR_HTMLEXP_NOTES                   (RID_APP_START+528)
-#define STR_HTMLEXP_CONTENTS                (RID_APP_START+529)
-#define STR_HTMLEXP_CLICKSTART              (RID_APP_START+530)
-#define STR_HTMLEXP_AUTHOR                  (RID_APP_START+531)
-#define STR_HTMLEXP_EMAIL                   (RID_APP_START+532)
-#define STR_HTMLEXP_HOMEPAGE                (RID_APP_START+533)
-#define STR_HTMLEXP_INFO                    (RID_APP_START+534)
-#define STR_HTMLEXP_DOWNLOAD                (RID_APP_START+536)
-#define STR_HTMLEXP_NOFRAMES                (RID_APP_START+537)
-#define STR_HTMLEXP_FIRSTPAGE               (RID_APP_START+538)
-#define STR_HTMLEXP_LASTPAGE                (RID_APP_START+539)
-#define STR_HTMLEXP_SETTEXT                 (RID_APP_START+540)
-#define STR_HTMLEXP_SETGRAPHIC              (RID_APP_START+541)
-#define STR_HTMLEXP_OUTLINE                 (RID_APP_START+542)
-#define STR_HTMLEXP_NOOUTLINE               (RID_APP_START+543)
-
-#define STR_PRES_SOFTEND                    (RID_APP_START+550)
-#define STR_PRES_PAUSE                      (RID_APP_START+551)
-
-#define STR_WEBVIEW_SAVE                    (RID_APP_START+555)
-
-#define STR_UNDO_APPLY_3D_FAVOURITE         (RID_APP_START+556)
-
-//free (RID_APP_START+557)
-
-#define STR_WARNING_NOSOUNDFILE             (RID_APP_START+565)
-
-#define STR_UNDO_GRAFFILTER                 (RID_APP_START+570)
-
-#define STR_UNDO_CONVERT_TO_METAFILE        (RID_APP_START+571)
-#define STR_UNDO_CONVERT_TO_BITMAP          (RID_APP_START+572)
-
-#define STR_HTMLEXP_ERROR_CREATE_FILE       (RID_APP_START+578)
-#define STR_HTMLEXP_ERROR_OPEN_FILE         (RID_APP_START+579)
-#define STR_HTMLEXP_ERROR_COPY_FILE         (RID_APP_START+580)
-
-#define STR_PAGE_BACKGROUND_TXT             (RID_APP_START+583)
-#define STR_PAGE_BACKGROUND_TITLE           (RID_APP_START+584)
-
-#define STR_STATUSBAR_MASTERPAGE            (RID_APP_START+600)
-
-#define STR_TWAIN_NO_SOURCE                 (RID_APP_START+670)
-#define STR_UNDO_VECTORIZE                  (RID_APP_START+671)
-
-#define STR_AL_VERT_TITLE_TEXT_CHART      (RID_APP_START+672)
-#define STR_AL_VERT_TITLE_VERT_OUTLINE    (RID_APP_START+673)
-#define STR_AL_TITLE_VERT_OUTLINE         (RID_APP_START+674)
-#define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675)
-
-#define STR_SET_BACKGROUND_PICTURE          (RID_APP_START+681)
-
-#define STR_DESC_RENAMESLIDE                (RID_APP_START+682)
-#define STR_TITLE_RENAMESLIDE               (RID_APP_START+683)
-
-#define STR_PLACEHOLDER_DESCRIPTION_TITLE       (RID_APP_START+684)
-#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE     (RID_APP_START+685)
-#define STR_PLACEHOLDER_DESCRIPTION_FOOTER      (RID_APP_START+686)
-#define STR_PLACEHOLDER_DESCRIPTION_HEADER      (RID_APP_START+687)
-#define STR_PLACEHOLDER_DESCRIPTION_DATETIME    (RID_APP_START+688)
-#define STR_PLACEHOLDER_DESCRIPTION_NUMBER      (RID_APP_START+689)
-#define STR_PLACEHOLDER_DESCRIPTION_SLIDE       (RID_APP_START+690)
-#define STR_PLACEHOLDER_DESCRIPTION_NOTES       (RID_APP_START+691)
-
-#define STR_FIELD_PLACEHOLDER_HEADER            (RID_APP_START+692)
-#define STR_FIELD_PLACEHOLDER_FOOTER            (RID_APP_START+693)
-#define STR_FIELD_PLACEHOLDER_DATETIME          (RID_APP_START+694)
-#define STR_FIELD_PLACEHOLDER_NUMBER            (RID_APP_START+695)
-
-#define STR_UNDO_HANGULHANJACONVERSION                  (RID_APP_START+696)
-#define STR_FIELD_PLACEHOLDER_COUNT             (RID_APP_START+697)
-#define STR_FIELD_PLACEHOLDER_SLIDENAME         (RID_APP_START+698)
-#define STR_FIELD_PLACEHOLDER_PAGENAME          (RID_APP_START+699)
-
-#define STR_LEFT_PANE_DRAW_TITLE                        (RID_APP_START+700)
-#define STR_LEFT_PANE_IMPRESS_TITLE                     (RID_APP_START+701)
-#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION        (RID_APP_START+711)
-#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION    (RID_APP_START+712)
-#define STR_TASKPANEL_LAYOUT_MENU_TITLE                 (RID_APP_START+713)
-#define STR_GRAPHICS_STYLE_FAMILY                       (RID_APP_START+715)
-#define STR_PRESENTATIONS_STYLE_FAMILY                  (RID_APP_START+716)
-#define STR_OBJECTS_TREE                                (RID_APP_START+717)
-#define STR_CELL_STYLE_FAMILY                           (RID_APP_START+718)
-
-#define STR_NAVIGATOR_SHOW_NAMED_SHAPES                 (RID_APP_START+719)
-#define STR_NAVIGATOR_SHOW_ALL_SHAPES                   (RID_APP_START+720)
-#define STR_NAVIGATOR_SHAPE_BASE_NAME                   (RID_APP_START+721)
-
-#define STR_RESET_LAYOUT                                (RID_APP_START+722)
-#define STR_INSERT_TABLE                                (RID_APP_START+723)
-#define STR_INSERT_CHART                                (RID_APP_START+724)
-#define STR_INSERT_PICTURE                              (RID_APP_START+725)
-#define STR_INSERT_MOVIE                                (RID_APP_START+726)
-
-#define STRING_DRAG_AND_DROP_PAGES          (RID_APP_START+727)
-#define STRING_DRAG_AND_DROP_SLIDES         (RID_APP_START+728)
-
-#define STR_PHOTO_ALBUM_EMPTY_WARNING                   (RID_APP_START+730)
-#define STR_PHOTO_ALBUM_TEXTBOX                         (RID_APP_START+731)
-
-#define STR_INSERT_3D_MODEL_TITLE                       (RID_APP_START+732)
-#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS       (RID_APP_START+733)
-
-#define STR_IMPRESS_PRINT_UI_GROUP_NAME                 (RID_APP_START+734)
-#define STR_IMPRESS_PRINT_UI_PRINT_GROUP                (RID_APP_START+736)
-#define STR_IMPRESS_PRINT_UI_CONTENT                    (RID_APP_START+737)
-#define STR_IMPRESS_PRINT_UI_CONTENT_CHOICES            (RID_APP_START+738)
-#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE              (RID_APP_START+739)
-#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES      (RID_APP_START+740)
-#define STR_IMPRESS_PRINT_UI_ORDER                      (RID_APP_START+741)
-#define STR_IMPRESS_PRINT_UI_ORDER_CHOICES              (RID_APP_START+742)
-#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT            (RID_APP_START+743)
-#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME              (RID_APP_START+744)
-#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE              (RID_APP_START+745)
-#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN            (RID_APP_START+746)
-#define STR_IMPRESS_PRINT_UI_QUALITY                    (RID_APP_START+748)
-#define STR_IMPRESS_PRINT_UI_QUALITY_CHOICES            (RID_APP_START+749)
-#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS               (RID_APP_START+750)
-#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES       (RID_APP_START+751)
-#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW  (RID_APP_START+752)
-#define STR_IMPRESS_PRINT_UI_BROCHURE                   (RID_APP_START+753)
-#define STR_IMPRESS_PRINT_UI_PAGE_SIDES                 (RID_APP_START+754)
-#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE           (RID_APP_START+755)
-#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST      (RID_APP_START+756)
-#define STR_IMPRESS_PRINT_UI_PAPER_TRAY                 (RID_APP_START+758)
-#define STR_IMPRESS_PRINT_UI_PAGE_RANGE                 (RID_APP_START+759)
-#define STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE          (RID_APP_START+760)
-#define STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE             (RID_APP_START+761)
-#define STR_DRAW_PRINT_UI_IS_PRINT_NAME                 (RID_APP_START+762)
-
-
-/******************************************************************************
-* The ids in glob.hrc start at RID_APP_START+750!
-******************************************************************************/
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 5f0f1a07a73d..b42d9c2887ca 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -88,7 +88,7 @@ private:
     void                    SetActualClickAction( css::presentation::ClickAction eCA );
     void                    SetEditText( OUString const & rStr );
     OUString                GetEditText( bool bURL = false );
-    static sal_uInt16       GetClickActionSdResId( css::presentation::ClickAction eCA );
+    static const char*      GetClickActionSdResId(css::presentation::ClickAction eCA);
 
 public:
             SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 29b796857e36..654c9a24091f 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -24,7 +24,6 @@
 #include <svl/lstner.hxx>
 #include "EventMultiplexer.hxx"
 #include "ViewShellBase.hxx"
-#include "res_bmp.hrc"
 
 namespace sd
 {
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index ce19b6a25825..81222e4e71da 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -34,7 +34,7 @@
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
 
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 0512139aaf90..4e9a31d69bcf 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -28,7 +28,7 @@
 #include "EventMultiplexer.hxx"
 #include "app.hrc"
 #include "DrawDocShell.hxx"
-#include "res_bmp.hrc"
+
 #include "sdresid.hxx"
 #include "helpids.h"
 
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index ef39e00b5fc1..1c6782d424a8 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -22,11 +22,11 @@
 #include "app.hrc"
 #include "drawdoc.hxx"
 #include "framework/FrameworkHelper.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "helpids.h"
 #include "pres.hxx"
-#include "res_bmp.hrc"
+
 #include "sdpage.hxx"
 #include "sdresid.hxx"
 #include "strings.hrc"
@@ -69,7 +69,7 @@ namespace sd { namespace sidebar {
 struct snewfoil_value_info
 {
     const char* msBmpResId;
-    sal_uInt16 mnStrResId;
+    const char* mpStrResId;
     WritingMode meWritingMode;
     AutoLayout maAutoLayout;
 };
@@ -78,7 +78,7 @@ static const snewfoil_value_info notes[] =
 {
     {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
      AUTOLAYOUT_NOTES},
-    {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info handout[] =
@@ -95,7 +95,7 @@ static const snewfoil_value_info handout[] =
      AUTOLAYOUT_HANDOUT6},
     {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT9},
-    {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static const snewfoil_value_info standard[] =
@@ -118,7 +118,7 @@ static const snewfoil_value_info standard[] =
     {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT},
     {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT},
     {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT},
-    {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 LayoutMenu::LayoutMenu (
@@ -538,7 +538,7 @@ void LayoutMenu::Fill()
     }
 
     Clear();
-    for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mnStrResId !=0; i++, pInfo++)
+    for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mpStrResId != nullptr; i++, pInfo++)
     {
         if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
         {
@@ -547,7 +547,7 @@ void LayoutMenu::Fill()
             if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
                 aBmp.Mirror (BmpMirrorFlags::Horizontal);
 
-            InsertItem(i, Image(aBmp), SdResId (pInfo->mnStrResId));
+            InsertItem(i, Image(aBmp), SdResId(pInfo->mpStrResId));
             SetItemData (i, new AutoLayout(pInfo->maAutoLayout));
         }
     }
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index e905b85254bd..a1d3f3f93b7b 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -166,7 +166,7 @@ private:
 
     typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
 
-    Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
+    Image GetPreviewSubstitution(const char* pId, PreviewSize ePreviewSize);
 
     void CleanContainer();
 };
@@ -867,44 +867,38 @@ SdDrawDocument* MasterPageContainer::Implementation::GetDocument()
 }
 
 Image MasterPageContainer::Implementation::GetPreviewSubstitution (
-    sal_uInt16 nId,
+    const char* pId,
     PreviewSize ePreviewSize)
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
     Image aPreview;
 
-    switch (nId)
+    if (strcmp(pId, STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION) == 0)
     {
-        case STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION:
+        Image& rPreview (ePreviewSize==SMALL
+            ? maSmallPreviewBeingCreated
+            : maLargePreviewBeingCreated);
+        if (rPreview.GetSizePixel().Width() == 0)
         {
-            Image& rPreview (ePreviewSize==SMALL
-                ? maSmallPreviewBeingCreated
-                : maLargePreviewBeingCreated);
-            if (rPreview.GetSizePixel().Width() == 0)
-            {
-                rPreview = maPreviewRenderer.RenderSubstitution(
-                    ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel,
-                    SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION));
-            }
-            aPreview = rPreview;
+            rPreview = maPreviewRenderer.RenderSubstitution(
+                ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel,
+                SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION));
         }
-        break;
-
-        case STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION:
+        aPreview = rPreview;
+    }
+    else if (strcmp(pId, STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION) == 0)
+    {
+        Image& rPreview (ePreviewSize==SMALL
+            ? maSmallPreviewNotAvailable
+            : maLargePreviewNotAvailable);
+        if (rPreview.GetSizePixel().Width() == 0)
         {
-            Image& rPreview (ePreviewSize==SMALL
-                ? maSmallPreviewNotAvailable
-                : maLargePreviewNotAvailable);
-            if (rPreview.GetSizePixel().Width() == 0)
-            {
-                rPreview = maPreviewRenderer.RenderSubstitution(
-                    ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel,
-                    SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION));
-            }
-            aPreview = rPreview;
+            rPreview = maPreviewRenderer.RenderSubstitution(
+                ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel,
+                SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION));
         }
-        break;
+        aPreview = rPreview;
     }
 
     return aPreview;
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index edd6d0f19414..982519c1bf2f 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -30,9 +30,9 @@
 #include "DrawDocShell.hxx"
 #include "sdpage.hxx"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "strings.hrc"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index a0c2e756e42c..bb9f723ff2dd 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -34,14 +34,13 @@
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/gallery.hxx>
 #include <svx/drawitem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/resary.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include "app.hrc"
 #include <editeng/paperinf.hxx>
@@ -62,7 +61,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <algorithm>
 #include "EventMultiplexer.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include <vcl/salbtype.hxx>
 #include <vcl/EnumContext.hxx>
 
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 48f6c3a321d4..fcdbc11f8aec 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -24,7 +24,7 @@
 #include <unotools/syslocale.hxx>
 #include <sfx2/viewfrm.hxx>
 
-#include "res_bmp.hrc"
+
 #include "slideshow.hxx"
 #include "ViewShellBase.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 9a7ccda3ae11..8a6516b0714c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -59,8 +59,8 @@
 #include <pgjump.hxx>
 #include "PaneHider.hxx"
 
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
 #include <vcl/canvastools.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index c900cdf6e55d..6f2ca506559c 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -54,11 +54,11 @@
 #include "FrameView.hxx"
 #include "DrawDocShell.hxx"
 #include "sdpage.hxx"
-#include "res_bmp.hrc"
+
 #include "sdresid.hxx"
 #include "strings.hrc"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdmod.hxx"
 #include "sdxfer.hxx"
 #include "ViewShellHint.hxx"
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index f98ea9761e27..27773ecd1a54 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -50,7 +50,7 @@
 #include "fuexpand.hxx"
 #include "fusumry.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "sdresid.hxx"
 #include "sdxfer.hxx"
@@ -67,7 +67,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svxids.hrc>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 271ff8ad02fa..c4907d82ffd6 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -35,7 +35,7 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "ViewShellBase.hxx"
 #include "ViewShellManager.hxx"
 #include "FrameView.hxx"
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 60fc8565dc03..4a39274fb4e9 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -44,11 +44,11 @@
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 
-#include "res_bmp.hrc"
+
 #include "sdresid.hxx"
 #include "strings.hrc"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 5fcbb1894b28..f6da3147aa50 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -61,7 +61,7 @@
 #include "sdpage.hxx"
 #include "sdxfer.hxx"
 #include "helpids.h"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "unmodpg.hxx"
 #include "DrawViewShell.hxx"
 #include "sdabstdlg.hxx"
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index b17392dc14a8..c3a19e028293 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -28,7 +28,7 @@
 #include "view/SlsTheme.hxx"
 #include "model/SlideSorterModel.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "DrawController.hxx"
 #include "ViewShellBase.hxx"
 #include "ViewShellManager.hxx"
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 29c14bf08db1..d2999a2464e8 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -40,7 +40,7 @@
 #include "ViewShellBase.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdattr.hrc"
 #include "sdresid.hxx"
 #include "AccessibleSlideSorterView.hxx"
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 3a98bfcb0cb6..4f480dba0637 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -46,7 +46,7 @@
 #include "sdpage.hxx"
 #include "Window.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <svl/itempool.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index b4d41cc4ddff..3af310378abd 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -24,7 +24,7 @@
 #include "view/SlsTheme.hxx"
 #include "tools/IconCache.hxx"
 #include "Window.hxx"
-#include "res_bmp.hrc"
+
 #include "bitmaps.hlst"
 
 namespace sd { namespace slidesorter { namespace view {
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index a22a14de1afa..dd5c0e164d9f 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "view/SlsTheme.hxx"
 #include "controller/SlsProperties.hxx"
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 3835ca5bd6b2..027ea9937d90 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -23,7 +23,7 @@
 #include "view/SlsTheme.hxx"
 #include "sdpage.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <vcl/settings.hxx>
 #include <vcl/help.hxx>
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 987af603506e..feba064cdd19 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -53,7 +53,7 @@
 #include "ViewShellBase.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "EventMultiplexer.hxx"
 
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 20bbc450fad5..f4e6a4b546c3 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -54,7 +54,7 @@
 #include "framework/FrameworkHelper.hxx"
 #include "TableDesignPane.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "tablefunction.hxx"
 #include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 139c59cfb507..6da3d85f3ea1 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -37,8 +37,7 @@
 #include "app.hrc"
 #include "createtableobjectbar.hxx"
 #include "registerinterfaces.hxx"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
 #include "strings.hrc"
 #include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 1fc88d296255..006607565e2a 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -44,7 +44,7 @@
 #include "app.hrc"
 #include "strings.hrc"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include "unokywds.hxx"
 #include "unowcntr.hxx"
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index eacd8ade3941..b7de3cd93df0 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -82,7 +82,7 @@
 
 #include <Annotation.hxx>
 #include <drawdoc.hxx>
-#include <glob.hrc>
+#include <strings.hrc>
 #include <sdresid.hxx>
 #include <sdpage.hxx>
 
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 8250ac4a692d..7c7f2b911d76 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -71,7 +71,7 @@
 #include "DrawDocShell.hxx"
 #include "helpids.h"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "unolayer.hxx"
 #include "imapinfo.hxx"
 #include "EffectMigration.hxx"
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 587014a25042..9758152bee97 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -41,7 +41,7 @@
 #include <svl/itemset.hxx>
 #include <svx/svdmodel.hxx>
 #include <sdresid.hxx>
-#include <glob.hrc>
+#include <strings.hrc>
 #include <sdpage.hxx>
 #include <unoprnms.hxx>
 #include <sdattr.hxx>
@@ -63,7 +63,7 @@
 #include "ViewShell.hxx"
 #include "DrawViewShell.hxx"
 #include "unoobj.hxx"
-#include "res_bmp.hrc"
+
 #include "strings.hxx"
 #include "bitmaps.hlst"
 #include "unokywds.hxx"
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index a6966be40195..358a17ea0879 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include "DocumentRenderer.hxx"
+#include "DocumentRenderer.hrc"
 
 #include "drawdoc.hxx"
 #include "optsitem.hxx"
@@ -47,7 +48,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/xlnclit.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <tools/resary.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -395,7 +395,7 @@ namespace {
                                     SdResId(STR_IMPRESS_PRINT_UI_CONTENT),
                                     aHelpIds,
                                     "PageContentType" ,
-                                    CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
+                                    CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES)),
                                     0)
                                 );
 
@@ -420,7 +420,7 @@ namespace {
                                     SdResId(STR_IMPRESS_PRINT_UI_ORDER),
                                     aHelpIds,
                                     "SlidesPerPageOrder" ,
-                                    CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
+                                    CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_ORDER_CHOICES)),
                                     0,
                                     Sequence< sal_Bool >(),
                                     aSlidesPerPageOpt )
@@ -486,7 +486,7 @@ namespace {
                                 "",
                                 aHelpIds,
                                 "Quality" ,
-                                CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES),
+                                CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)),
                                 0)
                             );
 
@@ -510,7 +510,8 @@ namespace {
                                 "",
                                 aHelpIds,
                                 "PageOptions" ,
-                                CreateChoice(mbImpress ? STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
+                                mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES)) :
+                                            CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW)),
                                 0,
                                 Sequence< sal_Bool >(),
                                 aPageOptionsOpt
@@ -543,7 +544,7 @@ namespace {
                                 SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
                                 aHelpIds,
                                 "PrintProspectInclude" ,
-                                CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
+                                CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST)),
                                 0,
                                 Sequence< sal_Bool >(),
                                 aIncludeOpt
@@ -612,9 +613,8 @@ namespace {
             AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, "",
                                 aHelpIds,
                                 aPrintRangeName,
-                                CreateChoice(mbImpress
-                                             ? STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
-                                             : STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE),
+                                mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE)) :
+                                            CreateChoice(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE)),
                                 nPrintRange )
                             );
             // create a an Edit dependent on "Pages" selected
@@ -631,23 +631,18 @@ namespace {
             maProperties.push_back( aVal );
         }
 
-        static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId)
+        static Sequence<OUString> CreateChoice(const char** pResourceId, size_t nCount)
         {
-            ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr());
-            ResStringArray aChoiceStrings (aResourceId);
-
-            const sal_uInt32 nCount (aChoiceStrings.Count());
             Sequence<OUString> aChoices (nCount);
-            for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex)
-                aChoices[nIndex] = aChoiceStrings.GetString(nIndex);
-
+            for (size_t nIndex=0; nIndex < nCount; ++nIndex)
+                aChoices[nIndex] = SdResId(pResourceId[nIndex]);
             return aChoices;
         }
 
         Sequence<OUString> GetSlidesPerPageSequence()
         {
             const Sequence<OUString> aChoice (
-                CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
+                CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)));
             maSlidesPerPage.clear();
             maSlidesPerPage.push_back(0); // first is using the default
             for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex)
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
deleted file mode 100644
index c5c6852e35a6..000000000000
--- a/sd/source/ui/view/DocumentRenderer.src
+++ /dev/null
@@ -1,181 +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 "app.hrc"
-#include "strings.hrc"
-
-String STR_IMPRESS_PRINT_UI_GROUP_NAME
-{
-    Text [en-US] = "%PRODUCTNAME %s";
-};
-String STR_IMPRESS_PRINT_UI_PRINT_GROUP
-{
-    Text [ en-US ] = "Print";
-};
-String STR_IMPRESS_PRINT_UI_CONTENT
-{
-    Text [ en-US ] = "Document";
-};
-StringArray STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Slides" ; > ;
-        < "Handouts" ; > ;
-        < "Notes" ; > ;
-        < "Outline" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_SLIDESPERPAGE
-{
-    Text [ en-US ] = "Slides per page" ;
-};
-StringArray STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "According to layout" ; > ;
-        < "1" ; > ;
-        < "2" ; > ;
-        < "3" ; > ;
-        < "4" ; > ;
-        < "6" ; > ;
-        < "9" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_ORDER
-{
-    Text [ en-US ] = "Order" ;
-};
-StringArray STR_IMPRESS_PRINT_UI_ORDER_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Left to right, then down" ; > ;
-        < "Top to bottom, then right" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT
-{
-    Text [ en-US ] = "~Contents";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_NAME
-{
-    Text [ en-US ] = "~Slide name";
-};
-String STR_DRAW_PRINT_UI_IS_PRINT_NAME
-{
-    Text [ en-US ] = "P~age name";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_DATE
-{
-    Text [ en-US ] = "~Date and time";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
-{
-    Text [ en-US ] = "Hidden pages";
-};
-String STR_IMPRESS_PRINT_UI_QUALITY
-{
-    Text [ en-US ] = "Color";
-};
-StringArray STR_IMPRESS_PRINT_UI_QUALITY_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Original colors" ; > ;
-        < "Grayscale" ; > ;
-        < "Black & white" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_PAGE_OPTIONS
-{
-    Text [ en-US ] = "~Size";
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Original size" ; > ;
-        < "Fit to printable page" ; > ;
-        < "Distribute on multiple sheets of paper" ; > ;
-        < "Tile sheet of paper with repeated slides" ; > ;
-    };
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
-{
-    ItemList [ en-US ] =
-    {
-        < "Original size" ; > ;
-        < "Fit to printable page" ; > ;
-        < "Distribute on multiple sheets of paper" ; > ;
-        < "Tile sheet of paper with repeated pages" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_BROCHURE
-{
-    Text [en-US] = "Brochure";
-};
-String STR_IMPRESS_PRINT_UI_PAGE_SIDES
-{
-    Text [ en-US ] = "Page sides";
-};
-String STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE
-{
-    Text [ en-US ] = "Include";
-};
-StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
-{
-    ItemList [ en-US ] =
-    {
-        < "All pages" ; > ;
-        < "Front sides / right pages" ; > ;
-        < "Back sides / left pages" ; > ;
-    };
-};
-
-String STR_IMPRESS_PRINT_UI_PAPER_TRAY
-{
-    Text [ en-US ] = "~Use only paper tray from printer preferences";
-};
-String STR_IMPRESS_PRINT_UI_PAGE_RANGE
-{
-    Text [en-US] = "Print range";
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
-{
-    ItemList [ en-US ] =
-    {
-        < "~All slides"; >;
-        < "~Slides"; >;
-        < "Se~lection"; >;
-    };
-};
-
-StringArray STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
-{
-    ItemList [ en-US ] =
-    {
-        < "~All pages"; >;
-        < "Pa~ges"; >;
-        < "Se~lection"; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index eb9b6be057b6..2cc7b4c26672 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -36,8 +36,8 @@
 #include <sfx2/objface.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 #include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index f2413042fd6a..11de79bcfa8a 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -30,8 +30,8 @@
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 #include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 0b3c8fcdeda7..9b2619ae4e14 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -53,7 +53,6 @@
 #include <tools/diagnose_ex.h>
 
 #include "strings.hrc"
-#include "sdstring.hrc"
 #include <editeng/outliner.hxx>
 #include "sdpage.hxx"
 #include "sdmod.hxx"
@@ -1228,15 +1227,15 @@ bool SdOutliner::ShowWrapArroundDialog()
     // The question text depends on the search direction.
     bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DocumentType::Impress;
 
-    sal_uInt16 nStringId;
+    const char* pStringId;
     if (mbDirectionIsForward)
-        nStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW;
+        pStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW;
     else
-        nStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW;
+        pStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW;
 
     // Pop up question box that asks the user whether to wrap around.
     // The dialog is made modal with respect to the whole application.
-    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId));
+    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(pStringId));
     aQuestionBox->SetImage(QueryBox::GetStandardImage());
     sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get());
 
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index a48d30d9a72d..8c1cf4e6bfc9 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -28,7 +28,7 @@
 #include "sdpage.hxx"
 #include "sdxfer.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 6e98bf784369..9481668f9e7e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -26,7 +26,7 @@
 #include "sdresid.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "slideshow.hxx"
 #include "unokywds.hxx"
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 9f210c1ce7d2..a59b1d8021a2 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -24,7 +24,7 @@
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 #include "strings.hrc"
 #include "helpids.h"
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 314e110b8b16..87957dde5256 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -41,10 +41,10 @@
 #include "stlsheet.hxx"
 
 #include <svx/svdoutl.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "View.hxx"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index bf52bffe3f0b..dac03c96d49e 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -33,8 +33,8 @@
 
 #include "sdresid.hxx"
 
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index de7c1e9db631..26334b02f4b5 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -52,8 +52,8 @@
 #include <sfx2/objface.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "drawdoc.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index d7b439d12169..f453acd062ed 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -57,7 +57,7 @@
 #include <editeng/cmapitem.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "prlayout.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 23e21891e2d2..2b6c952d2d2b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -47,9 +47,9 @@
 
 #include "view/viewoverlaymanager.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "strings.hrc"
 #include "helpids.h"
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 51bcc0a2388c..a4b00f47357a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -112,7 +112,7 @@
 #include <svl/whiter.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 
 #include "framework/FrameworkHelper.hxx"
@@ -1358,14 +1358,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
             if( !bDone )
             {
+                ::sd::Window* pWindow = GetActiveWindow();
 #ifndef UNX
-                const sal_uInt16 nId = STR_TWAIN_NO_SOURCE;
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE))->Execute();
 #else
-                const sal_uInt16 nId = STR_TWAIN_NO_SOURCE_UNX;
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE_UNX))->Execute();
 #endif
-
-                ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute();
             }
             else
             {
@@ -1821,6 +1819,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
         case SID_SHOW_NEXT_LEVEL:
         {
+            const char* STR_PRESOBJ_MPOUTLINE_ARY[] =
+            {
+                STR_PRESOBJ_MPOUTLINE,
+                STR_PRESOBJ_MPOUTLLAYER2,
+                STR_PRESOBJ_MPOUTLLAYER3,
+                STR_PRESOBJ_MPOUTLLAYER4,
+                STR_PRESOBJ_MPOUTLLAYER5,
+                STR_PRESOBJ_MPOUTLLAYER6,
+                STR_PRESOBJ_MPOUTLLAYER7,
+                STR_PRESOBJ_MPNOTESTITLE,
+                STR_PRESOBJ_MPNOTESTEXT,
+                STR_PRESOBJ_NOTESTEXT
+            };
+
             ESelection aSel;
             // fdo#78151 editing a PRESOBJ_OUTLINE in a master page ?
             ::Outliner* pOL = GetOutlinerForMasterPageOutlineTextObj(aSel);
@@ -1835,7 +1847,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (nDepth != sal_uInt16(-1) && nDepth < 8)
                     {
                         sal_uInt16 nNewDepth = nDepth+1;
-                        pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
+                        pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE_ARY[nNewDepth]), EE_PARA_APPEND, nNewDepth);
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 73ccbfd99004..ba75f71d124d 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -52,9 +52,9 @@
 #include "optsitem.hxx"
 
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdundogr.hxx"
 #include "undopage.hxx"
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 32439b7abca9..3e9134efcef9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -40,9 +40,9 @@
 #include <vcl/cursor.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "Window.hxx"
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 9ba7f6bb4dce..b433d25e924e 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -37,8 +37,8 @@
 #include "LayerTabBar.hxx"
 
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "app.hrc"
 #include "helpids.h"
 #include "optsitem.hxx"
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 97a595cc1abc..99f5bd398c48 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -72,8 +72,8 @@
 #include <sfx2/viewfrm.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "PresentationViewShell.hxx"
 
 #include "Outliner.hxx"
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 80cd59e7107d..74d6e39bafb3 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -50,7 +50,7 @@
 #include "view/viewoverlaymanager.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "sdpage.hxx"
 #include "FrameView.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index c22a012ae94e..403e67b330d7 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -41,8 +41,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "Outliner.hxx"
 #include "Window.hxx"
 #include "sdmod.hxx"
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 70fc761fdd0e..9699b1c343eb 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -67,9 +67,9 @@
 #include "ViewShellHint.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "drawdoc.hxx"
 #include "fusel.hxx"
 #include "futext.hxx"
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 7b16b72e9ba5..d31bfdbd48d1 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -36,8 +36,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "SpellDialogChildWindow.hxx"
 #include "sdresid.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index d4e7ccdea3aa..8db33b353ae2 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -37,7 +37,7 @@
 #include "sdmod.hxx"
 #include "sdresid.hxx"
 #include "pres.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdiocmpt.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 14b9022abc1c..1d71af0e9539 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -63,8 +63,8 @@
 #include "optsitem.hxx"
 
 #include "strings.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "Outliner.hxx"
 #include "Window.hxx"
 #include "TextObjectBar.hxx"
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index e17bf1877ba8..024a88a16e22 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -58,7 +58,7 @@
 #include "pres.hxx"
 #include "OutlineViewShell.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "Outliner.hxx"
 #include "strings.hrc"
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 392ec7619ef5..67b3348226e1 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -39,7 +39,7 @@
 #include "drawview.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "ViewShellBase.hxx"
 #include "FactoryIds.hxx"
 
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index d634fa8d4d80..500f183b6a0a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -63,7 +63,7 @@
 #include "DrawDocShell.hxx"
 #include "sdmod.hxx"
 #include "sdpage.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "DrawViewShell.hxx"
 #include "futext.hxx"
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 852208426834..189a76e83314 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -49,7 +49,7 @@
 #include "navigatr.hxx"
 #include "anminfo.hxx"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdxfer.hxx"
 #include "sdresid.hxx"
 #include "sdmod.hxx"
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 4f8b8be7fec2..4ddb23e17747 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -61,7 +61,7 @@
 #include <svtools/soerr.hxx>
 #include <sfx2/ipclient.hxx>
 #include <svx/svdoashp.hxx>
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <config_features.h>
 
@@ -391,7 +391,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
     if( !mpViewSh )
         return;
 
-    SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), RID_SO_ERRCTX );
+    SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), getRID_SO_ERRCTX() );
     ErrCode nError = ERRCODE_NONE;
 
     ::std::vector< OUString >::const_iterator aIter( maDropFileVector.begin() );
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 7b60cc3796d5..8db35425a4fe 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -27,8 +27,8 @@
 #include "sdattr.hxx"
 #include "sdmod.hxx"
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "DrawViewShell.hxx"
 #include "GraphicViewShell.hxx"
 #include "helpids.h"
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index f0445646fff0..c0343a70b548 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -26,7 +26,7 @@
 #include "strings.hrc"
 #include "strings.hxx"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 
 #include "unmodpg.hxx"
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 7e28f6723cf5..f6ef6ba44904 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -25,8 +25,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <tools/rcid.h>
-
 #include <vcl/help.hxx>
 #include <vcl/lazydelete.hxx>
 
@@ -39,11 +37,11 @@
 
 #include "view/viewoverlaymanager.hxx"
 
-#include "res_bmp.hrc"
+
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
@@ -61,7 +59,7 @@ namespace sd {
 class ImageButtonHdl;
 
 static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
-static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
+static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
 
 static const OUStringLiteral aSmallPlaceHolders[] =
 {
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index e0b40d1d1515..4e06cd625566 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -718,7 +718,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
 {
     ErrCode aErrCode = ERRCODE_NONE;
 
-    SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX);
+    SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), getRID_SO_ERRCTX());
     bool bAbort = false;
     GetDocSh()->SetWaitCursor( true );
     SfxViewShell* pViewShell = GetViewShell();
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 5f342906d994..f346ab12529b 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -24,7 +24,7 @@
 #include "GraphicViewShellBase.hxx"
 
 #include <sfx2/viewfrm.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <com/sun/star/lang/Locale.hpp>
 #include <svtools/svtresid.hxx>
 #include <utility>
@@ -32,8 +32,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "sdabstdlg.hxx"
 
 #include "fupoor.hxx"
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index ef5e71171ad6..b1f7ce840bcc 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -44,7 +44,7 @@
 #include "app.hrc"
 #include "helpids.h"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "OutlineView.hxx"
 #include "Client.hxx"
 #include "sdresid.hxx"
@@ -89,7 +89,7 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <svl/poolitem.hxx>
-#include <glob.hrc>
+#include <strings.hrc>
 #include "strings.hxx"
 #include "AccessibleDocumentViewBase.hxx"
 
diff --git a/sd/uiconfig/sdraw/ui/breakdialog.ui b/sd/uiconfig/sdraw/ui/breakdialog.ui
index 8ae980ae4a77..63d4744475a3 100644
--- a/sd/uiconfig/sdraw/ui/breakdialog.ui
+++ b/sd/uiconfig/sdraw/ui/breakdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sd">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="BreakDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Break</property>
+    <property name="title" translatable="yes" context="breakdialog|BreakDialog">Break</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -48,7 +48,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Processing metafile:</property>
+                <property name="label" translatable="yes" context="breakdialog|label1">Processing metafile:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -62,7 +62,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Broken down metaobjects:</property>
+                <property name="label" translatable="yes" context="breakdialog|label2">Broken down metaobjects:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -76,7 +76,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Inserted drawing objects:</property>
+                <property name="label" translatable="yes" context="breakdialog|label3">Inserted drawing objects:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
index dba01c0e8f9a..38bd8f5654ec 100644
--- a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
+++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="BulletsAndNumberingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Bullets and Numbering</property>
+    <property name="title" translatable="yes" context="bulletsandnumbering|BulletsAndNumberingDialog">Bullets and Numbering</property>
     <property name="window_position">mouse</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -64,7 +64,7 @@
             </child>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label" translatable="yes">Reset</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|reset">Reset</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="bullets">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bullets</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|bullets">Bullets</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="singlenum">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|singlenum">Numbering</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="graphics">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|graphics">Image</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|position">Position</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="customize">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Customize</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|customize">Customize</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 07c1a506afda..87baa25e17ae 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -29,7 +29,7 @@
   <object class="GtkDialog" id="DuplicateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Duplicate</property>
+    <property name="title" translatable="yes" context="copydlg|DuplicateDialog">Duplicate</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -72,7 +72,7 @@
             </child>
             <child>
               <object class="GtkButton" id="default">
-                <property name="label" translatable="yes">_Default</property>
+                <property name="label" translatable="yes" context="copydlg|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -124,7 +124,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Number of _copies:</property>
+                    <property name="label" translatable="yes" context="copydlg|label4">Number of _copies:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">copies</property>
                   </object>
@@ -154,11 +154,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Values from Selection</property>
+                    <property name="tooltip_text" translatable="yes" context="copydlg|viewdata|tooltip_text">Values from Selection</property>
                     <property name="image">image1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="viewdata-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Values from Selection</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="copydlg|viewdata-atkobject">Values from Selection</property>
                       </object>
                     </child>
                   </object>
@@ -200,7 +200,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_X axis:</property>
+                            <property name="label" translatable="yes" context="copydlg|label5">_X axis:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">x:0.00cm</property>
                             <property name="xalign">0</property>
@@ -214,7 +214,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Y axis:</property>
+                            <property name="label" translatable="yes" context="copydlg|label6">_Y axis:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">y:0.00cm</property>
                             <property name="xalign">0</property>
@@ -228,7 +228,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Angle:</property>
+                            <property name="label" translatable="yes" context="copydlg|label7">_Angle:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">angle:0degrees</property>
                             <property name="xalign">0</property>
@@ -288,7 +288,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Placement</property>
+                    <property name="label" translatable="yes" context="copydlg|label1">Placement</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -326,7 +326,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Width:</property>
+                            <property name="label" translatable="yes" context="copydlg|label8">_Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">width:0.00cm</property>
                             <property name="xalign">0</property>
@@ -340,7 +340,7 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Height:</property>
+                            <property name="label" translatable="yes" context="copydlg|label9">_Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">height:0.00cm</property>
                             <property name="xalign">0</property>
@@ -386,7 +386,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Enlargement</property>
+                    <property name="label" translatable="yes" context="copydlg|label2">Enlargement</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -424,7 +424,7 @@
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Start:</property>
+                            <property name="label" translatable="yes" context="copydlg|label10">_Start:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">start</property>
                             <property name="xalign">0</property>
@@ -438,7 +438,7 @@
                           <object class="GtkLabel" id="endlabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_End:</property>
+                            <property name="label" translatable="yes" context="copydlg|endlabel">_End:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">end</property>
                             <property name="xalign">0</property>
@@ -478,7 +478,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Colors</property>
+                    <property name="label" translatable="yes" context="copydlg|label3">Colors</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sd/uiconfig/sdraw/ui/crossfadedialog.ui b/sd/uiconfig/sdraw/ui/crossfadedialog.ui
index bb7715cab0ca..93b64006e200 100644
--- a/sd/uiconfig/sdraw/ui/crossfadedialog.ui
+++ b/sd/uiconfig/sdraw/ui/crossfadedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="CrossFadeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Cross-fading</property>
+    <property name="title" translatable="yes" context="crossfadedialog|CrossFadeDialog">Cross-fading</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -99,7 +99,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="orientation">
-                        <property name="label" translatable="yes">Same orientation</property>
+                        <property name="label" translatable="yes" context="crossfadedialog|orientation">Same orientation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="attributes">
-                        <property name="label" translatable="yes">Cross-fade attributes</property>
+                        <property name="label" translatable="yes" context="crossfadedialog|attributes">Cross-fade attributes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -134,7 +134,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Increments:</property>
+                        <property name="label" translatable="yes" context="crossfadedialog|label2">Increments:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">increments</property>
                       </object>
@@ -163,7 +163,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
+                <property name="label" translatable="yes" context="crossfadedialog|label1">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui
index c03169e322ec..b66b879199ab 100644
--- a/sd/uiconfig/sdraw/ui/dlgsnap.ui
+++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-5000000</property>
@@ -32,7 +32,7 @@
   <object class="GtkDialog" id="SnapObjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Snap Object</property>
+    <property name="title" translatable="yes" context="dlgsnap|SnapObjectDialog">New Snap Object</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -167,7 +167,7 @@
                           <object class="GtkLabel" id="xlabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_X:</property>
+                            <property name="label" translatable="yes" context="dlgsnap|xlabel">_X:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">x:0.00cm</property>
                           </object>
@@ -180,7 +180,7 @@
                           <object class="GtkLabel" id="ylabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Y:</property>
+                            <property name="label" translatable="yes" context="dlgsnap|ylabel">_Y:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">y:0.00cm</property>
                           </object>
@@ -197,7 +197,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="dlgsnap|label1">Position</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -230,7 +230,7 @@
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="point">
-                            <property name="label" translatable="yes">_Point</property>
+                            <property name="label" translatable="yes" context="dlgsnap|point">_Point</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -249,7 +249,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="vert">
-                            <property name="label" translatable="yes">_Vertical</property>
+                            <property name="label" translatable="yes" context="dlgsnap|vert">_Vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -267,7 +267,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="horz">
-                            <property name="label" translatable="yes">Hori_zontal</property>
+                            <property name="label" translatable="yes" context="dlgsnap|horz">Hori_zontal</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -291,7 +291,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Type</property>
+                    <property name="label" translatable="yes" context="dlgsnap|label2">Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sd/uiconfig/sdraw/ui/drawchardialog.ui b/sd/uiconfig/sdraw/ui/drawchardialog.ui
index 7b763d84a944..763ffa3991cf 100644
--- a/sd/uiconfig/sdraw/ui/drawchardialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawchardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DrawCharDialog">
     <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="drawchardialog|DrawCharDialog">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="RID_SVXPAGE_CHAR_NAME">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Fonts</property>
+                <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_CHAR_NAME">Fonts</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS">
                 <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="drawchardialog|RID_SVXPAGE_CHAR_EFFECTS">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_CHAR_POSITION">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_CHAR_POSITION">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_BACKGROUND">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_BACKGROUND">Highlighting</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
index 087cc4b63c44..e126d52fe413 100644
--- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DrawPageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Page Setup</property>
+    <property name="title" translatable="yes" context="drawpagedialog|DrawPageDialog">Page Setup</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="RID_SVXPAGE_PAGE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page</property>
+                <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_PAGE">Page</property>
               </object>
               <packing>
                 <property name="position">0</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_AREA">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_AREA">Background</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sd/uiconfig/sdraw/ui/drawparadialog.ui b/sd/uiconfig/sdraw/ui/drawparadialog.ui
index 019958c5298b..b9ab7f223cd1 100644
--- a/sd/uiconfig/sdraw/ui/drawparadialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawparadialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DrawParagraphPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph</property>
+    <property name="title" translatable="yes" context="drawparadialog|DrawParagraphPropertiesDialog">Paragraph</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="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="labelTP_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="drawparadialog|labelTP_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="labelNUMBERING">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="drawparadialog|labelNUMBERING">Numbering</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
index 561f63000965..8508220870b6 100644
--- a/sd/uiconfig/sdraw/ui/drawprtldialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DrawPRTLDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Presentation Layout</property>
+    <property name="title" translatable="yes" context="drawprtldialog|DrawPRTLDialog">Presentation Layout</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="RID_SVXPAGE_LINE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_LINE">Line</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_AREA">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_AREA">Area</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_SHADOW">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shadow</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_SHADOW">Shadow</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_CHAR_NAME">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Font</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_CHAR_NAME">Font</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS">
                 <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="drawprtldialog|RID_SVXPAGE_CHAR_EFFECTS">Font Effects</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -179,7 +179,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_STD_PARAGRAPH">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_STD_PARAGRAPH">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -193,7 +193,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TEXTATTR">Text</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -207,7 +207,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_PICK_BULLET">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bullets</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_BULLET">Bullets</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -221,7 +221,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_PICK_SINGLE_NUM">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_SINGLE_NUM">Numbering</property>
               </object>
               <packing>
                 <property name="position">9</property>
@@ -235,7 +235,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_PICK_BMP">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_BMP">Image</property>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -249,7 +249,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_NUM_OPTIONS">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Customize</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_NUM_OPTIONS">Customize</property>
               </object>
               <packing>
                 <property name="position">11</property>
@@ -263,7 +263,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_ALIGN_PARAGRAPH">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_ALIGN_PARAGRAPH">Alignment</property>
               </object>
               <packing>
                 <property name="position">12</property>
@@ -277,7 +277,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">13</property>
@@ -291,7 +291,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">14</property>
@@ -305,7 +305,7 @@
               <object class="GtkLabel" id="RID_SVXPAGE_BACKGROUND">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_BACKGROUND">Highlighting</property>
               </object>
               <packing>
                 <property name="position">15</property>
diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui b/sd/uiconfig/sdraw/ui/insertlayer.ui
index 6fe8870d178d..3eab93e53e45 100644
--- a/sd/uiconfig/sdraw/ui/insertlayer.ui
+++ b/sd/uiconfig/sdraw/ui/insertlayer.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertLayerDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Layer</property>
+    <property name="title" translatable="yes" context="insertlayer|InsertLayerDialog">Insert Layer</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
@@ -103,7 +103,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Name</property>
+                    <property name="label" translatable="yes" context="insertlayer|label4">_Name</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -143,7 +143,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Title</property>
+                    <property name="label" translatable="yes" context="insertlayer|label5">_Title</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -194,7 +194,7 @@
                   <object class="GtkLabel" id="description">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Description</property>
+                    <property name="label" translatable="yes" context="insertlayer|description">_Description</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -210,7 +210,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="visible">
-                <property name="label" translatable="yes">_Visible</property>
+                <property name="label" translatable="yes" context="insertlayer|visible">_Visible</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="printable">
-                <property name="label" translatable="yes">_Printable</property>
+                <property name="label" translatable="yes" context="insertlayer|printable">_Printable</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -242,7 +242,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="locked">
-                <property name="label" translatable="yes">_Locked</property>
+                <property name="label" translatable="yes" context="insertlayer|locked">_Locked</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sd/uiconfig/sdraw/ui/insertslidesdialog.ui b/sd/uiconfig/sdraw/ui/insertslidesdialog.ui
index 4586900fb5a8..c2dfea0298cb 100644
--- a/sd/uiconfig/sdraw/ui/insertslidesdialog.ui
+++ b/sd/uiconfig/sdraw/ui/insertslidesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="InsertSlidesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Slides/Objects</property>
+    <property name="title" translatable="yes" context="insertslidesdialog|InsertSlidesDialog">Insert Slides/Objects</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -80,7 +80,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="backgrounds">
-                <property name="label" translatable="yes">Delete unused backg_rounds</property>
+                <property name="label" translatable="yes" context="insertslidesdialog|backgrounds">Delete unused backg_rounds</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -95,7 +95,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="links">
-                <property name="label" translatable="yes">_Link</property>
+                <property name="label" translatable="yes" context="insertslidesdialog|links">_Link</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sd/uiconfig/sdraw/ui/namedesign.ui b/sd/uiconfig/sdraw/ui/namedesign.ui
index 6ab4730ed368..5d58dad3fe20 100644
--- a/sd/uiconfig/sdraw/ui/namedesign.ui
+++ b/sd/uiconfig/sdraw/ui/namedesign.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="NameDesignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Name HTML Design</property>
+    <property name="title" translatable="yes" context="namedesign|NameDesignDialog">Name HTML Design</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
index f6ededb0a9e0..1fcd6cea9f97 100644
--- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
+++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">9999</property>
@@ -27,7 +27,7 @@
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="checkbuttonCB_NEW_START">
-                <property name="label" translatable="yes">R_estart at this paragraph</property>
+                <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NEW_START">R_estart at this paragraph</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
@@ -57,7 +57,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="checkbuttonCB_NUMBER_NEW_START">
-                <property name="label" translatable="yes">S_tart with:</property>
+                <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NUMBER_NEW_START">S_tart with:</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
@@ -82,7 +82,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Paragraph Numbering</property>
+        <property name="label" translatable="yes" context="paranumberingtab|label1">Paragraph Numbering</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui b/sd/uiconfig/sdraw/ui/printeroptions.ui
index 1c2f33002196..38edf40a5c73 100644
--- a/sd/uiconfig/sdraw/ui/printeroptions.ui
+++ b/sd/uiconfig/sdraw/ui/printeroptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -29,7 +29,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printname">
-                    <property name="label" translatable="yes">Page name</property>
+                    <property name="label" translatable="yes" context="printeroptions|printname">Page name</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printdatetime">
-                    <property name="label" translatable="yes">Date and time</property>
+                    <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -67,7 +67,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -100,7 +100,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalcolors">
-                    <property name="label" translatable="yes">Original size</property>
+                    <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -118,7 +118,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="grayscale">
-                    <property name="label" translatable="yes">Grayscale</property>
+                    <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -136,7 +136,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="blackandwhite">
-                    <property name="label" translatable="yes">Black &amp; white</property>
+                    <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black &amp; white</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -160,7 +160,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Color</property>
+            <property name="label" translatable="yes" context="printeroptions|label5">Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -193,7 +193,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalsize">
-                    <property name="label" translatable="yes">Original size</property>
+                    <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -211,7 +211,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="fittoprintable">
-                    <property name="label" translatable="yes">Fit to printable page</property>
+                    <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -229,7 +229,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="distributeonmultiple">
-                    <property name="label" translatable="yes">Distribute on multiple sheets of paper</property>
+                    <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -247,7 +247,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="tilesheet">
-                    <property name="label" translatable="yes">Tile sheet of paper with repeated pages</property>
+                    <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated pages</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -271,7 +271,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Size</property>
+            <property name="label" translatable="yes" context="printeroptions|label6">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
index 77238491d241..ad01ff617e81 100644
--- a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
+++ b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryUnlinkImageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Release image's link?</property>
+    <property name="title" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">Release image's link?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">This image is linked to a document.</property>
-    <property name="secondary_text" translatable="yes">Do you want to unlink the image in order to edit it?</property>
+    <property name="text" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">This image is linked to a document.</property>
+    <property name="secondary_text" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">Do you want to unlink the image in order to edit it?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox4">
         <property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/tabledesigndialog.ui b/sd/uiconfig/sdraw/ui/tabledesigndialog.ui
index d7572202c31e..1932b4886e31 100644
--- a/sd/uiconfig/sdraw/ui/tabledesigndialog.ui
+++ b/sd/uiconfig/sdraw/ui/tabledesigndialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="TableDesignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Table Design</property>
+    <property name="title" translatable="yes" context="tabledesigndialog|TableDesignDialog">Table Design</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
             <property name="column_homogeneous">True</property>
             <child>
               <object class="GtkCheckButton" id="UseFirstRowStyle">
-                <property name="label" translatable="yes">_Header row</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseFirstRowStyle">_Header row</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="GtkCheckButton" id="UseLastRowStyle">
-                <property name="label" translatable="yes">Tot_al row</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseLastRowStyle">Tot_al row</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -112,7 +112,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseBandingRowStyle">
-                <property name="label" translatable="yes">_Banded rows</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseBandingRowStyle">_Banded rows</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -127,7 +127,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseFirstColumnStyle">
-                <property name="label" translatable="yes">Fi_rst column</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseFirstColumnStyle">Fi_rst column</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -142,7 +142,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseLastColumnStyle">
-                <property name="label" translatable="yes">_Last column</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseLastColumnStyle">_Last column</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -157,7 +157,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseBandingColumnStyle">
-                <property name="label" translatable="yes">Ba_nded columns</property>
+                <property name="label" translatable="yes" context="tabledesigndialog|UseBandingColumnStyle">Ba_nded columns</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sd/uiconfig/sdraw/ui/vectorize.ui b/sd/uiconfig/sdraw/ui/vectorize.ui
index 683c810c2855..2ce3b6586b59 100644
--- a/sd/uiconfig/sdraw/ui/vectorize.ui
+++ b/sd/uiconfig/sdraw/ui/vectorize.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">8</property>
@@ -24,7 +24,7 @@
   <object class="GtkDialog" id="VectorizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Convert to Polygon</property>
+    <property name="title" translatable="yes" context="vectorize|VectorizeDialog">Convert to Polygon</property>
     <property name="resizable">False</property>
     <property name="window_position">mouse</property>
     <property name="type_hint">dialog</property>
@@ -69,7 +69,7 @@
             </child>
             <child>
               <object class="GtkButton" id="preview">
-                <property name="label" translatable="yes">Preview</property>
+                <property name="label" translatable="yes" context="vectorize|preview">Preview</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -115,7 +115,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Number of colors:</property>
+                <property name="label" translatable="yes" context="vectorize|label2">Number of colors:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">colors</property>
               </object>
@@ -141,7 +141,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Point reduction:</property>
+                <property name="label" translatable="yes" context="vectorize|label3">Point reduction:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">points:0px</property>
               </object>
@@ -169,7 +169,7 @@
                 <property name="margin_left">12</property>
                 <property name="xalign">0</property>
                 <property name="xpad">12</property>
-                <property name="label" translatable="yes">Tile size:</property>
+                <property name="label" translatable="yes" context="vectorize|tilesft">Tile size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">tiles:0px</property>
               </object>
@@ -192,7 +192,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="fillholes">
-                <property name="label" translatable="yes">_Fill holes</property>
+                <property name="label" translatable="yes" context="vectorize|fillholes">_Fill holes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Source image:</property>
+                <property name="label" translatable="yes" context="vectorize|label5">Source image:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">tiles:0px</property>
               </object>
@@ -240,7 +240,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Vectorized image:</property>
+                <property name="label" translatable="yes" context="vectorize|label6">Vectorized image:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">tiles:0px</property>
               </object>
diff --git a/sd/uiconfig/simpress/ui/annotationmenu.ui b/sd/uiconfig/simpress/ui/annotationmenu.ui
index 0e8ba5f39645..6235c0172b05 100644
--- a/sd/uiconfig/simpress/ui/annotationmenu.ui
+++ b/sd/uiconfig/simpress/ui/annotationmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -10,7 +10,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ReplyToAnnotation</property>
-        <property name="label" translatable="yes">_Reply</property>
+        <property name="label" translatable="yes" context="annotationmenu|reply">_Reply</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Bold</property>
-        <property name="label" translatable="yes">_Bold</property>
+        <property name="label" translatable="yes" context="annotationmenu|bold">_Bold</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -34,7 +34,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Italic</property>
-        <property name="label" translatable="yes">_Italic</property>
+        <property name="label" translatable="yes" context="annotationmenu|italic">_Italic</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -43,7 +43,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Underline</property>
-        <property name="label" translatable="yes">_Underline</property>
+        <property name="label" translatable="yes" context="annotationmenu|underline">_Underline</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -52,7 +52,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Strikeout</property>
-        <property name="label" translatable="yes">_Strikethrough</property>
+        <property name="label" translatable="yes" context="annotationmenu|strike">_Strikethrough</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -67,7 +67,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Copy</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="annotationmenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -76,7 +76,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Paste</property>
-        <property name="label" translatable="yes">_Paste</property>
+        <property name="label" translatable="yes" context="annotationmenu|paste">_Paste</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -91,7 +91,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteAnnotation</property>
-        <property name="label" translatable="yes">_Delete Comment</property>
+        <property name="label" translatable="yes" context="annotationmenu|delete">_Delete Comment</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -100,7 +100,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteAllAnnotationByAuthor</property>
-        <property name="label" translatable="yes">Delete All Comments b_y %1</property>
+        <property name="label" translatable="yes" context="annotationmenu|deleteby">Delete All Comments b_y %1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -109,7 +109,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteAllAnnotation</property>
-        <property name="label" translatable="yes">Delete _All Comments</property>
+        <property name="label" translatable="yes" context="annotationmenu|deleteall">Delete _All Comments</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/annotationtagmenu.ui b/sd/uiconfig/simpress/ui/annotationtagmenu.ui
index f65dea877a7e..71d2b910d9ef 100644
--- a/sd/uiconfig/simpress/ui/annotationtagmenu.ui
+++ b/sd/uiconfig/simpress/ui/annotationtagmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="reply">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Reply</property>
+        <property name="label" translatable="yes" context="annotationtagmenu|reply">_Reply</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete Comment</property>
+        <property name="label" translatable="yes" context="annotationtagmenu|delete">_Delete Comment</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="deleteby">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete All Comments b_y %1</property>
+        <property name="label" translatable="yes" context="annotationtagmenu|deleteby">Delete All Comments b_y %1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="deleteall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete _All Comments</property>
+        <property name="label" translatable="yes" context="annotationtagmenu|deleteall">Delete _All Comments</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/currentmastermenu.ui b/sd/uiconfig/simpress/ui/currentmastermenu.ui
index 21db41224bee..f0ee0aedfc98 100644
--- a/sd/uiconfig/simpress/ui/currentmastermenu.ui
+++ b/sd/uiconfig/simpress/ui/currentmastermenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="applyall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Apply to All Slides</property>
+        <property name="label" translatable="yes" context="currentmastermenu|applyall">_Apply to All Slides</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="applyselect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Apply to _Selected Slides</property>
+        <property name="label" translatable="yes" context="currentmastermenu|applyselect">Apply to _Selected Slides</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit Master...</property>
+        <property name="label" translatable="yes" context="currentmastermenu|edit">_Edit Master...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">D_elete Master</property>
+        <property name="label" translatable="yes" context="currentmastermenu|delete">D_elete Master</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -53,14 +53,14 @@
       <object class="GtkMenuItem" id="large">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Show _Large Preview</property>
+        <property name="label" translatable="yes" context="currentmastermenu|large">Show _Large Preview</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="small">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Show S_mall Preview</property>
+        <property name="label" translatable="yes" context="currentmastermenu|small">Show S_mall Preview</property>
       </object>
     </child>
   </object>
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index 0ae1fbcd335f..f2d6c2f35681 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -41,7 +41,7 @@
                       <object class="GtkLabel" id="prop_label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Direction:</property>
+                        <property name="label" translatable="yes" context="customanimationeffecttab|prop_label1">_Direction:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">prop_list1</property>
                       </object>
@@ -87,7 +87,7 @@
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkCheckButton" id="smooth_start">
-                        <property name="label" translatable="yes">Accelerated start</property>
+                        <property name="label" translatable="yes" context="customanimationeffecttab|smooth_start">Accelerated start</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -101,7 +101,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="smooth_end">
-                        <property name="label" translatable="yes">Decelerated end</property>
+                        <property name="label" translatable="yes" context="customanimationeffecttab|smooth_end">Decelerated end</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -128,7 +128,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Settings</property>
+            <property name="label" translatable="yes" context="customanimationeffecttab|label3">Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -166,7 +166,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">A_fter animation:</property>
+                    <property name="label" translatable="yes" context="customanimationeffecttab|aeffect_label">A_fter animation:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">aeffect_list</property>
                   </object>
@@ -180,7 +180,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Sound:</property>
+                    <property name="label" translatable="yes" context="customanimationeffecttab|sound_label">_Sound:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">sound_list</property>
                   </object>
@@ -194,7 +194,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Text animation:</property>
+                    <property name="label" translatable="yes" context="customanimationeffecttab|text_animation_label">_Text animation:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">text_animation_list</property>
                   </object>
@@ -208,7 +208,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Di_m color:</property>
+                    <property name="label" translatable="yes" context="customanimationeffecttab|dim_color_label">Di_m color:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">dim_color_list</property>
                   </object>
@@ -285,7 +285,7 @@
                       <object class="GtkLabel" id="text_delay_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">delay between characters</property>
+                        <property name="label" translatable="yes" context="customanimationeffecttab|text_delay_label">delay between characters</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -304,10 +304,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Don't dim</item>
-                      <item translatable="yes">Dim with color</item>
-                      <item translatable="yes">Hide after animation</item>
-                      <item translatable="yes">Hide on next animation</item>
+                      <item translatable="yes" context="customanimationeffecttab|aeffect_list">Don't dim</item>
+                      <item translatable="yes" context="customanimationeffecttab|aeffect_list">Dim with color</item>
+                      <item translatable="yes" context="customanimationeffecttab|aeffect_list">Hide after animation</item>
+                      <item translatable="yes" context="customanimationeffecttab|aeffect_list">Hide on next animation</item>
                     </items>
                   </object>
                   <packing>
@@ -320,9 +320,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">All at once</item>
-                      <item translatable="yes">Word by word</item>
-                      <item translatable="yes">Letter by letter</item>
+                      <item translatable="yes" context="customanimationeffecttab|text_animation_list">All at once</item>
+                      <item translatable="yes" context="customanimationeffecttab|text_animation_list">Word by word</item>
+                      <item translatable="yes" context="customanimationeffecttab|text_animation_list">Letter by letter</item>
                     </items>
                   </object>
                   <packing>
@@ -341,7 +341,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Enhancement</property>
+            <property name="label" translatable="yes" context="customanimationeffecttab|label4">Enhancement</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sd/uiconfig/simpress/ui/customanimationproperties.ui b/sd/uiconfig/simpress/ui/customanimationproperties.ui
index 2b5130c37a9b..59d293e2560c 100644
--- a/sd/uiconfig/simpress/ui/customanimationproperties.ui
+++ b/sd/uiconfig/simpress/ui/customanimationproperties.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CustomAnimationProperties">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Effect Options</property>
+    <property name="title" translatable="yes" context="customanimationproperties|CustomAnimationProperties">Effect Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
               <object class="GtkLabel" id="effect">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Effect</property>
+                <property name="label" translatable="yes" context="customanimationproperties|effect">Effect</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -95,7 +95,7 @@
               <object class="GtkLabel" id="timing">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Timing</property>
+                <property name="label" translatable="yes" context="customanimationproperties|timing">Timing</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="textanim">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Animation</property>
+                <property name="label" translatable="yes" context="customanimationproperties|textanim">Text Animation</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index 06b845f76568..9daa53d7a06b 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -88,7 +88,7 @@
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Add Effect</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanel|add_effect|tooltip_text">Add Effect</property>
                 <property name="image">image_add</property>
               </object>
               <packing>
@@ -103,7 +103,7 @@
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Remove Effect</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanel|remove_effect|tooltip_text">Remove Effect</property>
                 <property name="image">image_remove</property>
               </object>
               <packing>
@@ -118,7 +118,7 @@
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Move Up</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanel|move_up|tooltip_text">Move Up</property>
                 <property name="image">image_up</property>
               </object>
               <packing>
@@ -133,7 +133,7 @@
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Move Down</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanel|move_down|tooltip_text">Move Down</property>
                 <property name="image">image_down</property>
               </object>
               <packing>
@@ -161,7 +161,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Category:</property>
+                <property name="label" translatable="yes" context="customanimationspanel|categorylabel">Category:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">categorylb</property>
               </object>
@@ -175,7 +175,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Effect:</property>
+                <property name="label" translatable="yes" context="customanimationspanel|effectlabel">Effect:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">effect_list</property>
               </object>
@@ -190,11 +190,11 @@
                 <property name="can_focus">False</property>
                 <property name="popup_fixed_width">False</property>
                 <items>
-                  <item translatable="yes">Entrance</item>
-                  <item translatable="yes">Emphasis</item>
-                  <item translatable="yes">Exit</item>
-                  <item translatable="yes">Motion Paths</item>
-                  <item translatable="yes">Misc Effects</item>
+                  <item translatable="yes" context="customanimationspanel|categorylb">Entrance</item>
+                  <item translatable="yes" context="customanimationspanel|categorylb">Emphasis</item>
+                  <item translatable="yes" context="customanimationspanel|categorylb">Exit</item>
+                  <item translatable="yes" context="customanimationspanel|categorylb">Motion Paths</item>
+                  <item translatable="yes" context="customanimationspanel|categorylb">Misc Effects</item>
                 </items>
               </object>
               <packing>
@@ -239,7 +239,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Start:</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|start_effect">_Start:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">start_effect_list</property>
                   </object>
@@ -253,7 +253,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Direction:</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|effect_property">_Direction:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">placeholder</property>
                   </object>
@@ -267,7 +267,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">D_uration:</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|effect_duration">D_uration:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">anim_duration:0.00sec</property>
                   </object>
@@ -282,9 +282,9 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <items>
-                      <item translatable="yes">On click</item>
-                      <item translatable="yes">With previous</item>
-                      <item translatable="yes">After previous</item>
+                      <item translatable="yes" context="customanimationspanel|start_effect_list">On click</item>
+                      <item translatable="yes" context="customanimationspanel|start_effect_list">With previous</item>
+                      <item translatable="yes" context="customanimationspanel|start_effect_list">After previous</item>
                     </items>
                   </object>
                   <packing>
@@ -321,7 +321,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Options</property>
+                    <property name="tooltip_text" translatable="yes" context="customanimationspanel|more_properties|tooltip_text">Options</property>
                     <property name="image">image1</property>
                     <property name="always_show_image">True</property>
                   </object>
@@ -347,7 +347,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Delay:</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|delay_label">_Delay:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -384,7 +384,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Effect</property>
+                <property name="label" translatable="yes" context="customanimationspanel|effect_label">Effect</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -426,7 +426,7 @@
                 <property name="spacing">18</property>
                 <child>
                   <object class="GtkCheckButton" id="auto_preview">
-                    <property name="label" translatable="yes">Automatic Preview</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|auto_preview">Automatic Preview</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -443,12 +443,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="play">
-                    <property name="label" translatable="yes">Play</property>
+                    <property name="label" translatable="yes" context="customanimationspanel|play">Play</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Preview Effect</property>
+                    <property name="tooltip_text" translatable="yes" context="customanimationspanel|play|tooltip_text">Preview Effect</property>
                     <property name="image">image_play</property>
                     <property name="image_position">right</property>
                     <property name="always_show_image">True</property>
@@ -476,7 +476,7 @@
         <child>
           <object class="GtkLabel" id="box1_label">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Animation Deck</property>
+            <property name="label" translatable="yes" context="customanimationspanel|box1_label">Animation Deck</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">box1</property>
           </object>
@@ -489,7 +489,7 @@
         <child>
           <object class="GtkLabel" id="custom_animation_list_label">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Animation List</property>
+            <property name="label" translatable="yes" context="customanimationspanel|custom_animation_list_label">Animation List</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">custom_animation_list</property>
           </object>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
index 9f76e6d12d5a..b91a51209230 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -93,7 +93,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Add Effect</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|add_effect|tooltip_text">Add Effect</property>
                 <property name="image">image_add1</property>
               </object>
               <packing>
@@ -107,7 +107,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Remove Effect</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|remove_effect|tooltip_text">Remove Effect</property>
                 <property name="image">image_remove1</property>
               </object>
               <packing>
@@ -121,7 +121,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Move Up</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|move_up|tooltip_text">Move Up</property>
                 <property name="image">image_up</property>
               </object>
               <packing>
@@ -135,7 +135,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Move Down</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|move_down|tooltip_text">Move Down</property>
                 <property name="image">image_down</property>
               </object>
               <packing>
@@ -163,7 +163,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Start:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|start_effect">_Start:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -176,7 +176,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Direction:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|effect_property">_Direction:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -190,9 +190,9 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <items>
-                  <item translatable="yes">On click</item>
-                  <item translatable="yes">With previous</item>
-                  <item translatable="yes">After previous</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">On click</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">With previous</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">After previous</item>
                 </items>
               </object>
               <packing>
@@ -244,7 +244,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Category:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|categorylabel">Category:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -257,11 +257,11 @@
                 <property name="can_focus">False</property>
                 <property name="popup_fixed_width">False</property>
                 <items>
-                  <item translatable="yes">Entrance</item>
-                  <item translatable="yes">Emphasis</item>
-                  <item translatable="yes">Exit</item>
-                  <item translatable="yes">Motion Paths</item>
-                  <item translatable="yes">Misc Effects</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Entrance</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Emphasis</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Exit</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Motion Paths</item>
+                  <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Misc Effects</item>
                 </items>
               </object>
               <packing>
@@ -274,7 +274,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">D_uration:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|effect_duration">D_uration:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -287,7 +287,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the speed of the Animation.</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|anim_duration|tooltip_text">Select the speed of the Animation.</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -299,7 +299,7 @@
               <object class="GtkLabel" id="delay_label">
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">_Delay:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|delay_label">_Delay:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -337,7 +337,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Effect:</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|effectlabel">Effect:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -375,7 +375,7 @@
             <property name="valign">center</property>
             <child>
               <object class="GtkCheckButton" id="auto_preview">
-                <property name="label" translatable="yes">Automatic Preview</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|auto_preview">Automatic Preview</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -404,12 +404,12 @@
             </child>
             <child>
               <object class="GtkButton" id="play">
-                <property name="label" translatable="yes">Play</property>
+                <property name="label" translatable="yes" context="customanimationspanelhorizontal|play">Play</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Preview Effect</property>
+                <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|play|tooltip_text">Preview Effect</property>
                 <property name="image">image_play</property>
                 <property name="image_position">right</property>
                 <property name="always_show_image">True</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationtexttab.ui b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
index ef297d0ad187..1ba5cbf494ec 100644
--- a/sd/uiconfig/simpress/ui/customanimationtexttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sd">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">999.99000000000001</property>
@@ -23,7 +23,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">_Group text:</property>
+            <property name="label" translatable="yes" context="customanimationtexttab|group_text_label">_Group text:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">group_text_list</property>
           </object>
@@ -53,7 +53,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="auto_after">
-            <property name="label" translatable="yes">_Automatically after:</property>
+            <property name="label" translatable="yes" context="customanimationtexttab|auto_after">_Automatically after:</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -75,13 +75,13 @@
             <property name="entry_text_column">0</property>
             <property name="id_column">1</property>
             <items>
-              <item translatable="yes">As one object</item>
-              <item translatable="yes">All paragraphs at once</item>
-              <item translatable="yes">By 1st level paragraphs</item>
-              <item translatable="yes">By 2nd level paragraphs</item>
-              <item translatable="yes">By 3rd level paragraphs</item>
-              <item translatable="yes">By 4th level paragraphs</item>
-              <item translatable="yes">By 5th level paragraphs</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">As one object</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">All paragraphs at once</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">By 1st level paragraphs</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">By 2nd level paragraphs</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">By 3rd level paragraphs</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">By 4th level paragraphs</item>
+              <item translatable="yes" context="customanimationtexttab|group_text_list">By 5th level paragraphs</item>
             </items>
           </object>
           <packing>
@@ -100,7 +100,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="animate_shape">
-        <property name="label" translatable="yes">Animate attached _shape</property>
+        <property name="label" translatable="yes" context="customanimationtexttab|animate_shape">Animate attached _shape</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -116,7 +116,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="reverse_order">
-        <property name="label" translatable="yes">_In reverse order</property>
+        <property name="label" translatable="yes" context="customanimationtexttab|reverse_order">_In reverse order</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
index 4b2c298a4981..cc3775b33893 100644
--- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">999.99000000000001</property>
@@ -26,7 +26,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">_Start:</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|start_label">_Start:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -39,7 +39,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">_Delay:</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|delay_label">_Delay:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -52,7 +52,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">D_uration:</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|duration_label">D_uration:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -65,7 +65,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">_Repeat:</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|repeat_label">_Repeat:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -79,9 +79,9 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <items>
-              <item translatable="yes">On click</item>
-              <item translatable="yes">With previous</item>
-              <item translatable="yes">After previous</item>
+              <item translatable="yes" context="customanimationtimingtab|start_list">On click</item>
+              <item translatable="yes" context="customanimationtimingtab|start_list">With previous</item>
+              <item translatable="yes" context="customanimationtimingtab|start_list">After previous</item>
             </items>
           </object>
           <packing>
@@ -108,7 +108,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Select the speed of the Animation.</property>
+            <property name="tooltip_text" translatable="yes" context="customanimationtimingtab|anim_duration|tooltip_text">Select the speed of the Animation.</property>
             <property name="hexpand">True</property>
             <property name="adjustment">adjustment1</property>
           </object>
@@ -130,7 +130,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="rewind">
-            <property name="label" translatable="yes">Rewind _when done playing</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|rewind">Rewind _when done playing</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -171,7 +171,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="rb_click_sequence">
-                    <property name="label" translatable="yes">_Animate as part of click sequence</property>
+                    <property name="label" translatable="yes" context="customanimationtimingtab|rb_click_sequence">_Animate as part of click sequence</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -189,7 +189,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="rb_interactive">
-                    <property name="label" translatable="yes">Start _effect on click of:</property>
+                    <property name="label" translatable="yes" context="customanimationtimingtab|rb_interactive">Start _effect on click of:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -225,7 +225,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Trigger</property>
+            <property name="label" translatable="yes" context="customanimationtimingtab|label11">Trigger</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui b/sd/uiconfig/simpress/ui/customslideshows.ui
index 08ffa9625e0c..79aefc00e832 100644
--- a/sd/uiconfig/simpress/ui/customslideshows.ui
+++ b/sd/uiconfig/simpress/ui/customslideshows.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CustomSlideShows">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Custom Slide Shows</property>
+    <property name="title" translatable="yes" context="customslideshows|CustomSlideShows">Custom Slide Shows</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -65,7 +65,7 @@
             </child>
             <child>
               <object class="GtkButton" id="copy">
-                <property name="label" translatable="yes">Cop_y</property>
+                <property name="label" translatable="yes" context="customslideshows|copy">Cop_y</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -94,7 +94,7 @@
             </child>
             <child>
               <object class="GtkButton" id="startshow">
-                <property name="label" translatable="yes">_Start</property>
+                <property name="label" translatable="yes" context="customslideshows|startshow">_Start</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -155,7 +155,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="usecustomshows">
-                <property name="label" translatable="yes">_Use custom slide show</property>
+                <property name="label" translatable="yes" context="customslideshows|usecustomshows">_Use custom slide show</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sd/uiconfig/simpress/ui/definecustomslideshow.ui b/sd/uiconfig/simpress/ui/definecustomslideshow.ui
index 6efa011ff564..cbff44c0d535 100644
--- a/sd/uiconfig/simpress/ui/definecustomslideshow.ui
+++ b/sd/uiconfig/simpress/ui/definecustomslideshow.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.2"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DefineCustomSlideShow">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Define Custom Slide Show</property>
+    <property name="title" translatable="yes" context="definecustomslideshow|DefineCustomSlideShow">Define Custom Slide Show</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Name:</property>
+                    <property name="label" translatable="yes" context="definecustomslideshow|label1">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">customname</property>
                   </object>
@@ -131,7 +131,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Existing slides:</property>
+                    <property name="label" translatable="yes" context="definecustomslideshow|label2">_Existing slides:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">pages:border</property>
                   </object>
@@ -145,7 +145,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Selected slides:</property>
+                    <property name="label" translatable="yes" context="definecustomslideshow|label3">_Selected slides:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">custompages:border</property>
                   </object>
@@ -195,7 +195,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="add">
-                        <property name="label" translatable="yes">&gt;&gt;</property>
+                        <property name="label" translatable="yes" context="definecustomslideshow|add">&gt;&gt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -208,7 +208,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="remove">
-                        <property name="label" translatable="yes">&lt;&lt;</property>
+                        <property name="label" translatable="yes" context="definecustomslideshow|remove">&lt;&lt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/sd/uiconfig/simpress/ui/dlgfield.ui b/sd/uiconfig/simpress/ui/dlgfield.ui
index 5a2144e40454..05fc144a7998 100644
--- a/sd/uiconfig/simpress/ui/dlgfield.ui
+++ b/sd/uiconfig/simpress/ui/dlgfield.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="EditFieldsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Field</property>
+    <property name="title" translatable="yes" context="dlgfield|EditFieldsDialog">Edit Field</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="fixedRB">
-                            <property name="label" translatable="yes">_Fixed</property>
+                            <property name="label" translatable="yes" context="dlgfield|fixedRB">_Fixed</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -115,7 +115,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="varRB">
-                            <property name="label" translatable="yes">_Variable</property>
+                            <property name="label" translatable="yes" context="dlgfield|varRB">_Variable</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Field Type</property>
+                    <property name="label" translatable="yes" context="dlgfield|label1">Field Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -161,7 +161,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Language:</property>
+                    <property name="label" translatable="yes" context="dlgfield|label2">_Language:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">languageLB</property>
                   </object>
@@ -213,7 +213,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">F_ormat</property>
+                    <property name="label" translatable="yes" context="dlgfield|label3">F_ormat</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
diff --git a/sd/uiconfig/simpress/ui/dockinganimation.ui b/sd/uiconfig/simpress/ui/dockinganimation.ui
index 31f169ba987d..9fc5a1fea4c9 100644
--- a/sd/uiconfig/simpress/ui/dockinganimation.ui
+++ b/sd/uiconfig/simpress/ui/dockinganimation.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -60,7 +60,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Animation</property>
+    <property name="title" translatable="yes" context="dockinganimation|DockingAnimation">Animation</property>
     <property name="type_hint">dock</property>
     <child>
       <object class="GtkBox" id="box1">
@@ -88,7 +88,7 @@
                   <object class="GtkBox" id="box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Preview</property>
+                    <property name="tooltip_text" translatable="yes" context="dockinganimation|box|tooltip_text">Preview</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
@@ -113,7 +113,7 @@
                       <object class="GtkComboBoxText" id="loopcount">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Loop Count</property>
+                        <property name="tooltip_text" translatable="yes" context="dockinganimation|loopcount|tooltip_text">Loop Count</property>
                         <items>
                           <item translatable="no">1</item>
                           <item translatable="no">2</item>
@@ -133,7 +133,7 @@
                           <item translatable="no">100</item>
                           <item translatable="no">500</item>
                           <item translatable="no">1000</item>
-                          <item translatable="yes">Max.</item>
+                          <item translatable="yes" context="dockinganimation|loopcount">Max.</item>
                         </items>
                       </object>
                       <packing>
@@ -147,7 +147,7 @@
                       <object class="GtkSpinButton" id="duration:hh:mm">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Duration</property>
+                        <property name="tooltip_text" translatable="yes" context="dockinganimation|duration|tooltip_text">Duration</property>
                         <property name="digits">2</property>
                       </object>
                       <packing>
@@ -161,7 +161,7 @@
                       <object class="GtkSpinButton" id="numbitmap">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Image Number</property>
+                        <property name="tooltip_text" translatable="yes" context="dockinganimation|numbitmap|tooltip_text">Image Number</property>
                         <property name="text" translatable="no">1</property>
                         <property name="adjustment">adjustment1</property>
                         <property name="value">1</property>
@@ -184,7 +184,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">First Image</property>
+                            <property name="tooltip_text" translatable="yes" context="dockinganimation|first|tooltip_text">First Image</property>
                             <property name="image">image5</property>
                           </object>
                           <packing>
@@ -199,7 +199,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Backwards</property>
+                            <property name="tooltip_text" translatable="yes" context="dockinganimation|prev|tooltip_text">Backwards</property>
                             <property name="image">image6</property>
                           </object>
                           <packing>
@@ -214,7 +214,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Stop</property>
+                            <property name="tooltip_text" translatable="yes" context="dockinganimation|stop|tooltip_text">Stop</property>
                             <property name="image">image7</property>
                           </object>
                           <packing>
@@ -229,7 +229,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Play</property>
+                            <property name="tooltip_text" translatable="yes" context="dockinganimation|next|tooltip_text">Play</property>
                             <property name="image">image8</property>
                           </object>
                           <packing>
@@ -244,7 +244,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Last Image</property>
+                            <property name="tooltip_text" translatable="yes" context="dockinganimation|last|tooltip_text">Last Image</property>
                             <property name="image">image9</property>
                           </object>
                           <packing>
@@ -297,7 +297,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="group">
-                            <property name="label" translatable="yes">Group object</property>
+                            <property name="label" translatable="yes" context="dockinganimation|group">Group object</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -315,7 +315,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="bitmap">
-                            <property name="label" translatable="yes">Bitmap object</property>
+                            <property name="label" translatable="yes" context="dockinganimation|bitmap">Bitmap object</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -338,7 +338,7 @@
                             <child>
                               <object class="GtkLabel" id="alignmentft">
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Alignment</property>
+                                <property name="label" translatable="yes" context="dockinganimation|alignmentft">Alignment</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">alignment</property>
                               </object>
@@ -353,15 +353,15 @@
                               <object class="GtkComboBoxText" id="alignment">
                                 <property name="can_focus">False</property>
                                 <items>
-                                  <item translatable="yes">Top Left</item>
-                                  <item translatable="yes">Left</item>
-                                  <item translatable="yes">Bottom Left</item>
-                                  <item translatable="yes">Top</item>
-                                  <item translatable="yes">Centered</item>
-                                  <item translatable="yes">Bottom</item>
-                                  <item translatable="yes">Top Right</item>
-                                  <item translatable="yes">Right</item>
-                                  <item translatable="yes">Bottom Right</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Top Left</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Left</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Bottom Left</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Top</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Centered</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Bottom</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Top Right</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Right</item>
+                                  <item translatable="yes" context="dockinganimation|alignment">Bottom Right</item>
                                 </items>
                               </object>
                               <packing>
@@ -387,7 +387,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Animation group</property>
+                    <property name="label" translatable="yes" context="dockinganimation|label1">Animation group</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -431,7 +431,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Apply Object</property>
+                                <property name="tooltip_text" translatable="yes" context="dockinganimation|getone|tooltip_text">Apply Object</property>
                                 <property name="image">image1</property>
                               </object>
                               <packing>
@@ -446,7 +446,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Apply Objects Individually</property>
+                                <property name="tooltip_text" translatable="yes" context="dockinganimation|getall|tooltip_text">Apply Objects Individually</property>
                                 <property name="image">image2</property>
                               </object>
                               <packing>
@@ -476,7 +476,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Number</property>
+                                <property name="label" translatable="yes" context="dockinganimation|label3">Number</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -519,7 +519,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Delete Current Image</property>
+                                <property name="tooltip_text" translatable="yes" context="dockinganimation|delone|tooltip_text">Delete Current Image</property>
                                 <property name="image">image3</property>
                               </object>
                               <packing>
@@ -534,7 +534,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Delete All Images</property>
+                                <property name="tooltip_text" translatable="yes" context="dockinganimation|delall|tooltip_text">Delete All Images</property>
                                 <property name="image">image4</property>
                               </object>
                               <packing>
@@ -560,7 +560,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Image</property>
+                    <property name="label" translatable="yes" context="dockinganimation|label2">Image</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -603,7 +603,7 @@
             </child>
             <child>
               <object class="GtkButton" id="create">
-                <property name="label" translatable="yes">Create</property>
+                <property name="label" translatable="yes" context="dockinganimation|create">Create</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/sd/uiconfig/simpress/ui/effectmenu.ui b/sd/uiconfig/simpress/ui/effectmenu.ui
index 7971047a8f4d..991b80326540 100644
--- a/sd/uiconfig/simpress/ui/effectmenu.ui
+++ b/sd/uiconfig/simpress/ui/effectmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkRadioMenuItem" id="onclick">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Start On _Click</property>
+        <property name="label" translatable="yes" context="effectmenu|onclick">Start On _Click</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkRadioMenuItem" id="withprev">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Start _With Previous</property>
+        <property name="label" translatable="yes" context="effectmenu|withprev">Start _With Previous</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkRadioMenuItem" id="afterprev">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Start _After Previous</property>
+        <property name="label" translatable="yes" context="effectmenu|afterprev">Start _After Previous</property>
       </object>
     </child>
     <child>
@@ -38,7 +38,7 @@
       <object class="GtkMenuItem" id="options">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Effect Options...</property>
+        <property name="label" translatable="yes" context="effectmenu|options">_Effect Options...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -46,7 +46,7 @@
       <object class="GtkMenuItem" id="timing">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Timing...</property>
+        <property name="label" translatable="yes" context="effectmenu|timing">_Timing...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -54,7 +54,7 @@
       <object class="GtkMenuItem" id="remove">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Remove</property>
+        <property name="label" translatable="yes" context="effectmenu|remove">_Remove</property>
       </object>
     </child>
   </object>
diff --git a/sd/uiconfig/simpress/ui/fontsizemenu.ui b/sd/uiconfig/simpress/ui/fontsizemenu.ui
index 05f563f4058e..53fb0ff1273f 100644
--- a/sd/uiconfig/simpress/ui/fontsizemenu.ui
+++ b/sd/uiconfig/simpress/ui/fontsizemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Tiny</property>
+        <property name="label" translatable="yes" context="fontsizemenu|25">Tiny</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="50">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Smaller</property>
+        <property name="label" translatable="yes" context="fontsizemenu|50">Smaller</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="150">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Larger</property>
+        <property name="label" translatable="yes" context="fontsizemenu|150">Larger</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="400">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Extra Large</property>
+        <property name="label" translatable="yes" context="fontsizemenu|400">Extra Large</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/fontstylemenu.ui b/sd/uiconfig/simpress/ui/fontstylemenu.ui
index 191f41d5b2d0..b7e40288236c 100644
--- a/sd/uiconfig/simpress/ui/fontstylemenu.ui
+++ b/sd/uiconfig/simpress/ui/fontstylemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkCheckMenuItem" id="bold">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Bold</property>
+        <property name="label" translatable="yes" context="fontstylemenu|bold">Bold</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkCheckMenuItem" id="italic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Italic</property>
+        <property name="label" translatable="yes" context="fontstylemenu|italic">Italic</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkCheckMenuItem" id="underline">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Underlined</property>
+        <property name="label" translatable="yes" context="fontstylemenu|underline">Underlined</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/headerfooterdialog.ui b/sd/uiconfig/simpress/ui/headerfooterdialog.ui
index dfef7e11d123..b60db1046aba 100644
--- a/sd/uiconfig/simpress/ui/headerfooterdialog.ui
+++ b/sd/uiconfig/simpress/ui/headerfooterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="HeaderFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Header and Footer</property>
+    <property name="title" translatable="yes" context="headerfooterdialog|HeaderFooterDialog">Header and Footer</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="apply_all">
-                <property name="label" translatable="yes">Appl_y to All</property>
+                <property name="label" translatable="yes" context="headerfooterdialog|apply_all">Appl_y to All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="slides">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Slides</property>
+                <property name="label" translatable="yes" context="headerfooterdialog|slides">Slides</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="notes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Notes and Handouts</property>
+                <property name="label" translatable="yes" context="headerfooterdialog|notes">Notes and Handouts</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sd/uiconfig/simpress/ui/headerfootertab.ui b/sd/uiconfig/simpress/ui/headerfootertab.ui
index 6568483abf34..0803ec61dbb0 100644
--- a/sd/uiconfig/simpress/ui/headerfootertab.ui
+++ b/sd/uiconfig/simpress/ui/headerfootertab.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="HeaderFooterTab">
@@ -37,7 +37,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="header_cb">
-                        <property name="label" translatable="yes">Heade_r</property>
+                        <property name="label" translatable="yes" context="headerfootertab|header_cb">Heade_r</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
                           <object class="GtkLabel" id="header_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Header _text:</property>
+                            <property name="label" translatable="yes" context="headerfootertab|header_label">Header _text:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">header_text</property>
                           </object>
@@ -98,7 +98,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="datetime_cb">
-                        <property name="label" translatable="yes">_Date and time</property>
+                        <property name="label" translatable="yes" context="headerfootertab|datetime_cb">_Date and time</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="rb_fixed">
-                                <property name="label" translatable="yes">Fi_xed</property>
+                                <property name="label" translatable="yes" context="headerfootertab|rb_fixed">Fi_xed</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -177,7 +177,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="rb_auto">
-                                <property name="label" translatable="yes">_Variable</property>
+                                <property name="label" translatable="yes" context="headerfootertab|rb_auto">_Variable</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -220,7 +220,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">start</property>
-                                        <property name="label" translatable="yes">_Language:</property>
+                                        <property name="label" translatable="yes" context="headerfootertab|language_label">_Language:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">language_list</property>
                                       </object>
@@ -244,7 +244,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">start</property>
-                                        <property name="label" translatable="yes">_Format:</property>
+                                        <property name="label" translatable="yes" context="headerfootertab|language_label1">_Format:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">datetime_format_list</property>
                                       </object>
@@ -289,7 +289,7 @@
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="footer_cb">
-                            <property name="label" translatable="yes">_Footer</property>
+                            <property name="label" translatable="yes" context="headerfootertab|footer_cb">_Footer</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -316,7 +316,7 @@
                               <object class="GtkLabel" id="footer_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">F_ooter text:</property>
+                                <property name="label" translatable="yes" context="headerfootertab|footer_label">F_ooter text:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">footer_text</property>
                               </object>
@@ -357,7 +357,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="slide_number">
-                        <property name="label" translatable="yes">_Slide number</property>
+                        <property name="label" translatable="yes" context="headerfootertab|slide_number">_Slide number</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -379,7 +379,7 @@
               <object class="GtkLabel" id="include_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Include on Slide</property>
+                <property name="label" translatable="yes" context="headerfootertab|include_label">Include on Slide</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -394,7 +394,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="not_on_title">
-            <property name="label" translatable="yes">Do _not show on the first slide</property>
+            <property name="label" translatable="yes" context="headerfootertab|not_on_title">Do _not show on the first slide</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -413,7 +413,7 @@
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Page Number</property>
+            <property name="label" translatable="yes" context="headerfootertab|replacement_a">_Page Number</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -427,7 +427,7 @@
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Include on page</property>
+            <property name="label" translatable="yes" context="headerfootertab|replacement_b">Include on page</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/insertslides.ui b/sd/uiconfig/simpress/ui/insertslides.ui
index aaefa1c277f4..3926811fe9c6 100644
--- a/sd/uiconfig/simpress/ui/insertslides.ui
+++ b/sd/uiconfig/simpress/ui/insertslides.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertSlidesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Slides</property>
+    <property name="title" translatable="yes" context="insertslides|InsertSlidesDialog">Insert Slides</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="before">
-                        <property name="label" translatable="yes">_Before</property>
+                        <property name="label" translatable="yes" context="insertslides|before">_Before</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="after">
-                        <property name="label" translatable="yes">A_fter</property>
+                        <property name="label" translatable="yes" context="insertslides|after">A_fter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -134,7 +134,7 @@
                 <property name="can_focus">False</property>
                 <property name="yalign">0.55000001192092896</property>
                 <property name="xpad">1</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="insertslides|label1">Position</property>
                 <property name="justify">center</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
diff --git a/sd/uiconfig/simpress/ui/interactiondialog.ui b/sd/uiconfig/simpress/ui/interactiondialog.ui
index 39eec0683c79..23694571d46c 100644
--- a/sd/uiconfig/simpress/ui/interactiondialog.ui
+++ b/sd/uiconfig/simpress/ui/interactiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InteractionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Interaction</property>
+    <property name="title" translatable="yes" context="interactiondialog|InteractionDialog">Interaction</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/sd/uiconfig/simpress/ui/interactionpage.ui b/sd/uiconfig/simpress/ui/interactionpage.ui
index 936393cf73be..f7323ece7fab 100644
--- a/sd/uiconfig/simpress/ui/interactionpage.ui
+++ b/sd/uiconfig/simpress/ui/interactionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="InteractionPage">
@@ -37,7 +37,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Action at mouse click:</property>
+                    <property name="label" translatable="yes" context="interactionpage|label2">Action at mouse click:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">listbox</property>
                   </object>
@@ -62,7 +62,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Target:</property>
+                    <property name="label" translatable="yes" context="interactionpage|fttree">Target:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">box3</property>
                   </object>
@@ -140,7 +140,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Interaction</property>
+            <property name="label" translatable="yes" context="interactionpage|label1">Interaction</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -180,7 +180,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkButton" id="browse">
-                        <property name="label" translatable="yes">_Browse...</property>
+                        <property name="label" translatable="yes" context="interactionpage|browse">_Browse...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -194,7 +194,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="find">
-                        <property name="label" translatable="yes">_Find</property>
+                        <property name="label" translatable="yes" context="interactionpage|find">_Find</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="no_show_all">True</property>
@@ -226,7 +226,7 @@
                         <property name="invisible_char">•</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="sound-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Path Name</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="interactionpage|sound-atkobject">Path Name</property>
                           </object>
                         </child>
                       </object>
diff --git a/sd/uiconfig/simpress/ui/layoutmenu.ui b/sd/uiconfig/simpress/ui/layoutmenu.ui
index f91b74d70e0f..8cf4406c33f7 100644
--- a/sd/uiconfig/simpress/ui/layoutmenu.ui
+++ b/sd/uiconfig/simpress/ui/layoutmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="apply">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Apply to _Selected Slides</property>
+        <property name="label" translatable="yes" context="layoutmenu|apply">Apply to _Selected Slides</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="insert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Insert Slide</property>
+        <property name="label" translatable="yes" context="layoutmenu|insert">_Insert Slide</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
index a5679db4162e..eb1484fc1329 100644
--- a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
+++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MasterLayoutDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Master Elements</property>
+    <property name="title" translatable="yes" context="masterlayoutdlg|MasterLayoutDialog">Master Elements</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="header">
-                        <property name="label" translatable="yes">_Header</property>
+                        <property name="label" translatable="yes" context="masterlayoutdlg|header">_Header</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -105,7 +105,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="datetime">
-                        <property name="label" translatable="yes">_Date/time</property>
+                        <property name="label" translatable="yes" context="masterlayoutdlg|datetime">_Date/time</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -121,7 +121,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="footer">
-                        <property name="label" translatable="yes">_Footer</property>
+                        <property name="label" translatable="yes" context="masterlayoutdlg|footer">_Footer</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -137,7 +137,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="pagenumber">
-                        <property name="label" translatable="yes">_Page number</property>
+                        <property name="label" translatable="yes" context="masterlayoutdlg|pagenumber">_Page number</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -153,7 +153,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="slidenumber">
-                        <property name="label" translatable="yes">_Slide number</property>
+                        <property name="label" translatable="yes" context="masterlayoutdlg|slidenumber">_Slide number</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -175,7 +175,7 @@
               <object class="GtkLabel" id="Placeholders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Placeholders</property>
+                <property name="label" translatable="yes" context="masterlayoutdlg|Placeholders">Placeholders</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sd/uiconfig/simpress/ui/mastermenu.ui b/sd/uiconfig/simpress/ui/mastermenu.ui
index 29a9acd09b38..7ac6eed806ae 100644
--- a/sd/uiconfig/simpress/ui/mastermenu.ui
+++ b/sd/uiconfig/simpress/ui/mastermenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="applyall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Apply to All Slides</property>
+        <property name="label" translatable="yes" context="mastermenu|applyall">_Apply to All Slides</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="applyselect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Apply to _Selected Slides</property>
+        <property name="label" translatable="yes" context="mastermenu|applyselect">Apply to _Selected Slides</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="large">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Show _Large Preview</property>
+        <property name="label" translatable="yes" context="mastermenu|large">Show _Large Preview</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="small">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Show S_mall Preview</property>
+        <property name="label" translatable="yes" context="mastermenu|small">Show S_mall Preview</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/navigatorpanel.ui b/sd/uiconfig/simpress/ui/navigatorpanel.ui
index 732bd8ac005d..f738f930b27c 100644
--- a/sd/uiconfig/simpress/ui/navigatorpanel.ui
+++ b/sd/uiconfig/simpress/ui/navigatorpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="NavigatorPanel">
     <property name="visible">True</property>
@@ -19,10 +19,10 @@
           <object class="GtkComboBox" id="documents">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Document</property>
+            <property name="tooltip_text" translatable="yes" context="navigatorpanel|documents|tooltip_text">Document</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="documents-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Active Window</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="navigatorpanel|documents-atkobject">Active Window</property>
               </object>
             </child>
           </object>
@@ -55,7 +55,7 @@
               <object class="GtkToolButton" id="first">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">First Slide</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|first|tooltip_text">First Slide</property>
                 <property name="action_name">first</property>
                 <property name="icon_name">sd/res/nv03.png</property>
               </object>
@@ -68,7 +68,7 @@
               <object class="GtkToolButton" id="previous">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Previous Slide</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|previous|tooltip_text">Previous Slide</property>
                 <property name="action_name">previous</property>
                 <property name="icon_name">sd/res/nv04.png</property>
               </object>
@@ -81,7 +81,7 @@
               <object class="GtkToolButton" id="next">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Next Slide</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|next|tooltip_text">Next Slide</property>
                 <property name="action_name">next</property>
                 <property name="icon_name">sd/res/nv05.png</property>
               </object>
@@ -94,7 +94,7 @@
               <object class="GtkToolButton" id="last">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Last Slide</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|last|tooltip_text">Last Slide</property>
                 <property name="action_name">last</property>
                 <property name="icon_name">sd/res/nv06.png</property>
               </object>
@@ -117,7 +117,7 @@
               <object class="GtkMenuToolButton" id="dragmode">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Drag Mode</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|dragmode|tooltip_text">Drag Mode</property>
                 <property name="action_name">dragmode</property>
                 <property name="icon_name">sd/res/nv09.png</property>
               </object>
@@ -130,7 +130,7 @@
               <object class="GtkMenuToolButton" id="shapes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Show Shapes</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|shapes|tooltip_text">Show Shapes</property>
                 <property name="action_name">shapes</property>
                 <property name="icon_name">sd/res/graphic.png</property>
               </object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 0f2cb20f3f54..196d98656e78 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="BringToFrontImg">
@@ -331,7 +331,7 @@
               <object class="GtkLabel" id="FileLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar|FileLabel">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -412,7 +412,7 @@
                         </child>
                         <child>
                           <object class="vcllo-SmallButton" id="FormatPaintbrush">
-                            <property name="label" translatable="yes">Clone</property>
+                            <property name="label" translatable="yes" context="notebookbar|FormatPaintbrush">Clone</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -909,7 +909,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|numberbullet|tooltip_text">Bullets and Numbering</property>
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="bullet">
@@ -949,14 +949,14 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Indent</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|indent|tooltip_text">Indent</property>
                                 <child>
                                   <object class="GtkToolButton" id="increaseindent">
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|increaseindent|tooltip_text">Increase Indent</property>
                                     <property name="is_important">True</property>
                                     <property name="action_name">.uno:IncrementIndent</property>
                                     <property name="use_underline">True</property>
@@ -972,7 +972,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|decreaseindent|tooltip_text">Decrease Indent</property>
                                     <property name="is_important">True</property>
                                     <property name="action_name">.uno:DecrementIndent</property>
                                     <property name="use_underline">True</property>
@@ -1006,7 +1006,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|horizontalalignment|tooltip_text">Horizontal Alignment</property>
                                 <property name="halign">start</property>
                                 <property name="show_arrow">False</property>
                                 <child>
@@ -1482,7 +1482,7 @@
               <object class="GtkLabel" id="ImpressLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Home</property>
+                <property name="label" translatable="yes" context="notebookbar|ImpressLabel">Home</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-default"/>
@@ -1601,7 +1601,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Insert Audio or Video</property>
+                            <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
@@ -1915,7 +1915,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="vcllo-SmallButton" id="InsertSymbol">
-                        <property name="label" translatable="yes">Symbol</property>
+                        <property name="label" translatable="yes" context="notebookbar|InsertSymbol">Symbol</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1990,7 +1990,7 @@
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -2012,7 +2012,7 @@
               <object class="GtkLabel" id="TransitionsLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transitions</property>
+                <property name="label" translatable="yes" context="notebookbar|TransitionsLabel">Transitions</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -2032,7 +2032,7 @@
               <object class="GtkLabel" id="AnimationLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Animation</property>
+                <property name="label" translatable="yes" context="notebookbar|AnimationLabel">Animation</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -2195,7 +2195,7 @@
               <object class="GtkLabel" id="SlideShowLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Slide Show</property>
+                <property name="label" translatable="yes" context="notebookbar|SlideShowLabel">Slide Show</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -2229,7 +2229,7 @@
                     </child>
                     <child>
                       <object class="vcllo-SmallButton" id="SpellOnline">
-                        <property name="label" translatable="yes">Auto Spellcheck</property>
+                        <property name="label" translatable="yes" context="notebookbar|SpellOnline">Auto Spellcheck</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2330,7 +2330,7 @@
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Review</property>
+                <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -2522,7 +2522,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="GridVisible">
-                        <property name="label" translatable="yes">Grid</property>
+                        <property name="label" translatable="yes" context="notebookbar|GridVisible">Grid</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -2710,7 +2710,7 @@
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">View</property>
+                <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -2730,7 +2730,7 @@
               <object class="GtkLabel" id="TableLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Table</property>
+                <property name="label" translatable="yes" context="notebookbar|TableLabel">Table</property>
                 <style>
                   <class name="context-Table"/>
                 </style>
@@ -3246,7 +3246,7 @@
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
index 4cd9e4383bdd..1ceb60b0a4aa 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -46,7 +46,7 @@
       <object class="GtkMenuItem" id="layout01">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Blank</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|layout01">Blank</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -54,7 +54,7 @@
       <object class="GtkMenuItem" id="layout02">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title Slide</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|layout02">Title Slide</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -62,7 +62,7 @@
       <object class="GtkMenuItem" id="layout03">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title, Text</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|layout03">Title, Text</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -70,7 +70,7 @@
       <object class="GtkMenuItem" id="layout04">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title, Content</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|layout04">Title, Content</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -78,7 +78,7 @@
       <object class="GtkMenuItem" id="layout05">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Centered Text</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|layout05">Centered Text</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -101,7 +101,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HyperlinkDialog</property>
-        <property name="label" translatable="yes">Hyperlink</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|hyperlink">Hyperlink</property>
       </object>
     </child>
     <child>
@@ -115,7 +115,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnote</property>
-        <property name="label" translatable="yes">Footnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|footnote">Footnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -124,7 +124,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEndnote</property>
-        <property name="label" translatable="yes">Endnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|endnote">Endnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -139,7 +139,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertBookmark</property>
-        <property name="label" translatable="yes">Bookmark</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|bookmark">Bookmark</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -148,7 +148,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertReferenceField</property>
-        <property name="label" translatable="yes">Cross-Reference</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|crossreference">Cross-Reference</property>
       </object>
     </child>
   </object>
@@ -165,7 +165,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsBefore</property>
-        <property name="label" translatable="yes">Master 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|master01">Master 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -174,7 +174,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsAfter</property>
-        <property name="label" translatable="yes">Master 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|master02">Master 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -254,7 +254,7 @@
       <object class="GtkMenuItem" id="shapestyledefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|shapestyledefault">Default</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -262,7 +262,7 @@
       <object class="GtkMenuItem" id="shapestylenofill">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">No Fill</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|shapestylenofill">No Fill</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -270,7 +270,7 @@
       <object class="GtkMenuItem" id="shapestyleshadow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">With Shadow</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|shapestyleshadow">With Shadow</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -284,7 +284,7 @@
       <object class="GtkMenuItem" id="shapestyletitle1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|shapestyletitle1">Title 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -292,7 +292,7 @@
       <object class="GtkMenuItem" id="shapestyletitle2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|shapestyletitle2">Title 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -486,7 +486,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|filegrouplabel">File</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -639,7 +639,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Clipboard</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|clipboardgrouplabel">Clipboard</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -685,7 +685,7 @@
                 <property name="spacing">3</property>
                 <child>
                   <object class="GtkButton" id="shapestyleb:stylemenu">
-                    <property name="label" translatable="yes">Style</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|shapestyleb">Style</property>
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -846,7 +846,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="growb">
-                            <property name="label" translatable="yes"> </property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|growb"> </property>
                             <property name="width_request">35</property>
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
@@ -868,7 +868,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="shrinkb">
-                            <property name="label" translatable="yes"> </property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|shrinkb"> </property>
                             <property name="width_request">35</property>
                             <property name="height_request">30</property>
                             <property name="visible">True</property>
@@ -1198,7 +1198,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|formatgrouplabel">Text</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -1248,7 +1248,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="startshowb">
-                        <property name="label" translatable="yes">Start</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|startshowb">Start</property>
                         <property name="width_request">70</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
@@ -1272,7 +1272,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="masterb:mastermenu">
-                            <property name="label" translatable="yes">Master</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|masterb">Master</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1290,7 +1290,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="layoutb:layoutmenu">
-                            <property name="label" translatable="yes">Layout</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|layoutb">Layout</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1320,7 +1320,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="animationb:animenu">
-                            <property name="label" translatable="yes">Animation</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|animationb">Animation</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1337,7 +1337,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="transitionb:transmenu">
-                            <property name="label" translatable="yes">Transition</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|transitionb">Transition</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1383,7 +1383,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Slide</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|slidegrouplabel">Slide</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1457,7 +1457,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
                                 <property name="action_name">.uno:BasicShapes</property>
-                                <property name="label" translatable="yes">Shapes</property>
+                                <property name="label" translatable="yes" context="notebookbar_groups|shapesb">Shapes</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -1473,7 +1473,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="linksb:linksmenu">
-                            <property name="label" translatable="yes">Links</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|linksb">Links</property>
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1581,7 +1581,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|insertgrouplabel">Insert</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1617,7 +1617,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="imagestyleb">
-                        <property name="label" translatable="yes">Style</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|imagestyleb">Style</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1656,7 +1656,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="resetb">
-                            <property name="label" translatable="yes">Reset</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|resetb">Reset</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1700,7 +1700,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="wrapb:wrapmenu">
-                            <property name="label" translatable="yes">Wrap</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|wrapb">Wrap</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1715,7 +1715,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="lockb">
-                            <property name="label" translatable="yes">Lock</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|lockb">Lock</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1759,7 +1759,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Image</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|imagegrouplabel">Image</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1815,7 +1815,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOff</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapoff">None</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1824,7 +1824,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapIdeal</property>
-        <property name="label" translatable="yes">Optimal</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapideal">Optimal</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1833,7 +1833,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOn</property>
-        <property name="label" translatable="yes">Parallel</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapon">Parallel</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1842,7 +1842,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapLeft</property>
-        <property name="label" translatable="yes">Before</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapleft">Before</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1851,7 +1851,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapRight</property>
-        <property name="label" translatable="yes">After</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapright">After</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1860,7 +1860,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapThrough</property>
-        <property name="label" translatable="yes">Through</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapthrough">Through</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1875,7 +1875,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapContour</property>
-        <property name="label" translatable="yes">Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapcontour">Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1884,7 +1884,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ContourDialog</property>
-        <property name="label" translatable="yes">Edit Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|contourdialog">Edit Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 13733be89fa9..057f9877a511 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">5</property>
@@ -37,7 +37,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="qickedit">
-                    <property name="label" translatable="yes">Allow quick editing</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|qickedit">Allow quick editing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -53,7 +53,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="textselected">
-                    <property name="label" translatable="yes">Only text area selected</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|textselected">Only text area selected</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -76,7 +76,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Objects</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|label2">Text Objects</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -110,7 +110,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="startwithwizard">
-                    <property name="label" translatable="yes">Start with _Template Selection</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|startwithwizard">Start with _Template Selection</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
           <object class="GtkLabel" id="newdoclbl">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">New Document</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|newdoclbl">New Document</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -167,7 +167,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="copywhenmove">
-                    <property name="label" translatable="yes">Copy when moving</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|copywhenmove">Copy when moving</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -190,7 +190,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Unit of _measurement:</property>
+                        <property name="label" translatable="yes" context="optimpressgeneralpage|label6">Unit of _measurement:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">units</property>
                       </object>
@@ -227,7 +227,7 @@
                         <property name="can_focus">False</property>
                         <property name="double_buffered">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Ta_b stops:</property>
+                        <property name="label" translatable="yes" context="optimpressgeneralpage|tapstoplabel">Ta_b stops:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">fill</property>
                         <property name="mnemonic_widget">metricFields:0.00mm</property>
@@ -259,7 +259,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="objalwymov">
-                    <property name="label" translatable="yes">Objects always moveable</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|objalwymov">Objects always moveable</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -274,7 +274,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="distrotcb">
-                    <property name="label" translatable="yes">Do not distort objects in curve</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|distrotcb">Do not distort objects in curve</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -290,7 +290,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="backgroundback">
-                    <property name="label" translatable="yes">Use background cache</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|backgroundback">Use background cache</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -312,7 +312,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_bottom">3</property>
-            <property name="label" translatable="yes">Settings</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|label4">Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -347,7 +347,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="enremotcont">
-                    <property name="label" translatable="yes">Enable remote control</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|enremotcont">Enable remote control</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -362,7 +362,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="enprsntcons">
-                    <property name="label" translatable="yes">Enable Presenter Console</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|enprsntcons">Enable Presenter Console</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -383,7 +383,7 @@
           <object class="GtkLabel" id="label7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Presentation</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|label7">Presentation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -422,7 +422,7 @@
                     <property name="double_buffered">False</property>
                     <property name="margin_right">3</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Drawing scale:</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|label8">_Drawing scale:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">scaleBox</property>
                   </object>
@@ -436,7 +436,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Page _width:</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|widthlbl">Page _width:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">metricWidthFields:0.00mm</property>
                   </object>
@@ -450,7 +450,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Page _height:</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|heightlbl">Page _height:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">metricHeightFields:0.00mm</property>
                   </object>
@@ -572,7 +572,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Scale</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|label5">Scale</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -604,7 +604,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printermetrics">
-                    <property name="label" translatable="yes">Us_e printer metrics for document formatting</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|printermetrics">Us_e printer metrics for document formatting</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -619,7 +619,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cbCompatibility">
-                    <property name="label" translatable="yes">Add _spacing between paragraphs and tables (in current document)</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables (in current document)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -642,7 +642,7 @@
             <property name="can_focus">False</property>
             <property name="xalign">0.49000000953674316</property>
             <property name="yalign">0.49000000953674316</property>
-            <property name="label" translatable="yes">Compatibility</property>
+            <property name="label" translatable="yes" context="optimpressgeneralpage|label1">Compatibility</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui
index a76df350297c..9e12348c05e0 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -15,20 +15,20 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">1 Image</col>
+        <col id="0" translatable="yes" context="photoalbum|liststore2">1 Image</col>
       </row>
       <row>
-        <col id="0" translatable="yes">2 Images</col>
+        <col id="0" translatable="yes" context="photoalbum|liststore2">2 Images</col>
       </row>
       <row>
-        <col id="0" translatable="yes">4 Images</col>
+        <col id="0" translatable="yes" context="photoalbum|liststore2">4 Images</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="PhotoAlbumCreatorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Photo Album</property>
+    <property name="title" translatable="yes" context="photoalbum|PhotoAlbumCreatorDialog">Create Photo Album</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -57,7 +57,7 @@
             </child>
             <child>
               <object class="GtkButton" id="create_btn">
-                <property name="label" translatable="yes">Insert Slides</property>
+                <property name="label" translatable="yes" context="photoalbum|create_btn">Insert Slides</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -166,7 +166,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Remove Image from List</property>
+                        <property name="tooltip_text" translatable="yes" context="photoalbum|rem_btn|tooltip_text">Remove Image from List</property>
                         <property name="use_stock">True</property>
                       </object>
                       <packing>
@@ -182,7 +182,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Move Image Up</property>
+                        <property name="tooltip_text" translatable="yes" context="photoalbum|up_btn|tooltip_text">Move Image Up</property>
                         <property name="use_stock">True</property>
                       </object>
                       <packing>
@@ -198,7 +198,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Move Image Down</property>
+                        <property name="tooltip_text" translatable="yes" context="photoalbum|down_btn|tooltip_text">Move Image Down</property>
                         <property name="use_stock">True</property>
                       </object>
                       <packing>
@@ -274,7 +274,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_bottom">6</property>
-                        <property name="label" translatable="yes">Preview</property>
+                        <property name="label" translatable="yes" context="photoalbum|label2">Preview</property>
                         <property name="xalign">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -303,7 +303,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Slide layout:</property>
+                            <property name="label" translatable="yes" context="photoalbum|label7">Slide layout:</property>
                             <property name="mnemonic_widget">opt_combo</property>
                           </object>
                           <packing>
@@ -341,7 +341,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="cap_check">
-                        <property name="label" translatable="yes">Add caption to each slide</property>
+                        <property name="label" translatable="yes" context="photoalbum|cap_check">Add caption to each slide</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -356,7 +356,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="asr_check">
-                        <property name="label" translatable="yes">Keep aspect ratio</property>
+                        <property name="label" translatable="yes" context="photoalbum|asr_check">Keep aspect ratio</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -372,7 +372,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="asr_check_crop">
-                        <property name="label" translatable="yes">Fill Screen</property>
+                        <property name="label" translatable="yes" context="photoalbum|asr_check_crop">Fill Screen</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -387,7 +387,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="insert_as_link_check">
-                        <property name="label" translatable="yes">Link images</property>
+                        <property name="label" translatable="yes" context="photoalbum|insert_as_link_check">Link images</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui
index 732683ddad58..7fcc7f2b03b8 100644
--- a/sd/uiconfig/simpress/ui/presentationdialog.ui
+++ b/sd/uiconfig/simpress/ui/presentationdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PresentationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Slide Show Settings</property>
+    <property name="title" translatable="yes" context="presentationdialog|PresentationDialog">Slide Show Settings</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -46,7 +46,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="from">
-                                <property name="label" translatable="yes">_From:</property>
+                                <property name="label" translatable="yes" context="presentationdialog|from">_From:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -73,7 +73,7 @@
                                 </accessibility>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="from_cb-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Starting slide</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="presentationdialog|from_cb-atkobject">Starting slide</property>
                                   </object>
                                 </child>
                               </object>
@@ -90,7 +90,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="allslides">
-                            <property name="label" translatable="yes">All _slides</property>
+                            <property name="label" translatable="yes" context="presentationdialog|allslides">All _slides</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -107,7 +107,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="customslideshow">
-                            <property name="label" translatable="yes">_Custom slide show:</property>
+                            <property name="label" translatable="yes" context="presentationdialog|customslideshow">_Custom slide show:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -147,7 +147,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Range</property>
+                    <property name="label" translatable="yes" context="presentationdialog|label1">Range</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="xalign">0</property>
-                                <property name="label" translatable="yes">P_resentation display:</property>
+                                <property name="label" translatable="yes" context="presentationdialog|presdisplay_label">P_resentation display:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">presdisplay_cb</property>
                               </object>
@@ -223,7 +223,7 @@
                             <child>
                               <object class="GtkLabel" id="externalmonitor_str">
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Display %1 (external)</property>
+                                <property name="label" translatable="yes" context="presentationdialog|externalmonitor_str">Display %1 (external)</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -233,7 +233,7 @@
                             <child>
                               <object class="GtkLabel" id="monitor_str">
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Display %1</property>
+                                <property name="label" translatable="yes" context="presentationdialog|monitor_str">Display %1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -243,7 +243,7 @@
                             <child>
                               <object class="GtkLabel" id="allmonitors_str">
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">All displays</property>
+                                <property name="label" translatable="yes" context="presentationdialog|allmonitors_str">All displays</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -253,7 +253,7 @@
                             <child>
                               <object class="GtkLabel" id="external_str">
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Auto External (Display %1)</property>
+                                <property name="label" translatable="yes" context="presentationdialog|external_str">Auto External (Display %1)</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -274,7 +274,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Multiple Displays</property>
+                    <property name="label" translatable="yes" context="presentationdialog|label3">Multiple Displays</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -314,7 +314,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="default">
-                                <property name="label" translatable="yes">F_ull screen</property>
+                                <property name="label" translatable="yes" context="presentationdialog|default">F_ull screen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -331,7 +331,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="window">
-                                <property name="label" translatable="yes">In a _window</property>
+                                <property name="label" translatable="yes" context="presentationdialog|window">In a _window</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -347,7 +347,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="auto">
-                                <property name="label" translatable="yes">_Loop and repeat after:</property>
+                                <property name="label" translatable="yes" context="presentationdialog|auto">_Loop and repeat after:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -366,7 +366,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="showlogo">
-                                <property name="label" translatable="yes">Show _logo</property>
+                                <property name="label" translatable="yes" context="presentationdialog|showlogo">Show _logo</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -385,14 +385,14 @@
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Duration of pause</property>
+                                <property name="tooltip_text" translatable="yes" context="presentationdialog|pauseduration|tooltip_text">Duration of pause</property>
                                 <property name="margin_left">12</property>
                                 <accessibility>
                                   <relation type="labelled-by" target="auto"/>
                                 </accessibility>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="pauseduration:hh:mm-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Pause Duration</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="presentationdialog|pauseduration-atkobject">Pause Duration</property>
                                   </object>
                                 </child>
                               </object>
@@ -409,7 +409,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Presentation Mode</property>
+                        <property name="label" translatable="yes" context="presentationdialog|label2">Presentation Mode</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -444,7 +444,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="manualslides">
-                                <property name="label" translatable="yes">Change slides _manually</property>
+                                <property name="label" translatable="yes" context="presentationdialog|manualslides">Change slides _manually</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -459,7 +459,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="pointervisible">
-                                <property name="label" translatable="yes">Mouse pointer _visible</property>
+                                <property name="label" translatable="yes" context="presentationdialog|pointervisible">Mouse pointer _visible</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -474,7 +474,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="pointeraspen">
-                                <property name="label" translatable="yes">Mouse pointer as _pen</property>
+                                <property name="label" translatable="yes" context="presentationdialog|pointeraspen">Mouse pointer as _pen</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -489,7 +489,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="animationsallowed">
-                                <property name="label" translatable="yes">_Animations allowed</property>
+                                <property name="label" translatable="yes" context="presentationdialog|animationsallowed">_Animations allowed</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -504,7 +504,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="changeslidesbyclick">
-                                <property name="label" translatable="yes">Change slides by clic_king on background</property>
+                                <property name="label" translatable="yes" context="presentationdialog|changeslidesbyclick">Change slides by clic_king on background</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -519,7 +519,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="alwaysontop">
-                                <property name="label" translatable="yes">Presentation always _on top</property>
+                                <property name="label" translatable="yes" context="presentationdialog|alwaysontop">Presentation always _on top</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -540,7 +540,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Options</property>
+                        <property name="label" translatable="yes" context="presentationdialog|label4">Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sd/uiconfig/simpress/ui/printeroptions.ui b/sd/uiconfig/simpress/ui/printeroptions.ui
index 59673664f8a2..cf43d767d8cd 100644
--- a/sd/uiconfig/simpress/ui/printeroptions.ui
+++ b/sd/uiconfig/simpress/ui/printeroptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -29,7 +29,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printname">
-                    <property name="label" translatable="yes">Slide name</property>
+                    <property name="label" translatable="yes" context="printeroptions|printname">Slide name</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printdatetime">
-                    <property name="label" translatable="yes">Date and time</property>
+                    <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printhidden">
-                    <property name="label" translatable="yes">Hidden pages</property>
+                    <property name="label" translatable="yes" context="printeroptions|printhidden">Hidden pages</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -116,7 +116,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalcolors">
-                    <property name="label" translatable="yes">Original size</property>
+                    <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -134,7 +134,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="grayscale">
-                    <property name="label" translatable="yes">Grayscale</property>
+                    <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -152,7 +152,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="blackandwhite">
-                    <property name="label" translatable="yes">Black &amp; white</property>
+                    <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black &amp; white</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -176,7 +176,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Color</property>
+            <property name="label" translatable="yes" context="printeroptions|label5">Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -209,7 +209,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalsize">
-                    <property name="label" translatable="yes">Original size</property>
+                    <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -227,7 +227,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="fittoprintable">
-                    <property name="label" translatable="yes">Fit to printable page</property>
+                    <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -245,7 +245,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="distributeonmultiple">
-                    <property name="label" translatable="yes">Distribute on multiple sheets of paper</property>
+                    <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -263,7 +263,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="tilesheet">
-                    <property name="label" translatable="yes">Tile sheet of paper with repeated slides</property>
+                    <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated slides</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -287,7 +287,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Size</property>
+            <property name="label" translatable="yes" context="printeroptions|label6">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui
index 1d3b9fd34ac1..708a11026c29 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="prntopts">
     <property name="visible">True</property>
@@ -34,7 +34,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="pagenmcb">
-                        <property name="label" translatable="yes">_Page name</property>
+                        <property name="label" translatable="yes" context="prntopts|pagenmcb">_Page name</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="datecb">
-                        <property name="label" translatable="yes">D_ate</property>
+                        <property name="label" translatable="yes" context="prntopts|datecb">D_ate</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="timecb">
-                        <property name="label" translatable="yes">Ti_me</property>
+                        <property name="label" translatable="yes" context="prntopts|timecb">Ti_me</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -85,7 +85,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hiddenpgcb">
-                        <property name="label" translatable="yes">H_idden pages</property>
+                        <property name="label" translatable="yes" context="prntopts|hiddenpgcb">H_idden pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
               <object class="GtkLabel" id="printlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Print</property>
+                <property name="label" translatable="yes" context="prntopts|printlbl">Print</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -142,7 +142,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="pagedefaultrb">
-                        <property name="label" translatable="yes">Default</property>
+                        <property name="label" translatable="yes" context="prntopts|pagedefaultrb">Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fittopgrb">
-                        <property name="label" translatable="yes">_Fit to page</property>
+                        <property name="label" translatable="yes" context="prntopts|fittopgrb">_Fit to page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -178,7 +178,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="tilepgrb">
-                        <property name="label" translatable="yes">_Tile pages</property>
+                        <property name="label" translatable="yes" context="prntopts|tilepgrb">_Tile pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -196,7 +196,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="brouchrb">
-                        <property name="label" translatable="yes">B_rochure</property>
+                        <property name="label" translatable="yes" context="prntopts|brouchrb">B_rochure</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -214,7 +214,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="papertryfrmprntrcb">
-                        <property name="label" translatable="yes">Paper tray from printer s_ettings</property>
+                        <property name="label" translatable="yes" context="prntopts|papertryfrmprntrcb">Paper tray from printer s_ettings</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="frontcb">
-                            <property name="label" translatable="yes">Fr_ont</property>
+                            <property name="label" translatable="yes" context="prntopts|frontcb">Fr_ont</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -256,7 +256,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="backcb">
-                            <property name="label" translatable="yes">Ba_ck</property>
+                            <property name="label" translatable="yes" context="prntopts|backcb">Ba_ck</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -290,7 +290,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page Options</property>
+                <property name="label" translatable="yes" context="prntopts|label3">Page Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -336,7 +336,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="drawingcb">
-                        <property name="label" translatable="yes">Drawing</property>
+                        <property name="label" translatable="yes" context="prntopts|drawingcb">Drawing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -352,7 +352,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="notecb">
-                        <property name="label" translatable="yes">Notes</property>
+                        <property name="label" translatable="yes" context="prntopts|notecb">Notes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -368,7 +368,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="handoutcb">
-                        <property name="label" translatable="yes">Handouts</property>
+                        <property name="label" translatable="yes" context="prntopts|handoutcb">Handouts</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -384,7 +384,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="outlinecb">
-                        <property name="label" translatable="yes">Outline</property>
+                        <property name="label" translatable="yes" context="prntopts|outlinecb">Outline</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -406,7 +406,7 @@
               <object class="GtkLabel" id="contentlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Content</property>
+                <property name="label" translatable="yes" context="prntopts|contentlbl">Content</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -439,7 +439,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="defaultrb">
-                        <property name="label" translatable="yes">Default</property>
+                        <property name="label" translatable="yes" context="prntopts|defaultrb">Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -456,7 +456,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="grayscalerb">
-                        <property name="label" translatable="yes">Gra_yscale</property>
+                        <property name="label" translatable="yes" context="prntopts|grayscalerb">Gra_yscale</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -474,7 +474,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="blackwhiterb">
-                        <property name="label" translatable="yes">Black &amp; _white</property>
+                        <property name="label" translatable="yes" context="prntopts|blackwhiterb">Black &amp; _white</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -498,7 +498,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Quality</property>
+                <property name="label" translatable="yes" context="prntopts|label2">Quality</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui
index 849423e03580..496bedf9f0db 100644
--- a/sd/uiconfig/simpress/ui/publishingdialog.ui
+++ b/sd/uiconfig/simpress/ui/publishingdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="PublishingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">HTML Export</property>
+    <property name="title" translatable="yes" context="publishingdialog|PublishingDialog">HTML Export</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -39,7 +39,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="newDesignRadiobutton">
-                        <property name="label" translatable="yes">New _design</property>
+                        <property name="label" translatable="yes" context="publishingdialog|newDesignRadiobutton">New _design</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -58,7 +58,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="oldDesignRadiobutton">
-                        <property name="label" translatable="yes">Existing design</property>
+                        <property name="label" translatable="yes" context="publishingdialog|oldDesignRadiobutton">Existing design</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -106,7 +106,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="delDesingButton">
-                                <property name="label" translatable="yes">Delete Selected Design</property>
+                                <property name="label" translatable="yes" context="publishingdialog|delDesingButton">Delete Selected Design</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -133,7 +133,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Select an existing design or create a new one</property>
+                        <property name="label" translatable="yes" context="publishingdialog|descLabel">Select an existing design or create a new one</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">designsTreeview:border</property>
                       </object>
@@ -152,7 +152,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="yalign">0.47999998927116394</property>
-                <property name="label" translatable="yes">Assign Design</property>
+                <property name="label" translatable="yes" context="publishingdialog|assignLabel">Assign Design</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -197,7 +197,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="ASPRadiobutton">
-                            <property name="label" translatable="yes">_Active Server Pages (ASP)</property>
+                            <property name="label" translatable="yes" context="publishingdialog|ASPRadiobutton">_Active Server Pages (ASP)</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -215,7 +215,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="perlRadiobutton">
-                            <property name="label" translatable="yes">Perl</property>
+                            <property name="label" translatable="yes" context="publishingdialog|perlRadiobutton">Perl</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -247,7 +247,7 @@
                                     <property name="halign">start</property>
                                     <property name="valign">start</property>
                                     <property name="xalign">0.49000000953674316</property>
-                                    <property name="label" translatable="yes">_URL for listeners:</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|indexTxtLabel">_URL for listeners:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">indexEntry</property>
                                   </object>
@@ -273,7 +273,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">URL for _presentation:</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|URLTxtLabel">URL for _presentation:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">URLEntry</property>
                                   </object>
@@ -299,7 +299,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">URL for _Perl scripts:</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|CGITxtLabel">URL for _Perl scripts:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">CGIEntry</property>
                                   </object>
@@ -338,7 +338,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0.49000000953674316</property>
-                    <property name="label" translatable="yes">Webcast</property>
+                    <property name="label" translatable="yes" context="publishingdialog|webCastLabel">Webcast</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -373,7 +373,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="chgDefaultRadiobutton">
-                            <property name="label" translatable="yes">_As stated in document</property>
+                            <property name="label" translatable="yes" context="publishingdialog|chgDefaultRadiobutton">_As stated in document</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -391,7 +391,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="chgAutoRadiobutton">
-                            <property name="label" translatable="yes">_Automatic</property>
+                            <property name="label" translatable="yes" context="publishingdialog|chgAutoRadiobutton">_Automatic</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -428,7 +428,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0.50999999046325684</property>
-                                        <property name="label" translatable="yes">_Slide view time:</property>
+                                        <property name="label" translatable="yes" context="publishingdialog|durationTxtLabel">_Slide view time:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">durationSpinbutton:hh:mm</property>
                                       </object>
@@ -458,7 +458,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="endlessCheckbutton">
-                                    <property name="label" translatable="yes">_Endless</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|endlessCheckbutton">_Endless</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -491,7 +491,7 @@
                   <object class="GtkLabel" id="kioskLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Advance Slides</property>
+                    <property name="label" translatable="yes" context="publishingdialog|kioskLabel">Advance Slides</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -529,7 +529,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="contentCheckbutton">
-                            <property name="label" translatable="yes">Create title page</property>
+                            <property name="label" translatable="yes" context="publishingdialog|contentCheckbutton">Create title page</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -546,7 +546,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="notesCheckbutton">
-                            <property name="label" translatable="yes">Show notes</property>
+                            <property name="label" translatable="yes" context="publishingdialog|notesCheckbutton">Show notes</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -569,7 +569,7 @@
                   <object class="GtkLabel" id="htmlOptionsLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="publishingdialog|htmlOptionsLabel">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -660,7 +660,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="webCastRadiobutton">
-                            <property name="label" translatable="yes">_WebCast</property>
+                            <property name="label" translatable="yes" context="publishingdialog|webCastRadiobutton">_WebCast</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -677,7 +677,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="kioskRadiobutton">
-                            <property name="label" translatable="yes">_Automatic</property>
+                            <property name="label" translatable="yes" context="publishingdialog|kioskRadiobutton">_Automatic</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -694,7 +694,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="singleDocumentRadiobutton">
-                            <property name="label" translatable="yes">_Single-document HTML</property>
+                            <property name="label" translatable="yes" context="publishingdialog|singleDocumentRadiobutton">_Single-document HTML</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -711,7 +711,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="framesRadiobutton">
-                            <property name="label" translatable="yes">Standard HTML with _frames</property>
+                            <property name="label" translatable="yes" context="publishingdialog|framesRadiobutton">Standard HTML with _frames</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -728,7 +728,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="standardRadiobutton">
-                            <property name="label" translatable="yes">Standard H_TML format</property>
+                            <property name="label" translatable="yes" context="publishingdialog|standardRadiobutton">Standard H_TML format</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -751,7 +751,7 @@
                   <object class="GtkLabel" id="publicationLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Publication Type</property>
+                    <property name="label" translatable="yes" context="publishingdialog|publicationLabel">Publication Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -809,7 +809,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="pngRadiobutton">
-                                <property name="label" translatable="yes">_PNG</property>
+                                <property name="label" translatable="yes" context="publishingdialog|pngRadiobutton">_PNG</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -828,7 +828,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="gifRadiobutton">
-                                <property name="label" translatable="yes">_GIF</property>
+                                <property name="label" translatable="yes" context="publishingdialog|gifRadiobutton">_GIF</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -846,7 +846,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="jpgRadiobutton">
-                                <property name="label" translatable="yes">_JPG</property>
+                                <property name="label" translatable="yes" context="publishingdialog|jpgRadiobutton">_JPG</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -873,7 +873,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">_Quality:</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|qualityTxtLabel">_Quality:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">qualityCombobox</property>
                                   </object>
@@ -915,7 +915,7 @@
                       <object class="GtkLabel" id="saveImgAsLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Save Images As</property>
+                        <property name="label" translatable="yes" context="publishingdialog|saveImgAsLabel">Save Images As</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -950,7 +950,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="resolution1Radiobutton">
-                                <property name="label" translatable="yes">Low (_640 × 480 pixels)</property>
+                                <property name="label" translatable="yes" context="publishingdialog|resolution1Radiobutton">Low (_640 × 480 pixels)</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -969,7 +969,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="resolution2Radiobutton">
-                                <property name="label" translatable="yes">Medium (_800 × 600 pixels)</property>
+                                <property name="label" translatable="yes" context="publishingdialog|resolution2Radiobutton">Medium (_800 × 600 pixels)</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -987,7 +987,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="resolution3Radiobutton">
-                                <property name="label" translatable="yes">High (_1024 × 768 pixels)</property>
+                                <property name="label" translatable="yes" context="publishingdialog|resolution3Radiobutton">High (_1024 × 768 pixels)</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -1012,7 +1012,7 @@
                       <object class="GtkLabel" id="monitorResolutionLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Monitor Resolution</property>
+                        <property name="label" translatable="yes" context="publishingdialog|monitorResolutionLabel">Monitor Resolution</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1052,7 +1052,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="sldSoundCheckbutton">
-                            <property name="label" translatable="yes">_Export sounds when slide advances</property>
+                            <property name="label" translatable="yes" context="publishingdialog|sldSoundCheckbutton">_Export sounds when slide advances</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1070,7 +1070,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="hiddenSlidesCheckbutton">
-                            <property name="label" translatable="yes">Export _hidden slides</property>
+                            <property name="label" translatable="yes" context="publishingdialog|hiddenSlidesCheckbutton">Export _hidden slides</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1093,7 +1093,7 @@
                   <object class="GtkLabel" id="effectsLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Effects</property>
+                    <property name="label" translatable="yes" context="publishingdialog|effectsLabel">Effects</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -1141,7 +1141,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Author:</property>
+                        <property name="label" translatable="yes" context="publishingdialog|authorTxtLabel">_Author:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">authorEntry</property>
                       </object>
@@ -1166,7 +1166,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">E-_mail address:</property>
+                        <property name="label" translatable="yes" context="publishingdialog|emailTxtLabel">E-_mail address:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">emailEntry</property>
                       </object>
@@ -1180,7 +1180,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Your hom_epage:</property>
+                        <property name="label" translatable="yes" context="publishingdialog|wwwTxtLabel">Your hom_epage:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">wwwEntry</property>
                       </object>
@@ -1195,7 +1195,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="valign">start</property>
-                        <property name="label" translatable="yes">Additional _information:</property>
+                        <property name="label" translatable="yes" context="publishingdialog|addInformLabel">Additional _information:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">miscTextview:border</property>
                       </object>
@@ -1240,7 +1240,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="downloadCheckbutton">
-                        <property name="label" translatable="yes">Link to a copy of the _original presentation</property>
+                        <property name="label" translatable="yes" context="publishingdialog|downloadCheckbutton">Link to a copy of the _original presentation</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1263,7 +1263,7 @@
               <object class="GtkLabel" id="infTitlePageLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Information for the Title Page</property>
+                <property name="label" translatable="yes" context="publishingdialog|infTitlePageLabel">Information for the Title Page</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1301,7 +1301,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="textOnlyCheckbutton">
-                        <property name="label" translatable="yes">_Text only</property>
+                        <property name="label" translatable="yes" context="publishingdialog|textOnlyCheckbutton">_Text only</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1340,7 +1340,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.49000000953674316</property>
-                <property name="label" translatable="yes">Select Button Style</property>
+                <property name="label" translatable="yes" context="publishingdialog|buttonStyleLabel">Select Button Style</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1378,7 +1378,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="docColorsRadiobutton">
-                        <property name="label" translatable="yes">_Apply color scheme from document</property>
+                        <property name="label" translatable="yes" context="publishingdialog|docColorsRadiobutton">_Apply color scheme from document</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1397,7 +1397,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="defaultRadiobutton">
-                        <property name="label" translatable="yes">Use _browser colors</property>
+                        <property name="label" translatable="yes" context="publishingdialog|defaultRadiobutton">Use _browser colors</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1415,7 +1415,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="userRadiobutton">
-                        <property name="label" translatable="yes">_Use custom color scheme</property>
+                        <property name="label" translatable="yes" context="publishingdialog|userRadiobutton">_Use custom color scheme</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -1450,7 +1450,7 @@
                                 <property name="row_spacing">6</property>
                                 <child>
                                   <object class="GtkButton" id="vLinkButton">
-                                    <property name="label" translatable="yes">_Visited Link</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|vLinkButton">_Visited Link</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1464,7 +1464,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="aLinkButton">
-                                    <property name="label" translatable="yes">Active Li_nk</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|aLinkButton">Active Li_nk</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1478,7 +1478,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="linkButton">
-                                    <property name="label" translatable="yes">Hyper_link</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|linkButton">Hyper_link</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1492,7 +1492,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="textButton">
-                                    <property name="label" translatable="yes">Text</property>
+                                    <property name="label" translatable="yes" context="publishingdialog|textButton">Text</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1525,7 +1525,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="backButton">
-                                <property name="label" translatable="yes">Bac_kground</property>
+                                <property name="label" translatable="yes" context="publishingdialog|backButton">Bac_kground</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -1556,7 +1556,7 @@
               <object class="GtkLabel" id="selectColorLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select Color Scheme</property>
+                <property name="label" translatable="yes" context="publishingdialog|selectColorLabel">Select Color Scheme</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1604,7 +1604,7 @@
             </child>
             <child>
               <object class="GtkButton" id="lastPageButton">
-                <property name="label" translatable="yes">&lt;&lt; Back</property>
+                <property name="label" translatable="yes" context="publishingdialog|lastPageButton">&lt;&lt; Back</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1618,7 +1618,7 @@
             </child>
             <child>
               <object class="GtkButton" id="nextPageButton">
-                <property name="label" translatable="yes">Ne_xt &gt;&gt;</property>
+                <property name="label" translatable="yes" context="publishingdialog|nextPageButton">Ne_xt &gt;&gt;</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1635,7 +1635,7 @@
             </child>
             <child>
               <object class="GtkButton" id="finishButton">
-                <property name="label" translatable="yes">_Create</property>
+                <property name="label" translatable="yes" context="publishingdialog|finishButton">_Create</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/sd/uiconfig/simpress/ui/remotedialog.ui b/sd/uiconfig/simpress/ui/remotedialog.ui
index 58bd47831fd0..0b93b65b5527 100644
--- a/sd/uiconfig/simpress/ui/remotedialog.ui
+++ b/sd/uiconfig/simpress/ui/remotedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="RemoteDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Impress Remote</property>
+    <property name="title" translatable="yes" context="remotedialog|RemoteDialog">Impress Remote</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -99,7 +99,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Connections</property>
+                <property name="label" translatable="yes" context="remotedialog|label1">Connections</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sd/uiconfig/simpress/ui/rotatemenu.ui b/sd/uiconfig/simpress/ui/rotatemenu.ui
index b5ac2f060875..b40fba865668 100644
--- a/sd/uiconfig/simpress/ui/rotatemenu.ui
+++ b/sd/uiconfig/simpress/ui/rotatemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="90">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Quarter Spin</property>
+        <property name="label" translatable="yes" context="rotatemenu|90">Quarter Spin</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="180">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Half Spin</property>
+        <property name="label" translatable="yes" context="rotatemenu|180">Half Spin</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="360">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Full Spin</property>
+        <property name="label" translatable="yes" context="rotatemenu|360">Full Spin</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="720">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Two Spins</property>
+        <property name="label" translatable="yes" context="rotatemenu|720">Two Spins</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="clockwise">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Clockwise</property>
+        <property name="label" translatable="yes" context="rotatemenu|clockwise">Clockwise</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -55,7 +55,7 @@
       <object class="GtkMenuItem" id="counterclock">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Counter-clockwise</property>
+        <property name="label" translatable="yes" context="rotatemenu|counterclock">Counter-clockwise</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/scalemenu.ui b/sd/uiconfig/simpress/ui/scalemenu.ui
index b0978fc35fa1..ae2d1b767c54 100644
--- a/sd/uiconfig/simpress/ui/scalemenu.ui
+++ b/sd/uiconfig/simpress/ui/scalemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Tiny</property>
+        <property name="label" translatable="yes" context="scalemenu|25">Tiny</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="50">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Smaller</property>
+        <property name="label" translatable="yes" context="scalemenu|50">Smaller</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="150">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Larger</property>
+        <property name="label" translatable="yes" context="scalemenu|150">Larger</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="400">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Extra Large</property>
+        <property name="label" translatable="yes" context="scalemenu|400">Extra Large</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="hori">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Horizontal</property>
+        <property name="label" translatable="yes" context="scalemenu|hori">Horizontal</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -55,7 +55,7 @@
       <object class="GtkMenuItem" id="vert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Vertical</property>
+        <property name="label" translatable="yes" context="scalemenu|vert">Vertical</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -63,7 +63,7 @@
       <object class="GtkMenuItem" id="both">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Both</property>
+        <property name="label" translatable="yes" context="scalemenu|both">Both</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/sdviewpage.ui b/sd/uiconfig/simpress/ui/sdviewpage.ui
index 8848a667b920..89fb9785c41b 100644
--- a/sd/uiconfig/simpress/ui/sdviewpage.ui
+++ b/sd/uiconfig/simpress/ui/sdviewpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="SdViewPage">
     <property name="visible">True</property>
@@ -23,7 +23,7 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="ruler">
-                <property name="label" translatable="yes">_Rulers visible</property>
+                <property name="label" translatable="yes" context="sdviewpage|ruler">_Rulers visible</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -39,7 +39,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="dragstripes">
-                <property name="label" translatable="yes">_Snap Lines when moving</property>
+                <property name="label" translatable="yes" context="sdviewpage|dragstripes">_Snap Lines when moving</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -55,7 +55,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="handlesbezier">
-                <property name="label" translatable="yes">_All control points in Bézier editor</property>
+                <property name="label" translatable="yes" context="sdviewpage|handlesbezier">_All control points in Bézier editor</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="moveoutline">
-                <property name="label" translatable="yes">_Contour of each individual object</property>
+                <property name="label" translatable="yes" context="sdviewpage|moveoutline">_Contour of each individual object</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -93,7 +93,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Display</property>
+        <property name="label" translatable="yes" context="sdviewpage|label1">Display</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index b9d07ab29ce9..73cb4a331b5b 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -28,7 +28,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">_Format:</property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|label2">_Format:</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
@@ -41,7 +41,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Background:</property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|label3">Background:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -54,8 +54,8 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <items>
-              <item translatable="yes">Landscape</item>
-              <item translatable="yes">Portrait</item>
+              <item translatable="yes" context="sidebarslidebackground|orientation">Landscape</item>
+              <item translatable="yes" context="sidebarslidebackground|orientation">Portrait</item>
             </items>
           </object>
           <packing>
@@ -88,7 +88,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="displaymasterobjects">
-            <property name="label" translatable="yes">Display Objects</property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|displaymasterobjects">Display Objects</property>
             <property name="use_action_appearance">True</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -127,7 +127,7 @@
         </child>
         <child>
           <object class="GtkButton" id="button2">
-            <property name="label" translatable="yes">Insert Image</property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|button2">Insert Image</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="displaymasterbackground">
-            <property name="label" translatable="yes">Display Background</property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|displaymasterbackground">Display Background</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -194,7 +194,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Orientation: </property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|label4">Orientation: </property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -209,7 +209,7 @@
             <property name="homogeneous">True</property>
             <child>
               <object class="GtkButton" id="masterslidebutton">
-                <property name="label" translatable="yes">Master Slide</property>
+                <property name="label" translatable="yes" context="sidebarslidebackground|masterslidebutton">Master Slide</property>
                 <property name="visible">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -223,7 +223,7 @@
             </child>
             <child>
               <object class="GtkButton" id="closemasterslide">
-                <property name="label" translatable="yes">Close Master View</property>
+                <property name="label" translatable="yes" context="sidebarslidebackground|closemasterslide">Close Master View</property>
                 <property name="visible">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -245,7 +245,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Top: </property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|labeltop">Top: </property>
             <property name="mnemonic_widget">top:0.00cm</property>
           </object>
           <packing>
@@ -271,7 +271,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Bottom: </property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|labelbottom">Bottom: </property>
             <property name="mnemonic_widget">bottom:0.00cm</property>
           </object>
           <packing>
@@ -297,7 +297,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Left: </property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|labelleft">Left: </property>
             <property name="mnemonic_widget">left:0.00cm</property>
           </object>
           <packing>
@@ -323,7 +323,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Right: </property>
+            <property name="label" translatable="yes" context="sidebarslidebackground|labelright">Right: </property>
             <property name="mnemonic_widget">right:0.00cm</property>
           </object>
           <packing>
diff --git a/sd/uiconfig/simpress/ui/slidecontextmenu.ui b/sd/uiconfig/simpress/ui/slidecontextmenu.ui
index 36fac2f08e5d..e2aa0b9df98e 100644
--- a/sd/uiconfig/simpress/ui/slidecontextmenu.ui
+++ b/sd/uiconfig/simpress/ui/slidecontextmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="next">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Next</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|next">_Next</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="prev">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Previous</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|prev">_Previous</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="goto">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Go to Slide</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|goto">_Go to Slide</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -35,7 +35,7 @@
               <object class="GtkMenuItem" id="first">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_First Slide</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|first">_First Slide</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -43,7 +43,7 @@
               <object class="GtkMenuItem" id="last">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Last Slide</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|last">_Last Slide</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -67,7 +67,7 @@
       <object class="GtkCheckMenuItem" id="pen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Mouse Pointer as ~Pen</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|pen">Mouse Pointer as ~Pen</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -75,7 +75,7 @@
       <object class="GtkMenuItem" id="width">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Pen Width</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|width">_Pen Width</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -85,7 +85,7 @@
               <object class="GtkRadioMenuItem" id="4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Very Thin</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|4">_Very Thin</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -93,7 +93,7 @@
               <object class="GtkRadioMenuItem" id="100">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Thin</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|100">_Thin</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -101,7 +101,7 @@
               <object class="GtkRadioMenuItem" id="150">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Normal</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|150">_Normal</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -109,7 +109,7 @@
               <object class="GtkRadioMenuItem" id="200">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Thick</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|200">_Thick</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -117,7 +117,7 @@
               <object class="GtkRadioMenuItem" id="400">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Very Thick</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|400">_Very Thick</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -129,7 +129,7 @@
       <object class="GtkMenuItem" id="color">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Change Pen Color...</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|color">_Change Pen Color...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -137,7 +137,7 @@
       <object class="GtkMenuItem" id="erase">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Erase All Ink on Slide</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|erase">_Erase All Ink on Slide</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -151,7 +151,7 @@
       <object class="GtkMenuItem" id="screen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Screen</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|screen">_Screen</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -161,7 +161,7 @@
               <object class="GtkMenuItem" id="black">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Black</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|black">_Black</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -169,7 +169,7 @@
               <object class="GtkMenuItem" id="white">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_White</property>
+                <property name="label" translatable="yes" context="slidecontextmenu|white">_White</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -181,7 +181,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">E_dit Presentation</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|edit">E_dit Presentation</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -189,7 +189,7 @@
       <object class="GtkMenuItem" id="end">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_End Show</property>
+        <property name="label" translatable="yes" context="slidecontextmenu|end">_End Show</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
index a959f6f1368c..093d9e33bbef 100644
--- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui
+++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SlideDesignDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Slide Design</property>
+    <property name="title" translatable="yes" context="slidedesigndialog|SlideDesignDialog">Slide Design</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -66,7 +66,7 @@
             </child>
             <child>
               <object class="GtkButton" id="load">
-                <property name="label" translatable="yes">_Load...</property>
+                <property name="label" translatable="yes" context="slidedesigndialog|load">_Load...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -107,7 +107,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="masterpage">
-                        <property name="label" translatable="yes">_Exchange background page</property>
+                        <property name="label" translatable="yes" context="slidedesigndialog|masterpage">_Exchange background page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -122,7 +122,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkmasters">
-                        <property name="label" translatable="yes">_Delete unused backgrounds</property>
+                        <property name="label" translatable="yes" context="slidedesigndialog|checkmasters">_Delete unused backgrounds</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -155,7 +155,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Select a Slide Design</property>
+                <property name="label" translatable="yes" context="slidedesigndialog|label1">Select a Slide Design</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index cbdcced781ca..75a38cb89cc3 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -68,7 +68,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">Duration:</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|duration_label">Duration:</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -81,7 +81,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property>
+                        <property name="tooltip_text" translatable="yes" context="slidetransitionspanel|transition_duration|tooltip_text">Select the speed of Slide Transition.</property>
                         <property name="hexpand">True</property>
                         <property name="adjustment">adjustment1</property>
                       </object>
@@ -95,7 +95,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">Sound:</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|sound_label">Sound:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -108,9 +108,9 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <items>
-                          <item translatable="yes">No sound</item>
-                          <item translatable="yes">Stop previous sound</item>
-                          <item translatable="yes">Other sound...</item>
+                          <item translatable="yes" context="slidetransitionspanel|sound_list">No sound</item>
+                          <item translatable="yes" context="slidetransitionspanel|sound_list">Stop previous sound</item>
+                          <item translatable="yes" context="slidetransitionspanel|sound_list">Other sound...</item>
                         </items>
                       </object>
                       <packing>
@@ -120,7 +120,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="loop_sound">
-                        <property name="label" translatable="yes">Loop until next sound</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|loop_sound">Loop until next sound</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -136,7 +136,7 @@
                       <object class="GtkLabel" id="variant_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Variant:</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|variant_label">Variant:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -164,7 +164,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Modify Transition</property>
+                <property name="label" translatable="yes" context="slidetransitionspanel|label1">Modify Transition</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -197,7 +197,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="rb_mouse_click">
-                        <property name="label" translatable="yes">On mouse click</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|rb_mouse_click">On mouse click</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -213,7 +213,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="rb_auto_after">
-                        <property name="label" translatable="yes">Automatically after:</property>
+                        <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_after">Automatically after:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -246,7 +246,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Advance Slide</property>
+                <property name="label" translatable="yes" context="slidetransitionspanel|label2">Advance Slide</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -271,7 +271,7 @@
                 <property name="layout_style">center</property>
                 <child>
                   <object class="GtkButton" id="apply_to_all">
-                    <property name="label" translatable="yes">Apply Transition to All Slides</property>
+                    <property name="label" translatable="yes" context="slidetransitionspanel|apply_to_all">Apply Transition to All Slides</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -309,7 +309,7 @@
                 <property name="spacing">18</property>
                 <child>
                   <object class="GtkCheckButton" id="auto_preview">
-                    <property name="label" translatable="yes">Automatic Preview</property>
+                    <property name="label" translatable="yes" context="slidetransitionspanel|auto_preview">Automatic Preview</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -324,7 +324,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="play">
-                    <property name="label" translatable="yes">Play</property>
+                    <property name="label" translatable="yes" context="slidetransitionspanel|play">Play</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
index 7339b63dfdfc..6ba124aaf023 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="SlideTransitionsPanel">
@@ -53,7 +53,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Duration:</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|duration_label">Duration:</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -66,7 +66,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property>
+                <property name="tooltip_text" translatable="yes" context="slidetransitionspanelhorizontal|transition_duration|tooltip_text">Select the speed of Slide Transition.</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -78,7 +78,7 @@
               <object class="GtkLabel" id="variant_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Variant:</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|variant_label">Variant:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -100,7 +100,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Sound:</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|sound_label">Sound:</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -113,9 +113,9 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <items>
-                  <item translatable="yes">No sound</item>
-                  <item translatable="yes">Stop previous sound</item>
-                  <item translatable="yes">Other sound...</item>
+                  <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">No sound</item>
+                  <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Stop previous sound</item>
+                  <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Other sound...</item>
                 </items>
               </object>
               <packing>
@@ -125,7 +125,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="loop_sound">
-                <property name="label" translatable="yes">Loop until next sound</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|loop_sound">Loop until next sound</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="rb_mouse_click">
-                <property name="label" translatable="yes">On mouse click</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_mouse_click">On mouse click</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="rb_auto_after">
-                <property name="label" translatable="yes">Automatically after:</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_auto_after">Automatically after:</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="auto_preview">
-                <property name="label" translatable="yes">Automatic Preview</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|auto_preview">Automatic Preview</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -202,7 +202,7 @@
                 <property name="layout_style">center</property>
                 <child>
                   <object class="GtkButton" id="apply_to_all">
-                    <property name="label" translatable="yes">Apply Transition to All Slides</property>
+                    <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|apply_to_all">Apply Transition to All Slides</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -223,7 +223,7 @@
             </child>
             <child>
               <object class="GtkButton" id="play">
-                <property name="label" translatable="yes">Play</property>
+                <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|play">Play</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
index 1ba59bba2255..909c08755763 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="TableDesignPanel">
@@ -19,7 +19,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkCheckButton" id="UseFirstRowStyle">
-            <property name="label" translatable="yes">_Header row</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseFirstRowStyle">_Header row</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -34,7 +34,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="UseLastRowStyle">
-            <property name="label" translatable="yes">Tot_al row</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseLastRowStyle">Tot_al row</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -49,7 +49,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="UseBandingRowStyle">
-            <property name="label" translatable="yes">_Banded rows</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseBandingRowStyle">_Banded rows</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -64,7 +64,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="UseFirstColumnStyle">
-            <property name="label" translatable="yes">Fi_rst column</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseFirstColumnStyle">Fi_rst column</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -79,7 +79,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="UseLastColumnStyle">
-            <property name="label" translatable="yes">_Last column</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseLastColumnStyle">_Last column</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -94,7 +94,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="UseBandingColumnStyle">
-            <property name="label" translatable="yes">Ba_nded columns</property>
+            <property name="label" translatable="yes" context="tabledesignpanel|UseBandingColumnStyle">Ba_nded columns</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui b/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui
index 72847b263efc..304558700ce3 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="TableDesignPanel">
@@ -36,7 +36,7 @@
             <property name="row_homogeneous">True</property>
             <child>
               <object class="GtkCheckButton" id="UseFirstRowStyle">
-                <property name="label" translatable="yes">_Header row</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseFirstRowStyle">_Header row</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseLastRowStyle">
-                <property name="label" translatable="yes">Tot_al row</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseLastRowStyle">Tot_al row</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -66,7 +66,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseBandingRowStyle">
-                <property name="label" translatable="yes">_Banded rows</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseBandingRowStyle">_Banded rows</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -81,7 +81,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseBandingColumnStyle">
-                <property name="label" translatable="yes">Ba_nded columns</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseBandingColumnStyle">Ba_nded columns</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseFirstColumnStyle">
-                <property name="label" translatable="yes">Fi_rst column</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseFirstColumnStyle">Fi_rst column</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="UseLastColumnStyle">
-                <property name="label" translatable="yes">_Last column</property>
+                <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseLastColumnStyle">_Last column</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui
index 961a0bb14d5e..550c0042ff90 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sd">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Graphic Styles</property>
+    <property name="title" translatable="yes" context="templatedialog|TemplateDialog">Graphic Styles</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -77,7 +77,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">_Standard</property>
+                <property name="label" translatable="yes" context="templatedialog|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -123,7 +123,7 @@
               <object class="GtkLabel" id="line">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Line</property>
+                <property name="label" translatable="yes" context="templatedialog|line">Line</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -137,7 +137,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="templatedialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="shadowing">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shadowing</property>
+                <property name="label" translatable="yes" context="templatedialog|shadowing">Shadowing</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="transparency">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="templatedialog|transparency">Transparency</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -179,7 +179,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="templatedialog|font">Font</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -193,7 +193,7 @@
               <object class="GtkLabel" id="fonteffect">
                 <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="templatedialog|fonteffect">Font Effects</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -207,7 +207,7 @@
               <object class="GtkLabel" id="indents">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="templatedialog|indents">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -221,7 +221,7 @@
               <object class="GtkLabel" id="text">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="templatedialog|text">Text</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -235,7 +235,7 @@
               <object class="GtkLabel" id="animation">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Animation</property>
+                <property name="label" translatable="yes" context="templatedialog|animation">Text Animation</property>
               </object>
               <packing>
                 <property name="position">9</property>
@@ -249,7 +249,7 @@
               <object class="GtkLabel" id="dimensioning">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Dimensioning</property>
+                <property name="label" translatable="yes" context="templatedialog|dimensioning">Dimensioning</property>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -263,7 +263,7 @@
               <object class="GtkLabel" id="connector">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Connector</property>
+                <property name="label" translatable="yes" context="templatedialog|connector">Connector</property>
               </object>
               <packing>
                 <property name="position">11</property>
@@ -277,7 +277,7 @@
               <object class="GtkLabel" id="alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="templatedialog|alignment">Alignment</property>
               </object>
               <packing>
                 <property name="position">12</property>
@@ -291,7 +291,7 @@
               <object class="GtkLabel" id="asiantypo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="templatedialog|asiantypo">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">13</property>
@@ -305,7 +305,7 @@
               <object class="GtkLabel" id="tabs">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="templatedialog|tabs">Tabs</property>
               </object>
               <packing>
                 <property name="position">14</property>
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index ba039a5539c2..cded03d2ae32 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -118,8 +118,8 @@ Start
 module = "gid_Module_Langpack_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
 copyright = "2017 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"
diff --git a/sfx2/AllLangMoTarget_sfx2.mk b/sfx2/AllLangMoTarget_sfx2.mk
new file mode 100644
index 000000000000..b0f7dc3efef6
--- /dev/null
+++ b/sfx2/AllLangMoTarget_sfx2.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,sfx))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,sfx,sfx2))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
deleted file mode 100644
index 1066e2b671b1..000000000000
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ /dev/null
@@ -1,58 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sfx,\
-    sfx/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
-
-$(eval $(call gb_SrsTarget_set_include,sfx/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/sfx2/source/dialog \
-    -I$(SRCDIR)/sfx2/source/inc \
-    -I$(SRCDIR)/sfx2/inc/ \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sfx/res,\
-    sfx2/source/appl/app.src \
-    sfx2/source/appl/newhelp.src \
-    sfx2/source/appl/sfx.src \
-    sfx2/source/bastyp/fltfnc.src \
-    sfx2/source/control/templateview.src \
-    sfx2/source/dialog/dialog.src \
-    sfx2/source/dialog/dinfdlg.src \
-    sfx2/source/dialog/filedlghelper.src \
-    sfx2/source/dialog/newstyle.src \
-    sfx2/source/dialog/recfloat.src \
-    sfx2/source/dialog/taskpane.src \
-    sfx2/source/dialog/templdlg.src \
-    sfx2/source/dialog/versdlg.src \
-    sfx2/source/doc/doc.src \
-    sfx2/source/doc/doctempl.src \
-    sfx2/source/doc/templatelocnames.src \
-    sfx2/source/sidebar/Sidebar.src \
-    sfx2/source/view/view.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 75755fb7d3bf..201a106d0738 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -354,7 +354,4 @@ $(eval $(call gb_Library_use_system_win32_libs,sfx,\
 
 endif
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sfx,sfx))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index d892973ddc5c..c547fc19072a 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -24,11 +24,11 @@ $(eval $(call gb_Module_add_targets,sfx2,\
     Library_sfx \
     Package_classification \
     Package_emoji \
+    UIConfig_sfx \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sfx2,\
-    AllLangResTarget_sfx2 \
-    UIConfig_sfx \
+    AllLangMoTarget_sfx2 \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sfx2,\
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
deleted file mode 100644
index aa6f54351ab2..000000000000
--- a/sfx2/inc/app.hrc
+++ /dev/null
@@ -1,94 +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_SFX2_INC_APP_HRC
-#define INCLUDED_SFX2_INC_APP_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define STR_NO_WEBBROWSER_FOUND                 (RID_SFX_APP_START+7)
-#define STR_NO_ABS_URI_REF                      (RID_SFX_APP_START+8)
-
-#define STR_QUITAPP                             (RID_SFX_APP_START+59)
-
-#define RID_STR_HLPFILENOTEXIST                 (RID_SFX_APP_START+68)
-
-#define RID_STR_HELP                            (RID_SFX_APP_START+79)
-
-#define STR_INFO_NOSEARCHRESULTS                (RID_SFX_APP_START+106)
-#define STR_INFO_NOSEARCHTEXTFOUND              (RID_SFX_APP_START+107)
-
-#define STR_HELP_WINDOW_TITLE                   (RID_SFX_APP_START+125) // string
-
-#define STR_HELP_BUTTON_INDEX_ON                (RID_SFX_APP_START+126)
-#define STR_HELP_BUTTON_START                   (RID_SFX_APP_START+127)
-#define STR_HELP_BUTTON_PREV                    (RID_SFX_APP_START+128)
-#define STR_HELP_BUTTON_NEXT                    (RID_SFX_APP_START+129)
-#define STR_HELP_BUTTON_PRINT                   (RID_SFX_APP_START+130)
-#define STR_HELP_BUTTON_SOURCEVIEW              (RID_SFX_APP_START+131)
-
-#define STR_QUICKSTART_EXIT                     (RID_SFX_APP_START+134)
-#define STR_QUICKSTART_TIP                      (RID_SFX_APP_START+135)
-#define STR_QUICKSTART_FILEOPEN                 (RID_SFX_APP_START+136)
-#define STR_QUICKSTART_FROMTEMPLATE             (RID_SFX_APP_START+137)
-#define STR_QUICKSTART_PRELAUNCH                (RID_SFX_APP_START+138)
-#define STR_QUICKSTART_LNKNAME                  (RID_SFX_APP_START+139)
-#define STR_HELP_BUTTON_ADDBOOKMARK             (RID_SFX_APP_START+140)
-#define STR_HELP_BUTTON_INDEX_OFF               (RID_SFX_APP_START+141)
-#define STR_HELP_BUTTON_SEARCHDIALOG            (RID_SFX_APP_START+142)
-#define STR_HELP_MENU_TEXT_SELECTION_MODE       (RID_SFX_APP_START+143)
-#define STR_HELP_MENU_TEXT_COPY                 (RID_SFX_APP_START+144)
-#define STR_QUICKSTART_PRELAUNCH_UNX            (RID_SFX_APP_START+146)
-#define STR_QUICKSTART_FILE                     (RID_SFX_APP_START+147)
-#define STR_QUICKSTART_STARTCENTER              (RID_SFX_APP_START+148)
-#define STR_QUICKSTART_RECENTDOC                (RID_SFX_APP_START+149)
-
-#define RID_HELP_ONSTARTUP_TEXT                 (RID_SFX_APP_START+145)
-
-#define RID_SECURITY_WARNING_TITLE              (RID_SFX_APP_START + 181)
-
-#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186)
-#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN  (RID_SFX_APP_START + 187)
-#define STR_QUERY_CANCELCHECKOUT                (RID_SFX_APP_START + 188)
-
-#define STR_INFO_WRONGDOCFORMAT                 (RID_SFX_APP_START + 190)
-
-#define STR_QUERY_UPDATE_LINKS                  (RID_SFX_APP_START + 192)
-#define STR_DDE_ERROR                           (RID_SFX_APP_START + 193)
-#define STR_SECURITY_WARNING_NO_HYPERLINKS      (RID_SFX_APP_START + 194)
-
-#define RID_SVXSTR_FILELINK                     (RID_SFX_APP_START + 195)
-#define RID_SVXSTR_GRAFIKLINK                   (RID_SFX_APP_START + 196)
-#define RID_SVXSTR_EDITGRFLINK                  (RID_SFX_APP_START + 197)
-
-// strings for error messages of OpenGraphics dialog
-#define RID_SVXSTR_GRFILTER_OPENERROR           (RID_SFX_APP_START + 198)
-#define RID_SVXSTR_GRFILTER_IOERROR             (RID_SFX_APP_START + 199)
-#define RID_SVXSTR_GRFILTER_FORMATERROR         (RID_SFX_APP_START + 200)
-#define RID_SVXSTR_GRFILTER_VERSIONERROR        (RID_SFX_APP_START + 201)
-#define RID_SVXSTR_GRFILTER_FILTERERROR         (RID_SFX_APP_START + 202)
-
-#define RID_SVXSTR_END_REDLINING_WARNING        (RID_SFX_APP_START + 212)
-#define RID_SVXSTR_INCORRECT_PASSWORD           (RID_SFX_APP_START + 213)
-
-
-#endif // #ifndef _SFX_APP_HRC
-
-// ******************************************************************* EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc
new file mode 100644
index 000000000000..69447b1833c9
--- /dev/null
+++ b/sfx2/inc/dinfdlg.hrc
@@ -0,0 +1,79 @@
+/* -*- 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_SFX2_INC_DINFDLG_HRC
+#define INCLUDED_SFX2_INC_DINFDLG_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* SFX_CB_PROPERTY_STRINGARRAY[] =
+{
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Checked by"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Client"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date completed"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Department"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Destinations"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Disposition"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Division"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Document number"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Editor"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "E-Mail"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Forward to"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Group"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Info"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Language"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Mailstop"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Matter"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Office"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Owner"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Project"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Publisher"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Purpose"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Received from"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded by"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded date"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Reference"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Source"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Status"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Telephone number"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Typist"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "URL")
+};
+
+#define CUSTOM_TYPE_UNKNOWN     0
+#define CUSTOM_TYPE_TEXT        1
+#define CUSTOM_TYPE_NUMBER      2
+#define CUSTOM_TYPE_DATE        3
+#define CUSTOM_TYPE_BOOLEAN     4
+#define CUSTOM_TYPE_DURATION    5
+#define CUSTOM_TYPE_DATETIME    6
+
+const std::pair<const char*, int> SFX_LB_PROPERTY_STRINGARRAY[] =
+{
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text")        , CUSTOM_TYPE_TEXT },
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime")    , CUSTOM_TYPE_DATETIME },
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date")        , CUSTOM_TYPE_DATE },
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Duration")    , CUSTOM_TYPE_DURATION },
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Number")      , CUSTOM_TYPE_NUMBER },
+    { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no")   , CUSTOM_TYPE_BOOLEAN }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
deleted file mode 100644
index 959e5b23e71f..000000000000
--- a/sfx2/inc/doc.hrc
+++ /dev/null
@@ -1,111 +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_SFX2_SOURCE_DOC_DOC_HRC
-#define INCLUDED_SFX2_SOURCE_DOC_DOC_HRC
-
-#include <sfx2/sfx.hrc>
-
-// #defines *****************************************************************
-
-#define RID_SFX_DOC_END                     (RID_SFX_DIALOG_START-1)
-
-#define STR_NODEFPRINTER                    (RID_SFX_DOC_START+ 0)
-#define STR_ERROR_PRINTER_BUSY              (RID_SFX_DOC_START+ 1)
-#define STR_NOSTARTPRINTER                  (RID_SFX_DOC_START+ 2)
-
-#define STR_TEMPLATE_FILTER                 (RID_SFX_DOC_START+ 28)
-
-#define STR_SAVEDOC                         (RID_SFX_DOC_START+ 45)
-#define STR_SAVEASDOC                       (RID_SFX_DOC_START+ 47)
-
-#define STR_CLOSEDOC                        (RID_SFX_DOC_START+ 49)
-#define STR_SAVEACOPY                       (RID_SFX_DOC_START+ 55)
-
-#define STR_AUTOMATICVERSION                (RID_SFX_DOC_START+ 68)
-
-#define TEMPLATE_LONG_NAMES_ARY             (RID_SFX_DOC_START+ 81)
-#define TEMPLATE_SHORT_NAMES_ARY            (RID_SFX_DOC_START+ 82)
-#define RID_CNT_STR_WAITING                 (RID_SFX_DOC_START+ 83)
-
-#define STR_EXPORTBUTTON                    (RID_SFX_DOC_START+93)
-
-#define STR_LABEL_FILEFORMAT                (RID_SFX_DOC_START+96)
-
-#define STR_HIDDENINFO_CONTAINS             (RID_SFX_DOC_START+110)
-#define STR_HIDDENINFO_RECORDCHANGES        (RID_SFX_DOC_START+111)
-#define STR_HIDDENINFO_NOTES                (RID_SFX_DOC_START+112)
-#define STR_HIDDENINFO_DOCVERSIONS          (RID_SFX_DOC_START+113)
-#define STR_HIDDENINFO_CONTINUE_SAVING      (RID_SFX_DOC_START+116)
-#define STR_HIDDENINFO_CONTINUE_PRINTING    (RID_SFX_DOC_START+117)
-#define STR_HIDDENINFO_CONTINUE_SIGNING     (RID_SFX_DOC_START+118)
-#define STR_HIDDENINFO_CONTINUE_CREATEPDF   (RID_SFX_DOC_START+119)
-
-#define STR_NEW_FILENAME_SAVE               (RID_SFX_DOC_START+121)
-
-#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
-#define STR_XMLSEC_ODF12_EXPECTED           (RID_SFX_DOC_START+126)
-
-#define STR_QRYTEMPL_MESSAGE                (RID_SFX_DOC_START+127)
-#define STR_QRYTEMPL_UPDATE_BTN             (RID_SFX_DOC_START+128)
-#define STR_QRYTEMPL_KEEP_BTN               (RID_SFX_DOC_START+129)
-
-#define STR_ACTION_REFRESH                  (RID_SFX_DOC_START+131)
-#define STR_ACTION_DEFAULT                  (RID_SFX_DOC_START+132)
-#define STR_INPUT_NEW                       (RID_SFX_DOC_START+134)
-#define STR_MSG_ERROR_LOCAL_MOVE            (RID_SFX_DOC_START+137)
-#define STR_MSG_ERROR_EXPORT                (RID_SFX_DOC_START+139)
-#define STR_MSG_ERROR_IMPORT                (RID_SFX_DOC_START+140)
-#define STR_MSG_ERROR_DELETE_TEMPLATE       (RID_SFX_DOC_START+141)
-#define STR_MSG_ERROR_DELETE_FOLDER         (RID_SFX_DOC_START+142)
-#define STR_QMSG_SEL_FOLDER_DELETE          (RID_SFX_DOC_START+146)
-#define STR_QMSG_TEMPLATE_OVERWRITE         (RID_SFX_DOC_START+147)
-#define STR_QMSG_SEL_TEMPLATE_DELETE        (RID_SFX_DOC_START+148)
-
-#define STR_OPEN                            (RID_SFX_DOC_START+151)
-#define STR_EDIT_TEMPLATE                   (RID_SFX_DOC_START+152)
-#define STR_DEFAULT_TEMPLATE                (RID_SFX_DOC_START+153)
-#define STR_RENAME                          (RID_SFX_DOC_START+154)
-#define STR_DELETE                          (RID_SFX_DOC_START+155)
-#define STR_RENAME_TEMPLATE                 (RID_SFX_DOC_START+157)
-
-#define STR_CATEGORY_NEW                    (RID_SFX_DOC_START+158)
-#define STR_CATEGORY_SELECT                 (RID_SFX_DOC_START+100)
-#define STR_CATEGORY_DELETE                 (RID_SFX_DOC_START+101)
-#define STR_CREATE_ERROR                    (RID_SFX_DOC_START+103)
-#define STR_ERROR_SAVEAS                    (RID_SFX_DOC_START+105)
-#define STR_CATEGORY_RENAME                 (RID_SFX_DOC_START+109)
-#define STR_TEMPLATE_SELECTION              (RID_SFX_DOC_START+120)
-#define STR_RESET_DEFAULT                   (RID_SFX_DOC_START+122)
-#define STR_TEMPLATE_TOOLTIP                (RID_SFX_DOC_START+169)
-#define STR_MSG_EXPORT_SUCCESS              (RID_SFX_DOC_START+170)
-#define STR_MSG_QUERY_COPY                  (RID_SFX_DOC_START+171)
-
-#define STR_QMSG_ERROR_OPENING_FILE          (RID_SFX_DOC_START+180)
-#define STR_QMSG_ERROR_OPENING_FILE_DETAILS  (RID_SFX_DOC_START+181)
-#define STR_QMSG_ERROR_OPENING_FILE_CONTINUE (RID_SFX_DOC_START+182)
-
-// please update to the last id
-#define ACT_SFX_DOC_END STR_QMSG_ERROR_OPENING_FILE_CONTINUE
-#if ACT_SFX_DOC_END > RID_SFX_DOC_END
-#error resource overflow in #line, #file
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/srchdlg.src b/sfx2/inc/doctempl.hrc
index ec1ca974e906..f897a187759e 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/sfx2/inc/doctempl.hrc
@@ -17,45 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
+#ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC
+#define INCLUDED_SFX2_INC_DOCTEMPL_HRC
 
- // Strings ---------------------------------------------------------------
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String RID_SVXSTR_SEARCH_STYLES
-{
-    Text [ en-US ] = "Including Styles" ;
-};
-String RID_SVXSTR_WRITER_STYLES
-{
-    Text [ en-US ] = "Paragraph St~yles" ;
-};
-String RID_SVXSTR_CALC_STYLES
-{
-    Text [ en-US ] = "Cell St~yles" ;
-};
-String RID_SVXSTR_SEARCH
-{
-    Text [ en-US ] = "(Search)" ;
-};
-String RID_SVXSTR_REPLACE
-{
-    Text [ en-US ] = "(Replace)" ;
-};
-String RID_SVXSTR_SEARCH_END
-{
-    Text [ en-US ] = "Reached the end of the document" ;
-};
-String RID_SVXSTR_SEARCH_END_SHEET
-{
-    Text [ en-US ] = "Reached the end of the sheet" ;
-};
-String RID_SVXSTR_SEARCH_NOT_FOUND
-{
-    Text [ en-US ] = "Search key not found" ;
-};
-String RID_SVXSTR_SEARCH_START
-{
-    Text [ en-US ] = "Reached the beginning of the document" ;
+const char* TEMPLATE_LONG_NAMES_ARY[] =
+{
+    NC_("TEMPLATE_LONG_NAMES_ARY", "My Templates"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Business Correspondence"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Other Business Documents"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Personal Correspondence and Documents"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Forms and Contracts"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Finances"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Education"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Presentation Backgrounds"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Presentations"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Miscellaneous"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Labels"),
+    NC_("TEMPLATE_LONG_NAMES_ARY", "Styles")
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
deleted file mode 100644
index 86cf4d56eecd..000000000000
--- a/sfx2/inc/filedlghelper.hrc
+++ /dev/null
@@ -1,31 +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_SFX2_INC_FILEDLGHELPER_HRC
-#define INCLUDED_SFX2_INC_FILEDLGHELPER_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define STR_PB_SAVEACOPY            (RID_SFX_EXPLORER_START + 65)
-#define STR_PB_COMPAREDOC           (RID_SFX_EXPLORER_START + 66)
-#define STR_PB_MERGEDOC             (RID_SFX_EXPLORER_START + 67)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 7a3e57ac264d..e381e7370484 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -348,7 +348,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sax/tools/converter.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
@@ -403,9 +402,7 @@
 #include <tools/globname.hxx>
 #include <tools/link.hxx>
 #include <tools/poly.hxx>
-#include <tools/rcid.h>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
@@ -445,7 +442,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx
index bd024c27ed90..9fb8ccf070fe 100644
--- a/sfx2/inc/strings.hxx
+++ b/sfx2/inc/strings.hxx
@@ -24,6 +24,14 @@
 #define STR_TEMPLATE_NAME9_DEF  "Sunset"
 #define STR_TEMPLATE_NAME10_DEF "Vintage"
 
+#define SFX_ST_EDIT             "..."
+
+#define CMIS_TYPE_STRING        "String"
+#define CMIS_TYPE_INTEGER       "Integer"
+#define CMIS_TYPE_DECIMAL       "Decimal"
+#define CMIS_TYPE_DATETIME      "Datetime"
+#define CMIS_TYPE_BOOL          "Bool"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index a67bef7505cb..f26a70439849 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -63,7 +63,7 @@
 #include <sfx2/viewfrm.hxx>
 #include "appdata.hxx"
 #include "openflag.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/module.hxx>
 #include <sfx2/event.hxx>
 #include "imestatuswindow.hxx"
@@ -343,9 +343,9 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
         pFrame->GetViewShell()->SetCurrentDocument();
 }
 
-ResMgr* SfxApplication::GetSfxResManager()
+std::locale* SfxApplication::GetSfxResLocale()
 {
-    return SfxResMgr::GetResMgr();
+    return SfxResLocale::GetResLocale();
 }
 
 void SfxApplication::SetProgress_Impl
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
deleted file mode 100644
index b792413365a1..000000000000
--- a/sfx2/source/appl/app.src
+++ /dev/null
@@ -1,365 +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 <sfx2/sfx.hrc>
-#include "app.hrc"
-#include "helpid.hrc"
-
-String STR_NONAME
-{
-    Text [ en-US ] = "Untitled" ;
-};
-String STR_STANDARD_SHORTCUT
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_BYTES
-{
-    Text [ en-US ] = "Bytes" ;
-};
-String STR_KB
-{
-    Text [ en-US ] = "KB" ;
-};
-String STR_MB
-{
-    Text [ en-US ] = "MB" ;
-};
-String STR_GB
-{
-    Text [ en-US ] = "GB" ;
-};
-String STR_QUERY_LASTVERSION
-{
-    Text [ en-US ] = "Cancel all changes?" ;
-};
-
-String STR_NO_WEBBROWSER_FOUND
-{
-    Text [ en-US ] = "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\nMaybe no web browser could be found on your system. In that case, please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation." ;
-};
-
-String STR_NO_ABS_URI_REF
-{
-    Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ;
-};
-
-String GID_INTERN
-{
-    Text [ en-US ] = "Internal" ;
-};
-
-String GID_APPLICATION
-{
-    Text [ en-US ] = "Application" ;
-};
-
-String GID_VIEW
-{
-    Text [ en-US ] = "View" ;
-};
-
-String GID_DOCUMENT
-{
-    Text [ en-US ] = "Documents" ;
-};
-
-String GID_EDIT
-{
-    Text [ en-US ] = "Edit" ;
-};
-
-String GID_MACRO
-{
-    Text [ en-US ] = "BASIC" ;
-};
-
-String GID_OPTIONS
-{
-    Text [ en-US ] = "Options" ;
-};
-
-String GID_MATH
-{
-    Text [ en-US ] = "Math" ;
-};
-
-String GID_NAVIGATOR
-{
-    Text [ en-US ] = "Navigate" ;
-};
-
-String GID_INSERT
-{
-    Text [ en-US ] = "Insert" ;
-};
-
-String GID_FORMAT
-{
-    Text [ en-US ] = "Format" ;
-};
-
-String GID_TEMPLATE
-{
-    Text [ en-US ] = "Templates" ;
-};
-
-String GID_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-
-String GID_FRAME
-{
-    Text [ en-US ] = "Frame" ;
-};
-
-String GID_GRAPHIC
-{
-    Text [ en-US ] = "Image" ;
-};
-
-String GID_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-
-String GID_ENUMERATION
-{
-    Text [ en-US ] = "Numbering" ;
-};
-
-String GID_DATA
-{
-    Text [ en-US ] = "Data" ;
-};
-
-String GID_SPECIAL
-{
-    Text [ en-US ] = "Special Functions" ;
-};
-
-String GID_IMAGE
-{
-    Text [ en-US ] = "Image" ;
-};
-
-String GID_CHART
-{
-    Text [ en-US ] = "Chart" ;
-};
-
-String GID_EXPLORER
-{
-    Text [ en-US ] = "Explorer" ;
-};
-
-String GID_CONNECTOR
-{
-    Text [ en-US ] = "Connector" ;
-};
-
-String GID_MODIFY
-{
-    Text [ en-US ] = "Modify" ;
-};
-
-String GID_DRAWING
-{
-    Text [ en-US ] = "Drawing" ;
-};
-
-String GID_CONTROLS
-{
-    Text [ en-US ] = "Controls" ;
-};
-
-String STR_QUITAPP
-{
-    Text [ en-US ] = "E~xit %PRODUCTNAME" ;
-};
-
-String RID_STR_HELP
-{
-    Text [ en-US ] = "Help" ;
-};
-
-String RID_STR_HLPFILENOTEXIST
-{
-    Text [ en-US ] = "The help file for this topic is not installed." ;
-};
-
-String STR_QUICKSTART_EXIT
-{
-    Text [ en-US ] = "Exit Quickstarter" ;
-};
-String STR_QUICKSTART_TIP
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Quickstarter" ;
-};
-String STR_QUICKSTART_FILEOPEN
-{
-    Text [ en-US ] = "Open Document..." ;
-};
-String STR_QUICKSTART_FROMTEMPLATE
-{
-    Text [ en-US ] = "From Template..." ;
-};
-String STR_QUICKSTART_PRELAUNCH
-{
-    Text [ en-US ] = "Load %PRODUCTNAME During System Start-Up" ;
-};
-String STR_QUICKSTART_PRELAUNCH_UNX
-{
-    Text[ en-US ] = "Disable systray Quickstarter";
-};
-String STR_QUICKSTART_LNKNAME
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ;
-};
-String STR_QUICKSTART_FILE
-{
-    Text [ en-US ] = "File";
-};
-
-String STR_QUICKSTART_STARTCENTER
-{
-    Text [ en-US ] = "Startcenter";
-};
-
-String STR_QUICKSTART_RECENTDOC
-{
-    Text [ en-US ] = "Recent Documents";
-};
-
-String STR_QUERY_UPDATE_LINKS
-{
-    Text [ en-US ] = "This document contains one or more links to external data.\n\nWould you like to change the document, and update all links\nto get the most recent data?" ;
-};
-
-String STR_DDE_ERROR
-{
-    Text [ en-US ] = "DDE link to %1 for %2 area %3 are not available." ;
-};
-
-String STR_SECURITY_WARNING_NO_HYPERLINKS
-{
-    Text [ en-US ] = "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened.";
-};
-
-String RID_SECURITY_WARNING_TITLE
-{
-    Text [ en-US ] = "Security Warning" ;
-};
-
-String RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE
-{
-    Text [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ;
-};
-
-String RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN
-{
-    Text [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ;
-};
-
-String STR_QUERY_CANCELCHECKOUT
-{
-    Text [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ;
-};
-
-String STR_INFO_WRONGDOCFORMAT
-{
-    Text [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ;
-};
-
-String RID_XMLSEC_DOCUMENTSIGNED
-{
-    Text [ en-US ] = " (Signed)" ;
-};
-
-String STR_EMBEDDED_TITLE
-{
-    Text [ en-US ] = " (Embedded document)" ;
-};
-
-String STR_STANDARD
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String RID_SVXSTR_FILELINK
-{
-    Text [ en-US ] = "Document" ;
-};
-
-String STR_NONE
-{
-    Text [ en-US ] = "- None -" ;
-};
-String RID_SVXSTR_GRAFIKLINK
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_SFX_FILTERNAME_ALL
-{
-    Text [ en-US ] = "All files" ;
-};
-String STR_SFX_FILTERNAME_PDF
-{
-    Text [ en-US ] = "PDF files" ;
-};
-String RID_SVXSTR_EDITGRFLINK
-{
-    Text [ en-US ] = "Link Image" ;
-};
-// i66948 used in project scripting
-String STR_ERRUNOEVENTBINDUNG
-{
-    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
-};
-String RID_SVXSTR_GRFILTER_OPENERROR
-{
-    Text [ en-US ] = "Image file cannot be opened" ;
-};
-String RID_SVXSTR_GRFILTER_IOERROR
-{
-    Text [ en-US ] = "Image file cannot be read" ;
-};
-String RID_SVXSTR_GRFILTER_FORMATERROR
-{
-    Text [ en-US ] = "Unknown image format" ;
-};
-String RID_SVXSTR_GRFILTER_VERSIONERROR
-{
-    Text [ en-US ] = "This version of the image file is not supported" ;
-};
-String RID_SVXSTR_GRFILTER_FILTERERROR
-{
-    Text [ en-US ] = "Image filter not found" ;
-};
-String RID_SVXSTR_END_REDLINING_WARNING
-{
-    Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ;
-};
-String RID_SVXSTR_INCORRECT_PASSWORD
-{
-    Text [ en-US ] = "Incorrect password" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 1610510eb3d1..c9184bbb6fd3 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -44,6 +44,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
+#include <sfx2/dinfdlg.hxx>
 #include <sfx2/module.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
@@ -59,14 +60,13 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/minfitem.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include "appdata.hxx"
 #include <sfx2/sfxhelp.hxx>
 #include <basic/basmgr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <unotools/configmgr.hxx>
 #include "sorgitm.hxx"
 #include "appbaslib.hxx"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 944ffd17facc..9b847e6f9a80 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -69,7 +69,7 @@
 #include "appdata.hxx"
 #include "workwin.hxx"
 #include "helper.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include "shutdownicon.hxx"
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index a2ad89c5834a..65c0f47a3d59 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/unoctitm.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include "objshimp.hxx"
 #include "imestatuswindow.hxx"
@@ -89,10 +89,6 @@ SfxAppData_Impl::SfxAppData_Impl()
     , pFactArr(nullptr)
     , pTopFrames( new SfxFrameArr_Impl )
     , pMatcher( nullptr )
-#if HAVE_FEATURE_SCRIPTING
-    , pBasicResMgr( nullptr )
-#endif
-    , pSvtResMgr( nullptr )
     , m_pToolsErrorHdl(nullptr)
     , m_pSoErrorHdl(nullptr)
 #if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 931c0b3cbc70..b924460de853 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -26,8 +26,10 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+#include <basic/sbdef.hxx>
 #include <svtools/soerr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
+#include <tools/resmgr.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/intitem.hxx>
@@ -48,8 +50,8 @@
 #include <vcl/scheduler.hxx>
 
 #include <sfx2/unoctitm.hxx>
-#include "app.hrc"
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
+#include "sfx2/strings.hrc"
 #include "appdata.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/dispatch.hxx>
@@ -211,18 +213,18 @@ void SfxApplication::Initialize_Impl()
     Help::EnableExtHelp();
 
     pImpl->m_pToolsErrorHdl = new SfxErrorHandler(
-        RID_ERRHDL, ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX));
+        getRID_ERRHDL(), ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX));
 
 #if HAVE_FEATURE_SCRIPTING
-    pImpl->pBasicResMgr = ResMgr::CreateResMgr("sb");
+    pImpl->aBasicResLocale = Translate::Create("sb", Application::GetSettings().GetUILanguageTag());
 #endif
-    pImpl->pSvtResMgr = ResMgr::CreateResMgr("svt");
+    pImpl->aSvtResLocale = Translate::Create("svt", Application::GetSettings().GetUILanguageTag());
 
     pImpl->m_pSoErrorHdl = new SfxErrorHandler(
-        RID_SO_ERROR_HANDLER, ErrCode(ERRCODE_AREA_SO), ErrCode(ERRCODE_AREA_SO_END), pImpl->pSvtResMgr );
+        getRID_SO_ERROR_HANDLER(), ErrCode(ERRCODE_AREA_SO), ErrCode(ERRCODE_AREA_SO_END), &(pImpl->aSvtResLocale));
 #if HAVE_FEATURE_SCRIPTING
     pImpl->m_pSbxErrorHdl = new SfxErrorHandler(
-        RID_BASIC_START, ErrCode(ERRCODE_AREA_SBX), ErrCode(ERRCODE_AREA_SBX_END), pImpl->pBasicResMgr );
+        getRID_BASIC_START(), ErrCode(ERRCODE_AREA_SBX), ErrCode(ERRCODE_AREA_SBX_END), &(pImpl->aBasicResLocale));
 #endif
 
     if (!utl::ConfigManager::IsAvoidConfig())
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 665ac27dd285..8408f4d0def9 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/msgpool.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
 
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index f56e46145aac..35a6f2966575 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/graphic/Primitive2DTools.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <tools/rcid.h>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <framework/menuconfiguration.hxx>
@@ -59,9 +58,9 @@
 #include <sfx2/dispatch.hxx>
 #include "workwin.hxx"
 #include <sfx2/fcontnr.hxx>
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfx.hrc>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/templdlg.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 647c7f7cec29..36903d8489dd 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -82,7 +82,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/viewsh.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index f71c499bb1fb..e5f76c956cec 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -29,7 +29,7 @@
 #include <unotools/saveopt.hxx>
 #include <unotools/misccfg.hxx>
 
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/app.hxx>
 #include <sfx2/evntconf.hxx>
 #include <sfx2/unoctitm.hxx>
@@ -44,7 +44,7 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/docfile.hxx>
 #include "sfxtypes.hxx"
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/fcontnr.hxx>
 #include "nochaos.hxx"
 #include <sfx2/doctempl.hxx>
@@ -102,8 +102,8 @@ void SfxApplication::Deinitialize()
 
     // free administration managers
     DELETEZ(pImpl->pAppDispat);
-    SfxResMgr::DeleteResMgr();
-    SvtResMgr::DeleteResMgr();
+    SfxResLocale::DeleteResLocale();
+    SvtResLocale::DeleteResLocale();
 
     // from here no SvObjects have to exists
     DELETEZ(pImpl->pMatcher);
@@ -123,11 +123,6 @@ void SfxApplication::Deinitialize()
     NoChaos::ReleaseItemPool();
 
 #if HAVE_FEATURE_SCRIPTING
-    DELETEZ(pImpl->pBasicResMgr);
-#endif
-    DELETEZ(pImpl->pSvtResMgr);
-
-#if HAVE_FEATURE_SCRIPTING
     delete pImpl->m_pSbxErrorHdl;
 #endif
     delete pImpl->m_pSoErrorHdl;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b17d8ba93128..1c8e1c6fd5c3 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -103,7 +103,7 @@
 #include <sfx2/tabdlg.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/sfx.hrc>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/childwin.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 226b16e56a16..ef555a0a9628 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <vcl/toolbox.hxx>
-#include <tools/rcid.h>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <com/sun/star/frame/XController.hpp>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 084461658c43..37e3adb3d046 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/opengrf.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "fileobj.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <vcl/dibtools.hxx>
 
 #define FILETYPE_TEXT       1
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 6a27fb4d8e08..f65cb81d5653 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/string.hxx>
 #include <sfx2/linkmgr.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <osl/file.hxx>
 #include <sfx2/objsh.hxx>
@@ -41,7 +42,7 @@
 
 #include "fileobj.hxx"
 #include "impldde.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 7f9139cfe769..1634ddd835b9 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -27,7 +27,7 @@
 #include <vcl/layout.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <vcl/svapp.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index f26660abd87e..110a07d129c6 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rcid.h>
-
 #include <cstdarg>
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
@@ -71,13 +69,9 @@ SfxModule_Impl::~SfxModule_Impl()
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell)
 
-ResMgr* SfxModule::GetResMgr()
-{
-    return pResMgr;
-}
-
-SfxModule::SfxModule( ResMgr* pMgrP, std::initializer_list<SfxObjectFactory*> pFactoryList )
-    : pResMgr( pMgrP ), pImpl(nullptr)
+SfxModule::SfxModule(const std::locale& rLocale, std::initializer_list<SfxObjectFactory*> pFactoryList)
+    : m_aResLocale(rLocale)
+    , pImpl(nullptr)
 {
     Construct_Impl();
     for (auto pFactory : pFactoryList)
@@ -100,14 +94,15 @@ void SfxModule::Construct_Impl()
     SetPool( &pApp->GetPool() );
 }
 
-
 SfxModule::~SfxModule()
 {
-    delete pImpl;
-    delete pResMgr;
+    //TODO how to silence useuniqueptr
+    if (true)
+    {
+        delete pImpl;
+    }
 }
 
-
 SfxSlotPool* SfxModule::GetSlotPool() const
 {
     return pImpl->pSlotPool;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 236a649ccaf6..76e667314656 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -31,7 +31,7 @@
 #include <sfx2/sfxhelp.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include "newhelp.hrc"
 #include "helpid.hrc"
 #include "bitmaps.hlst"
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
deleted file mode 100644
index 704bedae3246..000000000000
--- a/sfx2/source/appl/newhelp.src
+++ /dev/null
@@ -1,99 +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 "app.hrc"
-#include "newhelp.hrc"
-#include "helpid.hrc"
-
-String STR_HELP_WINDOW_TITLE
-{
-    Text [ en-US ] = "%PRODUCTNAME Help";
-};
-
-String STR_HELP_BUTTON_INDEX_ON
-{
-    Text [ en-US ] = "Show Navigation Pane";
-};
-
-String STR_HELP_BUTTON_INDEX_OFF
-{
-    Text [ en-US ] = "Hide Navigation Pane";
-};
-
-String STR_HELP_BUTTON_START
-{
-    Text [ en-US ] = "First Page";
-};
-
-String STR_HELP_BUTTON_PREV
-{
-    Text [ en-US ] = "Previous Page";
-};
-
-String STR_HELP_BUTTON_NEXT
-{
-    Text [ en-US ] = "Next Page";
-};
-
-String STR_HELP_BUTTON_PRINT
-{
-    Text [ en-US ] = "Print...";
-};
-
-String STR_HELP_BUTTON_ADDBOOKMARK
-{
-    Text [ en-US ] = "Add to Bookmarks...";
-};
-
-String STR_HELP_BUTTON_SEARCHDIALOG
-{
-    Text [ en-US ] = "Find on this Page...";
-};
-
-String STR_HELP_BUTTON_SOURCEVIEW
-{
-    Text [ en-US ] = "HTML Source";
-};
-
-String STR_HELP_MENU_TEXT_SELECTION_MODE
-{
-    Text [ en-US ] = "Select Text";
-};
-
-String STR_HELP_MENU_TEXT_COPY
-{
-    Text [ en-US ] = "~Copy" ;
-};
-
-String STR_INFO_NOSEARCHRESULTS
-{
-    Text [ en-US ] = "No topics found.";
-};
-
-String STR_INFO_NOSEARCHTEXTFOUND
-{
-    Text [ en-US ] = "The text you entered was not found.";
-};
-
-String RID_HELP_ONSTARTUP_TEXT
-{
-    Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 51ce43006f71..40e4bd84ef9f 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/docfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 
 
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::cppu;
 
 
-sal_uInt16  SvxOpenGrfErr2ResId( ErrCode err )
+const char* SvxOpenGrfErr2ResId( ErrCode err )
 {
     if (err == ERRCODE_GRFILTER_OPENERROR)
         return RID_SVXSTR_GRFILTER_OPENERROR;
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index ed702340fb11..a72c3b78b1be 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -26,7 +26,7 @@
 
 #include "openuriexternally.hxx"
 
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 
 bool sfx2::openUriExternally(
     OUString const & uri, bool handleSystemShellExecuteException)
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
deleted file mode 100644
index c6162a8ff9e6..000000000000
--- a/sfx2/source/appl/sfx.src
+++ /dev/null
@@ -1,42 +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 <sfx2/sfx.hrc>
-
-String STR_PASSWD_MIN_LEN
-{
-    Text [ en-US ] = "(Minimum $(MINLEN) characters)" ;
-};
-
-String STR_PASSWD_MIN_LEN1
-{
-    Text [ en-US ] = "(Minimum 1 character)" ;
-};
-
-String STR_PASSWD_EMPTY
-{
-    Text [ en-US ] = "(The password can be empty)" ;
-};
-
-String STR_MODULENOTINSTALLED
-{
-    Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index cde3a0e334a7..4df7cbd8d7bd 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -60,7 +60,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "helper.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxuno.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 4978363c5ad9..9b013a94393f 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -24,7 +24,7 @@
 #include <boost/logic/tribool.hpp>
 #include <config_folders.h>
 #include <shutdownicon.hxx>
-#include <app.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <osl/mutex.hxx>
 #include <svtools/imagemgr.hxx>
@@ -55,7 +55,6 @@
 #include <sfx2/dispatch.hxx>
 #include <comphelper/extract.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/rcid.h>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
@@ -207,7 +206,7 @@ ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > & rxC
     m_bVeto ( false ),
     m_bListenForTermination ( false ),
     m_bSystemDialogs( false ),
-    m_pResMgr( nullptr ),
+    m_pResLocale( nullptr ),
     m_pFileDlg( nullptr ),
     m_xContext( rxContext ),
     m_bInitialized( false )
@@ -302,22 +301,11 @@ void ShutdownIcon::FromTemplate()
     }
 }
 
-
-OUString ShutdownIcon::GetResString( int id )
+OUString ShutdownIcon::GetResString(const char* id)
 {
-    ::SolarMutexGuard aGuard;
-
-    if( ! m_pResMgr )
-        m_pResMgr = SfxResMgr::GetResMgr();
-    ResId aResId( id, *m_pResMgr );
-    aResId.SetRT( RSC_STRING );
-    if (!m_pResMgr->IsAvailable(aResId))
-        return OUString();
-
-    return ResId(id, *m_pResMgr);
+    return SfxResId(id);
 }
 
-
 OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
 {
     ::SolarMutexGuard aGuard;
@@ -325,7 +313,6 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
     return SvFileInformationManager::GetDescription( INetURLObject( aUrl ) );
 }
 
-
 void ShutdownIcon::StartFileDialog()
 {
     ::SolarMutexGuard aGuard;
@@ -347,7 +334,6 @@ void ShutdownIcon::StartFileDialog()
     m_pFileDlg->StartExecuteModal( LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
 }
 
-
 IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void )
 {
     DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" );
@@ -557,10 +543,10 @@ void ShutdownIcon::init()
 {
     // access resource system and sfx only protected by solarmutex
     ::SolarMutexGuard aSolarGuard;
-    ResMgr *pResMgr = SfxResMgr::GetResMgr();
+    std::locale *pResLocale = SfxResLocale::GetResLocale();
 
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
-    m_pResMgr = pResMgr;
+    m_pResLocale = pResLocale;
     aGuard.clear();
     css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
     aGuard.reset();
@@ -717,8 +703,8 @@ OUString ShutdownIcon::getShortcutName()
 
 #ifdef _WIN32
     OUString aShortcutName( "StarOffice 6.0"  );
-    ResMgr* pMgr = SfxResMgr::GetResMgr();
-    if( pMgr )
+    std::locale* pResLocale = SfxResLocale::GetResLocale();
+    if (pResLocale)
     {
         ::SolarMutexGuard aGuard;
         aShortcutName = SfxResId(STR_QUICKSTART_LNKNAME);
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 1d49954c5a6e..455fe4cd4043 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -41,7 +41,6 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray();
 
 }
 
-class ResMgr;
 namespace sfx2
 {
     class FileDialogHelper;
@@ -68,7 +67,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
         bool                    m_bVeto;
         bool                    m_bListenForTermination;
         bool                    m_bSystemDialogs;
-        ResMgr*                 m_pResMgr;
+        std::locale*            m_pResLocale;
         sfx2::FileDialogHelper* m_pFileDlg;
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
@@ -113,7 +112,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
         /// @throws css::uno::Exception
         void init();
 
-        OUString GetResString( int id );
+        static OUString GetResString(const char* id);
         static OUString GetUrlDescription( const OUString& aUrl );
 
         void SetVeto( bool bVeto )  { m_bVeto = bVeto;}
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index eb4633eaa7c5..ebf830568f54 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -27,7 +27,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <sfx2/app.hxx>
 #include <sal/macros.h>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include "shutdownicon.hxx"
 
 #include <com/sun/star/util/XStringWidth.hpp>
@@ -396,11 +396,11 @@ void aqua_init_systray()
             aShortcuts.clear();
 
             pExecute = [[QSMenuExecute alloc] init];
-            pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""];
-            pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""];
-            NSMenu* pMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )];
+            pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) ) action: nullptr keyEquivalent: @""];
+            pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) ) action: nullptr keyEquivalent: @""];
+            NSMenu* pMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) )];
             [pMenu setAutoenablesItems: NO];
-            NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )];
+            NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) )];
             [pDockMenu setAutoenablesItems: NO];
 
             // collect the URLs of the entries in the File/New menu
@@ -436,7 +436,7 @@ void aqua_init_systray()
             // insert entry for startcenter
             if( aModuleOptions.IsModuleInstalled( SvtModuleOptions::EModule::STARTMODULE ) )
             {
-                appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, "n" );
+                appendMenuItem( pMenu, nil, ShutdownIcon::GetResString(STR_QUICKSTART_STARTCENTER), MI_STARTMODULE, "n" );
                 if( [NSApp respondsToSelector: @selector(setDockIconClickHandler:)] )
                     [NSApp performSelector:@selector(setDockIconClickHandler:) withObject: pExecute];
                 else
@@ -466,12 +466,12 @@ void aqua_init_systray()
             // insert the remaining menu entries
 
             // add recent menu
-            appendRecentMenu( pMenu, pDockMenu, pShutdownIcon->GetResString( STR_QUICKSTART_RECENTDOC ) );
+            appendRecentMenu( pMenu, pDockMenu, ShutdownIcon::GetResString(STR_QUICKSTART_RECENTDOC) );
 
-            rtl::OUString aTitle( pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ) );
+            rtl::OUString aTitle( ShutdownIcon::GetResString(STR_QUICKSTART_FROMTEMPLATE) );
             rtl::OUString aKeyEquiv( getShortCut( aTitle ) );
             appendMenuItem( pMenu, pDockMenu, aTitle, MI_TEMPLATE, aKeyEquiv );
-            aTitle = pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN );
+            aTitle = ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN);
             aKeyEquiv = getShortCut( aTitle );
             appendMenuItem( pMenu, pDockMenu, aTitle, MI_OPEN, aKeyEquiv );
 
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 1bdf3e2e5ef5..a4f8fd35a4cd 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <osl/module.hxx>
 #include <sfx2/app.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include "shutdownicon.hxx"
 
 #include <config_gio.h>
@@ -197,7 +197,6 @@ add_image_menu_item( GtkMenuShell *pMenuShell,
 
 static void populate_menu( GtkWidget *pMenu )
 {
-    ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
     GtkMenuShell *pMenuShell = GTK_MENU_SHELL( pMenu );
     SvtModuleOptions aModuleOptions;
 
@@ -225,7 +224,7 @@ static void populate_menu( GtkWidget *pMenu )
         add_item (pMenuShell, MATH_URL, nullptr,
                   SV_ICON_ID_FORMULA, G_CALLBACK( open_url_cb ));
 
-    OUString aULabel = pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE );
+    OUString aULabel = ShutdownIcon::GetResString(STR_QUICKSTART_FROMTEMPLATE);
     add_item (pMenuShell, "dummy", &aULabel,
               SV_ICON_ID_TEMPLATE, G_CALLBACK( open_template_cb ));
 
@@ -236,7 +235,7 @@ static void populate_menu( GtkWidget *pMenu )
 
     pOpenMenuItem = add_image_menu_item
         (pMenuShell, GTK_STOCK_OPEN,
-         pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ),
+         ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN),
          G_CALLBACK( open_file_cb ));
 
 
@@ -245,7 +244,7 @@ static void populate_menu( GtkWidget *pMenu )
 
     pDisableMenuItem = add_image_menu_item
         ( pMenuShell, GTK_STOCK_CLOSE,
-          pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ),
+          ShutdownIcon::GetResString(STR_QUICKSTART_PRELAUNCH_UNX),
           G_CALLBACK( systray_disable_cb ) );
 
     pMenuItem = gtk_separator_menu_item_new();
@@ -253,7 +252,7 @@ static void populate_menu( GtkWidget *pMenu )
 
     pExitMenuItem = add_image_menu_item
         ( pMenuShell, GTK_STOCK_QUIT,
-          pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ),
+          ShutdownIcon::GetResString(STR_QUICKSTART_EXIT),
           G_CALLBACK( exit_quickstarter_cb ) );
 
     gtk_widget_show_all( pMenu );
@@ -325,7 +324,7 @@ void plugin_init_sys_tray()
     ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
 
     aLabel = OUStringToOString (
-            pShutdownIcon->GetResString( STR_QUICKSTART_TIP ),
+            ShutdownIcon::GetResString(STR_QUICKSTART_TIP),
             RTL_TEXTENCODING_UTF8 );
 
     pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-startcenter");
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index a7bd05a34f04..d0fa1b9dccb1 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -30,7 +30,7 @@
 #undef WB_RIGHT
 
 #include "shutdownicon.hxx"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <shlobj.h>
 #include <objidl.h>
 #include <osl/thread.h>
@@ -199,13 +199,13 @@ static HMENU createSystrayMenu( )
 
     // insert the remaining menu entries
     addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE,
-        pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, "");
+        ShutdownIcon::GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, "");
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
-    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, "SHELL32");
+    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN), pos, true, "SHELL32");
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
-    addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, "" );
+    addMenuItem( hMenu, IDM_INSTALL,0, ShutdownIcon::GetResString(STR_QUICKSTART_PRELAUNCH), pos, false, "" );
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" );
-    addMenuItem( hMenu, IDM_EXIT,   0, pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ), pos, false, "" );
+    addMenuItem( hMenu, IDM_EXIT,   0, ShutdownIcon::GetResString(STR_QUICKSTART_EXIT), pos, false, "" );
 
     // indicate status of autostart folder
     CheckMenuItem( hMenu, IDM_INSTALL, MF_BYCOMMAND | (ShutdownIcon::GetAutostart() ? MF_CHECKED : MF_UNCHECKED) );
@@ -240,9 +240,7 @@ static void deleteSystrayMenu( HMENU hMenu )
 
 static void addTaskbarIcon( HWND hWnd )
 {
-    OUString strTip;
-    if( ShutdownIcon::getInstance() )
-        strTip = ShutdownIcon::getInstance()->GetResString( STR_QUICKSTART_TIP );
+    OUString strTip = ShutdownIcon::GetResString(STR_QUICKSTART_TIP);
 
     // add taskbar icon
     NOTIFYICONDATAW nid;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 9bab15397683..de328cbbb96f 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -37,7 +37,6 @@
 #include <sfx2/toolbarids.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
-#include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itempool.hxx>
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
deleted file mode 100644
index 46e836f6b88a..000000000000
--- a/sfx2/source/bastyp/bastyp.hrc
+++ /dev/null
@@ -1,28 +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 <sfx2/sfx.hrc>
-
-//for the mapping error code -> ResId
-
-#define RC_BASTYP                                               RID_SFX_BASTYP_START
-#define STR_FILTER_NOT_INSTALLED                (RC_BASTYP +  9)
-#define STR_FILTER_CONSULT_SERVICE              (RC_BASTYP + 10)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index ef136761d100..e17c35a7a89e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -72,7 +72,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/progress.hxx>
 #include "openflag.hxx"
-#include "bastyp.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src
deleted file mode 100644
index 023d5eb10f8b..000000000000
--- a/sfx2/source/bastyp/fltfnc.src
+++ /dev/null
@@ -1,33 +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 <sfx2/sfx.hrc>
-#include "bastyp.hrc"
-#include "helpid.hrc"
-String STR_FILTER_NOT_INSTALLED
-{
-    Text [ en-US ] = "The selected filter $(FILTER) has not been installed.\nWould you like to do this now?";
-};
-
-String STR_FILTER_CONSULT_SERVICE
-{
-    Text [ en-US ] = "The selected filter $(FILTER) is not included in your edition.\nYou can find information about orders on our homepage.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 87c083a240d5..1469e91ceacc 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfx.hrc>
-#include "bastyp.hrc"
+#include "sfx2/strings.hrc"
 #include "strings.hxx"
 
 #include <comphelper/processfactory.hxx>
@@ -128,7 +128,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
     }
 
     // Who we are
-    OUString sGenerator(ResMgr::ExpandVariables(STR_HTML_GENERATOR));
+    OUString sGenerator(Translate::ExpandVariables(STR_HTML_GENERATOR));
     OUString os( "$_OS" );
     ::rtl::Bootstrap::expandMacros(os);
     sGenerator = sGenerator.replaceFirst( "%1", os );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 0676b2d8b139..5561ccde0491 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
 #include <sfx2/sfxresid.hxx>
-#include "bastyp.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/msg.hxx>
 #include "sfxslots.hxx"
 #include "sfxbasecontroller_internal.hxx"
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 5fcb091ac888..97c8f48a436d 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -19,24 +19,30 @@
 
 
 #include <sfx2/sfxresid.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include "tools/resmgr.hxx"
 
-static ResMgr* pMgr=nullptr;
+static std::locale* pResLocale = nullptr;
 
-ResMgr* SfxResMgr::GetResMgr()
+std::locale* SfxResLocale::GetResLocale()
 {
-    if ( !pMgr )
+    if (!pResLocale)
     {
-        pMgr = ResMgr::CreateResMgr("sfx");
+        pResLocale = new std::locale(Translate::Create("sfx", Application::GetSettings().GetUILanguageTag()));
     }
 
-    return pMgr;
+    return pResLocale;
 }
 
-void SfxResMgr::DeleteResMgr()
+void SfxResLocale::DeleteResLocale()
 {
-    DELETEZ( pMgr );
+    DELETEZ(pResLocale);
 }
 
+OUString SfxResId(const char* pId)
+{
+    return Translate::get(pId, *SfxResLocale::GetResLocale());
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index b3e69007debb..e2820186c68d 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -25,7 +25,7 @@
 #include <fstream>
 #include <streambuf>
 
-#include <doc.hrc>
+#include <sfx2/strings.hrc>
 
 #include <vcl/builderfactory.hxx>
 using namespace ::com::sun::star;
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index 9b4c8c7888d3..b7c14e874de8 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -23,7 +23,7 @@
 #include <vcl/graph.hxx>
 #include <sfx2/sfxresid.hxx>
 
-#include <templateview.hrc>
+#include <sfx2/strings.hrc>
 
 using namespace basegfx;
 using namespace basegfx::tools;
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 39718dd272c0..59262504626d 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <tools/stream.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 // due to pSlotPool
 #include "appdata.hxx"
@@ -32,6 +32,7 @@
 #include <sfx2/module.hxx>
 
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 
 SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent)
  : _pParentPool( pParent )
@@ -48,6 +49,65 @@ SfxSlotPool::~SfxSlotPool()
         delete pIF;
 }
 
+namespace
+{
+    const char* getGidResId(SfxGroupId nId)
+    {
+        if (nId == GID_INTERN)
+            return STR_GID_INTERN;
+        else if (nId == GID_APPLICATION)
+            return STR_GID_APPLICATION;
+        else if (nId == GID_VIEW)
+            return STR_GID_VIEW;
+        else if (nId == GID_DOCUMENT)
+            return STR_GID_DOCUMENT;
+        else if (nId == GID_EDIT)
+            return STR_GID_EDIT;
+        else if (nId == GID_MACRO)
+            return STR_GID_MACRO;
+        else if (nId == GID_OPTIONS)
+            return STR_GID_OPTIONS;
+        else if (nId == GID_MATH)
+            return STR_GID_MATH;
+        else if (nId == GID_NAVIGATOR)
+            return STR_GID_NAVIGATOR;
+        else if (nId == GID_INSERT)
+            return STR_GID_INSERT;
+        else if (nId == GID_FORMAT)
+            return STR_GID_FORMAT;
+        else if (nId == GID_TEMPLATE)
+            return STR_GID_TEMPLATE;
+        else if (nId == GID_TEXT)
+            return STR_GID_TEXT;
+        else if (nId == GID_FRAME)
+            return STR_GID_FRAME;
+        else if (nId == GID_GRAPHIC)
+            return STR_GID_GRAPHIC;
+        else if (nId == GID_TABLE)
+            return STR_GID_TABLE;
+        else if (nId == GID_ENUMERATION)
+            return STR_GID_ENUMERATION;
+        else if (nId == GID_DATA)
+            return STR_GID_DATA;
+        else if (nId == GID_SPECIAL)
+            return STR_GID_SPECIAL;
+        else if (nId == GID_IMAGE)
+            return STR_GID_IMAGE;
+        else if (nId == GID_CHART)
+            return STR_GID_CHART;
+        else if (nId == GID_EXPLORER)
+            return STR_GID_EXPLORER;
+        else if (nId == GID_CONNECTOR)
+            return STR_GID_CONNECTOR;
+        else if (nId == GID_MODIFY)
+            return STR_GID_MODIFY;
+        else if (nId == GID_DRAWING)
+            return STR_GID_DRAWING;
+        else if (nId == GID_CONTROLS)
+            return STR_GID_CONTROLS;
+        return nullptr;
+    }
+}
 
 // registers the availability of the Interface of functions
 
@@ -143,15 +203,14 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo )
             }
         }
 
-        ResId aResId((sal_uInt16)_vGroups[_nCurGroup], *SfxResMgr::GetResMgr());
-        aResId.SetRT(RSC_STRING);
-        if ( !SfxResMgr::GetResMgr()->IsAvailable(aResId) )
+        const char* pResId = getGidResId(_vGroups[_nCurGroup]);
+        if (!pResId)
         {
             OSL_FAIL( "GroupId-Name not defined in SFX!" );
             return OUString();
         }
 
-        return aResId;
+        return SfxResId(pResId);
     }
 
     return OUString();
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index b38c697da431..21bd87a0b5ea 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -28,7 +28,9 @@
 #include <vcl/pngread.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
-#include <templateview.hrc>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <sfx2/strings.hrc>
 #include "bitmaps.hlst"
 
 #include <officecfg/Office/Common.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index c1dc04d49008..e41b983a4642 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -23,7 +23,7 @@
 #include <unotools/historyoptions.hxx>
 #include <vcl/svapp.hxx>
 
-#include <templateview.hrc>
+#include <sfx2/strings.hrc>
 #include "bitmaps.hlst"
 
 using namespace basegfx;
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 6e270e4262e2..52c2017af491 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -14,7 +14,7 @@
 #include <vcl/builderfactory.hxx>
 #include <sfx2/app.hxx>
 
-#include <doc.hrc>
+#include <sfx2/strings.hrc>
 
 #define MNI_OPEN               1
 #define MNI_EDIT               2
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 7f105c9c3a3a..f1fb81586348 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -32,8 +32,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
-#include <doc.hrc>
-#include "templateview.hrc"
+#include <sfx2/strings.hrc>
+#include "sfx2/strings.hrc"
 #include "bitmaps.hlst"
 
 #define MNI_OPEN               1
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index f5fd5c07dadf..440e34b1bc61 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -14,7 +14,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
-#include <doc.hrc>
+#include <sfx2/strings.hrc>
 #include "bitmaps.hlst"
 
 #include <vcl/builderfactory.hxx>
diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc
deleted file mode 100644
index c06aba80b963..000000000000
--- a/sfx2/source/control/templateview.hrc
+++ /dev/null
@@ -1,13 +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_WELCOME_LINE1                259
-#define STR_WELCOME_LINE2                260
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src b/sfx2/source/control/templateview.src
deleted file mode 100644
index 0a39ee7243a6..000000000000
--- a/sfx2/source/control/templateview.src
+++ /dev/null
@@ -1,22 +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 "templateview.hrc"
-
-String STR_WELCOME_LINE1
-{
-    Text [ en-US ] = "Welcome to %PRODUCTNAME.";
-};
-
-String STR_WELCOME_LINE2
-{
-    Text [ en-US ] = "Drop a document here or pick an app from the left side to create one.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 36c4242e5991..02c180349cf9 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -23,7 +23,7 @@
 #include <vcl/graph.hxx>
 #include <sfx2/sfxresid.hxx>
 
-#include <templateview.hrc>
+#include <sfx2/strings.hrc>
 #include "bitmaps.hlst"
 
 using namespace basegfx;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 29510c59fbf1..c16cae72d8ff 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -25,7 +25,7 @@
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <vcl/idle.hxx>
 
 #include <sfx2/basedlgs.hxx>
@@ -39,7 +39,7 @@
 #include <sfx2/sfxhelp.hxx>
 #include "workwin.hxx"
 #include <sfx2/sfxresid.hxx>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
deleted file mode 100644
index 52e2477aec36..000000000000
--- a/sfx2/source/dialog/dialog.hrc
+++ /dev/null
@@ -1,59 +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_SFX2_SOURCE_DIALOG_DIALOG_HRC
-#define INCLUDED_SFX2_SOURCE_DIALOG_DIALOG_HRC
-
-#include <sfx2/sfx.hrc>
-
-// defines ---------------------------------------------------------------
-
-#define RC_DIALOG_BEGIN                 RID_SFX_DIALOG_START
-
-#define STR_RESET                       ( RC_DIALOG_BEGIN + 0)
-#define STR_QUERY_OVERWRITE             ( RC_DIALOG_BEGIN + 1)
-#define STR_TABPAGE_INVALIDNAME         ( RC_DIALOG_BEGIN + 13)
-#define STR_TABPAGE_INVALIDSTYLE        ( RC_DIALOG_BEGIN + 14)
-#define STR_POOL_STYLE_NAME             ( RC_DIALOG_BEGIN + 16)
-#define STR_TABPAGE_INVALIDPARENT       ( RC_DIALOG_BEGIN + 18)
-
-#define STR_DELETE_STYLE                ( RC_DIALOG_BEGIN + 19)
-#define STR_DELETE_STYLE_USED           ( RC_DIALOG_BEGIN + 20)
-
-#define STR_VIEWVERSIONCOMMENT          ( RC_DIALOG_BEGIN + 71 )
-#define STR_NO_NAME_SET                 ( RC_DIALOG_BEGIN + 72 )
-
-#define STR_ERROR_WRONG_CONFIRM         ( RC_DIALOG_BEGIN + 76 )
-
-// 100-106 in tbxcust.hrc
-#define STR_MACRO_LOSS                  ( RC_DIALOG_BEGIN + 107 )
-#define STR_CANCEL_RECORDING            ( RC_DIALOG_BEGIN + 108 )
-
-#define STR_PDF_EXPORT_SEND             ( RC_DIALOG_BEGIN + 120 )
-#define STR_STYLE_FILL_FORMAT_MODE      ( RC_DIALOG_BEGIN + 121 )
-#define STR_STYLE_NEW_STYLE_FROM_SELECTION ( RC_DIALOG_BEGIN + 122 )
-#define STR_STYLE_UPDATE_STYLE          ( RC_DIALOG_BEGIN + 123 )
-#define SFX_ST_EDIT                     ( RC_DIALOG_BEGIN + 124 )
-#define STR_STYLE_ELEMTLIST             ( RC_DIALOG_BEGIN + 125 )
-#define STR_FONT_TABPAGE                ( RC_DIALOG_BEGIN + 126 )
-#define STR_PREVIEW_CHECKBOX            ( RC_DIALOG_BEGIN + 127 )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
deleted file mode 100644
index 27600db38fde..000000000000
--- a/sfx2/source/dialog/dialog.src
+++ /dev/null
@@ -1,83 +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 <sfx2/sfx.hrc>
-#include "dialog.hrc"
-#include "helpid.hrc"
-#include "sfxlocal.hrc"
-
-String STR_RESET
-{
-    Text [ en-US ] = "~Reset" ;
-};
-String STR_TABPAGE_INVALIDNAME
-{
-    Text [ en-US ] = "This name is already in use." ;
-};
-String STR_TABPAGE_INVALIDSTYLE
-{
-    Text [ en-US ] = "This Style does not exist." ;
-};
-String STR_TABPAGE_INVALIDPARENT
-{
-    Text [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ;
-};
-String STR_POOL_STYLE_NAME
-{
-    Text [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
-};
-String STR_DELETE_STYLE_USED
-{
-    Text [ en-US ] = "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n" ;
-};
-String STR_DELETE_STYLE
-{
-    Text [ en-US ] = "Styles in use: " ;
-};
-
-String SID_NAVIGATOR
-{
-    Text [ en-US ] = "Navigator";
-};
-String SID_SIDEBAR
-{
-    Text [ en-US ] = "Sidebar";
-};
-
-String STR_ERROR_WRONG_CONFIRM
-{
-    Text [ en-US ] = "Faulty password confirmation";
-};
-
-String STR_PDF_EXPORT_SEND
-{
-  Text [ en-US ] = "Send" ;
-};
-
-String STR_FONT_TABPAGE
-{
-  Text [ en-US ] = "Font" ;
-};
-
-String STR_PREVIEW_CHECKBOX
-{
-    Text [ en-US ] = "Show Previews";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c749ca3b2137..9602469ad3fa 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -20,7 +20,6 @@
 #include <svl/eitem.hxx>
 #include <svl/urihelper.hxx>
 #include <tools/datetime.hxx>
-#include <tools/resary.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
@@ -29,6 +28,7 @@
 #include <unotools/cmdoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/useroptions.hxx>
+#include <svtools/controldims.hxx>
 #include <svtools/imagemgr.hxx>
 
 #include <memory>
@@ -51,7 +51,6 @@
 
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/securitypage.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/frame.hxx>
@@ -59,6 +58,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include <sfx2/dinfdlg.hxx>
 #include "helper.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
@@ -67,9 +67,8 @@
 #include "documentfontsdialog.hxx"
 #include <sfx2/sfx.hrc>
 #include "dinfdlg.hrc"
-#include "app.hrc"
-#include "sfxlocal.hrc"
-#include <dialog.hrc>
+#include "sfx2/strings.hrc"
+#include "strings.hxx"
 #include "bitmaps.hlst"
 #include <vcl/help.hxx>
 #include <vcl/builderfactory.hxx>
@@ -1408,9 +1407,8 @@ namespace
                                                                     WB_AUTOSIZE|WB_AUTOHSCROLL));
         aNameBox->SetPosSizePixel(aNameBox->LogicToPixel(Point(0, 2), MapUnit::MapAppFont),
                                   aNameBox->LogicToPixel(Size(60, 72), MapUnit::MapAppFont));
-        ResStringArray aStrArr(ResId(SFX_CB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr()));
-        for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i)
-            aNameBox->InsertEntry(aStrArr.GetString(i));
+        for (size_t i = 0; i < SAL_N_ELEMENTS(SFX_CB_PROPERTY_STRINGARRAY); ++i)
+            aNameBox->InsertEntry(SfxResId(SFX_CB_PROPERTY_STRINGARRAY[i]));
         return aNameBox;
     }
 }
@@ -1421,11 +1419,10 @@ CustomPropertiesTypeBox::CustomPropertiesTypeBox(vcl::Window* pParent, CustomPro
 {
     SetPosSizePixel(LogicToPixel(Point(63, 2), MapUnit::MapAppFont),
                     LogicToPixel(Size(60, 80), MapUnit::MapAppFont));
-    ResStringArray aStrArr(ResId(SFX_LB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr()));
-    for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(SFX_LB_PROPERTY_STRINGARRAY); ++i)
     {
-        InsertEntry(aStrArr.GetString(i));
-        SetEntryData(i, reinterpret_cast<void*>(aStrArr.GetValue(i)));
+        InsertEntry(SfxResId(SFX_LB_PROPERTY_STRINGARRAY[i].first));
+        SetEntryData(i, reinterpret_cast<void*>(SFX_LB_PROPERTY_STRINGARRAY[i].second));
     }
     SelectEntryPos(0);
 }
@@ -1453,7 +1450,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) :
     m_aRemoveButton->SetModeImage(Image(BitmapEx(SFX_BMP_PROPERTY_REMOVE)));
     m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY));
 
-    m_aEditButton->SetText(SfxResId(SFX_ST_EDIT));
+    m_aEditButton->SetText(SFX_ST_EDIT);
 }
 
 void CustomPropertyLine::SetRemoved()
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
deleted file mode 100644
index 5d0e85528822..000000000000
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ /dev/null
@@ -1,42 +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_SFX2_SOURCE_DIALOG_DINFDLG_HRC
-#define INCLUDED_SFX2_SOURCE_DIALOG_DINFDLG_HRC
-
-#include <svtools/controldims.hrc>
-
-// const -----------------------------------------------------------------
-
-#define CUSTOM_TYPE_UNKNOWN     0
-#define CUSTOM_TYPE_TEXT        1
-#define CUSTOM_TYPE_NUMBER      2
-#define CUSTOM_TYPE_DATE        3
-#define CUSTOM_TYPE_BOOLEAN     4
-#define CUSTOM_TYPE_DURATION    5
-#define CUSTOM_TYPE_DATETIME    6
-
-#define CMIS_TYPE_STRING      "String"
-#define CMIS_TYPE_INTEGER     "Integer"
-#define CMIS_TYPE_DECIMAL     "Decimal"
-#define CMIS_TYPE_DATETIME    "Datetime"
-#define CMIS_TYPE_BOOL        "Bool"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
deleted file mode 100644
index 15fca113f380..000000000000
--- a/sfx2/source/dialog/dinfdlg.src
+++ /dev/null
@@ -1,101 +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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include "sfxlocal.hrc"
-#include "dinfdlg.hrc"
-#include "dialog.hrc"
-
-String STR_SFX_NEWOFFICEDOC
-{
-    Text [ en-US ] = "%PRODUCTNAME document" ;
-};
-
-StringArray SFX_CB_PROPERTY_STRINGARRAY
-{
-    ItemList [ en-US ] =
-    {
-        < "Checked by"; >;
-        < "Client"; >;
-        < "Date completed"; >;
-        < "Department"; >;
-        < "Destinations"; >;
-        < "Disposition"; >;
-        < "Division"; >;
-        < "Document number"; >;
-        < "Editor"; >;
-        < "E-Mail"; >;
-        < "Forward to"; >;
-        < "Group"; >;
-        < "Info"; >;
-        < "Language"; >;
-        < "Mailstop"; >;
-        < "Matter"; >;
-        < "Office"; >;
-        < "Owner"; >;
-        < "Project"; >;
-        < "Publisher"; >;
-        < "Purpose"; >;
-        < "Received from"; >;
-        < "Recorded by"; >;
-        < "Recorded date"; >;
-        < "Reference"; >;
-        < "Source"; >;
-        < "Status"; >;
-        < "Telephone number"; >;
-        < "Typist"; >;
-        < "URL"; >;
-    };
-};
-
-StringArray SFX_LB_PROPERTY_STRINGARRAY
-{
-    ItemList [ en-US ] =
-    {
-        < "Text"        ; CUSTOM_TYPE_TEXT ; > ;
-        < "DateTime"    ; CUSTOM_TYPE_DATETIME ; > ;
-        < "Date"        ; CUSTOM_TYPE_DATE ; > ;
-        < "Duration"    ; CUSTOM_TYPE_DURATION ; > ;
-        < "Number"      ; CUSTOM_TYPE_NUMBER ; > ;
-        < "Yes or no"   ; CUSTOM_TYPE_BOOLEAN ; > ;
-    };
-};
-
-String SFX_ST_EDIT
-{
-    Text = "...";
-};
-
-String SFX_ST_DURATION_FORMAT
-{
-    Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
-};
-
-String STR_SFX_REMOVE_PROPERTY
-{
-    Text [ en-US ] = "Remove Property" ;
-};
-
-String STR_SFX_QUERY_WRONG_TYPE
-{
-    Text [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 3cd8ef520f64..9c046d23ec4d 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -84,12 +84,12 @@
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "filedlghelper.hrc"
+#include "sfx2/strings.hrc"
 #include "filtergrouping.hxx"
 #include <sfx2/request.hxx>
 #include "filedlgimpl.hxx"
 #include <helpid.hrc>
-#include <sfxlocal.hrc>
+#include <sfx2/strings.hrc>
 #include <rtl/strbuf.hxx>
 #include <comphelper/sequence.hxx>
 
diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src
deleted file mode 100644
index 1e777e20353a..000000000000
--- a/sfx2/source/dialog/filedlghelper.src
+++ /dev/null
@@ -1,65 +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 "sfxlocal.hrc"
-#include "filedlghelper.hrc"
-
-String STR_SFX_FILEDLG_ACTUALVERSION
-{
-    Text [ en-US ] = "Current version";
-};
-
-String STR_SFX_EXPLORERFILE_EXPORT
-{
-    Text [ en-US ] = "Export";
-};
-
-String STR_SFX_EXPLORERFILE_INSERT
-{
-    Text [ en-US ] = "Insert" ;
-};
-
-String STR_SFX_EXPLORERFILE_BUTTONINSERT
-{
-    Text [ en-US ] = "~Insert" ;
-};
-
-String STR_SFX_IMPORT_ALL
-{
-    Text [ en-US ] = "<All formats>" ;
-};
-
-String STR_PB_SAVEACOPY
-{
-    Text [ en-US ] = "Save a Copy" ;
-};
-
-String STR_PB_COMPAREDOC
-{
-    Text [ en-US ] = "Compare to" ;
-};
-
-String STR_PB_MERGEDOC
-{
-    Text [ en-US ] = "Merge with" ;
-};
-
-//******************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 3e11d9d4c1db..7b81b834fb72 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <osl/thread.h>
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index bdf8a34d83d8..873ae8e84509 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -58,7 +58,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
 #include <unotools/tempfile.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 3b7ec61abf87..c463872fef36 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -38,9 +38,9 @@
 #include <sfx2/templdlg.hxx>
 #include "templdgi.hxx"
 #include <sfx2/sfx.hrc>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
-#include <svl/style.hrc>
+#include <svl/style.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 4b508bc97824..3ebca4245826 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/navigat.hxx>
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "helpid.hrc"
@@ -54,7 +55,7 @@ SfxNavigator::SfxNavigator( SfxBindings* pBind ,
                                             nBits )
                         , pWrapper( pChildWin )
 {
-    SetText( SfxResId(SID_NAVIGATOR) );
+    SetText(SfxResId(STR_SID_NAVIGATOR));
 }
 
 void SfxNavigator::Resize()
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index e19d944ed1a2..56dc7efde514 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -22,7 +22,7 @@
 #include <svl/style.hxx>
 
 #include <sfx2/newstyle.hxx>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include <vcl/layout.hxx>
 
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
deleted file mode 100644
index 6046ecab329a..000000000000
--- a/sfx2/source/dialog/newstyle.src
+++ /dev/null
@@ -1,28 +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 <sfx2/sfx.hrc>
-#include "dialog.hrc"
-
-String STR_QUERY_OVERWRITE
-{
-    Text [ en-US ] = "Style already exists. Overwrite?" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 0c030ee63f2b..62ff5cb3172f 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -25,7 +25,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/sfxresid.hxx>
 
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
 
 IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void )
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 949b6e2679ea..f73a1949414d 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -21,7 +21,7 @@
 #include <vcl/msgbox.hxx>
 
 #include "recfloat.hxx"
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
deleted file mode 100644
index 96064e623a6b..000000000000
--- a/sfx2/source/dialog/recfloat.src
+++ /dev/null
@@ -1,33 +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 "helpid.hrc"
-#include "dialog.hrc"
-
-String STR_MACRO_LOSS
-{
-    Text [ en-US ] = "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.";
-};
-
-String STR_CANCEL_RECORDING
-{
-    Text [ en-US ] = "Cancel Recording";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index a6c00be522fd..160c6d462c9c 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -38,7 +38,7 @@
 #include <svl/intitem.hxx>
 #include <svl/PasswordHelper.hxx>
 
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 829d3cc8e8c0..0f449f1d9b8c 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -33,7 +33,7 @@
 #include "workwin.hxx"
 #include <sfx2/dockwin.hxx>
 #include <sfx2/app.hxx>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index df326ed7cc69..95beb5059c3b 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxuno.hxx>
 
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include <tools/debug.hxx>
 #include <unotools/viewoptions.hxx>
 
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index a8b71e7408b3..907b4ead60ef 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -18,20 +18,15 @@
  */
 
 #include <sfx2/styfitem.hxx>
-#include <tools/rcid.h>
+#include <tools/resmgr.hxx>
 
-SfxStyleFamilyItem::SfxStyleFamilyItem(SfxStyleFamily nFamily_, const OUString &rName, const Image& rImage, const ResId &rStringArrayId)
+SfxStyleFamilyItem::SfxStyleFamilyItem(SfxStyleFamily nFamily_, const OUString &rName, const Image& rImage, const std::pair<const char*, int>* pStringArray, const std::locale& rResLocale)
     : nFamily(nFamily_)
     , aText(rName)
     , aImage(rImage)
 {
-    ResStringArray aResList(rStringArrayId);
-    aFilterList.resize(aResList.Count());
-    for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
-    {
-        aFilterList[i].aName = aResList.GetString(i);
-        aFilterList[i].nFlags = aResList.GetValue(i);
-    }
+    for (const std::pair<const char*, int>* pItem = pStringArray; pItem->first; ++pItem)
+        aFilterList.push_back(SfxFilterTupel(Translate::get(pItem->first, rResLocale), pItem->second));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 3e174e3eccd5..00acce620dd6 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxuno.hxx>
 
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
 // class SfxStyleDialog --------------------------------------------------
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index ae36f224a6a6..f9de799edc6b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -39,7 +39,7 @@
 
 #include "uitest/sfx_uiobject.hxx"
 
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include "helpid.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/dialog/taskpane.src b/sfx2/source/dialog/taskpane.src
deleted file mode 100644
index 9930274bc208..000000000000
--- a/sfx2/source/dialog/taskpane.src
+++ /dev/null
@@ -1,33 +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 <sfx2/sfx.hrc>
-#include "sfxlocal.hrc"
-
-String STR_SFX_DOCK
-{
-    Text [ en-US ] = "Dock";
-};
-
-String STR_SFX_UNDOCK
-{
-    Text [ en-US ] = "Undock";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4013c0283e39..ba9985aefa29 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -51,7 +51,7 @@
 #include <sfx2/sfxresid.hxx>
 
 #include <sfx2/sfx.hrc>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include "arrdecl.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index e8496186bb19..3a12553aa8a3 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -21,7 +21,7 @@
 #include <sfx2/titledockwin.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
 #include "bitmaps.hlst"
 #include <sfx2/sfxresid.hxx>
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 97e7623307f3..e016d111a18b 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -27,7 +27,7 @@
 #include "templdgi.hxx"
 
 #include <sfx2/sfx.hrc>
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 
 // Constructor
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 66e5e31d8a6d..17e61ffe3fca 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -35,7 +35,7 @@
 #include <svtools/miscopt.hxx>
 
 #include "versdlg.hxx"
-#include "dialog.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src
deleted file mode 100644
index 00171456fdde..000000000000
--- a/sfx2/source/dialog/versdlg.src
+++ /dev/null
@@ -1,32 +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 "dialog.hrc"
-
-String STR_VIEWVERSIONCOMMENT
-{
-    Text [ en-US ] = "View Version Comment" ;
-};
-
-String STR_NO_NAME_SET
-{
-    Text [ en-US ] = "(no name set)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
deleted file mode 100644
index 8d26bba9de82..000000000000
--- a/sfx2/source/doc/doc.src
+++ /dev/null
@@ -1,272 +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 <sfx2/sfx.hrc>
-#include "doc.hrc"
-
-String STR_TEMPLATE_FILTER
-{
-    Text [ en-US ] = "Templates" ;
-};
-String STR_SAVEDOC
-{
-    Text [ en-US ] = "~Save" ;
-};
-String STR_SAVEASDOC
-{
-    Text [ en-US ] = "Save ~As..." ;
-};
-String STR_SAVEACOPY
-{
-    Text [ en-US ] = "Save a Copy..." ;
-};
-String STR_CLOSEDOC
-{
-    Text [ en-US ] = "~Close" ;
-};
-String STR_OPEN
-{
-    Text [ en-US ] = "Open" ;
-};
-String STR_EDIT_TEMPLATE
-{
-    Text [ en-US ] = "Edit" ;
-};
-String STR_DEFAULT_TEMPLATE
-{
-    Text [ en-US ] = "Set As Default" ;
-};
-String STR_RESET_DEFAULT
-{
-    Text [ en-US ] = "Reset Default" ;
-};
-String STR_DELETE
-{
-    Text [ en-US ] = "Delete" ;
-};
-String STR_RENAME
-{
-    Text [ en-US ] = "Rename" ;
-};
-String STR_CATEGORY_RENAME
-{
-    Text [ en-US ] = "Rename Category" ;
-};
-String STR_RENAME_TEMPLATE
-{
-    Text [ en-US ] = "Enter New Name: " ;
-};
-String STR_TEMPLATE_TOOLTIP
-{
-    Text [ en-US ] = "Title: $1\nCategory: $2" ;
-};
-String STR_TEMPLATE_SELECTION
-{
-    Text [ en-US ] = "Select a Template" ;
-};
-String STR_AUTOMATICVERSION
-{
-    Text [ en-US ] = "Automatically saved version" ;
-};
-
-String STR_EXPORTBUTTON
-{
-    Text [ en-US ] = "Export" ;
-};
-
-String STR_LABEL_FILEFORMAT
-{
-    Text [ en-US ] = "File format:" ;
-};
-
-String STR_HIDDENINFO_CONTAINS
-{
-    Text [ en-US ] = "This document contains:\n\n" ;
-};
-String STR_HIDDENINFO_RECORDCHANGES
-{
-    Text [ en-US ] = "Recorded changes" ;
-};
-String STR_HIDDENINFO_NOTES
-{
-    Text [ en-US ] = "Notes" ;
-};
-String STR_HIDDENINFO_DOCVERSIONS
-{
-    Text [ en-US ] = "Document versions" ;
-};
-String STR_HIDDENINFO_CONTINUE_SAVING
-{
-    Text [ en-US ] = "Do you want to continue saving the document?" ;
-};
-String STR_HIDDENINFO_CONTINUE_PRINTING
-{
-    Text [ en-US ] = "Do you want to continue printing the document?" ;
-};
-String STR_HIDDENINFO_CONTINUE_SIGNING
-{
-    Text [ en-US ] = "Do you want to continue signing the document?" ;
-};
-String STR_HIDDENINFO_CONTINUE_CREATEPDF
-{
-    Text [ en-US ] = "Do you want to continue creating a PDF file?" ;
-};
-
-String STR_NEW_FILENAME_SAVE
-{
-    Text [ en-US ] = "If you do not want to overwrite the original document, you should save your work under a new filename." ;
-};
-
-String STR_SHARED
-{
-    Text [ en-US ] = " (shared)";
-    Text [ x-comment ] = "Used in the title of a shared document.";
-};
-
-String STR_XMLSEC_ODF12_EXPECTED
-{
-    Text [ en-US ] = "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x).";
-};
-
-String STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN
-{
-    Text [ en-US ] = "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?";
-};
-
-String STR_QRYTEMPL_MESSAGE
-{
-    Text [ en-US ] = "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?";
-};
-
-String STR_QRYTEMPL_UPDATE_BTN
-{
-    Text [ en-US ] = "~Update Styles";
-};
-
-String STR_QRYTEMPL_KEEP_BTN
-{
-    Text [ en-US ] = "~Keep Old Styles";
-};
-
-String STR_ACTION_REFRESH
-{
-    Text [ en-US ] = "Refresh";
-};
-
-String STR_ACTION_DEFAULT
-{
-    Text [ x-comment ] = "leave ending space";
-    Text [ en-US ] = "Reset Default Template ";
-};
-
-String STR_CATEGORY_NEW
-{
-    Text [ en-US ] = "New Category";
-};
-
-String STR_CATEGORY_DELETE
-{
-    Text [ en-US ] = "Delete Category";
-};
-
-String STR_CATEGORY_SELECT
-{
-    Text [ en-US ] = "Select Category";
-};
-
-String STR_MSG_EXPORT_SUCCESS
-{
-    Text [ en-US ] = "$1 templates successfully exported." ;
-};
-
-String STR_MSG_QUERY_COPY
-{
-    Text [ en-US ] = "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?";
-};
-
-String STR_CREATE_ERROR
-{
-    Text [ en-US ] = "Cannot create category: $1";
-};
-
-String STR_ERROR_SAVEAS
-{
-    Text [ en-US ] = "Cannot save template: $1";
-};
-
-String STR_INPUT_NEW
-{
-    Text [ en-US ] = "Enter category name:";
-};
-
-String STR_MSG_ERROR_LOCAL_MOVE
-{
-    Text [ en-US ] = "Error moving the following templates to $1.\n$2" ;
-};
-
-String STR_MSG_ERROR_EXPORT
-{
-    Text [ en-US ] = "Error exporting the following templates:\n$1";
-};
-
-String STR_MSG_ERROR_IMPORT
-{
-    Text [ en-US ] = "Error importing the following templates to $1:\n$2";
-};
-
-String STR_MSG_ERROR_DELETE_TEMPLATE
-{
-    Text [ en-US ] = "The following templates cannot be deleted:\n$1";
-};
-
-String STR_MSG_ERROR_DELETE_FOLDER
-{
-    Text [ en-US ] = "The following folders cannot be deleted:\n$1";
-};
-
-String STR_QMSG_SEL_FOLDER_DELETE
-{
-    Text [ en-US ] = "Do you want to delete the selected folders?";
-};
-
-String STR_QMSG_TEMPLATE_OVERWRITE
-{
-    Text [ en-US ] = "A template named $1 already exist in $2. Do you want to overwrite it?";
-};
-
-String STR_QMSG_SEL_TEMPLATE_DELETE
-{
-    Text [ en-US ] = "Do you want to delete the selected templates?";
-};
-
-String STR_QMSG_ERROR_OPENING_FILE
-{
-    Text [ en-US ] = "An error occurred during opening the file. This may be caused by incorrect file contents.\n";
-};
-
-String STR_QMSG_ERROR_OPENING_FILE_DETAILS
-{
-    Text [ en-US ] = "The error details are:\n";
-};
-
-String STR_QMSG_ERROR_OPENING_FILE_CONTINUE
-{
-    Text [ en-US ] = "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 3fcbcdc4a77d..ac67301c11eb 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -45,7 +45,7 @@
 #include "syspath.hxx"
 #include <osl/file.hxx>
 #include <osl/security.hxx>
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 
 #include <rtl/strbuf.hxx>
 #include <tools/globname.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a99b4762f458..b371e2e67cab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -116,7 +116,8 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
-#include "doc.hrc"
+#include <sfx2/sfxsids.hrc>
+#include "sfx2/strings.hrc"
 #include "openflag.hxx"
 #include <sfx2/sfxresid.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 5a844d5591f4..5a29eff8f3cf 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -27,7 +27,6 @@
 #include <vcl/settings.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/resary.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
@@ -63,6 +62,7 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 
+#include "doctemplateslocal.hxx"
 #include "sfxurlrelocator.hxx"
 
 using namespace ::com::sun::star;
@@ -85,8 +85,7 @@ using namespace ::ucbhelper;
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
-#include <sfx2/templatelocnames.hrc>
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include "strings.hxx"
 #include <sfx2/fcontnr.hxx>
 #include <svtools/templatefoldercache.hxx>
@@ -104,7 +103,6 @@ using ::std::advance;
 
 #define COMMAND_TRANSFER        "transfer"
 
-
 class RegionData_Impl;
 
 namespace DocTempl {
@@ -490,10 +488,26 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString)
         STR_TEMPLATE_NAME10_DEF
     };
 
-    for (int i = 0; i < NUM_TEMPLATE_NAMES; ++i)
+    const char* STR_TEMPLATE_NAME[] =
+    {
+        STR_TEMPLATE_NAME1,
+        STR_TEMPLATE_NAME2,
+        STR_TEMPLATE_NAME3,
+        STR_TEMPLATE_NAME4,
+        STR_TEMPLATE_NAME5,
+        STR_TEMPLATE_NAME6,
+        STR_TEMPLATE_NAME7,
+        STR_TEMPLATE_NAME8,
+        STR_TEMPLATE_NAME9,
+        STR_TEMPLATE_NAME10,
+    };
+
+    assert(SAL_N_ELEMENTS(aTemplateNames) == SAL_N_ELEMENTS(STR_TEMPLATE_NAME));
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(STR_TEMPLATE_NAME); ++i)
     {
         if (rString == aTemplateNames[i])
-            return SfxResId(STR_TEMPLATE_NAME1 + i);
+            return SfxResId(STR_TEMPLATE_NAME[i]);
     }
     return rString;
 }
@@ -1601,11 +1615,7 @@ bool SfxDocTemplate_Impl::Construct( )
     mbConstructed = true;
     maRootURL = aRootContent->getIdentifier()->getContentIdentifier();
 
-    ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr()));
-
-    if ( aLongNames.Count() )
-        maStandardGroup = aLongNames.GetString( 0 );
-
+    maStandardGroup = DocTemplLocaleHelper::GetStandardGroupString();
     Content aTemplRoot( aRootContent, aCmdEnv, xContext );
     CreateFromHierarchy( aTemplRoot );
 
diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src
deleted file mode 100644
index c9bea1e3c468..000000000000
--- a/sfx2/source/doc/doctempl.src
+++ /dev/null
@@ -1,68 +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 <sfx2/sfx.hrc>
-
-#include "doc.hrc"
-
-StringArray TEMPLATE_SHORT_NAMES_ARY
-{
-    ItemList =
-    {
-        < "standard" ; > ;
-        < "officorr" ; > ;
-        < "offimisc" ; > ;
-        < "personal" ; > ;
-        < "forms" ; > ;
-        < "finance" ; > ;
-        < "educate" ; > ;
-        < "layout" ; > ;
-        < "presnt" ; > ;
-        < "misc" ; > ;
-        < "labels" ; > ;
-        < "styles" ; > ;
-    };
-};
-
-StringArray TEMPLATE_LONG_NAMES_ARY
-{
-    ItemList [ en-US ] =
-    {
-        < "My Templates" ; > ;
-        < "Business Correspondence" ; > ;
-        < "Other Business Documents" ; > ;
-        < "Personal Correspondence and Documents" ; > ;
-        < "Forms and Contracts" ; > ;
-        < "Finances" ; > ;
-        < "Education" ; > ;
-        < "Presentation Backgrounds" ; > ;
-        < "Presentations" ; > ;
-        < "Miscellaneous" ; > ;
-        < "Labels" ; > ;
-        < "Styles" ; > ;
-    };
-
-    };
-
-String RID_CNT_STR_WAITING
-{
-    Text [ en-US ] = "The templates are being initialized for first-time usage." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 919fc06936d3..699707d8ab2b 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -22,7 +22,6 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <unotools/pathoptions.hxx>
@@ -81,7 +80,8 @@
 #include "doctemplateslocal.hxx"
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
+#include "doctempl.hrc"
 
 #include <memory>
 #include <vector>
@@ -483,21 +483,33 @@ void SfxDocTplService_Impl::getDefaultLocale()
     }
 }
 
+const char* TEMPLATE_SHORT_NAMES_ARY[] =
+{
+    "standard",
+    "officorr",
+    "offimisc",
+    "personal",
+    "forms",
+    "finance",
+    "educate",
+    "layout",
+    "presnt",
+    "misc",
+    "labels",
+    "styles"
+};
 
 void SfxDocTplService_Impl::readFolderList()
 {
     SolarMutexGuard aGuard;
 
-    ResStringArray aShortNames(ResId(TEMPLATE_SHORT_NAMES_ARY, *SfxResMgr::GetResMgr()));
-    ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr()));
-
-    sal_uInt16 nCount = (sal_uInt16)( std::min( aShortNames.Count(), aLongNames.Count() ) );
+    size_t nCount = std::min(SAL_N_ELEMENTS(TEMPLATE_SHORT_NAMES_ARY), SAL_N_ELEMENTS(TEMPLATE_LONG_NAMES_ARY));
 
-    for ( sal_uInt16 i=0; i<nCount; i++ )
+    for (size_t i = 0; i < nCount; ++i)
     {
         NamePair_Impl* pPair = new NamePair_Impl;
-        pPair->maShortName  = aShortNames.GetString( i );
-        pPair->maLongName   = aLongNames.GetString( i );
+        pPair->maShortName  = OUString::createFromAscii(TEMPLATE_SHORT_NAMES_ARY[i]);
+        pPair->maLongName   = SfxResId(TEMPLATE_LONG_NAMES_ARY[i]);
 
         maNames.push_back( pPair );
     }
@@ -2795,4 +2807,9 @@ com_sun_star_comp_sfx2_DocumentTemplates_get_implementation(
     return cppu::acquire(new SfxDocTplService(context));
 }
 
+OUString DocTemplLocaleHelper::GetStandardGroupString()
+{
+    return SfxResId(TEMPLATE_LONG_NAMES_ARY[0]);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 3284df1f299e..7e35e8625466 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -58,6 +58,8 @@ public:
         const std::vector< css::beans::StringPair >& aSequence,
         const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
+    static OUString GetStandardGroupString();
+
     // XDocumentHandler
     virtual void SAL_CALL startDocument() override;
     virtual void SAL_CALL endDocument() override;
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 407a035f15ba..b1f7a675faa0 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -51,7 +51,7 @@
 
 #include <sfx2/sfxresid.hxx>
 #include "graphhelp.hxx"
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include "bitmaps.hlst"
 
 #include <memory>
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index e27863804976..ced0f774bce8 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -69,13 +69,12 @@
 #include <toolkit/awt/vclxwindow.hxx>
 
 #include <sfx2/sfxsids.hrc>
-#include <doc.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/request.hxx>
 #include <sfxtypes.hxx>
 #include "alienwarn.hxx"
@@ -86,7 +85,7 @@
 #include <rtl/ref.hxx>
 #include <framework/interaction.hxx>
 #include <svtools/sfxecode.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 
 #include <memory>
 
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index d6eab23ca041..a29fcbae3137 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -31,7 +31,8 @@
 #include <svtools/ehdl.hxx>
 #include <tools/urlobj.hxx>
 
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
+#include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index ff4534e11159..ef8425a224fd 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -51,9 +51,9 @@
 #include <vcl/settings.hxx>
 
 #include <sfx2/app.hxx>
+#include <sfx2/dinfdlg.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "appdata.hxx"
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/viewsh.hxx>
@@ -64,10 +64,10 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
 #include <basic/basmgr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/doctempl.hxx>
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxbasemodel.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6c2ba01954b0..581ab76a44ec 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -102,10 +102,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/docfac.hxx>
 #include "helper.hxx"
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include "workwin.hxx"
 #include "helpid.hrc"
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxdlg.hxx>
 #include "appbaslib.hxx"
 #include <openflag.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 856a22abf32e..929008cd1136 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -69,10 +69,10 @@
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/viewsh.hxx>
+#include <sfx2/dinfdlg.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include "objshimp.hxx"
@@ -80,7 +80,7 @@
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "versdlg.hxx"
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/sfxhelp.hxx>
@@ -89,7 +89,7 @@
 #include <sfx2/checkin.hxx>
 #include <sfx2/infobar.hxx>
 
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 1f05b72bde83..6e5c03265503 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -113,7 +113,7 @@
 #include "appopen.hxx"
 #include "objshimp.hxx"
 #include "sfxtypes.hxx"
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
@@ -127,8 +127,6 @@
 #include "appdata.hxx"
 #include <objstor.hxx>
 
-#include "app.hrc"
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -2861,32 +2859,32 @@ HiddenInformation SfxObjectShell::GetHiddenInformationState( HiddenInformation n
 sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent )
 {
     sal_Int16 nRet = RET_YES;
-    sal_uInt16 nResId = sal_uInt16();
+    const char* pResId = nullptr;
     SvtSecurityOptions::EOption eOption = SvtSecurityOptions::EOption();
 
     switch ( eFact )
     {
         case HiddenWarningFact::WhenSaving :
         {
-            nResId = STR_HIDDENINFO_CONTINUE_SAVING;
+            pResId = STR_HIDDENINFO_CONTINUE_SAVING;
             eOption = SvtSecurityOptions::EOption::DocWarnSaveOrSend;
             break;
         }
         case HiddenWarningFact::WhenPrinting :
         {
-            nResId = STR_HIDDENINFO_CONTINUE_PRINTING;
+            pResId = STR_HIDDENINFO_CONTINUE_PRINTING;
             eOption = SvtSecurityOptions::EOption::DocWarnPrint;
             break;
         }
         case HiddenWarningFact::WhenSigning :
         {
-            nResId = STR_HIDDENINFO_CONTINUE_SIGNING;
+            pResId = STR_HIDDENINFO_CONTINUE_SIGNING;
             eOption = SvtSecurityOptions::EOption::DocWarnSigning;
             break;
         }
         case HiddenWarningFact::WhenCreatingPDF :
         {
-            nResId = STR_HIDDENINFO_CONTINUE_CREATEPDF;
+            pResId = STR_HIDDENINFO_CONTINUE_CREATEPDF;
             eOption = SvtSecurityOptions::EOption::DocWarnCreatePdf;
             break;
         }
@@ -2925,7 +2923,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::
         if ( bWarning )
         {
             sMessage += "\n";
-            sMessage += SfxResId(nResId);
+            sMessage += SfxResId(pResId);
             ScopedVclPtrInstance< WarningBox > aWBox(pParent, WB_YES_NO | WB_DEF_NO, sMessage);
             nRet = aWBox->Execute();
         }
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 771db32575cb..6e3617421b07 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -84,12 +84,12 @@
 #include "sfxtypes.hxx"
 #include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
-#include "doc.hrc"
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
+#include "sfx2/strings.hrc"
 #include "appdata.hxx"
 #include <sfx2/sfxsids.hrc>
 #include <basic/basmgr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <sfx2/QuerySaveDocument.hxx>
 #include "helpid.hrc"
 #include <sfx2/msg.hxx>
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index d4fce41f8a5c..7315e98f9344 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -20,7 +20,7 @@
 
 #include "querytemplate.hxx"
 #include <sfx2/sfxresid.hxx>
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include "helpid.hrc"
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index cd4b0ada4c0a..74883875e7a8 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/DocumentTemplates.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 87fb58704ff1..eb07fd640874 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -100,10 +100,11 @@
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
 #include <basic/basmgr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <sfx2/event.hxx>
 #include <eventsupplier.hxx>
 #include <sfx2/evntconf.hxx>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d4a42faf1dd9..a2e61fd29ad6 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -56,7 +56,7 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-#include "doc.hrc"
+#include "sfx2/strings.hrc"
 #include "bitmaps.hlst"
 
 const char TM_SETTING_MANAGER[] = "TemplateManager";
diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src
deleted file mode 100644
index 06c1ec53b76a..000000000000
--- a/sfx2/source/doc/templatelocnames.src
+++ /dev/null
@@ -1,62 +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 <sfx2/templatelocnames.hrc>
-
-String STR_TEMPLATE_NAME1
-{
-    Text [ en-US ] = "Abstract Green" ;
-};
-
-String STR_TEMPLATE_NAME2
-{
-    Text [ en-US ] = "Abstract Red" ;
-};
-
-String STR_TEMPLATE_NAME3
-{
-    Text [ en-US ] = "Abstract Yellow" ;
-};
-
-String STR_TEMPLATE_NAME4
-{
-    Text [ en-US ] = "Bright Blue" ;
-};
-
-String STR_TEMPLATE_NAME5
-{
-    Text [ en-US ] = "DNA" ;
-};
-
-String STR_TEMPLATE_NAME6
-{
-    Text [ en-US ] = "Inspiration" ;
-};
-
-String STR_TEMPLATE_NAME7
-{
-    Text [ en-US ] = "Lush Green" ;
-};
-
-String STR_TEMPLATE_NAME8
-{
-    Text [ en-US ] = "Metropolis" ;
-};
-
-String STR_TEMPLATE_NAME9
-{
-    Text [ en-US ] = "Sunset" ;
-};
-
-String STR_TEMPLATE_NAME10
-{
-    Text [ en-US ] = "Vintage" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index d8ae9b33078f..406888d2ba3e 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -48,7 +48,6 @@ class SfxFrame;
 class SfxFrameArr_Impl;
 class SvtSaveOptions;
 class SvtHelpOptions;
-class ResMgr;
 class SfxViewFrame;
 class SfxSlotPool;
 class SfxDispatcher;
@@ -84,9 +83,9 @@ public:
     // application members
     SfxFilterMatcher*                   pMatcher;
 #if HAVE_FEATURE_SCRIPTING
-    ResMgr*                             pBasicResMgr;
+    std::locale                         aBasicResLocale;
 #endif
-    ResMgr*                             pSvtResMgr;
+    std::locale                         aSvtResLocale;
     SfxErrorHandler *m_pToolsErrorHdl;
     SfxErrorHandler *m_pSoErrorHdl;
 #if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
deleted file mode 100644
index bc7ff0fc20c7..000000000000
--- a/sfx2/source/inc/sfxlocal.hrc
+++ /dev/null
@@ -1,44 +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 .
- */
-
-// local resources
-
-#ifndef INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC
-#define INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC
-
-#include <sfx2/sfx.hrc>
-
-// Strings ---------------------------------------------------------------
-#define STR_SFX_NEWOFFICEDOC                (RID_SFX_SFXLOCAL_START +  0)
-#define STR_SFX_REMOVE_PROPERTY             (RID_SFX_SFXLOCAL_START +  1)
-#define STR_SFX_FILEDLG_ACTUALVERSION       (RID_SFX_SFXLOCAL_START +  2)
-#define STR_SFX_EXPLORERFILE_INSERT         (RID_SFX_SFXLOCAL_START +  3)
-#define STR_SFX_EXPLORERFILE_BUTTONINSERT   (RID_SFX_SFXLOCAL_START +  4)
-#define STR_SFX_IMPORT_ALL                  (RID_SFX_SFXLOCAL_START +  5)
-#define STR_SFX_EXPLORERFILE_EXPORT         (RID_SFX_SFXLOCAL_START +  6)
-#define STR_SFX_DOCK                        (RID_SFX_SFXLOCAL_START +  7)
-#define STR_SFX_UNDOCK                      (RID_SFX_SFXLOCAL_START +  8)
-#define SFX_ST_DURATION_FORMAT              (RID_SFX_SFXLOCAL_START +  9)
-#define STR_SFX_QUERY_WRONG_TYPE            (RID_SFX_SFXLOCAL_START + 11)
-#define SFX_LB_PROPERTY_STRINGARRAY         (RID_SFX_SFXLOCAL_START + 12)
-#define SFX_CB_PROPERTY_STRINGARRAY         (RID_SFX_SFXLOCAL_START + 13)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 4d56a5625887..99e5af0b6f87 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -22,8 +22,6 @@
 #include <sal/config.h>
 
 #include <sal/log.hxx>
-#include <tools/rcid.h>
-#include <tools/resid.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 90c0e6ba82ea..15e111d5d6db 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -32,7 +32,7 @@ class SfxTemplateControllerItem;
 #include <svtools/treelistbox.hxx>
 #include <svl/eitem.hxx>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/styfitem.hxx>
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 807b353b0d16..68f11cc6d407 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/sfxresid.hxx>
 
 #include <sfx2/sfxsids.hrc>
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/frame.hxx>
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 559139906824..d878b0f1bf35 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -20,8 +20,7 @@
 #include <sfx2/sidebar/DeckTitleBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sfxresid.hxx>
-
-#include "Sidebar.hrc"
+#include <sfx2/strings.hrc>
 
 #include <vcl/image.hxx>
 
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5d449e03e496..730c7617d107 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -19,9 +19,7 @@
 
 #include <sfx2/sidebar/PanelTitleBar.hxx>
 #include <sfx2/sfxresid.hxx>
-
-#include "Sidebar.hrc"
-
+#include <sfx2/strings.hrc>
 #include <sfx2/sidebar/Paint.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
deleted file mode 100644
index e5fe67967615..000000000000
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ /dev/null
@@ -1,28 +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 <sfx2/sfx.hrc>
-
-#define SFX_STR_SIDEBAR_MORE_OPTIONS            (RID_SFX_SIDEBAR_START + 1)
-#define SFX_STR_SIDEBAR_CLOSE_DECK              (RID_SFX_SIDEBAR_START + 2)
-#define SFX_STR_SIDEBAR_SETTINGS                (RID_SFX_SIDEBAR_START + 3)
-#define SFX_STR_SIDEBAR_CUSTOMIZATION           (RID_SFX_SIDEBAR_START + 4)
-#define SFX_STR_SIDEBAR_RESTORE                 (RID_SFX_SIDEBAR_START + 5)
-#define SFX_STR_SIDEBAR_HIDE_SIDEBAR            (RID_SFX_SIDEBAR_START + 6)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
deleted file mode 100644
index 6af475e25e66..000000000000
--- a/sfx2/source/sidebar/Sidebar.src
+++ /dev/null
@@ -1,51 +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 "Sidebar.hrc"
-
-String SFX_STR_SIDEBAR_MORE_OPTIONS
-{
-    Text [en-US] = "More Options";
-};
-
-String SFX_STR_SIDEBAR_CLOSE_DECK
-{
-    Text [en-US] = "Close Sidebar Deck";
-};
-
-String SFX_STR_SIDEBAR_SETTINGS
-{
-    Text [en-US] = "Sidebar Settings";
-};
-
-String SFX_STR_SIDEBAR_CUSTOMIZATION
-{
-    Text [en-US] = "Customization";
-};
-
-String SFX_STR_SIDEBAR_RESTORE
-{
-    Text [en-US] = "Restore Default";
-};
-
-String SFX_STR_SIDEBAR_HIDE_SIDEBAR
-{
-    Text [en-US] = "Close Sidebar";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index ed2004473bf0..a2b01d2635c3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -33,8 +33,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/titledockwin.hxx>
-#include "sfxlocal.hrc"
-#include "Sidebar.hrc"
+#include "sfx2/strings.hrc"
 #include <framework/ContextChangeEventMultiplexerTunnel.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 024ce6b17397..944485fbc4bf 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -26,9 +26,9 @@
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
+#include <sfx2/strings.hrc>
 
 #include <sfx2/sfxresid.hxx>
-#include "Sidebar.hrc"
 
 #include <vcl/gradient.hxx>
 #include <vcl/image.hxx>
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index 0c736331e030..55ba2249327d 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 907c08d13f68..41759086a5f6 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -29,6 +29,7 @@
 #include <unotools/streamwrap.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <sfx2/sfx.hrc>
+#include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/datetime.hxx>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 9c4f43a25477..fe4ae015f496 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -819,7 +819,7 @@ sal_Int64 SfxInPlaceClient::GetAspect() const
 
 ErrCode SfxInPlaceClient::DoVerb( long nVerb )
 {
-    SfxErrorContext aEc( ERRCTX_SO_DOVERB, m_pViewSh->GetWindow(), RID_SO_ERRCTX );
+    SfxErrorContext aEc(ERRCTX_SO_DOVERB, m_pViewSh->GetWindow(), getRID_SO_ERRCTX());
     ErrCode nError = ERRCODE_NONE;
 
     if ( m_xImp->m_xObject.is() )
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 5b9bf2212525..8a677637d10a 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -33,7 +33,6 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/sfxresid.hxx>
-#include "view.hrc"
 
 // struct SfxPrinter_Impl ------------------------------------------------
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 7910618d6409..53a677c71836 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -76,6 +76,7 @@
 
 #include <sfx2/event.hxx>
 #include <sfx2/viewfac.hxx>
+#include <sfx2/strings.hrc>
 #include "sfxbasecontroller_internal.hxx"
 
 #include <unordered_map>
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
deleted file mode 100644
index 7980bfb75e56..000000000000
--- a/sfx2/source/view/view.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 INCLUDED_SFX2_SOURCE_VIEW_VIEW_HRC
-#define INCLUDED_SFX2_SOURCE_VIEW_VIEW_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define STR_NODEFPRINTER                    (RID_SFX_VIEW_START+ 0)
-#define STR_ERROR_PRINTER_BUSY              (RID_SFX_VIEW_START+ 1)
-#define STR_NOSTARTPRINTER                  (RID_SFX_VIEW_START+ 2)
-
-#define STR_PAGE                            (RID_SFX_VIEW_START+20)
-#define STR_PRINT_NEWORI                    (RID_SFX_VIEW_START+22)
-#define STR_PRINT_NEWSIZE                   (RID_SFX_VIEW_START+23)
-#define STR_PRINT_NEWORISIZE                (RID_SFX_VIEW_START+24)
-
-#define STR_ERROR_SEND_MAIL                 (RID_SFX_VIEW_START+31)
-
-#define STR_QUERY_OPENASTEMPLATE            (RID_SFX_VIEW_START+41)
-#define STR_CANT_CLOSE                      (RID_SFX_VIEW_START+42)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
deleted file mode 100644
index 94f8a5ecbd1f..000000000000
--- a/sfx2/source/view/view.src
+++ /dev/null
@@ -1,165 +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 "view.hrc"
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include "sfxlocal.hrc"
-
-String STR_NODEFPRINTER
-{
-    Text [ en-US ] = "No default printer found.\nPlease choose a printer and try again." ;
-};
-String STR_NOSTARTPRINTER
-{
-    Text [ en-US ] = "Could not start printer.\nPlease check your printer configuration." ;
-};
-String STR_ERROR_PRINTER_BUSY
-{
-    Text [ en-US ] = "Printer busy" ;
-};
-String STR_PAGE
-{
-    Text [ en-US ] = "Page " ;
-};
-String STR_READONLY
-{
-    Text [ en-US ] = " (read-only)" ;
-};
-String STR_PRINT_NEWORI
-{
-    Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ;
-};
-String STR_PRINT_NEWSIZE
-{
-    Text [ en-US ] = "The page size has been modified.\nShould the new settings be saved\nin the active document?" ;
-};
-String STR_PRINT_NEWORISIZE
-{
-    Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ;
-};
-
-String STR_CANT_CLOSE
-{
-    Text [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ;
-};
-
-String STR_ERROR_SEND_MAIL
-{
-    Text [ en-US ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ;
-};
-
-String STR_QUERY_OPENASTEMPLATE
-{
-    Text [ en-US ] = "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?" ;
-};
-String STR_REPAIREDDOCUMENT
-{
-    Text [ en-US ] = " (repaired document)" ;
-};
-
-String STR_NONCHECKEDOUT_DOCUMENT
-{
-    Text [ en-US ] = "This document is not checked out on the server." ;
-};
-String STR_READONLY_DOCUMENT
-{
-    Text [ en-US ] = "This document is open in read-only mode." ;
-};
-String STR_READONLY_PDF
-{
-    Text [ en-US ] = "This PDF is open in read-only mode to allow signing the existing file." ;
-};
-
-String STR_CLASSIFIED_DOCUMENT
-{
-    Text [ en-US ] = "The classification label of this document is %1." ;
-};
-
-String STR_TARGET_DOC_NOT_CLASSIFIED
-{
-    Text [ en-US ] = "This document must be classified before the clipboard can be pasted." ;
-};
-
-String STR_DOC_CLASSIFICATION_TOO_LOW
-{
-    Text [ en-US ] = "This document has a lower classification level than the clipboard." ;
-};
-
-String STR_CLASSIFIED_INTELLECTUAL_PROPERTY
-{
-    Text [ en-US ] = "Intellectual Property:" ;
-};
-
-String STR_CLASSIFIED_NATIONAL_SECURITY
-{
-    Text [ en-US ] = "National Security:" ;
-};
-
-String STR_CLASSIFIED_EXPORT_CONTROL
-{
-    Text [ en-US ] = "Export Control:" ;
-};
-
-String STR_CHECKOUT
-{
-    Text[ en-US ] = "Check Out";
-};
-
-String STR_READONLY_EDIT
-{
-    Text[ en-US ] = "Edit Document";
-};
-
-String STR_READONLY_SIGN
-{
-    Text[ en-US ] = "Sign Document";
-};
-
-String STR_SIGNATURE_BROKEN
-{
-    Text[ en-US ] = "This document has an invalid signature.";
-};
-
-String STR_SIGNATURE_INVALID
-{
-    Text[ en-US ] = "The signature was valid, but the document has been modified";
-};
-
-String STR_SIGNATURE_NOTVALIDATED
-{
-    Text[ en-US ] = "The signature is OK, but the certificate could not be validated.";
-};
-
-String STR_SIGNATURE_PARTIAL_OK
-{
-    Text[ en-US ] = "The signature is OK, but the document is only partially signed.";
-};
-
-String STR_SIGNATURE_OK
-{
-    Text[ en-US ] = "This document is digitally signed and the signature is valid.";
-};
-
-String STR_SIGNATURE_SHOW
-{
-    Text[ en-US ] = "Show Signatures";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1dbcdf6e52a1..5ddcb71e8765 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -82,7 +82,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/sharecontrolfile.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <framework/framelistanalyzer.hxx>
 #include <shellimpl.hxx>
@@ -125,7 +125,6 @@ using ::com::sun::star::container::XIndexContainer;
 #include "viewimp.hxx"
 #include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/sfx.hrc>
-#include "view.hrc"
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/progress.hxx>
@@ -133,7 +132,7 @@ using ::com::sun::star::container::XIndexContainer;
 #include "workwin.hxx"
 #include "helper.hxx"
 #include <sfx2/minfitem.hxx>
-#include "app.hrc"
+#include "sfx2/strings.hrc"
 #include "impviewframe.hxx"
 
 #define SfxViewFrame
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2a4fca34715c..f50f7b8f3cfc 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -46,10 +46,10 @@
 #include <sfx2/event.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/strings.hrc>
 
 #include <toolkit/awt/vclxdevice.hxx>
 
-#include "view.hrc"
 #include "helpid.hrc"
 
 using namespace com::sun::star;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2fc7afaf330a..7dc86b388164 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -58,7 +58,6 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 #include <sfx2/app.hxx>
-#include "view.hrc"
 #include <sfx2/viewsh.hxx>
 #include "viewimp.hxx"
 #include <sfx2/sfxresid.hxx>
@@ -69,7 +68,7 @@
 #include <sfx2/dispatch.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/docfac.hxx>
-#include "sfxlocal.hrc"
+#include "sfx2/strings.hrc"
 #include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include "bluthsndapi.hxx"
diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui
index d7b49b8d5cbd..d92c8bbbf757 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AlienWarnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Confirm File Format</property>
+    <property name="title" translatable="yes" context="alienwarndialog|AlienWarnDialog">Confirm File Format</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">This document may contain formatting or content that cannot be saved in the currently selected file format “%FORMATNAME”.</property>
-    <property name="secondary_text" translatable="yes">Use the default ODF file format to be sure that the document is saved correctly.</property>
+    <property name="text" translatable="yes" context="alienwarndialog|AlienWarnDialog">This document may contain formatting or content that cannot be saved in the currently selected file format “%FORMATNAME”.</property>
+    <property name="secondary_text" translatable="yes" context="alienwarndialog|AlienWarnDialog">Use the default ODF file format to be sure that the document is saved correctly.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -24,7 +24,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Use %DEFAULTEXTENSION _Format</property>
+                <property name="label" translatable="yes" context="alienwarndialog|cancel">Use %DEFAULTEXTENSION _Format</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -40,7 +40,7 @@
             </child>
             <child>
               <object class="GtkButton" id="save">
-                <property name="label" translatable="yes">_Use %FORMATNAME Format</property>
+                <property name="label" translatable="yes" context="alienwarndialog|save">_Use %FORMATNAME Format</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -65,7 +65,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="ask">
-            <property name="label" translatable="yes">_Ask when not saving in ODF or default format</property>
+            <property name="label" translatable="yes" context="alienwarndialog|ask">_Ask when not saving in ODF or default format</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/bookmarkdialog.ui b/sfx2/uiconfig/ui/bookmarkdialog.ui
index c9ce55395992..9bda16b86859 100644
--- a/sfx2/uiconfig/ui/bookmarkdialog.ui
+++ b/sfx2/uiconfig/ui/bookmarkdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sfx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="BookmarkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add to Bookmarks</property>
+    <property name="title" translatable="yes" context="bookmarkdialog|BookmarkDialog">Add to Bookmarks</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -15,7 +15,7 @@
           <object class="GtkLabel" id="alttitle">
             <property name="can_focus">False</property>
             <property name="no_show_all">True</property>
-            <property name="label" translatable="yes">Rename Bookmark</property>
+            <property name="label" translatable="yes" context="bookmarkdialog|alttitle">Rename Bookmark</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -94,7 +94,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bookmark:</property>
+                <property name="label" translatable="yes" context="bookmarkdialog|label2">Bookmark:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
               </object>
diff --git a/sfx2/uiconfig/ui/bookmarkmenu.ui b/sfx2/uiconfig/ui/bookmarkmenu.ui
index 84e0aa6840d7..9e591a38d9ff 100644
--- a/sfx2/uiconfig/ui/bookmarkmenu.ui
+++ b/sfx2/uiconfig/ui/bookmarkmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="display">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Display</property>
+        <property name="label" translatable="yes" context="bookmarkmenu|display">Display</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="bookmarkmenu|rename">Rename...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes" context="bookmarkmenu|delete">Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sfx2/uiconfig/ui/charmapcontrol.ui b/sfx2/uiconfig/ui/charmapcontrol.ui
index defc9220c92b..06216cfe99eb 100644
--- a/sfx2/uiconfig/ui/charmapcontrol.ui
+++ b/sfx2/uiconfig/ui/charmapcontrol.ui
@@ -20,7 +20,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Recent Characters</property>
+            <property name="label" translatable="yes" context="charmapcontrol|label1">Recent Characters</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -418,7 +418,7 @@
         </child>
         <child>
           <object class="GtkButton" id="specialchardlg">
-            <property name="label" translatable="yes">Launch Dialog</property>
+            <property name="label" translatable="yes" context="charmapcontrol|specialchardlg">Launch Dialog</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui
index e3488e556a2b..812c55b764a6 100644
--- a/sfx2/uiconfig/ui/checkin.ui
+++ b/sfx2/uiconfig/ui/checkin.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CheckinDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Check-In</property>
+    <property name="title" translatable="yes" context="checkin|CheckinDialog">Check-In</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -81,7 +81,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="MajorVersion">
-                <property name="label" translatable="yes">New major version</property>
+                <property name="label" translatable="yes" context="checkin|MajorVersion">New major version</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Version comment:</property>
+                <property name="label" translatable="yes" context="checkin|label2">Version comment:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">VersionComment:border</property>
               </object>
diff --git a/sfx2/uiconfig/ui/cmisinfopage.ui b/sfx2/uiconfig/ui/cmisinfopage.ui
index 6e75f31dd7a5..8da7d50b524e 100644
--- a/sfx2/uiconfig/ui/cmisinfopage.ui
+++ b/sfx2/uiconfig/ui/cmisinfopage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="CmisInfoPage">
     <property name="visible">True</property>
@@ -51,7 +51,7 @@
           <object class="GtkLabel" id="name">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Name</property>
+            <property name="label" translatable="yes" context="cmisinfopage|name">Name</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -63,7 +63,7 @@
           <object class="GtkLabel" id="type">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Type</property>
+            <property name="label" translatable="yes" context="cmisinfopage|type">Type</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -75,7 +75,7 @@
           <object class="GtkLabel" id="value">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Value</property>
+            <property name="label" translatable="yes" context="cmisinfopage|value">Value</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sfx2/uiconfig/ui/cmisline.ui b/sfx2/uiconfig/ui/cmisline.ui
index bfdf7b077a4c..0e3c55d988e9 100644
--- a/sfx2/uiconfig/ui/cmisline.ui
+++ b/sfx2/uiconfig/ui/cmisline.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sfx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="CmisFrame">
     <property name="visible">True</property>
@@ -43,7 +43,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="cmisline|type">Type</property>
                 <property name="width_chars">8</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -58,7 +58,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="yes">
-                <property name="label" translatable="yes">Yes</property>
+                <property name="label" translatable="yes" context="cmisline|yes">Yes</property>
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -79,7 +79,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="no">
-                <property name="label" translatable="yes">No</property>
+                <property name="label" translatable="yes" context="cmisline|no">No</property>
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/custominfopage.ui b/sfx2/uiconfig/ui/custominfopage.ui
index 89455a5e1eb5..500d0ac964f5 100644
--- a/sfx2/uiconfig/ui/custominfopage.ui
+++ b/sfx2/uiconfig/ui/custominfopage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="CustomInfoPage">
     <property name="visible">True</property>
@@ -11,7 +11,7 @@
     <property name="row_spacing">6</property>
     <child>
       <object class="GtkButton" id="add">
-        <property name="label" translatable="yes">Add _Property</property>
+        <property name="label" translatable="yes" context="custominfopage|add">Add _Property</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
@@ -46,7 +46,7 @@
           <object class="GtkLabel" id="name">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Name</property>
+            <property name="label" translatable="yes" context="custominfopage|name">Name</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -58,7 +58,7 @@
           <object class="GtkLabel" id="type">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Type</property>
+            <property name="label" translatable="yes" context="custominfopage|type">Type</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -70,7 +70,7 @@
           <object class="GtkLabel" id="value">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Value</property>
+            <property name="label" translatable="yes" context="custominfopage|value">Value</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui
index b39d4cc361b6..77bb63b8b928 100644
--- a/sfx2/uiconfig/ui/descriptioninfopage.ui
+++ b/sfx2/uiconfig/ui/descriptioninfopage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="DescriptionInfoPage">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Title:</property>
+        <property name="label" translatable="yes" context="descriptioninfopage|label27">_Title:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">title</property>
       </object>
@@ -29,7 +29,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Subject:</property>
+        <property name="label" translatable="yes" context="descriptioninfopage|label28">_Subject:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">subject</property>
       </object>
@@ -43,7 +43,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Keywords:</property>
+        <property name="label" translatable="yes" context="descriptioninfopage|label29">_Keywords:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">keywords</property>
       </object>
@@ -58,7 +58,7 @@
         <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Comments:</property>
+        <property name="label" translatable="yes" context="descriptioninfopage|label30">_Comments:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">comments:border</property>
       </object>
diff --git a/sfx2/uiconfig/ui/documentfontspage.ui b/sfx2/uiconfig/ui/documentfontspage.ui
index 7fab55f639f8..9d79d8ce1d9d 100644
--- a/sfx2/uiconfig/ui/documentfontspage.ui
+++ b/sfx2/uiconfig/ui/documentfontspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="DocumentFontsPage">
     <property name="visible">True</property>
@@ -22,7 +22,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="embedFonts">
-                <property name="label" translatable="yes">_Embed fonts in the document</property>
+                <property name="label" translatable="yes" context="documentfontspage|embedFonts">_Embed fonts in the document</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -37,7 +37,7 @@
           <object class="GtkLabel" id="fontEmbeddingLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Font Embedding</property>
+            <property name="label" translatable="yes" context="documentfontspage|fontEmbeddingLabel">Font Embedding</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index a16a5f3151ae..bfeeedc128e2 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="DocumentInfoPage">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">_Created:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label13">_Created:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showcreate</property>
       </object>
@@ -29,7 +29,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">_Modified:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label14">_Modified:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showmodify</property>
       </object>
@@ -43,7 +43,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">_Digitally signed:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label15">_Digitally signed:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showsigned</property>
       </object>
@@ -57,7 +57,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Last pri_nted:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label16">Last pri_nted:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showprint</property>
       </object>
@@ -71,7 +71,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Total _editing time:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label17">Total _editing time:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showedittime</property>
       </object>
@@ -85,7 +85,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Re_vision number:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label18">Re_vision number:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showrevision</property>
       </object>
@@ -128,7 +128,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Multiply signed document</property>
+        <property name="label" translatable="yes" context="documentinfopage|showsigned">Multiply signed document</property>
         <property name="selectable">True</property>
       </object>
       <packing>
@@ -180,7 +180,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="userdatacb">
-        <property name="label" translatable="yes">_Apply user data</property>
+        <property name="label" translatable="yes" context="documentinfopage|userdatacb">_Apply user data</property>
         <property name="use_action_appearance">False</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -197,7 +197,7 @@
     <child>
       <object class="GtkCheckButton" id="thumbnailsavecb">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Save preview image with this document</property>
+        <property name="label" translatable="yes" context="documentinfopage|thumbnailsavecb">Save preview image with this document</property>
         <property name="use_action_appearance">False</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -214,7 +214,7 @@
     </child>
     <child>
       <object class="GtkButton" id="reset">
-        <property name="label" translatable="yes">Reset Properties</property>
+        <property name="label" translatable="yes" context="documentinfopage|reset">Reset Properties</property>
         <property name="use_action_appearance">False</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
@@ -228,7 +228,7 @@
     </child>
     <child>
       <object class="GtkButton" id="signature">
-        <property name="label" translatable="yes">Di_gital Signatures...</property>
+        <property name="label" translatable="yes" context="documentinfopage|signature">Di_gital Signatures...</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -247,7 +247,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">_Size:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label11">_Size:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showsize</property>
       </object>
@@ -261,7 +261,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">unknown</property>
+        <property name="label" translatable="yes" context="documentinfopage|showsize">unknown</property>
         <property name="selectable">True</property>
       </object>
       <packing>
@@ -275,7 +275,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">_Location:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label8">_Location:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showlocation</property>
       </object>
@@ -305,7 +305,7 @@
         <property name="can_focus">False</property>
         <property name="halign">end</property>
         <property name="xpad">1</property>
-        <property name="label" translatable="yes">_Type:</property>
+        <property name="label" translatable="yes" context="documentinfopage|label7">_Type:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showtype</property>
       </object>
@@ -329,7 +329,7 @@
     </child>
     <child>
       <object class="GtkButton" id="changepass">
-        <property name="label" translatable="yes">Change _Password</property>
+        <property name="label" translatable="yes" context="documentinfopage|changepass">Change _Password</property>
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -347,7 +347,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Template:</property>
+        <property name="label" translatable="yes" context="documentinfopage|templateft">Template:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showtemplate</property>
       </object>
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index d40027a5e539..945a8641477b 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DocumentPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Properties of “%1”</property>
+    <property name="title" translatable="yes" context="documentpropertiesdialog|DocumentPropertiesDialog">Properties of “%1”</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -94,7 +94,7 @@
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General </property>
+                <property name="label" translatable="yes" context="documentpropertiesdialog|general">General </property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -107,7 +107,7 @@
               <object class="GtkLabel" id="description">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Description</property>
+                <property name="label" translatable="yes" context="documentpropertiesdialog|description">Description</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -121,7 +121,7 @@
               <object class="GtkLabel" id="customprops">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Properties</property>
+                <property name="label" translatable="yes" context="documentpropertiesdialog|customprops">Custom Properties</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="cmisprops">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">CMIS Properties</property>
+                <property name="label" translatable="yes" context="documentpropertiesdialog|cmisprops">CMIS Properties</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="security">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Security</property>
+                <property name="label" translatable="yes" context="documentpropertiesdialog|security">Security</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/sfx2/uiconfig/ui/editdocumentdialog.ui b/sfx2/uiconfig/ui/editdocumentdialog.ui
index bfaccd927322..e879e95dcfc9 100644
--- a/sfx2/uiconfig/ui/editdocumentdialog.ui
+++ b/sfx2/uiconfig/ui/editdocumentdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="EditDocumentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Confirm editing of document</property>
+    <property name="title" translatable="yes" context="editdocumentdialog|EditDocumentDialog">Confirm editing of document</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Are you sure you want to edit the document?</property>
-    <property name="secondary_text" translatable="yes">The original file can be signed without editing the document. Existing signatures on the document will be lost in case of saving an edited version.</property>
+    <property name="text" translatable="yes" context="editdocumentdialog|EditDocumentDialog">Are you sure you want to edit the document?</property>
+    <property name="secondary_text" translatable="yes" context="editdocumentdialog|EditDocumentDialog">The original file can be signed without editing the document. Existing signatures on the document will be lost in case of saving an edited version.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -24,7 +24,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">Edit Document</property>
+                <property name="label" translatable="yes" context="editdocumentdialog|edit">Edit Document</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -41,7 +41,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Cancel</property>
+                <property name="label" translatable="yes" context="editdocumentdialog|cancel">Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sfx2/uiconfig/ui/editdurationdialog.ui b/sfx2/uiconfig/ui/editdurationdialog.ui
index d3474eea8fa6..4cbbe9bb87d0 100644
--- a/sfx2/uiconfig/ui/editdurationdialog.ui
+++ b/sfx2/uiconfig/ui/editdurationdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="EditDurationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Duration</property>
+    <property name="title" translatable="yes" context="editdurationdialog|EditDurationDialog">Edit Duration</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -94,7 +94,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="negative">
-                        <property name="label" translatable="yes">_Negative</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|negative">_Negative</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -113,7 +113,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Years:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label1">_Years:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">years</property>
                       </object>
@@ -127,7 +127,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Months:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label">_Months:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">months</property>
                       </object>
@@ -141,7 +141,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Days:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label3">_Days:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">days</property>
                       </object>
@@ -155,7 +155,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">H_ours:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label4">H_ours:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">hours</property>
                       </object>
@@ -169,7 +169,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Min_utes:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label5">Min_utes:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">minutes</property>
                       </object>
@@ -183,7 +183,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Seconds:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label6">_Seconds:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">seconds</property>
                       </object>
@@ -197,7 +197,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Millise_conds:</property>
+                        <property name="label" translatable="yes" context="editdurationdialog|label7">Millise_conds:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">milliseconds</property>
                       </object>
@@ -284,7 +284,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Duration</property>
+                <property name="label" translatable="yes" context="editdurationdialog|label2">Duration</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sfx2/uiconfig/ui/emojicontrol.ui b/sfx2/uiconfig/ui/emojicontrol.ui
index df829f2fa783..b261e430b118 100644
--- a/sfx2/uiconfig/ui/emojicontrol.ui
+++ b/sfx2/uiconfig/ui/emojicontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="emojictrl">
     <property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/errorfindemaildialog.ui b/sfx2/uiconfig/ui/errorfindemaildialog.ui
index bd6176da240a..0f0195015ba0 100644
--- a/sfx2/uiconfig/ui/errorfindemaildialog.ui
+++ b/sfx2/uiconfig/ui/errorfindemaildialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="ErrorFindEmailDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No e-mail configuration</property>
+    <property name="title" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">No e-mail configuration</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">%PRODUCTNAME was unable to find a working e-mail configuration.</property>
-    <property name="secondary_text" translatable="yes">Please save this document locally instead and attach it from within your e-mail client.</property>
+    <property name="text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">%PRODUCTNAME was unable to find a working e-mail configuration.</property>
+    <property name="secondary_text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">Please save this document locally instead and attach it from within your e-mail client.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/floatingrecord.ui b/sfx2/uiconfig/ui/floatingrecord.ui
index 56f521b1432b..446fd7c0cdbe 100644
--- a/sfx2/uiconfig/ui/floatingrecord.ui
+++ b/sfx2/uiconfig/ui/floatingrecord.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingRecord">
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Record Macro</property>
+    <property name="title" translatable="yes" context="floatingrecord|FloatingRecord">Record Macro</property>
     <property name="type_hint">utility</property>
     <property name="deletable">False</property>
     <child>
diff --git a/sfx2/uiconfig/ui/helpbookmarkpage.ui b/sfx2/uiconfig/ui/helpbookmarkpage.ui
index ecd9ede08c11..4255f7336f33 100644
--- a/sfx2/uiconfig/ui/helpbookmarkpage.ui
+++ b/sfx2/uiconfig/ui/helpbookmarkpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="HelpBookmarkPage">
@@ -19,7 +19,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkButton" id="display">
-            <property name="label" translatable="yes">_Display</property>
+            <property name="label" translatable="yes" context="helpbookmarkpage|display">_Display</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -38,7 +38,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Bookmarks</property>
+            <property name="label" translatable="yes" context="helpbookmarkpage|label1">_Bookmarks</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">bookmarks:border</property>
           </object>
diff --git a/sfx2/uiconfig/ui/helpcontentpage.ui b/sfx2/uiconfig/ui/helpcontentpage.ui
index dab60b32ed7f..49c8f41d2f5f 100644
--- a/sfx2/uiconfig/ui/helpcontentpage.ui
+++ b/sfx2/uiconfig/ui/helpcontentpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="HelpContentPage">
diff --git a/sfx2/uiconfig/ui/helpcontrol.ui b/sfx2/uiconfig/ui/helpcontrol.ui
index b358212b32f4..5d6490fbe3f8 100644
--- a/sfx2/uiconfig/ui/helpcontrol.ui
+++ b/sfx2/uiconfig/ui/helpcontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="HelpControl">
     <property name="visible">True</property>
@@ -40,7 +40,7 @@
               <object class="GtkLabel" id="contents">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Contents</property>
+                <property name="label" translatable="yes" context="helpcontrol|contents">Contents</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -53,7 +53,7 @@
               <object class="GtkLabel" id="index">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Index</property>
+                <property name="label" translatable="yes" context="helpcontrol|index">Index</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -67,7 +67,7 @@
               <object class="GtkLabel" id="find">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Find</property>
+                <property name="label" translatable="yes" context="helpcontrol|find">Find</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -81,7 +81,7 @@
               <object class="GtkLabel" id="bookmarks">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bookmarks</property>
+                <property name="label" translatable="yes" context="helpcontrol|bookmarks">Bookmarks</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sfx2/uiconfig/ui/helpindexpage.ui b/sfx2/uiconfig/ui/helpindexpage.ui
index a9728f7b2921..2ce099c92781 100644
--- a/sfx2/uiconfig/ui/helpindexpage.ui
+++ b/sfx2/uiconfig/ui/helpindexpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="HelpIndexPage">
@@ -19,7 +19,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkButton" id="display">
-            <property name="label" translatable="yes">_Display</property>
+            <property name="label" translatable="yes" context="helpindexpage|display">_Display</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -38,7 +38,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Search term</property>
+            <property name="label" translatable="yes" context="helpindexpage|label1">_Search term</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">terms:border</property>
           </object>
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index 20299bd055df..f3847c880a92 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="onlinehelpmanual">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME Help Not Installed</property>
+    <property name="title" translatable="yes" context="helpmanual|onlinehelpmanual">%PRODUCTNAME Help Not Installed</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
-    <property name="text" translatable="yes">The %PRODUCTNAME built-in help is not installed on your computer.</property>
-    <property name="secondary_text" translatable="yes">You may either install it from our website or your system’s repositories, or read an online version.</property>
+    <property name="text" translatable="yes" context="helpmanual|onlinehelpmanual">The %PRODUCTNAME built-in help is not installed on your computer.</property>
+    <property name="secondary_text" translatable="yes" context="helpmanual|onlinehelpmanual">You may either install it from our website or your system’s repositories, or read an online version.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="internal_box">
         <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="website">
-                <property name="label" translatable="yes">Read Help Online</property>
+                <property name="label" translatable="yes" context="helpmanual|website">Read Help Online</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/helpsearchpage.ui b/sfx2/uiconfig/ui/helpsearchpage.ui
index 64131609b138..878357aab266 100644
--- a/sfx2/uiconfig/ui/helpsearchpage.ui
+++ b/sfx2/uiconfig/ui/helpsearchpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="HelpSearchPage">
@@ -19,7 +19,7 @@
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkButton" id="display">
-            <property name="label" translatable="yes">_Display</property>
+            <property name="label" translatable="yes" context="helpsearchpage|display">_Display</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -38,7 +38,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Search term</property>
+            <property name="label" translatable="yes" context="helpsearchpage|label1">_Search term</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">search</property>
           </object>
@@ -113,7 +113,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="completewords">
-            <property name="label" translatable="yes">_Complete words only</property>
+            <property name="label" translatable="yes" context="helpsearchpage|completewords">_Complete words only</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -130,7 +130,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="headings">
-            <property name="label" translatable="yes">Find in _headings only</property>
+            <property name="label" translatable="yes" context="helpsearchpage|headings">Find in _headings only</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/inputdialog.ui b/sfx2/uiconfig/ui/inputdialog.ui
index df0055ecfb9c..af83a01db48a 100644
--- a/sfx2/uiconfig/ui/inputdialog.ui
+++ b/sfx2/uiconfig/ui/inputdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InputDialog">
     <property name="can_focus">False</property>
@@ -80,7 +80,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Height:</property>
+                <property name="label" translatable="yes" context="inputdialog|label">Height:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry</property>
                 <property name="xalign">0</property>
diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui
index 1f9c30919faf..54d17b2651e9 100644
--- a/sfx2/uiconfig/ui/licensedialog.ui
+++ b/sfx2/uiconfig/ui/licensedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LicenseDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Licensing and Legal information</property>
+    <property name="title" translatable="yes" context="licensedialog|LicenseDialog">Licensing and Legal information</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="show">
-                <property name="label" translatable="yes">_Show License</property>
+                <property name="label" translatable="yes" context="licensedialog|show">_Show License</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -60,7 +60,7 @@
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/.
+            <property name="label" translatable="yes" context="licensedialog|label">%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/.
 
 Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the LICENSE.html file; choose Show License to see exact details in English.
 
diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui b/sfx2/uiconfig/ui/linkeditdialog.ui
index 33b3ffb966d6..22fbce8eec58 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LinkEditDialog">
     <property name="can_focus">False</property>
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Application:</property>
+                        <property name="label" translatable="yes" context="linkeditdialog|label2">_Application:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">app</property>
                       </object>
@@ -111,7 +111,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_File:</property>
+                        <property name="label" translatable="yes" context="linkeditdialog|label3">_File:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">file</property>
                       </object>
@@ -125,7 +125,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Category:</property>
+                        <property name="label" translatable="yes" context="linkeditdialog|label4">_Category:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">category</property>
                       </object>
@@ -178,7 +178,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Modify Link</property>
+                <property name="label" translatable="yes" context="linkeditdialog|label1">Modify Link</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui b/sfx2/uiconfig/ui/loadtemplatedialog.ui
index d23a8db9b8a6..3c1828609a23 100644
--- a/sfx2/uiconfig/ui/loadtemplatedialog.ui
+++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="LoadTemplateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New</property>
+    <property name="title" translatable="yes" context="loadtemplatedialog|LoadTemplateDialog">New</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -67,7 +67,7 @@
             </child>
             <child>
               <object class="GtkButton" id="fromfile">
-                <property name="label" translatable="yes">From File...</property>
+                <property name="label" translatable="yes" context="loadtemplatedialog|fromfile">From File...</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -125,7 +125,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Categories</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|label1">Categories</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -169,7 +169,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Templates</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|label2">Templates</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -192,7 +192,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="text">
-                    <property name="label" translatable="yes">Te_xt</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|text">Te_xt</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -209,7 +209,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="frame">
-                    <property name="label" translatable="yes">_Frame</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|frame">_Frame</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -226,7 +226,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="pages">
-                    <property name="label" translatable="yes">_Pages</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|pages">_Pages</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -243,7 +243,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="numbering">
-                    <property name="label" translatable="yes">N_umbering</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|numbering">N_umbering</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -260,7 +260,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="overwrite">
-                    <property name="label" translatable="yes">_Overwrite</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|overwrite">_Overwrite</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -290,7 +290,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Load Styles</property>
+                <property name="label" translatable="yes" context="loadtemplatedialog|alttitle">Load Styles</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -328,7 +328,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Pre_view</property>
+                    <property name="label" translatable="yes" context="loadtemplatedialog|label3">Pre_view</property>
                     <property name="use_underline">True</property>
                   </object>
                 </child>
diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui
index ec7b0262a194..f03c8389f7fe 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="ManageStylePage">
     <property name="visible">True</property>
@@ -35,7 +35,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Name:</property>
+                    <property name="label" translatable="yes" context="managestylepage|nameft">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">namerw</property>
                   </object>
@@ -49,7 +49,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Ne_xt style:</property>
+                    <property name="label" translatable="yes" context="managestylepage|nextstyleft">Ne_xt style:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">nextstyle</property>
                   </object>
@@ -63,7 +63,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Inherit from:</property>
+                    <property name="label" translatable="yes" context="managestylepage|linkedwithft">Inherit from:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">linkedwith</property>
                   </object>
@@ -77,7 +77,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Category:</property>
+                    <property name="label" translatable="yes" context="managestylepage|categoryft">_Category:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">category</property>
                   </object>
@@ -100,7 +100,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="editstyle">
-                    <property name="label" translatable="yes">Edit Style</property>
+                    <property name="label" translatable="yes" context="managestylepage|editstyle">Edit Style</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -123,7 +123,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="editlinkstyle">
-                    <property name="label" translatable="yes">Edit Style</property>
+                    <property name="label" translatable="yes" context="managestylepage|editlinkstyle">Edit Style</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -185,7 +185,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autoupdate">
-                    <property name="label" translatable="yes">_AutoUpdate</property>
+                    <property name="label" translatable="yes" context="managestylepage|autoupdate">_AutoUpdate</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -209,7 +209,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Style</property>
+            <property name="label" translatable="yes" context="managestylepage|label1">Style</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -250,7 +250,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contains</property>
+            <property name="label" translatable="yes" context="managestylepage|label2">Contains</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sfx2/uiconfig/ui/newstyle.ui b/sfx2/uiconfig/ui/newstyle.ui
index d80b835a1e32..283472c79e7f 100644
--- a/sfx2/uiconfig/ui/newstyle.ui
+++ b/sfx2/uiconfig/ui/newstyle.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CreateStyleDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create Style</property>
+    <property name="title" translatable="yes" context="newstyle|CreateStyleDialog">Create Style</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
@@ -105,7 +105,7 @@
                     </child>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="stylename-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Style Name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="newstyle|stylename-atkobject">Style Name</property>
                       </object>
                     </child>
                   </object>
@@ -116,7 +116,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Style Name</property>
+                <property name="label" translatable="yes" context="newstyle|label1">Style Name</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sfx2/uiconfig/ui/notebookbar.ui b/sfx2/uiconfig/ui/notebookbar.ui
index a26b9f6c171f..7513c17dbd30 100644
--- a/sfx2/uiconfig/ui/notebookbar.ui
+++ b/sfx2/uiconfig/ui/notebookbar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="NotebookBar">
@@ -70,7 +70,7 @@
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar|label9">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/sfx2/uiconfig/ui/notebookbarpopup.ui b/sfx2/uiconfig/ui/notebookbarpopup.ui
index 8400e481e66c..aac21502efc4 100644
--- a/sfx2/uiconfig/ui/notebookbarpopup.ui
+++ b/sfx2/uiconfig/ui/notebookbarpopup.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="Popup">
     <property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/optprintpage.ui b/sfx2/uiconfig/ui/optprintpage.ui
index c4030370c45d..5ee073421edc 100644
--- a/sfx2/uiconfig/ui/optprintpage.ui
+++ b/sfx2/uiconfig/ui/optprintpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">2</property>
@@ -40,7 +40,7 @@
                     <property name="column_spacing">18</property>
                     <child>
                       <object class="GtkRadioButton" id="printer">
-                        <property name="label" translatable="yes">_Printer</property>
+                        <property name="label" translatable="yes" context="optprintpage|printer">_Printer</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -57,7 +57,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="file">
-                        <property name="label" translatable="yes">Print to _file</property>
+                        <property name="label" translatable="yes" context="optprintpage|file">Print to _file</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -76,7 +76,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Settings for:</property>
+                        <property name="label" translatable="yes" context="optprintpage|label4">Settings for:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">printer</property>
                       </object>
@@ -104,7 +104,7 @@
                         <property name="column_spacing">24</property>
                         <child>
                           <object class="GtkCheckButton" id="reducetrans">
-                            <property name="label" translatable="yes">_Reduce transparency</property>
+                            <property name="label" translatable="yes" context="optprintpage|reducetrans">_Reduce transparency</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -119,7 +119,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="reducegrad">
-                            <property name="label" translatable="yes">Reduce _gradient</property>
+                            <property name="label" translatable="yes" context="optprintpage|reducegrad">Reduce _gradient</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -134,7 +134,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="converttogray">
-                            <property name="label" translatable="yes">Con_vert colors to grayscale</property>
+                            <property name="label" translatable="yes" context="optprintpage|converttogray">Con_vert colors to grayscale</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
                                 <property name="row_spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="reducetransauto">
-                                    <property name="label" translatable="yes">Auto_matically</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducetransauto">Auto_matically</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -176,7 +176,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="reducetransnone">
-                                    <property name="label" translatable="yes">_No transparency</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducetransnone">_No transparency</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -215,7 +215,7 @@
                                     <property name="column_spacing">12</property>
                                     <child>
                                       <object class="GtkRadioButton" id="reducegradstripes">
-                                        <property name="label" translatable="yes">Gradient _stripes:</property>
+                                        <property name="label" translatable="yes" context="optprintpage|reducegradstripes">Gradient _stripes:</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -250,7 +250,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="reducegradcolor">
-                                    <property name="label" translatable="yes">Intermediate _color</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducegradcolor">Intermediate _color</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -284,7 +284,7 @@
                                 <property name="row_spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="reducebitmapoptimal">
-                                    <property name="label" translatable="yes">_High print quality</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducebitmapoptimal">_High print quality</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -301,7 +301,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="reducebitmapnormal">
-                                    <property name="label" translatable="yes">N_ormal print quality</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducebitmapnormal">N_ormal print quality</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -322,7 +322,7 @@
                                     <property name="column_spacing">12</property>
                                     <child>
                                       <object class="GtkRadioButton" id="reducebitmapresol">
-                                        <property name="label" translatable="yes">Reso_lution:</property>
+                                        <property name="label" translatable="yes" context="optprintpage|reducebitmapresol">Reso_lution:</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -341,12 +341,12 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <items>
-                                          <item translatable="yes">72 DPI</item>
-                                          <item translatable="yes">96 DPI</item>
-                                          <item translatable="yes">150 DPI (Fax)</item>
-                                          <item translatable="yes">200 DPI (default)</item>
-                                          <item translatable="yes">300 DPI</item>
-                                          <item translatable="yes">600 DPI</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">72 DPI</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">96 DPI</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">150 DPI (Fax)</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">200 DPI (default)</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">300 DPI</item>
+                                          <item translatable="yes" context="optprintpage|reducebitmapdpi">600 DPI</item>
                                         </items>
                                       </object>
                                       <packing>
@@ -362,7 +362,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="reducebitmaptrans">
-                                    <property name="label" translatable="yes">Include transparent objects</property>
+                                    <property name="label" translatable="yes" context="optprintpage|reducebitmaptrans">Include transparent objects</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -385,7 +385,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="reducebitmap">
-                            <property name="label" translatable="yes">Reduce _bitmaps</property>
+                            <property name="label" translatable="yes" context="optprintpage|reducebitmap">Reduce _bitmaps</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -400,7 +400,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="pdf">
-                            <property name="label" translatable="yes">_PDF as standard print job format</property>
+                            <property name="label" translatable="yes" context="optprintpage|pdf">_PDF as standard print job format</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -430,7 +430,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Reduce Print Data</property>
+            <property name="label" translatable="yes" context="optprintpage|label1">Reduce Print Data</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -463,7 +463,7 @@
                 <property name="column_spacing">24</property>
                 <child>
                   <object class="GtkCheckButton" id="papersize">
-                    <property name="label" translatable="yes">P_aper size</property>
+                    <property name="label" translatable="yes" context="optprintpage|papersize">P_aper size</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -478,7 +478,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="paperorient">
-                    <property name="label" translatable="yes">Pap_er orientation</property>
+                    <property name="label" translatable="yes" context="optprintpage|paperorient">Pap_er orientation</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -494,7 +494,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="trans">
-                    <property name="label" translatable="yes">_Transparency</property>
+                    <property name="label" translatable="yes" context="optprintpage|trans">_Transparency</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -515,7 +515,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Printer Warnings</property>
+            <property name="label" translatable="yes" context="optprintpage|label2">Printer Warnings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui
index 259b7faa8c79..cb3c47124537 100644
--- a/sfx2/uiconfig/ui/password.ui
+++ b/sfx2/uiconfig/ui/password.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Enter Password</property>
+    <property name="title" translatable="yes" context="password|PasswordDialog">Enter Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                           <object class="GtkLabel" id="userft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">User:</property>
+                            <property name="label" translatable="yes" context="password|userft">User:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">usered</property>
                             <property name="xalign">0</property>
@@ -111,7 +111,7 @@
                           <object class="GtkLabel" id="pass1ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Password:</property>
+                            <property name="label" translatable="yes" context="password|pass1ft">Password:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">pass1ed</property>
                             <property name="xalign">0</property>
@@ -125,7 +125,7 @@
                           <object class="GtkLabel" id="confirm1ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Confirm:</property>
+                            <property name="label" translatable="yes" context="password|confirm1ft">Confirm:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirm1ed</property>
                             <property name="xalign">0</property>
@@ -155,7 +155,7 @@
                             <property name="invisible_char">●</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="pass1ed-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Password</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="password|pass1ed-atkobject">Password</property>
                               </object>
                             </child>
                           </object>
@@ -185,7 +185,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Password</property>
+                    <property name="label" translatable="yes" context="password|label1">Password</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -220,7 +220,7 @@
                           <object class="GtkLabel" id="pass2ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Password:</property>
+                            <property name="label" translatable="yes" context="password|pass2ft">Password:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">pass2ed</property>
                             <property name="xalign">0</property>
@@ -234,7 +234,7 @@
                           <object class="GtkLabel" id="confirm2ft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Confirm:</property>
+                            <property name="label" translatable="yes" context="password|confirm2ft">Confirm:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirm2ed</property>
                             <property name="xalign">0</property>
@@ -278,7 +278,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Second Password</property>
+                    <property name="label" translatable="yes" context="password|label2">Second Password</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sfx2/uiconfig/ui/printeroptionsdialog.ui b/sfx2/uiconfig/ui/printeroptionsdialog.ui
index 0c6adf9d538c..9914fc7d9ed5 100644
--- a/sfx2/uiconfig/ui/printeroptionsdialog.ui
+++ b/sfx2/uiconfig/ui/printeroptionsdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PrinterOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Printer Options</property>
+    <property name="title" translatable="yes" context="printeroptionsdialog|PrinterOptionsDialog">Printer Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui
index b9f1e1be873e..4d48d2379296 100644
--- a/sfx2/uiconfig/ui/querysavedialog.ui
+++ b/sfx2/uiconfig/ui/querysavedialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save Document?</property>
+    <property name="title" translatable="yes" context="querysavedialog|QuerySaveDialog">Save Document?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
-    <property name="text" translatable="yes">Save changes to document “$(DOC)” before closing?</property>
-    <property name="secondary_text" translatable="yes">Your changes will be lost if you don’t save them.</property>
+    <property name="text" translatable="yes" context="querysavedialog|QuerySaveDialog">Save changes to document “$(DOC)” before closing?</property>
+    <property name="secondary_text" translatable="yes" context="querysavedialog|QuerySaveDialog">Your changes will be lost if you don’t save them.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="discard">
-                <property name="label" translatable="yes">_Don’t Save</property>
+                <property name="label" translatable="yes" context="querysavedialog|discard">_Don’t Save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui b/sfx2/uiconfig/ui/safemodequerydialog.ui
index 6d9ba3a618be..d9bd93e3f833 100644
--- a/sfx2/uiconfig/ui/safemodequerydialog.ui
+++ b/sfx2/uiconfig/ui/safemodequerydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SafeModeQueryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Enter Safe Mode</property>
+    <property name="title" translatable="yes" context="safemodequerydialog|SafeModeQueryDialog">Enter Safe Mode</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="restart">
-                <property name="label" translatable="yes">_Restart</property>
+                <property name="label" translatable="yes" context="safemodequerydialog|restart">_Restart</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -60,7 +60,7 @@
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Are you sure you want to restart %PRODUCTNAME and enter safe mode?</property>
+            <property name="label" translatable="yes" context="safemodequerydialog|label">Are you sure you want to restart %PRODUCTNAME and enter safe mode?</property>
             <property name="wrap">True</property>
             <property name="max_width_chars">80</property>
             <property name="lines">2</property>
diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui b/sfx2/uiconfig/ui/saveastemplatedlg.ui
index d750bb1f821f..a49d29d85206 100644
--- a/sfx2/uiconfig/ui/saveastemplatedlg.ui
+++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="categorylist">
@@ -10,14 +10,14 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="saveastemplatedlg|categorylist">None</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="SaveAsTemplateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save As Template</property>
+    <property name="title" translatable="yes" context="saveastemplatedlg|SaveAsTemplateDialog">Save As Template</property>
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -100,7 +100,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Template _Name</property>
+                    <property name="label" translatable="yes" context="saveastemplatedlg|create_label">Template _Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name_entry</property>
                     <attributes>
@@ -142,7 +142,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Template _Category</property>
+                    <property name="label" translatable="yes" context="saveastemplatedlg|select_label">Template _Category</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">categorylb:border</property>
                     <attributes>
@@ -181,7 +181,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="defaultcb">
-                <property name="label" translatable="yes">_Set as default template</property>
+                <property name="label" translatable="yes" context="saveastemplatedlg|defaultcb">_Set as default template</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/searchdialog.ui b/sfx2/uiconfig/ui/searchdialog.ui
index 14e7fd6ab676..0f2f71e325f8 100644
--- a/sfx2/uiconfig/ui/searchdialog.ui
+++ b/sfx2/uiconfig/ui/searchdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SearchDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Find on this Page</property>
+    <property name="title" translatable="yes" context="searchdialog|SearchDialog">Find on this Page</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="search">
-                <property name="label" translatable="yes">_Find</property>
+                <property name="label" translatable="yes" context="searchdialog|search">_Find</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -90,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Search for:</property>
+                    <property name="label" translatable="yes" context="searchdialog|label1">_Search for:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">searchterm</property>
                   </object>
@@ -114,7 +114,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="matchcase">
-                    <property name="label" translatable="yes">Ma_tch case</property>
+                    <property name="label" translatable="yes" context="searchdialog|matchcase">Ma_tch case</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wholewords">
-                    <property name="label" translatable="yes">Whole wor_ds only</property>
+                    <property name="label" translatable="yes" context="searchdialog|wholewords">Whole wor_ds only</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="backwards">
-                    <property name="label" translatable="yes">Bac_kwards</property>
+                    <property name="label" translatable="yes" context="searchdialog|backwards">Bac_kwards</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="wrap">
-                    <property name="label" translatable="yes">Wrap _around</property>
+                    <property name="label" translatable="yes" context="searchdialog|wrap">Wrap _around</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/sfx2/uiconfig/ui/securityinfopage.ui b/sfx2/uiconfig/ui/securityinfopage.ui
index ea3386558c83..dee9c6fd7b74 100644
--- a/sfx2/uiconfig/ui/securityinfopage.ui
+++ b/sfx2/uiconfig/ui/securityinfopage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sfx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFrame" id="SecurityInfoPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="readonly">
-                <property name="label" translatable="yes">_Open file read-only</property>
+                <property name="label" translatable="yes" context="securityinfopage|readonly">_Open file read-only</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -47,7 +47,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="recordchanges">
-                <property name="label" translatable="yes">Record _changes</property>
+                <property name="label" translatable="yes" context="securityinfopage|recordchanges">Record _changes</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="protect">
-                    <property name="label" translatable="yes">Protect...</property>
+                    <property name="label" translatable="yes" context="securityinfopage|protect">Protect...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -84,7 +84,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="unprotect">
-                    <property name="label" translatable="yes">_Unprotect...</property>
+                    <property name="label" translatable="yes" context="securityinfopage|unprotect">_Unprotect...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -116,7 +116,7 @@
       <object class="GtkLabel" id="label47">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">File Sharing Options</property>
+        <property name="label" translatable="yes" context="securityinfopage|label47">File Sharing Options</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sfx2/uiconfig/ui/singletabdialog.ui b/sfx2/uiconfig/ui/singletabdialog.ui
index 078c129c34e8..9638d3b66faf 100644
--- a/sfx2/uiconfig/ui/singletabdialog.ui
+++ b/sfx2/uiconfig/ui/singletabdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SingleTabDialog">
     <property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 7f7acd422429..e3cc99f40d33 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="3.0"/>
   <object class="GtkImage" id="calc_all_image">
@@ -15,7 +15,7 @@
       <object class="GtkMenuItem" id="clear_all">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Clear Recent Documents</property>
+        <property name="label" translatable="yes" context="startcenter|clear_all">Clear Recent Documents</property>
       </object>
     </child>
   </object>
@@ -36,28 +36,28 @@
       <object class="GtkMenuItem" id="filter_writer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Writer Templates</property>
+        <property name="label" translatable="yes" context="startcenter|filter_writer">Writer Templates</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="filter_calc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Calc Templates</property>
+        <property name="label" translatable="yes" context="startcenter|filter_calc">Calc Templates</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="filter_impress">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Impress Templates</property>
+        <property name="label" translatable="yes" context="startcenter|filter_impress">Impress Templates</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="filter_draw">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Draw Templates</property>
+        <property name="label" translatable="yes" context="startcenter|filter_draw">Draw Templates</property>
       </object>
     </child>
     <child>
@@ -70,7 +70,7 @@
       <object class="GtkMenuItem" id="manage">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Manage Templates</property>
+        <property name="label" translatable="yes" context="startcenter|manage">Manage Templates</property>
       </object>
     </child>
   </object>
@@ -143,7 +143,7 @@
                         <property name="spacing">3</property>
                         <child>
                           <object class="GtkButton" id="open_all">
-                            <property name="label" translatable="yes">_Open File</property>
+                            <property name="label" translatable="yes" context="startcenter|open_all">_Open File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -163,7 +163,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="open_remote">
-                            <property name="label" translatable="yes">Remote File_s</property>
+                            <property name="label" translatable="yes" context="startcenter|open_remote">Remote File_s</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -195,7 +195,7 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="open_recent:clearmenu">
-                            <property name="label" translatable="yes">_Recent Files</property>
+                            <property name="label" translatable="yes" context="startcenter|open_recent">_Recent Files</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -214,7 +214,7 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="templates_all:filtermenu">
-                            <property name="label" translatable="yes">T_emplates</property>
+                            <property name="label" translatable="yes" context="startcenter|templates_all">T_emplates</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -250,7 +250,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="margin_bottom">6</property>
-                            <property name="label" translatable="yes">Create:</property>
+                            <property name="label" translatable="yes" context="startcenter|create_label">Create:</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -261,7 +261,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="writer_all">
-                            <property name="label" translatable="yes">_Writer Document</property>
+                            <property name="label" translatable="yes" context="startcenter|writer_all">_Writer Document</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -281,7 +281,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="calc_all">
-                            <property name="label" translatable="yes">_Calc Spreadsheet</property>
+                            <property name="label" translatable="yes" context="startcenter|calc_all">_Calc Spreadsheet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -301,7 +301,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="impress_all">
-                            <property name="label" translatable="yes">_Impress Presentation</property>
+                            <property name="label" translatable="yes" context="startcenter|impress_all">_Impress Presentation</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -321,7 +321,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="draw_all">
-                            <property name="label" translatable="yes">_Draw Drawing</property>
+                            <property name="label" translatable="yes" context="startcenter|draw_all">_Draw Drawing</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -341,7 +341,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="math_all">
-                            <property name="label" translatable="yes">_Math Formula</property>
+                            <property name="label" translatable="yes" context="startcenter|math_all">_Math Formula</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -361,7 +361,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="database_all">
-                            <property name="label" translatable="yes">_Base Database</property>
+                            <property name="label" translatable="yes" context="startcenter|database_all">_Base Database</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -394,7 +394,7 @@
                           <object class="GtkLabel" id="althelplabel">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes">He_lp</property>
+                            <property name="label" translatable="yes" context="startcenter|althelplabel">He_lp</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -451,7 +451,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="extensions">
-                            <property name="label" translatable="yes">E_xtensions</property>
+                            <property name="label" translatable="yes" context="startcenter|extensions">E_xtensions</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -479,7 +479,7 @@
             <child type="label">
               <object class="GtkLabel" id="label1">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Application</property>
+                <property name="label" translatable="yes" context="startcenter|label1">Application</property>
               </object>
             </child>
           </object>
@@ -497,7 +497,7 @@
             <child>
               <object class="GtkLabel" id="all_recent_label">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Recent Files List</property>
+                <property name="label" translatable="yes" context="startcenter|all_recent_label">Recent Files List</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">all_recent</property>
               </object>
@@ -510,7 +510,7 @@
             <child>
               <object class="GtkLabel" id="local_view_label">
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Templates List</property>
+                <property name="label" translatable="yes" context="startcenter|local_view_label">Templates List</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">local_view</property>
               </object>
diff --git a/sfx2/uiconfig/ui/stylecontextmenu.ui b/sfx2/uiconfig/ui/stylecontextmenu.ui
index da524cf902b4..6c735054a9b5 100644
--- a/sfx2/uiconfig/ui/stylecontextmenu.ui
+++ b/sfx2/uiconfig/ui/stylecontextmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="new">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">New...</property>
+        <property name="label" translatable="yes" context="stylecontextmenu|new">New...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Modify...</property>
+        <property name="label" translatable="yes" context="stylecontextmenu|edit">Modify...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="hide">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Hide</property>
+        <property name="label" translatable="yes" context="stylecontextmenu|hide">Hide</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="show">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Show</property>
+        <property name="label" translatable="yes" context="stylecontextmenu|show">Show</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete...</property>
+        <property name="label" translatable="yes" context="stylecontextmenu|delete">Delete...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sfx2/uiconfig/ui/templatecategorydlg.ui b/sfx2/uiconfig/ui/templatecategorydlg.ui
index d0f95f445964..aef4df524c62 100644
--- a/sfx2/uiconfig/ui/templatecategorydlg.ui
+++ b/sfx2/uiconfig/ui/templatecategorydlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="categorylist">
@@ -10,14 +10,14 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="templatecategorydlg|categorylist">None</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="TemplatesCategoryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Category</property>
+    <property name="title" translatable="yes" context="templatecategorydlg|TemplatesCategoryDialog">Select Category</property>
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -100,7 +100,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Select from Existing Category</property>
+                    <property name="label" translatable="yes" context="templatecategorydlg|select_label">Select from Existing Category</property>
                     <attributes>
                       <attribute name="weight" value="normal"/>
                     </attributes>
@@ -146,7 +146,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">or Create a New Category</property>
+                    <property name="label" translatable="yes" context="templatecategorydlg|create_label">or Create a New Category</property>
                     <attributes>
                       <attribute name="weight" value="normal"/>
                     </attributes>
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index c391081df2a0..3fee75c64ff7 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="applist">
@@ -10,19 +10,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">All Applications</col>
+        <col id="0" translatable="yes" context="templatedlg|applist">All Applications</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Documents</col>
+        <col id="0" translatable="yes" context="templatedlg|applist">Documents</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Spreadsheets</col>
+        <col id="0" translatable="yes" context="templatedlg|applist">Spreadsheets</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Presentations</col>
+        <col id="0" translatable="yes" context="templatedlg|applist">Presentations</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Drawings</col>
+        <col id="0" translatable="yes" context="templatedlg|applist">Drawings</col>
       </row>
     </data>
   </object>
@@ -33,7 +33,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">All Categories</col>
+        <col id="0" translatable="yes" context="templatedlg|folderlist">All Categories</col>
       </row>
     </data>
   </object>
@@ -62,7 +62,7 @@
     <property name="height_request">600</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Templates</property>
+    <property name="title" translatable="yes" context="templatedlg|TemplateDialog">Templates</property>
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
@@ -143,8 +143,8 @@
                   <object class="GtkEntry" id="search_filter">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Search</property>
-                    <property name="placeholder_text" translatable="yes">Search...</property>
+                    <property name="tooltip_text" translatable="yes" context="templatedlg|search_filter|tooltip_text">Search</property>
+                    <property name="placeholder_text" translatable="yes" context="templatedlg|search_filter">Search...</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -166,7 +166,7 @@
                           <object class="GtkComboBox" id="filter_application">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Filter by Application</property>
+                            <property name="tooltip_text" translatable="yes" context="templatedlg|filter_application|tooltip_text">Filter by Application</property>
                             <property name="resize_mode">queue</property>
                             <property name="model">applist</property>
                           </object>
@@ -181,7 +181,7 @@
                             <property name="width_request">250</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Filter by Category</property>
+                            <property name="tooltip_text" translatable="yes" context="templatedlg|filter_folder|tooltip_text">Filter by Category</property>
                             <property name="model">folderlist</property>
                           </object>
                           <packing>
@@ -202,7 +202,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Filter</property>
+                        <property name="label" translatable="yes" context="templatedlg|label1">Filter</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -279,7 +279,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="thumbnailviewlabel">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Template List</property>
+                    <property name="label" translatable="yes" context="templatedlg|thumbnailviewlabel">Template List</property>
                   </object>
                 </child>
               </object>
@@ -309,7 +309,7 @@
                           <object class="GtkToolButton" id="action_menu">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Settings</property>
+                            <property name="tooltip_text" translatable="yes" context="templatedlg|action_menu|tooltip_text">Settings</property>
                             <property name="action_name">action_menu</property>
                             <property name="icon_name">sfx2/res/actionaction013.png</property>
                           </object>
@@ -330,7 +330,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Browse online templates</property>
+                        <property name="tooltip_text" translatable="yes" context="templatedlg|online_link|tooltip_text">Browse online templates</property>
                         <property name="image">image5</property>
                         <property name="relief">none</property>
                         <property name="yalign">0.49000000953674316</property>
@@ -344,7 +344,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hidedialogcb">
-                        <property name="label" translatable="yes">Show this dialog at startup</property>
+                        <property name="label" translatable="yes" context="templatedlg|hidedialogcb">Show this dialog at startup</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
@@ -370,11 +370,11 @@
                     <property name="halign">end</property>
                     <child>
                       <object class="GtkButton" id="move_btn">
-                        <property name="label" translatable="yes">Move</property>
+                        <property name="label" translatable="yes" context="templatedlg|move_btn">Move</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Move Templates</property>
+                        <property name="tooltip_text" translatable="yes" context="templatedlg|move_btn|tooltip_text">Move Templates</property>
                         <property name="image">image3</property>
                         <property name="relief">none</property>
                         <property name="yalign">0.50999999046325684</property>
@@ -388,11 +388,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="export_btn">
-                        <property name="label" translatable="yes">Export</property>
+                        <property name="label" translatable="yes" context="templatedlg|export_btn">Export</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Export Templates</property>
+                        <property name="tooltip_text" translatable="yes" context="templatedlg|export_btn|tooltip_text">Export Templates</property>
                         <property name="image">image1</property>
                         <property name="relief">none</property>
                         <property name="always_show_image">True</property>
@@ -405,11 +405,11 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="import_btn">
-                        <property name="label" translatable="yes">Import</property>
+                        <property name="label" translatable="yes" context="templatedlg|import_btn">Import</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Import Templates</property>
+                        <property name="tooltip_text" translatable="yes" context="templatedlg|import_btn|tooltip_text">Import Templates</property>
                         <property name="image">image4</property>
                         <property name="relief">none</property>
                         <property name="always_show_image">True</property>
diff --git a/sfx2/uiconfig/ui/versioncommentdialog.ui b/sfx2/uiconfig/ui/versioncommentdialog.ui
index a7fda6551aef..6a2d6d3109d2 100644
--- a/sfx2/uiconfig/ui/versioncommentdialog.ui
+++ b/sfx2/uiconfig/ui/versioncommentdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="VersionCommentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Version Comment</property>
+    <property name="title" translatable="yes" context="versioncommentdialog|VersionCommentDialog">Insert Version Comment</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -98,7 +98,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Date and time: </property>
+                <property name="label" translatable="yes" context="versioncommentdialog|timestamp">Date and time: </property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -110,7 +110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Saved by: </property>
+                <property name="label" translatable="yes" context="versioncommentdialog|author">Saved by: </property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sfx2/uiconfig/ui/versionscmis.ui b/sfx2/uiconfig/ui/versionscmis.ui
index d7c4ce61f80c..10b73b0e9e14 100644
--- a/sfx2/uiconfig/ui/versionscmis.ui
+++ b/sfx2/uiconfig/ui/versionscmis.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="VersionsCmisDialog">
@@ -49,7 +49,7 @@
             </child>
             <child>
               <object class="GtkButton" id="show">
-                <property name="label" translatable="yes">_Show...</property>
+                <property name="label" translatable="yes" context="versionscmis|show">_Show...</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -80,7 +80,7 @@
             </child>
             <child>
               <object class="GtkButton" id="compare">
-                <property name="label" translatable="yes">_Compare</property>
+                <property name="label" translatable="yes" context="versionscmis|compare">_Compare</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -157,7 +157,7 @@
                               <object class="GtkLabel" id="datetime">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Date and time</property>
+                                <property name="label" translatable="yes" context="versionscmis|datetime">Date and time</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -169,7 +169,7 @@
                               <object class="GtkLabel" id="savedby">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Saved by</property>
+                                <property name="label" translatable="yes" context="versionscmis|savedby">Saved by</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -181,7 +181,7 @@
                               <object class="GtkLabel" id="comments">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Comments</property>
+                                <property name="label" translatable="yes" context="versionscmis|comments">Comments</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -218,7 +218,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Existing Versions</property>
+                    <property name="label" translatable="yes" context="versionscmis|label2">Existing Versions</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sfx2/uiconfig/ui/versionsofdialog.ui b/sfx2/uiconfig/ui/versionsofdialog.ui
index 3930082ee8c0..c4ff85111374 100644
--- a/sfx2/uiconfig/ui/versionsofdialog.ui
+++ b/sfx2/uiconfig/ui/versionsofdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sfx">
   <requires lib="gtk+" version="3.6"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="VersionsOfDialog">
@@ -48,7 +48,7 @@
             </child>
             <child>
               <object class="GtkButton" id="show">
-                <property name="label" translatable="yes">_Show...</property>
+                <property name="label" translatable="yes" context="versionsofdialog|show">_Show...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -77,7 +77,7 @@
             </child>
             <child>
               <object class="GtkButton" id="compare">
-                <property name="label" translatable="yes">_Compare</property>
+                <property name="label" translatable="yes" context="versionsofdialog|compare">_Compare</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cmis">
-                <property name="label" translatable="yes">CMIS</property>
+                <property name="label" translatable="yes" context="versionsofdialog|cmis">CMIS</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -152,7 +152,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkButton" id="save">
-                            <property name="label" translatable="yes">Save _New Version</property>
+                            <property name="label" translatable="yes" context="versionsofdialog|save">Save _New Version</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="always">
-                            <property name="label" translatable="yes">_Always save a new version on closing</property>
+                            <property name="label" translatable="yes" context="versionsofdialog|always">_Always save a new version on closing</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -186,7 +186,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">New Versions</property>
+                    <property name="label" translatable="yes" context="versionsofdialog|label1">New Versions</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -231,7 +231,7 @@
                               <object class="GtkLabel" id="datetime">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Date and time</property>
+                                <property name="label" translatable="yes" context="versionsofdialog|datetime">Date and time</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -243,7 +243,7 @@
                               <object class="GtkLabel" id="savedby">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Saved by</property>
+                                <property name="label" translatable="yes" context="versionsofdialog|savedby">Saved by</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -255,7 +255,7 @@
                               <object class="GtkLabel" id="comments">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Comments</property>
+                                <property name="label" translatable="yes" context="versionsofdialog|comments">Comments</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -292,7 +292,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Existing Versions</property>
+                    <property name="label" translatable="yes" context="versionsofdialog|label2">Existing Versions</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index b71f00101ff1..9694010b291c 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -229,7 +229,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -242,7 +241,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex
new file mode 100755
index 000000000000..2a657290ed88
--- /dev/null
+++ b/solenv/bin/hrcex
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import polib
+import binascii
+import getopt
+import sys
+import os.path
+from subprocess import check_output
+
+try:
+    myopts, args = getopt.getopt(sys.argv[1:], "i:o:")
+except getopt.GetoptError as e:
+    print(" Syntax: hrcex -i FileIn -o FileOut")
+    print(" FileIn:   Source files (*.ui)")
+    print(" FileOut:  Destination file (*.*)")
+    sys.exit(2)
+
+for o, a in myopts:
+    if o == '-i':
+        ifile = a
+    elif o == '-o':
+        ofile = a
+
+with open(ofile, "a") as output:
+    input = check_output(["xgettext", "-C", "--add-comments", "--keyword=NC_:1c,2", "--from-code=UTF-8", "--no-wrap", ifile, "-o", "-"])
+    po = polib.pofile(input)
+    if len(po) != 0:
+        print >> output, ""
+        for entry in po:
+            keyid = entry.msgctxt + '|' + entry.msgid
+            print >> output, '#. ' + polib.genKeyId(keyid)
+            location = entry.occurrences[0][0]
+            location = os.path.basename(location)
+            entry.occurrences[0] = location, entry.occurrences[0][1]
+            print >> output, entry
diff --git a/solenv/bin/uiex b/solenv/bin/uiex
new file mode 100755
index 000000000000..0f086a20c6c7
--- /dev/null
+++ b/solenv/bin/uiex
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import polib
+import binascii
+import getopt
+import sys
+import os.path
+from subprocess import check_output
+
+try:
+    myopts, args = getopt.getopt(sys.argv[1:], "i:o:")
+except getopt.GetoptError as e:
+    print(" Syntax: uiex -i FileIn -o FileOut")
+    print(" FileIn:   Source files (*.ui)")
+    print(" FileOut:  Destination file (*.*)")
+    sys.exit(2)
+
+for o, a in myopts:
+    if o == '-i':
+        ifile = a
+    elif o == '-o':
+        ofile = a
+
+with open(ofile, "a") as output:
+    input = check_output(["xgettext", "--add-comments", "--no-wrap", ifile, "-o", "-"])
+    po = polib.pofile(input)
+    if len(po) != 0:
+        print >> output, ""
+        for entry in po:
+            keyid = entry.msgctxt + '|' + entry.msgid
+            print >> output, '#. ' + polib.genKeyId(keyid)
+            location = entry.occurrences[0][0]
+            location = os.path.basename(location)
+            entry.occurrences[0] = location, entry.occurrences[0][1]
+            print >> output, entry
diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt
deleted file mode 100644
index 7eb3557fa7a2..000000000000
--- a/solenv/bin/uilangfilter.xslt
+++ /dev/null
@@ -1,63 +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/.
- *
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:str="http://exslt.org/strings">
-  <xsl:output method="xml" encoding="UTF-8"/>
-
-<xsl:template match="/">
-  <l><xsl:text>&#10;</xsl:text>
-  <!--
-      What I want to do here is to extract all nodes that are translatable
-      except the columns of list and tree stores
-  -->
-  <xsl:apply-templates select="//*[not(self::col)][@translatable='yes']" />
-  <!--
-      What I want to do here is to extract just the list and tree store
-      columns that are translatable (the first one only)
-  -->
-  <xsl:apply-templates select="interface/object[data/row/col[@id='0'][@translatable='yes']]" />
-  </l>
-</xsl:template>
-
-<!--
-    Normal nodes
--->
-<xsl:template match="*/*[not(self::col|self::item)][@translatable='yes']">
-  <xsl:text> </xsl:text>
-  <t r="string" g="{str:tokenize(../@id,':')[1]}" l="{@name}">
-  <xsl:copy-of select="text()" />
-  </t><xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<!--
-    Item nodes
--->
-<xsl:template match="*/*[self::item][@translatable='yes']">
-  <xsl:text> </xsl:text>
-  <xsl:variable name="groupid" select="../../@id"/>
-  <t r="stringlist" g="{str:tokenize(../../@id,':')[1]}" l="{count(preceding::item[../../@id=$groupid])}">
-  <xsl:copy-of select="text()" />
-  </t><xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<!--
-    Column nodes
--->
-<xsl:template match="col[@id='0'][@translatable='yes']">
-  <xsl:text> </xsl:text>
-  <xsl:variable name="groupid" select="../../../@id"/>
-  <t r="stringlist" g="{str:tokenize($groupid,':')[1]}" l="{count(preceding::col[@id='0'][../../../@id=$groupid])}">
-  <xsl:copy-of select="text()" />
-  </t><xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="text()"/>
-
-</xsl:stylesheet> 
diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
deleted file mode 100644
index 45482a92420d..000000000000
--- a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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 <types.h>
-
-namespace gb
-{
-    class SrsTarget;
-    class ResTarget;
-    class AllLangResTarget;
-
-    class SrsPartTarget : public Target, public HasDependencies, public UsesRsc
-    {
-        private:
-            /// SrsPartTarget s do not need to be explicitly constructed.
-
-            /// They are a helper class for the SrsTarget class.
-            /// They are named after the path of their source file (without
-            /// file extension) from the root of their source repository.
-            SrsPartTarget(String name);
-            friend class SrsTarget;
-
-            /// Platformdependent command to generate the dependencies for the srs target.
-            static const Command command_dep(
-                String srsname,
-                Path sourcefile,
-                List<Path> include,
-                List<String> defs);
-    };
-
-    class SrsTarget : public Target, public HasDependencies, public IsCleanable
-    {
-        public:
-            /// Sets defines for srs processing.
-            /// \$\$(DEFS) contains the current flags and can be used, if
-            /// just a few need to be modified.
-            void set_defs(List<String> defs);
-            /// Sets the include paths for srs processing.
-            /// \$\$(INCLUDE) contains the current paths and can be used, if
-            /// just a few need to be modified.
-            void set_include(List<String> include);
-            /// Adds a SrsPartTarget to be processed.
-            void add_file(SrsPartTarget part);
-            /// Adds multiple SrsPartTarget s to be processed.
-            void add_files(List<SrsPartTarget> parts);
-        private:
-            /// SrsTarget s do not need to be explicitly constructed.
-
-            /// They are a helper class for the ResTarget class.
-            SrsTarget(String name);
-            friend class ResTarget;
-
-            List<String> DEFS;
-            List<String> INCLUDE
-            List<SrsPartTarget> PARTS;
-            static const List<String> DEFAULTDEFS;
-    };
-
-    class ResTarget : public Target, public IsCleanable, public HasSrs
-    {
-        public:
-            void add_file(Path file);
-            void add_files(List<Path> files);
-        private:
-            /// ResTarget do not need to be explicitly constructed.
-
-            /// They are a helper class for the AllLangResTarget class.
-            ResTarget(String name, String library, Language lang, Path reslocation);
-            friend class AllLangResTarget;
-
-            String LIBRARY;
-            Language LANGUAGE;
-            Path RESLOCATION;
-    };
-
-    class AllLangResTarget : public Target, public IsCleanable, public HasSrs
-    {
-        public:
-            AllLangResTarget(String name);
-            /// Sets the location where resources are to be found. reslocation is a path relative to the icon-themes/galaxy directory.
-            /// Resources will be found in reslocation itself and in the subdirectories res/ of it and again in subdirectories
-            /// of those named as the language of the processed resource. In addition, resources are found in the res/ directory directly
-            /// below icon-themes/galaxy and the subdirectory of it named as the language of the processed resource.
-            void set_reslocation(Path reslocation);
-        private:
-            /// Sets the languages for which to create resources.
-            static void set_langs(List<Language> langs);
-
-            /// The list of languages that need to be build.
-            static List<Language> LANGS;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
index cf10d4db8bdf..7e606bd02731 100644
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -158,15 +158,6 @@ namespace gb { namespace types
             /// just a few need to be modified.
             void set_include(List<Path> include);
     };
-    /// A target using the resource compiler
-    class UsesRsc
-    {
-        public:
-            /// The command to execute rsc.
-            static const Command RSCCOMMAND;
-            /// The target on with to depend to make sure the rsc executable is available.
-            static const Path RSCTARGET;
-    };
     /// A target processing a set of srs files
     class HasSrs
     {
diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
new file mode 100644
index 000000000000..e94ba29057be
--- /dev/null
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -0,0 +1,105 @@
+# -*- 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/.
+#
+# 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 .
+#
+
+# Overview of dependencies and tasks of AllLangMoTarget
+#
+# target                task                depends on
+# AllLangMoTarget      nothing              MoTarget for all active langs
+# MoTarget             running msgfmt
+
+gb_MoTarget_LOCALESTRDEPS := $(call gb_Executable_get_runtime_dependencies,localestr)
+gb_MoTarget_LOCALESTRCOMMAND := $(call gb_Executable_get_command,localestr)
+
+# MoTarget
+
+$(call gb_MoTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),RES,2)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f \
+			$(call gb_MoTarget_get_target,$*) \
+			$(call gb_MoTarget_get_install_target,$*))
+
+#for the moment merge existing source and ui translations into a single .po,
+#and minimize msgctxt
+#eventually instead can do something like
+#msgfmt $(gb_POLOCATION)/$(LANGUAGE)/$(LIBRARY)/messages.po -o $@)
+$(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY) $(gb_MoTarget_LOCALESTRDEPS)
+	$(call gb_Output_announce,$*,$(true),MO,2)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && \
+		$(MSGUNIQ) $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@)
+
+#$(info $(call gb_MoTarget_get_target,$(1)))
+define gb_MoTarget_MoTarget
+$(call gb_MoTarget_get_target,$(1)) : LIBRARY = $(2)
+$(call gb_MoTarget_get_target,$(1)) : LANGUAGE = $(3)
+$(call gb_MoTarget_get_target,$(1)) : POLOCATION = $(2)
+$(call gb_AllLangMoTarget_get_clean_target,$(2)) : $(call gb_MoTarget_get_clean_target,$(1))
+
+endef
+
+define gb_MoTarget_set_polocation
+$(call gb_MoTarget_get_target,$(1)) : POLOCATION = $(2)
+
+endef
+
+# AllLangMoTarget
+
+gb_AllLangMoTarget_LANGS := $(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG)))
+
+define gb_AllLangMoTarget_set_langs
+gb_AllLangMoTarget_LANGS := $(1)
+endef
+
+$(call gb_AllLangMoTarget_get_clean_target,%) :
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_AllLangMoTarget_get_target,$*))
+
+$(call gb_AllLangMoTarget_get_target,%) : $(gb_MoTarget_LOCALESTRDEPS)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(dir $@) && touch $@)
+
+gb_MoTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).mo
+
+define gb_AllLangMoTarget_AllLangMoTarget
+ifeq (,$$(filter $(1),$$(gb_AllLangMoTarget_REGISTERED)))
+$$(eval $$(call gb_Output_info,Currently known AllLangMoTargets are: $(sort $(gb_AllLangMoTarget_REGISTERED)),ALL))
+$$(eval $$(call gb_Output_error,AllLangMoTarget $(1) must be registered in Repository.mk))
+endif
+$(foreach lang,$(gb_AllLangMoTarget_LANGS),\
+	$(call gb_MoTarget_MoTarget,$(1)$(lang),$(1),$(lang)))
+
+$(foreach lang,$(gb_AllLangMoTarget_LANGS),\
+$(call gb_Helper_install,$(call gb_AllLangMoTarget_get_target,$(1)), \
+	$(call gb_MoTarget_get_install_target,$(shell $(SRCDIR)/bin/run localestr $(lang))/LC_MESSAGES/$(1)), \
+	$(call gb_MoTarget_get_target,$(1)$(lang))))
+
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangMoTarget_get_target,$(1)),$(call gb_AllLangMoTarget_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangMoTarget)
+$(call gb_Postprocess_register_target,AllResources,AllLangMoTarget,$(1))
+
+endef
+
+define gb_AllLangMoTarget_set_polocation
+$(foreach lang,$(gb_AllLangMoTarget_LANGS),\
+        $(call gb_MoTarget_set_polocation,$(1)$(lang),$(2)))
+
+endef
+
+# vim: set noet sw=4: 
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
deleted file mode 100644
index 3976ecc002ff..000000000000
--- a/solenv/gbuild/AllLangResTarget.mk
+++ /dev/null
@@ -1,346 +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/.
-#
-# 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 .
-#
-
-
-# Overview of dependencies and tasks of SrsTarget
-#
-# target                task                depends on
-# SrsTarget             joining the parts   SrsPartTarget
-# SrsPartTarget         preprocessing       SrsPartMergeTarget (with l10n)
-#                                           source file (without l10n)
-# SrsPartMergeTarget    merging/transex     source file (only needed with l10n)
-
-# Overview of dependencies and tasks of AllLangResTarget
-#
-# target                task                depends on
-# AllLangResTarget      nothing             ResTarget for all active langs
-# ResTarget             running rsc         SrsTarget, resources
-
-
-# SrsPartMergeTarget class
-
-gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3)
-
-define gb_SrsPartMergeTarget__command
-MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-i $(3) \
-		-o $(1) \
-		-m $${MERGEINPUT} \
-		-l all \
-		$(if $(filter MSC,$(COM)),$(if $(strip $(gb_WITH_LANG)),-b))) && \
-rm -rf $${MERGEINPUT}
-
-endef
-
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXDEPS)
-	$(call gb_Output_announce,$*,$(true),SRS,1)
-	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
-		$(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
-		mkdir -p $(dir $@) && cp $< $@)
-
-# translations are optional - use "wildcard" to avoid spurious re-builds
-# when they don't exist
-define gb_SrsPartMergeTarget_SrsPartMergeTarget
-$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)))
-endef
-
-define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : POFILES := $(2)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(2)
-$(2) :
-endef
-
-# SrsPartTarget class
-
-# defined by platform
-#  gb_SrsPartTarget__command_dep
-
-gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
-gb_ResTarget_RSCCOMMAND = $(call gb_Executable_get_command,rsc)
-
-define gb_SrsPartTarget__command
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "-s \
-		$(INCLUDE) \
-		-I$(dir $(3)) \
-		$(DEFS) \
-		-D__RSC \
-		-fp=$(1) \
-		$(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
-	$(gb_ResTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
-	rm -rf $${RESPONSEFILE})
-
-endef
-
-$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
-		$(gb_ResTarget_RSCDEPS) $(gb_SrsPartTarget__command_target)
-	$(call gb_SrsPartTarget__command_dep,$*,$<)
-	$(call gb_SrsPartTarget__command,$@,$*,$<)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@))
-endif
-
-
-define gb_SrsPartTarget_SrsPartTarget
-ifeq ($(strip $(gb_WITH_LANG)),)
-$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := 
-else
-$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1))
-endif
-
-endef
-
-# SrsTarget class
-
-gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
-
-.PHONY : $(call gb_SrsTarget_get_clean_target,%)
-$(call gb_SrsTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),SRS,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_SrsTarget_get_target,$*) \
-			$(call gb_SrsTarget_get_dep_target,$*) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_SrsTarget__command_dep
-$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-		$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part)))) && \
-	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
-	rm -f $${RESPONSEFILE}
-endef
-endif
-
-$(call gb_SrsTarget_get_headers_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-	    mkdir -p $(dir $@) && touch $@)
-
-# This recipe actually also builds the dep-target as a side-effect, which
-# is an optimization to reduce incremental build time.
-$(call gb_SrsTarget_get_target,%) :
-ifeq ($(gb_FULLDEPS),$(true))
-	$(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*)
-endif
-	$(call gb_Output_announce,$*,$(true),SRS,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		cat $^ > $@)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,%) : \
-		$(call gb_Executable_get_runtime_dependencies,concat-deps)
-	$(call gb_SrsTarget__command_dep,$@,$*)
-endif
-
-define gb_SrsTarget_SrsTarget
-$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
-$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
-$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
-$(call gb_SrsTarget_get_target,$(1)) : PARTS :=
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : PARTS :=
--include $(call gb_SrsTarget_get_dep_target,$(1))
-endif
-
-endef
-
-define gb_SrsTarget_set_defs
-$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : DEFS := $(2)
-endif
-
-endef
-
-define gb_SrsTarget_set_include
-$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
-
-endef
-
-define gb_SrsTarget__add_file
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_target,$(2))
-endif
-$(call gb_SrsPartTarget_SrsPartTarget,$(2))
-$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
-$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_headers_target,$(1))
-$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : PARTS += $(2)
-endif
-
-endef
-
-define gb_SrsTarget_add_file
-$(call gb_SrsTarget__add_file,$(1),$(2))
-
-endef
-
-define gb_SrsTarget_add_files
-$(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
-
-endef
-
-# ResTarget
-
-gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/
-
-$(call gb_ResTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RES,2)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f \
-			$(call gb_ResTarget_get_target,$*) \
-			$(call gb_ResTarget_get_install_target,$*))
-
-$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
-		$(gb_ResTarget_RSCDEPS)
-	$(call gb_Output_announce,$*,$(true),RES,2)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		RESPONSEFILE=`$(gb_MKTEMP)` && \
-		echo "-r -p \
-			-lg$(LANGUAGE) \
-			-fs=$@ \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-			-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
-			-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-			$(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCDEPS),$^)" \
-			> $${RESPONSEFILE} && \
-		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
-		rm -f $${RESPONSEFILE})
-
-#$(info $(call gb_ResTarget_get_target,$(1)))
-define gb_ResTarget_ResTarget
-$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
-$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
-$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
-$(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
-
-endef
-
-define gb_ResTarget_add_file
-$(call gb_ResTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_ResTarget_add_one_srs
-$(call gb_ResTarget_add_file,$(1),$(call gb_SrsTarget_get_target,$(2)))
-$(call gb_ResTarget_get_clean_target,$(1)) : $(call gb_SrsTarget_get_clean_target,$(2))
-
-endef
-
-define gb_ResTarget_add_files
-$(foreach file,$(2),\
-	$(call gb_ResTarget_add_file,$(1),$(file)))
-
-endef
-
-define gb_ResTarget_add_srs
-$(foreach srs,$(2),\
-	$(call gb_ResTarget_add_one_srs,$(1),$(srs)))
-
-endef
-
-define gb_ResTarget_set_reslocation
-$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
-
-endef
-
-
-# AllLangResTarget
-
-gb_AllLangResTarget_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-
-define gb_AllLangResTarget_set_langs
-gb_AllLangResTarget_LANGS := $(1)
-endef
-
-$(call gb_AllLangResTarget_get_clean_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_AllLangResTarget_get_target,$*))
-
-$(call gb_AllLangResTarget_get_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && touch $@)
-
-gb_ResTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
-
-define gb_AllLangResTarget_AllLangResTarget
-ifeq (,$$(filter $(1),$$(gb_AllLangResTarget_REGISTERED)))
-$$(eval $$(call gb_Output_info,Currently known AllLangResTargets are: $(sort $(gb_AllLangResTarget_REGISTERED)),ALL))
-$$(eval $$(call gb_Output_error,AllLangResTarget $(1) must be registered in Repository.mk))
-endif
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
-
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-$(call gb_Helper_install,$(call gb_AllLangResTarget_get_target,$(1)), \
-	$(call gb_ResTarget_get_install_target,$(1)$(lang)), \
-	$(call gb_ResTarget_get_target,$(1)$(lang))))
-
-$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget)
-$(call gb_Postprocess_register_target,AllResources,AllLangResTarget,$(1))
-
-endef
-
-define gb_AllLangResTarget_add_one_srs
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
-
-endef
-
-define gb_AllLangResTarget_add_srs
-$(foreach srs,$(2),\
-	$(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
-
-endef
-
-define gb_AllLangResTarget_set_reslocation
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
-
-endef
-
-# vim: set noet sw=4: 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 5883ead35a9b..cc6a70d1b5e1 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -77,6 +77,7 @@ define gb_CppunitTest__make_args
 $(HEADLESS) \
 "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \
 "-env:BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)" \
+"-env:BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)" \
 "-env:UserInstallation=$(call gb_Helper_make_url,$(call gb_CppunitTest_get_target,$*).user)" \
 $(if $(URE),\
     $(if $(strip $(CONFIGURATION_LAYERS)),\
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0d45f071826e..688f5963a1f5 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -257,9 +257,8 @@ gb_Package_MODULE_$(1) += $(2)
 
 endef
 
-# TODO: this should be extended to handle auto-installation.
-define gb_Helper_register_resources
-gb_AllLangResTarget_REGISTERED += $(1)
+define gb_Helper_register_mos
+gb_AllLangMoTarget_REGISTERED += $(1)
 
 endef
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 9f94b8d6fcad..a38e163db7ea 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -217,7 +217,6 @@ $(eval $(foreach method,\
 	use_package \
 	use_packages \
 	use_unpacked \
-	use_restarget \
 	add_sdi_headers \
 	set_precompiled_header \
 	export_objects_list \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 23d0999112af..d75b7fe1e355 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -978,7 +978,6 @@ gb_BUILD_HELPER_LIBS := basegfx \
 # tools libmerged depends on, so they link against gb_BUILD_HELPER_LIBS
 gb_BUILD_HELPER_TOOLS := $(foreach exe,\
 	cppumaker \
-	rsc \
 	svidl \
 	unoidl-check \
 	unoidl-write \
@@ -1494,16 +1493,6 @@ $(call gb_LinkTarget_get_headers_target,$(1)) :| \
 
 endef
 
-# Delay linking until a res target has been built. This is needed so that
-# unit tests using libraries do not fail if the res target is not yet built.
-#
-# call gb_LinkTarget_use_restarget,linktarget,restarget(s)
-define gb_LinkTarget_use_restarget
-$(call gb_LinkTarget_get_target,$(1)) :| \
-	$(foreach res,$(2),$(call gb_AllLangResTarget_get_target,$(res)))
-
-endef
-
 # this forwards to functions that must be defined in RepositoryExternal.mk.
 # Automatically forward for libmerged library too when linktarget is merged.
 #
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 4073dcfd9bf5..bd1873544f91 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -228,8 +228,7 @@ showmodules :
 
 translations : $(WORKDIR)/pot.done
 
-$(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \
-									propex uiex ulfex xrmex treex, \
+$(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex treex, \
 							$(call gb_Executable_get_target_for_build,$(exec)))
 	$(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1)
 	$(call gb_Helper_abbreviate_dirs,\
@@ -292,7 +291,7 @@ endif
 endef
 
 define gb_Module_add_target
-$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),$(warning target $(2) should be a l10n target))
+$(if $(filter AllLang% Dictionary% Package_registry,$(2)),$(warning target $(2) should be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
 $(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
@@ -301,7 +300,7 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 endef
 
 define gb_Module_add_l10n_target
-$(if $(filter AllLang% CustomTarget_autotextshare Dictionary% UIConfig% Package_registry,$(2)),,$(warning target $(2) should not be a l10n target))
+$(if $(filter AllLang% CustomTarget_autotextshare Dictionary% Package_registry,$(2)),,$(warning target $(2) should not be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
 $(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 8ec6c4610ca3..4518b00b5d69 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -35,7 +35,7 @@ gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FO
 gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
 gb_AllLangHelp_get_target = $(WORKDIR)/AllLangHelp/$(1)
 gb_AllLangPackage_get_target = $(WORKDIR)/AllLangPackage/$(1)
-gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
+gb_AllLangMoTarget_get_target = $(WORKDIR)/AllLangMo/$(1)
 gb_AsmObject_get_target = $(WORKDIR)/AsmObject/$(1).o
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
@@ -145,6 +145,7 @@ gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
 gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
+gb_MoTarget_get_target = $(WORKDIR)/MoTarget/$(1).mo
 gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
 gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre
 gb_ScpTarget_get_external_target = $(WORKDIR)/ScpTarget/$(1).external
@@ -160,8 +161,6 @@ gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename
 gb_UIConfig_get_imagelist_target = $(WORKDIR)/UIConfig/$(1).ilst
 gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1).done
 gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst
-gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
-gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
 gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml
 gb_UITest_get_target = $(WORKDIR)/UITest/$(1)/done
 gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
@@ -227,7 +226,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	AutoInstall \
 	AllLangHelp \
 	AllLangPackage \
-	AllLangResTarget \
+	AllLangMoTarget \
 	CliAssembly \
 	CliAssemblyTarget \
 	CliConfigTarget \
@@ -287,7 +286,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	ExternalProject \
 	UIConfig \
 	UIImageListTarget \
-	UILocalizeTarget \
 	UIMenubarTarget \
 	UITest \
 	UnoApi \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 55446a31851d..01bfdbaea5b6 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -7,76 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# class UILocalizeTarget
-
-# Produces translations for one .ui file.
-
-gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
-
-gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
-gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
-
-# If translatable strings from a .ui file are not merged into the
-# respective .po file yet, the produced translated files are empty,
-# which breaks delivery. This hack avoids the problem by creating a
-# dummy translation file.
-$(call gb_UILocalizeTarget_get_workdir,%).ui :
-	$(if $(wildcard $@) \
-		,touch $@ \
-		,echo '<?xml version="1.0"?><t></t>' > $@ \
-	)
-
-define gb_UILocalizeTarget__command
-$(call gb_Output_announce,$(2),$(true),UIX,1)
-MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
-$(call gb_Helper_abbreviate_dirs,\
-	$(gb_UILocalizeTarget_COMMAND) \
-		-i $(UIConfig_FILE) \
-		-o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
-		-l all \
-		-m $${MERGEINPUT} \
-	&& touch $(1) \
-) && \
-rm -rf $${MERGEINPUT}
-endef
-
-$(dir $(call gb_UILocalizeTarget_get_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
-	$(call gb_UILocalizeTarget__command,$@,$*)
-
-.PHONY : $(call gb_UILocalizeTarget_get_clean_target,%)
-$(call gb_UILocalizeTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UIX,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -rf $(call gb_UILocalizeTarget_get_target,$*) $(call gb_UILocalizeTarget_get_workdir,$*) \
-	)
-
-# Produce translations for one .ui file
-#
-# gb_UILocalizeTarget_UILocalizeTarget target
-define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(2),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po)))
-
-endef
-
-# gb_UILocalizeTarget__UILocalizeTarget_impl target pofiles
-define gb_UILocalizeTarget__UILocalizeTarget_impl
-$(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(3)
-$(call gb_UILocalizeTarget_get_target,$(1)) : UIConfig_FILE := $(SRCDIR)/$(2).ui
-
-$(call gb_UILocalizeTarget_get_target,$(1)) : $(3)
-$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(2).ui
-$(call gb_UILocalizeTarget_get_target,$(1)) :| \
-	$(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir \
-	$(call gb_UILocalizeTarget_get_workdir,$(1))/.dir
-
-endef
-
 # class UIMenubarTarget
 
 # Handles platform-specific processing of menubar config files.
@@ -162,13 +92,8 @@ endef
 #
 # This class provides the following filelists:
 # * UIConfig/<name> containing all nontranslatable files
-# * UIConfig/<name>_<lang> for each active lang, containing translations
-#   of .ui files. This filelist only exists if the UIConfig contains any
-#   .ui files.
 
 gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
-# en-US is the default, so there is no translation for it
-gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
 $(dir $(call gb_UIConfig_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -194,7 +119,6 @@ $(call gb_UIConfig_get_clean_target,%) :
 
 gb_UIConfig_get_packagename = UIConfig/$(1)
 gb_UIConfig_get_packagesetname = UIConfig/$(1)
-gb_UIConfig_get_zipname_for_lang = UIConfig/$(1)/$(2)
 
 # Processes and delivers a set of UI configuration files.
 #
@@ -217,26 +141,12 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) :| $(dir $(call gb_UIConfig_get_im
 $(call gb_UIConfig_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call gb_UIConfig_get_packagesetname,$(1)))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_UIConfig_get_packagesetname,$(1)))
 
-ifneq ($(gb_UIConfig_LANGS),)
-$(foreach lang,$(gb_UIConfig_LANGS),$(call gb_UIConfig__UIConfig_for_lang,$(1),$(lang)))
-endif
-
 $$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),UIConfig)
 $(call gb_Postprocess_register_target,AllUIConfigs,UIConfig,$(1))
 
 endef
 
-define gb_UIConfig__UIConfig_for_lang
-$(call gb_UIConfig_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)))
-$(call gb_Zip_Zip_internal,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)/$(1))
-$(call gb_Zip_add_commandoptions,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),--suffixes .ui)
-$(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) : $(SRCDIR)/solenv/gbuild/UIConfig.mk
-$(call gb_Zip_set_install_name,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(INSTROOT)/$(gb_UIConfig_INSTDIR)/$(1)/ui/res/$(2).zip)
-
-endef
-
 # gb_UIConfig__package_file target package type destfile srcfile
 define gb_UIConfig__package_file
 $(call gb_Package_add_file,$(2),$(gb_UIConfig_INSTDIR)/$(1)/$(3)/$(4),$(5))
@@ -260,56 +170,6 @@ $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIImageListTarget_get_clea
 
 endef
 
-# Add a l10n for an .ui file to respective lang package.
-#
-# gb_UIConfig__add_uifile_for_lang target file lang
-define gb_UIConfig__add_uifile_for_lang
-$(call gb_Zip_add_file,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(notdir $(2))/$(3).ui)
-$(call gb_Zip_add_dependency,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(call gb_UILocalizeTarget_get_target,$(1)/$(notdir $(2))))
-
-endef
-
-# Add a l10n for an .ui file to respective lang package.
-#
-# This is only for "real" languages, i.e., everything except qtz.
-#
-# gb_UIConfig__add_uifile_for_real_lang target file lang
-define gb_UIConfig__add_uifile_for_real_lang
-$(if $(filter qtz,$(3)),$(call gb_Output_error,gb_UIConfig__add_uifile_for_real_lang called with qtz))
-$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(3))
-
-endef
-
-# gb_UIConfig__add_translations_impl target uifile langs
-define gb_UIConfig__add_translations_impl
-$(call gb_UILocalizeTarget_UILocalizeTarget,$(1)/$(notdir $(2)),$(2))
-$(call gb_UIConfig_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(1)/$(notdir $(2)))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(1)/$(notdir $(2)))
-$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_real_lang,$(1),$(2),$(lang)))
-
-endef
-
-# gb_UIConfig__add_translations target uifile langs qtz
-define gb_UIConfig__add_translations
-$(if $(strip $(3) $(4)),$(call gb_UIConfig__add_translations_impl,$(1),$(2),$(3)))
-$(if $(strip $(4)),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
-
-endef
-
-# Adds translations for languages that have corresponding .po file
-#
-# gb_UIConfig__add_uifile_translations target uifile
-define gb_UIConfig__add_uifile_translations
-$(call gb_UIConfig__add_translations,$(1),$(2),\
-	$(foreach lang,$(gb_UIConfig_LANGS),\
-		$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \
-	),\
-	$(filter qtz,$(gb_UIConfig_LANGS)) \
-)
-
-endef
-
-
 gb_UIConfig_ALLFILES:=
 # Adds .ui file to the package
 #
@@ -320,10 +180,6 @@ define gb_UIConfig_add_uifile
 gb_UIConfig_ALLFILES+=$(1):$(notdir $(2))
 $(call gb_UIConfig__add_uifile,$(1),$(2))
 
-ifneq ($(gb_UIConfig_LANGS),)
-$(call gb_UIConfig__add_uifile_translations,$(1),$(2))
-endif
-
 endef
 
 # Adds multiple .ui files to the package
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 29bdf8d78f8c..e2da5726479d 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -146,7 +146,6 @@ gb_WinResTarget_add_defs =
 gb_LinkTarget_set_nativeres =
 gb_LinkTarget_add_nativeres =
 gb_Library_set_componentfile =
-gb_LinkTarget_use_restarget =
 
 #$(call gb_Library_get_exports_target,%):
 $(WORKDIR)/LinkTarget/Library/%.exports:
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk
index 1b05e9cc6a74..09d596ec2955 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -59,6 +59,11 @@ define gb_PackageInfo_emit_l10n_for_one_resource
 
 endef
 
+define gb_PackageInfo_emit_l10n_for_one_mo
+@echo "$(patsubst $(INSTDIR)/%,%,$(call gb_MoTarget_get_install_target,$(1)$(2)))" >> $(gb_PackageInfo_get_target)/l10n-$(2).files
+
+endef
+
 define gb_PackageInfo_emit_l10n_for_one_uizip
 @echo "$(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1).zip" >> $(gb_PackageInfo_get_target)/l10n-$(1).files
 
@@ -72,7 +77,7 @@ endef
 define gb_PackageInfo_emit_l10n_for_one_lang
 @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst %/,%,$(gb_AllLangPackage_ALLDIRS)),$(call gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1))))
-$(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangResTarget_REGISTERED),$(call gb_PackageInfo_emit_l10n_for_one_resource,$(target),$(1))))
+$(if $(filter $(gb_AllLangMoTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangMoTarget_REGISTERED),$(call gb_PackageInfo_emit_l10n_for_one_mo,$(target),$(1))))
 $(foreach uizip,\
     $(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst :,$(WHITESPACE),$(uifile))))),\
     $(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip)))
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 5daf671e082b..9e5b8df11814 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -24,12 +24,9 @@ gb_BUILD_TOOLS = \
 		javamaker \
 		makedepend \
 		propex \
-		rsc \
 		saxparser \
 		svidl \
-		transex3 \
 		treex \
-		uiex \
 		ulfex \
 		unoidl-check \
 		unoidl-write \
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 0b11b3698a2e..51094b42ae50 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -65,7 +65,7 @@ AVAILABLE TARGETS
                         CppunitTest_sw_macros_test)
        <target>.clean   clean gbuild target
        <class>_<target> for all targets and for the following classes:
-           o AllLangResTarget
+           o AllLangMoTarget
            o AllLangZip
            o CliLibrary
            o CliNativeLibrary
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 31183b012ac4..b29b15e82d8b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -266,7 +266,7 @@ $(eval $(call gb_Deliver_init))
 include $(foreach class, \
 	ComponentTarget \
 	Postprocess \
-	AllLangResTarget \
+	AllLangMoTarget \
 	WinResTarget \
 	LinkTarget \
 	Library \
diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index 8866c52c4e05..98c49ebb8d70 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -123,7 +123,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
         shutil.rmtree(self.tempwork)
 
     def test_gbuildtojson(self):
-        modules = ['accessibility', 'android', 'animations', 'apple_remote', 'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'rsc', 'salhelper', 'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 'xmlsecurity']
+        modules = ['accessibility', 'android', 'animations', 'apple_remote', 'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper', 'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 'xmlsecurity']
         if os.environ['OS'] == 'WNT':
             # for now, use a limited subset for testing on windows as it is so annoyingly slow on this
             modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox', 'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
diff --git a/starmath/AllLangMoTarget_sm.mk b/starmath/AllLangMoTarget_sm.mk
new file mode 100644
index 000000000000..7073577fafca
--- /dev/null
+++ b/starmath/AllLangMoTarget_sm.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,sm))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,sm,starmath))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
deleted file mode 100644
index 9ef487d8e51b..000000000000
--- a/starmath/AllLangResTarget_sm.mk
+++ /dev/null
@@ -1,32 +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,sm))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sm,\
-	sm/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sm/res))
-
-$(eval $(call gb_SrsTarget_set_include,sm/res,\
-	-I$(SRCDIR)/starmath/inc \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sm/res,\
-    starmath/source/smres.src \
-    starmath/source/commands.src \
-    starmath/source/symbol.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 831bf0e648a5..d87039dc8567 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -109,7 +109,4 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
         $$(INCLUDE) \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sm,sm))
-
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 004921143316..f7a65618ae4c 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Module_Module,starmath))
 $(eval $(call gb_Module_add_targets,starmath,\
     Library_sm \
     Library_smd \
+    UIConfig_smath \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,starmath,\
-    AllLangResTarget_sm \
-    UIConfig_smath \
+    AllLangMoTarget_sm \
 ))
 
 $(eval $(call gb_Module_add_check_targets,starmath,\
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 5c16ce50f210..79607eb2acf6 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -75,15 +75,15 @@ class SmElementsControl : public Control
     friend class ElementSelectorUIObject;
     friend class ElementUIObject;
 
-    static const std::pair<const char*, sal_uInt16> aUnaryBinaryOperatorsList[];
-    static const std::pair<const char*, sal_uInt16> aRelationsList[];
-    static const std::pair<const char*, sal_uInt16> aSetOperations[];
-    static const std::pair<const char*, sal_uInt16> aFunctions[];
-    static const std::pair<const char*, sal_uInt16> aOperators[];
-    static const std::pair<const char*, sal_uInt16> aAttributes[];
-    static const std::pair<const char*, sal_uInt16> aBrackets[];
-    static const std::pair<const char*, sal_uInt16> aFormats[];
-    static const std::pair<const char*, sal_uInt16> aOthers[];
+    static const std::pair<const char*, const char*> aUnaryBinaryOperatorsList[];
+    static const std::pair<const char*, const char*> aRelationsList[];
+    static const std::pair<const char*, const char*> aSetOperations[];
+    static const std::pair<const char*, const char*> aFunctions[];
+    static const std::pair<const char*, const char*> aOperators[];
+    static const std::pair<const char*, const char*> aAttributes[];
+    static const std::pair<const char*, const char*> aBrackets[];
+    static const std::pair<const char*, const char*> aFormats[];
+    static const std::pair<const char*, const char*> aOthers[];
 
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
@@ -92,7 +92,7 @@ class SmElementsControl : public Control
 
     SmDocShell*   mpDocShell;
     SmFormat      maFormat;
-    sal_uInt16    maCurrentSetId;
+    OString       msCurrentSetId;
     SmElement*    mpCurrentElement;
     Link<SmElement&,void> maSelectHdlLink;
 
@@ -103,7 +103,7 @@ class SmElementsControl : public Control
 
     void addElement(const OUString& aElementVisual, const OUString& aElementSource, const OUString& aHelpText);
 
-    void addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 size);
+    void addElements(const std::pair<const char*, const char*> aElementsArray[], sal_uInt16 size);
 
     void build();
 
@@ -116,7 +116,7 @@ public:
     virtual ~SmElementsControl() override;
     virtual void dispose() override;
 
-    void setElementSetId(sal_uInt16 aSetId);
+    void setElementSetId(const char* pSetId);
 
     void setVerticalMode(bool bVertical);
 
@@ -132,7 +132,7 @@ public:
 
 class SmElementsDockingWindow : public SfxDockingWindow
 {
-    static const sal_uInt16 aCategories[];
+    static const char* aCategories[];
 
     VclPtr<SmElementsControl>  mpElementsControl;
     VclPtr<ListBox>            mpElementListBox;
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 1d54e9079470..fc1924f14d7b 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -117,7 +117,6 @@
 #include <node.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <rect.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
@@ -145,7 +144,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
 #include <tools/wintypes.hxx>
diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc
new file mode 100644
index 000000000000..f946e61cc513
--- /dev/null
+++ b/starmath/inc/smmod.hrc
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_UI_SYMBOLSET_NAMES[] =
+{
+    NC_("RID_UI_SYMBOLSET_NAMES", "Greek"),
+    NC_("RID_UI_SYMBOLSET_NAMES", "Special")
+};
+
+const char* RID_UI_SYMBOL_NAMES[] =
+{
+    NC_("RID_UI_SYMBOL_NAMES", "alpha"),
+    NC_("RID_UI_SYMBOL_NAMES", "ALPHA"),
+    NC_("RID_UI_SYMBOL_NAMES", "beta"),
+    NC_("RID_UI_SYMBOL_NAMES", "BETA"),
+    NC_("RID_UI_SYMBOL_NAMES", "gamma"),
+    NC_("RID_UI_SYMBOL_NAMES", "GAMMA"),
+    NC_("RID_UI_SYMBOL_NAMES", "delta"),
+    NC_("RID_UI_SYMBOL_NAMES", "DELTA"),
+    NC_("RID_UI_SYMBOL_NAMES", "epsilon"),
+    NC_("RID_UI_SYMBOL_NAMES", "EPSILON"),
+    NC_("RID_UI_SYMBOL_NAMES", "zeta"),
+    NC_("RID_UI_SYMBOL_NAMES", "ZETA"),
+    NC_("RID_UI_SYMBOL_NAMES", "eta"),
+    NC_("RID_UI_SYMBOL_NAMES", "ETA"),
+    NC_("RID_UI_SYMBOL_NAMES", "theta"),
+    NC_("RID_UI_SYMBOL_NAMES", "THETA"),
+    NC_("RID_UI_SYMBOL_NAMES", "iota"),
+    NC_("RID_UI_SYMBOL_NAMES", "IOTA"),
+    NC_("RID_UI_SYMBOL_NAMES", "kappa"),
+    NC_("RID_UI_SYMBOL_NAMES", "KAPPA"),
+    NC_("RID_UI_SYMBOL_NAMES", "lambda"),
+    NC_("RID_UI_SYMBOL_NAMES", "LAMBDA"),
+    NC_("RID_UI_SYMBOL_NAMES", "mu"),
+    NC_("RID_UI_SYMBOL_NAMES", "MU"),
+    NC_("RID_UI_SYMBOL_NAMES", "nu"),
+    NC_("RID_UI_SYMBOL_NAMES", "NU"),
+    NC_("RID_UI_SYMBOL_NAMES", "xi"),
+    NC_("RID_UI_SYMBOL_NAMES", "XI"),
+    NC_("RID_UI_SYMBOL_NAMES", "omicron"),
+    NC_("RID_UI_SYMBOL_NAMES", "OMICRON"),
+    NC_("RID_UI_SYMBOL_NAMES", "pi"),
+    NC_("RID_UI_SYMBOL_NAMES", "PI"),
+    NC_("RID_UI_SYMBOL_NAMES", "rho"),
+    NC_("RID_UI_SYMBOL_NAMES", "RHO"),
+    NC_("RID_UI_SYMBOL_NAMES", "sigma"),
+    NC_("RID_UI_SYMBOL_NAMES", "SIGMA"),
+    NC_("RID_UI_SYMBOL_NAMES", "tau"),
+    NC_("RID_UI_SYMBOL_NAMES", "TAU"),
+    NC_("RID_UI_SYMBOL_NAMES", "upsilon"),
+    NC_("RID_UI_SYMBOL_NAMES", "UPSILON"),
+    NC_("RID_UI_SYMBOL_NAMES", "phi"),
+    NC_("RID_UI_SYMBOL_NAMES", "PHI"),
+    NC_("RID_UI_SYMBOL_NAMES", "chi"),
+    NC_("RID_UI_SYMBOL_NAMES", "CHI"),
+    NC_("RID_UI_SYMBOL_NAMES", "psi"),
+    NC_("RID_UI_SYMBOL_NAMES", "PSI"),
+    NC_("RID_UI_SYMBOL_NAMES", "omega"),
+    NC_("RID_UI_SYMBOL_NAMES", "OMEGA"),
+    NC_("RID_UI_SYMBOL_NAMES", "varepsilon"),
+    NC_("RID_UI_SYMBOL_NAMES", "vartheta"),
+    NC_("RID_UI_SYMBOL_NAMES", "varpi"),
+    NC_("RID_UI_SYMBOL_NAMES", "varrho"),
+    NC_("RID_UI_SYMBOL_NAMES", "varsigma"),
+    NC_("RID_UI_SYMBOL_NAMES", "varphi"),
+    NC_("RID_UI_SYMBOL_NAMES", "element"),
+    NC_("RID_UI_SYMBOL_NAMES", "noelement"),
+    NC_("RID_UI_SYMBOL_NAMES", "strictlylessthan"),
+    NC_("RID_UI_SYMBOL_NAMES", "strictlygreaterthan"),
+    NC_("RID_UI_SYMBOL_NAMES", "notequal"),
+    NC_("RID_UI_SYMBOL_NAMES", "identical"),
+    NC_("RID_UI_SYMBOL_NAMES", "tendto"),
+    NC_("RID_UI_SYMBOL_NAMES", "infinite"),
+    NC_("RID_UI_SYMBOL_NAMES", "angle"),
+    NC_("RID_UI_SYMBOL_NAMES", "perthousand"),
+    NC_("RID_UI_SYMBOL_NAMES", "and"),
+    NC_("RID_UI_SYMBOL_NAMES", "or")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 0ddb2e7cd5cd..f50e6d540b2f 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -20,14 +20,11 @@
 #ifndef INCLUDED_STARMATH_INC_SMMOD_HXX
 #define INCLUDED_STARMATH_INC_SMMOD_HXX
 
-#include <tools/resary.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <sfx2/module.hxx>
 
-#include "starmath.hrc"
-
 #include <unotools/options.hxx>
 #include <memory>
 
@@ -51,26 +48,17 @@ class SvtSysLocale;
 class VirtualDevice;
 
 
-OUString SmResId(sal_uInt16 nId);
+OUString SmResId(const char* pId);
 
 class SmLocalizedSymbolData
 {
-    ResStringArray      aUiSymbolNamesAry;
-    ResStringArray      aExportSymbolNamesAry;
-    ResStringArray      aUiSymbolSetNamesAry;
-    ResStringArray      aExportSymbolSetNamesAry;
-
 public:
     SmLocalizedSymbolData();
     ~SmLocalizedSymbolData();
 
-    const ResStringArray& GetUiSymbolNamesArray() const     { return aUiSymbolNamesAry; }
-    const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
     static const OUString GetUiSymbolName( const OUString &rExportName );
     static const OUString GetExportSymbolName( const OUString &rUiName );
 
-    const ResStringArray& GetUiSymbolSetNamesArray() const     { return aUiSymbolSetNamesAry; }
-    const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
     static const OUString GetUiSymbolSetName( const OUString &rExportName );
     static const OUString GetExportSymbolSetName( const OUString &rUiName );
 };
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 7775cb9fab64..b191713a9f79 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -72,344 +72,8 @@
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
 #define SID_AUTO_CLOSE_BRACKETS     (SID_SMA_START + 127)
 
-#define RID_PRINTUIOPT_PRODNAME     (RID_APP_START + 11)
-#define RID_PRINTUIOPT_CONTENTS     (RID_APP_START + 12)
-#define RID_PRINTUIOPT_TITLE        (RID_APP_START + 13)
-#define RID_PRINTUIOPT_FRMLTXT      (RID_APP_START + 14)
-#define RID_PRINTUIOPT_BORDERS      (RID_APP_START + 15)
-#define RID_PRINTUIOPT_SIZE         (RID_APP_START + 16)
-#define RID_PRINTUIOPT_ORIGSIZE     (RID_APP_START + 17)
-#define RID_PRINTUIOPT_FITTOPAGE    (RID_APP_START + 18)
-#define RID_PRINTUIOPT_SCALING      (RID_APP_START + 19)
-
-#define RID_FONTREGULAR             (RID_APP_START + 804)
-#define RID_FONTITALIC              (RID_APP_START + 805)
-#define RID_FONTBOLD                (RID_APP_START + 806)
-#define RID_DOCUMENTSTR             (RID_APP_START + 808)
 #define RID_STATUSBAR               (RID_APP_START + 816)
 
-#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT  (RID_APP_START + 821)
-#define STR_STATSTR_READING                 (RID_APP_START + 823)
-#define STR_STATSTR_WRITING                 (RID_APP_START + 824)
-#define STR_CMDBOXWINDOW                    (RID_APP_START + 825)
-#define STR_BLACK                           (RID_APP_START + 826)
-#define STR_BLUE                            (RID_APP_START + 827)
-#define STR_GREEN                           (RID_APP_START + 828)
-#define STR_RED                             (RID_APP_START + 829)
-#define STR_CYAN                            (RID_APP_START + 830)
-#define STR_MAGENTA                         (RID_APP_START + 831)
-#define STR_YELLOW                          (RID_APP_START + 832)
-#define STR_HIDE                            (RID_APP_START + 833)
-#define STR_SIZE                            (RID_APP_START + 834)
-#define STR_FONT                            (RID_APP_START + 835)
-#define STR_ALIGN_LEFT                      (RID_APP_START + 836)
-#define STR_ALIGN_CENTER                    (RID_APP_START + 837)
-#define STR_ALIGN_RIGHT                     (RID_APP_START + 838)
-#define STR_GRAY                            (RID_APP_START + 841)
-#define STR_LIME                            (RID_APP_START + 842)
-#define STR_MAROON                          (RID_APP_START + 843)
-#define STR_NAVY                            (RID_APP_START + 844)
-#define STR_OLIVE                           (RID_APP_START + 845)
-#define STR_PURPLE                          (RID_APP_START + 846)
-#define STR_SILVER                          (RID_APP_START + 847)
-#define STR_TEAL                            (RID_APP_START + 848)
-
-#define RID_ERR_IDENT               (RID_APP_START + 920)
-#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 921)
-#define RID_ERR_UNEXPECTEDTOKEN     (RID_APP_START + 922)
-#define RID_ERR_LGROUPEXPECTED      (RID_APP_START + 923)
-#define RID_ERR_RGROUPEXPECTED      (RID_APP_START + 924)
-#define RID_ERR_LBRACEEXPECTED      (RID_APP_START + 925)
-#define RID_ERR_RBRACEEXPECTED      (RID_APP_START + 926)
-#define RID_ERR_PARENTMISMATCH      (RID_APP_START + 927)
-#define RID_ERR_FONTEXPECTED        (RID_APP_START + 928)
-#define RID_ERR_SIZEEXPECTED        (RID_APP_START + 929)
-#define RID_ERR_DOUBLEALIGN         (RID_APP_START + 930)
-#define RID_ERR_DOUBLESUBSUPSCRIPT  (RID_APP_START + 931)
-#define RID_ERR_POUNDEXPECTED       (RID_APP_START + 932)
-#define RID_ERR_COLOREXPECTED       (RID_APP_START + 933)
-// blank: 934 - 935
-#define RID_ERR_RIGHTEXPECTED       (RID_APP_START + 936)
-
-// Help text
-#define RID_PLUSX_HELP              (RID_APP_START + 1335)
-#define RID_MINUSX_HELP             (RID_APP_START + 1336)
-#define RID_PLUSMINUSX_HELP         (RID_APP_START + 1337)
-#define RID_MINUSPLUSX_HELP         (RID_APP_START + 1338)
-#define RID_XPLUSY_HELP             (RID_APP_START + 1339)
-#define RID_XCDOTY_HELP             (RID_APP_START + 1340)
-#define RID_XTIMESY_HELP            (RID_APP_START + 1341)
-#define RID_XSYMTIMESY_HELP         (RID_APP_START + 1342)
-#define RID_XMINUSY_HELP            (RID_APP_START + 1343)
-#define RID_XOVERY_HELP             (RID_APP_START + 1344)
-#define RID_XDIVY_HELP              (RID_APP_START + 1345)
-#define RID_XSYMDIVIDEY_HELP        (RID_APP_START + 1346)
-#define RID_NEGX_HELP               (RID_APP_START + 1347)
-// blank: 1348 - 1357
-#define RID_XANDY_HELP              (RID_APP_START + 1358)
-#define RID_XORY_HELP               (RID_APP_START + 1359)
-#define RID_XODIVIDEY_HELP          (RID_APP_START + 1360)
-#define RID_XODOTY_HELP             (RID_APP_START + 1361)
-#define RID_XOMINUSY_HELP           (RID_APP_START + 1362)
-#define RID_XOPLUSY_HELP            (RID_APP_START + 1363)
-#define RID_XOTIMESY_HELP           (RID_APP_START + 1364)
-#define RID_XCIRCY_HELP             (RID_APP_START + 1365)
-#define RID_XWIDESLASHY_HELP        (RID_APP_START + 1366)
-#define RID_XWIDEBSLASHY_HELP       (RID_APP_START + 1367)
-#define RID_RSUBX_HELP              (RID_APP_START + 1368)
-#define RID_RSUPX_HELP              (RID_APP_START + 1369)
-#define RID_BINOMXY_HELP            (RID_APP_START + 1370)
-#define RID_STACK_HELP              (RID_APP_START + 1371)
-#define RID_MATRIX_HELP             (RID_APP_START + 1372)
-#define RID_LSUBX_HELP              (RID_APP_START + 1373)
-#define RID_LSUPX_HELP              (RID_APP_START + 1374)
-#define RID_CSUBX_HELP              (RID_APP_START + 1375)
-#define RID_CSUPX_HELP              (RID_APP_START + 1376)
-#define RID_NOSPACE_HELP            (RID_APP_START + 1377)
-#define RID_NEWLINE_HELP            (RID_APP_START + 1378)
-#define RID_SBLANK_HELP             (RID_APP_START + 1379)
-#define RID_BLANK_HELP              (RID_APP_START + 1380)
-#define RID_RE_HELP                 (RID_APP_START + 1381)
-#define RID_IM_HELP                 (RID_APP_START + 1382)
-#define RID_INFINITY_HELP           (RID_APP_START + 1383)
-#define RID_PARTIAL_HELP            (RID_APP_START + 1384)
-#define RID_WP_HELP                 (RID_APP_START + 1385)
-#define RID_DOTSAXIS_HELP           (RID_APP_START + 1386)
-#define RID_DOTSUP_HELP             (RID_APP_START + 1387)
-#define RID_DOTSDOWN_HELP           (RID_APP_START + 1388)
-#define RID_DOTSLOW_HELP            (RID_APP_START + 1389)
-#define RID_DOTSVERT_HELP           (RID_APP_START + 1390)
-#define RID_NABLA_HELP              (RID_APP_START + 1391)
-#define RID_HBAR_HELP               (RID_APP_START + 1392)
-#define RID_LAMBDABAR_HELP          (RID_APP_START + 1393)
-#define RID_LEFTARROW_HELP          (RID_APP_START + 1394)
-#define RID_RIGHTARROW_HELP         (RID_APP_START + 1395)
-#define RID_UPARROW_HELP            (RID_APP_START + 1396)
-#define RID_DOWNARROW_HELP          (RID_APP_START + 1397)
-#define RID_EXISTS_HELP             (RID_APP_START + 1398)
-#define RID_NOTEXISTS_HELP          (RID_APP_START + 1399)
-#define RID_FORALL_HELP             (RID_APP_START + 1400)
-
-#define RID_UI_SYMBOL_NAMES             (RID_APP_START + 3102)
-#define RID_EXPORT_SYMBOL_NAMES         (RID_APP_START + 3103)
-#define RID_UI_SYMBOLSET_NAMES          (RID_APP_START + 3105)
-#define RID_EXPORT_SYMBOLSET_NAMES      (RID_APP_START + 3106)
-
-#define RID_CATEGORY_UNARY_BINARY_OPERATORS (RID_APP_START + 4001)
-#define RID_CATEGORY_RELATIONS              (RID_APP_START + 4002)
-#define RID_CATEGORY_SET_OPERATIONS         (RID_APP_START + 4003)
-#define RID_CATEGORY_FUNCTIONS              (RID_APP_START + 4004)
-#define RID_CATEGORY_OPERATORS              (RID_APP_START + 4005)
-#define RID_CATEGORY_ATTRIBUTES             (RID_APP_START + 4006)
-#define RID_CATEGORY_BRACKETS               (RID_APP_START + 4007)
-#define RID_CATEGORY_FORMATS                (RID_APP_START + 4008)
-#define RID_CATEGORY_OTHERS                 (RID_APP_START + 4009)
-#define RID_CATEGORY_EXAMPLES               (RID_APP_START + 4010)
-
-// more tooltips help texts
-#define RID_XEQY_HELP               (RID_APP_START + 4011)
-#define RID_XNEQY_HELP              (RID_APP_START + 4012)
-#define RID_XEQUIVY_HELP            (RID_APP_START + 4013)
-#define RID_XORTHOY_HELP            (RID_APP_START + 4014)
-#define RID_XLTY_HELP               (RID_APP_START + 4015)
-#define RID_XGTY_HELP               (RID_APP_START + 4016)
-#define RID_XAPPROXY_HELP           (RID_APP_START + 4017)
-#define RID_XPARALLELY_HELP         (RID_APP_START + 4018)
-#define RID_XLESLANTY_HELP          (RID_APP_START + 4019)
-#define RID_XGESLANTY_HELP          (RID_APP_START + 4020)
-#define RID_XSIMEQY_HELP            (RID_APP_START + 4021)
-#define RID_XPROPY_HELP             (RID_APP_START + 4022)
-#define RID_XLEY_HELP               (RID_APP_START + 4023)
-#define RID_XGEY_HELP               (RID_APP_START + 4024)
-#define RID_XSIMY_HELP              (RID_APP_START + 4025)
-#define RID_XTOWARDY_HELP           (RID_APP_START + 4026)
-#define RID_XLLY_HELP               (RID_APP_START + 4027)
-#define RID_XGGY_HELP               (RID_APP_START + 4028)
-#define RID_XDEFY_HELP              (RID_APP_START + 4029)
-#define RID_XTRANSLY_HELP           (RID_APP_START + 4030)
-#define RID_XTRANSRY_HELP           (RID_APP_START + 4031)
-#define RID_XDIVIDESY_HELP          (RID_APP_START + 4032)
-#define RID_XNDIVIDESY_HELP         (RID_APP_START + 4033)
-#define RID_DLARROW_HELP            (RID_APP_START + 4034)
-#define RID_DLRARROW_HELP           (RID_APP_START + 4035)
-#define RID_DRARROW_HELP            (RID_APP_START + 4036)
-#define RID_XPRECEDESY_HELP         (RID_APP_START + 4037)
-#define RID_XNOTPRECEDESY_HELP      (RID_APP_START + 4038)
-#define RID_XSUCCEEDSY_HELP         (RID_APP_START + 4039)
-#define RID_XNOTSUCCEEDSY_HELP      (RID_APP_START + 4040)
-#define RID_XPRECEDESEQUALY_HELP    (RID_APP_START + 4041)
-#define RID_XSUCCEEDSEQUALY_HELP    (RID_APP_START + 4042)
-#define RID_XPRECEDESEQUIVY_HELP    (RID_APP_START + 4043)
-#define RID_XSUCCEEDSEQUIVY_HELP    (RID_APP_START + 4044)
-#define RID_XINY_HELP               (RID_APP_START + 4045)
-#define RID_XNOTINY_HELP            (RID_APP_START + 4046)
-#define RID_XOWNSY_HELP             (RID_APP_START + 4047)
-#define RID_XINTERSECTIONY_HELP     (RID_APP_START + 4048)
-#define RID_XUNIONY_HELP            (RID_APP_START + 4049)
-#define RID_XSETMINUSY_HELP         (RID_APP_START + 4050)
-#define RID_XSLASHY_HELP            (RID_APP_START + 4051)
-#define RID_XSUBSETY_HELP           (RID_APP_START + 4052)
-#define RID_XSUBSETEQY_HELP         (RID_APP_START + 4053)
-#define RID_XSUPSETY_HELP           (RID_APP_START + 4054)
-#define RID_XSUPSETEQY_HELP         (RID_APP_START + 4055)
-#define RID_LRPARENTX_HELP          (RID_APP_START + 4056)
-#define RID_LRBRACKETX_HELP         (RID_APP_START + 4057)
-#define RID_LRANGLEX_HELP           (RID_APP_START + 4058)
-#define RID_LRBRACEX_HELP           (RID_APP_START + 4059)
-#define RID_LRLINEX_HELP            (RID_APP_START + 4060)
-#define RID_LRDLINEX_HELP           (RID_APP_START + 4061)
-#define RID_LRGROUPX_HELP           (RID_APP_START + 4062)
-#define RID_SLRPARENTX_HELP         (RID_APP_START + 4063)
-#define RID_SLRBRACKETX_HELP        (RID_APP_START + 4064)
-#define RID_SLRANGLEX_HELP          (RID_APP_START + 4065)
-#define RID_SLRBRACEX_HELP          (RID_APP_START + 4066)
-#define RID_SLRLINEX_HELP           (RID_APP_START + 4067)
-#define RID_SLRDLINEX_HELP          (RID_APP_START + 4068)
-#define RID_LRCEILX_HELP            (RID_APP_START + 4069)
-// blank: 4070
-#define RID_LRFLOORX_HELP           (RID_APP_START + 4071)
-#define RID_SLRCEILX_HELP           (RID_APP_START + 4072)
-#define RID_SLRFLOORX_HELP          (RID_APP_START + 4073)
-#define RID_LMRANGLEXY_HELP         (RID_APP_START + 4074)
-#define RID_SLMRANGLEXY_HELP        (RID_APP_START + 4075)
-#define RID_LRDBRACKETX_HELP        (RID_APP_START + 4076)
-#define RID_SLRDBRACKETX_HELP       (RID_APP_START + 4077)
-#define RID_XOVERBRACEY_HELP        (RID_APP_START + 4078)
-#define RID_XUNDERBRACEY_HELP       (RID_APP_START + 4079)
-#define RID_XNSUBSETY_HELP          (RID_APP_START + 4080)
-#define RID_XNSUBSETEQY_HELP        (RID_APP_START + 4081)
-#define RID_XNSUPSETY_HELP          (RID_APP_START + 4082)
-#define RID_XNSUPSETEQY_HELP        (RID_APP_START + 4083)
-#define RID_SETN_HELP               (RID_APP_START + 4084)
-#define RID_SETZ_HELP               (RID_APP_START + 4085)
-#define RID_SETQ_HELP               (RID_APP_START + 4086)
-#define RID_SETR_HELP               (RID_APP_START + 4087)
-#define RID_SETC_HELP               (RID_APP_START + 4088)
-#define RID_ALEPH_HELP              (RID_APP_START + 4089)
-#define RID_EMPTYSET_HELP           (RID_APP_START + 4090)
-#define RID_ACUTEX_HELP             (RID_APP_START + 4091)
-#define RID_GRAVEX_HELP             (RID_APP_START + 4092)
-#define RID_CHECKX_HELP             (RID_APP_START + 4093)
-#define RID_BREVEX_HELP             (RID_APP_START + 4094)
-#define RID_BARX_HELP               (RID_APP_START + 4095)
-#define RID_VECX_HELP               (RID_APP_START + 4096)
-#define RID_HATX_HELP               (RID_APP_START + 4097)
-#define RID_TILDEX_HELP             (RID_APP_START + 4098)
-#define RID_CIRCLEX_HELP            (RID_APP_START + 4099)
-#define RID_DOTX_HELP               (RID_APP_START + 4100)
-#define RID_DDOTX_HELP              (RID_APP_START + 4101)
-#define RID_DDDOTX_HELP             (RID_APP_START + 4102)
-#define RID_OVERLINEX_HELP          (RID_APP_START + 4103)
-#define RID_UNDERLINEX_HELP         (RID_APP_START + 4104)
-#define RID_OVERSTRIKEX_HELP        (RID_APP_START + 4105)
-#define RID_PHANTOMX_HELP           (RID_APP_START + 4106)
-#define RID_BOLDX_HELP              (RID_APP_START + 4107)
-#define RID_ITALX_HELP              (RID_APP_START + 4108)
-#define RID_SIZEXY_HELP             (RID_APP_START + 4109)
-#define RID_FONTXY_HELP             (RID_APP_START + 4110)
-#define RID_WIDEHATX_HELP           (RID_APP_START + 4112)
-#define RID_WIDETILDEX_HELP         (RID_APP_START + 4113)
-#define RID_WIDEVECX_HELP           (RID_APP_START + 4114)
-#define RID_COLORX_BLACK_HELP       (RID_APP_START + 4115)
-#define RID_COLORX_BLUE_HELP        (RID_APP_START + 4116)
-#define RID_COLORX_GREEN_HELP       (RID_APP_START + 4117)
-#define RID_COLORX_RED_HELP         (RID_APP_START + 4118)
-#define RID_COLORX_CYAN_HELP        (RID_APP_START + 4119)
-#define RID_COLORX_MAGENTA_HELP     (RID_APP_START + 4120)
-#define RID_COLORX_YELLOW_HELP      (RID_APP_START + 4121)
-#define RID_ABSX_HELP               (RID_APP_START + 4122)
-#define RID_FACTX_HELP              (RID_APP_START + 4123)
-#define RID_SQRTX_HELP              (RID_APP_START + 4124)
-#define RID_NROOTXY_HELP            (RID_APP_START + 4125)
-#define RID_EX_HELP                 (RID_APP_START + 4126)
-#define RID_LNX_HELP                (RID_APP_START + 4127)
-#define RID_EXPX_HELP               (RID_APP_START + 4128)
-#define RID_LOGX_HELP               (RID_APP_START + 4129)
-#define RID_SINX_HELP               (RID_APP_START + 4130)
-#define RID_COSX_HELP               (RID_APP_START + 4131)
-#define RID_TANX_HELP               (RID_APP_START + 4132)
-#define RID_COTX_HELP               (RID_APP_START + 4133)
-#define RID_SINHX_HELP              (RID_APP_START + 4134)
-#define RID_COSHX_HELP              (RID_APP_START + 4135)
-#define RID_TANHX_HELP              (RID_APP_START + 4136)
-#define RID_COTHX_HELP              (RID_APP_START + 4137)
-#define RID_ARCSINX_HELP            (RID_APP_START + 4138)
-#define RID_ARCCOSX_HELP            (RID_APP_START + 4139)
-#define RID_ARCTANX_HELP            (RID_APP_START + 4140)
-#define RID_ARCCOTX_HELP            (RID_APP_START + 4141)
-#define RID_ARSINHX_HELP            (RID_APP_START + 4142)
-#define RID_ARCOSHX_HELP            (RID_APP_START + 4143)
-#define RID_ARTANHX_HELP            (RID_APP_START + 4144)
-#define RID_ARCOTHX_HELP            (RID_APP_START + 4145)
-#define RID_LIMX_HELP               (RID_APP_START + 4146)
-#define RID_SUMX_HELP               (RID_APP_START + 4147)
-#define RID_PRODX_HELP              (RID_APP_START + 4148)
-#define RID_COPRODX_HELP            (RID_APP_START + 4149)
-#define RID_INTX_HELP               (RID_APP_START + 4150)
-#define RID_IINTX_HELP              (RID_APP_START + 4151)
-#define RID_IIINTX_HELP             (RID_APP_START + 4152)
-#define RID_LINTX_HELP              (RID_APP_START + 4153)
-#define RID_LLINTX_HELP             (RID_APP_START + 4154)
-#define RID_LLLINTX_HELP            (RID_APP_START + 4155)
-// blank: 4156 - 4160
-#define RID_LIM_FROMX_HELP          (RID_APP_START + 4161)
-#define RID_SUM_FROMX_HELP          (RID_APP_START + 4162)
-#define RID_PROD_FROMX_HELP         (RID_APP_START + 4163)
-#define RID_COPROD_FROMX_HELP       (RID_APP_START + 4164)
-#define RID_INT_FROMX_HELP          (RID_APP_START + 4165)
-#define RID_IINT_FROMX_HELP         (RID_APP_START + 4166)
-#define RID_IIINT_FROMX_HELP        (RID_APP_START + 4167)
-#define RID_LINT_FROMX_HELP         (RID_APP_START + 4168)
-#define RID_LLINT_FROMX_HELP        (RID_APP_START + 4169)
-#define RID_LLLINT_FROMX_HELP       (RID_APP_START + 4170)
-#define RID_LIM_TOX_HELP            (RID_APP_START + 4171)
-#define RID_SUM_TOX_HELP            (RID_APP_START + 4172)
-#define RID_PROD_TOX_HELP           (RID_APP_START + 4173)
-#define RID_COPROD_TOX_HELP         (RID_APP_START + 4174)
-#define RID_INT_TOX_HELP            (RID_APP_START + 4175)
-#define RID_IINT_TOX_HELP           (RID_APP_START + 4176)
-#define RID_IIINT_TOX_HELP          (RID_APP_START + 4177)
-#define RID_LINT_TOX_HELP           (RID_APP_START + 4178)
-#define RID_LLINT_TOX_HELP          (RID_APP_START + 4179)
-#define RID_LLLINT_TOX_HELP         (RID_APP_START + 4180)
-#define RID_LIM_FROMTOX_HELP        (RID_APP_START + 4181)
-#define RID_SUM_FROMTOX_HELP        (RID_APP_START + 4182)
-#define RID_PROD_FROMTOX_HELP       (RID_APP_START + 4183)
-#define RID_COPROD_FROMTOX_HELP     (RID_APP_START + 4184)
-#define RID_INT_FROMTOX_HELP        (RID_APP_START + 4185)
-#define RID_IINT_FROMTOX_HELP       (RID_APP_START + 4186)
-#define RID_IIINT_FROMTOX_HELP      (RID_APP_START + 4187)
-#define RID_LINT_FROMTOX_HELP       (RID_APP_START + 4188)
-#define RID_LLINT_FROMTOX_HELP      (RID_APP_START + 4189)
-#define RID_LLLINT_FROMTOX_HELP     (RID_APP_START + 4190)
-
-#define RID_COLORX_GRAY_HELP        (RID_APP_START + 4193)
-#define RID_COLORX_LIME_HELP        (RID_APP_START + 4194)
-#define RID_COLORX_MAROON_HELP      (RID_APP_START + 4195)
-#define RID_COLORX_NAVY_HELP        (RID_APP_START + 4196)
-#define RID_COLORX_OLIVE_HELP       (RID_APP_START + 4197)
-#define RID_COLORX_PURPLE_HELP      (RID_APP_START + 4198)
-#define RID_COLORX_SILVER_HELP      (RID_APP_START + 4199)
-#define RID_COLORX_TEAL_HELP        (RID_APP_START + 4200)
-
-#define RID_XEVALUATEDATY_HELP      (RID_APP_START + 4201)
-#define RID_LIMINFX_HELP            (RID_APP_START + 4202)
-#define RID_LIMINF_FROMX_HELP       (RID_APP_START + 4203)
-#define RID_LIMINF_TOX_HELP         (RID_APP_START + 4204)
-#define RID_LIMINF_FROMTOX_HELP     (RID_APP_START + 4205)
-#define RID_LIMSUPX_HELP            (RID_APP_START + 4206)
-#define RID_LIMSUP_FROMX_HELP       (RID_APP_START + 4207)
-#define RID_LIMSUP_TOX_HELP         (RID_APP_START + 4208)
-#define RID_LIMSUP_FROMTOX_HELP     (RID_APP_START + 4209)
-
-#define RID_ALIGNLX_HELP                  (RID_APP_START + 4275)
-#define RID_ALIGNCX_HELP                  (RID_APP_START + 4276)
-#define RID_ALIGNRX_HELP                  (RID_APP_START + 4277)
-
-// 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no
-// Define but latterly an Enum
-#define HID_SMA_VIEWSHELL_DOCUMENT      (342)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
new file mode 100644
index 000000000000..b000bfe62ca9
--- /dev/null
+++ b/starmath/inc/strings.hrc
@@ -0,0 +1,341 @@
+/* -*- 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_SM_INC_STRINGS_HRC
+#define INCLUDED_SM_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define RID_PLUSX_HELP                      NC_("RID_PLUSX_HELP", "+ Sign" )
+#define RID_MINUSX_HELP                     NC_("RID_MINUSX_HELP", "- Sign" )
+#define RID_PLUSMINUSX_HELP                 NC_("RID_PLUSMINUSX_HELP", "+- Sign" )
+#define RID_MINUSPLUSX_HELP                 NC_("RID_MINUSPLUSX_HELP", "-+ Sign" )
+#define RID_NEGX_HELP                       NC_("RID_NEGX_HELP", "Boolean NOT" )
+#define RID_XPLUSY_HELP                     NC_("RID_XPLUSY_HELP", "Addition +" )
+#define RID_XMINUSY_HELP                    NC_("RID_XMINUSY_HELP", "Subtraction -" )
+#define RID_XCDOTY_HELP                     NC_("RID_XCDOTY_HELP", "Multiplication (Dot)" )
+#define RID_XTIMESY_HELP                    NC_("RID_XTIMESY_HELP", "Multiplication (x)" )
+#define RID_XSYMTIMESY_HELP                 NC_("RID_XSYMTIMESY_HELP", "Multiplication (*)" )
+#define RID_XSYMDIVIDEY_HELP                NC_("RID_XSYMDIVIDEY_HELP", "Division (Slash)" )
+#define RID_XDIVY_HELP                      NC_("RID_XDIVY_HELP", "Division (÷)" )
+#define RID_XOVERY_HELP                     NC_("RID_XOVERY_HELP", "Division (Fraction)" )
+#define RID_XODIVIDEY_HELP                  NC_("RID_XODIVIDEY_HELP", "Circled Slash" )
+#define RID_XODOTY_HELP                     NC_("RID_XODOTY_HELP", "Circled Dot" )
+#define RID_XOMINUSY_HELP                   NC_("RID_XOMINUSY_HELP", "Circled Minus" )
+#define RID_XOPLUSY_HELP                    NC_("RID_XOPLUSY_HELP", "Circled Plus" )
+#define RID_XOTIMESY_HELP                   NC_("RID_XOTIMESY_HELP", "Tensor Product" )
+#define RID_XANDY_HELP                      NC_("RID_XANDY_HELP", "Boolean AND" )
+#define RID_XORY_HELP                       NC_("RID_XORY_HELP", "Boolean OR" )
+#define RID_XEQY_HELP                       NC_("RID_XEQY_HELP", "Is Equal" )
+#define RID_XNEQY_HELP                      NC_("RID_XNEQY_HELP", "Is Not Equal" )
+#define RID_XLTY_HELP                       NC_("RID_XLTY_HELP", "Is Less Than" )
+#define RID_XGTY_HELP                       NC_("RID_XGTY_HELP", "Is Greater Than" )
+#define RID_XLEY_HELP                       NC_("RID_XLEY_HELP", "Is Less Than Or Equal To" )
+#define RID_XGEY_HELP                       NC_("RID_XGEY_HELP", "Is Greater Than Or Equal To" )
+#define RID_XLESLANTY_HELP                  NC_("RID_XLESLANTY_HELP", "Is Less Than Or Equal To" )
+#define RID_XGESLANTY_HELP                  NC_("RID_XGESLANTY_HELP", "Is Greater Than Or Equal To" )
+#define RID_XLLY_HELP                       NC_("RID_XLLY_HELP", "Is Much Less Than" )
+#define RID_XGGY_HELP                       NC_("RID_XGGY_HELP", "Is Much Greater Than" )
+#define RID_XDEFY_HELP                      NC_("RID_XDEFY_HELP", "Is Defined As" )
+#define RID_XEQUIVY_HELP                    NC_("RID_XEQUIVY_HELP", "Is Congruent To" )
+#define RID_XAPPROXY_HELP                   NC_("RID_XAPPROXY_HELP", "Is Approximately Equal" )
+#define RID_XSIMY_HELP                      NC_("RID_XSIMY_HELP", "Is Similar To" )
+#define RID_XSIMEQY_HELP                    NC_("RID_XSIMEQY_HELP", "Is Similar Or Equal" )
+#define RID_XPROPY_HELP                     NC_("RID_XPROPY_HELP", "Is Proportional To" )
+#define RID_XORTHOY_HELP                    NC_("RID_XORTHOY_HELP", "Is Orthogonal To" )
+#define RID_XPARALLELY_HELP                 NC_("RID_XPARALLELY_HELP", "Is Parallel To" )
+#define RID_XTOWARDY_HELP                   NC_("RID_XTOWARDY_HELP", "Toward" )
+#define RID_XTRANSLY_HELP                   NC_("RID_XTRANSLY_HELP", "Corresponds To (Left)" )
+#define RID_XTRANSRY_HELP                   NC_("RID_XTRANSRY_HELP", "Corresponds To (Right)" )
+#define RID_XINY_HELP                       NC_("RID_XINY_HELP", "Is In" )
+#define RID_XNOTINY_HELP                    NC_("RID_XNOTINY_HELP", "Is Not In" )
+#define RID_XOWNSY_HELP                     NC_("RID_XOWNSY_HELP", "Owns" )
+#define RID_XUNIONY_HELP                    NC_("RID_XUNIONY_HELP", "Union" )
+#define RID_XINTERSECTIONY_HELP             NC_("RID_XINTERSECTIONY_HELP", "Intersection" )
+#define RID_XSETMINUSY_HELP                 NC_("RID_XSETMINUSY_HELP", "Difference" )
+#define RID_XSLASHY_HELP                    NC_("RID_XSLASHY_HELP", "Quotient Set" )
+#define RID_XSUBSETY_HELP                   NC_("RID_XSUBSETY_HELP", "Subset" )
+#define RID_XSUBSETEQY_HELP                 NC_("RID_XSUBSETEQY_HELP", "Subset Or Equal To" )
+#define RID_XSUPSETY_HELP                   NC_("RID_XSUPSETY_HELP", "Superset" )
+#define RID_XSUPSETEQY_HELP                 NC_("RID_XSUPSETEQY_HELP", "Superset Or Equal To" )
+#define RID_XNSUBSETY_HELP                  NC_("RID_XNSUBSETY_HELP", "Not Subset" )
+#define RID_XNSUBSETEQY_HELP                NC_("RID_XNSUBSETEQY_HELP", "Not Subset Or Equal" )
+#define RID_XNSUPSETY_HELP                  NC_("RID_XNSUPSETY_HELP", "Not Superset" )
+#define RID_XNSUPSETEQY_HELP                NC_("RID_XNSUPSETEQY_HELP", "Not Superset Or Equal" )
+#define RID_ABSX_HELP                       NC_("RID_ABSX_HELP", "Absolute Value" )
+#define RID_FACTX_HELP                      NC_("RID_FACTX_HELP", "Factorial" )
+#define RID_SQRTX_HELP                      NC_("RID_SQRTX_HELP", "Square Root" )
+#define RID_NROOTXY_HELP                    NC_("RID_NROOTXY_HELP", "N-th Root" )
+#define RID_EX_HELP                         NC_("RID_EX_HELP", "Exponential Function" )
+#define RID_EXPX_HELP                       NC_("RID_EXPX_HELP", "Exponential Function" )
+#define RID_LNX_HELP                        NC_("RID_LNX_HELP", "Natural Logarithm" )
+#define RID_LOGX_HELP                       NC_("RID_LOGX_HELP", "Logarithm" )
+#define RID_SINX_HELP                       NC_("RID_SINX_HELP", "Sine" )
+#define RID_COSX_HELP                       NC_("RID_COSX_HELP", "Cosine" )
+#define RID_TANX_HELP                       NC_("RID_TANX_HELP", "Tangent" )
+#define RID_COTX_HELP                       NC_("RID_COTX_HELP", "Cotangent" )
+#define RID_ARCSINX_HELP                    NC_("RID_ARCSINX_HELP", "Arcsine" )
+#define RID_ARCCOSX_HELP                    NC_("RID_ARCCOSX_HELP", "Arccosine" )
+#define RID_ARCTANX_HELP                    NC_("RID_ARCTANX_HELP", "Arctangent" )
+#define RID_ARCCOTX_HELP                    NC_("RID_ARCCOTX_HELP", "Arccotangent" )
+#define RID_SINHX_HELP                      NC_("RID_SINHX_HELP", "Hyperbolic Sine" )
+#define RID_COSHX_HELP                      NC_("RID_COSHX_HELP", "Hyperbolic Cosine" )
+#define RID_TANHX_HELP                      NC_("RID_TANHX_HELP", "Hyperbolic Tangent" )
+#define RID_COTHX_HELP                      NC_("RID_COTHX_HELP", "Hyperbolic Cotangent" )
+#define RID_ARSINHX_HELP                    NC_("RID_ARSINHX_HELP", "Area Hyperbolic Sine" )
+#define RID_ARCOSHX_HELP                    NC_("RID_ARCOSHX_HELP", "Area Hyperbolic Cosine" )
+#define RID_ARTANHX_HELP                    NC_("RID_ARTANHX_HELP", "Area Hyperbolic Tangent" )
+#define RID_ARCOTHX_HELP                    NC_("RID_ARCOTHX_HELP", "Area Hyperbolic Cotangent" )
+#define RID_SUMX_HELP                       NC_("RID_SUMX_HELP", "Sum" )
+#define RID_SUM_FROMX_HELP                  NC_("RID_SUM_FROMX_HELP", "Sum Subscript Bottom" )
+#define RID_SUM_TOX_HELP                    NC_("RID_SUM_TOX_HELP", "Sum Superscript Top" )
+#define RID_SUM_FROMTOX_HELP                NC_("RID_SUM_FROMTOX_HELP", "Sum Sup/Sub script" )
+#define RID_PRODX_HELP                      NC_("RID_PRODX_HELP", "Product" )
+#define RID_PROD_FROMX_HELP                 NC_("RID_PROD_FROMX_HELP", "Product Subscript Bottom" )
+#define RID_PROD_TOX_HELP                   NC_("RID_PROD_TOX_HELP", "Product Superscript Top" )
+#define RID_PROD_FROMTOX_HELP               NC_("RID_PROD_FROMTOX_HELP", "Product Sup/Sub script" )
+#define RID_COPRODX_HELP                    NC_("RID_COPRODX_HELP", "Coproduct" )
+#define RID_COPROD_FROMX_HELP               NC_("RID_COPROD_FROMX_HELP", "Coproduct Subscript Bottom" )
+#define RID_COPROD_TOX_HELP                 NC_("RID_COPROD_TOX_HELP", "Coproduct Superscript Top" )
+#define RID_COPROD_FROMTOX_HELP             NC_("RID_COPROD_FROMTOX_HELP", "Coproduct Sup/Sub script" )
+#define RID_LIMX_HELP                       NC_("RID_LIMX_HELP", "Limes" )
+#define RID_LIM_FROMX_HELP                  NC_("RID_LIM_FROMX_HELP", "Limes Subscript Bottom" )
+#define RID_LIM_TOX_HELP                    NC_("RID_LIM_TOX_HELP", "Limes Superscript Top" )
+#define RID_LIM_FROMTOX_HELP                NC_("RID_LIM_FROMTOX_HELP", "Limes Sup/Sub script" )
+#define RID_LIMINFX_HELP                    NC_("RID_LIMINFX_HELP", "Limit Inferior" )
+#define RID_LIMINF_FROMX_HELP               NC_("RID_LIMINF_FROMX_HELP", "Limit Inferior Subscript Bottom" )
+#define RID_LIMINF_TOX_HELP                 NC_("RID_LIMINF_TOX_HELP", "Limit Inferior Superscript Top" )
+#define RID_LIMINF_FROMTOX_HELP             NC_("RID_LIMINF_FROMTOX_HELP", "Limit Inferior Sup/Sub script" )
+#define RID_LIMSUPX_HELP                    NC_("RID_LIMSUPX_HELP", "Limit Superior" )
+#define RID_LIMSUP_FROMX_HELP               NC_("RID_LIMSUP_FROMX_HELP", "Limit Superior Subscript Bottom" )
+#define RID_LIMSUP_TOX_HELP                 NC_("RID_LIMSUP_TOX_HELP", "Limit Superior Superscript Top" )
+#define RID_LIMSUP_FROMTOX_HELP             NC_("RID_LIMSUP_FROMTOX_HELP", "Limit Superior Sup/Sub script" )
+#define RID_EXISTS_HELP                     NC_("RID_EXISTS_HELP", "There Exists" )
+#define RID_NOTEXISTS_HELP                  NC_("RID_NOTEXISTS_HELP", "There Not Exists" )
+#define RID_FORALL_HELP                     NC_("RID_FORALL_HELP", "For all" )
+#define RID_INTX_HELP                       NC_("RID_INTX_HELP", "Integral" )
+#define RID_INT_FROMX_HELP                  NC_("RID_INT_FROMX_HELP", "Integral Subscript Bottom" )
+#define RID_INT_TOX_HELP                    NC_("RID_INT_TOX_HELP", "Integral Superscript Top" )
+#define RID_INT_FROMTOX_HELP                NC_("RID_INT_FROMTOX_HELP", "Integral Sup/Sub script" )
+#define RID_IINTX_HELP                      NC_("RID_IINTX_HELP", "Double Integral" )
+#define RID_IINT_FROMX_HELP                 NC_("RID_IINT_FROMX_HELP", "Double Integral Subscript Bottom" )
+#define RID_IINT_TOX_HELP                   NC_("RID_IINT_TOX_HELP", "Double Integral Superscript Top" )
+#define RID_IINT_FROMTOX_HELP               NC_("RID_IINT_FROMTOX_HELP", "Double Integral Sup/Sub script" )
+#define RID_IIINTX_HELP                     NC_("RID_IIINTX_HELP", "Triple Integral" )
+#define RID_IIINT_FROMX_HELP                NC_("RID_IIINT_FROMX_HELP", "Triple Integral Subscript Bottom" )
+#define RID_IIINT_TOX_HELP                  NC_("RID_IIINT_TOX_HELP", "Triple Integral Superscript Top" )
+#define RID_IIINT_FROMTOX_HELP              NC_("RID_IIINT_FROMTOX_HELP", "Triple Integral Sup/Sub script" )
+#define RID_LINTX_HELP                      NC_("RID_LINTX_HELP", "Curve Integral" )
+#define RID_LINT_FROMX_HELP                 NC_("RID_LINT_FROMX_HELP", "Curve Integral Subscript Bottom" )
+#define RID_LINT_TOX_HELP                   NC_("RID_LINT_TOX_HELP", "Curve Integral Superscript Top" )
+#define RID_LINT_FROMTOX_HELP               NC_("RID_LINT_FROMTOX_HELP", "Curve Integral Sup/Sub script" )
+#define RID_LLINTX_HELP                     NC_("RID_LLINTX_HELP", "Double Curve Integral" )
+#define RID_LLINT_FROMX_HELP                NC_("RID_LLINT_FROMX_HELP", "Double Curve Integral Subscript Bottom" )
+#define RID_LLINT_TOX_HELP                  NC_("RID_LLINT_TOX_HELP", "Double Curve Integral Superscript Top" )
+#define RID_LLINT_FROMTOX_HELP              NC_("RID_LLINT_FROMTOX_HELP", "Double Curve Integral Sup/Sub script" )
+#define RID_LLLINTX_HELP                    NC_("RID_LLLINTX_HELP", "Triple Curve Integral" )
+#define RID_LLLINT_FROMX_HELP               NC_("RID_LLLINT_FROMX_HELP", "Triple Curve Integral Subscript Bottom" )
+#define RID_LLLINT_TOX_HELP                 NC_("RID_LLLINT_TOX_HELP", "Triple Curve Integral Superscript Top" )
+#define RID_LLLINT_FROMTOX_HELP             NC_("RID_LLLINT_FROMTOX_HELP", "Triple Curve Integral Sup/Sub script" )
+#define RID_ACUTEX_HELP                     NC_("RID_ACUTEX_HELP", "Acute Accent" )
+#define RID_BARX_HELP                       NC_("RID_BARX_HELP", "Line Above" )
+#define RID_BREVEX_HELP                     NC_("RID_BREVEX_HELP", "Breve" )
+#define RID_CHECKX_HELP                     NC_("RID_CHECKX_HELP", "Reverse Circumflex" )
+#define RID_CIRCLEX_HELP                    NC_("RID_CIRCLEX_HELP", "Circle" )
+#define RID_DOTX_HELP                       NC_("RID_DOTX_HELP", "Dot" )
+#define RID_DDOTX_HELP                      NC_("RID_DDOTX_HELP", "Double Dot" )
+#define RID_DDDOTX_HELP                     NC_("RID_DDDOTX_HELP", "Triple Dot" )
+#define RID_GRAVEX_HELP                     NC_("RID_GRAVEX_HELP", "Grave Accent" )
+#define RID_HATX_HELP                       NC_("RID_HATX_HELP", "Circumflex" )
+#define RID_TILDEX_HELP                     NC_("RID_TILDEX_HELP", "Tilde" )
+#define RID_VECX_HELP                       NC_("RID_VECX_HELP", "Vector Arrow" )
+#define RID_UNDERLINEX_HELP                 NC_("RID_UNDERLINEX_HELP", "Line Below" )
+#define RID_OVERLINEX_HELP                  NC_("RID_OVERLINEX_HELP", "Line Over" )
+#define RID_OVERSTRIKEX_HELP                NC_("RID_OVERSTRIKEX_HELP", "Line Through" )
+#define RID_PHANTOMX_HELP                   NC_("RID_PHANTOMX_HELP", "Transparent" )
+#define RID_BOLDX_HELP                      NC_("RID_BOLDX_HELP", "Bold Font" )
+#define RID_ITALX_HELP                      NC_("RID_ITALX_HELP", "Italic Font" )
+#define RID_SIZEXY_HELP                     NC_("RID_SIZEXY_HELP", "Resize" )
+#define RID_FONTXY_HELP                     NC_("RID_FONTXY_HELP", "Change Font" )
+#define RID_COLORX_BLACK_HELP               NC_("RID_COLORX_BLACK_HELP", "Color Black" )
+#define RID_COLORX_BLUE_HELP                NC_("RID_COLORX_BLUE_HELP", "Color Blue" )
+#define RID_COLORX_GREEN_HELP               NC_("RID_COLORX_GREEN_HELP", "Color Green" )
+#define RID_COLORX_RED_HELP                 NC_("RID_COLORX_RED_HELP", "Color Red" )
+#define RID_COLORX_CYAN_HELP                NC_("RID_COLORX_CYAN_HELP", "Color Cyan" )
+#define RID_COLORX_MAGENTA_HELP             NC_("RID_COLORX_MAGENTA_HELP", "Color Magenta" )
+#define RID_COLORX_GRAY_HELP                NC_("RID_COLORX_GRAY_HELP", "Color Gray" )
+#define RID_COLORX_LIME_HELP                NC_("RID_COLORX_LIME_HELP", "Color Lime" )
+#define RID_COLORX_MAROON_HELP              NC_("RID_COLORX_MAROON_HELP", "Color Maroon" )
+#define RID_COLORX_NAVY_HELP                NC_("RID_COLORX_NAVY_HELP", "Color Navy" )
+#define RID_COLORX_OLIVE_HELP               NC_("RID_COLORX_OLIVE_HELP", "Color Olive" )
+#define RID_COLORX_PURPLE_HELP              NC_("RID_COLORX_PURPLE_HELP", "Color Purple" )
+#define RID_COLORX_SILVER_HELP              NC_("RID_COLORX_SILVER_HELP", "Color Silver" )
+#define RID_COLORX_TEAL_HELP                NC_("RID_COLORX_TEAL_HELP", "Color Teal" )
+#define RID_COLORX_YELLOW_HELP              NC_("RID_COLORX_YELLOW_HELP", "Color Yellow" )
+#define RID_LRGROUPX_HELP                   NC_("RID_LRGROUPX_HELP", "Group Brackets" )
+#define RID_LRPARENTX_HELP                  NC_("RID_LRPARENTX_HELP", "Round Brackets" )
+#define RID_LRBRACKETX_HELP                 NC_("RID_LRBRACKETX_HELP", "Square Brackets" )
+#define RID_LRDBRACKETX_HELP                NC_("RID_LRDBRACKETX_HELP", "Double Square Brackets" )
+#define RID_LRBRACEX_HELP                   NC_("RID_LRBRACEX_HELP", "Braces" )
+#define RID_LRANGLEX_HELP                   NC_("RID_LRANGLEX_HELP", "Angle Brackets" )
+#define RID_LRCEILX_HELP                    NC_("RID_LRCEILX_HELP", "Upper Ceil" )
+#define RID_LRFLOORX_HELP                   NC_("RID_LRFLOORX_HELP", "Floor" )
+#define RID_LRLINEX_HELP                    NC_("RID_LRLINEX_HELP", "Single Lines" )
+#define RID_LRDLINEX_HELP                   NC_("RID_LRDLINEX_HELP", "Double Lines" )
+#define RID_LMRANGLEXY_HELP                 NC_("RID_LMRANGLEXY_HELP", "Operator Brackets" )
+#define RID_SLRPARENTX_HELP                 NC_("RID_SLRPARENTX_HELP", "Round Brackets (Scalable)" )
+#define RID_SLRBRACKETX_HELP                NC_("RID_SLRBRACKETX_HELP", "Square Brackets (Scalable)" )
+#define RID_SLRDBRACKETX_HELP               NC_("RID_SLRDBRACKETX_HELP", "Double Square Brackets (Scalable)" )
+#define RID_SLRBRACEX_HELP                  NC_("RID_SLRBRACEX_HELP", "Braces (Scalable)" )
+#define RID_SLRANGLEX_HELP                  NC_("RID_SLRANGLEX_HELP", "Angle Brackets (Scalable)" )
+#define RID_SLRCEILX_HELP                   NC_("RID_SLRCEILX_HELP", "Ceiling (Scalable)" )
+#define RID_SLRFLOORX_HELP                  NC_("RID_SLRFLOORX_HELP", "Floor (Scalable)" )
+#define RID_SLRLINEX_HELP                   NC_("RID_SLRLINEX_HELP", "Single Lines (Scalable)" )
+#define RID_SLRDLINEX_HELP                  NC_("RID_SLRDLINEX_HELP", "Double Lines (Scalable)" )
+#define RID_SLMRANGLEXY_HELP                NC_("RID_SLMRANGLEXY_HELP", "Operator Brackets (Scalable)" )
+#define RID_XEVALUATEDATY_HELP              NC_("RID_XEVALUATEDATY_HELP", "Evaluated At" )
+#define RID_XOVERBRACEY_HELP                NC_("RID_XOVERBRACEY_HELP", "Braces Top (Scalable)" )
+#define RID_XUNDERBRACEY_HELP               NC_("RID_XUNDERBRACEY_HELP", "Braces Bottom (Scalable)" )
+#define RID_RSUBX_HELP                      NC_("RID_RSUBX_HELP", "Subscript Right" )
+#define RID_RSUPX_HELP                      NC_("RID_RSUPX_HELP", "Power" )
+#define RID_LSUBX_HELP                      NC_("RID_LSUBX_HELP", "Subscript Left" )
+#define RID_LSUPX_HELP                      NC_("RID_LSUPX_HELP", "Superscript Left" )
+#define RID_CSUBX_HELP                      NC_("RID_CSUBX_HELP", "Subscript Bottom" )
+#define RID_CSUPX_HELP                      NC_("RID_CSUPX_HELP", "Superscript Top" )
+#define RID_SBLANK_HELP                     NC_("RID_SBLANK_HELP", "Small Gap" )
+#define RID_BLANK_HELP                      NC_("RID_BLANK_HELP", "Blank" )
+#define RID_NEWLINE_HELP                    NC_("RID_NEWLINE_HELP", "New Line" )
+#define RID_BINOMXY_HELP                    NC_("RID_BINOMXY_HELP", "Vertical Stack (2 Elements)")
+#define RID_STACK_HELP                      NC_("RID_STACK_HELP", "Vertical Stack" )
+#define RID_MATRIX_HELP                     NC_("RID_MATRIX_HELP", "Matrix Stack" )
+#define RID_ALIGNLX_HELP                    NC_("RID_ALIGNLX_HELP", "Align Left" )
+#define RID_ALIGNCX_HELP                    NC_("RID_ALIGNCX_HELP", "Align Center" )
+#define RID_ALIGNRX_HELP                    NC_("RID_ALIGNRX_HELP", "Align Right" )
+#define RID_ALEPH_HELP                      NC_("RID_ALEPH_HELP", "Aleph" )
+#define RID_EMPTYSET_HELP                   NC_("RID_EMPTYSET_HELP", "Empty Set" )
+#define RID_RE_HELP                         NC_("RID_RE_HELP", "Real Part" )
+#define RID_IM_HELP                         NC_("RID_IM_HELP", "Imaginary Part" )
+#define RID_INFINITY_HELP                   NC_("RID_INFINITY_HELP", "Infinity" )
+#define RID_PARTIAL_HELP                    NC_("RID_PARTIAL_HELP", "Partial" )
+#define RID_NABLA_HELP                      NC_("RID_NABLA_HELP", "Nabla" )
+#define RID_WP_HELP                         NC_("RID_WP_HELP", "Weierstrass p" )
+#define RID_DOTSAXIS_HELP                   NC_("RID_DOTSAXIS_HELP", "Dots In Middle" )
+#define RID_DOTSUP_HELP                     NC_("RID_DOTSUP_HELP", "Dots To Top" )
+#define RID_DOTSDOWN_HELP                   NC_("RID_DOTSDOWN_HELP", "Dots To Bottom" )
+#define RID_DOTSLOW_HELP                    NC_("RID_DOTSLOW_HELP", "Dots At Bottom" )
+#define RID_DOTSVERT_HELP                   NC_("RID_DOTSVERT_HELP", "Dots Vertically" )
+#define RID_XCIRCY_HELP                     NC_("RID_XCIRCY_HELP", "Concatenate" )
+#define RID_XWIDESLASHY_HELP                NC_("RID_XWIDESLASHY_HELP", "Division (wideslash)" )
+#define RID_XWIDEBSLASHY_HELP               NC_("RID_XWIDEBSLASHY_HELP", "Division (counter wideslash)" )
+#define RID_XDIVIDESY_HELP                  NC_("RID_XDIVIDESY_HELP", "Divides" )
+#define RID_XNDIVIDESY_HELP                 NC_("RID_XNDIVIDESY_HELP", "Does Not Divide" )
+#define RID_DLARROW_HELP                    NC_("RID_DLARROW_HELP", "Double Arrow Left" )
+#define RID_DLRARROW_HELP                   NC_("RID_DLRARROW_HELP", "Double Arrow Left And Right" )
+#define RID_DRARROW_HELP                    NC_("RID_DRARROW_HELP", "Double Arrow Right" )
+#define RID_SETN_HELP                       NC_("RID_SETN_HELP", "Natural Numbers Set" )
+#define RID_SETZ_HELP                       NC_("RID_SETZ_HELP", "Integers Set" )
+#define RID_SETQ_HELP                       NC_("RID_SETQ_HELP", "Set of Rational Numbers" )
+#define RID_SETR_HELP                       NC_("RID_SETR_HELP", "Real Numbers Set" )
+#define RID_SETC_HELP                       NC_("RID_SETC_HELP", "Complex Numbers Set" )
+#define RID_WIDEHATX_HELP                   NC_("RID_WIDEHATX_HELP", "Large Circumflex" )
+#define RID_WIDETILDEX_HELP                 NC_("RID_WIDETILDEX_HELP", "Large Tilde" )
+#define RID_WIDEVECX_HELP                   NC_("RID_WIDEVECX_HELP", "Large Vector Arrow" )
+#define RID_HBAR_HELP                       NC_("RID_HBAR_HELP", "h Bar" )
+#define RID_LAMBDABAR_HELP                  NC_("RID_LAMBDABAR_HELP", "Lambda Bar" )
+#define RID_LEFTARROW_HELP                  NC_("RID_LEFTARROW_HELP", "Left Arrow" )
+#define RID_RIGHTARROW_HELP                 NC_("RID_RIGHTARROW_HELP", "Right Arrow" )
+#define RID_UPARROW_HELP                    NC_("RID_UPARROW_HELP", "Up Arrow" )
+#define RID_DOWNARROW_HELP                  NC_("RID_DOWNARROW_HELP", "Down Arrow" )
+#define RID_NOSPACE_HELP                    NC_("RID_NOSPACE_HELP", "No space" )
+#define RID_XPRECEDESY_HELP                 NC_("RID_XPRECEDESY_HELP", "Precedes" )
+#define RID_XPRECEDESEQUALY_HELP            NC_("RID_XPRECEDESEQUALY_HELP", "Precedes or equal to" )
+#define RID_XPRECEDESEQUIVY_HELP            NC_("RID_XPRECEDESEQUIVY_HELP", "Precedes or equivalent to" )
+#define RID_XSUCCEEDSY_HELP                 NC_("RID_XSUCCEEDSY_HELP", "Succeeds" )
+#define RID_XSUCCEEDSEQUALY_HELP            NC_("RID_XSUCCEEDSEQUALY_HELP", "Succeeds or equal to" )
+#define RID_XSUCCEEDSEQUIVY_HELP            NC_("RID_XSUCCEEDSEQUIVY_HELP", "Succeeds or equivalent to" )
+#define RID_XNOTPRECEDESY_HELP              NC_("RID_XNOTPRECEDESY_HELP", "Not precedes" )
+#define RID_XNOTSUCCEEDSY_HELP              NC_("RID_XNOTSUCCEEDSY_HELP", "Not succeeds" )
+#define RID_CATEGORY_UNARY_BINARY_OPERATORS NC_("RID_CATEGORY_UNARY_BINARY_OPERATORS", "Unary/Binary Operators" )
+#define RID_CATEGORY_RELATIONS              NC_("RID_CATEGORY_RELATIONS", "Relations" )
+#define RID_CATEGORY_SET_OPERATIONS         NC_("RID_CATEGORY_SET_OPERATIONS", "Set Operations" )
+#define RID_CATEGORY_FUNCTIONS              NC_("RID_CATEGORY_FUNCTIONS", "Functions" )
+#define RID_CATEGORY_OPERATORS              NC_("RID_CATEGORY_OPERATORS", "Operators" )
+#define RID_CATEGORY_ATTRIBUTES             NC_("RID_CATEGORY_ATTRIBUTES", "Attributes" )
+#define RID_CATEGORY_BRACKETS               NC_("RID_CATEGORY_BRACKETS", "Brackets" )
+#define RID_CATEGORY_FORMATS                NC_("RID_CATEGORY_FORMATS", "Formats" )
+#define RID_CATEGORY_OTHERS                 NC_("RID_CATEGORY_OTHERS", "Others" )
+#define RID_CATEGORY_EXAMPLES               NC_("RID_CATEGORY_EXAMPLES", "Examples" )
+
+#define RID_FONTREGULAR                     NC_("RID_FONTREGULAR", "Standard" )
+#define RID_FONTITALIC                      NC_("RID_FONTITALIC", "Italic" )
+#define RID_FONTBOLD                        NC_("RID_FONTBOLD", "Bold" )
+#define STR_BLACK                           NC_("STR_BLACK", "black" )
+#define STR_BLUE                            NC_("STR_BLUE", "blue" )
+#define STR_GREEN                           NC_("STR_GREEN", "green" )
+#define STR_RED                             NC_("STR_RED", "red" )
+#define STR_CYAN                            NC_("STR_CYAN", "cyan" )
+#define STR_MAGENTA                         NC_("STR_MAGENTA", "magenta" )
+#define STR_GRAY                            NC_("STR_GRAY", "gray" )
+#define STR_LIME                            NC_("STR_LIME", "lime" )
+#define STR_MAROON                          NC_("STR_MAROON", "maroon" )
+#define STR_NAVY                            NC_("STR_NAVY", "navy" )
+#define STR_OLIVE                           NC_("STR_OLIVE", "olive" )
+#define STR_PURPLE                          NC_("STR_PURPLE", "purple" )
+#define STR_SILVER                          NC_("STR_SILVER", "silver" )
+#define STR_TEAL                            NC_("STR_TEAL", "teal" )
+#define STR_YELLOW                          NC_("STR_YELLOW", "yellow" )
+#define STR_HIDE                            NC_("STR_HIDE", "hide" )
+#define STR_SIZE                            NC_("STR_SIZE", "size" )
+#define STR_FONT                            NC_("STR_FONT", "font" )
+#define STR_ALIGN_LEFT                      NC_("STR_ALIGN_LEFT", "left" )
+#define STR_ALIGN_CENTER                    NC_("STR_ALIGN_CENTER", "center" )
+#define STR_ALIGN_RIGHT                     NC_("STR_ALIGN_RIGHT", "right" )
+#define STR_CMDBOXWINDOW                    NC_("STR_CMDBOXWINDOW", "Commands" )
+#define RID_DOCUMENTSTR                     NC_("RID_DOCUMENTSTR", "Formula" )
+#define STR_STATSTR_READING                 NC_("STR_STATSTR_READING", "Loading document..." )
+#define STR_STATSTR_WRITING                 NC_("STR_STATSTR_WRITING", "Saving document..." )
+#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT  NC_("STR_MATH_DOCUMENT_FULLTYPE_CURRENT", "%PRODUCTNAME %PRODUCTVERSION Formula")
+#define RID_ERR_IDENT                       NC_("RID_ERR_IDENT", "ERROR : " )
+#define RID_ERR_UNEXPECTEDCHARACTER         NC_("RID_ERR_UNEXPECTEDCHARACTER", "Unexpected character" )
+#define RID_ERR_UNEXPECTEDTOKEN             NC_("RID_ERR_UNEXPECTEDTOKEN", "Unexpected token" )
+#define RID_ERR_LGROUPEXPECTED              NC_("RID_ERR_LGROUPEXPECTED", "'{' expected" )
+#define RID_ERR_RGROUPEXPECTED              NC_("RID_ERR_RGROUPEXPECTED", "'}' expected" )
+#define RID_ERR_LBRACEEXPECTED              NC_("RID_ERR_LBRACEEXPECTED", "'(' expected" )
+#define RID_ERR_RBRACEEXPECTED              NC_("RID_ERR_RBRACEEXPECTED", "')' expected" )
+#define RID_ERR_PARENTMISMATCH              NC_("RID_ERR_PARENTMISMATCH", "Left and right symbols mismatched" )
+#define RID_ERR_FONTEXPECTED                NC_("RID_ERR_FONTEXPECTED", "'fixed', 'sans', or 'serif' expected" )
+#define RID_ERR_SIZEEXPECTED                NC_("RID_ERR_SIZEEXPECTED", "'size' followed by an unexpected token" )
+#define RID_ERR_DOUBLEALIGN                 NC_("RID_ERR_DOUBLEALIGN", "Double aligning is not allowed" )
+#define RID_ERR_DOUBLESUBSUPSCRIPT          NC_("RID_ERR_DOUBLESUBSUPSCRIPT", "Double sub/superscripts is not allowed" )
+#define RID_ERR_POUNDEXPECTED               NC_("RID_ERR_POUNDEXPECTED", "'#' expected" )
+#define RID_ERR_COLOREXPECTED               NC_("RID_ERR_COLOREXPECTED", "Color required" )
+#define RID_ERR_RIGHTEXPECTED               NC_("RID_ERR_RIGHTEXPECTED", "'RIGHT' expected" )
+#define RID_PRINTUIOPT_PRODNAME             NC_("RID_PRINTUIOPT_PRODNAME", "%PRODUCTNAME %s" )
+#define RID_PRINTUIOPT_CONTENTS             NC_("RID_PRINTUIOPT_CONTENTS", "Contents" )
+#define RID_PRINTUIOPT_TITLE                NC_("RID_PRINTUIOPT_TITLE", "~Title" )
+#define RID_PRINTUIOPT_FRMLTXT              NC_("RID_PRINTUIOPT_FRMLTXT", "~Formula text" )
+#define RID_PRINTUIOPT_BORDERS              NC_("RID_PRINTUIOPT_BORDERS", "B~orders" )
+#define RID_PRINTUIOPT_SIZE                 NC_("RID_PRINTUIOPT_SIZE", "Size" )
+#define RID_PRINTUIOPT_ORIGSIZE             NC_("RID_PRINTUIOPT_ORIGSIZE", "O~riginal size" )
+#define RID_PRINTUIOPT_FITTOPAGE            NC_("RID_PRINTUIOPT_FITTOPAGE", "Fit to ~page" )
+#define RID_PRINTUIOPT_SCALING              NC_("RID_PRINTUIOPT_SCALING", "~Scaling" )
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 9d0bd53ebdf3..d28baee430d7 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -23,6 +23,7 @@
 #include <editeng/editview.hxx>
 
 #include <sfx2/zoomitem.hxx>
+#include "starmath.hrc"
 #include <memory>
 
 typedef tools::SvRef<SmDocShell> SmDocShellRef;
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 95fe2e4f12ca..4d09089449e2 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -21,6 +21,7 @@
 #include <ElementsDockingWindow.hxx>
 
 #include <starmath.hrc>
+#include <strings.hrc>
 #include <smmod.hxx>
 #include <view.hxx>
 #include <visitors.hxx>
@@ -54,11 +55,11 @@ SmElementSeparator::SmElementSeparator() :
     SmElement(std::unique_ptr<SmNode>(), OUString(), OUString())
 {}
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aUnaryBinaryOperatorsList[] =
+const std::pair<const char*, const char*> SmElementsControl::aUnaryBinaryOperatorsList[] =
 {
     {RID_PLUSX, RID_PLUSX_HELP}, {RID_MINUSX, RID_MINUSX_HELP},
     {RID_PLUSMINUSX, RID_PLUSMINUSX_HELP}, {RID_MINUSPLUSX, RID_MINUSPLUSX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_XPLUSY, RID_XPLUSY_HELP}, {RID_XMINUSY, RID_XMINUSY_HELP},
     {RID_XCDOTY, RID_XCDOTY_HELP}, {RID_XTIMESY, RID_XTIMESY_HELP},
     {RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOVERY, RID_XOVERY_HELP},
@@ -67,113 +68,113 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aUnaryBinaryOperator
     {RID_XODOTY, RID_XODOTY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP},
     {RID_XODIVIDEY, RID_XODIVIDEY_HELP}, {RID_XCIRCY, RID_XCIRCY_HELP},
     {RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY, RID_XORY_HELP},
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aRelationsList[] =
+const std::pair<const char*, const char*> SmElementsControl::aRelationsList[] =
 {
     {RID_XEQY, RID_XEQY_HELP}, {RID_XNEQY, RID_XNEQY_HELP}, {RID_XLTY, RID_XLTY_HELP},
     {RID_XLEY, RID_XLEY_HELP}, {RID_XLESLANTY, RID_XLESLANTY_HELP}, {RID_XGTY, RID_XGTY_HELP},
     {RID_XGEY, RID_XGEY_HELP}, {RID_XGESLANTY, RID_XGESLANTY_HELP},
     {RID_XLLY, RID_XLLY_HELP}, {RID_XGGY, RID_XGGY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_XAPPROXY, RID_XAPPROXY_HELP}, {RID_XSIMY, RID_XSIMY_HELP}, {RID_XSIMEQY, RID_XSIMEQY_HELP},
     {RID_XEQUIVY, RID_XEQUIVY_HELP}, {RID_XPROPY, RID_XPROPY_HELP}, {RID_XPARALLELY, RID_XPARALLELY_HELP},
     {RID_XORTHOY, RID_XORTHOY_HELP}, {RID_XDIVIDESY, RID_XDIVIDESY_HELP}, {RID_XNDIVIDESY, RID_XNDIVIDESY_HELP},
     {RID_XTOWARDY, RID_XTOWARDY_HELP}, {RID_XTRANSLY, RID_XTRANSLY_HELP}, {RID_XTRANSRY, RID_XTRANSRY_HELP},
     {RID_XDEFY, RID_XDEFY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_DLARROW, RID_DLARROW_HELP}, {RID_DLRARROW, RID_DLRARROW_HELP}, {RID_DRARROW, RID_DRARROW_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_XPRECEDESY, RID_XPRECEDESY_HELP}, {RID_XSUCCEEDSY, RID_XSUCCEEDSY_HELP},
     {RID_XPRECEDESEQUALY, RID_XPRECEDESEQUALY_HELP}, {RID_XSUCCEEDSEQUALY, RID_XSUCCEEDSEQUALY_HELP},
     {RID_XPRECEDESEQUIVY, RID_XPRECEDESEQUIVY_HELP}, {RID_XSUCCEEDSEQUIVY, RID_XSUCCEEDSEQUIVY_HELP},
     {RID_XNOTPRECEDESY, RID_XNOTPRECEDESY_HELP}, {RID_XNOTSUCCEEDSY, RID_XNOTSUCCEEDSY_HELP},
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aSetOperations[] =
+const std::pair<const char*, const char*> SmElementsControl::aSetOperations[] =
 {
     {RID_XINY, RID_XINY_HELP}, {RID_XNOTINY, RID_XNOTINY_HELP}, {RID_XOWNSY, RID_XOWNSY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_XINTERSECTIONY, RID_XINTERSECTIONY_HELP}, {RID_XUNIONY, RID_XUNIONY_HELP},
     {RID_XSETMINUSY, RID_XSETMINUSY_HELP}, {RID_XSLASHY, RID_XSLASHY_HELP},
     {RID_XSUBSETY, RID_XSUBSETY_HELP}, {RID_XSUBSETEQY, RID_XSUBSETEQY_HELP},
     {RID_XSUPSETY, RID_XSUPSETY_HELP}, {RID_XSUPSETEQY, RID_XSUPSETEQY_HELP},
     {RID_XNSUBSETY, RID_XNSUBSETY_HELP}, {RID_XNSUBSETEQY, RID_XNSUBSETEQY_HELP},
     {RID_XNSUPSETY, RID_XNSUPSETY_HELP}, {RID_XNSUPSETEQY, RID_XNSUPSETEQY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_EMPTYSET, RID_EMPTYSET_HELP}, {RID_ALEPH, RID_ALEPH_HELP}, {RID_SETN, RID_SETN_HELP},
     {RID_SETZ, RID_SETZ_HELP}, {RID_SETQ, RID_SETQ_HELP}, {RID_SETR, RID_SETR_HELP}, {RID_SETC, RID_SETC_HELP}
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aFunctions[] =
+const std::pair<const char*, const char*> SmElementsControl::aFunctions[] =
 {
     {RID_ABSX, RID_ABSX_HELP}, {RID_FACTX, RID_FACTX_HELP}, {RID_SQRTX, RID_SQRTX_HELP},
     {RID_NROOTXY, RID_NROOTXY_HELP}, {RID_RSUPX, RID_RSUPX_HELP}, {RID_EX, RID_EX_HELP},
     {RID_LNX, RID_LNX_HELP}, {RID_EXPX, RID_EXPX_HELP}, {RID_LOGX, RID_LOGX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_SINX, RID_SINX_HELP}, {RID_COSX, RID_COSX_HELP}, {RID_TANX, RID_TANX_HELP}, {RID_COTX, RID_COTX_HELP},
     {RID_SINHX, RID_SINHX_HELP}, {RID_COSHX, RID_COSHX_HELP}, {RID_TANHX, RID_TANHX_HELP},
     {RID_COTHX, RID_COTHX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_ARCSINX, RID_ARCSINX_HELP}, {RID_ARCCOSX, RID_ARCCOSX_HELP}, {RID_ARCTANX, RID_ARCTANX_HELP},
     {RID_ARCCOTX, RID_ARCCOTX_HELP}, {RID_ARSINHX, RID_ARSINHX_HELP}, {RID_ARCOSHX, RID_ARCOSHX_HELP},
     {RID_ARTANHX, RID_ARTANHX_HELP}, {RID_ARCOTHX, RID_ARCOTHX_HELP}
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aOperators[] =
+const std::pair<const char*, const char*> SmElementsControl::aOperators[] =
 {
     {RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP},
     {RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LIMINFX, RID_LIMINFX_HELP}, {RID_LIMINF_FROMX, RID_LIMINF_FROMX_HELP},
     {RID_LIMINF_TOX, RID_LIMINF_TOX_HELP}, {RID_LIMINF_FROMTOX, RID_LIMINF_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LIMSUPX, RID_LIMSUPX_HELP}, {RID_LIMSUP_FROMX, RID_LIMSUP_FROMX_HELP},
     {RID_LIMSUP_TOX, RID_LIMSUP_TOX_HELP}, {RID_LIMSUP_FROMTOX, RID_LIMSUP_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP},
     {RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_PRODX, RID_PRODX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
     {RID_PROD_TOX, RID_PROD_TOX_HELP}, {RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_COPRODX, RID_COPRODX_HELP}, {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP},
     {RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_COPROD_FROMTOX, RID_COPROD_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_INTX, RID_INTX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
     {RID_INT_TOX, RID_INT_TOX_HELP}, {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_IINTX, RID_IINTX_HELP}, {RID_IINT_FROMX, RID_IINT_FROMX_HELP},
     {RID_IINT_TOX, RID_IINT_TOX_HELP}, {RID_IINT_FROMTOX, RID_IINT_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_IIINTX, RID_IIINTX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
     {RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP},
     {RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LLINTX, RID_LLINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP},
     {RID_LLINT_TOX, RID_LLINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LLLINTX, RID_LLLINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
     {RID_LLLINT_TOX, RID_LLLINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP},
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aAttributes[] =
+const std::pair<const char*, const char*> SmElementsControl::aAttributes[] =
 {
     {RID_ACUTEX, RID_ACUTEX_HELP}, {RID_GRAVEX, RID_GRAVEX_HELP}, {RID_BREVEX, RID_BREVEX_HELP},
     {RID_CIRCLEX, RID_CIRCLEX_HELP}, {RID_DOTX, RID_DOTX_HELP}, {RID_DDOTX, RID_DDOTX_HELP},
     {RID_DDDOTX, RID_DDDOTX_HELP}, {RID_BARX, RID_BARX_HELP}, {RID_VECX, RID_VECX_HELP},
     {RID_TILDEX, RID_TILDEX_HELP}, {RID_HATX, RID_HATX_HELP}, {RID_CHECKX, RID_CHECKX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_WIDEVECX, RID_WIDEVECX_HELP}, {RID_WIDETILDEX, RID_WIDETILDEX_HELP}, {RID_WIDEHATX, RID_WIDEHATX_HELP},
     {RID_OVERLINEX, RID_OVERLINEX_HELP}, {RID_UNDERLINEX, RID_UNDERLINEX_HELP}, {RID_OVERSTRIKEX, RID_OVERSTRIKEX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_PHANTOMX, RID_PHANTOMX_HELP}, {RID_BOLDX, RID_BOLDX_HELP}, {RID_ITALX, RID_ITALX_HELP},
     {RID_SIZEXY, RID_SIZEXY_HELP}, {RID_FONTXY, RID_FONTXY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE, RID_COLORX_BLUE_HELP},
     {RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED, RID_COLORX_RED_HELP},
     {RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA, RID_COLORX_MAGENTA_HELP},
@@ -184,49 +185,49 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aAttributes[] =
     {RID_COLORX_TEAL, RID_COLORX_TEAL_HELP}
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aBrackets[] =
+const std::pair<const char*, const char*> SmElementsControl::aBrackets[] =
 {
     {RID_LRGROUPX, RID_LRGROUPX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LRPARENTX, RID_LRPARENTX_HELP}, {RID_LRBRACKETX, RID_LRBRACKETX_HELP},
     {RID_LRDBRACKETX, RID_LRDBRACKETX_HELP}, {RID_LRBRACEX, RID_LRBRACEX_HELP},
     {RID_LRANGLEX, RID_LRANGLEX_HELP}, {RID_LMRANGLEXY, RID_LMRANGLEXY_HELP},
     {RID_LRCEILX, RID_LRCEILX_HELP}, {RID_LRFLOORX, RID_LRFLOORX_HELP},
     {RID_LRLINEX, RID_LRLINEX_HELP}, {RID_LRDLINEX, RID_LRDLINEX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_SLRPARENTX, RID_SLRPARENTX_HELP}, {RID_SLRBRACKETX, RID_SLRBRACKETX_HELP},
     {RID_SLRDBRACKETX, RID_SLRDBRACKETX_HELP}, {RID_SLRBRACEX, RID_SLRBRACEX_HELP},
     {RID_SLRANGLEX, RID_SLRANGLEX_HELP}, {RID_SLMRANGLEXY, RID_SLMRANGLEXY_HELP},
     {RID_SLRCEILX, RID_SLRCEILX_HELP}, {RID_SLRFLOORX, RID_SLRFLOORX_HELP},
     {RID_SLRLINEX, RID_SLRLINEX_HELP}, {RID_SLRDLINEX, RID_SLRDLINEX_HELP},
     {RID_XEVALUATEDATY, RID_XEVALUATEDATY_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_XOVERBRACEY, RID_XOVERBRACEY_HELP}, {RID_XUNDERBRACEY, RID_XUNDERBRACEY_HELP},
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aFormats[] =
+const std::pair<const char*, const char*> SmElementsControl::aFormats[] =
 {
     {RID_RSUPX, RID_RSUPX_HELP}, {RID_RSUBX, RID_RSUBX_HELP}, {RID_LSUPX, RID_LSUPX_HELP},
     {RID_LSUBX, RID_LSUBX_HELP}, {RID_CSUPX, RID_CSUPX_HELP}, {RID_CSUBX, RID_CSUBX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_NEWLINE, RID_NEWLINE_HELP}, {RID_SBLANK, RID_SBLANK_HELP}, {RID_BLANK, RID_BLANK_HELP},
     {RID_NOSPACE, RID_NOSPACE_HELP},
     {RID_ALIGNLX, RID_ALIGNLX_HELP}, {RID_ALIGNCX, RID_ALIGNCX_HELP}, {RID_ALIGNRX, RID_ALIGNRX_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP},
     {RID_MATRIX, RID_MATRIX_HELP},
 };
 
-const std::pair<const char*, sal_uInt16> SmElementsControl::aOthers[] =
+const std::pair<const char*, const char*> SmElementsControl::aOthers[] =
 {
     {RID_INFINITY, RID_INFINITY_HELP}, {RID_PARTIAL, RID_PARTIAL_HELP}, {RID_NABLA, RID_NABLA_HELP},
     {RID_EXISTS, RID_EXISTS_HELP}, {RID_NOTEXISTS, RID_NOTEXISTS_HELP}, {RID_FORALL, RID_FORALL_HELP},
     {RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE, RID_RE_HELP},
     {RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
     {RID_DOWNARROW, RID_DOWNARROW_HELP},
-    {nullptr, 0},
+    {nullptr, nullptr},
     {RID_DOTSLOW, RID_DOTSLOW_HELP}, {RID_DOTSAXIS, RID_DOTSAXIS_HELP}, {RID_DOTSVERT, RID_DOTSVERT_HELP},
     {RID_DOTSUP, RID_DOTSUP_HELP}, {RID_DOTSDOWN, RID_DOTSDOWN_HELP}
 };
@@ -234,7 +235,6 @@ const std::pair<const char*, sal_uInt16> SmElementsControl::aOthers[] =
 SmElementsControl::SmElementsControl(vcl::Window *pParent)
     : Control(pParent, WB_TABSTOP)
     , mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT))
-    , maCurrentSetId(0)
     , mpCurrentElement(nullptr)
     , mbVerticalMode(true)
     , mxScroll(VclPtr<ScrollBar>::Create(this, WB_VERT))
@@ -541,104 +541,104 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
     maElementList.push_back(o3tl::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
 }
 
-void SmElementsControl::setElementSetId(sal_uInt16 aSetId)
+void SmElementsControl::setElementSetId(const char* pSetId)
 {
-    maCurrentSetId = aSetId;
+    msCurrentSetId = pSetId;
     maMaxElementDimensions = Size();
     build();
 }
 
-void SmElementsControl::addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 aElementsArraySize)
+void SmElementsControl::addElements(const std::pair<const char*, const char*> aElementsArray[], sal_uInt16 aElementsArraySize)
 {
     for (sal_uInt16 i = 0; i < aElementsArraySize ; i++)
     {
         const char* pElement = aElementsArray[i].first;
-        sal_uInt16 aElementHelp = aElementsArray[i].second;
+        const char* pElementHelp = aElementsArray[i].second;
         if (!pElement) {
             maElementList.push_back(o3tl::make_unique<SmElementSeparator>());
         } else {
             OUString aElement(OUString::createFromAscii(pElement));
             if (aElement == RID_NEWLINE)
-                addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), aElement, SmResId(aElementHelp));
+                addElement(OUString( "\xe2\x86\xb5", 3, RTL_TEXTENCODING_UTF8 ), aElement, SmResId(pElementHelp));
             else if (aElement == RID_SBLANK)
-                addElement("\"`\"", aElement, SmResId(aElementHelp));
+                addElement("\"`\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_BLANK)
-                addElement("\"~\"", aElement, SmResId(aElementHelp));
+                addElement("\"~\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_PHANTOMX)
-                addElement("\"" + SmResId(STR_HIDE) +"\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_HIDE) +"\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_BOLDX)
-                addElement("bold B", aElement, SmResId(aElementHelp));
+                addElement("bold B", aElement, SmResId(pElementHelp));
             else if (aElement == RID_ITALX)
-                addElement("ital I", aElement, SmResId(aElementHelp));
+                addElement("ital I", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SIZEXY)
-                addElement("\"" + SmResId(STR_SIZE) + "\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_SIZE) + "\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_FONTXY)
-                addElement("\"" + SmResId(STR_FONT) + "\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_FONT) + "\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_BLACK)
-                addElement("color black { \"" + SmResId(STR_BLACK) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color black { \"" + SmResId(STR_BLACK) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_BLUE)
-                addElement("color blue { \"" + SmResId(STR_BLUE) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color blue { \"" + SmResId(STR_BLUE) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_GREEN)
-                addElement("color green { \"" + SmResId(STR_GREEN) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color green { \"" + SmResId(STR_GREEN) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_RED)
-                addElement("color red { \"" + SmResId(STR_RED) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color red { \"" + SmResId(STR_RED) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_CYAN)
-                addElement("color cyan { \"" + SmResId(STR_CYAN) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color cyan { \"" + SmResId(STR_CYAN) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_MAGENTA)
-                addElement("color magenta { \"" + SmResId(STR_MAGENTA) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color magenta { \"" + SmResId(STR_MAGENTA) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_YELLOW)
-                addElement("color yellow { \"" + SmResId(STR_YELLOW) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color yellow { \"" + SmResId(STR_YELLOW) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_GRAY)
-                addElement("color gray { \"" + SmResId(STR_GRAY) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color gray { \"" + SmResId(STR_GRAY) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_LIME)
-                addElement("color lime { \"" + SmResId(STR_LIME) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color lime { \"" + SmResId(STR_LIME) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_MAROON)
-                addElement("color maroon { \"" + SmResId(STR_MAROON) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color maroon { \"" + SmResId(STR_MAROON) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_NAVY)
-                addElement("color navy { \"" + SmResId(STR_NAVY) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color navy { \"" + SmResId(STR_NAVY) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_OLIVE)
-                addElement("color olive { \"" + SmResId(STR_OLIVE) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color olive { \"" + SmResId(STR_OLIVE) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_PURPLE)
-                addElement("color purple { \"" + SmResId(STR_PURPLE) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color purple { \"" + SmResId(STR_PURPLE) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_SILVER)
-                addElement("color silver { \"" + SmResId(STR_SILVER) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color silver { \"" + SmResId(STR_SILVER) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_COLORX_TEAL)
-                addElement("color teal { \"" + SmResId(STR_TEAL) + "\" }", aElement, SmResId(aElementHelp));
+                addElement("color teal { \"" + SmResId(STR_TEAL) + "\" }", aElement, SmResId(pElementHelp));
             else if (aElement == RID_ALIGNLX)
-                addElement("\"" + SmResId(STR_ALIGN_LEFT) + "\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_ALIGN_LEFT) + "\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_ALIGNCX)
-                addElement("\"" + SmResId(STR_ALIGN_CENTER) + "\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_ALIGN_CENTER) + "\"", aElement, SmResId(pElementHelp));
             else if (aElement == RID_ALIGNRX)
-                addElement("\"" + SmResId(STR_ALIGN_RIGHT) + "\"", aElement, SmResId(aElementHelp));
+                addElement("\"" + SmResId(STR_ALIGN_RIGHT) + "\"", aElement, SmResId(pElementHelp));
 
             else if (aElement == RID_SLRPARENTX)
-                addElement("left ( binom{<?>}{<?>} right ) ", aElement, SmResId(aElementHelp));
+                addElement("left ( binom{<?>}{<?>} right ) ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRBRACKETX)
-                addElement("left [ binom{<?>}{<?>} right ] ", aElement, SmResId(aElementHelp));
+                addElement("left [ binom{<?>}{<?>} right ] ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRDBRACKETX)
-                addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", aElement, SmResId(aElementHelp));
+                addElement("left ldbracket binom{<?>}{<?>} right rdbracket ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRBRACEX)
-                addElement("left lbrace binom{<?>}{<?>} right rbrace ", aElement, SmResId(aElementHelp));
+                addElement("left lbrace binom{<?>}{<?>} right rbrace ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRANGLEX)
-                addElement("left langle binom{<?>}{<?>} right rangle ", aElement, SmResId(aElementHelp));
+                addElement("left langle binom{<?>}{<?>} right rangle ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRCEILX)
-                addElement("left lceil binom{<?>}{<?>} right rceil ", aElement, SmResId(aElementHelp));
+                addElement("left lceil binom{<?>}{<?>} right rceil ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRFLOORX)
-                addElement("left lfloor binom{<?>}{<?>} right rfloor ", aElement, SmResId(aElementHelp));
+                addElement("left lfloor binom{<?>}{<?>} right rfloor ", aElement, SmResId(pElementHelp));
 
             else if (aElement == RID_SLRLINEX)
-                addElement("left lline binom{<?>}{<?>} right rline ", aElement, SmResId(aElementHelp));
+                addElement("left lline binom{<?>}{<?>} right rline ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLRDLINEX)
-                addElement("left ldline binom{<?>}{<?>} right rdline ", aElement, SmResId(aElementHelp));
+                addElement("left ldline binom{<?>}{<?>} right rdline ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_SLMRANGLEXY)
-                addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", aElement, SmResId(aElementHelp));
+                addElement("left langle binom{<?>}{<?>} mline binom{<?>}{<?>} right rangle ", aElement, SmResId(pElementHelp));
 
             else if (aElement == RID_XOVERBRACEY)
-                addElement("{<?><?><?>} overbrace {<?>} ", aElement, SmResId(aElementHelp));
+                addElement("{<?><?><?>} overbrace {<?>} ", aElement, SmResId(pElementHelp));
             else if (aElement == RID_XUNDERBRACEY)
-                addElement("{<?><?><?>} underbrace {<?>} ", aElement, SmResId(aElementHelp));
+                addElement("{<?><?><?>} underbrace {<?>} ", aElement, SmResId(pElementHelp));
             else
-                addElement(aElement, aElement, SmResId(aElementHelp));
+                addElement(aElement, aElement, SmResId(pElementHelp));
         }
     }
 }
@@ -647,49 +647,36 @@ void SmElementsControl::build()
 {
     maElementList.clear();
 
-    switch(maCurrentSetId)
+    if (msCurrentSetId == RID_CATEGORY_UNARY_BINARY_OPERATORS)
+        addElements(aUnaryBinaryOperatorsList, SAL_N_ELEMENTS(aUnaryBinaryOperatorsList));
+    else if (msCurrentSetId == RID_CATEGORY_RELATIONS)
+        addElements(aRelationsList, SAL_N_ELEMENTS(aRelationsList));
+    else if (msCurrentSetId == RID_CATEGORY_SET_OPERATIONS)
+        addElements(aSetOperations, SAL_N_ELEMENTS(aSetOperations));
+    else if (msCurrentSetId == RID_CATEGORY_FUNCTIONS)
+        addElements(aFunctions, SAL_N_ELEMENTS(aFunctions));
+    else if (msCurrentSetId == RID_CATEGORY_OPERATORS)
+        addElements(aOperators, SAL_N_ELEMENTS(aOperators));
+    else if (msCurrentSetId == RID_CATEGORY_ATTRIBUTES)
+        addElements(aAttributes, SAL_N_ELEMENTS(aAttributes));
+    else if (msCurrentSetId ==  RID_CATEGORY_BRACKETS)
+        addElements(aBrackets, SAL_N_ELEMENTS(aBrackets));
+    else if (msCurrentSetId == RID_CATEGORY_FORMATS)
+        addElements(aFormats, SAL_N_ELEMENTS(aFormats));
+    else if (msCurrentSetId == RID_CATEGORY_OTHERS)
+        addElements(aOthers, SAL_N_ELEMENTS(aOthers));
+    else if (msCurrentSetId == RID_CATEGORY_EXAMPLES)
     {
-        case RID_CATEGORY_UNARY_BINARY_OPERATORS:
-            addElements(aUnaryBinaryOperatorsList, SAL_N_ELEMENTS(aUnaryBinaryOperatorsList));
-        break;
-        case RID_CATEGORY_RELATIONS:
-            addElements(aRelationsList, SAL_N_ELEMENTS(aRelationsList));
-        break;
-        case RID_CATEGORY_SET_OPERATIONS:
-            addElements(aSetOperations, SAL_N_ELEMENTS(aSetOperations));
-        break;
-        case RID_CATEGORY_FUNCTIONS:
-            addElements(aFunctions, SAL_N_ELEMENTS(aFunctions));
-        break;
-        case RID_CATEGORY_OPERATORS:
-            addElements(aOperators, SAL_N_ELEMENTS(aOperators));
-        break;
-        case RID_CATEGORY_ATTRIBUTES:
-            addElements(aAttributes, SAL_N_ELEMENTS(aAttributes));
-        break;
-        case RID_CATEGORY_BRACKETS:
-            addElements(aBrackets, SAL_N_ELEMENTS(aBrackets));
-        break;
-        case RID_CATEGORY_FORMATS:
-            addElements(aFormats, SAL_N_ELEMENTS(aFormats));
-        break;
-        case RID_CATEGORY_OTHERS:
-            addElements(aOthers, SAL_N_ELEMENTS(aOthers));
-        break;
-        case RID_CATEGORY_EXAMPLES:
-        {
-            OUString aEquation = "C=%pi cdot d = 2 cdot %pi cdot r";
-            addElement(aEquation, aEquation, "");
-            aEquation = "E=mc^2";
-            addElement(aEquation, aEquation, "");
-            aEquation = "a^2 + b^2 = c^2";
-            addElement(aEquation, aEquation, "");
-            aEquation = "f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}";
-            addElement(aEquation, aEquation, "");
-            aEquation = "f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over {2%sigma^2}}";
-            addElement(aEquation, aEquation, "");
-        }
-        break;
+        OUString aEquation = "C=%pi cdot d = 2 cdot %pi cdot r";
+        addElement(aEquation, aEquation, "");
+        aEquation = "E=mc^2";
+        addElement(aEquation, aEquation, "");
+        aEquation = "a^2 + b^2 = c^2";
+        addElement(aEquation, aEquation, "");
+        aEquation = "f ( x ) = sum from { { i = 0 } } to { infinity } { {f^{(i)}(0)} over {i!} x^i}";
+        addElement(aEquation, aEquation, "");
+        aEquation = "f ( x ) = {1} over {%sigma sqrt{2%pi} }func e^-{{(x-%mu)^2} over {2%sigma^2}}";
+        addElement(aEquation, aEquation, "");
     }
     LayoutOrPaintContents();
     Invalidate();
@@ -705,7 +692,7 @@ FactoryFunction SmElementsControl::GetUITestFactory() const
     return ElementSelectorUIObject::create;
 }
 
-const sal_uInt16 SmElementsDockingWindow::aCategories[] = {
+const char* SmElementsDockingWindow::aCategories[] = {
     RID_CATEGORY_UNARY_BINARY_OPERATORS,
     RID_CATEGORY_RELATIONS,
     RID_CATEGORY_SET_OPERATIONS,
@@ -732,9 +719,9 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
 
     mpElementListBox->SetDropDownLineCount( SAL_N_ELEMENTS(aCategories) );
 
-    for (sal_uInt16 nCategory : aCategories)
+    for (const char* pCategory : aCategories)
     {
-        mpElementListBox->InsertEntry(SmResId(nCategory));
+        mpElementListBox->InsertEntry(SmResId(pCategory));
     }
 
     mpElementListBox->SetSelectHdl(LINK(this, SmElementsDockingWindow, ElementSelectedHandle));
@@ -789,12 +776,12 @@ IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, voi
 
 IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
 {
-    for (sal_uInt16 aCurrentCategory : aCategories)
+    for (const char* pCurrentCategory : aCategories)
     {
-        OUString aCurrentCategoryString = SmResId(aCurrentCategory);
+        OUString aCurrentCategoryString = SmResId(pCurrentCategory);
         if (aCurrentCategoryString == rList.GetSelectEntry())
         {
-            mpElementsControl->setElementSetId(aCurrentCategory);
+            mpElementsControl->setElementSetId(pCurrentCategory);
             return;
         }
     }
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c335be846891..a43638123405 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -60,6 +60,8 @@
 #include <document.hxx>
 #include <view.hxx>
 #include <o3tl/make_unique.hxx>
+#include "strings.hrc"
+
 using namespace com::sun::star;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index a0d47e9c74fd..05467dcfad3d 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -20,7 +20,7 @@
 #include "action.hxx"
 #include "smdll.hxx"
 #include "document.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 SmFormatAction::SmFormatAction(SmDocShell *pDocSh,
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 84be03edc1a7..70a649dedfa0 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -33,6 +33,7 @@
 #include "cfgitem.hxx"
 
 #include "starmath.hrc"
+#include "strings.hrc"
 #include "smdll.hxx"
 #include "smmod.hxx"
 #include "format.hxx"
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
deleted file mode 100644
index cfa5ecef566f..000000000000
--- a/starmath/source/commands.src
+++ /dev/null
@@ -1,1062 +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 <sfx2/sfx.hrc>
-#include "starmath.hrc"
-
-String RID_PLUSX_HELP
-{
-    Text [ en-US ] = "+ Sign" ;
-};
-String RID_MINUSX_HELP
-{
-    Text [ en-US ] = "- Sign" ;
-};
-String RID_PLUSMINUSX_HELP
-{
-    Text [ en-US ] = "+- Sign" ;
-};
-String RID_MINUSPLUSX_HELP
-{
-    Text [ en-US ] = "-+ Sign" ;
-};
-String RID_NEGX_HELP
-{
-    Text [ en-US ] = "Boolean NOT" ;
-};
-String RID_XPLUSY_HELP
-{
-    Text [ en-US ] = "Addition +" ;
-};
-String RID_XMINUSY_HELP
-{
-    Text [ en-US ] = "Subtraction -" ;
-};
-String RID_XCDOTY_HELP
-{
-    Text [ en-US ] = "Multiplication (Dot)" ;
-};
-String RID_XTIMESY_HELP
-{
-    Text [ en-US ] = "Multiplication (x)" ;
-};
-String RID_XSYMTIMESY_HELP
-{
-    Text [ en-US ] = "Multiplication (*)" ;
-};
-String RID_XSYMDIVIDEY_HELP
-{
-    Text [ en-US ] = "Division (Slash)" ;
-};
-String RID_XDIVY_HELP
-{
-    Text [ en-US ] = "Division (÷)" ;
-};
-String RID_XOVERY_HELP
-{
-    Text [ en-US ] = "Division (Fraction)" ;
-};
-String RID_XODIVIDEY_HELP
-{
-    Text [ en-US ] = "Circled Slash" ;
-};
-String RID_XODOTY_HELP
-{
-    Text [ en-US ] = "Circled Dot" ;
-};
-String RID_XOMINUSY_HELP
-{
-    Text [ en-US ] = "Circled Minus" ;
-};
-String RID_XOPLUSY_HELP
-{
-    Text [ en-US ] = "Circled Plus" ;
-};
-String RID_XOTIMESY_HELP
-{
-    Text [ en-US ] = "Tensor Product" ;
-};
-String RID_XANDY_HELP
-{
-    Text [ en-US ] = "Boolean AND" ;
-};
-String RID_XORY_HELP
-{
-    Text [ en-US ] = "Boolean OR" ;
-};
-String RID_XEQY_HELP
-{
-    Text [ en-US ] = "Is Equal" ;
-};
-String RID_XNEQY_HELP
-{
-    Text [ en-US ] = "Is Not Equal" ;
-};
-String RID_XLTY_HELP
-{
-    Text [ en-US ] = "Is Less Than" ;
-};
-String RID_XGTY_HELP
-{
-    Text [ en-US ] = "Is Greater Than" ;
-};
-String RID_XLEY_HELP
-{
-    Text [ en-US ] = "Is Less Than Or Equal To" ;
-};
-String RID_XGEY_HELP
-{
-    Text [ en-US ] = "Is Greater Than Or Equal To" ;
-};
-String RID_XLESLANTY_HELP
-{
-    Text [ en-US ] = "Is Less Than Or Equal To" ;
-};
-String RID_XGESLANTY_HELP
-{
-    Text [ en-US ] = "Is Greater Than Or Equal To" ;
-};
-String RID_XLLY_HELP
-{
-    Text [ en-US ] = "Is Much Less Than" ;
-};
-String RID_XGGY_HELP
-{
-    Text [ en-US ] = "Is Much Greater Than" ;
-};
-String RID_XDEFY_HELP
-{
-    Text [ en-US ] = "Is Defined As" ;
-};
-String RID_XEQUIVY_HELP
-{
-    Text [ en-US ] = "Is Congruent To" ;
-};
-String RID_XAPPROXY_HELP
-{
-    Text [ en-US ] = "Is Approximately Equal" ;
-};
-String RID_XSIMY_HELP
-{
-    Text [ en-US ] = "Is Similar To" ;
-};
-String RID_XSIMEQY_HELP
-{
-    Text [ en-US ] = "Is Similar Or Equal" ;
-};
-String RID_XPROPY_HELP
-{
-    Text [ en-US ] = "Is Proportional To" ;
-};
-String RID_XORTHOY_HELP
-{
-    Text [ en-US ] = "Is Orthogonal To" ;
-};
-String RID_XPARALLELY_HELP
-{
-    Text [ en-US ] = "Is Parallel To" ;
-};
-String RID_XTOWARDY_HELP
-{
-    Text [ en-US ] = "Toward" ;
-};
-String RID_XTRANSLY_HELP
-{
-    Text [ en-US ] = "Corresponds To (Left)" ;
-};
-String RID_XTRANSRY_HELP
-{
-    Text [ en-US ] = "Corresponds To (Right)" ;
-};
-String RID_XINY_HELP
-{
-    Text [ en-US ] = "Is In" ;
-};
-String RID_XNOTINY_HELP
-{
-    Text [ en-US ] = "Is Not In" ;
-};
-String RID_XOWNSY_HELP
-{
-    Text [ en-US ] = "Owns" ;
-};
-String RID_XUNIONY_HELP
-{
-    Text [ en-US ] = "Union" ;
-};
-String RID_XINTERSECTIONY_HELP
-{
-    Text [ en-US ] = "Intersection" ;
-};
-String RID_XSETMINUSY_HELP
-{
-    Text [ en-US ] = "Difference" ;
-};
-String RID_XSLASHY_HELP
-{
-    Text [ en-US ] = "Quotient Set" ;
-};
-String RID_XSUBSETY_HELP
-{
-    Text [ en-US ] = "Subset" ;
-};
-String RID_XSUBSETEQY_HELP
-{
-    Text [ en-US ] = "Subset Or Equal To" ;
-};
-String RID_XSUPSETY_HELP
-{
-    Text [ en-US ] = "Superset" ;
-};
-String RID_XSUPSETEQY_HELP
-{
-    Text [ en-US ] = "Superset Or Equal To" ;
-};
-String RID_XNSUBSETY_HELP
-{
-    Text [ en-US ] = "Not Subset" ;
-};
-String RID_XNSUBSETEQY_HELP
-{
-    Text [ en-US ] = "Not Subset Or Equal" ;
-};
-String RID_XNSUPSETY_HELP
-{
-    Text [ en-US ] = "Not Superset" ;
-};
-String RID_XNSUPSETEQY_HELP
-{
-    Text [ en-US ] = "Not Superset Or Equal" ;
-};
-String RID_ABSX_HELP
-{
-    Text [ en-US ] = "Absolute Value" ;
-};
-String RID_FACTX_HELP
-{
-    Text [ en-US ] = "Factorial" ;
-};
-String RID_SQRTX_HELP
-{
-    Text [ en-US ] = "Square Root" ;
-};
-String RID_NROOTXY_HELP
-{
-    Text [ en-US ] = "N-th Root" ;
-};
-String RID_EX_HELP
-{
-    Text [ en-US ] = "Exponential Function" ;
-};
-String RID_EXPX_HELP
-{
-    Text [ en-US ] = "Exponential Function" ;
-};
-String RID_LNX_HELP
-{
-    Text [ en-US ] = "Natural Logarithm" ;
-};
-String RID_LOGX_HELP
-{
-    Text [ en-US ] = "Logarithm" ;
-};
-String RID_SINX_HELP
-{
-    Text [ en-US ] = "Sine" ;
-};
-String RID_COSX_HELP
-{
-    Text [ en-US ] = "Cosine" ;
-};
-String RID_TANX_HELP
-{
-    Text [ en-US ] = "Tangent" ;
-};
-String RID_COTX_HELP
-{
-    Text [ en-US ] = "Cotangent" ;
-};
-String RID_ARCSINX_HELP
-{
-    Text [ en-US ] = "Arcsine" ;
-};
-String RID_ARCCOSX_HELP
-{
-    Text [ en-US ] = "Arccosine" ;
-};
-String RID_ARCTANX_HELP
-{
-    Text [ en-US ] = "Arctangent" ;
-};
-String RID_ARCCOTX_HELP
-{
-    Text [ en-US ] = "Arccotangent" ;
-};
-String RID_SINHX_HELP
-{
-    Text [ en-US ] = "Hyperbolic Sine" ;
-};
-String RID_COSHX_HELP
-{
-    Text [ en-US ] = "Hyperbolic Cosine" ;
-};
-String RID_TANHX_HELP
-{
-    Text [ en-US ] = "Hyperbolic Tangent" ;
-};
-String RID_COTHX_HELP
-{
-    Text [ en-US ] = "Hyperbolic Cotangent" ;
-};
-String RID_ARSINHX_HELP
-{
-    Text [ en-US ] = "Area Hyperbolic Sine" ;
-};
-String RID_ARCOSHX_HELP
-{
-    Text [ en-US ] = "Area Hyperbolic Cosine" ;
-};
-String RID_ARTANHX_HELP
-{
-    Text [ en-US ] = "Area Hyperbolic Tangent" ;
-};
-String RID_ARCOTHX_HELP
-{
-    Text [ en-US ] = "Area Hyperbolic Cotangent" ;
-};
-String RID_SUMX_HELP
-{
-    Text [ en-US ] = "Sum" ;
-};
-String RID_SUM_FROMX_HELP
-{
-    Text [ en-US ] = "Sum Subscript Bottom" ;
-};
-String RID_SUM_TOX_HELP
-{
-    Text [ en-US ] = "Sum Superscript Top" ;
-};
-String RID_SUM_FROMTOX_HELP
-{
-    Text [ en-US ] = "Sum Sup/Sub script" ;
-};
-String RID_PRODX_HELP
-{
-    Text [ en-US ] = "Product" ;
-};
-String RID_PROD_FROMX_HELP
-{
-    Text [ en-US ] = "Product Subscript Bottom" ;
-};
-String RID_PROD_TOX_HELP
-{
-    Text [ en-US ] = "Product Superscript Top" ;
-};
-String RID_PROD_FROMTOX_HELP
-{
-    Text [ en-US ] = "Product Sup/Sub script" ;
-};
-String RID_COPRODX_HELP
-{
-    Text [ en-US ] = "Coproduct" ;
-};
-String RID_COPROD_FROMX_HELP
-{
-    Text [ en-US ] = "Coproduct Subscript Bottom" ;
-};
-String RID_COPROD_TOX_HELP
-{
-    Text [ en-US ] = "Coproduct Superscript Top" ;
-};
-String RID_COPROD_FROMTOX_HELP
-{
-    Text [ en-US ] = "Coproduct Sup/Sub script" ;
-};
-String RID_LIMX_HELP
-{
-    Text [ en-US ] = "Limes" ;
-};
-String RID_LIM_FROMX_HELP
-{
-    Text [ en-US ] = "Limes Subscript Bottom" ;
-};
-String RID_LIM_TOX_HELP
-{
-    Text [ en-US ] = "Limes Superscript Top" ;
-};
-String RID_LIM_FROMTOX_HELP
-{
-    Text [ en-US ] = "Limes Sup/Sub script" ;
-};
-String RID_LIMINFX_HELP
-{
-    Text [ en-US ] = "Limit Inferior" ;
-};
-String RID_LIMINF_FROMX_HELP
-{
-    Text [ en-US ] = "Limit Inferior Subscript Bottom" ;
-};
-String RID_LIMINF_TOX_HELP
-{
-    Text [ en-US ] = "Limit Inferior Superscript Top" ;
-};
-String RID_LIMINF_FROMTOX_HELP
-{
-    Text [ en-US ] = "Limit Inferior Sup/Sub script" ;
-};
-String RID_LIMSUPX_HELP
-{
-    Text [ en-US ] = "Limit Superior" ;
-};
-String RID_LIMSUP_FROMX_HELP
-{
-    Text [ en-US ] = "Limit Superior Subscript Bottom" ;
-};
-String RID_LIMSUP_TOX_HELP
-{
-    Text [ en-US ] = "Limit Superior Superscript Top" ;
-};
-String RID_LIMSUP_FROMTOX_HELP
-{
-    Text [ en-US ] = "Limit Superior Sup/Sub script" ;
-};
-String RID_EXISTS_HELP
-{
-    Text [ en-US ] = "There Exists" ;
-};
-String RID_NOTEXISTS_HELP
-{
-    Text [ en-US ] = "There Not Exists" ;
-};
-String RID_FORALL_HELP
-{
-    Text [ en-US ] = "For all" ;
-};
-String RID_INTX_HELP
-{
-    Text [ en-US ] = "Integral" ;
-};
-String RID_INT_FROMX_HELP
-{
-    Text [ en-US ] = "Integral Subscript Bottom" ;
-};
-String RID_INT_TOX_HELP
-{
-    Text [ en-US ] = "Integral Superscript Top" ;
-};
-String RID_INT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Integral Sup/Sub script" ;
-};
-String RID_IINTX_HELP
-{
-    Text [ en-US ] = "Double Integral" ;
-};
-String RID_IINT_FROMX_HELP
-{
-    Text [ en-US ] = "Double Integral Subscript Bottom" ;
-};
-String RID_IINT_TOX_HELP
-{
-    Text [ en-US ] = "Double Integral Superscript Top" ;
-};
-String RID_IINT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Double Integral Sup/Sub script" ;
-};
-String RID_IIINTX_HELP
-{
-    Text [ en-US ] = "Triple Integral" ;
-};
-String RID_IIINT_FROMX_HELP
-{
-    Text [ en-US ] = "Triple Integral Subscript Bottom" ;
-};
-String RID_IIINT_TOX_HELP
-{
-    Text [ en-US ] = "Triple Integral Superscript Top" ;
-};
-String RID_IIINT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Triple Integral Sup/Sub script" ;
-};
-String RID_LINTX_HELP
-{
-    Text [ en-US ] = "Curve Integral" ;
-};
-String RID_LINT_FROMX_HELP
-{
-    Text [ en-US ] = "Curve Integral Subscript Bottom" ;
-};
-String RID_LINT_TOX_HELP
-{
-    Text [ en-US ] = "Curve Integral Superscript Top" ;
-};
-String RID_LINT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Curve Integral Sup/Sub script" ;
-};
-String RID_LLINTX_HELP
-{
-    Text [ en-US ] = "Double Curve Integral" ;
-};
-String RID_LLINT_FROMX_HELP
-{
-    Text [ en-US ] = "Double Curve Integral Subscript Bottom" ;
-};
-String RID_LLINT_TOX_HELP
-{
-    Text [ en-US ] = "Double Curve Integral Superscript Top" ;
-};
-String RID_LLINT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Double Curve Integral Sup/Sub script" ;
-};
-String RID_LLLINTX_HELP
-{
-    Text [ en-US ] = "Triple Curve Integral" ;
-};
-String RID_LLLINT_FROMX_HELP
-{
-    Text [ en-US ] = "Triple Curve Integral Subscript Bottom" ;
-};
-String RID_LLLINT_TOX_HELP
-{
-    Text [ en-US ] = "Triple Curve Integral Superscript Top" ;
-};
-String RID_LLLINT_FROMTOX_HELP
-{
-    Text [ en-US ] = "Triple Curve Integral Sup/Sub script" ;
-};
-String RID_ACUTEX_HELP
-{
-    Text [ en-US ] = "Acute Accent" ;
-};
-String RID_BARX_HELP
-{
-    Text [ en-US ] = "Line Above" ;
-};
-String RID_BREVEX_HELP
-{
-    Text [ en-US ] = "Breve" ;
-};
-String RID_CHECKX_HELP
-{
-    Text [ en-US ] = "Reverse Circumflex" ;
-};
-String RID_CIRCLEX_HELP
-{
-    Text [ en-US ] = "Circle" ;
-};
-String RID_DOTX_HELP
-{
-    Text [ en-US ] = "Dot" ;
-};
-String RID_DDOTX_HELP
-{
-    Text [ en-US ] = "Double Dot" ;
-};
-String RID_DDDOTX_HELP
-{
-    Text [ en-US ] = "Triple Dot" ;
-};
-String RID_GRAVEX_HELP
-{
-    Text [ en-US ] = "Grave Accent" ;
-};
-String RID_HATX_HELP
-{
-    Text [ en-US ] = "Circumflex" ;
-};
-String RID_TILDEX_HELP
-{
-    Text [ en-US ] = "Tilde" ;
-};
-String RID_VECX_HELP
-{
-    Text [ en-US ] = "Vector Arrow" ;
-};
-String RID_UNDERLINEX_HELP
-{
-    Text [ en-US ] = "Line Below" ;
-};
-String RID_OVERLINEX_HELP
-{
-    Text [ en-US ] = "Line Over" ;
-};
-String RID_OVERSTRIKEX_HELP
-{
-    Text [ en-US ] = "Line Through" ;
-};
-String RID_PHANTOMX_HELP
-{
-    Text [ en-US ] = "Transparent" ;
-};
-String RID_BOLDX_HELP
-{
-    Text [ en-US ] = "Bold Font" ;
-};
-String RID_ITALX_HELP
-{
-    Text [ en-US ] = "Italic Font" ;
-};
-String RID_SIZEXY_HELP
-{
-    Text [ en-US ] = "Resize" ;
-};
-String RID_FONTXY_HELP
-{
-    Text [ en-US ] = "Change Font" ;
-};
-String RID_COLORX_BLACK_HELP
-{
-    Text [ en-US ] = "Color Black" ;
-};
-String RID_COLORX_BLUE_HELP
-{
-    Text [ en-US ] = "Color Blue" ;
-};
-String RID_COLORX_GREEN_HELP
-{
-    Text [ en-US ] = "Color Green" ;
-};
-String RID_COLORX_RED_HELP
-{
-    Text [ en-US ] = "Color Red" ;
-};
-String RID_COLORX_CYAN_HELP
-{
-    Text [ en-US ] = "Color Cyan" ;
-};
-String RID_COLORX_MAGENTA_HELP
-{
-    Text [ en-US ] = "Color Magenta" ;
-};
-String RID_COLORX_GRAY_HELP
-{
-    Text [ en-US ] = "Color Gray" ;
-};
-String RID_COLORX_LIME_HELP
-{
-    Text [ en-US ] = "Color Lime" ;
-};
-String RID_COLORX_MAROON_HELP
-{
-    Text [ en-US ] = "Color Maroon" ;
-};
-String RID_COLORX_NAVY_HELP
-{
-    Text [ en-US ] = "Color Navy" ;
-};
-String RID_COLORX_OLIVE_HELP
-{
-    Text [ en-US ] = "Color Olive" ;
-};
-String RID_COLORX_PURPLE_HELP
-{
-    Text [ en-US ] = "Color Purple" ;
-};
-String RID_COLORX_SILVER_HELP
-{
-    Text [ en-US ] = "Color Silver" ;
-};
-String RID_COLORX_TEAL_HELP
-{
-    Text [ en-US ] = "Color Teal" ;
-};
-String RID_COLORX_YELLOW_HELP
-{
-    Text [ en-US ] = "Color Yellow" ;
-};
-
-String RID_LRGROUPX_HELP
-{
-    Text [ en-US ] = "Group Brackets" ;
-};
-String RID_LRPARENTX_HELP
-{
-    Text [ en-US ] = "Round Brackets" ;
-};
-String RID_LRBRACKETX_HELP
-{
-    Text [ en-US ] = "Square Brackets" ;
-};
-String RID_LRDBRACKETX_HELP
-{
-    Text [ en-US ] = "Double Square Brackets" ;
-};
-String RID_LRBRACEX_HELP
-{
-    Text [ en-US ] = "Braces" ;
-};
-String RID_LRANGLEX_HELP
-{
-    Text [ en-US ] = "Angle Brackets" ;
-};
-String RID_LRCEILX_HELP
-{
-    Text [ en-US ] = "Upper Ceil" ;
-};
-String RID_LRFLOORX_HELP
-{
-    Text [ en-US ] = "Floor" ;
-};
-String RID_LRLINEX_HELP
-{
-    Text [ en-US ] = "Single Lines" ;
-};
-String RID_LRDLINEX_HELP
-{
-    Text [ en-US ] = "Double Lines" ;
-};
-String RID_LMRANGLEXY_HELP
-{
-    Text [ en-US ] = "Operator Brackets" ;
-};
-String RID_SLRPARENTX_HELP
-{
-    Text [ en-US ] = "Round Brackets (Scalable)" ;
-};
-String RID_SLRBRACKETX_HELP
-{
-    Text [ en-US ] = "Square Brackets (Scalable)" ;
-};
-String RID_SLRDBRACKETX_HELP
-{
-    Text [ en-US ] = "Double Square Brackets (Scalable)" ;
-};
-String RID_SLRBRACEX_HELP
-{
-    Text [ en-US ] = "Braces (Scalable)" ;
-};
-String RID_SLRANGLEX_HELP
-{
-    Text [ en-US ] = "Angle Brackets (Scalable)" ;
-};
-String RID_SLRCEILX_HELP
-{
-    Text [ en-US ] = "Ceiling (Scalable)" ;
-};
-String RID_SLRFLOORX_HELP
-{
-    Text [ en-US ] = "Floor (Scalable)" ;
-};
-String RID_SLRLINEX_HELP
-{
-    Text [ en-US ] = "Single Lines (Scalable)" ;
-};
-String RID_SLRDLINEX_HELP
-{
-    Text [ en-US ] = "Double Lines (Scalable)" ;
-};
-String RID_SLMRANGLEXY_HELP
-{
-    Text [ en-US ] = "Operator Brackets (Scalable)" ;
-};
-String RID_XEVALUATEDATY_HELP
-{
-    Text [ en-US ] = "Evaluated At" ;
-};
-String RID_XOVERBRACEY_HELP
-{
-    Text [ en-US ] = "Braces Top (Scalable)" ;
-};
-String RID_XUNDERBRACEY_HELP
-{
-    Text [ en-US ] = "Braces Bottom (Scalable)" ;
-};
-String RID_RSUBX_HELP
-{
-    Text [ en-US ] = "Subscript Right" ;
-};
-String RID_RSUPX_HELP
-{
-    Text [ en-US ] = "Power" ;
-};
-String RID_LSUBX_HELP
-{
-    Text [ en-US ] = "Subscript Left" ;
-};
-String RID_LSUPX_HELP
-{
-    Text [ en-US ] = "Superscript Left" ;
-};
-String RID_CSUBX_HELP
-{
-    Text [ en-US ] = "Subscript Bottom" ;
-};
-String RID_CSUPX_HELP
-{
-    Text [ en-US ] = "Superscript Top" ;
-};
-String RID_SBLANK_HELP
-{
-    Text [ en-US ] = "Small Gap" ;
-};
-String RID_BLANK_HELP
-{
-    Text [ en-US ] = "Blank" ;
-};
-String RID_NEWLINE_HELP
-{
-    Text [ en-US ] = "New Line" ;
-};
-String RID_BINOMXY_HELP
-{
-    Text [ en-US ] = "Vertical Stack (2 Elements)";
-};
-String RID_STACK_HELP
-{
-    Text [ en-US ] = "Vertical Stack" ;
-};
-String RID_MATRIX_HELP
-{
-    Text [ en-US ] = "Matrix Stack" ;
-};
-String RID_ALIGNLX_HELP
-{
-    Text [ en-US ] = "Align Left" ;
-};
-String RID_ALIGNCX_HELP
-{
-    Text [ en-US ] = "Align Center" ;
-};
-String RID_ALIGNRX_HELP
-{
-    Text [ en-US ] = "Align Right" ;
-};
-String RID_ALEPH_HELP
-{
-    Text [ en-US ] = "Aleph" ;
-};
-String RID_EMPTYSET_HELP
-{
-    Text [ en-US ] = "Empty Set" ;
-};
-String RID_RE_HELP
-{
-    Text [ en-US ] = "Real Part" ;
-};
-String RID_IM_HELP
-{
-    Text [ en-US ] = "Imaginary Part" ;
-};
-String RID_INFINITY_HELP
-{
-    Text [ en-US ] = "Infinity" ;
-};
-String RID_PARTIAL_HELP
-{
-    Text [ en-US ] = "Partial" ;
-};
-String RID_NABLA_HELP
-{
-    Text [ en-US ] = "Nabla" ;
-};
-String RID_WP_HELP
-{
-    Text [ en-US ] = "Weierstrass p" ;
-};
-String RID_DOTSAXIS_HELP
-{
-    Text [ en-US ] = "Dots In Middle" ;
-};
-String RID_DOTSUP_HELP
-{
-    Text [ en-US ] = "Dots To Top" ;
-};
-String RID_DOTSDOWN_HELP
-{
-    Text [ en-US ] = "Dots To Bottom" ;
-};
-String RID_DOTSLOW_HELP
-{
-    Text [ en-US ] = "Dots At Bottom" ;
-};
-String RID_DOTSVERT_HELP
-{
-    Text [ en-US ] = "Dots Vertically" ;
-};
-String RID_XCIRCY_HELP
-{
-    Text [ en-US ] = "Concatenate" ;
-};
-String RID_XWIDESLASHY_HELP
-{
-    Text [ en-US ] = "Division (wideslash)" ;
-};
-String RID_XWIDEBSLASHY_HELP
-{
-    Text [ en-US ] = "Division (counter wideslash)" ;
-};
-String RID_XDIVIDESY_HELP
-{
-    Text [ en-US ] = "Divides" ;
-};
-String RID_XNDIVIDESY_HELP
-{
-    Text [ en-US ] = "Does Not Divide" ;
-};
-String RID_DLARROW_HELP
-{
-    Text [ en-US ] = "Double Arrow Left" ;
-};
-String RID_DLRARROW_HELP
-{
-    Text [ en-US ] = "Double Arrow Left And Right" ;
-};
-String RID_DRARROW_HELP
-{
-    Text [ en-US ] = "Double Arrow Right" ;
-};
-String RID_SETN_HELP
-{
-    Text [ en-US ] = "Natural Numbers Set" ;
-};
-String RID_SETZ_HELP
-{
-    Text [ en-US ] = "Integers Set" ;
-};
-String RID_SETQ_HELP
-{
-    Text [ en-US ] = "Set of Rational Numbers" ;
-};
-String RID_SETR_HELP
-{
-    Text [ en-US ] = "Real Numbers Set" ;
-};
-String RID_SETC_HELP
-{
-    Text [ en-US ] = "Complex Numbers Set" ;
-};
-String RID_WIDEHATX_HELP
-{
-    Text [ en-US ] = "Large Circumflex" ;
-};
-String RID_WIDETILDEX_HELP
-{
-    Text [ en-US ] = "Large Tilde" ;
-};
-String RID_WIDEVECX_HELP
-{
-    Text [ en-US ] = "Large Vector Arrow" ;
-};
-String RID_HBAR_HELP
-{
-    Text [ en-US ] = "h Bar" ;
-};
-String RID_LAMBDABAR_HELP
-{
-    Text [ en-US ] = "Lambda Bar" ;
-};
-String RID_LEFTARROW_HELP
-{
-    Text [ en-US ] = "Left Arrow" ;
-};
-String RID_RIGHTARROW_HELP
-{
-    Text [ en-US ] = "Right Arrow" ;
-};
-String RID_UPARROW_HELP
-{
-    Text [ en-US ] = "Up Arrow" ;
-};
-String RID_DOWNARROW_HELP
-{
-    Text [ en-US ] = "Down Arrow" ;
-};
-String RID_NOSPACE_HELP
-{
-    Text [ en-US ] = "No space" ;
-};
-String RID_XPRECEDESY_HELP
-{
-    Text [ en-US ] = "Precedes" ;
-};
-String RID_XPRECEDESEQUALY_HELP
-{
-    Text [ en-US ] = "Precedes or equal to" ;
-};
-String RID_XPRECEDESEQUIVY_HELP
-{
-    Text [ en-US ] = "Precedes or equivalent to" ;
-};
-String RID_XSUCCEEDSY_HELP
-{
-    Text [ en-US ] = "Succeeds" ;
-};
-String RID_XSUCCEEDSEQUALY_HELP
-{
-    Text [ en-US ] = "Succeeds or equal to" ;
-};
-String RID_XSUCCEEDSEQUIVY_HELP
-{
-    Text [ en-US ] = "Succeeds or equivalent to" ;
-};
-String RID_XNOTPRECEDESY_HELP
-{
-    Text [ en-US ] = "Not precedes" ;
-};
-String RID_XNOTSUCCEEDSY_HELP
-{
-    Text [ en-US ] = "Not succeeds" ;
-};
-
-String RID_CATEGORY_UNARY_BINARY_OPERATORS
-{
-    Text [ en-US ] = "Unary/Binary Operators" ;
-};
-String RID_CATEGORY_RELATIONS
-{
-    Text [ en-US ] = "Relations" ;
-};
-String RID_CATEGORY_SET_OPERATIONS
-{
-    Text [ en-US ] = "Set Operations" ;
-};
-String RID_CATEGORY_FUNCTIONS
-{
-    Text [ en-US ] = "Functions" ;
-};
-String RID_CATEGORY_OPERATORS
-{
-    Text [ en-US ] = "Operators" ;
-};
-String RID_CATEGORY_ATTRIBUTES
-{
-    Text [ en-US ] = "Attributes" ;
-};
-String RID_CATEGORY_BRACKETS
-{
-    Text [ en-US ] = "Brackets" ;
-};
-String RID_CATEGORY_FORMATS
-{
-    Text [ en-US ] = "Formats" ;
-};
-String RID_CATEGORY_OTHERS
-{
-    Text [ en-US ] = "Others" ;
-};
-String RID_CATEGORY_EXAMPLES
-{
-    Text [ en-US ] = "Examples" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index ec8d8a2d5560..16d237dcb4b2 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#include "tools/rcid.h"
 #include <comphelper/string.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
@@ -44,6 +43,8 @@
 
 #include "dialog.hxx"
 #include "starmath.hrc"
+#include "strings.hrc"
+#include "helpids.h"
 #include "cfgitem.hxx"
 #include "smmod.hxx"
 #include "symbol.hxx"
@@ -92,12 +93,11 @@ public:
     const OUString& GetStyleName(sal_uInt16 nIdx) const;
 };
 
-SmFontStyles::SmFontStyles() :
-    aNormal (ResId(RID_FONTREGULAR, *SM_MOD()->GetResMgr())),
-    aBold   (ResId(RID_FONTBOLD,    *SM_MOD()->GetResMgr())),
-    aItalic (ResId(RID_FONTITALIC,  *SM_MOD()->GetResMgr()))
+SmFontStyles::SmFontStyles()
+    : aNormal(SmResId(RID_FONTREGULAR))
+    , aBold(SmResId(RID_FONTBOLD))
+    , aItalic(SmResId(RID_FONTITALIC))
 {
-
     aBoldItalic = aBold;
     aBoldItalic += ", ";
     aBoldItalic += aItalic;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 998a648e05eb..b335e6ee81dc 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -77,6 +77,7 @@
 #include <format.hxx>
 #include <smdll.hxx>
 #include <starmath.hrc>
+#include <strings.hrc>
 #include <symbol.hxx>
 #include <unomodel.hxx>
 #include <utility.hxx>
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index b2e41cd36d3d..a499763b10ba 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -23,8 +23,9 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 
-
 #include "starmath.hrc"
+#include "strings.hrc"
+#include "helpids.h"
 
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index e737b848c08e..68ba77331b7d 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -67,6 +67,7 @@
 #include "mathmlexport.hxx"
 #include "register.hxx"
 #include <starmath.hrc>
+#include <strings.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
 #include <utility.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 2b12163f5697..eac8b6e758e6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -68,6 +68,7 @@ one go*/
 #include "mathmlimport.hxx"
 #include "register.hxx"
 #include <starmath.hrc>
+#include <strings.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
 #include <utility.hxx>
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 2d45f0bc5445..d5e891f155d8 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -26,7 +26,7 @@
 #include <o3tl/make_unique.hxx>
 #include <vcl/settings.hxx>
 #include "parse.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
 #include "smdll.hxx"
 #include "smmod.hxx"
 #include "cfgitem.hxx"
@@ -2221,28 +2221,28 @@ void SmParser::AddError(SmParseError Type, SmNode *pNode)
     pErrDesc->m_pNode = pNode;
     pErrDesc->m_aText = SmResId(RID_ERR_IDENT);
 
-    sal_uInt16  nRID;
+    const char* pRID;
     switch (Type)
     {
-        case SmParseError::UnexpectedChar:     nRID = RID_ERR_UNEXPECTEDCHARACTER; break;
-        case SmParseError::UnexpectedToken:    nRID = RID_ERR_UNEXPECTEDTOKEN;     break;
-        case SmParseError::PoundExpected:      nRID = RID_ERR_POUNDEXPECTED;       break;
-        case SmParseError::ColorExpected:      nRID = RID_ERR_COLOREXPECTED;       break;
-        case SmParseError::LgroupExpected:     nRID = RID_ERR_LGROUPEXPECTED;      break;
-        case SmParseError::RgroupExpected:     nRID = RID_ERR_RGROUPEXPECTED;      break;
-        case SmParseError::LbraceExpected:     nRID = RID_ERR_LBRACEEXPECTED;      break;
-        case SmParseError::RbraceExpected:     nRID = RID_ERR_RBRACEEXPECTED;      break;
-        case SmParseError::ParentMismatch:     nRID = RID_ERR_PARENTMISMATCH;      break;
-        case SmParseError::RightExpected:      nRID = RID_ERR_RIGHTEXPECTED;       break;
-        case SmParseError::FontExpected:       nRID = RID_ERR_FONTEXPECTED;        break;
-        case SmParseError::SizeExpected:       nRID = RID_ERR_SIZEEXPECTED;        break;
-        case SmParseError::DoubleAlign:        nRID = RID_ERR_DOUBLEALIGN;         break;
-        case SmParseError::DoubleSubsupscript: nRID = RID_ERR_DOUBLESUBSUPSCRIPT;  break;
+        case SmParseError::UnexpectedChar:     pRID = RID_ERR_UNEXPECTEDCHARACTER; break;
+        case SmParseError::UnexpectedToken:    pRID = RID_ERR_UNEXPECTEDTOKEN;     break;
+        case SmParseError::PoundExpected:      pRID = RID_ERR_POUNDEXPECTED;       break;
+        case SmParseError::ColorExpected:      pRID = RID_ERR_COLOREXPECTED;       break;
+        case SmParseError::LgroupExpected:     pRID = RID_ERR_LGROUPEXPECTED;      break;
+        case SmParseError::RgroupExpected:     pRID = RID_ERR_RGROUPEXPECTED;      break;
+        case SmParseError::LbraceExpected:     pRID = RID_ERR_LBRACEEXPECTED;      break;
+        case SmParseError::RbraceExpected:     pRID = RID_ERR_RBRACEEXPECTED;      break;
+        case SmParseError::ParentMismatch:     pRID = RID_ERR_PARENTMISMATCH;      break;
+        case SmParseError::RightExpected:      pRID = RID_ERR_RIGHTEXPECTED;       break;
+        case SmParseError::FontExpected:       pRID = RID_ERR_FONTEXPECTED;        break;
+        case SmParseError::SizeExpected:       pRID = RID_ERR_SIZEEXPECTED;        break;
+        case SmParseError::DoubleAlign:        pRID = RID_ERR_DOUBLEALIGN;         break;
+        case SmParseError::DoubleSubsupscript: pRID = RID_ERR_DOUBLESUBSUPSCRIPT;  break;
         default:
             assert(false);
             return;
     }
-    pErrDesc->m_aText += SmResId(nRID);
+    pErrDesc->m_aText += SmResId(pRID);
 
     m_aErrDescList.push_back(std::move(pErrDesc));
 }
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index 162d26e915fd..2373e1e5d4ec 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -36,6 +36,7 @@
 #include <ElementsDockingWindow.hxx>
 
 #include <starmath.hrc>
+#include <strings.hrc>
 
 #include <svx/xmlsecctrl.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index b257e9308b8d..0e821d5b9d01 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
 #include <svx/svxids.hrc>
+#include <tools/resmgr.hxx>
 #include <vcl/virdev.hxx>
 #include <unotools/syslocale.hxx>
 #include "smmod.hxx"
@@ -33,6 +34,8 @@
 #include "dialog.hxx"
 #include "edit.hxx"
 #include "view.hxx"
+#include "strings.hrc"
+#include "smmod.hrc"
 #include "starmath.hrc"
 #include "svx/modctrl.hxx"
 
@@ -40,16 +43,12 @@
 #define SmModule
 #include "smslots.hxx"
 
-OUString SmResId(sal_uInt16 nId)
+OUString SmResId(const char* pId)
 {
-    return ResId(nId, *SM_MOD()->GetResMgr());
+    return Translate::get(pId, SM_MOD()->GetResLocale());
 }
 
-SmLocalizedSymbolData::SmLocalizedSymbolData() :
-    aUiSymbolNamesAry       (ResId(RID_UI_SYMBOL_NAMES, *SM_MOD()->GetResMgr())),
-    aExportSymbolNamesAry   (ResId(RID_EXPORT_SYMBOL_NAMES, *SM_MOD()->GetResMgr())),
-    aUiSymbolSetNamesAry    (ResId(RID_UI_SYMBOLSET_NAMES, *SM_MOD()->GetResMgr())),
-    aExportSymbolSetNamesAry(ResId(RID_EXPORT_SYMBOLSET_NAMES, *SM_MOD()->GetResMgr()))
+SmLocalizedSymbolData::SmLocalizedSymbolData()
 {
 }
 
@@ -61,15 +60,11 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
 {
     OUString aRes;
 
-    const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
-    const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
-    const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
-    sal_uInt32 nCount = rExportNames.Count();
-    for (sal_uInt32 i = 0;  i < nCount;  ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
     {
-        if (rExportNames.GetString(i) == rExportName)
+        if (rExportName.equalsAscii(strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1))
         {
-            aRes = rUiNames.GetString(i);
+            aRes = SmResId(RID_UI_SYMBOL_NAMES[i]);
             break;
         }
     }
@@ -81,15 +76,12 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
 {
     OUString aRes;
 
-    const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
-    const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
-    const ResStringArray &rExportNames = rData.GetExportSymbolNamesArray();
-    sal_uInt32 nCount = rUiNames.Count();
-    for (sal_uInt32 i = 0;  i < nCount;  ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
     {
-        if (rUiNames.GetString(i) == rUiName)
+        if (rUiName == SmResId(RID_UI_SYMBOL_NAMES[i]))
         {
-            aRes = rExportNames.GetString(i);
+            const char *pKey = strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1;
+            aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
             break;
         }
     }
@@ -101,15 +93,11 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
 {
     OUString aRes;
 
-    const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
-    const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
-    const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
-    sal_uInt32 nCount = rExportNames.Count();
-    for (sal_uInt32 i = 0;  i < nCount;  ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
     {
-        if (rExportNames.GetString(i) == rExportName)
+        if (rExportName.equalsAscii(strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1))
         {
-            aRes = rUiNames.GetString(i);
+            aRes = SmResId(RID_UI_SYMBOLSET_NAMES[i]);
             break;
         }
     }
@@ -121,15 +109,12 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU
 {
     OUString aRes;
 
-    const SmLocalizedSymbolData &rData = SM_MOD()->GetLocSymbolData();
-    const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
-    const ResStringArray &rExportNames = rData.GetExportSymbolSetNamesArray();
-    sal_uInt32 nCount = rUiNames.Count();
-    for (sal_uInt32 i = 0;  i < nCount;  ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
     {
-        if (rUiNames.GetString(i) == rUiName)
+        if (rUiName == SmResId(RID_UI_SYMBOLSET_NAMES[i]))
         {
-            aRes = rExportNames.GetString(i);
+            const char *pKey = strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1;
+            aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
             break;
         }
     }
@@ -144,8 +129,8 @@ void SmModule::InitInterface_Impl()
     GetStaticInterface()->RegisterStatusBar(RID_STATUSBAR);
 }
 
-SmModule::SmModule(SfxObjectFactory* pObjFact) :
-    SfxModule(ResMgr::CreateResMgr("sm"), {pObjFact})
+SmModule::SmModule(SfxObjectFactory* pObjFact)
+    : SfxModule(Translate::Create("sm", Application::GetSettings().GetUILanguageTag()), {pObjFact})
 {
     SetName("StarMath");
 
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
deleted file mode 100644
index 7941085d9b3f..000000000000
--- a/starmath/source/smres.src
+++ /dev/null
@@ -1,267 +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 <sfx2/sfx.hrc>
-#include "starmath.hrc"
-
-String RID_FONTREGULAR
-{
-    Text [ en-US ] = "Standard" ;
-};
-String RID_FONTITALIC
-{
-    Text [ en-US ] = "Italic" ;
-};
-String RID_FONTBOLD
-{
-    Text [ en-US ] = "Bold" ;
-};
-String STR_BLACK
-{
-    Text [ en-US ] = "black" ;
-};
-String STR_BLUE
-{
-    Text [ en-US ] = "blue" ;
-};
-String STR_GREEN
-{
-    Text [ en-US ] = "green" ;
-};
-String STR_RED
-{
-    Text [ en-US ] = "red" ;
-};
-String STR_CYAN
-{
-    Text [ en-US ] = "cyan" ;
-};
-String STR_MAGENTA
-{
-    Text [ en-US ] = "magenta" ;
-};
-String STR_GRAY
-{
-    Text [ en-US ] = "gray" ;
-};
-String STR_LIME
-{
-    Text [ en-US ] = "lime" ;
-};
-String STR_MAROON
-{
-    Text [ en-US ] = "maroon" ;
-};
-String STR_NAVY
-{
-    Text [ en-US ] = "navy" ;
-};
-String STR_OLIVE
-{
-    Text [ en-US ] = "olive" ;
-};
-String STR_PURPLE
-{
-    Text [ en-US ] = "purple" ;
-};
-String STR_SILVER
-{
-    Text [ en-US ] = "silver" ;
-};
-String STR_TEAL
-{
-    Text [ en-US ] = "teal" ;
-};
-
-String STR_YELLOW
-{
-    Text [ en-US ] = "yellow" ;
-};
-String STR_HIDE
-{
-    Text [ en-US ] = "hide" ;
-};
-String STR_SIZE
-{
-    Text [ en-US ] = "size" ;
-};
-String STR_FONT
-{
-    Text [ en-US ] = "font" ;
-};
-
-String STR_ALIGN_LEFT
-{
-    Text [ en-US ] = "left" ;
-};
-String STR_ALIGN_CENTER
-{
-    Text [ en-US ] = "center" ;
-};
-String STR_ALIGN_RIGHT
-{
-    Text [ en-US ] = "right" ;
-};
-
-String STR_CMDBOXWINDOW
-{
-    Text [ en-US ] = "Commands" ;
-};
-
-String RID_DOCUMENTSTR
-{
-    Text [ en-US ] = "Formula" ;
-};
-
-String STR_STATSTR_READING
-{
-    Text [ en-US ] = "Loading document..." ;
-};
-
-String STR_STATSTR_WRITING
-{
-    Text [ en-US ] = "Saving document..." ;
-};
-
-String STR_MATH_DOCUMENT_FULLTYPE_CURRENT
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Formula";
-};
-
-String RID_ERR_IDENT
-{
-    Text [ en-US ] = "ERROR : " ;
-};
-
-String RID_ERR_UNEXPECTEDCHARACTER
-{
-    Text [ en-US ] = "Unexpected character" ;
-};
-
-String RID_ERR_UNEXPECTEDTOKEN
-{
-    Text [ en-US ] = "Unexpected token" ;
-};
-
-String RID_ERR_LGROUPEXPECTED
-{
-    Text [ en-US ] = "'{' expected" ;
-};
-
-String RID_ERR_RGROUPEXPECTED
-{
-    Text [ en-US ] = "'}' expected" ;
-};
-
-String RID_ERR_LBRACEEXPECTED
-{
-    Text [ en-US ] = "'(' expected" ;
-};
-
-String RID_ERR_RBRACEEXPECTED
-{
-    Text [ en-US ] = "')' expected" ;
-};
-
-String RID_ERR_PARENTMISMATCH
-{
-    Text [ en-US ] = "Left and right symbols mismatched" ;
-};
-
-String RID_ERR_FONTEXPECTED
-{
-    Text [ en-US ] = "'fixed', 'sans', or 'serif' expected" ;
-};
-
-String RID_ERR_SIZEEXPECTED
-{
-    Text [ en-US ] = "'size' followed by an unexpected token" ;
-};
-
-String RID_ERR_DOUBLEALIGN
-{
-    Text [ en-US ] = "Double aligning is not allowed" ;
-};
-
-String RID_ERR_DOUBLESUBSUPSCRIPT
-{
-    Text [ en-US ] = "Double sub/superscripts is not allowed" ;
-};
-
-String RID_ERR_POUNDEXPECTED
-{
-    Text [ en-US ] = "'#' expected" ;
-};
-
-String RID_ERR_COLOREXPECTED
-{
-    Text [ en-US ] = "Color required" ;
-};
-
-String RID_ERR_RIGHTEXPECTED
-{
-    Text [ en-US ] = "'RIGHT' expected" ;
-};
-
-String RID_PRINTUIOPT_PRODNAME
-{
-    Text [ en-US ] = "%PRODUCTNAME %s" ;
-};
-
-String RID_PRINTUIOPT_CONTENTS
-{
-    Text [ en-US ] = "Contents" ;
-};
-
-String RID_PRINTUIOPT_TITLE
-{
-    Text [ en-US ] = "~Title" ;
-};
-
-String RID_PRINTUIOPT_FRMLTXT
-{
-    Text [ en-US ] = "~Formula text" ;
-};
-
-String RID_PRINTUIOPT_BORDERS
-{
-    Text [ en-US ] = "B~orders" ;
-};
-
-String RID_PRINTUIOPT_SIZE
-{
-    Text [ en-US ] = "Size" ;
-};
-
-String RID_PRINTUIOPT_ORIGSIZE
-{
-    Text [ en-US ] = "O~riginal size" ;
-};
-
-String RID_PRINTUIOPT_FITTOPAGE
-{
-    Text [ en-US ] = "Fit to ~page" ;
-};
-
-String RID_PRINTUIOPT_SCALING
-{
-    Text [ en-US ] = "~Scaling" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 2f7143bb34b6..1b127bef4454 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -26,7 +26,7 @@
 #include "dialog.hxx"
 #include "cfgitem.hxx"
 #include "smmod.hxx"
-#include "starmath.hrc"
+#include "strings.hrc"
 
 
 SmSym::SmSym() :
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
deleted file mode 100644
index 6f41a45ab616..000000000000
--- a/starmath/source/symbol.src
+++ /dev/null
@@ -1,187 +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 <starmath.hrc>
-
-// Both list types Ui and Export have to be identical. The Ui version
-// is the localized version of all symbols that is show in the Ui,
-// for Export they have to be in English. The transition between
-// both lists is done with GetExportSymbolName() and GetUiSymbolName().
-StringArray RID_EXPORT_SYMBOLSET_NAMES
-{
-    ItemList =
-    {
-        < "Greek" ; > ;
-        < "Special" ; > ;
-    };
-};
-StringArray RID_UI_SYMBOLSET_NAMES
-{
-    ItemList [ en-US ] =
-    {
-        < "Greek" ; > ;
-        < "Special" ; > ;
-    };
-};
-StringArray RID_EXPORT_SYMBOL_NAMES
-{
-    ItemList =
-    {
-        < "alpha" ; > ;
-        < "ALPHA" ; > ;
-        < "beta" ; > ;
-        < "BETA" ; > ;
-        < "gamma" ; > ;
-        < "GAMMA" ; > ;
-        < "delta" ; > ;
-        < "DELTA" ; > ;
-        < "epsilon" ; > ;
-        < "EPSILON" ; > ;
-        < "zeta" ; > ;
-        < "ZETA" ; > ;
-        < "eta" ; > ;
-        < "ETA" ; > ;
-        < "theta" ; > ;
-        < "THETA" ; > ;
-        < "iota" ; > ;
-        < "IOTA" ; > ;
-        < "kappa" ; > ;
-        < "KAPPA" ; > ;
-        < "lambda" ; > ;
-        < "LAMBDA" ; > ;
-        < "mu" ; > ;
-        < "MU" ; > ;
-        < "nu" ; > ;
-        < "NU" ; > ;
-        < "xi" ; > ;
-        < "XI" ; > ;
-        < "omicron" ; > ;
-        < "OMICRON" ; > ;
-        < "pi" ; > ;
-        < "PI" ; > ;
-        < "rho" ; > ;
-        < "RHO" ; > ;
-        < "sigma" ; > ;
-        < "SIGMA" ; > ;
-        < "tau" ; > ;
-        < "TAU" ; > ;
-        < "upsilon" ; > ;
-        < "UPSILON" ; > ;
-        < "phi" ; > ;
-        < "PHI" ; > ;
-        < "chi" ; > ;
-        < "CHI" ; > ;
-        < "psi" ; > ;
-        < "PSI" ; > ;
-        < "omega" ; > ;
-        < "OMEGA" ; > ;
-        < "varepsilon" ; > ;
-        < "vartheta" ; > ;
-        < "varpi" ; > ;
-        < "varrho" ; > ;
-        < "varsigma" ; > ;
-        < "varphi" ; > ;
-        < "element" ; > ;
-        < "noelement" ; > ;
-        < "strictlylessthan" ; > ;
-        < "strictlygreaterthan" ; > ;
-        < "notequal" ; > ;
-        < "identical" ; > ;
-        < "tendto" ; > ;
-        < "infinite" ; > ;
-        < "angle" ; > ;
-        < "perthousand" ; > ;
-        < "and" ; > ;
-        < "or" ; > ;
-    };
-};
-StringArray RID_UI_SYMBOL_NAMES
-{
-    ItemList [ en-US ] =
-    {
-        < "alpha" ; > ;
-        < "ALPHA" ; > ;
-        < "beta" ; > ;
-        < "BETA" ; > ;
-        < "gamma" ; > ;
-        < "GAMMA" ; > ;
-        < "delta" ; > ;
-        < "DELTA" ; > ;
-        < "epsilon" ; > ;
-        < "EPSILON" ; > ;
-        < "zeta" ; > ;
-        < "ZETA" ; > ;
-        < "eta" ; > ;
-        < "ETA" ; > ;
-        < "theta" ; > ;
-        < "THETA" ; > ;
-        < "iota" ; > ;
-        < "IOTA" ; > ;
-        < "kappa" ; > ;
-        < "KAPPA" ; > ;
-        < "lambda" ; > ;
-        < "LAMBDA" ; > ;
-        < "mu" ; > ;
-        < "MU" ; > ;
-        < "nu" ; > ;
-        < "NU" ; > ;
-        < "xi" ; > ;
-        < "XI" ; > ;
-        < "omicron" ; > ;
-        < "OMICRON" ; > ;
-        < "pi" ; > ;
-        < "PI" ; > ;
-        < "rho" ; > ;
-        < "RHO" ; > ;
-        < "sigma" ; > ;
-        < "SIGMA" ; > ;
-        < "tau" ; > ;
-        < "TAU" ; > ;
-        < "upsilon" ; > ;
-        < "UPSILON" ; > ;
-        < "phi" ; > ;
-        < "PHI" ; > ;
-        < "chi" ; > ;
-        < "CHI" ; > ;
-        < "psi" ; > ;
-        < "PSI" ; > ;
-        < "omega" ; > ;
-        < "OMEGA" ; > ;
-        < "varepsilon" ; > ;
-        < "vartheta" ; > ;
-        < "varpi" ; > ;
-        < "varrho" ; > ;
-        < "varsigma" ; > ;
-        < "varphi" ; > ;
-        < "element" ; > ;
-        < "noelement" ; > ;
-        < "strictlylessthan" ; > ;
-        < "strictlygreaterthan" ; > ;
-        < "notequal" ; > ;
-        < "identical" ; > ;
-        < "tendto" ; > ;
-        < "infinite" ; > ;
-        < "angle" ; > ;
-        < "perthousand" ; > ;
-        < "and" ; > ;
-        < "or" ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/uiobject.cxx b/starmath/source/uiobject.cxx
index 51b0733ff545..a34f10c28341 100644
--- a/starmath/source/uiobject.cxx
+++ b/starmath/source/uiobject.cxx
@@ -66,7 +66,7 @@ StringMap ElementSelectorUIObject::get_state()
     if (pElement)
         aMap["CurrentEntry"] = pElement->getText();
 
-    aMap["CurrentSelection"] = OUString::number(mxElementsSelector->maCurrentSetId);
+    aMap["CurrentSelection"] = OUString::fromUtf8(mxElementsSelector->msCurrentSetId);
 
     return aMap;
 }
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 489a8ba1cabd..7f9dd45fdc4b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -49,6 +49,7 @@
 #include <view.hxx>
 #include <symbol.hxx>
 #include <starmath.hrc>
+#include <strings.hrc>
 #include <smdll.hxx>
 #include "cfgitem.hxx"
 
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 9dd1fe3f6d2c..21018ad7eccf 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/builderfactory.hxx>
 
-#include "starmath.hrc"
+#include "strings.hrc"
 
 #include "utility.hxx"
 #include "dialog.hxx"
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a9652672e16f..56e79c66d330 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -70,6 +70,7 @@
 #include "dialog.hxx"
 #include "document.hxx"
 #include "starmath.hrc"
+#include "strings.hrc"
 #include "mathmlimport.hxx"
 #include "cursor.hxx"
 #include "accessibility.hxx"
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 3e727f417109..aaf1bb8b1fb3 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AlignmentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Alignment</property>
+    <property name="title" translatable="yes" context="alignmentdialog|AlignmentDialog">Alignment</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -64,7 +64,7 @@
             </child>
             <child>
               <object class="GtkButton" id="default">
-                <property name="label" translatable="yes">_Default</property>
+                <property name="label" translatable="yes" context="alignmentdialog|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -108,7 +108,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="left">
-                        <property name="label" translatable="yes">_Left</property>
+                        <property name="label" translatable="yes" context="alignmentdialog|left">_Left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -125,7 +125,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="center">
-                        <property name="label" translatable="yes">_Centered</property>
+                        <property name="label" translatable="yes" context="alignmentdialog|center">_Centered</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="right">
-                        <property name="label" translatable="yes">_Right</property>
+                        <property name="label" translatable="yes" context="alignmentdialog|right">_Right</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Horizontal</property>
+                <property name="label" translatable="yes" context="alignmentdialog|label1">Horizontal</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
diff --git a/starmath/uiconfig/smath/ui/catalogdialog.ui b/starmath/uiconfig/smath/ui/catalogdialog.ui
index 5d6e9eebceeb..26dbdacf49f5 100644
--- a/starmath/uiconfig/smath/ui/catalogdialog.ui
+++ b/starmath/uiconfig/smath/ui/catalogdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CatalogDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Symbols</property>
+    <property name="title" translatable="yes" context="catalogdialog|CatalogDialog">Symbols</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +21,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="insert">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="catalogdialog|insert">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -52,7 +52,7 @@
             </child>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">_Edit...</property>
+                <property name="label" translatable="yes" context="catalogdialog|edit">_Edit...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -99,7 +99,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Symbol set:</property>
+                <property name="label" translatable="yes" context="catalogdialog|label1">_Symbol set:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -120,7 +120,7 @@
             </child>
             <child>
               <object class="smlo-SmShowSymbolSet" id="symbolsetdisplay">
-                <property name="label" translatable="yes">button</property>
+                <property name="label" translatable="yes" context="catalogdialog|symbolsetdisplay">button</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="symbolname">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Unknown</property>
+                <property name="label" translatable="yes" context="catalogdialog|symbolname">Unknown</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/starmath/uiconfig/smath/ui/dockingelements.ui b/starmath/uiconfig/smath/ui/dockingelements.ui
index 79dd5679dcae..652ae360d439 100644
--- a/starmath/uiconfig/smath/ui/dockingelements.ui
+++ b/starmath/uiconfig/smath/ui/dockingelements.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="DockingElements">
     <property name="visible">True</property>
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Elements</property>
+    <property name="title" translatable="yes" context="dockingelements|DockingElements">Elements</property>
     <property name="type_hint">dock</property>
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/starmath/uiconfig/smath/ui/fontdialog.ui b/starmath/uiconfig/smath/ui/fontdialog.ui
index 5d7292228d0a..a9faaa0443bd 100644
--- a/starmath/uiconfig/smath/ui/fontdialog.ui
+++ b/starmath/uiconfig/smath/ui/fontdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="FontDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fonts</property>
+    <property name="title" translatable="yes" context="fontdialog|FontDialog">Fonts</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -112,7 +112,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Font</property>
+                    <property name="label" translatable="yes" context="fontdialog|formulaL">Font</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -147,7 +147,7 @@
                         <property name="column_homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="bold">
-                            <property name="label" translatable="yes">_Bold</property>
+                            <property name="label" translatable="yes" context="fontdialog|bold">_Bold</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="italic">
-                            <property name="label" translatable="yes">_Italic</property>
+                            <property name="label" translatable="yes" context="fontdialog|italic">_Italic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -184,7 +184,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Attributes</property>
+                    <property name="label" translatable="yes" context="fontdialog|formulaL1">Attributes</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
diff --git a/starmath/uiconfig/smath/ui/fontsizedialog.ui b/starmath/uiconfig/smath/ui/fontsizedialog.ui
index bd1a2fca86f5..fbf3d50e31b7 100644
--- a/starmath/uiconfig/smath/ui/fontsizedialog.ui
+++ b/starmath/uiconfig/smath/ui/fontsizedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentBaseSize">
     <property name="lower">4</property>
@@ -17,7 +17,7 @@
   <object class="GtkDialog" id="FontSizeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Font Sizes</property>
+    <property name="title" translatable="yes" context="fontsizedialog|FontSizeDialog">Font Sizes</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -76,7 +76,7 @@
             </child>
             <child>
               <object class="GtkButton" id="default">
-                <property name="label" translatable="yes">_Default</property>
+                <property name="label" translatable="yes" context="fontsizedialog|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -119,7 +119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Base _size:</property>
+                        <property name="label" translatable="yes" context="fontsizedialog|label4">Base _size:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinB_baseSize:0pt</property>
                       </object>
@@ -191,7 +191,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Operators:</property>
+                            <property name="label" translatable="yes" context="fontsizedialog|label2">_Operators:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinB_function:0%</property>
                           </object>
@@ -205,7 +205,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Limits:</property>
+                            <property name="label" translatable="yes" context="fontsizedialog|label3">_Limits:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinB_limit:0%</property>
                           </object>
@@ -245,7 +245,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Text:</property>
+                            <property name="label" translatable="yes" context="fontsizedialog|label5">_Text:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinB_text:0%</property>
                           </object>
@@ -259,7 +259,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Functions:</property>
+                            <property name="label" translatable="yes" context="fontsizedialog|label7">_Functions:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinB_function:0%</property>
                           </object>
@@ -273,7 +273,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Indexes:</property>
+                            <property name="label" translatable="yes" context="fontsizedialog|label6">_Indexes:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinB_index:0%</property>
                           </object>
@@ -316,7 +316,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Relative Sizes</property>
+                    <property name="label" translatable="yes" context="fontsizedialog|label1">Relative Sizes</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 060854db54ec..898426702775 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="FontsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fonts</property>
+    <property name="title" translatable="yes" context="fonttypedialog|FontsDialog">Fonts</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -51,7 +51,7 @@
             </child>
             <child>
               <object class="GtkButton" id="modify:menu1">
-                <property name="label" translatable="yes">_Modify</property>
+                <property name="label" translatable="yes" context="fonttypedialog|modify">_Modify</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -79,7 +79,7 @@
             </child>
             <child>
               <object class="GtkButton" id="default">
-                <property name="label" translatable="yes">_Default</property>
+                <property name="label" translatable="yes" context="fonttypedialog|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -132,7 +132,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Variables:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label1">_Variables:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">variableCB</property>
                             <attributes>
@@ -149,7 +149,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Functions:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label2">_Functions:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">functionCB</property>
                             <attributes>
@@ -166,7 +166,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Numbers:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label3">_Numbers:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numberCB</property>
                             <attributes>
@@ -183,7 +183,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Text:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label4">_Text:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">textCB</property>
                             <attributes>
@@ -247,7 +247,7 @@
                   <object class="GtkLabel" id="formulaL">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Formula Fonts</property>
+                    <property name="label" translatable="yes" context="fonttypedialog|formulaL">Formula Fonts</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -285,7 +285,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Serif:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label5">_Serif:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">serifCB</property>
                             <attributes>
@@ -302,7 +302,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">S_ans-serif:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label6">S_ans-serif:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">sansCB</property>
                             <attributes>
@@ -319,7 +319,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">F_ixed-width:</property>
+                            <property name="label" translatable="yes" context="fonttypedialog|label7">F_ixed-width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">fixedCB</property>
                             <attributes>
@@ -372,7 +372,7 @@
                   <object class="GtkLabel" id="customL">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Custom Fonts</property>
+                    <property name="label" translatable="yes" context="fonttypedialog|customL">Custom Fonts</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -420,7 +420,7 @@
       <object class="GtkMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Variables</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem1">_Variables</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -428,7 +428,7 @@
       <object class="GtkMenuItem" id="menuitem2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Functions</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem2">_Functions</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -436,7 +436,7 @@
       <object class="GtkMenuItem" id="menuitem3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Numbers</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem3">_Numbers</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -444,7 +444,7 @@
       <object class="GtkMenuItem" id="menuitem4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Text</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem4">_Text</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -452,7 +452,7 @@
       <object class="GtkMenuItem" id="menuitem5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Serif</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem5">_Serif</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -460,7 +460,7 @@
       <object class="GtkMenuItem" id="menuitem6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">S_ans-serif</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem6">S_ans-serif</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -468,7 +468,7 @@
       <object class="GtkMenuItem" id="menuitem7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Fixe_d-width</property>
+        <property name="label" translatable="yes" context="fonttypedialog|menuitem7">Fixe_d-width</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/starmath/uiconfig/smath/ui/printeroptions.ui b/starmath/uiconfig/smath/ui/printeroptions.ui
index 2ef10834881e..df65a975df68 100644
--- a/starmath/uiconfig/smath/ui/printeroptions.ui
+++ b/starmath/uiconfig/smath/ui/printeroptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -29,7 +29,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="title">
-                    <property name="label" translatable="yes">Title</property>
+                    <property name="label" translatable="yes" context="printeroptions|title">Title</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="formulatext">
-                    <property name="label" translatable="yes">Formula text</property>
+                    <property name="label" translatable="yes" context="printeroptions|formulatext">Formula text</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="borders">
-                    <property name="label" translatable="yes">Borders</property>
+                    <property name="label" translatable="yes" context="printeroptions|borders">Borders</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -116,7 +116,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalsize">
-                    <property name="label" translatable="yes">Original size</property>
+                    <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -134,7 +134,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="fittopage">
-                    <property name="label" translatable="yes">Fit to page</property>
+                    <property name="label" translatable="yes" context="printeroptions|fittopage">Fit to page</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -156,7 +156,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="scaling">
-                        <property name="label" translatable="yes">Scaling:</property>
+                        <property name="label" translatable="yes" context="printeroptions|scaling">Scaling:</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -198,7 +198,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Size</property>
+            <property name="label" translatable="yes" context="printeroptions|label5">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
index 00404f3ef5a2..8fe8f882162f 100644
--- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
+++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveDefaultsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save defaults?</property>
+    <property name="title" translatable="yes" context="savedefaultsdialog|SaveDefaultsDialog">Save defaults?</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Should the changes be saved as defaults?</property>
-    <property name="secondary_text" translatable="yes">These changes will apply for all new formulas.</property>
+    <property name="text" translatable="yes" context="savedefaultsdialog|SaveDefaultsDialog">Should the changes be saved as defaults?</property>
+    <property name="secondary_text" translatable="yes" context="savedefaultsdialog|SaveDefaultsDialog">These changes will apply for all new formulas.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui
index 3d9eabd93d74..1b94f563e7fa 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">10</property>
@@ -36,7 +36,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="title">
-                    <property name="label" translatable="yes">_Title row</property>
+                    <property name="label" translatable="yes" context="smathsettings|title">_Title row</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -52,7 +52,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="text">
-                    <property name="label" translatable="yes">_Formula text</property>
+                    <property name="label" translatable="yes" context="smathsettings|text">_Formula text</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="frame">
-                    <property name="label" translatable="yes">B_order</property>
+                    <property name="label" translatable="yes" context="smathsettings|frame">B_order</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -90,7 +90,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Print Options</property>
+            <property name="label" translatable="yes" context="smathsettings|label4">Print Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -124,7 +124,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkRadioButton" id="sizenormal">
-                    <property name="label" translatable="yes">O_riginal size</property>
+                    <property name="label" translatable="yes" context="smathsettings|sizenormal">O_riginal size</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -142,7 +142,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="sizescaled">
-                    <property name="label" translatable="yes">Fit to _page</property>
+                    <property name="label" translatable="yes" context="smathsettings|sizescaled">Fit to _page</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -164,7 +164,7 @@
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="sizezoomed">
-                        <property name="label" translatable="yes">_Scaling:</property>
+                        <property name="label" translatable="yes" context="smathsettings|sizezoomed">_Scaling:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Print Format</property>
+            <property name="label" translatable="yes" context="smathsettings|label5">Print Format</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -240,7 +240,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="norightspaces">
-                    <property name="label" translatable="yes">Ig_nore ~~ and ' at the end of the line</property>
+                    <property name="label" translatable="yes" context="smathsettings|norightspaces">Ig_nore ~~ and ' at the end of the line</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -256,7 +256,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="saveonlyusedsymbols">
-                    <property name="label" translatable="yes">Embed only used symbols (smaller file size)</property>
+                    <property name="label" translatable="yes" context="smathsettings|saveonlyusedsymbols">Embed only used symbols (smaller file size)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -272,7 +272,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autoclosebrackets">
-                    <property name="label" translatable="yes">Auto close brackets, parentheses and braces</property>
+                    <property name="label" translatable="yes" context="smathsettings|autoclosebrackets">Auto close brackets, parentheses and braces</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -294,7 +294,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Miscellaneous Options</property>
+            <property name="label" translatable="yes" context="smathsettings|label1">Miscellaneous Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui
index f4f4f955219c..31b490270aa7 100644
--- a/starmath/uiconfig/smath/ui/spacingdialog.ui
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SpacingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Spacing</property>
+    <property name="title" translatable="yes" context="spacingdialog|SpacingDialog">Spacing</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -50,7 +50,7 @@
             </child>
             <child>
               <object class="GtkButton" id="category:menu">
-                <property name="label" translatable="yes">_Category</property>
+                <property name="label" translatable="yes" context="spacingdialog|category">_Category</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -65,7 +65,7 @@
             </child>
             <child>
               <object class="GtkButton" id="default">
-                <property name="label" translatable="yes">_Default</property>
+                <property name="label" translatable="yes" context="spacingdialog|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -247,7 +247,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="checkbutton">
-                                    <property name="label" translatable="yes">Scale all brackets</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|checkbutton">Scale all brackets</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="no_show_all">True</property>
@@ -307,7 +307,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Title</property>
+                    <property name="label" translatable="yes" context="spacingdialog|title">Title</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -362,7 +362,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|1label1">_Spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -375,7 +375,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Line spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|1label2">_Line spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -388,7 +388,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Root spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|1label3">_Root spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -466,7 +466,7 @@
                   <object class="GtkLabel" id="1title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Spacing</property>
+                    <property name="label" translatable="yes" context="spacingdialog|1title">Spacing</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -521,7 +521,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Superscript:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|2label1">_Superscript:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -534,7 +534,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">S_ubscript:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|2label2">S_ubscript:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -600,7 +600,7 @@
                   <object class="GtkLabel" id="2title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Indexes</property>
+                    <property name="label" translatable="yes" context="spacingdialog|2title">Indexes</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -655,7 +655,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Numerator:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|3label1">_Numerator:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -668,7 +668,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Denominator:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|3label2">_Denominator:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -734,7 +734,7 @@
                   <object class="GtkLabel" id="3title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Fractions</property>
+                    <property name="label" translatable="yes" context="spacingdialog|3title">Fractions</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -789,7 +789,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Excess length:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|4label1">_Excess length:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -802,7 +802,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Weight:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|4label2">_Weight:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -868,7 +868,7 @@
                   <object class="GtkLabel" id="4title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Fraction Bar</property>
+                    <property name="label" translatable="yes" context="spacingdialog|4title">Fraction Bar</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -923,7 +923,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Upper limit:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|5label1">_Upper limit:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -936,7 +936,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Lower limit:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|5label2">_Lower limit:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1002,7 +1002,7 @@
                   <object class="GtkLabel" id="5title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Limits</property>
+                    <property name="label" translatable="yes" context="spacingdialog|5title">Limits</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1057,7 +1057,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Excess size (left/right):</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|6label1">_Excess size (left/right):</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1070,7 +1070,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|6label2">_Spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1083,7 +1083,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Excess size:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|6label4">_Excess size:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1161,7 +1161,7 @@
                   <object class="GtkLabel" id="6title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Brackets</property>
+                    <property name="label" translatable="yes" context="spacingdialog|6title">Brackets</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1216,7 +1216,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Line spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|7label1">_Line spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1229,7 +1229,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Column spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|7label2">_Column spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1295,7 +1295,7 @@
                   <object class="GtkLabel" id="7title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Matrix</property>
+                    <property name="label" translatable="yes" context="spacingdialog|7title">Matrix</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1350,7 +1350,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Primary height:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|8label1">_Primary height:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1363,7 +1363,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Minimum spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|8label2">_Minimum spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1429,7 +1429,7 @@
                   <object class="GtkLabel" id="8title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Symbols</property>
+                    <property name="label" translatable="yes" context="spacingdialog|8title">Symbols</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1484,7 +1484,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Excess size:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|9label1">_Excess size:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1497,7 +1497,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Spacing:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|9label2">_Spacing:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1563,7 +1563,7 @@
                   <object class="GtkLabel" id="9title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Operators</property>
+                    <property name="label" translatable="yes" context="spacingdialog|9title">Operators</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1618,7 +1618,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="spacingdialog|10label1">_Left:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1631,7 +1631,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="spacingdialog|10label2">_Right:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1644,7 +1644,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Top:</property>
+                                    <property name="label" translatable="yes" context="spacingdialog|10label3">_Top:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1657,7 +1657,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="spacingdialog|10label4">_Bottom:</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -1747,7 +1747,7 @@
                   <object class="GtkLabel" id="10title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Borders</property>
+                    <property name="label" translatable="yes" context="spacingdialog|10title">Borders</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -1862,7 +1862,7 @@
       <object class="GtkMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Spacing</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem1">Spacing</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1870,7 +1870,7 @@
       <object class="GtkMenuItem" id="menuitem2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Indexes</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem2">Indexes</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1878,7 +1878,7 @@
       <object class="GtkMenuItem" id="menuitem3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Fractions</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem3">Fractions</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1886,7 +1886,7 @@
       <object class="GtkMenuItem" id="menuitem4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Fraction Bars</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem4">Fraction Bars</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1894,7 +1894,7 @@
       <object class="GtkMenuItem" id="menuitem5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Limits</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem5">Limits</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1902,7 +1902,7 @@
       <object class="GtkMenuItem" id="menuitem6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Brackets</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem6">Brackets</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1910,7 +1910,7 @@
       <object class="GtkMenuItem" id="menuitem7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Matrices</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem7">Matrices</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1918,7 +1918,7 @@
       <object class="GtkMenuItem" id="menuitem8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Symbols</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem8">Symbols</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1926,7 +1926,7 @@
       <object class="GtkMenuItem" id="menuitem9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Operators</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem9">Operators</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -1934,7 +1934,7 @@
       <object class="GtkMenuItem" id="menuitem10">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Borders</property>
+        <property name="label" translatable="yes" context="spacingdialog|menuitem10">Borders</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/starmath/uiconfig/smath/ui/symdefinedialog.ui b/starmath/uiconfig/smath/ui/symdefinedialog.ui
index 0516cfc9f324..84f473032fa5 100644
--- a/starmath/uiconfig/smath/ui/symdefinedialog.ui
+++ b/starmath/uiconfig/smath/ui/symdefinedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="EditSymbols">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Symbols</property>
+    <property name="title" translatable="yes" context="symdefinedialog|EditSymbols">Edit Symbols</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -38,7 +38,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">O_ld symbol set:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|oldSymbolSetText">O_ld symbol set:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldSymbolSets</property>
                       </object>
@@ -83,7 +83,7 @@
                         <property name="can_focus">False</property>
                         <property name="margin_top">6</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Old symbol:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|oldSymbolText">_Old symbol:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">oldSymbols</property>
                       </object>
@@ -154,7 +154,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Symbol:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|symbolText">_Symbol:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">symbols</property>
                       </object>
@@ -168,7 +168,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Symbol s_et:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|symbolSetText">Symbol s_et:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">symbolSets</property>
                       </object>
@@ -182,7 +182,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Font:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|fontText">_Font:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">fonts</property>
                       </object>
@@ -196,7 +196,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">S_tyle:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|styleText">S_tyle:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">styles</property>
                       </object>
@@ -210,7 +210,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">S_ubset:</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|fontsSubsetFT">S_ubset:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">fontsSubsetLB</property>
                       </object>
@@ -384,7 +384,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="modify">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="symdefinedialog|modify">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/svl/AllLangMoTarget_svl.mk b/svl/AllLangMoTarget_svl.mk
new file mode 100644
index 000000000000..8a1b2b7ad90e
--- /dev/null
+++ b/svl/AllLangMoTarget_svl.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,svl))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
deleted file mode 100644
index 30baf34c6e70..000000000000
--- a/svl/AllLangResTarget_svl.mk
+++ /dev/null
@@ -1,32 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,svl))
-
-$(eval $(call gb_AllLangResTarget_add_srs,svl,\
-    svl/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,svl/res))
-
-$(eval $(call gb_SrsTarget_add_files,svl/res,\
-    svl/source/misc/mediatyp.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index 18d79ab3cc85..d14e184b65a9 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,svl,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,svl,\
-    AllLangResTarget_svl \
+    AllLangMoTarget_svl \
 ))
 
 $(eval $(call gb_Module_add_check_targets,svl,\
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index fe18e9635c35..98c7d4a26ac4 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -27,7 +27,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <tools/resmgr.hxx>
-#include <tools/simplerm.hxx>
 
 #include "getstringresource.hxx"
 
@@ -36,14 +35,13 @@ namespace {
 class ResMgrMap {
 public:
     ResMgrMap() = default;
-    ~ResMgrMap();
     ResMgrMap(const ResMgrMap&) = delete;
     ResMgrMap& operator=(const ResMgrMap&) = delete;
 
-    SimpleResMgr * get(LanguageTag const & locale);
+    const std::locale& get(LanguageTag const & locale);
 
 private:
-    typedef std::map< OUString, SimpleResMgr * > Map;
+    typedef std::map<OUString, std::locale> Map;
 
     Map map_;
         // one SimpleResMgr for each language for which a resource was requested
@@ -53,20 +51,12 @@ private:
         // for each language ever requested)
 };
 
-ResMgrMap::~ResMgrMap() {
-    for (Map::iterator i(map_.begin()); i != map_.end(); ++i) {
-        delete i->second;
-    }
-}
-
-SimpleResMgr * ResMgrMap::get(LanguageTag const & locale) {
+const std::locale& ResMgrMap::get(LanguageTag const & locale) {
     OUString code( locale.getBcp47());
     Map::iterator i(map_.find(code));
     if (i == map_.end()) {
-        std::unique_ptr< SimpleResMgr > mgr(
-            new SimpleResMgr("svl", locale));
-        i = map_.insert(Map::value_type(code, mgr.get())).first;
-        mgr.reset();
+        std::locale loc = Translate::Create("svl", locale);
+        i = map_.insert(Map::value_type(code, loc)).first;
     }
     return i->second;
 }
@@ -77,9 +67,9 @@ struct theResMgrMap: public rtl::Static< ResMgrMap, theResMgrMap > {};
 
 namespace svl {
 
-OUString getStringResource(sal_uInt16 id, LanguageTag const & locale)
+OUString getStringResource(const char* id, LanguageTag const & locale)
 {
-    return theResMgrMap::get().get(locale)->ReadString(id);
+    return Translate::get(id, theResMgrMap::get().get(locale));
 }
 
 }
diff --git a/svl/source/misc/getstringresource.hxx b/svl/source/misc/getstringresource.hxx
index 3fcde3883f88..4776c1572754 100644
--- a/svl/source/misc/getstringresource.hxx
+++ b/svl/source/misc/getstringresource.hxx
@@ -31,8 +31,7 @@ namespace com { namespace sun { namespace star { namespace lang {
 namespace svl {
 
 OUString getStringResource(
-    sal_uInt16 id, LanguageTag const & locale);
-
+    const char* id, LanguageTag const & locale);
 }
 
 #endif
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index b073e8b9b0ba..3da903827455 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -213,7 +213,7 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
 
 /** A mapping from type IDs to presentation resource IDs.  Sorted by type ID.
  */
-sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
+const char* aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
     = { STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN
         STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_APP_OCTSTREAM
         STR_SVT_MIMETYPE_APP_PDF, // CONTENT_TYPE_APP_PDF
@@ -604,18 +604,18 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID)
 OUString INetContentTypes::GetPresentation(INetContentType eTypeID,
                                             const LanguageTag& aLocale)
 {
-    sal_uInt16 nResID = sal_uInt16();
+    const char* pResID = nullptr;
     if (eTypeID <= CONTENT_TYPE_LAST)
-        nResID = aStaticResourceIDMap[eTypeID];
+        pResID = aStaticResourceIDMap[eTypeID];
     else
     {
         OUString aPresentation = Registration::GetPresentation(eTypeID);
         if (aPresentation.isEmpty())
-            nResID = STR_SVT_MIMETYPE_APP_OCTSTREAM;
+            pResID = STR_SVT_MIMETYPE_APP_OCTSTREAM;
         else
             return aPresentation;
     }
-    return svl::getStringResource(nResID, aLocale);
+    return svl::getStringResource(pResID, aLocale);
 }
 
 //static
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
deleted file mode 100644
index 2ea4da899369..000000000000
--- a/svl/source/misc/mediatyp.src
+++ /dev/null
@@ -1,369 +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 .
- */
-
-//  Internet Media Type Presentations
-
-#include <svl/svl.hrc>
-
-String STR_SVT_MIMETYPE_APP_OCTSTREAM
-{
-    Text [ en-US ] = "Binary file" ;
-};
-
-String STR_SVT_MIMETYPE_APP_PDF
-{
-    Text [ en-US ] = "PDF file" ;
-};
-
-String STR_SVT_MIMETYPE_APP_RTF
-{
-    Text [ en-US ] = "RTF File" ;
-};
-
-String STR_SVT_MIMETYPE_APP_MSWORD
-{
-    Text [ en-US ] = "MS-Word document" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARCALC
-{
-    Text [ en-US ] = "%PRODUCTNAME Spreadsheet" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARCHART
-{
-    Text [ en-US ] = "%PRODUCTNAME Chart" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARDRAW
-{
-    Text [ en-US ] = "%PRODUCTNAME Drawing" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARIMAGE
-{
-    Text [ en-US ] = "%PRODUCTNAME Image" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARMATH
-{
-    Text [ en-US ] = "%PRODUCTNAME Formula" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARWRITER
-{
-    Text [ en-US ] = "%PRODUCTNAME Text" ;
-};
-
-String STR_SVT_MIMETYPE_APP_ZIP
-{
-    Text [ en-US ] = "ZIP file" ;
-};
-
-String STR_SVT_MIMETYPE_APP_JAR
-{
-    Text [ en-US ] = "JAR file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_AIFF
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_BASIC
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_MIDI
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_VORBIS
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_WAV
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_AUDIO_WEBM
-{
-    Text [ en-US ] = "Audio file" ;
-};
-
-String STR_SVT_MIMETYPE_IMAGE_GIF
-{
-    Text [ en-US ] = "Image" ;
-};
-
-String STR_SVT_MIMETYPE_IMAGE_JPEG
-{
-    Text [ en-US ] = "Image" ;
-};
-
-String STR_SVT_MIMETYPE_IMAGE_PCX
-{
-    Text [ en-US ] = "Image" ;
-};
-
-String STR_SVT_MIMETYPE_IMAGE_BMP
-{
-    Text [ en-US ] = "Bitmap" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_HTML
-{
-    Text [ en-US ] = "HTML document" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_PLAIN
-{
-    Text [ en-US ] = "Text file" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_URL
-{
-    Text [ en-US ] = "Bookmark" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_VCARD
-{
-    Text [ en-US ] = "vCard file" ;
-};
-
-String STR_SVT_MIMETYPE_VIDEO_MSVIDEO
-{
-    Text [ en-US ] = "Video file" ;
-};
-
-String STR_SVT_MIMETYPE_VIDEO_THEORA
-{
-    Text [ en-US ] = "Video file" ;
-};
-
-String STR_SVT_MIMETYPE_VIDEO_VDO
-{
-    Text [ en-US ] = "Video file" ;
-};
-
-String STR_SVT_MIMETYPE_VIDEO_WEBM
-{
-    Text [ en-US ] = "Video file" ;
-};
-
-String STR_SVT_MIMETYPE_X_STARMAIL
-{
-    Text [ en-US ] = "Message" ;
-};
-
-String STR_SVT_MIMETYPE_X_VRML
-{
-    Text [ en-US ] = "VRML file" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARIMPRESS
-{
-    Text [ en-US ] = "%PRODUCTNAME Presentation" ;
-};
-
-String STR_SVT_MIMETYPE_APP_IMPRESSPACKED
-{
-    Text [ en-US ] = "%PRODUCTNAME Presentation (packed)";
-};
-
-String STR_SVT_MIMETYPE_APP_STARHELP
-{
-    Text [ en-US ] = "%PRODUCTNAME Help" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FSYSBOX
-{
-    Text [ en-US ] = "Workplace" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FSYSFLD
-{
-    Text [ en-US ] = "Folder" ;
-};
-
-String STR_SVT_MIMETYPE_APP_GAL
-{
-    Text [ en-US ] = "Gallery";
-};
-
-String STR_SVT_MIMETYPE_APP_GAL_THEME
-{
-    Text [ en-US ] = "Gallery theme" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARW_GLOB
-{
-    Text [ en-US ] = "%PRODUCTNAME Master Document" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SDM
-{
-    Text [ en-US ] = "Message" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SMD
-{
-    Text [ en-US ] = "Message" ;
-};
-
-String STR_SVT_MIMETYPE_APP_STARW_WEB
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer/Web" ;
-};
-
-String STR_SVT_MIMETYPE_FRAMESET
-{
-    Text [ en-US ] = "Frameset Document" ;
-};
-
-String STR_SVT_MIMETYPE_MACRO
-{
-    Text [ en-US ] = "Macro file" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_SFSYSFOLDER
-{
-    Text [ en-US ] = "System folder" ;
-};
-
-String STR_SVT_MIMETYPE_APP_TEMPLATE
-{
-    Text [ en-US ] = "%PRODUCTNAME Template";
-};
-
-String STR_SVT_MIMETYPE_IMAGE_GENERIC
-{
-    Text [ en-US ] = "Image";
-};
-
-String STR_SVT_MIMETYPE_APP_MSEXCEL
-{
-    Text [ en-US ] = "MS Excel document" ;
-};
-
-String STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL
-{
-    Text [ en-US ] = "MS Excel Template" ;
-};
-
-String STR_SVT_MIMETYPE_APP_MSPPOINT
-{
-    Text [ en-US ] = "MS PowerPoint document" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_VCALENDAR
-{
-    Text [ en-US ] = "vCalendar-file" ;
-};
-
-String STR_SVT_MIMETYPE_TEXT_ICALENDAR
-{
-    Text [ en-US ] = "iCalendar-File";
-};
-
-String STR_SVT_MIMETYPE_TEXT_XMLICALENDAR
-{
-    Text [ en-US ] = "XML-iCalendar-File";
-};
-
-String STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP
-{
-    Text [ en-US ] = "CDE-Calendar-File";
-};
-
-String STR_SVT_MIMETYPE_INET_MSG_RFC822
-{
-    Text [ en-US ] = "message/rfc822" ;
-};
-
-String STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE
-{
-    Text [ en-US ] = "multipart/alternative" ;
-};
-
-String STR_SVT_MIMETYPE_INET_MULTI_DIGEST
-{
-    Text [ en-US ] = "multipart/digest" ;
-};
-
-String STR_SVT_MIMETYPE_INET_MULTI_PARALLEL
-{
-    Text [ en-US ] = "multipart/parallel" ;
-};
-
-String STR_SVT_MIMETYPE_INET_MULTI_RELATED
-{
-    Text [ en-US ] = "multipart/related" ;
-};
-
-String STR_SVT_MIMETYPE_INET_MULTI_MIXED
-{
-    Text [ en-US ] = "multipart/mixed" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXCALC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXCHART
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXDRAW
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXMATH
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXWRITER
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXIMPRESS
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXGLOBAL
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
-};
-
-String STR_SVT_MIMETYPE_APP_SXIPACKED
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Presentation (packed)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/AllLangMoTarget_svt.mk b/svtools/AllLangMoTarget_svt.mk
new file mode 100644
index 000000000000..dc1ad301c40f
--- /dev/null
+++ b/svtools/AllLangMoTarget_svt.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,svt))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,svt,svtools))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
deleted file mode 100644
index f373af6e4b83..000000000000
--- a/svtools/AllLangResTarget_svt.mk
+++ /dev/null
@@ -1,59 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools))
-
-$(eval $(call gb_AllLangResTarget_add_srs,svt,\
-    svt/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,svt/res))
-
-$(eval $(call gb_SrsTarget_set_include,svt/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/svtools/source/inc \
-    -I$(SRCDIR)/svtools/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,svt/res,\
-    svtools/source/contnr/fileview.src \
-    svtools/source/contnr/svcontnr.src \
-    svtools/source/contnr/templwin.src \
-    svtools/source/control/calendar.src \
-    svtools/source/control/ctrlbox.src \
-    svtools/source/control/ctrltool.src \
-    svtools/source/control/filectrl.src \
-    svtools/source/control/ruler.src \
-    svtools/source/dialogs/addresstemplate.src \
-	svtools/source/dialogs/filedlg2.src \
-    svtools/source/dialogs/formats.src \
-    svtools/source/dialogs/so3res.src \
-    svtools/source/dialogs/wizardmachine.src \
-    $(if $(ENABLE_JAVA), \
-        svtools/source/java/javaerror.src) \
-    svtools/source/misc/errtxt.src \
-    svtools/source/misc/imagemgr.src \
-    svtools/source/misc/langtab.src \
-    svtools/source/misc/svtools.src \
-    svtools/source/misc/undo.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fb1d1cabc87d..08f182571690 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -245,7 +245,4 @@ $(eval $(call gb_Library_use_system_win32_libs,svt,\
 ))
 endif
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,svt,svt))
-
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index b963cea380fe..f75971c27df3 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -21,11 +21,11 @@ $(eval $(call gb_Module_Module,svtools))
 
 $(eval $(call gb_Module_add_targets,svtools,\
     Library_svt \
+    UIConfig_svt \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,svtools,\
-    AllLangResTarget_svt \
-    UIConfig_svt \
+    AllLangMoTarget_svt \
 ))
 
 $(eval $(call gb_Module_add_check_targets,svtools,\
diff --git a/svtools/inc/errtxt.hrc b/svtools/inc/errtxt.hrc
new file mode 100644
index 000000000000..1383d224c51b
--- /dev/null
+++ b/svtools/inc/errtxt.hrc
@@ -0,0 +1,158 @@
+/* -*- 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#include <svtools/sfxecode.hxx>
+#include <svtools/soerr.hxx>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+#define S_MAX   0x7fff
+
+const ErrMsgCode RID_ERRCTX[] =
+{
+    { NC_("RID_ERRCTX", "Error") , ErrCode(ERRCTX_ERROR) },
+    { NC_("RID_ERRCTX", "Warning") , ErrCode(ERRCTX_WARNING) },
+    { NC_("RID_ERRCTX", "$(ERR) loading the template $(ARG1)") , ErrCode(ERRCTX_SFX_LOADTEMPLATE) },
+    { NC_("RID_ERRCTX", "$(ERR) saving the document $(ARG1)"), ErrCode(ERRCTX_SFX_SAVEDOC) },
+    { NC_("RID_ERRCTX", "$(ERR) saving the document $(ARG1)"), ErrCode(ERRCTX_SFX_SAVEASDOC) },
+    { NC_("RID_ERRCTX", "$(ERR) displaying doc. information for document $(ARG1)") , ErrCode(ERRCTX_SFX_DOCINFO) },
+    { NC_("RID_ERRCTX", "$(ERR) writing document $(ARG1) as template") , ErrCode(ERRCTX_SFX_DOCTEMPLATE) },
+    { NC_("RID_ERRCTX", "$(ERR) copying or moving document contents") , ErrCode(ERRCTX_SFX_MOVEORCOPYCONTENTS) },
+    { NC_("RID_ERRCTX", "$(ERR) starting the Document Manager") , ErrCode(ERRCTX_SFX_DOCMANAGER) },
+    { NC_("RID_ERRCTX", "$(ERR) loading document $(ARG1)") , ErrCode(ERRCTX_SFX_OPENDOC) },
+    { NC_("RID_ERRCTX", "$(ERR) creating a new document") , ErrCode(ERRCTX_SFX_NEWDOCDIRECT) },
+    { NC_("RID_ERRCTX", "$(ERR) creating a new document") , ErrCode(ERRCTX_SFX_NEWDOC) },
+    { NC_("RID_ERRCTX", "$(ERR) expanding entry") , ErrCode(ERRCTX_SFX_CREATEOBJSH) },
+    { NC_("RID_ERRCTX", "$(ERR) loading BASIC of document $(ARG1)") , ErrCode(ERRCTX_SFX_LOADBASIC) },
+    { NC_("RID_ERRCTX", "$(ERR) searching for an address"), ErrCode(ERRCTX_SFX_SEARCHADDRESS) },
+    { nullptr, ERRCODE_NONE }
+};
+
+const ErrMsgCode RID_ERRHDL[] =
+{
+    { NC_("RID_ERRHDL", "Abort") , ErrCode(ERRCODE_CLASS_ABORT) },
+    { NC_("RID_ERRHDL", "Nonexistent object") , ErrCode(ERRCODE_CLASS_NOTEXISTS) },
+    { NC_("RID_ERRHDL", "Object already exists") , ErrCode(ERRCODE_CLASS_ALREADYEXISTS) },
+    { NC_("RID_ERRHDL", "Object not accessible") , ErrCode(ERRCODE_CLASS_ACCESS) },
+    { NC_("RID_ERRHDL", "Inadmissible path") , ErrCode(ERRCODE_CLASS_PATH) },
+    { NC_("RID_ERRHDL", "Locking problem") , ErrCode(ERRCODE_CLASS_LOCKING) },
+    { NC_("RID_ERRHDL", "Wrong parameter") , ErrCode(ERRCODE_CLASS_PARAMETER) },
+    { NC_("RID_ERRHDL", "Resource exhausted") , ErrCode(ERRCODE_CLASS_SPACE) },
+    { NC_("RID_ERRHDL", "Action not supported") , ErrCode(ERRCODE_CLASS_NOTSUPPORTED) },
+    { NC_("RID_ERRHDL", "Read Error") , ErrCode(ERRCODE_CLASS_READ) },
+    { NC_("RID_ERRHDL", "Write Error") , ErrCode(ERRCODE_CLASS_WRITE) },
+    { NC_("RID_ERRHDL", "unknown") , ErrCode(ERRCODE_CLASS_UNKNOWN) },
+    { NC_("RID_ERRHDL", "Version Incompatibility") , ErrCode(ERRCODE_CLASS_VERSION) },
+    { NC_("RID_ERRHDL", "General Error") , ErrCode(ERRCODE_CLASS_GENERAL) },
+    { NC_("RID_ERRHDL", "Incorrect format") , ErrCode(ERRCODE_CLASS_FORMAT) },
+    { NC_("RID_ERRHDL", "Error creating object") , ErrCode(ERRCODE_CLASS_CREATE) },
+    { NC_("RID_ERRHDL", "Inadmissible value or data type") , ErrCode(ERRCODE_CLASS_SBX) },
+    { NC_("RID_ERRHDL", "BASIC runtime error") , ErrCode(ERRCODE_CLASS_RUNTIME) },
+    { NC_("RID_ERRHDL", "BASIC syntax error") , ErrCode(ERRCODE_CLASS_COMPILER) },
+    { NC_("RID_ERRHDL", "General Error") , ErrCode(1) },
+    { NC_("RID_ERRHDL", "General input/output error.") , ErrCode(ERRCODE_IO_GENERAL) },
+    { NC_("RID_ERRHDL", "Invalid file name.") , ErrCode(ERRCODE_IO_MISPLACEDCHAR) },
+    { NC_("RID_ERRHDL", "Nonexistent file.") , ErrCode(ERRCODE_IO_NOTEXISTS) },
+    { NC_("RID_ERRHDL", "File already exists.") , ErrCode(ERRCODE_IO_ALREADYEXISTS) },
+    { NC_("RID_ERRHDL", "The object is not a directory.") , ErrCode(ERRCODE_IO_NOTADIRECTORY) },
+    { NC_("RID_ERRHDL", "The object is not a file.") , ErrCode(ERRCODE_IO_NOTAFILE) },
+    { NC_("RID_ERRHDL", "The specified device is invalid.") , ErrCode(ERRCODE_IO_INVALIDDEVICE) },
+    { NC_("RID_ERRHDL", "The object cannot be accessed\ndue to insufficient user rights.") , ErrCode(ERRCODE_IO_ACCESSDENIED) },
+    { NC_("RID_ERRHDL", "Sharing violation while accessing the object.") , ErrCode(ERRCODE_IO_LOCKVIOLATION) },
+    { NC_("RID_ERRHDL", "No more space on device.") , ErrCode(ERRCODE_IO_OUTOFSPACE) },
+    { NC_("RID_ERRHDL", "This operation cannot be run on\nfiles containing wildcards.") , ErrCode(ERRCODE_IO_ISWILDCARD) },
+    { NC_("RID_ERRHDL", "This operation is not supported on this operating system.") , ErrCode(ERRCODE_IO_NOTSUPPORTED) },
+    { NC_("RID_ERRHDL", "There are too many files open.") , ErrCode(ERRCODE_IO_TOOMANYOPENFILES) },
+    { NC_("RID_ERRHDL", "Data could not be read from the file.") , ErrCode(ERRCODE_IO_CANTREAD) },
+    { NC_("RID_ERRHDL", "The file could not be written.") , ErrCode(ERRCODE_IO_CANTWRITE) },
+    { NC_("RID_ERRHDL", "The operation could not be run due to insufficient memory.") , ErrCode(ERRCODE_IO_OUTOFMEMORY) },
+    { NC_("RID_ERRHDL", "The seek operation could not be run.") , ErrCode(ERRCODE_IO_CANTSEEK) },
+    { NC_("RID_ERRHDL", "The tell operation could not be run.") , ErrCode(ERRCODE_IO_CANTTELL) },
+    { NC_("RID_ERRHDL", "Incorrect file version.") , ErrCode(ERRCODE_IO_WRONGVERSION) },
+    { NC_("RID_ERRHDL", "Incorrect file format.") , ErrCode(ERRCODE_IO_WRONGFORMAT) },
+    { NC_("RID_ERRHDL", "The file name contains invalid characters.") , ErrCode(ERRCODE_IO_INVALIDCHAR) },
+    { NC_("RID_ERRHDL", "An unknown I/O error has occurred.") , ErrCode(ERRCODE_IO_UNKNOWN) },
+    { NC_("RID_ERRHDL", "An invalid attempt was made to access the file.") , ErrCode(ERRCODE_IO_INVALIDACCESS) },
+    { NC_("RID_ERRHDL", "The file could not be created.") , ErrCode(ERRCODE_IO_CANTCREATE) },
+    { NC_("RID_ERRHDL", "The operation was started under an invalid parameter.") , ErrCode(ERRCODE_IO_INVALIDPARAMETER) },
+    { NC_("RID_ERRHDL", "The operation on the file was aborted.") , ErrCode(ERRCODE_IO_ABORT) },
+    { NC_("RID_ERRHDL", "Path to the file does not exist.") , ErrCode(ERRCODE_IO_NOTEXISTSPATH) },
+    { NC_("RID_ERRHDL", "An object cannot be copied into itself.") , ErrCode(ERRCODE_IO_RECURSIVE) },
+    { NC_("RID_ERRHDL", "The specified template could not be found.") , ErrCode(ERRCODE_SFX_TEMPLATENOTFOUND) },
+    { NC_("RID_ERRHDL", "The file cannot be used as template.") , ErrCode(ERRCODE_SFX_NOTATEMPLATE) },
+    { NC_("RID_ERRHDL", "This document has already been opened for editing.") , ErrCode(ERRCODE_SFX_ALREADYOPEN) },
+    { NC_("RID_ERRHDL", "The wrong password has been entered.") , ErrCode(ERRCODE_SFX_WRONGPASSWORD) },
+    { NC_("RID_ERRHDL", "Error reading file.") , ErrCode(ERRCODE_SFX_DOLOADFAILED) },
+    { NC_("RID_ERRHDL", "The document was opened as read-only.") , ErrCode(ERRCODE_SFX_DOCUMENTREADONLY) },
+    { NC_("RID_ERRHDL", "General OLE Error.") , ErrCode(ERRCODE_SFX_OLEGENERAL) },
+    { NC_("RID_ERRHDL", "The host name $(ARG1) could not be resolved.") , ErrCode(ERRCODE_INET_NAME_RESOLVE) },
+    { NC_("RID_ERRHDL", "Could not establish Internet connection to $(ARG1).") , ErrCode(ERRCODE_INET_CONNECT) },
+    { NC_("RID_ERRHDL", "Error reading data from the Internet.\nServer error message: $(ARG1).") , ErrCode(ERRCODE_INET_READ) },
+    { NC_("RID_ERRHDL", "Error transferring data to the Internet.\nServer error message: $(ARG1).") , ErrCode(ERRCODE_INET_WRITE) },
+    { NC_("RID_ERRHDL", "General Internet error has occurred.") , ErrCode(ERRCODE_INET_GENERAL) },
+    { NC_("RID_ERRHDL", "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated.") , ErrCode(ERRCODE_INET_OFFLINE) },
+    { NC_("RID_ERRHDL", "The contents could not be created.") , ErrCode(ERRCODE_SFX_CANTCREATECONTENT) },
+    { NC_("RID_ERRHDL", "The file name is too long for the target file system.") , ErrCode(ERRCODE_IO_NAMETOOLONG) },
+    { NC_("RID_ERRHDL", "The input syntax is invalid.") , ErrCode(ERRCODE_SFX_INVALIDSYNTAX) },
+    { NC_("RID_ERRHDL", "The input syntax is invalid.") , ErrCode(ERRCODE_SFX_CANTCREATEFOLDER) },
+    { NC_("RID_ERRHDL", "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."), ErrCode(ERRCODE_IO_NOTSTORABLEINBINARYFORMAT) },
+    { NC_("RID_ERRHDL", "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."), ErrCode(ERRCODE_SFX_NOMOREDOCUMENTSALLOWED) },
+    { NC_("RID_ERRHDL", "Could not create backup copy.") , ErrCode(ERRCODE_SFX_CANTCREATEBACKUP) },
+    { NC_("RID_ERRHDL", "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."), ErrCode(ERRCODE_SFX_MACROS_SUPPORT_DISABLED) },
+    { NC_("RID_ERRHDL", "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available.") , ErrCode(ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC) },
+    { NC_("RID_ERRHDL", "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available.") , ErrCode(ERRCODE_SFX_DOCUMENT_MACRO_DISABLED) },
+    { NC_("RID_ERRHDL", "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n ") , ErrCode(ERRCODE_SFX_INCOMPLETE_ENCRYPTION) },
+    { NC_("RID_ERRHDL", "Invalid data length.") , ErrCode(ERRCODE_IO_INVALIDLENGTH) },
+    { NC_("RID_ERRHDL", "Function not possible: path contains current directory.") , ErrCode(ERRCODE_IO_CURRENTDIR) },
+    { NC_("RID_ERRHDL", "Function not possible: device (drive) not identical.") , ErrCode(ERRCODE_IO_NOTSAMEDEVICE) },
+    { NC_("RID_ERRHDL", "Device (drive) not ready.") , ErrCode(ERRCODE_IO_DEVICENOTREADY) },
+    { NC_("RID_ERRHDL", "Wrong checksum.") , ErrCode(ERRCODE_IO_BADCRC) },
+    { NC_("RID_ERRHDL", "Function not possible: write protected.") , ErrCode(ERRCODE_IO_WRITEPROTECTED) },
+    { NC_("RID_ERRHDL", "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."), ErrCode(ERRCODE_SFX_SHARED_NOPASSWORDCHANGE) },
+    { nullptr, ERRCODE_NONE }
+};
+
+const ErrMsgCode RID_SO_ERROR_HANDLER[] =
+{
+    { NC_("RID_ERRHDL", "General OLE error."),
+      ErrCode(sal_uInt32(ERRCODE_SO_GENERALERROR) & S_MAX) },
+    { NC_("RID_ERRHDL", "False."),
+      ErrCode(sal_uInt32(ERRCODE_SO_FALSE) & S_MAX) },
+    { NC_("RID_ERRHDL", "Data not available at this time."),
+      ErrCode(sal_uInt32(ERRCODE_SO_PENDING) & S_MAX) },
+    { NC_("RID_ERRHDL", "The action cannot be executed in the object's current state."),
+      ErrCode(sal_uInt32(ERRCODE_SO_CANNOT_DOVERB_NOW) & S_MAX) },
+    { NC_("RID_ERRHDL", "The object does not support any actions."),
+      ErrCode(sal_uInt32(ERRCODE_SO_NOVERBS) & S_MAX) },
+    { NC_("RID_ERRHDL", "Object does not support this action."),
+      ErrCode(sal_uInt32(ERRCODE_SO_NOTIMPL) & S_MAX) },
+    { nullptr, ERRCODE_NONE }
+};
+
+const ErrMsgCode RID_SO_ERRCTX[] =
+{
+    { NC_("RID_ERRHDL", "$(ERR) activating object") , ErrCode(ERRCTX_SO_DOVERB) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
new file mode 100644
index 000000000000..95a6b23b62bf
--- /dev/null
+++ b/svtools/inc/langtab.hrc
@@ -0,0 +1,412 @@
+/* -*- 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_SVTOOLS_INC_LANGTAB_HRC
+#define INCLUDED_SVTOOLS_INC_LANGTAB_HRC
+
+#include <i18nlangtag/lang.h>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
+{
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "[None]") , LANGUAGE_NONE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Unknown") , LANGUAGE_DONTKNOW },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Default") , LANGUAGE_SYSTEM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Default") , LANGUAGE_USER_SYSTEM_CONFIG },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Afrikaans (South Africa)") , LANGUAGE_AFRIKAANS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Albanian") , LANGUAGE_ALBANIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic") , LANGUAGE_ARABIC_PRIMARY_ONLY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Algeria)") , LANGUAGE_ARABIC_ALGERIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Bahrain)") , LANGUAGE_ARABIC_BAHRAIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Chad)") , LANGUAGE_USER_ARABIC_CHAD },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Comoros)") , LANGUAGE_USER_ARABIC_COMOROS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Djibouti)") , LANGUAGE_USER_ARABIC_DJIBOUTI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Egypt)") , LANGUAGE_ARABIC_EGYPT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Eritrea)") , LANGUAGE_USER_ARABIC_ERITREA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Iraq)") , LANGUAGE_ARABIC_IRAQ },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Israel)") , LANGUAGE_USER_ARABIC_ISRAEL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Jordan)") , LANGUAGE_ARABIC_JORDAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Kuwait)") , LANGUAGE_ARABIC_KUWAIT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Lebanon)") , LANGUAGE_ARABIC_LEBANON },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Libya)") , LANGUAGE_ARABIC_LIBYA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Mauritania)") , LANGUAGE_USER_ARABIC_MAURITANIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Morocco)") , LANGUAGE_ARABIC_MOROCCO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Oman)") , LANGUAGE_ARABIC_OMAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Palestine)") , LANGUAGE_USER_ARABIC_PALESTINE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Qatar)") , LANGUAGE_ARABIC_QATAR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Saudi Arabia)") , LANGUAGE_ARABIC_SAUDI_ARABIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Somalia)") , LANGUAGE_USER_ARABIC_SOMALIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Sudan)") , LANGUAGE_USER_ARABIC_SUDAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Syria)") , LANGUAGE_ARABIC_SYRIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Tunisia)") , LANGUAGE_ARABIC_TUNISIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (UAE)") , LANGUAGE_ARABIC_UAE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Yemen)") , LANGUAGE_ARABIC_YEMEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aragonese") , LANGUAGE_USER_ARAGONESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian") , LANGUAGE_ARMENIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Assamese") , LANGUAGE_ASSAMESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Latin") , LANGUAGE_AZERI_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Cyrillic") , LANGUAGE_AZERI_CYRILLIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Basque") , LANGUAGE_BASQUE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bengali (India)") , LANGUAGE_BENGALI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bulgarian") , LANGUAGE_BULGARIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Belarusian") , LANGUAGE_BELARUSIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Catalan") , LANGUAGE_CATALAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Catalan (Valencian)") , LANGUAGE_USER_CATALAN_VALENCIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chinese (traditional)") , LANGUAGE_CHINESE_TRADITIONAL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chinese (simplified)") , LANGUAGE_CHINESE_SIMPLIFIED },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chinese (Hong Kong)") , LANGUAGE_CHINESE_HONGKONG },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chinese (Singapore)") , LANGUAGE_CHINESE_SINGAPORE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chinese (Macau)") , LANGUAGE_CHINESE_MACAU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Church Slavic") , LANGUAGE_USER_CHURCH_SLAVIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Croatian") , LANGUAGE_CROATIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Czech") , LANGUAGE_CZECH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Danish") , LANGUAGE_DANISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dutch (Netherlands)") , LANGUAGE_DUTCH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dutch (Belgium)") , LANGUAGE_DUTCH_BELGIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (USA)") , LANGUAGE_ENGLISH_US },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (UK)") , LANGUAGE_ENGLISH_UK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English, OED spelling (UK)") , LANGUAGE_USER_ENGLISH_UK_OXENDICT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Australia)") , LANGUAGE_ENGLISH_AUS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Canada)") , LANGUAGE_ENGLISH_CAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (New Zealand)") , LANGUAGE_ENGLISH_NZ },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Ireland)") , LANGUAGE_ENGLISH_EIRE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (South Africa)") , LANGUAGE_ENGLISH_SAFRICA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Jamaica)") , LANGUAGE_ENGLISH_JAMAICA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Caribbean)") , LANGUAGE_ENGLISH_CARRIBEAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Belize)") , LANGUAGE_ENGLISH_BELIZE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Trinidad)") , LANGUAGE_ENGLISH_TRINIDAD },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zimbabwe)") , LANGUAGE_ENGLISH_ZIMBABWE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Philippines)") , LANGUAGE_ENGLISH_PHILIPPINES },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (India)") , LANGUAGE_ENGLISH_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Estonian") , LANGUAGE_ESTONIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Finnish") , LANGUAGE_FINNISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Faroese") , LANGUAGE_FAEROESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Persian") , LANGUAGE_FARSI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (France)") , LANGUAGE_FRENCH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Belgium)") , LANGUAGE_FRENCH_BELGIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Canada)") , LANGUAGE_FRENCH_CANADIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Switzerland)") , LANGUAGE_FRENCH_SWISS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Luxembourg)") , LANGUAGE_FRENCH_LUXEMBOURG },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Monaco)") , LANGUAGE_FRENCH_MONACO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Gascon") , LANGUAGE_USER_GASCON },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Germany)") , LANGUAGE_GERMAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Switzerland)") , LANGUAGE_GERMAN_SWISS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Austria)") , LANGUAGE_GERMAN_AUSTRIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Luxembourg)") , LANGUAGE_GERMAN_LUXEMBOURG },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Liechtenstein)") , LANGUAGE_GERMAN_LIECHTENSTEIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Greek") , LANGUAGE_GREEK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Gujarati") , LANGUAGE_GUJARATI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hebrew") , LANGUAGE_HEBREW },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hindi") , LANGUAGE_HINDI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hungarian") , LANGUAGE_HUNGARIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Icelandic") , LANGUAGE_ICELANDIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Indonesian") , LANGUAGE_INDONESIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Italian (Italy)") , LANGUAGE_ITALIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Italian (Switzerland)") , LANGUAGE_ITALIAN_SWISS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Japanese") , LANGUAGE_JAPANESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kannada") , LANGUAGE_KANNADA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kashmiri (Kashmir)") , LANGUAGE_KASHMIRI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kashmiri (India)") , LANGUAGE_KASHMIRI_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kazakh") , LANGUAGE_KAZAKH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Konkani") , LANGUAGE_KONKANI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Korean (RoK)") , LANGUAGE_KOREAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Latvian") , LANGUAGE_LATVIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lithuanian") , LANGUAGE_LITHUANIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Macedonian") , LANGUAGE_MACEDONIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay (Malaysia)") , LANGUAGE_MALAY_MALAYSIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay (Brunei Darussalam)") , LANGUAGE_MALAY_BRUNEI_DARUSSALAM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malayalam") , LANGUAGE_MALAYALAM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manipuri") , LANGUAGE_MANIPURI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Marathi") , LANGUAGE_MARATHI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nepali (Nepal)") , LANGUAGE_NEPALI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nepali (India)") , LANGUAGE_NEPALI_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Norwegian, Bokmål") , LANGUAGE_NORWEGIAN_BOKMAL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Norwegian, Nynorsk") , LANGUAGE_NORWEGIAN_NYNORSK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Odia") , LANGUAGE_ODIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Polish") , LANGUAGE_POLISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Angola)") , LANGUAGE_USER_PORTUGUESE_ANGOLA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Portugal)") , LANGUAGE_PORTUGUESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Brazil)") , LANGUAGE_PORTUGUESE_BRAZILIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Punjabi") , LANGUAGE_PUNJABI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rhaeto-Romance") , LANGUAGE_RHAETO_ROMAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Romanian (Romania)") , LANGUAGE_ROMANIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Romanian (Moldova)") , LANGUAGE_ROMANIAN_MOLDOVA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Russian") , LANGUAGE_RUSSIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sanskrit") , LANGUAGE_SANSKRIT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Cyrillic (Serbia and Montenegro)") , LANGUAGE_SERBIAN_CYRILLIC_SAM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Latin (Serbia and Montenegro)") , LANGUAGE_SERBIAN_LATIN_SAM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Cyrillic (Serbia)") , LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Latin (Serbia)") , LANGUAGE_USER_SERBIAN_LATIN_SERBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Cyrillic (Montenegro)") , LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Latin (Montenegro)") , LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Serbian Latin") , LANGUAGE_SERBIAN_LATIN_LSO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sidama") , LANGUAGE_USER_SIDAMA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sindhi") , LANGUAGE_SINDHI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Slovak") , LANGUAGE_SLOVAK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Slovenian") , LANGUAGE_SLOVENIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Spain)") , LANGUAGE_SPANISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Mexico)") , LANGUAGE_SPANISH_MEXICAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Guatemala)") , LANGUAGE_SPANISH_GUATEMALA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Costa Rica)") , LANGUAGE_SPANISH_COSTARICA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Panama)") , LANGUAGE_SPANISH_PANAMA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Dom. Rep.)") , LANGUAGE_SPANISH_DOMINICAN_REPUBLIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Venezuela)") , LANGUAGE_SPANISH_VENEZUELA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Colombia)") , LANGUAGE_SPANISH_COLOMBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Peru)") , LANGUAGE_SPANISH_PERU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Argentina)") , LANGUAGE_SPANISH_ARGENTINA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Ecuador)") , LANGUAGE_SPANISH_ECUADOR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Chile)") , LANGUAGE_SPANISH_CHILE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Uruguay)") , LANGUAGE_SPANISH_URUGUAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Paraguay)") , LANGUAGE_SPANISH_PARAGUAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Bolivia)") , LANGUAGE_SPANISH_BOLIVIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (El Salvador)") , LANGUAGE_SPANISH_EL_SALVADOR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Honduras)") , LANGUAGE_SPANISH_HONDURAS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Nicaragua)") , LANGUAGE_SPANISH_NICARAGUA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Puerto Rico)") , LANGUAGE_SPANISH_PUERTO_RICO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Swahili (Kenya)") , LANGUAGE_SWAHILI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Swedish (Sweden)") , LANGUAGE_SWEDISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Swedish (Finland)") , LANGUAGE_SWEDISH_FINLAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tajik") , LANGUAGE_TAJIK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tamil") , LANGUAGE_TAMIL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tatar") , LANGUAGE_TATAR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Telugu") , LANGUAGE_TELUGU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Thai") , LANGUAGE_THAI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Turkish") , LANGUAGE_TURKISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Urdu (Pakistan)") , LANGUAGE_URDU_PAKISTAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Urdu (India)") , LANGUAGE_URDU_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ukrainian") , LANGUAGE_UKRAINIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Uzbek Latin") , LANGUAGE_UZBEK_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Uzbek Cyrillic") , LANGUAGE_UZBEK_CYRILLIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Welsh") , LANGUAGE_WELSH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Latin") , LANGUAGE_USER_LATIN_VATICAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Esperanto") , LANGUAGE_USER_ESPERANTO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kinyarwanda (Rwanda)") , LANGUAGE_USER_KINYARWANDA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Maori") , LANGUAGE_MAORI_NEW_ZEALAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Galician") , LANGUAGE_GALICIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dhivehi") , LANGUAGE_DHIVEHI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Northern Sotho") , LANGUAGE_SEPEDI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Gaelic (Scotland)") , LANGUAGE_GAELIC_SCOTLAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Mongolian Cyrillic") , LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Mongolian Mongolian") , LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interlingua") , LANGUAGE_USER_INTERLINGUA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bosnian") , LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bengali (Bangladesh)") , LANGUAGE_BENGALI_BANGLADESH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Occitan") , LANGUAGE_USER_OCCITAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Khmer") , LANGUAGE_KHMER },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Northern (Turkey)") , LANGUAGE_USER_KURDISH_TURKEY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Northern (Syria)") , LANGUAGE_USER_KURDISH_SYRIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Central (Iraq)") , LANGUAGE_USER_KURDISH_IRAQ },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Central (Iran)") , LANGUAGE_USER_KURDISH_IRAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Southern (Iran)") , LANGUAGE_USER_KURDISH_SOUTHERN_IRAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kurdish, Southern (Iraq)") , LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sardinian") , LANGUAGE_USER_SARDINIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dzongkha") , LANGUAGE_DZONGKHA_BHUTAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Swahili (Tanzania)") , LANGUAGE_USER_SWAHILI_TANZANIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lao") , LANGUAGE_LAO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Irish") , LANGUAGE_GAELIC_IRELAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tibetan (PR China)") , LANGUAGE_TIBETAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Georgian") , LANGUAGE_GEORGIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Frisian") , LANGUAGE_FRISIAN_NETHERLANDS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tswana (South Africa)") , LANGUAGE_TSWANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Zulu") , LANGUAGE_ZULU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Vietnamese") , LANGUAGE_VIETNAMESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Breton") , LANGUAGE_USER_BRETON },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kalaallisut") , LANGUAGE_USER_KALAALLISUT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ndebele, South") , LANGUAGE_USER_NDEBELE_SOUTH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Southern Sotho") , LANGUAGE_SESOTHO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Swazi") , LANGUAGE_USER_SWAZI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tsonga") , LANGUAGE_TSONGA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Venda") , LANGUAGE_VENDA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tswana (Botswana)") , LANGUAGE_USER_TSWANA_BOTSWANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xhosa") , LANGUAGE_XHOSA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sinhala") , LANGUAGE_SINHALESE_SRI_LANKA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Moore") , LANGUAGE_USER_MOORE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bambara") , LANGUAGE_USER_BAMBARA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Akan") , LANGUAGE_USER_AKAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Luxembourgish") , LANGUAGE_USER_LUXEMBOURGISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Friulian") , LANGUAGE_USER_FRIULIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fijian") , LANGUAGE_USER_FIJIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Afrikaans (Namibia)") , LANGUAGE_USER_AFRIKAANS_NAMIBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Namibia)") , LANGUAGE_USER_ENGLISH_NAMIBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Walloon") , LANGUAGE_USER_WALLOON },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Coptic") , LANGUAGE_USER_COPTIC },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tigrigna (Eritrea)") , LANGUAGE_TIGRIGNA_ERITREA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tigrigna (Ethiopia)") , LANGUAGE_TIGRIGNA_ETHIOPIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Amharic") , LANGUAGE_AMHARIC_ETHIOPIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kirghiz") , LANGUAGE_KIRGHIZ },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "German (Belgium)") , LANGUAGE_USER_GERMAN_BELGIUM },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Chuvash") , LANGUAGE_USER_CHUVASH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Burmese") , LANGUAGE_BURMESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hausa (Nigeria)") , LANGUAGE_HAUSA_NIGERIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hausa (Ghana)") , LANGUAGE_USER_HAUSA_GHANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Éwé") , LANGUAGE_USER_EWE_GHANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Ghana)") , LANGUAGE_USER_ENGLISH_GHANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sango") , LANGUAGE_USER_SANGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tagalog") , LANGUAGE_USER_TAGALOG },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ganda") , LANGUAGE_USER_GANDA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lingala") , LANGUAGE_USER_LINGALA_DRCONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Low German") , LANGUAGE_USER_LOW_GERMAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hiligaynon") , LANGUAGE_USER_HILIGAYNON },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nyanja") , LANGUAGE_USER_NYANJA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kashubian") , LANGUAGE_USER_KASHUBIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Spanish (Cuba)") , LANGUAGE_USER_SPANISH_CUBA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tetun (Indonesia)") , LANGUAGE_USER_TETUN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Quechua (Bolivia, North)") , LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Quechua (Bolivia, South)") , LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Somali") , LANGUAGE_SOMALI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Inari (Finland)") , LANGUAGE_SAMI_INARI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Lule (Norway)") , LANGUAGE_SAMI_LULE_NORWAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Lule (Sweden)") , LANGUAGE_SAMI_LULE_SWEDEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Northern (Finland)") , LANGUAGE_SAMI_NORTHERN_FINLAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Northern (Norway)") , LANGUAGE_SAMI_NORTHERN_NORWAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Northern (Sweden)") , LANGUAGE_SAMI_NORTHERN_SWEDEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Skolt (Finland)") , LANGUAGE_SAMI_SKOLT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Southern (Norway)") , LANGUAGE_SAMI_SOUTHERN_NORWAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Southern (Sweden)") , LANGUAGE_SAMI_SOUTHERN_SWEDEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Kildin (Russia)") , LANGUAGE_USER_SAMI_KILDIN_RUSSIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guarani (Paraguay)") , LANGUAGE_GUARANI_PARAGUAY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bodo") , LANGUAGE_USER_BODO_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dogri") , LANGUAGE_USER_DOGRI_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Maithili") , LANGUAGE_USER_MAITHILI_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Santali") , LANGUAGE_USER_SANTALI_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tetun (Timor-Leste)") , LANGUAGE_USER_TETUN_TIMOR_LESTE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Turkmen") , LANGUAGE_TURKMEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Maltese") , LANGUAGE_MALTESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tok Pisin") , LANGUAGE_USER_TOK_PISIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Shuswap") , LANGUAGE_USER_SHUSWAP },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Oromo") , LANGUAGE_OROMO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Greek, Ancient") , LANGUAGE_USER_ANCIENT_GREEK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yiddish (Israel)") , LANGUAGE_YIDDISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Quechua (Ecuador)") , LANGUAGE_QUECHUA_ECUADOR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Uyghur") , LANGUAGE_UIGHUR_CHINA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Asturian") , LANGUAGE_USER_ASTURIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sorbian, Upper") , LANGUAGE_UPPER_SORBIAN_GERMANY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sorbian, Lower") , LANGUAGE_LOWER_SORBIAN_GERMANY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Latgalian") , LANGUAGE_USER_LATGALIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Maore") , LANGUAGE_USER_MAORE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bushi") , LANGUAGE_USER_BUSHI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tahitian") , LANGUAGE_USER_TAHITIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malagasy, Plateau") , LANGUAGE_MALAGASY_PLATEAU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Papiamentu (Netherlands Antilles)") , LANGUAGE_PAPIAMENTU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Papiamento (Aruba)") , LANGUAGE_USER_PAPIAMENTU_ARUBA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sardinian, Campidanese") , LANGUAGE_USER_SARDINIAN_CAMPIDANESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sardinian, Gallurese") , LANGUAGE_USER_SARDINIAN_GALLURESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sardinian, Logudorese") , LANGUAGE_USER_SARDINIAN_LOGUDORESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sardinian, Sassarese") , LANGUAGE_USER_SARDINIAN_SASSARESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bafia") , LANGUAGE_USER_BAFIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Gikuyu") , LANGUAGE_USER_GIKUYU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yoruba") , LANGUAGE_YORUBA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rusyn (Ukraine)") , LANGUAGE_USER_RUSYN_UKRAINE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rusyn (Slovakia)") , LANGUAGE_USER_RUSYN_SLOVAKIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabyle Latin") , LANGUAGE_TAMAZIGHT_LATIN_ALGERIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yiddish (USA)") , LANGUAGE_USER_YIDDISH_US },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hawaiian") , LANGUAGE_HAWAIIAN_UNITED_STATES },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Limbu") , LANGUAGE_USER_LIMBU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lojban") , LANGUAGE_USER_LOJBAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Haitian") , LANGUAGE_USER_HAITIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Beembe") , LANGUAGE_USER_BEEMBE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bekwel") , LANGUAGE_USER_BEKWEL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Congo)") , LANGUAGE_USER_KITUBA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lari") , LANGUAGE_USER_LARI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Mbochi") , LANGUAGE_USER_MBOCHI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Eboo") , LANGUAGE_USER_TEKE_EBOO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Ibali") , LANGUAGE_USER_TEKE_IBALI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Tyee") , LANGUAGE_USER_TEKE_TYEE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Vili") , LANGUAGE_USER_VILI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "KeyID") , LANGUAGE_USER_KEYID },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pali Latin") , LANGUAGE_USER_PALI_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kyrgyz (China)") , LANGUAGE_USER_KYRGYZ_CHINA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Komi-Zyrian") , LANGUAGE_USER_KOMI_ZYRIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Komi-Permyak") , LANGUAGE_USER_KOMI_PERMYAK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pitjantjatjara") , LANGUAGE_USER_PITJANTJATJARA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Malawi)") , LANGUAGE_USER_ENGLISH_MALAWI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Erzya") , LANGUAGE_USER_ERZYA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Mari, Meadow") , LANGUAGE_USER_MARI_MEADOW },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Papiamento (Curaçao)") , LANGUAGE_USER_PAPIAMENTU_CURACAO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Papiamento (Bonaire)") , LANGUAGE_USER_PAPIAMENTU_BONAIRE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Khanty") , LANGUAGE_USER_KHANTY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Livonian") , LANGUAGE_USER_LIVONIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Moksha") , LANGUAGE_USER_MOKSHA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Mari, Hill") , LANGUAGE_USER_MARI_HILL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nganasan") , LANGUAGE_USER_NGANASAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Olonets") , LANGUAGE_USER_OLONETS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Veps") , LANGUAGE_USER_VEPS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Võro") , LANGUAGE_USER_VORO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nenets") , LANGUAGE_USER_NENETS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aka (Congo)") , LANGUAGE_USER_AKA_CONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dibole") , LANGUAGE_USER_DIBOLE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Doondo") , LANGUAGE_USER_DOONDO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kaamba") , LANGUAGE_USER_KAAMBA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Koongo (Congo)") , LANGUAGE_USER_KOONGO_CONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kunyi") , LANGUAGE_USER_KUNYI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ngungwel") , LANGUAGE_USER_NGUNGWEL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Njyem (Congo)") , LANGUAGE_USER_NJYEM_CONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Punu") , LANGUAGE_USER_PUNU_CONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Suundi") , LANGUAGE_USER_SUUNDI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Kukuya") , LANGUAGE_USER_TEKE_KUKUYA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tsaangi") , LANGUAGE_USER_TSAANGI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka") , LANGUAGE_USER_YAKA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yombe (Congo)") , LANGUAGE_USER_YOMBE_CONGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "N'ko") , LANGUAGE_USER_NKO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Udmurt") , LANGUAGE_USER_UDMURT },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tibetan (India)") , LANGUAGE_USER_TIBETAN_INDIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cornish") , LANGUAGE_USER_CORNISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sami, Pite (Sweden)") , LANGUAGE_USER_SAMI_PITE_SWEDEN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ngäbere") , LANGUAGE_USER_NGAEBERE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kumyk") , LANGUAGE_USER_KUMYK },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nogai") , LANGUAGE_USER_NOGAI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Karakalpak Latin") , LANGUAGE_USER_KARAKALPAK_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ladin") , LANGUAGE_USER_LADIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Burkina Faso)") , LANGUAGE_USER_FRENCH_BURKINA_FASO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Puinave") , LANGUAGE_USER_PUINAVE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Maninkakan, Eastern, Latin") , LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Avar") , LANGUAGE_USER_AVAR },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cree, Plains, Latin") , LANGUAGE_USER_CREE_PLAINS_LATIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cree, Plains, Syllabics") , LANGUAGE_USER_CREE_PLAINS_SYLLABICS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Lengo") , LANGUAGE_USER_LENGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Côte d'Ivoire)") , LANGUAGE_FRENCH_COTE_D_IVOIRE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Mali)") , LANGUAGE_FRENCH_MALI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Senegal)") , LANGUAGE_FRENCH_SENEGAL },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Benin)") , LANGUAGE_USER_FRENCH_BENIN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Niger)") , LANGUAGE_USER_FRENCH_NIGER },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Togo)") , LANGUAGE_USER_FRENCH_TOGO },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kven Finnish") , LANGUAGE_USER_KVEN_FINNISH },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Venetian") , LANGUAGE_USER_VENETIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Gambia)") , LANGUAGE_USER_ENGLISH_GAMBIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aranese") , LANGUAGE_USER_OCCITAN_ARANESE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arpitan (France)") , LANGUAGE_USER_ARPITAN_FRANCE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arpitan (Italy)") , LANGUAGE_USER_ARPITAN_ITALY },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arpitan (Switzerland)") , LANGUAGE_USER_ARPITAN_SWITZERLAND },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Botswana)") , LANGUAGE_USER_ENGLISH_BOTSWANA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interlingue Occidental") , LANGUAGE_USER_INTERLINGUE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Apatani") , LANGUAGE_USER_APATANI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Mauritius)") , LANGUAGE_USER_ENGLISH_MAURITIUS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Mauritius)") , LANGUAGE_USER_FRENCH_MAURITIUS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Silesian") , LANGUAGE_USER_SILESIAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Hungarian (Szekely-Hungarian Rovas)") , LANGUAGE_USER_HUNGARIAN_ROVAS },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Malaysia)") , LANGUAGE_ENGLISH_MALAYSIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manchu") , LANGUAGE_USER_MANCHU },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the Congo)"), LANGUAGE_USER_KITUBA_DRCONGO }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 43808e2f26f7..189391a74379 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -341,7 +341,6 @@
 #include <i18nutil/paper.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sot/exchange.hxx>
 #include <sot/sotdllapi.h>
 #include <svl/SfxBroadcaster.hxx>
@@ -375,9 +374,7 @@
 #include <tools/mapunit.hxx>
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
-#include <tools/rcid.h>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx
index 32ca8890c444..d87b80ba6426 100644
--- a/svtools/inc/strings.hxx
+++ b/svtools/inc/strings.hxx
@@ -10,12 +10,19 @@
 #ifndef INCLUDED_SVTOOLS_INC_STRINGS_HXX
 #define INCLUDED_SVTOOLS_INC_STRINGS_HXX
 
-#define STR_ERR_HDLMESS         "$(ACTION)$(ERROR)"
-#define RID_ERRHDL_CLASS        "$(CLASS)$(ERROR)"
+#define STR_ERR_HDLMESS                 "$(ACTION)$(ERROR)"
+#define RID_ERRHDL_CLASS                "$(CLASS)$(ERROR)"
 // no need to translate this
 // the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
 // field label list of the dialog
-#define STR_LOGICAL_FIELD_NAMES "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"
+#define STR_LOGICAL_FIELD_NAMES         "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"
+
+#define STR_DESCRIPTION_SMATH_DOC       "StarMath 2.0 - 5.0"
+#define STR_DESCRIPTION_SCHART_DOC      "StarChart 3.0 - 5.0"
+#define STR_DESCRIPTION_SDRAW_DOC       "StarDraw 3.0 / 5.0 (StarImpress)"
+#define STR_DESCRIPTION_SCALC_DOC       "StarCalc 3.0 - 5.0"
+#define STR_DESCRIPTION_SIMPRESS_DOC    "StarImpress 4.0 / 5.0"
+#define STR_DESCRIPTION_SWRITER_DOC     "StarWriter 3.0 - 5.0"
 
 #endif
 
diff --git a/svtools/source/contnr/templwin.hrc b/svtools/inc/templwin.hrc
index 665a05779ca2..5eef305ef0e0 100644
--- a/svtools/source/contnr/templwin.hrc
+++ b/svtools/inc/templwin.hrc
@@ -16,8 +16,13 @@
  *   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_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC
-#define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC
+
+#ifndef INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
+#define INCLUDED_SVTOOLS_INC_TEMPLWIN_HRC
+
+#include <svtools/controldims.hxx>
+
+#define NC_(Context, String) (Context "\004" u8##String)
 
 #define DI_TITLE                1
 #define DI_FROM                 2
@@ -32,6 +37,22 @@
 #define DI_THEME                11
 #define DI_SIZE                 12
 
+const std::pair<const char*, int> STRARY_SVT_DOCINFO[] =
+{
+    { NC_("STRARY_SVT_DOCINFO", "Title") , DI_TITLE },
+    { NC_("STRARY_SVT_DOCINFO", "By") , DI_FROM },
+    { NC_("STRARY_SVT_DOCINFO", "Date") , DI_DATE },
+    { NC_("STRARY_SVT_DOCINFO", "Keywords") , DI_KEYWORDS },
+    { NC_("STRARY_SVT_DOCINFO", "Description") , DI_DESCRIPTION },
+    { NC_("STRARY_SVT_DOCINFO", "Type") , DI_MIMETYPE },
+    { NC_("STRARY_SVT_DOCINFO", "Modified on") , DI_MODIFIEDDATE },
+    { NC_("STRARY_SVT_DOCINFO", "Modified by") , DI_MODIFIEDBY },
+    { NC_("STRARY_SVT_DOCINFO", "Printed on") , DI_PRINTDATE },
+    { NC_("STRARY_SVT_DOCINFO", "Printed by") , DI_PRINTBY },
+    { NC_("STRARY_SVT_DOCINFO", "Subject") , DI_THEME },
+    { NC_("STRARY_SVT_DOCINFO", "Size") , DI_SIZE }
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index c4d94dc5a7dd..a6ad427d7bf0 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -24,12 +24,11 @@
 #include <vcl/window.hxx>
 
 #include <vcl/edit.hxx>
-#include <tools/resid.hxx>
 #include <vcl/spinfld.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/svtresid.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include "bitmaps.hlst"
 
 #include <algorithm>
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 7b44cb4f69d2..7a5df2ad4614 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -45,10 +45,9 @@
 
 namespace svtools {
 
-ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits):
-    Window(pParent, WB_DIALOGCONTROL),
-    m_pEditWin( VclPtr<ExtMultiLineEdit>::Create(this, nBits) ),
-    m_xInfoTable(new SvtDocInfoTable_Impl)
+ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits)
+    : Window(pParent, WB_DIALOGCONTROL)
+    , m_pEditWin( VclPtr<ExtMultiLineEdit>::Create(this, nBits) )
 {
     m_pEditWin->SetLeftMargin(10);
     m_pEditWin->Show();
@@ -141,7 +140,7 @@ void ODocumentInfoPreview::insertEntry(
 void ODocumentInfoPreview::insertNonempty(long id, OUString const & value)
 {
     if (!value.isEmpty()) {
-        insertEntry(m_xInfoTable->GetString(id), value);
+        insertEntry(SvtDocInfoTable_Impl::GetString(id), value);
     }
 }
 
@@ -157,7 +156,7 @@ void ODocumentInfoPreview::insertDateTime(
         OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT));
         buf.append(", ");
         buf.append(rLocaleWrapper.getTime(aToolsDT));
-        insertEntry(m_xInfoTable->GetString(id), buf.makeStringAndClear());
+        insertEntry(SvtDocInfoTable_Impl::GetString(id), buf.makeStringAndClear());
     }
 }
 
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index a85e6d1d392d..c940a789b1ca 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -27,7 +27,7 @@
 #include <svtools/imagemgr.hxx>
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include "bitmaps.hlst"
 #include <svtools/viewdataentry.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
deleted file mode 100644
index 73ab0a340842..000000000000
--- a/svtools/source/contnr/fileview.src
+++ /dev/null
@@ -1,65 +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 <svtools/svtools.hrc>
-#include <svtools/helpid.hrc>
-
-// strings --------------------------------------------------------------------
-
-String STR_SVT_FILEVIEW_COLUMN_TITLE
-{
-    Text [ en-US ] = "Name";
-};
-
-String STR_SVT_FILEVIEW_COLUMN_SIZE
-{
-    Text [ en-US ] = "Size";
-};
-
-String STR_SVT_FILEVIEW_COLUMN_DATE
-{
-    Text [ en-US ] = "Date modified";
-};
-
-String STR_SVT_FILEVIEW_COLUMN_TYPE
-{
-    Text [ en-US ] = "Type";
-};
-
-String STR_SVT_BYTES
-{
-    Text [ en-US ] = "Bytes" ;
-};
-
-String STR_SVT_KB
-{
-    Text [ en-US ] = "KB" ;
-};
-
-String STR_SVT_MB
-{
-    Text [ en-US ] = "MB" ;
-};
-
-String STR_SVT_GB
-{
-    Text [ en-US ] = "GB" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
deleted file mode 100644
index d486cb6e3eb7..000000000000
--- a/svtools/source/contnr/svcontnr.src
+++ /dev/null
@@ -1,49 +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 <svtools/svtools.hrc>
-
-// descriptions of accessible objects
-
-String STR_SVT_ACC_DESC_TABLISTBOX
-{
-    Text [ en-US ] = "Row: %1, Column: %2";
-};
-
-String STR_SVT_ACC_DESC_FILEVIEW
-{
-    Text [ en-US ] = ", Type: %1, URL: %2";
-};
-
-String STR_SVT_ACC_DESC_FOLDER
-{
-    Text [ en-US ] = "Folder";
-};
-
-String STR_SVT_ACC_DESC_FILE
-{
-    Text [ en-US ] = "File";
-};
-
-String STR_SVT_ACC_EMPTY_FIELD
-{
-    Text [ en-US ] = "Empty Field";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 7d8e130b1db1..b0e3132596ff 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -34,7 +34,7 @@
 #include <rtl/instance.hxx>
 #include <svtools/svtresid.hxx>
 #include <tools/wintypes.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include "bitmaps.hlst"
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 93fb4403e007..af846b52381c 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -22,7 +22,7 @@
 #include <svtools/headbar.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/svlbitm.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index d88d0e134826..bd4433fd443b 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -17,25 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include "templwin.hxx"
+#include "templwin.hrc"
 
-// class SvtDocInfoTable_Impl --------------------------------------------
-SvtDocInfoTable_Impl::SvtDocInfoTable_Impl()
-    : ResStringArray(ResId(STRARY_SVT_DOCINFO, *SvtResMgr::GetResMgr()))
-
+namespace SvtDocInfoTable_Impl
 {
-}
-
-OUString SvtDocInfoTable_Impl::GetString( long nId ) const
-{
-    sal_uInt32 nPos( FindIndex( nId ) );
-
-    if ( RESARRAY_INDEX_NOTFOUND != nPos )
-        return ResStringArray::GetString( nPos );
+    OUString GetString(int nId)
+    {
+        for (size_t i = 0; i < SAL_N_ELEMENTS(STRARY_SVT_DOCINFO); ++i)
+        {
+            if (STRARY_SVT_DOCINFO[i].second == nId)
+                return SvtResId(STRARY_SVT_DOCINFO[i].first);
+        }
 
-    return OUString();
+        return OUString();
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index edbbb3beef83..066972b98d8f 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -19,14 +19,9 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
 #define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
 
-#include <tools/resary.hxx>
-
-class SvtDocInfoTable_Impl : public ResStringArray
+namespace SvtDocInfoTable_Impl
 {
-public:
-    SvtDocInfoTable_Impl();
-
-    OUString GetString( long nId ) const;
+    OUString GetString(int nId);
 };
 
 #endif // INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
deleted file mode 100644
index 24e8ae991ece..000000000000
--- a/svtools/source/contnr/templwin.src
+++ /dev/null
@@ -1,44 +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 "templwin.hrc"
-#include <svtools/controldims.hrc>
-#include <svtools/helpid.hrc>
-#include <svtools/svtools.hrc>
-
-StringArray STRARY_SVT_DOCINFO
-{
-    ItemList [ en-US ] =
-    {
-        < "Title" ; DI_TITLE ; > ;
-        < "By" ; DI_FROM ; > ;
-        < "Date" ; DI_DATE ; > ;
-        < "Keywords" ; DI_KEYWORDS ; > ;
-        < "Description" ; DI_DESCRIPTION ; > ;
-        < "Type" ; DI_MIMETYPE ; > ;
-        < "Modified on" ; DI_MODIFIEDDATE ; > ;
-        < "Modified by" ; DI_MODIFIEDBY ; > ;
-        < "Printed on" ; DI_PRINTDATE ; > ;
-        < "Printed by" ; DI_PRINTBY ; > ;
-        < "Subject" ; DI_THEME ; > ;
-        < "Size" ; DI_SIZE ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 5556d1006d00..f79174303bd5 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/calendar.hxx>
 #include <memory>
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
deleted file mode 100644
index 21f0c6026a2a..000000000000
--- a/svtools/source/control/calendar.src
+++ /dev/null
@@ -1,38 +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 <svtools/svtools.hrc>
-String STR_SVT_CALENDAR_DAY
-{
-    Text [ en-US ] = "Day" ;
-};
-String STR_SVT_CALENDAR_WEEK
-{
-    Text [ en-US ] = "Week" ;
-};
-String STR_SVT_CALENDAR_TODAY
-{
-    Text [ en-US ] = "Today" ;
-};
-String STR_SVT_CALENDAR_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 5998eb47ffae..2b707859a62e 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/collatorres.hxx>
 
 //  implementation of the collator-algorithm-name translation
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 7bf29c78f604..0ef866caeb2a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -33,7 +33,7 @@
 
 #include <svtools/sampletext.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/borderhelper.hxx>
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
deleted file mode 100644
index 4d04006cfbcd..000000000000
--- a/svtools/source/control/ctrlbox.src
+++ /dev/null
@@ -1,151 +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 <svtools/svtools.hrc>
-
-/*
- * resources for CollatorResource / CollatorResourceData resp.
- */
-
-String STR_SVT_COLLATE_ALPHANUMERIC
-{
-    /* alphanumeric sorting algorithm */
-    Text [ en-US ] = "Alphanumeric";
-};
-
-String STR_SVT_COLLATE_NORMAL
-{
-    /* default or normal sorting algorithm */
-    Text [ en-US ] = "Normal";
-};
-
-String STR_SVT_COLLATE_CHARSET
-{
-    /* default or normal sorting algorithm */
-    Text [ en-US ] = "Character set";
-};
-
-String STR_SVT_COLLATE_DICTIONARY
-{
-    /* german dictionary word order / sorting */
-    Text [ en-US ] = "Dictionary";
-};
-
-String STR_SVT_COLLATE_PINYIN
-{
-    /* chinese sorting algorithm */
-    Text [ en-US ] = "Pinyin";
-};
-
-String STR_SVT_COLLATE_STROKE
-{
-    /* chinese sorting algorithm */
-    Text [ en-US ] = "Stroke";
-};
-
-String STR_SVT_COLLATE_RADICAL
-{
-    /* chinese sorting algorithm */
-    Text [ en-US ] = "Radical";
-};
-
-String STR_SVT_COLLATE_UNICODE
-{
-    /* sorting according to the unicode code point of the character */
-    Text [ en-US ] = "Unicode";
-};
-
-String STR_SVT_COLLATE_ZHUYIN
-{
-    /* chinese sorting algorithm */
-    Text [ en-US ] = "Zhuyin";
-};
-
-String STR_SVT_COLLATE_PHONEBOOK
-{
-    /* phone book sorting algorithm. e.g. German */
-    Text [ en-US ] = "Phone book";
-};
-
-String STR_SVT_COLLATE_PHONETIC_F
-{
-    Text [ en-US ] = "Phonetic (alphanumeric first)";
-};
-
-String STR_SVT_COLLATE_PHONETIC_L
-{
-    Text [ en-US ] = "Phonetic (alphanumeric last)";
-};
-
-String STR_SVT_INDEXENTRY_ALPHANUMERIC
-{
-    /* alphanumeric indexentry algorithm */
-    Text [ en-US ] = "Alphanumeric";
-};
-
-String STR_SVT_INDEXENTRY_DICTIONARY
-{
-    /* korean dictionary indexentry algorithm */
-    Text [ en-US ] = "Dictionary";
-};
-
-String STR_SVT_INDEXENTRY_PINYIN
-{
-    /* chinese sorting algorithm */
-    Text [ en-US ] = "Pinyin";
-};
-
-String STR_SVT_INDEXENTRY_RADICAL
-{
-    /* chinese indexentry algorithm */
-    Text [ en-US ] = "Radical";
-};
-
-String STR_SVT_INDEXENTRY_STROKE
-{
-    /* chinese indexentry algorithm */
-    Text [ en-US ] = "Stroke";
-};
-
-String STR_SVT_INDEXENTRY_ZHUYIN
-{
-    /* chinese indexentry algorithm */
-    Text [ en-US ] = "Zhuyin";
-};
-
-String STR_SVT_INDEXENTRY_PHONETIC_FS
-{
-    Text [ en-US ] = "Phonetic (alphanumeric first, grouped by syllables)";
-};
-
-String STR_SVT_INDEXENTRY_PHONETIC_FC
-{
-    Text [ en-US ] = "Phonetic (alphanumeric first, grouped by consonants)";
-};
-
-String STR_SVT_INDEXENTRY_PHONETIC_LS
-{
-    Text [ en-US ] = "Phonetic (alphanumeric last, grouped by syllables)";
-};
-
-String STR_SVT_INDEXENTRY_PHONETIC_LC
-{
-    Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index df8390db6a65..ad0e038dacc9 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -29,7 +29,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 #include <sal/macros.h>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/ctrltool.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
deleted file mode 100644
index 5965f40ac15c..000000000000
--- a/svtools/source/control/ctrltool.src
+++ /dev/null
@@ -1,146 +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 <svtools/svtools.hrc>
-
-String STR_SVT_STYLE_LIGHT
-{
-    Text [ en-US ] = "Light" ;
-};
-
-String STR_SVT_STYLE_LIGHT_ITALIC
-{
-    Text [ en-US ] = "Light Italic" ;
-};
-
-String STR_SVT_STYLE_NORMAL
-{
-    Text [ en-US ] = "Regular" ;
-};
-
-String STR_SVT_STYLE_NORMAL_ITALIC
-{
-    Text [ en-US ] = "Italic" ;
-};
-
-String STR_SVT_STYLE_BOLD
-{
-    Text [ en-US ] = "Bold" ;
-};
-
-String STR_SVT_STYLE_BOLD_ITALIC
-{
-    Text [ en-US ] = "Bold Italic" ;
-};
-
-String STR_SVT_STYLE_BLACK
-{
-    Text [ en-US ] = "Black" ;
-};
-
-String STR_SVT_STYLE_BLACK_ITALIC
-{
-    Text [ en-US ] = "Black Italic" ;
-};
-
-String STR_SVT_STYLE_BOOK
-{
-    Text [ en-US ] = "Book" ;
-};
-
-String STR_SVT_STYLE_BOLD_OBLIQUE
-{
-    Text [ en-US ] = "Bold Oblique" ;
-};
-
-String STR_SVT_STYLE_CONDENSED
-{
-    Text [ en-US ] = "Condensed" ;
-};
-
-String STR_SVT_STYLE_CONDENSED_BOLD
-{
-    Text [ en-US ] = "Condensed Bold" ;
-};
-
-String STR_SVT_STYLE_CONDENSED_BOLD_ITALIC
-{
-    Text [ en-US ] = "Condensed Bold Italic" ;
-};
-
-String STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE
-{
-    Text [ en-US ] = "Condensed Bold Oblique" ;
-};
-
-String STR_SVT_STYLE_CONDENSED_ITALIC
-{
-    Text [ en-US ] = "Condensed Italic" ;
-};
-
-String STR_SVT_STYLE_CONDENSED_OBLIQUE
-{
-    Text [ en-US ] = "Condensed Oblique" ;
-};
-
-String STR_SVT_STYLE_EXTRALIGHT
-{
-    Text [ en-US ] = "ExtraLight" ;
-};
-
-String STR_SVT_STYLE_EXTRALIGHT_ITALIC
-{
-    Text [ en-US ] = "ExtraLight Italic" ;
-};
-
-String STR_SVT_STYLE_OBLIQUE
-{
-    Text [ en-US ] = "Oblique" ;
-};
-
-String STR_SVT_STYLE_SEMIBOLD
-{
-    Text [ en-US ] = "Semibold" ;
-};
-
-String STR_SVT_STYLE_SEMIBOLD_ITALIC
-{
-    Text [ en-US ] = "Semibold Italic" ;
-};
-
-String STR_SVT_FONTMAP_BOTH
-{
-    Text [ en-US ] = "The same font will be used on both your printer and your screen." ;
-};
-
-String STR_SVT_FONTMAP_PRINTERONLY
-{
-    Text [ en-US ] = "This is a printer font. The screen image may differ." ;
-};
-
-String STR_SVT_FONTMAP_STYLENOTAVAILABLE
-{
-    Text [ en-US ] = "This font style will be simulated or the closest matching style will be used.";
-};
-
-String STR_SVT_FONTMAP_NOTAVAILABLE
-{
-    Text [ en-US ] = "This font has not been installed. The closest available font will be used.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 7fc74b545618..ad2297325751 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -26,7 +26,7 @@
 #include <svtools/svtresid.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/stdtext.hxx>
-#include <filectrl.hrc>
+#include <svtools/strings.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src
deleted file mode 100644
index 357170c4ef1d..000000000000
--- a/svtools/source/control/filectrl.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 "filectrl.hrc"
-String STR_FILECTRL_BUTTONTEXT
-{
-    Text [ en-US ] = "Browse..." ;
-};
-
-String STR_TABBAR_PUSHBUTTON_MOVET0HOME
-{
-    Text [ en-US ] = "Move To Home" ;
-};
-String STR_TABBAR_PUSHBUTTON_MOVELEFT
-{
-    Text [ en-US ] = "Move Left" ;
-};
-String STR_TABBAR_PUSHBUTTON_MOVERIGHT
-{
-    Text [ en-US ] = "Move Right" ;
-};
-String STR_TABBAR_PUSHBUTTON_MOVETOEND
-{
-    Text [ en-US ] = "Move To End" ;
-};
-String STR_TABBAR_PUSHBUTTON_ADDTAB
-{
-    Text [ en-US ] = "Add" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index d9040f909b63..cb8391f0aeeb 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/indexentryres.hxx>
 
 //  implementation of the indexentry-algorithm-name translation
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 3039ea74f74a..70b2897f7851 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -26,7 +26,7 @@
 
 #include <svtools/ruler.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/colorcfg.hxx>
 
 #include <memory>
diff --git a/svtools/source/control/ruler.src b/svtools/source/control/ruler.src
deleted file mode 100644
index 2ca6d2d74b30..000000000000
--- a/svtools/source/control/ruler.src
+++ /dev/null
@@ -1,30 +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 "svtools/svtools.hrc"
-
-String STR_SVT_ACC_RULER_HORZ_NAME
-{
-    Text[ en-US ] = "Horizontal Ruler";
-};
-String STR_SVT_ACC_RULER_VERT_NAME
-{
-    Text[ en-US ] = "Vertical Ruler";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 41ffdcd9319e..8d8bb6d9cdbd 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -30,9 +30,8 @@
 #include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include "svtaccessiblefactory.hxx"
-#include <filectrl.hrc>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <limits>
 #include <utility>
 #include <vcl/idle.hxx>
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 031edde3755a..0c878a71dea1 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -13,7 +13,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <vcl/msgbox.hxx>
 
 using namespace com::sun::star::uno;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 6262bcdee23b..3de2fc529302 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -21,7 +21,7 @@
 #include <memory>
 #include <svtools/addresstemplate.hxx>
 #include "addresstemplate.hrc"
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/helpid.hrc>
 #include <svtools/svtresid.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
deleted file mode 100644
index 2044f18ff6a4..000000000000
--- a/svtools/source/dialogs/addresstemplate.src
+++ /dev/null
@@ -1,153 +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 <svtools/svtools.hrc>
-#include "addresstemplate.hrc"
-
-String STR_NO_FIELD_SELECTION
-{
-    Text [ en-US ] = "<none>";
-};
-
-String STR_FIELD_COMPANY
-{
-    Text [ en-US ] = "Company";
-};
-String STR_FIELD_DEPARTMENT
-{
-    Text [ en-US ] = "Department";
-};
-String STR_FIELD_FIRSTNAME
-{
-    Text [ en-US ] = "First name";
-};
-String STR_FIELD_LASTNAME
-{
-    Text [ en-US ] = "Last name";
-};
-String STR_FIELD_STREET
-{
-    Text [ en-US ] = "Street";
-};
-String STR_FIELD_COUNTRY
-{
-    Text [ en-US ] = "Country";
-};
-String STR_FIELD_ZIPCODE
-{
-    Text [ en-US ] = "ZIP Code";
-};
-String STR_FIELD_CITY
-{
-    Text [ en-US ] = "City";
-};
-String STR_FIELD_TITLE
-{
-    Text [ en-US ] = "Title";
-};
-String STR_FIELD_POSITION
-{
-    Text [ en-US ] = "Position";
-};
-String STR_FIELD_ADDRFORM
-{
-    Text [ en-US ] = "Addr. Form";
-};
-String STR_FIELD_INITIALS
-{
-    Text [ en-US ] = "Initials";
-};
-String STR_FIELD_SALUTATION
-{
-    Text [ en-US ] = "Complimentary close";
-};
-String STR_FIELD_HOMETEL
-{
-    Text [ en-US ] = "Tel: Home";
-};
-String STR_FIELD_WORKTEL
-{
-    Text [ en-US ] = "Tel: Work";
-};
-String STR_FIELD_FAX
-{
-    Text [ en-US ] = "FAX";
-};
-String STR_FIELD_EMAIL
-{
-    Text [ en-US ] = "E-mail";
-};
-String STR_FIELD_URL
-{
-    Text [ en-US ] = "URL";
-};
-String STR_FIELD_NOTE
-{
-    Text [ en-US ] = "Note";
-};
-String STR_FIELD_USER1
-{
-    Text [ en-US ] = "User 1";
-};
-String STR_FIELD_USER2
-{
-    Text [ en-US ] = "User 2";
-};
-String STR_FIELD_USER3
-{
-    Text [ en-US ] = "User 3";
-};
-String STR_FIELD_USER4
-{
-    Text [ en-US ] = "User 4";
-};
-String STR_FIELD_ID
-{
-    Text [ en-US ] = "ID";
-};
-String STR_FIELD_STATE
-{
-    Text [ en-US ] = "State";
-};
-String STR_FIELD_OFFICETEL
-{
-    Text [ en-US ] = "Tel: Office";
-};
-String STR_FIELD_PAGER
-{
-    Text [ en-US ] = "Pager";
-};
-String STR_FIELD_MOBILE
-{
-    Text [ en-US ] = "Mobile";
-};
-String STR_FIELD_TELOTHER
-{
-    Text [ en-US ] = "Tel: Other";
-};
-String STR_FIELD_CALENDAR
-{
-    Text [ en-US ] = "Calendar";
-};
-String STR_FIELD_INVITE
-{
-    Text [ en-US ] = "Invite";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
deleted file mode 100644
index 795da0e54362..000000000000
--- a/svtools/source/dialogs/filedlg2.src
+++ /dev/null
@@ -1,41 +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 <svtools/filedlg2.hrc>
-#include <svtools/svtools.hrc>
-
-String STR_FILEDLG_OPEN
-{
-    Text [ en-US ] = "Open" ;
-};
-String STR_FILEDLG_TYPE
-{
-    Text [ en-US ] = "File ~type" ;
-};
-String STR_FILEDLG_SAVE
-{
-    Text [ en-US ] = "Save" ;
-};
-
-String STR_SVT_DEFAULT_SERVICE_LABEL
-{
-    Text [ en-US ] = "$user$'s $service$" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
deleted file mode 100644
index 3ecaff7ac772..000000000000
--- a/svtools/source/dialogs/formats.src
+++ /dev/null
@@ -1,291 +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 <svtools/sores.hxx>
-
-String STR_FORMAT_STRING
-{
-    Text [ en-US ] = "Unformatted text" ;
-};
-String STR_FORMAT_BITMAP
-{
-    Text [ en-US ] = "Bitmap";
-};
-String STR_FORMAT_GDIMETAFILE
-{
-    Text [ en-US ] = "GDI metafile";
-};
-String STR_FORMAT_RTF
-{
-    Text [ en-US ] = "Formatted text [RTF]" ;
-};
-String STR_FORMAT_ID_RICHTEXT
-{
-    Text [ en-US ] = "Formatted text [Richtext]" ;
-};
-String STR_FORMAT_ID_DRAWING
-{
-    Text [ en-US ] = "Drawing format";
-};
-String STR_FORMAT_ID_SVXB
-{
-    Text [ en-US ] = "SVXB (StarView bitmap/animation)";
-};
-String STR_FORMAT_ID_INTERNALLINK_STATE
-{
-    Text [ en-US ] = "Status Info from Svx Internal Link";
-};
-String STR_FORMAT_ID_SOLK
-{
-    Text [ en-US ] = "SOLK (%PRODUCTNAME Link)";
-};
-String STR_FORMAT_ID_NETSCAPE_BOOKMARK
-{
-    Text [ en-US ] = "Netscape Bookmark";
-};
-String STR_FORMAT_ID_STARSERVER
-{
-    Text [ en-US ] = "Star server format";
-};
-String STR_FORMAT_ID_STAROBJECT
-{
-    Text [ en-US ] = "Star object format";
-};
-String STR_FORMAT_ID_APPLETOBJECT
-{
-    Text [ en-US ] = "Applet object";
-};
-String STR_FORMAT_ID_PLUGIN_OBJECT
-{
-    Text [ en-US ] = "Plug-in object";
-};
-String STR_FORMAT_ID_STARWRITER_30
-{
-    Text [ en-US ] = "StarWriter 3.0 object";
-};
-String STR_FORMAT_ID_STARWRITER_40
-{
-    Text [ en-US ] = "StarWriter 4.0 object";
-};
-String STR_FORMAT_ID_STARWRITER_50
-{
-    Text [ en-US ] = "StarWriter 5.0 object";
-};
-String STR_FORMAT_ID_STARWRITERWEB_40
-{
-    Text [ en-US ] = "StarWriter/Web 4.0 object";
-};
-String STR_FORMAT_ID_STARWRITERWEB_50
-{
-    Text [ en-US ] = "StarWriter/Web 5.0 object";
-};
-String STR_FORMAT_ID_STARWRITERGLOB_40
-{
-    Text [ en-US ] = "StarWriter/Master 4.0 object";
-};
-String STR_FORMAT_ID_STARWRITERGLOB_50
-{
-    Text [ en-US ] = "StarWriter/Master 5.0 object";
-};
-String STR_FORMAT_ID_STARDRAW
-{
-    Text [ en-US ] = "StarDraw object";
-};
-String STR_FORMAT_ID_STARDRAW_40
-{
-    Text [ en-US ] = "StarDraw 4.0 object";
-};
-String STR_FORMAT_ID_STARIMPRESS_50
-{
-    Text [ en-US ] = "StarImpress 5.0 object";
-};
-String STR_FORMAT_ID_STARDRAW_50
-{
-    Text [ en-US ] = "StarDraw 5.0 object";
-};
-String STR_FORMAT_ID_STARCALC
-{
-    Text [ en-US ] = "StarCalc object";
-};
-String STR_FORMAT_ID_STARCALC_40
-{
-    Text [ en-US ] = "StarCalc  4.0 object";
-};
-String STR_FORMAT_ID_STARCALC_50
-{
-    Text [ en-US ] = "StarCalc 5.0 object";
-};
-String STR_FORMAT_ID_STARCHART
-{
-    Text [ en-US ] = "StarChart object";
-};
-String STR_FORMAT_ID_STARCHART_40
-{
-    Text [ en-US ] = "StarChart 4.0 object";
-};
-String STR_FORMAT_ID_STARCHART_50
-{
-    Text [ en-US ] = "StarChart 5.0 object";
-};
-String STR_FORMAT_ID_STARIMAGE
-{
-    Text [ en-US ] = "StarImage object";
-};
-String STR_FORMAT_ID_STARIMAGE_40
-{
-    Text [ en-US ] = "StarImage 4.0 object";
-};
-String STR_FORMAT_ID_STARIMAGE_50
-{
-    Text [ en-US ] = "StarImage 5.0 object";
-};
-String STR_FORMAT_ID_STARMATH
-{
-    Text [ en-US ] = "StarMath object";
-};
-String STR_FORMAT_ID_STARMATH_40
-{
-    Text [ en-US ] = "StarMath 4.0 object";
-};
-String STR_FORMAT_ID_STARMATH_50
-{
-    Text [ en-US ] = "StarMath 5.0 object";
-};
-String STR_FORMAT_ID_STAROBJECT_PAINTDOC
-{
-    Text [ en-US ] = "StarObject Paint object";
-};
-String STR_FORMAT_ID_HTML
-{
-    Text [ en-US ] = "HTML (HyperText Markup Language)";
-};
-String STR_FORMAT_ID_HTML_SIMPLE
-{
-    Text [ en-US ] = "HTML format";
-};
-String STR_FORMAT_ID_BIFF_5
-{
-    Text [ en-US ] = "Biff5 (Microsoft Excel 5.0/95)";
-};
-String STR_FORMAT_ID_BIFF_8
-{
-    Text [ en-US ] = "Biff8 (Microsoft Excel 97/2000/XP/2003)";
-};
-String STR_FORMAT_ID_SYLK
-{
-    Text [ en-US ] = "Sylk";
-};
-String STR_FORMAT_ID_LINK
-{
-    Text [ en-US ] = "DDE link" ;
-};
-String STR_FORMAT_ID_DIF
-{
-    Text [ en-US ] = "DIF";
-};
-String STR_FORMAT_ID_MSWORD_DOC
-{
-    Text [ en-US ] = "Microsoft Word object";
-};
-String STR_FORMAT_ID_STAR_FRAMESET_DOC
-{
-    Text [ en-US ] = "StarFrameSet object";
-};
-String STR_FORMAT_ID_OFFICE_DOC
-{
-    Text [ en-US ] = "Office document object";
-};
-String STR_FORMAT_ID_NOTES_DOCINFO
-{
-    Text [ en-US ] = "Notes document info";
-};
-String STR_FORMAT_ID_SFX_DOC
-{
-    Text [ en-US ] = "Sfx document";
-};
-String STR_FORMAT_ID_STARCHARTDOCUMENT_50
-{
-    Text [ en-US ] = "StarChart 5.0 object";
-};
-String STR_FORMAT_ID_GRAPHOBJ
-{
-    Text [ en-US ] = "Graphic object";
-};
-String STR_FORMAT_ID_STARWRITER_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Writer object";
-};
-String STR_FORMAT_ID_STARWRITERWEB_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Writer/Web object";
-};
-String STR_FORMAT_ID_STARWRITERGLOB_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Writer/Master object";
-};
-String STR_FORMAT_ID_STARDRAW_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Draw object";
-};
-String STR_FORMAT_ID_STARIMPRESS_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Impress object";
-};
-String STR_FORMAT_ID_STARCALC_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Calc object";
-};
-String STR_FORMAT_ID_STARCHART_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Chart object";
-};
-String STR_FORMAT_ID_STARMATH_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Math object";
-};
-String STR_FORMAT_ID_WMF
-{
-    Text [ en-US ] = "Windows metafile";
-};
-String STR_FORMAT_ID_DBACCESS_QUERY
-{
-    Text [ en-US ] = "Data source object";
-};
-String STR_FORMAT_ID_DBACCESS_TABLE
-{
-    Text [ en-US ] = "Data source table";
-};
-String STR_FORMAT_ID_DBACCESS_COMMAND
-{
-    Text [ en-US ] = "SQL query";
-};
-String STR_FORMAT_ID_DIALOG_60
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 dialog";
-};
-String STR_FORMAT_ID_FILEGRPDESCRIPTOR
-{
-    Text [ en-US ] = "Link";
-};
-String STR_FORMAT_ID_HTML_NO_COMMENT
-{
-    Text [ en-US ] = "HTML format without comments";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 003656ca0b67..9aaa7dbf1871 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/insdlg.hxx>
-#include <svtools/sores.hxx>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 
 #include <unotools/configmgr.hxx>
@@ -193,7 +193,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
     struct SotResourcePair
     {
         SotClipboardFormatId   mnSotId;
-        sal_uInt16              mnResId;
+        const char* mpResId;
     };
 
     static const SotResourcePair aSotResourcePairs[] =
@@ -267,18 +267,18 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
         { SotClipboardFormatId::RICHTEXT,            STR_FORMAT_ID_RICHTEXT },
     };
 
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
 
     sal_uInt32 const nCount = SAL_N_ELEMENTS( aSotResourcePairs );
-    for( sal_uInt32 i = 0; ( i < nCount ) && !nResId; i++ )
+    for (sal_uInt32 i = 0; ( i < nCount ) && !pResId; ++i)
     {
         if( aSotResourcePairs[ i ].mnSotId == nId )
-            nResId = aSotResourcePairs[ i ].mnResId;
+            pResId = aSotResourcePairs[ i ].mpResId;
     }
 
     OUString aUIName;
-    if( nResId )
-        aUIName = SvtResId( nResId );
+    if (pResId)
+        aUIName = SvtResId(pResId);
     else
         aUIName = SotExchange::GetFormatName( nId );
 
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 37d6cd901c6b..c3e76fb6fd40 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svtools/prnsetup.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <vcl/print.hxx>
 
@@ -127,9 +127,9 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt
 }
 
 
-static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId)
+static OUString ImplPrnDlgAddResString(const OUString& rStr, const char* pResId)
 {
-    return ImplPrnDlgAddString(rStr, SvtResId(nResId));
+    return ImplPrnDlgAddString(rStr, SvtResId(pResId));
 }
 
 
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 5ccc4cdf60a1..661169dcad47 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svtools/roadmapwizard.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <roadmap.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
deleted file mode 100644
index f76a19ebb823..000000000000
--- a/svtools/source/dialogs/so3res.src
+++ /dev/null
@@ -1,74 +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 "svtools/sores.hxx"
-#include <svtools/soerr.hxx>
-
-#define S_MAX   0x7fff
-
-StringArray RID_SO_ERROR_HANDLER
-{
-    ItemList [ en-US ] =
-    {
-        < "General OLE error." ;
-          ERRCODE_SO_GENERALERROR&S_MAX ; >;
-        < "False." ;
-          ERRCODE_SO_FALSE&S_MAX ; >;
-        < "Data not available at this time." ;
-          ERRCODE_SO_PENDING&S_MAX ; >;
-        < "The action cannot be executed in the object's current state." ;
-          ERRCODE_SO_CANNOT_DOVERB_NOW & S_MAX ; >;
-        < "The object does not support any actions." ;
-          ERRCODE_SO_NOVERBS & S_MAX ; >;
-        < "Object does not support this action." ;
-          ERRCODE_SO_NOTIMPL & S_MAX ; >;
-    };
-};
-
-StringArray RID_SO_ERRCTX
-{
-    ItemList [ en-US ] =
-    {
-        < "$(ERR) activating object" ; ERRCTX_SO_DOVERB ; >;
-    };
-};
-
-String STR_ERROR_OBJNOCREATE
-{
-    Text [ en-US ] = "Object % could not be inserted." ;
-};
-String STR_ERROR_OBJNOCREATE_FROM_FILE
-{
-    Text [ en-US ] = "Object from file % could not be inserted." ;
-};
-String STR_ERROR_OBJNOCREATE_PLUGIN
-{
-    Text [ en-US ] = "Plug-in from document % could not be inserted." ;
-};
-String STR_FURTHER_OBJECT
-{
-    Text [ en-US ] = "Further objects" ;
-};
-
-String STR_UNKNOWN_SOURCE
-{
-    Text [ en-US ] = "Unknown source" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index b6fec0147f4a..3317f5d81651 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -23,7 +23,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 
 
 namespace svt
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
deleted file mode 100644
index cfae2539b15b..000000000000
--- a/svtools/source/dialogs/wizardmachine.src
+++ /dev/null
@@ -1,42 +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 <svtools/svtools.hrc>
-
-String STR_WIZDLG_FINISH
-{
-    Text [ en-US ] = "~Finish" ;
-};
-
-String STR_WIZDLG_NEXT
-{
-    Text [ en-US ] = "~Next >>";
-};
-
-String STR_WIZDLG_PREVIOUS
-{
-    Text [ en-US ] = "<< Bac~k";
-};
-
-String STR_WIZDLG_ROADMAP_TITLE
-{
-    Text [ en-US ] = "Steps";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index ca47490e3816..06f790ba4fca 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -22,7 +22,7 @@
 #include <tools/fract.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/FilterConfigItem.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index d8df2c321c89..6c8f162da847 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -22,8 +22,6 @@
 #include <vcl/metaact.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/imagerepository.hxx>
-#include <tools/rcid.h>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/fract.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index c56a8e73015f..dbb6bfc0160a 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -21,8 +21,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
-#include <tools/rcid.h>
-#include <tools/resid.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svl/solar.hrc>
 #include <vcl/salbtype.hxx>
diff --git a/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc
deleted file mode 100644
index 75cf6ace23b7..000000000000
--- a/svtools/source/inc/filectrl.hrc
+++ /dev/null
@@ -1,33 +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_SVTOOLS_SOURCE_INC_FILECTRL_HRC
-#define INCLUDED_SVTOOLS_SOURCE_INC_FILECTRL_HRC
-
-#define STR_FILECTRL_BUTTONTEXT     333     // ID-Range?!
-
-#define  STR_TABBAR_PUSHBUTTON_MOVET0HOME  (STR_FILECTRL_BUTTONTEXT + 1)
-#define  STR_TABBAR_PUSHBUTTON_MOVELEFT    (STR_FILECTRL_BUTTONTEXT + 2)
-#define  STR_TABBAR_PUSHBUTTON_MOVERIGHT   (STR_FILECTRL_BUTTONTEXT + 3)
-#define  STR_TABBAR_PUSHBUTTON_MOVETOEND   (STR_FILECTRL_BUTTONTEXT + 4)
-#define  STR_TABBAR_PUSHBUTTON_ADDTAB      (STR_FILECTRL_BUTTONTEXT + 5)
-
-#endif // INCLUDED_SVTOOLS_SOURCE_INC_FILECTRL_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
deleted file mode 100644
index 60d7c720ebeb..000000000000
--- a/svtools/source/java/javaerror.src
+++ /dev/null
@@ -1,67 +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 <svtools/svtools.hrc>
-
-String STR_WARNING_JAVANOTFOUND
-{
-    Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.";
-};
-
-String STR_WARNING_JAVANOTFOUND_MAC
-{
-    Text [ en-US ] ="%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.";
-};
-
-String STR_WARNING_INVALIDJAVASETTINGS_MAC
-{
-    Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.";
-};
-
-String STR_WARNING_INVALIDJAVASETTINGS
-{
-    Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.";
-};
-
-String STR_ERROR_JVMCREATIONFAILED_MAC
-{
-    Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced.";
-};
-
-String STR_ERROR_JVMCREATIONFAILED
-{
-    Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.";
-};
-
-String STR_WARNING_JAVANOTFOUND_TITLE
-{
-    Text[ en-US ] = "JRE Required" ;
-};
-
-String STR_WARNING_INVALIDJAVASETTINGS_TITLE
-{
-    Text[ en-US ] = "Select JRE";
-};
-
-String STR_ERROR_JVMCREATIONFAILED_TITLE
-{
-    Text[ en-US ] = "JRE is Defective" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 74f78dc4bdc4..ba9625065663 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/svtools.hrc>
-#include <tools/resid.hxx>
+#include <svtools/strings.hrc>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
@@ -30,7 +29,6 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/rcid.h>
 #include <jvmfwk/framework.hxx>
 
 #include <svtools/restartdialog.hxx>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index eb432c7ce2e7..a6be046e4647 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -17,18 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rcid.h>
-#include <tools/resary.hxx>
+#include <tools/resmgr.hxx>
 #include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
 #include <svtools/ehdl.hxx>
+#include <svtools/soerr.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/sfxecode.hxx>
 #include <memory>
+#include "errtxt.hrc"
 #include "strings.hxx"
 
 static DialogMask aWndFunc(
@@ -138,26 +139,21 @@ static DialogMask aWndFunc(
     return nRet;
 }
 
-
-SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, ErrCode lStartP, ErrCode lEndP, ResMgr *pMgrP) :
-
-    lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( nullptr )
-
+SfxErrorHandler::SfxErrorHandler(const ErrMsgCode* pIdPs, ErrCode lStartP, ErrCode lEndP, const std::locale* pLocale)
+    : lStart(lStartP), lEnd(lEndP), pIds(pIdPs), pResLocale(pLocale)
 {
     ErrorRegistry::RegisterDisplay(&aWndFunc);
-    if( ! pMgr )
+    if (!pResLocale)
     {
-        pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() );
-        pFreeMgr.reset(pMgr);
+        xFreeLocale.reset(new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag())));
+        pResLocale = xFreeLocale.get();
     }
 }
 
-
 SfxErrorHandler::~SfxErrorHandler()
 {
 }
 
-
 bool SfxErrorHandler::CreateString(const ErrorInfo *pErr, OUString &rStr) const
 
 /*  [Description]
@@ -201,14 +197,13 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr)
     */
 
 {
-    std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ));
-    if( pResMgr )
+    std::locale loc(Translate::Create("svt", Application::GetSettings().GetUILanguageTag()));
+    for (const ErrMsgCode* pItem = getRID_ERRHDL(); pItem->second; ++pItem)
     {
-        ResStringArray aEr(ResId(RID_ERRHDL, *pResMgr));
-        sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)lClassId);
-        if (nErrIdx != RESARRAY_INDEX_NOTFOUND)
+        if (sal_uInt32(pItem->second) == lClassId)
         {
-            rStr = aEr.GetString(nErrIdx);
+            rStr = Translate::get(pItem->first, loc);
+            break;
         }
     }
 }
@@ -223,20 +218,18 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, OUString &rStr) const
     */
 
 {
-    SolarMutexGuard aGuard;
-
     bool bRet = false;
     rStr = RID_ERRHDL_CLASS;
 
-    ResStringArray aEr(ResId(nId, *pMgr));
-    sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)(sal_uInt32)lErrId);
-    if (nErrIdx != RESARRAY_INDEX_NOTFOUND)
+    for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem)
     {
-        rStr = rStr.replaceAll("$(ERROR)", aEr.GetString(nErrIdx));
-        bRet = true;
+        if (pItem->second == lErrId)
+        {
+            rStr = rStr.replaceAll("$(ERROR)", Translate::get(pItem->first, *pResLocale));
+            bRet = true;
+            break;
+        }
     }
-    else
-        bRet = false;
 
     if( bRet )
     {
@@ -252,25 +245,24 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, OUString &rStr) const
 }
 
 SfxErrorContext::SfxErrorContext(
-    sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP)
-:   ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP)
+    sal_uInt16 nCtxIdP, vcl::Window *pWindow, const ErrMsgCode* pIdsP, const std::locale* pResLocaleP)
+:   ErrorContext(pWindow), nCtxId(nCtxIdP), pIds(pIdsP), pResLocale(pResLocaleP)
 {
-    if( nResId==USHRT_MAX )
-        nResId=RID_ERRCTX;
+    if (!pIds)
+        pIds = getRID_ERRCTX();
 }
 
 
 SfxErrorContext::SfxErrorContext(
     sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow,
-    sal_uInt16 nResIdP, ResMgr *pMgrP)
-:   ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP),
+    const ErrMsgCode* pIdsP, const std::locale* pResLocaleP)
+:   ErrorContext(pWindow), nCtxId(nCtxIdP), pIds(pIdsP), pResLocale(pResLocaleP),
     aArg1(aArg1P)
 {
-    if( nResId==USHRT_MAX )
-        nResId=RID_ERRCTX;
+    if (!pIds)
+        pIds = getRID_ERRCTX();
 }
 
-
 bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr)
 
 /*  [Description]
@@ -280,43 +272,67 @@ bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr)
 
 {
     bool bRet = false;
-    ResMgr* pFreeMgr = nullptr;
-    if( ! pMgr )
+    std::locale* pFreeLocale = nullptr;
+    if (!pResLocale)
     {
-        pFreeMgr = pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() );
+        pFreeLocale = new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag()));
+        pResLocale = pFreeLocale;
     }
-    if( pMgr )
+    if (pResLocale)
     {
-        SolarMutexGuard aGuard;
-
-        ResStringArray aTestEr(ResId(nResId, *pMgr));
-        sal_uInt32 nErrIdx = aTestEr.FindIndex(nCtxId);
-        if (nErrIdx != RESARRAY_INDEX_NOTFOUND)
-        {
-            rStr = aTestEr.GetString(nErrIdx);
-            rStr = rStr.replaceAll("$(ARG1)", aArg1);
-            bRet = true;
-        }
-        else
+        for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem)
         {
-            SAL_WARN( "svtools.misc", "ErrorContext cannot find the resource" );
-            bRet = false;
+            if (sal_uInt32(pItem->second) == nCtxId)
+            {
+                rStr = Translate::get(pItem->first, *pResLocale);
+                rStr = rStr.replaceAll("$(ARG1)", aArg1);
+                bRet = true;
+                break;
+            }
         }
 
+        SAL_WARN_IF(!bRet, "svtools.misc", "ErrorContext cannot find the resource");
+
         if ( bRet )
         {
             sal_uInt16 nId = nErrId.IsWarning() ? ERRCTX_WARNING : ERRCTX_ERROR;
-            ResStringArray aEr(ResId(RID_ERRCTX, *pMgr));
-            rStr = rStr.replaceAll("$(ERR)", aEr.GetString(nId));
+            for (const ErrMsgCode* pItem = getRID_ERRCTX(); pItem->second; ++pItem)
+            {
+                if (sal_uInt32(pItem->second) == nId)
+                {
+                    rStr = rStr.replaceAll("$(ERR)", Translate::get(pItem->first, *pResLocale));
+                    break;
+                }
+            }
         }
     }
 
-    if( pFreeMgr )
+    if (pFreeLocale)
     {
-        delete pFreeMgr;
-        pMgr = nullptr;
+        delete pFreeLocale;
+        pResLocale = nullptr;
     }
     return bRet;
 }
 
+const ErrMsgCode* getRID_ERRHDL()
+{
+    return RID_ERRHDL;
+}
+
+const ErrMsgCode* getRID_ERRCTX()
+{
+    return RID_ERRCTX;
+}
+
+const ErrMsgCode* getRID_SO_ERROR_HANDLER()
+{
+    return RID_SO_ERROR_HANDLER;
+}
+
+const ErrMsgCode* getRID_SO_ERRCTX()
+{
+    return RID_SO_ERRCTX;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 45de241940df..68691df709d7 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -20,7 +20,7 @@
 
 #include <svtools/embedhlp.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include "bitmaps.hlst"
 #include <svtools/svtresid.hxx>
 
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
deleted file mode 100644
index a84c5b32c9ab..000000000000
--- a/svtools/source/misc/errtxt.src
+++ /dev/null
@@ -1,132 +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 <svtools/svtools.hrc>
-#include <svtools/sfxecode.hxx>
-
-StringArray RID_ERRCTX
-{
-    ItemList [ en-US ] =
-    {
-        < "Error" ; ERRCTX_ERROR ; >;
-        < "Warning" ; ERRCTX_WARNING ; >;
-        < "$(ERR) loading the template $(ARG1)" ; ERRCTX_SFX_LOADTEMPLATE ; >;
-        < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEDOC ; >;
-        < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEASDOC ; >;
-        < "$(ERR) displaying doc. information for document $(ARG1)" ; ERRCTX_SFX_DOCINFO ; >;
-        < "$(ERR) writing document $(ARG1) as template" ; ERRCTX_SFX_DOCTEMPLATE ; >;
-        < "$(ERR) copying or moving document contents" ; ERRCTX_SFX_MOVEORCOPYCONTENTS ; >;
-        < "$(ERR) starting the Document Manager" ; ERRCTX_SFX_DOCMANAGER ; >;
-        < "$(ERR) loading document $(ARG1)" ; ERRCTX_SFX_OPENDOC ; >;
-        < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOCDIRECT ; >;
-        < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOC ; >;
-        < "$(ERR) expanding entry" ; ERRCTX_SFX_CREATEOBJSH ; >;
-        < "$(ERR) loading BASIC of document $(ARG1)" ; ERRCTX_SFX_LOADBASIC ; >;
-        < "$(ERR) searching for an address"; ERRCTX_SFX_SEARCHADDRESS ; >;
-    };
-};
-
-StringArray RID_ERRHDL
-{
-    ItemList [ en-US ] =
-    {
-        < "Abort" ; ERRCODE_CLASS_ABORT ; >;
-        < "Nonexistent object" ; ERRCODE_CLASS_NOTEXISTS ; >;
-        < "Object already exists" ; ERRCODE_CLASS_ALREADYEXISTS ; >;
-        < "Object not accessible" ; ERRCODE_CLASS_ACCESS ; >;
-        < "Inadmissible path" ; ERRCODE_CLASS_PATH ; >;
-        < "Locking problem" ; ERRCODE_CLASS_LOCKING ; >;
-        < "Wrong parameter" ; ERRCODE_CLASS_PARAMETER ; >;
-        < "Resource exhausted" ; ERRCODE_CLASS_SPACE ; >;
-        < "Action not supported" ; ERRCODE_CLASS_NOTSUPPORTED ; >;
-        < "Read Error" ; ERRCODE_CLASS_READ ; >;
-        < "Write Error" ; ERRCODE_CLASS_WRITE ; >;
-        < "unknown" ; ERRCODE_CLASS_UNKNOWN ; >;
-        < "Version Incompatibility" ; ERRCODE_CLASS_VERSION ; >;
-        < "General Error" ; ERRCODE_CLASS_GENERAL ; >;
-        < "Incorrect format" ; ERRCODE_CLASS_FORMAT ; >;
-        < "Error creating object" ; ERRCODE_CLASS_CREATE ; >;
-        < "Inadmissible value or data type" ; ERRCODE_CLASS_SBX ; >;
-        < "BASIC runtime error" ; ERRCODE_CLASS_RUNTIME ; >;
-        < "BASIC syntax error" ; ERRCODE_CLASS_COMPILER ; >;
-        < "General Error" ; 1 ; >;
-        < "General input/output error." ; ERRCODE_IO_GENERAL ; >;
-        < "Invalid file name." ; ERRCODE_IO_MISPLACEDCHAR ; >;
-        < "Nonexistent file." ; ERRCODE_IO_NOTEXISTS ; >;
-        < "File already exists." ; ERRCODE_IO_ALREADYEXISTS ; >;
-        < "The object is not a directory." ; ERRCODE_IO_NOTADIRECTORY ; >;
-        < "The object is not a file." ; ERRCODE_IO_NOTAFILE ; >;
-        < "The specified device is invalid." ; ERRCODE_IO_INVALIDDEVICE ; >;
-        < "The object cannot be accessed\ndue to insufficient user rights." ; ERRCODE_IO_ACCESSDENIED ; >;
-        < "Sharing violation while accessing the object." ; ERRCODE_IO_LOCKVIOLATION ; >;
-        < "No more space on device." ; ERRCODE_IO_OUTOFSPACE ; >;
-        < "This operation cannot be run on\nfiles containing wildcards." ; ERRCODE_IO_ISWILDCARD ; >;
-        < "This operation is not supported on this operating system." ; ERRCODE_IO_NOTSUPPORTED ; >;
-        < "There are too many files open." ; ERRCODE_IO_TOOMANYOPENFILES ; >;
-        < "Data could not be read from the file." ; ERRCODE_IO_CANTREAD ; >;
-        < "The file could not be written." ; ERRCODE_IO_CANTWRITE ; >;
-        < "The operation could not be run due to insufficient memory." ; ERRCODE_IO_OUTOFMEMORY ; >;
-        < "The seek operation could not be run." ; ERRCODE_IO_CANTSEEK ; >;
-        < "The tell operation could not be run." ; ERRCODE_IO_CANTTELL ; >;
-        < "Incorrect file version." ; ERRCODE_IO_WRONGVERSION ; >;
-        < "Incorrect file format." ; ERRCODE_IO_WRONGFORMAT ; >;
-        < "The file name contains invalid characters." ; ERRCODE_IO_INVALIDCHAR ; >;
-        < "An unknown I/O error has occurred." ; ERRCODE_IO_UNKNOWN ; >;
-        < "An invalid attempt was made to access the file." ; ERRCODE_IO_INVALIDACCESS ; >;
-        < "The file could not be created." ; ERRCODE_IO_CANTCREATE ; >;
-        < "The operation was started under an invalid parameter." ; ERRCODE_IO_INVALIDPARAMETER ; >;
-        < "The operation on the file was aborted." ; ERRCODE_IO_ABORT ; >;
-        < "Path to the file does not exist." ; ERRCODE_IO_NOTEXISTSPATH ; >;
-        < "An object cannot be copied into itself." ; ERRCODE_IO_RECURSIVE ; >;
-        < "The specified template could not be found." ; ERRCODE_SFX_TEMPLATENOTFOUND ; >;
-        < "The file cannot be used as template." ; ERRCODE_SFX_NOTATEMPLATE ; >;
-        < "This document has already been opened for editing." ; ERRCODE_SFX_ALREADYOPEN ; >;
-        < "The wrong password has been entered." ; ERRCODE_SFX_WRONGPASSWORD ; >;
-        < "Error reading file." ; ERRCODE_SFX_DOLOADFAILED ; >;
-        < "The document was opened as read-only." ; ERRCODE_SFX_DOCUMENTREADONLY ; >;
-        < "General OLE Error." ; ERRCODE_SFX_OLEGENERAL ; >;
-        < "The host name $(ARG1) could not be resolved." ; ERRCODE_INET_NAME_RESOLVE ; >;
-        < "Could not establish Internet connection to $(ARG1)." ; ERRCODE_INET_CONNECT ; >;
-        < "Error reading data from the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_READ ; >;
-        < "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_WRITE ; >;
-        < "General Internet error has occurred." ; ERRCODE_INET_GENERAL ; >;
-        < "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; ERRCODE_INET_OFFLINE ; >;
-        < "The contents could not be created." ; ERRCODE_SFX_CANTCREATECONTENT ; >;
-        < "The file name is too long for the target file system." ; ERRCODE_IO_NAMETOOLONG ; >;
-        < "The input syntax is invalid." ; ERRCODE_SFX_INVALIDSYNTAX ; >;
-        < "The input syntax is invalid." ; ERRCODE_SFX_CANTCREATEFOLDER ; >;
-        < "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ; >;
-        < "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; ERRCODE_SFX_NOMOREDOCUMENTSALLOWED ; >;
-        < "Could not create backup copy." ; ERRCODE_SFX_CANTCREATEBACKUP ; >;
-        < "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; ERRCODE_SFX_MACROS_SUPPORT_DISABLED ; >;
-        < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC ; >;
-        < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ; >;
-        < "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; ERRCODE_SFX_INCOMPLETE_ENCRYPTION ; >;
-        < "Invalid data length." ; ERRCODE_IO_INVALIDLENGTH ; >;
-        < "Function not possible: path contains current directory." ; ERRCODE_IO_CURRENTDIR ; >;
-        < "Function not possible: device (drive) not identical." ; ERRCODE_IO_NOTSAMEDEVICE ; >;
-        < "Device (drive) not ready." ; ERRCODE_IO_DEVICENOTREADY ; >;
-        < "Wrong checksum." ; ERRCODE_IO_BADCRC ; >;
-        < "Function not possible: write protected." ; ERRCODE_IO_WRITEPROTECTED ; >;
-        < "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ; >;
-        < "File format error found at $(ARG1)(row,col)."; ERRCODE_SFX_FORMAT_ROWCOL ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 85050af4f01c..31c80e9c50f2 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -34,13 +34,13 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/content.hxx>
-#include <tools/rcid.h>
 #include <unotools/configmgr.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <vcl/lazydelete.hxx>
 #include "imagemgr.hrc"
 #include "bitmaps.hlst"
+#include "strings.hxx"
 
 // globals *******************************************************************
 
@@ -51,7 +51,7 @@ struct SvtExtensionResIdMapping_Impl
 {
     const char*   _pExt;
     bool    _bExt;
-    sal_uInt16  _nStrId;
+    const char* pStrId;
     sal_uInt16  _nImgId;
 };
 
@@ -90,7 +90,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
     { "jpg",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
     { "lha",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
 #ifdef _WIN32
-    { "lnk",   false, 0,                                     0 },
+    { "lnk",   false, nullptr,                               0 },
 #endif
     { "log",   true,  STR_DESCRIPTION_LOGFILE,               0 },
     { "lst",   true,  STR_DESCRIPTION_LOGFILE,               0 },
@@ -111,14 +111,14 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
     { "pas",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
     { "pcd",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCD },
     { "pct",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCT },
-    { "pict",   true,  STR_DESCRIPTION_GRAPHIC_DOC,          IMG_PCT },
+    { "pict",  true,  STR_DESCRIPTION_GRAPHIC_DOC,          IMG_PCT },
     { "pcx",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCX },
     { "pl",    true,  STR_DESCRIPTION_SOURCEFILE,            0 },
     { "png",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PNG },
     { "rar",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
     { "rtf",   false, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "sbl",   false, 0,                                     0 },
-    { "sch",   false, 0,                                     0 },
+    { "sbl",   false, nullptr,                               0 },
+    { "sch",   false, nullptr,                               0 },
     { "sda",   false, STR_DESCRIPTION_SDRAW_DOC,             IMG_DRAW },
     { "sdb",   false, STR_DESCRIPTION_SDATABASE_DOC,         IMG_DATABASE },
     { "sdc",   false, STR_DESCRIPTION_SCALC_DOC,             IMG_CALC },
@@ -126,7 +126,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
     { "sdp",   false, STR_DESCRIPTION_SIMPRESS_DOC,          0 },
     { "sds",   false, STR_DESCRIPTION_SCHART_DOC,            0 },
     { "sdw",   false, STR_DESCRIPTION_SWRITER_DOC,           IMG_WRITER },
-    { "sga",   false, 0,                                     0 },
+    { "sga",   false, nullptr,                               0 },
     { "sgf",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGF },
     { "sgl",   false, STR_DESCRIPTION_GLOBALDOC,             IMG_GLOBAL_DOC },
     { "sgv",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGV },
@@ -169,7 +169,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
     { "pps",   false, STR_DESCRIPTION_POWERPOINT_SHOW,       IMG_IMPRESS },
     { "pptx",  false, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
     { "oxt",   false, STR_DESCRIPTION_EXTENSION,             IMG_EXTENSION },
-    { nullptr, false, 0, 0 }
+    { nullptr, false, nullptr, 0 }
 };
 
 struct SvtFactory2ExtensionMapping_Impl
@@ -412,50 +412,49 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol
     return nImage;
 }
 
-static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt )
+static const char* GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt )
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
     sal_Int32  nIndex = GetIndexOfExtension_Impl( rExtension );
     if ( nIndex != NO_INDEX )
     {
-        nId = ExtensionMap_Impl[ nIndex ]._nStrId;
+        pId = ExtensionMap_Impl[ nIndex ].pStrId;
         rbShowExt = ExtensionMap_Impl[ nIndex ]._bExt;
     }
 
-    return nId;
+    return pId;
 }
 
 static OUString GetDescriptionByFactory_Impl( const OUString& rFactory )
 {
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     if ( rFactory.startsWithIgnoreAsciiCase( "swriter" ) )
-        nResId = STR_DESCRIPTION_FACTORY_WRITER;
+        pResId = STR_DESCRIPTION_FACTORY_WRITER;
     else if ( rFactory.startsWithIgnoreAsciiCase( "scalc" ) )
-        nResId = STR_DESCRIPTION_FACTORY_CALC;
+        pResId = STR_DESCRIPTION_FACTORY_CALC;
     else if ( rFactory.startsWithIgnoreAsciiCase( "simpress" ) )
-        nResId = STR_DESCRIPTION_FACTORY_IMPRESS;
+        pResId = STR_DESCRIPTION_FACTORY_IMPRESS;
     else if ( rFactory.startsWithIgnoreAsciiCase( "sdraw" ) )
-        nResId = STR_DESCRIPTION_FACTORY_DRAW;
+        pResId = STR_DESCRIPTION_FACTORY_DRAW;
     else if ( rFactory.startsWithIgnoreAsciiCase( "swriter/web" ) )
-        nResId = STR_DESCRIPTION_FACTORY_WRITERWEB;
+        pResId = STR_DESCRIPTION_FACTORY_WRITERWEB;
     else if ( rFactory.startsWithIgnoreAsciiCase( "swriter/globaldocument" ) )
-        nResId = STR_DESCRIPTION_FACTORY_GLOBALDOC;
+        pResId = STR_DESCRIPTION_FACTORY_GLOBALDOC;
     else if ( rFactory.startsWithIgnoreAsciiCase( "smath" ) )
-        nResId = STR_DESCRIPTION_FACTORY_MATH;
+        pResId = STR_DESCRIPTION_FACTORY_MATH;
     else if ( rFactory.startsWithIgnoreAsciiCase( "sdatabase" ) )
-        nResId = STR_DESCRIPTION_FACTORY_DATABASE;
+        pResId = STR_DESCRIPTION_FACTORY_DATABASE;
 
-    if ( nResId )
+    if (pResId)
     {
-        SolarMutexGuard aGuard;
-        return SvtResId(nResId);
+        return SvtResId(pResId);
     }
     return OUString();
 }
 
-static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
+static const char* GetFolderDescriptionId_Impl( const OUString& rURL )
 {
-    sal_uInt16 nRet = STR_DESCRIPTION_FOLDER;
+    const char* pRet = STR_DESCRIPTION_FOLDER;
     svtools::VolumeInfo aVolumeInfo;
     try
     {
@@ -463,13 +462,13 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
         if ( GetVolumeProperties_Impl( aCnt, aVolumeInfo ) )
         {
             if ( aVolumeInfo.m_bIsRemote )
-                nRet = STR_DESCRIPTION_REMOTE_VOLUME;
+                pRet = STR_DESCRIPTION_REMOTE_VOLUME;
             else if ( aVolumeInfo.m_bIsFloppy )
-                nRet = STR_DESCRIPTION_FLOPPY_VOLUME;
+                pRet = STR_DESCRIPTION_FLOPPY_VOLUME;
             else if ( aVolumeInfo.m_bIsCompactDisc )
-                nRet = STR_DESCRIPTION_CDROM_VOLUME;
+                pRet = STR_DESCRIPTION_CDROM_VOLUME;
             else if ( aVolumeInfo.m_bIsRemoveable || aVolumeInfo.m_bIsVolume )
-                nRet = STR_DESCRIPTION_LOCALE_VOLUME;
+                pRet = STR_DESCRIPTION_LOCALE_VOLUME;
         }
     }
     catch( const css::uno::RuntimeException& )
@@ -480,7 +479,7 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
     {
 
     }
-    return nRet;
+    return pRet;
 }
 
 static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
@@ -702,7 +701,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
 {
     OUString sExtension(rObject.getExtension());
     OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     bool bShowExt = false, bOnlyFile = false;
     bool bFolder = bDetectFolder && CONTENT_HELPER::IsFolder( sURL );
     if ( !bFolder )
@@ -727,19 +726,19 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
             if ( bExt )
             {
                 sExtension = sExtension.toAsciiLowerCase();
-                nResId = GetDescriptionId_Impl( sExtension, bShowExt );
+                pResId = GetDescriptionId_Impl( sExtension, bShowExt );
             }
-            if ( !nResId )
+            if (!pResId)
             {
-                nResId = STR_DESCRIPTION_FILE;
+                pResId = STR_DESCRIPTION_FILE;
                 bOnlyFile = bExt;
             }
         }
     }
     else
-        nResId = GetFolderDescriptionId_Impl( sURL );
+        pResId = GetFolderDescriptionId_Impl( sURL );
 
-    if ( nResId > 0 )
+    if (pResId)
     {
         if ( bOnlyFile )
         {
@@ -748,8 +747,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
             sDescription = sExtension;
             sDescription += "-";
         }
-        SolarMutexGuard aGuard;
-        sDescription += SvtResId(nResId);
+        sDescription += SvtResId(pResId);
     }
 
     DBG_ASSERT( !sDescription.isEmpty(), "file without description" );
@@ -818,17 +816,17 @@ OUString SvFileInformationManager::GetFileDescription( const INetURLObject& rObj
 
 OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo )
 {
-    sal_uInt16 nResId = STR_DESCRIPTION_FOLDER;
+    const char* pResId = STR_DESCRIPTION_FOLDER;
     if ( rInfo.m_bIsRemote )
-        nResId = STR_DESCRIPTION_REMOTE_VOLUME;
+        pResId = STR_DESCRIPTION_REMOTE_VOLUME;
     else if ( rInfo.m_bIsFloppy )
-        nResId = STR_DESCRIPTION_FLOPPY_VOLUME;
+        pResId = STR_DESCRIPTION_FLOPPY_VOLUME;
     else if ( rInfo.m_bIsCompactDisc )
-        nResId = STR_DESCRIPTION_CDROM_VOLUME;
+        pResId = STR_DESCRIPTION_CDROM_VOLUME;
     else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsVolume )
-        nResId = STR_DESCRIPTION_LOCALE_VOLUME;
+        pResId = STR_DESCRIPTION_LOCALE_VOLUME;
 
-    return SvtResId(nResId);
+    return SvtResId(pResId);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/imagemgr.hrc b/svtools/source/misc/imagemgr.hrc
index 4d6f3132dfa9..7862d3a03c83 100644
--- a/svtools/source/misc/imagemgr.hrc
+++ b/svtools/source/misc/imagemgr.hrc
@@ -72,77 +72,6 @@
 #define IMG_OO_WRITER_TEMPLATE          (IMAGELIST_START + 179)
 #define IMG_EXTENSION                   (IMAGELIST_START + 180)
 
-#define RID_DESCRIPTION_START           256
-
-#define STR_DESCRIPTION_SOURCEFILE                  (RID_DESCRIPTION_START +  0)
-#define STR_DESCRIPTION_BOOKMARKFILE                (RID_DESCRIPTION_START +  1)
-#define STR_DESCRIPTION_GRAPHIC_DOC                 (RID_DESCRIPTION_START +  2)
-#define STR_DESCRIPTION_CFGFILE                     (RID_DESCRIPTION_START +  3)
-#define STR_DESCRIPTION_APPLICATION                 (RID_DESCRIPTION_START +  4)
-#define STR_DESCRIPTION_DATABASE_TABLE              (RID_DESCRIPTION_START +  5)
-#define STR_DESCRIPTION_SYSFILE                     (RID_DESCRIPTION_START +  6)
-#define STR_DESCRIPTION_WORD_DOC                    (RID_DESCRIPTION_START +  7)
-#define STR_DESCRIPTION_HELP_DOC                    (RID_DESCRIPTION_START +  8)
-#define STR_DESCRIPTION_HTMLFILE                    (RID_DESCRIPTION_START +  9)
-#define STR_DESCRIPTION_ARCHIVFILE                  (RID_DESCRIPTION_START + 10)
-#define STR_DESCRIPTION_LOGFILE                     (RID_DESCRIPTION_START + 11)
-#define STR_DESCRIPTION_SMATH_DOC                   (RID_DESCRIPTION_START + 12)
-#define STR_DESCRIPTION_SCHART_DOC                  (RID_DESCRIPTION_START + 13)
-#define STR_DESCRIPTION_SDRAW_DOC                   (RID_DESCRIPTION_START + 14)
-#define STR_DESCRIPTION_SCALC_DOC                   (RID_DESCRIPTION_START + 15)
-#define STR_DESCRIPTION_SIMPRESS_DOC                (RID_DESCRIPTION_START + 16)
-#define STR_DESCRIPTION_SWRITER_DOC                 (RID_DESCRIPTION_START + 17)
-#define STR_DESCRIPTION_GLOBALDOC                   (RID_DESCRIPTION_START + 18)
-#define STR_DESCRIPTION_SIMAGE_DOC                  (RID_DESCRIPTION_START + 19)
-#define STR_DESCRIPTION_TEXTFILE                    (RID_DESCRIPTION_START + 20)
-#define STR_DESCRIPTION_LINK                        (RID_DESCRIPTION_START + 21)
-#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC        (RID_DESCRIPTION_START + 22)
-#define STR_DESCRIPTION_EXCEL_DOC                   (RID_DESCRIPTION_START + 23)
-#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC          (RID_DESCRIPTION_START + 24)
-#define STR_DESCRIPTION_BATCHFILE                   (RID_DESCRIPTION_START + 25)
-#define STR_DESCRIPTION_FILE                        (RID_DESCRIPTION_START + 26)
-#define STR_DESCRIPTION_FOLDER                      (RID_DESCRIPTION_START + 27)
-#define STR_DESCRIPTION_FACTORY_WRITER              (RID_DESCRIPTION_START + 28)
-#define STR_DESCRIPTION_FACTORY_CALC                (RID_DESCRIPTION_START + 29)
-#define STR_DESCRIPTION_FACTORY_IMPRESS             (RID_DESCRIPTION_START + 30)
-#define STR_DESCRIPTION_FACTORY_DRAW                (RID_DESCRIPTION_START + 31)
-#define STR_DESCRIPTION_FACTORY_WRITERWEB           (RID_DESCRIPTION_START + 32)
-#define STR_DESCRIPTION_FACTORY_GLOBALDOC           (RID_DESCRIPTION_START + 33)
-#define STR_DESCRIPTION_FACTORY_MATH                (RID_DESCRIPTION_START + 34)
-#define STR_DESCRIPTION_CALC_TEMPLATE               (RID_DESCRIPTION_START + 35)
-#define STR_DESCRIPTION_DRAW_TEMPLATE               (RID_DESCRIPTION_START + 36)
-#define STR_DESCRIPTION_IMPRESS_TEMPLATE            (RID_DESCRIPTION_START + 37)
-#define STR_DESCRIPTION_WRITER_TEMPLATE             (RID_DESCRIPTION_START + 38)
-#define STR_DESCRIPTION_LOCALE_VOLUME               (RID_DESCRIPTION_START + 39)
-#define STR_DESCRIPTION_FLOPPY_VOLUME               (RID_DESCRIPTION_START + 40)
-#define STR_DESCRIPTION_CDROM_VOLUME                (RID_DESCRIPTION_START + 41)
-#define STR_DESCRIPTION_REMOTE_VOLUME               (RID_DESCRIPTION_START + 42)
-#define STR_DESCRIPTION_POWERPOINT                  (RID_DESCRIPTION_START + 43)
-#define STR_DESCRIPTION_POWERPOINT_TEMPLATE         (RID_DESCRIPTION_START + 44)
-#define STR_DESCRIPTION_POWERPOINT_SHOW             (RID_DESCRIPTION_START + 45)
-#define STR_DESCRIPTION_SXMATH_DOC                  (RID_DESCRIPTION_START + 46)
-#define STR_DESCRIPTION_SXCHART_DOC                 (RID_DESCRIPTION_START + 47)
-#define STR_DESCRIPTION_SXDRAW_DOC                  (RID_DESCRIPTION_START + 48)
-#define STR_DESCRIPTION_SXCALC_DOC                  (RID_DESCRIPTION_START + 49)
-#define STR_DESCRIPTION_SXIMPRESS_DOC               (RID_DESCRIPTION_START + 50)
-#define STR_DESCRIPTION_SXWRITER_DOC                (RID_DESCRIPTION_START + 51)
-#define STR_DESCRIPTION_SXGLOBAL_DOC                (RID_DESCRIPTION_START + 52)
-#define STR_DESCRIPTION_MATHML_DOC                  (RID_DESCRIPTION_START + 53)
-#define STR_DESCRIPTION_SDATABASE_DOC               (RID_DESCRIPTION_START + 54)
-#define STR_DESCRIPTION_OO_DATABASE_DOC             (RID_DESCRIPTION_START + 55)
-#define STR_DESCRIPTION_OO_DRAW_DOC                 (RID_DESCRIPTION_START + 56)
-#define STR_DESCRIPTION_OO_MATH_DOC                 (RID_DESCRIPTION_START + 57)
-#define STR_DESCRIPTION_OO_GLOBAL_DOC               (RID_DESCRIPTION_START + 58)
-#define STR_DESCRIPTION_OO_IMPRESS_DOC              (RID_DESCRIPTION_START + 59)
-#define STR_DESCRIPTION_OO_CALC_DOC                 (RID_DESCRIPTION_START + 60)
-#define STR_DESCRIPTION_OO_WRITER_DOC               (RID_DESCRIPTION_START + 61)
-#define STR_DESCRIPTION_OO_DRAW_TEMPLATE            (RID_DESCRIPTION_START + 62)
-#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE         (RID_DESCRIPTION_START + 63)
-#define STR_DESCRIPTION_OO_CALC_TEMPLATE            (RID_DESCRIPTION_START + 64)
-#define STR_DESCRIPTION_OO_WRITER_TEMPLATE          (RID_DESCRIPTION_START + 65)
-#define STR_DESCRIPTION_FACTORY_DATABASE            (RID_DESCRIPTION_START + 66)
-#define STR_DESCRIPTION_EXTENSION                   (RID_DESCRIPTION_START + 67)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
deleted file mode 100644
index aeed4a10cd93..000000000000
--- a/svtools/source/misc/imagemgr.src
+++ /dev/null
@@ -1,310 +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 <svtools/svtools.hrc>
-#include "imagemgr.hrc"
-
-// description strings
-
-String STR_DESCRIPTION_SOURCEFILE
-{
-    Text [ en-US ] = "Source code" ;
-};
-String STR_DESCRIPTION_BOOKMARKFILE
-{
-    Text [ en-US ] = "Bookmark file" ;
-};
-String STR_DESCRIPTION_GRAPHIC_DOC
-{
-    Text [ en-US ] = "Graphics" ;
-};
-String STR_DESCRIPTION_CFGFILE
-{
-    Text [ en-US ] = "Configuration file" ;
-};
-String STR_DESCRIPTION_APPLICATION
-{
-    Text [ en-US ] = "Application" ;
-};
-String STR_DESCRIPTION_DATABASE_TABLE
-{
-    Text [ en-US ] = "Database table" ;
-};
-String STR_DESCRIPTION_SYSFILE
-{
-    Text [ en-US ] = "System file" ;
-};
-String STR_DESCRIPTION_WORD_DOC
-{
-    Text [ en-US ] = "MS Word document" ;
-};
-String STR_DESCRIPTION_HELP_DOC
-{
-    Text [ en-US ] = "Help file" ;
-};
-String STR_DESCRIPTION_HTMLFILE
-{
-    Text [ en-US ] = "HTML document" ;
-};
-String STR_DESCRIPTION_ARCHIVFILE
-{
-    Text [ en-US ] = "Archive file" ;
-};
-String STR_DESCRIPTION_LOGFILE
-{
-    Text [ en-US ] = "Log file" ;
-};
-String STR_DESCRIPTION_SMATH_DOC
-{
-    Text = "StarMath 2.0 - 5.0" ;
-};
-String STR_DESCRIPTION_SCHART_DOC
-{
-    Text = "StarChart 3.0 - 5.0" ;
-};
-String STR_DESCRIPTION_SDRAW_DOC
-{
-    Text = "StarDraw 3.0 / 5.0 (StarImpress)" ;
-};
-
-String STR_DESCRIPTION_SDATABASE_DOC
-{
-    Text [ en-US ] = "StarOffice Database" ;
-};
-
-String STR_DESCRIPTION_SCALC_DOC
-{
-    Text = "StarCalc 3.0 - 5.0" ;
-};
-String STR_DESCRIPTION_SIMPRESS_DOC
-{
-    Text = "StarImpress 4.0 / 5.0" ;
-};
-String STR_DESCRIPTION_SWRITER_DOC
-{
-    Text = "StarWriter 3.0 - 5.0" ;
-};
-String STR_DESCRIPTION_GLOBALDOC
-{
-    Text [ en-US ] = "StarWriter 4.0 / 5.0 Master Document" ;
-};
-String STR_DESCRIPTION_SIMAGE_DOC
-{
-    Text [ en-US ] = "StarOffice Image" ;
-};
-String STR_DESCRIPTION_TEXTFILE
-{
-    Text [ en-US ] = "Text file" ;
-};
-String STR_DESCRIPTION_LINK
-{
-    Text [ en-US ] = "Link" ;
-};
-String STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC
-{
-    Text [ en-US ] = "StarOffice 3.0 - 5.0 Template" ;
-};
-String STR_DESCRIPTION_EXCEL_DOC
-{
-    Text [ en-US ] = "MS Excel document" ;
-};
-String STR_DESCRIPTION_EXCEL_TEMPLATE_DOC
-{
-    Text [ en-US ] = "MS Excel template" ;
-};
-String STR_DESCRIPTION_BATCHFILE
-{
-    Text [ en-US ] = "Batch file" ;
-};
-String STR_DESCRIPTION_FILE
-{
-    Text [ en-US ] = "File" ;
-};
-String STR_DESCRIPTION_FOLDER
-{
-    Text [ en-US ] = "Folder" ;
-};
-String STR_DESCRIPTION_FACTORY_WRITER
-{
-    Text [ en-US ] = "Text Document";
-};
-String STR_DESCRIPTION_FACTORY_CALC
-{
-    Text [ en-US ] = "Spreadsheet";
-};
-String STR_DESCRIPTION_FACTORY_IMPRESS
-{
-    Text [ en-US ] = "Presentation";
-};
-String STR_DESCRIPTION_FACTORY_DRAW
-{
-    Text [ en-US ] = "Drawing";
-};
-String STR_DESCRIPTION_FACTORY_WRITERWEB
-{
-    Text [ en-US ] = "HTML document";
-};
-String STR_DESCRIPTION_FACTORY_GLOBALDOC
-{
-    Text [ en-US ] = "Master document";
-};
-String STR_DESCRIPTION_FACTORY_MATH
-{
-    Text [ en-US ] = "Formula";
-};
-String STR_DESCRIPTION_FACTORY_DATABASE
-{
-    Text [ en-US ] = "Database";
-};
-String STR_DESCRIPTION_CALC_TEMPLATE
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet Template" ;
-};
-String STR_DESCRIPTION_DRAW_TEMPLATE
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Drawing Template" ;
-};
-String STR_DESCRIPTION_IMPRESS_TEMPLATE
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Presentation Template" ;
-};
-String STR_DESCRIPTION_WRITER_TEMPLATE
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Text Document Template" ;
-};
-String STR_DESCRIPTION_LOCALE_VOLUME
-{
-    Text [ en-US ] = "Local drive" ;
-};
-String STR_DESCRIPTION_FLOPPY_VOLUME
-{
-    Text [ en-US ] = "Disk drive" ;
-};
-String STR_DESCRIPTION_CDROM_VOLUME
-{
-    Text [ en-US ] = "CD-ROM drive" ;
-};
-String STR_DESCRIPTION_REMOTE_VOLUME
-{
-    Text [ en-US ] = "Network connection" ;
-};
-String STR_DESCRIPTION_POWERPOINT
-{
-    Text [ en-US ] = "MS PowerPoint Document";
-};
-
-String STR_DESCRIPTION_POWERPOINT_TEMPLATE
-{
-    Text [ en-US ] = "MS PowerPoint Template";
-};
-
-String STR_DESCRIPTION_POWERPOINT_SHOW
-{
-    Text [ en-US ] = "MS PowerPoint Show";
-};
-
-String STR_DESCRIPTION_SXMATH_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
-};
-
-String STR_DESCRIPTION_SXCHART_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
-};
-
-String STR_DESCRIPTION_SXDRAW_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
-};
-
-String STR_DESCRIPTION_SXCALC_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
-};
-
-String STR_DESCRIPTION_SXIMPRESS_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
-};
-
-String STR_DESCRIPTION_SXWRITER_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
-};
-
-String STR_DESCRIPTION_SXGLOBAL_DOC
-{
-    Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
-};
-String STR_DESCRIPTION_MATHML_DOC
-{
-    Text [ en-US ] = "MathML Document" ;
-};
-
-String STR_DESCRIPTION_OO_DATABASE_DOC
-{
-    Text [ en-US ] = "OpenDocument Database" ;
-};
-String STR_DESCRIPTION_OO_DRAW_DOC
-{
-    Text [ en-US ] = "OpenDocument Drawing" ;
-};
-String STR_DESCRIPTION_OO_MATH_DOC
-{
-    Text [ en-US ] = "OpenDocument Formula" ;
-};
-String STR_DESCRIPTION_OO_GLOBAL_DOC
-{
-    Text [ en-US ] = "OpenDocument Master Document" ;
-};
-String STR_DESCRIPTION_OO_IMPRESS_DOC
-{
-    Text [ en-US ] = "OpenDocument Presentation" ;
-};
-String STR_DESCRIPTION_OO_CALC_DOC
-{
-    Text [ en-US ] = "OpenDocument Spreadsheet" ;
-};
-String STR_DESCRIPTION_OO_WRITER_DOC
-{
-    Text [ en-US ] = "OpenDocument Text" ;
-};
-String STR_DESCRIPTION_OO_CALC_TEMPLATE
-{
-    Text [ en-US ] = "OpenDocument Spreadsheet Template" ;
-};
-String STR_DESCRIPTION_OO_DRAW_TEMPLATE
-{
-    Text [ en-US ] = "OpenDocument Drawing Template" ;
-};
-String STR_DESCRIPTION_OO_IMPRESS_TEMPLATE
-{
-    Text [ en-US ] = "OpenDocument Presentation Template" ;
-};
-String STR_DESCRIPTION_OO_WRITER_TEMPLATE
-{
-    Text [ en-US ] = "OpenDocument Text Template" ;
-};
-String STR_DESCRIPTION_EXTENSION
-{
-    Text [ en-US ] = "%PRODUCTNAME Extension" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index d22880d72246..d714a29599a1 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -26,28 +26,48 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svtools/langtab.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/resary.hxx>
 #include <officecfg/VCL.hxx>
-
+#include "langtab.hrc"
 
 using namespace ::com::sun::star;
 
-class SvtLanguageTableImpl : public ResStringArray
+class SvtLanguageTableImpl
 {
+private:
+    std::vector<std::pair<OUString, LanguageType>> m_aStrings;
 public:
 
     SvtLanguageTableImpl();
-    virtual ~SvtLanguageTableImpl();
 
     bool            HasType( const LanguageType eType ) const;
     const OUString  GetString( const LanguageType eType ) const;
     LanguageType    GetType( const OUString& rStr ) const;
     sal_uInt32      GetEntryCount() const;
     LanguageType    GetTypeAtIndex( sal_uInt32 nIndex ) const;
+    sal_uInt32      AddItem(const OUString& rLanguage, const LanguageType eType)
+    {
+        m_aStrings.push_back(std::make_pair(rLanguage, eType));
+        return m_aStrings.size();
+    }
+    LanguageType    GetValue(sal_uInt32 nIndex) const
+    {
+        return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].second : LANGUAGE_DONTKNOW;
+    }
+    sal_uInt32      FindIndex(LanguageType nValue) const
+    {
+        const size_t nItems = m_aStrings.size();
+        for (size_t i = 0; i < nItems; ++i)
+        {
+            if (m_aStrings[i].second == nValue)
+                return i;
+        }
+        return RESARRAY_INDEX_NOTFOUND;
+    }
 };
 
 namespace {
@@ -131,8 +151,12 @@ const OUString ApplyLreOrRleEmbedding( const OUString &rText )
 }
 
 SvtLanguageTableImpl::SvtLanguageTableImpl()
-    : ResStringArray(ResId(STR_ARR_SVT_LANGUAGE_TABLE, *SvtResMgr::GetResMgr()))
 {
+    for (size_t i = 0; i < SAL_N_ELEMENTS(STR_ARR_SVT_LANGUAGE_TABLE); ++i)
+    {
+        m_aStrings.push_back(std::make_pair(SvtResId(STR_ARR_SVT_LANGUAGE_TABLE[i].first), STR_ARR_SVT_LANGUAGE_TABLE[i].second));
+    }
+
     auto xNA = officecfg::VCL::ExtraLanguages::get();
     uno::Sequence <OUString> rElementNames = xNA->getElementNames();
     sal_Int32 nLen = rElementNames.getLength();
@@ -150,24 +174,19 @@ SvtLanguageTableImpl::SvtLanguageTableImpl()
             LanguageType nLangType = aLang.getLanguageType();
             if (nType <= LanguageTag::ScriptType::RTL && nType > LanguageTag::ScriptType::UNKNOWN)
                 aLang.setScriptType(LanguageTag::ScriptType(nType));
-            sal_uInt32 nPos = FindIndex((sal_uInt16)nLangType);
+            sal_uInt32 nPos = FindIndex(nLangType);
             if (nPos == RESARRAY_INDEX_NOTFOUND)
-                AddItem((aName.isEmpty() ? rElementNames[i] : aName), (sal_uInt16)nLangType);
+                AddItem((aName.isEmpty() ? rElementNames[i] : aName), nLangType);
         }
     }
 }
 
-SvtLanguageTableImpl::~SvtLanguageTableImpl()
-{
-}
-
-
 bool SvtLanguageTableImpl::HasType( const LanguageType eType ) const
 {
     LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType );
-    sal_uInt32 nPos = FindIndex( (sal_uInt16)eLang );
+    sal_uInt32 nPos = FindIndex(eLang);
 
-    return RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count();
+    return RESARRAY_INDEX_NOTFOUND != nPos && nPos < GetEntryCount();
 }
 
 bool SvtLanguageTable::HasLanguageType( const LanguageType eType )
@@ -190,10 +209,10 @@ OUString lcl_getDescription( const OUString& rBcp47 )
 const OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const
 {
     LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType );
-    sal_uInt32 nPos = FindIndex( (sal_uInt16)eLang );
+    sal_uInt32 nPos = FindIndex(eLang);
 
-    if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
-        return ResStringArray::GetString( nPos );
+    if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < GetEntryCount() )
+        return m_aStrings[nPos].first;
 
     //Rather than return a fairly useless "Unknown" name, return a geeky but usable-in-a-pinch lang-tag
     OUString sLangTag( lcl_getDescription( LanguageTag::convertToBcp47(eType)));
@@ -205,7 +224,7 @@ const OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const
     // And add it to the table if it is an on-the-fly-id, which it usually is,
     // so it is available in all subsequent language boxes.
     if (LanguageTag::isOnTheFlyID( eType))
-        const_cast<SvtLanguageTableImpl*>(this)->AddItem( sLangTag, (sal_uInt16)eType);
+        const_cast<SvtLanguageTableImpl*>(this)->AddItem( sLangTag, eType);
 
     return sLangTag;
 }
@@ -218,13 +237,13 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
 LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const
 {
     LanguageType eType = LANGUAGE_DONTKNOW;
-    sal_uInt32 nCount = Count();
+    sal_uInt32 nCount = GetEntryCount();
 
     for ( sal_uInt32 i = 0; i < nCount; ++i )
     {
-        if (ResStringArray::GetString( i ) == rStr)
+        if (m_aStrings[i].first == rStr)
         {
-            eType = LanguageType( GetValue( i ) );
+            eType = GetValue(i);
             break;
         }
     }
@@ -236,10 +255,9 @@ LanguageType SvtLanguageTable::GetLanguageType( const OUString& rStr )
     return theLanguageTable::get().GetType( rStr );
 }
 
-
 sal_uInt32 SvtLanguageTableImpl::GetEntryCount() const
 {
-    return Count();
+    return m_aStrings.size();
 }
 
 sal_uInt32 SvtLanguageTable::GetLanguageEntryCount()
@@ -251,8 +269,8 @@ sal_uInt32 SvtLanguageTable::GetLanguageEntryCount()
 LanguageType SvtLanguageTableImpl::GetTypeAtIndex( sal_uInt32 nIndex ) const
 {
     LanguageType nType = LANGUAGE_DONTKNOW;
-    if (nIndex < Count())
-        nType = LanguageType( GetValue( nIndex ) );
+    if (nIndex < GetEntryCount())
+        nType = GetValue(nIndex);
     return nType;
 }
 
@@ -265,7 +283,7 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( sal_uInt32 nIndex )
 sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString )
 {
     return theLanguageTable::get().AddItem( (rString.isEmpty() ? lcl_getDescription(rLanguageTag.getBcp47()) : rString),
-            (sal_uInt16)rLanguageTag.getLanguageType());
+            rLanguageTag.getLanguageType());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
deleted file mode 100644
index bf088d4c112b..000000000000
--- a/svtools/source/misc/langtab.src
+++ /dev/null
@@ -1,409 +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 <svtools/svtools.hrc>
-#include <i18nlangtag/lang.h>
-
-StringArray STR_ARR_SVT_LANGUAGE_TABLE
-{
-    ItemList [ en-US ] =
-    {
-        < "[None]" ; LANGUAGE_NONE ; > ;
-        < "Unknown" ; LANGUAGE_DONTKNOW ; > ;
-        < "Default" ; LANGUAGE_SYSTEM ; > ;
-        < "Default" ; LANGUAGE_USER_SYSTEM_CONFIG ; > ;
-        < "Afrikaans (South Africa)" ; LANGUAGE_AFRIKAANS ; > ;
-        < "Albanian" ; LANGUAGE_ALBANIAN ; > ;
-        < "Arabic" ; LANGUAGE_ARABIC_PRIMARY_ONLY ; > ;
-        < "Arabic (Algeria)" ; LANGUAGE_ARABIC_ALGERIA ; > ;
-        < "Arabic (Bahrain)" ; LANGUAGE_ARABIC_BAHRAIN ; > ;
-        < "Arabic (Chad)" ; LANGUAGE_USER_ARABIC_CHAD ; > ;
-        < "Arabic (Comoros)" ; LANGUAGE_USER_ARABIC_COMOROS ; > ;
-        < "Arabic (Djibouti)" ; LANGUAGE_USER_ARABIC_DJIBOUTI ; > ;
-        < "Arabic (Egypt)" ; LANGUAGE_ARABIC_EGYPT ; > ;
-        < "Arabic (Eritrea)" ; LANGUAGE_USER_ARABIC_ERITREA ; > ;
-        < "Arabic (Iraq)" ; LANGUAGE_ARABIC_IRAQ ; > ;
-        < "Arabic (Israel)" ; LANGUAGE_USER_ARABIC_ISRAEL ; > ;
-        < "Arabic (Jordan)" ; LANGUAGE_ARABIC_JORDAN ; > ;
-        < "Arabic (Kuwait)" ; LANGUAGE_ARABIC_KUWAIT ; > ;
-        < "Arabic (Lebanon)" ; LANGUAGE_ARABIC_LEBANON ; > ;
-        < "Arabic (Libya)" ; LANGUAGE_ARABIC_LIBYA ; > ;
-        < "Arabic (Mauritania)" ; LANGUAGE_USER_ARABIC_MAURITANIA ; > ;
-        < "Arabic (Morocco)" ; LANGUAGE_ARABIC_MOROCCO ; > ;
-        < "Arabic (Oman)" ; LANGUAGE_ARABIC_OMAN ; > ;
-        < "Arabic (Palestine)" ; LANGUAGE_USER_ARABIC_PALESTINE ; > ;
-        < "Arabic (Qatar)" ; LANGUAGE_ARABIC_QATAR ; > ;
-        < "Arabic (Saudi Arabia)" ; LANGUAGE_ARABIC_SAUDI_ARABIA ; > ;
-        < "Arabic (Somalia)" ; LANGUAGE_USER_ARABIC_SOMALIA ; > ;
-        < "Arabic (Sudan)" ; LANGUAGE_USER_ARABIC_SUDAN ; > ;
-        < "Arabic (Syria)" ; LANGUAGE_ARABIC_SYRIA ; > ;
-        < "Arabic (Tunisia)" ; LANGUAGE_ARABIC_TUNISIA ; > ;
-        < "Arabic (UAE)" ; LANGUAGE_ARABIC_UAE ; > ;
-        < "Arabic (Yemen)" ; LANGUAGE_ARABIC_YEMEN ; > ;
-        < "Aragonese" ; LANGUAGE_USER_ARAGONESE ; > ;
-        < "Armenian" ; LANGUAGE_ARMENIAN ; > ;
-        < "Assamese" ; LANGUAGE_ASSAMESE ; > ;
-        < "Azerbaijani Latin" ; LANGUAGE_AZERI_LATIN ; > ;
-        < "Azerbaijani Cyrillic" ; LANGUAGE_AZERI_CYRILLIC ; > ;
-        < "Basque" ; LANGUAGE_BASQUE ; > ;
-        < "Bengali (India)" ; LANGUAGE_BENGALI ; > ;
-        < "Bulgarian" ; LANGUAGE_BULGARIAN ; > ;
-        < "Belarusian" ; LANGUAGE_BELARUSIAN ; > ;
-        < "Catalan" ; LANGUAGE_CATALAN ; > ;
-        < "Catalan (Valencian)" ; LANGUAGE_USER_CATALAN_VALENCIAN ; > ;
-        < "Chinese (traditional)" ; LANGUAGE_CHINESE_TRADITIONAL ; > ;
-        < "Chinese (simplified)" ; LANGUAGE_CHINESE_SIMPLIFIED ; > ;
-        < "Chinese (Hong Kong)" ; LANGUAGE_CHINESE_HONGKONG ; > ;
-        < "Chinese (Singapore)" ; LANGUAGE_CHINESE_SINGAPORE ; > ;
-        < "Chinese (Macau)" ; LANGUAGE_CHINESE_MACAU ; > ;
-        < "Church Slavic" ; LANGUAGE_USER_CHURCH_SLAVIC ; > ;
-        < "Croatian" ; LANGUAGE_CROATIAN ; > ;
-        < "Czech" ; LANGUAGE_CZECH ; > ;
-        < "Danish" ; LANGUAGE_DANISH ; > ;
-        < "Dutch (Netherlands)" ; LANGUAGE_DUTCH ; > ;
-        < "Dutch (Belgium)" ; LANGUAGE_DUTCH_BELGIAN ; > ;
-        < "English (USA)" ; LANGUAGE_ENGLISH_US ; > ;
-        < "English (UK)" ; LANGUAGE_ENGLISH_UK ; > ;
-        < "English, OED spelling (UK)" ; LANGUAGE_USER_ENGLISH_UK_OXENDICT ; > ;
-        < "English (Australia)" ; LANGUAGE_ENGLISH_AUS ; > ;
-        < "English (Canada)" ; LANGUAGE_ENGLISH_CAN ; > ;
-        < "English (New Zealand)" ; LANGUAGE_ENGLISH_NZ ; > ;
-        < "English (Ireland)" ; LANGUAGE_ENGLISH_EIRE ; > ;
-        < "English (South Africa)" ; LANGUAGE_ENGLISH_SAFRICA ; > ;
-        < "English (Jamaica)" ; LANGUAGE_ENGLISH_JAMAICA ; > ;
-        < "English (Caribbean)" ; LANGUAGE_ENGLISH_CARRIBEAN ; > ;
-        < "English (Belize)" ; LANGUAGE_ENGLISH_BELIZE ; > ;
-        < "English (Trinidad)" ; LANGUAGE_ENGLISH_TRINIDAD ; > ;
-        < "English (Zimbabwe)" ; LANGUAGE_ENGLISH_ZIMBABWE ; > ;
-        < "English (Philippines)" ; LANGUAGE_ENGLISH_PHILIPPINES ; > ;
-        < "English (India)" ; LANGUAGE_ENGLISH_INDIA ; > ;
-        < "Estonian" ; LANGUAGE_ESTONIAN ; > ;
-        < "Finnish" ; LANGUAGE_FINNISH ; > ;
-        < "Faroese" ; LANGUAGE_FAEROESE ; > ;
-        < "Persian" ; LANGUAGE_FARSI ; > ;
-        < "French (France)" ; LANGUAGE_FRENCH ; > ;
-        < "French (Belgium)" ; LANGUAGE_FRENCH_BELGIAN ; > ;
-        < "French (Canada)" ; LANGUAGE_FRENCH_CANADIAN ; > ;
-        < "French (Switzerland)" ; LANGUAGE_FRENCH_SWISS ; > ;
-        < "French (Luxembourg)" ; LANGUAGE_FRENCH_LUXEMBOURG ; > ;
-        < "French (Monaco)" ; LANGUAGE_FRENCH_MONACO ; > ;
-        < "Gascon" ; LANGUAGE_USER_GASCON ; > ;
-        < "German (Germany)" ; LANGUAGE_GERMAN ; > ;
-        < "German (Switzerland)" ; LANGUAGE_GERMAN_SWISS ; > ;
-        < "German (Austria)" ; LANGUAGE_GERMAN_AUSTRIAN ; > ;
-        < "German (Luxembourg)" ; LANGUAGE_GERMAN_LUXEMBOURG ; > ;
-        < "German (Liechtenstein)" ; LANGUAGE_GERMAN_LIECHTENSTEIN ; > ;
-        < "Greek" ; LANGUAGE_GREEK ; > ;
-        < "Gujarati" ; LANGUAGE_GUJARATI ; > ;
-        < "Hebrew" ; LANGUAGE_HEBREW ; > ;
-        < "Hindi" ; LANGUAGE_HINDI ; > ;
-        < "Hungarian" ; LANGUAGE_HUNGARIAN ; > ;
-        < "Icelandic" ; LANGUAGE_ICELANDIC ; > ;
-        < "Indonesian" ; LANGUAGE_INDONESIAN ; > ;
-        < "Italian (Italy)" ; LANGUAGE_ITALIAN ; > ;
-        < "Italian (Switzerland)" ; LANGUAGE_ITALIAN_SWISS ; > ;
-        < "Japanese" ; LANGUAGE_JAPANESE ; > ;
-        < "Kannada" ; LANGUAGE_KANNADA ; > ;
-        < "Kashmiri (Kashmir)" ; LANGUAGE_KASHMIRI ; > ;
-        < "Kashmiri (India)" ; LANGUAGE_KASHMIRI_INDIA ; > ;
-        < "Kazakh" ; LANGUAGE_KAZAKH ; > ;
-        < "Konkani" ; LANGUAGE_KONKANI ; > ;
-        < "Korean (RoK)" ; LANGUAGE_KOREAN ; > ;
-        < "Latvian" ; LANGUAGE_LATVIAN ; > ;
-        < "Lithuanian" ; LANGUAGE_LITHUANIAN ; > ;
-        < "Macedonian" ; LANGUAGE_MACEDONIAN ; > ;
-        < "Malay (Malaysia)" ; LANGUAGE_MALAY_MALAYSIA ; > ;
-        < "Malay (Brunei Darussalam)" ; LANGUAGE_MALAY_BRUNEI_DARUSSALAM ; > ;
-        < "Malayalam" ; LANGUAGE_MALAYALAM ; > ;
-        < "Manipuri" ; LANGUAGE_MANIPURI ; > ;
-        < "Marathi" ; LANGUAGE_MARATHI ; > ;
-        < "Nepali (Nepal)" ; LANGUAGE_NEPALI ; > ;
-        < "Nepali (India)" ; LANGUAGE_NEPALI_INDIA ; > ;
-        < "Norwegian, Bokmål" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ;
-        < "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ;
-        < "Odia" ; LANGUAGE_ODIA ; > ;
-        < "Polish" ; LANGUAGE_POLISH ; > ;
-        < "Portuguese (Angola)" ; LANGUAGE_USER_PORTUGUESE_ANGOLA ; > ;
-        < "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ;
-        < "Portuguese (Brazil)" ; LANGUAGE_PORTUGUESE_BRAZILIAN ; > ;
-        < "Punjabi" ; LANGUAGE_PUNJABI ; > ;
-        < "Rhaeto-Romance" ; LANGUAGE_RHAETO_ROMAN ; > ;
-        < "Romanian (Romania)" ; LANGUAGE_ROMANIAN ; > ;
-        < "Romanian (Moldova)" ; LANGUAGE_ROMANIAN_MOLDOVA ; > ;
-        < "Russian" ; LANGUAGE_RUSSIAN ; > ;
-        < "Sanskrit" ; LANGUAGE_SANSKRIT ; > ;
-        < "Serbian Cyrillic (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_CYRILLIC_SAM ; > ;
-        < "Serbian Latin (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_LATIN_SAM ; > ;
-        < "Serbian Cyrillic (Serbia)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA ; > ;
-        < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ;
-        < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ;
-        < "Serbian Latin (Montenegro)" ; LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ;
-        < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_LSO ; > ;
-        < "Sidama" ; LANGUAGE_USER_SIDAMA ; > ;
-        < "Sindhi" ; LANGUAGE_SINDHI ; > ;
-        < "Slovak" ; LANGUAGE_SLOVAK ; > ;
-        < "Slovenian" ; LANGUAGE_SLOVENIAN ; > ;
-        < "Spanish (Spain)" ; LANGUAGE_SPANISH ; > ;
-        < "Spanish (Mexico)" ; LANGUAGE_SPANISH_MEXICAN ; > ;
-        < "Spanish (Guatemala)" ; LANGUAGE_SPANISH_GUATEMALA ; > ;
-        < "Spanish (Costa Rica)" ; LANGUAGE_SPANISH_COSTARICA ; > ;
-        < "Spanish (Panama)" ; LANGUAGE_SPANISH_PANAMA ; > ;
-        < "Spanish (Dom. Rep.)" ; LANGUAGE_SPANISH_DOMINICAN_REPUBLIC ; > ;
-        < "Spanish (Venezuela)" ; LANGUAGE_SPANISH_VENEZUELA ; > ;
-        < "Spanish (Colombia)" ; LANGUAGE_SPANISH_COLOMBIA ; > ;
-        < "Spanish (Peru)" ; LANGUAGE_SPANISH_PERU ; > ;
-        < "Spanish (Argentina)" ; LANGUAGE_SPANISH_ARGENTINA ; > ;
-        < "Spanish (Ecuador)" ; LANGUAGE_SPANISH_ECUADOR ; > ;
-        < "Spanish (Chile)" ; LANGUAGE_SPANISH_CHILE ; > ;
-        < "Spanish (Uruguay)" ; LANGUAGE_SPANISH_URUGUAY ; > ;
-        < "Spanish (Paraguay)" ; LANGUAGE_SPANISH_PARAGUAY ; > ;
-        < "Spanish (Bolivia)" ; LANGUAGE_SPANISH_BOLIVIA ; > ;
-        < "Spanish (El Salvador)" ; LANGUAGE_SPANISH_EL_SALVADOR ; > ;
-        < "Spanish (Honduras)" ; LANGUAGE_SPANISH_HONDURAS ; > ;
-        < "Spanish (Nicaragua)" ; LANGUAGE_SPANISH_NICARAGUA ; > ;
-        < "Spanish (Puerto Rico)" ; LANGUAGE_SPANISH_PUERTO_RICO ; > ;
-        < "Swahili (Kenya)" ; LANGUAGE_SWAHILI ; > ;
-        < "Swedish (Sweden)" ; LANGUAGE_SWEDISH ; > ;
-        < "Swedish (Finland)" ; LANGUAGE_SWEDISH_FINLAND ; > ;
-        < "Tajik" ; LANGUAGE_TAJIK ; > ;
-        < "Tamil" ; LANGUAGE_TAMIL ; > ;
-        < "Tatar" ; LANGUAGE_TATAR ; > ;
-        < "Telugu" ; LANGUAGE_TELUGU ; > ;
-        < "Thai" ; LANGUAGE_THAI ; > ;
-        < "Turkish" ; LANGUAGE_TURKISH ; > ;
-        < "Urdu (Pakistan)" ; LANGUAGE_URDU_PAKISTAN ; > ;
-        < "Urdu (India)" ; LANGUAGE_URDU_INDIA ; > ;
-        < "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ;
-        < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ;
-        < "Uzbek Cyrillic" ; LANGUAGE_UZBEK_CYRILLIC ; > ;
-        < "Welsh" ; LANGUAGE_WELSH ; > ;
-        < "Latin" ; LANGUAGE_USER_LATIN_VATICAN ; > ;
-        < "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ;
-        < "Kinyarwanda (Rwanda)" ; LANGUAGE_USER_KINYARWANDA ; > ;
-        < "Maori" ; LANGUAGE_MAORI_NEW_ZEALAND ; > ;
-        < "Galician" ; LANGUAGE_GALICIAN ; > ;
-        < "Dhivehi" ; LANGUAGE_DHIVEHI ; > ;
-        < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ;
-        < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ;
-        < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA ; > ;
-        < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA ; > ;
-        < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ;
-        < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ;
-        < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ;
-        < "Occitan" ; LANGUAGE_USER_OCCITAN ; > ;
-        < "Khmer" ; LANGUAGE_KHMER ; > ;
-        < "Kurdish, Northern (Turkey)" ; LANGUAGE_USER_KURDISH_TURKEY ; > ;
-        < "Kurdish, Northern (Syria)" ; LANGUAGE_USER_KURDISH_SYRIA ; > ;
-        < "Kurdish, Central (Iraq)" ; LANGUAGE_USER_KURDISH_IRAQ ; > ;
-        < "Kurdish, Central (Iran)" ; LANGUAGE_USER_KURDISH_IRAN ; > ;
-        < "Kurdish, Southern (Iran)" ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAN ; > ;
-        < "Kurdish, Southern (Iraq)" ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ ; > ;
-        < "Sardinian" ; LANGUAGE_USER_SARDINIAN ; > ;
-        < "Dzongkha" ; LANGUAGE_DZONGKHA_BHUTAN ; > ;
-        < "Swahili (Tanzania)" ; LANGUAGE_USER_SWAHILI_TANZANIA ; > ;
-        < "Lao" ; LANGUAGE_LAO ; > ;
-        < "Irish" ; LANGUAGE_GAELIC_IRELAND ; > ;
-        < "Tibetan (PR China)" ; LANGUAGE_TIBETAN ; > ;
-        < "Georgian" ; LANGUAGE_GEORGIAN ; > ;
-        < "Frisian" ; LANGUAGE_FRISIAN_NETHERLANDS ; > ;
-        < "Tswana (South Africa)" ; LANGUAGE_TSWANA ; > ;
-        < "Zulu" ; LANGUAGE_ZULU ; > ;
-        < "Vietnamese" ; LANGUAGE_VIETNAMESE ; > ;
-        < "Breton" ; LANGUAGE_USER_BRETON ; > ;
-        < "Kalaallisut" ; LANGUAGE_USER_KALAALLISUT ; > ;
-        < "Ndebele, South" ; LANGUAGE_USER_NDEBELE_SOUTH ; > ;
-        < "Southern Sotho" ; LANGUAGE_SESOTHO ; > ;
-        < "Swazi" ; LANGUAGE_USER_SWAZI ; > ;
-        < "Tsonga" ; LANGUAGE_TSONGA ; > ;
-        < "Venda" ; LANGUAGE_VENDA ; > ;
-        < "Tswana (Botswana)" ; LANGUAGE_USER_TSWANA_BOTSWANA ; > ;
-        < "Xhosa" ; LANGUAGE_XHOSA ; > ;
-        < "Sinhala" ; LANGUAGE_SINHALESE_SRI_LANKA ; > ;
-        < "Moore" ; LANGUAGE_USER_MOORE ; > ;
-        < "Bambara" ; LANGUAGE_USER_BAMBARA ; > ;
-        < "Akan" ; LANGUAGE_USER_AKAN ; > ;
-        < "Luxembourgish" ; LANGUAGE_USER_LUXEMBOURGISH ; > ;
-        < "Friulian" ; LANGUAGE_USER_FRIULIAN ; > ;
-        < "Fijian" ; LANGUAGE_USER_FIJIAN ; > ;
-        < "Afrikaans (Namibia)" ; LANGUAGE_USER_AFRIKAANS_NAMIBIA ; > ;
-        < "English (Namibia)" ; LANGUAGE_USER_ENGLISH_NAMIBIA ; > ;
-        < "Walloon" ; LANGUAGE_USER_WALLOON ; > ;
-        < "Coptic" ; LANGUAGE_USER_COPTIC ; > ;
-        < "Tigrigna (Eritrea)" ; LANGUAGE_TIGRIGNA_ERITREA ; > ;
-        < "Tigrigna (Ethiopia)" ; LANGUAGE_TIGRIGNA_ETHIOPIA ; > ;
-        < "Amharic" ; LANGUAGE_AMHARIC_ETHIOPIA ; > ;
-        < "Kirghiz" ; LANGUAGE_KIRGHIZ ; > ;
-        < "German (Belgium)" ; LANGUAGE_USER_GERMAN_BELGIUM ; > ;
-        < "Chuvash" ; LANGUAGE_USER_CHUVASH ; > ;
-        < "Burmese" ; LANGUAGE_BURMESE ; > ;
-        < "Hausa (Nigeria)" ; LANGUAGE_HAUSA_NIGERIA ; > ;
-        < "Hausa (Ghana)" ; LANGUAGE_USER_HAUSA_GHANA ; > ;
-        < "Éwé" ; LANGUAGE_USER_EWE_GHANA ; > ;
-        < "English (Ghana)" ; LANGUAGE_USER_ENGLISH_GHANA ; > ;
-        < "Sango" ; LANGUAGE_USER_SANGO ; > ;
-        < "Tagalog" ; LANGUAGE_USER_TAGALOG ; > ;
-        < "Ganda" ; LANGUAGE_USER_GANDA ; > ;
-        < "Lingala" ; LANGUAGE_USER_LINGALA_DRCONGO ; > ;
-        < "Low German" ; LANGUAGE_USER_LOW_GERMAN ; > ;
-        < "Hiligaynon" ; LANGUAGE_USER_HILIGAYNON ; > ;
-        < "Nyanja" ; LANGUAGE_USER_NYANJA ; > ;
-        < "Kashubian" ; LANGUAGE_USER_KASHUBIAN ; > ;
-        < "Spanish (Cuba)" ; LANGUAGE_USER_SPANISH_CUBA ; > ;
-        < "Tetun (Indonesia)" ; LANGUAGE_USER_TETUN ; > ;
-        < "Quechua (Bolivia, North)" ; LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA ; > ;
-        < "Quechua (Bolivia, South)" ; LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA ; > ;
-        < "Somali" ; LANGUAGE_SOMALI ; > ;
-        < "Sami, Inari (Finland)" ; LANGUAGE_SAMI_INARI ; > ;
-        < "Sami, Lule (Norway)" ; LANGUAGE_SAMI_LULE_NORWAY ; > ;
-        < "Sami, Lule (Sweden)" ; LANGUAGE_SAMI_LULE_SWEDEN ; > ;
-        < "Sami, Northern (Finland)" ; LANGUAGE_SAMI_NORTHERN_FINLAND ; > ;
-        < "Sami, Northern (Norway)" ; LANGUAGE_SAMI_NORTHERN_NORWAY ; > ;
-        < "Sami, Northern (Sweden)" ; LANGUAGE_SAMI_NORTHERN_SWEDEN ; > ;
-        < "Sami, Skolt (Finland)" ; LANGUAGE_SAMI_SKOLT ; > ;
-        < "Sami, Southern (Norway)" ; LANGUAGE_SAMI_SOUTHERN_NORWAY ; > ;
-        < "Sami, Southern (Sweden)" ; LANGUAGE_SAMI_SOUTHERN_SWEDEN ; > ;
-        < "Sami, Kildin (Russia)" ; LANGUAGE_USER_SAMI_KILDIN_RUSSIA ; > ;
-        < "Guarani (Paraguay)" ; LANGUAGE_GUARANI_PARAGUAY ; > ;
-        < "Bodo" ; LANGUAGE_USER_BODO_INDIA ; > ;
-        < "Dogri" ; LANGUAGE_USER_DOGRI_INDIA ; > ;
-        < "Maithili" ; LANGUAGE_USER_MAITHILI_INDIA ; > ;
-        < "Santali" ; LANGUAGE_USER_SANTALI_INDIA ; > ;
-        < "Tetun (Timor-Leste)" ; LANGUAGE_USER_TETUN_TIMOR_LESTE ; > ;
-        < "Turkmen" ; LANGUAGE_TURKMEN ; > ;
-        < "Maltese" ; LANGUAGE_MALTESE ; > ;
-        < "Tok Pisin" ; LANGUAGE_USER_TOK_PISIN ; > ;
-        < "Shuswap" ; LANGUAGE_USER_SHUSWAP ; > ;
-        < "Oromo" ; LANGUAGE_OROMO ; > ;
-        < "Greek, Ancient" ; LANGUAGE_USER_ANCIENT_GREEK ; > ;
-        < "Yiddish (Israel)" ; LANGUAGE_YIDDISH ; > ;
-        < "Quechua (Ecuador)" ; LANGUAGE_QUECHUA_ECUADOR ; > ;
-        < "Uyghur" ; LANGUAGE_UIGHUR_CHINA ; > ;
-        < "Asturian" ; LANGUAGE_USER_ASTURIAN ; > ;
-        < "Sorbian, Upper" ; LANGUAGE_UPPER_SORBIAN_GERMANY ; > ;
-        < "Sorbian, Lower" ; LANGUAGE_LOWER_SORBIAN_GERMANY ; > ;
-        < "Latgalian" ; LANGUAGE_USER_LATGALIAN ; > ;
-        < "Maore" ; LANGUAGE_USER_MAORE ; > ;
-        < "Bushi" ; LANGUAGE_USER_BUSHI ; > ;
-        < "Tahitian" ; LANGUAGE_USER_TAHITIAN ; > ;
-        < "Malagasy, Plateau" ; LANGUAGE_MALAGASY_PLATEAU ; > ;
-        < "Papiamentu (Netherlands Antilles)" ; LANGUAGE_PAPIAMENTU ; > ;
-        < "Papiamento (Aruba)" ; LANGUAGE_USER_PAPIAMENTU_ARUBA ; > ;
-        < "Sardinian, Campidanese" ; LANGUAGE_USER_SARDINIAN_CAMPIDANESE ; > ;
-        < "Sardinian, Gallurese" ; LANGUAGE_USER_SARDINIAN_GALLURESE ; > ;
-        < "Sardinian, Logudorese" ; LANGUAGE_USER_SARDINIAN_LOGUDORESE ; > ;
-        < "Sardinian, Sassarese" ; LANGUAGE_USER_SARDINIAN_SASSARESE ; > ;
-        < "Bafia" ; LANGUAGE_USER_BAFIA ; > ;
-        < "Gikuyu" ; LANGUAGE_USER_GIKUYU ; > ;
-        < "Yoruba" ; LANGUAGE_YORUBA ; > ;
-        < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ;
-        < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ;
-        < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN_ALGERIA ; > ;
-        < "Yiddish (USA)" ; LANGUAGE_USER_YIDDISH_US ; > ;
-        < "Hawaiian" ; LANGUAGE_HAWAIIAN_UNITED_STATES ; > ;
-        < "Limbu" ; LANGUAGE_USER_LIMBU ; > ;
-        < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ;
-        < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
-        < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ;
-        < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ;
-        < "Kituba (Congo)" ; LANGUAGE_USER_KITUBA ; > ;
-        < "Lari" ; LANGUAGE_USER_LARI ; > ;
-        < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ;
-        < "Teke-Eboo" ; LANGUAGE_USER_TEKE_EBOO ; > ;
-        < "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ;
-        < "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ;
-        < "Vili" ; LANGUAGE_USER_VILI ; > ;
-        < "KeyID" ; LANGUAGE_USER_KEYID ; > ;
-        < "Pali Latin" ; LANGUAGE_USER_PALI_LATIN ; > ;
-        < "Kyrgyz (China)" ; LANGUAGE_USER_KYRGYZ_CHINA ; > ;
-        < "Komi-Zyrian" ; LANGUAGE_USER_KOMI_ZYRIAN ; > ;
-        < "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ;
-        < "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ;
-        < "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ;
-        < "Erzya" ; LANGUAGE_USER_ERZYA ; > ;
-        < "Mari, Meadow" ; LANGUAGE_USER_MARI_MEADOW ; > ;
-        < "Papiamento (Curaçao)" ; LANGUAGE_USER_PAPIAMENTU_CURACAO ; > ;
-        < "Papiamento (Bonaire)" ; LANGUAGE_USER_PAPIAMENTU_BONAIRE ; > ;
-        < "Khanty" ; LANGUAGE_USER_KHANTY ; > ;
-        < "Livonian" ; LANGUAGE_USER_LIVONIAN ; > ;
-        < "Moksha" ; LANGUAGE_USER_MOKSHA ; > ;
-        < "Mari, Hill" ; LANGUAGE_USER_MARI_HILL ; > ;
-        < "Nganasan" ; LANGUAGE_USER_NGANASAN ; > ;
-        < "Olonets" ; LANGUAGE_USER_OLONETS ; > ;
-        < "Veps" ; LANGUAGE_USER_VEPS ; > ;
-        < "Võro" ; LANGUAGE_USER_VORO ; > ;
-        < "Nenets" ; LANGUAGE_USER_NENETS ; > ;
-        < "Aka (Congo)" ; LANGUAGE_USER_AKA_CONGO ; > ;
-        < "Dibole" ; LANGUAGE_USER_DIBOLE ; > ;
-        < "Doondo" ; LANGUAGE_USER_DOONDO ; > ;
-        < "Kaamba" ; LANGUAGE_USER_KAAMBA ; > ;
-        < "Koongo (Congo)" ; LANGUAGE_USER_KOONGO_CONGO ; > ;
-        < "Kunyi" ; LANGUAGE_USER_KUNYI ; > ;
-        < "Ngungwel" ; LANGUAGE_USER_NGUNGWEL ; > ;
-        < "Njyem (Congo)" ; LANGUAGE_USER_NJYEM_CONGO ; > ;
-        < "Punu" ; LANGUAGE_USER_PUNU_CONGO ; > ;
-        < "Suundi" ; LANGUAGE_USER_SUUNDI ; > ;
-        < "Teke-Kukuya" ; LANGUAGE_USER_TEKE_KUKUYA ; > ;
-        < "Tsaangi" ; LANGUAGE_USER_TSAANGI ; > ;
-        < "Yaka" ; LANGUAGE_USER_YAKA ; > ;
-        < "Yombe (Congo)" ; LANGUAGE_USER_YOMBE_CONGO ; > ;
-        < "N'ko" ; LANGUAGE_USER_NKO ; > ;
-        < "Udmurt" ; LANGUAGE_USER_UDMURT ; > ;
-        < "Tibetan (India)" ; LANGUAGE_USER_TIBETAN_INDIA ; > ;
-        < "Cornish" ; LANGUAGE_USER_CORNISH ; > ;
-        < "Sami, Pite (Sweden)" ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; > ;
-        < "Ngäbere" ; LANGUAGE_USER_NGAEBERE ; > ;
-        < "Kumyk" ; LANGUAGE_USER_KUMYK ; > ;
-        < "Nogai" ; LANGUAGE_USER_NOGAI ; > ;
-        < "Karakalpak Latin" ; LANGUAGE_USER_KARAKALPAK_LATIN ; > ;
-        < "Ladin" ; LANGUAGE_USER_LADIN ; > ;
-        < "French (Burkina Faso)" ; LANGUAGE_USER_FRENCH_BURKINA_FASO ; > ;
-        < "Puinave" ; LANGUAGE_USER_PUINAVE ; > ;
-        < "Maninkakan, Eastern, Latin" ; LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ; > ;
-        < "Avar" ; LANGUAGE_USER_AVAR ; > ;
-        < "Cree, Plains, Latin" ; LANGUAGE_USER_CREE_PLAINS_LATIN ; > ;
-        < "Cree, Plains, Syllabics" ; LANGUAGE_USER_CREE_PLAINS_SYLLABICS ; > ;
-        < "Lengo" ; LANGUAGE_USER_LENGO ; > ;
-        < "French (Côte d'Ivoire)" ; LANGUAGE_FRENCH_COTE_D_IVOIRE ; > ;
-        < "French (Mali)" ; LANGUAGE_FRENCH_MALI ; > ;
-        < "French (Senegal)" ; LANGUAGE_FRENCH_SENEGAL ; > ;
-        < "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ;
-        < "French (Niger)" ; LANGUAGE_USER_FRENCH_NIGER ; > ;
-        < "French (Togo)" ; LANGUAGE_USER_FRENCH_TOGO ; > ;
-        < "Kven Finnish" ; LANGUAGE_USER_KVEN_FINNISH ; > ;
-        < "Venetian" ; LANGUAGE_USER_VENETIAN ; > ;
-        < "English (Gambia)" ; LANGUAGE_USER_ENGLISH_GAMBIA ; > ;
-        < "Aranese" ; LANGUAGE_USER_OCCITAN_ARANESE ; > ;
-        < "Arpitan (France)" ; LANGUAGE_USER_ARPITAN_FRANCE ; > ;
-        < "Arpitan (Italy)" ; LANGUAGE_USER_ARPITAN_ITALY ; > ;
-        < "Arpitan (Switzerland)" ; LANGUAGE_USER_ARPITAN_SWITZERLAND ; > ;
-        < "English (Botswana)" ; LANGUAGE_USER_ENGLISH_BOTSWANA ; > ;
-        < "Interlingue Occidental" ; LANGUAGE_USER_INTERLINGUE ; > ;
-        < "Apatani" ; LANGUAGE_USER_APATANI ; > ;
-        < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
-        < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
-        < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
-        < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
-        < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
-        < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
-        < "Xibe" ; LANGUAGE_USER_XIBE ; > ;
-        < "Kituba (Democratic Republic of the Congo)" ; LANGUAGE_USER_KITUBA_DRCONGO ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/svtools.src b/svtools/source/misc/svtools.src
deleted file mode 100644
index 2604ecc18839..000000000000
--- a/svtools/source/misc/svtools.src
+++ /dev/null
@@ -1,168 +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 "svtools/svtools.hrc"
-
-String STR_SVT_1BIT_THRESHOLD
-{
-    Text [ en-US ] = "1 bit threshold";
-};
-String STR_SVT_1BIT_DITHERED
-{
-    Text [ en-US ] = "1 bit dithered";
-};
-String STR_SVT_4BIT_GRAYSCALE
-{
-    Text [ en-US ] = "4 bit grayscale";
-};
-String STR_SVT_4BIT_COLOR_PALETTE
-{
-    Text [ en-US ] = "4 bit color";
-};
-String STR_SVT_8BIT_GRAYSCALE
-{
-    Text [ en-US ] = "8 bit grayscale";
-};
-String STR_SVT_8BIT_COLOR_PALETTE
-{
-    Text [ en-US ] = "8 bit color";
-};
-String STR_SVT_24BIT_TRUE_COLOR
-{
-    Text [ en-US ] = "24 bit true color";
-};
-String STR_SVT_ESTIMATED_SIZE_PIX_1
-{
-    Text [ en-US ] = "The image needs about %1 KB of memory.";
-};
-String STR_SVT_ESTIMATED_SIZE_PIX_2
-{
-    Text [ en-US ] = "The image needs about %1 KB of memory, the file size is %2 KB.";
-};
-String STR_SVT_ESTIMATED_SIZE_VEC
-{
-    Text [ en-US ] = "The file size is %1 KB.";
-};
-String STR_SVT_HOST
-{
-    Text [ en-US ] = "host";
-};
-String STR_SVT_PORT
-{
-    Text [ en-US ] = "port";
-};
-String STR_SVT_PRNDLG_READY
-{
-    Text [ en-US ] = "Ready" ;
-};
-String STR_SVT_PRNDLG_PAUSED
-{
-    Text [ en-US ] = "Paused" ;
-};
-String STR_SVT_PRNDLG_PENDING
-{
-    Text [ en-US ] = "Pending deletion" ;
-};
-String STR_SVT_PRNDLG_BUSY
-{
-    Text [ en-US ] = "Busy" ;
-};
-String STR_SVT_PRNDLG_INITIALIZING
-{
-    Text [ en-US ] = "Initializing" ;
-};
-String STR_SVT_PRNDLG_WAITING
-{
-    Text [ en-US ] = "Waiting" ;
-};
-String STR_SVT_PRNDLG_WARMING_UP
-{
-    Text [ en-US ] = "Warming up" ;
-};
-String STR_SVT_PRNDLG_PROCESSING
-{
-    Text [ en-US ] = "Processing" ;
-};
-String STR_SVT_PRNDLG_PRINTING
-{
-    Text [ en-US ] = "Printing" ;
-};
-String STR_SVT_PRNDLG_OFFLINE
-{
-    Text [ en-US ] = "Offline" ;
-};
-String STR_SVT_PRNDLG_ERROR
-{
-    Text [ en-US ] = "Error" ;
-};
-String STR_SVT_PRNDLG_SERVER_UNKNOWN
-{
-    Text [ en-US ] = "Unknown Server" ;
-};
-String STR_SVT_PRNDLG_PAPER_JAM
-{
-    Text [ en-US ] = "Paper jam" ;
-};
-String STR_SVT_PRNDLG_PAPER_OUT
-{
-    Text [ en-US ] = "Not enough paper" ;
-};
-String STR_SVT_PRNDLG_MANUAL_FEED
-{
-    Text [ en-US ] = "Manual feed" ;
-};
-String STR_SVT_PRNDLG_PAPER_PROBLEM
-{
-    Text [ en-US ] = "Paper problem" ;
-};
-String STR_SVT_PRNDLG_IO_ACTIVE
-{
-    Text [ en-US ] = "I/O active" ;
-};
-String STR_SVT_PRNDLG_OUTPUT_BIN_FULL
-{
-    Text [ en-US ] = "Output bin full" ;
-};
-String STR_SVT_PRNDLG_TONER_LOW
-{
-    Text [ en-US ] = "Toner low" ;
-};
-String STR_SVT_PRNDLG_NO_TONER
-{
-    Text [ en-US ] = "No toner" ;
-};
-String STR_SVT_PRNDLG_PAGE_PUNT
-{
-    Text [ en-US ] = "Delete Page" ;
-};
-String STR_SVT_PRNDLG_USER_INTERVENTION
-{
-    Text [ en-US ] = "User intervention necessary" ;
-};
-String STR_SVT_PRNDLG_OUT_OF_MEMORY
-{
-    Text [ en-US ] = "Insufficient memory" ;
-};
-String STR_SVT_PRNDLG_DOOR_OPEN
-{
-    Text [ en-US ] = "Cover open" ;
-};
-String STR_SVT_PRNDLG_POWER_SAVE
-{
-    Text [ en-US ] = "Power save mode" ;
-};
-String STR_SVT_PRNDLG_DEFPRINTER
-{
-    Text [ en-US ] = "Default printer" ;
-};
-String STR_SVT_PRNDLG_JOBCOUNT
-{
-    Text [ en-US ] = "%d documents" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index 59da66bcd51c..dff8d906abcf 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -22,26 +22,31 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-static ResMgr* pMgr=nullptr;
+static std::locale* pResLocale=nullptr;
 
 namespace
 {
-    ResMgr* getResMgr(const LanguageTag& aLocale)
+    std::locale* getResLocale(const LanguageTag& aLocale)
     {
-        if (!pMgr)
-            pMgr = ResMgr::CreateResMgr("svt", aLocale );
-        return pMgr;
+        if (!pResLocale)
+            pResLocale = new std::locale(Translate::Create("svt", aLocale));
+        return pResLocale;
     }
 }
 
-ResMgr* SvtResMgr::GetResMgr()
+std::locale* SvtResLocale::GetResLocale()
 {
-    return getResMgr(Application::GetSettings().GetUILanguageTag());
+    return getResLocale(Application::GetSettings().GetUILanguageTag());
 }
 
-void SvtResMgr::DeleteResMgr()
+void SvtResLocale::DeleteResLocale()
 {
-    DELETEZ( pMgr );
+    DELETEZ(pResLocale);
+}
+
+OUString SvtResId(const char* pId)
+{
+    return Translate::get(pId, *SvtResLocale::GetResLocale());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/undo.src b/svtools/source/misc/undo.src
deleted file mode 100644
index 10880afc510e..000000000000
--- a/svtools/source/misc/undo.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 <svtools/svtools.hrc>
-
-String STR_UNDO
-{
-    Text [ en-US ] = "Undo: " ;
-};
-String STR_REDO
-{
-    Text [ en-US ] = "Re~do: " ;
-};
-String STR_REPEAT
-{
-    Text [ en-US ] = "~Repeat: " ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui
index 85917eb76c15..3215603551b1 100644
--- a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui
+++ b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment-height">
     <property name="upper">20000</property>
@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="GraphicExporter">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Image Options</property>
+    <property name="title" translatable="yes" context="GraphicExportOptionsDialog|GraphicExporter">Image Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -91,7 +91,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Width:</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label5">Width:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -103,7 +103,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Height:</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label6">Height:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -115,7 +115,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Resolution:</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|resolutionft">Resolution:</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -153,7 +153,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">px</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label2">px</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -165,7 +165,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">px</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label3">px</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -177,7 +177,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">DPI</property>
+                            <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label4">DPI</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -220,7 +220,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Size</property>
+                    <property name="label" translatable="yes" context="GraphicExportOptionsDialog|label1">Size</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 0b9caeb94a8c..58edfc7a11bc 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddressTemplateDialog">
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Templates: Address Book Assignment</property>
+    <property name="title" translatable="yes" context="addresstemplatedialog|AddressTemplateDialog">Templates: Address Book Assignment</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -101,7 +101,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Data source:</property>
+                            <property name="label" translatable="yes" context="addresstemplatedialog|label33">Data source:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">datasource</property>
                           </object>
@@ -115,7 +115,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Table:</property>
+                            <property name="label" translatable="yes" context="addresstemplatedialog|label43">Table:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">datatable</property>
                           </object>
@@ -162,7 +162,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="admin">
-                            <property name="label" translatable="yes">_Address Data Source...</property>
+                            <property name="label" translatable="yes" context="addresstemplatedialog|admin">_Address Data Source...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -184,7 +184,7 @@
                   <object class="GtkLabel" id="label100">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Address Book Source</property>
+                    <property name="label" translatable="yes" context="addresstemplatedialog|label100">Address Book Source</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -518,7 +518,7 @@
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Field Assignment</property>
+                    <property name="label" translatable="yes" context="addresstemplatedialog|label23">Field Assignment</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svtools/uiconfig/ui/fileviewmenu.ui b/svtools/uiconfig/ui/fileviewmenu.ui
index a63f7061abee..53a1abe337e3 100644
--- a/svtools/uiconfig/ui/fileviewmenu.ui
+++ b/svtools/uiconfig/ui/fileviewmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="fileviewmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Rename</property>
+        <property name="label" translatable="yes" context="fileviewmenu|rename">_Rename</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui
index 9dba2f2709a1..65eea459fdd7 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -28,13 +28,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">pixels/cm</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore1">pixels/cm</col>
       </row>
       <row>
-        <col id="0" translatable="yes">pixels/inch</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore1">pixels/inch</col>
       </row>
       <row>
-        <col id="0" translatable="yes">pixels/meter</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore1">pixels/meter</col>
       </row>
     </data>
   </object>
@@ -45,26 +45,26 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">inches</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore2">inches</col>
       </row>
       <row>
-        <col id="0" translatable="yes">cm</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore2">cm</col>
       </row>
       <row>
-        <col id="0" translatable="yes">mm</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore2">mm</col>
       </row>
       <row>
-        <col id="0" translatable="yes">points</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore2">points</col>
       </row>
       <row>
-        <col id="0" translatable="yes">pixels</col>
+        <col id="0" translatable="yes" context="graphicexport|liststore2">pixels</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="GraphicExportDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%1 Options</property>
+    <property name="title" translatable="yes" context="graphicexport|GraphicExportDialog">%1 Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -156,7 +156,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Width:</property>
+                            <property name="label" translatable="yes" context="graphicexport|label5">Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">widthmf-nospin</property>
                             <property name="xalign">1</property>
@@ -170,7 +170,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Height:</property>
+                            <property name="label" translatable="yes" context="graphicexport|label6">Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">heightmf-nospin</property>
                             <property name="xalign">1</property>
@@ -184,7 +184,7 @@
                           <object class="GtkLabel" id="resolutionft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Resolution:</property>
+                            <property name="label" translatable="yes" context="graphicexport|resolutionft">Resolution:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">resolutionmf-nospin</property>
                             <property name="xalign">1</property>
@@ -268,7 +268,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Size</property>
+                    <property name="label" translatable="yes" context="graphicexport|label1">Size</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -304,7 +304,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Color Depth</property>
+                    <property name="label" translatable="yes" context="graphicexport|label2">Color Depth</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -367,7 +367,7 @@
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Quality</property>
+                    <property name="label" translatable="yes" context="graphicexport|label9">Quality</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -430,7 +430,7 @@
                   <object class="GtkLabel" id="label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Compression</property>
+                    <property name="label" translatable="yes" context="graphicexport|label">Compression</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -456,7 +456,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="rlecb">
-                        <property name="label" translatable="yes">RLE encoding</property>
+                        <property name="label" translatable="yes" context="graphicexport|rlecb">RLE encoding</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -471,7 +471,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Compression</property>
+                    <property name="label" translatable="yes" context="graphicexport|label3">Compression</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -497,7 +497,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="interlacedcb">
-                        <property name="label" translatable="yes">Interlaced</property>
+                        <property name="label" translatable="yes" context="graphicexport|interlacedcb">Interlaced</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -512,7 +512,7 @@
                   <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Mode</property>
+                    <property name="label" translatable="yes" context="graphicexport|label12">Mode</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -538,7 +538,7 @@
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkCheckButton" id="savetransparencycb">
-                        <property name="label" translatable="yes">Save transparency</property>
+                        <property name="label" translatable="yes" context="graphicexport|savetransparencycb">Save transparency</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -553,7 +553,7 @@
                   <object class="GtkLabel" id="labe">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Drawing Objects</property>
+                    <property name="label" translatable="yes" context="graphicexport|labe">Drawing Objects</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -583,7 +583,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="binarycb">
-                            <property name="label" translatable="yes">Binary</property>
+                            <property name="label" translatable="yes" context="graphicexport|binarycb">Binary</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -598,7 +598,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="textcb">
-                            <property name="label" translatable="yes">Text</property>
+                            <property name="label" translatable="yes" context="graphicexport|textcb">Text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -620,7 +620,7 @@
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Encoding</property>
+                    <property name="label" translatable="yes" context="graphicexport|label16">Encoding</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -654,7 +654,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" id="tiffpreviewcb">
-                                <property name="label" translatable="yes">Image preview (TIFF)</property>
+                                <property name="label" translatable="yes" context="graphicexport|tiffpreviewcb">Image preview (TIFF)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -669,7 +669,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="epsipreviewcb">
-                                <property name="label" translatable="yes">Interchange (EPSI)</property>
+                                <property name="label" translatable="yes" context="graphicexport|epsipreviewcb">Interchange (EPSI)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -689,7 +689,7 @@
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Preview</property>
+                        <property name="label" translatable="yes" context="graphicexport|label17">Preview</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -719,7 +719,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="color1rb">
-                                <property name="label" translatable="yes">Color</property>
+                                <property name="label" translatable="yes" context="graphicexport|color1rb">Color</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -734,7 +734,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="color2rb">
-                                <property name="label" translatable="yes">Grayscale</property>
+                                <property name="label" translatable="yes" context="graphicexport|color2rb">Grayscale</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -756,7 +756,7 @@
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Color Format</property>
+                        <property name="label" translatable="yes" context="graphicexport|label18">Color Format</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -786,7 +786,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="level1rb">
-                                <property name="label" translatable="yes">Level 1</property>
+                                <property name="label" translatable="yes" context="graphicexport|level1rb">Level 1</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -801,7 +801,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="level2rb">
-                                <property name="label" translatable="yes">Level 2</property>
+                                <property name="label" translatable="yes" context="graphicexport|level2rb">Level 2</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -823,7 +823,7 @@
                       <object class="GtkLabel" id="label19">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Version</property>
+                        <property name="label" translatable="yes" context="graphicexport|label19">Version</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -853,7 +853,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="compresslzw">
-                                <property name="label" translatable="yes">LZW encoding</property>
+                                <property name="label" translatable="yes" context="graphicexport|compresslzw">LZW encoding</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -868,7 +868,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="compressnone">
-                                <property name="label" translatable="yes">None</property>
+                                <property name="label" translatable="yes" context="graphicexport|compressnone">None</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -890,7 +890,7 @@
                       <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Compression</property>
+                        <property name="label" translatable="yes" context="graphicexport|label20">Compression</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -936,7 +936,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Information</property>
+                    <property name="label" translatable="yes" context="graphicexport|label4">Information</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svtools/uiconfig/ui/javadisableddialog.ui b/svtools/uiconfig/ui/javadisableddialog.ui
index eb2eecb73d51..bc2d7b250207 100644
--- a/svtools/uiconfig/ui/javadisableddialog.ui
+++ b/svtools/uiconfig/ui/javadisableddialog.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="JavaDisabledDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Enable JRE?</property>
+    <property name="title" translatable="yes" context="javadisableddialog|JavaDisabledDialog">Enable JRE?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?</property>
+    <property name="text" translatable="yes" context="javadisableddialog|JavaDisabledDialog">%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index b0cb09781631..69ca0d8f97dc 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">65535</property>
@@ -19,16 +19,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">WebDAV</col>
+        <col id="0" translatable="yes" context="placeedit|liststore1">WebDAV</col>
       </row>
       <row>
-        <col id="0" translatable="yes">FTP</col>
+        <col id="0" translatable="yes" context="placeedit|liststore1">FTP</col>
       </row>
       <row>
-        <col id="0" translatable="yes">SSH</col>
+        <col id="0" translatable="yes" context="placeedit|liststore1">SSH</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Windows Share</col>
+        <col id="0" translatable="yes" context="placeedit|liststore1">Windows Share</col>
       </row>
     </data>
   </object>
@@ -36,7 +36,7 @@
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">File Services</property>
+    <property name="title" translatable="yes" context="placeedit|PlaceEditDialog">File Services</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -127,7 +127,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Type:</property>
+                <property name="label" translatable="yes" context="placeedit|typeLabel">Type:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">type</property>
               </object>
@@ -172,7 +172,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Host:</property>
+                <property name="label" translatable="yes" context="placeedit|hostLabel">Host:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">host</property>
               </object>
@@ -186,7 +186,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Root:</property>
+                <property name="label" translatable="yes" context="placeedit|pathLabel">Root:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">path</property>
               </object>
@@ -212,7 +212,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Share:</property>
+                <property name="label" translatable="yes" context="placeedit|shareLabel">Share:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">share</property>
               </object>
@@ -238,7 +238,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Repository:</property>
+                <property name="label" translatable="yes" context="placeedit|repositoryLabel">Repository:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">repositories</property>
               </object>
@@ -249,7 +249,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="webdavs">
-                <property name="label" translatable="yes">Secure connection</property>
+                <property name="label" translatable="yes" context="placeedit|webdavs">Secure connection</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="hexpand">True</property>
@@ -266,7 +266,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">User:</property>
+                <property name="label" translatable="yes" context="placeedit|loginLabel">User:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">login</property>
               </object>
@@ -292,7 +292,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Label:</property>
+                <property name="label" translatable="yes" context="placeedit|nameLabel">Label:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -336,7 +336,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Port:</property>
+                    <property name="label" translatable="yes" context="placeedit|portLabel">Port:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">port-nospin</property>
                   </object>
@@ -411,7 +411,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Password:</property>
+                <property name="label" translatable="yes" context="placeedit|passwordLabel">Password:</property>
                 <property name="mnemonic_widget">password</property>
               </object>
               <packing>
@@ -433,7 +433,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="rememberPassword">
-                <property name="label" translatable="yes">Remember password</property>
+                <property name="label" translatable="yes" context="placeedit|rememberPassword">Remember password</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/svtools/uiconfig/ui/printersetupdialog.ui b/svtools/uiconfig/ui/printersetupdialog.ui
index 56f5227ba966..7cc0d9b6b15d 100644
--- a/svtools/uiconfig/ui/printersetupdialog.ui
+++ b/svtools/uiconfig/ui/printersetupdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PrinterSetupDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Printer Setup</property>
+    <property name="title" translatable="yes" context="printersetupdialog|PrinterSetupDialog">Printer Setup</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">Options...</property>
+                <property name="label" translatable="yes" context="printersetupdialog|options">Options...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -108,7 +108,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Name:</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|label2">Name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">name</property>
                       </object>
@@ -122,7 +122,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Status:</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|label3">Status:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -134,7 +134,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Type:</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|label4">Type:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -146,7 +146,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Location:</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|label5">Location:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -158,7 +158,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Comment:</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|label6">Comment:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -215,7 +215,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="properties">
-                        <property name="label" translatable="yes">Properties...</property>
+                        <property name="label" translatable="yes" context="printersetupdialog|properties">Properties...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -244,7 +244,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Printer</property>
+                <property name="label" translatable="yes" context="printersetupdialog|label1">Printer</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svtools/uiconfig/ui/querydeletedialog.ui b/svtools/uiconfig/ui/querydeletedialog.ui
index 624c8d2d1f75..1168f0da5091 100644
--- a/svtools/uiconfig/ui/querydeletedialog.ui
+++ b/svtools/uiconfig/ui/querydeletedialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Confirm Delete</property>
+    <property name="title" translatable="yes" context="querydeletedialog|QueryDeleteDialog">Confirm Delete</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Are you sure you want to delete the selected data?</property>
-    <property name="secondary_text" translatable="yes">Entry: %s</property>
+    <property name="text" translatable="yes" context="querydeletedialog|QueryDeleteDialog">Are you sure you want to delete the selected data?</property>
+    <property name="secondary_text" translatable="yes" context="querydeletedialog|QueryDeleteDialog">Entry: %s</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
             <property name="layout_style">center</property>
             <child>
               <object class="GtkButton" id="yes">
-                <property name="label" translatable="yes">_Delete</property>
+                <property name="label" translatable="yes" context="querydeletedialog|yes">_Delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -39,7 +39,7 @@
             </child>
             <child>
               <object class="GtkButton" id="all">
-                <property name="label" translatable="yes">Delete _All</property>
+                <property name="label" translatable="yes" context="querydeletedialog|all">Delete _All</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkButton" id="no">
-                <property name="label" translatable="yes">Do _Not Delete</property>
+                <property name="label" translatable="yes" context="querydeletedialog|no">Do _Not Delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index 3edc5ccba028..70a7853acd04 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="RestartDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Restart %PRODUCTNAME</property>
+    <property name="title" translatable="yes" context="restartdialog|RestartDialog">Restart %PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -20,7 +20,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="yes">
-                <property name="label" translatable="yes">Restart Now</property>
+                <property name="label" translatable="yes" context="restartdialog|yes">Restart Now</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="no">
-                <property name="label" translatable="yes">Restart Later</property>
+                <property name="label" translatable="yes" context="restartdialog|no">Restart Later</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -64,7 +64,7 @@
               <object class="GtkLabel" id="reason_java">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_java">For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">30</property>
                 <property name="xalign">0</property>
@@ -79,7 +79,7 @@
               <object class="GtkLabel" id="reason_mailmerge_install">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For mail merge to work properly, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_mailmerge_install">For mail merge to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -94,7 +94,7 @@
               <object class="GtkLabel" id="reason_pdf">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the modified default print job format to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_pdf">For the modified default print job format to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -109,7 +109,7 @@
               <object class="GtkLabel" id="reason_bibliography_install">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the bibliography to work properly, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_bibliography_install">For the bibliography to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="reason_assigning_folders">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the assigned folders and archives to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_assigning_folders">For the assigned folders and archives to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="reason_assigning_javaparameters">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the assigned Java parameters to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_assigning_javaparameters">For the assigned Java parameters to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="reason_adding_path">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the added path to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_adding_path">For the added path to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -169,7 +169,7 @@
               <object class="GtkLabel" id="reason_language_change">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the updated language settings to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_language_change">For the updated language settings to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -184,7 +184,7 @@
               <object class="GtkLabel" id="reason_exp_features">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the modified experimental features to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_exp_features">For the modified experimental features to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -199,7 +199,7 @@
               <object class="GtkLabel" id="reason_extension_install">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the extension to work properly, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_extension_install">For the extension to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -214,7 +214,7 @@
               <object class="GtkLabel" id="reason_opengl">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">For the OpenGL changes to take effect, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_opengl">For the OpenGL changes to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
@@ -229,7 +229,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Do you want to restart %PRODUCTNAME now?</property>
+                <property name="label" translatable="yes" context="restartdialog|label">Do you want to restart %PRODUCTNAME now?</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
               </object>
diff --git a/svtools/uiconfig/ui/wizarddialog.ui b/svtools/uiconfig/ui/wizarddialog.ui
index 73e89d2826f3..3cbb27f4829e 100644
--- a/svtools/uiconfig/ui/wizarddialog.ui
+++ b/svtools/uiconfig/ui/wizarddialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svt">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="WizardDialog">
     <property name="can_focus">False</property>
diff --git a/svx/AllLangMoTarget_svx.mk b/svx/AllLangMoTarget_svx.mk
new file mode 100644
index 000000000000..b1fa1c861cc5
--- /dev/null
+++ b/svx/AllLangMoTarget_svx.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,svx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
deleted file mode 100644
index 6b98d1c85f46..000000000000
--- a/svx/AllLangResTarget_gal.mk
+++ /dev/null
@@ -1,39 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,gal))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,gal,svx))
-
-$(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal))
-
-$(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
-
-$(eval $(call gb_SrsTarget_set_include,svx/gal,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/svx/source/gallery2 \
-    -I$(SRCDIR)/svx/inc/ \
-))
-
-$(eval $(call gb_SrsTarget_add_files,svx/gal,\
-    svx/source/gallery2/gallery.src \
-    svx/source/gallery2/galtheme.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
deleted file mode 100644
index 5ff57a54ea65..000000000000
--- a/svx/AllLangResTarget_svx.mk
+++ /dev/null
@@ -1,80 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,svx))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
-
-$(eval $(call gb_AllLangResTarget_add_srs,svx,\
-    svx/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,svx/res))
-
-$(eval $(call gb_SrsTarget_set_include,svx/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/source/dialog \
-    -I$(SRCDIR)/svx/inc/ \
-))
-
-$(eval $(call gb_SrsTarget_add_files,svx/res,\
-    svx/source/accessibility/accessibility.src \
-    svx/source/core/graphichelper.src \
-    svx/source/dialog/bmpmask.src \
-    svx/source/dialog/compressgraphicdialog.src \
-    svx/source/dialog/dlgctrl.src \
-    svx/source/dialog/docrecovery.src \
-    svx/source/dialog/frmsel.src \
-    svx/source/dialog/language.src \
-    svx/source/dialog/page.src \
-    svx/source/dialog/numberingtype.src \
-    svx/source/dialog/passwd.src \
-    svx/source/dialog/prtqry.src \
-    svx/source/dialog/ruler.src \
-    svx/source/dialog/spacing.src \
-    svx/source/dialog/SafeMode.src \
-    svx/source/dialog/samecontent.src \
-    svx/source/dialog/sdstring.src \
-    svx/source/dialog/srchdlg.src \
-    svx/source/dialog/svxbmpnumvalueset.src \
-    svx/source/dialog/swframeposstrings.src \
-    svx/source/dialog/txenctab.src \
-    svx/source/dialog/ucsubset.src \
-    svx/source/engine3d/float3d.src \
-    svx/source/engine3d/string3d.src \
-    svx/source/form/datanavi.src \
-    svx/source/form/fmstring.src \
-    svx/source/items/svxerr.src \
-    svx/source/items/svxitems.src \
-    svx/source/stbctrls/stbctrls.src \
-    svx/source/svdraw/svdstr.src \
-    svx/source/table/table.src \
-    svx/source/tbxctrls/colrctrl.src \
-    svx/source/tbxctrls/extrusioncontrols.src \
-    svx/source/tbxctrls/fontworkgallery.src \
-    svx/source/tbxctrls/grafctrl.src \
-    svx/source/tbxctrls/lboxctrl.src \
-    svx/source/tbxctrls/tbcontrl.src \
-    svx/source/tbxctrls/tbunosearchcontrollers.src \
-    svx/source/toolbars/extrusionbar.src \
-    svx/source/toolbars/fontworkbar.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 18cc965ff8dd..5bfbf899034d 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -483,7 +483,4 @@ $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
     -I$(SRCDIR)/sfx2/sdi \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,svxcore,svx))
-
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 50a9abc18069..da7c3b2aba8f 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -23,12 +23,11 @@ $(eval $(call gb_Module_add_targets,svx,\
     Library_svx \
     Library_svxcore \
     Library_textconversiondlgs \
+    UIConfig_svx \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,svx,\
-    AllLangResTarget_svx \
-    AllLangResTarget_gal \
-    UIConfig_svx \
+    AllLangMoTarget_svx \
 ))
 
 $(eval $(call gb_Module_add_check_targets,svx,\
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
deleted file mode 100644
index 3fd1d8b4ee6b..000000000000
--- a/svx/inc/accessibility.hrc
+++ /dev/null
@@ -1,74 +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_SVX_INC_ACCESSIBILITY_HRC
-#define INCLUDED_SVX_INC_ACCESSIBILITY_HRC
-
-#include <svx/dialogs.hrc>
-
-#define RID_SVXSTR_A11Y_3D_MATERIAL_COLOR       (RID_SVXSTR_ACCESSIBILITY_START + 1)
-#define RID_SVXSTR_A11Y_FILLSTYLE_NONE          (RID_SVXSTR_ACCESSIBILITY_START + 4)
-#define RID_SVXSTR_A11Y_FILLSTYLE_SOLID         (RID_SVXSTR_ACCESSIBILITY_START + 5)
-#define RID_SVXSTR_A11Y_FILLSTYLE_HATCH         (RID_SVXSTR_ACCESSIBILITY_START + 6)
-#define RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT      (RID_SVXSTR_ACCESSIBILITY_START + 7)
-#define RID_SVXSTR_A11Y_FILLSTYLE_BITMAP        (RID_SVXSTR_ACCESSIBILITY_START + 8)
-#define RID_SVXSTR_A11Y_WITH                    (RID_SVXSTR_ACCESSIBILITY_START + 9)
-#define RID_SVXSTR_A11Y_STYLE                   (RID_SVXSTR_ACCESSIBILITY_START + 10)
-#define RID_SVXSTR_A11Y_AND                     (RID_SVXSTR_ACCESSIBILITY_START + 11)
-
-// SvxRectCtl & children
-#define RID_SVXSTR_RECTCTL_ACC_START            (RID_SVXSTR_ACCESSIBILITY_START + 20)
-#define RID_SVXSTR_RECTCTL_ACC_CORN_NAME        (RID_SVXSTR_RECTCTL_ACC_START + 0)
-#define RID_SVXSTR_RECTCTL_ACC_CORN_DESCR       (RID_SVXSTR_RECTCTL_ACC_START + 1)
-#define RID_SVXSTR_RECTCTL_ACC_ANGL_NAME        (RID_SVXSTR_RECTCTL_ACC_START + 2)
-#define RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR       (RID_SVXSTR_RECTCTL_ACC_START + 3)
-
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_LT          (RID_SVXSTR_RECTCTL_ACC_START + 4)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_MT          (RID_SVXSTR_RECTCTL_ACC_START + 5)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_RT          (RID_SVXSTR_RECTCTL_ACC_START + 6)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_LM          (RID_SVXSTR_RECTCTL_ACC_START + 7)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_MM          (RID_SVXSTR_RECTCTL_ACC_START + 8)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_RM          (RID_SVXSTR_RECTCTL_ACC_START + 9)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_LB          (RID_SVXSTR_RECTCTL_ACC_START + 10)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_MB          (RID_SVXSTR_RECTCTL_ACC_START + 11)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_RB          (RID_SVXSTR_RECTCTL_ACC_START + 12)
-
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A000        (RID_SVXSTR_RECTCTL_ACC_START + 13)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A045        (RID_SVXSTR_RECTCTL_ACC_START + 14)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A090        (RID_SVXSTR_RECTCTL_ACC_START + 15)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A135        (RID_SVXSTR_RECTCTL_ACC_START + 16)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A180        (RID_SVXSTR_RECTCTL_ACC_START + 17)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A225        (RID_SVXSTR_RECTCTL_ACC_START + 18)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A270        (RID_SVXSTR_RECTCTL_ACC_START + 19)
-#define RID_SVXSTR_RECTCTL_ACC_CHLD_A315        (RID_SVXSTR_RECTCTL_ACC_START + 20)
-#define RID_SVXSTR_RECTCTL_ACC_END              (RID_SVXSTR_RECTCTL_ACC_START + 21)
-
-// SvxGraphCtrlAccessibleContext
-#define RID_SVXSTR_GRAPHCTRL_ACC_START          (RID_SVXSTR_RECTCTL_ACC_END)
-#define RID_SVXSTR_GRAPHCTRL_ACC_NAME           (RID_SVXSTR_GRAPHCTRL_ACC_START + 0)
-#define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION    (RID_SVXSTR_GRAPHCTRL_ACC_START + 1)
-
-// SvxShowCharSetAcc
-#define RID_SVXSTR_CHARACTER_SELECTION          (RID_SVXSTR_ACCESSIBILITY_START + 80)
-#define RID_SVXSTR_CHARACTER_CODE               (RID_SVXSTR_ACCESSIBILITY_START + 81)
-#define RID_SVXSTR_CHAR_SEL_DESC                (RID_SVXSTR_ACCESSIBILITY_START + 82)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/fieldunit.hrc b/svx/inc/fieldunit.hrc
new file mode 100644
index 000000000000..829d14750f3b
--- /dev/null
+++ b/svx/inc/fieldunit.hrc
@@ -0,0 +1,45 @@
+/* -*- 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_SVX_INC_PAGE_HRC
+#define INCLUDED_SVX_INC_PAGE_HRC
+
+#include <tools/fldunit.hxx>
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, FieldUnit> RID_SVXSTR_FIELDUNIT_TABLE[] =
+{
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Millimeter") , FUNIT_MM },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Centimeter") , FUNIT_CM },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Meter") , FUNIT_M },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Kilometer") , FUNIT_KM },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Inch") , FUNIT_INCH },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Foot") , FUNIT_FOOT },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Miles") , FUNIT_MILE },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Pica") , FUNIT_PICA },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Point") , FUNIT_POINT },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Char") , FUNIT_CHAR },
+    { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Line") , FUNIT_LINE },
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/fmstring.hrc b/svx/inc/fmstring.hrc
new file mode 100644
index 000000000000..3b4c9b07fe4a
--- /dev/null
+++ b/svx/inc/fmstring.hrc
@@ -0,0 +1,55 @@
+/* -*- 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_SVX_INC_FMSTRING_HRC
+#define INCLUDED_SVX_INC_FMSTRING_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_RSC_SQL_INTERNATIONAL[] =
+{
+    NC_("RID_RSC_SQL_INTERNATIONAL", "LIKE"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "NOT"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "EMPTY"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "TRUE"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "FALSE"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "IS"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "BETWEEN"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "OR"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "AND"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Average"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Count"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Maximum"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Minimum"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Sum"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Every"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Any"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Some"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "STDDEV_POP"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "STDDEV_SAMP"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "VAR_SAMP"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "VAR_POP"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Collect"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Fusion"),
+    NC_("RID_RSC_SQL_INTERNATIONAL", "Intersection")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/frmsel.hrc b/svx/inc/frmsel.hrc
new file mode 100644
index 000000000000..8b3e0fb25e4d
--- /dev/null
+++ b/svx/inc/frmsel.hrc
@@ -0,0 +1,55 @@
+/* -*- 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_SVX_INC_FRMSEL_HRC
+#define INCLUDED_SVX_INC_FRMSEL_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+std::pair<const char*, sal_uInt16> RID_SVXSTR_FRMSEL_TEXTS[] =
+{
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Border setting") , 0 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Left border line") , 1 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Right border line") , 2 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Top border line") , 3 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Bottom border line") , 4 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Horizontal border line") , 5 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Vertical border line") , 6 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Diagonal border line from top left to bottom right") , 7 },
+    { NC_("RID_SVXSTR_FRMSEL_TEXTS", "Diagonal border line from bottom left to top right") , 8 },
+};
+
+std::pair<const char*, sal_uInt16> RID_SVXSTR_FRMSEL_DESCRIPTIONS[] =
+{
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Border setting") , 0 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Left border line") , 1 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Right border line") , 2 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Top border line") , 3 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Bottom border line") , 4 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Horizontal border line") , 5 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Vertical border line") , 6 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Diagonal border line from top left to bottom right") , 7 },
+    { NC_("RID_SVXSTR_FRMSEL_DESCRIPTIONS", "Diagonal border line from bottom left to top right") , 8 },
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
deleted file mode 100644
index 79415e4ba177..000000000000
--- a/svx/inc/gallery.hrc
+++ /dev/null
@@ -1,36 +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_SVX_INC_GALLERY_HRC
-#define INCLUDED_SVX_INC_GALLERY_HRC
-
-#include <svx/dialogs.hrc>
-#include "galtheme.hrc"
-
-// Gallery-Strings
-#define RID_SVXSTR_GALLERY_FILTER               (RID_SVX_GALLERY_START + 26)
-#define RID_SVXSTR_GALLERY_NEWTHEME             (RID_SVX_GALLERY_START + 32)
-#define RID_SVXSTR_GALLERY_CREATETHEME          (RID_SVX_GALLERY_START + 42)
-#define RID_SVXSTR_GALLERY_TITLE                (RID_SVX_GALLERY_START + 84)
-#define RID_SVXSTR_GALLERY_ICONVIEW             (RID_SVX_GALLERY_START + 86)
-#define RID_SVXSTR_GALLERY_LISTVIEW             (RID_SVX_GALLERY_START + 87)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
deleted file mode 100644
index 0b08a9ccb0f0..000000000000
--- a/svx/inc/galtheme.hrc
+++ /dev/null
@@ -1,80 +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_SVX_INC_GALTHEME_HRC
-#define INCLUDED_SVX_INC_GALTHEME_HRC
-
-#define RID_GALLERYSTR_THEME_START          (6000)
-
-// ATTENTION: This list has to be in sync with
-//  * include/svx/gallery.hxx
-//  * share/gallery (theme files are identified by id)
-//
-// These defines are used to map gallery names to translated string resources. Since
-// galleries may be copied from older offices to newer, do *never* change this
-// IDs except adding new ones (and adapting RID_GALLERYSTR_THEME_LAST). The ID
-// *is* written into the binary file *.thm (which is a gallery theme combined of
-// three files, *.thm, *.sdv and *.sdg)
-
-#define RID_GALLERYSTR_THEME_3D             (RID_GALLERYSTR_THEME_START + 1)
-#define RID_GALLERYSTR_THEME_ANIMATIONS                 (RID_GALLERYSTR_THEME_START + 2)
-#define RID_GALLERYSTR_THEME_BULLETS                    (RID_GALLERYSTR_THEME_START + 3)
-#define RID_GALLERYSTR_THEME_OFFICE                     (RID_GALLERYSTR_THEME_START + 4)
-#define RID_GALLERYSTR_THEME_FLAGS          (RID_GALLERYSTR_THEME_START + 5)
-#define RID_GALLERYSTR_THEME_FLOWCHARTS                 (RID_GALLERYSTR_THEME_START + 6)
-#define RID_GALLERYSTR_THEME_EMOTICONS                  (RID_GALLERYSTR_THEME_START + 7)
-#define RID_GALLERYSTR_THEME_PHOTOS         (RID_GALLERYSTR_THEME_START + 8)
-#define RID_GALLERYSTR_THEME_BACKGROUNDS                (RID_GALLERYSTR_THEME_START + 9)
-#define RID_GALLERYSTR_THEME_HOMEPAGE                   (RID_GALLERYSTR_THEME_START + 10)
-#define RID_GALLERYSTR_THEME_INTERACTION                (RID_GALLERYSTR_THEME_START + 11)
-#define RID_GALLERYSTR_THEME_MAPS           (RID_GALLERYSTR_THEME_START + 12)
-#define RID_GALLERYSTR_THEME_PEOPLE                     (RID_GALLERYSTR_THEME_START + 13)
-#define RID_GALLERYSTR_THEME_SURFACES                   (RID_GALLERYSTR_THEME_START + 14)
-#define RID_GALLERYSTR_THEME_SOUNDS         (RID_GALLERYSTR_THEME_START + 18)
-#define RID_GALLERYSTR_THEME_SYMBOLS                    (RID_GALLERYSTR_THEME_START + 19)
-#define RID_GALLERYSTR_THEME_MYTHEME                    (RID_GALLERYSTR_THEME_START + 20)
-
-#define RID_GALLERYSTR_THEME_ARROWS                     (RID_GALLERYSTR_THEME_START + 22)
-#define RID_GALLERYSTR_THEME_BALLOONS                   (RID_GALLERYSTR_THEME_START + 23)
-#define RID_GALLERYSTR_THEME_KEYBOARD                   (RID_GALLERYSTR_THEME_START + 24)
-#define RID_GALLERYSTR_THEME_TIME                       (RID_GALLERYSTR_THEME_START + 25)
-#define RID_GALLERYSTR_THEME_PRESENTATION               (RID_GALLERYSTR_THEME_START + 26)
-#define RID_GALLERYSTR_THEME_CALENDAR                   (RID_GALLERYSTR_THEME_START + 27)
-#define RID_GALLERYSTR_THEME_NAVIGATION                 (RID_GALLERYSTR_THEME_START + 28)
-#define RID_GALLERYSTR_THEME_COMMUNICATION              (RID_GALLERYSTR_THEME_START + 29)
-#define RID_GALLERYSTR_THEME_FINANCES                   (RID_GALLERYSTR_THEME_START + 30)
-#define RID_GALLERYSTR_THEME_COMPUTER                   (RID_GALLERYSTR_THEME_START + 31)
-
-#define RID_GALLERYSTR_THEME_CLIMA                      (RID_GALLERYSTR_THEME_START + 32)
-#define RID_GALLERYSTR_THEME_EDUCATION                  (RID_GALLERYSTR_THEME_START + 33)
-#define RID_GALLERYSTR_THEME_TROUBLE                    (RID_GALLERYSTR_THEME_START + 34)
-#define RID_GALLERYSTR_THEME_SCREENBEANS                (RID_GALLERYSTR_THEME_START + 35)
-
-#define RID_GALLERYSTR_THEME_COMPUTERS            (RID_GALLERYSTR_THEME_START + 39)
-#define RID_GALLERYSTR_THEME_DIAGRAMS             (RID_GALLERYSTR_THEME_START + 40)
-#define RID_GALLERYSTR_THEME_ENVIRONMENT          (RID_GALLERYSTR_THEME_START + 41)
-#define RID_GALLERYSTR_THEME_FINANCE              (RID_GALLERYSTR_THEME_START + 42)
-#define RID_GALLERYSTR_THEME_TRANSPORT            (RID_GALLERYSTR_THEME_START + 43)
-#define RID_GALLERYSTR_THEME_TXTSHAPES            (RID_GALLERYSTR_THEME_START + 44)
-
-#define RID_GALLERYSTR_THEME_FIRST          RID_GALLERYSTR_THEME_3D
-#define RID_GALLERYSTR_THEME_LAST           RID_GALLERYSTR_THEME_TXTSHAPES
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/numberingtype.hrc b/svx/inc/numberingtype.hrc
new file mode 100644
index 000000000000..9538baef14e3
--- /dev/null
+++ b/svx/inc/numberingtype.hrc
@@ -0,0 +1,61 @@
+/* -*- 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_SVX_INC_NUMBERINGTYPE_HRC
+#define INCLUDED_SVX_INC_NUMBERINGTYPE_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RID_SVXSTRARY_NUMBERINGTYPE[] =
+{
+    { "None" ,                                  5/*SVX_NUM_NUMBER_NONE         */ },
+    { "Bullet" ,                                6/*SVX_NUM_CHAR_SPECIAL        */ },
+    { "Graphics" ,                              8/*SVX_NUM_BITMAP              */ },
+    { "Linked graphics" ,                     136/*SVX_NUM_BITMAP|0x80         */ },
+    { "1, 2, 3, ..." ,                          4/*SVX_NUM_ARABIC              */ },
+    { "A, B, C, ..." ,                          0/*SVX_NUM_CHARS_UPPER_LETTER  */ },
+    { "a, b, c, ..." ,                          1/*SVX_NUM_CHARS_LOWER_LETTER  */ },
+    { "I, II, III, ..." ,                       2/*SVX_NUM_ROMAN_UPPER         */ },
+    { "i, ii, iii, ..." ,                       3/*SVX_NUM_ROMAN_LOWER         */ },
+    { "A, .., AA, .., AAA, ..." ,               9/*SVX_NUM_CHARS_UPPER_LETTER_N*/ },
+    { "a, .., aa, .., aaa, ..." ,               10/*SVX_NUM_CHARS_LOWER_LETTER_N*/ },
+    { "Native Numbering" ,                      12 /*NATIVE_NUMBERING                   */ },
+    { "А, Б, .., Аа, Аб, ... (Bulgarian)" ,     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */ },
+    { "а, б, .., аа, аб, ... (Bulgarian)" ,     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */ },
+    { "А, Б, .., Аа, Бб, ... (Bulgarian)" ,     40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG   */ },
+    { "а, б, .., аа, бб, ... (Bulgarian)" ,     41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG   */ },
+    { "А, Б, .., Аа, Аб, ... (Russian)" ,       42 /*CHARS_CYRILLIC_UPPER_LETTER_RU     */ },
+    { "а, б, .., аа, аб, ... (Russian)" ,       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */ },
+    { "А, Б, .., Аа, Бб, ... (Russian)" ,       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */ },
+    { "а, б, .., аа, бб, ... (Russian)" ,       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */ },
+    { "А, Б, .., Аа, Аб, ... (Serbian)" ,       48 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */ },
+    { "а, б, .., аа, аб, ... (Serbian)" ,       49 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */ },
+    { "А, Б, .., Аа, Бб, ... (Serbian)" ,       50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */ },
+    { "а, б, .., аа, бб, ... (Serbian)" ,       51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */ },
+    { "Α, Β, Γ, ... (Greek Upper Letter)",      52 /*CHARS_GREEK_UPPER_LETTER           */ },
+    { "α, β, γ, ... (Greek Lower Letter)",      53 /*CHARS_GREEK_LOWER_LETTER           */ },
+    { "א...י, יא...כ, ..." ,                    56 /*NUMBER_HEBREW                      */ },
+    { "א...ת, אא...תת, ..." ,                   33 /*CHARS_HEBREW                       */ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/page.hrc b/svx/inc/page.hrc
new file mode 100644
index 000000000000..03036b1e095d
--- /dev/null
+++ b/svx/inc/page.hrc
@@ -0,0 +1,99 @@
+/* -*- 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_SVX_INC_PAGE_HRC
+#define INCLUDED_SVX_INC_PAGE_HRC
+
+#include "page.h"
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RID_SVXSTRARY_PAPERSIZE_STD[] =
+{
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A6") , PAPERSIZE_A6 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A5") , PAPERSIZE_A5 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A4") , PAPERSIZE_A4 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A3") , PAPERSIZE_A3 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B6 (ISO)") , PAPERSIZE_B6_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B5 (ISO)") , PAPERSIZE_B5_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B4 (ISO)") , PAPERSIZE_B4_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Letter") , PAPERSIZE_LETTER },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Legal") , PAPERSIZE_LEGAL },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Long Bond") , PAPERSIZE_LEGAL2 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Tabloid") , PAPERSIZE_TABLOID },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B6 (JIS)") , PAPERSIZE_B6_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B5 (JIS)") , PAPERSIZE_B5_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B4 (JIS)") , PAPERSIZE_B4_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "16 Kai") , PAPERSIZE_KAI16},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "32 Kai") , PAPERSIZE_KAI32},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Big 32 Kai") , PAPERSIZE_KAI32BIG},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "User") , PAPERSIZE_USER },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "DL Envelope") , PAPERSIZE_DL },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "C6 Envelope") , PAPERSIZE_C6 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "C6/5 Envelope") , PAPERSIZE_C65 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "C5 Envelope") , PAPERSIZE_C5 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "C4 Envelope") , PAPERSIZE_C4 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#6¾ Envelope") , PAPERSIZE_COM675},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#7¾ (Monarch) Envelope") , PAPERSIZE_MONARCH},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#9 Envelope") , PAPERSIZE_COM9},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#10 Envelope") , PAPERSIZE_COM10},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#11 Envelope") , PAPERSIZE_COM11},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "#12 Envelope") , PAPERSIZE_COM12},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Japanese Postcard") , PAPERSIZE_POSTCARD_JP}
+};
+
+const std::pair<const char*, int> RID_SVXSTRARY_PAPERSIZE_DRAW[] =
+{
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A6") , PAPERSIZE_A6 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A5") , PAPERSIZE_A5 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A4") , PAPERSIZE_A4 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A3") , PAPERSIZE_A3 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A2") , PAPERSIZE_A2 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A1") , PAPERSIZE_A1 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "A0") , PAPERSIZE_A0 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B6 (ISO)") , PAPERSIZE_B6_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B5 (ISO)") , PAPERSIZE_B5_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B4 (ISO)") , PAPERSIZE_B4_ISO },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Letter") , PAPERSIZE_LETTER },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Legal") , PAPERSIZE_LEGAL },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Long Bond") , PAPERSIZE_LEGAL2 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Tabloid") , PAPERSIZE_TABLOID },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B6 (JIS)") , PAPERSIZE_B6_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B5 (JIS)") , PAPERSIZE_B5_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "B4 (JIS)") , PAPERSIZE_B4_JIS },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "16 Kai") , PAPERSIZE_KAI16},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "32 Kai") , PAPERSIZE_KAI32},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Big 32 Kai") , PAPERSIZE_KAI32BIG},
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "User") , PAPERSIZE_USER },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "DL Envelope") , PAPERSIZE_DL },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "C6 Envelope") , PAPERSIZE_C6 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "C6/5 Envelope") , PAPERSIZE_C65 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "C5 Envelope") , PAPERSIZE_C5 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "C4 Envelope") , PAPERSIZE_C4 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Dia Slide") , PAPERSIZE_DIA },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Screen 4:3") , PAPERSIZE_SCREEN_4_3 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Screen 16:9") , PAPERSIZE_SCREEN_16_9 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Screen 16:10") , PAPERSIZE_SCREEN_16_10 },
+    { NC_("RID_SVXSTRARY_PAPERSIZE_DRAW", "Japanese Postcard") , PAPERSIZE_POSTCARD_JP}
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index fb56189ab71b..72422d06817c 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -313,7 +313,6 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index c5f848d6af20..49ee27ea7a1c 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -366,8 +366,6 @@
 #include <libxml/xmlwriter.h>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -421,7 +419,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/svx/inc/samecontent.hrc b/svx/inc/samecontent.hrc
new file mode 100644
index 000000000000..7c7ffe5445f1
--- /dev/null
+++ b/svx/inc/samecontent.hrc
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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_SVX_INC_SPACING_HRC
+#define INCLUDED_SVX_INC_SPACING_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RID_SVXSTRARY_SAMECONTENT[] =
+{
+    { NC_("RID_SVXSTRARY_SAMECONTENT", "All Pages"),                     0 },
+    { NC_("RID_SVXSTRARY_SAMECONTENT", "First Page"),                    1 },
+    { NC_("RID_SVXSTRARY_SAMECONTENT", "Left and Right Pages"),          2 },
+    { NC_("RID_SVXSTRARY_SAMECONTENT", "First, Left and Right Pages"),   3 }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
new file mode 100644
index 000000000000..2e41d505015f
--- /dev/null
+++ b/svx/inc/spacing.hrc
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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_SVX_INC_SPACING_HRC
+#define INCLUDED_SVX_INC_SPACING_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RID_SVXSTRARY_SPACING[] =
+{
+    { NC_("RID_SVXSTRARY_SPACING", "None"),                    0 },
+    { NC_("RID_SVXSTRARY_SPACING", "Extra Small (1/16\")"),   91 },
+    { NC_("RID_SVXSTRARY_SPACING", "Small (1/8\")"),         181 },
+    { NC_("RID_SVXSTRARY_SPACING", "Small Medium (1/4\")"),  363 },
+    { NC_("RID_SVXSTRARY_SPACING", "Medium (3/8\")"),        539 },
+    { NC_("RID_SVXSTRARY_SPACING", "Medium Large (1/2\")"),  720 },
+    { NC_("RID_SVXSTRARY_SPACING", "Large (3/4\")"),        1077 },
+    { NC_("RID_SVXSTRARY_SPACING", "Extra Large (1\")"),    1440 }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index e049c98b8b4f..cb726c172189 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -10,12 +10,218 @@
 #ifndef INCLUDED_SVX_INC_STRINGS_HXX
 #define INCLUDED_SVX_INC_STRINGS_HXX
 
-#define RID_GALLERYSTR_THEME_HTMLBUTTONS        "private://gallery/hidden/HtmlExportButtons"
-#define RID_GALLERYSTR_THEME_POWERPOINT         "private://gallery/hidden/imgppt"
-#define RID_GALLERYSTR_THEME_USERSOUNDS         "private://gallery/hidden/usersounds"
-#define RID_GALLERYSTR_THEME_FONTWORK           "private://gallery/hidden/fontwork"
-#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL  "private://gallery/hidden/fontworkvertical"
-#define RID_GALLERYSTR_THEME_DUMMY5             "Dummy 5"
+#define RID_GALLERYSTR_THEME_HTMLBUTTONS            "private://gallery/hidden/HtmlExportButtons"
+#define RID_GALLERYSTR_THEME_POWERPOINT             "private://gallery/hidden/imgppt"
+#define RID_GALLERYSTR_THEME_RULERS                 "Rulers"
+#define RID_GALLERYSTR_THEME_USERSOUNDS             "private://gallery/hidden/usersounds"
+#define RID_GALLERYSTR_THEME_DUMMY5                 "Dummy 5"
+#define RID_GALLERYSTR_THEME_FONTWORK               "private://gallery/hidden/fontwork"
+#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL      "private://gallery/hidden/fontworkvertical"
+
+// Reference-strings for standardcolor-table
+#define RID_SVXSTR_COLOR_BLACK_DEF                  "Black"
+#define RID_SVXSTR_COLOR_BLUE_DEF                   "Blue"
+#define RID_SVXSTR_COLOR_GREEN_DEF                  "Green"
+#define RID_SVXSTR_COLOR_CYAN_DEF                   "Cyan"
+#define RID_SVXSTR_COLOR_RED_DEF                    "Red"
+#define RID_SVXSTR_COLOR_MAGENTA_DEF                "Magenta"
+#define RID_SVXSTR_COLOR_GREY_DEF                   "Gray"
+#define RID_SVXSTR_COLOR_YELLOW_DEF                 "Yellow"
+#define RID_SVXSTR_COLOR_WHITE_DEF                  "White"
+#define RID_SVXSTR_COLOR_BLUEGREY_DEF               "Blue gray"
+#define RID_SVXSTR_COLOR_ORANGE_DEF                 "Orange"
+#define RID_SVXSTR_COLOR_VIOLET_DEF                 "Violet"
+#define RID_SVXSTR_COLOR_BORDEAUX_DEF               "Bordeaux"
+#define RID_SVXSTR_COLOR_PALE_YELLOW_DEF            "Pale yellow"
+#define RID_SVXSTR_COLOR_PALE_GREEN_DEF             "Pale green"
+#define RID_SVXSTR_COLOR_DARKVIOLET_DEF             "Dark violet"
+#define RID_SVXSTR_COLOR_SALMON_DEF                 "Salmon"
+#define RID_SVXSTR_COLOR_SEABLUE_DEF                "Sea blue"
+#define RID_SVXSTR_COLOR_CHART_DEF                  "Chart"
+#define RID_SVXSTR_COLOR_PURPLE_DEF                 "Purple"
+#define RID_SVXSTR_COLOR_SKYBLUE_DEF                "Sky blue"
+#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF            "Yellow green"
+#define RID_SVXSTR_COLOR_PINK_DEF                   "Pink"
+#define RID_SVXSTR_COLOR_TURQUOISE_DEF              "Turquoise"
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF           "Blue classic"
+// Reference-strings for standard-gradient-table
+#define RID_SVXSTR_GRDT0_DEF                        "Gradient"
+#define RID_SVXSTR_GRDT1_DEF                        "Linear blue/white"
+#define RID_SVXSTR_GRDT2_DEF                        "Linear magenta/green"
+#define RID_SVXSTR_GRDT3_DEF                        "Linear yellow/brown"
+#define RID_SVXSTR_GRDT4_DEF                        "Radial green/black"
+#define RID_SVXSTR_GRDT5_DEF                        "Radial red/yellow"
+#define RID_SVXSTR_GRDT6_DEF                        "Rectangular red/white"
+#define RID_SVXSTR_GRDT7_DEF                        "Square yellow/white"
+#define RID_SVXSTR_GRDT8_DEF                        "Ellipsoid blue grey/light blue"
+#define RID_SVXSTR_GRDT9_DEF                        "Axial light red/white"
+#define RID_SVXSTR_GRDT10_DEF                       "Diagonal 1l"
+#define RID_SVXSTR_GRDT11_DEF                       "Diagonal 1r"
+#define RID_SVXSTR_GRDT12_DEF                       "Diagonal 2l"
+#define RID_SVXSTR_GRDT13_DEF                       "Diagonal 2r"
+#define RID_SVXSTR_GRDT14_DEF                       "Diagonal 3l"
+#define RID_SVXSTR_GRDT15_DEF                       "Diagonal 3r"
+#define RID_SVXSTR_GRDT16_DEF                       "Diagonal 4l"
+#define RID_SVXSTR_GRDT17_DEF                       "Diagonal 4r"
+#define RID_SVXSTR_GRDT18_DEF                       "Diagonal Blue"
+#define RID_SVXSTR_GRDT19_DEF                       "Diagonal Green"
+#define RID_SVXSTR_GRDT20_DEF                       "Diagonal Orange"
+#define RID_SVXSTR_GRDT21_DEF                       "Diagonal Red"
+#define RID_SVXSTR_GRDT22_DEF                       "Diagonal Turquoise"
+#define RID_SVXSTR_GRDT23_DEF                       "Diagonal Violet"
+#define RID_SVXSTR_GRDT24_DEF                       "From a Corner"
+#define RID_SVXSTR_GRDT25_DEF                       "From a Corner, Blue"
+#define RID_SVXSTR_GRDT26_DEF                       "From a Corner, Green"
+#define RID_SVXSTR_GRDT27_DEF                       "From a Corner, Orange"
+#define RID_SVXSTR_GRDT28_DEF                       "From a Corner, Red"
+#define RID_SVXSTR_GRDT29_DEF                       "From a Corner, Turquoise"
+#define RID_SVXSTR_GRDT30_DEF                       "From a Corner, Violet"
+#define RID_SVXSTR_GRDT31_DEF                       "From the Middle"
+#define RID_SVXSTR_GRDT32_DEF                       "From the Middle, Blue"
+#define RID_SVXSTR_GRDT33_DEF                       "From the Middle, Green"
+#define RID_SVXSTR_GRDT34_DEF                       "From the Middle, Orange"
+#define RID_SVXSTR_GRDT35_DEF                       "From the Middle, Red"
+#define RID_SVXSTR_GRDT36_DEF                       "From the Middle, Turquoise"
+#define RID_SVXSTR_GRDT37_DEF                       "From the Middle, Violet"
+#define RID_SVXSTR_GRDT38_DEF                       "Horizontal"
+#define RID_SVXSTR_GRDT39_DEF                       "Horizontal Blue"
+#define RID_SVXSTR_GRDT40_DEF                       "Horizontal Green"
+#define RID_SVXSTR_GRDT41_DEF                       "Horizontal Orange"
+#define RID_SVXSTR_GRDT42_DEF                       "Horizontal Red"
+#define RID_SVXSTR_GRDT43_DEF                       "Horizontal Turquoise"
+#define RID_SVXSTR_GRDT44_DEF                       "Horizontal Violet"
+#define RID_SVXSTR_GRDT45_DEF                       "Radial"
+#define RID_SVXSTR_GRDT46_DEF                       "Radial Blue"
+#define RID_SVXSTR_GRDT47_DEF                       "Radial Green"
+#define RID_SVXSTR_GRDT48_DEF                       "Radial Orange"
+#define RID_SVXSTR_GRDT49_DEF                       "Radial Red"
+#define RID_SVXSTR_GRDT50_DEF                       "Radial Turquoise"
+#define RID_SVXSTR_GRDT51_DEF                       "Radial Violet"
+#define RID_SVXSTR_GRDT52_DEF                       "Vertical"
+#define RID_SVXSTR_GRDT53_DEF                       "Vertical Blue"
+#define RID_SVXSTR_GRDT54_DEF                       "Vertical Green"
+#define RID_SVXSTR_GRDT55_DEF                       "Vertical Orange"
+#define RID_SVXSTR_GRDT56_DEF                       "Vertical Red"
+#define RID_SVXSTR_GRDT57_DEF                       "Vertical Turquoise"
+#define RID_SVXSTR_GRDT58_DEF                       "Vertical Violet"
+#define RID_SVXSTR_GRDT59_DEF                       "Gray Gradient"
+#define RID_SVXSTR_GRDT60_DEF                       "Yellow Gradient"
+#define RID_SVXSTR_GRDT61_DEF                       "Orange Gradient"
+#define RID_SVXSTR_GRDT62_DEF                       "Red Gradient"
+#define RID_SVXSTR_GRDT63_DEF                       "Pink Gradient"
+#define RID_SVXSTR_GRDT64_DEF                       "Sky"
+#define RID_SVXSTR_GRDT65_DEF                       "Cyan Gradient"
+#define RID_SVXSTR_GRDT66_DEF                       "Blue Gradient"
+#define RID_SVXSTR_GRDT67_DEF                       "Purple Pipe"
+#define RID_SVXSTR_GRDT68_DEF                       "Night"
+#define RID_SVXSTR_GRDT69_DEF                       "Green Gradient"
+#define RID_SVXSTR_GRDT70_DEF                       "Tango Green"
+#define RID_SVXSTR_GRDT71_DEF                       "Subtle Tango Green"
+#define RID_SVXSTR_GRDT72_DEF                       "Tango Purple"
+#define RID_SVXSTR_GRDT73_DEF                       "Tango Red"
+#define RID_SVXSTR_GRDT74_DEF                       "Tango Blue"
+#define RID_SVXSTR_GRDT75_DEF                       "Tango Yellow"
+#define RID_SVXSTR_GRDT76_DEF                       "Tango Orange"
+#define RID_SVXSTR_GRDT77_DEF                       "Tango Gray"
+#define RID_SVXSTR_GRDT78_DEF                       "Clay"
+#define RID_SVXSTR_GRDT79_DEF                       "Olive Green"
+#define RID_SVXSTR_GRDT80_DEF                       "Silver"
+#define RID_SVXSTR_GRDT81_DEF                       "Sunburst"
+#define RID_SVXSTR_GRDT82_DEF                       "Brownie"
+#define RID_SVXSTR_GRDT83_DEF                       "Sunset"
+#define RID_SVXSTR_GRDT84_DEF                       "Deep Green"
+#define RID_SVXSTR_GRDT85_DEF                       "Deep Orange"
+#define RID_SVXSTR_GRDT86_DEF                       "Deep Blue"
+#define RID_SVXSTR_GRDT87_DEF                       "Purple Haze"
+// Reference-strings for standard-hatch-table
+#define RID_SVXSTR_HATCH0_DEF                       "Black 45 Degrees Wide"
+#define RID_SVXSTR_HATCH1_DEF                       "Black 45 Degrees"
+#define RID_SVXSTR_HATCH2_DEF                       "Black -45 Degrees"
+#define RID_SVXSTR_HATCH3_DEF                       "Black 90 Degrees"
+#define RID_SVXSTR_HATCH4_DEF                       "Red Crossed 45 Degrees"
+#define RID_SVXSTR_HATCH5_DEF                       "Red Crossed 0 Degrees"
+#define RID_SVXSTR_HATCH6_DEF                       "Blue Crossed 45 Degrees"
+#define RID_SVXSTR_HATCH7_DEF                       "Blue Crossed 0 Degrees"
+#define RID_SVXSTR_HATCH8_DEF                       "Blue Triple 90 Degrees"
+#define RID_SVXSTR_HATCH9_DEF                       "Black 0 Degrees"
+#define RID_SVXSTR_HATCH10_DEF                      "Hatching"
+// Reference-strings for standard-bitmap-table
+#define RID_SVXSTR_BMP0_DEF                         "Empty"
+#define RID_SVXSTR_BMP1_DEF                         "Sky"
+#define RID_SVXSTR_BMP2_DEF                         "Aqua"
+#define RID_SVXSTR_BMP3_DEF                         "Coarse"
+#define RID_SVXSTR_BMP4_DEF                         "Space Metal"
+#define RID_SVXSTR_BMP5_DEF                         "Space"
+#define RID_SVXSTR_BMP6_DEF                         "Metal"
+#define RID_SVXSTR_BMP7_DEF                         "Wet"
+#define RID_SVXSTR_BMP8_DEF                         "Marble"
+#define RID_SVXSTR_BMP9_DEF                         "Linen"
+#define RID_SVXSTR_BMP10_DEF                        "Stone"
+#define RID_SVXSTR_BMP11_DEF                        "Pebbles"
+#define RID_SVXSTR_BMP12_DEF                        "Wall"
+#define RID_SVXSTR_BMP13_DEF                        "Red Wall"
+#define RID_SVXSTR_BMP14_DEF                        "Pattern"
+#define RID_SVXSTR_BMP15_DEF                        "Leaves"
+#define RID_SVXSTR_BMP16_DEF                        "Lawn Artificial"
+#define RID_SVXSTR_BMP17_DEF                        "Daisy"
+#define RID_SVXSTR_BMP18_DEF                        "Orange"
+#define RID_SVXSTR_BMP19_DEF                        "Fiery"
+#define RID_SVXSTR_BMP20_DEF                        "Roses"
+#define RID_SVXSTR_BMP21_DEF                        "Bitmap"
+// Reference-strings for standard-dash-table
+#define RID_SVXSTR_DASH0_DEF                        "Ultrafine Dashed"
+#define RID_SVXSTR_DASH1_DEF                        "Fine Dashed"
+#define RID_SVXSTR_DASH2_DEF                        "Ultrafine 2 Dots 3 Dashes"
+#define RID_SVXSTR_DASH3_DEF                        "Fine Dotted"
+#define RID_SVXSTR_DASH4_DEF                        "Line with Fine Dots"
+#define RID_SVXSTR_DASH5_DEF                        "Fine Dashed (var)"
+#define RID_SVXSTR_DASH6_DEF                        "3 Dashes 3 Dots (var)"
+#define RID_SVXSTR_DASH7_DEF                        "Ultrafine Dotted (var)"
+#define RID_SVXSTR_DASH8_DEF                        "Line Style 9"
+#define RID_SVXSTR_DASH9_DEF                        "2 Dots 1 Dash"
+#define RID_SVXSTR_DASH10_DEF                       "Dashed (var)"
+#define RID_SVXSTR_DASH11_DEF                       "Dash"
+#define RID_SVXSTR_DASH12_DEF                       "Line Style"
+// Reference-strings for standard-line-end-table
+#define RID_SVXSTR_LEND0_DEF                        "Arrow concave"
+#define RID_SVXSTR_LEND1_DEF                        "Square 45"
+#define RID_SVXSTR_LEND2_DEF                        "Small Arrow"
+#define RID_SVXSTR_LEND3_DEF                        "Dimension Lines"
+#define RID_SVXSTR_LEND4_DEF                        "Double Arrow"
+#define RID_SVXSTR_LEND5_DEF                        "Rounded short Arrow"
+#define RID_SVXSTR_LEND6_DEF                        "Symmetric Arrow"
+#define RID_SVXSTR_LEND7_DEF                        "Line Arrow"
+#define RID_SVXSTR_LEND8_DEF                        "Rounded large Arrow"
+#define RID_SVXSTR_LEND9_DEF                        "Circle"
+#define RID_SVXSTR_LEND10_DEF                       "Square"
+#define RID_SVXSTR_LEND11_DEF                       "Arrow"
+#define RID_SVXSTR_LEND12_DEF                       "Short line Arrow"
+#define RID_SVXSTR_LEND13_DEF                       "Triangle unfilled"
+#define RID_SVXSTR_LEND14_DEF                       "Diamond unfilled"
+#define RID_SVXSTR_LEND15_DEF                       "Diamond"
+#define RID_SVXSTR_LEND16_DEF                       "Circle unfilled"
+#define RID_SVXSTR_LEND17_DEF                       "Square 45 unfilled"
+#define RID_SVXSTR_LEND18_DEF                       "Square unfilled"
+#define RID_SVXSTR_LEND19_DEF                       "Half Circle unfilled"
+#define RID_SVXSTR_LEND20_DEF                       "Arrowhead"
+// Reference-strings for standard transparence gradients
+#define RID_SVXSTR_TRASNGR0_DEF                     "Transparency"
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF          "Green 1 (%PRODUCTNAME Main Color)"
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF     "Green Accent"
+#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF      "Blue Accent"
+#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF    "Orange Accent"
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF           "Purple"
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF    "Purple Accent"
+#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF    "Yellow Accent"
+#define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF           "Tango: Butter"
+#define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF           "Tango: Orange"
+#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF        "Tango: Chocolate"
+#define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF        "Tango: Chameleon"
+#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF         "Tango: Sky Blue"
+#define RID_SVXSTR_COLOR_TANGO_PLUM_DEF             "Tango: Plum"
+#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF      "Tango: Scarlet Red"
+#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF        "Tango: Aluminium"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index 972c990b7797..296562342431 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -24,17 +24,12 @@
 #include <sal/config.h>
 #include <svx/svxdllapi.h>
 
-class ResMgr;
-
-// Get the resource manager for the app
-ResMgr* ImpGetResMgr();
-
 // ResourceCache for frequently used strings.
 // Global string resources with the IDs from
 // SDR_StringCacheBegin (256) to SDR_StringCacheEnd
 // are cached.
 // See also SvdStr.Hrc
-SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
+SVX_DLLPUBLIC OUString ImpGetResStr(const char* pResID);
 
 #endif // INCLUDED_SVX_INC_SVDGLOB_HXX
 
diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc
new file mode 100644
index 000000000000..65a80b73d8b7
--- /dev/null
+++ b/svx/inc/svxerr.hrc
@@ -0,0 +1,96 @@
+/* -*- 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_SVX_INC_SVXERR_HRC
+#define INCLUDED_SVX_INC_SVXERR_HRC
+
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#include "svx/svxerr.hxx"
+#include <editeng/editerr.hxx>
+
+// Error-Context ---------------------------------------------------------
+const ErrMsgCode RID_SVXERRCTX[] =
+{
+    { NC_("RID_SVXERRCTX", "$(ERR) executing the thesaurus.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_THESAURUS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCTX", "$(ERR) executing the spellcheck.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_SPELLING) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCTX", "$(ERR) executing the hyphenation.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_HYPHENATION) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCTX", "$(ERR) creating a dictionary.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_DICTIONARY) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCTX", "$(ERR) setting background attribute.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_BACKGROUND) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCTX", "$(ERR) loading the graphics.") ,
+      ErrCode(sal_uInt32(ERRCTX_SVX_IMPORT_GRAPHIC) & ERRCODE_RES_MASK) },
+    { nullptr, ERRCODE_NONE }
+};
+
+// Error-Code ------------------------------------------------------------
+const ErrMsgCode RID_SVXERRCODE[] =
+{
+    { NC_("RID_SVXERRCODE", "No thesaurus available for the current language.\nPlease check your installation and install the desired language.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options -  Language Settings - Writing Aids'."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "Spellcheck is not available.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_LINGUNOTEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "Hyphenation not available.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_HYPHENNOTEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be read.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_DICT_NOTREADABLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be created.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The graphic $(ARG1) could not be found.") ,
+      ErrCode(sal_uInt32(ERRCODE_SVX_GRAPHIC_NOTREADABLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "An unlinked graphic could not be loaded."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "A language has not been fixed for the selected term."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_NOLANGUAGE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The form layer wasn't loaded as the required IO-services (com.sun.star.io.*) could not be instantiated."),
+      ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_NOIOSERVICES) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The form layer wasn't written as the required IO services (com.sun.star.io.*) could not be instantiated."),
+      ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_NOIOSERVICES) | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "An error occurred while reading the form controls. The form layer has not been loaded."),
+      ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_READWRITEFAILED) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "An error occurred while writing the form controls. The form layer has not been saved."),
+      ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_READWRITEFAILED) | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "An error occurred while reading one of the bullets. Not all of the bullets were loaded."),
+      ErrCode((sal_uInt32(ERRCODE_SVX_BULLETITEM_NOBULLET) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_MODIFIED_VBASIC_STORAGE) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The original VBA Basic Code contained in the document will not be saved."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_VBASIC_STORAGE_EXIST) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The password is incorrect. The document cannot be opened."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_WRONGPASS) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The encryption method used in this document is not supported. Only Microsoft Office 97/2000 compatible password encryption is supported."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_READ_FILTER_CRYPT) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "The loading of password-encrypted Microsoft PowerPoint presentations is not supported."),
+      ErrCode(sal_uInt32(ERRCODE_SVX_READ_FILTER_PPOINT) & ERRCODE_RES_MASK) },
+    { NC_("RID_SVXERRCODE", "Password protection is not supported when documents are saved in a Microsoft Office format.\nDo you want to save the document without password protection?"),
+      ErrCode(sal_uInt32(ERRCODE_SVX_EXPORT_FILTER_CRYPT) & ERRCODE_RES_MASK) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
new file mode 100644
index 000000000000..f45b06531478
--- /dev/null
+++ b/svx/inc/swframeposstrings.hrc
@@ -0,0 +1,74 @@
+/* -*- 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_SVX_INC_SWFRAMEPOSSTRINGS_HRC
+#define INCLUDED_SVX_INC_SWFRAMEPOSSTRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+//the following string have to match the (enum values) positions in svx/swframeposstrings.hxx!
+const char* RID_SVXSW_FRAMEPOSITIONS[] =
+{
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Left"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Right"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "From left"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Inside"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Outside"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "From inside"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Paragraph area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Paragraph text area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Left page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Right page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Left paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Right paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Inner page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Outer page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Inner paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Outer paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Entire page"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Base line"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Character"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Row"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Margin"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Paragraph text area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Left frame border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Right frame border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Entire frame"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Frame text area"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Inner frame border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Outer frame border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Top"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Bottom"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Center"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Center"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "From top"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "From bottom"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Below"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "From right"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Top page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Bottom page border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Top paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Bottom paragraph border"),
+    NC_("RID_SVXSW_FRAMEPOSITIONS", "Line of text")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/svx/inc/tabwin.hrc
index 3895d1113fdf..ac0a1221efda 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/svx/inc/tabwin.hrc
@@ -17,13 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DP_CONFIGURATION_HRC
-#define INCLUDED_DP_CONFIGURATION_HRC
+#ifndef INCLUDED_SVX_INC_TABWIN_HRC
+#define INCLUDED_SVX_INC_TABWIN_HRC
 
-#include "deployment.hrc"
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define RID_STR_CONF_SCHEMA                       (RID_DEPLOYMENT_CONF_START+10)
-#define RID_STR_CONF_DATA                         (RID_DEPLOYMENT_CONF_START+11)
+const char* RID_RSC_TABWIN_PREFIX[] =
+{
+    NC_("RID_RSC_TABWIN_PREFIX", "Table"),
+    NC_("RID_RSC_TABWIN_PREFIX", "Query"),
+    NC_("RID_RSC_TABWIN_PREFIX", "SQL")
+};
 
 #endif
 
diff --git a/svx/inc/txenctab.hrc b/svx/inc/txenctab.hrc
new file mode 100644
index 000000000000..6481cb722804
--- /dev/null
+++ b/svx/inc/txenctab.hrc
@@ -0,0 +1,114 @@
+/* -*- 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_SVX_INC_TXENCTAB_HRC
+#define INCLUDED_SVX_INC_TXENCTAB_HRC
+
+#include <rtl/textenc.h>
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// Encodings for which no conversion exist yet are commented out.
+
+const std::pair<const char*, rtl_TextEncoding> RID_SVXSTR_TEXTENCODING_TABLE[] =
+{
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (Windows-1252/WinLatin 1)")           , RTL_TEXTENCODING_MS_1252          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (Apple Macintosh)")                    , RTL_TEXTENCODING_APPLE_ROMAN      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-850/International)")          , RTL_TEXTENCODING_IBM_850          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-437/US)")                     , RTL_TEXTENCODING_IBM_437          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-860/Portuguese)")         , RTL_TEXTENCODING_IBM_860          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-861/Icelandic)")              , RTL_TEXTENCODING_IBM_861          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-863/French (Can.))")  , RTL_TEXTENCODING_IBM_863          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (DOS/OS2-865/Nordic)")             , RTL_TEXTENCODING_IBM_865          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (ASCII/US)")                           , RTL_TEXTENCODING_ASCII_US         },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (ISO-8859-1)")                         , RTL_TEXTENCODING_ISO_8859_1       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (ISO-8859-2)")                         , RTL_TEXTENCODING_ISO_8859_2       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Latin 3 (ISO-8859-3)")                            , RTL_TEXTENCODING_ISO_8859_3       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Baltic (ISO-8859-4)")                         , RTL_TEXTENCODING_ISO_8859_4       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (ISO-8859-5)")                           , RTL_TEXTENCODING_ISO_8859_5       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Arabic (ISO-8859-6)")                             , RTL_TEXTENCODING_ISO_8859_6       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Greek (ISO-8859-7)")                          , RTL_TEXTENCODING_ISO_8859_7       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Hebrew (ISO-8859-8)")                         , RTL_TEXTENCODING_ISO_8859_8       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Turkish (ISO-8859-9)")                            , RTL_TEXTENCODING_ISO_8859_9       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (ISO-8859-14)")                        , RTL_TEXTENCODING_ISO_8859_14      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (ISO-8859-15/EURO)")                   , RTL_TEXTENCODING_ISO_8859_15      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Greek (DOS/OS2-737)")                     , RTL_TEXTENCODING_IBM_737          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Baltic (DOS/OS2-775)")                            , RTL_TEXTENCODING_IBM_775          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (DOS/OS2-852)")                            , RTL_TEXTENCODING_IBM_852          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (DOS/OS2-855)")                      , RTL_TEXTENCODING_IBM_855          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Turkish (DOS/OS2-857)")                           , RTL_TEXTENCODING_IBM_857          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Hebrew (DOS/OS2-862)")                            , RTL_TEXTENCODING_IBM_862          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Arabic (DOS/OS2-864)")                            , RTL_TEXTENCODING_IBM_864          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (DOS/OS2-866/Russian)")              , RTL_TEXTENCODING_IBM_866          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Greek (DOS/OS2-869/Modern)")                  , RTL_TEXTENCODING_IBM_869          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (Windows-1250/WinLatin 2)")                , RTL_TEXTENCODING_MS_1250          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (Windows-1251)")                     , RTL_TEXTENCODING_MS_1251          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Greek (Windows-1253)")                        , RTL_TEXTENCODING_MS_1253          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Turkish (Windows-1254)")                          , RTL_TEXTENCODING_MS_1254          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Hebrew (Windows-1255)")                       , RTL_TEXTENCODING_MS_1255          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Arabic (Windows-1256)")                           , RTL_TEXTENCODING_MS_1256          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Baltic (Windows-1257)")                           , RTL_TEXTENCODING_MS_1257          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Vietnamese (Windows-1258)")                       , RTL_TEXTENCODING_MS_1258          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (Apple Macintosh)")                        , RTL_TEXTENCODING_APPLE_CENTEURO   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (Apple Macintosh/Croatian)")           , RTL_TEXTENCODING_APPLE_CROATIAN   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (Apple Macintosh)")                  , RTL_TEXTENCODING_APPLE_CYRILLIC   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Greek (Apple Macintosh)")                 , RTL_TEXTENCODING_APPLE_GREEK      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Western Europe (Apple Macintosh/Icelandic)")          , RTL_TEXTENCODING_APPLE_ICELAND    },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (Apple Macintosh/Romanian)")           , RTL_TEXTENCODING_APPLE_ROMANIAN   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Turkish (Apple Macintosh)")                       , RTL_TEXTENCODING_APPLE_TURKISH    },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (Apple Macintosh/Ukrainian)")            , RTL_TEXTENCODING_APPLE_UKRAINIAN  },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (Apple Macintosh)")        , RTL_TEXTENCODING_APPLE_CHINSIMP   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (Apple Macintosh)")       , RTL_TEXTENCODING_APPLE_CHINTRAD   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Japanese (Apple Macintosh)")                      , RTL_TEXTENCODING_APPLE_JAPANESE   },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Korean (Apple Macintosh)")                    , RTL_TEXTENCODING_APPLE_KOREAN     },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Japanese (Windows-932)")                          , RTL_TEXTENCODING_MS_932           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (Windows-936)")            , RTL_TEXTENCODING_MS_936           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Korean (Windows-949)")                        , RTL_TEXTENCODING_MS_949           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (Windows-950)")           , RTL_TEXTENCODING_MS_950           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Japanese (Shift-JIS)")                            , RTL_TEXTENCODING_SHIFT_JIS        },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (GB-2312)")                , RTL_TEXTENCODING_GB_2312          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (GB-18030)")               , RTL_TEXTENCODING_GB_18030         },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (GBT-12345)")             , RTL_TEXTENCODING_GBT_12345        },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (GBK/GB-2312-80)")         , RTL_TEXTENCODING_GBK              },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (Big5)")                  , RTL_TEXTENCODING_BIG5             },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (BIG5-HKSCS)")            , RTL_TEXTENCODING_BIG5_HKSCS       },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Japanese (EUC-JP)")                               , RTL_TEXTENCODING_EUC_JP           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (EUC-CN)")                 , RTL_TEXTENCODING_EUC_CN           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese traditional (EUC-TW)")                , RTL_TEXTENCODING_EUC_TW           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Japanese (ISO-2022-JP)")                         , RTL_TEXTENCODING_ISO_2022_JP      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Chinese simplified (ISO-2022-CN)")            , RTL_TEXTENCODING_ISO_2022_CN      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (KOI8-R)")                               , RTL_TEXTENCODING_KOI8_R           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Unicode (UTF-7)")                                 , RTL_TEXTENCODING_UTF7             },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Unicode (UTF-8)")                                 , RTL_TEXTENCODING_UTF8             },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (ISO-8859-10)")                            , RTL_TEXTENCODING_ISO_8859_10      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Eastern Europe (ISO-8859-13)")                            , RTL_TEXTENCODING_ISO_8859_13      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Korean (EUC-KR)")                             , RTL_TEXTENCODING_EUC_KR           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Korean (ISO-2022-KR)")                        , RTL_TEXTENCODING_ISO_2022_KR      },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Korean (Windows-Johab-1361)")                 , RTL_TEXTENCODING_MS_1361          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Unicode (UTF-16)")                            , RTL_TEXTENCODING_UCS2             },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Thai (ISO-8859-11/TIS-620)")                                  , RTL_TEXTENCODING_TIS_620          },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Thai (Windows-874)")                              , RTL_TEXTENCODING_MS_874           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (KOI8-U)")                             , RTL_TEXTENCODING_KOI8_U           },
+    { NC_("RID_SVXSTR_TEXTENCODING_TABLE", "Cyrillic (PT154)")                                , RTL_TEXTENCODING_PT154            }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/ucsubsetstruct.hrc b/svx/inc/ucsubsetstruct.hrc
new file mode 100644
index 000000000000..8bbc19ddfbce
--- /dev/null
+++ b/svx/inc/ucsubsetstruct.hrc
@@ -0,0 +1,312 @@
+/* -*- 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_SVX_INC_UCSUBSETSTRUCT_HRC
+#define INCLUDED_SVX_INC_UCSUBSETSTRUCT_HRC
+
+#include <svx/ucsubset.hrc>
+#include <utility>
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+/*
+ * strings for unicode range descriptions (used e.g. by charmap)
+ * (see the Unicode Standard & TrueType::OS2.ulUnicodeRange description)
+ */
+const std::pair<const char*, sal_uInt16> RID_SUBSETMAP[] =
+{
+    { NC_("RID_SUBSETMAP", "Basic Latin"), RID_SUBSETSTR_BASIC_LATIN },
+    { NC_("RID_SUBSETMAP", "Latin-1"), RID_SUBSETSTR_LATIN_1 },
+    { NC_("RID_SUBSETMAP", "Latin Extended-A"), RID_SUBSETSTR_LATIN_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Latin Extended-B"), RID_SUBSETSTR_LATIN_EXTENDED_B },
+    { NC_("RID_SUBSETMAP", "IPA Extensions"), RID_SUBSETSTR_IPA_EXTENSIONS },
+    { NC_("RID_SUBSETMAP", "Spacing Modifier Letters"), RID_SUBSETSTR_SPACING_MODIFIERS },
+    { NC_("RID_SUBSETMAP", "Combining Diacritical Marks"), RID_SUBSETSTR_COMB_DIACRITICAL },
+    { NC_("RID_SUBSETMAP", "Basic Greek"), RID_SUBSETSTR_BASIC_GREEK },
+    { NC_("RID_SUBSETMAP", "Greek Symbols And Coptic"), RID_SUBSETSTR_GREEK_SYMS_COPTIC },
+    { NC_("RID_SUBSETMAP", "Cyrillic"), RID_SUBSETSTR_CYRILLIC },
+    { NC_("RID_SUBSETMAP", "Armenian"), RID_SUBSETSTR_ARMENIAN },
+    { NC_("RID_SUBSETMAP", "Basic Hebrew"), RID_SUBSETSTR_BASIC_HEBREW },
+    { NC_("RID_SUBSETMAP", "Hebrew Extended"), RID_SUBSETSTR_HEBREW_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Basic Arabic"), RID_SUBSETSTR_BASIC_ARABIC },
+    { NC_("RID_SUBSETMAP", "Arabic Extended"), RID_SUBSETSTR_ARABIC_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Devanagari"), RID_SUBSETSTR_DEVANAGARI },
+    { NC_("RID_SUBSETMAP", "Bengali"), RID_SUBSETSTR_BENGALI },
+    { NC_("RID_SUBSETMAP", "Gurmukhi"), RID_SUBSETSTR_GURMUKHI },
+    { NC_("RID_SUBSETMAP", "Gujarati"), RID_SUBSETSTR_GUJARATI },
+    { NC_("RID_SUBSETMAP", "Odia"), RID_SUBSETSTR_ODIA },
+    { NC_("RID_SUBSETMAP", "Tamil"), RID_SUBSETSTR_TAMIL },
+    { NC_("RID_SUBSETMAP", "Telugu"), RID_SUBSETSTR_TELUGU },
+    { NC_("RID_SUBSETMAP", "Kannada"), RID_SUBSETSTR_KANNADA },
+    { NC_("RID_SUBSETMAP", "Malayalam"), RID_SUBSETSTR_MALAYALAM },
+    { NC_("RID_SUBSETMAP", "Thai"), RID_SUBSETSTR_THAI },
+    { NC_("RID_SUBSETMAP", "Lao"), RID_SUBSETSTR_LAO },
+    { NC_("RID_SUBSETMAP", "Basic Georgian"), RID_SUBSETSTR_BASIC_GEORGIAN },
+    { NC_("RID_SUBSETMAP", "Georgian Extended"), RID_SUBSETSTR_GEORGIAN_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Hangul Jamo"), RID_SUBSETSTR_HANGUL_JAMO },
+    { NC_("RID_SUBSETMAP", "Latin Extended Additionals"), RID_SUBSETSTR_LATIN_EXTENDED_ADDS },
+    { NC_("RID_SUBSETMAP", "Greek Extended"), RID_SUBSETSTR_GREEK_EXTENDED },
+    { NC_("RID_SUBSETMAP", "General punctuation"), RID_SUBSETSTR_GENERAL_PUNCTUATION },
+    { NC_("RID_SUBSETMAP", "Superscripts and Subscripts"), RID_SUBSETSTR_SUB_SUPER_SCRIPTS },
+    { NC_("RID_SUBSETMAP", "Currency Symbols"), RID_SUBSETSTR_CURRENCY_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Combining Diacritical Symbols"), RID_SUBSETSTR_COMB_DIACRITIC_SYMS },
+    { NC_("RID_SUBSETMAP", "Letterlike Symbols"), RID_SUBSETSTR_LETTERLIKE_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Number Forms"), RID_SUBSETSTR_NUMBER_FORMS },
+    { NC_("RID_SUBSETMAP", "Arrows"), RID_SUBSETSTR_ARROWS },
+    { NC_("RID_SUBSETMAP", "Mathematical Operators"), RID_SUBSETSTR_MATH_OPERATORS },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Technical"), RID_SUBSETSTR_MISC_TECHNICAL },
+    { NC_("RID_SUBSETMAP", "Control Pictures"), RID_SUBSETSTR_CONTROL_PICTURES },
+    { NC_("RID_SUBSETMAP", "Optical Character Recognition"), RID_SUBSETSTR_OPTICAL_CHAR_REC },
+    { NC_("RID_SUBSETMAP", "Enclosed Alphanumerics"), RID_SUBSETSTR_ENCLOSED_ALPHANUM },
+    { NC_("RID_SUBSETMAP", "Box Drawing"), RID_SUBSETSTR_BOX_DRAWING },
+    { NC_("RID_SUBSETMAP", "Block Elements"), RID_SUBSETSTR_BLOCK_ELEMENTS },
+    { NC_("RID_SUBSETMAP", "Geometric Shapes"), RID_SUBSETSTR_GEOMETRIC_SHAPES },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Symbols"), RID_SUBSETSTR_MISC_DINGBATS },
+    { NC_("RID_SUBSETMAP", "Dingbats"), RID_SUBSETSTR_DINGBATS },
+    { NC_("RID_SUBSETMAP", "CJK Symbols And Punctuation"), RID_SUBSETSTR_CJK_SYMS_PUNCTUATION },
+    { NC_("RID_SUBSETMAP", "Hiragana"), RID_SUBSETSTR_HIRAGANA },
+    { NC_("RID_SUBSETMAP", "Katakana"), RID_SUBSETSTR_KATAKANA },
+    { NC_("RID_SUBSETMAP", "Bopomofo"), RID_SUBSETSTR_BOPOMOFO },
+    { NC_("RID_SUBSETMAP", "Hangul Compatibility Jamo"), RID_SUBSETSTR_HANGUL_COMPAT_JAMO },
+    { NC_("RID_SUBSETMAP", "CJK Miscellaneous"), RID_SUBSETSTR_CJK_MISC },
+    { NC_("RID_SUBSETMAP", "Enclosed CJK Letters And Months"), RID_SUBSETSTR_ENCLOSED_CJK_LETTERS },
+    { NC_("RID_SUBSETMAP", "CJK Compatibility"), RID_SUBSETSTR_CJK_COMPATIBILITY },
+    { NC_("RID_SUBSETMAP", "Hangul"), RID_SUBSETSTR_HANGUL },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs"), RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension A"), RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH },
+    { NC_("RID_SUBSETMAP", "Private Use Area"), RID_SUBSETSTR_PRIVATE_USE_AREA },
+    { NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs"), RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS },
+    { NC_("RID_SUBSETMAP", "Alphabetic Presentation Forms"), RID_SUBSETSTR_ALPHA_PRESENTATION },
+    { NC_("RID_SUBSETMAP", "Arabic Presentation Forms-A"), RID_SUBSETSTR_ARABIC_PRESENT_A },
+    { NC_("RID_SUBSETMAP", "Combining Half Marks"), RID_SUBSETSTR_COMBINING_HALF_MARKS },
+    { NC_("RID_SUBSETMAP", "CJK Compatibility Forms"), RID_SUBSETSTR_CJK_COMPAT_FORMS },
+    { NC_("RID_SUBSETMAP", "Small Form Variants"), RID_SUBSETSTR_SMALL_FORM_VARIANTS },
+    { NC_("RID_SUBSETMAP", "Arabic Presentation Forms-B"), RID_SUBSETSTR_ARABIC_PRESENT_B },
+    { NC_("RID_SUBSETMAP", "Half-width and Full-width Forms"), RID_SUBSETSTR_HALFW_FULLW_FORMS },
+    { NC_("RID_SUBSETMAP", "Specials"), RID_SUBSETSTR_SPECIALS },
+    { NC_("RID_SUBSETMAP", "Yi Syllables"), RID_SUBSETSTR_YI_SYLLABLES },
+    { NC_("RID_SUBSETMAP", "Yi Radicals"), RID_SUBSETSTR_YI_RADICALS },
+    { NC_("RID_SUBSETMAP", "Old Italic"), RID_SUBSETSTR_OLD_ITALIC },
+    { NC_("RID_SUBSETMAP", "Gothic"), RID_SUBSETSTR_GOTHIC },
+    { NC_("RID_SUBSETMAP", "Deseret"), RID_SUBSETSTR_DESERET },
+    { NC_("RID_SUBSETMAP", "Byzantine Musical Symbols"), RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Musical Symbols"), RID_SUBSETSTR_MUSICAL_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Mathematical Alphanumeric Symbols"), RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension B"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension C"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension D"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D },
+    { NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs Supplement"), RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Tags"), RID_SUBSETSTR_TAGS },
+    { NC_("RID_SUBSETMAP", "Cyrillic Supplement"), RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY },
+    { NC_("RID_SUBSETMAP", "Variation Selectors"), RID_SUBSETSTR_VARIATION_SELECTORS },
+    { NC_("RID_SUBSETMAP", "Supplementary Private Use Area-A"), RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A },
+    { NC_("RID_SUBSETMAP", "Supplementary Private Use Area-B"), RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B },
+    { NC_("RID_SUBSETMAP", "Limbu"), RID_SUBSETSTR_LIMBU },
+    { NC_("RID_SUBSETMAP", "Tai Le"), RID_SUBSETSTR_TAI_LE },
+    { NC_("RID_SUBSETMAP", "Khmer Symbols"), RID_SUBSETSTR_KHMER_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Phonetic Extensions"), RID_SUBSETSTR_PHONETIC_EXTENSIONS },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Arrows"), RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS },
+    { NC_("RID_SUBSETMAP", "Yijing Hexagram Symbols"), RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Linear B Syllabary"), RID_SUBSETSTR_LINEAR_B_SYLLABARY },
+    { NC_("RID_SUBSETMAP", "Linear B Ideograms"), RID_SUBSETSTR_LINEAR_B_IDEOGRAMS },
+    { NC_("RID_SUBSETMAP", "Aegean Numbers"), RID_SUBSETSTR_AEGEAN_NUMBERS },
+    { NC_("RID_SUBSETMAP", "Ugaritic"), RID_SUBSETSTR_UGARITIC },
+    { NC_("RID_SUBSETMAP", "Shavian"), RID_SUBSETSTR_SHAVIAN },
+    { NC_("RID_SUBSETMAP", "Osmanya"), RID_SUBSETSTR_OSMANYA },
+    { NC_("RID_SUBSETMAP", "Sinhala"), RID_SUBSETSTR_SINHALA },
+    { NC_("RID_SUBSETMAP", "Tibetan"), RID_SUBSETSTR_TIBETAN },
+    { NC_("RID_SUBSETMAP", "Myanmar"), RID_SUBSETSTR_MYANMAR },
+    { NC_("RID_SUBSETMAP", "Khmer"), RID_SUBSETSTR_KHMER },
+    { NC_("RID_SUBSETMAP", "Ogham"), RID_SUBSETSTR_OGHAM },
+    { NC_("RID_SUBSETMAP", "Runic"), RID_SUBSETSTR_RUNIC },
+    { NC_("RID_SUBSETMAP", "Syriac"), RID_SUBSETSTR_SYRIAC },
+    { NC_("RID_SUBSETMAP", "Thaana"), RID_SUBSETSTR_THAANA },
+    { NC_("RID_SUBSETMAP", "Ethiopic"), RID_SUBSETSTR_ETHIOPIC },
+    { NC_("RID_SUBSETMAP", "Cherokee"), RID_SUBSETSTR_CHEROKEE },
+    { NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables"), RID_SUBSETSTR_CANADIAN_ABORIGINAL },
+    { NC_("RID_SUBSETMAP", "Mongolian"), RID_SUBSETSTR_MONGOLIAN },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A"), RID_SUBSETSTR_MISC_MATH_SYMS_A },
+    { NC_("RID_SUBSETMAP", "Supplemental Arrows-A"), RID_SUBSETSTR_SUPPL_ARROWS_A },
+    { NC_("RID_SUBSETMAP", "Braille Patterns"), RID_SUBSETSTR_BRAILLE_PATTERNS },
+    { NC_("RID_SUBSETMAP", "Supplemental Arrows-B"), RID_SUBSETSTR_SUPPL_ARROWS_B },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-B"), RID_SUBSETSTR_MISC_MATH_SYMS_B },
+    { NC_("RID_SUBSETMAP", "CJK Radical Supplement"), RID_SUBSETSTR_CJK_RADICAL_SUPPL },
+    { NC_("RID_SUBSETMAP", "Kangxi Radicals"), RID_SUBSETSTR_KANGXI_RADICALS },
+    { NC_("RID_SUBSETMAP", "Ideographic Description Characters"), RID_SUBSETSTR_IDEO_DESC_CHARS },
+    { NC_("RID_SUBSETMAP", "Tagalog"), RID_SUBSETSTR_TAGALOG },
+    { NC_("RID_SUBSETMAP", "Hanunoo"), RID_SUBSETSTR_HANUNOO },
+    { NC_("RID_SUBSETMAP", "Tagbanwa"), RID_SUBSETSTR_TAGBANWA },
+    { NC_("RID_SUBSETMAP", "Buhid"), RID_SUBSETSTR_BUHID },
+    { NC_("RID_SUBSETMAP", "Kanbun"), RID_SUBSETSTR_KANBUN },
+    { NC_("RID_SUBSETMAP", "Bopomofo Extended"), RID_SUBSETSTR_BOPOMOFO_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Katakana Phonetics"), RID_SUBSETSTR_KATAKANA_PHONETIC },
+    { NC_("RID_SUBSETMAP", "CJK Strokes"), RID_SUBSETSTR_CJK_STROKES },
+    { NC_("RID_SUBSETMAP", "Cypriot Syllabary"), RID_SUBSETSTR_CYPRIOT_SYLLABARY },
+    { NC_("RID_SUBSETMAP", "Tai Xuan Jing Symbols"), RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Variation Selectors Supplement"), RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Ancient Greek Musical Notation"), RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION },
+    { NC_("RID_SUBSETMAP", "Ancient Greek Numbers"), RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS },
+    { NC_("RID_SUBSETMAP", "Arabic Supplement"), RID_SUBSETSTR_ARABIC_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Buginese"), RID_SUBSETSTR_BUGINESE },
+    { NC_("RID_SUBSETMAP", "Combining Diacritical Marks Supplement"), RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Coptic"), RID_SUBSETSTR_COPTIC },
+    { NC_("RID_SUBSETMAP", "Ethiopic Extended"), RID_SUBSETSTR_ETHIOPIC_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Ethiopic Supplement"), RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Georgian Supplement"), RID_SUBSETSTR_GEORGIAN_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Glagolitic"), RID_SUBSETSTR_GLAGOLITIC },
+    { NC_("RID_SUBSETMAP", "Kharoshthi"), RID_SUBSETSTR_KHAROSHTHI },
+    { NC_("RID_SUBSETMAP", "Modifier Tone Letters"), RID_SUBSETSTR_MODIFIER_TONE_LETTERS },
+    { NC_("RID_SUBSETMAP", "New Tai Lue"), RID_SUBSETSTR_NEW_TAI_LUE },
+    { NC_("RID_SUBSETMAP", "Old Persian"), RID_SUBSETSTR_OLD_PERSIAN },
+    { NC_("RID_SUBSETMAP", "Phonetic Extensions Supplement"), RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Supplemental Punctuation"), RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION },
+    { NC_("RID_SUBSETMAP", "Syloti Nagri"), RID_SUBSETSTR_SYLOTI_NAGRI },
+    { NC_("RID_SUBSETMAP", "Tifinagh"), RID_SUBSETSTR_TIFINAGH },
+    { NC_("RID_SUBSETMAP", "Vertical Forms"), RID_SUBSETSTR_VERTICAL_FORMS },
+    { NC_("RID_SUBSETMAP", "Nko"), RID_SUBSETSTR_NKO },
+    { NC_("RID_SUBSETMAP", "Balinese"), RID_SUBSETSTR_BALINESE },
+    { NC_("RID_SUBSETMAP", "Latin Extended-C"), RID_SUBSETSTR_LATIN_EXTENDED_C },
+    { NC_("RID_SUBSETMAP", "Latin Extended-D"), RID_SUBSETSTR_LATIN_EXTENDED_D },
+    { NC_("RID_SUBSETMAP", "Phags-Pa"), RID_SUBSETSTR_PHAGS_PA },
+    { NC_("RID_SUBSETMAP", "Phoenician"), RID_SUBSETSTR_PHOENICIAN },
+    { NC_("RID_SUBSETMAP", "Cuneiform"), RID_SUBSETSTR_CUNEIFORM },
+    { NC_("RID_SUBSETMAP", "Cuneiform Numbers And Punctuation"), RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION },
+    { NC_("RID_SUBSETMAP", "Counting Rod Numerals"), RID_SUBSETSTR_COUNTING_ROD_NUMERALS },
+    { NC_("RID_SUBSETMAP", "Sundanese"), RID_SUBSETSTR_SUNDANESE },
+    { NC_("RID_SUBSETMAP", "Lepcha"), RID_SUBSETSTR_LEPCHA },
+    { NC_("RID_SUBSETMAP", "Ol Chiki"), RID_SUBSETSTR_OL_CHIKI },
+    { NC_("RID_SUBSETMAP", "Cyrillic Extended-A"), RID_SUBSETSTR_CYRILLIC_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Vai"), RID_SUBSETSTR_VAI },
+    { NC_("RID_SUBSETMAP", "Cyrillic Extended-B"), RID_SUBSETSTR_CYRILLIC_EXTENDED_B },
+    { NC_("RID_SUBSETMAP", "Saurashtra"), RID_SUBSETSTR_SAURASHTRA },
+    { NC_("RID_SUBSETMAP", "Kayah Li"), RID_SUBSETSTR_KAYAH_LI },
+    { NC_("RID_SUBSETMAP", "Rejang"), RID_SUBSETSTR_REJANG },
+    { NC_("RID_SUBSETMAP", "Cham"), RID_SUBSETSTR_CHAM },
+    { NC_("RID_SUBSETMAP", "Ancient Symbols"), RID_SUBSETSTR_ANCIENT_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Phaistos Disc"), RID_SUBSETSTR_PHAISTOS_DISC },
+    { NC_("RID_SUBSETMAP", "Lycian"), RID_SUBSETSTR_LYCIAN },
+    { NC_("RID_SUBSETMAP", "Carian"), RID_SUBSETSTR_CARIAN },
+    { NC_("RID_SUBSETMAP", "Lydian"), RID_SUBSETSTR_LYDIAN },
+    { NC_("RID_SUBSETMAP", "Mahjong Tiles"), RID_SUBSETSTR_MAHJONG_TILES },
+    { NC_("RID_SUBSETMAP", "Domino Tiles"), RID_SUBSETSTR_DOMINO_TILES },
+    { NC_("RID_SUBSETMAP", "Samaritan"), RID_SUBSETSTR_SAMARITAN },
+    { NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended"), RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Tai Tham"), RID_SUBSETSTR_TAI_THAM },
+    { NC_("RID_SUBSETMAP", "Vedic Extensions"), RID_SUBSETSTR_VEDIC_EXTENSIONS },
+    { NC_("RID_SUBSETMAP", "Lisu"), RID_SUBSETSTR_LISU },
+    { NC_("RID_SUBSETMAP", "Bamum"), RID_SUBSETSTR_BAMUM },
+    { NC_("RID_SUBSETMAP", "Common Indic Number Forms"), RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS },
+    { NC_("RID_SUBSETMAP", "Devanagari Extended"), RID_SUBSETSTR_DEVANAGARI_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Hangul Jamo Extended-A"), RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Javanese"), RID_SUBSETSTR_JAVANESE },
+    { NC_("RID_SUBSETMAP", "Myanmar Extended-A"), RID_SUBSETSTR_MYANMAR_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Tai Viet"), RID_SUBSETSTR_TAI_VIET },
+    { NC_("RID_SUBSETMAP", "Meetei Mayek"), RID_SUBSETSTR_MEETEI_MAYEK },
+    { NC_("RID_SUBSETMAP", "Hangul Jamo Extended-B"), RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B },
+    { NC_("RID_SUBSETMAP", "Imperial Aramaic"), RID_SUBSETSTR_IMPERIAL_ARAMAIC },
+    { NC_("RID_SUBSETMAP", "Old South Arabian"), RID_SUBSETSTR_OLD_SOUTH_ARABIAN },
+    { NC_("RID_SUBSETMAP", "Avestan"), RID_SUBSETSTR_AVESTAN },
+    { NC_("RID_SUBSETMAP", "Inscriptional Parthian"), RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN },
+    { NC_("RID_SUBSETMAP", "Inscriptional Pahlavi"), RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI },
+    { NC_("RID_SUBSETMAP", "Old Turkic"), RID_SUBSETSTR_OLD_TURKIC },
+    { NC_("RID_SUBSETMAP", "Rumi Numeral Symbols"), RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Kaithi"), RID_SUBSETSTR_KAITHI },
+    { NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs"), RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS },
+    { NC_("RID_SUBSETMAP", "Enclosed Alphanumeric Supplement"), RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Enclosed Ideographic Supplement"), RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Mandaic"), RID_SUBSETSTR_MANDAIC },
+    { NC_("RID_SUBSETMAP", "Batak"), RID_SUBSETSTR_BATAK },
+    { NC_("RID_SUBSETMAP", "Ethiopic Extended-A"), RID_SUBSETSTR_ETHIOPIC_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Brahmi"), RID_SUBSETSTR_BRAHMI },
+    { NC_("RID_SUBSETMAP", "Bamum Supplement"), RID_SUBSETSTR_BAMUM_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Kana Supplement"), RID_SUBSETSTR_KANA_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Playing Cards"), RID_SUBSETSTR_PLAYING_CARDS },
+    { NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Pictographs"), RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS },
+    { NC_("RID_SUBSETMAP", "Emoticons"), RID_SUBSETSTR_EMOTICONS },
+    { NC_("RID_SUBSETMAP", "Transport And Map Symbols"), RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Alchemical Symbols"), RID_SUBSETSTR_ALCHEMICAL_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Arabic Extended-A"), RID_SUBSETSTR_ARABIC_EXTENDED_A },
+    { NC_("RID_SUBSETMAP", "Arabic Mathematical Alphabetic Symbols"), RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS },
+    { NC_("RID_SUBSETMAP", "Chakma"), RID_SUBSETSTR_CHAKMA },
+    { NC_("RID_SUBSETMAP", "Meetei Mayek Extensions"), RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS },
+    { NC_("RID_SUBSETMAP", "Meroitic Cursive"), RID_SUBSETSTR_MEROITIC_CURSIVE },
+    { NC_("RID_SUBSETMAP", "Meroitic Hieroglyphs"), RID_SUBSETSTR_MEROITIC_HIEROGLYPHS },
+    { NC_("RID_SUBSETMAP", "Miao"), RID_SUBSETSTR_MIAO },
+    { NC_("RID_SUBSETMAP", "Sharada"), RID_SUBSETSTR_SHARADA },
+    { NC_("RID_SUBSETMAP", "Sora Sompeng"), RID_SUBSETSTR_SORA_SOMPENG },
+    { NC_("RID_SUBSETMAP", "Sundanese Supplement"), RID_SUBSETSTR_SUNDANESE_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Takri"), RID_SUBSETSTR_TAKRI },
+    { NC_("RID_SUBSETMAP", "Bassa Vah"), RID_SUBSETSTR_BASSA_VAH },
+    { NC_("RID_SUBSETMAP", "Caucasian Albanian"), RID_SUBSETSTR_CAUCASIAN_ALBANIAN },
+    { NC_("RID_SUBSETMAP", "Coptic Epact Numbers"), RID_SUBSETSTR_COPTIC_EPACT_NUMBERS },
+    { NC_("RID_SUBSETMAP", "Combining Diacritical Marks Extended"), RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Duployan"), RID_SUBSETSTR_DUPLOYAN },
+    { NC_("RID_SUBSETMAP", "Elbasan"), RID_SUBSETSTR_ELBASAN },
+    { NC_("RID_SUBSETMAP", "Geometric Shapes Extended"), RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED },
+    { NC_("RID_SUBSETMAP", "Grantha"), RID_SUBSETSTR_GRANTHA },
+    { NC_("RID_SUBSETMAP", "Khojki"), RID_SUBSETSTR_KHOJKI },
+    { NC_("RID_SUBSETMAP", "Khudawadi"), RID_SUBSETSTR_KHUDAWADI },
+    { NC_("RID_SUBSETMAP", "Latin Extended-E"), RID_SUBSETSTR_LATIN_EXTENDED_E },
+    { NC_("RID_SUBSETMAP", "Linear A"), RID_SUBSETSTR_LINEAR_A },
+    { NC_("RID_SUBSETMAP", "Mahajani"), RID_SUBSETSTR_MAHAJANI },
+    { NC_("RID_SUBSETMAP", "Manichaean"), RID_SUBSETSTR_MANICHAEAN },
+    { NC_("RID_SUBSETMAP", "Mende Kikakui"), RID_SUBSETSTR_MENDE_KIKAKUI },
+    { NC_("RID_SUBSETMAP", "Modi"), RID_SUBSETSTR_MODI },
+    { NC_("RID_SUBSETMAP", "Mro"), RID_SUBSETSTR_MRO },
+    { NC_("RID_SUBSETMAP", "Myanmar Extended-B"), RID_SUBSETSTR_MYANMAR_EXTENDED_B },
+    { NC_("RID_SUBSETMAP", "Nabataean"), RID_SUBSETSTR_NABATAEAN },
+    { NC_("RID_SUBSETMAP", "Old North Arabian"), RID_SUBSETSTR_OLD_NORTH_ARABIAN },
+    { NC_("RID_SUBSETMAP", "Old Permic"), RID_SUBSETSTR_OLD_PERMIC },
+    { NC_("RID_SUBSETMAP", "Ornamental Dingbats"), RID_SUBSETSTR_ORNAMENTAL_DINGBATS },
+    { NC_("RID_SUBSETMAP", "Pahawh Hmong"), RID_SUBSETSTR_PAHAWH_HMONG },
+    { NC_("RID_SUBSETMAP", "Palmyrene"), RID_SUBSETSTR_PALMYRENE },
+    { NC_("RID_SUBSETMAP", "Pau Cin Hau"), RID_SUBSETSTR_PAU_CIN_HAU },
+    { NC_("RID_SUBSETMAP", "Psalter Pahlavi"), RID_SUBSETSTR_PSALTER_PAHLAVI },
+    { NC_("RID_SUBSETMAP", "Shorthand Format Controls"), RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS },
+    { NC_("RID_SUBSETMAP", "Siddham"), RID_SUBSETSTR_SIDDHAM },
+    { NC_("RID_SUBSETMAP", "Sinhala Archaic Numbers"), RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS },
+    { NC_("RID_SUBSETMAP", "Supplemental Arrows-C"), RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C },
+    { NC_("RID_SUBSETMAP", "Tirhuta"), RID_SUBSETSTR_TIRHUTA },
+    { NC_("RID_SUBSETMAP", "Warang Citi"), RID_SUBSETSTR_WARANG_CITI },
+    { NC_("RID_SUBSETMAP", "Ahom"), RID_SUBSETSTR_AHOM },
+    { NC_("RID_SUBSETMAP", "Anatolian Hieroglyphs"), RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS },
+    { NC_("RID_SUBSETMAP", "Cherokee Supplement"), RID_SUBSETSTR_CHEROKEE_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension E"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E },
+    { NC_("RID_SUBSETMAP", "Early Dynastic Cuneiform"), RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM },
+    { NC_("RID_SUBSETMAP", "Hatran"), RID_SUBSETSTR_HATRAN },
+    { NC_("RID_SUBSETMAP", "Multani"), RID_SUBSETSTR_MULTANI },
+    { NC_("RID_SUBSETMAP", "Old Hungarian"), RID_SUBSETSTR_OLD_HUNGARIAN },
+    { NC_("RID_SUBSETMAP", "Supplemental Symbols And Pictographs"), RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS },
+    { NC_("RID_SUBSETMAP", "Sutton Signwriting"), RID_SUBSETSTR_SUTTON_SIGNWRITING },
+    { NC_("RID_SUBSETMAP", "Adlam"), RID_SUBSETSTR_ADLAM },
+    { NC_("RID_SUBSETMAP", "Bhaiksuki"), RID_SUBSETSTR_BHAIKSUKI },
+    { NC_("RID_SUBSETMAP", "Cyrillic Extended-C"), RID_SUBSETSTR_CYRILLIC_EXTENDED_C },
+    { NC_("RID_SUBSETMAP", "Glagolitic Supplement"), RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Ideographic Symbols and Punctuation"), RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION },
+    { NC_("RID_SUBSETMAP", "Marchen"), RID_SUBSETSTR_MARCHEN },
+    { NC_("RID_SUBSETMAP", "Mongolian Supplement"), RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT },
+    { NC_("RID_SUBSETMAP", "Newa"), RID_SUBSETSTR_NEWA },
+    { NC_("RID_SUBSETMAP", "Osage"), RID_SUBSETSTR_OSAGE },
+    { NC_("RID_SUBSETMAP", "Tangut"), RID_SUBSETSTR_TANGUT },
+    { NC_("RID_SUBSETMAP", "Tangut Components"), RID_SUBSETSTR_TANGUT_COMPONENTS }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 031238accff4..7691ed9d868c 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -44,7 +44,7 @@
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <vcl/svapp.hxx>
 #include <algorithm>
 
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index b4f7d9652f55..b7a1a0dd829f 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -35,7 +35,8 @@
 #include <svx/dialmgr.hxx>
 #include "editeng/unolingu.hxx"
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "frmsel.hrc"
 
 namespace svx {
 namespace a11y {
@@ -58,8 +59,6 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB
     meBorder( eBorder ),
     maFocusListeners( maFocusMutex ),
     maPropertyListeners( maPropertyMutex ),
-    maNames( ResId(RID_SVXSTR_FRMSEL_TEXTS, DIALOG_MGR()) ),
-    maDescriptions( ResId(RID_SVXSTR_FRMSEL_DESCRIPTIONS, DIALOG_MGR()) ),
     mnClientId( 0 )
 {
     if ( mpFrameSel )
@@ -154,14 +153,14 @@ OUString AccFrameSelector::getAccessibleDescription(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
-    return maDescriptions.GetString((sal_uInt32)meBorder);
+    return SvxResId(RID_SVXSTR_FRMSEL_DESCRIPTIONS[(sal_uInt32)meBorder].first);
 }
 
 OUString AccFrameSelector::getAccessibleName(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
-    return maNames.GetString((sal_uInt32)meBorder);
+    return SvxResId(RID_SVXSTR_FRMSEL_TEXTS[(sal_uInt32)meBorder].first);
 }
 
 Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(  )
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ac3347c15ff2..c2a7aa15cce5 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -48,8 +48,7 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 
-#include "accessibility.hrc"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index efbb48c58980..ec5b127f96dc 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -38,8 +38,7 @@
 #include <com/sun/star/uno/Exception.hpp>
 
 // Includes for string resources.
-#include "accessibility.hrc"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/dialmgr.hxx>
 
 #include <svx/xdef.hxx>
@@ -66,13 +65,13 @@ DescriptionGenerator::~DescriptionGenerator()
 }
 
 
-void DescriptionGenerator::Initialize (sal_Int32 nResourceId)
+void DescriptionGenerator::Initialize(const char* pResourceId)
 {
     // Get the string from the resource for the specified id.
     OUString sPrefix;
     {
         SolarMutexGuard aGuard;
-        sPrefix = SvxResId (nResourceId);
+        sPrefix = SvxResId(pResourceId);
     }
 
     // Forward the call with the resulting string.
@@ -126,13 +125,13 @@ OUString DescriptionGenerator::operator() (void)
 void DescriptionGenerator::AddProperty (
     const OUString& sPropertyName,
     PropertyType aType,
-    const sal_Int32 nLocalizedNameId,
+    const char* pLocalizedNameId,
     long nWhichId)
 {
     OUString sLocalizedName;
     {
         SolarMutexGuard aGuard;
-        sLocalizedName = SvxResId (nLocalizedNameId);
+        sLocalizedName = SvxResId(pLocalizedNameId);
     }
     AddProperty (sPropertyName, aType, sLocalizedName, nWhichId);
 }
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0f970ee347d2..741c58daaef3 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -40,8 +40,7 @@
 #include <svx/AccessibleShapeInfo.hxx>
 #include "GraphCtlAccessibleContext.hxx"
 #include <svx/graphctl.hxx>
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/unomod.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 4f7f17549d5b..a64a09c3f56b 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdoashp.hxx>
 #include "svx/unoapi.hxx"
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -192,10 +192,9 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
 }
 
 /// get the accessible base name for an object
-OUString
-    ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
+OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
 {
-    sal_Int32 nResourceId;
+    const char* pResourceId;
     OUString sName;
 
     switch (ShapeTypeHandler::Instance().GetTypeId (rxShape))
@@ -204,74 +203,74 @@ OUString
       // AccessibleShape::CreateAccessibleBaseName.  See issue 11190 for details.
       // Id can be removed from SvxShapeTypes.hxx as well.
         case DRAWING_3D_CUBE:
-            nResourceId = STR_ObjNameSingulCube3d;
+            pResourceId = STR_ObjNameSingulCube3d;
             break;
         case DRAWING_3D_EXTRUDE:
-            nResourceId = STR_ObjNameSingulExtrude3d;
+            pResourceId = STR_ObjNameSingulExtrude3d;
             break;
         case DRAWING_3D_LATHE:
-            nResourceId = STR_ObjNameSingulLathe3d;
+            pResourceId = STR_ObjNameSingulLathe3d;
             break;
         case DRAWING_3D_SCENE:
-            nResourceId = STR_ObjNameSingulScene3d;
+            pResourceId = STR_ObjNameSingulScene3d;
             break;
         case DRAWING_3D_SPHERE:
-            nResourceId = STR_ObjNameSingulSphere3d;
+            pResourceId = STR_ObjNameSingulSphere3d;
             break;
         case DRAWING_CAPTION:
-            nResourceId = STR_ObjNameSingulCAPTION;
+            pResourceId = STR_ObjNameSingulCAPTION;
             break;
         case DRAWING_CLOSED_BEZIER:
-            nResourceId = STR_ObjNameSingulPATHFILL;
+            pResourceId = STR_ObjNameSingulPATHFILL;
             break;
         case DRAWING_CLOSED_FREEHAND:
-            nResourceId = STR_ObjNameSingulFREEFILL;
+            pResourceId = STR_ObjNameSingulFREEFILL;
             break;
         case DRAWING_CONNECTOR:
-            nResourceId = STR_ObjNameSingulEDGE;
+            pResourceId = STR_ObjNameSingulEDGE;
             break;
         case DRAWING_CONTROL:
-            nResourceId = STR_ObjNameSingulUno;
+            pResourceId = STR_ObjNameSingulUno;
             break;
         case DRAWING_ELLIPSE:
-            nResourceId = STR_ObjNameSingulCIRCE;
+            pResourceId = STR_ObjNameSingulCIRCE;
             break;
         case DRAWING_GROUP:
-            nResourceId = STR_ObjNameSingulGRUP;
+            pResourceId = STR_ObjNameSingulGRUP;
             break;
         case DRAWING_LINE:
-            nResourceId = STR_ObjNameSingulLINE;
+            pResourceId = STR_ObjNameSingulLINE;
             break;
         case DRAWING_MEASURE:
-            nResourceId = STR_ObjNameSingulMEASURE;
+            pResourceId = STR_ObjNameSingulMEASURE;
             break;
         case DRAWING_OPEN_BEZIER:
-            nResourceId = STR_ObjNameSingulPATHLINE;
+            pResourceId = STR_ObjNameSingulPATHLINE;
             break;
         case DRAWING_OPEN_FREEHAND:
-            nResourceId = STR_ObjNameSingulFREELINE;
+            pResourceId = STR_ObjNameSingulFREELINE;
             break;
         case DRAWING_PAGE:
-            nResourceId = STR_ObjNameSingulPAGE;
+            pResourceId = STR_ObjNameSingulPAGE;
             break;
         case DRAWING_POLY_LINE:
-            nResourceId = STR_ObjNameSingulPLIN;
+            pResourceId = STR_ObjNameSingulPLIN;
             break;
         case DRAWING_POLY_LINE_PATH:
-            nResourceId = STR_ObjNameSingulPLIN;
+            pResourceId = STR_ObjNameSingulPLIN;
             break;
         case DRAWING_POLY_POLYGON:
-            nResourceId = STR_ObjNameSingulPOLY;
+            pResourceId = STR_ObjNameSingulPOLY;
             break;
         case DRAWING_POLY_POLYGON_PATH:
-            nResourceId = STR_ObjNameSingulPOLY;
+            pResourceId = STR_ObjNameSingulPOLY;
             break;
         case DRAWING_RECTANGLE:
-            nResourceId = STR_ObjNameSingulRECT;
+            pResourceId = STR_ObjNameSingulRECT;
             break;
         case DRAWING_CUSTOM:
             {
-                nResourceId = STR_ObjNameSingulCUSTOMSHAPE;
+                pResourceId = STR_ObjNameSingulCUSTOMSHAPE;
 
                 SvxShape* pShape = SvxShape::getImplementation( rxShape );
                 if (pShape)
@@ -285,10 +284,10 @@ OUString
                             if(pCustomShape)
                             {
                                 if (pCustomShape->IsTextPath())
-                                    nResourceId = STR_ObjNameSingulFONTWORK;
+                                    pResourceId = STR_ObjNameSingulFONTWORK;
                                 else
                                 {
-                                    nResourceId = -1;
+                                    pResourceId = nullptr;
                                     sName = pCustomShape->GetCustomShapeName();
                                 }
                             }
@@ -298,10 +297,10 @@ OUString
                 break;
             }
         case DRAWING_TEXT:
-            nResourceId = STR_ObjNameSingulTEXT;
+            pResourceId = STR_ObjNameSingulTEXT;
             break;
         default:
-            nResourceId = -1;
+            pResourceId = nullptr;
             sName = "UnknownAccessibleShape";
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (rxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
@@ -309,10 +308,10 @@ OUString
             break;
     }
 
-    if (nResourceId != -1)
+    if (pResourceId)
     {
         SolarMutexGuard aGuard;
-        sName = SvxResId((unsigned short)nResourceId);
+        sName = SvxResId(pResourceId);
     }
 
     return sName;
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
deleted file mode 100644
index 37986e929a66..000000000000
--- a/svx/source/accessibility/accessibility.src
+++ /dev/null
@@ -1,193 +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 "accessibility.hrc"
-
-String RID_SVXSTR_A11Y_3D_MATERIAL_COLOR
-{
-    Text [ en-US ] = "3D material color" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_SOLID
-{
-    Text [ en-US ] = "Solid" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_HATCH
-{
-    Text [ en-US ] = "With hatching" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT
-{
-    Text [ en-US ] = "Gradient" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_BITMAP
-{
-    Text [ en-US ] = "Bitmap" ;
-};
-String RID_SVXSTR_A11Y_WITH
-{
-    Text [ en-US ] = "with" ;
-};
-String RID_SVXSTR_A11Y_STYLE
-{
-    Text [ en-US ] = "Style" ;
-};
-String RID_SVXSTR_A11Y_AND
-{
-    Text [ en-US ] = "and" ;
-};
-
-// SvxRectCtl
-
-String RID_SVXSTR_RECTCTL_ACC_CORN_NAME
-{
-    Text [ en-US ] = "Corner control" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CORN_DESCR
-{
-    Text [ en-US ] = "Selection of a corner point." ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_ANGL_NAME
-{
-    Text [ en-US ] = "Angle control" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR
-{
-    Text [ en-US ] = "Selection of a major angle." ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LT
-{
-    Text [ en-US ] = "Top left" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MT
-{
-    Text [ en-US ] = "Top middle" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RT
-{
-    Text [ en-US ] = "Top right" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LM
-{
-    Text [ en-US ] = "Left center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MM
-{
-    Text [ en-US ] = "Center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RM
-{
-    Text [ en-US ] = "Right center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LB
-{
-    Text [ en-US ] = "Bottom left" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MB
-{
-    Text [ en-US ] = "Bottom middle" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RB
-{
-    Text [ en-US ] = "Bottom right" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A000
-{
-    Text [ en-US ] = "0 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A045
-{
-    Text [ en-US ] = "45 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A090
-{
-    Text [ en-US ] = "90 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A135
-{
-    Text [ en-US ] = "135 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A180
-{
-    Text [ en-US ] = "180 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A225
-{
-    Text [ en-US ] = "225 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A270
-{
-    Text [ en-US ] = "270 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A315
-{
-    Text [ en-US ] = "315 degrees" ;
-};
-
-// SvxGraphCtrlAccessibleContext
-String RID_SVXSTR_GRAPHCTRL_ACC_NAME
-{
-    Text [ en-US ] = "Contour control" ;
-};
-
-String RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION
-{
-    Text [ en-US ] = "This is where you can edit the contour." ;
-};
-
-String RID_SVXSTR_CHARACTER_SELECTION
-{
-    Text [ en-US ] = "Special character selection";
-};
-
-String RID_SVXSTR_CHAR_SEL_DESC
-{
-    Text [ en-US ] = "Select special characters in this area.";
-};
-
-String RID_SVXSTR_CHARACTER_CODE
-{
-    // The space behind is a must.
-    Text [ en-US ] = "Character code ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 25ebf7640145..9e8c3ab5fa71 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -29,7 +29,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <osl/interlck.h>
 #include <svx/dialmgr.hxx>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <comphelper/types.hxx>
 
 namespace svx
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index c2a048a82853..e48d24b50dbc 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -34,8 +34,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
 
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 6bdc0c05c3e2..ab060c469658 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -33,8 +33,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
@@ -57,8 +56,8 @@ namespace
 {
     struct ChildIndexToPointData
     {
-        short       nResIdName;
-        short       nResIdDescr;
+        const char* pResIdName;
+        const char* pResIdDescr;
         RectPoint  ePoint;
     };
 }
@@ -226,8 +225,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
         if( !xChild.is() )
         {
             const ChildIndexToPointData*    p = IndexToPoint( nIndex );
-            OUString aName(SvxResId(p->nResIdName));
-            OUString aDescr(SvxResId(p->nResIdDescr));
+            OUString aName(SvxResId(p->pResIdName));
+            OUString aDescr(SvxResId(p->pResIdDescr));
 
             tools::Rectangle       aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) );
 
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 450026b95513..5aa82122c969 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -24,7 +24,7 @@
 #include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/graphichelper.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <vcl/layout.hxx>
 
diff --git a/svx/source/core/graphichelper.src b/svx/source/core/graphichelper.src
deleted file mode 100644
index c866076bed4d..000000000000
--- a/svx/source/core/graphichelper.src
+++ /dev/null
@@ -1,36 +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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_EXPORT_GRAPHIC_TITLE
-{
-    Text [ en-US ] = "Image Export" ;
-};
-
-String RID_SVXSTR_SAVEAS_IMAGE
-{
-    Text [ en-US ] = "Save as Image" ;
-};
-
-String RID_SVXSTR_SAVE_MODIFIED_IMAGE
-{
-    Text [ en-US ] = "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 198b3d909302..4d3ff711e9ce 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -21,7 +21,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <unotools/configmgr.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index c0bd9c222eb7..7940e92eec9f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -31,8 +31,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/bmpmask.hxx>
-#include <svx/dialogs.hrc>
-#include <bmpmask.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <memory>
 #include "helpid.hrc"
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 13726e6fb7db..c9738a0d9095 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -32,7 +32,7 @@
 
 #include <svx/dialmgr.hxx>
 #include "svx/xoutbmp.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
 #include "contimp.hxx"
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
deleted file mode 100644
index bf054482824d..000000000000
--- a/svx/source/dialog/bmpmask.hrc
+++ /dev/null
@@ -1,22 +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_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
deleted file mode 100644
index 16bf943d9f69..000000000000
--- a/svx/source/dialog/bmpmask.src
+++ /dev/null
@@ -1,30 +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 <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-#include "bmpmask.hrc"
-#include "helpid.hrc"
-
-String RID_SVXDLG_BMPMASK_STR_PALETTE
-{
-    Text [ en-US ] = "Color Palette";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index e1b298df858d..e2e8fe43cba7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -22,12 +22,11 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <svtools/colorcfg.hxx>
-#include <tools/resary.hxx>
 
 #include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <svx/charmap.hxx>
 #include <svx/dialmgr.hxx>
@@ -42,8 +41,8 @@
 #include <comphelper/types.hxx>
 #include <svl/itemset.hxx>
 #include <unicode/uchar.h>
-
 #include "rtl/ustrbuf.hxx"
+#include "ucsubsetstruct.hrc"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
@@ -785,6 +784,19 @@ inline Subset::Subset(sal_UCS4 nMin, sal_UCS4 nMax, const OUString& rName)
 :   mnRangeMin(nMin), mnRangeMax(nMax), maRangeName(rName)
 {}
 
+namespace
+{
+    OUString FindIndex(sal_uInt16 nRID)
+    {
+        for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SUBSETMAP); ++i)
+        {
+            if (nRID == RID_SUBSETMAP[i].second)
+                return SvxResId(RID_SUBSETMAP[i].first);
+        }
+        return OUString();
+    }
+}
+
 void SubsetMap::InitList()
 {
     static SubsetList aAllSubsets;
@@ -793,8 +805,6 @@ void SubsetMap::InitList()
     {
         bInit = false;
 
-        ResStringArray aStringList(ResId(RID_SUBSETMAP, DIALOG_MGR()));
-
         //I wish icu had a way to give me the block ranges
         for (int i = UBLOCK_BASIC_LATIN; i < UBLOCK_COUNT; ++i)
         {
@@ -809,826 +819,826 @@ void SubsetMap::InitList()
                 case UBLOCK_LOW_SURROGATES:
                     break;
                 case UBLOCK_BASIC_LATIN:
-                    aAllSubsets.push_back( Subset( 0x0000, 0x007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_LATIN)) ) );
+                    aAllSubsets.push_back( Subset( 0x0000, 0x007F, FindIndex(RID_SUBSETSTR_BASIC_LATIN) ) );
                     break;
                 case UBLOCK_LATIN_1_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x0080, 0x00FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_1)) ) );
+                    aAllSubsets.push_back( Subset( 0x0080, 0x00FF, FindIndex(RID_SUBSETSTR_LATIN_1) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0x0100, 0x017F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x0100, 0x017F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_A) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_B:
-                    aAllSubsets.push_back( Subset( 0x0180, 0x024F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x0180, 0x024F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_B) ) );
                     break;
                 case UBLOCK_IPA_EXTENSIONS:
-                    aAllSubsets.push_back( Subset( 0x0250, 0x02AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IPA_EXTENSIONS)) ) );
+                    aAllSubsets.push_back( Subset( 0x0250, 0x02AF, FindIndex(RID_SUBSETSTR_IPA_EXTENSIONS) ) );
                     break;
                 case UBLOCK_SPACING_MODIFIER_LETTERS:
-                    aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SPACING_MODIFIERS)) ) );
+                    aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, FindIndex(RID_SUBSETSTR_SPACING_MODIFIERS) ) );
                     break;
                 case UBLOCK_COMBINING_DIACRITICAL_MARKS:
-                    aAllSubsets.push_back( Subset( 0x0300, 0x036F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMB_DIACRITICAL)) ) );
+                    aAllSubsets.push_back( Subset( 0x0300, 0x036F, FindIndex(RID_SUBSETSTR_COMB_DIACRITICAL) ) );
                     break;
                 case UBLOCK_GREEK:
-                    aAllSubsets.push_back( Subset( 0x0370, 0x03FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_GREEK)) ) );
+                    aAllSubsets.push_back( Subset( 0x0370, 0x03FF, FindIndex(RID_SUBSETSTR_BASIC_GREEK) ) );
                     break;
                 case UBLOCK_CYRILLIC:
-                    aAllSubsets.push_back( Subset( 0x0400, 0x04FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x0400, 0x04FF, FindIndex(RID_SUBSETSTR_CYRILLIC) ) );
                     break;
                 case UBLOCK_ARMENIAN:
-                    aAllSubsets.push_back( Subset( 0x0530, 0x058F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARMENIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x0530, 0x058F, FindIndex(RID_SUBSETSTR_ARMENIAN) ) );
                     break;
                 case UBLOCK_HEBREW:
-                    aAllSubsets.push_back( Subset( 0x0590, 0x05FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_HEBREW)) ) );
+                    aAllSubsets.push_back( Subset( 0x0590, 0x05FF, FindIndex(RID_SUBSETSTR_BASIC_HEBREW) ) );
                     break;
                 case UBLOCK_ARABIC:
-                    aAllSubsets.push_back( Subset( 0x0600, 0x065F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_ARABIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x0600, 0x065F, FindIndex(RID_SUBSETSTR_BASIC_ARABIC) ) );
                     break;
                 case UBLOCK_SYRIAC:
-                    aAllSubsets.push_back( Subset( 0x0700, 0x074F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SYRIAC)) ) );
+                    aAllSubsets.push_back( Subset( 0x0700, 0x074F, FindIndex(RID_SUBSETSTR_SYRIAC) ) );
                     break;
                 case UBLOCK_THAANA:
-                    aAllSubsets.push_back( Subset( 0x0780, 0x07BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_THAANA)) ) );
+                    aAllSubsets.push_back( Subset( 0x0780, 0x07BF, FindIndex(RID_SUBSETSTR_THAANA) ) );
                     break;
                 case UBLOCK_DEVANAGARI:
-                    aAllSubsets.push_back( Subset( 0x0900, 0x097F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DEVANAGARI)) ) );
+                    aAllSubsets.push_back( Subset( 0x0900, 0x097F, FindIndex(RID_SUBSETSTR_DEVANAGARI) ) );
                     break;
                 case UBLOCK_BENGALI:
-                    aAllSubsets.push_back( Subset( 0x0980, 0x09FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BENGALI)) ) );
+                    aAllSubsets.push_back( Subset( 0x0980, 0x09FF, FindIndex(RID_SUBSETSTR_BENGALI) ) );
                     break;
                 case UBLOCK_GURMUKHI:
-                    aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GURMUKHI)) ) );
+                    aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, FindIndex(RID_SUBSETSTR_GURMUKHI) ) );
                     break;
                 case UBLOCK_GUJARATI:
-                    aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GUJARATI)) ) );
+                    aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, FindIndex(RID_SUBSETSTR_GUJARATI) ) );
                     break;
                 case UBLOCK_ORIYA:
-                    aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ODIA)) ) );
+                    aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, FindIndex(RID_SUBSETSTR_ODIA) ) );
                     break;
                 case UBLOCK_TAMIL:
-                    aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAMIL)) ) );
+                    aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, FindIndex(RID_SUBSETSTR_TAMIL) ) );
                     break;
                 case UBLOCK_TELUGU:
-                    aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TELUGU)) ) );
+                    aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, FindIndex(RID_SUBSETSTR_TELUGU) ) );
                     break;
                 case UBLOCK_KANNADA:
-                    aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANNADA)) ) );
+                    aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, FindIndex(RID_SUBSETSTR_KANNADA) ) );
                     break;
                 case UBLOCK_MALAYALAM:
-                    aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MALAYALAM)) ) );
+                    aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, FindIndex(RID_SUBSETSTR_MALAYALAM) ) );
                     break;
                 case UBLOCK_SINHALA:
-                    aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SINHALA)) ) );
+                    aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, FindIndex(RID_SUBSETSTR_SINHALA) ) );
                     break;
                 case UBLOCK_THAI:
-                    aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_THAI)) ) );
+                    aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, FindIndex(RID_SUBSETSTR_THAI) ) );
                     break;
                 case UBLOCK_LAO:
-                    aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LAO)) ) );
+                    aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, FindIndex(RID_SUBSETSTR_LAO) ) );
                     break;
                 case UBLOCK_TIBETAN:
-                    aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIBETAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, FindIndex(RID_SUBSETSTR_TIBETAN) ) );
                     break;
                 case UBLOCK_MYANMAR:
-                    aAllSubsets.push_back( Subset( 0x1000, 0x109F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR)) ) );
+                    aAllSubsets.push_back( Subset( 0x1000, 0x109F, FindIndex(RID_SUBSETSTR_MYANMAR) ) );
                     break;
                 case UBLOCK_GEORGIAN:
-                    aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_GEORGIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, FindIndex(RID_SUBSETSTR_BASIC_GEORGIAN) ) );
                     break;
                 case UBLOCK_HANGUL_JAMO:
-                    aAllSubsets.push_back( Subset( 0x1100, 0x11FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO)) ) );
+                    aAllSubsets.push_back( Subset( 0x1100, 0x11FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO) ) );
                     break;
                 case UBLOCK_ETHIOPIC:
-                    aAllSubsets.push_back( Subset( 0x1200, 0x137F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x1200, 0x137F, FindIndex(RID_SUBSETSTR_ETHIOPIC) ) );
                     break;
                 case UBLOCK_CHEROKEE:
-                    aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHEROKEE)) ) );
+                    aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, FindIndex(RID_SUBSETSTR_CHEROKEE) ) );
                     break;
                 case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS:
-                    aAllSubsets.push_back( Subset( 0x1400, 0x167F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CANADIAN_ABORIGINAL)) ) );
+                    aAllSubsets.push_back( Subset( 0x1400, 0x167F, FindIndex(RID_SUBSETSTR_CANADIAN_ABORIGINAL) ) );
                     break;
                 case UBLOCK_OGHAM:
-                    aAllSubsets.push_back( Subset( 0x1680, 0x169F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OGHAM)) ) );
+                    aAllSubsets.push_back( Subset( 0x1680, 0x169F, FindIndex(RID_SUBSETSTR_OGHAM) ) );
                     break;
                 case UBLOCK_RUNIC:
-                    aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_RUNIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, FindIndex(RID_SUBSETSTR_RUNIC) ) );
                     break;
                 case UBLOCK_KHMER:
-                    aAllSubsets.push_back( Subset( 0x1780, 0x17FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHMER)) ) );
+                    aAllSubsets.push_back( Subset( 0x1780, 0x17FF, FindIndex(RID_SUBSETSTR_KHMER) ) );
                     break;
                 case UBLOCK_MONGOLIAN:
-                    aAllSubsets.push_back( Subset( 0x1800, 0x18AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MONGOLIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x1800, 0x18AF, FindIndex(RID_SUBSETSTR_MONGOLIAN) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_ADDITIONAL:
-                    aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_ADDS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_ADDS) ) );
                     break;
                 case UBLOCK_GREEK_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GREEK_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, FindIndex(RID_SUBSETSTR_GREEK_EXTENDED) ) );
                     break;
                 case UBLOCK_GENERAL_PUNCTUATION:
-                    aAllSubsets.push_back( Subset( 0x2000, 0x206F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GENERAL_PUNCTUATION)) ) );
+                    aAllSubsets.push_back( Subset( 0x2000, 0x206F, FindIndex(RID_SUBSETSTR_GENERAL_PUNCTUATION) ) );
                     break;
                 case UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS:
-                    aAllSubsets.push_back( Subset( 0x2070, 0x209F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUB_SUPER_SCRIPTS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2070, 0x209F, FindIndex(RID_SUBSETSTR_SUB_SUPER_SCRIPTS) ) );
                     break;
                 case UBLOCK_CURRENCY_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CURRENCY_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, FindIndex(RID_SUBSETSTR_CURRENCY_SYMBOLS) ) );
                     break;
                 case UBLOCK_COMBINING_MARKS_FOR_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMB_DIACRITIC_SYMS)) ) );
+                    aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, FindIndex(RID_SUBSETSTR_COMB_DIACRITIC_SYMS) ) );
                     break;
                 case UBLOCK_LETTERLIKE_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x2100, 0x214F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LETTERLIKE_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2100, 0x214F, FindIndex(RID_SUBSETSTR_LETTERLIKE_SYMBOLS) ) );
                     break;
                 case UBLOCK_NUMBER_FORMS:
-                    aAllSubsets.push_back( Subset( 0x2150, 0x218F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NUMBER_FORMS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2150, 0x218F, FindIndex(RID_SUBSETSTR_NUMBER_FORMS) ) );
                     break;
                 case UBLOCK_ARROWS:
-                    aAllSubsets.push_back( Subset( 0x2190, 0x21FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARROWS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2190, 0x21FF, FindIndex(RID_SUBSETSTR_ARROWS) ) );
                     break;
                 case UBLOCK_MATHEMATICAL_OPERATORS:
-                    aAllSubsets.push_back( Subset( 0x2200, 0x22FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MATH_OPERATORS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2200, 0x22FF, FindIndex(RID_SUBSETSTR_MATH_OPERATORS) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_TECHNICAL:
-                    aAllSubsets.push_back( Subset( 0x2300, 0x23FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_TECHNICAL)) ) );
+                    aAllSubsets.push_back( Subset( 0x2300, 0x23FF, FindIndex(RID_SUBSETSTR_MISC_TECHNICAL) ) );
                     break;
                 case UBLOCK_CONTROL_PICTURES:
-                    aAllSubsets.push_back( Subset( 0x2400, 0x243F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CONTROL_PICTURES)) ) );
+                    aAllSubsets.push_back( Subset( 0x2400, 0x243F, FindIndex(RID_SUBSETSTR_CONTROL_PICTURES) ) );
                     break;
                 case UBLOCK_OPTICAL_CHARACTER_RECOGNITION:
-                    aAllSubsets.push_back( Subset( 0x2440, 0x245F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OPTICAL_CHAR_REC)) ) );
+                    aAllSubsets.push_back( Subset( 0x2440, 0x245F, FindIndex(RID_SUBSETSTR_OPTICAL_CHAR_REC) ) );
                     break;
                 case UBLOCK_ENCLOSED_ALPHANUMERICS:
-                    aAllSubsets.push_back( Subset( 0x2460, 0x24FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUM)) ) );
+                    aAllSubsets.push_back( Subset( 0x2460, 0x24FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUM) ) );
                     break;
                 case UBLOCK_BOX_DRAWING:
-                    aAllSubsets.push_back( Subset( 0x2500, 0x257F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOX_DRAWING)) ) );
+                    aAllSubsets.push_back( Subset( 0x2500, 0x257F, FindIndex(RID_SUBSETSTR_BOX_DRAWING) ) );
                     break;
                 case UBLOCK_BLOCK_ELEMENTS:
-                    aAllSubsets.push_back( Subset( 0x2580, 0x259F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BLOCK_ELEMENTS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2580, 0x259F, FindIndex(RID_SUBSETSTR_BLOCK_ELEMENTS) ) );
                     break;
                 case UBLOCK_GEOMETRIC_SHAPES:
-                    aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES)) ) );
+                    aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x2600, 0x26FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_DINGBATS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2600, 0x26FF, FindIndex(RID_SUBSETSTR_MISC_DINGBATS) ) );
                     break;
                 case UBLOCK_DINGBATS:
-                    aAllSubsets.push_back( Subset( 0x2700, 0x27BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DINGBATS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2700, 0x27BF, FindIndex(RID_SUBSETSTR_DINGBATS) ) );
                     break;
                 case UBLOCK_BRAILLE_PATTERNS:
-                    aAllSubsets.push_back( Subset( 0x2800, 0x28FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BRAILLE_PATTERNS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2800, 0x28FF, FindIndex(RID_SUBSETSTR_BRAILLE_PATTERNS) ) );
                     break;
                 case UBLOCK_CJK_RADICALS_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_RADICAL_SUPPL)) ) );
+                    aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, FindIndex(RID_SUBSETSTR_CJK_RADICAL_SUPPL) ) );
                     break;
                 case UBLOCK_KANGXI_RADICALS:
-                    aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANGXI_RADICALS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, FindIndex(RID_SUBSETSTR_KANGXI_RADICALS) ) );
                     break;
                 case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS:
-                    aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IDEO_DESC_CHARS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, FindIndex(RID_SUBSETSTR_IDEO_DESC_CHARS) ) );
                     break;
                 case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
-                    aAllSubsets.push_back( Subset( 0x3000, 0x303F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION)) ) );
+                    aAllSubsets.push_back( Subset( 0x3000, 0x303F, FindIndex(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION) ) );
                     break;
                 case UBLOCK_HIRAGANA:
-                    aAllSubsets.push_back( Subset( 0x3040, 0x309F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HIRAGANA)) ) );
+                    aAllSubsets.push_back( Subset( 0x3040, 0x309F, FindIndex(RID_SUBSETSTR_HIRAGANA) ) );
                     break;
                 case UBLOCK_KATAKANA:
-                    aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KATAKANA)) ) );
+                    aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, FindIndex(RID_SUBSETSTR_KATAKANA) ) );
                     break;
                 case UBLOCK_BOPOMOFO:
-                    aAllSubsets.push_back( Subset( 0x3100, 0x312F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOPOMOFO)) ) );
+                    aAllSubsets.push_back( Subset( 0x3100, 0x312F, FindIndex(RID_SUBSETSTR_BOPOMOFO) ) );
                     break;
                 case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
-                    aAllSubsets.push_back( Subset( 0x3130, 0x318F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_COMPAT_JAMO)) ) );
+                    aAllSubsets.push_back( Subset( 0x3130, 0x318F, FindIndex(RID_SUBSETSTR_HANGUL_COMPAT_JAMO) ) );
                     break;
                 case UBLOCK_KANBUN:
-                    aAllSubsets.push_back( Subset( 0x3190, 0x319F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANBUN)) ) );
+                    aAllSubsets.push_back( Subset( 0x3190, 0x319F, FindIndex(RID_SUBSETSTR_KANBUN) ) );
                     break;
                 case UBLOCK_BOPOMOFO_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOPOMOFO_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, FindIndex(RID_SUBSETSTR_BOPOMOFO_EXTENDED) ) );
                     break;
                 case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS:
-                    aAllSubsets.push_back( Subset( 0x3200, 0x32FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS)) ) );
+                    aAllSubsets.push_back( Subset( 0x3200, 0x32FF, FindIndex(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS) ) );
                     break;
                 case UBLOCK_CJK_COMPATIBILITY:
-                    aAllSubsets.push_back( Subset( 0x3300, 0x33FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY)) ) );
+                    aAllSubsets.push_back( Subset( 0x3300, 0x33FF, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:
-                    aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH)) ) );
+                    aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, FindIndex(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:
-                    aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH)) ) );
+                    aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH) ) );
                     break;
                 case UBLOCK_YI_SYLLABLES:
-                    aAllSubsets.push_back( Subset( 0xA000, 0xA48F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YI_SYLLABLES)) ) );
+                    aAllSubsets.push_back( Subset( 0xA000, 0xA48F, FindIndex(RID_SUBSETSTR_YI_SYLLABLES) ) );
                     break;
                 case UBLOCK_YI_RADICALS:
-                    aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YI_RADICALS)) ) );
+                    aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, FindIndex(RID_SUBSETSTR_YI_RADICALS) ) );
                     break;
                 case UBLOCK_HANGUL_SYLLABLES:
-                    aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL)) ) );
+                    aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, FindIndex(RID_SUBSETSTR_HANGUL) ) );
                     break;
                 case UBLOCK_PRIVATE_USE_AREA:
-                    aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PRIVATE_USE_AREA)) ) );
+                    aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, FindIndex(RID_SUBSETSTR_PRIVATE_USE_AREA) ) );
                     break;
                 case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:
-                    aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, FindIndex(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS) ) );
                     break;
                 case UBLOCK_ALPHABETIC_PRESENTATION_FORMS:
-                    aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ALPHA_PRESENTATION)) ) );
+                    aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, FindIndex(RID_SUBSETSTR_ALPHA_PRESENTATION) ) );
                     break;
                 case UBLOCK_ARABIC_PRESENTATION_FORMS_A:
-                    aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_A)) ) );
+                    aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_A) ) );
                     break;
                 case UBLOCK_COMBINING_HALF_MARKS:
-                    aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_HALF_MARKS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, FindIndex(RID_SUBSETSTR_COMBINING_HALF_MARKS) ) );
                     break;
                 case UBLOCK_CJK_COMPATIBILITY_FORMS:
-                    aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPAT_FORMS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, FindIndex(RID_SUBSETSTR_CJK_COMPAT_FORMS) ) );
                     break;
                 case UBLOCK_SMALL_FORM_VARIANTS:
-                    aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SMALL_FORM_VARIANTS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, FindIndex(RID_SUBSETSTR_SMALL_FORM_VARIANTS) ) );
                     break;
                 case UBLOCK_ARABIC_PRESENTATION_FORMS_B:
-                    aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_B)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_B) ) );
                     break;
                 case UBLOCK_SPECIALS:
-                    aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SPECIALS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, FindIndex(RID_SUBSETSTR_SPECIALS) ) );
                     break;
                 case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS:
-                    aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HALFW_FULLW_FORMS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, FindIndex(RID_SUBSETSTR_HALFW_FULLW_FORMS) ) );
                     break;
                 case UBLOCK_OLD_ITALIC:
-                    aAllSubsets.push_back( Subset( 0x10300, 0x1032F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_ITALIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10300, 0x1032F, FindIndex(RID_SUBSETSTR_OLD_ITALIC) ) );
                     break;
                 case UBLOCK_GOTHIC:
-                    aAllSubsets.push_back( Subset( 0x10330, 0x1034F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GOTHIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10330, 0x1034F, FindIndex(RID_SUBSETSTR_GOTHIC) ) );
                     break;
                 case UBLOCK_DESERET:
-                    aAllSubsets.push_back( Subset( 0x10400, 0x1044F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DESERET)) ) );
+                    aAllSubsets.push_back( Subset( 0x10400, 0x1044F, FindIndex(RID_SUBSETSTR_DESERET) ) );
                     break;
                 case UBLOCK_BYZANTINE_MUSICAL_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, FindIndex(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS) ) );
                     break;
                 case UBLOCK_MUSICAL_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MUSICAL_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, FindIndex(RID_SUBSETSTR_MUSICAL_SYMBOLS) ) );
                     break;
                 case UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, FindIndex(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B:
-                    aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B) ) );
                     break;
                 case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_TAGS:
-                    aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGS)) ) );
+                    aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, FindIndex(RID_SUBSETSTR_TAGS) ) );
                     break;
                 case UBLOCK_CYRILLIC_SUPPLEMENTARY:
-                    aAllSubsets.push_back( Subset( 0x0500, 0x052F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY)) ) );
+                    aAllSubsets.push_back( Subset( 0x0500, 0x052F, FindIndex(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY) ) );
                     break;
                 case UBLOCK_TAGALOG:
-                    aAllSubsets.push_back( Subset( 0x1700, 0x171F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGALOG)) ) );
+                    aAllSubsets.push_back( Subset( 0x1700, 0x171F, FindIndex(RID_SUBSETSTR_TAGALOG) ) );
                     break;
                 case UBLOCK_HANUNOO:
-                    aAllSubsets.push_back( Subset( 0x1720, 0x173F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANUNOO)) ) );
+                    aAllSubsets.push_back( Subset( 0x1720, 0x173F, FindIndex(RID_SUBSETSTR_HANUNOO) ) );
                     break;
                 case UBLOCK_BUHID:
-                    aAllSubsets.push_back( Subset( 0x1740, 0x175F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BUHID)) ) );
+                    aAllSubsets.push_back( Subset( 0x1740, 0x175F, FindIndex(RID_SUBSETSTR_BUHID) ) );
                     break;
                 case UBLOCK_TAGBANWA:
-                    aAllSubsets.push_back( Subset( 0x1760, 0x177F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGBANWA)) ) );
+                    aAllSubsets.push_back( Subset( 0x1760, 0x177F, FindIndex(RID_SUBSETSTR_TAGBANWA) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A:
-                    aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_A) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_ARROWS_A:
-                    aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_A) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_ARROWS_B:
-                    aAllSubsets.push_back( Subset( 0x2900, 0x297F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x2900, 0x297F, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_B) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B:
-                    aAllSubsets.push_back( Subset( 0x2980, 0x29FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x2980, 0x29FF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS:
-                    aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
                     break;
                 case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS:
-                    aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KATAKANA_PHONETIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, FindIndex(RID_SUBSETSTR_KATAKANA_PHONETIC) ) );
                     break;
                 case UBLOCK_VARIATION_SELECTORS:
-                    aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS) ) );
                     break;
                 case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A:
-                    aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A)) ) );
+                    aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A) ) );
                     break;
                 case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B:
-                    aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B)) ) );
+                    aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B) ) );
                     break;
                 case UBLOCK_LIMBU:
-                    aAllSubsets.push_back( Subset( 0x1900, 0x194F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LIMBU)) ) );
+                    aAllSubsets.push_back( Subset( 0x1900, 0x194F, FindIndex(RID_SUBSETSTR_LIMBU) ) );
                     break;
                 case UBLOCK_TAI_LE:
-                    aAllSubsets.push_back( Subset( 0x1950, 0x197F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_LE)) ) );
+                    aAllSubsets.push_back( Subset( 0x1950, 0x197F, FindIndex(RID_SUBSETSTR_TAI_LE) ) );
                     break;
                 case UBLOCK_KHMER_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHMER_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, FindIndex(RID_SUBSETSTR_KHMER_SYMBOLS) ) );
                     break;
                 case UBLOCK_PHONETIC_EXTENSIONS:
-                    aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS:
-                    aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS)) ) );
+                    aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS) ) );
                     break;
                 case UBLOCK_YIJING_HEXAGRAM_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, FindIndex(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS) ) );
                     break;
                 case UBLOCK_LINEAR_B_SYLLABARY:
-                    aAllSubsets.push_back( Subset( 0x10000, 0x1007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_B_SYLLABARY)) ) );
+                    aAllSubsets.push_back( Subset( 0x10000, 0x1007F, FindIndex(RID_SUBSETSTR_LINEAR_B_SYLLABARY) ) );
                     break;
                 case UBLOCK_LINEAR_B_IDEOGRAMS:
-                    aAllSubsets.push_back( Subset( 0x10080, 0x100FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS)) ) );
+                    aAllSubsets.push_back( Subset( 0x10080, 0x100FF, FindIndex(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS) ) );
                     break;
                 case UBLOCK_AEGEAN_NUMBERS:
-                    aAllSubsets.push_back( Subset( 0x10100, 0x1013F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AEGEAN_NUMBERS)) ) );
+                    aAllSubsets.push_back( Subset( 0x10100, 0x1013F, FindIndex(RID_SUBSETSTR_AEGEAN_NUMBERS) ) );
                     break;
                 case UBLOCK_UGARITIC:
-                    aAllSubsets.push_back( Subset( 0x10380, 0x1039F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_UGARITIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10380, 0x1039F, FindIndex(RID_SUBSETSTR_UGARITIC) ) );
                     break;
                 case UBLOCK_SHAVIAN:
-                    aAllSubsets.push_back( Subset( 0x10450, 0x1047F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHAVIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10450, 0x1047F, FindIndex(RID_SUBSETSTR_SHAVIAN) ) );
                     break;
                 case UBLOCK_OSMANYA:
-                    aAllSubsets.push_back( Subset( 0x10480, 0x104AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OSMANYA)) ) );
+                    aAllSubsets.push_back( Subset( 0x10480, 0x104AF, FindIndex(RID_SUBSETSTR_OSMANYA) ) );
                     break;
                 case UBLOCK_CYPRIOT_SYLLABARY:
-                    aAllSubsets.push_back( Subset( 0x10800, 0x1083F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYPRIOT_SYLLABARY)) ) );
+                    aAllSubsets.push_back( Subset( 0x10800, 0x1083F, FindIndex(RID_SUBSETSTR_CYPRIOT_SYLLABARY) ) );
                     break;
                 case UBLOCK_TAI_XUAN_JING_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, FindIndex(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS) ) );
                     break;
                 case UBLOCK_VARIATION_SELECTORS_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION:
-                    aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION)) ) );
+                    aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION) ) );
                     break;
                 case UBLOCK_ANCIENT_GREEK_NUMBERS:
-                    aAllSubsets.push_back( Subset(0x10140, 0x1018F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS)) ) );
+                    aAllSubsets.push_back( Subset(0x10140, 0x1018F , FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS) ) );
                     break;
                 case UBLOCK_ARABIC_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset(0x0750, 0x077F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset(0x0750, 0x077F , FindIndex(RID_SUBSETSTR_ARABIC_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_BUGINESE:
-                    aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BUGINESE)) ) );
+                    aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , FindIndex(RID_SUBSETSTR_BUGINESE) ) );
                     break;
                 case UBLOCK_CJK_STROKES:
-                    aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_STROKES)) ) );
+                    aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, FindIndex(RID_SUBSETSTR_CJK_STROKES) ) );
                     break;
                 case UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_COPTIC:
-                    aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COPTIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , FindIndex(RID_SUBSETSTR_COPTIC) ) );
                     break;
                 case UBLOCK_ETHIOPIC_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED) ) );
                     break;
                 case UBLOCK_ETHIOPIC_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1380, 0x139F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1380, 0x139F, FindIndex(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_GEORGIAN_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, FindIndex(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_GLAGOLITIC:
-                    aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GLAGOLITIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, FindIndex(RID_SUBSETSTR_GLAGOLITIC) ) );
                     break;
                 case UBLOCK_KHAROSHTHI:
-                    aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHAROSHTHI)) ) );
+                    aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, FindIndex(RID_SUBSETSTR_KHAROSHTHI) ) );
                     break;
                 case UBLOCK_MODIFIER_TONE_LETTERS:
-                    aAllSubsets.push_back( Subset( 0xA700, 0xA71F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MODIFIER_TONE_LETTERS)) ) );
+                    aAllSubsets.push_back( Subset( 0xA700, 0xA71F, FindIndex(RID_SUBSETSTR_MODIFIER_TONE_LETTERS) ) );
                     break;
                 case UBLOCK_NEW_TAI_LUE:
-                    aAllSubsets.push_back( Subset( 0x1980, 0x19DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NEW_TAI_LUE)) ) );
+                    aAllSubsets.push_back( Subset( 0x1980, 0x19DF, FindIndex(RID_SUBSETSTR_NEW_TAI_LUE) ) );
                     break;
                 case UBLOCK_OLD_PERSIAN:
-                    aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_PERSIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, FindIndex(RID_SUBSETSTR_OLD_PERSIAN) ) );
                     break;
                 case UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_PUNCTUATION:
-                    aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION)) ) );
+                    aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION) ) );
                     break;
                 case UBLOCK_SYLOTI_NAGRI:
-                    aAllSubsets.push_back( Subset( 0xA800, 0xA82F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SYLOTI_NAGRI)) ) );
+                    aAllSubsets.push_back( Subset( 0xA800, 0xA82F, FindIndex(RID_SUBSETSTR_SYLOTI_NAGRI) ) );
                     break;
                 case UBLOCK_TIFINAGH:
-                    aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIFINAGH)) ) );
+                    aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, FindIndex(RID_SUBSETSTR_TIFINAGH) ) );
                     break;
                 case UBLOCK_VERTICAL_FORMS:
-                    aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VERTICAL_FORMS)) ) );
+                    aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, FindIndex(RID_SUBSETSTR_VERTICAL_FORMS) ) );
                     break;
                 case UBLOCK_NKO:
-                    aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NKO)) ) );
+                    aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, FindIndex(RID_SUBSETSTR_NKO) ) );
                     break;
                 case UBLOCK_BALINESE:
-                    aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BALINESE)) ) );
+                    aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, FindIndex(RID_SUBSETSTR_BALINESE) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_C:
-                    aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_C)) ) );
+                    aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_C) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_D:
-                    aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_D)) ) );
+                    aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_D) ) );
                     break;
                 case UBLOCK_PHAGS_PA:
-                    aAllSubsets.push_back( Subset( 0xA840, 0xA87F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHAGS_PA)) ) );
+                    aAllSubsets.push_back( Subset( 0xA840, 0xA87F, FindIndex(RID_SUBSETSTR_PHAGS_PA) ) );
                     break;
                 case UBLOCK_PHOENICIAN:
-                    aAllSubsets.push_back( Subset( 0x10900, 0x1091F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHOENICIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10900, 0x1091F, FindIndex(RID_SUBSETSTR_PHOENICIAN) ) );
                     break;
                 case UBLOCK_CUNEIFORM:
-                    aAllSubsets.push_back( Subset( 0x12000, 0x123FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CUNEIFORM)) ) );
+                    aAllSubsets.push_back( Subset( 0x12000, 0x123FF, FindIndex(RID_SUBSETSTR_CUNEIFORM) ) );
                     break;
                 case UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION:
-                    aAllSubsets.push_back( Subset( 0x12400, 0x1247F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION)) ) );
+                    aAllSubsets.push_back( Subset( 0x12400, 0x1247F, FindIndex(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION) ) );
                     break;
                 case UBLOCK_COUNTING_ROD_NUMERALS:
-                    aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COUNTING_ROD_NUMERALS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, FindIndex(RID_SUBSETSTR_COUNTING_ROD_NUMERALS) ) );
                     break;
                 case UBLOCK_SUNDANESE:
-                    aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUNDANESE)) ) );
+                    aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, FindIndex(RID_SUBSETSTR_SUNDANESE) ) );
                     break;
                 case UBLOCK_LEPCHA:
-                    aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LEPCHA)) ) );
+                    aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, FindIndex(RID_SUBSETSTR_LEPCHA) ) );
                     break;
                 case UBLOCK_OL_CHIKI:
-                    aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OL_CHIKI)) ) );
+                    aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, FindIndex(RID_SUBSETSTR_OL_CHIKI) ) );
                     break;
                 case UBLOCK_CYRILLIC_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_A) ) );
                     break;
                 case UBLOCK_VAI:
-                    aAllSubsets.push_back( Subset( 0xA500, 0xA63F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VAI)) ) );
+                    aAllSubsets.push_back( Subset( 0xA500, 0xA63F, FindIndex(RID_SUBSETSTR_VAI) ) );
                     break;
                 case UBLOCK_CYRILLIC_EXTENDED_B:
-                    aAllSubsets.push_back( Subset( 0xA640, 0xA69F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_B)) ) );
+                    aAllSubsets.push_back( Subset( 0xA640, 0xA69F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_B) ) );
                     break;
                 case UBLOCK_SAURASHTRA:
-                    aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SAURASHTRA)) ) );
+                    aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, FindIndex(RID_SUBSETSTR_SAURASHTRA) ) );
                     break;
                 case UBLOCK_KAYAH_LI:
-                    aAllSubsets.push_back( Subset( 0xA900, 0xA92F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KAYAH_LI)) ) );
+                    aAllSubsets.push_back( Subset( 0xA900, 0xA92F, FindIndex(RID_SUBSETSTR_KAYAH_LI) ) );
                     break;
                 case UBLOCK_REJANG:
-                    aAllSubsets.push_back( Subset( 0xA930, 0xA95F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_REJANG)) ) );
+                    aAllSubsets.push_back( Subset( 0xA930, 0xA95F, FindIndex(RID_SUBSETSTR_REJANG) ) );
                     break;
                 case UBLOCK_CHAM:
-                    aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHAM)) ) );
+                    aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, FindIndex(RID_SUBSETSTR_CHAM) ) );
                     break;
                 case UBLOCK_ANCIENT_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x10190, 0x101CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x10190, 0x101CF, FindIndex(RID_SUBSETSTR_ANCIENT_SYMBOLS) ) );
                     break;
                 case UBLOCK_PHAISTOS_DISC:
-                    aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHAISTOS_DISC)) ) );
+                    aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, FindIndex(RID_SUBSETSTR_PHAISTOS_DISC) ) );
                     break;
                 case UBLOCK_LYCIAN:
-                    aAllSubsets.push_back( Subset( 0x10280, 0x1029F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LYCIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10280, 0x1029F, FindIndex(RID_SUBSETSTR_LYCIAN) ) );
                     break;
                 case UBLOCK_CARIAN:
-                    aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CARIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, FindIndex(RID_SUBSETSTR_CARIAN) ) );
                     break;
                 case UBLOCK_LYDIAN:
-                    aAllSubsets.push_back( Subset( 0x10920, 0x1093F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LYDIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10920, 0x1093F, FindIndex(RID_SUBSETSTR_LYDIAN) ) );
                     break;
                 case UBLOCK_MAHJONG_TILES:
-                    aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MAHJONG_TILES)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, FindIndex(RID_SUBSETSTR_MAHJONG_TILES) ) );
                     break;
                 case UBLOCK_DOMINO_TILES:
-                    aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DOMINO_TILES)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, FindIndex(RID_SUBSETSTR_DOMINO_TILES) ) );
                     break;
 #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4)
                 case UBLOCK_SAMARITAN:
-                    aAllSubsets.push_back( Subset( 0x0800, 0x083F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SAMARITAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x0800, 0x083F, FindIndex(RID_SUBSETSTR_SAMARITAN) ) );
                     break;
                 case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, FindIndex(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) ) );
                     break;
                 case UBLOCK_TAI_THAM:
-                    aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_THAM)) ) );
+                    aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, FindIndex(RID_SUBSETSTR_TAI_THAM) ) );
                     break;
                 case UBLOCK_VEDIC_EXTENSIONS:
-                    aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VEDIC_EXTENSIONS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, FindIndex(RID_SUBSETSTR_VEDIC_EXTENSIONS) ) );
                     break;
                 case UBLOCK_LISU:
-                    aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LISU)) ) );
+                    aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, FindIndex(RID_SUBSETSTR_LISU) ) );
                     break;
                 case UBLOCK_BAMUM:
-                    aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BAMUM)) ) );
+                    aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, FindIndex(RID_SUBSETSTR_BAMUM) ) );
                     break;
                 case UBLOCK_COMMON_INDIC_NUMBER_FORMS:
-                    aAllSubsets.push_back( Subset( 0xA830, 0xA83F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS)) ) );
+                    aAllSubsets.push_back( Subset( 0xA830, 0xA83F, FindIndex(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS) ) );
                     break;
                 case UBLOCK_DEVANAGARI_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DEVANAGARI_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, FindIndex(RID_SUBSETSTR_DEVANAGARI_EXTENDED) ) );
                     break;
                 case UBLOCK_HANGUL_JAMO_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0xA960, 0xA97F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0xA960, 0xA97F, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A) ) );
                     break;
                 case UBLOCK_JAVANESE:
-                    aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_JAVANESE)) ) );
+                    aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, FindIndex(RID_SUBSETSTR_JAVANESE) ) );
                     break;
                 case UBLOCK_MYANMAR_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_A) ) );
                     break;
                 case UBLOCK_TAI_VIET:
-                    aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_VIET)) ) );
+                    aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, FindIndex(RID_SUBSETSTR_TAI_VIET) ) );
                     break;
                 case UBLOCK_MEETEI_MAYEK:
-                    aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEETEI_MAYEK)) ) );
+                    aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK) ) );
                     break;
                 case UBLOCK_HANGUL_JAMO_EXTENDED_B:
-                    aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B)) ) );
+                    aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B) ) );
                     break;
                 case UBLOCK_IMPERIAL_ARAMAIC:
-                    aAllSubsets.push_back( Subset( 0x10840, 0x1085F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IMPERIAL_ARAMAIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10840, 0x1085F, FindIndex(RID_SUBSETSTR_IMPERIAL_ARAMAIC) ) );
                     break;
                 case UBLOCK_OLD_SOUTH_ARABIAN:
-                    aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_SOUTH_ARABIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, FindIndex(RID_SUBSETSTR_OLD_SOUTH_ARABIAN) ) );
                     break;
                 case UBLOCK_AVESTAN:
-                    aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AVESTAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, FindIndex(RID_SUBSETSTR_AVESTAN) ) );
                     break;
                 case UBLOCK_INSCRIPTIONAL_PARTHIAN:
-                    aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN) ) );
                     break;
                 case UBLOCK_INSCRIPTIONAL_PAHLAVI:
-                    aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI)) ) );
+                    aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI) ) );
                     break;
                 case UBLOCK_OLD_TURKIC:
-                    aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_TURKIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, FindIndex(RID_SUBSETSTR_OLD_TURKIC) ) );
                     break;
                 case UBLOCK_RUMI_NUMERAL_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, FindIndex(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS) ) );
                     break;
                 case UBLOCK_KAITHI:
-                    aAllSubsets.push_back( Subset( 0x11080, 0x110CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KAITHI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11080, 0x110CF, FindIndex(RID_SUBSETSTR_KAITHI) ) );
                     break;
                 case UBLOCK_EGYPTIAN_HIEROGLYPHS:
-                    aAllSubsets.push_back( Subset( 0x13000, 0x1342F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0x13000, 0x1342F, FindIndex(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS) ) );
                     break;
                 case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, FindIndex(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:
-                    aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C)) ) );
+                    aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ) );
                     break;
 #endif
 #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 6)
                 case UBLOCK_MANDAIC:
-                    aAllSubsets.push_back( Subset( 0x0840, 0x085F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MANDAIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x0840, 0x085F, FindIndex(RID_SUBSETSTR_MANDAIC) ) );
                     break;
                 case UBLOCK_BATAK:
-                    aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BATAK)) ) );
+                    aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, FindIndex(RID_SUBSETSTR_BATAK) ) );
                     break;
                 case UBLOCK_ETHIOPIC_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A) ) );
                     break;
                 case UBLOCK_BRAHMI:
-                    aAllSubsets.push_back( Subset( 0x11000, 0x1107F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BRAHMI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11000, 0x1107F, FindIndex(RID_SUBSETSTR_BRAHMI) ) );
                     break;
                 case UBLOCK_BAMUM_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BAMUM_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, FindIndex(RID_SUBSETSTR_BAMUM_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_KANA_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANA_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, FindIndex(RID_SUBSETSTR_KANA_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_PLAYING_CARDS:
-                    aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PLAYING_CARDS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, FindIndex(RID_SUBSETSTR_PLAYING_CARDS) ) );
                     break;
                 case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
-                    aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS) ) );
                     break;
                 case UBLOCK_EMOTICONS:
-                    aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EMOTICONS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, FindIndex(RID_SUBSETSTR_EMOTICONS) ) );
                     break;
                 case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, FindIndex(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS) ) );
                     break;
                 case UBLOCK_ALCHEMICAL_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, FindIndex(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:
-                    aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D)) ) );
+                    aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ) );
                     break;
 #endif
 // Note ICU version 49 (NOT 4.9), so the MAJOR_NUM is two digits.
 #if U_ICU_VERSION_MAJOR_NUM >= 49
                 case UBLOCK_ARABIC_EXTENDED_A:
-                    aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_EXTENDED_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, FindIndex(RID_SUBSETSTR_ARABIC_EXTENDED_A) ) );
                     break;
                 case UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS:
-                    aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, FindIndex(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) ) );
                     break;
                 case UBLOCK_CHAKMA:
-                    aAllSubsets.push_back( Subset( 0x11100, 0x1114F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHAKMA)) ) );
+                    aAllSubsets.push_back( Subset( 0x11100, 0x1114F, FindIndex(RID_SUBSETSTR_CHAKMA) ) );
                     break;
                 case UBLOCK_MEETEI_MAYEK_EXTENSIONS:
-                    aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS)) ) );
+                    aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS) ) );
                     break;
                 case UBLOCK_MEROITIC_CURSIVE:
-                    aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEROITIC_CURSIVE)) ) );
+                    aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, FindIndex(RID_SUBSETSTR_MEROITIC_CURSIVE) ) );
                     break;
                 case UBLOCK_MEROITIC_HIEROGLYPHS:
-                    aAllSubsets.push_back( Subset( 0x10980, 0x1099F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0x10980, 0x1099F, FindIndex(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS) ) );
                     break;
                 case UBLOCK_MIAO:
-                    aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MIAO)) ) );
+                    aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, FindIndex(RID_SUBSETSTR_MIAO) ) );
                     break;
                 case UBLOCK_SHARADA:
-                    aAllSubsets.push_back( Subset( 0x11180, 0x111DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHARADA)) ) );
+                    aAllSubsets.push_back( Subset( 0x11180, 0x111DF, FindIndex(RID_SUBSETSTR_SHARADA) ) );
                     break;
                 case UBLOCK_SORA_SOMPENG:
-                    aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SORA_SOMPENG)) ) );
+                    aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, FindIndex(RID_SUBSETSTR_SORA_SOMPENG) ) );
                     break;
                 case UBLOCK_SUNDANESE_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, FindIndex(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_TAKRI:
-                    aAllSubsets.push_back( Subset( 0x11680, 0x116CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAKRI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11680, 0x116CF, FindIndex(RID_SUBSETSTR_TAKRI) ) );
                     break;
 #endif
 #if U_ICU_VERSION_MAJOR_NUM >= 54
                 case UBLOCK_BASSA_VAH:
-                    aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASSA_VAH)) ) );
+                    aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, FindIndex(RID_SUBSETSTR_BASSA_VAH) ) );
                     break;
                 case UBLOCK_CAUCASIAN_ALBANIAN:
-                    aAllSubsets.push_back( Subset( 0x10530, 0x1056F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CAUCASIAN_ALBANIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10530, 0x1056F, FindIndex(RID_SUBSETSTR_CAUCASIAN_ALBANIAN) ) );
                     break;
                 case UBLOCK_COPTIC_EPACT_NUMBERS:
-                    aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS)) ) );
+                    aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, FindIndex(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS) ) );
                     break;
                 case UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED) ) );
                     break;
                 case UBLOCK_DUPLOYAN:
-                    aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DUPLOYAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, FindIndex(RID_SUBSETSTR_DUPLOYAN) ) );
                     break;
                 case UBLOCK_ELBASAN:
-                    aAllSubsets.push_back( Subset( 0x10500, 0x1052F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ELBASAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10500, 0x1052F, FindIndex(RID_SUBSETSTR_ELBASAN) ) );
                     break;
                 case UBLOCK_GEOMETRIC_SHAPES_EXTENDED:
-                    aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED) ) );
                     break;
                 case UBLOCK_GRANTHA:
-                    aAllSubsets.push_back( Subset( 0x11300, 0x1137F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GRANTHA)) ) );
+                    aAllSubsets.push_back( Subset( 0x11300, 0x1137F, FindIndex(RID_SUBSETSTR_GRANTHA) ) );
                     break;
                 case UBLOCK_KHOJKI:
-                    aAllSubsets.push_back( Subset( 0x11200, 0x1124F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHOJKI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11200, 0x1124F, FindIndex(RID_SUBSETSTR_KHOJKI) ) );
                     break;
                 case UBLOCK_KHUDAWADI:
-                    aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHUDAWADI)) ) );
+                    aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, FindIndex(RID_SUBSETSTR_KHUDAWADI) ) );
                     break;
                 case UBLOCK_LATIN_EXTENDED_E:
-                    aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_E)) ) );
+                    aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_E) ) );
                     break;
                 case UBLOCK_LINEAR_A:
-                    aAllSubsets.push_back( Subset( 0x10600, 0x1077F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_A)) ) );
+                    aAllSubsets.push_back( Subset( 0x10600, 0x1077F, FindIndex(RID_SUBSETSTR_LINEAR_A) ) );
                     break;
                 case UBLOCK_MAHAJANI:
-                    aAllSubsets.push_back( Subset( 0x11150, 0x1117F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MAHAJANI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11150, 0x1117F, FindIndex(RID_SUBSETSTR_MAHAJANI) ) );
                     break;
                 case UBLOCK_MANICHAEAN:
-                    aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MANICHAEAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, FindIndex(RID_SUBSETSTR_MANICHAEAN) ) );
                     break;
                 case UBLOCK_MENDE_KIKAKUI:
-                    aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MENDE_KIKAKUI)) ) );
+                    aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, FindIndex(RID_SUBSETSTR_MENDE_KIKAKUI) ) );
                     break;
                 case UBLOCK_MODI:
-                    aAllSubsets.push_back( Subset( 0x11600, 0x1165F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MODI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11600, 0x1165F, FindIndex(RID_SUBSETSTR_MODI) ) );
                     break;
                 case UBLOCK_MRO:
-                    aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MRO)) ) );
+                    aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, FindIndex(RID_SUBSETSTR_MRO) ) );
                     break;
                 case UBLOCK_MYANMAR_EXTENDED_B:
-                    aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_B)) ) );
+                    aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_B) ) );
                     break;
                 case UBLOCK_NABATAEAN:
-                    aAllSubsets.push_back( Subset( 0x10880, 0x108AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NABATAEAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10880, 0x108AF, FindIndex(RID_SUBSETSTR_NABATAEAN) ) );
                     break;
                 case UBLOCK_OLD_NORTH_ARABIAN:
-                    aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_NORTH_ARABIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, FindIndex(RID_SUBSETSTR_OLD_NORTH_ARABIAN) ) );
                     break;
                 case UBLOCK_OLD_PERMIC:
-                    aAllSubsets.push_back( Subset( 0x10350, 0x1037F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_PERMIC)) ) );
+                    aAllSubsets.push_back( Subset( 0x10350, 0x1037F, FindIndex(RID_SUBSETSTR_OLD_PERMIC) ) );
                     break;
                 case UBLOCK_ORNAMENTAL_DINGBATS:
-                    aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ORNAMENTAL_DINGBATS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, FindIndex(RID_SUBSETSTR_ORNAMENTAL_DINGBATS) ) );
                     break;
                 case UBLOCK_PAHAWH_HMONG:
-                    aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PAHAWH_HMONG)) ) );
+                    aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, FindIndex(RID_SUBSETSTR_PAHAWH_HMONG) ) );
                     break;
                 case UBLOCK_PALMYRENE:
-                    aAllSubsets.push_back( Subset( 0x10860, 0x1087F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PALMYRENE)) ) );
+                    aAllSubsets.push_back( Subset( 0x10860, 0x1087F, FindIndex(RID_SUBSETSTR_PALMYRENE) ) );
                     break;
                 case UBLOCK_PAU_CIN_HAU:
-                    aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PAU_CIN_HAU)) ) );
+                    aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, FindIndex(RID_SUBSETSTR_PAU_CIN_HAU) ) );
                     break;
                 case UBLOCK_PSALTER_PAHLAVI:
-                    aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PSALTER_PAHLAVI)) ) );
+                    aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, FindIndex(RID_SUBSETSTR_PSALTER_PAHLAVI) ) );
                     break;
                 case UBLOCK_SHORTHAND_FORMAT_CONTROLS:
-                    aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, FindIndex(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS) ) );
                     break;
                 case UBLOCK_SIDDHAM:
-                    aAllSubsets.push_back( Subset( 0x11580, 0x115FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SIDDHAM)) ) );
+                    aAllSubsets.push_back( Subset( 0x11580, 0x115FF, FindIndex(RID_SUBSETSTR_SIDDHAM) ) );
                     break;
                 case UBLOCK_SINHALA_ARCHAIC_NUMBERS:
-                    aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS)) ) );
+                    aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, FindIndex(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_ARROWS_C:
-                    aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C) ) );
                     break;
                 case UBLOCK_TIRHUTA:
-                    aAllSubsets.push_back( Subset( 0x11480, 0x114DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIRHUTA)) ) );
+                    aAllSubsets.push_back( Subset( 0x11480, 0x114DF, FindIndex(RID_SUBSETSTR_TIRHUTA) ) );
                     break;
                 case UBLOCK_WARANG_CITI:
-                    aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_WARANG_CITI)) ) );
+                    aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, FindIndex(RID_SUBSETSTR_WARANG_CITI) ) );
                     break;
 #endif
 #if U_ICU_VERSION_MAJOR_NUM >= 56
                 case UBLOCK_AHOM:
-                    aAllSubsets.push_back( Subset( 0x11700, 0x1173F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AHOM)) ) );
+                    aAllSubsets.push_back( Subset( 0x11700, 0x1173F, FindIndex(RID_SUBSETSTR_AHOM) ) );
                     break;
                 case UBLOCK_ANATOLIAN_HIEROGLYPHS:
-                    aAllSubsets.push_back( Subset( 0x14400, 0x1467F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0x14400, 0x1467F, FindIndex(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS) ) );
                     break;
                 case UBLOCK_CHEROKEE_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, FindIndex(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
-                    aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E)) ) );
+                    aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E) ) );
                     break;
                 case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
-                    aAllSubsets.push_back( Subset( 0x12480, 0x1254F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM)) ) );
+                    aAllSubsets.push_back( Subset( 0x12480, 0x1254F, FindIndex(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM) ) );
                     break;
                 case UBLOCK_HATRAN:
-                    aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HATRAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, FindIndex(RID_SUBSETSTR_HATRAN) ) );
                     break;
                 case UBLOCK_MULTANI:
-                    aAllSubsets.push_back( Subset( 0x11280, 0x112AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MULTANI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11280, 0x112AF, FindIndex(RID_SUBSETSTR_MULTANI) ) );
                     break;
                 case UBLOCK_OLD_HUNGARIAN:
-                    aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_HUNGARIAN)) ) );
+                    aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, FindIndex(RID_SUBSETSTR_OLD_HUNGARIAN) ) );
                     break;
                 case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
-                    aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS)) ) );
+                    aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS) ) );
                     break;
                 case UBLOCK_SUTTON_SIGNWRITING:
-                    aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUTTON_SIGNWRITING)) ) );
+                    aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, FindIndex(RID_SUBSETSTR_SUTTON_SIGNWRITING) ) );
                     break;
 #endif
 #if (U_ICU_VERSION_MAJOR_NUM >= 58)
                 case UBLOCK_ADLAM:
-                    aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ADLAM)) ) );
+                    aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, FindIndex(RID_SUBSETSTR_ADLAM) ) );
                     break;
                 case UBLOCK_BHAIKSUKI:
-                    aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BHAIKSUKI)) ) );
+                    aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, FindIndex(RID_SUBSETSTR_BHAIKSUKI) ) );
                     break;
                 case UBLOCK_CYRILLIC_EXTENDED_C:
-                    aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_C)) ) );
+                    aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_C) ) );
                     break;
                 case UBLOCK_GLAGOLITIC_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, FindIndex(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
-                    aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION)) ) );
+                    aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, FindIndex(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION) ) );
                     break;
                 case UBLOCK_MARCHEN:
-                    aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MARCHEN)) ) );
+                    aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, FindIndex(RID_SUBSETSTR_MARCHEN) ) );
                     break;
                 case UBLOCK_MONGOLIAN_SUPPLEMENT:
-                    aAllSubsets.push_back( Subset( 0x11660, 0x1167F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT)) ) );
+                    aAllSubsets.push_back( Subset( 0x11660, 0x1167F, FindIndex(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT) ) );
                     break;
                 case UBLOCK_NEWA:
-                    aAllSubsets.push_back( Subset( 0x11400, 0x1147F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NEWA)) ) );
+                    aAllSubsets.push_back( Subset( 0x11400, 0x1147F, FindIndex(RID_SUBSETSTR_NEWA) ) );
                     break;
                 case UBLOCK_OSAGE:
-                    aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OSAGE)) ) );
+                    aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, FindIndex(RID_SUBSETSTR_OSAGE) ) );
                     break;
                 case UBLOCK_TANGUT:
-                    aAllSubsets.push_back( Subset( 0x17000, 0x187FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TANGUT)) ) );
+                    aAllSubsets.push_back( Subset( 0x17000, 0x187FF, FindIndex(RID_SUBSETSTR_TANGUT) ) );
                     break;
                 case UBLOCK_TANGUT_COMPONENTS:
-                    aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS)) ) );
+                    aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS) ) );
                     break;
 #endif
 
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 1ba75a6d0e41..ac3a32f5e2e3 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -21,7 +21,7 @@
 #include <svtools/treelistentry.hxx>
 #include <svx/checklbx.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <vcl/builderfactory.hxx>
 
 SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) :
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 683cc80ed0d6..00c7de098be0 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/slider.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdograf.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/dialmgr.hxx>
@@ -35,8 +36,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include "compressgraphicdialog.hrc"
-
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
diff --git a/svx/source/dialog/compressgraphicdialog.hrc b/svx/source/dialog/compressgraphicdialog.hrc
deleted file mode 100644
index 2dd73ca251ac..000000000000
--- a/svx/source/dialog/compressgraphicdialog.hrc
+++ /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/.
- *
- * 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 STR_IMAGE_ORIGINAL_SIZE 256
-#define STR_IMAGE_VIEW_SIZE 257
-#define STR_IMAGE_CAPACITY 258
-#define STR_IMAGE_GIF 259
-#define STR_IMAGE_JPEG 260
-#define STR_IMAGE_PNG 261
-#define STR_IMAGE_TIFF 262
-#define STR_IMAGE_WMF 263
-#define STR_IMAGE_MET 264
-#define STR_IMAGE_PCT 265
-#define STR_IMAGE_SVG 266
-#define STR_IMAGE_BMP 267
-#define STR_IMAGE_UNKNOWN 268
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/compressgraphicdialog.src b/svx/source/dialog/compressgraphicdialog.src
deleted file mode 100644
index b2377c814c14..000000000000
--- a/svx/source/dialog/compressgraphicdialog.src
+++ /dev/null
@@ -1,87 +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 "compressgraphicdialog.hrc"
-
-String STR_IMAGE_ORIGINAL_SIZE
-{
-    Text [ en-US ] = "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)" ;
-};
-
-String STR_IMAGE_VIEW_SIZE
-{
-    Text [ en-US ] = "$(WIDTH) x $(HEIGHT) at $(DPI) DPI" ;
-};
-
-String STR_IMAGE_CAPACITY
-{
-    Text [ en-US ] = "$(CAPACITY) kiB" ;
-};
-
-String STR_IMAGE_GIF
-{
-    Text [ en-US ] = "Gif image";
-};
-
-String STR_IMAGE_JPEG
-{
-    Text [ en-US ] = "Jpeg image";
-};
-
-String STR_IMAGE_PNG
-{
-    Text [ en-US ] = "PNG image";
-};
-
-String STR_IMAGE_TIFF
-{
-    Text [ en-US ] = "TIFF image";
-};
-
-String STR_IMAGE_WMF
-{
-    Text [ en-US ] = "WMF image";
-};
-
-String STR_IMAGE_MET
-{
-    Text [ en-US ] = "MET image";
-};
-
-String STR_IMAGE_PCT
-{
-    Text [ en-US ] = "PCT image";
-};
-
-String STR_IMAGE_SVG
-{
-    Text [ en-US ] = "SVG image";
-};
-
-String STR_IMAGE_BMP
-{
-    Text [ en-US ] = "BMP image";
-};
-
-String STR_IMAGE_UNKNOWN
-{
-    Text [ en-US ] = "Unknown";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 12934170aea3..b644c3e56fe1 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/xoutbmp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <contwnd.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index b84393490c6f..0928a31a4aed 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -32,7 +32,7 @@
 
 #include <editeng/unolingu.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include <svx/ctredlin.hxx>
 #include "helpid.hrc"
 
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 68c8ffa6bf7c..ea4ee37041f3 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -21,6 +21,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 14d75def2647..c13faa7110f3 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -18,9 +18,8 @@
  */
 
 #include "svx/dialcontrol.hxx"
-#include "bmpmask.hrc"
 #include <svx/dialmgr.hxx>
-#include <tools/rcid.h>
+#include <svx/strings.hrc>
 #include <cmath>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index 05d9de4fc3e9..145ef6bf0745 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -19,17 +19,18 @@
 
 #include <tools/resmgr.hxx>
 #include <svx/dialmgr.hxx>
-#include <svl/solar.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-static ResMgr* pResMgr=nullptr;
+const std::locale& SvxResLocale()
+{
+    static std::locale loc = Translate::Create("svx", Application::GetSettings().GetUILanguageTag());
+    return loc;
+}
 
-ResMgr* DialogsResMgr::GetResMgr()
+OUString SvxResId(const char* pId)
 {
-    if (!pResMgr)
-        pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-    return pResMgr;
+    return Translate::get(pId, SvxResLocale());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a971e4871b0d..0f9955db0d3b 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svx/dlgctl3d.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/view3d.hxx>
 #include <svx/fmmodel.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b55c16ef6cdb..74fe85448178 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -23,8 +23,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
-#include <accessibility.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src
deleted file mode 100644
index 20e8d3ecec6a..000000000000
--- a/svx/source/dialog/dlgctrl.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 <svx/dialogs.hrc>
-
-String STR_SWITCH
-{
-    Text [ en-US ] = "Switch" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 1aa77acce4df..b71546962395 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -22,7 +22,7 @@
 #include <sal/macros.h>
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include "docrecovery.hxx"
 
@@ -801,16 +801,16 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re
     }
 }
 
-RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr)
+RecovDocList::RecovDocList(SvSimpleTableContainer& rParent)
     : SvSimpleTable      ( rParent )
     , m_aGreenCheckImg    (BitmapEx(RID_SVXBMP_GREENCHECK))
     , m_aYellowCheckImg   (BitmapEx(RID_SVXBMP_YELLOWCHECK))
     , m_aRedCrossImg      (BitmapEx(RID_SVXBMP_REDCROSS))
-    , m_aSuccessRecovStr  ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) )
-    , m_aOrigDocRecovStr  ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) )
-    , m_aRecovFailedStr   ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) )
-    , m_aRecovInProgrStr  ( ResId(RID_SVXSTR_RECOVINPROGR, rResMgr ) )
-    , m_aNotRecovYetStr   ( ResId(RID_SVXSTR_NOTRECOVYET, rResMgr ) )
+    , m_aSuccessRecovStr  (SvxResId(RID_SVXSTR_SUCCESSRECOV))
+    , m_aOrigDocRecovStr  (SvxResId(RID_SVXSTR_ORIGDOCRECOV))
+    , m_aRecovFailedStr   (SvxResId(RID_SVXSTR_RECOVFAILED))
+    , m_aRecovInProgrStr  (SvxResId(RID_SVXSTR_RECOVINPROGR))
+    , m_aNotRecovYetStr   (SvxResId(RID_SVXSTR_NOTRECOVYET))
 {
 }
 
@@ -828,9 +828,9 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
 }
 
 
-short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes)
+short impl_askUserForWizardCancel(vcl::Window* pParent, const char* pRes)
 {
-    ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(nRes), VclMessageType::Question, VclButtonsType::YesNo);
+    ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(pRes), VclMessageType::Question, VclButtonsType::YesNo);
     if (aQuery->Execute() == RET_YES)
         return DLG_RET_OK;
     else
@@ -857,7 +857,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
     SvSimpleTableContainer* pFileListLBContainer = get<SvSimpleTableContainer>("filelist");
     Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, 68), MapUnit::MapAppFont));
     pFileListLBContainer->set_height_request(aSize.Height());
-    m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer, DIALOG_MGR());
+    m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer);
 
     static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 };
     m_pFileListLB->SetTabs( &nTabs[0] );
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
deleted file mode 100644
index db0aa574e854..000000000000
--- a/svx/source/dialog/docrecovery.src
+++ /dev/null
@@ -1,28 +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 <svx/dialogs.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_QUERY_EXIT_RECOVERY
-{
-    Text [ en-US ] = "Are you sure you want to discard the %PRODUCTNAME document recovery data?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 213126c069c1..bd5ff70a24ff 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -38,7 +38,8 @@
 #include <svtools/sampletext.hxx>
 
 #include <svx/fntctrl.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include <svx/sdasitm.hxx>
 
 // Item set includes
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 0bf45c59a96f..7ee1da514845 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -30,7 +30,8 @@
 #include <svx/dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include <svx/fontwork.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 894fadc00a25..aaf935418702 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -30,11 +30,9 @@
 #include <vcl/settings.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 
-#include <tools/rcid.h>
-
 using namespace ::com::sun::star;
 using namespace ::editeng;
 
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
deleted file mode 100644
index 5b5541399ff5..000000000000
--- a/svx/source/dialog/frmsel.src
+++ /dev/null
@@ -1,54 +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 <svx/dialogs.hrc>
-
-StringArray RID_SVXSTR_FRMSEL_TEXTS
-{
-    ItemList [ en-US ] =
-    {
-        < "Border setting" ; 0; > ;
-        < "Left border line" ; 1; > ;
-        < "Right border line" ; 2; > ;
-        < "Top border line" ; 3; > ;
-        < "Bottom border line" ; 4; > ;
-        < "Horizontal border line" ; 5; > ;
-        < "Vertical border line" ; 6; > ;
-        < "Diagonal border line from top left to bottom right" ; 7; > ;
-        < "Diagonal border line from bottom left to top right" ; 8; > ;
-    };
-};
-
-StringArray RID_SVXSTR_FRMSEL_DESCRIPTIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "Border setting" ; 0; > ;
-        < "Left border line" ; 1; > ;
-        < "Right border line" ; 2; > ;
-        < "Top border line" ; 3; > ;
-        < "Bottom border line" ; 4; > ;
-        < "Horizontal border line" ; 5; > ;
-        < "Vertical border line" ; 6; > ;
-        < "Diagonal border line from top left to bottom right" ; 7; > ;
-        < "Diagonal border line from bottom left to top right" ; 8; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index c8858fd16487..0ca19dfe68f3 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -25,7 +25,8 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/grfflt.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/svxdlg.hxx>
 #include <memory>
 
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 24b263019f08..5ae16c739c10 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -25,7 +25,7 @@
 #include <vcl/graph.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <svl/intitem.hxx>
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 638b44951f2f..4e09745ffe97 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -42,7 +42,7 @@
 #include <vcl/layout.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include "imapdlg.hrc"
 #include "imapwnd.hxx"
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 8b7456d585a9..13698841f019 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -28,7 +28,7 @@
 
 #include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <imapdlg.hrc>
 #include <imapwnd.hxx>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b6ef358e6a9d..38b3ed4332d1 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -30,7 +30,7 @@
 #include <editeng/unolingu.hxx>
 #include <svx/langbox.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include <vcl/builderfactory.hxx>
 #include <vcl/i18nhelp.hxx>
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
deleted file mode 100644
index f3275f72757b..000000000000
--- a/svx/source/dialog/language.src
+++ /dev/null
@@ -1,29 +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 <svx/dialogs.hrc>
-
- // Language-Strings ------------------------------------------------------
-
-String RID_SVXSTR_LANGUAGE_ALL
-{
-    Text [ en-US ] = "[All]" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/numberingtype.src b/svx/source/dialog/numberingtype.src
deleted file mode 100644
index eac9cafd9f60..000000000000
--- a/svx/source/dialog/numberingtype.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 <svx/dialogs.hrc>
-
-StringArray RID_SVXSTRARY_NUMBERINGTYPE
-{
-    ItemList [ en-US ] =
-    {
-        < "None" ;                                  5/*SVX_NUM_NUMBER_NONE         */; > ;
-        < "Bullet" ;                                6/*SVX_NUM_CHAR_SPECIAL        */; > ;
-        < "Graphics" ;                              8/*SVX_NUM_BITMAP              */; > ;
-        < "Linked graphics" ;                     136/*SVX_NUM_BITMAP|0x80         */; > ;
-        < "1, 2, 3, ..." ;                          4/*SVX_NUM_ARABIC              */; > ;
-        < "A, B, C, ..." ;                          0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        < "a, b, c, ..." ;                          1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        < "I, II, III, ..." ;                       2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        < "i, ii, iii, ..." ;                       3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        < "A, .., AA, .., AAA, ..." ;               9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        < "a, .., aa, .., aaa, ..." ;               10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        < "Native Numbering" ;                      12 /*NATIVE_NUMBERING                   */; > ;
-        < "А, Б, .., Аа, Аб, ... (Bulgarian)" ;     38 /*CHARS_CYRILLIC_UPPER_LETTER_BG     */; > ;
-        < "а, б, .., аа, аб, ... (Bulgarian)" ;     39 /*CHARS_CYRILLIC_LOWER_LETTER_BG     */; > ;
-        < "А, Б, .., Аа, Бб, ... (Bulgarian)" ;     40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG   */; > ;
-        < "а, б, .., аа, бб, ... (Bulgarian)" ;     41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG   */; > ;
-        < "А, Б, .., Аа, Аб, ... (Russian)" ;       42 /*CHARS_CYRILLIC_UPPER_LETTER_RU     */; > ;
-        < "а, б, .., аа, аб, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
-        < "А, Б, .., Аа, Бб, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
-        < "а, б, .., аа, бб, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
-        < "А, Б, .., Аа, Аб, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
-        < "а, б, .., аа, аб, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
-        < "А, Б, .., Аа, Бб, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
-        < "а, б, .., аа, бб, ... (Serbian)" ;       51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
-        < "Α, Β, Γ, ... (Greek Upper Letter)";      52 /*CHARS_GREEK_UPPER_LETTER           */; > ;
-        < "α, β, γ, ... (Greek Lower Letter)";      53 /*CHARS_GREEK_LOWER_LETTER           */; > ;
-        < "א...י, יא...כ, ..." ;                    56 /*NUMBER_HEBREW                      */; > ;
-        < "א...ת, אא...תת, ..." ;                   33 /*CHARS_HEBREW                       */; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index c5034273c10b..15897fbc3526 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -24,7 +24,7 @@
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/optgrid.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "svx/dlgutil.hxx"
 
 // local functions
diff --git a/svx/source/dialog/page.src b/svx/source/dialog/page.src
deleted file mode 100644
index b39830ce9a47..000000000000
--- a/svx/source/dialog/page.src
+++ /dev/null
@@ -1,99 +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 <svx/dialogs.hrc>
-#include "page.h"
-
- // RID_SVXPAGE_PAGE ------------------------------------------------------
-
-StringArray RID_SVXSTRARY_PAPERSIZE_STD
-{
-    ItemList [ en-US ] =
-    {
-        < "A6" ; PAPERSIZE_A6 ; > ;
-        < "A5" ; PAPERSIZE_A5 ; > ;
-        < "A4" ; PAPERSIZE_A4 ; > ;
-        < "A3" ; PAPERSIZE_A3 ; > ;
-        < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-        < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
-        < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
-        < "Letter" ; PAPERSIZE_LETTER ; > ;
-        < "Legal" ; PAPERSIZE_LEGAL ; > ;
-        < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
-        < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-        < "16 Kai" ; PAPERSIZE_KAI16; > ;
-        < "32 Kai" ; PAPERSIZE_KAI32; > ;
-        < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
-        < "User" ; PAPERSIZE_USER ; > ;
-        < "DL Envelope" ; PAPERSIZE_DL ; > ;
-        < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
-        < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-        < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-        < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
-        < "#6¾ Envelope" ; PAPERSIZE_COM675; > ;
-        < "#7¾ (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
-        < "#9 Envelope" ; PAPERSIZE_COM9; > ;
-        < "#10 Envelope" ; PAPERSIZE_COM10; > ;
-        < "#11 Envelope" ; PAPERSIZE_COM11; > ;
-        < "#12 Envelope" ; PAPERSIZE_COM12; > ;
-        < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
-    };
-};
-StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
-{
-    ItemList [ en-US ] =
-    {
-        < "A6" ; PAPERSIZE_A6 ; > ;
-        < "A5" ; PAPERSIZE_A5 ; > ;
-        < "A4" ; PAPERSIZE_A4 ; > ;
-        < "A3" ; PAPERSIZE_A3 ; > ;
-        < "A2" ; PAPERSIZE_A2 ; > ;
-        < "A1" ; PAPERSIZE_A1 ; > ;
-        < "A0" ; PAPERSIZE_A0 ; > ;
-        < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-        < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
-        < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
-        < "Letter" ; PAPERSIZE_LETTER ; > ;
-        < "Legal" ; PAPERSIZE_LEGAL ; > ;
-        < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
-        < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-        < "16 Kai" ; PAPERSIZE_KAI16; > ;
-        < "32 Kai" ; PAPERSIZE_KAI32; > ;
-        < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
-        < "User" ; PAPERSIZE_USER ; > ;
-        < "DL Envelope" ; PAPERSIZE_DL ; > ;
-        < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
-        < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-        < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-        < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
-        < "Dia Slide" ; PAPERSIZE_DIA ; > ;
-        < "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
-        < "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
-        < "Screen 16:10" ; PAPERSIZE_SCREEN_16_10 ; > ;
-        < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 37b8f6a56188..0670d6856320 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -16,23 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/pagenumberlistbox.hxx>
 #include <editeng/numitem.hxx>
-#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
+#include "numberingtype.hrc"
 
 PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
 {
-    ResStringArray aPaperAry( ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()) );
-    sal_uInt32 nCnt = aPaperAry.Count();
-
-    for ( sal_uInt32 i = 0; i < nCnt; ++i )
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); ++i)
     {
-        sal_uInt16 nData = aPaperAry.GetValue(i);
+        sal_uInt16 nData = RID_SVXSTRARY_NUMBERINGTYPE[i].second;
         switch (nData)
         {
             // String list array is also used in Writer and contains strings
@@ -43,7 +40,7 @@ PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
             break;
             default:
                 {
-                    OUString aStr = aPaperAry.GetString(i);
+                    OUString aStr = SvxResId(RID_SVXSTRARY_NUMBERINGTYPE[i].first);
                     sal_Int32 nPos = InsertEntry( aStr );
                     SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
                 }
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 263de1e0712a..e0361e104d47 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/papersizelistbox.hxx>
-#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
-
+#include "page.hrc"
 
 PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
@@ -34,14 +33,15 @@ VCL_BUILDER_FACTORY(PaperSizeListBox);
 
 void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp )
 {
-    ResStringArray aPaperAry( ResId( ( eApp == PaperSizeApp::Std  ) ?
-                              RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW, DIALOG_MGR() ) );
-    sal_uInt32 nCnt = aPaperAry.Count();
+    const std::pair<const char*, int>* pPaperAry = eApp == PaperSizeApp::Std ?
+        RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW;
+    sal_uInt32 nCnt = eApp == PaperSizeApp::Std ?
+        SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_STD) : SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_DRAW);
 
     for ( sal_uInt32 i = 0; i < nCnt; ++i )
     {
-        OUString aStr = aPaperAry.GetString(i);
-        Paper eSize = (Paper)aPaperAry.GetValue(i);
+        OUString aStr = SvxResId(pPaperAry[i].first);
+        Paper eSize = (Paper)pPaperAry[i].second;
         sal_Int32 nPos = InsertEntry( aStr );
         SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)eSize) );
     }
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index b5e37d9f8dcd..24a9db6167f9 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -21,7 +21,7 @@
 #include <vcl/layout.hxx>
 #include "svx/passwd.hxx"
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
 {
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
deleted file mode 100644
index 11d4e0cf1f27..000000000000
--- a/svx/source/dialog/passwd.src
+++ /dev/null
@@ -1,32 +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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_ERR_OLD_PASSWD
-{
-    Text [ en-US ] = "Invalid password" ;
-};
-
-String RID_SVXSTR_ERR_REPEAT_PASSWD
-{
-    Text [ en-US ] = "Passwords do not match" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index a7876a19e106..26a3bbf6e550 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/prtqry.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
deleted file mode 100644
index 57fe9f976041..000000000000
--- a/svx/source/dialog/prtqry.src
+++ /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/.
- *
- * 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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_QRY_PRINT_TITLE
-{
-    Text [ en-US ] = "Printing selection";
-};
-String RID_SVXSTR_QRY_PRINT_MSG
-{
-    Text [ en-US ] = "Do you want to print the selection or the entire document?";
-};
-String RID_SVXSTR_QRY_PRINT_ALL
-{
-    Text [ en-US ] = "~All";
-};
-String RID_SVXSTR_QRY_PRINT_SELECTION
-{
-    Text [ en-US ] = "~Selection";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index b7ab5198a854..cf7413968749 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -20,7 +20,8 @@
 #include <svl/rectitem.hxx>
 
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #include <svx/ruler.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 1ee45524aed9..55b7d562bdcb 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -23,7 +23,7 @@
 #include <o3tl/any.hxx>
 #include <svx/rubydialog.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
deleted file mode 100644
index 0e8cc51b89ff..000000000000
--- a/svx/source/dialog/ruler.src
+++ /dev/null
@@ -1,38 +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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_RULER_TAB_LEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String RID_SVXSTR_RULER_TAB_RIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String RID_SVXSTR_RULER_TAB_CENTER
-{
-    Text [ en-US ] = "Center" ;
-};
-String RID_SVXSTR_RULER_TAB_DECIMAL
-{
-    Text [ en-US ] = "Decimal" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 241b9f73be0a..02b9f1fdf345 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "svx/rulritem.hxx"
 #include <tools/mapunit.hxx>
 #include <osl/diagnose.h>
diff --git a/svx/source/dialog/samecontent.src b/svx/source/dialog/samecontent.src
deleted file mode 100644
index 38666d4c6503..000000000000
--- a/svx/source/dialog/samecontent.src
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <svx/dialogs.hrc>
-
-StringArray RID_SVXSTRARY_SAMECONTENT
-{
-    ItemList [ en-US ] =
-    {
-        < "All Pages" ;                     0; > ;
-        < "First Page" ;                    1; > ;
-        < "Left and Right Pages" ;          2; > ;
-        < "First, Left and Right Pages" ;   3; > ;
-    };
-};
\ No newline at end of file
diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx
index 5e46d593cd87..2cc3b8f5e07f 100644
--- a/svx/source/dialog/samecontentlistbox.cxx
+++ b/svx/source/dialog/samecontentlistbox.cxx
@@ -16,22 +16,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/samecontentlistbox.hxx>
-#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
+#include "samecontent.hrc"
 
 SameContentListBox::SameContentListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
 {
-    ResStringArray aSameContentAry( ResId(RID_SVXSTRARY_SAMECONTENT, DIALOG_MGR()) );
-    sal_uInt32 nCnt = aSameContentAry.Count();
-
-    for ( sal_uInt32 i = 0; i < nCnt; ++i )
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_SAMECONTENT); ++i)
     {
-        OUString aStr = aSameContentAry.GetString(i);
-        sal_uInt16 nData = aSameContentAry.GetValue(i);
+        OUString aStr = SvxResId(RID_SVXSTRARY_SAMECONTENT[i].first);
+        sal_uInt16 nData = RID_SVXSTRARY_SAMECONTENT[i].second;
         sal_Int32 nPos = InsertEntry( aStr );
         SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
     }
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
deleted file mode 100644
index 2142f7840d75..000000000000
--- a/svx/source/dialog/sdstring.src
+++ /dev/null
@@ -1,2288 +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 <svx/dialogs.hrc>
-
- // Strings for the Draw-Dialog --------------------------------------------
-String RID_SVXSTR_SOLID
-{
-    Text [ en-US ] = "Continuous" ;
-};
-String RID_SVXSTR_GRADIENT
-{
-    Text [ en-US ] = "Gradient" ;
-};
-String RID_SVXSTR_BITMAP
-{
-    Text [ en-US ] = "Bitmap" ;
-};
-String RID_SVXSTR_PATTERN
-{
-    Text [ en-US ] = "Pattern";
-};
-String RID_SVXSTR_PATTERN_UNTITLED
-{
-    Text [ en-US ] = "Untitled Pattern";
-};
-String RID_SVXSTR_LINESTYLE
-{
-    Text [ en-US ] = "Line Style" ;
-};
-String RID_SVXSTR_INVISIBLE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXSTR_COLOR
-{
-    Text [ en-US ] = "Color" ;
-};
-String RID_SVXSTR_HATCH
-{
-    Text [ en-US ] = "Hatching" ;
-};
-String RID_SVXSTR_LINEEND
-{
-    Text [ en-US ] = "Arrowheads" ;
-};
-
-String RID_SVXSTR_COLOR_BLACK
-{
-    Text [ en-US ] = "Black" ;
-};
-String RID_SVXSTR_COLOR_BLUE
-{
-    Text [ en-US ] = "Blue" ;
-};
-String RID_SVXSTR_COLOR_GREEN
-{
-    Text [ en-US ] = "Green" ;
-};
-String RID_SVXSTR_COLOR_CYAN
-{
-    Text [ en-US ] = "Cyan" ;
-};
-String RID_SVXSTR_COLOR_RED
-{
-    Text [ en-US ] = "Red" ;
-};
-String RID_SVXSTR_COLOR_MAGENTA
-{
-    Text [ en-US ] = "Magenta" ;
-};
-String RID_SVXSTR_COLOR_GREY
-{
-    Text [ en-US ] = "Gray" ;
-};
-String RID_SVXSTR_COLOR_YELLOW
-{
-    Text [ en-US ] = "Yellow" ;
-};
-String RID_SVXSTR_COLOR_WHITE
-{
-    Text [ en-US ] = "White" ;
-};
-String RID_SVXSTR_COLOR_BLUEGREY
-{
-    Text [ en-US ] = "Blue gray" ;
-};
-String RID_SVXSTR_COLOR_BLUE_CLASSIC
-{
-    /* Old default color Blue9, probably often used in saved files */
-    Text [ en-US ] = "Blue classic" ;
-};
-String RID_SVXSTR_COLOR_ORANGE
-{
-    Text [ en-US ] = "Orange" ;
-};
-String RID_SVXSTR_ARROW
-{
-    Text [ en-US ] = "Arrow" ;
-};
-String RID_SVXSTR_SQUARE
-{
-    Text [ en-US ] = "Square" ;
-};
-String RID_SVXSTR_CIRCLE
-{
-    Text [ en-US ] = "Circle" ;
-};
-String RID_SVXSTR_NONE
-{
-    Text [ en-US ] = "- none -" ;
-};
-String RID_SVXSTR_TRANSPARENCE
-{
-    Text [ en-US ] = "Transparency" ;
-};
-String RID_SVXSTR_CENTERED
-{
-    Text [ en-US ] = "Centered" ;
-};
-String RID_SVXSTR_NOTCENTERED
-{
-    Text [ en-US ] = "Not centered" ;
-};
-String RID_SVXSTR_GRAFMODE_STANDARD
-{
-    Text [ en-US ] = "Default";
-};
-String RID_SVXSTR_GRAFMODE_GREYS
-{
-    Text [ en-US ] = "Grayscale";
-};
-String RID_SVXSTR_GRAFMODE_MONO
-{
-    Text [ en-US ] = "Black/White";
-};
-String RID_SVXSTR_GRAFMODE_WATERMARK
-{
-    Text [ en-US ] = "Watermark";
-};
-
-// BM: some additional standard colors
-
-String RID_SVXSTR_COLOR_VIOLET
-{
-    Text [ en-US ] = "Violet";
-};
-
-String RID_SVXSTR_COLOR_BORDEAUX
-{
-    Text [ en-US ] = "Bordeaux";
-};
-
-String RID_SVXSTR_COLOR_PALE_YELLOW
-{
-    Text [ en-US ] = "Pale yellow";
-};
-
-String RID_SVXSTR_COLOR_PALE_GREEN
-{
-    Text [ en-US ] = "Pale green";
-};
-
-String RID_SVXSTR_COLOR_DARKVIOLET
-{
-    Text [ en-US ] = "Dark violet";
-};
-
-String RID_SVXSTR_COLOR_SALMON
-{
-    Text [ en-US ] = "Salmon";
-};
-
-String RID_SVXSTR_COLOR_SEABLUE
-{
-    Text [ en-US ] = "Sea blue";
-};
-
-String RID_SVXSTR_COLOR_CHART
-{
-    Text [ en-US ] = "Chart" ;
-};
-
-String RID_SVXSTR_COLOR_PURPLE
-{
-    Text [ en-US ] = "Purple";
-};
-
-String RID_SVXSTR_COLOR_SKYBLUE
-{
-    Text [ en-US ] = "Sky blue";
-};
-
-String RID_SVXSTR_COLOR_YELLOWGREEN
-{
-    Text [ en-US ] = "Yellow green";
-};
-
-String RID_SVXSTR_COLOR_PINK
-{
-    Text [ en-US ] = "Pink";
-};
-
-String RID_SVXSTR_COLOR_TURQUOISE
-{
-    Text [ en-US ] = "Turquoise" ;
-};
-
-String RID_SVXSTR_TBLAFMT_3D
-{
-    Text [ en-US ] = "3D";
-};
-String RID_SVXSTR_TBLAFMT_BLACK1
-{
-    Text [ en-US ] = "Black 1";
-};
-String RID_SVXSTR_TBLAFMT_BLACK2
-{
-    Text [ en-US ] = "Black 2";
-};
-String RID_SVXSTR_TBLAFMT_BLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String RID_SVXSTR_TBLAFMT_BROWN
-{
-    Text [ en-US ] = "Brown";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY
-{
-    Text [ en-US ] = "Currency";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_3D
-{
-    Text [ en-US ] = "Currency 3D";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_GRAY
-{
-    Text [ en-US ] = "Currency Gray";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER
-{
-    Text [ en-US ] = "Currency Lavender";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE
-{
-    Text [ en-US ] = "Currency Turquoise";
-};
-String RID_SVXSTR_TBLAFMT_GRAY
-{
-    Text [ en-US ] = "Gray";
-};
-String RID_SVXSTR_TBLAFMT_GREEN
-{
-    Text [ en-US ] = "Green";
-};
-String RID_SVXSTR_TBLAFMT_LAVENDER
-{
-    Text [ en-US ] = "Lavender";
-};
-String RID_SVXSTR_TBLAFMT_RED
-{
-    Text [ en-US ] = "Red";
-};
-String RID_SVXSTR_TBLAFMT_TURQUOISE
-{
-    Text [ en-US ] = "Turquoise";
-};
-String RID_SVXSTR_TBLAFMT_YELLOW
-{
-    Text [ en-US ] = "Yellow";
-};
-
-String RID_SVXSTR_LINEJOINT_MIDDLE
-{
-    Text [ en-US ] = "Line joint averaged";
-};
-String RID_SVXSTR_LINEJOINT_BEVEL
-{
-    Text [ en-US ] = "Line joint bevel";
-};
-String RID_SVXSTR_LINEJOINT_MITER
-{
-    Text [ en-US ] = "Line joint miter";
-};
-String RID_SVXSTR_LINEJOINT_ROUND
-{
-    Text [ en-US ] = "Line joint round";
-};
-String RID_SVXSTR_LINECAP_BUTT
-{
-    Text [ en-US ] = "Line cap flat"; // the familiar name for it
-};
-String RID_SVXSTR_LINECAP_ROUND
-{
-    Text [ en-US ] = "Line cap round";
-};
-String RID_SVXSTR_LINECAP_SQUARE
-{
-    Text [ en-US ] = "Line cap square";
-};
-
-// Reference-strings for standardcolor-table
-
-/* do not translate */
-String RID_SVXSTR_COLOR_BLACK_DEF
-{
-    Text = "Black" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BLUE_DEF
-{
-    Text = "Blue" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_GREEN_DEF
-{
-    Text = "Green" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_CYAN_DEF
-{
-    Text = "Cyan" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_RED_DEF
-{
-    Text = "Red" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_MAGENTA_DEF
-{
-    Text = "Magenta" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_GREY_DEF
-{
-    Text = "Gray" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_YELLOW_DEF
-{
-    Text = "Yellow" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_WHITE_DEF
-{
-    Text = "White" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BLUEGREY_DEF
-{
-    Text = "Blue gray" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_ORANGE_DEF
-{
-    Text = "Orange" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_VIOLET_DEF
-{
-    Text = "Violet";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BORDEAUX_DEF
-{
-    Text = "Bordeaux";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_PALE_YELLOW_DEF
-{
-    Text = "Pale yellow";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_PALE_GREEN_DEF
-{
-    Text = "Pale green";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_DARKVIOLET_DEF
-{
-    Text = "Dark violet";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_SALMON_DEF
-{
-    Text = "Salmon";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_SEABLUE_DEF
-{
-    Text = "Sea blue";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_CHART_DEF
-{
-    Text = "Chart";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_PURPLE_DEF
-{
-    Text = "Purple";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_SKYBLUE_DEF
-{
-    Text = "Sky blue";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_YELLOWGREEN_DEF
-{
-    Text = "Yellow green";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_PINK_DEF
-{
-    Text = "Pink";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_TURQUOISE_DEF
-{
-    Text = "Turquoise" ;
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF
-{
-    Text = "Blue classic" ;
-};
-
-// Reference-strings for standard-gradient-table
-
-/* do not translate */
-String RID_SVXSTR_GRDT0_DEF
-{
-    Text = "Gradient";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT1_DEF
-{
-    Text = "Linear blue/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT2_DEF
-{
-    Text = "Linear magenta/green";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT3_DEF
-{
-    Text = "Linear yellow/brown";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT4_DEF
-{
-    Text = "Radial green/black";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT5_DEF
-{
-    Text = "Radial red/yellow";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT6_DEF
-{
-    Text = "Rectangular red/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT7_DEF
-{
-    Text = "Square yellow/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT8_DEF
-{
-    Text = "Ellipsoid blue grey/light blue";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT9_DEF
-{
-    Text = "Axial light red/white";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT10_DEF
-{
-    Text = "Diagonal 1l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT11_DEF
-{
-    Text = "Diagonal 1r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT12_DEF
-{
-    Text = "Diagonal 2l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT13_DEF
-{
-    Text = "Diagonal 2r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT14_DEF
-{
-    Text = "Diagonal 3l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT15_DEF
-{
-    Text = "Diagonal 3r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT16_DEF
-{
-    Text = "Diagonal 4l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT17_DEF
-{
-    Text = "Diagonal 4r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT18_DEF
-{
-    Text = "Diagonal Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT19_DEF
-{
-    Text = "Diagonal Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT20_DEF
-{
-    Text = "Diagonal Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT21_DEF
-{
-    Text = "Diagonal Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT22_DEF
-{
-    Text = "Diagonal Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT23_DEF
-{
-    Text = "Diagonal Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT24_DEF
-{
-    Text = "From a Corner";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT25_DEF
-{
-    Text = "From a Corner, Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT26_DEF
-{
-    Text = "From a Corner, Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT27_DEF
-{
-    Text = "From a Corner, Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT28_DEF
-{
-    Text = "From a Corner, Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT29_DEF
-{
-    Text = "From a Corner, Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT30_DEF
-{
-    Text = "From a Corner, Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT31_DEF
-{
-    Text = "From the Middle";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT32_DEF
-{
-    Text = "From the Middle, Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT33_DEF
-{
-    Text = "From the Middle, Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT34_DEF
-{
-    Text = "From the Middle, Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT35_DEF
-{
-    Text = "From the Middle, Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT36_DEF
-{
-    Text = "From the Middle, Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT37_DEF
-{
-    Text = "From the Middle, Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT38_DEF
-{
-    Text = "Horizontal";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT39_DEF
-{
-    Text = "Horizontal Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT40_DEF
-{
-    Text = "Horizontal Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT41_DEF
-{
-    Text = "Horizontal Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT42_DEF
-{
-    Text = "Horizontal Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT43_DEF
-{
-    Text = "Horizontal Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT44_DEF
-{
-    Text = "Horizontal Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT45_DEF
-{
-    Text = "Radial";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT46_DEF
-{
-    Text = "Radial Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT47_DEF
-{
-    Text = "Radial Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT48_DEF
-{
-    Text = "Radial Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT49_DEF
-{
-    Text = "Radial Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT50_DEF
-{
-    Text = "Radial Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT51_DEF
-{
-    Text = "Radial Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT52_DEF
-{
-    Text = "Vertical";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT53_DEF
-{
-    Text = "Vertical Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT54_DEF
-{
-    Text = "Vertical Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT55_DEF
-{
-    Text = "Vertical Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT56_DEF
-{
-    Text = "Vertical Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT57_DEF
-{
-    Text = "Vertical Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT58_DEF
-{
-    Text = "Vertical Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT59_DEF
-{
-    Text = "Gray Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT60_DEF
-{
-    Text = "Yellow Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT61_DEF
-{
-    Text = "Orange Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT62_DEF
-{
-    Text = "Red Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT63_DEF
-{
-    Text = "Pink Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT64_DEF
-{
-    Text = "Sky";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT65_DEF
-{
-    Text = "Cyan Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT66_DEF
-{
-    Text = "Blue Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT67_DEF
-{
-    Text = "Purple Pipe";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT68_DEF
-{
-    Text = "Night";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT69_DEF
-{
-    Text = "Green Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT70_DEF
-{
-    Text = "Tango Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT71_DEF
-{
-    Text = "Subtle Tango Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT72_DEF
-{
-    Text = "Tango Purple";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT73_DEF
-{
-    Text = "Tango Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT74_DEF
-{
-    Text = "Tango Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT75_DEF
-{
-    Text = "Tango Yellow";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT76_DEF
-{
-    Text = "Tango Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT77_DEF
-{
-    Text = "Tango Gray";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT78_DEF
-{
-    Text = "Clay";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT79_DEF
-{
-    Text = "Olive Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT80_DEF
-{
-    Text = "Silver";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT81_DEF
-{
-    Text = "Sunburst";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT82_DEF
-{
-    Text = "Brownie";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT83_DEF
-{
-    Text = "Sunset";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT84_DEF
-{
-    Text = "Deep Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT85_DEF
-{
-    Text = "Deep Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT86_DEF
-{
-    Text = "Deep Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT87_DEF
-{
-    Text = "Purple Haze";
-};
-
-String RID_SVXSTR_GRDT0
-{
-    Text [ en-US ] = "Gradient";
-};
-String RID_SVXSTR_GRDT1
-{
-    Text [ en-US ] = "Linear blue/white";
-};
-String RID_SVXSTR_GRDT2
-{
-    Text [ en-US ] = "Linear magenta/green";
-};
-String RID_SVXSTR_GRDT3
-{
-    Text [ en-US ] = "Linear yellow/brown";
-};
-String RID_SVXSTR_GRDT4
-{
-    Text [ en-US ] = "Radial green/black";
-};
-String RID_SVXSTR_GRDT5
-{
-    Text [ en-US ] = "Radial red/yellow";
-};
-String RID_SVXSTR_GRDT6
-{
-    Text [ en-US ] = "Rectangular red/white";
-};
-String RID_SVXSTR_GRDT7
-{
-    Text [ en-US ] = "Square yellow/white";
-};
-String RID_SVXSTR_GRDT8
-{
-    Text [ en-US ] = "Ellipsoid blue gray/light blue";
-};
-String RID_SVXSTR_GRDT9
-{
-    Text [ en-US ] = "Axial light red/white";
-};
-
-String RID_SVXSTR_GRDT10
-{
-    Text [ en-US ] = "Diagonal 1l";
-    Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT11
-{
-    Text [ en-US ] = "Diagonal 1r";
-    Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT12
-{
-    Text [ en-US ] = "Diagonal 2l";
-    Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT13
-{
-    Text [ en-US ] = "Diagonal 2r";
-    Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT14
-{
-    Text [ en-US ] = "Diagonal 3l";
-    Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT15
-{
-    Text [ en-US ] = "Diagonal 3r";
-    Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT16
-{
-    Text [ en-US ] = "Diagonal 4l";
-    Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT17
-{
-    Text [ en-US ] = "Diagonal 4r";
-    Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT18
-{
-    Text [ en-US ] = "Diagonal Blue";
-};
-
-String RID_SVXSTR_GRDT19
-{
-    Text [ en-US ] = "Diagonal Green";
-};
-
-String RID_SVXSTR_GRDT20
-{
-    Text [ en-US ] = "Diagonal Orange";
-};
-
-String RID_SVXSTR_GRDT21
-{
-    Text [ en-US ] = "Diagonal Red";
-};
-
-String RID_SVXSTR_GRDT22
-{
-    Text [ en-US ] = "Diagonal Turquoise";
-};
-
-String RID_SVXSTR_GRDT23
-{
-    Text [ en-US ] = "Diagonal Violet";
-};
-
-String RID_SVXSTR_GRDT24
-{
-    Text [ en-US ] = "From a Corner";
-};
-
-String RID_SVXSTR_GRDT25
-{
-    Text [ en-US ] = "From a Corner, Blue";
-};
-
-String RID_SVXSTR_GRDT26
-{
-    Text [ en-US ] = "From a Corner, Green";
-};
-
-String RID_SVXSTR_GRDT27
-{
-    Text [ en-US ] = "From a Corner, Orange";
-};
-
-String RID_SVXSTR_GRDT28
-{
-    Text [ en-US ] = "From a Corner, Red";
-};
-
-String RID_SVXSTR_GRDT29
-{
-    Text [ en-US ] = "From a Corner, Turquoise";
-};
-
-String RID_SVXSTR_GRDT30
-{
-    Text [ en-US ] = "From a Corner, Violet";
-};
-
-String RID_SVXSTR_GRDT31
-{
-    Text [ en-US ] = "From the Middle";
-};
-
-String RID_SVXSTR_GRDT32
-{
-    Text [ en-US ] = "From the Middle, Blue";
-};
-
-String RID_SVXSTR_GRDT33
-{
-    Text [ en-US ] = "From the Middle, Green";
-};
-
-String RID_SVXSTR_GRDT34
-{
-    Text [ en-US ] = "From the Middle, Orange";
-};
-
-String RID_SVXSTR_GRDT35
-{
-    Text [ en-US ] = "From the Middle, Red";
-};
-
-String RID_SVXSTR_GRDT36
-{
-    Text [ en-US ] = "From the Middle, Turquoise";
-};
-
-String RID_SVXSTR_GRDT37
-{
-    Text [ en-US ] = "From the Middle, Violet";
-};
-
-String RID_SVXSTR_GRDT38
-{
-    Text [ en-US ] = "Horizontal";
-};
-
-String RID_SVXSTR_GRDT39
-{
-    Text [ en-US ] = "Horizontal Blue";
-};
-
-String RID_SVXSTR_GRDT40
-{
-    Text [ en-US ] = "Horizontal Green";
-};
-
-String RID_SVXSTR_GRDT41
-{
-    Text [ en-US ] = "Horizontal Orange";
-};
-
-String RID_SVXSTR_GRDT42
-{
-    Text [ en-US ] = "Horizontal Red";
-};
-
-String RID_SVXSTR_GRDT43
-{
-    Text [ en-US ] = "Horizontal Turquoise";
-};
-
-String RID_SVXSTR_GRDT44
-{
-    Text [ en-US ] = "Horizontal Violet";
-};
-
-String RID_SVXSTR_GRDT45
-{
-    Text [ en-US ] = "Radial";
-};
-
-String RID_SVXSTR_GRDT46
-{
-    Text [ en-US ] = "Radial Blue";
-};
-
-String RID_SVXSTR_GRDT47
-{
-    Text [ en-US ] = "Radial Green";
-};
-
-String RID_SVXSTR_GRDT48
-{
-    Text [ en-US ] = "Radial Orange";
-};
-
-String RID_SVXSTR_GRDT49
-{
-    Text [ en-US ] = "Radial Red";
-};
-
-String RID_SVXSTR_GRDT50
-{
-    Text [ en-US ] = "Radial Turquoise";
-};
-
-String RID_SVXSTR_GRDT51
-{
-    Text [ en-US ] = "Radial Violet";
-};
-
-String RID_SVXSTR_GRDT52
-{
-    Text [ en-US ] = "Vertical";
-};
-
-String RID_SVXSTR_GRDT53
-{
-    Text [ en-US ] = "Vertical Blue";
-};
-
-String RID_SVXSTR_GRDT54
-{
-    Text [ en-US ] = "Vertical Green";
-};
-
-String RID_SVXSTR_GRDT55
-{
-    Text [ en-US ] = "Vertical Orange";
-};
-
-String RID_SVXSTR_GRDT56
-{
-    Text [ en-US ] = "Vertical Red";
-};
-
-String RID_SVXSTR_GRDT57
-{
-    Text [ en-US ] = "Vertical Turquoise";
-};
-
-String RID_SVXSTR_GRDT58
-{
-    Text [ en-US ] = "Vertical Violet";
-};
-
-String RID_SVXSTR_GRDT59
-{
-    Text [ en-US ] = "Gray Gradient";
-};
-
-String RID_SVXSTR_GRDT60
-{
-    Text [ en-US ] = "Yellow Gradient";
-};
-
-String RID_SVXSTR_GRDT61
-{
-    Text [ en-US ] = "Orange Gradient";
-};
-
-String RID_SVXSTR_GRDT62
-{
-    Text [ en-US ] = "Red Gradient";
-};
-
-String RID_SVXSTR_GRDT63
-{
-    Text [ en-US ] = "Pink Gradient";
-};
-
-String RID_SVXSTR_GRDT64
-{
-    Text [ en-US ] = "Sky";
-};
-
-String RID_SVXSTR_GRDT65
-{
-    Text [ en-US ] = "Cyan Gradient";
-};
-
-String RID_SVXSTR_GRDT66
-{
-    Text [ en-US ] = "Blue Gradient";
-};
-
-String RID_SVXSTR_GRDT67
-{
-    Text [ en-US ] = "Purple Pipe";
-};
-
-String RID_SVXSTR_GRDT68
-{
-    Text [ en-US ] = "Night";
-};
-
-String RID_SVXSTR_GRDT69
-{
-    Text [ en-US ] = "Green Gradient";
-};
-
-String RID_SVXSTR_GRDT70
-{
-    Text [ en-US ] = "Tango Green";
-};
-
-String RID_SVXSTR_GRDT71
-{
-    Text [ en-US ] = "Subtle Tango Green";
-};
-
-String RID_SVXSTR_GRDT72
-{
-    Text [ en-US ] = "Tango Purple";
-};
-
-String RID_SVXSTR_GRDT73
-{
-    Text [ en-US ] = "Tango Red";
-};
-
-String RID_SVXSTR_GRDT74
-{
-    Text [ en-US ] = "Tango Blue";
-};
-
-String RID_SVXSTR_GRDT75
-{
-    Text [ en-US ] = "Tango Yellow";
-};
-
-String RID_SVXSTR_GRDT76
-{
-    Text [ en-US ] = "Tango Orange";
-};
-
-String RID_SVXSTR_GRDT77
-{
-    Text [ en-US ] = "Tango Gray";
-};
-
-String RID_SVXSTR_GRDT78
-{
-    Text [ en-US ] = "Clay";
-};
-
-String RID_SVXSTR_GRDT79
-{
-    Text [ en-US ] = "Olive Green";
-};
-
-String RID_SVXSTR_GRDT80
-{
-    Text [ en-US ] = "Silver";
-};
-
-String RID_SVXSTR_GRDT81
-{
-    Text [ en-US ] = "Sunburst";
-};
-
-String RID_SVXSTR_GRDT82
-{
-    Text [ en-US ] = "Brownie";
-};
-
-String RID_SVXSTR_GRDT83
-{
-    Text [ en-US ] = "Sunset";
-};
-
-String RID_SVXSTR_GRDT84
-{
-    Text [ en-US ] = "Deep Green";
-};
-
-String RID_SVXSTR_GRDT85
-{
-    Text [ en-US ] = "Deep Orange";
-};
-
-String RID_SVXSTR_GRDT86
-{
-    Text [ en-US ] = "Deep Blue";
-};
-
-String RID_SVXSTR_GRDT87
-{
-    Text [ en-US ] = "Purple Haze";
-};
-
-// Reference-strings for standard-hatch-table
-
-/* do not translate */
-String RID_SVXSTR_HATCH0_DEF
-{
-    Text = "Black 45 Degrees Wide";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH1_DEF
-{
-    Text = "Black 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH2_DEF
-{
-    Text = "Black -45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH3_DEF
-{
-    Text = "Black 90 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH4_DEF
-{
-    Text = "Red Crossed 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH5_DEF
-{
-    Text = "Red Crossed 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH6_DEF
-{
-    Text = "Blue Crossed 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH7_DEF
-{
-    Text = "Blue Crossed 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH8_DEF
-{
-    Text = "Blue Triple 90 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH9_DEF
-{
-    Text = "Black 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH10_DEF
-{
-    Text = "Hatching";
-};
-
-String RID_SVXSTR_HATCH0
-{
-    Text [ en-US ] = "Black 45 Degrees Wide";
-};
-String RID_SVXSTR_HATCH1
-{
-    Text [ en-US ] = "Black 45 Degrees";
-};
-String RID_SVXSTR_HATCH2
-{
-    Text [ en-US ] = "Black -45 Degrees";
-};
-String RID_SVXSTR_HATCH3
-{
-    Text [ en-US ] = "Black 90 Degrees";
-};
-String RID_SVXSTR_HATCH4
-{
-    Text [ en-US ] = "Red Crossed 45 Degrees";
-};
-String RID_SVXSTR_HATCH5
-{
-    Text [ en-US ] = "Red Crossed 0 Degrees";
-};
-String RID_SVXSTR_HATCH6
-{
-    Text [ en-US ] = "Blue Crossed 45 Degrees";
-};
-String RID_SVXSTR_HATCH7
-{
-    Text [ en-US ] = "Blue Crossed 0 Degrees";
-};
-String RID_SVXSTR_HATCH8
-{
-    Text [ en-US ] = "Blue Triple 90 Degrees";
-};
-String RID_SVXSTR_HATCH9
-{
-    Text [ en-US ] = "Black 0 Degrees";
-};
-String RID_SVXSTR_HATCH10
-{
-    Text [ en-US ] = "Hatching" ;
-};
-
-// Reference-strings for standard-bitmap-table
-
-/* do not translate */
-String RID_SVXSTR_BMP0_DEF
-{
-    Text = "Empty";
-};
-/* do not translate */
-String RID_SVXSTR_BMP1_DEF
-{
-    Text = "Sky";
-};
-/* do not translate */
-String RID_SVXSTR_BMP2_DEF
-{
-    Text = "Aqua";
-};
-/* do not translate */
-String RID_SVXSTR_BMP3_DEF
-{
-    Text = "Coarse";
-};
-/* do not translate */
-String RID_SVXSTR_BMP4_DEF
-{
-    Text = "Space Metal";
-};
-/* do not translate */
-String RID_SVXSTR_BMP5_DEF
-{
-    Text = "Space";
-};
-/* do not translate */
-String RID_SVXSTR_BMP6_DEF
-{
-    Text = "Metal";
-};
-/* do not translate */
-String RID_SVXSTR_BMP7_DEF
-{
-    Text = "Wet";
-};
-/* do not translate */
-String RID_SVXSTR_BMP8_DEF
-{
-    Text = "Marble";
-};
-/* do not translate */
-String RID_SVXSTR_BMP9_DEF
-{
-    Text = "Linen";
-};
-/* do not translate */
-String RID_SVXSTR_BMP10_DEF
-{
-    Text = "Stone";
-};
-/* do not translate */
-String RID_SVXSTR_BMP11_DEF
-{
-    Text = "Pebbles";
-};
-/* do not translate */
-String RID_SVXSTR_BMP12_DEF
-{
-    Text = "Wall";
-};
-/* do not translate */
-String RID_SVXSTR_BMP13_DEF
-{
-    Text = "Red Wall";
-};
-/* do not translate */
-String RID_SVXSTR_BMP14_DEF
-{
-    Text = "Pattern";
-};
-/* do not translate */
-String RID_SVXSTR_BMP15_DEF
-{
-    Text = "Leaves";
-};
-/* do not translate */
-String RID_SVXSTR_BMP16_DEF
-{
-    Text = "Lawn Artificial";
-};
-/* do not translate */
-String RID_SVXSTR_BMP17_DEF
-{
-    Text = "Daisy";
-};
-/* do not translate */
-String RID_SVXSTR_BMP18_DEF
-{
-    Text = "Orange";
-};
-/* do not translate */
-String RID_SVXSTR_BMP19_DEF
-{
-    Text = "Fiery";
-};
-/* do not translate */
-String RID_SVXSTR_BMP20_DEF
-{
-    Text = "Roses";
-};
-
-/* do not translate */
-String RID_SVXSTR_BMP21_DEF
-{
-    Text = "Bitmap";
-};
-
-String RID_SVXSTR_BMP0
-{
-    Text [ en-US ] = "Empty";
-};
-String RID_SVXSTR_BMP1
-{
-    Text [ en-US ] = "Sky";
-};
-String RID_SVXSTR_BMP2
-{
-    Text [ en-US ] = "Water";
-};
-String RID_SVXSTR_BMP3
-{
-    Text [ en-US ] = "Coarse grained";
-};
-String RID_SVXSTR_BMP4
-{
-    Text [ en-US ] = "Mercury";
-};
-String RID_SVXSTR_BMP5
-{
-    Text [ en-US ] = "Space";
-};
-String RID_SVXSTR_BMP6
-{
-    Text [ en-US ] = "Metal";
-};
-String RID_SVXSTR_BMP7
-{
-    Text [ en-US ] = "Droplets";
-};
-String RID_SVXSTR_BMP8
-{
-    Text [ en-US ] = "Marble";
-};
-String RID_SVXSTR_BMP9
-{
-    Text [ en-US ] = "Linen";
-};
-String RID_SVXSTR_BMP10
-{
-    Text [ en-US ] = "Stone";
-};
-String RID_SVXSTR_BMP11
-{
-    Text [ en-US ] = "Gravel";
-};
-String RID_SVXSTR_BMP12
-{
-    Text [ en-US ] = "Wall";
-};
-String RID_SVXSTR_BMP13
-{
-    Text [ en-US ] = "Brownstone";
-};
-String RID_SVXSTR_BMP14
-{
-    Text [ en-US ] = "Netting";
-};
-String RID_SVXSTR_BMP15
-{
-    Text [ en-US ] = "Leaves";
-};
-String RID_SVXSTR_BMP16
-{
-    Text [ en-US ] = "Artificial Turf";
-};
-String RID_SVXSTR_BMP17
-{
-    Text [ en-US ] = "Daisy";
-};
-String RID_SVXSTR_BMP18
-{
-    Text [ en-US ] = "Orange";
-};
-String RID_SVXSTR_BMP19
-{
-    Text [ en-US ] = "Fiery";
-};
-String RID_SVXSTR_BMP20
-{
-    Text [ en-US ] = "Roses";
-};
-
-String RID_SVXSTR_BMP21
-{
-    Text [ en-US ] = "Bitmap";
-};
-
-// Reference-strings for standard-dash-table
-
-/* do not translate */
-String RID_SVXSTR_DASH0_DEF
-{
-    Text = "Ultrafine Dashed";
-};
-/* do not translate */
-String RID_SVXSTR_DASH1_DEF
-{
-    Text = "Fine Dashed";
-};
-/* do not translate */
-String RID_SVXSTR_DASH2_DEF
-{
-    Text = "Ultrafine 2 Dots 3 Dashes";
-};
-/* do not translate */
-String RID_SVXSTR_DASH3_DEF
-{
-    Text = "Fine Dotted";
-};
-/* do not translate */
-String RID_SVXSTR_DASH4_DEF
-{
-    Text = "Line with Fine Dots";
-};
-/* do not translate */
-String RID_SVXSTR_DASH5_DEF
-{
-    Text = "Fine Dashed (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH6_DEF
-{
-    Text = "3 Dashes 3 Dots (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH7_DEF
-{
-    Text = "Ultrafine Dotted (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH8_DEF
-{
-    Text = "Line Style 9";
-};
-/* do not translate */
-String RID_SVXSTR_DASH9_DEF
-{
-    Text = "2 Dots 1 Dash";
-};
-/* do not translate */
-String RID_SVXSTR_DASH10_DEF
-{
-    Text = "Dashed (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH11_DEF
-{
-    Text = "Dash";
-};
-
-/* do not translate */
-String RID_SVXSTR_DASH12_DEF
-{
-    Text = "Line Style";
-};
-
-String RID_SVXSTR_DASH0
-{
-    Text [ en-US ] = "Ultrafine Dashed";
-};
-String RID_SVXSTR_DASH1
-{
-    Text [ en-US ] = "Fine Dashed";
-};
-String RID_SVXSTR_DASH2
-{
-    Text [ en-US ] = "2 Dots 3 Dashes";
-};
-String RID_SVXSTR_DASH3
-{
-    Text [ en-US ] = "Fine Dotted";
-};
-String RID_SVXSTR_DASH4
-{
-    Text [ en-US ] = "Line with Fine Dots";
-};
-String RID_SVXSTR_DASH5
-{
-    Text [ en-US ] = "Fine Dashed";
-};
-String RID_SVXSTR_DASH6
-{
-    Text [ en-US ] = "3 Dashes 3 Dots";
-};
-String RID_SVXSTR_DASH7
-{
-    Text [ en-US ] = "Ultrafine Dotted";
-};
-String RID_SVXSTR_DASH8
-{
-    Text [ en-US ] = "Line Style 9";
-};
-String RID_SVXSTR_DASH9
-{
-    Text [ en-US ] = "2 Dots 1 Dash";
-};
-String RID_SVXSTR_DASH10
-{
-    Text [ en-US ] = "Dashed";
-};
-String RID_SVXSTR_DASH11
-{
-    Text [ en-US ] = "Dashed";
-};
-
-String RID_SVXSTR_DASH12
-{
-    Text [ en-US ] = "Line Style";
-};
-
-// Reference-strings for standard-line-end-table
-
-/* do not translate */
-String RID_SVXSTR_LEND0_DEF
-{
-    Text = "Arrow concave";
-};
-/* do not translate */
-String RID_SVXSTR_LEND1_DEF
-{
-    Text = "Square 45";
-};
-/* do not translate */
-String RID_SVXSTR_LEND2_DEF
-{
-    Text = "Small Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND3_DEF
-{
-    Text = "Dimension Lines";
-};
-/* do not translate */
-String RID_SVXSTR_LEND4_DEF
-{
-    Text = "Double Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND5_DEF
-{
-    Text = "Rounded short Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND6_DEF
-{
-    Text = "Symmetric Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND7_DEF
-{
-    Text = "Line Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND8_DEF
-{
-    Text = "Rounded large Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND9_DEF
-{
-    Text = "Circle";
-};
-/* do not translate */
-String RID_SVXSTR_LEND10_DEF
-{
-    Text = "Square";
-};
-/* do not translate */
-String RID_SVXSTR_LEND11_DEF
-{
-    Text = "Arrow";
-};
-
-/* do not translate */
-String RID_SVXSTR_LEND12_DEF
-{
-    Text = "Short line Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND13_DEF
-{
-    Text = "Triangle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND14_DEF
-{
-    Text = "Diamond unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND15_DEF
-{
-    Text = "Diamond";
-};
-/* do not translate */
-String RID_SVXSTR_LEND16_DEF
-{
-    Text = "Circle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND17_DEF
-{
-    Text = "Square 45 unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND18_DEF
-{
-    Text = "Square unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND19_DEF
-{
-    Text = "Half Circle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND20_DEF
-{
-    Text = "Arrowhead";
-};
-
-String RID_SVXSTR_LEND0
-{
-    Text [ en-US ] = "Arrow concave";
-};
-String RID_SVXSTR_LEND1
-{
-    Text [ en-US ] = "Square 45";
-};
-String RID_SVXSTR_LEND2
-{
-    Text [ en-US ] = "Small arrow";
-};
-String RID_SVXSTR_LEND3
-{
-    Text [ en-US ] = "Dimension lines";
-};
-String RID_SVXSTR_LEND4
-{
-    Text [ en-US ] = "Double Arrow";
-};
-String RID_SVXSTR_LEND5
-{
-    Text [ en-US ] = "Rounded short arrow";
-};
-String RID_SVXSTR_LEND6
-{
-    Text [ en-US ] = "Symmetric arrow";
-};
-String RID_SVXSTR_LEND7
-{
-    Text [ en-US ] = "Line arrow";
-};
-String RID_SVXSTR_LEND8
-{
-    Text [ en-US ] = "Rounded large arrow";
-};
-String RID_SVXSTR_LEND9
-{
-    Text [ en-US ] = "Circle";
-};
-String RID_SVXSTR_LEND10
-{
-    Text [ en-US ] = "Square";
-};
-String RID_SVXSTR_LEND11
-{
-    Text [ en-US ] = "Arrow";
-};
-
-String RID_SVXSTR_LEND12
-{
-    Text [ en-US ] = "Short line arrow";
-};
-String RID_SVXSTR_LEND13
-{
-    Text [ en-US ] = "Triangle unfilled";
-};
-String RID_SVXSTR_LEND14
-{
-    Text [ en-US ] = "Diamond unfilled";
-};
-String RID_SVXSTR_LEND15
-{
-    Text [ en-US ] = "Diamond";
-};
-String RID_SVXSTR_LEND16
-{
-    Text [ en-US ] = "Circle unfilled";
-};
-String RID_SVXSTR_LEND17
-{
-    Text [ en-US ] = "Square 45 unfilled";
-};
-String RID_SVXSTR_LEND18
-{
-    Text [ en-US ] = "Square unfilled";
-};
-String RID_SVXSTR_LEND19
-{
-    Text [ en-US ] = "Half circle unfilled";
-};
-String RID_SVXSTR_LEND20
-{
-    Text [ en-US ] = "Arrowhead";
-};
-
-// Reference-strings for standard transparence gradients
-
-/* do not translate */
-String RID_SVXSTR_TRASNGR0_DEF
-{
-    Text = "Transparency";
-};
-
-String RID_SVXSTR_TRASNGR0
-{
-    Text [ en-US ] = "Transparency";
-};
-
- // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
-
-StringArray RID_SVXSTR_FIELDUNIT_TABLE
-{
-    ItemList [ en-US ] =
-    {
-        < "Millimeter" ; FUNIT_MM ; > ;
-        < "Centimeter" ; FUNIT_CM ; > ;
-        < "Meter" ; FUNIT_M ; > ;
-        < "Kilometer" ; FUNIT_KM ; > ;
-        < "Inch" ; FUNIT_INCH ; > ;
-        < "Foot" ; FUNIT_FOOT ; > ;
-        < "Miles" ; FUNIT_MILE ; > ;
-        < "Pica" ; FUNIT_PICA ; > ;
-        < "Point" ; FUNIT_POINT ; > ;
-        < "Char" ; FUNIT_CHAR ; > ;
-        < "Line" ; FUNIT_LINE ; > ;
-    };
-    };
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_1
-{
-    Text [ en-US ] = "Green 1 (%PRODUCTNAME Main Color)" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT
-{
-    Text [ en-US ] = "Green Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT
-{
-    Text [ en-US ] = "Blue Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT
-{
-    Text [ en-US ] = "Orange Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE
-{
-    Text [ en-US ] = "Purple" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT
-{
-    Text [ en-US ] = "Purple Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT
-{
-    Text [ en-US ] = "Yellow Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF
-{
-    Text = "Green 1 (%PRODUCTNAME Main Color)" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF
-{
-    Text = "Green Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF
-{
-    Text = "Blue Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF
-{
-    Text = "Orange Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF
-{
-    Text = "Purple" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF
-{
-    Text = "Purple Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF
-{
-    Text = "Yellow Accent" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_BUTTER
-{
-    Text [ en-US ] = "Tango: Butter" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ORANGE
-{
-    Text [ en-US ] = "Tango: Orange" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHOCOLATE
-{
-    Text [ en-US ] = "Tango: Chocolate" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHAMELEON
-{
-    Text [ en-US ] = "Tango: Chameleon" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SKY_BLUE
-{
-    Text [ en-US ] = "Tango: Sky Blue" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_PLUM
-{
-    Text [ en-US ] = "Tango: Plum" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SCARLET_RED
-{
-    Text [ en-US ] = "Tango: Scarlet Red" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ALUMINIUM
-{
-    Text [ en-US ] = "Tango: Aluminium" ;
-    Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_BUTTER_DEF
-{
-    Text = "Tango: Butter" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ORANGE_DEF
-{
-    Text = "Tango: Orange" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF
-{
-    Text = "Tango: Chocolate" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF
-{
-    Text = "Tango: Chameleon" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF
-{
-    Text = "Tango: Sky Blue" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_PLUM_DEF
-{
-    Text = "Tango: Plum" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF
-{
-    Text = "Tango: Scarlet Red" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
-{
-    Text = "Tango: Aluminium" ;
-};
-
-String RID_SVXSTR_GALLERYPROPS_GALTHEME
-{
-    Text [ en-US ] = "Gallery Theme" ;
-};
-
-String RID_SVXSTR_GALLERY_THEMEITEMS
-{
-    Text [ en-US ] = "Theme Items";
-};
-
-String RID_SVXSTR_GALLERY_PREVIEW
-{
-    Text [ en-US ] = "Preview";
-};
-
-String RID_SVXSTR_SUCCESSRECOV
-{
-    Text[ en-US ] = "Successfully recovered";
-};
-
-String RID_SVXSTR_ORIGDOCRECOV
-{
-    Text[ en-US ] = "Original document recovered";
-};
-
-String RID_SVXSTR_RECOVFAILED
-{
-    Text[ en-US ] = "Recovery failed";
-};
-
-String RID_SVXSTR_RECOVINPROGR
-{
-    Text[ en-US ] = "Recovery in progress";
-};
-
-String RID_SVXSTR_NOTRECOVYET
-{
-    Text[ en-US ] = "Not recovered yet";
-};
-
-String RID_SVXSTR_RECOVERY_INPROGRESS
-{
-    Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time." ;
-};
-
-String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR
-{
-    Text[ en-US ] = "Recovery of your documents was finished. Click 'Finish' to see your documents.";
-};
-
-String RID_SVXSTR_RECOVERYONLY_FINISH
-{
-    Text[ en-US ] = "~Finish";
-};
-
-String RID_SVXSTR_WIDTH_LAST_CUSTOM
-{
-    Text[ en-US ] = "Last Custom Value";
-};
-
-String RID_SVXSTR_PT
-{
-    Text[ en-US ] = "pt";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/spacing.src b/svx/source/dialog/spacing.src
deleted file mode 100644
index f7e10ee69c99..000000000000
--- a/svx/source/dialog/spacing.src
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <svx/dialogs.hrc>
-
-StringArray RID_SVXSTRARY_SPACING
-{
-    ItemList [ en-US ] =
-    {
-        < "None" ;                  0; > ;
-        < "Extra Small (1/16\")";   91; > ;
-        < "Small (1/8\")";         181; > ;
-        < "Small Medium (1/4\")";  363; > ;
-        < "Medium (3/8\")";        539; > ;
-        < "Medium Large (1/2\")";  720; > ;
-        < "Large (3/4\")";          1077; > ;
-        < "Extra Large (1\")";   1440; > ;
-    };
-};
\ No newline at end of file
diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx
index 14b8a05ad975..ff50306f7942 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -16,22 +16,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/spacinglistbox.hxx>
-#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
+#include "spacing.hrc"
 
 SpacingListBox::SpacingListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
 {
-    ResStringArray aSpacingAry( ResId(RID_SVXSTRARY_SPACING, DIALOG_MGR()) );
-    sal_uInt32 nCnt = aSpacingAry.Count();
-
-    for ( sal_uInt32 i = 0; i < nCnt; ++i )
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_SPACING); ++i)
     {
-        OUString aStr = aSpacingAry.GetString(i);
-        sal_uInt16 nData = aSpacingAry.GetValue(i);
+        OUString aStr = SvxResId(RID_SVXSTRARY_SPACING[i].first);
+        sal_uInt16 nData = RID_SVXSTRARY_SPACING[i].second;
         sal_Int32 nPos = InsertEntry( aStr );
         SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
     }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 8eb35e60fa15..fab2f3f9d459 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -52,8 +52,10 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include "svx/srchdlg.hxx"
+#include "svx/strarray.hxx"
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/svxitems.hrc>
 
 #include <svl/srchitem.hxx>
@@ -2118,7 +2120,6 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void )
     pTimer->Start();
 }
 
-
 OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
                                              bool bSrchFlag ) const
 {
@@ -2155,8 +2156,6 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
         default: ;//prevent warning
     }
 
-    ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
-
     for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
     {
         const SearchAttrItem& rItem = pList->GetObject(i);
@@ -2178,9 +2177,9 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
         }
         else
         {
-            sal_uInt32 nId  = aAttrNames.FindIndex( rItem.nSlot );
+            sal_uInt32 nId = SvxAttrNameTable::FindIndex(rItem.nSlot);
             if ( RESARRAY_INDEX_NOTFOUND != nId )
-                rStr += aAttrNames.GetString( nId );
+                rStr += SvxAttrNameTable::GetString(nId);
         }
     }
     return rStr;
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index a30be0454610..3e3a92b28270 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -17,31 +17,101 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
+#include <tools/resary.hxx>
+#include <svx/svxitems.hrc>
+#include "fieldunit.hrc"
+#include "numberingtype.hrc"
 
-SvxStringArray::SvxStringArray( sal_uInt32 nResId ) :
-    ResStringArray(ResId(nResId, DIALOG_MGR()))
+SvxStringArray::SvxStringArray(const char **pResId, size_t nLength)
+{
+    for (size_t i = 0; i < nLength; ++i)
+        m_aTranslations.push_back(SvxResId(pResId[i]));
+}
+
+const OUString SvxStringArray::GetString(sal_uInt32 nPos) const
+{
+    return m_aTranslations[nPos];
+}
+
+sal_uInt32 SvxFieldUnitTable::Count()
+{
+    return SAL_N_ELEMENTS(RID_SVXSTR_FIELDUNIT_TABLE);
+}
+
+OUString SvxFieldUnitTable::GetString(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return SvxResId(RID_SVXSTR_FIELDUNIT_TABLE[nPos].first);
+    return OUString();
+}
+
+FieldUnit SvxFieldUnitTable::GetValue(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return RID_SVXSTR_FIELDUNIT_TABLE[nPos].second;
+    return FUNIT_NONE;
+}
 
+OUString SvxAttrNameTable::GetString(sal_uInt32 nPos)
 {
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return SvxResId(RID_ATTR_NAMES[nPos].first);
+    return OUString();
 }
 
-SvxStringArray::SvxStringArray( const ResId& rResId ) :
-    ResStringArray( rResId )
+sal_uInt32 SvxAttrNameTable::Count()
 {
+    return SAL_N_ELEMENTS(RID_ATTR_NAMES);
 }
 
+sal_uInt16 SvxAttrNameTable::GetValue(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return RID_ATTR_NAMES[nPos].second;
+    return 0;
+}
 
-SvxStringArray::~SvxStringArray()
+sal_uInt32 SvxAttrNameTable::FindIndex(int nValue)
 {
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_ATTR_NAMES); ++i)
+    {
+        if (nValue == RID_ATTR_NAMES[i].second)
+            return i;
+    }
+    return RESARRAY_INDEX_NOTFOUND;
 }
 
-const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
+OUString SvxNumberingTypeTable::GetString(sal_uInt32 nPos)
 {
-    if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
-        return ResStringArray::GetString( nPos );
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return SvxResId(RID_SVXSTRARY_NUMBERINGTYPE[nPos].first);
     return OUString();
 }
 
+sal_uInt32 SvxNumberingTypeTable::Count()
+{
+    return SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE);
+}
+
+int SvxNumberingTypeTable::GetValue(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return RID_SVXSTRARY_NUMBERINGTYPE[nPos].second;
+    return 0;
+}
+
+sal_uInt32 SvxNumberingTypeTable::FindIndex(int nValue)
+{
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); ++i)
+    {
+        if (nValue == RID_SVXSTRARY_NUMBERINGTYPE[i].second)
+            return i;
+    }
+    return RESARRAY_INDEX_NOTFOUND;
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 7a5230b845f3..1f166ec87a3d 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/valueset.hxx>
 #include <svl/languageoptions.hxx>
@@ -385,6 +385,42 @@ SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits)
 
 VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
 
+static const char* RID_SVXSTR_BULLET_DESCRIPTIONS[] =
+{
+    RID_SVXSTR_BULLET_DESCRIPTION_0,
+    RID_SVXSTR_BULLET_DESCRIPTION_1,
+    RID_SVXSTR_BULLET_DESCRIPTION_2,
+    RID_SVXSTR_BULLET_DESCRIPTION_3,
+    RID_SVXSTR_BULLET_DESCRIPTION_4,
+    RID_SVXSTR_BULLET_DESCRIPTION_5,
+    RID_SVXSTR_BULLET_DESCRIPTION_6,
+    RID_SVXSTR_BULLET_DESCRIPTION_7
+};
+
+static const char* RID_SVXSTR_SINGLENUM_DESCRIPTIONS[] =
+{
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_0,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_1,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_2,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_3,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_4,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_5,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_6,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_7
+};
+
+static const char* RID_SVXSTR_OUTLINENUM_DESCRIPTIONS[] =
+{
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_0,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_1,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_2,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_3,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_4,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_5,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_6,
+    RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
+};
+
 void SvxNumValueSet::init(NumberingPageType eType)
 {
     ePageType = eType;
@@ -398,7 +434,7 @@ void SvxNumValueSet::init(NumberingPageType eType)
         for ( sal_uInt16 i = 0; i < 8; i++ )
         {
             InsertItem( i + 1, i );
-            SetItemText( i + 1, SvxResId( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) );
+            SetItemText(i + 1, SvxResId(RID_SVXSTR_BULLET_DESCRIPTIONS[i]));
         }
     }
 }
@@ -428,7 +464,7 @@ void SvxNumValueSet::SetNumberingSettings(
     {
             InsertItem( i + 1, i );
             if( i < 8 )
-                SetItemText( i + 1, SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
+                SetItemText(i + 1, SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
     }
 }
 
@@ -446,7 +482,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
     {
         InsertItem( i + 1, i );
         if( i < 8 )
-            SetItemText( i + 1, SvxResId( RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + i ));
+            SetItemText(i + 1, SvxResId(RID_SVXSTR_OUTLINENUM_DESCRIPTIONS[i]));
     }
 }
 
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
deleted file mode 100644
index 93fb4f7b8335..000000000000
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ /dev/null
@@ -1,121 +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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_BULLET_DESCRIPTION_0
-{
-    Text [en-US] = "Solid small circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_1
-{
-    Text [en-US] = "Solid large circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_2
-{
-    Text [en-US] = "Solid diamond bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_3
-{
-    Text [en-US] = "Solid large square bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_4
-{
-    Text [en-US] = "Right pointing arrow bullets filled out";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_5
-{
-    Text [en-US] = "Right pointing arrow bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_6
-{
-    Text [en-US] = "Check mark bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_7
-{
-    Text [en-US] = "Tick mark bullets";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
-{
-    Text [en-US] = "Number 1) 2) 3)";
-    //Text [en-US] = "Number %NUMBERINGSAMPLE";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
-{
-    Text [en-US] = "Number 1. 2. 3.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
-{
-    Text [en-US] = "Number (1) (2) (3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
-{
-    Text [en-US] = "Uppercase Roman number I. II. III.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
-{
-    Text [en-US] = "Uppercase letter A) B) C)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
-{
-    Text [en-US] = "Lowercase letter a) b) c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
-{
-    Text [en-US] = "Lowercase letter (a) (b) (c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
-{
-    Text [en-US] = "Lowercase Roman number i. ii. iii.";
-};
-
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-{
-    Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-{
-    Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-{
-    Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-{
-    Text [en-US] = "Numeric";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-{
-    Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-{
-    Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-{
-    Text [en-US] = "Numeric with all sublevels";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-{
-    Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5beb625cb0a4..307c31b51863 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -28,10 +28,12 @@
 #include <svl/rectitem.hxx>
 #include <svl/hint.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/ruler.hxx>
 #include <svx/rulritem.hxx>
+#include <editeng/editids.hrc>
 #include <editeng/tstpitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/protitem.hxx>
@@ -3367,6 +3369,14 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
     return false;
 }
 
+static const char* RID_SVXSTR_RULER_TAB[] =
+{
+    RID_SVXSTR_RULER_TAB_LEFT,
+    RID_SVXSTR_RULER_TAB_RIGHT,
+    RID_SVXSTR_RULER_TAB_CENTER,
+    RID_SVXSTR_RULER_TAB_DECIMAL
+};
+
 void SvxRuler::Command( const CommandEvent& rCommandEvent )
 {
     /* Mouse context menu for switching the unit of measurement */
@@ -3394,7 +3404,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
                 nStyle |= static_cast<sal_uInt16>(bHorz ? WB_HORZ : WB_VERT);
                 DrawTab(*pDev, aFillColor, aPt, nStyle);
                 aMenu->InsertItem(i + 1,
-                                 SvxResId(RID_SVXSTR_RULER_START + i),
+                                 SvxResId(RID_SVXSTR_RULER_TAB[i]),
                                  Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE))));
                 aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle);
                 pDev->SetOutputSize(aSz); // delete device
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 5deb147a62f5..6dd9ae33d05b 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -21,24 +21,16 @@
 #include <tools/resary.hxx>
 #include <tools/debug.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "swframeposstrings.hrc"
 
-SvxSwFramePosString::SvxSwFramePosString() :
-    pImpl(new ResStringArray(ResId(RID_SVXSW_FRAMEPOSITIONS, DIALOG_MGR())))
-{
-    assert(pImpl->Count() == SvxSwFramePosString::STR_MAX);
-}
-
-SvxSwFramePosString::~SvxSwFramePosString()
-{
-}
-
-OUString SvxSwFramePosString::GetString(StringId eId) const
+OUString SvxSwFramePosString::GetString(StringId eId)
 {
+    assert(SAL_N_ELEMENTS(RID_SVXSW_FRAMEPOSITIONS) == SvxSwFramePosString::STR_MAX);
     DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId");
     if(!(eId >= 0 && eId < STR_MAX))
         eId = LEFT;
-    return pImpl->GetString(eId);
+    return SvxResId(RID_SVXSW_FRAMEPOSITIONS[eId]);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
deleted file mode 100644
index e8c1c07b5af1..000000000000
--- a/svx/source/dialog/swframeposstrings.src
+++ /dev/null
@@ -1,71 +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 <svx/dialogs.hrc>
-
-//the following string have to match the (enum values) positions in svx/swframeposstrings.hxx!
-StringArray RID_SVXSW_FRAMEPOSITIONS
-{
-    ItemList [ en-US ] =
-    {
-        < "Left" ; > ;
-        < "Right" ; > ;
-        < "From left" ; > ;
-        < "Inside" ; > ;
-        < "Outside" ; > ;
-        < "From inside" ; > ;
-        < "Paragraph area" ; > ;
-        < "Paragraph text area" ; > ;
-        < "Left page border" ; > ;
-        < "Right page border" ; > ;
-        < "Left paragraph border" ; > ;
-        < "Right paragraph border" ; > ;
-        < "Inner page border" ; > ;
-        < "Outer page border" ; > ;
-        < "Inner paragraph border" ; > ;
-        < "Outer paragraph border" ; > ;
-        < "Entire page" ; > ;
-        < "Page text area" ; > ;
-        < "Base line" ; > ;
-        < "Character" ; > ;
-        < "Row" ; > ;
-        < "Margin" ; > ;
-        < "Paragraph text area" ; > ;
-        < "Left frame border" ; > ;
-        < "Right frame border" ; > ;
-        < "Entire frame" ; > ;
-        < "Frame text area" ; > ;
-        < "Inner frame border" ; > ;
-        < "Outer frame border" ; > ;
-        < "Top" ; > ;
-        < "Bottom" ; > ;
-        < "Center" ; > ;
-        < "Center" ; > ;
-        < "From top" ; > ;
-        < "From bottom" ; > ;
-        < "Below" ; > ;
-        < "From right" ; > ;
-        < "Top page border" ; > ;
-        < "Bottom page border" ; > ;
-        < "Top paragraph border" ; > ;
-        < "Bottom paragraph border" ; > ;
-        < "Line of text" ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 7434c5e1e3e3..f476ae3bd52a 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -20,8 +20,9 @@
 #include <config_features.h>
 
 #include "svx/txencbox.hxx"
+#include <svx/dialmgr.hxx>
 #include "svx/txenctab.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #if HAVE_FEATURE_DBCONNECTIVITY
 #include "svx/dbcharsethelper.hxx"
 #endif
@@ -32,11 +33,11 @@
 #include <rtl/locale.h>
 #include <rtl/strbuf.hxx>
 #include <osl/nlsupport.h>
+#include "txenctab.hrc"
 
 SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
     : ListBox( pParent, nBits )
 {
-    m_pEncTable = new SvxTextEncodingTable;
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
@@ -59,12 +60,6 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
     disposeOnce();
 }
 
-void SvxTextEncodingBox::dispose()
-{
-    delete m_pEncTable;
-    ListBox::dispose();
-}
-
 sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
 {
     sal_Int32 nCount = GetEntryCount();
@@ -83,11 +78,11 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
 {
     rtl_TextEncodingInfo aInfo;
     aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
-    sal_uInt32 nCount = m_pEncTable->Count();
-    for ( sal_uInt32 j=0; j<nCount; j++ )
+    const sal_uInt32 nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
+    for (sal_uInt32 j = 0; j < nCount; ++j)
     {
         bool bInsert = true;
-        rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
+        rtl_TextEncoding nEnc = RID_SVXSTR_TEXTENCODING_TABLE[j].second;
         if ( nExcludeInfoFlags )
         {
             if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
@@ -120,7 +115,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
                 }
             }
             if ( bInsert )
-                InsertTextEncoding( nEnc, m_pEncTable->GetString( j ) );
+                InsertTextEncoding(nEnc, SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
         }
     }
 }
@@ -201,7 +196,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
 
 void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc )
 {
-    const OUString& rEntry = m_pEncTable->GetTextString( nEnc );
+    const OUString& rEntry = SvxTextEncodingTable::GetTextString(nEnc);
     if ( !rEntry.isEmpty() )
         InsertTextEncoding( nEnc, rEntry );
     else
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index e60e497c455a..4a17c73fc28a 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -18,38 +18,32 @@
  */
 
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/txenctab.hxx"
+#include "txenctab.hrc"
 
-SvxTextEncodingTable::SvxTextEncodingTable()
-    : ResStringArray(ResId(RID_SVXSTR_TEXTENCODING_TABLE, DIALOG_MGR()))
+const OUString SvxTextEncodingTable::GetTextString(const rtl_TextEncoding nEnc)
 {
-}
+    const size_t nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
 
-SvxTextEncodingTable::~SvxTextEncodingTable()
-{
-}
-
-const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
-{
-    sal_uInt32 nPos = FindIndex( (long)nEnc );
-
-    if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
-        return ResStringArray::GetString( nPos );
+    for (size_t i = 0; i < nCount; ++i)
+    {
+        if (RID_SVXSTR_TEXTENCODING_TABLE[i].second == nEnc)
+            return SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[i].first);
+    }
 
     return OUString();
 }
 
-
-rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const
+rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding(const OUString& rStr)
 {
-    sal_uInt32 nCount = Count();
+    const size_t nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
 
-    for ( sal_uInt32 i = 0; i < nCount; ++i )
+    for (size_t i = 0; i < nCount; ++i)
     {
-        if (ResStringArray::GetString( i ) == rStr)
-            return rtl_TextEncoding( GetValue( i ) );
+        if (SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[i].first).equals(rStr))
+            return RID_SVXSTR_TEXTENCODING_TABLE[i].second;
     }
     return RTL_TEXTENCODING_DONTKNOW;
 }
diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
deleted file mode 100644
index c3cefd8eaf5a..000000000000
--- a/svx/source/dialog/txenctab.src
+++ /dev/null
@@ -1,110 +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 <svx/dialogs.hrc>
-#include <rtl/textenc.h>
-
-// Encodings for which no conversion exist yet are commented out.
-
-StringArray RID_SVXSTR_TEXTENCODING_TABLE
-{
-    ItemList [ en-US ] =
-    {
-         < "Western Europe (Windows-1252/WinLatin 1)"           ; RTL_TEXTENCODING_MS_1252          ; > ;
-        < "Western Europe (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_ROMAN      ; > ;
-        < "Western Europe (DOS/OS2-850/International)"          ; RTL_TEXTENCODING_IBM_850          ; > ;
-        < "Western Europe (DOS/OS2-437/US)"                     ; RTL_TEXTENCODING_IBM_437          ; > ;
-        < "Western Europe (DOS/OS2-860/Portuguese)"         ; RTL_TEXTENCODING_IBM_860          ; > ;
-        < "Western Europe (DOS/OS2-861/Icelandic)"              ; RTL_TEXTENCODING_IBM_861          ; > ;
-        < "Western Europe (DOS/OS2-863/French (Can.))"  ; RTL_TEXTENCODING_IBM_863          ; > ;
-        < "Western Europe (DOS/OS2-865/Nordic)"             ; RTL_TEXTENCODING_IBM_865          ; > ;
-        < "Western Europe (ASCII/US)"                           ; RTL_TEXTENCODING_ASCII_US         ; > ;
-        < "Western Europe (ISO-8859-1)"                         ; RTL_TEXTENCODING_ISO_8859_1       ; > ;
-        < "Eastern Europe (ISO-8859-2)"                         ; RTL_TEXTENCODING_ISO_8859_2       ; > ;
-        < "Latin 3 (ISO-8859-3)"                            ; RTL_TEXTENCODING_ISO_8859_3       ; > ;
-        < "Baltic (ISO-8859-4)"                         ; RTL_TEXTENCODING_ISO_8859_4       ; > ;
-        < "Cyrillic (ISO-8859-5)"                           ; RTL_TEXTENCODING_ISO_8859_5       ; > ;
-        < "Arabic (ISO-8859-6)"                             ; RTL_TEXTENCODING_ISO_8859_6       ; > ;
-        < "Greek (ISO-8859-7)"                          ; RTL_TEXTENCODING_ISO_8859_7       ; > ;
-        < "Hebrew (ISO-8859-8)"                         ; RTL_TEXTENCODING_ISO_8859_8       ; > ;
-        < "Turkish (ISO-8859-9)"                            ; RTL_TEXTENCODING_ISO_8859_9       ; > ;
-        < "Western Europe (ISO-8859-14)"                        ; RTL_TEXTENCODING_ISO_8859_14      ; > ;
-        < "Western Europe (ISO-8859-15/EURO)"                   ; RTL_TEXTENCODING_ISO_8859_15      ; > ;
-        < "Greek (DOS/OS2-737)"                     ; RTL_TEXTENCODING_IBM_737          ; > ;
-        < "Baltic (DOS/OS2-775)"                            ; RTL_TEXTENCODING_IBM_775          ; > ;
-        < "Eastern Europe (DOS/OS2-852)"                            ; RTL_TEXTENCODING_IBM_852          ; > ;
-        < "Cyrillic (DOS/OS2-855)"                      ; RTL_TEXTENCODING_IBM_855          ; > ;
-        < "Turkish (DOS/OS2-857)"                           ; RTL_TEXTENCODING_IBM_857          ; > ;
-        < "Hebrew (DOS/OS2-862)"                            ; RTL_TEXTENCODING_IBM_862          ; > ;
-        < "Arabic (DOS/OS2-864)"                            ; RTL_TEXTENCODING_IBM_864          ; > ;
-        < "Cyrillic (DOS/OS2-866/Russian)"              ; RTL_TEXTENCODING_IBM_866          ; > ;
-        < "Greek (DOS/OS2-869/Modern)"                  ; RTL_TEXTENCODING_IBM_869          ; > ;
-        < "Eastern Europe (Windows-1250/WinLatin 2)"                ; RTL_TEXTENCODING_MS_1250          ; > ;
-        < "Cyrillic (Windows-1251)"                     ; RTL_TEXTENCODING_MS_1251          ; > ;
-        < "Greek (Windows-1253)"                        ; RTL_TEXTENCODING_MS_1253          ; > ;
-        < "Turkish (Windows-1254)"                          ; RTL_TEXTENCODING_MS_1254          ; > ;
-        < "Hebrew (Windows-1255)"                       ; RTL_TEXTENCODING_MS_1255          ; > ;
-        < "Arabic (Windows-1256)"                           ; RTL_TEXTENCODING_MS_1256          ; > ;
-        < "Baltic (Windows-1257)"                           ; RTL_TEXTENCODING_MS_1257          ; > ;
-        < "Vietnamese (Windows-1258)"                       ; RTL_TEXTENCODING_MS_1258          ; > ;
-        < "Eastern Europe (Apple Macintosh)"                        ; RTL_TEXTENCODING_APPLE_CENTEURO   ; > ;
-        < "Eastern Europe (Apple Macintosh/Croatian)"           ; RTL_TEXTENCODING_APPLE_CROATIAN   ; > ;
-        < "Cyrillic (Apple Macintosh)"                  ; RTL_TEXTENCODING_APPLE_CYRILLIC   ; > ;
-        < "Greek (Apple Macintosh)"                 ; RTL_TEXTENCODING_APPLE_GREEK      ; > ;
-        < "Western Europe (Apple Macintosh/Icelandic)"          ; RTL_TEXTENCODING_APPLE_ICELAND    ; > ;
-        < "Eastern Europe (Apple Macintosh/Romanian)"           ; RTL_TEXTENCODING_APPLE_ROMANIAN   ; > ;
-        < "Turkish (Apple Macintosh)"                       ; RTL_TEXTENCODING_APPLE_TURKISH    ; > ;
-        < "Cyrillic (Apple Macintosh/Ukrainian)"            ; RTL_TEXTENCODING_APPLE_UKRAINIAN  ; > ;
-        < "Chinese simplified (Apple Macintosh)"        ; RTL_TEXTENCODING_APPLE_CHINSIMP   ; > ;
-        < "Chinese traditional (Apple Macintosh)"       ; RTL_TEXTENCODING_APPLE_CHINTRAD   ; > ;
-        < "Japanese (Apple Macintosh)"                      ; RTL_TEXTENCODING_APPLE_JAPANESE   ; > ;
-        < "Korean (Apple Macintosh)"                    ; RTL_TEXTENCODING_APPLE_KOREAN     ; > ;
-        < "Japanese (Windows-932)"                          ; RTL_TEXTENCODING_MS_932           ; > ;
-        < "Chinese simplified (Windows-936)"            ; RTL_TEXTENCODING_MS_936           ; > ;
-        < "Korean (Windows-949)"                        ; RTL_TEXTENCODING_MS_949           ; > ;
-        < "Chinese traditional (Windows-950)"           ; RTL_TEXTENCODING_MS_950           ; > ;
-        < "Japanese (Shift-JIS)"                            ; RTL_TEXTENCODING_SHIFT_JIS        ; > ;
-        < "Chinese simplified (GB-2312)"                ; RTL_TEXTENCODING_GB_2312          ; > ;
-        < "Chinese simplified (GB-18030)"               ; RTL_TEXTENCODING_GB_18030         ; > ;
-        < "Chinese traditional (GBT-12345)"             ; RTL_TEXTENCODING_GBT_12345        ; > ;
-        < "Chinese simplified (GBK/GB-2312-80)"         ; RTL_TEXTENCODING_GBK              ; > ;
-        < "Chinese traditional (Big5)"                  ; RTL_TEXTENCODING_BIG5             ; > ;
-        < "Chinese traditional (BIG5-HKSCS)"            ; RTL_TEXTENCODING_BIG5_HKSCS       ; > ;
-        < "Japanese (EUC-JP)"                               ; RTL_TEXTENCODING_EUC_JP           ; > ;
-        < "Chinese simplified (EUC-CN)"                 ; RTL_TEXTENCODING_EUC_CN           ; > ;
-        < "Chinese traditional (EUC-TW)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
-        < "Japanese (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
-        < "Chinese simplified (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
-        < "Cyrillic (KOI8-R)"                               ; RTL_TEXTENCODING_KOI8_R           ; > ;
-        < "Unicode (UTF-7)"                                 ; RTL_TEXTENCODING_UTF7             ; > ;
-        < "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8             ; > ;
-        < "Eastern Europe (ISO-8859-10)"                            ; RTL_TEXTENCODING_ISO_8859_10      ; > ;
-        < "Eastern Europe (ISO-8859-13)"                            ; RTL_TEXTENCODING_ISO_8859_13      ; > ;
-        < "Korean (EUC-KR)"                             ; RTL_TEXTENCODING_EUC_KR           ; > ;
-        < "Korean (ISO-2022-KR)"                        ; RTL_TEXTENCODING_ISO_2022_KR      ; > ;
-        < "Korean (Windows-Johab-1361)"                 ; RTL_TEXTENCODING_MS_1361          ; > ;
-        < "Unicode (UTF-16)"                            ; RTL_TEXTENCODING_UCS2             ; > ;
-        < "Thai (ISO-8859-11/TIS-620)"                                  ; RTL_TEXTENCODING_TIS_620          ; > ;
-        < "Thai (Windows-874)"                              ; RTL_TEXTENCODING_MS_874           ; > ;
-        < "Cyrillic (KOI8-U)"                             ; RTL_TEXTENCODING_KOI8_U           ; > ;
-        < "Cyrillic (PT154)"                                ; RTL_TEXTENCODING_PT154            ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
deleted file mode 100644
index 9234b6a26463..000000000000
--- a/svx/source/dialog/ucsubset.src
+++ /dev/null
@@ -1,308 +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 <svx/ucsubset.hrc>
-
-/*
- * strings for unicode range descriptions (used e.g. by charmap)
- * (see the Unicode Standard & TrueType::OS2.ulUnicodeRange description)
- */
-
-StringArray RID_SUBSETMAP
-{
-    ItemList [ en-US ] =
-    {
-        < "Basic Latin"; RID_SUBSETSTR_BASIC_LATIN ; > ;
-        < "Latin-1"; RID_SUBSETSTR_LATIN_1 ; > ;
-        < "Latin Extended-A"; RID_SUBSETSTR_LATIN_EXTENDED_A ; > ;
-        < "Latin Extended-B"; RID_SUBSETSTR_LATIN_EXTENDED_B ; > ;
-        < "IPA Extensions"; RID_SUBSETSTR_IPA_EXTENSIONS ; > ;
-        < "Spacing Modifier Letters"; RID_SUBSETSTR_SPACING_MODIFIERS ; > ;
-        < "Combining Diacritical Marks"; RID_SUBSETSTR_COMB_DIACRITICAL ; > ;
-        < "Basic Greek"; RID_SUBSETSTR_BASIC_GREEK ; > ;
-        < "Greek Symbols And Coptic"; RID_SUBSETSTR_GREEK_SYMS_COPTIC ; > ;
-        < "Cyrillic"; RID_SUBSETSTR_CYRILLIC ; > ;
-        < "Armenian"; RID_SUBSETSTR_ARMENIAN ; > ;
-        < "Basic Hebrew"; RID_SUBSETSTR_BASIC_HEBREW ; > ;
-        < "Hebrew Extended"; RID_SUBSETSTR_HEBREW_EXTENDED ; > ;
-        < "Basic Arabic"; RID_SUBSETSTR_BASIC_ARABIC ; > ;
-        < "Arabic Extended"; RID_SUBSETSTR_ARABIC_EXTENDED ; > ;
-        < "Devanagari"; RID_SUBSETSTR_DEVANAGARI ; > ;
-        < "Bengali"; RID_SUBSETSTR_BENGALI ; > ;
-        < "Gurmukhi"; RID_SUBSETSTR_GURMUKHI ; > ;
-        < "Gujarati"; RID_SUBSETSTR_GUJARATI ; > ;
-        < "Odia"; RID_SUBSETSTR_ODIA ; > ;
-        < "Tamil"; RID_SUBSETSTR_TAMIL ; > ;
-        < "Telugu"; RID_SUBSETSTR_TELUGU ; > ;
-        < "Kannada"; RID_SUBSETSTR_KANNADA ; > ;
-        < "Malayalam"; RID_SUBSETSTR_MALAYALAM ; > ;
-        < "Thai"; RID_SUBSETSTR_THAI ; > ;
-        < "Lao"; RID_SUBSETSTR_LAO ; > ;
-        < "Basic Georgian"; RID_SUBSETSTR_BASIC_GEORGIAN ; > ;
-        < "Georgian Extended"; RID_SUBSETSTR_GEORGIAN_EXTENDED ; > ;
-        < "Hangul Jamo"; RID_SUBSETSTR_HANGUL_JAMO ; > ;
-        < "Latin Extended Additionals"; RID_SUBSETSTR_LATIN_EXTENDED_ADDS ; > ;
-        < "Greek Extended"; RID_SUBSETSTR_GREEK_EXTENDED ; > ;
-        < "General punctuation"; RID_SUBSETSTR_GENERAL_PUNCTUATION ; > ;
-        < "Superscripts and Subscripts"; RID_SUBSETSTR_SUB_SUPER_SCRIPTS ; > ;
-        < "Currency Symbols"; RID_SUBSETSTR_CURRENCY_SYMBOLS ; > ;
-        < "Combining Diacritical Symbols"; RID_SUBSETSTR_COMB_DIACRITIC_SYMS ; > ;
-        < "Letterlike Symbols"; RID_SUBSETSTR_LETTERLIKE_SYMBOLS ; > ;
-        < "Number Forms"; RID_SUBSETSTR_NUMBER_FORMS ; > ;
-        < "Arrows"; RID_SUBSETSTR_ARROWS ; > ;
-        < "Mathematical Operators"; RID_SUBSETSTR_MATH_OPERATORS ; > ;
-        < "Miscellaneous Technical"; RID_SUBSETSTR_MISC_TECHNICAL ; > ;
-        < "Control Pictures"; RID_SUBSETSTR_CONTROL_PICTURES ; > ;
-        < "Optical Character Recognition"; RID_SUBSETSTR_OPTICAL_CHAR_REC ; > ;
-        < "Enclosed Alphanumerics"; RID_SUBSETSTR_ENCLOSED_ALPHANUM ; > ;
-        < "Box Drawing"; RID_SUBSETSTR_BOX_DRAWING ; > ;
-        < "Block Elements"; RID_SUBSETSTR_BLOCK_ELEMENTS ; > ;
-        < "Geometric Shapes"; RID_SUBSETSTR_GEOMETRIC_SHAPES ; > ;
-        < "Miscellaneous Symbols"; RID_SUBSETSTR_MISC_DINGBATS ; > ;
-        < "Dingbats"; RID_SUBSETSTR_DINGBATS ; > ;
-        < "CJK Symbols And Punctuation"; RID_SUBSETSTR_CJK_SYMS_PUNCTUATION ; > ;
-        < "Hiragana"; RID_SUBSETSTR_HIRAGANA ; > ;
-        < "Katakana"; RID_SUBSETSTR_KATAKANA ; > ;
-        < "Bopomofo"; RID_SUBSETSTR_BOPOMOFO ; > ;
-        < "Hangul Compatibility Jamo"; RID_SUBSETSTR_HANGUL_COMPAT_JAMO ; > ;
-        < "CJK Miscellaneous"; RID_SUBSETSTR_CJK_MISC ; > ;
-        < "Enclosed CJK Letters And Months"; RID_SUBSETSTR_ENCLOSED_CJK_LETTERS ; > ;
-        < "CJK Compatibility"; RID_SUBSETSTR_CJK_COMPATIBILITY ; > ;
-        < "Hangul"; RID_SUBSETSTR_HANGUL ; > ;
-        < "CJK Unified Ideographs"; RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH ; > ;
-        < "CJK Unified Ideographs Extension A"; RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH ; > ;
-        < "Private Use Area"; RID_SUBSETSTR_PRIVATE_USE_AREA ; > ;
-        < "CJK Compatibility Ideographs"; RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS ; > ;
-        < "Alphabetic Presentation Forms"; RID_SUBSETSTR_ALPHA_PRESENTATION ; > ;
-        < "Arabic Presentation Forms-A"; RID_SUBSETSTR_ARABIC_PRESENT_A ; > ;
-        < "Combining Half Marks"; RID_SUBSETSTR_COMBINING_HALF_MARKS ; > ;
-        < "CJK Compatibility Forms"; RID_SUBSETSTR_CJK_COMPAT_FORMS ; > ;
-        < "Small Form Variants"; RID_SUBSETSTR_SMALL_FORM_VARIANTS ; > ;
-        < "Arabic Presentation Forms-B"; RID_SUBSETSTR_ARABIC_PRESENT_B ; > ;
-        < "Half-width and Full-width Forms"; RID_SUBSETSTR_HALFW_FULLW_FORMS ; > ;
-        < "Specials"; RID_SUBSETSTR_SPECIALS ; > ;
-        < "Yi Syllables"; RID_SUBSETSTR_YI_SYLLABLES ; > ;
-        < "Yi Radicals"; RID_SUBSETSTR_YI_RADICALS ; > ;
-        < "Old Italic"; RID_SUBSETSTR_OLD_ITALIC ; > ;
-        < "Gothic"; RID_SUBSETSTR_GOTHIC ; > ;
-        < "Deseret"; RID_SUBSETSTR_DESERET ; > ;
-        < "Byzantine Musical Symbols"; RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS ; > ;
-        < "Musical Symbols"; RID_SUBSETSTR_MUSICAL_SYMBOLS ; > ;
-        < "Mathematical Alphanumeric Symbols"; RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS ; > ;
-        < "CJK Unified Ideographs Extension B"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ; > ;
-        < "CJK Unified Ideographs Extension C"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ; > ;
-        < "CJK Unified Ideographs Extension D"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ; > ;
-        < "CJK Compatibility Ideographs Supplement"; RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT ; > ;
-        < "Tags"; RID_SUBSETSTR_TAGS ; > ;
-        < "Cyrillic Supplement"; RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY ; > ;
-        < "Variation Selectors"; RID_SUBSETSTR_VARIATION_SELECTORS ; > ;
-        < "Supplementary Private Use Area-A"; RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A ; > ;
-        < "Supplementary Private Use Area-B"; RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B ; > ;
-        < "Limbu"; RID_SUBSETSTR_LIMBU ; > ;
-        < "Tai Le"; RID_SUBSETSTR_TAI_LE ; > ;
-        < "Khmer Symbols"; RID_SUBSETSTR_KHMER_SYMBOLS ; > ;
-        < "Phonetic Extensions"; RID_SUBSETSTR_PHONETIC_EXTENSIONS ; > ;
-        < "Miscellaneous Symbols And Arrows"; RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS ; > ;
-        < "Yijing Hexagram Symbols"; RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS ; > ;
-        < "Linear B Syllabary"; RID_SUBSETSTR_LINEAR_B_SYLLABARY ; > ;
-        < "Linear B Ideograms"; RID_SUBSETSTR_LINEAR_B_IDEOGRAMS ; > ;
-        < "Aegean Numbers"; RID_SUBSETSTR_AEGEAN_NUMBERS ; > ;
-        < "Ugaritic"; RID_SUBSETSTR_UGARITIC ; > ;
-        < "Shavian"; RID_SUBSETSTR_SHAVIAN ; > ;
-        < "Osmanya"; RID_SUBSETSTR_OSMANYA ; > ;
-        < "Sinhala"; RID_SUBSETSTR_SINHALA ; > ;
-        < "Tibetan"; RID_SUBSETSTR_TIBETAN ; > ;
-        < "Myanmar"; RID_SUBSETSTR_MYANMAR ; > ;
-        < "Khmer"; RID_SUBSETSTR_KHMER ; > ;
-        < "Ogham"; RID_SUBSETSTR_OGHAM ; > ;
-        < "Runic"; RID_SUBSETSTR_RUNIC ; > ;
-        < "Syriac"; RID_SUBSETSTR_SYRIAC ; > ;
-        < "Thaana"; RID_SUBSETSTR_THAANA ; > ;
-        < "Ethiopic"; RID_SUBSETSTR_ETHIOPIC ; > ;
-        < "Cherokee"; RID_SUBSETSTR_CHEROKEE ; > ;
-        < "Canadian Aboriginal Syllables"; RID_SUBSETSTR_CANADIAN_ABORIGINAL ; > ;
-        < "Mongolian"; RID_SUBSETSTR_MONGOLIAN ; > ;
-        < "Miscellaneous Mathematical Symbols-A"; RID_SUBSETSTR_MISC_MATH_SYMS_A ; > ;
-        < "Supplemental Arrows-A"; RID_SUBSETSTR_SUPPL_ARROWS_A ; > ;
-        < "Braille Patterns"; RID_SUBSETSTR_BRAILLE_PATTERNS ; > ;
-        < "Supplemental Arrows-B"; RID_SUBSETSTR_SUPPL_ARROWS_B ; > ;
-        < "Miscellaneous Mathematical Symbols-B"; RID_SUBSETSTR_MISC_MATH_SYMS_B ; > ;
-        < "CJK Radical Supplement"; RID_SUBSETSTR_CJK_RADICAL_SUPPL ; > ;
-        < "Kangxi Radicals"; RID_SUBSETSTR_KANGXI_RADICALS ; > ;
-        < "Ideographic Description Characters"; RID_SUBSETSTR_IDEO_DESC_CHARS ; > ;
-        < "Tagalog"; RID_SUBSETSTR_TAGALOG ; > ;
-        < "Hanunoo"; RID_SUBSETSTR_HANUNOO ; > ;
-        < "Tagbanwa"; RID_SUBSETSTR_TAGBANWA ; > ;
-        < "Buhid"; RID_SUBSETSTR_BUHID ; > ;
-        < "Kanbun"; RID_SUBSETSTR_KANBUN ; > ;
-        < "Bopomofo Extended"; RID_SUBSETSTR_BOPOMOFO_EXTENDED ; > ;
-        < "Katakana Phonetics"; RID_SUBSETSTR_KATAKANA_PHONETIC ; > ;
-        < "CJK Strokes"; RID_SUBSETSTR_CJK_STROKES ; > ;
-        < "Cypriot Syllabary"; RID_SUBSETSTR_CYPRIOT_SYLLABARY ; > ;
-        < "Tai Xuan Jing Symbols"; RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS ; > ;
-        < "Variation Selectors Supplement"; RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT ; > ;
-        < "Ancient Greek Musical Notation"; RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION ; > ;
-        < "Ancient Greek Numbers"; RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS ; > ;
-        < "Arabic Supplement"; RID_SUBSETSTR_ARABIC_SUPPLEMENT ; > ;
-        < "Buginese"; RID_SUBSETSTR_BUGINESE ; > ;
-        < "Combining Diacritical Marks Supplement"; RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT ; > ;
-        < "Coptic"; RID_SUBSETSTR_COPTIC ; > ;
-        < "Ethiopic Extended"; RID_SUBSETSTR_ETHIOPIC_EXTENDED ; > ;
-        < "Ethiopic Supplement"; RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT ; > ;
-        < "Georgian Supplement"; RID_SUBSETSTR_GEORGIAN_SUPPLEMENT ; > ;
-        < "Glagolitic"; RID_SUBSETSTR_GLAGOLITIC ; > ;
-        < "Kharoshthi"; RID_SUBSETSTR_KHAROSHTHI ; > ;
-        < "Modifier Tone Letters"; RID_SUBSETSTR_MODIFIER_TONE_LETTERS ; > ;
-        < "New Tai Lue"; RID_SUBSETSTR_NEW_TAI_LUE ; > ;
-        < "Old Persian"; RID_SUBSETSTR_OLD_PERSIAN ; > ;
-        < "Phonetic Extensions Supplement"; RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT ; > ;
-        < "Supplemental Punctuation"; RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION ; > ;
-        < "Syloti Nagri"; RID_SUBSETSTR_SYLOTI_NAGRI ; > ;
-        < "Tifinagh"; RID_SUBSETSTR_TIFINAGH ; > ;
-        < "Vertical Forms"; RID_SUBSETSTR_VERTICAL_FORMS ; > ;
-        < "Nko"; RID_SUBSETSTR_NKO ; > ;
-        < "Balinese"; RID_SUBSETSTR_BALINESE ; > ;
-        < "Latin Extended-C"; RID_SUBSETSTR_LATIN_EXTENDED_C ; > ;
-        < "Latin Extended-D"; RID_SUBSETSTR_LATIN_EXTENDED_D ; > ;
-        < "Phags-Pa"; RID_SUBSETSTR_PHAGS_PA ; > ;
-        < "Phoenician"; RID_SUBSETSTR_PHOENICIAN ; > ;
-        < "Cuneiform"; RID_SUBSETSTR_CUNEIFORM ; > ;
-        < "Cuneiform Numbers And Punctuation"; RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION ; > ;
-        < "Counting Rod Numerals"; RID_SUBSETSTR_COUNTING_ROD_NUMERALS ; > ;
-        < "Sundanese"; RID_SUBSETSTR_SUNDANESE ; > ;
-        < "Lepcha"; RID_SUBSETSTR_LEPCHA ; > ;
-        < "Ol Chiki"; RID_SUBSETSTR_OL_CHIKI ; > ;
-        < "Cyrillic Extended-A"; RID_SUBSETSTR_CYRILLIC_EXTENDED_A ; > ;
-        < "Vai"; RID_SUBSETSTR_VAI ; > ;
-        < "Cyrillic Extended-B"; RID_SUBSETSTR_CYRILLIC_EXTENDED_B ; > ;
-        < "Saurashtra"; RID_SUBSETSTR_SAURASHTRA ; > ;
-        < "Kayah Li"; RID_SUBSETSTR_KAYAH_LI ; > ;
-        < "Rejang"; RID_SUBSETSTR_REJANG ; > ;
-        < "Cham"; RID_SUBSETSTR_CHAM ; > ;
-        < "Ancient Symbols"; RID_SUBSETSTR_ANCIENT_SYMBOLS ; > ;
-        < "Phaistos Disc"; RID_SUBSETSTR_PHAISTOS_DISC ; > ;
-        < "Lycian"; RID_SUBSETSTR_LYCIAN ; > ;
-        < "Carian"; RID_SUBSETSTR_CARIAN ; > ;
-        < "Lydian"; RID_SUBSETSTR_LYDIAN ; > ;
-        < "Mahjong Tiles"; RID_SUBSETSTR_MAHJONG_TILES ; > ;
-        < "Domino Tiles"; RID_SUBSETSTR_DOMINO_TILES ; > ;
-        < "Samaritan"; RID_SUBSETSTR_SAMARITAN ; > ;
-        < "Canadian Aboriginal Syllabics Extended"; RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED ; > ;
-        < "Tai Tham"; RID_SUBSETSTR_TAI_THAM ; > ;
-        < "Vedic Extensions"; RID_SUBSETSTR_VEDIC_EXTENSIONS ; > ;
-        < "Lisu"; RID_SUBSETSTR_LISU ; > ;
-        < "Bamum"; RID_SUBSETSTR_BAMUM ; > ;
-        < "Common Indic Number Forms"; RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS ; > ;
-        < "Devanagari Extended"; RID_SUBSETSTR_DEVANAGARI_EXTENDED ; > ;
-        < "Hangul Jamo Extended-A"; RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A ; > ;
-        < "Javanese"; RID_SUBSETSTR_JAVANESE ; > ;
-        < "Myanmar Extended-A"; RID_SUBSETSTR_MYANMAR_EXTENDED_A ; > ;
-        < "Tai Viet"; RID_SUBSETSTR_TAI_VIET ; > ;
-        < "Meetei Mayek"; RID_SUBSETSTR_MEETEI_MAYEK ; > ;
-        < "Hangul Jamo Extended-B"; RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B ; > ;
-        < "Imperial Aramaic"; RID_SUBSETSTR_IMPERIAL_ARAMAIC ; > ;
-        < "Old South Arabian"; RID_SUBSETSTR_OLD_SOUTH_ARABIAN ; > ;
-        < "Avestan"; RID_SUBSETSTR_AVESTAN ; > ;
-        < "Inscriptional Parthian"; RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN ; > ;
-        < "Inscriptional Pahlavi"; RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI ; > ;
-        < "Old Turkic"; RID_SUBSETSTR_OLD_TURKIC ; > ;
-        < "Rumi Numeral Symbols"; RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS ; > ;
-        < "Kaithi"; RID_SUBSETSTR_KAITHI ; > ;
-        < "Egyptian Hieroglyphs"; RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS ; > ;
-        < "Enclosed Alphanumeric Supplement"; RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT ; > ;
-        < "Enclosed Ideographic Supplement"; RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT ; > ;
-        < "Mandaic"; RID_SUBSETSTR_MANDAIC ; > ;
-        < "Batak"; RID_SUBSETSTR_BATAK ; > ;
-        < "Ethiopic Extended-A"; RID_SUBSETSTR_ETHIOPIC_EXTENDED_A ; > ;
-        < "Brahmi"; RID_SUBSETSTR_BRAHMI ; > ;
-        < "Bamum Supplement"; RID_SUBSETSTR_BAMUM_SUPPLEMENT ; > ;
-        < "Kana Supplement"; RID_SUBSETSTR_KANA_SUPPLEMENT ; > ;
-        < "Playing Cards"; RID_SUBSETSTR_PLAYING_CARDS ; > ;
-        < "Miscellaneous Symbols And Pictographs"; RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS ; > ;
-        < "Emoticons"; RID_SUBSETSTR_EMOTICONS ; > ;
-        < "Transport And Map Symbols"; RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS ; > ;
-        < "Alchemical Symbols"; RID_SUBSETSTR_ALCHEMICAL_SYMBOLS ; > ;
-        < "Arabic Extended-A"; RID_SUBSETSTR_ARABIC_EXTENDED_A ; > ;
-        < "Arabic Mathematical Alphabetic Symbols"; RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS ; > ;
-        < "Chakma"; RID_SUBSETSTR_CHAKMA ; > ;
-        < "Meetei Mayek Extensions"; RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS ; > ;
-        < "Meroitic Cursive"; RID_SUBSETSTR_MEROITIC_CURSIVE ; > ;
-        < "Meroitic Hieroglyphs"; RID_SUBSETSTR_MEROITIC_HIEROGLYPHS ; > ;
-        < "Miao"; RID_SUBSETSTR_MIAO ; > ;
-        < "Sharada"; RID_SUBSETSTR_SHARADA ; > ;
-        < "Sora Sompeng"; RID_SUBSETSTR_SORA_SOMPENG ; > ;
-        < "Sundanese Supplement"; RID_SUBSETSTR_SUNDANESE_SUPPLEMENT ; > ;
-        < "Takri"; RID_SUBSETSTR_TAKRI ; > ;
-        < "Bassa Vah"; RID_SUBSETSTR_BASSA_VAH ; > ;
-        < "Caucasian Albanian"; RID_SUBSETSTR_CAUCASIAN_ALBANIAN ; > ;
-        < "Coptic Epact Numbers"; RID_SUBSETSTR_COPTIC_EPACT_NUMBERS ; > ;
-        < "Combining Diacritical Marks Extended"; RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED ; > ;
-        < "Duployan"; RID_SUBSETSTR_DUPLOYAN ; > ;
-        < "Elbasan"; RID_SUBSETSTR_ELBASAN ; > ;
-        < "Geometric Shapes Extended"; RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED ; > ;
-        < "Grantha"; RID_SUBSETSTR_GRANTHA ; > ;
-        < "Khojki"; RID_SUBSETSTR_KHOJKI ; > ;
-        < "Khudawadi"; RID_SUBSETSTR_KHUDAWADI ; > ;
-        < "Latin Extended-E"; RID_SUBSETSTR_LATIN_EXTENDED_E ; > ;
-        < "Linear A"; RID_SUBSETSTR_LINEAR_A ; > ;
-        < "Mahajani"; RID_SUBSETSTR_MAHAJANI ; > ;
-        < "Manichaean"; RID_SUBSETSTR_MANICHAEAN ; > ;
-        < "Mende Kikakui"; RID_SUBSETSTR_MENDE_KIKAKUI ; > ;
-        < "Modi"; RID_SUBSETSTR_MODI ; > ;
-        < "Mro"; RID_SUBSETSTR_MRO ; > ;
-        < "Myanmar Extended-B"; RID_SUBSETSTR_MYANMAR_EXTENDED_B ; > ;
-        < "Nabataean"; RID_SUBSETSTR_NABATAEAN ; > ;
-        < "Old North Arabian"; RID_SUBSETSTR_OLD_NORTH_ARABIAN ; > ;
-        < "Old Permic"; RID_SUBSETSTR_OLD_PERMIC ; > ;
-        < "Ornamental Dingbats"; RID_SUBSETSTR_ORNAMENTAL_DINGBATS ; > ;
-        < "Pahawh Hmong"; RID_SUBSETSTR_PAHAWH_HMONG ; > ;
-        < "Palmyrene"; RID_SUBSETSTR_PALMYRENE ; > ;
-        < "Pau Cin Hau"; RID_SUBSETSTR_PAU_CIN_HAU ; > ;
-        < "Psalter Pahlavi"; RID_SUBSETSTR_PSALTER_PAHLAVI ; > ;
-        < "Shorthand Format Controls"; RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS ; > ;
-        < "Siddham"; RID_SUBSETSTR_SIDDHAM ; > ;
-        < "Sinhala Archaic Numbers"; RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS ; > ;
-        < "Supplemental Arrows-C"; RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C ; > ;
-        < "Tirhuta"; RID_SUBSETSTR_TIRHUTA ; > ;
-        < "Warang Citi"; RID_SUBSETSTR_WARANG_CITI ; > ;
-        < "Ahom"; RID_SUBSETSTR_AHOM ; > ;
-        < "Anatolian Hieroglyphs"; RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS ; > ;
-        < "Cherokee Supplement"; RID_SUBSETSTR_CHEROKEE_SUPPLEMENT ; > ;
-        < "CJK Unified Ideographs Extension E"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E ; > ;
-        < "Early Dynastic Cuneiform"; RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM ; > ;
-        < "Hatran"; RID_SUBSETSTR_HATRAN ; > ;
-        < "Multani"; RID_SUBSETSTR_MULTANI ; > ;
-        < "Old Hungarian"; RID_SUBSETSTR_OLD_HUNGARIAN ; > ;
-        < "Supplemental Symbols And Pictographs"; RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS ; > ;
-        < "Sutton Signwriting"; RID_SUBSETSTR_SUTTON_SIGNWRITING ; > ;
-        < "Adlam"; RID_SUBSETSTR_ADLAM ; > ;
-        < "Bhaiksuki"; RID_SUBSETSTR_BHAIKSUKI ; > ;
-        < "Cyrillic Extended-C"; RID_SUBSETSTR_CYRILLIC_EXTENDED_C ; > ;
-        < "Glagolitic Supplement"; RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ; > ;
-        < "Ideographic Symbols and Punctuation"; RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ; > ;
-        < "Marchen"; RID_SUBSETSTR_MARCHEN ; > ;
-        < "Mongolian Supplement"; RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ; > ;
-        < "Newa"; RID_SUBSETSTR_NEWA ; > ;
-        < "Osage"; RID_SUBSETSTR_OSAGE ; > ;
-        < "Tangut"; RID_SUBSETSTR_TANGUT ; > ;
-        < "Tangut Components"; RID_SUBSETSTR_TANGUT_COMPONENTS ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index e6816c596f99..1f9b21998aad 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/cube3d.hxx>
 #include "svx/globl3d.hxx"
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 14a4b993e1f8..4ccf6948bd97 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -26,7 +26,7 @@
 #include <svx/svdtrans.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/e3dundo.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 26f371ea174f..a52678399973 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpage.hxx>
 #include "svx/globl3d.hxx"
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d2b3077d71fa..359eb476b725 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -46,7 +46,7 @@
 #include <svx/viewpt3d.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
deleted file mode 100644
index f8d12a88f99e..000000000000
--- a/svx/source/engine3d/float3d.src
+++ /dev/null
@@ -1,44 +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 <svx/dialogs.hrc>
-#include "float3d.hrc"
-#include <svx/svxcommands.h>
-
-String RID_SVXFLOAT3D_FAVORITE
-{
-    Text [ en-US ] = "Favorite";
-};
-
-String RID_SVXFLOAT3D_FIX_R
-{
-    Text [ en-US ] = "R:";
-};
-
-String RID_SVXFLOAT3D_FIX_G
-{
-    Text [ en-US ] = "G:";
-};
-
-String RID_SVXFLOAT3D_FIX_B
-{
-    Text [ en-US ] = "B:";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 186e922e7177..a93db14a763a 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index b19530a0c534..5bb9e66b2a6d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -19,7 +19,7 @@
 
 #include <o3tl/numeric.hxx>
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 7e80afac9779..13cdd51ee04a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
 
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 854a677b7c5a..168e8af898c9 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
deleted file mode 100644
index d7451ae414c8..000000000000
--- a/svx/source/engine3d/string3d.src
+++ /dev/null
@@ -1,44 +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 <svx/dialogs.hrc>
-
- // Strings for the Draw Dialog --------------------------------------------
-String RID_SVX_3D_UNDO_EXCHANGE_PASTE
-{
-    Text [ en-US ] = "Insert object(s)" ;
-};
-String RID_SVX_3D_UNDO_ROTATE
-{
-    Text [ en-US ] = "Rotate 3D object" ;
-};
-String RID_SVX_3D_UNDO_EXTRUDE
-{
-    Text [ en-US ] = "Create extrusion object" ;
-};
-String RID_SVX_3D_UNDO_LATHE
-{
-    Text [ en-US ] = "Create rotation object" ;
-};
-String RID_SVX_3D_UNDO_BREAK_LATHE
-{
-    Text [ en-US ] = "Split 3D object" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index d90aba0823b7..bb6f9dc0b1d1 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -31,7 +31,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svdview.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 1e8909606cc5..9027efbbe219 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -24,7 +24,7 @@
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>
 #include <svx/fmview.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d1ce99b84dcb..a254f807dffc 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -21,7 +21,6 @@
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
-#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
@@ -29,7 +28,7 @@
 #include "gridcols.hxx"
 #include "svx/dbaexchange.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmgridcl.hxx"
 #include "svx/svxdlg.hxx"
 #include "svx/svxids.hrc"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2a58190fda9c..7581d8da9223 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -21,7 +21,7 @@
 #include <memory>
 #include <sal/macros.h>
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 2b0aa598f9bd..795e329ed08f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -41,14 +41,13 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <comphelper/processfactory.hxx>
-#include <tools/resid.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/fract.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index d9e0a43e4b5c..333907a5b35a 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -20,14 +20,14 @@
 
 #include <sal/macros.h>
 #include "svx/ParseContext.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/dialmgr.hxx>
 
 #include <unotools/syslocale.hxx>
-#include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
+#include "fmstring.hrc"
 
 using namespace svxform;
 using namespace ::connectivity;
@@ -35,10 +35,8 @@ using namespace ::connectivity;
 OSystemParseContext::OSystemParseContext()
     : IParseContext()
 {
-    SolarMutexGuard aGuard;
-    ResStringArray aLocalizedKeywords(ResId(RID_RSC_SQL_INTERNATIONAL, DIALOG_MGR()));
-    for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i)
-        m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i));
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_RSC_SQL_INTERNATIONAL); ++i)
+        m_aLocalizedKeywords.push_back(SvxResId(RID_RSC_SQL_INTERNATIONAL[i]));
 }
 
 OSystemParseContext::~OSystemParseContext()
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index e461c58e9bb7..83ec24fd291d 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -21,7 +21,7 @@
 #include "svx/databaselocationinput.hxx"
 #include "svx/dialmgr.hxx"
 
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 1c2ece9f4891..1efc8de7081a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -27,15 +27,15 @@
 
 #include "fmhelp.hrc"
 #include "bitmaps.hlst"
+#include "fpicker/fpicker.hrc"
 #include <svx/svxids.hrc>
-#include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
+#include <tools/resmgr.hxx>
 #include <svx/xmlexchg.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svtools/svtools.hrc>
 #include "svtools/treelistentry.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -517,7 +517,7 @@ namespace svxform
                 ItemNode* pNode = nullptr;
                 Reference< css::xml::dom::XNode > xParentNode;
                 Reference< XPropertySet > xNewBinding;
-                sal_uInt16 nResId = 0;
+                const char* pResId = nullptr;
                 bool bIsElement = true;
                 if ( DGTInstance == m_eGroup )
                 {
@@ -537,7 +537,7 @@ namespace svxform
                     {
                         try
                         {
-                            nResId = RID_STR_DATANAV_ADD_ELEMENT;
+                            pResId = RID_STR_DATANAV_ADD_ELEMENT;
                             xNewNode = m_xUIHelper->createElement( xParentNode, NEW_ELEMENT );
                         }
                         catch ( Exception& )
@@ -547,7 +547,7 @@ namespace svxform
                     }
                     else
                     {
-                        nResId = RID_STR_DATANAV_ADD_ATTRIBUTE;
+                        pResId = RID_STR_DATANAV_ADD_ATTRIBUTE;
                         bIsElement = false;
                         eType = DITAttribute;
                         try
@@ -605,7 +605,7 @@ namespace svxform
                 {
                     try
                     {
-                        nResId = RID_STR_DATANAV_ADD_BINDING;
+                        pResId = RID_STR_DATANAV_ADD_BINDING;
                         xNewBinding = xModel->createBinding();
                         Reference< XSet > xBindings( xModel->getBindings(), UNO_QUERY );
                         xBindings->insert( makeAny( xNewBinding ) );
@@ -619,7 +619,7 @@ namespace svxform
                 }
 
                 ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper );
-                aDlg->SetText( SvxResId( nResId ) );
+                aDlg->SetText( SvxResId( pResId ) );
                 aDlg->InitText( eType );
                 short nReturn = aDlg->Execute();
                 if (  DGTInstance == m_eGroup )
@@ -693,7 +693,7 @@ namespace svxform
 
                     ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper );
                     DataItemType eType = DITElement;
-                    sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+                    const char* pResId = RID_STR_DATANAV_EDIT_ELEMENT;
                     if ( pNode && pNode->m_xNode.is() )
                     {
                         try
@@ -701,7 +701,7 @@ namespace svxform
                             css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                             if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE )
                             {
-                                nResId = RID_STR_DATANAV_EDIT_ATTRIBUTE;
+                                pResId = RID_STR_DATANAV_EDIT_ATTRIBUTE;
                                 eType = DITAttribute;
                             }
                         }
@@ -712,10 +712,10 @@ namespace svxform
                     }
                     else if ( DGTBinding == m_eGroup )
                     {
-                        nResId = RID_STR_DATANAV_EDIT_BINDING;
+                        pResId = RID_STR_DATANAV_EDIT_BINDING;
                         eType = DITBinding;
                     }
-                    aDlg->SetText( SvxResId( nResId ) );
+                    aDlg->SetText( SvxResId( pResId ) );
                     aDlg->InitText( eType );
                     if ( aDlg->Execute() == RET_OK )
                     {
@@ -951,9 +951,9 @@ namespace svxform
                     DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
                     css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
-                    sal_uInt16 nResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
+                    const char* pResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
                     OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME);
-                    ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo);
+                    ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(pResId), VclMessageType::Question, VclButtonsType::YesNo);
                     OUString sMessText = aQBox->get_primary_text();
                     sMessText = sMessText.replaceFirst(
                         sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) );
@@ -983,7 +983,7 @@ namespace svxform
             {
                 DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
                 bool bSubmission = ( DGTSubmission == m_eGroup );
-                sal_uInt16 nResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING;
+                const char* pResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING;
                 OUString sProperty = bSubmission ? OUString(PN_SUBMISSION_ID) : OUString(PN_BINDING_ID);
                 OUString sSearch = bSubmission ? OUString(SUBMISSIONNAME) : OUString(BINDINGNAME);
                 OUString sName;
@@ -995,7 +995,7 @@ namespace svxform
                 {
                     SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
                 }
-                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(nResId),
+                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(pResId),
                                                           VclMessageType::Question, VclButtonsType::YesNo);
                 OUString sMessText = aQBox->get_primary_text();
                 sMessText = sMessText.replaceFirst( sSearch, sName);
@@ -1314,8 +1314,8 @@ namespace svxform
         }
         if ( DGTInstance == m_eGroup )
         {
-            sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
-            sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+            const char* pResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+            const char* pResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
             if ( pEntry )
             {
                 ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1326,8 +1326,8 @@ namespace svxform
                         css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                         if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE )
                         {
-                            nResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE;
-                            nResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE;
+                            pResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE;
+                            pResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE;
                         }
                     }
                     catch ( Exception& )
@@ -1336,12 +1336,12 @@ namespace svxform
                     }
                 }
             }
-            m_pToolBox->SetItemText( m_nEditId, SvxResId( nResId1 ) );
-            m_pToolBox->SetItemText( m_nRemoveId, SvxResId( nResId2 ) );
+            m_pToolBox->SetItemText( m_nEditId, SvxResId( pResId1 ) );
+            m_pToolBox->SetItemText( m_nRemoveId, SvxResId( pResId2 ) );
             if ( _pMenu )
             {
-                _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( nResId1 ) );
-                _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( nResId2 ) );
+                _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( pResId1 ) );
+                _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( pResId2 ) );
             }
         }
     }
@@ -3354,8 +3354,8 @@ namespace svxform
         m_pURLED->DisableHistory();
         m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
-        // load the filter name from fps_office resource
-        m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office"));
+        // load the filter name from fps resource
+        m_sAllFilterName = Translate::get(STR_FILTERNAME_ALL, Translate::Create("fps", Application::GetSettings().GetUILanguageTag()));
     }
 
     AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
deleted file mode 100644
index cca33a4c7bf1..000000000000
--- a/svx/source/form/datanavi.src
+++ /dev/null
@@ -1,209 +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 "svx/dialogs.hrc"
-#include "svx/fmresids.hrc"
-#include "fmhelp.hrc"
-
-String RID_STR_QRY_REMOVE_MODEL
-{
-    Text [ en-US ] = "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?" ;
-};
-
-String RID_STR_QRY_REMOVE_INSTANCE
-{
-    Text [ en-US ] = "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\nDo you really want to delete this instance?" ;
-};
-
-String RID_STR_QRY_REMOVE_ELEMENT
-{
-    Text [ en-US ] = "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\nDo you really want to delete this element?" ;
-};
-
-String RID_STR_QRY_REMOVE_ATTRIBUTE
-{
-    Text [ en-US ] = "Do you really want to delete the attribute '$ATTRIBUTENAME'?" ;
-};
-
-String RID_STR_QRY_REMOVE_SUBMISSION
-{
-    Text [ en-US ] = "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n\nDo you really want to delete this submission?" ;
-};
-
-String RID_STR_QRY_REMOVE_BINDING
-{
-    Text [ en-US ] = "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n\nDo you really want to delete this binding?" ;
-};
-
-String RID_STR_INVALID_XMLNAME
-{
-    Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a different name." ;
-};
-
-String RID_STR_INVALID_XMLPREFIX
-{
-    Text [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a different prefix." ;
-};
-
-String RID_STR_DOUBLE_MODELNAME
-{
-    Text [ en-US ] = "The name '%1' already exists. Please enter a new name." ;
-};
-
-String RID_STR_EMPTY_SUBMISSIONNAME
-{
-    Text [ en-US ] = "The submission must have a name." ;
-};
-
-String RID_STR_METHOD_POST
-{
-    Text [ en-US ] = "Post" ;
-};
-
-String RID_STR_METHOD_PUT
-{
-    Text [ en-US ] = "Put" ;
-};
-
-String RID_STR_METHOD_GET
-{
-    Text [ en-US ] = "Get" ;
-};
-
-String RID_STR_REPLACE_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-
-String RID_STR_REPLACE_INST
-{
-    Text [ en-US ] = "Instance" ;
-};
-
-String RID_STR_REPLACE_DOC
-{
-    Text [ en-US ] = "Document" ;
-};
-
-String RID_STR_DATANAV_SUBM_BIND
-{
-    Text [ en-US ] = "Binding: " ;
-};
-
-String RID_STR_DATANAV_SUBM_REF
-{
-    Text [ en-US ] = "Reference: " ;
-};
-
-String RID_STR_DATANAV_SUBM_ACTION
-{
-    Text [ en-US ] = "Action: " ;
-};
-
-String RID_STR_DATANAV_SUBM_METHOD
-{
-    Text [ en-US ] = "Method: " ;
-};
-
-String RID_STR_DATANAV_SUBM_REPLACE
-{
-    Text [ en-US ] = "Replace: " ;
-};
-
-String RID_STR_DATANAV_ADD_ELEMENT
-{
-    Text [ en-US ] = "Add Element" ;
-};
-
-String RID_STR_DATANAV_EDIT_ELEMENT
-{
-    Text [ en-US ] = "Edit Element" ;
-};
-
-String RID_STR_DATANAV_REMOVE_ELEMENT
-{
-    Text [ en-US ] = "Delete Element" ;
-};
-
-String RID_STR_DATANAV_ADD_ATTRIBUTE
-{
-    Text [ en-US ] = "Add Attribute" ;
-};
-
-String RID_STR_DATANAV_EDIT_ATTRIBUTE
-{
-    Text [ en-US ] = "Edit Attribute" ;
-};
-
-String RID_STR_DATANAV_REMOVE_ATTRIBUTE
-{
-    Text [ en-US ] = "Delete Attribute" ;
-};
-
-String RID_STR_DATANAV_ADD_BINDING
-{
-    Text [ en-US ] = "Add Binding" ;
-};
-
-String RID_STR_DATANAV_EDIT_BINDING
-{
-    Text [ en-US ] = "Edit Binding" ;
-};
-
-String RID_STR_DATANAV_REMOVE_BINDING
-{
-    Text [ en-US ] = "Delete Binding" ;
-};
-
-String RID_STR_DATANAV_ADD_SUBMISSION
-{
-    Text [ en-US ] = "Add Submission" ;
-};
-
-String RID_STR_DATANAV_EDIT_SUBMISSION
-{
-    Text [ en-US ] = "Edit Submission" ;
-};
-
-String RID_STR_DATANAV_REMOVE_SUBMISSION
-{
-    Text [ en-US ] = "Delete Submission" ;
-};
-
-String RID_STR_ELEMENT
-{
-    Text [ en-US ] = "Element" ;
-};
-
-String RID_STR_ATTRIBUTE
-{
-    Text [ en-US ] = "Attribute" ;
-};
-
-String RID_STR_BINDING
-{
-    Text [ en-US ] = "Binding" ;
-};
-
-String RID_STR_BINDING_EXPR
-{
-    Text [ en-US ] = "Binding expression" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index e6a855e860d4..3eb21268652d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -23,7 +23,7 @@
 #include "fmhelp.hrc"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include <svx/strings.hrc>
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 93f7c5bd2339..c0611b084cd9 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -23,7 +23,7 @@
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmpgeimp.hxx"
@@ -104,7 +104,7 @@ const long STD_MIN_SIZE_Y = 250;
 
 OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
 {
-    sal_uInt16 nClassNameResourceId = 0;
+    const char* pClassNameResourceId = nullptr;
 
     switch ( nClassId )
     {
@@ -112,12 +112,12 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
         {
             Reference< XInterface >  xIFace;
             aUnoObj >>= xIFace;
-            nClassNameResourceId = RID_STR_PROPTITLE_EDIT;
+            pClassNameResourceId = RID_STR_PROPTITLE_EDIT;
             if (xIFace.is())
             {   // we have a chance to check if it's a formatted field model
                 Reference< XServiceInfo >  xInfo(xIFace, UNO_QUERY);
                 if (xInfo.is() && (xInfo->supportsService(FM_SUN_COMPONENT_FORMATTEDFIELD)))
-                    nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
+                    pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
                 else if (!xInfo.is())
                 {
                     // couldn't distinguish between formatted and edit with the service name, so try with the properties
@@ -126,7 +126,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
                     {
                         Reference< XPropertySetInfo >  xPropsInfo = xProps->getPropertySetInfo();
                         if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(FM_PROP_FORMATSSUPPLIER))
-                            nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
+                            pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
                     }
                 }
             }
@@ -134,51 +134,51 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
         break;
 
         case FormComponentType::COMMANDBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break;
         case FormComponentType::RADIOBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break;
         case FormComponentType::CHECKBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break;
         case FormComponentType::LISTBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break;
         case FormComponentType::COMBOBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break;
         case FormComponentType::GROUPBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break;
         case FormComponentType::IMAGEBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
         case FormComponentType::FIXEDTEXT:
-            nClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break;
         case FormComponentType::GRIDCONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break;
         case FormComponentType::FILECONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break;
         case FormComponentType::DATEFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break;
         case FormComponentType::TIMEFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break;
         case FormComponentType::NUMERICFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break;
         case FormComponentType::CURRENCYFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break;
         case FormComponentType::PATTERNFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break;
         case FormComponentType::IMAGECONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break;
         case FormComponentType::HIDDENCONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break;
         case FormComponentType::SCROLLBAR:
-            nClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break;
         case FormComponentType::SPINBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break;
         case FormComponentType::NAVIGATIONBAR:
-            nClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break;
         case FormComponentType::CONTROL:
         default:
-            nClassNameResourceId = RID_STR_CONTROL; break;
+            pClassNameResourceId = RID_STR_CONTROL; break;
     }
 
-    return SvxResId(nClassNameResourceId);
+    return SvxResId(pClassNameResourceId);
 }
 
 FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 39be171835b2..5d0b439e6fd4 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/fmresids.hrc"
+#include <svx/strings.hrc>
 #include "fmexpl.hxx"
 
 #include "fmhelp.hrc"
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index acb25f5758b9..a792f3919b53 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -21,7 +21,6 @@
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
 #include "fmpgeimp.hxx"
-#include "svx/fmresids.hrc"
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 8755138a576d..924010787f16 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -35,9 +35,7 @@
 
 #include <svx/svxids.hrc>
 #include "tbxform.hxx"
-#include <tools/resid.hxx>
 
-#include "svx/fmresids.hrc"
 #include <svx/dialmgr.hxx>
 #include "tabwin.hxx"
 #include "fmexpl.hxx"
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 394dd5a863a0..ef2c1d7a0fd9 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -26,7 +26,6 @@
 
 #include "fmobj.hxx"
 
-#include <svx/fmresids.hrc>
 #include <svx/dialmgr.hxx>
 
 #include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 3da638ebcc24..cd579f0fe24a 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -27,7 +27,7 @@
 #include "fmobj.hxx"
 #include "formcontrolfactory.hxx"
 #include "svx/svditer.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "treevisitor.hxx"
 
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -39,7 +39,6 @@
 #include <svx/fmglob.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmmodel.hxx>
-#include <tools/resid.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/stdtext.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 1d6e48f2ebdf..5d700e69a4d6 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -55,7 +55,6 @@
 
 #include <svx/svxids.hrc>
 
-#include "svx/fmresids.hrc"
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
 #include <svl/eitem.hxx>
@@ -77,7 +76,7 @@
 #include "formtoolbars.hxx"
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "svx/sdrobjectfilter.hxx"
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0e285474c6ad..d463f66b8ffc 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -24,7 +24,6 @@
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -35,7 +34,7 @@
 #include "gridcols.hxx"
 #include "svx/svditer.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/fmmodel.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index cbcc635a3296..cd5e94199c46 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -19,7 +19,6 @@
 
 
 #include <rtl/strbuf.hxx>
-#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
 #include "svx/fmsrccfg.hxx"
 #include <tools/debug.hxx>
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
deleted file mode 100644
index f2b0f1e2963e..000000000000
--- a/svx/source/form/fmstring.src
+++ /dev/null
@@ -1,366 +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 "svx/fmresids.hrc"
-/* Strings for translation */
-String RID_ERR_FIELDREQUIRED
-{
-    Text [ en-US ] = "Input required in field '#'. Please enter a value.";
-};
-String RID_STR_FORMS
-{
-    Text [ en-US ] = "Forms";
-};
-String RID_STR_NO_PROPERTIES
-{
-    Text [ en-US ] = "No control selected";
-};
-String RID_STR_PROPERTIES_CONTROL
-{
-    Text [ en-US ] = "Properties: ";
-};
-String RID_STR_PROPERTIES_FORM
-{
-    Text [ en-US ] = "Form Properties";
-};
-String RID_STR_FMEXPLORER
-{
-    Text [ en-US ] = "Form Navigator";
-};
-String RID_STR_FORM
-{
-    Text [ en-US ] = "Form";
-};
-StringArray RID_RSC_TABWIN_PREFIX
-{
-    ItemList [ en-US ] =
-    {
-        < "Table"; >;
-        < "Query"; >;
-        < "SQL"; >;
-    };
-};
-String RID_STR_STDFORMNAME
-{
-    Text [ en-US ]= "Form";
-};
-String RID_STR_PROPTITLE_HIDDEN
-{
-    Text [ en-US ] = "Hidden Control";
-};
-String RID_STR_CONTROL
-{
-    Text [ en-US ] = "Control";
-};
-String RID_STR_REC_TEXT
-{
-    Text [ en-US ] = "Record";
-};
-String RID_STR_REC_FROM_TEXT
-{
-    Text [ en-US ] = "of";
-};
-String RID_STR_FIELDSELECTION
-{
-    Text [ en-US ] = "Add field:";
-};
-String RID_STR_WRITEERROR
-{
-    Text [ en-US ] = "Error writing data to database";
-};
-
-String RID_STR_SYNTAXERROR
-{
-    Text [ en-US ] = "Syntax error in query expression";
-};
-
-String RID_STR_DELETECONFIRM_RECORD
-{
-    Text [ en-US ] = "You intend to delete 1 record.";
-};
-String RID_STR_DELETECONFIRM_RECORDS
-{
-    Text [ en-US ] = "# records will be deleted.";
-};
-String RID_STR_DELETECONFIRM
-{
-    Text [ en-US ] = "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?";
-};
-
-String RID_STR_NAVIGATIONBAR
-{
-    Text [ en-US ] = "Navigation bar";
-};
-String RID_STR_COLUMN
-{
-    Text [ en-US ] = "Col";
-};
-String RID_STR_UNDO_PROPERTY
-{
-    Text [ en-US ] = "Set property '#'";
-};
-String RID_STR_UNDO_CONTAINER_INSERT
-{
-    Text [ en-US ] = "Insert in container";
-};
-String RID_STR_UNDO_CONTAINER_REMOVE
-{
-    Text [ en-US ] = "Delete #";
-};
-String RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE
-{
-    Text [ en-US ] = "Delete # objects";
-};
-String RID_STR_UNDO_CONTAINER_REPLACE
-{
-    Text [ en-US ] = "Replace a container element";
-};
-String RID_STR_UNDO_MODEL_REPLACE
-{
-    Text [ en-US ] = "Replace Control";
-};
-String RID_STR_PROPTITLE_PUSHBUTTON
-{
-    Text [ en-US ] = "Push 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_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 ";
-};
-String RID_STR_PROPTITLE_SCROLLBAR
-{
-    Text [ en-US ] = "Scrollbar";
-};
-String RID_STR_PROPTITLE_SPINBUTTON
-{
-    Text [ en-US ] = "Spin Button";
-};
-String RID_STR_PROPTITLE_NAVBAR
-{
-    Text [ en-US ] = "Navigation Bar";
-};
-String RID_STR_PROPTITLE_MULTISELECT
-{
-    Text [ en-US ] = "Multiselection";
-};
-String RID_STR_NODATACONTROLS
-{
-    Text [ en-US ] = "No data-related controls in the current form!";
-};
-String RID_STR_POSTFIX_DATE
-{
-    Text [ en-US ] = " (Date)";
-};
-String RID_STR_POSTFIX_TIME
-{
-    Text [ en-US ] = " (Time)";
-};
-String RID_STR_FILTER_NAVIGATOR
-{
-    Text [ en-US ] = "Filter navigator";
-};
-
-String RID_STR_FILTER_FILTER_FOR
-{
-    Text [ en-US ] = "Filter for";
-};
-
-String RID_STR_FILTER_FILTER_OR
-{
-    Text [ en-US ] = "Or";
-};
-
-String RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY
-{
-    Text [ en-US ] = "Valid bound controls which can be used in the table view do not exist in the current form.";
-};
-String RID_STR_AUTOFIELD
-{
-    Text [ en-US ] = "<AutoField>";
-};
-
-StringArray RID_RSC_SQL_INTERNATIONAL
-{
-    ItemList [ en-US ] =
-    {
-        < "LIKE"; >;
-        < "NOT"; >;
-        < "EMPTY"; >;
-        < "TRUE"; >;
-        < "FALSE"; >;
-        < "IS"; >;
-        < "BETWEEN"; >;
-        < "OR"; >;
-        < "AND"; >;
-        < "Average"; >;
-        < "Count"; >;
-        < "Maximum"; >;
-        < "Minimum"; >;
-        < "Sum"; >;
-        < "Every"; >;
-        < "Any"; >;
-        < "Some"; >;
-        < "STDDEV_POP"; >;
-        < "STDDEV_SAMP"; >;
-        < "VAR_SAMP"; >;
-        < "VAR_POP"; >;
-        < "Collect"; >;
-        < "Fusion"; >;
-        < "Intersection"; >;
-    };
-};
-
-String RID_STR_SVT_SQL_SYNTAX_ERROR
-{
-    Text [ en-US ] = "Syntax error in SQL statement";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE
-{
-    Text [ en-US ] = "The value #1 cannot be used with LIKE.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE
-{
-    Text [ en-US ] = "LIKE cannot be used with this field.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID
-{
-    Text [ en-US ] = "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID
-{
-    Text [ en-US ] = "The field cannot be compared with an integer.";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE
-{
-    Text [ en-US ] = "The database does not contain a table named \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY
-{
-    Text [ en-US ] = "The database does contain neither a table nor a query named \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS
-{
-    Text [ en-US ] = "The database already contains a table or view with name \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS
-{
-    Text [ en-US ] = "The database already contains a query with name \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_COLUMN
-{
-    Text [ en-US ] = "The column \"#1\" is unknown in the table \"#2\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID
-{
-    Text [ en-US ] = "The field cannot be compared with a floating point number.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE
-{
-    Text [ en-US ] = "The entered criterion cannot be compared with this field.";
-};
-
-String RID_STR_DATANAVIGATOR
-{
-    Text [ en-US ] = "Data Navigator";
-};
-
-String RID_STR_READONLY_VIEW
-{
-    Text [ en-US ] = " (read-only)";
-};
-
-String RID_STR_ALREADYEXISTOVERWRITE
-{
-    Text [ en-US ] = "The file already exists. Overwrite?" ;
-};
-String RID_STR_OBJECT_LABEL
-{
-    Text [ en-US ] = "#object# label";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 2a8580e6827b..e2b298b99728 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -20,6 +20,7 @@
 #include "fmtextcontroldialogs.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <editeng/eeitem.hxx>
 
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 9d742c2f600b..5d71b38977f6 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -19,7 +19,6 @@
 
 
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index dd149236bfe3..7e3bd870fe77 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -27,7 +27,7 @@
 #include "svx/svditer.hxx"
 #include "fmobj.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmmodel.hxx"
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 019419d204cd..029f2d6cc708 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -23,7 +23,7 @@
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 8224dcc6b79a..728166409e43 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -21,7 +21,7 @@
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
@@ -464,18 +464,18 @@ namespace svxform
                     OUString sInitialLabel;
                     OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel );
 
-                    sal_uInt16 nTitleResId = 0;
+                    const char* pTitleResId = nullptr;
                     switch ( nClassId )
                     {
-                        case FormComponentType::COMMANDBUTTON:  nTitleResId = RID_STR_PROPTITLE_PUSHBUTTON;      break;
-                        case FormComponentType::RADIOBUTTON:    nTitleResId = RID_STR_PROPTITLE_RADIOBUTTON;     break;
-                        case FormComponentType::CHECKBOX:       nTitleResId = RID_STR_PROPTITLE_CHECKBOX;        break;
-                        case FormComponentType::GROUPBOX:       nTitleResId = RID_STR_PROPTITLE_GROUPBOX;        break;
-                        case FormComponentType::FIXEDTEXT:      nTitleResId = RID_STR_PROPTITLE_FIXEDTEXT;       break;
+                        case FormComponentType::COMMANDBUTTON:  pTitleResId = RID_STR_PROPTITLE_PUSHBUTTON;      break;
+                        case FormComponentType::RADIOBUTTON:    pTitleResId = RID_STR_PROPTITLE_RADIOBUTTON;     break;
+                        case FormComponentType::CHECKBOX:       pTitleResId = RID_STR_PROPTITLE_CHECKBOX;        break;
+                        case FormComponentType::GROUPBOX:       pTitleResId = RID_STR_PROPTITLE_GROUPBOX;        break;
+                        case FormComponentType::FIXEDTEXT:      pTitleResId = RID_STR_PROPTITLE_FIXEDTEXT;       break;
                     }
 
-                    if ( nTitleResId )
-                        sInitialLabel = SvxResId(nTitleResId);
+                    if (pTitleResId)
+                        sInitialLabel = SvxResId(pTitleResId);
 
                     _rxControlModel->setPropertyValue(
                         FM_PROP_LABEL,
@@ -644,42 +644,42 @@ namespace svxform
 
     OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
     {
-        sal_uInt16 nResId(0);
+        const char* pResId(nullptr);
 
         switch ( _nClassId )
         {
-            case FormComponentType::COMMANDBUTTON:  nResId = RID_STR_PROPTITLE_PUSHBUTTON;  break;
-            case FormComponentType::RADIOBUTTON:    nResId = RID_STR_PROPTITLE_RADIOBUTTON; break;
-            case FormComponentType::CHECKBOX:       nResId = RID_STR_PROPTITLE_CHECKBOX;    break;
-            case FormComponentType::LISTBOX:        nResId = RID_STR_PROPTITLE_LISTBOX;     break;
-            case FormComponentType::COMBOBOX:       nResId = RID_STR_PROPTITLE_COMBOBOX;    break;
-            case FormComponentType::GROUPBOX:       nResId = RID_STR_PROPTITLE_GROUPBOX;    break;
-            case FormComponentType::IMAGEBUTTON:    nResId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
-            case FormComponentType::FIXEDTEXT:      nResId = RID_STR_PROPTITLE_FIXEDTEXT;   break;
-            case FormComponentType::GRIDCONTROL:    nResId = RID_STR_PROPTITLE_DBGRID;      break;
-            case FormComponentType::FILECONTROL:    nResId = RID_STR_PROPTITLE_FILECONTROL; break;
-            case FormComponentType::DATEFIELD:      nResId = RID_STR_PROPTITLE_DATEFIELD;   break;
-            case FormComponentType::TIMEFIELD:      nResId = RID_STR_PROPTITLE_TIMEFIELD;   break;
-            case FormComponentType::NUMERICFIELD:   nResId = RID_STR_PROPTITLE_NUMERICFIELD;    break;
-            case FormComponentType::CURRENCYFIELD:  nResId = RID_STR_PROPTITLE_CURRENCYFIELD;   break;
-            case FormComponentType::PATTERNFIELD:   nResId = RID_STR_PROPTITLE_PATTERNFIELD;    break;
-            case FormComponentType::IMAGECONTROL:   nResId = RID_STR_PROPTITLE_IMAGECONTROL;    break;
-            case FormComponentType::HIDDENCONTROL:  nResId = RID_STR_PROPTITLE_HIDDEN;      break;
-            case FormComponentType::SCROLLBAR:      nResId = RID_STR_PROPTITLE_SCROLLBAR;   break;
-            case FormComponentType::SPINBUTTON:     nResId = RID_STR_PROPTITLE_SPINBUTTON;  break;
-            case FormComponentType::NAVIGATIONBAR:  nResId = RID_STR_PROPTITLE_NAVBAR;      break;
+            case FormComponentType::COMMANDBUTTON:  pResId = RID_STR_PROPTITLE_PUSHBUTTON;  break;
+            case FormComponentType::RADIOBUTTON:    pResId = RID_STR_PROPTITLE_RADIOBUTTON; break;
+            case FormComponentType::CHECKBOX:       pResId = RID_STR_PROPTITLE_CHECKBOX;    break;
+            case FormComponentType::LISTBOX:        pResId = RID_STR_PROPTITLE_LISTBOX;     break;
+            case FormComponentType::COMBOBOX:       pResId = RID_STR_PROPTITLE_COMBOBOX;    break;
+            case FormComponentType::GROUPBOX:       pResId = RID_STR_PROPTITLE_GROUPBOX;    break;
+            case FormComponentType::IMAGEBUTTON:    pResId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
+            case FormComponentType::FIXEDTEXT:      pResId = RID_STR_PROPTITLE_FIXEDTEXT;   break;
+            case FormComponentType::GRIDCONTROL:    pResId = RID_STR_PROPTITLE_DBGRID;      break;
+            case FormComponentType::FILECONTROL:    pResId = RID_STR_PROPTITLE_FILECONTROL; break;
+            case FormComponentType::DATEFIELD:      pResId = RID_STR_PROPTITLE_DATEFIELD;   break;
+            case FormComponentType::TIMEFIELD:      pResId = RID_STR_PROPTITLE_TIMEFIELD;   break;
+            case FormComponentType::NUMERICFIELD:   pResId = RID_STR_PROPTITLE_NUMERICFIELD;    break;
+            case FormComponentType::CURRENCYFIELD:  pResId = RID_STR_PROPTITLE_CURRENCYFIELD;   break;
+            case FormComponentType::PATTERNFIELD:   pResId = RID_STR_PROPTITLE_PATTERNFIELD;    break;
+            case FormComponentType::IMAGECONTROL:   pResId = RID_STR_PROPTITLE_IMAGECONTROL;    break;
+            case FormComponentType::HIDDENCONTROL:  pResId = RID_STR_PROPTITLE_HIDDEN;      break;
+            case FormComponentType::SCROLLBAR:      pResId = RID_STR_PROPTITLE_SCROLLBAR;   break;
+            case FormComponentType::SPINBUTTON:     pResId = RID_STR_PROPTITLE_SPINBUTTON;  break;
+            case FormComponentType::NAVIGATIONBAR:  pResId = RID_STR_PROPTITLE_NAVBAR;      break;
 
             case FormComponentType::TEXTFIELD:
-                nResId = RID_STR_PROPTITLE_EDIT;
+                pResId = RID_STR_PROPTITLE_EDIT;
                 if ( _rxObject.is() && _rxObject->supportsService( FM_SUN_COMPONENT_FORMATTEDFIELD ) )
-                    nResId = RID_STR_PROPTITLE_FORMATTED;
+                    pResId = RID_STR_PROPTITLE_FORMATTED;
                 break;
 
             default:
-                nResId = RID_STR_CONTROL;     break;
+                pResId = RID_STR_CONTROL;     break;
         }
 
-        return SvxResId(nResId);
+        return SvxResId(pResId);
     }
 
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 37e4bb1b3676..1c8baa032b56 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -26,7 +26,7 @@
 #include "formcontrolling.hxx"
 #include "fmprop.hrc"
 #include "svx/dialmgr.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index a81783be56bd..ef6d24af1eed 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -27,7 +27,6 @@
 
 #include "fmhelp.hrc"
 #include "fmexpl.hxx"
-#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmundo.hxx"
@@ -50,7 +49,7 @@
 #include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include "svtools/treelistentry.hxx"
 
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index f7d6d3673973..b176b61fd5bf 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -31,7 +31,7 @@
 #include "fmundo.hxx"
 #include "fmhelp.hrc"
 #include "fmexpl.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmshimp.hxx"
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index c426054fcb7c..df06fec08719 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -22,6 +22,7 @@
 #include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dbaexchange.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -41,7 +42,6 @@
 
 #include "fmprop.hrc"
 
-#include "svx/fmresids.hrc"
 #include <svx/dialmgr.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/objitem.hxx>
@@ -50,8 +50,8 @@
 #include <sfx2/frame.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include "svtools/treelistentry.hxx"
-#include <tools/resary.hxx>
 #include <vcl/settings.hxx>
+#include "tabwin.hrc"
 
 const long STD_WIN_SIZE_X = 120;
 const long STD_WIN_SIZE_Y = 150;
@@ -332,18 +332,17 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
 
         // set prefix
         OUString  aPrefix;
-        ResStringArray aPrefixes(ResId(RID_RSC_TABWIN_PREFIX, DIALOG_MGR()));
 
         switch (m_nObjectType)
         {
             case CommandType::TABLE:
-                aPrefix = aPrefixes.GetString(0);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[0]);
                 break;
             case CommandType::QUERY:
-                aPrefix = aPrefixes.GetString(1);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[1]);
                 break;
             default:
-                aPrefix = aPrefixes.GetString(2);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[2]);
                 break;
         }
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index b2051704ce33..90b4cae4aa74 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -30,10 +30,10 @@
 
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include "svx/tbxctl.hxx"
 #include "tbxform.hxx"
-#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 8228852dba7d..755c162850b2 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -19,7 +19,7 @@
 
 #include "GalleryControl.hxx"
 
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/galmisc.hxx"
 #include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index b53c711b1061..f690357da5d3 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -32,9 +32,9 @@
 #include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <algorithm>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <svx/svxdlg.hxx>
@@ -121,7 +121,7 @@ GalleryBrowser1::GalleryBrowser1(
     StartListening( *mpGallery );
 
     maNewTheme->SetHelpId( HID_GALLERY_NEWTHEME );
-    maNewTheme->SetText( GalResId(RID_SVXSTR_GALLERY_CREATETHEME));
+    maNewTheme->SetText( SvxResId(RID_SVXSTR_GALLERY_CREATETHEME));
     maNewTheme->SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
     // disable creation of new themes if a writable directory is not available
@@ -604,7 +604,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl, ListBox&, void)
 
 IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void)
 {
-    OUString  aNewTheme( GalResId(RID_SVXSTR_GALLERY_NEWTHEME) );
+    OUString  aNewTheme( SvxResId(RID_SVXSTR_GALLERY_NEWTHEME) );
     OUString  aName( aNewTheme );
     sal_uIntPtr nCount = 0;
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index cff892c4f875..6582b61d7e92 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -34,19 +34,20 @@
 #include <editeng/brushitem.hxx>
 #include "helpid.hrc"
 #include "svx/gallery.hxx"
+#include "svx/svxids.hrc"
 #include "galobj.hxx"
 #include "svx/gallery1.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galctrl.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "GalleryControl.hxx"
 #include "bitmaps.hlst"
 
@@ -402,12 +403,12 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :
     maViewBox->InsertItem( TBX_ID_ICON, aDummyImage );
     maViewBox->SetItemBits( TBX_ID_ICON, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK );
     maViewBox->SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW );
-    maViewBox->SetQuickHelpText( TBX_ID_ICON, GalResId(RID_SVXSTR_GALLERY_ICONVIEW) );
+    maViewBox->SetQuickHelpText( TBX_ID_ICON, SvxResId(RID_SVXSTR_GALLERY_ICONVIEW) );
 
     maViewBox->InsertItem( TBX_ID_LIST, aDummyImage );
     maViewBox->SetItemBits( TBX_ID_LIST, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK );
     maViewBox->SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW );
-    maViewBox->SetQuickHelpText( TBX_ID_LIST, GalResId(RID_SVXSTR_GALLERY_LISTVIEW) );
+    maViewBox->SetQuickHelpText( TBX_ID_LIST, SvxResId(RID_SVXSTR_GALLERY_LISTVIEW) );
 
     MiscHdl( nullptr );
     maViewBox->SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) );
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 9e10d6786228..4e1c02bcccf6 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -24,6 +24,7 @@
 #include <avmedia/mediaplayer.hxx>
 #include "helpid.hrc"
 #include "galbrws2.hxx"
+#include "svx/dialmgr.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "svx/galctrl.hxx"
@@ -31,7 +32,7 @@
 #include <editeng/svxfont.hxx>
 #include "galobj.hxx"
 #include <avmedia/mediawindow.hxx>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
@@ -411,7 +412,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
 
     SetMode( BrowserMode::AUTO_VSCROLL | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::AUTO_HSCROLL );
     SetDataRowHeight( 28 );
-    InsertDataColumn( GALLERY_BRWBOX_TITLE, GalResId(RID_SVXSTR_GALLERY_TITLE), 256  );
+    InsertDataColumn( GALLERY_BRWBOX_TITLE, SvxResId(RID_SVXSTR_GALLERY_TITLE), 256  );
 }
 
 void GalleryListView::InitSettings()
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
deleted file mode 100644
index 5c1275e898e8..000000000000
--- a/svx/source/gallery2/gallery.src
+++ /dev/null
@@ -1,49 +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 <sfx2/sfxsids.hrc>
-#include "helpid.hrc"
-#include "gallery.hrc"
-
-String RID_SVXSTR_GALLERY_FILTER
-{
-    Text [ en-US ] = "Graphics filter" ;
-};
-String RID_SVXSTR_GALLERY_NEWTHEME
-{
-    Text [ en-US ] = "New Theme" ;
-};
-String RID_SVXSTR_GALLERY_CREATETHEME
-{
-    Text [ en-US ] = "New Theme..." ;
-};
-String RID_SVXSTR_GALLERY_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String RID_SVXSTR_GALLERY_ICONVIEW
-{
-    Text [ en-US ] = "Icon View";
-};
-String RID_SVXSTR_GALLERY_LISTVIEW
-{
-    Text [ en-US ] = "Detailed View";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 38abd6a0b9e7..2428e48cb5dc 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -32,13 +32,15 @@
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <tools/vcompat.hxx>
+#include <vcl/lstbox.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
+#include "svx/dialmgr.hxx"
 #include "svx/gallery.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "strings.hxx"
 #include "svx/galmisc.hxx"
 #include "svx/galtheme.hxx"
@@ -58,6 +60,61 @@ static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
     return FileExists( aURL );
 }
 
+const std::pair<sal_uInt16, const char*> aUnlocalized[] =
+{
+    { GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HTMLBUTTONS },
+    { GALLERY_THEME_POWERPOINT, RID_GALLERYSTR_THEME_POWERPOINT },
+    { GALLERY_THEME_USERSOUNDS, RID_GALLERYSTR_THEME_USERSOUNDS },
+    { GALLERY_THEME_DUMMY5, RID_GALLERYSTR_THEME_DUMMY5 },
+    { GALLERY_THEME_RULERS, RID_GALLERYSTR_THEME_RULERS },
+    { GALLERY_THEME_FONTWORK, RID_GALLERYSTR_THEME_FONTWORK },
+    { GALLERY_THEME_FONTWORK_VERTICAL, RID_GALLERYSTR_THEME_FONTWORK_VERTICAL }
+};
+
+const std::pair<sal_uInt16, const char*> aLocalized[] =
+{
+    { RID_GALLERY_THEME_3D, RID_GALLERYSTR_THEME_3D },
+    { RID_GALLERY_THEME_ANIMATIONS, RID_GALLERYSTR_THEME_ANIMATIONS },
+    { RID_GALLERY_THEME_BULLETS, RID_GALLERYSTR_THEME_BULLETS },
+    { RID_GALLERY_THEME_OFFICE, RID_GALLERYSTR_THEME_OFFICE },
+    { RID_GALLERY_THEME_FLAGS, RID_GALLERYSTR_THEME_FLAGS },
+    { RID_GALLERY_THEME_FLOWCHARTS, RID_GALLERYSTR_THEME_FLOWCHARTS },
+    { RID_GALLERY_THEME_EMOTICONS, RID_GALLERYSTR_THEME_EMOTICONS },
+    { RID_GALLERY_THEME_PHOTOS, RID_GALLERYSTR_THEME_PHOTOS },
+    { RID_GALLERY_THEME_BACKGROUNDS, RID_GALLERYSTR_THEME_BACKGROUNDS },
+    { RID_GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HOMEPAGE },
+    { RID_GALLERY_THEME_INTERACTION, RID_GALLERYSTR_THEME_INTERACTION },
+    { RID_GALLERY_THEME_MAPS, RID_GALLERYSTR_THEME_MAPS },
+    { RID_GALLERY_THEME_PEOPLE, RID_GALLERYSTR_THEME_PEOPLE },
+    { RID_GALLERY_THEME_SURFACES, RID_GALLERYSTR_THEME_SURFACES },
+    { RID_GALLERY_THEME_SOUNDS, RID_GALLERYSTR_THEME_SOUNDS },
+    { RID_GALLERY_THEME_SYMBOLS, RID_GALLERYSTR_THEME_SYMBOLS },
+    { RID_GALLERY_THEME_MYTHEME, RID_GALLERYSTR_THEME_MYTHEME },
+
+    { RID_GALLERY_THEME_ARROWS, RID_GALLERYSTR_THEME_ARROWS },
+    { RID_GALLERY_THEME_BALLOONS, RID_GALLERYSTR_THEME_BALLOONS },
+    { RID_GALLERY_THEME_KEYBOARD, RID_GALLERYSTR_THEME_KEYBOARD },
+    { RID_GALLERY_THEME_TIME, RID_GALLERYSTR_THEME_TIME },
+    { RID_GALLERY_THEME_PRESENTATION, RID_GALLERYSTR_THEME_PRESENTATION },
+    { RID_GALLERY_THEME_CALENDAR, RID_GALLERYSTR_THEME_CALENDAR },
+    { RID_GALLERY_THEME_NAVIGATION, RID_GALLERYSTR_THEME_NAVIGATION },
+    { RID_GALLERY_THEME_COMMUNICATION, RID_GALLERYSTR_THEME_COMMUNICATION },
+    { RID_GALLERY_THEME_FINANCES, RID_GALLERYSTR_THEME_FINANCES },
+    { RID_GALLERY_THEME_COMPUTER, RID_GALLERYSTR_THEME_COMPUTER },
+
+    { RID_GALLERY_THEME_CLIMA, RID_GALLERYSTR_THEME_CLIMA },
+    { RID_GALLERY_THEME_EDUCATION, RID_GALLERYSTR_THEME_EDUCATION },
+    { RID_GALLERY_THEME_TROUBLE, RID_GALLERYSTR_THEME_TROUBLE },
+    { RID_GALLERY_THEME_SCREENBEANS, RID_GALLERYSTR_THEME_SCREENBEANS },
+
+    { RID_GALLERY_THEME_COMPUTERS, RID_GALLERYSTR_THEME_COMPUTERS },
+    { RID_GALLERY_THEME_DIAGRAMS, RID_GALLERYSTR_THEME_DIAGRAMS },
+    { RID_GALLERY_THEME_ENVIRONMENT, RID_GALLERYSTR_THEME_ENVIRONMENT },
+    { RID_GALLERY_THEME_FINANCE, RID_GALLERYSTR_THEME_FINANCE },
+    { RID_GALLERY_THEME_TRANSPORT, RID_GALLERYSTR_THEME_TRANSPORT },
+    { RID_GALLERY_THEME_TXTSHAPES, RID_GALLERYSTR_THEME_TXTSHAPES }
+};
+
 GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
                                       const INetURLObject& rBaseURL, const OUString& rName,
                                       bool _bReadOnly, bool _bNewFile,
@@ -104,15 +161,6 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
     {
         //some of these are supposed to *not* be localized
         //so catch them before looking up the resource
-        const std::pair<sal_uInt16, const char*> aUnlocalized[] =
-        {
-            { GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HTMLBUTTONS },
-            { GALLERY_THEME_POWERPOINT, RID_GALLERYSTR_THEME_POWERPOINT },
-            { GALLERY_THEME_USERSOUNDS, RID_GALLERYSTR_THEME_USERSOUNDS },
-            { GALLERY_THEME_DUMMY5, RID_GALLERYSTR_THEME_DUMMY5 },
-            { GALLERY_THEME_FONTWORK, RID_GALLERYSTR_THEME_FONTWORK },
-            { GALLERY_THEME_FONTWORK_VERTICAL, RID_GALLERYSTR_THEME_FONTWORK_VERTICAL }
-        };
         for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i)
         {
             if (aUnlocalized[i].first == nId)
@@ -123,13 +171,31 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
         }
         //look up the rest of the ids in string resources
         if (aName.isEmpty())
-            aName = GalResId(RID_GALLERYSTR_THEME_START + (sal_uInt16) nId);
+        {
+            for (size_t i = 0; i < SAL_N_ELEMENTS(aLocalized); ++i)
+            {
+                if (aLocalized[i].first == nId)
+                {
+                    aName = SvxResId(aLocalized[i].second);
+                    break;
+                }
+            }
+        }
     }
 
     if( aName.isEmpty() )
         aName = rName;
 }
 
+void GalleryTheme::InsertAllThemes( ListBox& rListBox )
+{
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i)
+        rListBox.InsertEntry(OUString::createFromAscii(aUnlocalized[i].second));
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aLocalized); ++i)
+        rListBox.InsertEntry(SvxResId(aLocalized[i].second));
+}
+
 INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL )
 {
     INetURLObject   aURL( rURL );
@@ -473,13 +539,13 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
         switch( nThemeId )
         {
             case GALLERY_THEME_3D:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_3D);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_3D);
                 break;
             case GALLERY_THEME_BULLETS:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_BULLETS);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_BULLETS);
                 break;
             case GALLERY_THEME_HOMEPAGE:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_HOMEPAGE);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_HOMEPAGE);
                 break;
             case GALLERY_THEME_POWERPOINT:
                 aFallback = RID_GALLERYSTR_THEME_POWERPOINT;
@@ -491,19 +557,37 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
                 aFallback = RID_GALLERYSTR_THEME_FONTWORK_VERTICAL;
                 break;
             case GALLERY_THEME_SOUNDS:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_SOUNDS);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_SOUNDS);
+                break;
+            case RID_GALLERY_THEME_ARROWS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_ARROWS);
+                break;
+            case RID_GALLERY_THEME_COMPUTERS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_COMPUTERS);
+                break;
+            case RID_GALLERY_THEME_DIAGRAMS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_DIAGRAMS);
+                break;
+            case RID_GALLERY_THEME_EDUCATION:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_EDUCATION);
+                break;
+            case RID_GALLERY_THEME_ENVIRONMENT:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_ENVIRONMENT);
+                break;
+            case RID_GALLERY_THEME_FINANCE:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_FINANCE);
+                break;
+            case RID_GALLERY_THEME_PEOPLE:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_PEOPLE);
+                break;
+            case RID_GALLERY_THEME_SYMBOLS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_SYMBOLS);
+                break;
+            case RID_GALLERY_THEME_TRANSPORT:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_TRANSPORT);
                 break;
-            case RID_GALLERYSTR_THEME_ARROWS:
-            case RID_GALLERYSTR_THEME_COMPUTERS:
-            case RID_GALLERYSTR_THEME_DIAGRAMS:
-            case RID_GALLERYSTR_THEME_EDUCATION:
-            case RID_GALLERYSTR_THEME_ENVIRONMENT:
-            case RID_GALLERYSTR_THEME_FINANCE:
-            case RID_GALLERYSTR_THEME_PEOPLE:
-            case RID_GALLERYSTR_THEME_SYMBOLS:
-            case RID_GALLERYSTR_THEME_TRANSPORT:
-            case RID_GALLERYSTR_THEME_TXTSHAPES:
-                aFallback = GalResId(static_cast<sal_uInt32>(nThemeId));
+            case RID_GALLERY_THEME_TXTSHAPES:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_TXTSHAPES);
                 break;
             default:
                 break;
@@ -697,7 +781,7 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
 
 bool GalleryThemeEntry::IsDefault() const
 {
-    return ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) );
+    return nId > 0 && nId != GALLERY_THEME_MYTHEME;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 4fac07003ebc..aed3a7169e4e 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -36,12 +36,13 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/svdpage.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/unomodel.hxx>
 #include "codec.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/gallery1.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
@@ -53,19 +54,6 @@
 
 using namespace ::com::sun::star;
 
-ResMgr* GetGalleryResMgr()
-{
-    static ResMgr* pGalleryResMgr = nullptr;
-
-    if( !pGalleryResMgr )
-    {
-        pGalleryResMgr = ResMgr::CreateResMgr(
-            "gal", Application::GetSettings().GetUILanguageTag() );
-    }
-
-    return pGalleryResMgr;
-}
-
 BitmapEx GalleryResGetBitmapEx(const OUString &rId)
 {
     BitmapEx aBmpEx(rId);
@@ -371,7 +359,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
 
             if( mpFilter )
             {
-                aProgressText = GalResId(RID_SVXSTR_GALLERY_FILTER);
+                aProgressText = SvxResId(RID_SVXSTR_GALLERY_FILTER);
 //              mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) );     // sj: progress wasn't working up from SO7 at all
 //                                                                                          // so I am removing this. The gallery progress should
 //                                                                                          // be changed to use the XStatusIndicator instead of XProgressMonitor
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 2f23545905ce..8f5ea2dc91d5 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/classids.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/helpers.hxx>
@@ -33,7 +32,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/fmpage.hxx>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/galmisc.hxx"
 #include "galobj.hxx"
 #include <vcl/svapp.hxx>
@@ -219,33 +218,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
 
 const OUString SgaObject::GetTitle() const
 {
-    OUString aReturnValue( aTitle );
-    if ( !getenv( "GALLERY_SHOW_PRIVATE_TITLE" ) )
-    {
-        if ( comphelper::string::getTokenCount(aReturnValue, ':') == 3 )
-        {
-            OUString    aPrivateInd  ( aReturnValue.getToken( 0, ':' ) );
-            OUString    aResourceName( aReturnValue.getToken( 1, ':' ) );
-            sal_Int32   nResId       ( aReturnValue.getToken( 2, ':' ).toInt32() );
-            if ( aPrivateInd == "private" &&
-                !aResourceName.isEmpty() && ( nResId > 0 ) && ( nResId < 0x10000 ) )
-            {
-                OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8));
-                std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(),
-                            Application::GetSettings().GetUILanguageTag() ));
-                if ( pResMgr )
-                {
-                    ResId aResId( (sal_uInt16)nResId, *pResMgr );
-                    aResId.SetRT( RSC_STRING );
-                    if ( pResMgr->IsAvailable( aResId ) )
-                    {
-                        aReturnValue = aResId;
-                    }
-                }
-            }
-        }
-    }
-    return aReturnValue;
+    return aTitle;
 }
 
 void SgaObject::SetTitle( const OUString& rTitle )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 4b3576eda7b3..d71a2c4b280b 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -39,6 +39,8 @@
 #include <svl/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/svxids.hrc>
 #include <svx/svdograf.hxx>
 #include <svx/fmpage.hxx>
 #include "codec.hxx"
@@ -52,7 +54,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include "galobj.hxx"
 #include <svx/gallery1.hxx>
-#include "galtheme.hrc"
 #include <vcl/lstbox.hxx>
 #include "gallerydrawmodel.hxx"
 #include <memory>
@@ -1521,10 +1522,4 @@ const tools::SvRef<SotStorage>& GalleryTheme::GetSvDrawStorage() const
 
 const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
 
-void GalleryTheme::InsertAllThemes( ListBox& rListBox )
-{
-    for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
-        rListBox.InsertEntry(GalResId(i));
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
deleted file mode 100644
index 8a75bf77f88b..000000000000
--- a/svx/source/gallery2/galtheme.src
+++ /dev/null
@@ -1,207 +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 "gallery.hrc"
-
-String RID_GALLERYSTR_THEME_3D
-{
-    Text [ en-US ] = "3D Effects";
-};
-
-String RID_GALLERYSTR_THEME_ANIMATIONS
-{
-    Text [ en-US ] = "Animations";
-};
-
-String RID_GALLERYSTR_THEME_BULLETS
-{
-    Text [ en-US ] = "Bullets";
-};
-
-String RID_GALLERYSTR_THEME_OFFICE
-{
-    Text [ en-US ] = "Office";
-};
-
-String RID_GALLERYSTR_THEME_FLAGS
-{
-    Text [ en-US ] = "Flags";
-};
-
-String RID_GALLERYSTR_THEME_FLOWCHARTS
-{
-    Text [ en-US ] = "Flow Charts";
-};
-
-String RID_GALLERYSTR_THEME_EMOTICONS
-{
-    Text [ en-US ] = "Emoticons";
-};
-
-String RID_GALLERYSTR_THEME_PHOTOS
-{
-    Text [ en-US ] = "Images";
-};
-
-String RID_GALLERYSTR_THEME_BACKGROUNDS
-{
-    Text [ en-US ] = "Backgrounds";
-};
-
-String RID_GALLERYSTR_THEME_HOMEPAGE
-{
-    Text [ en-US ] = "Homepage";
-};
-
-String RID_GALLERYSTR_THEME_INTERACTION
-{
-    Text [ en-US ] = "Interaction";
-};
-
-String RID_GALLERYSTR_THEME_MAPS
-{
-    Text [ en-US ] = "Maps";
-};
-
-String RID_GALLERYSTR_THEME_PEOPLE
-{
-    Text [ en-US ] = "People";
-};
-
-String RID_GALLERYSTR_THEME_SURFACES
-{
-    Text [ en-US ] = "Surfaces";
-};
-
-String RID_GALLERYSTR_THEME_COMPUTERS
-{
-       Text [ en-US ] = "Computers";
-};
-
-String RID_GALLERYSTR_THEME_DIAGRAMS
-{
-       Text [ en-US ] = "Diagrams";
-};
-
-String RID_GALLERYSTR_THEME_ENVIRONMENT
-{
-       Text [ en-US ] = "Environment";
-};
-
-String RID_GALLERYSTR_THEME_FINANCE
-{
-       Text [ en-US ] = "Finance";
-};
-
-String RID_GALLERYSTR_THEME_TRANSPORT
-{
-       Text [ en-US ] = "Transport";
-};
-
-String RID_GALLERYSTR_THEME_TXTSHAPES
-{
-       Text [ en-US ] = "Textshapes";
-};
-
-String RID_GALLERYSTR_THEME_SOUNDS
-{
-    Text [ en-US ] = "Sounds";
-};
-
-String RID_GALLERYSTR_THEME_SYMBOLS
-{
-    Text [ en-US ] = "Symbols";
-};
-
-String RID_GALLERYSTR_THEME_MYTHEME
-{
-    Text [ en-US ] = "My Theme";
-};
-
-String RID_GALLERYSTR_THEME_ARROWS
-{
-    Text [ en-US ] = "Arrows";
-};
-
-String RID_GALLERYSTR_THEME_BALLOONS
-{
-    Text [ en-US ] = "Balloons";
-};
-
-String RID_GALLERYSTR_THEME_KEYBOARD
-{
-    Text [ en-US ] = "Keyboard";
-};
-
-String RID_GALLERYSTR_THEME_TIME
-{
-    Text [ en-US ] = "Time";
-};
-
-String RID_GALLERYSTR_THEME_PRESENTATION
-{
-    Text [ en-US ] = "Presentation";
-};
-
-String RID_GALLERYSTR_THEME_CALENDAR
-{
-    Text [ en-US ] = "Calendar";
-};
-
-String RID_GALLERYSTR_THEME_NAVIGATION
-{
-    Text [ en-US ] = "Navigation";
-};
-
-String RID_GALLERYSTR_THEME_COMMUNICATION
-{
-    Text [ en-US ] = "Communication";
-};
-
-String RID_GALLERYSTR_THEME_FINANCES
-{
-    Text [ en-US ] = "Finances";
-};
-
-String RID_GALLERYSTR_THEME_COMPUTER
-{
-    Text [ en-US ] = "Computers";
-};
-
-String RID_GALLERYSTR_THEME_CLIMA
-{
-    Text [ en-US ] = "Climate";
-};
-
-String RID_GALLERYSTR_THEME_EDUCATION
-{
-    Text [ en-US ] = "School & University";
-};
-
-String RID_GALLERYSTR_THEME_TROUBLE
-{
-    Text [ en-US ] = "Problem Solving";
-};
-
-String RID_GALLERYSTR_THEME_SCREENBEANS
-{
-    Text [ en-US ] = "Screen Beans";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index a7737003222f..42c870b04a06 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <tools/link.hxx>
-#include <tools/resary.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
@@ -115,9 +114,6 @@ private:
     ::comphelper::OInterfaceContainerHelper2 maFocusListeners;
     ::comphelper::OInterfaceContainerHelper2 maPropertyListeners;
 
-    ResStringArray      maNames;
-    ResStringArray      maDescriptions;
-
     ::comphelper::AccessibleEventNotifier::TClientId    mnClientId;
 };
 
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 0c6793f5bd7c..35d44db70725 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -37,8 +37,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/fmresids.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxdllapi.h>
 #include <rtl/ref.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 1f3b3fa70ddf..5ec8fab16e9c 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -463,7 +463,7 @@ class RecovDocList : public SvSimpleTable
 
 
         /** @short TODO */
-        RecovDocList(SvSimpleTableContainer& rParent, ResMgr& rResMgr);
+        RecovDocList(SvSimpleTableContainer& rParent);
 
         /** @short TODO */
         virtual void InitEntry(SvTreeListEntry* pEntry,
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index e05a1348ebe4..b06b0e482cdd 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -18,7 +18,8 @@
  */
 
 #include <svx/svxitems.hrc>
-
+#include <svx/strings.hrc>
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
 #include <com/sun/star/table/BorderLine.hpp>
@@ -224,19 +225,19 @@ bool SvxMarginItem::GetPresentation
         {
             rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) +
                         GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_TOP) +
                         GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_RIGHT) +
                         GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) +
                         GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             return true;
         }
         default: ; //prevent warning
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index eb5d023a3fd3..fc288024393a 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -21,9 +21,8 @@
 
 #include <utility>
 
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
-
-
 #include <svx/pageitem.hxx>
 #include <editeng/itemtype.hxx>
 #include <svx/unomid.hxx>
@@ -31,12 +30,12 @@
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <svl/itemset.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
 
 using namespace ::com::sun::star;
 
-
 SfxPoolItem* SvxPageItem::CreateDefault() { return new   SvxPageItem(0);}
 
 SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
@@ -86,6 +85,15 @@ inline OUString GetUsageText( const SvxPageUsage eU )
     }
 }
 
+static const char* RID_SVXITEMS_PAGE_NUMS[] =
+{
+    RID_SVXITEMS_PAGE_NUM_CHR_UPPER,
+    RID_SVXITEMS_PAGE_NUM_CHR_LOWER,
+    RID_SVXITEMS_PAGE_NUM_ROM_UPPER,
+    RID_SVXITEMS_PAGE_NUM_ROM_LOWER,
+    RID_SVXITEMS_PAGE_NUM_ARABIC,
+    RID_SVXITEMS_PAGE_NUM_NONE
+};
 
 bool SvxPageItem::GetPresentation
 (
@@ -106,8 +114,8 @@ bool SvxPageItem::GetPresentation
             {
                 rText = aDescName + cpDelimTmp;
             }
-            DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
-            rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
+            assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
+            rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
             if ( bLandscape )
                 rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
             else
@@ -126,8 +134,8 @@ bool SvxPageItem::GetPresentation
             {
                 rText += aDescName + cpDelimTmp;
             }
-            DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
-            rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
+            assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
+            rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
             if ( bLandscape )
                 rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
             else
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 056a9e13dba9..9a3f4127e14b 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -19,10 +19,10 @@
 
 #include "svx/postattr.hxx"
 #include <editeng/itemtype.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
 
-
 SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); }
 SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); }
 SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); }
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 308f70ae5f9b..e3266825c30a 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -19,14 +19,13 @@
 
 #include "svx/svxerr.hxx"
 #include <svx/dialmgr.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include <svx/strings.hrc>
 #include <rtl/instance.hxx>
+#include "svxerr.hrc"
 
 SvxErrorHandler::SvxErrorHandler() :
   SfxErrorHandler(
-      RID_SVXERRCODE, ErrCode(ERRCODE_AREA_SVX), ErrCode(ERRCODE_AREA_SVX_END), &DIALOG_MGR() )
+      getRID_SVXERRCODE(), ErrCode(ERRCODE_AREA_SVX), ErrCode(ERRCODE_AREA_SVX_END), &SvxResLocale())
 {
 }
 
@@ -41,4 +40,14 @@ void SvxErrorHandler::ensure()
     theSvxErrorHandler::get();
 }
 
+const ErrMsgCode* getRID_SVXERRCODE()
+{
+    return RID_SVXERRCODE;
+}
+
+const ErrMsgCode* getRID_SVXERRCTX()
+{
+    return RID_SVXERRCTX;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
deleted file mode 100644
index 614694f6e028..000000000000
--- a/svx/source/items/svxerr.src
+++ /dev/null
@@ -1,98 +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 "svx/svxerr.hxx"
-#include <svx/dialogs.hrc>
-#include <editeng/editerr.hxx>
-
- // Error-Context ---------------------------------------------------------
-StringArray RID_SVXERRCTX
-{
-    ItemList [ en-US ] =
-    {
-        < "$(ERR) executing the thesaurus." ;
-          ERRCTX_SVX_LINGU_THESAURUS&ERRCODE_RES_MASK ; >;
-        < "$(ERR) executing the spellcheck." ;
-          ERRCTX_SVX_LINGU_SPELLING&ERRCODE_RES_MASK ; >;
-        < "$(ERR) executing the hyphenation." ;
-          ERRCTX_SVX_LINGU_HYPHENATION&ERRCODE_RES_MASK ; >;
-        < "$(ERR) creating a dictionary." ;
-          ERRCTX_SVX_LINGU_DICTIONARY&ERRCODE_RES_MASK ; >;
-        < "$(ERR) setting background attribute." ;
-          ERRCTX_SVX_BACKGROUND&ERRCODE_RES_MASK ; >;
-        < "$(ERR) loading the graphics." ;
-          ERRCTX_SVX_IMPORT_GRAPHIC&ERRCODE_RES_MASK ; >;
-    };
-};
-
- // Error-Code ------------------------------------------------------------
-StringArray RID_SVXERRCODE
-{
-    ItemList [ en-US ] =
-    {
-        < "No thesaurus available for the current language.\nPlease check your installation and install the desired language." ;
-          ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options -  Language Settings - Writing Aids'.";
-          ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "Spellcheck is not available." ;
-          ERRCODE_SVX_LINGU_LINGUNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "Hyphenation not available." ;
-          ERRCODE_SVX_LINGU_HYPHENNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "The custom dictionary $(ARG1) cannot be read." ;
-          ERRCODE_SVX_LINGU_DICT_NOTREADABLE&ERRCODE_RES_MASK ; >;
-        < "The custom dictionary $(ARG1) cannot be created." ;
-          ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE&ERRCODE_RES_MASK ; >;
-        < "The graphic $(ARG1) could not be found." ;
-          ERRCODE_SVX_GRAPHIC_NOTREADABLE&ERRCODE_RES_MASK ; >;
-        < "An unlinked graphic could not be loaded.";
-          ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT&ERRCODE_RES_MASK ; >;
-        < "A language has not been fixed for the selected term.";
-          ERRCODE_SVX_LINGU_NOLANGUAGE&ERRCODE_RES_MASK ; >;
-        < "The form layer wasn't loaded as the required IO-services (com.sun.star.io.*) could not be instantiated.";
-          (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-        < "The form layer wasn't written as the required IO services (com.sun.star.io.*) could not be instantiated.";
-          (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while reading the form controls. The form layer has not been loaded.";
-          (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while writing the form controls. The form layer has not been saved.";
-          (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while reading one of the bullets. Not all of the bullets were loaded.";
-          (ERRCODE_SVX_BULLETITEM_NOBULLET | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-
-        < "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead.";
-          ERRCODE_SVX_MODIFIED_VBASIC_STORAGE & ERRCODE_RES_MASK ; >;
-
-        < "The original VBA Basic Code contained in the document will not be saved.";
-          ERRCODE_SVX_VBASIC_STORAGE_EXIST & ERRCODE_RES_MASK ; >;
-
-        < "The password is incorrect. The document cannot be opened.";
-          ERRCODE_SVX_WRONGPASS & ERRCODE_RES_MASK ; >;
-
-        < "The encryption method used in this document is not supported. Only Microsoft Office 97/2000 compatible password encryption is supported.";
-          ERRCODE_SVX_READ_FILTER_CRYPT & ERRCODE_RES_MASK ; >;
-
-        < "The loading of password-encrypted Microsoft PowerPoint presentations is not supported.";
-          ERRCODE_SVX_READ_FILTER_PPOINT & ERRCODE_RES_MASK ; >;
-
-        < "Password protection is not supported when documents are saved in a Microsoft Office format.\nDo you want to save the document without password protection?";
-          ERRCODE_SVX_EXPORT_FILTER_CRYPT & ERRCODE_RES_MASK ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
deleted file mode 100644
index 90ad9c097edc..000000000000
--- a/svx/source/items/svxitems.src
+++ /dev/null
@@ -1,192 +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 "svx/svxitems.hrc"
-#include "svx/svxids.hrc"
-#include <editeng/editids.hrc>
-
-StringArray RID_ATTR_NAMES
-{
-    ItemList [ en-US ] =
-    {
-        < "Scale"           ;           SID_ATTR_ZOOM ; > ;
-        < "Brush"           ;           SID_ATTR_BRUSH ; > ;
-        < "Tab stops"               ;   SID_ATTR_TABSTOP ; > ;
-        < "Character"               ;   SID_ATTR_CHAR ; > ;
-        < "Font"            ;           SID_ATTR_CHAR_FONT ; > ;
-        < "Font posture"        ;       SID_ATTR_CHAR_POSTURE ; > ;
-        < "Font weight"             ;   SID_ATTR_CHAR_WEIGHT ; > ;
-        < "Shadowed"            ;       SID_ATTR_CHAR_SHADOWED ; > ;
-        < "Individual words"        ;   SID_ATTR_CHAR_WORDLINEMODE ; > ;
-        < "Outline"         ;           SID_ATTR_CHAR_CONTOUR ; > ;
-        < "Strikethrough"           ;   SID_ATTR_CHAR_STRIKEOUT ; > ;
-        < "Underline"           ;       SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "Font size"               ;   SID_ATTR_CHAR_FONTHEIGHT ; > ;
-        < "Rel. Font size"      ;       SID_ATTR_CHAR_PROPSIZE ; > ;
-        < "Font color"          ;       SID_ATTR_CHAR_COLOR ; > ;
-        < "Kerning"     ;               SID_ATTR_CHAR_KERNING ; > ;
-        < "Effects"     ;               SID_ATTR_CHAR_CASEMAP ; > ;
-        < "Language";                   SID_ATTR_CHAR_LANGUAGE ; > ;
-        < "Position"        ;           SID_ATTR_CHAR_ESCAPEMENT ; > ;
-        < "Character blinking"    ;     SID_ATTR_CHAR_AUTOKERN ; > ;
-        < "Character set color"       ; SID_ATTR_CHAR_CHARSETCOLOR ; > ;
-        < "Overline"      ;             SID_ATTR_CHAR_OVERLINE ; > ;
-        < "Paragraph"       ;           SID_ATTR_PARA ; > ;
-        < "Alignment"       ;           SID_ATTR_PARA_ADJUST ; > ;
-        < "Line spacing"        ;       SID_ATTR_PARA_LINESPACE ; > ;
-        < "Page Break"      ;           SID_ATTR_PARA_PAGEBREAK ; > ;
-        < "Hyphenation"     ;           SID_ATTR_PARA_HYPHENZONE ; > ;
-        < "Do not split paragraph";     SID_ATTR_PARA_SPLIT ; > ;
-        < "Orphans"     ;               SID_ATTR_PARA_ORPHANS ; > ;
-        < "Widows"      ;               SID_ATTR_PARA_WIDOWS ; > ;
-        < "Paragraph spacing"     ;     SID_ATTR_PARA_ULSPACE ; > ;
-        < "Paragraph indent"      ;     SID_ATTR_PARA_LRSPACE ; > ;
-        < "Indent"      ;               SID_ATTR_LRSPACE ; > ;
-        < "Spacing"     ;               SID_ATTR_ULSPACE ; > ;
-        < "Page"        ;               SID_ATTR_PAGE ; > ;
-        < "Page Style"      ;           SID_ATTR_PARA_MODEL ; > ;
-        < "Keep with next paragraph";   SID_ATTR_PARA_KEEP ; > ;
-        < "Blinking"        ;           SID_ATTR_FLASH ; > ;
-        < "Register-true"       ;       SID_ATTR_PARA_REGISTER ; > ;
-        < "Character background"    ;   SID_ATTR_BRUSH_CHAR ; > ;
-        < "Asian font"      ;           SID_ATTR_CHAR_CJK_FONT ; > ;
-        < "Size of Asian font"      ;   SID_ATTR_CHAR_CJK_FONTHEIGHT ; > ;
-        < "Language of Asian font";     SID_ATTR_CHAR_CJK_LANGUAGE ; > ;
-        < "Posture of Asian font"   ;   SID_ATTR_CHAR_CJK_POSTURE ; > ;
-        < "Weight of Asian font"    ;   SID_ATTR_CHAR_CJK_WEIGHT ; > ;
-        < "CTL"     ;                   SID_ATTR_CHAR_CTL_FONT ; > ;
-        < "Size of complex scripts" ;   SID_ATTR_CHAR_CTL_FONTHEIGHT ; > ;
-        < "Language of complex scripts";SID_ATTR_CHAR_CTL_LANGUAGE ; > ;
-        < "Posture of complex scripts"; SID_ATTR_CHAR_CTL_POSTURE ; > ;
-        < "Weight of complex scripts";  SID_ATTR_CHAR_CTL_WEIGHT ; > ;
-        < "Double-lined"        ;       SID_ATTR_CHAR_TWO_LINES ; > ;
-        < "Emphasis mark"       ;       SID_ATTR_CHAR_EMPHASISMARK ; > ;
-        < "Text spacing"        ;       SID_ATTR_PARA_SCRIPTSPACE ; > ;
-        < "Hanging punctuation"     ;   SID_ATTR_PARA_HANGPUNCTUATION ; > ;
-        < "Forbidden characters"    ;   SID_ATTR_PARA_FORBIDDEN_RULES ; > ;
-        < "Rotation"        ;           SID_ATTR_CHAR_ROTATED ; > ;
-        < "Character scaling"       ;   SID_ATTR_CHAR_SCALEWIDTH ; > ;
-        < "Relief"      ;               SID_ATTR_CHAR_RELIEF ; > ;
-        < "Vertical text alignment" ;   SID_PARA_VERTALIGN ; > ;
-    };
-};
-
-// end enum ColorName -----------------------------------------------------------
-String RID_SVXITEMS_ORI_STANDARD
-{
-    Text [ en-US ] = "Default orientation" ;
-};
-String RID_SVXITEMS_ORI_TOPBOTTOM
-{
-    Text [ en-US ] = "From top to bottom" ;
-};
-String RID_SVXITEMS_ORI_BOTTOMTOP
-{
-    Text [ en-US ] = "Bottom to Top" ;
-};
-String RID_SVXITEMS_ORI_STACKED
-{
-    Text [ en-US ] = "Stacked" ;
-};
-String RID_SVXITEMS_MARGIN_LEFT
-{
-    Text [ en-US ] = "Left margin: " ;
-};
-String RID_SVXITEMS_MARGIN_TOP
-{
-    Text [ en-US ] = "Top margin: " ;
-};
-String RID_SVXITEMS_MARGIN_RIGHT
-{
-    Text [ en-US ] = "Right margin: " ;
-};
-String RID_SVXITEMS_MARGIN_BOTTOM
-{
-    Text [ en-US ] = "Bottom margin: " ;
-};
-String RID_SVXITEMS_PAGE_COMPLETE
-{
-    Text [ en-US ] = "Page Description: " ;
-};
-String RID_SVXITEMS_PAGE_NUM_CHR_UPPER
-{
-    Text [ en-US ] = "Capitals" ;
-};
-String RID_SVXITEMS_PAGE_NUM_CHR_LOWER
-{
-    Text [ en-US ] = "Lowercase" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ROM_UPPER
-{
-    Text [ en-US ] = "Uppercase Roman" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ROM_LOWER
-{
-    Text [ en-US ] = "Lowercase Roman" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ARABIC
-{
-    Text [ en-US ] = "Arabic" ;
-};
-String RID_SVXITEMS_PAGE_NUM_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXITEMS_PAGE_LAND_TRUE
-{
-    Text [ en-US ] = "Landscape" ;
-};
-String RID_SVXITEMS_PAGE_LAND_FALSE
-{
-    Text [ en-US ] = "Portrait" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_LEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_RIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_ALL
-{
-    Text [ en-US ] = "All" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_MIRROR
-{
-    Text [ en-US ] = "Mirrored" ;
-};
-String RID_SVXITEMS_AUTHOR_COMPLETE
-{
-    Text [ en-US ] = "Author: " ;
-};
-String RID_SVXITEMS_DATE_COMPLETE
-{
-    Text [ en-US ] = "Date: " ;
-};
-String RID_SVXITEMS_TEXT_COMPLETE
-{
-    Text [ en-US ] = "Text: " ;
-};
-String RID_SVXITEMS_BRUSH_CHAR
-{
-    Text [ en-US ] = "Character background";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 505aca582944..ce0018aad9d1 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -29,7 +29,7 @@
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index cbbc44efb654..d40a0f30e544 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -36,7 +36,7 @@
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <vcl/lazydelete.hxx>
 #include <vcl/settings.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svdglob.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index b94b59be08fb..74c9f45beb9e 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "EmptyPanel.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/dialmgr.hxx"
 
 namespace svx { namespace sidebar {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 10f3798e5bdb..39c98404b0cc 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -19,7 +19,8 @@
 
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <AreaPropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 464189990860..186e0f9b6c48 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -20,7 +20,8 @@
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/sidebar/AreaPropertyPanelBase.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index a286dd1a4902..44bfc5aa11cb 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -18,7 +18,8 @@
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <GraphicPropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 85bb09bf8083..a2285eb6ad04 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -18,7 +18,8 @@
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <LinePropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 191600c4ca16..3f15d5e85402 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -20,7 +20,8 @@
 #include <memory>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 408619a6d364..b811fe90dc4f 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -19,7 +19,7 @@
 #include <svx/sidebar/LineWidthPopup.hxx>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/xlnwtit.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 6a81478a0c9b..e21778be3705 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -31,7 +31,7 @@
 #include <svx/gallery.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
 
@@ -319,12 +319,6 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
     if ( pFont )
         pActualBullets[nIndex]->aFont = *pFont;
     pActualBullets[nIndex]->bIsCustomized = true;
-
-    OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
-    OUString aReplace = "%LIST_NUM";
-    OUString sNUM = OUString::number( nIndex + 1 );
-    aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM);
-    pActualBullets[nIndex]->sDescription = aStrFromRES;
 }
 
 void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool /*isDefault*/, bool isResetSize)
@@ -391,6 +385,18 @@ NumberingTypeMgr::~NumberingTypeMgr()
 {
 }
 
+static const char* RID_SVXSTR_SINGLENUM_DESCRIPTIONS[] =
+{
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_0,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_1,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_2,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_3,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_4,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_5,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_6,
+    RID_SVXSTR_SINGLENUM_DESCRIPTION_7
+};
+
 class theNumberingTypeMgr : public rtl::Static<NumberingTypeMgr, theNumberingTypeMgr> {};
 
 NumberingTypeMgr& NumberingTypeMgr::GetInstance()
@@ -418,7 +424,7 @@ void NumberingTypeMgr::Init()
             NumberSettings_Impl* pNumEntry = new NumberSettings_Impl;
             pNumEntry->pNumSetting = pNew;
             if ( i < 8 )
-                pNumEntry->sDescription = SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
+                pNumEntry->sDescription = SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]);
             maNumberSettingsArr.push_back(std::shared_ptr<NumberSettings_Impl>(pNumEntry));
         }
     }
@@ -489,12 +495,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_
     ApplyNumRule(aTmpRule1,nIndex,mLevel,true);
     ApplyNumRule(aTmpRule2,nIndex,mLevel);
     if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false;
-    if (_pSet->bIsCustomized) {
-        OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION);
-        OUString sNUM = OUString::number( nIndex + 1 );
-        aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
-        _pSet->sDescription = aStrFromRES;
-    } else {
+    if (!_pSet->bIsCustomized) {
         _pSet->sDescription = GetDescription(nIndex,true);
     }
     ImplStore("standard.syb");
@@ -752,12 +753,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
     ApplyNumRule(aTmpRule1,nIndex,mLevel,true);
     ApplyNumRule(aTmpRule2,nIndex,mLevel);
     if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false;
-    if (pItemArr->bIsCustomized) {
-        OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION);
-        OUString sNUM = OUString::number( nIndex + 1 );
-        aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
-        pItemArr->sDescription = aStrFromRES;
-    } else {
+    if (!pItemArr->bIsCustomized) {
         pItemArr->sDescription = GetDescription(nIndex,true);
     }
     ImplStore("standard.syc");
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 293969610614..86c17ccf8198 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "ParaPropertyPanel.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/dispatch.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 3b76365ed6ff..d892d8d4d9e5 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -20,7 +20,8 @@
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include "PosSizePropertyPanel.hxx"
 #include <svx/sidebar/SidebarDialControl.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 0766550e29cd..eacdf09ad734 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -11,7 +11,8 @@
 #include <comphelper/string.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index b499c686bb28..e0bfe2d2fc43 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -19,7 +19,7 @@
 #include <sfx2/bindings.hxx>
 #include "TextCharacterSpacingControl.hxx"
 #include "TextPropertyPanel.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <unotools/viewoptions.hxx>
 #include <editeng/kernitem.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 6c1df6a2d9bd..ed8a51bf48d1 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -18,7 +18,7 @@
  */
 #include "TextUnderlineControl.hxx"
 #include "TextPropertyPanel.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 1f8fe0d9569a..8330edccb1b0 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 62f7220959e6..42bdbe3718e0 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "svx/insctrl.hxx"
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 1ace4873094d..d152013e86c0 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -24,7 +24,7 @@
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/modctrl.hxx>
 #include <svx/dialmgr.hxx>
 
@@ -89,8 +89,8 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
 
     _repaint();
 
-    int nResId = modified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO;
-    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(nResId));
+    const char* pResId = modified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO;
+    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(pResId));
 
     if ( start )
         mxImpl->maIdle.Start();
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 1999b5a1465c..afa7e6a6da54 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -41,7 +41,8 @@
 #include "svx/dlgutil.hxx"
 #include "stbctrls.h"
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "bitmaps.hlst"
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index fd73a7418b8a..79e7237c350c 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -26,7 +26,7 @@
 
 #include <svx/selctrl.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "stbctrls.h"
 #include "bitmaps.hlst"
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
deleted file mode 100644
index 7c58b4bbc9a2..000000000000
--- a/svx/source/stbctrls/stbctrls.src
+++ /dev/null
@@ -1,153 +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 <svx/dialogs.hrc>
-#include "helpid.hrc"
-#include "stbctrls.h"
-
- // Strings ---------------------------------------------------------------
-String RID_SVXSTR_INSERT_HELPTEXT
-{
-    Text [ en-US ] = "Insert mode. Click to change to overwrite mode." ;
-};
-String RID_SVXSTR_OVERWRITE_HELPTEXT
-{
-    Text [ en-US ] = "Overwrite mode. Click to change to insert mode." ;
-};
-String RID_SVXSTR_OVERWRITE_TEXT
-{
-    Text [ x-comment ] = "To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'." ;
-    Text [ en-US ] = "Overwrite" ;
-};
-
-String RID_SVXSTR_XMLSEC_SIG_OK
-{
-    Text [ en-US ] = "Digital Signature: The document signature is OK.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
-{
-    Text [ en-US ] = "Digital Signature: The document signature is OK, but the certificates could not be validated.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_NOT_OK
-{
-    Text [ en-US ] = "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document.";
-};
-
-String RID_SVXSTR_XMLSEC_NO_SIG
-{
-    Text [ en-US ] = "Digital Signature: The document is not signed.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG
-{
-    Text [ en-US ] = "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed.";
-};
-
-String RID_SVXSTR_DOC_MODIFIED_YES
-{
-    Text [ en-US ] = "The document has been modified. Click to save the document.";
-};
-
-String RID_SVXSTR_DOC_MODIFIED_NO
-{
-    Text [ en-US ] = "The document has not been modified since the last save.";
-};
-
-String RID_SVXSTR_DOC_LOAD
-{
-    Text [ en-US ] = "Loading document...";
-};
-
-String RID_SVXSTR_FIT_SLIDE
-{
-    Text [ en-US ] = "Fit slide to current window.";
-};
-
-String RID_SVXSTR_WARN_MISSING_SMARTART
-{
-    Text [ en-US ] = "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue.";
-};
-
-String RID_SVXSTR_ZOOMTOOL_HINT
-{
-    Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to open Zoom dialog.";
-};
-
-String RID_SVXSTR_ZOOM_IN
-{
-    Text [ en-US ] = "Zoom In";
-};
-
-String RID_SVXSTR_ZOOM_OUT
-{
-    Text [ en-US ] = "Zoom Out";
-};
-
-String RID_SVXSTR_ZOOM_25
-{
-    Text [ en-US ] = "25%" ;
-};
-
-String RID_SVXSTR_ZOOM_50
-{
-    Text [ en-US ] = "50%" ;
-};
-
-String RID_SVXSTR_ZOOM_75
-{
-    Text [ en-US ] = "75%" ;
-};
-
-String RID_SVXSTR_ZOOM_100
-{
-    Text [ en-US ] = "100%" ;
-};
-
-String RID_SVXSTR_ZOOM_150
-{
-    Text [ en-US ] = "150%" ;
-};
-
-String RID_SVXSTR_ZOOM_200
-{
-    Text [ en-US ] = "200%" ;
-};
-
-String RID_SVXSTR_ZOOM_WHOLE_PAGE
-{
-    Text [ en-US ] = "Entire Page" ;
-};
-
-String RID_SVXSTR_ZOOM_PAGE_WIDTH
-{
-    Text [ en-US ] = "Page Width" ;
-};
-
-String RID_SVXSTR_ZOOM_OPTIMAL_VIEW
-{
-    Text [ en-US ] = "Optimal View" ;
-};
-
-String RID_SIDEBAR_EMPTY_PANEL_TEXT
-{
-    Text [ en-US ] = "Properties for the task that you are performing are not available for the current selection" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index f294a945726d..0d7f9035db7e 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -33,7 +33,7 @@
 
 #include <svl/eitem.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
@@ -86,17 +86,17 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons
 
     GetStatusBar().SetItemText( GetId(), "" );    // necessary ?
 
-    sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+    const char* pResId = RID_SVXSTR_XMLSEC_NO_SIG;
     if ( mpImpl->mnState == SignatureState::OK )
-        nResId = RID_SVXSTR_XMLSEC_SIG_OK;
+        pResId = RID_SVXSTR_XMLSEC_SIG_OK;
     else if ( mpImpl->mnState == SignatureState::BROKEN )
-        nResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
+        pResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
     else if ( mpImpl->mnState == SignatureState::NOTVALIDATED )
-        nResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
+        pResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
     else if ( mpImpl->mnState == SignatureState::PARTIAL_OK )
-        nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
+        pResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
 
-    GetStatusBar().SetQuickHelpText( GetId(), SvxResId( nResId ) );
+    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(pResId));
 }
 
 void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index ea1059862330..74474e78a71f 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <svx/zoomctrl.hxx>
 #include <svx/zoomslideritem.hxx>
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index be0b0721f260..d36b1eb366c5 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -25,7 +25,7 @@
 #include <vcl/settings.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <basegfx/tools/zoomtools.hxx>
 #include "bitmaps.hlst"
 
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index c04c02de8a10..9ca98e9f7d2e 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -20,46 +20,46 @@
 
 #include "svx/ActionDescriptionProvider.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const OUString& rObjectName )
 {
-    sal_uInt16 nResID=0;
+    const char* pResID = nullptr;
     switch( eActionType )
     {
     case ActionType::Insert:
-        nResID=STR_UndoInsertObj;
+        pResID=STR_UndoInsertObj;
         break;
     case ActionType::Delete:
-        nResID= STR_EditDelete;
+        pResID= STR_EditDelete;
         break;
     case ActionType::Move:
-        nResID= STR_EditMove;
+        pResID= STR_EditMove;
         break;
     case ActionType::Resize:
-        nResID= STR_EditResize;
+        pResID= STR_EditResize;
         break;
     case ActionType::Rotate:
-        nResID= STR_EditRotate;
+        pResID= STR_EditRotate;
         break;
     case ActionType::Format:
-        nResID= STR_EditSetAttributes;
+        pResID= STR_EditSetAttributes;
         break;
     case ActionType::MoveToTop:
-        nResID= STR_EditMovToTop;
+        pResID= STR_EditMovToTop;
         break;
     case ActionType::MoveToBottom:
-        nResID= STR_EditMovToBtm;
+        pResID= STR_EditMovToBtm;
         break;
     case ActionType::PosSize:
-        nResID = STR_EditPosSize;
+        pResID = STR_EditPosSize;
         break;
     }
-    if(!nResID)
+    if (!pResID)
         return OUString();
 
-    OUString aStr(ImpGetResStr(nResID));
+    OUString aStr(ImpGetResStr(pResID));
     return aStr.replaceAll("%1", rObjectName);
 }
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 46ae6858ec01..9c55222fd98f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -48,8 +48,9 @@
 #include <vcl/settings.hxx>
 
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
+#include <svx/dialmgr.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdattr.hxx>
@@ -384,226 +385,225 @@ bool SdrItemPool::GetPresentation(
 
 void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName)
 {
-    ResMgr* pResMgr = ImpGetResMgr();
-    sal_uInt16  nResId = SIP_UNKNOWN_ATTR;
+    const char* pResId = SIP_UNKNOWN_ATTR;
 
     switch (nWhich)
     {
-        case XATTR_LINESTYLE        : nResId = SIP_XA_LINESTYLE;break;
-        case XATTR_LINEDASH         : nResId = SIP_XA_LINEDASH;break;
-        case XATTR_LINEWIDTH        : nResId = SIP_XA_LINEWIDTH;break;
-        case XATTR_LINECOLOR        : nResId = SIP_XA_LINECOLOR;break;
-        case XATTR_LINESTART        : nResId = SIP_XA_LINESTART;break;
-        case XATTR_LINEEND          : nResId = SIP_XA_LINEEND;break;
-        case XATTR_LINESTARTWIDTH   : nResId = SIP_XA_LINESTARTWIDTH;break;
-        case XATTR_LINEENDWIDTH     : nResId = SIP_XA_LINEENDWIDTH;break;
-        case XATTR_LINESTARTCENTER  : nResId = SIP_XA_LINESTARTCENTER;break;
-        case XATTR_LINEENDCENTER    : nResId = SIP_XA_LINEENDCENTER;break;
-        case XATTR_LINETRANSPARENCE : nResId = SIP_XA_LINETRANSPARENCE;break;
-        case XATTR_LINEJOINT        : nResId = SIP_XA_LINEJOINT;break;
-        case XATTRSET_LINE          : nResId = SIP_XATTRSET_LINE;break;
-
-        case XATTR_FILLSTYLE            : nResId = SIP_XA_FILLSTYLE;break;
-        case XATTR_FILLCOLOR            : nResId = SIP_XA_FILLCOLOR;break;
-        case XATTR_FILLGRADIENT         : nResId = SIP_XA_FILLGRADIENT;break;
-        case XATTR_FILLHATCH            : nResId = SIP_XA_FILLHATCH;break;
-        case XATTR_FILLBITMAP           : nResId = SIP_XA_FILLBITMAP;break;
-        case XATTR_FILLTRANSPARENCE     : nResId = SIP_XA_FILLTRANSPARENCE;break;
-        case XATTR_GRADIENTSTEPCOUNT    : nResId = SIP_XA_GRADIENTSTEPCOUNT;break;
-        case XATTR_FILLBMP_TILE         : nResId = SIP_XA_FILLBMP_TILE;break;
-        case XATTR_FILLBMP_POS          : nResId = SIP_XA_FILLBMP_POS;break;
-        case XATTR_FILLBMP_SIZEX        : nResId = SIP_XA_FILLBMP_SIZEX;break;
-        case XATTR_FILLBMP_SIZEY        : nResId = SIP_XA_FILLBMP_SIZEY;break;
-        case XATTR_FILLFLOATTRANSPARENCE: nResId = SIP_XA_FILLFLOATTRANSPARENCE;break;
-        case XATTR_SECONDARYFILLCOLOR   : nResId = SIP_XA_SECONDARYFILLCOLOR;break;
-        case XATTR_FILLBMP_SIZELOG      : nResId = SIP_XA_FILLBMP_SIZELOG;break;
-        case XATTR_FILLBMP_TILEOFFSETX  : nResId = SIP_XA_FILLBMP_TILEOFFSETX;break;
-        case XATTR_FILLBMP_TILEOFFSETY  : nResId = SIP_XA_FILLBMP_TILEOFFSETY;break;
-        case XATTR_FILLBMP_STRETCH      : nResId = SIP_XA_FILLBMP_STRETCH;break;
-        case XATTR_FILLBMP_POSOFFSETX   : nResId = SIP_XA_FILLBMP_POSOFFSETX;break;
-        case XATTR_FILLBMP_POSOFFSETY   : nResId = SIP_XA_FILLBMP_POSOFFSETY;break;
-        case XATTR_FILLBACKGROUND       : nResId = SIP_XA_FILLBACKGROUND;break;
-
-        case XATTRSET_FILL             : nResId = SIP_XATTRSET_FILL;break;
-
-        case XATTR_FORMTXTSTYLE     : nResId = SIP_XA_FORMTXTSTYLE;break;
-        case XATTR_FORMTXTADJUST    : nResId = SIP_XA_FORMTXTADJUST;break;
-        case XATTR_FORMTXTDISTANCE  : nResId = SIP_XA_FORMTXTDISTANCE;break;
-        case XATTR_FORMTXTSTART     : nResId = SIP_XA_FORMTXTSTART;break;
-        case XATTR_FORMTXTMIRROR    : nResId = SIP_XA_FORMTXTMIRROR;break;
-        case XATTR_FORMTXTOUTLINE   : nResId = SIP_XA_FORMTXTOUTLINE;break;
-        case XATTR_FORMTXTSHADOW    : nResId = SIP_XA_FORMTXTSHADOW;break;
-        case XATTR_FORMTXTSHDWCOLOR : nResId = SIP_XA_FORMTXTSHDWCOLOR;break;
-        case XATTR_FORMTXTSHDWXVAL  : nResId = SIP_XA_FORMTXTSHDWXVAL;break;
-        case XATTR_FORMTXTSHDWYVAL  : nResId = SIP_XA_FORMTXTSHDWYVAL;break;
-        case XATTR_FORMTXTHIDEFORM  : nResId = SIP_XA_FORMTXTHIDEFORM;break;
-        case XATTR_FORMTXTSHDWTRANSP: nResId = SIP_XA_FORMTXTSHDWTRANSP;break;
-
-        case SDRATTR_SHADOW            : nResId = SIP_SA_SHADOW;break;
-        case SDRATTR_SHADOWCOLOR       : nResId = SIP_SA_SHADOWCOLOR;break;
-        case SDRATTR_SHADOWXDIST       : nResId = SIP_SA_SHADOWXDIST;break;
-        case SDRATTR_SHADOWYDIST       : nResId = SIP_SA_SHADOWYDIST;break;
-        case SDRATTR_SHADOWTRANSPARENCE: nResId = SIP_SA_SHADOWTRANSPARENCE;break;
-        case SDRATTR_SHADOW3D          : nResId = SIP_SA_SHADOW3D;break;
-        case SDRATTR_SHADOWPERSP       : nResId = SIP_SA_SHADOWPERSP;break;
-
-        case SDRATTR_CAPTIONTYPE      : nResId = SIP_SA_CAPTIONTYPE;break;
-        case SDRATTR_CAPTIONFIXEDANGLE: nResId = SIP_SA_CAPTIONFIXEDANGLE;break;
-        case SDRATTR_CAPTIONANGLE     : nResId = SIP_SA_CAPTIONANGLE;break;
-        case SDRATTR_CAPTIONGAP       : nResId = SIP_SA_CAPTIONGAP;break;
-        case SDRATTR_CAPTIONESCDIR    : nResId = SIP_SA_CAPTIONESCDIR;break;
-        case SDRATTR_CAPTIONESCISREL  : nResId = SIP_SA_CAPTIONESCISREL;break;
-        case SDRATTR_CAPTIONESCREL    : nResId = SIP_SA_CAPTIONESCREL;break;
-        case SDRATTR_CAPTIONESCABS    : nResId = SIP_SA_CAPTIONESCABS;break;
-        case SDRATTR_CAPTIONLINELEN   : nResId = SIP_SA_CAPTIONLINELEN;break;
-        case SDRATTR_CAPTIONFITLINELEN: nResId = SIP_SA_CAPTIONFITLINELEN;break;
-
-        case SDRATTR_ECKENRADIUS            : nResId = SIP_SA_ECKENRADIUS;break;
-        case SDRATTR_TEXT_MINFRAMEHEIGHT    : nResId = SIP_SA_TEXT_MINFRAMEHEIGHT;break;
-        case SDRATTR_TEXT_AUTOGROWHEIGHT    : nResId = SIP_SA_TEXT_AUTOGROWHEIGHT;break;
-        case SDRATTR_TEXT_FITTOSIZE         : nResId = SIP_SA_TEXT_FITTOSIZE;break;
-        case SDRATTR_TEXT_LEFTDIST          : nResId = SIP_SA_TEXT_LEFTDIST;break;
-        case SDRATTR_TEXT_RIGHTDIST         : nResId = SIP_SA_TEXT_RIGHTDIST;break;
-        case SDRATTR_TEXT_UPPERDIST         : nResId = SIP_SA_TEXT_UPPERDIST;break;
-        case SDRATTR_TEXT_LOWERDIST         : nResId = SIP_SA_TEXT_LOWERDIST;break;
-        case SDRATTR_TEXT_VERTADJUST        : nResId = SIP_SA_TEXT_VERTADJUST;break;
-        case SDRATTR_TEXT_MAXFRAMEHEIGHT    : nResId = SIP_SA_TEXT_MAXFRAMEHEIGHT;break;
-        case SDRATTR_TEXT_MINFRAMEWIDTH     : nResId = SIP_SA_TEXT_MINFRAMEWIDTH;break;
-        case SDRATTR_TEXT_MAXFRAMEWIDTH     : nResId = SIP_SA_TEXT_MAXFRAMEWIDTH;break;
-        case SDRATTR_TEXT_AUTOGROWWIDTH     : nResId = SIP_SA_TEXT_AUTOGROWWIDTH;break;
-        case SDRATTR_TEXT_HORZADJUST        : nResId = SIP_SA_TEXT_HORZADJUST;break;
-        case SDRATTR_TEXT_ANIKIND           : nResId = SIP_SA_TEXT_ANIKIND;break;
-        case SDRATTR_TEXT_ANIDIRECTION      : nResId = SIP_SA_TEXT_ANIDIRECTION;break;
-        case SDRATTR_TEXT_ANISTARTINSIDE    : nResId = SIP_SA_TEXT_ANISTARTINSIDE;break;
-        case SDRATTR_TEXT_ANISTOPINSIDE     : nResId = SIP_SA_TEXT_ANISTOPINSIDE;break;
-        case SDRATTR_TEXT_ANICOUNT          : nResId = SIP_SA_TEXT_ANICOUNT;break;
-        case SDRATTR_TEXT_ANIDELAY          : nResId = SIP_SA_TEXT_ANIDELAY;break;
-        case SDRATTR_TEXT_ANIAMOUNT         : nResId = SIP_SA_TEXT_ANIAMOUNT;break;
-        case SDRATTR_TEXT_CONTOURFRAME      : nResId = SIP_SA_TEXT_CONTOURFRAME;break;
-        case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : nResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break;
-        case SDRATTR_XMLATTRIBUTES          : nResId = SIP_SA_XMLATTRIBUTES;break;
-        case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: nResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break;
-        case SDRATTR_TEXT_WORDWRAP          : nResId = SIP_SA_WORDWRAP;break;
-        case SDRATTR_TEXT_CHAINNEXTNAME     : nResId = SIP_SA_CHAINNEXTNAME;break;
-
-        case SDRATTR_EDGEKIND           : nResId = SIP_SA_EDGEKIND;break;
-        case SDRATTR_EDGENODE1HORZDIST  : nResId = SIP_SA_EDGENODE1HORZDIST;break;
-        case SDRATTR_EDGENODE1VERTDIST  : nResId = SIP_SA_EDGENODE1VERTDIST;break;
-        case SDRATTR_EDGENODE2HORZDIST  : nResId = SIP_SA_EDGENODE2HORZDIST;break;
-        case SDRATTR_EDGENODE2VERTDIST  : nResId = SIP_SA_EDGENODE2VERTDIST;break;
-        case SDRATTR_EDGENODE1GLUEDIST  : nResId = SIP_SA_EDGENODE1GLUEDIST;break;
-        case SDRATTR_EDGENODE2GLUEDIST  : nResId = SIP_SA_EDGENODE2GLUEDIST;break;
-        case SDRATTR_EDGELINEDELTAANZ   : nResId = SIP_SA_EDGELINEDELTAANZ;break;
-        case SDRATTR_EDGELINE1DELTA     : nResId = SIP_SA_EDGELINE1DELTA;break;
-        case SDRATTR_EDGELINE2DELTA     : nResId = SIP_SA_EDGELINE2DELTA;break;
-        case SDRATTR_EDGELINE3DELTA     : nResId = SIP_SA_EDGELINE3DELTA;break;
-
-        case SDRATTR_MEASUREKIND             : nResId = SIP_SA_MEASUREKIND;break;
-        case SDRATTR_MEASURETEXTHPOS         : nResId = SIP_SA_MEASURETEXTHPOS;break;
-        case SDRATTR_MEASURETEXTVPOS         : nResId = SIP_SA_MEASURETEXTVPOS;break;
-        case SDRATTR_MEASURELINEDIST         : nResId = SIP_SA_MEASURELINEDIST;break;
-        case SDRATTR_MEASUREHELPLINEOVERHANG : nResId = SIP_SA_MEASUREHELPLINEOVERHANG;break;
-        case SDRATTR_MEASUREHELPLINEDIST     : nResId = SIP_SA_MEASUREHELPLINEDIST;break;
-        case SDRATTR_MEASUREHELPLINE1LEN     : nResId = SIP_SA_MEASUREHELPLINE1LEN;break;
-        case SDRATTR_MEASUREHELPLINE2LEN     : nResId = SIP_SA_MEASUREHELPLINE2LEN;break;
-        case SDRATTR_MEASUREBELOWREFEDGE     : nResId = SIP_SA_MEASUREBELOWREFEDGE;break;
-        case SDRATTR_MEASURETEXTROTA90       : nResId = SIP_SA_MEASURETEXTROTA90;break;
-        case SDRATTR_MEASURETEXTUPSIDEDOWN   : nResId = SIP_SA_MEASURETEXTUPSIDEDOWN;break;
-        case SDRATTR_MEASUREOVERHANG         : nResId = SIP_SA_MEASUREOVERHANG;break;
-        case SDRATTR_MEASUREUNIT             : nResId = SIP_SA_MEASUREUNIT;break;
-        case SDRATTR_MEASURESCALE            : nResId = SIP_SA_MEASURESCALE;break;
-        case SDRATTR_MEASURESHOWUNIT         : nResId = SIP_SA_MEASURESHOWUNIT;break;
-        case SDRATTR_MEASUREFORMATSTRING     : nResId = SIP_SA_MEASUREFORMATSTRING;break;
-        case SDRATTR_MEASURETEXTAUTOANGLE    : nResId = SIP_SA_MEASURETEXTAUTOANGLE;break;
-        case SDRATTR_MEASURETEXTAUTOANGLEVIEW: nResId = SIP_SA_MEASURETEXTAUTOANGLEVIEW;break;
-        case SDRATTR_MEASURETEXTISFIXEDANGLE : nResId = SIP_SA_MEASURETEXTISFIXEDANGLE;break;
-        case SDRATTR_MEASURETEXTFIXEDANGLE   : nResId = SIP_SA_MEASURETEXTFIXEDANGLE;break;
-        case SDRATTR_MEASUREDECIMALPLACES    : nResId = SIP_SA_MEASUREDECIMALPLACES;break;
-
-        case SDRATTR_CIRCKIND      : nResId = SIP_SA_CIRCKIND;break;
-        case SDRATTR_CIRCSTARTANGLE: nResId = SIP_SA_CIRCSTARTANGLE;break;
-        case SDRATTR_CIRCENDANGLE  : nResId = SIP_SA_CIRCENDANGLE;break;
-
-        case SDRATTR_OBJMOVEPROTECT : nResId = SIP_SA_OBJMOVEPROTECT;break;
-        case SDRATTR_OBJSIZEPROTECT : nResId = SIP_SA_OBJSIZEPROTECT;break;
-        case SDRATTR_OBJPRINTABLE   : nResId = SIP_SA_OBJPRINTABLE;break;
-        case SDRATTR_OBJVISIBLE     : nResId = SIP_SA_OBJVISIBLE;break;
-        case SDRATTR_LAYERID        : nResId = SIP_SA_LAYERID;break;
-        case SDRATTR_LAYERNAME      : nResId = SIP_SA_LAYERNAME;break;
-        case SDRATTR_OBJECTNAME     : nResId = SIP_SA_OBJECTNAME;break;
-        case SDRATTR_ALLPOSITIONX   : nResId = SIP_SA_ALLPOSITIONX;break;
-        case SDRATTR_ALLPOSITIONY   : nResId = SIP_SA_ALLPOSITIONY;break;
-        case SDRATTR_ALLSIZEWIDTH   : nResId = SIP_SA_ALLSIZEWIDTH;break;
-        case SDRATTR_ALLSIZEHEIGHT  : nResId = SIP_SA_ALLSIZEHEIGHT;break;
-        case SDRATTR_ONEPOSITIONX   : nResId = SIP_SA_ONEPOSITIONX;break;
-        case SDRATTR_ONEPOSITIONY   : nResId = SIP_SA_ONEPOSITIONY;break;
-        case SDRATTR_ONESIZEWIDTH   : nResId = SIP_SA_ONESIZEWIDTH;break;
-        case SDRATTR_ONESIZEHEIGHT  : nResId = SIP_SA_ONESIZEHEIGHT;break;
-        case SDRATTR_LOGICSIZEWIDTH : nResId = SIP_SA_LOGICSIZEWIDTH;break;
-        case SDRATTR_LOGICSIZEHEIGHT: nResId = SIP_SA_LOGICSIZEHEIGHT;break;
-        case SDRATTR_ROTATEANGLE    : nResId = SIP_SA_ROTATEANGLE;break;
-        case SDRATTR_SHEARANGLE     : nResId = SIP_SA_SHEARANGLE;break;
-        case SDRATTR_MOVEX          : nResId = SIP_SA_MOVEX;break;
-        case SDRATTR_MOVEY          : nResId = SIP_SA_MOVEY;break;
-        case SDRATTR_RESIZEXONE     : nResId = SIP_SA_RESIZEXONE;break;
-        case SDRATTR_RESIZEYONE     : nResId = SIP_SA_RESIZEYONE;break;
-        case SDRATTR_ROTATEONE      : nResId = SIP_SA_ROTATEONE;break;
-        case SDRATTR_HORZSHEARONE   : nResId = SIP_SA_HORZSHEARONE;break;
-        case SDRATTR_VERTSHEARONE   : nResId = SIP_SA_VERTSHEARONE;break;
-        case SDRATTR_RESIZEXALL     : nResId = SIP_SA_RESIZEXALL;break;
-        case SDRATTR_RESIZEYALL     : nResId = SIP_SA_RESIZEYALL;break;
-        case SDRATTR_ROTATEALL      : nResId = SIP_SA_ROTATEALL;break;
-        case SDRATTR_HORZSHEARALL   : nResId = SIP_SA_HORZSHEARALL;break;
-        case SDRATTR_VERTSHEARALL   : nResId = SIP_SA_VERTSHEARALL;break;
-        case SDRATTR_TRANSFORMREF1X : nResId = SIP_SA_TRANSFORMREF1X;break;
-        case SDRATTR_TRANSFORMREF1Y : nResId = SIP_SA_TRANSFORMREF1Y;break;
-        case SDRATTR_TRANSFORMREF2X : nResId = SIP_SA_TRANSFORMREF2X;break;
-        case SDRATTR_TRANSFORMREF2Y : nResId = SIP_SA_TRANSFORMREF2Y;break;
-
-        case SDRATTR_GRAFRED            : nResId = SIP_SA_GRAFRED;break;
-        case SDRATTR_GRAFGREEN          : nResId = SIP_SA_GRAFGREEN;break;
-        case SDRATTR_GRAFBLUE           : nResId = SIP_SA_GRAFBLUE;break;
-        case SDRATTR_GRAFLUMINANCE      : nResId = SIP_SA_GRAFLUMINANCE;break;
-        case SDRATTR_GRAFCONTRAST       : nResId = SIP_SA_GRAFCONTRAST;break;
-        case SDRATTR_GRAFGAMMA          : nResId = SIP_SA_GRAFGAMMA;break;
-        case SDRATTR_GRAFTRANSPARENCE   : nResId = SIP_SA_GRAFTRANSPARENCE;break;
-        case SDRATTR_GRAFINVERT         : nResId = SIP_SA_GRAFINVERT;break;
-        case SDRATTR_GRAFMODE           : nResId = SIP_SA_GRAFMODE;break;
-        case SDRATTR_GRAFCROP           : nResId = SIP_SA_GRAFCROP;break;
-
-        case EE_PARA_HYPHENATE  : nResId = SIP_EE_PARA_HYPHENATE;break;
-        case EE_PARA_BULLETSTATE: nResId = SIP_EE_PARA_BULLETSTATE;break;
-        case EE_PARA_OUTLLRSPACE: nResId = SIP_EE_PARA_OUTLLRSPACE;break;
-        case EE_PARA_OUTLLEVEL  : nResId = SIP_EE_PARA_OUTLLEVEL;break;
-        case EE_PARA_BULLET     : nResId = SIP_EE_PARA_BULLET;break;
-        case EE_PARA_LRSPACE    : nResId = SIP_EE_PARA_LRSPACE;break;
-        case EE_PARA_ULSPACE    : nResId = SIP_EE_PARA_ULSPACE;break;
-        case EE_PARA_SBL        : nResId = SIP_EE_PARA_SBL;break;
-        case EE_PARA_JUST       : nResId = SIP_EE_PARA_JUST;break;
-        case EE_PARA_TABS       : nResId = SIP_EE_PARA_TABS;break;
-
-        case EE_CHAR_COLOR      : nResId = SIP_EE_CHAR_COLOR;break;
-        case EE_CHAR_FONTINFO   : nResId = SIP_EE_CHAR_FONTINFO;break;
-        case EE_CHAR_FONTHEIGHT : nResId = SIP_EE_CHAR_FONTHEIGHT;break;
-        case EE_CHAR_FONTWIDTH  : nResId = SIP_EE_CHAR_FONTWIDTH;break;
-        case EE_CHAR_WEIGHT     : nResId = SIP_EE_CHAR_WEIGHT;break;
-        case EE_CHAR_UNDERLINE  : nResId = SIP_EE_CHAR_UNDERLINE;break;
-        case EE_CHAR_OVERLINE   : nResId = SIP_EE_CHAR_OVERLINE;break;
-        case EE_CHAR_STRIKEOUT  : nResId = SIP_EE_CHAR_STRIKEOUT;break;
-        case EE_CHAR_ITALIC     : nResId = SIP_EE_CHAR_ITALIC;break;
-        case EE_CHAR_OUTLINE    : nResId = SIP_EE_CHAR_OUTLINE;break;
-        case EE_CHAR_SHADOW     : nResId = SIP_EE_CHAR_SHADOW;break;
-        case EE_CHAR_ESCAPEMENT : nResId = SIP_EE_CHAR_ESCAPEMENT;break;
-        case EE_CHAR_PAIRKERNING: nResId = SIP_EE_CHAR_PAIRKERNING;break;
-        case EE_CHAR_KERNING    : nResId = SIP_EE_CHAR_KERNING;break;
-        case EE_CHAR_WLM        : nResId = SIP_EE_CHAR_WLM;break;
-        case EE_FEATURE_TAB     : nResId = SIP_EE_FEATURE_TAB;break;
-        case EE_FEATURE_LINEBR  : nResId = SIP_EE_FEATURE_LINEBR;break;
-        case EE_FEATURE_NOTCONV : nResId = SIP_EE_FEATURE_NOTCONV;break;
-        case EE_FEATURE_FIELD   : nResId = SIP_EE_FEATURE_FIELD;break;
+        case XATTR_LINESTYLE        : pResId = SIP_XA_LINESTYLE;break;
+        case XATTR_LINEDASH         : pResId = SIP_XA_LINEDASH;break;
+        case XATTR_LINEWIDTH        : pResId = SIP_XA_LINEWIDTH;break;
+        case XATTR_LINECOLOR        : pResId = SIP_XA_LINECOLOR;break;
+        case XATTR_LINESTART        : pResId = SIP_XA_LINESTART;break;
+        case XATTR_LINEEND          : pResId = SIP_XA_LINEEND;break;
+        case XATTR_LINESTARTWIDTH   : pResId = SIP_XA_LINESTARTWIDTH;break;
+        case XATTR_LINEENDWIDTH     : pResId = SIP_XA_LINEENDWIDTH;break;
+        case XATTR_LINESTARTCENTER  : pResId = SIP_XA_LINESTARTCENTER;break;
+        case XATTR_LINEENDCENTER    : pResId = SIP_XA_LINEENDCENTER;break;
+        case XATTR_LINETRANSPARENCE : pResId = SIP_XA_LINETRANSPARENCE;break;
+        case XATTR_LINEJOINT        : pResId = SIP_XA_LINEJOINT;break;
+        case XATTRSET_LINE          : pResId = SIP_XATTRSET_LINE;break;
+
+        case XATTR_FILLSTYLE            : pResId = SIP_XA_FILLSTYLE;break;
+        case XATTR_FILLCOLOR            : pResId = SIP_XA_FILLCOLOR;break;
+        case XATTR_FILLGRADIENT         : pResId = SIP_XA_FILLGRADIENT;break;
+        case XATTR_FILLHATCH            : pResId = SIP_XA_FILLHATCH;break;
+        case XATTR_FILLBITMAP           : pResId = SIP_XA_FILLBITMAP;break;
+        case XATTR_FILLTRANSPARENCE     : pResId = SIP_XA_FILLTRANSPARENCE;break;
+        case XATTR_GRADIENTSTEPCOUNT    : pResId = SIP_XA_GRADIENTSTEPCOUNT;break;
+        case XATTR_FILLBMP_TILE         : pResId = SIP_XA_FILLBMP_TILE;break;
+        case XATTR_FILLBMP_POS          : pResId = SIP_XA_FILLBMP_POS;break;
+        case XATTR_FILLBMP_SIZEX        : pResId = SIP_XA_FILLBMP_SIZEX;break;
+        case XATTR_FILLBMP_SIZEY        : pResId = SIP_XA_FILLBMP_SIZEY;break;
+        case XATTR_FILLFLOATTRANSPARENCE: pResId = SIP_XA_FILLFLOATTRANSPARENCE;break;
+        case XATTR_SECONDARYFILLCOLOR   : pResId = SIP_XA_SECONDARYFILLCOLOR;break;
+        case XATTR_FILLBMP_SIZELOG      : pResId = SIP_XA_FILLBMP_SIZELOG;break;
+        case XATTR_FILLBMP_TILEOFFSETX  : pResId = SIP_XA_FILLBMP_TILEOFFSETX;break;
+        case XATTR_FILLBMP_TILEOFFSETY  : pResId = SIP_XA_FILLBMP_TILEOFFSETY;break;
+        case XATTR_FILLBMP_STRETCH      : pResId = SIP_XA_FILLBMP_STRETCH;break;
+        case XATTR_FILLBMP_POSOFFSETX   : pResId = SIP_XA_FILLBMP_POSOFFSETX;break;
+        case XATTR_FILLBMP_POSOFFSETY   : pResId = SIP_XA_FILLBMP_POSOFFSETY;break;
+        case XATTR_FILLBACKGROUND       : pResId = SIP_XA_FILLBACKGROUND;break;
+
+        case XATTRSET_FILL             : pResId = SIP_XATTRSET_FILL;break;
+
+        case XATTR_FORMTXTSTYLE     : pResId = SIP_XA_FORMTXTSTYLE;break;
+        case XATTR_FORMTXTADJUST    : pResId = SIP_XA_FORMTXTADJUST;break;
+        case XATTR_FORMTXTDISTANCE  : pResId = SIP_XA_FORMTXTDISTANCE;break;
+        case XATTR_FORMTXTSTART     : pResId = SIP_XA_FORMTXTSTART;break;
+        case XATTR_FORMTXTMIRROR    : pResId = SIP_XA_FORMTXTMIRROR;break;
+        case XATTR_FORMTXTOUTLINE   : pResId = SIP_XA_FORMTXTOUTLINE;break;
+        case XATTR_FORMTXTSHADOW    : pResId = SIP_XA_FORMTXTSHADOW;break;
+        case XATTR_FORMTXTSHDWCOLOR : pResId = SIP_XA_FORMTXTSHDWCOLOR;break;
+        case XATTR_FORMTXTSHDWXVAL  : pResId = SIP_XA_FORMTXTSHDWXVAL;break;
+        case XATTR_FORMTXTSHDWYVAL  : pResId = SIP_XA_FORMTXTSHDWYVAL;break;
+        case XATTR_FORMTXTHIDEFORM  : pResId = SIP_XA_FORMTXTHIDEFORM;break;
+        case XATTR_FORMTXTSHDWTRANSP: pResId = SIP_XA_FORMTXTSHDWTRANSP;break;
+
+        case SDRATTR_SHADOW            : pResId = SIP_SA_SHADOW;break;
+        case SDRATTR_SHADOWCOLOR       : pResId = SIP_SA_SHADOWCOLOR;break;
+        case SDRATTR_SHADOWXDIST       : pResId = SIP_SA_SHADOWXDIST;break;
+        case SDRATTR_SHADOWYDIST       : pResId = SIP_SA_SHADOWYDIST;break;
+        case SDRATTR_SHADOWTRANSPARENCE: pResId = SIP_SA_SHADOWTRANSPARENCE;break;
+        case SDRATTR_SHADOW3D          : pResId = SIP_SA_SHADOW3D;break;
+        case SDRATTR_SHADOWPERSP       : pResId = SIP_SA_SHADOWPERSP;break;
+
+        case SDRATTR_CAPTIONTYPE      : pResId = SIP_SA_CAPTIONTYPE;break;
+        case SDRATTR_CAPTIONFIXEDANGLE: pResId = SIP_SA_CAPTIONFIXEDANGLE;break;
+        case SDRATTR_CAPTIONANGLE     : pResId = SIP_SA_CAPTIONANGLE;break;
+        case SDRATTR_CAPTIONGAP       : pResId = SIP_SA_CAPTIONGAP;break;
+        case SDRATTR_CAPTIONESCDIR    : pResId = SIP_SA_CAPTIONESCDIR;break;
+        case SDRATTR_CAPTIONESCISREL  : pResId = SIP_SA_CAPTIONESCISREL;break;
+        case SDRATTR_CAPTIONESCREL    : pResId = SIP_SA_CAPTIONESCREL;break;
+        case SDRATTR_CAPTIONESCABS    : pResId = SIP_SA_CAPTIONESCABS;break;
+        case SDRATTR_CAPTIONLINELEN   : pResId = SIP_SA_CAPTIONLINELEN;break;
+        case SDRATTR_CAPTIONFITLINELEN: pResId = SIP_SA_CAPTIONFITLINELEN;break;
+
+        case SDRATTR_ECKENRADIUS            : pResId = SIP_SA_ECKENRADIUS;break;
+        case SDRATTR_TEXT_MINFRAMEHEIGHT    : pResId = SIP_SA_TEXT_MINFRAMEHEIGHT;break;
+        case SDRATTR_TEXT_AUTOGROWHEIGHT    : pResId = SIP_SA_TEXT_AUTOGROWHEIGHT;break;
+        case SDRATTR_TEXT_FITTOSIZE         : pResId = SIP_SA_TEXT_FITTOSIZE;break;
+        case SDRATTR_TEXT_LEFTDIST          : pResId = SIP_SA_TEXT_LEFTDIST;break;
+        case SDRATTR_TEXT_RIGHTDIST         : pResId = SIP_SA_TEXT_RIGHTDIST;break;
+        case SDRATTR_TEXT_UPPERDIST         : pResId = SIP_SA_TEXT_UPPERDIST;break;
+        case SDRATTR_TEXT_LOWERDIST         : pResId = SIP_SA_TEXT_LOWERDIST;break;
+        case SDRATTR_TEXT_VERTADJUST        : pResId = SIP_SA_TEXT_VERTADJUST;break;
+        case SDRATTR_TEXT_MAXFRAMEHEIGHT    : pResId = SIP_SA_TEXT_MAXFRAMEHEIGHT;break;
+        case SDRATTR_TEXT_MINFRAMEWIDTH     : pResId = SIP_SA_TEXT_MINFRAMEWIDTH;break;
+        case SDRATTR_TEXT_MAXFRAMEWIDTH     : pResId = SIP_SA_TEXT_MAXFRAMEWIDTH;break;
+        case SDRATTR_TEXT_AUTOGROWWIDTH     : pResId = SIP_SA_TEXT_AUTOGROWWIDTH;break;
+        case SDRATTR_TEXT_HORZADJUST        : pResId = SIP_SA_TEXT_HORZADJUST;break;
+        case SDRATTR_TEXT_ANIKIND           : pResId = SIP_SA_TEXT_ANIKIND;break;
+        case SDRATTR_TEXT_ANIDIRECTION      : pResId = SIP_SA_TEXT_ANIDIRECTION;break;
+        case SDRATTR_TEXT_ANISTARTINSIDE    : pResId = SIP_SA_TEXT_ANISTARTINSIDE;break;
+        case SDRATTR_TEXT_ANISTOPINSIDE     : pResId = SIP_SA_TEXT_ANISTOPINSIDE;break;
+        case SDRATTR_TEXT_ANICOUNT          : pResId = SIP_SA_TEXT_ANICOUNT;break;
+        case SDRATTR_TEXT_ANIDELAY          : pResId = SIP_SA_TEXT_ANIDELAY;break;
+        case SDRATTR_TEXT_ANIAMOUNT         : pResId = SIP_SA_TEXT_ANIAMOUNT;break;
+        case SDRATTR_TEXT_CONTOURFRAME      : pResId = SIP_SA_TEXT_CONTOURFRAME;break;
+        case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : pResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break;
+        case SDRATTR_XMLATTRIBUTES          : pResId = SIP_SA_XMLATTRIBUTES;break;
+        case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: pResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break;
+        case SDRATTR_TEXT_WORDWRAP          : pResId = SIP_SA_WORDWRAP;break;
+        case SDRATTR_TEXT_CHAINNEXTNAME     : pResId = SIP_SA_CHAINNEXTNAME;break;
+
+        case SDRATTR_EDGEKIND           : pResId = SIP_SA_EDGEKIND;break;
+        case SDRATTR_EDGENODE1HORZDIST  : pResId = SIP_SA_EDGENODE1HORZDIST;break;
+        case SDRATTR_EDGENODE1VERTDIST  : pResId = SIP_SA_EDGENODE1VERTDIST;break;
+        case SDRATTR_EDGENODE2HORZDIST  : pResId = SIP_SA_EDGENODE2HORZDIST;break;
+        case SDRATTR_EDGENODE2VERTDIST  : pResId = SIP_SA_EDGENODE2VERTDIST;break;
+        case SDRATTR_EDGENODE1GLUEDIST  : pResId = SIP_SA_EDGENODE1GLUEDIST;break;
+        case SDRATTR_EDGENODE2GLUEDIST  : pResId = SIP_SA_EDGENODE2GLUEDIST;break;
+        case SDRATTR_EDGELINEDELTAANZ   : pResId = SIP_SA_EDGELINEDELTAANZ;break;
+        case SDRATTR_EDGELINE1DELTA     : pResId = SIP_SA_EDGELINE1DELTA;break;
+        case SDRATTR_EDGELINE2DELTA     : pResId = SIP_SA_EDGELINE2DELTA;break;
+        case SDRATTR_EDGELINE3DELTA     : pResId = SIP_SA_EDGELINE3DELTA;break;
+
+        case SDRATTR_MEASUREKIND             : pResId = SIP_SA_MEASUREKIND;break;
+        case SDRATTR_MEASURETEXTHPOS         : pResId = SIP_SA_MEASURETEXTHPOS;break;
+        case SDRATTR_MEASURETEXTVPOS         : pResId = SIP_SA_MEASURETEXTVPOS;break;
+        case SDRATTR_MEASURELINEDIST         : pResId = SIP_SA_MEASURELINEDIST;break;
+        case SDRATTR_MEASUREHELPLINEOVERHANG : pResId = SIP_SA_MEASUREHELPLINEOVERHANG;break;
+        case SDRATTR_MEASUREHELPLINEDIST     : pResId = SIP_SA_MEASUREHELPLINEDIST;break;
+        case SDRATTR_MEASUREHELPLINE1LEN     : pResId = SIP_SA_MEASUREHELPLINE1LEN;break;
+        case SDRATTR_MEASUREHELPLINE2LEN     : pResId = SIP_SA_MEASUREHELPLINE2LEN;break;
+        case SDRATTR_MEASUREBELOWREFEDGE     : pResId = SIP_SA_MEASUREBELOWREFEDGE;break;
+        case SDRATTR_MEASURETEXTROTA90       : pResId = SIP_SA_MEASURETEXTROTA90;break;
+        case SDRATTR_MEASURETEXTUPSIDEDOWN   : pResId = SIP_SA_MEASURETEXTUPSIDEDOWN;break;
+        case SDRATTR_MEASUREOVERHANG         : pResId = SIP_SA_MEASUREOVERHANG;break;
+        case SDRATTR_MEASUREUNIT             : pResId = SIP_SA_MEASUREUNIT;break;
+        case SDRATTR_MEASURESCALE            : pResId = SIP_SA_MEASURESCALE;break;
+        case SDRATTR_MEASURESHOWUNIT         : pResId = SIP_SA_MEASURESHOWUNIT;break;
+        case SDRATTR_MEASUREFORMATSTRING     : pResId = SIP_SA_MEASUREFORMATSTRING;break;
+        case SDRATTR_MEASURETEXTAUTOANGLE    : pResId = SIP_SA_MEASURETEXTAUTOANGLE;break;
+        case SDRATTR_MEASURETEXTAUTOANGLEVIEW: pResId = SIP_SA_MEASURETEXTAUTOANGLEVIEW;break;
+        case SDRATTR_MEASURETEXTISFIXEDANGLE : pResId = SIP_SA_MEASURETEXTISFIXEDANGLE;break;
+        case SDRATTR_MEASURETEXTFIXEDANGLE   : pResId = SIP_SA_MEASURETEXTFIXEDANGLE;break;
+        case SDRATTR_MEASUREDECIMALPLACES    : pResId = SIP_SA_MEASUREDECIMALPLACES;break;
+
+        case SDRATTR_CIRCKIND      : pResId = SIP_SA_CIRCKIND;break;
+        case SDRATTR_CIRCSTARTANGLE: pResId = SIP_SA_CIRCSTARTANGLE;break;
+        case SDRATTR_CIRCENDANGLE  : pResId = SIP_SA_CIRCENDANGLE;break;
+
+        case SDRATTR_OBJMOVEPROTECT : pResId = SIP_SA_OBJMOVEPROTECT;break;
+        case SDRATTR_OBJSIZEPROTECT : pResId = SIP_SA_OBJSIZEPROTECT;break;
+        case SDRATTR_OBJPRINTABLE   : pResId = SIP_SA_OBJPRINTABLE;break;
+        case SDRATTR_OBJVISIBLE     : pResId = SIP_SA_OBJVISIBLE;break;
+        case SDRATTR_LAYERID        : pResId = SIP_SA_LAYERID;break;
+        case SDRATTR_LAYERNAME      : pResId = SIP_SA_LAYERNAME;break;
+        case SDRATTR_OBJECTNAME     : pResId = SIP_SA_OBJECTNAME;break;
+        case SDRATTR_ALLPOSITIONX   : pResId = SIP_SA_ALLPOSITIONX;break;
+        case SDRATTR_ALLPOSITIONY   : pResId = SIP_SA_ALLPOSITIONY;break;
+        case SDRATTR_ALLSIZEWIDTH   : pResId = SIP_SA_ALLSIZEWIDTH;break;
+        case SDRATTR_ALLSIZEHEIGHT  : pResId = SIP_SA_ALLSIZEHEIGHT;break;
+        case SDRATTR_ONEPOSITIONX   : pResId = SIP_SA_ONEPOSITIONX;break;
+        case SDRATTR_ONEPOSITIONY   : pResId = SIP_SA_ONEPOSITIONY;break;
+        case SDRATTR_ONESIZEWIDTH   : pResId = SIP_SA_ONESIZEWIDTH;break;
+        case SDRATTR_ONESIZEHEIGHT  : pResId = SIP_SA_ONESIZEHEIGHT;break;
+        case SDRATTR_LOGICSIZEWIDTH : pResId = SIP_SA_LOGICSIZEWIDTH;break;
+        case SDRATTR_LOGICSIZEHEIGHT: pResId = SIP_SA_LOGICSIZEHEIGHT;break;
+        case SDRATTR_ROTATEANGLE    : pResId = SIP_SA_ROTATEANGLE;break;
+        case SDRATTR_SHEARANGLE     : pResId = SIP_SA_SHEARANGLE;break;
+        case SDRATTR_MOVEX          : pResId = SIP_SA_MOVEX;break;
+        case SDRATTR_MOVEY          : pResId = SIP_SA_MOVEY;break;
+        case SDRATTR_RESIZEXONE     : pResId = SIP_SA_RESIZEXONE;break;
+        case SDRATTR_RESIZEYONE     : pResId = SIP_SA_RESIZEYONE;break;
+        case SDRATTR_ROTATEONE      : pResId = SIP_SA_ROTATEONE;break;
+        case SDRATTR_HORZSHEARONE   : pResId = SIP_SA_HORZSHEARONE;break;
+        case SDRATTR_VERTSHEARONE   : pResId = SIP_SA_VERTSHEARONE;break;
+        case SDRATTR_RESIZEXALL     : pResId = SIP_SA_RESIZEXALL;break;
+        case SDRATTR_RESIZEYALL     : pResId = SIP_SA_RESIZEYALL;break;
+        case SDRATTR_ROTATEALL      : pResId = SIP_SA_ROTATEALL;break;
+        case SDRATTR_HORZSHEARALL   : pResId = SIP_SA_HORZSHEARALL;break;
+        case SDRATTR_VERTSHEARALL   : pResId = SIP_SA_VERTSHEARALL;break;
+        case SDRATTR_TRANSFORMREF1X : pResId = SIP_SA_TRANSFORMREF1X;break;
+        case SDRATTR_TRANSFORMREF1Y : pResId = SIP_SA_TRANSFORMREF1Y;break;
+        case SDRATTR_TRANSFORMREF2X : pResId = SIP_SA_TRANSFORMREF2X;break;
+        case SDRATTR_TRANSFORMREF2Y : pResId = SIP_SA_TRANSFORMREF2Y;break;
+
+        case SDRATTR_GRAFRED            : pResId = SIP_SA_GRAFRED;break;
+        case SDRATTR_GRAFGREEN          : pResId = SIP_SA_GRAFGREEN;break;
+        case SDRATTR_GRAFBLUE           : pResId = SIP_SA_GRAFBLUE;break;
+        case SDRATTR_GRAFLUMINANCE      : pResId = SIP_SA_GRAFLUMINANCE;break;
+        case SDRATTR_GRAFCONTRAST       : pResId = SIP_SA_GRAFCONTRAST;break;
+        case SDRATTR_GRAFGAMMA          : pResId = SIP_SA_GRAFGAMMA;break;
+        case SDRATTR_GRAFTRANSPARENCE   : pResId = SIP_SA_GRAFTRANSPARENCE;break;
+        case SDRATTR_GRAFINVERT         : pResId = SIP_SA_GRAFINVERT;break;
+        case SDRATTR_GRAFMODE           : pResId = SIP_SA_GRAFMODE;break;
+        case SDRATTR_GRAFCROP           : pResId = SIP_SA_GRAFCROP;break;
+
+        case EE_PARA_HYPHENATE  : pResId = SIP_EE_PARA_HYPHENATE;break;
+        case EE_PARA_BULLETSTATE: pResId = SIP_EE_PARA_BULLETSTATE;break;
+        case EE_PARA_OUTLLRSPACE: pResId = SIP_EE_PARA_OUTLLRSPACE;break;
+        case EE_PARA_OUTLLEVEL  : pResId = SIP_EE_PARA_OUTLLEVEL;break;
+        case EE_PARA_BULLET     : pResId = SIP_EE_PARA_BULLET;break;
+        case EE_PARA_LRSPACE    : pResId = SIP_EE_PARA_LRSPACE;break;
+        case EE_PARA_ULSPACE    : pResId = SIP_EE_PARA_ULSPACE;break;
+        case EE_PARA_SBL        : pResId = SIP_EE_PARA_SBL;break;
+        case EE_PARA_JUST       : pResId = SIP_EE_PARA_JUST;break;
+        case EE_PARA_TABS       : pResId = SIP_EE_PARA_TABS;break;
+
+        case EE_CHAR_COLOR      : pResId = SIP_EE_CHAR_COLOR;break;
+        case EE_CHAR_FONTINFO   : pResId = SIP_EE_CHAR_FONTINFO;break;
+        case EE_CHAR_FONTHEIGHT : pResId = SIP_EE_CHAR_FONTHEIGHT;break;
+        case EE_CHAR_FONTWIDTH  : pResId = SIP_EE_CHAR_FONTWIDTH;break;
+        case EE_CHAR_WEIGHT     : pResId = SIP_EE_CHAR_WEIGHT;break;
+        case EE_CHAR_UNDERLINE  : pResId = SIP_EE_CHAR_UNDERLINE;break;
+        case EE_CHAR_OVERLINE   : pResId = SIP_EE_CHAR_OVERLINE;break;
+        case EE_CHAR_STRIKEOUT  : pResId = SIP_EE_CHAR_STRIKEOUT;break;
+        case EE_CHAR_ITALIC     : pResId = SIP_EE_CHAR_ITALIC;break;
+        case EE_CHAR_OUTLINE    : pResId = SIP_EE_CHAR_OUTLINE;break;
+        case EE_CHAR_SHADOW     : pResId = SIP_EE_CHAR_SHADOW;break;
+        case EE_CHAR_ESCAPEMENT : pResId = SIP_EE_CHAR_ESCAPEMENT;break;
+        case EE_CHAR_PAIRKERNING: pResId = SIP_EE_CHAR_PAIRKERNING;break;
+        case EE_CHAR_KERNING    : pResId = SIP_EE_CHAR_KERNING;break;
+        case EE_CHAR_WLM        : pResId = SIP_EE_CHAR_WLM;break;
+        case EE_FEATURE_TAB     : pResId = SIP_EE_FEATURE_TAB;break;
+        case EE_FEATURE_LINEBR  : pResId = SIP_EE_FEATURE_LINEBR;break;
+        case EE_FEATURE_NOTCONV : pResId = SIP_EE_FEATURE_NOTCONV;break;
+        case EE_FEATURE_FIELD   : pResId = SIP_EE_FEATURE_FIELD;break;
     } // switch
 
-    rItemName = ResId( nResId, *pResMgr );
+    rItemName = SvxResId(pResId);
 }
 
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index da33c32f0d26..7fdd997e97fb 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -32,11 +32,11 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svddrgv.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -551,7 +551,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag()
     }
 }
 
-void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const
+void SdrDragMethod::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const
 {
     ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE;
     if (IsDraggingPoints()) {
@@ -559,7 +559,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr
     } else if (IsDraggingGluePoints()) {
         nOpt=ImpTakeDescriptionOptions::GLUEPOINTS;
     }
-    getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nOpt);
+    getSdrDragView().ImpTakeDescriptionStr(pStrCacheID,rStr,nOpt);
 }
 
 SdrObject* SdrDragMethod::GetDragObj() const
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 1f8ed61d7817..738d19496dee 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 08fbfa0caffe..3b1e8d687954 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/e3dsceneupdater.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 2a6a33a91bd2..d988aad4fc64 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -31,7 +31,7 @@
 #include "getallcharpropids.hxx"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b97868fbf485..d34b0101ff8c 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -28,7 +28,7 @@
 #include "svx/svditer.hxx"
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
@@ -39,7 +39,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdoashp.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <memory>
@@ -1936,26 +1936,26 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
     if (AreObjectsMarked()) {
         bool bMrkChg = false;
         const size_t nMarkCount=GetMarkedObjectCount();
-        sal_uInt16 nDscrID=0;
+        const char* pDscrID = nullptr;
         if(bLineToArea)
         {
             if(nMarkCount == 1)
-                nDscrID = STR_EditConvToContour;
+                pDscrID = STR_EditConvToContour;
             else
-                nDscrID = STR_EditConvToContours;
+                pDscrID = STR_EditConvToContours;
 
-            BegUndo(ImpGetResStr(nDscrID), GetDescriptionOfMarkedObjects());
+            BegUndo(ImpGetResStr(pDscrID), GetDescriptionOfMarkedObjects());
         }
         else
         {
             if (bPath) {
-                if (nMarkCount==1) nDscrID=STR_EditConvToCurve;
-                else nDscrID=STR_EditConvToCurves;
-                BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
+                if (nMarkCount==1) pDscrID=STR_EditConvToCurve;
+                else pDscrID=STR_EditConvToCurves;
+                BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
             } else {
-                if (nMarkCount==1) nDscrID=STR_EditConvToPoly;
-                else nDscrID=STR_EditConvToPolys;
-                BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
+                if (nMarkCount==1) pDscrID=STR_EditConvToPoly;
+                else pDscrID=STR_EditConvToPolys;
+                BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
             }
         }
         for (size_t nm=nMarkCount; nm>0;) {
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 04e3b34f8aff..02faf7d3a171 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -48,7 +48,7 @@
 #include <svdibrow.hxx>
 #endif
 #include <svx/svddrgv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/globl3d.hxx"
 #include <svx/textchain.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index ba73c511b18b..00418251e783 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -21,12 +21,12 @@
 
 #include "editeng/forbiddencharacterstable.hxx"
 #include "officecfg/Office/Common.hxx"
-#include <tools/resmgr.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
@@ -71,8 +71,7 @@ using namespace ::com::sun::star;
 SdrGlobalData::SdrGlobalData() :
     pSysLocale(nullptr),
     pLocaleData(nullptr),
-    pDefaults(nullptr),
-    pResMgr(nullptr)
+    pDefaults(nullptr)
 {
     if (!utl::ConfigManager::IsAvoidConfig())
     {
@@ -380,29 +379,16 @@ std::vector<Link<SdrObjUserDataCreatorParams, SdrObjUserData*>>& ImpGetUserMakeO
     return rGlobalData.aUserMakeObjUserDataHdl;
 }
 
-ResMgr* ImpGetResMgr()
+OUString ImpGetResStr(const char* pResID)
 {
-    SdrGlobalData& rGlobalData = GetSdrGlobalData();
-
-    if(!rGlobalData.pResMgr)
-    {
-        rGlobalData.pResMgr =
-            ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILanguageTag() );
-    }
-
-    return rGlobalData.pResMgr;
-}
-
-OUString ImpGetResStr(sal_uInt16 nResID)
-{
-    return ResId(nResID, *ImpGetResMgr());
+    return SvxResId(pResID);
 }
 
 namespace sdr
 {
-    OUString GetResourceString(sal_uInt16 nResID)
+    OUString GetResourceString(const char* pResID)
     {
-        return ImpGetResStr(nResID);
+        return ImpGetResStr(pResID);
     }
 }
 
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index fa46fb917624..16833fa6346d 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -22,7 +22,7 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 169ec37ef599..f67f22b00d3d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -32,7 +32,7 @@
 #include <vcl/bitmapaccess.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 7027e004b5a9..0cfa87c62b5a 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -22,7 +22,7 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 bool SdrLayerIDSet::IsEmpty() const
 {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 12170197a19e..c5506f3b1c06 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -27,7 +27,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 713d0222d3cf..4fca8bb55982 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -63,7 +63,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdoutlinercache.hxx"
 
 #include "svx/xflclit.hxx"
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 87d1fb24c667..9927b54cfed1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -37,7 +37,7 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
@@ -2024,9 +2024,9 @@ const tools::Rectangle& SdrMarkView::GetMarkedObjRect() const
 }
 
 
-void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt) const
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
     sal_Int32 nPos = rStr.indexOf("%1");
 
     if(nPos != -1)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 42c105bfe628..2c2bd016378b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -46,7 +46,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <editeng/adjustitem.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 310eb2834556..975af73c5dda 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -90,7 +90,7 @@
 #include <svx/svdovirt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdview.hxx>
@@ -1010,9 +1010,9 @@ OUString SdrObject::TakeObjNamePlural() const
     return ImpGetResStr(STR_ObjNamePluralNONE);
 }
 
-void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const
+void SdrObject::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
     sal_Int32 nPos = rStr.indexOf("%1");
     if (nPos >= 0)
     {
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index a29fbc1eb876..fe94193a1df4 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -33,7 +33,7 @@
 
 #include "svdconv.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <sdr/contact/viewcontactofsdrcaptionobj.hxx>
 #include <sdr/properties/captionproperties.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index dc5d7a8f8a43..33220dc67910 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -27,7 +27,7 @@
 #include <svl/style.hxx>
 
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <sdr/properties/circleproperties.hxx>
@@ -282,26 +282,26 @@ void SdrCircObj::RecalcXPoly()
 
 OUString SdrCircObj::TakeObjNameSingul() const
 {
-    sal_uInt16 nID=STR_ObjNameSingulCIRC;
+    const char* pID=STR_ObjNameSingulCIRC;
     if (maRect.GetWidth() == maRect.GetHeight() && aGeo.nShearAngle==0)
     {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
-            case OBJ_SECT: nID=STR_ObjNameSingulSECT; break;
-            case OBJ_CARC: nID=STR_ObjNameSingulCARC; break;
-            case OBJ_CCUT: nID=STR_ObjNameSingulCCUT; break;
+            case OBJ_CIRC: pID=STR_ObjNameSingulCIRC; break;
+            case OBJ_SECT: pID=STR_ObjNameSingulSECT; break;
+            case OBJ_CARC: pID=STR_ObjNameSingulCARC; break;
+            case OBJ_CCUT: pID=STR_ObjNameSingulCCUT; break;
             default: break;
         }
     } else {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNameSingulCIRCE; break;
-            case OBJ_SECT: nID=STR_ObjNameSingulSECTE; break;
-            case OBJ_CARC: nID=STR_ObjNameSingulCARCE; break;
-            case OBJ_CCUT: nID=STR_ObjNameSingulCCUTE; break;
+            case OBJ_CIRC: pID=STR_ObjNameSingulCIRCE; break;
+            case OBJ_SECT: pID=STR_ObjNameSingulSECTE; break;
+            case OBJ_CARC: pID=STR_ObjNameSingulCARCE; break;
+            case OBJ_CCUT: pID=STR_ObjNameSingulCCUTE; break;
             default: break;
         }
     }
-    OUStringBuffer sName(ImpGetResStr(nID));
+    OUStringBuffer sName(ImpGetResStr(pID));
 
     OUString aName(GetName());
     if (!aName.isEmpty())
@@ -316,26 +316,26 @@ OUString SdrCircObj::TakeObjNameSingul() const
 
 OUString SdrCircObj::TakeObjNamePlural() const
 {
-    sal_uInt16 nID=STR_ObjNamePluralCIRC;
+    const char* pID=STR_ObjNamePluralCIRC;
     if (maRect.GetWidth() == maRect.GetHeight() && aGeo.nShearAngle==0)
     {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
-            case OBJ_SECT: nID=STR_ObjNamePluralSECT; break;
-            case OBJ_CARC: nID=STR_ObjNamePluralCARC; break;
-            case OBJ_CCUT: nID=STR_ObjNamePluralCCUT; break;
+            case OBJ_CIRC: pID=STR_ObjNamePluralCIRC; break;
+            case OBJ_SECT: pID=STR_ObjNamePluralSECT; break;
+            case OBJ_CARC: pID=STR_ObjNamePluralCARC; break;
+            case OBJ_CCUT: pID=STR_ObjNamePluralCCUT; break;
             default: break;
         }
     } else {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNamePluralCIRCE; break;
-            case OBJ_SECT: nID=STR_ObjNamePluralSECTE; break;
-            case OBJ_CARC: nID=STR_ObjNamePluralCARCE; break;
-            case OBJ_CCUT: nID=STR_ObjNamePluralCCUTE; break;
+            case OBJ_CIRC: pID=STR_ObjNamePluralCIRCE; break;
+            case OBJ_SECT: pID=STR_ObjNamePluralSECTE; break;
+            case OBJ_CARC: pID=STR_ObjNamePluralCARCE; break;
+            case OBJ_CCUT: pID=STR_ObjNamePluralCCUTE; break;
             default: break;
         }
     }
-    return ImpGetResStr(nID);
+    return ImpGetResStr(pID);
 }
 
 SdrCircObj* SdrCircObj::Clone() const
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 916562f24ac8..9ef591618ca2 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -19,7 +19,7 @@
 
 #include "svddrgm1.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 82bdf58a2f70..a134c6a408ca 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
@@ -773,11 +773,11 @@ OUString SdrGrafObj::TakeObjNameSingul() const
         {
             case GraphicType::Bitmap:
             {
-                const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+                const char* pId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                      ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
                                      ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
 
-                sName.append(ImpGetResStr(nId));
+                sName.append(ImpGetResStr(pId));
             }
             break;
 
@@ -843,11 +843,11 @@ OUString SdrGrafObj::TakeObjNamePlural() const
         {
             case GraphicType::Bitmap:
             {
-                const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+                const char* pId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                      ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
                                      ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
 
-                sName.append(ImpGetResStr(nId));
+                sName.append(ImpGetResStr(pId));
             }
             break;
 
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index eb60afd57349..e5446948abee 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 9b1de06053ff..dbc0e2b8ab33 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -19,7 +19,7 @@
 
 #include "svdconv.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index a1cf3d03877d..a1220e7afe1f 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -35,7 +35,7 @@
 
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index f74de525e3b4..bdda4a5bc39c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -69,7 +69,7 @@
 #include <svx/charthelper.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 027abf46149c..315af8d7f0bd 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -20,7 +20,7 @@
 
 #include <svx/svdopage.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 62e71e615d6b..f82c22977821 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnclit.hxx>
@@ -1876,7 +1876,7 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
     if(OBJ_LINE == meKind)
     {
-        sal_uInt16 nId(STR_ObjNameSingulLINE);
+        const char* pId(STR_ObjNameSingulLINE);
 
         if(lcl_ImpIsLine(GetPathPoly()))
         {
@@ -1888,11 +1888,11 @@ OUString SdrPathObj::TakeObjNameSingul() const
             {
                 if(aB2DPoint0.getY() == aB2DPoint1.getY())
                 {
-                    nId = STR_ObjNameSingulLINE_Hori;
+                    pId = STR_ObjNameSingulLINE_Hori;
                 }
                 else if(aB2DPoint0.getX() == aB2DPoint1.getX())
                 {
-                    nId = STR_ObjNameSingulLINE_Vert;
+                    pId = STR_ObjNameSingulLINE_Vert;
                 }
                 else
                 {
@@ -1901,31 +1901,31 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
                     if(fDx == fDy)
                     {
-                        nId = STR_ObjNameSingulLINE_Diag;
+                        pId = STR_ObjNameSingulLINE_Diag;
                     }
                 }
             }
         }
 
-        sName.append(ImpGetResStr(nId));
+        sName.append(ImpGetResStr(pId));
     }
     else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
     {
         const bool bClosed(OBJ_POLY == meKind);
-        sal_uInt16 nId(0);
+        const char* pId(nullptr);
 
         if(mpDAC && mpDAC->IsCreating())
         {
             if(bClosed)
             {
-                nId = STR_ObjNameSingulPOLY;
+                pId = STR_ObjNameSingulPOLY;
             }
             else
             {
-                nId = STR_ObjNameSingulPLIN;
+                pId = STR_ObjNameSingulPLIN;
             }
 
-            sName.append(ImpGetResStr(nId));
+            sName.append(ImpGetResStr(pId));
         }
         else
         {
@@ -1940,14 +1940,14 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
             if(bClosed)
             {
-                nId = STR_ObjNameSingulPOLY_PointCount;
+                pId = STR_ObjNameSingulPOLY_PointCount;
             }
             else
             {
-                nId = STR_ObjNameSingulPLIN_PointCount;
+                pId = STR_ObjNameSingulPLIN_PointCount;
             }
 
-            OUString sTemp(ImpGetResStr(nId));
+            OUString sTemp(ImpGetResStr(pId));
             // #i96537#
             sName.append(sTemp.replaceFirst("%2", OUString::number(nPointCount)));
         }
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index b1e585add4c5..5cd19c1e0168 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -35,7 +35,7 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
@@ -221,14 +221,17 @@ OUString SdrRectObj::TakeObjNameSingul() const
 
     OUStringBuffer sName;
 
-    sal_uInt16 nResId=STR_ObjNameSingulRECT;
-    if (aGeo.nShearAngle!=0) {
-        nResId+=4;  // parallelogram or, maybe, rhombus
-    } else {
-        if (maRect.GetWidth() == maRect.GetHeight()) nResId+=2; // square
+    bool bRounded = GetEckenradius() != 0; // rounded down
+    const char* pResId = bRounded ? STR_ObjNameSingulRECTRND : STR_ObjNameSingulRECT;
+    if (aGeo.nShearAngle!=0)
+    {
+        pResId = bRounded ? STR_ObjNameSingulPARALRND : STR_ObjNameSingulPARAL;  // parallelogram or, maybe, rhombus
+    }
+    else if (maRect.GetWidth() == maRect.GetHeight())
+    {
+        pResId = bRounded ? STR_ObjNameSingulQUADRND : STR_ObjNameSingulQUAD; // square
     }
-    if (GetEckenradius()!=0) nResId+=8; // rounded down
-    sName.append(ImpGetResStr(nResId));
+    sName.append(ImpGetResStr(pResId));
 
     OUString aName(GetName());
     if (!aName.isEmpty())
@@ -249,22 +252,18 @@ OUString SdrRectObj::TakeObjNamePlural() const
         return SdrTextObj::TakeObjNamePlural();
     }
 
-    sal_uInt16 nResId=STR_ObjNamePluralRECT;
-
+    bool bRounded = GetEckenradius() != 0; // rounded down
+    const char* pResId = bRounded ? STR_ObjNamePluralRECTRND : STR_ObjNamePluralRECT;
     if (aGeo.nShearAngle!=0)
     {
-        nResId+=4;  // parallelogram or rhombus
+        pResId = bRounded ? STR_ObjNamePluralPARALRND : STR_ObjNamePluralPARAL;  // parallelogram or rhombus
     }
-    else
+    else if (maRect.GetWidth() == maRect.GetHeight())
     {
-        if (maRect.GetWidth() == maRect.GetHeight())
-            nResId+=2; // square
+        pResId = bRounded ? STR_ObjNamePluralQUADRND : STR_ObjNamePluralQUAD; // square
     }
 
-    if (GetEckenradius()!=0)
-        nResId+=8; // rounded down
-
-    return ImpGetResStr(nResId);
+    return ImpGetResStr(pResId);
 }
 
 SdrRectObj* SdrRectObj::Clone() const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d6226922ed9d..21d588fc89f7 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -27,7 +27,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 4c020a82bfdf..7592455c493e 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 9312569bc14e..88d4d09797a1 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index ec0b23ea94ba..a201188e19f1 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
deleted file mode 100644
index 79d5726192a6..000000000000
--- a/svx/source/svdraw/svdstr.src
+++ /dev/null
@@ -1,2304 +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 "svx/svdstr.hrc"
-
-String STR_ObjNameSingulNONE
-{
-    Text [ en-US ] = "Drawing object" ;
-};
-String STR_ObjNamePluralNONE
-{
-    Text [ en-US ] = "Drawing objects" ;
-};
-
-String STR_ObjNameSingulGRUP
-{
-    Text [ en-US ] = "Group object" ;
-};
-String STR_ObjNamePluralGRUP
-{
-    Text [ en-US ] = "Group objects" ;
-};
-String STR_ObjNameSingulGRUPEMPTY
-{
-    Text [ en-US ] = "Blank group object" ;
-};
-String STR_ObjNamePluralGRUPEMPTY
-{
-    Text [ en-US ] = "Blank group objects" ;
-};
-
-String STR_ObjNameSingulLINE
-{
-    Text [ en-US ] = "Line" ;
-};
-String STR_ObjNameSingulLINE_Hori
-{
-    Text [ en-US ] = "Horizontal line" ;
-};
-String STR_ObjNameSingulLINE_Vert
-{
-    Text [ en-US ] = "Vertical line" ;
-};
-String STR_ObjNameSingulLINE_Diag
-{
-    Text [ en-US ] = "Diagonal line" ;
-};
-String STR_ObjNamePluralLINE
-{
-    Text [ en-US ] = "Lines" ;
-};
-String STR_ObjNameSingulRECT
-{
-    Text [ en-US ] = "Rectangle" ;
-};
-String STR_ObjNamePluralRECT
-{
-    Text [ en-US ] = "Rectangles" ;
-};
-String STR_ObjNameSingulQUAD
-{
-    Text [ en-US ] = "Square" ;
-};
-String STR_ObjNamePluralQUAD
-{
-    Text [ en-US ] = "Squares" ;
-};
-String STR_ObjNameSingulPARAL
-{
-    Text [ en-US ] = "Parallelogram" ;
-};
-String STR_ObjNamePluralPARAL
-{
-    Text [ en-US ] = "Parallelograms" ;
-};
-String STR_ObjNameSingulRAUTE
-{
-    Text [ en-US ] = "Rhombus" ;
-};
-String STR_ObjNamePluralRAUTE
-{
-    Text [ en-US ] = "Rhombuses" ;
-};
-String STR_ObjNameSingulRECTRND
-{
-    Text [ en-US ] = "Rounded rectangle" ;
-};
-String STR_ObjNamePluralRECTRND
-{
-    Text [ en-US ] = "Rounded Rectangles" ;
-};
-String STR_ObjNameSingulQUADRND
-{
-    Text [ en-US ] = "rounded square" ;
-};
-String STR_ObjNamePluralQUADRND
-{
-    Text [ en-US ] = "Rounded Squares" ;
-};
-String STR_ObjNameSingulPARALRND
-{
-    Text [ en-US ] = "Rounded Parallelogram" ;
-};
-String STR_ObjNamePluralPARALRND
-{
-    Text [ en-US ] = "Rounded parallelograms" ;
-};
-String STR_ObjNameSingulRAUTERND
-{
-    Text [ en-US ] = "rounded rhombus" ;
-};
-String STR_ObjNamePluralRAUTERND
-{
-    Text [ en-US ] = "Rounded rhombuses" ;
-};
-String STR_ObjNameSingulCIRC
-{
-    Text [ en-US ] = "Circle" ;
-};
-String STR_ObjNamePluralCIRC
-{
-    Text [ en-US ] = "Circles" ;
-};
-String STR_ObjNameSingulSECT
-{
-    Text [ en-US ] = "Circle sector" ;
-};
-String STR_ObjNamePluralSECT
-{
-    Text [ en-US ] = "Circle sectors" ;
-};
-String STR_ObjNameSingulCARC
-{
-    Text [ en-US ] = "Arc" ;
-};
-String STR_ObjNamePluralCARC
-{
-    Text [ en-US ] = "Arcs" ;
-};
-String STR_ObjNameSingulCCUT
-{
-    Text [ en-US ] = "Circle segment" ;
-};
-String STR_ObjNamePluralCCUT
-{
-    Text [ en-US ] = "Circle segments" ;
-};
-String STR_ObjNameSingulCIRCE
-{
-    Text [ en-US ] = "Ellipse" ;
-};
-String STR_ObjNamePluralCIRCE
-{
-    Text [ en-US ] = "Ellipses" ;
-};
-String STR_ObjNameSingulSECTE
-{
-    Text [ en-US ] = "Ellipse Pie" ;
-};
-String STR_ObjNamePluralSECTE
-{
-    Text [ en-US ] = "Ellipse Pies" ;
-};
-String STR_ObjNameSingulCARCE
-{
-    Text [ en-US ] = "Elliptical arc" ;
-};
-String STR_ObjNamePluralCARCE
-{
-    Text [ en-US ] = "Elliptical arcs" ;
-};
-String STR_ObjNameSingulCCUTE
-{
-    Text [ en-US ] = "Ellipse Segment" ;
-};
-String STR_ObjNamePluralCCUTE
-{
-    Text [ en-US ] = "Ellipse Segments" ;
-};
-
-String STR_ObjNameSingulPOLY
-{
-    Text [ en-US ] = "Polygon" ;
-};
-String STR_ObjNameSingulPOLY_PointCount
-{
-    Text [ en-US ] = "Polygon %2 corners" ;
-};
-String STR_ObjNamePluralPOLY
-{
-    Text [ en-US ] = "Polygons" ;
-};
-String STR_ObjNameSingulPLIN
-{
-    Text [ en-US ] = "Polyline" ;
-};
-String STR_ObjNameSingulPLIN_PointCount
-{
-    Text [ en-US ] = "Polyline with %2 corners" ;
-};
-String STR_ObjNamePluralPLIN
-{
-    Text [ en-US ] = "Polylines" ;
-};
-String STR_ObjNameSingulPATHLINE
-{
-    Text [ en-US ] = "Bézier curve" ;
-};
-String STR_ObjNamePluralPATHLINE
-{
-    Text [ en-US ] = "Bézier curves" ;
-};
-String STR_ObjNameSingulPATHFILL
-{
-    Text [ en-US ] = "Bézier curve" ;
-};
-String STR_ObjNamePluralPATHFILL
-{
-    Text [ en-US ] = "Bézier curves" ;
-};
-String STR_ObjNameSingulFREELINE
-{
-    Text [ en-US ] = "Freeform Line" ;
-};
-String STR_ObjNamePluralFREELINE
-{
-    Text [ en-US ] = "Freeform Lines" ;
-};
-String STR_ObjNameSingulFREEFILL
-{
-    Text [ en-US ] = "Freeform Line" ;
-};
-String STR_ObjNamePluralFREEFILL
-{
-    Text [ en-US ] = "Freeform Lines" ;
-};
-String STR_ObjNameSingulCOMBLINE
-{
-    Text [ en-US ] = "Curve" ;
-};
-
-String STR_ObjNameSingulNATSPLN
-{
-    Text [ en-US ] = "Natural Spline" ;
-};
-String STR_ObjNamePluralNATSPLN
-{
-    Text [ en-US ] = "Natural Splines" ;
-};
-String STR_ObjNameSingulPERSPLN
-{
-    Text [ en-US ] = "Periodic Spline" ;
-};
-String STR_ObjNamePluralPERSPLN
-{
-    Text [ en-US ] = "Periodic Splines" ;
-};
-
-String STR_ObjNameSingulTEXT
-{
-    Text [ en-US ] = "Text Frame" ;
-};
-String STR_ObjNamePluralTEXT
-{
-    Text [ en-US ] = "Text Frame" ;
-};
-String STR_ObjNameSingulTEXTLNK
-{
-    Text [ en-US ] = "Linked text frame" ;
-};
-String STR_ObjNamePluralTEXTLNK
-{
-    Text [ en-US ] = "Linked text frames" ;
-};
-String STR_ObjNameSingulTITLETEXT
-{
-    Text [ en-US ] = "Title text" ;
-};
-String STR_ObjNamePluralTITLETEXT
-{
-    Text [ en-US ] = "Title texts" ;
-};
-String STR_ObjNameSingulOUTLINETEXT
-{
-    Text [ en-US ] = "Outline Text" ;
-};
-String STR_ObjNamePluralOUTLINETEXT
-{
-    Text [ en-US ] = "Outline Texts" ;
-};
-
-String STR_ObjNameSingulGRAF
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_ObjNamePluralGRAF
-{
-    Text [ en-US ] = "Images" ;
-};
-String STR_ObjNameSingulGRAFLNK
-{
-    Text [ en-US ] = "Linked image" ;
-};
-String STR_ObjNamePluralGRAFLNK
-{
-    Text [ en-US ] = "Linked images" ;
-};
-String STR_ObjNameSingulGRAFNONE
-{
-    Text [ en-US ] = "Blank image object" ;
-};
-String STR_ObjNamePluralGRAFNONE
-{
-    Text [ en-US ] = "Blank image objects" ;
-};
-String STR_ObjNameSingulGRAFNONELNK
-{
-    Text [ en-US ] = "Blank linked image" ;
-};
-String STR_ObjNamePluralGRAFNONELNK
-{
-    Text [ en-US ] = "Blank linked images" ;
-};
-String STR_ObjNameSingulGRAFMTF
-{
-    Text [ en-US ] = "Metafile" ;
-};
-String STR_ObjNamePluralGRAFMTF
-{
-    Text [ en-US ] = "Metafiles" ;
-};
-String STR_ObjNameSingulGRAFMTFLNK
-{
-    Text [ en-US ] = "Linked Metafile" ;
-};
-String STR_ObjNamePluralGRAFMTFLNK
-{
-    Text [ en-US ] = "Linked Metafiles" ;
-};
-String STR_ObjNameSingulGRAFBMP
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_ObjNameSingulGRAFBMPTRANS
-{
-    Text [ en-US ] = "Image with transparency" ;
-};
-String STR_ObjNameSingulGRAFBMPLNK
-{
-    Text [ en-US ] = "Linked Image" ;
-};
-String STR_ObjNameSingulGRAFBMPTRANSLNK
-{
-    Text [ en-US ] = "Linked image with transparency" ;
-};
-String STR_ObjNamePluralGRAFBMP
-{
-    Text [ en-US ] = "Images" ;
-};
-String STR_ObjNamePluralGRAFBMPTRANS
-{
-    Text [ en-US ] = "Images with transparency" ;
-};
-String STR_ObjNamePluralGRAFBMPLNK
-{
-    Text [ en-US ] = "Linked images" ;
-};
-String STR_ObjNamePluralGRAFBMPTRANSLNK
-{
-    Text [ en-US ] = "Linked images with transparency" ;
-};
-String STR_ObjNameSingulCUSTOMSHAPE
-{
-    Text [ en-US ] =  "Shape";
-};
-String STR_ObjNamePluralCUSTOMSHAPE
-{
-    Text [ en-US ] =  "Shapes";
-};
-
-// Vector Data support
-String STR_ObjNameSingulGRAFSVG
-{
-    Text [ en-US ] = "SVG" ;
-};
-String STR_ObjNamePluralGRAFSVG
-{
-    Text [ en-US ] = "SVGs" ;
-};
-String STR_ObjNameSingulGRAFWMF
-{
-    Text [ en-US ] = "WMF" ;
-};
-String STR_ObjNamePluralGRAFWMF
-{
-    Text [ en-US ] = "WMFs" ;
-};
-String STR_ObjNameSingulGRAFEMF
-{
-    Text [ en-US ] = "EMF" ;
-};
-String STR_ObjNamePluralGRAFEMF
-{
-    Text [ en-US ] = "EMFs" ;
-};
-
-String STR_ObjNameSingulOLE2
-{
-    Text [ en-US ] = "embedded object (OLE)" ;
-};
-String STR_ObjNamePluralOLE2
-{
-    Text [ en-US ] = "Embedded objects (OLE)" ;
-};
-String STR_ObjNameSingulUno
-{
-    Text [ en-US ] = "Control";
-};
-String STR_ObjNamePluralUno
-{
-    Text [ en-US ] = "Controls";
-};
-
-String STR_ObjNameSingulFrame
-{
-    Text [ en-US ] = "Frame" ;
-};
-String STR_ObjNamePluralFrame
-{
-    Text [ en-US ] = "Frames" ;
-};
-
-String STR_ObjNameSingulEDGE
-{
-    Text [ en-US ] = "Object Connectors" ;
-};
-String STR_ObjNamePluralEDGE
-{
-    Text [ en-US ] = "Object Connectors" ;
-};
-String STR_ObjNameSingulCAPTION
-{
-    Text [ en-US ] = "Callout" ;
-};
-String STR_ObjNamePluralCAPTION
-{
-    Text [ en-US ] = "Callouts" ;
-};
-
-String STR_ObjNameSingulPAGE
-{
-    Text [ en-US ] = "Preview object" ;
-};
-String STR_ObjNamePluralPAGE
-{
-    Text [ en-US ] = "Preview objects" ;
-};
-String STR_ObjNameSingulMEASURE
-{
-    Text [ en-US ] = "Dimension line" ;
-};
-String STR_ObjNamePluralMEASURE
-{
-    Text [ en-US ] = "Dimensioning objects" ;
-};
-String STR_ObjNamePlural
-{
-    Text [ en-US ] = "Drawing objects" ;
-};
-String STR_ObjNameNoObj
-{
-    Text [ en-US ] = "No draw object" ;
-};
-String STR_ObjNameSingulPlural
-{
-    Text [ en-US ] = "Draw object(s)" ;
-};
-
-// New in 537: names for 3D objects
-String STR_ObjNameSingulCube3d
-{
-    Text [ en-US ] = "3D cube";
-};
-
-String STR_ObjNamePluralCube3d
-{
-    Text [ en-US ] = "3D cubes";
-};
-
-String STR_ObjNameSingulExtrude3d
-{
-    Text [ en-US ] = "Extrusion object";
-};
-
-String STR_ObjNamePluralExtrude3d
-{
-    Text [ en-US ] = "Extrusion objects";
-};
-
-String STR_ObjNameSingulLathe3d
-{
-    Text [ en-US ] = "Rotation object";
-};
-
-String STR_ObjNamePluralLathe3d
-{
-    Text [ en-US ] = "Rotation objects";
-};
-
-String STR_ObjNameSingulObj3d
-{
-    Text [ en-US ] = "3D object";
-};
-
-String STR_ObjNamePluralObj3d
-{
-    Text [ en-US ] = "3D objects";
-};
-
-String STR_ObjNameSingulScene3d
-{
-    Text [ en-US ] = "3D scene";
-};
-
-String STR_ObjNamePluralScene3d
-{
-    Text [ en-US ] = "3D scenes";
-};
-
-String STR_ObjNameSingulSphere3d
-{
-    Text [ en-US ] = "Sphere";
-};
-
-String STR_ObjNamePluralSphere3d
-{
-    Text [ en-US ] = "Spheres";
-};
-
-String STR_EditWithCopy
-{
-    Text [ en-US ] = "with copy" ;
-};
-String STR_EditPosSize
-{
-    Text [ en-US ] = "Set position and size for %1" ;
-};
-String STR_EditDelete
-{
-    Text [ en-US ] = "Delete %1" ;
-};
-String STR_EditMovToTop
-{
-    Text [ en-US ] = "Move %1 forward" ;
-};
-String STR_EditMovToBtm
-{
-    Text [ en-US ] = "Move %1 further back" ;
-};
-String STR_EditPutToTop
-{
-    Text [ en-US ] = "Move %1 to front" ;
-};
-String STR_EditPutToBtm
-{
-    Text [ en-US ] = "Move %1 to back" ;
-};
-String STR_EditRevOrder
-{
-    Text [ en-US ] = "Reverse order of %1" ;
-};
-String STR_EditMove
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_EditResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_EditRotate
-{
-    Text [ en-US ] = "Rotate %1" ;
-};
-String STR_EditMirrorHori
-{
-    Text [ en-US ] = "Flip %1 horizontal" ;
-};
-String STR_EditMirrorVert
-{
-    Text [ en-US ] = "Flip %1 vertical" ;
-};
-String STR_EditMirrorDiag
-{
-    Text [ en-US ] = "Flip %1 diagonal" ;
-};
-String STR_EditMirrorFree
-{
-    Text [ en-US ] = "Flip %1 freehand" ;
-};
-String STR_EditShear
-{
-    Text [ en-US ] = "Distort %1 (slant)" ;
-};
-String STR_EditCrook
-{
-    Text [ en-US ] = "Arrange %1 in circle" ;
-};
-String STR_EditCrookContortion
-{
-    Text [ en-US ] = "Curve %1 in circle" ;
-};
-String STR_EditDistort
-{
-    Text [ en-US ] = "Distort %1" ;
-};
-String STR_EditRipUp
-{
-    Text [ en-US ] = "Undo %1" ;
-};
-String STR_EditSetPointsSmooth
-{
-    Text [ en-US ] = "Modify bézier properties of %1" ;
-};
-String STR_EditSetSegmentsKind
-{
-    Text [ en-US ] = "Modify bézier properties of %1" ;
-};
-String STR_EditSetGlueEscDir
-{
-    Text [ en-US ] = "Set exit direction for %1" ;
-};
-String STR_EditSetGluePercent
-{
-    Text [ en-US ] = "Set relative attribute at %1" ;
-};
-String STR_EditSetGlueAlign
-{
-    Text [ en-US ] = "Set reference point for %1" ;
-};
-String STR_EditGroup
-{
-    Text [ en-US ] = "Group %1" ;
-};
-String STR_EditUngroup
-{
-    Text [ en-US ] = "Ungroup %1" ;
-};
-String STR_EditSetAttributes
-{
-    Text [ en-US ] = "Apply attributes to %1" ;
-};
-String STR_EditSetStylesheet
-{
-    Text [ en-US ] = "Apply Styles to %1" ;
-};
-String STR_EditDelStylesheet
-{
-    Text [ en-US ] = "Remove Style from %1" ;
-};
-String STR_EditConvToPoly
-{
-    Text [ en-US ] = "Convert %1 to polygon" ;
-};
-String STR_EditConvToPolys
-{
-    Text [ en-US ] = "Convert %1 to polygons" ;
-};
-String STR_EditConvToCurve
-{
-    Text [ en-US ] = "Convert %1 to curve" ;
-};
-String STR_EditConvToCurves
-{
-    Text [ en-US ] = "Convert %1 to curves" ;
-};
-String STR_EditConvToContour
-{
-    Text [ en-US ] = "Convert %1 to contour";
-};
-String STR_EditConvToContours
-{
-    Text [ en-US ] = "Convert %1 to contours";
-};
-String STR_EditAlign
-{
-    Text [ en-US ] = "Align %1" ;
-};
-String STR_EditAlignVTop
-{
-    Text [ en-US ] = "Align %1 to top" ;
-};
-String STR_EditAlignVBottom
-{
-    Text [ en-US ] = "Align %1 to bottom" ;
-};
-String STR_EditAlignVCenter
-{
-    Text [ en-US ] = "Horizontally center %1" ;
-};
-String STR_EditAlignHLeft
-{
-    Text [ en-US ] = "Align %1 to left" ;
-};
-String STR_EditAlignHRight
-{
-    Text [ en-US ] = "Align %1 to right" ;
-};
-String STR_EditAlignHCenter
-{
-    Text [ en-US ] = "Vertically center %1" ;
-};
-String STR_EditAlignCenter
-{
-    Text [ en-US ] = "Center %1" ;
-};
-String STR_EditTransform
-{
-    Text [ en-US ] = "Transform %1" ;
-};
-String STR_EditCombine_PolyPoly
-{
-    Text [ en-US ] = "Combine %1" ;
-};
-String STR_EditMergeMergePoly
-{
-    Text [ en-US ] = "Merge %1";
-};
-String STR_EditMergeSubstractPoly
-{
-    Text [ en-US ] = "Subtract %1";
-};
-String STR_EditMergeIntersectPoly
-{
-    Text [ en-US ] = "Intersect %1";
-};
-String STR_DistributeMarkedObjects
-{
-    Text [ en-US ] = "Distribute selected objects";
-};
-String STR_EqualizeWidthMarkedObjects
-{
-    Text [ en-US ] = "Equalize Width %1";
-};
-String STR_EqualizeHeightMarkedObjects
-{
-    Text [ en-US ] = "Equalize Height %1";
-};
-String STR_EditCombine_OnePoly
-{
-    Text [ en-US ] = "Combine %1" ;
-};
-String STR_EditDismantle_Polys
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_EditDismantle_Lines
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_EditImportMtf
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_ExchangePaste
-{
-    Text [ en-US ] = "Insert object(s)" ;
-};
-String STR_DragInsertPoint
-{
-    Text [ en-US ] = "Insert point to %1" ;
-};
-String STR_DragInsertGluePoint
-{
-    Text [ en-US ] = "Insert glue point to %1" ;
-};
-String STR_DragMethMovHdl
-{
-    Text [ en-US ] = "Move reference-point" ;
-};
-String STR_DragMethObjOwn
-{
-    Text [ en-US ] = "Geometrically change %1" ;
-};
-String STR_DragMethMove
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_DragMethResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_DragMethRotate
-{
-    Text [ en-US ] = "Rotate %1" ;
-};
-String STR_DragMethMirrorHori
-{
-    Text [ en-US ] = "Flip %1 horizontal" ;
-};
-String STR_DragMethMirrorVert
-{
-    Text [ en-US ] = "Flip %1 vertical" ;
-};
-String STR_DragMethMirrorDiag
-{
-    Text [ en-US ] = "Flip %1 diagonal" ;
-};
-String STR_DragMethMirrorFree
-{
-    Text [ en-US ] = "Flip %1 freehand" ;
-};
-String STR_DragMethGradient
-{
-    Text [ en-US ] = "Interactive gradient for %1";
-};
-String STR_DragMethTransparence
-{
-    Text [ en-US ] = "Interactive transparency for %1";
-};
-String STR_DragMethShear
-{
-    Text [ en-US ] = "Distort %1 (slant)" ;
-};
-String STR_DragMethCrook
-{
-    Text [ en-US ] = "Arrange %1 in circle" ;
-};
-String STR_DragMethCrookContortion
-{
-    Text [ en-US ] = "Curve %1 in circle" ;
-};
-String STR_DragMethDistort
-{
-    Text [ en-US ] = "Distort %1" ;
-};
-String STR_DragMethCrop
-{
-    Text [ en-US ] = "Crop %1" ;
-};
-
-String STR_DragRectEckRad
-{
-    Text [ en-US ] = "Alter radius by %1" ;
-};
-String STR_DragPathObj
-{
-    Text [ en-US ] = "Change %1" ;
-};
-String STR_DragRectResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_DragCaptFram
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_DragCaptTail
-{
-    Text [ en-US ] = "Move end point of %1" ;
-};
-String STR_DragCircAngle
-{
-    Text [ en-US ] = "Adjust angle by %1" ;
-};
-String STR_DragEdgeTail
-{
-    Text [ en-US ] = "Change %1" ;
-};
-String STR_ViewTextEdit
-{
-    Text [ en-US ] = "TextEdit: Paragraph %1, Row %2, Column %3" ;
-};
-String STR_ViewMarked
-{
-    Text [ en-US ] = "%1 selected" ;
-};
-String STR_ViewMarkedPoint
-{
-    Text [ en-US ] = "Point from %1" ;
-};
-String STR_ViewMarkedPoints
-{
-    Text [ en-US ] = "%2 points from %1" ;
-};
-String STR_ViewMarkedGluePoint
-{
-    Text [ en-US ] = "Glue point from %1" ;
-};
-String STR_ViewMarkedGluePoints
-{
-    Text [ en-US ] = "%2 glue points from %1" ;
-};
-String STR_ViewMarkObjs
-{
-    Text [ en-US ] = "Mark objects" ;
-};
-String STR_ViewMarkMoreObjs
-{
-    Text [ en-US ] = "Mark additional objects" ;
-};
-String STR_ViewMarkPoints
-{
-    Text [ en-US ] = "Mark points" ;
-};
-String STR_ViewMarkMorePoints
-{
-    Text [ en-US ] = "Mark additional points" ;
-};
-String STR_ViewMarkGluePoints
-{
-    Text [ en-US ] = "Mark glue points" ;
-};
-String STR_ViewMarkMoreGluePoints
-{
-    Text [ en-US ] = "Mark additional glue points" ;
-};
-String STR_ViewCreateObj
-{
-    Text [ en-US ] = "Create %1" ;
-};
-String STR_UndoInsertObj
-{
-    Text [ en-US ] = "Insert %1" ;
-};
-String STR_UndoCopyObj
-{
-    Text [ en-US ] = "Copy %1" ;
-};
-String STR_UndoObjOrdNum
-{
-    Text [ en-US ] = "Change object order of %1" ;
-};
-String STR_UndoObjSetText
-{
-    Text [ en-US ] = "Edit text of %1" ;
-};
-String STR_UndoNewPage
-{
-    Text [ en-US ] = "Insert page" ;
-};
-String STR_UndoDelPage
-{
-    Text [ en-US ] = "Delete page" ;
-};
-String STR_UndoCopPage
-{
-    Text [ en-US ] = "Copy page" ;
-};
-String STR_UndoMovPage
-{
-    Text [ en-US ] = "Change order of pages" ;
-};
-String STR_UndoDelPageMasterDscr
-{
-    Text [ en-US ] = "Clear background page assignment" ;
-};
-String STR_UndoChgPageMasterDscr
-{
-    Text [ en-US ] = "Change background page assignment" ;
-};
-String STR_UndoMergeModel
-{
-    Text [ en-US ] = "Insert document" ;
-};
-String STR_UndoNewLayer
-{
-    Text [ en-US ] = "Insert Layer" ;
-};
-String STR_UndoDelLayer
-{
-    Text [ en-US ] = "Delete layer" ;
-};
-String STR_UndoMovLayer
-{
-    Text [ en-US ] = "Change order of layers" ;
-};
-// Undo/Redo for setting object's name (#i73249#)
-String STR_UndoObjName
-{
-    Text [ en-US ] = "Change object name of %1 to" ;
-};
-String STR_UndoObjTitle
-{
-    Text [ en-US ] = "Change object title of %1" ;
-};
-String STR_UndoObjDescription
-{
-    Text [ en-US ] = "Change object description of %1" ;
-};
-String STR_StandardLayerName
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String STR_ItemValON
-{
-    Text [ en-US ] = "on" ;
-};
-String STR_ItemValOFF
-{
-    Text [ en-US ] = "off" ;
-};
-String STR_ItemValYES
-{
-    Text [ en-US ] = "yes" ;
-};
-String STR_ItemValNO
-{
-    Text [ en-US ] = "No" ;
-};
-
-String STR_ItemValCAPTIONTYPE1
-{
-    Text [ en-US ] = "Type 1" ;
-};
-String STR_ItemValCAPTIONTYPE2
-{
-    Text [ en-US ] = "Type 2" ;
-};
-String STR_ItemValCAPTIONTYPE3
-{
-    Text [ en-US ] = "Type 3" ;
-};
-String STR_ItemValCAPTIONTYPE4
-{
-    Text [ en-US ] = "Type 4" ;
-};
-String STR_ItemValCAPTIONESCHORI
-{
-    Text [ en-US ] = "Horizontal" ;
-};
-String STR_ItemValCAPTIONESCVERT
-{
-    Text [ en-US ] = "Vertical" ;
-};
-String STR_ItemValCAPTIONESCBESTFIT
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
-String STR_ItemValFITTOSIZENONE
-{
-    Text [ en-US ] = "Off" ;
-};
-String STR_ItemValFITTOSIZEPROP
-{
-    Text [ en-US ] = "Proportional" ;
-};
-String STR_ItemValFITTOSIZEALLLINES
-{
-    Text [ en-US ] = "Fit to size (all rows separately) " ;
-};
-String STR_ItemValFITTOSIZERESIZEAT
-{
-    Text [ en-US ] = "Use hard attributes" ;
-};
-
-String STR_ItemValTEXTVADJTOP
-{
-    Text [ en-US ] = "Top" ;
-};
-String STR_ItemValTEXTVADJCENTER
-{
-    Text [ en-US ] = "Center" ;
-};
-String STR_ItemValTEXTVADJBOTTOM
-{
-    Text [ en-US ] = "Bottom" ;
-};
-String STR_ItemValTEXTVADJBLOCK
-{
-    Text [ en-US ] = "Use entire height" ;
-};
-String STR_ItemValTEXTVADJSTRETCH
-{
-    Text [ en-US ] = "Stretched" ;
-};
-String STR_ItemValTEXTHADJLEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String STR_ItemValTEXTHADJCENTER
-{
-    Text [ en-US ] = "Center" ;
-};
-String STR_ItemValTEXTHADJRIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String STR_ItemValTEXTHADJBLOCK
-{
-    Text [ en-US ] = "Use entire width" ;
-};
-String STR_ItemValTEXTHADJSTRETCH
-{
-    Text [ en-US ] = "Stretched" ;
-};
-
-String STR_ItemValTEXTANI_NONE
-{
-    Text [ en-US ] = "off" ;
-};
-String STR_ItemValTEXTANI_BLINK
-{
-    Text [ en-US ] = "flash" ;
-};
-String STR_ItemValTEXTANI_SCROLL
-{
-    Text [ en-US ] = "Scroll Through" ;
-};
-String STR_ItemValTEXTANI_ALTERNATE
-{
-    Text [ en-US ] = "alternating" ;
-};
-String STR_ItemValTEXTANI_SLIDE
-{
-    Text [ en-US ] = "Scroll In" ;
-};
-String STR_ItemValTEXTANI_LEFT
-{
-    Text [ en-US ] = "left" ;
-};
-String STR_ItemValTEXTANI_UP
-{
-    Text [ en-US ] = "up" ;
-};
-String STR_ItemValTEXTANI_RIGHT
-{
-    Text [ en-US ] = "right" ;
-};
-String STR_ItemValTEXTANI_DOWN
-{
-    Text [ en-US ] = "down" ;
-};
-
-String STR_ItemValEDGE_ORTHOLINES
-{
-    Text [ en-US ] = "Standard Connector" ;
-};
-String STR_ItemValEDGE_THREELINES
-{
-    Text [ en-US ] = "Line Connector" ;
-};
-String STR_ItemValEDGE_ONELINE
-{
-    Text [ en-US ] = "Straight Connector" ;
-};
-String STR_ItemValEDGE_BEZIER
-{
-    Text [ en-US ] = "Curved Connector" ;
-};
-
-String STR_ItemValMEASURE_STD
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_ItemValMEASURE_RADIUS
-{
-    Text [ en-US ] = "Radius" ;
-};
-String STR_ItemValMEASURE_TEXTHAUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
-String STR_ItemValMEASURE_TEXTLEFTOUTSIDE
-{
-    Text [ en-US ] = "left outside" ;
-};
-String STR_ItemValMEASURE_TEXTINSIDE
-{
-    Text [ en-US ] = "inside (centered)" ;
-};
-String STR_ItemValMEASURE_TEXTRIGHTOUTSID
-{
-    Text [ en-US ] = "right outside" ;
-};
-String STR_ItemValMEASURE_TEXTVAUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
-String STR_ItemValMEASURE_ABOVE
-{
-    Text [ en-US ] = "on the line" ;
-};
-String STR_ItemValMEASURETEXT_BREAKEDLINE
-{
-    Text [ en-US ] = "broken line" ;
-};
-String STR_ItemValMEASURE_BELOW
-{
-    Text [ en-US ] = "below the line" ;
-};
-String STR_ItemValMEASURETEXT_VERTICALCEN
-{
-    Text [ en-US ] = "centered" ;
-};
-
-String STR_ItemValCIRC_FULL
-{
-    Text [ en-US ] = "full circle" ;
-};
-String STR_ItemValCIRC_SECT
-{
-    Text [ en-US ] = "Circle Pie" ;
-};
-String STR_ItemValCIRC_CUT
-{
-    Text [ en-US ] = "Circle segment" ;
-};
-String STR_ItemValCIRC_ARC
-{
-    Text [ en-US ] = "Arc" ;
-};
-
-// Strings for the templates dialog
-String SIP_UNKNOWN_ATTR
-{
-    Text [ en-US ] = "Unknown attribute";
-};
-
-// Strings for the templates dialog
-String SIP_XA_LINESTYLE
-{
-    Text [ en-US ] = "Line style";
-};
-
-String SIP_XA_LINEDASH
-{
-    Text [ en-US ] = "Line pattern";
-};
-
-String SIP_XA_LINEWIDTH
-{
-    Text [ en-US ] = "Line width";
-};
-
-String SIP_XA_LINECOLOR
-{
-    Text [ en-US ] = "Line color";
-};
-
-String SIP_XA_LINESTART
-{
-    Text [ en-US ] = "Line head";
-};
-
-String SIP_XA_LINEEND
-{
-    Text [ en-US ] = "Line end";
-};
-
-String SIP_XA_LINESTARTWIDTH
-{
-    Text [ en-US ] = "Line head width";
-};
-
-String SIP_XA_LINEENDWIDTH
-{
-    Text [ en-US ] = "Line end width";
-};
-
-String SIP_XA_LINESTARTCENTER
-{
-    Text [ en-US ] = "Center arrowhead";
-};
-
-String SIP_XA_LINEENDCENTER
-{
-    Text [ en-US ] = "Center arrowend";
-};
-
-String SIP_XA_LINETRANSPARENCE
-{
-    Text [ en-US ] = "Line transparency";
-};
-
-String SIP_XA_LINEJOINT
-{
-    Text [ en-US ] = "Line joint";
-};
-
-String SIP_XATTRSET_LINE
-{
-    Text [ en-US ] = "Line attributes";
-};
-
-String SIP_XA_FILLSTYLE
-{
-    Text [ en-US ] = "Fill style";
-};
-
-String SIP_XA_FILLCOLOR
-{
-    Text [ en-US ] = "Fillcolor";
-};
-
-String SIP_XA_FILLGRADIENT
-{
-    Text [ en-US ] = "Gradient";
-};
-
-String SIP_XA_FILLHATCH
-{
-    Text [ en-US ] = "Hatching";
-};
-
-String SIP_XA_FILLBITMAP
-{
-    Text [ en-US ] = "Fillbitmap";
-};
-
-String SIP_XA_FILLTRANSPARENCE
-{
-    Text [ en-US ] = "Transparency";
-};
-
-String SIP_XA_GRADIENTSTEPCOUNT
-{
-    Text [ en-US ] = "Number of gradient steps";
-};
-
-String SIP_XA_FILLBMP_TILE
-{
-    Text [ en-US ] = "Tile fill";
-};
-
-String SIP_XA_FILLBMP_POS
-{
-    Text [ en-US ] = "Fillbitmap position";
-};
-
-String SIP_XA_FILLBMP_SIZEX
-{
-    Text [ en-US ] = "Fillbitmap width";
-};
-
-String SIP_XA_FILLBMP_SIZEY
-{
-    Text [ en-US ] = "Height of fillbitmap";
-};
-
-String SIP_XA_FILLFLOATTRANSPARENCE
-{
-    Text [ en-US ] = "Transparent gradient";
-};
-
-String SIP_XA_SECONDARYFILLCOLOR
-{
-    Text [ en-US ] = "Fill reserved for 2";
-};
-
-String SIP_XA_FILLBMP_SIZELOG
-{
-    Text [ en-US ] = "Tile size not in %";
-};
-
-String SIP_XA_FILLBMP_TILEOFFSETX
-{
-    Text [ en-US ] = "Tile offset X in %";
-};
-
-String SIP_XA_FILLBMP_TILEOFFSETY
-{
-    Text [ en-US ] = "Tile offset Y in %";
-};
-
-String SIP_XA_FILLBMP_STRETCH
-{
-    Text [ en-US ] = "Bitmap scaling";
-};
-
-String SIP_XA_FILLBMP_POSOFFSETX
-{
-    Text [ en-US ] = "Tile position X in %";
-};
-
-String SIP_XA_FILLBMP_POSOFFSETY
-{
-    Text [ en-US ] = "Tile position Y in %";
-};
-
-String SIP_XA_FILLBACKGROUND
-{
-    Text [ en-US ] = "Background fill";
-};
-
-String SIP_XATTRSET_FILL
-{
-    Text [ en-US ] = "Area attributes";
-};
-
-String SIP_XA_FORMTXTSTYLE
-{
-    Text [ en-US ] = "Fontwork style";
-};
-
-String SIP_XA_FORMTXTADJUST
-{
-    Text [ en-US ] = "Fontwork alignment";
-};
-
-String SIP_XA_FORMTXTDISTANCE
-{
-    Text [ en-US ] = "Fontwork spacing";
-};
-
-String SIP_XA_FORMTXTSTART
-{
-    Text [ en-US ] = "Fontwork font begin";
-};
-
-String SIP_XA_FORMTXTMIRROR
-{
-    Text [ en-US ] = "Fontwork mirror";
-};
-
-String SIP_XA_FORMTXTOUTLINE
-{
-    Text [ en-US ] = "Fontwork outline";
-};
-
-String SIP_XA_FORMTXTSHADOW
-{
-    Text [ en-US ] = "Fontwork shadow";
-};
-
-String SIP_XA_FORMTXTSHDWCOLOR
-{
-    Text [ en-US ] = "Fontwork shadow color";
-};
-
-String SIP_XA_FORMTXTSHDWXVAL
-{
-    Text [ en-US ] = "Fontwork shadow offset X";
-};
-
-String SIP_XA_FORMTXTSHDWYVAL
-{
-    Text [ en-US ] = "Fontwork shadow offset Y";
-};
-
-String SIP_XA_FORMTXTHIDEFORM
-{
-    Text [ en-US ] = "Hide fontwork outline";
-};
-
-String SIP_XA_FORMTXTSHDWTRANSP
-{
-    Text [ en-US ] = "Fontwork shadow transparency";
-};
-
-String SIP_SA_SHADOW
-{
-    Text [ en-US ] = "Shadow";
-};
-
-String SIP_SA_SHADOWCOLOR
-{
-    Text [ en-US ] = "Shadow color";
-};
-
-String SIP_SA_SHADOWXDIST
-{
-    Text [ en-US ] = "Shadow spacing X";
-};
-
-String SIP_SA_SHADOWYDIST
-{
-    Text [ en-US ] = "Shadow spacing Y";
-};
-
-String SIP_SA_SHADOWTRANSPARENCE
-{
-    Text [ en-US ] = "Shadow transparency";
-};
-
-String SIP_SA_SHADOW3D
-{
-    Text [ en-US ] = "3D shadow";
-};
-
-String SIP_SA_SHADOWPERSP
-{
-    Text [ en-US ] = "Perspective shadow";
-};
-
-String SIP_SA_CAPTIONTYPE
-{
-    Text [ en-US ] = "Type of legend";
-};
-
-String SIP_SA_CAPTIONFIXEDANGLE
-{
-    Text [ en-US ] = "Fixed legend angle";
-};
-
-String SIP_SA_CAPTIONANGLE
-{
-    Text [ en-US ] = "Legend angle";
-};
-
-String SIP_SA_CAPTIONGAP
-{
-    Text [ en-US ] = "Legend lines spacing";
-};
-
-String SIP_SA_CAPTIONESCDIR
-{
-    Text [ en-US ] = "Legend exit alignment";
-};
-
-String SIP_SA_CAPTIONESCISREL
-{
-    Text [ en-US ] = "Relative exit legend";
-};
-
-String SIP_SA_CAPTIONESCREL
-{
-    Text [ en-US ] = "Relative exit legend";
-};
-
-String SIP_SA_CAPTIONESCABS
-{
-    Text [ en-US ] = "Absolute exit of legend";
-};
-
-String SIP_SA_CAPTIONLINELEN
-{
-    Text [ en-US ] = "Legend line length";
-};
-
-String SIP_SA_CAPTIONFITLINELEN
-{
-    Text [ en-US ] = "AutoLength of legend lines";
-};
-
-String SIP_SA_ECKENRADIUS
-{
-    Text [ en-US ] = "Corner radius";
-};
-
-String SIP_SA_TEXT_MINFRAMEHEIGHT
-{
-    Text [ en-US ] = "Minimal frame height";
-};
-
-String SIP_SA_TEXT_AUTOGROWHEIGHT
-{
-    Text [ en-US ] = "AutoFit height";
-};
-
-String SIP_SA_TEXT_FITTOSIZE
-{
-    Text [ en-US ] = "Fit text to frame";
-};
-
-String SIP_SA_TEXT_LEFTDIST
-{
-    Text [ en-US ] = "Left text frame spacing";
-};
-
-String SIP_SA_TEXT_RIGHTDIST
-{
-    Text [ en-US ] = "Right text frame spacing";
-};
-
-String SIP_SA_TEXT_UPPERDIST
-{
-    Text [ en-US ] = "Upper text frame spacing";
-};
-
-String SIP_SA_TEXT_LOWERDIST
-{
-    Text [ en-US ] = "Lower text frame spacing";
-};
-
-String SIP_SA_TEXT_VERTADJUST
-{
-    Text [ en-US ] = "Vertical text anchor";
-};
-
-String SIP_SA_TEXT_MAXFRAMEHEIGHT
-{
-    Text [ en-US ] = "Maximal frame height";
-};
-
-String SIP_SA_TEXT_MINFRAMEWIDTH
-{
-    Text [ en-US ] = "Minimal frame width";
-};
-
-String SIP_SA_TEXT_MAXFRAMEWIDTH
-{
-    Text [ en-US ] = "Maximal frame width";
-};
-
-String SIP_SA_TEXT_AUTOGROWWIDTH
-{
-    Text [ en-US ] = "AutoFit width";
-};
-
-String SIP_SA_TEXT_HORZADJUST
-{
-    Text [ en-US ] = "Horizontal text anchor";
-};
-
-String SIP_SA_TEXT_ANIKIND
-{
-    Text [ en-US ] = "Ticker";
-};
-
-String SIP_SA_TEXT_ANIDIRECTION
-{
-    Text [ en-US ] = "Ticker direction";
-};
-
-String SIP_SA_TEXT_ANISTARTINSIDE
-{
-    Text [ en-US ] = "Ticker start inside";
-};
-
-String SIP_SA_TEXT_ANISTOPINSIDE
-{
-    Text [ en-US ] = "Ticker stop inside";
-};
-
-String SIP_SA_TEXT_ANICOUNT
-{
-    Text [ en-US ] = "Number of ticker runs";
-};
-
-String SIP_SA_TEXT_ANIDELAY
-{
-    Text [ en-US ] = "Speed of ticker";
-};
-
-String SIP_SA_TEXT_ANIAMOUNT
-{
-    Text [ en-US ] = "Ticker step size";
-};
-
-String SIP_SA_TEXT_CONTOURFRAME
-{
-    Text [ en-US ] = "Outline text flow";
-};
-
-String SIP_SA_CUSTOMSHAPE_ADJUSTMENT
-{
-    Text[ en-US ] = "Shape Adjustment";
-};
-
-String SIP_SA_XMLATTRIBUTES
-{
-    Text [ en-US ] = "User-defined attributes";
-};
-
-String SIP_SA_TEXT_USEFIXEDCELLHEIGHT
-{
-    Text [ en-US ] = "Use font-independent line spacing";
-};
-
-String SIP_SA_WORDWRAP
-{
-    Text[ en-US ] = "Word wrap text in shape";
-};
-
-String SIP_SA_CHAINNEXTNAME
-{
-    Text[ en-US ] = "Next link in text chain";
-};
-
-String SIP_SA_EDGEKIND
-{
-    Text [ en-US ] = "Type of connector";
-};
-
-String SIP_SA_EDGENODE1HORZDIST
-{
-    Text [ en-US ] = "Horz. spacing object 1";
-};
-
-String SIP_SA_EDGENODE1VERTDIST
-{
-    Text [ en-US ] = "Vert. spacing object 1";
-};
-
-String SIP_SA_EDGENODE2HORZDIST
-{
-    Text [ en-US ] = "Horz. spacing object 2";
-};
-
-String SIP_SA_EDGENODE2VERTDIST
-{
-    Text [ en-US ] = "Vert. spacing object 2";
-};
-
-String SIP_SA_EDGENODE1GLUEDIST
-{
-    Text [ en-US ] = "Glue spacing object 1";
-};
-
-String SIP_SA_EDGENODE2GLUEDIST
-{
-    Text [ en-US ] = "Glue spacing object 2";
-};
-
-String SIP_SA_EDGELINEDELTAANZ
-{
-    Text [ en-US ] = "Number of movable lines";
-};
-
-String SIP_SA_EDGELINE1DELTA
-{
-    Text [ en-US ] = "Offset line 1";
-};
-
-String SIP_SA_EDGELINE2DELTA
-{
-    Text [ en-US ] = "Offset line 2";
-};
-
-String SIP_SA_EDGELINE3DELTA
-{
-    Text [ en-US ] = "Offset line 3";
-};
-
-String SIP_SA_MEASUREKIND
-{
-    Text [ en-US ] = "Type of dimensioning";
-};
-
-String SIP_SA_MEASURETEXTHPOS
-{
-    Text [ en-US ] = "Dimension value - horizontal position";
-};
-
-String SIP_SA_MEASURETEXTVPOS
-{
-    Text [ en-US ] = "Dimension value - vertical position";
-};
-
-String SIP_SA_MEASURELINEDIST
-{
-    Text [ en-US ] = "Dimension line space";
-};
-
-String SIP_SA_MEASUREHELPLINEOVERHANG
-{
-    Text [ en-US ] = "Dimension help line overhang";
-};
-
-String SIP_SA_MEASUREHELPLINEDIST
-{
-    Text [ en-US ] = "Dimension help line spacing";
-};
-
-String SIP_SA_MEASUREHELPLINE1LEN
-{
-    Text [ en-US ] = "Backlog of dimension help line 1";
-};
-
-String SIP_SA_MEASUREHELPLINE2LEN
-{
-    Text [ en-US ] = "Backlog of dimension help line 2";
-};
-
-String SIP_SA_MEASUREBELOWREFEDGE
-{
-    Text [ en-US ] = "Lower edge dimensioning";
-};
-
-String SIP_SA_MEASURETEXTROTA90
-{
-    Text [ en-US ] = "Dimension value across dimension line";
-};
-
-String SIP_SA_MEASURETEXTUPSIDEDOWN
-{
-    Text [ en-US ] = "Rotate dimension value by 180 degree";
-};
-
-String SIP_SA_MEASUREOVERHANG
-{
-    Text [ en-US ] = "Dimension line overhang";
-};
-
-String SIP_SA_MEASUREUNIT
-{
-    Text [ en-US ] = "Measure unit";
-};
-
-String SIP_SA_MEASURESCALE
-{
-    Text [ en-US ] = "Additional scale factor";
-};
-
-String SIP_SA_MEASURESHOWUNIT
-{
-    Text [ en-US ] = "Measure unit display";
-};
-
-String SIP_SA_MEASUREFORMATSTRING
-{
-    Text [ en-US ] = "Dimension value format";
-};
-
-String SIP_SA_MEASURETEXTAUTOANGLE
-{
-    Text [ en-US ] = "AutoPositioning of the dimension value";
-};
-
-String SIP_SA_MEASURETEXTAUTOANGLEVIEW
-{
-    Text [ en-US ] = "Angle for the automatic positioning of the dimension value";
-};
-
-String SIP_SA_MEASURETEXTISFIXEDANGLE
-{
-    Text [ en-US ] = "Determination of the dimension value angle";
-};
-
-String SIP_SA_MEASURETEXTFIXEDANGLE
-{
-    Text [ en-US ] = "Angle of the dimension value";
-};
-
-String SIP_SA_MEASUREDECIMALPLACES
-{
-    Text [ en-US ] = "Decimal places";
-};
-
-String SIP_SA_CIRCKIND
-{
-    Text [ en-US ] = "Type of circle";
-};
-
-String SIP_SA_CIRCSTARTANGLE
-{
-    Text [ en-US ] = "Start angle";
-};
-
-String SIP_SA_CIRCENDANGLE
-{
-    Text [ en-US ] = "End angle";
-};
-
-String SIP_SA_OBJMOVEPROTECT
-{
-    Text [ en-US ] = "Protected object position";
-};
-
-String SIP_SA_OBJSIZEPROTECT
-{
-    Text [ en-US ] = "Protected object size";
-};
-
-String SIP_SA_OBJPRINTABLE
-{
-    Text [ en-US ] = "Object, printable";
-};
-
-String SIP_SA_OBJVISIBLE
-{
-    Text [ en-US ] = "Object, visible";
-};
-
-String SIP_SA_LAYERID
-{
-    Text [ en-US ] = "Level ID";
-};
-
-String SIP_SA_LAYERNAME
-{
-    Text [ en-US ] = "Layer";
-};
-
-String SIP_SA_OBJECTNAME
-{
-    Text [ en-US ] = "Object name";
-};
-
-String SIP_SA_ALLPOSITIONX
-{
-    Text [ en-US ] = "Position X, complete";
-};
-
-String SIP_SA_ALLPOSITIONY
-{
-    Text [ en-US ] = "Position Y, complete";
-};
-
-String SIP_SA_ALLSIZEWIDTH
-{
-    Text [ en-US ] = "Total Width";
-};
-
-String SIP_SA_ALLSIZEHEIGHT
-{
-    Text [ en-US ] = "Height, complete";
-};
-
-String SIP_SA_ONEPOSITIONX
-{
-    Text [ en-US ] = "Single position X";
-};
-
-String SIP_SA_ONEPOSITIONY
-{
-    Text [ en-US ] = "Single position Y";
-};
-
-String SIP_SA_ONESIZEWIDTH
-{
-    Text [ en-US ] = "Single width";
-};
-
-String SIP_SA_ONESIZEHEIGHT
-{
-    Text [ en-US ] = "Single height";
-};
-
-String SIP_SA_LOGICSIZEWIDTH
-{
-    Text [ en-US ] = "Logical width";
-};
-
-String SIP_SA_LOGICSIZEHEIGHT
-{
-    Text [ en-US ] = "Logical height";
-};
-
-String SIP_SA_ROTATEANGLE
-{
-    Text [ en-US ] = "Single rotation angle";
-};
-
-String SIP_SA_SHEARANGLE
-{
-    Text [ en-US ] = "Single shear angle";
-};
-
-String SIP_SA_MOVEX
-{
-    Text [ en-US ] = "Move horizontally";
-};
-
-String SIP_SA_MOVEY
-{
-    Text [ en-US ] = "Move vertically";
-};
-
-String SIP_SA_RESIZEXONE
-{
-    Text [ en-US ] = "Resize X, single";
-};
-
-String SIP_SA_RESIZEYONE
-{
-    Text [ en-US ] = "Resize Y, single";
-};
-
-String SIP_SA_ROTATEONE
-{
-    Text [ en-US ] = "Single rotation";
-};
-
-String SIP_SA_HORZSHEARONE
-{
-    Text [ en-US ] = "Single horizontal shear";
-};
-
-String SIP_SA_VERTSHEARONE
-{
-    Text [ en-US ] = "Single vertical shear";
-};
-
-String SIP_SA_RESIZEXALL
-{
-    Text [ en-US ] = "Resize X, complete";
-};
-
-String SIP_SA_RESIZEYALL
-{
-    Text [ en-US ] = "Resize Y, complete";
-};
-
-String SIP_SA_ROTATEALL
-{
-    Text [ en-US ] = "Rotate all";
-};
-
-String SIP_SA_HORZSHEARALL
-{
-    Text [ en-US ] = "Shear horizontal, complete";
-};
-
-String SIP_SA_VERTSHEARALL
-{
-    Text [ en-US ] = "Shear vertical, complete";
-};
-
-String SIP_SA_TRANSFORMREF1X
-{
-    Text [ en-US ] = "Reference point 1 X";
-};
-
-String SIP_SA_TRANSFORMREF1Y
-{
-    Text [ en-US ] = "Reference point 1 Y";
-};
-
-String SIP_SA_TRANSFORMREF2X
-{
-    Text [ en-US ] = "Reference point 2 X";
-};
-
-String SIP_SA_TRANSFORMREF2Y
-{
-    Text [ en-US ] = "Reference point 2 Y";
-};
-
-String SIP_EE_PARA_HYPHENATE
-{
-    Text [ en-US ] = "Hyphenation";
-};
-
-String SIP_EE_PARA_BULLETSTATE
-{
-    Text [ en-US ] = "Display bullets";
-};
-
-String SIP_EE_PARA_OUTLLRSPACE
-{
-    Text [ en-US ] = "Numbering indents";
-};
-
-String SIP_EE_PARA_OUTLLEVEL
-{
-    Text [ en-US ] = "Numbering level";
-};
-
-String SIP_EE_PARA_BULLET
-{
-    Text [ en-US ] = "Bullets and Numberings";
-};
-
-String SIP_EE_PARA_LRSPACE
-{
-    Text [ en-US ] = "Indents";
-};
-
-String SIP_EE_PARA_ULSPACE
-{
-    Text [ en-US ] = "Paragraph spacing";
-};
-
-String SIP_EE_PARA_SBL
-{
-    Text [ en-US ] = "Line spacing";
-};
-
-String SIP_EE_PARA_JUST
-{
-    Text [ en-US ] = "Paragraph alignment";
-};
-
-String SIP_EE_PARA_TABS
-{
-    Text [ en-US ] = "Tabulators";
-};
-
-String SIP_EE_CHAR_COLOR
-{
-    Text [ en-US ] = "Font color";
-};
-
-String SIP_EE_CHAR_FONTINFO
-{
-    Text [ en-US ] = "Character set";
-};
-
-String SIP_EE_CHAR_FONTHEIGHT
-{
-    Text [ en-US ] = "Font size";
-};
-
-String SIP_EE_CHAR_FONTWIDTH
-{
-    Text [ en-US ] = "Font width";
-};
-
-String SIP_EE_CHAR_WEIGHT
-{
-    Text [ en-US ] = "Bold (thickness)";
-};
-
-String SIP_EE_CHAR_UNDERLINE
-{
-    Text [ en-US ] = "Underline";
-};
-
-String SIP_EE_CHAR_OVERLINE
-{
-    Text [ en-US ] = "Overline";
-};
-
-String SIP_EE_CHAR_STRIKEOUT
-{
-    Text [ en-US ] = "Strikethrough";
-};
-
-String SIP_EE_CHAR_ITALIC
-{
-    Text [ en-US ] = "Italic";
-};
-
-String SIP_EE_CHAR_OUTLINE
-{
-    Text [ en-US ] = "Outline";
-};
-
-String SIP_EE_CHAR_SHADOW
-{
-    Text [ en-US ] = "Font shadow";
-};
-
-String SIP_EE_CHAR_ESCAPEMENT
-{
-    Text [ en-US ] = "Superscript/subscript";
-};
-
-String SIP_EE_CHAR_PAIRKERNING
-{
-    Text [ en-US ] = "Kerning";
-};
-
-String SIP_EE_CHAR_KERNING
-{
-    Text [ en-US ] = "Manual kerning";
-};
-
-String SIP_EE_CHAR_WLM
-{
-    Text [ en-US ] = "No underline for spaces";
-};
-
-String SIP_EE_FEATURE_TAB
-{
-    Text [ en-US ] = "Tabulator";
-};
-
-String SIP_EE_FEATURE_LINEBR
-{
-    Text [ en-US ] = "Optional line break";
-};
-
-String SIP_EE_FEATURE_NOTCONV
-{
-    Text [ en-US ] = "Non-convertible character";
-};
-
-String SIP_EE_FEATURE_FIELD
-{
-    Text [ en-US ] = "Fields";
-};
-
-String SIP_SA_GRAFRED
-{
-    Text [ en-US ] = "Red";
-};
-String SIP_SA_GRAFGREEN
-{
-    Text [ en-US ] = "Green";
-};
-String SIP_SA_GRAFBLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String SIP_SA_GRAFLUMINANCE
-{
-    Text [ en-US ] = "Brightness";
-};
-String SIP_SA_GRAFCONTRAST
-{
-    Text [ en-US ] = "Contrast";
-};
-String SIP_SA_GRAFGAMMA
-{
-    Text [ en-US ] = "Gamma";
-};
-String SIP_SA_GRAFTRANSPARENCE
-{
-    Text [ en-US ] = "Transparency";
-};
-String SIP_SA_GRAFINVERT
-{
-    Text [ en-US ] = "Invert";
-};
-String SIP_SA_GRAFMODE
-{
-    Text [ en-US ] = "Image mode";
-};
-String SIP_SA_GRAFCROP
-{
-    Text [ en-US ] = "Crop";
-
-};
-
-String STR_ObjNameSingulMEDIA
-{
-    Text [ en-US ] = "Media object" ;
-};
-String STR_ObjNamePluralMEDIA
-{
-    Text [ en-US ] = "Media objects" ;
-};
-
-// drawing layer table strings
-
-String STR_TABLE_INSCOL
-{
-    Text [ en-US ] = "Insert column" ;
-};
-String STR_TABLE_INSROW
-{
-    Text [ en-US ] = "Insert row" ;
-};
-String STR_UNDO_COL_DELETE
-{
-    Text [ en-US ] = "Delete column" ;
-};
-String STR_UNDO_ROW_DELETE
-{
-    Text [ en-US ] = "Delete row" ;
-};
-String STR_TABLE_SPLIT
-{
-    Text [ en-US ] = "Split cells" ;
-};
-String STR_TABLE_MERGE
-{
-    Text [ en-US ] = "Merge cells" ;
-};
-String STR_TABLE_NUMFORMAT
-{
-    Text [ en-US ] = "Format cell" ;
-};
-
-String STR_TABLE_DISTRIBUTE_ROWS
-{
-    Text [ en-US ] = "Distribute rows" ;
-};
-
-String STR_TABLE_DISTRIBUTE_COLUMNS
-{
-    Text [ en-US ] = "Distribute columns" ;
-};
-
-String STR_TABLE_DELETE_CELL_CONTENTS
-{
-    Text [ en-US ] = "Delete cell contents" ;
-};
-
-String STR_TABLE_STYLE
-{
-    Text [ en-US ] = "Table style" ;
-};
-
-String STR_TABLE_STYLE_SETTINGS
-{
-    Text [ en-US ] = "Table style settings" ;
-};
-
-String STR_ObjNameSingulTable
-{
-    Text [ en-US ] = "Table";
-};
-String STR_ObjNamePluralTable
-{
-    Text [ en-US ] = "Tables";
-};
-
-String STR_ObjNameSingulFONTWORK
-{
-    Text [ en-US ] = "Font work" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index ea5ed60938bb..695a236a9f6a 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
 #include <svx/xfillit0.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/scene3d.hxx>
 #include <editeng/editdata.hxx>
@@ -214,9 +214,9 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)
 {
 }
 
-OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat )
+OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, const char* pStrCacheID, bool bRepeat )
 {
-    const OUString rStr {ImpGetResStr(nStrCacheID)};
+    const OUString rStr {ImpGetResStr(pStrCacheID)};
 
     const sal_Int32 nPos = rStr.indexOf("%1");
     if (nPos < 0)
@@ -228,10 +228,10 @@ OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject
     return rStr.replaceAt(nPos, 2, _rForObject.TakeObjNameSingul());
 }
 
-void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, bool bRepeat) const
 {
     if ( pObj )
-        rStr = GetDescriptionStringForObject( *pObj, nStrCacheID, bRepeat );
+        rStr = GetDescriptionStringForObject( *pObj, pStrCacheID, bRepeat );
 }
 
 // common call method for possible change of the page when UNDO/REDO is triggered
@@ -1418,9 +1418,9 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
     }
 }
 
-void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr)
+void SdrUndoPage::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr)
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
 }
 
 
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 9bce8d9c970e..f11e6f6b0055 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -20,7 +20,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f4b9a6482084..f81933b05a95 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -35,7 +35,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 486d55435c69..a0289ae3f95b 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -25,7 +25,7 @@
 #include "tablelayouter.hxx"
 #include "cell.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 5adbfde30df4..a88553f0e0b2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -50,7 +50,7 @@
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "editeng/writingmodeitem.hxx"
 #include "editeng/frmdiritem.hxx"
diff --git a/svx/source/table/table.src b/svx/source/table/table.src
deleted file mode 100644
index 27cfa6c0b57f..000000000000
--- a/svx/source/table/table.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 "svx/dialogs.hrc"
-
-String RID_SVXSTR_STYLEFAMILY_TABLEDESIGN
-{
-    Text [ en-US ] = "Table Design Styles";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 96db2db82e80..e3dae07e78bf 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -60,7 +60,7 @@
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
 #include "editeng/lineitem.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 3b56970ad81d..321c40d58b4d 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -42,7 +42,7 @@
 #include "svx/unoprov.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 
 #include "celltypes.hxx"
 
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index b48833191503..359df376c1c6 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -35,7 +35,7 @@
 #include "editeng/borderline.hxx"
 #include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 using ::editeng::SvxBorderLine;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 69202bf8aefe..31a5e5ac3a0e 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -38,7 +38,7 @@
 #include "tableundo.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 using namespace ::osl;
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 4aaadfb22eda..b9e14521af6e 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -23,7 +23,8 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/drawitem.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/colrdlg.hxx>
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx
index 11891d63175b..f236c0d9971d 100644
--- a/svx/source/tbxctrls/SvxColorChildWindow.cxx
+++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx
@@ -20,7 +20,7 @@
 #include <svx/SvxColorChildWindow.hxx>
 #include <sfx2/dockwin.hxx>
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/colrctrl.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index e9916bb52ced..ba58a567313d 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/image.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/popupmenuwindow.hxx>
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index ab931156aa7e..d9dcda7c749b 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -14,7 +14,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/numvset.hxx>
 #include <vcl/commandinfoprovider.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index faaf6552b800..0829234d00a9 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -21,7 +21,8 @@
 
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
deleted file mode 100644
index 3b22a7580bde..000000000000
--- a/svx/source/tbxctrls/colrctrl.src
+++ /dev/null
@@ -1,28 +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 <svx/dialogs.hrc>
-#include "helpid.hrc"
-
-String STR_COLORTABLE
-{
-    Text [ en-US ] = "Color Palette" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 400bc0f72a45..41501d8ea1d4 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -31,7 +31,7 @@
 #include <svl/intitem.hxx>
 #include <editeng/colritem.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/dialmgr.hxx>
@@ -39,7 +39,6 @@
 #include "coreservices.hxx"
 #include "helpid.hrc"
 #include "extrusioncontrols.hxx"
-#include "extrusioncontrols.hrc"
 #include "extrusiondepthdialog.hxx"
 
 #include "bitmaps.hlst"
@@ -109,6 +108,19 @@ static const OUStringLiteral aDirectionBmps[] =
     RID_SVXBMP_DIRECTION_DIRECTION_SE
 };
 
+static const char* aDirectionStrs[] =
+{
+    RID_SVXSTR_DIRECTION_NW,
+    RID_SVXSTR_DIRECTION_N,
+    RID_SVXSTR_DIRECTION_NE,
+    RID_SVXSTR_DIRECTION_W,
+    RID_SVXSTR_DIRECTION_NONE,
+    RID_SVXSTR_DIRECTION_E,
+    RID_SVXSTR_DIRECTION_SW,
+    RID_SVXSTR_DIRECTION_S,
+    RID_SVXSTR_DIRECTION_SE
+};
+
 ExtrusionDirectionWindow::ExtrusionDirectionWindow(
     svt::ToolboxController& rController,
     vcl::Window* pParentWindow
@@ -132,8 +144,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 
     for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
     {
-        OUString aText(SvxResId(RID_SVXSTR_DIRECTION + i));
-        mpDirectionSet->InsertItem(i + 1, maImgDirection[i], aText);
+        mpDirectionSet->InsertItem(i + 1, maImgDirection[i], SvxResId(aDirectionStrs[i]));
     }
 
     mpDirectionSet->SetOutputSizePixel(Size(72, 72));
@@ -417,20 +428,39 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
     }
 }
 
-
 void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 {
     meUnit = eUnit;
-    sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
 
-    for( int i = 0; i < 5; i++ )
+    const char* aDepths[] =
     {
-        OUString aStr( SvxResId( nResource + i ) );
-        setEntryText( i, aStr );
+        RID_SVXSTR_DEPTH_0,
+        RID_SVXSTR_DEPTH_1,
+        RID_SVXSTR_DEPTH_2,
+        RID_SVXSTR_DEPTH_3,
+        RID_SVXSTR_DEPTH_4
+    };
+
+    const char* aDepthsInch[] =
+    {
+        RID_SVXSTR_DEPTH_0_INCH,
+        RID_SVXSTR_DEPTH_1_INCH,
+        RID_SVXSTR_DEPTH_2_INCH,
+        RID_SVXSTR_DEPTH_3_INCH,
+        RID_SVXSTR_DEPTH_4_INCH
+    };
+
+    assert(SAL_N_ELEMENTS(aDepths) == SAL_N_ELEMENTS(aDepthsInch));
+
+    const char** pResource = IsMetric(eUnit) ? aDepths : aDepthsInch;
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aDepths); ++i)
+    {
+        OUString aStr(SvxResId(pResource[i]));
+        setEntryText(i, aStr);
     }
 }
 
-
 void ExtrusionDepthWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
 )
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
deleted file mode 100644
index 2ed1970bcf34..000000000000
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ /dev/null
@@ -1,42 +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 <svx/dialogs.hrc>
-
-// enum to index light images
-#define FROM_TOP_LEFT       0
-#define FROM_TOP            1
-#define FROM_TOP_RIGHT      2
-#define FROM_LEFT           3
-#define FROM_FRONT          4
-#define FROM_RIGHT          5
-#define FROM_BOTTOM_LEFT    6
-#define FROM_BOTTOM         7
-#define FROM_BOTTOM_RIGHT   8
-
-#define DIRECTION_NW        0
-#define DIRECTION_N         1
-#define DIRECTION_NE        2
-#define DIRECTION_W         3
-#define DIRECTION_NONE      4
-#define DIRECTION_E         5
-#define DIRECTION_SW        6
-#define DIRECTION_S         7
-#define DIRECTION_SE        8
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 03c536e0a477..1b40c2d649af 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -33,6 +33,26 @@
 
 class ValueSet;
 
+// enum to index light images
+#define FROM_TOP_LEFT       0
+#define FROM_TOP            1
+#define FROM_TOP_RIGHT      2
+#define FROM_LEFT           3
+#define FROM_FRONT          4
+#define FROM_RIGHT          5
+#define FROM_BOTTOM_LEFT    6
+#define FROM_BOTTOM         7
+#define FROM_BOTTOM_RIGHT   8
+
+#define DIRECTION_NW        0
+#define DIRECTION_N         1
+#define DIRECTION_NE        2
+#define DIRECTION_W         3
+#define DIRECTION_NONE      4
+#define DIRECTION_E         5
+#define DIRECTION_SW        6
+#define DIRECTION_S         7
+#define DIRECTION_SE        8
 
 namespace svx
 {
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
deleted file mode 100644
index a0d896e2e9f0..000000000000
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ /dev/null
@@ -1,172 +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 <svx/dialogs.hrc>
-#include "extrusioncontrols.hrc"
-
-String RID_SVXSTR_PERSPECTIVE
-{
-    Text [ en-US ] = "~Perspective" ;
-};
-
-String RID_SVXSTR_PARALLEL
-{
-    Text [ en-US ] = "P~arallel" ;
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NW
-{
-    Text [ en-US ] = "Extrusion North-West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_N
-{
-    Text [ en-US ] = "Extrusion North";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NE
-{
-    Text [ en-US ] = "Extrusion North-East";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_W
-{
-    Text [ en-US ] = "Extrusion West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NONE
-{
-    Text [ en-US ] = "Extrusion Backwards";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_E
-{
-    Text [ en-US ] = "Extrusion East";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_SW
-{
-    Text [ en-US ] = "Extrusion South-West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_S
-{
-    Text [ en-US ] = "Extrusion South";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_SE
-{
-    Text [ en-US ] = "Extrusion South-East";
-};
-String RID_SVXSTR_BRIGHT
-{
-    Text [ en-US ] = "~Bright";
-};
-
-String RID_SVXSTR_NORMAL
-{
-    Text [ en-US ] = "~Normal";
-};
-
-String RID_SVXSTR_DIM
-{
-    Text [ en-US ] = "~Dim";
-};
-
-String RID_SVXSTR_WIREFRAME
-{
-    Text [ en-US ] = "~Wire Frame";
-};
-
-String RID_SVXSTR_MATTE
-{
-    Text [ en-US ] = "~Matt";
-};
-
-String RID_SVXSTR_PLASTIC
-{
-    Text [ en-US ] = "~Plastic";
-};
-
-String RID_SVXSTR_METAL
-{
-    Text [ en-US ] = "Me~tal";
-};
-
-String RID_SVXSTR_DEPTH_0
-{
-    Text [ en-US ] = "~0 cm";
-};
-
-String RID_SVXSTR_DEPTH_1
-{
-    Text [ en-US ] = "~1 cm";
-};
-
-String RID_SVXSTR_DEPTH_2
-{
-    Text [ en-US ] = "~2.5 cm";
-};
-
-String RID_SVXSTR_DEPTH_3
-{
-    Text [ en-US ] = "~5 cm";
-};
-
-String RID_SVXSTR_DEPTH_4
-{
-    Text [ en-US ] = "10 ~cm";
-};
-
-String RID_SVXSTR_DEPTH_0_INCH
-{
-    Text [ en-US ] = "0 inch";
-};
-
-String RID_SVXSTR_DEPTH_1_INCH
-{
-    Text [ en-US ] = "0.~5 inch";
-};
-
-String RID_SVXSTR_DEPTH_2_INCH
-{
-    Text [ en-US ] = "~1 inch";
-};
-
-String RID_SVXSTR_DEPTH_3_INCH
-{
-    Text [ en-US ] = "~2 inch";
-};
-
-String RID_SVXSTR_DEPTH_4_INCH
-{
-    Text [ en-US ] = "~4 inch";
-};
-
-String RID_SVXSTR_CUSTOM
-{
-    Text [ en-US ] = "~Custom...";
-};
-
-String RID_SVXSTR_INFINITY
-{
-    Text [ en-US ] = "~Infinity";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index e63fbd48899e..68729ff95567 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -26,7 +26,8 @@
 #include <rtl/ustring.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolbox.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #define TMP_STR_BEGIN   "["
 #define TMP_STR_END     "]"
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index d86c84067e57..ac3f2e5b4da5 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -38,7 +38,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
deleted file mode 100644
index 246d1f411ffa..000000000000
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ /dev/null
@@ -1,83 +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 "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_ALIGN_LEFT
-{
-    Text [ en-US ] = "~Left Align";
-};
-
-String RID_SVXSTR_ALIGN_CENTER
-{
-    Text [ en-US ] = "~Center";
-};
-
-String RID_SVXSTR_ALIGN_RIGHT
-{
-    Text [ en-US ] = "~Right Align";
-};
-
-String RID_SVXSTR_ALIGN_WORD
-{
-    Text [ en-US ] = "~Word Justify";
-};
-
-String RID_SVXSTR_ALIGN_STRETCH
-{
-    Text [ en-US ] = "S~tretch Justify";
-};
-
-String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT
-{
-    Text [ en-US ] = "~Very Tight";
-};
-
-String RID_SVXSTR_CHARS_SPACING_TIGHT
-{
-    Text [ en-US ] = "~Tight";
-};
-
-String RID_SVXSTR_CHARS_SPACING_NORMAL
-{
-    Text [ en-US ] = "~Normal";
-};
-
-String RID_SVXSTR_CHARS_SPACING_LOOSE
-{
-    Text [ en-US ] = "~Loose";
-};
-
-String RID_SVXSTR_CHARS_SPACING_VERY_LOOSE
-{
-    Text [ en-US ] = "Very ~Loose";
-};
-
-String RID_SVXSTR_CHARS_SPACING_CUSTOM
-{
-    Text [ en-US ] = "~Custom...";
-};
-
-String RID_SVXSTR_CHARS_SPACING_KERN_PAIRS
-{
-    Text [ en-US ] = "~Kern Character Pairs";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3627a470d7f8..12a822e4b858 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -37,8 +37,9 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include <editeng/brushitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
@@ -65,7 +66,7 @@ using namespace ::com::sun::star::lang;
 #define SYMBOL_TO_FIELD_OFFSET      4
 #define ITEMVALUE(ItemSet,Id,Cast)  static_cast<const Cast&>((ItemSet).Get(Id)).GetValue()
 #define TOOLBOX_NAME                "colorbar"
-
+#define RID_SVXSTR_UNDO_GRAFCROP    RID_SVXSTR_GRAFCROP
 
 class ImplGrafMetricField : public MetricField
 {
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
deleted file mode 100644
index afa3777a8f0c..000000000000
--- a/svx/source/tbxctrls/grafctrl.src
+++ /dev/null
@@ -1,59 +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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_UNDO_GRAFMODE
-{
-    Text [ en-US ] = "Image Mode";
-};
-String RID_SVXSTR_UNDO_GRAFRED
-{
-    Text [ en-US ] = "Red";
-};
-String RID_SVXSTR_UNDO_GRAFGREEN
-{
-    Text [ en-US ] = "Green";
-};
-String RID_SVXSTR_UNDO_GRAFBLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String RID_SVXSTR_UNDO_GRAFLUMINANCE
-{
-    Text [ en-US ] = "Brightness";
-};
-String RID_SVXSTR_UNDO_GRAFCONTRAST
-{
-    Text [ en-US ] = "Contrast";
-};
-String RID_SVXSTR_UNDO_GRAFGAMMA
-{
-    Text [ en-US ] = "Gamma";
-};
-String RID_SVXSTR_UNDO_GRAFTRANSPARENCY
-{
-    Text [ en-US ] = "Transparency";
-};
-String RID_SVXSTR_GRAFCROP
-{
-    Text [ en-US ] = "Crop";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index fb513a9bd596..cd71cb296302 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -29,7 +29,8 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #define DELAY_TIMEOUT           100
 
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index f6fac3b05832..ef22cab1e8e9 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -25,7 +25,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "svx/layctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 69f347c63248..04e8da774545 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -40,7 +40,7 @@
 #include <tools/urlobj.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -142,15 +142,12 @@ void SvxUndoRedoControl::Impl_SetInfo( sal_Int32 nCount )
 {
     DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" );
 
-//    ListBox &rListBox = pPopupWin->GetListBox();
-
-    sal_uInt16 nId;
+    const char* pId;
     if (nCount == 1)
-        nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
+        pId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
     else
-        nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS;
-
-    aActionStr = SvxResId(nId);
+        pId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS;
+    aActionStr = SvxResId(pId);
 
     OUString aText = aActionStr.replaceAll("$(ARG1)", OUString::number(nCount));
     pPopupWin->SetText(aText);
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
deleted file mode 100644
index f9b5ab12004d..000000000000
--- a/svx/source/tbxctrls/lboxctrl.src
+++ /dev/null
@@ -1,43 +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 <svx/dialogs.hrc>
-#include <helpid.hrc>
-
-String RID_SVXSTR_NUM_UNDO_ACTIONS
-{
-    Text[ en-US ] = "Actions to undo: $(ARG1)";
-};
-
-String RID_SVXSTR_NUM_UNDO_ACTION
-{
-    Text[ en-US ] = "Actions to undo: $(ARG1)" ;
-};
-
-String RID_SVXSTR_NUM_REDO_ACTIONS
-{
-    Text[ en-US ] = "Actions to redo: $(ARG1)";
-};
-
-String RID_SVXSTR_NUM_REDO_ACTION
-{
-    Text[ en-US ] = "Actions to redo: $(ARG1)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c6e71154a9a0..f1efc65b123d 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -27,7 +27,8 @@
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "helpid.hrc"
 
 #include "svx/drawitem.hxx"
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7f9e0523056c..79e9382b835a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -61,13 +61,15 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
+#include <svx/svxids.hrc>
 #include "helpid.hrc"
 #include <sfx2/htmlmode.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <svx/xtable.hxx>
+#include <editeng/editids.hrc>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -1302,7 +1304,7 @@ SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
         case SID_ATTR_CHAR_COLOR2:
         case SID_EXTRUSION_3D_COLOR:
         {
-            mpButtonAutoColor->SetText(EditResId::GetString(RID_SVXSTR_AUTOMATIC));
+            mpButtonAutoColor->SetText(EditResId(RID_SVXSTR_AUTOMATIC));
             break;
         }
         case SID_FM_CTL_PROPERTIES:
@@ -1428,7 +1430,7 @@ namespace
             case SID_EXTRUSION_3D_COLOR:
             default:
                 aColor = COL_AUTO;
-                sColorName = EditResId::GetString(RID_SVXSTR_AUTOMATIC);
+                sColorName = EditResId(RID_SVXSTR_AUTOMATIC);
                 break;
         }
 
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
deleted file mode 100644
index 61d72cc2b5a2..000000000000
--- a/svx/source/tbxctrls/tbcontrl.src
+++ /dev/null
@@ -1,109 +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 <svx/dialogs.hrc>
-#include <helpid.hrc>
-
-String RID_SVXSTR_NOFILL
-{
-    Text [ en-US ] = "No Fill" ;
-};
-
-String RID_SVXSTR_TRANSPARENT
-{
-    Text [ en-US ] = "Transparent";
-};
-
-String RID_SVXSTR_DEFAULT
-{
-    Text [ en-US ] = "Default";
-};
-
-String RID_SVXSTR_FRAME
-{
-    Text [ en-US ] = "Borders" ;
-};
-
-String RID_SVXSTR_FRAME_STYLE
-{
-    Text [ en-US ] = "Border Style" ;
-};
-
-String RID_SVXSTR_MORENUMBERING
-{
-    Text [ en-US ] = "More Numbering..." ;
-};
-
-String RID_SVXSTR_MOREBULLETS
-{
-    Text [ en-US ] = "More Bullets..." ;
-};
-
-String RID_SVXSTR_BY_AUTHOR
-{
-    Text [ en-US ] = "By author";
-};
-
-String RID_SVXSTR_PAGES
-{
-    Text [ en-US ] = "Pages";
-};
-
-String RID_SVXSTR_CLEARFORM
-{
-    Text [ en-US ] = "Clear formatting";
-};
-
-String RID_SVXSTR_MORE_STYLES
-{
-    Text [ en-US ] = "More Styles...";
-};
-
-String RID_SVXSTR_MORE
-{
-    Text [ en-US ] = "More Options...";
-};
-
-// This is duplicated in GenericCommands.xcu in officecfg.
-String RID_SVXSTR_CHARFONTNAME
-{
-    Text [ en-US ] = "Font Name";
-};
-
-String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
-{
-    Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
-};
-
-String RID_SVXSTR_CUSTOM_PAL
-{
-    Text [ en-US ] = "custom";
-};
-
-String RID_SVXSTR_DOC_COLORS
-{
-    Text [ en-US ] = "Document colors";
-};
-
-String RID_SVXSTR_DOC_COLOR_PREFIX
-{
-    Text [ en-US ] = "Document Color";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 91347d99cad5..a5e1fe1b9e1c 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -24,7 +24,7 @@
 
 #include <config_features.h>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.src b/svx/source/tbxctrls/tbunosearchcontrollers.src
deleted file mode 100644
index 1e537a9c1760..000000000000
--- a/svx/source/tbxctrls/tbunosearchcontrollers.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 <svx/dialogs.hrc>
-
-String RID_SVXSTR_FINDBAR_FIND
-{
-    Text [ en-US ] = "Find" ;
-};
-
-String RID_SVXSTR_FINDBAR_MATCHCASE
-{
-    Text [ en-US ] = "Match Case" ;
-};
-
-String RID_SVXSTR_FINDBAR_SEARCHFORMATTED
-{
-    Text [ en-US ] = "Formatted Display" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index cc45215d388a..134dc4d90559 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -27,7 +27,7 @@
 #include <vcl/toolbox.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "svx/tbxctl.hxx"
 #include "svx/tbxcolor.hxx"
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 3b1a33daf093..ed7184fca627 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -19,7 +19,8 @@
 
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 0446e9ec819b..f6b17f66fa07 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
+#include <svx/svxids.hrc>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
@@ -33,7 +34,7 @@
 #include <svx/xsflclit.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
 #include "svx/chrtitem.hxx"
@@ -451,7 +452,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings )
 {
     sal_uInt16 nSID = rReq.GetSlot();
-    sal_uInt16 nStrResId = 0;
+    const char* pStrResId = nullptr;
 
     const bool bUndo = pSdrView && pSdrView->IsUndoEnabled();
 
@@ -459,74 +460,74 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
     {
         case SID_EXTRUSION_TOOGLE:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_DOWN:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_UP:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_LEFT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_RIGHT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_DIRECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_PROJECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_DEPTH:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_3D_COLOR:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_SURFACE:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_LIGHTING_INTENSITY:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_LIGHTING_DIRECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
 
             if (pSdrView)
             {
@@ -540,7 +541,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                     {
                         if( bUndo )
                         {
-                            OUString aStr( SvxResId( nStrResId ) );
+                            OUString aStr( SvxResId( pStrResId ) );
                             pSdrView->BegUndo( aStr );
                             pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
                         }
diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src
deleted file mode 100644
index 3401256ad56a..000000000000
--- a/svx/source/toolbars/extrusionbar.src
+++ /dev/null
@@ -1,77 +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 <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-
-String RID_SVX_EXTRUSION_BAR
-{
-    Text [ en-US ] = "Extrusion";
-};
-
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF
-{
-    Text [ en-US ] = "Apply Extrusion On/Off";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN
-{
-    Text [ en-US ] = "Tilt Down";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP
-{
-    Text [ en-US ] = "Tilt Up";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT
-{
-    Text [ en-US ] = "Tilt Left";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT
-{
-    Text [ en-US ] = "Tilt Right";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH
-{
-    Text [ en-US ] = "Change Extrusion Depth";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION
-{
-    Text [ en-US ] = "Change Orientation";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION
-{
-    Text [ en-US ] = "Change Projection Type";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING
-{
-    Text [ en-US ] = "Change Lighting";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS
-{
-    Text [ en-US ] = "Change Brightness";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE
-{
-    Text [ en-US ] = "Change Extrusion Surface";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR
-{
-    Text [ en-US ] = "Change Extrusion Color";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 7919070045e3..b1fd0c339272 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <svx/sdasitm.hxx>
 #include "svx/gallery.hxx"
@@ -417,7 +417,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const
 
 void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings )
 {
-    sal_uInt16 nStrResId = 0;
+    const char* pStrResId = nullptr;
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -498,26 +498,26 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
         case SID_FONTWORK_SHAPE:
         case SID_FONTWORK_ALIGNMENT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_CHARACTER_SPACING:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_KERN_CHARACTER_PAIRS:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_SAME_LETTER_HEIGHTS:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
             const size_t nCount = rMarkList.GetMarkCount();
@@ -529,7 +529,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
                     const bool bUndo = pSdrView->IsUndoEnabled();
                     if( bUndo )
                     {
-                        OUString aStr( SvxResId( nStrResId ) );
+                        OUString aStr( SvxResId( pStrResId ) );
                         pSdrView->BegUndo( aStr );
                         pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
                     }
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
deleted file mode 100644
index fd64a174bdd9..000000000000
--- a/svx/source/toolbars/fontworkbar.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 <svx/dialogs.hrc>
-
-String RID_SVX_FONTWORK_BAR
-{
-    Text [ en-US ] = "Fontwork";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE
-{
-    Text [ en-US ] = "Apply Fontwork Shape";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT
-{
-    Text [ en-US ] = "Apply Fontwork Same Letter Heights";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT
-{
-    Text [ en-US ] = "Apply Fontwork Alignment";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING
-{
-    Text [ en-US ] = "Apply Fontwork Character Spacing";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index ece9db430bbe..3397653a2a3d 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index afae4101d256..92d9f1b7ff4c 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -37,7 +37,8 @@
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
 #include "svx/globl3d.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "strings.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 
@@ -1038,58 +1039,416 @@ bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) throw()
     return true;
 }
 
-bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResIds, int& nCount ) throw()
+static const char* RID_SVXSTR_BMP_DEF[] =
+{
+    RID_SVXSTR_BMP0_DEF,
+    RID_SVXSTR_BMP1_DEF,
+    RID_SVXSTR_BMP2_DEF,
+    RID_SVXSTR_BMP3_DEF,
+    RID_SVXSTR_BMP4_DEF,
+    RID_SVXSTR_BMP5_DEF,
+    RID_SVXSTR_BMP6_DEF,
+    RID_SVXSTR_BMP7_DEF,
+    RID_SVXSTR_BMP8_DEF,
+    RID_SVXSTR_BMP9_DEF,
+    RID_SVXSTR_BMP10_DEF,
+    RID_SVXSTR_BMP11_DEF,
+    RID_SVXSTR_BMP12_DEF,
+    RID_SVXSTR_BMP13_DEF,
+    RID_SVXSTR_BMP14_DEF,
+    RID_SVXSTR_BMP15_DEF,
+    RID_SVXSTR_BMP16_DEF,
+    RID_SVXSTR_BMP17_DEF,
+    RID_SVXSTR_BMP18_DEF,
+    RID_SVXSTR_BMP19_DEF,
+    RID_SVXSTR_BMP20_DEF,
+    RID_SVXSTR_BMP21_DEF
+};
+
+static const char* RID_SVXSTR_BMP[] =
+{
+    RID_SVXSTR_BMP0,
+    RID_SVXSTR_BMP1,
+    RID_SVXSTR_BMP2,
+    RID_SVXSTR_BMP3,
+    RID_SVXSTR_BMP4,
+    RID_SVXSTR_BMP5,
+    RID_SVXSTR_BMP6,
+    RID_SVXSTR_BMP7,
+    RID_SVXSTR_BMP8,
+    RID_SVXSTR_BMP9,
+    RID_SVXSTR_BMP10,
+    RID_SVXSTR_BMP11,
+    RID_SVXSTR_BMP12,
+    RID_SVXSTR_BMP13,
+    RID_SVXSTR_BMP14,
+    RID_SVXSTR_BMP15,
+    RID_SVXSTR_BMP16,
+    RID_SVXSTR_BMP17,
+    RID_SVXSTR_BMP18,
+    RID_SVXSTR_BMP19,
+    RID_SVXSTR_BMP20,
+    RID_SVXSTR_BMP21
+};
+
+static const char* RID_SVXSTR_DASH_DEF[] =
+{
+    RID_SVXSTR_DASH0_DEF,
+    RID_SVXSTR_DASH1_DEF,
+    RID_SVXSTR_DASH2_DEF,
+    RID_SVXSTR_DASH3_DEF,
+    RID_SVXSTR_DASH4_DEF,
+    RID_SVXSTR_DASH5_DEF,
+    RID_SVXSTR_DASH6_DEF,
+    RID_SVXSTR_DASH7_DEF,
+    RID_SVXSTR_DASH8_DEF,
+    RID_SVXSTR_DASH9_DEF,
+    RID_SVXSTR_DASH10_DEF,
+    RID_SVXSTR_DASH11_DEF,
+    RID_SVXSTR_DASH12_DEF
+};
+
+static const char* RID_SVXSTR_DASH[] =
+{
+    RID_SVXSTR_DASH0,
+    RID_SVXSTR_DASH1,
+    RID_SVXSTR_DASH2,
+    RID_SVXSTR_DASH3,
+    RID_SVXSTR_DASH4,
+    RID_SVXSTR_DASH5,
+    RID_SVXSTR_DASH6,
+    RID_SVXSTR_DASH7,
+    RID_SVXSTR_DASH8,
+    RID_SVXSTR_DASH9,
+    RID_SVXSTR_DASH10,
+    RID_SVXSTR_DASH11,
+    RID_SVXSTR_DASH12
+};
+
+static const char* RID_SVXSTR_LEND_DEF[] =
+{
+    RID_SVXSTR_LEND0_DEF,
+    RID_SVXSTR_LEND1_DEF,
+    RID_SVXSTR_LEND2_DEF,
+    RID_SVXSTR_LEND3_DEF,
+    RID_SVXSTR_LEND4_DEF,
+    RID_SVXSTR_LEND5_DEF,
+    RID_SVXSTR_LEND6_DEF,
+    RID_SVXSTR_LEND7_DEF,
+    RID_SVXSTR_LEND8_DEF,
+    RID_SVXSTR_LEND9_DEF,
+    RID_SVXSTR_LEND10_DEF,
+    RID_SVXSTR_LEND11_DEF,
+    RID_SVXSTR_LEND12_DEF,
+    RID_SVXSTR_LEND13_DEF,
+    RID_SVXSTR_LEND14_DEF,
+    RID_SVXSTR_LEND15_DEF,
+    RID_SVXSTR_LEND16_DEF,
+    RID_SVXSTR_LEND17_DEF,
+    RID_SVXSTR_LEND18_DEF,
+    RID_SVXSTR_LEND19_DEF,
+    RID_SVXSTR_LEND20_DEF
+};
+
+static const char* RID_SVXSTR_LEND[] =
+{
+    RID_SVXSTR_LEND0,
+    RID_SVXSTR_LEND1,
+    RID_SVXSTR_LEND2,
+    RID_SVXSTR_LEND3,
+    RID_SVXSTR_LEND4,
+    RID_SVXSTR_LEND5,
+    RID_SVXSTR_LEND6,
+    RID_SVXSTR_LEND7,
+    RID_SVXSTR_LEND8,
+    RID_SVXSTR_LEND9,
+    RID_SVXSTR_LEND10,
+    RID_SVXSTR_LEND11,
+    RID_SVXSTR_LEND12,
+    RID_SVXSTR_LEND13,
+    RID_SVXSTR_LEND14,
+    RID_SVXSTR_LEND15,
+    RID_SVXSTR_LEND16,
+    RID_SVXSTR_LEND17,
+    RID_SVXSTR_LEND18,
+    RID_SVXSTR_LEND19,
+    RID_SVXSTR_LEND20
+};
+
+static const char* RID_SVXSTR_GRDT_DEF[] =
+{
+    RID_SVXSTR_GRDT0_DEF,
+    RID_SVXSTR_GRDT1_DEF,
+    RID_SVXSTR_GRDT2_DEF,
+    RID_SVXSTR_GRDT3_DEF,
+    RID_SVXSTR_GRDT4_DEF,
+    RID_SVXSTR_GRDT5_DEF,
+    RID_SVXSTR_GRDT6_DEF,
+    RID_SVXSTR_GRDT7_DEF,
+    RID_SVXSTR_GRDT8_DEF,
+    RID_SVXSTR_GRDT9_DEF,
+    RID_SVXSTR_GRDT10_DEF,
+    RID_SVXSTR_GRDT11_DEF,
+    RID_SVXSTR_GRDT12_DEF,
+    RID_SVXSTR_GRDT13_DEF,
+    RID_SVXSTR_GRDT14_DEF,
+    RID_SVXSTR_GRDT15_DEF,
+    RID_SVXSTR_GRDT16_DEF,
+    RID_SVXSTR_GRDT17_DEF,
+    RID_SVXSTR_GRDT18_DEF,
+    RID_SVXSTR_GRDT19_DEF,
+    RID_SVXSTR_GRDT20_DEF,
+    RID_SVXSTR_GRDT21_DEF,
+    RID_SVXSTR_GRDT22_DEF,
+    RID_SVXSTR_GRDT23_DEF,
+    RID_SVXSTR_GRDT24_DEF,
+    RID_SVXSTR_GRDT25_DEF,
+    RID_SVXSTR_GRDT26_DEF,
+    RID_SVXSTR_GRDT27_DEF,
+    RID_SVXSTR_GRDT28_DEF,
+    RID_SVXSTR_GRDT29_DEF,
+    RID_SVXSTR_GRDT30_DEF,
+    RID_SVXSTR_GRDT31_DEF,
+    RID_SVXSTR_GRDT32_DEF,
+    RID_SVXSTR_GRDT33_DEF,
+    RID_SVXSTR_GRDT34_DEF,
+    RID_SVXSTR_GRDT35_DEF,
+    RID_SVXSTR_GRDT36_DEF,
+    RID_SVXSTR_GRDT37_DEF,
+    RID_SVXSTR_GRDT38_DEF,
+    RID_SVXSTR_GRDT39_DEF,
+    RID_SVXSTR_GRDT40_DEF,
+    RID_SVXSTR_GRDT41_DEF,
+    RID_SVXSTR_GRDT42_DEF,
+    RID_SVXSTR_GRDT43_DEF,
+    RID_SVXSTR_GRDT44_DEF,
+    RID_SVXSTR_GRDT45_DEF,
+    RID_SVXSTR_GRDT46_DEF,
+    RID_SVXSTR_GRDT47_DEF,
+    RID_SVXSTR_GRDT48_DEF,
+    RID_SVXSTR_GRDT49_DEF,
+    RID_SVXSTR_GRDT50_DEF,
+    RID_SVXSTR_GRDT51_DEF,
+    RID_SVXSTR_GRDT52_DEF,
+    RID_SVXSTR_GRDT53_DEF,
+    RID_SVXSTR_GRDT54_DEF,
+    RID_SVXSTR_GRDT55_DEF,
+    RID_SVXSTR_GRDT56_DEF,
+    RID_SVXSTR_GRDT57_DEF,
+    RID_SVXSTR_GRDT58_DEF,
+    RID_SVXSTR_GRDT59_DEF,
+    RID_SVXSTR_GRDT60_DEF,
+    RID_SVXSTR_GRDT61_DEF,
+    RID_SVXSTR_GRDT62_DEF,
+    RID_SVXSTR_GRDT63_DEF,
+    RID_SVXSTR_GRDT64_DEF,
+    RID_SVXSTR_GRDT65_DEF,
+    RID_SVXSTR_GRDT66_DEF,
+    RID_SVXSTR_GRDT67_DEF,
+    RID_SVXSTR_GRDT68_DEF,
+    RID_SVXSTR_GRDT69_DEF,
+    RID_SVXSTR_GRDT70_DEF,
+    RID_SVXSTR_GRDT71_DEF,
+    RID_SVXSTR_GRDT72_DEF,
+    RID_SVXSTR_GRDT73_DEF,
+    RID_SVXSTR_GRDT74_DEF,
+    RID_SVXSTR_GRDT75_DEF,
+    RID_SVXSTR_GRDT76_DEF,
+    RID_SVXSTR_GRDT77_DEF,
+    RID_SVXSTR_GRDT78_DEF,
+    RID_SVXSTR_GRDT79_DEF,
+    RID_SVXSTR_GRDT80_DEF,
+    RID_SVXSTR_GRDT81_DEF,
+    RID_SVXSTR_GRDT82_DEF,
+    RID_SVXSTR_GRDT83_DEF,
+    RID_SVXSTR_GRDT84_DEF,
+    RID_SVXSTR_GRDT85_DEF,
+    RID_SVXSTR_GRDT86_DEF,
+    RID_SVXSTR_GRDT87_DEF
+};
+
+static const char* RID_SVXSTR_GRDT[] =
+{
+    RID_SVXSTR_GRDT0,
+    RID_SVXSTR_GRDT1,
+    RID_SVXSTR_GRDT2,
+    RID_SVXSTR_GRDT3,
+    RID_SVXSTR_GRDT4,
+    RID_SVXSTR_GRDT5,
+    RID_SVXSTR_GRDT6,
+    RID_SVXSTR_GRDT7,
+    RID_SVXSTR_GRDT8,
+    RID_SVXSTR_GRDT9,
+    RID_SVXSTR_GRDT10,
+    RID_SVXSTR_GRDT11,
+    RID_SVXSTR_GRDT12,
+    RID_SVXSTR_GRDT13,
+    RID_SVXSTR_GRDT14,
+    RID_SVXSTR_GRDT15,
+    RID_SVXSTR_GRDT16,
+    RID_SVXSTR_GRDT17,
+    RID_SVXSTR_GRDT18,
+    RID_SVXSTR_GRDT19,
+    RID_SVXSTR_GRDT20,
+    RID_SVXSTR_GRDT21,
+    RID_SVXSTR_GRDT22,
+    RID_SVXSTR_GRDT23,
+    RID_SVXSTR_GRDT24,
+    RID_SVXSTR_GRDT25,
+    RID_SVXSTR_GRDT26,
+    RID_SVXSTR_GRDT27,
+    RID_SVXSTR_GRDT28,
+    RID_SVXSTR_GRDT29,
+    RID_SVXSTR_GRDT30,
+    RID_SVXSTR_GRDT31,
+    RID_SVXSTR_GRDT32,
+    RID_SVXSTR_GRDT33,
+    RID_SVXSTR_GRDT34,
+    RID_SVXSTR_GRDT35,
+    RID_SVXSTR_GRDT36,
+    RID_SVXSTR_GRDT37,
+    RID_SVXSTR_GRDT38,
+    RID_SVXSTR_GRDT39,
+    RID_SVXSTR_GRDT40,
+    RID_SVXSTR_GRDT41,
+    RID_SVXSTR_GRDT42,
+    RID_SVXSTR_GRDT43,
+    RID_SVXSTR_GRDT44,
+    RID_SVXSTR_GRDT45,
+    RID_SVXSTR_GRDT46,
+    RID_SVXSTR_GRDT47,
+    RID_SVXSTR_GRDT48,
+    RID_SVXSTR_GRDT49,
+    RID_SVXSTR_GRDT50,
+    RID_SVXSTR_GRDT51,
+    RID_SVXSTR_GRDT52,
+    RID_SVXSTR_GRDT53,
+    RID_SVXSTR_GRDT54,
+    RID_SVXSTR_GRDT55,
+    RID_SVXSTR_GRDT56,
+    RID_SVXSTR_GRDT57,
+    RID_SVXSTR_GRDT58,
+    RID_SVXSTR_GRDT59,
+    RID_SVXSTR_GRDT60,
+    RID_SVXSTR_GRDT61,
+    RID_SVXSTR_GRDT62,
+    RID_SVXSTR_GRDT63,
+    RID_SVXSTR_GRDT64,
+    RID_SVXSTR_GRDT65,
+    RID_SVXSTR_GRDT66,
+    RID_SVXSTR_GRDT67,
+    RID_SVXSTR_GRDT68,
+    RID_SVXSTR_GRDT69,
+    RID_SVXSTR_GRDT70,
+    RID_SVXSTR_GRDT71,
+    RID_SVXSTR_GRDT72,
+    RID_SVXSTR_GRDT73,
+    RID_SVXSTR_GRDT74,
+    RID_SVXSTR_GRDT75,
+    RID_SVXSTR_GRDT76,
+    RID_SVXSTR_GRDT77,
+    RID_SVXSTR_GRDT78,
+    RID_SVXSTR_GRDT79,
+    RID_SVXSTR_GRDT80,
+    RID_SVXSTR_GRDT81,
+    RID_SVXSTR_GRDT82,
+    RID_SVXSTR_GRDT83,
+    RID_SVXSTR_GRDT84,
+    RID_SVXSTR_GRDT85,
+    RID_SVXSTR_GRDT86,
+    RID_SVXSTR_GRDT87
+};
+
+static const char* RID_SVXSTR_HATCHS_DEF[] =
+{
+    RID_SVXSTR_HATCH0_DEF,
+    RID_SVXSTR_HATCH1_DEF,
+    RID_SVXSTR_HATCH2_DEF,
+    RID_SVXSTR_HATCH3_DEF,
+    RID_SVXSTR_HATCH4_DEF,
+    RID_SVXSTR_HATCH5_DEF,
+    RID_SVXSTR_HATCH6_DEF,
+    RID_SVXSTR_HATCH7_DEF,
+    RID_SVXSTR_HATCH8_DEF,
+    RID_SVXSTR_HATCH9_DEF,
+    RID_SVXSTR_HATCH10_DEF
+};
+
+static const char* RID_SVXSTR_HATCHS[] =
+{
+    RID_SVXSTR_HATCH0,
+    RID_SVXSTR_HATCH1,
+    RID_SVXSTR_HATCH2,
+    RID_SVXSTR_HATCH3,
+    RID_SVXSTR_HATCH4,
+    RID_SVXSTR_HATCH5,
+    RID_SVXSTR_HATCH6,
+    RID_SVXSTR_HATCH7,
+    RID_SVXSTR_HATCH8,
+    RID_SVXSTR_HATCH9,
+    RID_SVXSTR_HATCH10
+};
+
+static const char* RID_SVXSTR_TRASNGR_DEF[] =
+{
+    RID_SVXSTR_TRASNGR0_DEF
+};
+
+static const char* RID_SVXSTR_TRASNGR[] =
+{
+    RID_SVXSTR_TRASNGR0
+};
+
+bool SvxUnoGetResourceRanges( const short nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw()
 {
     switch( nWhich )
     {
     case XATTR_FILLBITMAP:
-        nApiResIds = RID_SVXSTR_BMP_DEF_START;
-        nIntResIds = RID_SVXSTR_BMP_START;
-        nCount = RID_SVXSTR_BMP_DEF_END - RID_SVXSTR_BMP_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_BMP_DEF;
+        pIntResIds = RID_SVXSTR_BMP;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_BMP_DEF);
         break;
-
     case XATTR_LINEDASH:
-        nApiResIds = RID_SVXSTR_DASH_DEF_START;
-        nIntResIds = RID_SVXSTR_DASH_START;
-        nCount = RID_SVXSTR_DASH_DEF_END - RID_SVXSTR_DASH_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_DASH_DEF;
+        pIntResIds = RID_SVXSTR_DASH;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_DASH_DEF);
         break;
 
     case XATTR_LINESTART:
     case XATTR_LINEEND:
-        nApiResIds = RID_SVXSTR_LEND_DEF_START;
-        nIntResIds = RID_SVXSTR_LEND_START;
-        nCount = RID_SVXSTR_LEND_DEF_END - RID_SVXSTR_LEND_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_LEND_DEF;
+        pIntResIds = RID_SVXSTR_LEND;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_LEND_DEF);
         break;
 
     case XATTR_FILLGRADIENT:
-        nApiResIds = RID_SVXSTR_GRDT_DEF_START;
-        nIntResIds = RID_SVXSTR_GRDT_START;
-        nCount = RID_SVXSTR_GRDT_DEF_END - RID_SVXSTR_GRDT_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_GRDT_DEF;
+        pIntResIds = RID_SVXSTR_GRDT;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_GRDT_DEF);
         break;
 
     case XATTR_FILLHATCH:
-        nApiResIds = RID_SVXSTR_HATCH_DEF_START;
-        nIntResIds = RID_SVXSTR_HATCH_START;
-        nCount = RID_SVXSTR_HATCH_DEF_END - RID_SVXSTR_HATCH_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_HATCHS_DEF;
+        pIntResIds = RID_SVXSTR_HATCHS;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_HATCHS_DEF);
         break;
 
     case XATTR_FILLFLOATTRANSPARENCE:
-        nApiResIds = RID_SVXSTR_TRASNGR_DEF_START;
-        nIntResIds = RID_SVXSTR_TRASNGR_START;
-        nCount = RID_SVXSTR_TRASNGR_DEF_END - RID_SVXSTR_TRASNGR_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_TRASNGR_DEF;
+        pIntResIds = RID_SVXSTR_TRASNGR;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_TRASNGR_DEF);
         break;
 
     default:
         return false;
     }
-
     return true;
 }
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString )
+bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
 {
-    // first, calculate the search string length without an optional number behind the name
+    // first, calculate the search string length without an optional number after the name
     sal_Int32 nLength = rString.getLength();
     while( nLength > 0 )
     {
@@ -1115,21 +1474,17 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
 
     const OUString aShortString( rString.copy( 0, nLength ) );
 
-    int i;
-    for( i = 0; i < nCount; i++ )
+    for (int i = 0; i < nCount; ++i)
     {
-        sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i);
-        const OUString aCompare(SvxResId(nResId));
+        const OUString aCompare = bToApi ? SvxResId(pSourceResIds[i]) : OUString::createFromAscii(pSourceResIds[i]);
         if( aShortString == aCompare )
         {
-            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
-            rString = rString.replaceAt( 0, aShortString.getLength(), SvxResId( nNewResId ) );
+            rString = rString.replaceAt( 0, aShortString.getLength(), bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]) );
             return true;
         }
         else if( rString == aCompare )
         {
-            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
-            rString = SvxResId(nNewResId);
+            rString = bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]);
             return true;
         }
     }
@@ -1149,7 +1504,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
 //   the possibility to define it wrong
 // - change the compare to also work when a shorter name is in front of a longer one
 
-static const sal_uInt16 SvxUnoColorNameDefResId[] =
+static const char* SvxUnoColorNameDefResId[] =
 {
     RID_SVXSTR_COLOR_BLUEGREY_DEF,
     RID_SVXSTR_COLOR_BLACK_DEF,
@@ -1193,7 +1548,7 @@ static const sal_uInt16 SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
 };
 
-static const sal_uInt16 SvxUnoColorNameResId[] =
+static const char* SvxUnoColorNameResId[] =
 {
     RID_SVXSTR_COLOR_BLUEGREY,
     RID_SVXSTR_COLOR_BLACK,
@@ -1238,7 +1593,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] =
 };
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString )
+bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
 {
     //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
     //replace "Red Hat 1" with the translation of Red :-)
@@ -1254,10 +1609,10 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn
 
     for(int i = 0; i < nCount; ++i )
     {
-        OUString aStrDefName = SvxResId( pSourceResIds[i] );
+        OUString aStrDefName = bToApi ? SvxResId(pSourceResIds[i]) : OUString::createFromAscii(pSourceResIds[i]);
         if( sStr == aStrDefName )
         {
-            OUString aReplace = SvxResId( pDestResIds[i] );
+            OUString aReplace = bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]);
             rString = rString.replaceAt( 0, aStrDefName.getLength(), aReplace );
             return true;
         }
@@ -1275,20 +1630,20 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( SvxUnoColorNameResId, SvxUnoColorNameDefResId, SAL_N_ELEMENTS( SvxUnoColorNameResId ), aNew ) )
+        if (SvxUnoConvertResourceStringBuiltIn(SvxUnoColorNameResId, SvxUnoColorNameDefResId, SAL_N_ELEMENTS(SvxUnoColorNameResId), aNew, true))
         {
             return aNew;
         }
     }
     else
     {
-        int nApiResIds;
-        int nIntResIds;
+        const char** pApiResIds;
+        const char** pIntResIds;
         int nCount;
 
-        if( SvxUnoGetResourceRanges( nWhich, nApiResIds, nIntResIds, nCount ) )
+        if( SvxUnoGetResourceRanges(nWhich, pApiResIds, pIntResIds, nCount))
         {
-            if(SvxUnoConvertResourceString( nIntResIds, nApiResIds, nCount, aNew ) )
+            if (SvxUnoConvertResourceString(pIntResIds, pApiResIds, nCount, aNew, true))
             {
                 return aNew;
             }
@@ -1308,20 +1663,20 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( SvxUnoColorNameDefResId, SvxUnoColorNameResId, SAL_N_ELEMENTS( SvxUnoColorNameResId ), aNew ) )
+        if (SvxUnoConvertResourceStringBuiltIn(SvxUnoColorNameDefResId, SvxUnoColorNameResId, SAL_N_ELEMENTS(SvxUnoColorNameResId), aNew, false))
         {
             return aNew;
         }
     }
     else
     {
-        int nApiResIds;
-        int nIntResIds;
+        const char** pApiResIds;
+        const char** pIntResIds;
         int nCount;
 
-        if( SvxUnoGetResourceRanges( nWhich, nApiResIds, nIntResIds, nCount ) )
+        if (SvxUnoGetResourceRanges(nWhich, pApiResIds, pIntResIds, nCount))
         {
-            if(SvxUnoConvertResourceString( nApiResIds, nIntResIds, nCount, aNew ) )
+            if (SvxUnoConvertResourceString(pApiResIds, pIntResIds, nCount, aNew, false))
             {
                 return aNew;
             }
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96184b68e8f1..3f309e678b82 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -50,7 +50,7 @@
 #include "svx/svdpagv.hxx"
 #include "svx/svdview.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 42b0f4b16463..9f49e7a6a0b3 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -67,7 +67,7 @@
 #include "svx/svdpool.hxx"
 #include <tools/gen.hxx>
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/svdocapt.hxx"
 #include <svx/obj3d.hxx>
 #include <tools/diagnose_ex.h>
@@ -78,7 +78,7 @@
 #include "svx/xflhtit.hxx"
 #include "svx/xlndsit.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svx/unomaster.hxx"
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 92ba35b7c1d6..57c28add93c7 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -44,8 +44,8 @@
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
-#include <svx/dialogs.hrc>
-#include "svx/svdstr.hrc"
+#include <svx/strings.hrc>
+#include "svx/strings.hrc"
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
@@ -136,7 +136,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
     Argument pPool2 can be null.
     If returned string equals NameOrIndex->GetName(), the name was already unique.
 */
-OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, const XPropertyListRef &pDefaults )
+OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults )
 {
     bool bForceNew = false;
 
@@ -173,7 +173,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
     if (aUniqueName.isEmpty())
     {
         sal_Int32 nUserIndex = 1;
-        OUString aUser(SvxResId(nPrefixResId));
+        OUString aUser(SvxResId(pPrefixResId));
         aUser += " ";
 
         if( pDefaults.get() )
@@ -392,21 +392,21 @@ bool XLineStyleItem::GetPresentation
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case css::drawing::LineStyle_NONE:
-            nId = RID_SVXSTR_INVISIBLE;
+            pId = RID_SVXSTR_INVISIBLE;
             break;
         case css::drawing::LineStyle_SOLID:
-            nId = RID_SVXSTR_SOLID;
+            pId = RID_SVXSTR_SOLID;
             break;
         default: break;
     }
 
-    if ( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
     return true;
 }
 
@@ -1049,7 +1049,7 @@ bool XLineWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -1938,7 +1938,7 @@ bool XLineStartWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -1986,7 +1986,7 @@ bool XLineEndWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -2032,8 +2032,7 @@ bool XLineStartCenterItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
     return true;
 }
 
@@ -2082,8 +2081,7 @@ bool XLineEndCenterItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
     return true;
 }
 
@@ -2139,30 +2137,30 @@ bool XFillStyleItem::GetPresentation
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case drawing::FillStyle_NONE:
-            nId = RID_SVXSTR_INVISIBLE;
+            pId = RID_SVXSTR_INVISIBLE;
             break;
         case drawing::FillStyle_SOLID:
-            nId = RID_SVXSTR_SOLID;
+            pId = RID_SVXSTR_SOLID;
             break;
         case drawing::FillStyle_GRADIENT:
-            nId = RID_SVXSTR_GRADIENT;
+            pId = RID_SVXSTR_GRADIENT;
             break;
         case drawing::FillStyle_HATCH:
-            nId = RID_SVXSTR_HATCH;
+            pId = RID_SVXSTR_HATCH;
             break;
         case drawing::FillStyle_BITMAP:
-            nId = RID_SVXSTR_BITMAP;
+            pId = RID_SVXSTR_BITMAP;
             break;
         default: break;
     }
 
-    if ( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
     return true;
 }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index e8338699f6e5..8bd12e6682df 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -22,7 +22,8 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include <i18nutil/unicode.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
@@ -116,37 +117,37 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*e
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case css::drawing::LineJoint::LineJoint_MAKE_FIXED_SIZE:
         case css::drawing::LineJoint_NONE:
-            nId = RID_SVXSTR_LINEJOINT_NONE;
+            pId = RID_SVXSTR_NONE;
         break;
 
         case css::drawing::LineJoint_MIDDLE:
-            nId = RID_SVXSTR_LINEJOINT_MIDDLE;
+            pId = RID_SVXSTR_LINEJOINT_MIDDLE;
         break;
 
 
         case css::drawing::LineJoint_BEVEL:
-            nId = RID_SVXSTR_LINEJOINT_BEVEL;
+            pId = RID_SVXSTR_LINEJOINT_BEVEL;
         break;
 
 
         case css::drawing::LineJoint_MITER:
-            nId = RID_SVXSTR_LINEJOINT_MITER;
+            pId = RID_SVXSTR_LINEJOINT_MITER;
         break;
 
 
         case css::drawing::LineJoint_ROUND:
-            nId = RID_SVXSTR_LINEJOINT_ROUND;
+            pId = RID_SVXSTR_LINEJOINT_ROUND;
         break;
     }
 
-    if( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
 
     return true;
 }
@@ -320,25 +321,25 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCo
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         default: /*css::drawing::LineCap_BUTT*/
-            nId = RID_SVXSTR_LINECAP_BUTT;
+            pId = RID_SVXSTR_LINECAP_BUTT;
         break;
 
         case(css::drawing::LineCap_ROUND):
-            nId = RID_SVXSTR_LINECAP_ROUND;
+            pId = RID_SVXSTR_LINECAP_ROUND;
         break;
 
         case(css::drawing::LineCap_SQUARE):
-            nId = RID_SVXSTR_LINECAP_SQUARE;
+            pId = RID_SVXSTR_LINECAP_SQUARE;
         break;
     }
 
-    if( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
 
     return true;
 }
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index bba8961f8b28..9185378d5a24 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -26,7 +26,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svl/style.hxx>
 #include <editeng/memberids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 856d52a0f406..735009e07e48 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -22,7 +22,7 @@
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index cb83d76a9dbe..e1c001dab4de 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -21,7 +21,7 @@
 #include "svx/XPropertyTable.hxx"
 #include <unotools/pathoptions.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 19c7cce2b1e0..eaa36a6cae82 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -23,7 +23,7 @@
 #include <vcl/settings.hxx>
 
 #include <vcl/virdev.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index fc5518f4a3bc..33d02eb45aa6 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -20,7 +20,7 @@
 #include "svx/XPropertyTable.hxx"
 
 #include <vcl/virdev.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 3979c8ce8ebb..c336e46e33d9 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -22,7 +22,7 @@
 
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xpool.hxx>
 
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index f14cc81b565f..04ad8fff02eb 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <svx/xtable.hxx>
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index 12cb480e4f7c..5fcc3afebef0 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -22,7 +22,7 @@
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index 38d6d013994e..ccf982d25f1d 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AcceptRejectChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Manage Changes</property>
+    <property name="title" translatable="yes" context="acceptrejectchangesdialog|AcceptRejectChangesDialog">Manage Changes</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="accept">
-                <property name="label" translatable="yes">_Accept</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|accept">_Accept</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="reject">
-                <property name="label" translatable="yes">_Reject</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|reject">_Reject</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="acceptall">
-                <property name="label" translatable="yes">A_ccept All</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|acceptall">A_ccept All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -60,7 +60,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rejectall">
-                <property name="label" translatable="yes">R_eject All</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|rejectall">R_eject All</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -131,14 +131,14 @@
       <object class="GtkMenuItem" id="calcedit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit Comment...</property>
+        <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcedit">Edit Comment...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="calcsort">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sorting</property>
+        <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcsort">Sorting</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -148,7 +148,7 @@
               <object class="GtkRadioMenuItem" id="calcaction">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Action</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcaction">Action</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -156,7 +156,7 @@
               <object class="GtkRadioMenuItem" id="calcposition">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcposition">Position</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -164,7 +164,7 @@
               <object class="GtkRadioMenuItem" id="calcauthor">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Author</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcauthor">Author</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -172,7 +172,7 @@
               <object class="GtkRadioMenuItem" id="calcdate">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdate">Date</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -180,7 +180,7 @@
               <object class="GtkRadioMenuItem" id="calcdesc">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Description</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdesc">Description</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -196,14 +196,14 @@
       <object class="GtkMenuItem" id="writeredit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit Comment...</property>
+        <property name="label" translatable="yes" context="acceptrejectchangesdialog|writeredit">Edit Comment...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="writersort">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sort By</property>
+        <property name="label" translatable="yes" context="acceptrejectchangesdialog|writersort">Sort By</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -213,7 +213,7 @@
               <object class="GtkRadioMenuItem" id="writeraction">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Action</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|writeraction">Action</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -221,7 +221,7 @@
               <object class="GtkRadioMenuItem" id="writerauthor">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Author</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerauthor">Author</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -229,7 +229,7 @@
               <object class="GtkRadioMenuItem" id="writerdate">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdate">Date</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -237,7 +237,7 @@
               <object class="GtkRadioMenuItem" id="writerdesc">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Comment</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdesc">Comment</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -245,7 +245,7 @@
               <object class="GtkRadioMenuItem" id="writerposition">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Document Position</property>
+                <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerposition">Document Position</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/svx/uiconfig/ui/addconditiondialog.ui b/svx/uiconfig/ui/addconditiondialog.ui
index 97df30c917fc..28aae5f887e5 100644
--- a/svx/uiconfig/ui/addconditiondialog.ui
+++ b/svx/uiconfig/ui/addconditiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddConditionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Condition</property>
+    <property name="title" translatable="yes" context="addconditiondialog|AddConditionDialog">Add Condition</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -25,7 +25,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Condition:</property>
+                <property name="label" translatable="yes" context="addconditiondialog|label1">_Condition:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">condition:border</property>
               </object>
@@ -66,7 +66,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Result:</property>
+                <property name="label" translatable="yes" context="addconditiondialog|label2">_Result:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">result:border</property>
               </object>
@@ -91,7 +91,7 @@
             </child>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">_Edit Namespaces...</property>
+                <property name="label" translatable="yes" context="addconditiondialog|edit">_Edit Namespaces...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/svx/uiconfig/ui/adddataitemdialog.ui b/svx/uiconfig/ui/adddataitemdialog.ui
index 5cfc6e9413ea..c874f94ec88b 100644
--- a/svx/uiconfig/ui/adddataitemdialog.ui
+++ b/svx/uiconfig/ui/adddataitemdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddDataItemDialog">
     <property name="can_focus">False</property>
@@ -49,7 +49,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Name:</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|nameft">_Name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">name</property>
                       </object>
@@ -63,7 +63,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Default value:</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|valueft">_Default value:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">value</property>
                       </object>
@@ -74,7 +74,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="browse">
-                        <property name="label" translatable="yes">_Add...</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|browse">_Add...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -107,7 +107,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Item</property>
+                <property name="label" translatable="yes" context="adddataitemdialog|label1">Item</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Data type:</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|datatypeft">_Data type:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">datatype</property>
                       </object>
@@ -168,7 +168,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="required">
-                        <property name="label" translatable="yes">_Required</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|required">_Required</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -183,7 +183,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="requiredcond">
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|requiredcond">Condition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -197,7 +197,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="relevant">
-                        <property name="label" translatable="yes">R_elevant</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|relevant">R_elevant</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -212,7 +212,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="relevantcond">
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|relevantcond">Condition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -226,7 +226,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="constraint">
-                        <property name="label" translatable="yes">_Constraint</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|constraint">_Constraint</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -241,7 +241,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="readonly">
-                        <property name="label" translatable="yes">Read-_only</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|readonly">Read-_only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -256,7 +256,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="calculate">
-                        <property name="label" translatable="yes">Calc_ulate</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|calculate">Calc_ulate</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -271,7 +271,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="constraintcond">
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|constraintcond">Condition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -285,7 +285,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="readonlycond">
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|readonlycond">Condition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -299,7 +299,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="calculatecond">
-                        <property name="label" translatable="yes">Condition</property>
+                        <property name="label" translatable="yes" context="adddataitemdialog|calculatecond">Condition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -319,7 +319,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
+                <property name="label" translatable="yes" context="adddataitemdialog|label4">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/addinstancedialog.ui b/svx/uiconfig/ui/addinstancedialog.ui
index c9adb22fe46d..e666eed3d3db 100644
--- a/svx/uiconfig/ui/addinstancedialog.ui
+++ b/svx/uiconfig/ui/addinstancedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AddInstanceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Instance</property>
+    <property name="title" translatable="yes" context="addinstancedialog|AddInstanceDialog">Add Instance</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Name:</property>
+                <property name="label" translatable="yes" context="addinstancedialog|label2">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -108,7 +108,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Edit Instance</property>
+                <property name="label" translatable="yes" context="addinstancedialog|alttitle">Edit Instance</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -121,7 +121,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_URL:</property>
+                <property name="label" translatable="yes" context="addinstancedialog|urlft">_URL:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -143,7 +143,7 @@
             </child>
             <child>
               <object class="GtkButton" id="browse">
-                <property name="label" translatable="yes">_Browse...</property>
+                <property name="label" translatable="yes" context="addinstancedialog|browse">_Browse...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -156,7 +156,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="link">
-                <property name="label" translatable="yes">_Link instance</property>
+                <property name="label" translatable="yes" context="addinstancedialog|link">_Link instance</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/svx/uiconfig/ui/addmodeldialog.ui b/svx/uiconfig/ui/addmodeldialog.ui
index 327c7924c62f..aff0921c1db3 100644
--- a/svx/uiconfig/ui/addmodeldialog.ui
+++ b/svx/uiconfig/ui/addmodeldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddModelDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Model</property>
+    <property name="title" translatable="yes" context="addmodeldialog|AddModelDialog">Add Model</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -78,7 +78,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="modify">
-                <property name="label" translatable="yes">Model data updates change document's modification status</property>
+                <property name="label" translatable="yes" context="addmodeldialog|modify">Model data updates change document's modification status</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Name:</property>
+                <property name="label" translatable="yes" context="addmodeldialog|label2">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -122,7 +122,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Edit Model</property>
+                <property name="label" translatable="yes" context="addmodeldialog|alttitle">Edit Model</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/svx/uiconfig/ui/addnamespacedialog.ui b/svx/uiconfig/ui/addnamespacedialog.ui
index 5a431291e4fd..fb80d73dd3fa 100644
--- a/svx/uiconfig/ui/addnamespacedialog.ui
+++ b/svx/uiconfig/ui/addnamespacedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddNamespaceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Namespace</property>
+    <property name="title" translatable="yes" context="addnamespacedialog|AddNamespaceDialog">Add Namespace</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -82,7 +82,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Prefix:</property>
+                <property name="label" translatable="yes" context="addnamespacedialog|label1">_Prefix:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">prefix</property>
               </object>
@@ -122,7 +122,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_URL:</property>
+                <property name="label" translatable="yes" context="addnamespacedialog|label2">_URL:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Edit Namespace</property>
+                <property name="label" translatable="yes" context="addnamespacedialog|alttitle">Edit Namespace</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/svx/uiconfig/ui/addsubmissiondialog.ui b/svx/uiconfig/ui/addsubmissiondialog.ui
index 36028d643930..335b87448406 100644
--- a/svx/uiconfig/ui/addsubmissiondialog.ui
+++ b/svx/uiconfig/ui/addsubmissiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AddSubmissionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Submission</property>
+    <property name="title" translatable="yes" context="addsubmissiondialog|AddSubmissionDialog">Add Submission</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Name:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|label2">_Name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -109,7 +109,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Binding e_xpression:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|urlft">Binding e_xpression:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">expression</property>
               </object>
@@ -120,7 +120,7 @@
             </child>
             <child>
               <object class="GtkButton" id="browse">
-                <property name="label" translatable="yes">_Add...</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|browse">_Add...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -137,7 +137,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Action:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|label3">_Action:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">action</property>
               </object>
@@ -165,7 +165,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Method:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|label4">_Method:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">method</property>
               </object>
@@ -204,7 +204,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Binding:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|label5">_Binding:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">binding</property>
               </object>
@@ -218,7 +218,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Replace:</property>
+                <property name="label" translatable="yes" context="addsubmissiondialog|label6">_Replace:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">replace</property>
               </object>
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 63bc46615d7c..16a536574a04 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AsianPhoneticGuideDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Asian Phonetic Guide</property>
+    <property name="title" translatable="yes" context="asianphoneticguidedialog|AsianPhoneticGuideDialog">Asian Phonetic Guide</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
                   <object class="GtkLabel" id="basetextft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Base text</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|basetextft">Base text</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -98,7 +98,7 @@
                   <object class="GtkLabel" id="rubytextft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Ruby text</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|rubytextft">Ruby text</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -138,7 +138,7 @@
                             <property name="hexpand">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Left2ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left2ED-atkobject">Base text</property>
                               </object>
                             </child>
                           </object>
@@ -174,7 +174,7 @@
                             <property name="can_focus">False</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Right2ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right2ED-atkobject">Ruby text</property>
                               </object>
                             </child>
                           </object>
@@ -189,7 +189,7 @@
                             <property name="can_focus">False</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Left3ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left3ED-atkobject">Base text</property>
                               </object>
                             </child>
                           </object>
@@ -204,7 +204,7 @@
                             <property name="can_focus">False</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Right3ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right3ED-atkobject">Ruby text</property>
                               </object>
                             </child>
                           </object>
@@ -219,7 +219,7 @@
                             <property name="can_focus">False</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Right4ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Ruby text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right4ED-atkobject">Ruby text</property>
                               </object>
                             </child>
                           </object>
@@ -234,7 +234,7 @@
                             <property name="can_focus">False</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="Left4ED-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Base text</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left4ED-atkobject">Base text</property>
                               </object>
                             </child>
                           </object>
@@ -265,7 +265,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Alignment:</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|label4">Alignment:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">adjustlb</property>
                     <property name="xalign">0</property>
@@ -279,7 +279,7 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position:</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|label5">Position:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">positionlb</property>
                     <property name="xalign">0</property>
@@ -293,7 +293,7 @@
                   <object class="GtkLabel" id="styleft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Character style for ruby text:</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|styleft">Character style for ruby text:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">stylelb</property>
                     <property name="xalign">0</property>
@@ -316,7 +316,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="styles">
-                    <property name="label" translatable="yes">Styles</property>
+                    <property name="label" translatable="yes" context="asianphoneticguidedialog|styles">Styles</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -332,11 +332,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Left</item>
-                      <item translatable="yes">Center</item>
-                      <item translatable="yes">Right</item>
-                      <item translatable="yes">0 1 0</item>
-                      <item translatable="yes">1 2 1</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|adjustlb">Left</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|adjustlb">Center</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|adjustlb">Right</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|adjustlb">0 1 0</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|adjustlb">1 2 1</item>
                     </items>
                   </object>
                   <packing>
@@ -349,8 +349,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Top</item>
-                      <item translatable="yes">Bottom</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|positionlb">Top</item>
+                      <item translatable="yes" context="asianphoneticguidedialog|positionlb">Bottom</item>
                     </items>
                   </object>
                   <packing>
@@ -373,7 +373,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
-                <property name="label" translatable="yes">Preview:</property>
+                <property name="label" translatable="yes" context="asianphoneticguidedialog|label1">Preview:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">preview</property>
                 <property name="xalign">0</property>
diff --git a/svx/uiconfig/ui/cellmenu.ui b/svx/uiconfig/ui/cellmenu.ui
index e7edb0c359fe..d53844d84f09 100644
--- a/svx/uiconfig/ui/cellmenu.ui
+++ b/svx/uiconfig/ui/cellmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="cellmenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/chineseconversiondialog.ui b/svx/uiconfig/ui/chineseconversiondialog.ui
index 3aeb83345036..77998376ed60 100644
--- a/svx/uiconfig/ui/chineseconversiondialog.ui
+++ b/svx/uiconfig/ui/chineseconversiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ChineseConversionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Chinese Conversion</property>
+    <property name="title" translatable="yes" context="chineseconversiondialog|ChineseConversionDialog">Chinese Conversion</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -100,7 +100,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="tosimplified">
-                            <property name="label" translatable="yes">_Traditional Chinese to simplified Chinese</property>
+                            <property name="label" translatable="yes" context="chineseconversiondialog|tosimplified">_Traditional Chinese to simplified Chinese</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="totraditional">
-                            <property name="label" translatable="yes">_Simplified Chinese to traditional Chinese</property>
+                            <property name="label" translatable="yes" context="chineseconversiondialog|totraditional">_Simplified Chinese to traditional Chinese</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Conversion Direction</property>
+                    <property name="label" translatable="yes" context="chineseconversiondialog|label1">Conversion Direction</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -176,7 +176,7 @@
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="commonterms">
-                            <property name="label" translatable="yes">Translate _common terms</property>
+                            <property name="label" translatable="yes" context="chineseconversiondialog|commonterms">Translate _common terms</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -192,7 +192,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="editterms">
-                            <property name="label" translatable="yes">_Edit Terms...</property>
+                            <property name="label" translatable="yes" context="chineseconversiondialog|editterms">_Edit Terms...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -211,7 +211,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Common Terms</property>
+                    <property name="label" translatable="yes" context="chineseconversiondialog|label2">Common Terms</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svx/uiconfig/ui/chinesedictionary.ui b/svx/uiconfig/ui/chinesedictionary.ui
index 1c4858ed683b..eb8ffe065473 100644
--- a/svx/uiconfig/ui/chinesedictionary.ui
+++ b/svx/uiconfig/ui/chinesedictionary.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="ChineseDictionaryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Dictionary</property>
+    <property name="title" translatable="yes" context="chinesedictionary|ChineseDictionaryDialog">Edit Dictionary</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -84,7 +84,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="tradtosimple">
-                    <property name="label" translatable="yes">_Traditional Chinese to simplified Chinese</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|tradtosimple">_Traditional Chinese to simplified Chinese</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -101,7 +101,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="simpletotrad">
-                    <property name="label" translatable="yes">_Simplified Chinese to traditional Chinese</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|simpletotrad">_Simplified Chinese to traditional Chinese</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -117,7 +117,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="reverse">
-                    <property name="label" translatable="yes">Reverse mapping</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|reverse">Reverse mapping</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -148,7 +148,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Term</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|termft">Term</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -172,7 +172,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Mapping</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|mappingft">Mapping</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -196,7 +196,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Property</property>
+                    <property name="label" translatable="yes" context="chinesedictionary|propertyft">Property</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -209,21 +209,21 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Other</item>
-                      <item translatable="yes">Foreign</item>
-                      <item translatable="yes">First name</item>
-                      <item translatable="yes">Last name</item>
-                      <item translatable="yes">Title</item>
-                      <item translatable="yes">Status</item>
-                      <item translatable="yes">Place name</item>
-                      <item translatable="yes">Business</item>
-                      <item translatable="yes">Adjective</item>
-                      <item translatable="yes">Idiom</item>
-                      <item translatable="yes">Abbreviation</item>
-                      <item translatable="yes">Numerical</item>
-                      <item translatable="yes">Noun</item>
-                      <item translatable="yes">Verb</item>
-                      <item translatable="yes">Brand name</item>
+                      <item translatable="yes" context="chinesedictionary|property">Other</item>
+                      <item translatable="yes" context="chinesedictionary|property">Foreign</item>
+                      <item translatable="yes" context="chinesedictionary|property">First name</item>
+                      <item translatable="yes" context="chinesedictionary|property">Last name</item>
+                      <item translatable="yes" context="chinesedictionary|property">Title</item>
+                      <item translatable="yes" context="chinesedictionary|property">Status</item>
+                      <item translatable="yes" context="chinesedictionary|property">Place name</item>
+                      <item translatable="yes" context="chinesedictionary|property">Business</item>
+                      <item translatable="yes" context="chinesedictionary|property">Adjective</item>
+                      <item translatable="yes" context="chinesedictionary|property">Idiom</item>
+                      <item translatable="yes" context="chinesedictionary|property">Abbreviation</item>
+                      <item translatable="yes" context="chinesedictionary|property">Numerical</item>
+                      <item translatable="yes" context="chinesedictionary|property">Noun</item>
+                      <item translatable="yes" context="chinesedictionary|property">Verb</item>
+                      <item translatable="yes" context="chinesedictionary|property">Brand name</item>
                     </items>
                   </object>
                   <packing>
@@ -254,7 +254,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="modify">
-                        <property name="label" translatable="yes">_Modify</property>
+                        <property name="label" translatable="yes" context="chinesedictionary|modify">_Modify</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 427fe869a539..14a9635f5430 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="auto_icon">
@@ -59,7 +59,7 @@
             </child>
             <child>
               <object class="GtkButton" id="none_color_button">
-                <property name="label" translatable="yes">None</property>
+                <property name="label" translatable="yes" context="colorwindow|none_color_button">None</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="image">none_icon</property>
@@ -128,7 +128,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Recent</property>
+            <property name="label" translatable="yes" context="colorwindow|label1">Recent</property>
             <property name="xalign">0</property>
           </object>
           <packing>
@@ -162,7 +162,7 @@
         </child>
         <child>
           <object class="GtkButton" id="color_picker_button">
-            <property name="label" translatable="yes">Custom Color…</property>
+            <property name="label" translatable="yes" context="colorwindow|color_picker_button">Custom Color…</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/svx/uiconfig/ui/colsmenu.ui b/svx/uiconfig/ui/colsmenu.ui
index d1bf1ca4925f..76d82155154b 100644
--- a/svx/uiconfig/ui/colsmenu.ui
+++ b/svx/uiconfig/ui/colsmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="insert">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert _Column</property>
+        <property name="label" translatable="yes" context="colsmenu|insert">Insert _Column</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -19,7 +19,7 @@
               <object class="GtkMenuItem" id="TextField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Box</property>
+                <property name="label" translatable="yes" context="colsmenu|TextField">Text Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -27,7 +27,7 @@
               <object class="GtkMenuItem" id="CheckBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Check Box</property>
+                <property name="label" translatable="yes" context="colsmenu|CheckBox">Check Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -35,7 +35,7 @@
               <object class="GtkMenuItem" id="ComboBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Combo Box</property>
+                <property name="label" translatable="yes" context="colsmenu|ComboBox">Combo Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -43,7 +43,7 @@
               <object class="GtkMenuItem" id="ListBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List Box</property>
+                <property name="label" translatable="yes" context="colsmenu|ListBox">List Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -51,7 +51,7 @@
               <object class="GtkMenuItem" id="DateField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date Field</property>
+                <property name="label" translatable="yes" context="colsmenu|DateField">Date Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -59,21 +59,21 @@
               <object class="GtkMenuItem" id="TimeField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Time Field</property>
+                <property name="label" translatable="yes" context="colsmenu|TimeField">Time Field</property>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="NumericField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numeric Field</property>
+                <property name="label" translatable="yes" context="colsmenu|NumericField">Numeric Field</property>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="CurrencyField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Currency Field</property>
+                <property name="label" translatable="yes" context="colsmenu|CurrencyField">Currency Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -81,7 +81,7 @@
               <object class="GtkMenuItem" id="PatternField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Pattern Field</property>
+                <property name="label" translatable="yes" context="colsmenu|PatternField">Pattern Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -89,7 +89,7 @@
               <object class="GtkMenuItem" id="FormattedField">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Formatted Field</property>
+                <property name="label" translatable="yes" context="colsmenu|FormattedField">Formatted Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -97,7 +97,7 @@
               <object class="GtkMenuItem" id="dateandtimefield">
                 <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date and Time Field</property>
+                <property name="label" translatable="yes" context="colsmenu|dateandtimefield">Date and Time Field</property>
                 <property name="visible">False</property>
                 <property name="use_underline">True</property>
               </object>
@@ -110,7 +110,7 @@
       <object class="GtkMenuItem" id="change">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Replace with</property>
+        <property name="label" translatable="yes" context="colsmenu|change">_Replace with</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -120,7 +120,7 @@
               <object class="GtkMenuItem" id="TextField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Box</property>
+                <property name="label" translatable="yes" context="colsmenu|TextField1">Text Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -128,7 +128,7 @@
               <object class="GtkMenuItem" id="CheckBox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Check Box</property>
+                <property name="label" translatable="yes" context="colsmenu|CheckBox1">Check Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -136,7 +136,7 @@
               <object class="GtkMenuItem" id="ComboBox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Combo Box</property>
+                <property name="label" translatable="yes" context="colsmenu|ComboBox1">Combo Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -144,7 +144,7 @@
               <object class="GtkMenuItem" id="ListBox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List Box</property>
+                <property name="label" translatable="yes" context="colsmenu|ListBox1">List Box</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -152,7 +152,7 @@
               <object class="GtkMenuItem" id="DateField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date Field</property>
+                <property name="label" translatable="yes" context="colsmenu|DateField1">Date Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -160,7 +160,7 @@
               <object class="GtkMenuItem" id="TimeField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Time Field</property>
+                <property name="label" translatable="yes" context="colsmenu|TimeField1">Time Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -168,7 +168,7 @@
               <object class="GtkMenuItem" id="NumericField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numeric Field</property>
+                <property name="label" translatable="yes" context="colsmenu|NumericField1">Numeric Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -176,7 +176,7 @@
               <object class="GtkMenuItem" id="CurrencyField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Currency Field</property>
+                <property name="label" translatable="yes" context="colsmenu|CurrencyField1">Currency Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -184,7 +184,7 @@
               <object class="GtkMenuItem" id="PatternField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Pattern Field</property>
+                <property name="label" translatable="yes" context="colsmenu|PatternField1">Pattern Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -192,7 +192,7 @@
               <object class="GtkMenuItem" id="FormattedField1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Formatted Field</property>
+                <property name="label" translatable="yes" context="colsmenu|FormattedField1">Formatted Field</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -200,7 +200,7 @@
               <object class="GtkMenuItem" id="dateandtimefield1">
                 <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date and Time Field</property>
+                <property name="label" translatable="yes" context="colsmenu|dateandtimefield1">Date and Time Field</property>
                 <property name="visible">False</property>
                 <property name="use_underline">True</property>
               </object>
@@ -213,7 +213,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete column</property>
+        <property name="label" translatable="yes" context="colsmenu|delete">Delete column</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -221,7 +221,7 @@
       <object class="GtkMenuItem" id="hide">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Hide Column</property>
+        <property name="label" translatable="yes" context="colsmenu|hide">_Hide Column</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -229,7 +229,7 @@
       <object class="GtkMenuItem" id="show">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Show Columns</property>
+        <property name="label" translatable="yes" context="colsmenu|show">_Show Columns</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -239,7 +239,7 @@
               <object class="GtkMenuItem" id="more">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_More...</property>
+                <property name="label" translatable="yes" context="colsmenu|more">_More...</property>
               </object>
             </child>
             <child>
@@ -252,7 +252,7 @@
               <object class="GtkMenuItem" id="all">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_All</property>
+                <property name="label" translatable="yes" context="colsmenu|all">_All</property>
               </object>
             </child>
           </object>
@@ -263,7 +263,7 @@
       <object class="GtkMenuItem" id="column">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Column...</property>
+        <property name="label" translatable="yes" context="colsmenu|column">Column...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui
index ff9c1003c421..2151ce005481 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="compression-adjustment">
     <property name="lower">1</property>
@@ -23,16 +23,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" context="compressgraphicdialog|interpolation-method-store">None</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bilinear</col>
+        <col id="0" translatable="yes" context="compressgraphicdialog|interpolation-method-store">Bilinear</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bicubic</col>
+        <col id="0" translatable="yes" context="compressgraphicdialog|interpolation-method-store">Bicubic</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Lanczos</col>
+        <col id="0" translatable="yes" context="compressgraphicdialog|interpolation-method-store">Lanczos</col>
       </row>
     </data>
   </object>
@@ -53,7 +53,7 @@
   <object class="GtkDialog" id="CompressGraphicDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Compress Image</property>
+    <property name="title" translatable="yes" context="compressgraphicdialog|CompressGraphicDialog">Compress Image</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -147,11 +147,11 @@
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="radio-jpeg">
-                            <property name="label" translatable="yes">JPEG Quality</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|radio-jpeg">JPEG Quality</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Lossy compression</property>
+                            <property name="tooltip_text" translatable="yes" context="compressgraphicdialog|radio-jpeg|tooltip_text">Lossy compression</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radio-lossless</property>
@@ -163,11 +163,11 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="radio-lossless">
-                            <property name="label" translatable="yes">PNG Compression</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|radio-lossless">PNG Compression</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Lossless compression</property>
+                            <property name="tooltip_text" translatable="yes" context="compressgraphicdialog|radio-lossless|tooltip_text">Lossless compression</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -282,7 +282,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Compression</property>
+                    <property name="label" translatable="yes" context="compressgraphicdialog|label2">Compression</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -315,7 +315,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="checkbox-reduce-resolution">
-                            <property name="label" translatable="yes">Reduce image resolution</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|checkbox-reduce-resolution">Reduce image resolution</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -332,7 +332,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Width:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label3">Width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spin-new-width</property>
                             <property name="width_chars">14</property>
@@ -347,7 +347,7 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Height:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label4">Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spin-new-height</property>
                             <property name="width_chars">14</property>
@@ -362,7 +362,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Resolution:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label5">Resolution:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">combo-resolution</property>
                             <property name="width_chars">14</property>
@@ -377,7 +377,7 @@
                           <object class="GtkLabel" id="label12">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Interpolation:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label12">Interpolation:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">interpolation-method-combo</property>
                             <property name="width_chars">14</property>
@@ -456,7 +456,7 @@
                           <object class="GtkLabel" id="label13">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">px</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label13">px</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -468,7 +468,7 @@
                           <object class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">px</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label14">px</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -480,7 +480,7 @@
                           <object class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">DPI</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label16">DPI</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -499,7 +499,7 @@
                   <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Resolution</property>
+                    <property name="label" translatable="yes" context="compressgraphicdialog|label22">Resolution</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -534,7 +534,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Actual dimensions:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label7">Actual dimensions:</property>
                             <property name="single_line_mode">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -560,7 +560,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Apparent dimensions:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label8">Apparent dimensions:</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -572,7 +572,7 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Image size:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label9">Image size:</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -623,7 +623,7 @@
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Type:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|label15">Type:</property>
                             <property name="single_line_mode">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -647,7 +647,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="calculate">
-                            <property name="label" translatable="yes">Calculate New Size:</property>
+                            <property name="label" translatable="yes" context="compressgraphicdialog|calculate">Calculate New Size:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -666,7 +666,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Image Information</property>
+                    <property name="label" translatable="yes" context="compressgraphicdialog|label1">Image Information</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svx/uiconfig/ui/convertmenu.ui b/svx/uiconfig/ui/convertmenu.ui
index 24e551979e04..6eb9525dc805 100644
--- a/svx/uiconfig/ui/convertmenu.ui
+++ b/svx/uiconfig/ui/convertmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="ConvertToEdit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Text Box</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToEdit">_Text Box</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="ConvertToButton">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Button</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToButton">_Button</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="ConvertToFixed">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">La_bel field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToFixed">La_bel field</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="ConvertToGroup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">G_roup Box</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToGroup">G_roup Box</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkMenuItem" id="ConvertToList">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">L_ist Box</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToList">L_ist Box</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -49,7 +49,7 @@
       <object class="GtkMenuItem" id="ConvertToCheckBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Check Box</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToCheckBox">_Check Box</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -57,7 +57,7 @@
       <object class="GtkMenuItem" id="ConvertToRadio">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Radio Button</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToRadio">_Radio Button</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -65,7 +65,7 @@
       <object class="GtkMenuItem" id="ConvertToCombo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Combo Bo_x</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToCombo">Combo Bo_x</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -73,7 +73,7 @@
       <object class="GtkMenuItem" id="ConvertToImageBtn">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">I_mage Button</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToImageBtn">I_mage Button</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -81,7 +81,7 @@
       <object class="GtkMenuItem" id="ConvertToFileControl">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_File Selection</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToFileControl">_File Selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -89,7 +89,7 @@
       <object class="GtkMenuItem" id="ConvertToDate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Date Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToDate">_Date Field</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -97,21 +97,21 @@
       <object class="GtkMenuItem" id="ConvertToTime">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Tim_e Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToTime">Tim_e Field</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertToNumeric">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Numerical Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToNumeric">_Numerical Field</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="ConvertToCurrency">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">C_urrency Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToCurrency">C_urrency Field</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -119,7 +119,7 @@
       <object class="GtkMenuItem" id="ConvertToPattern">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Pattern Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToPattern">_Pattern Field</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -127,7 +127,7 @@
       <object class="GtkMenuItem" id="ConvertToImageControl">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Ima_ge Control</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToImageControl">Ima_ge Control</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -135,7 +135,7 @@
       <object class="GtkMenuItem" id="ConvertToFormatted">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Fo_rmatted Field</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToFormatted">Fo_rmatted Field</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -143,7 +143,7 @@
       <object class="GtkMenuItem" id="ConvertToScrollBar">
         <property name="sensitive">False</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Scroll bar</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToScrollBar">Scroll bar</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -151,7 +151,7 @@
       <object class="GtkMenuItem" id="ConvertToSpinButton">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Spin Button</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToSpinButton">Spin Button</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -159,7 +159,7 @@
       <object class="GtkMenuItem" id="ConvertToNavigationBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Navigation Bar</property>
+        <property name="label" translatable="yes" context="convertmenu|ConvertToNavigationBar">Navigation Bar</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index d993eb0e4470..ffca66d6a84a 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkDialog" id="CrashReportDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Crash Report</property>
+    <property name="title" translatable="yes" context="crashreportdlg|CrashReportDialog">Crash Report</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_send">
-                <property name="label" translatable="yes">_Send Crash Report</property>
+                <property name="label" translatable="yes" context="crashreportdlg|btn_send">_Send Crash Report</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_cancel">
-                <property name="label" translatable="yes">_Don’t Send</property>
+                <property name="label" translatable="yes" context="crashreportdlg|btn_cancel">_Don’t Send</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -48,7 +48,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_close">
-                <property name="label" translatable="yes">Close</property>
+                <property name="label" translatable="yes" context="crashreportdlg|btn_close">Close</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
               </object>
@@ -69,7 +69,7 @@
           <object class="GtkLabel" id="ed_pre">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Unfortunately it seems that %PRODUCTNAME crashed when it was last run.
+            <property name="label" translatable="yes" context="crashreportdlg|ed_pre">Unfortunately it seems that %PRODUCTNAME crashed when it was last run.
 
 You can help us to fix this issue by sending an anonymous crash report to the %PRODUCTNAME crash reporting server.</property>
             <property name="wrap">True</property>
@@ -85,7 +85,7 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
             <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">The crash report was successfully uploaded.
+            <property name="label" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
 You can soon find the report at:
 crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
             <property name="wrap">True</property>
@@ -100,7 +100,7 @@ crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
         <child>
           <object class="GtkTextView" id="ed_bugreport">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.
+            <property name="label" translatable="yes" context="crashreportdlg|ed_bugreport">Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.
 Add detailed instructions on how to reproduce the crash and the shown crash ID into the crash report field.
 Thank you for your help in improving %PRODUCTNAME.</property>
             <property name="wrap">True</property>
@@ -113,7 +113,7 @@ Thank you for your help in improving %PRODUCTNAME.</property>
         </child>
         <child>
            <object class="GtkCheckButton" id="check_safemode">
-             <property name="label" translatable="yes">Restart %PRODUCTNAME to enter safe mode</property>
+             <property name="label" translatable="yes" context="crashreportdlg|check_safemode">Restart %PRODUCTNAME to enter safe mode</property>
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="receives_default">False</property>
diff --git a/svx/uiconfig/ui/datanavigator.ui b/svx/uiconfig/ui/datanavigator.ui
index 45d0c0c8d045..c6eb4bf588d8 100644
--- a/svx/uiconfig/ui/datanavigator.ui
+++ b/svx/uiconfig/ui/datanavigator.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="DataNavigator">
     <property name="visible">True</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="modelsbutton:modelsmenu">
-                <property name="label" translatable="yes">_Models</property>
+                <property name="label" translatable="yes" context="datanavigator|modelsbutton">_Models</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -70,7 +70,7 @@
               <object class="GtkLabel" id="instance">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Instance</property>
+                <property name="label" translatable="yes" context="datanavigator|instance">Instance</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="submissions">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Submissions</property>
+                <property name="label" translatable="yes" context="datanavigator|submissions">Submissions</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="bindings">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bindings</property>
+                <property name="label" translatable="yes" context="datanavigator|bindings">Bindings</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -113,7 +113,7 @@
         </child>
         <child>
           <object class="GtkButton" id="instances:instancesmenu">
-            <property name="label" translatable="yes">_Instances</property>
+            <property name="label" translatable="yes" context="datanavigator|instances">_Instances</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -141,21 +141,21 @@
       <object class="GtkMenuItem" id="instancesadd">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add...</property>
+        <property name="label" translatable="yes" context="datanavigator|instancesadd">_Add...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="instancesedit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit...</property>
+        <property name="label" translatable="yes" context="datanavigator|instancesedit">_Edit...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="instancesremove">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Remove...</property>
+        <property name="label" translatable="yes" context="datanavigator|instancesremove">_Remove...</property>
       </object>
     </child>
     <child>
@@ -168,7 +168,7 @@
       <object class="GtkMenuItem" id="instancesdetails">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Show Details</property>
+        <property name="label" translatable="yes" context="datanavigator|instancesdetails">_Show Details</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -180,7 +180,7 @@
       <object class="GtkMenuItem" id="modelsadd">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add...</property>
+        <property name="label" translatable="yes" context="datanavigator|modelsadd">_Add...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -188,7 +188,7 @@
       <object class="GtkMenuItem" id="modelsedit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit...</property>
+        <property name="label" translatable="yes" context="datanavigator|modelsedit">_Edit...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -196,7 +196,7 @@
       <object class="GtkMenuItem" id="modelsremove">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Remove</property>
+        <property name="label" translatable="yes" context="datanavigator|modelsremove">_Remove</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/defaultshapespanel.ui b/svx/uiconfig/ui/defaultshapespanel.ui
index aab5fe0cf60e..390d5cf1a2d3 100644
--- a/svx/uiconfig/ui/defaultshapespanel.ui
+++ b/svx/uiconfig/ui/defaultshapespanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="DefaultShapesPanel">
@@ -55,7 +55,7 @@
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Lines &amp; Arrows</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label1">Lines &amp; Arrows</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -92,7 +92,7 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Curve</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label2">Curve</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -129,7 +129,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Connectors</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label3">Connectors</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -166,7 +166,7 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Basic Shapes</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label4">Basic Shapes</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -203,7 +203,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Symbols</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label5">Symbols</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -240,7 +240,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Block Arrows</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label6">Block Arrows</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -277,7 +277,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Flowchart</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label7">Flowchart</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -314,7 +314,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Callouts</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label8">Callouts</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -351,7 +351,7 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Stars</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label9">Stars</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -388,7 +388,7 @@
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">3D Objects</property>
+                            <property name="label" translatable="yes" context="defaultshapespanel|label10">3D Objects</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui
index 71e433e3edbb..f77b40390d99 100644
--- a/svx/uiconfig/ui/deletefooterdialog.ui
+++ b/svx/uiconfig/ui/deletefooterdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete footer?</property>
+    <property name="title" translatable="yes" context="deletefooterdialog|DeleteFooterDialog">Delete footer?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Are you sure you want to delete the footer?</property>
-    <property name="secondary_text" translatable="yes">All contents of the footer will be deleted and can not be restored.</property>
+    <property name="text" translatable="yes" context="deletefooterdialog|DeleteFooterDialog">Are you sure you want to delete the footer?</property>
+    <property name="secondary_text" translatable="yes" context="deletefooterdialog|DeleteFooterDialog">All contents of the footer will be deleted and can not be restored.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui
index 60f82fb098fa..9a09130c24d2 100644
--- a/svx/uiconfig/ui/deleteheaderdialog.ui
+++ b/svx/uiconfig/ui/deleteheaderdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteHeaderDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete header?</property>
+    <property name="title" translatable="yes" context="deleteheaderdialog|DeleteHeaderDialog">Delete header?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Are you sure you want to delete the header?</property>
-    <property name="secondary_text" translatable="yes">All contents of the header will be deleted and can not be restored.</property>
+    <property name="text" translatable="yes" context="deleteheaderdialog|DeleteHeaderDialog">Are you sure you want to delete the header?</property>
+    <property name="secondary_text" translatable="yes" context="deleteheaderdialog|DeleteHeaderDialog">All contents of the header will be deleted and can not be restored.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index b468ce2a076d..f491b35ed0d7 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -261,7 +261,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">3D Effects</property>
+    <property name="title" translatable="yes" context="docking3deffects|Docking3DEffects">3D Effects</property>
     <property name="type_hint">dock</property>
     <child>
       <object class="GtkGrid" id="grid1">
@@ -291,7 +291,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">R_ounded edges</property>
+                        <property name="label" translatable="yes" context="docking3deffects|diagonalft">R_ounded edges</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">diagonal:0%</property>
                       </object>
@@ -305,7 +305,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Scaled depth</property>
+                        <property name="label" translatable="yes" context="docking3deffects|scaleddepthft">_Scaled depth</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">scaleddepth:0%</property>
                       </object>
@@ -319,7 +319,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Rotation angle</property>
+                        <property name="label" translatable="yes" context="docking3deffects|angleft">_Rotation angle</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">angle:0.0°</property>
                       </object>
@@ -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">_Depth</property>
+                        <property name="label" translatable="yes" context="docking3deffects|depthft">_Depth</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">depth:0.00cm</property>
                       </object>
@@ -399,7 +399,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Geometry</property>
+                <property name="label" translatable="yes" context="docking3deffects|label1">Geometry</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -441,7 +441,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Horizontal</property>
+                            <property name="label" translatable="yes" context="docking3deffects|label6">_Horizontal</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">hori</property>
                           </object>
@@ -480,7 +480,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Vertical</property>
+                            <property name="label" translatable="yes" context="docking3deffects|label7">_Vertical</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">veri</property>
                           </object>
@@ -515,7 +515,7 @@
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Segments</property>
+                <property name="label" translatable="yes" context="docking3deffects|label10">Segments</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -567,7 +567,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Object-Specific</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|objspecific|tooltip_text">Object-Specific</property>
                                 <property name="valign">center</property>
                                 <property name="image">image8</property>
                               </object>
@@ -581,7 +581,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Flat</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|flat|tooltip_text">Flat</property>
                                 <property name="valign">center</property>
                                 <property name="image">image9</property>
                               </object>
@@ -595,7 +595,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Spherical</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|spherical|tooltip_text">Spherical</property>
                                 <property name="valign">center</property>
                                 <property name="image">image10</property>
                               </object>
@@ -609,7 +609,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Invert Normals</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|invertnormals|tooltip_text">Invert Normals</property>
                                 <property name="valign">center</property>
                                 <property name="image">image11</property>
                               </object>
@@ -623,7 +623,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Double-Sided Illumination</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|doublesidedillum|tooltip_text">Double-Sided Illumination</property>
                                 <property name="valign">center</property>
                                 <property name="image">image12</property>
                               </object>
@@ -637,7 +637,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Double-Sided</property>
+                                <property name="tooltip_text" translatable="yes" context="docking3deffects|doublesided|tooltip_text">Double-Sided</property>
                                 <property name="valign">center</property>
                                 <property name="image">image13</property>
                               </object>
@@ -663,7 +663,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Normals</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label11">Normals</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -695,7 +695,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Convert to 3D</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|to3d|tooltip_text">Convert to 3D</property>
                             <property name="image">image14</property>
                           </object>
                           <packing>
@@ -708,7 +708,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Convert to Rotation Object</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|tolathe|tooltip_text">Convert to Rotation Object</property>
                             <property name="image">image15</property>
                           </object>
                           <packing>
@@ -721,7 +721,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Perspective On/Off</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|perspective|tooltip_text">Perspective On/Off</property>
                             <property name="image">image16</property>
                           </object>
                           <packing>
@@ -760,7 +760,7 @@
                     <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="preview-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">3D Preview</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="docking3deffects|preview-atkobject">3D Preview</property>
                       </object>
                     </child>
                   </object>
@@ -780,7 +780,7 @@
                     <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="lightpreview-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Color Light Preview</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="docking3deffects|lightpreview-atkobject">Color Light Preview</property>
                       </object>
                     </child>
                   </object>
@@ -826,7 +826,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Mode</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label8">_Mode</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mode</property>
                       </object>
@@ -840,9 +840,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Flat</item>
-                          <item translatable="yes">Phong</item>
-                          <item translatable="yes">Gouraud</item>
+                          <item translatable="yes" context="docking3deffects|mode">Flat</item>
+                          <item translatable="yes" context="docking3deffects|mode">Phong</item>
+                          <item translatable="yes" context="docking3deffects|mode">Gouraud</item>
                         </items>
                       </object>
                       <packing>
@@ -858,7 +858,7 @@
               <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shading</property>
+                <property name="label" translatable="yes" context="docking3deffects|label12">Shading</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -895,7 +895,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">S_urface angle</property>
+                        <property name="label" translatable="yes" context="docking3deffects|slantft">S_urface angle</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">slant:0°</property>
                       </object>
@@ -921,7 +921,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">3D Shadowing On/Off</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|shadow|tooltip_text">3D Shadowing On/Off</property>
                         <property name="image">image17</property>
                       </object>
                       <packing>
@@ -937,7 +937,7 @@
               <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shadow</property>
+                <property name="label" translatable="yes" context="docking3deffects|label13">Shadow</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -999,7 +999,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Focal length</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label15">_Focal length</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">veri</property>
                       </object>
@@ -1013,7 +1013,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Distance</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label14">_Distance</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">hori</property>
                       </object>
@@ -1030,7 +1030,7 @@
               <object class="GtkLabel" id="label16">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Camera</property>
+                <property name="label" translatable="yes" context="docking3deffects|label16">Camera</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1065,7 +1065,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Light source</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label17">_Light source</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1079,7 +1079,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Colors Dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|colorbutton1|tooltip_text">Colors Dialog</property>
                         <property name="valign">start</property>
                         <property name="image">image19</property>
                       </object>
@@ -1105,7 +1105,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Colors Dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|colorbutton2|tooltip_text">Colors Dialog</property>
                         <property name="valign">center</property>
                         <property name="image">image18</property>
                       </object>
@@ -1119,7 +1119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Ambient light</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label18">_Ambient light</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">ambientcolor</property>
                       </object>
@@ -1139,7 +1139,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 1</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light1|tooltip_text">Light Source 1</property>
                             <property name="image">image20</property>
                           </object>
                           <packing>
@@ -1152,7 +1152,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 2</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light2|tooltip_text">Light Source 2</property>
                             <property name="image">image21</property>
                           </object>
                           <packing>
@@ -1165,7 +1165,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 3</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light3|tooltip_text">Light Source 3</property>
                             <property name="image">image22</property>
                           </object>
                           <packing>
@@ -1178,7 +1178,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 4</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light4|tooltip_text">Light Source 4</property>
                             <property name="image">image23</property>
                           </object>
                           <packing>
@@ -1191,7 +1191,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 5</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light5|tooltip_text">Light Source 5</property>
                             <property name="image">image24</property>
                           </object>
                           <packing>
@@ -1204,7 +1204,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 6</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light6|tooltip_text">Light Source 6</property>
                             <property name="image">image25</property>
                           </object>
                           <packing>
@@ -1217,7 +1217,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 7</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light7|tooltip_text">Light Source 7</property>
                             <property name="image">image26</property>
                           </object>
                           <packing>
@@ -1230,7 +1230,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Light Source 8</property>
+                            <property name="tooltip_text" translatable="yes" context="docking3deffects|light8|tooltip_text">Light Source 8</property>
                             <property name="image">image27</property>
                           </object>
                           <packing>
@@ -1367,7 +1367,7 @@
               <object class="GtkLabel" id="label19">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Illumination</property>
+                <property name="label" translatable="yes" context="docking3deffects|label19">Illumination</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1402,7 +1402,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Type</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label20">_Type</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1415,7 +1415,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Mode</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label22">_Mode</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1428,7 +1428,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Projection X</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label23">_Projection X</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1441,7 +1441,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">P_rojection Y</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label24">P_rojection Y</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1454,7 +1454,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Filtering</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label25">_Filtering</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1467,7 +1467,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Black &amp; White</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|textype|tooltip_text">Black &amp; White</property>
                         <property name="halign">center</property>
                         <property name="image">image28</property>
                       </object>
@@ -1481,7 +1481,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Color</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texcolor|tooltip_text">Color</property>
                         <property name="halign">center</property>
                         <property name="image">image29</property>
                       </object>
@@ -1495,7 +1495,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Only Texture</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texreplace|tooltip_text">Only Texture</property>
                         <property name="halign">center</property>
                         <property name="image">image30</property>
                       </object>
@@ -1509,7 +1509,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Texture and Shading</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texmodulate|tooltip_text">Texture and Shading</property>
                         <property name="halign">center</property>
                         <property name="image">image31</property>
                       </object>
@@ -1523,7 +1523,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Object-Specific</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texobjx|tooltip_text">Object-Specific</property>
                         <property name="halign">center</property>
                         <property name="image">image32</property>
                       </object>
@@ -1537,7 +1537,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Parallel</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texparallelx|tooltip_text">Parallel</property>
                         <property name="halign">center</property>
                         <property name="image">image33</property>
                       </object>
@@ -1551,7 +1551,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Circular</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texcirclex|tooltip_text">Circular</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="image">image34</property>
@@ -1566,7 +1566,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Object-Specific</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texobjy|tooltip_text">Object-Specific</property>
                         <property name="halign">center</property>
                         <property name="image">image35</property>
                       </object>
@@ -1580,7 +1580,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Parallel</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texparallely|tooltip_text">Parallel</property>
                         <property name="halign">center</property>
                         <property name="image">image36</property>
                       </object>
@@ -1594,7 +1594,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Circular</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texcircley|tooltip_text">Circular</property>
                         <property name="halign">start</property>
                         <property name="image">image37</property>
                       </object>
@@ -1608,7 +1608,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Filtering On/Off</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texfilter|tooltip_text">Filtering On/Off</property>
                         <property name="halign">center</property>
                         <property name="image">image38</property>
                       </object>
@@ -1622,7 +1622,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Texture, Shadow and Color</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|texblend|tooltip_text">Texture, Shadow and Color</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="image">image42</property>
@@ -1649,7 +1649,7 @@
               <object class="GtkLabel" id="label21">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Textures</property>
+                <property name="label" translatable="yes" context="docking3deffects|label21">Textures</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1684,7 +1684,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Favorites</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label26">_Favorites</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -1697,7 +1697,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Object color</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label27">_Object color</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">objcolor</property>
                       </object>
@@ -1711,7 +1711,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Illumination color</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label29">_Illumination color</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">illumcolor</property>
                       </object>
@@ -1749,12 +1749,12 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">User-defined</item>
-                          <item translatable="yes">Metal</item>
-                          <item translatable="yes">Gold</item>
-                          <item translatable="yes">Chrome</item>
-                          <item translatable="yes">Plastic</item>
-                          <item translatable="yes">Wood</item>
+                          <item translatable="yes" context="docking3deffects|favorites">User-defined</item>
+                          <item translatable="yes" context="docking3deffects|favorites">Metal</item>
+                          <item translatable="yes" context="docking3deffects|favorites">Gold</item>
+                          <item translatable="yes" context="docking3deffects|favorites">Chrome</item>
+                          <item translatable="yes" context="docking3deffects|favorites">Plastic</item>
+                          <item translatable="yes" context="docking3deffects|favorites">Wood</item>
                         </items>
                       </object>
                       <packing>
@@ -1768,7 +1768,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Colors Dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|colorbutton3|tooltip_text">Colors Dialog</property>
                         <property name="image">image39</property>
                       </object>
                       <packing>
@@ -1781,7 +1781,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Colors Dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|colorbutton4|tooltip_text">Colors Dialog</property>
                         <property name="image">image40</property>
                       </object>
                       <packing>
@@ -1797,7 +1797,7 @@
               <object class="GtkLabel" id="label28">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Material</property>
+                <property name="label" translatable="yes" context="docking3deffects|label28">Material</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1832,7 +1832,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Color</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label30">_Color</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">speccolor</property>
                       </object>
@@ -1846,7 +1846,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">I_ntensity</property>
+                        <property name="label" translatable="yes" context="docking3deffects|label31">I_ntensity</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">intensity:0%</property>
                       </object>
@@ -1872,7 +1872,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Colors Dialog</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|colorbutton5|tooltip_text">Colors Dialog</property>
                         <property name="image">image41</property>
                       </object>
                       <packing>
@@ -1900,7 +1900,7 @@
               <object class="GtkLabel" id="label32">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Specular</property>
+                <property name="label" translatable="yes" context="docking3deffects|label32">Specular</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -1922,7 +1922,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Assign</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|assign|tooltip_text">Assign</property>
                 <property name="image">image7</property>
               </object>
               <packing>
@@ -1935,7 +1935,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Update</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|update|tooltip_text">Update</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
                 <property name="image">image6</property>
@@ -1950,7 +1950,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Material</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|material|tooltip_text">Material</property>
                 <property name="image">image5</property>
               </object>
               <packing>
@@ -1963,7 +1963,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Textures</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|texture|tooltip_text">Textures</property>
                 <property name="image">image4</property>
               </object>
               <packing>
@@ -1976,7 +1976,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Illumination</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|light|tooltip_text">Illumination</property>
                 <property name="image">image3</property>
               </object>
               <packing>
@@ -1989,7 +1989,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Shading</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|representation|tooltip_text">Shading</property>
                 <property name="image">image2</property>
               </object>
               <packing>
@@ -2002,7 +2002,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Geometry</property>
+                <property name="tooltip_text" translatable="yes" context="docking3deffects|geometry|tooltip_text">Geometry</property>
                 <property name="image">image1</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui b/svx/uiconfig/ui/dockingcolorreplace.ui
index c74b4618e385..77a44d403feb 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++ b/svx/uiconfig/ui/dockingcolorreplace.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -15,7 +15,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Color Replacer</property>
+    <property name="title" translatable="yes" context="dockingcolorreplace|DockingColorReplace">Color Replacer</property>
     <property name="type_hint">dock</property>
     <child>
       <object class="GtkGrid" id="grid1">
@@ -49,7 +49,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Source color</property>
+                        <property name="label" translatable="yes" context="dockingcolorreplace|label2">Source color</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -62,7 +62,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Tolerance</property>
+                        <property name="label" translatable="yes" context="dockingcolorreplace|label3">Tolerance</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -74,7 +74,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Replace with...</property>
+                        <property name="label" translatable="yes" context="dockingcolorreplace|label4">Replace with...</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -91,7 +91,7 @@
                         <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cbx2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|cbx2-atkobject" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 2</property>
                           </object>
                         </child>
                       </object>
@@ -109,7 +109,7 @@
                         <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cbx3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|cbx3-atkobject" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 3</property>
                           </object>
                         </child>
                       </object>
@@ -127,7 +127,7 @@
                         <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cbx4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|cbx4-atkobject" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 4</property>
                           </object>
                         </child>
                       </object>
@@ -145,7 +145,7 @@
                         <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="cbx1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|cbx1-atkobject" comments="This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.">Source Color 1</property>
                           </object>
                         </child>
                       </object>
@@ -156,7 +156,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="cbx5">
-                        <property name="label" translatable="yes">Tr_ansparency</property>
+                        <property name="label" translatable="yes" context="dockingcolorreplace|cbx5">Tr_ansparency</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -177,7 +177,7 @@
                         <property name="adjustment">adjustment1</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="tol1:0%-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Tolerance 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|tol1-atkobject">Tolerance 1</property>
                           </object>
                         </child>
                       </object>
@@ -195,7 +195,7 @@
                         <property name="value">10</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="tol2:0%-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Tolerance 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|tol2-atkobject">Tolerance 2</property>
                           </object>
                         </child>
                       </object>
@@ -213,7 +213,7 @@
                         <property name="value">10</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="tol3:0%-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Tolerance 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|tol3-atkobject">Tolerance 3</property>
                           </object>
                         </child>
                       </object>
@@ -231,7 +231,7 @@
                         <property name="value">10</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="tol4:0%-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Tolerance 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|tol4-atkobject">Tolerance 4</property>
                           </object>
                         </child>
                       </object>
@@ -247,7 +247,7 @@
                         <property name="hexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="color1-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Replace with 1</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|color1-atkobject">Replace with 1</property>
                           </object>
                         </child>
                       </object>
@@ -263,7 +263,7 @@
                         <property name="hexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="color2-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Replace with 2</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|color2-atkobject">Replace with 2</property>
                           </object>
                         </child>
                       </object>
@@ -279,7 +279,7 @@
                         <property name="hexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="color3-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Replace with 3</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|color3-atkobject">Replace with 3</property>
                           </object>
                         </child>
                       </object>
@@ -295,7 +295,7 @@
                         <property name="hexpand">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="color4-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Replace with 4</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="dockingcolorreplace|color4-atkobject">Replace with 4</property>
                           </object>
                         </child>
                       </object>
@@ -334,7 +334,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Colors</property>
+                <property name="label" translatable="yes" context="dockingcolorreplace|label1">Colors</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -354,7 +354,7 @@
             <property name="column_spacing">24</property>
             <child>
               <object class="GtkButton" id="replace">
-                <property name="label" translatable="yes">_Replace</property>
+                <property name="label" translatable="yes" context="dockingcolorreplace|replace">_Replace</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -385,7 +385,7 @@
                       <object class="GtkToolButton" id="pipette">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Pipette</property>
+                        <property name="label" translatable="yes" context="dockingcolorreplace|pipette">Pipette</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">res/sc10350.png</property>
                       </object>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index 32ab55392784..b1abc2dea0fb 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -15,7 +15,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fontwork</property>
+    <property name="title" translatable="yes" context="dockingfontwork|DockingFontwork">Fontwork</property>
     <property name="type_hint">dock</property>
     <child>
       <object class="GtkGrid" id="grid1">
@@ -30,7 +30,7 @@
               <object class="GtkToggleToolButton" id="off">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Off</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|off|tooltip_text">Off</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw01.png</property>
               </object>
@@ -53,7 +53,7 @@
               <object class="GtkRadioToolButton" id="rotate">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Rotate</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|rotate|tooltip_text">Rotate</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw02.png</property>
               </object>
@@ -66,7 +66,7 @@
               <object class="GtkRadioToolButton" id="upright">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Upright</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|upright|tooltip_text">Upright</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw03.png</property>
                 <property name="group">rotate</property>
@@ -80,7 +80,7 @@
               <object class="GtkRadioToolButton" id="hori">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Slant Horizontal</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw04.png</property>
                 <property name="group">rotate</property>
@@ -94,7 +94,7 @@
               <object class="GtkRadioToolButton" id="vert">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Slant Vertical</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw05.png</property>
                 <property name="group">rotate</property>
@@ -118,7 +118,7 @@
               <object class="GtkToggleToolButton" id="orientation">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Orientation</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|orientation|tooltip_text">Orientation</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw06.png</property>
               </object>
@@ -141,7 +141,7 @@
               <object class="GtkRadioToolButton" id="left">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Align Left</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|left|tooltip_text">Align Left</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw07.png</property>
               </object>
@@ -154,7 +154,7 @@
               <object class="GtkRadioToolButton" id="center">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Center</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|center|tooltip_text">Center</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw08.png</property>
                 <property name="group">left</property>
@@ -168,7 +168,7 @@
               <object class="GtkRadioToolButton" id="right">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Align Right</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|right|tooltip_text">Align Right</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw09.png</property>
                 <property name="group">left</property>
@@ -182,7 +182,7 @@
               <object class="GtkRadioToolButton" id="autosize">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">AutoSize Text</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw010.png</property>
                 <property name="group">left</property>
@@ -220,7 +220,7 @@
               <object class="GtkSpinButton" id="distance:0.00mm">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Distance</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distance|tooltip_text">Distance</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="digits">2</property>
               </object>
@@ -257,7 +257,7 @@
               <object class="GtkSpinButton" id="indent:0.00mm">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|indent|tooltip_text">Indent</property>
                 <property name="text" translatable="no">0.00</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="digits">2</property>
@@ -281,7 +281,7 @@
               <object class="GtkToggleToolButton" id="contour">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Contour</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|contour|tooltip_text">Contour</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw011.png</property>
               </object>
@@ -294,7 +294,7 @@
               <object class="GtkToggleToolButton" id="textcontour">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Text Contour</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw012.png</property>
               </object>
@@ -317,7 +317,7 @@
               <object class="GtkRadioToolButton" id="noshadow">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">No Shadow</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|noshadow|tooltip_text">No Shadow</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw013.png</property>
               </object>
@@ -330,7 +330,7 @@
               <object class="GtkRadioToolButton" id="vertical">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Vertical</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|vertical|tooltip_text">Vertical</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw014.png</property>
                 <property name="group">noshadow</property>
@@ -344,7 +344,7 @@
               <object class="GtkRadioToolButton" id="slant">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Slant</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|slant|tooltip_text">Slant</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">svx/res/fw015.png</property>
                 <property name="group">noshadow</property>
@@ -382,7 +382,7 @@
               <object class="GtkSpinButton" id="distancex:0.00mm">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Distance X</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancex|tooltip_text">Distance X</property>
                 <property name="text" translatable="no">0.00</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="digits">2</property>
@@ -420,7 +420,7 @@
               <object class="GtkSpinButton" id="distancey:0.00mm">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Distance Y</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancey|tooltip_text">Distance Y</property>
                 <property name="text" translatable="no">0</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="digits">2</property>
@@ -440,7 +440,7 @@
           <object class="svxcorelo-SvxColorListBox" id="color">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Shadow Color</property>
+            <property name="tooltip_text" translatable="yes" context="dockingfontwork|color|tooltip_text">Shadow Color</property>
             <property name="valign">start</property>
             <property name="hexpand">True</property>
           </object>
diff --git a/svx/uiconfig/ui/docrecoverybrokendialog.ui b/svx/uiconfig/ui/docrecoverybrokendialog.ui
index f934476c67cd..79e3b2dc28eb 100644
--- a/svx/uiconfig/ui/docrecoverybrokendialog.ui
+++ b/svx/uiconfig/ui/docrecoverybrokendialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DocRecoveryBrokenDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME Document Recovery</property>
+    <property name="title" translatable="yes" context="docrecoverybrokendialog|DocRecoveryBrokenDialog">%PRODUCTNAME Document Recovery</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="save">
-                <property name="label" translatable="yes">_Save</property>
+                <property name="label" translatable="yes" context="docrecoverybrokendialog|save">_Save</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -71,7 +71,7 @@
                 <property name="halign">start</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The automatic recovery process was interrupted.
+                <property name="label" translatable="yes" context="docrecoverybrokendialog|label1">The automatic recovery process was interrupted.
 
 The documents listed below will be saved in the folder noted below if you click 'Save'. Click 'Cancel' to close the wizard without saving the documents.</property>
                 <property name="wrap">True</property>
@@ -88,7 +88,7 @@ The documents listed below will be saved in the folder noted below if you click
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Documents:</property>
+                <property name="label" translatable="yes" context="docrecoverybrokendialog|label3">Documents:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">filelist:border</property>
               </object>
@@ -121,7 +121,7 @@ The documents listed below will be saved in the folder noted below if you click
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Save to:</property>
+                <property name="label" translatable="yes" context="docrecoverybrokendialog|label4">_Save to:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">savedir</property>
               </object>
@@ -152,7 +152,7 @@ The documents listed below will be saved in the folder noted below if you click
                 </child>
                 <child>
                   <object class="GtkButton" id="change">
-                    <property name="label" translatable="yes">Chan_ge...</property>
+                    <property name="label" translatable="yes" context="docrecoverybrokendialog|change">Chan_ge...</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/svx/uiconfig/ui/docrecoveryprogressdialog.ui b/svx/uiconfig/ui/docrecoveryprogressdialog.ui
index 2dd8c653d825..4e3201080b58 100644
--- a/svx/uiconfig/ui/docrecoveryprogressdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryprogressdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DocRecoveryProgressDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Documents Are Being Saved</property>
+    <property name="title" translatable="yes" context="docrecoveryprogressdialog|DocRecoveryProgressDialog">Documents Are Being Saved</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -39,7 +39,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Progress of saving:</property>
+                <property name="label" translatable="yes" context="docrecoveryprogressdialog|label2">Progress of saving:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 1b7b08b9dea7..8f9a9f8505b2 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DocRecoveryRecoverDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
+    <property name="title" translatable="yes" context="docrecoveryrecoverdialog|DocRecoveryRecoverDialog">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">_Discard</property>
+                <property name="label" translatable="yes" context="docrecoveryrecoverdialog|cancel">_Discard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="next">
-                <property name="label" translatable="yes">_Start</property>
+                <property name="label" translatable="yes" context="docrecoveryrecoverdialog|next">_Start</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -74,7 +74,7 @@
                   <object class="GtkLabel" id="desc">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">%PRODUCTNAME will attempt to recover the state of the files you were working on before it crashed. Click 'Start' to begin the process, or click 'Discard' to cancel the recovery.</property>
+                    <property name="label" translatable="yes" context="docrecoveryrecoverdialog|desc">%PRODUCTNAME will attempt to recover the state of the files you were working on before it crashed. Click 'Start' to begin the process, or click 'Discard' to cancel the recovery.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">87</property>
                     <property name="xalign">0</property>
@@ -95,7 +95,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Status of recovered documents:</property>
+                        <property name="label" translatable="yes" context="docrecoveryrecoverdialog|label2">Status of recovered documents:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">filelist:border</property>
                         <property name="xalign">0</property>
@@ -132,7 +132,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Document Name</property>
+                            <property name="label" translatable="yes" context="docrecoveryrecoverdialog|nameft">Document Name</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -144,7 +144,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Status</property>
+                            <property name="label" translatable="yes" context="docrecoveryrecoverdialog|statusft">Status</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
diff --git a/svx/uiconfig/ui/docrecoverysavedialog.ui b/svx/uiconfig/ui/docrecoverysavedialog.ui
index 2e2862abf8c4..f0d9e2ee4dbe 100644
--- a/svx/uiconfig/ui/docrecoverysavedialog.ui
+++ b/svx/uiconfig/ui/docrecoverysavedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DocRecoverySaveDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
+    <property name="title" translatable="yes" context="docrecoverysavedialog|DocRecoverySaveDialog">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -56,7 +56,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Due to an unexpected error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically.</property>
+                    <property name="label" translatable="yes" context="docrecoverysavedialog|label1">Due to an unexpected error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">87</property>
                     <property name="xalign">0</property>
@@ -77,7 +77,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">The following files will be recovered:</property>
+                        <property name="label" translatable="yes" context="docrecoverysavedialog|label2">The following files will be recovered:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">filelist:border</property>
                         <property name="xalign">0</property>
diff --git a/svx/uiconfig/ui/extrustiondepthdialog.ui b/svx/uiconfig/ui/extrustiondepthdialog.ui
index 593c1a95484c..79b65f1cbaa8 100644
--- a/svx/uiconfig/ui/extrustiondepthdialog.ui
+++ b/svx/uiconfig/ui/extrustiondepthdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">338.666</property>
@@ -9,7 +9,7 @@
   <object class="GtkDialog" id="ExtrustionDepthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Extrusion Depth</property>
+    <property name="title" translatable="yes" context="extrustiondepthdialog|ExtrustionDepthDialog">Extrusion Depth</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -113,7 +113,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Value</property>
+                        <property name="label" translatable="yes" context="extrustiondepthdialog|label1">_Value</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">depth:0.00cm</property>
                       </object>
@@ -132,7 +132,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Depth</property>
+                <property name="label" translatable="yes" context="extrustiondepthdialog|label2">Depth</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/filtermenu.ui b/svx/uiconfig/ui/filtermenu.ui
index 2a58c1b83ef9..a3b14ab4bcec 100644
--- a/svx/uiconfig/ui/filtermenu.ui
+++ b/svx/uiconfig/ui/filtermenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="filtermenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit</property>
+        <property name="label" translatable="yes" context="filtermenu|edit">_Edit</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="isnull">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Is Null</property>
+        <property name="label" translatable="yes" context="filtermenu|isnull">_Is Null</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="isnotnull">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">I_s not Null</property>
+        <property name="label" translatable="yes" context="filtermenu|isnotnull">I_s not Null</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui
index 8a21d441c1ac..bc30d36758be 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FindReplaceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Find &amp; Replace</property>
+    <property name="title" translatable="yes" context="findreplacedialog|FindReplaceDialog">Find &amp; Replace</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -132,7 +132,7 @@
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <property name="label" translatable="yes">_Find:</property>
+                            <property name="label" translatable="yes" context="findreplacedialog|label4">_Find:</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0.40000000596046448</property>
@@ -180,7 +180,7 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="matchcase">
-                                <property name="label" translatable="yes">Ma_tch case</property>
+                                <property name="label" translatable="yes" context="findreplacedialog|matchcase">Ma_tch case</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -196,7 +196,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="searchformatted">
-                                <property name="label" translatable="yes">For_matted display</property>
+                                <property name="label" translatable="yes" context="findreplacedialog|searchformatted">For_matted display</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -215,7 +215,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" id="wholewords">
-                                    <property name="label" translatable="yes">Whole wor_ds only</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|wholewords">Whole wor_ds only</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -233,7 +233,7 @@
                                   <object class="GtkLabel" id="entirecells">
                                     <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
-                                    <property name="label" translatable="yes">_Entire cells</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|entirecells">_Entire cells</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -251,7 +251,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="allsheets">
-                                <property name="label" translatable="yes">All _sheets</property>
+                                <property name="label" translatable="yes" context="findreplacedialog|allsheets">All _sheets</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="no_show_all">True</property>
@@ -278,7 +278,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Search For</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|label1">_Search For</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -362,7 +362,7 @@
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <property name="label" translatable="yes">Re_place:</property>
+                            <property name="label" translatable="yes" context="findreplacedialog|label5">Re_place:</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <attributes>
@@ -395,7 +395,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label2">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Re_place With</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|label2">Re_place With</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -421,7 +421,7 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="searchall">
-                    <property name="label" translatable="yes">Find _All</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|searchall">Find _All</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -435,7 +435,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="backsearch">
-                    <property name="label" translatable="yes">Find Pre_vious</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|backsearch">Find Pre_vious</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -449,7 +449,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="search">
-                    <property name="label" translatable="yes">Find Ne_xt</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|search">Find Ne_xt</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
@@ -465,7 +465,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="replace">
-                    <property name="label" translatable="yes">_Replace</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|replace">_Replace</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -479,7 +479,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="replaceall">
-                    <property name="label" translatable="yes">Replace A_ll</property>
+                    <property name="label" translatable="yes" context="findreplacedialog|replaceall">Replace A_ll</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -630,7 +630,7 @@
                                 <property name="column_homogeneous">True</property>
                                 <child>
                                   <object class="GtkCheckButton" id="selection">
-                                    <property name="label" translatable="yes">C_urrent selection only</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|selection">C_urrent selection only</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="no_show_all">True</property>
@@ -645,7 +645,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="regexp">
-                                    <property name="label" translatable="yes">Re_gular expressions</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|regexp">Re_gular expressions</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="no_show_all">True</property>
@@ -667,7 +667,7 @@
                                     <property name="layout_style">spread</property>
                                     <child>
                                       <object class="GtkButton" id="attributes">
-                                        <property name="label" translatable="yes">Attribut_es...</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|attributes">Attribut_es...</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="no_show_all">True</property>
@@ -681,7 +681,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="format">
-                                        <property name="label" translatable="yes">For_mat...</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|format">For_mat...</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="no_show_all">True</property>
@@ -695,7 +695,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="noformat">
-                                        <property name="label" translatable="yes">_No Format</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|noformat">_No Format</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="no_show_all">True</property>
@@ -716,7 +716,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="layout">
-                                    <property name="label" translatable="yes">Search for st_yles</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|layout">Search for st_yles</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="no_show_all">True</property>
@@ -731,7 +731,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ignorediacritics">
-                                    <property name="label" translatable="yes">Ignore diac_ritics</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|ignorediacritics">Ignore diac_ritics</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -746,7 +746,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ignorekashida">
-                                    <property name="label" translatable="yes">Ignore _kashida</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|ignorekashida">Ignore _kashida</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -761,7 +761,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="matchcharwidth">
-                                    <property name="label" translatable="yes">Match character _width</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|matchcharwidth">Match character _width</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -781,7 +781,7 @@
                                     <property name="spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="similarity">
-                                        <property name="label" translatable="yes">S_imilarity search</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|similarity">S_imilarity search</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -797,7 +797,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="similaritybtn">
-                                        <property name="label" translatable="yes">Similarities...</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|similaritybtn">Similarities...</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="no_show_all">True</property>
@@ -824,7 +824,7 @@
                                     <property name="spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="soundslike">
-                                        <property name="label" translatable="yes">Sounds like (_Japanese)</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|soundslike">Sounds like (_Japanese)</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -840,7 +840,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="soundslikebtn">
-                                        <property name="label" translatable="yes">Sounds...</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|soundslikebtn">Sounds...</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="no_show_all">True</property>
@@ -866,7 +866,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkCheckButton" id="wildcard">
-                                        <property name="label" translatable="yes">Wil_dcards</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|wildcard">Wil_dcards</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -882,7 +882,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="notes">
-                                        <property name="label" translatable="yes">_Comments</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|notes">_Comments</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -904,7 +904,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="replace_backwards">
-                                    <property name="label" translatable="yes">Replace _backwards</property>
+                                    <property name="label" translatable="yes" context="findreplacedialog|replace_backwards">Replace _backwards</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="no_show_all">True</property>
@@ -940,7 +940,7 @@
                                       <object class="GtkLabel" id="searchinlabel">
                                         <property name="can_focus">False</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Search i_n:</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|searchinlabel">Search i_n:</property>
                                         <property name="use_underline">True</property>
                                         <property name="xalign">0</property>
                                       </object>
@@ -955,9 +955,9 @@
                                         <property name="can_focus">False</property>
                                         <property name="no_show_all">True</property>
                                         <items>
-                                          <item translatable="yes">Formulas</item>
-                                          <item translatable="yes">Values</item>
-                                          <item translatable="yes">Notes</item>
+                                          <item translatable="yes" context="findreplacedialog|calcsearchin">Formulas</item>
+                                          <item translatable="yes" context="findreplacedialog|calcsearchin">Values</item>
+                                          <item translatable="yes" context="findreplacedialog|calcsearchin">Notes</item>
                                         </items>
                                       </object>
                                       <packing>
@@ -982,7 +982,7 @@
                                       <object class="GtkLabel" id="searchdir">
                                         <property name="can_focus">False</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Direction:</property>
+                                        <property name="label" translatable="yes" context="findreplacedialog|searchdir">Direction:</property>
                                         <property name="use_underline">True</property>
                                         <property name="xalign">0</property>
                                       </object>
@@ -999,7 +999,7 @@
                                         <property name="spacing">15</property>
                                         <child>
                                           <object class="GtkRadioButton" id="rows">
-                                            <property name="label" translatable="yes">Ro_ws</property>
+                                            <property name="label" translatable="yes" context="findreplacedialog|rows">Ro_ws</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="no_show_all">True</property>
@@ -1019,7 +1019,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkRadioButton" id="cols">
-                                            <property name="label" translatable="yes">Colum_ns</property>
+                                            <property name="label" translatable="yes" context="findreplacedialog|cols">Colum_ns</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="no_show_all">True</property>
@@ -1065,7 +1065,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Other _options</property>
+                        <property name="label" translatable="yes" context="findreplacedialog|label3">Other _options</property>
                         <property name="use_underline">True</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
diff --git a/svx/uiconfig/ui/floatingareastyle.ui b/svx/uiconfig/ui/floatingareastyle.ui
index 006fb82dc6ea..8016b0c73af2 100644
--- a/svx/uiconfig/ui/floatingareastyle.ui
+++ b/svx/uiconfig/ui/floatingareastyle.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">359</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">_Angle:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label1">_Angle:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">angle:0degrees</property>
               </object>
@@ -59,7 +59,7 @@
                   <object class="GtkSpinButton" id="angle:0degrees">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Specify the angle of rotation for the gradient shading style.</property>
+                    <property name="tooltip_text" translatable="yes" context="floatingareastyle|angle|tooltip_text">Specify the angle of rotation for the gradient shading style.</property>
                     <property name="adjustment">adjustment1</property>
                   </object>
                   <packing>
@@ -79,7 +79,7 @@
                           <object class="GtkToolButton" id="left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Rotate counterclockwise by 45 degrees.</property>
+                            <property name="tooltip_text" translatable="yes" context="floatingareastyle|left|tooltip_text">Rotate counterclockwise by 45 degrees.</property>
                             <property name="icon_name">svx/res/symphony/rotate_left.png</property>
                           </object>
                           <packing>
@@ -101,7 +101,7 @@
                           <object class="GtkToolButton" id="right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Rotate clockwise by 45 degrees.</property>
+                            <property name="tooltip_text" translatable="yes" context="floatingareastyle|right|tooltip_text">Rotate clockwise by 45 degrees.</property>
                             <property name="icon_name">svx/res/symphony/rotate_right.png</property>
                           </object>
                           <packing>
@@ -144,7 +144,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">_Start value:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label4">_Start value:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">start:0%</property>
               </object>
@@ -158,7 +158,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">_End value:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label5">_End value:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">end:0%</property>
               </object>
@@ -171,7 +171,7 @@
               <object class="GtkSpinButton" id="start:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent.</property>
+                <property name="tooltip_text" translatable="yes" context="floatingareastyle|start|tooltip_text">Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent.</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
@@ -183,7 +183,7 @@
               <object class="GtkSpinButton" id="end:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent.</property>
+                <property name="tooltip_text" translatable="yes" context="floatingareastyle|end|tooltip_text">Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent.</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
@@ -207,7 +207,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">_Border:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label6">_Border:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">border:0%</property>
               </object>
@@ -220,7 +220,7 @@
               <object class="GtkSpinButton" id="border:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the border value of gradient transparency.</property>
+                <property name="tooltip_text" translatable="yes" context="floatingareastyle|border|tooltip_text">Specify the border value of gradient transparency.</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
@@ -245,7 +245,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Center _X:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label2">Center _X:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">centerx:0%</property>
               </object>
@@ -259,7 +259,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Center _Y:</property>
+                <property name="label" translatable="yes" context="floatingareastyle|label3">Center _Y:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">centery:0%</property>
               </object>
@@ -272,7 +272,7 @@
               <object class="GtkSpinButton" id="centerx:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the horizontal offset percentage from the center for the gradient shading style. 50% is the horizontal center.</property>
+                <property name="tooltip_text" translatable="yes" context="floatingareastyle|centerx|tooltip_text">Specify the horizontal offset percentage from the center for the gradient shading style. 50% is the horizontal center.</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
@@ -284,7 +284,7 @@
               <object class="GtkSpinButton" id="centery:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the vertical offset percentage from the center for the gradient shading style.  50% is the vertical center.</property>
+                <property name="tooltip_text" translatable="yes" context="floatingareastyle|centery|tooltip_text">Specify the vertical offset percentage from the center for the gradient shading style.  50% is the vertical center.</property>
                 <property name="adjustment">adjustment2</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/floatingcontour.ui b/svx/uiconfig/ui/floatingcontour.ui
index 78662a81f434..bdea2fe174b0 100644
--- a/svx/uiconfig/ui/floatingcontour.ui
+++ b/svx/uiconfig/ui/floatingcontour.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -14,7 +14,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Contour Editor</property>
+    <property name="title" translatable="yes" context="floatingcontour|FloatingContour">Contour Editor</property>
     <child>
       <object class="GtkBox" id="mainbox">
         <property name="visible">True</property>
@@ -43,7 +43,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_APPLY</property>
-                    <property name="label" translatable="yes">Apply</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_APPLY">Apply</property>
                     <property name="icon_name">svx/res/cd01.png</property>
                   </object>
                   <packing>
@@ -68,7 +68,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_WORKPLACE</property>
-                    <property name="label" translatable="yes">Workspace</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_WORKPLACE">Workspace</property>
                     <property name="icon_name">svx/res/cd02.png</property>
                   </object>
                   <packing>
@@ -93,7 +93,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_SELECT</property>
-                    <property name="label" translatable="yes">Select</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_SELECT">Select</property>
                     <property name="icon_name">svx/res/cd05.png</property>
                   </object>
                   <packing>
@@ -108,7 +108,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_RECT</property>
-                    <property name="label" translatable="yes">Rectangle</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_RECT">Rectangle</property>
                     <property name="icon_name">svx/res/cd06.png</property>
                   </object>
                   <packing>
@@ -123,7 +123,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_CIRCLE</property>
-                    <property name="label" translatable="yes">Ellipse</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_CIRCLE">Ellipse</property>
                     <property name="icon_name">svx/res/cd07.png</property>
                   </object>
                   <packing>
@@ -138,7 +138,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_POLY</property>
-                    <property name="label" translatable="yes">Polygon</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_POLY">Polygon</property>
                     <property name="icon_name">svx/res/cd08.png</property>
                   </object>
                   <packing>
@@ -163,7 +163,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_POLYEDIT</property>
-                    <property name="label" translatable="yes">Edit Points</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_POLYEDIT">Edit Points</property>
                     <property name="icon_name">svx/res/cd015.png</property>
                   </object>
                   <packing>
@@ -178,7 +178,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_POLYMOVE</property>
-                    <property name="label" translatable="yes">Move Points</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_POLYMOVE">Move Points</property>
                     <property name="icon_name">svx/res/cd016.png</property>
                   </object>
                   <packing>
@@ -193,7 +193,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_POLYINSERT</property>
-                    <property name="label" translatable="yes">Insert Points</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_POLYINSERT">Insert Points</property>
                     <property name="icon_name">svx/res/cd017.png</property>
                   </object>
                   <packing>
@@ -208,7 +208,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_POLYDELETE</property>
-                    <property name="label" translatable="yes">Delete Points</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_POLYDELETE">Delete Points</property>
                     <property name="icon_name">svx/res/cd018.png</property>
                   </object>
                   <packing>
@@ -231,7 +231,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="action_name">TBI_AUTOCONTOUR</property>
-                    <property name="label" translatable="yes">AutoContour</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_AUTOCONTOUR">AutoContour</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">svx/res/cd025.png</property>
                   </object>
@@ -257,7 +257,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_UNDO</property>
-                    <property name="label" translatable="yes">Undo </property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_UNDO">Undo </property>
                     <property name="icon_name">svx/res/cd020.png</property>
                   </object>
                   <packing>
@@ -272,7 +272,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_REDO</property>
-                    <property name="label" translatable="yes">Redo</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_REDO">Redo</property>
                     <property name="icon_name">svx/res/cd021.png</property>
                   </object>
                   <packing>
@@ -287,7 +287,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">start</property>
                     <property name="action_name">TBI_PIPETTE</property>
-                    <property name="label" translatable="yes">Pipette</property>
+                    <property name="label" translatable="yes" context="floatingcontour|TBI_PIPETTE">Pipette</property>
                     <property name="icon_name">svx/res/cd026.png</property>
                   </object>
                   <packing>
@@ -307,7 +307,7 @@
               <object class="GtkSpinButton" id="spinbutton:0%">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Color Tolerance</property>
+                <property name="tooltip_text" translatable="yes" context="floatingcontour|spinbutton|tooltip_text">Color Tolerance</property>
                 <property name="adjustment">adjustment1</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/floatinglineproperty.ui b/svx/uiconfig/ui/floatinglineproperty.ui
index aad8af88a13d..d7741cfc4093 100644
--- a/svx/uiconfig/ui/floatinglineproperty.ui
+++ b/svx/uiconfig/ui/floatinglineproperty.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">500</property>
@@ -50,7 +50,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Line Width:</property>
+                <property name="label" translatable="yes" context="floatinglineproperty|label1">Custom Line Width:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spin:0.0pt</property>
                 <property name="ellipsize">end</property>
diff --git a/svx/uiconfig/ui/floatingundoredo.ui b/svx/uiconfig/ui/floatingundoredo.ui
index 2c48f82e9d29..7600c2fd88e6 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingUndoRedo:border">
     <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/fontworkgallerydialog.ui b/svx/uiconfig/ui/fontworkgallerydialog.ui
index 7d94186ec5c8..637926139dbd 100644
--- a/svx/uiconfig/ui/fontworkgallerydialog.ui
+++ b/svx/uiconfig/ui/fontworkgallerydialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="FontworkGalleryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fontwork Gallery</property>
+    <property name="title" translatable="yes" context="fontworkgallerydialog|FontworkGalleryDialog">Fontwork Gallery</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -84,7 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select a Fontwork style:</property>
+                <property name="label" translatable="yes" context="fontworkgallerydialog|label1">Select a Fontwork style:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/fontworkspacingdialog.ui b/svx/uiconfig/ui/fontworkspacingdialog.ui
index aec82679d1ab..bbdd6f1600d2 100644
--- a/svx/uiconfig/ui/fontworkspacingdialog.ui
+++ b/svx/uiconfig/ui/fontworkspacingdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">500</property>
@@ -10,7 +10,7 @@
   <object class="GtkDialog" id="FontworkSpacingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fontwork Character Spacing</property>
+    <property name="title" translatable="yes" context="fontworkspacingdialog|FontworkSpacingDialog">Fontwork Character Spacing</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -29,7 +29,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Value:</property>
+                <property name="label" translatable="yes" context="fontworkspacingdialog|label2">_Value:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry:0%</property>
               </object>
diff --git a/svx/uiconfig/ui/formdatamenu.ui b/svx/uiconfig/ui/formdatamenu.ui
index 31efe171edee..818dad26fea7 100644
--- a/svx/uiconfig/ui/formdatamenu.ui
+++ b/svx/uiconfig/ui/formdatamenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="additem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add Item</property>
+        <property name="label" translatable="yes" context="formdatamenu|additem">Add Item</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="addelement">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add Element</property>
+        <property name="label" translatable="yes" context="formdatamenu|addelement">Add Element</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="addattribute">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add Attribute</property>
+        <property name="label" translatable="yes" context="formdatamenu|addattribute">Add Attribute</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit</property>
+        <property name="label" translatable="yes" context="formdatamenu|edit">Edit</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes" context="formdatamenu|delete">Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/formlinkwarndialog.ui b/svx/uiconfig/ui/formlinkwarndialog.ui
index 642f68c5eff9..dcd7d76bc5ff 100644
--- a/svx/uiconfig/ui/formlinkwarndialog.ui
+++ b/svx/uiconfig/ui/formlinkwarndialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="FormLinkWarnDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">This instance is linked with the form.</property>
-    <property name="secondary_text" translatable="yes">The changes you make to this instance will be lost when the form is reloaded.
+    <property name="text" translatable="yes" context="formlinkwarndialog|FormLinkWarnDialog">This instance is linked with the form.</property>
+    <property name="secondary_text" translatable="yes" context="formlinkwarndialog|FormLinkWarnDialog">The changes you make to this instance will be lost when the form is reloaded.
 
 How do you want to proceed?</property>
     <child internal-child="vbox">
@@ -24,7 +24,7 @@ How do you want to proceed?</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Edit</property>
+                <property name="label" translatable="yes" context="formlinkwarndialog|ok">_Edit</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/svx/uiconfig/ui/formnavimenu.ui b/svx/uiconfig/ui/formnavimenu.ui
index e63337c02e73..ecf5d836e533 100644
--- a/svx/uiconfig/ui/formnavimenu.ui
+++ b/svx/uiconfig/ui/formnavimenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="new">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_New</property>
+        <property name="label" translatable="yes" context="formnavimenu|new">_New</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -19,7 +19,7 @@
               <object class="GtkMenuItem" id="form">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Form</property>
+                <property name="label" translatable="yes" context="formnavimenu|form">Form</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -27,7 +27,7 @@
               <object class="GtkMenuItem" id="hidden">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hidden Control</property>
+                <property name="label" translatable="yes" context="formnavimenu|hidden">Hidden Control</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="change">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Replace with</property>
+        <property name="label" translatable="yes" context="formnavimenu|change">Replace with</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="cut">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Cu_t</property>
+        <property name="label" translatable="yes" context="formnavimenu|cut">Cu_t</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -55,7 +55,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="formnavimenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -63,7 +63,7 @@
       <object class="GtkMenuItem" id="paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Paste</property>
+        <property name="label" translatable="yes" context="formnavimenu|paste">_Paste</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -71,7 +71,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="formnavimenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -79,7 +79,7 @@
       <object class="GtkMenuItem" id="taborder">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Tab Order...</property>
+        <property name="label" translatable="yes" context="formnavimenu|taborder">Tab Order...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -87,7 +87,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Rename</property>
+        <property name="label" translatable="yes" context="formnavimenu|rename">_Rename</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -95,7 +95,7 @@
       <object class="GtkMenuItem" id="props">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Propert_ies</property>
+        <property name="label" translatable="yes" context="formnavimenu|props">Propert_ies</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -103,7 +103,7 @@
       <object class="GtkCheckMenuItem" id="designmode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Open in Design Mode</property>
+        <property name="label" translatable="yes" context="formnavimenu|designmode">Open in Design Mode</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -111,7 +111,7 @@
       <object class="GtkCheckMenuItem" id="controlfocus">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Automatic Control Focus</property>
+        <property name="label" translatable="yes" context="formnavimenu|controlfocus">Automatic Control Focus</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/functionmenu.ui b/svx/uiconfig/ui/functionmenu.ui
index bc7d064f0712..6607141284c6 100644
--- a/svx/uiconfig/ui/functionmenu.ui
+++ b/svx/uiconfig/ui/functionmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkCheckMenuItem" id="avg">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Average</property>
+        <property name="label" translatable="yes" context="functionmenu|avg">Average</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,49 +17,49 @@
       <object class="GtkCheckMenuItem" id="counta">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">CountA</property>
+        <property name="label" translatable="yes" context="functionmenu|counta">CountA</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="count">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Count</property>
+        <property name="label" translatable="yes" context="functionmenu|count">Count</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="max">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Maximum</property>
+        <property name="label" translatable="yes" context="functionmenu|max">Maximum</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="min">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Minimum</property>
+        <property name="label" translatable="yes" context="functionmenu|min">Minimum</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="sum">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sum</property>
+        <property name="label" translatable="yes" context="functionmenu|sum">Sum</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="selection">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Selection count</property>
+        <property name="label" translatable="yes" context="functionmenu|selection">Selection count</property>
       </object>
     </child>
     <child>
       <object class="GtkCheckMenuItem" id="none">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="functionmenu|none">None</property>
       </object>
     </child>
   </object>
diff --git a/svx/uiconfig/ui/gallerymenu1.ui b/svx/uiconfig/ui/gallerymenu1.ui
index 7ee1d56ffa51..59bf2d154ff3 100644
--- a/svx/uiconfig/ui/gallerymenu1.ui
+++ b/svx/uiconfig/ui/gallerymenu1.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="update">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Update</property>
+        <property name="label" translatable="yes" context="gallerymenu1|update">Update</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,14 +23,14 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="gallerymenu1|delete">_Delete</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Rename</property>
+        <property name="label" translatable="yes" context="gallerymenu1|rename">_Rename</property>
       </object>
     </child>
     <child>
@@ -43,7 +43,7 @@
       <object class="GtkMenuItem" id="assign">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Assign _ID</property>
+        <property name="label" translatable="yes" context="gallerymenu1|assign">Assign _ID</property>
       </object>
     </child>
     <child>
@@ -56,7 +56,7 @@
       <object class="GtkMenuItem" id="properties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Propert_ies...</property>
+        <property name="label" translatable="yes" context="gallerymenu1|properties">Propert_ies...</property>
       </object>
     </child>
   </object>
diff --git a/svx/uiconfig/ui/gallerymenu2.ui b/svx/uiconfig/ui/gallerymenu2.ui
index 6b389617e54a..b4143fa760cf 100644
--- a/svx/uiconfig/ui/gallerymenu2.ui
+++ b/svx/uiconfig/ui/gallerymenu2.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="add">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Insert</property>
+        <property name="label" translatable="yes" context="gallerymenu2|add">_Insert</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="background">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Insert as Bac_kground</property>
+        <property name="label" translatable="yes" context="gallerymenu2|background">Insert as Bac_kground</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkCheckMenuItem" id="preview">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Preview</property>
+        <property name="label" translatable="yes" context="gallerymenu2|preview">_Preview</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -45,7 +45,7 @@
       <object class="GtkMenuItem" id="title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Title</property>
+        <property name="label" translatable="yes" context="gallerymenu2|title">_Title</property>
       </object>
     </child>
     <child>
@@ -58,7 +58,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="gallerymenu2|delete">_Delete</property>
       </object>
     </child>
     <child>
@@ -71,7 +71,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="gallerymenu2|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -79,7 +79,7 @@
       <object class="GtkMenuItem" id="paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Insert</property>
+        <property name="label" translatable="yes" context="gallerymenu2|paste">_Insert</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui
index ef636cf624ec..56ccd9709055 100644
--- a/svx/uiconfig/ui/headfootformatpage.ui
+++ b/svx/uiconfig/ui/headfootformatpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -55,7 +55,7 @@
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkCheckButton" id="checkHeaderOn">
-                        <property name="label" translatable="yes">Hea_der on</property>
+                        <property name="label" translatable="yes" context="headfootformatpage|checkHeaderOn">Hea_der on</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -72,7 +72,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkFooterOn">
-                        <property name="label" translatable="yes">_Footer on</property>
+                        <property name="label" translatable="yes" context="headfootformatpage|checkFooterOn">_Footer on</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -110,7 +110,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="checkSameLR">
-                            <property name="label" translatable="yes">Same _content on left and right pages</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|checkSameLR">Same _content on left and right pages</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -128,7 +128,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="checkSameFP">
-                            <property name="label" translatable="yes">Same content on first page</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|checkSameFP">Same content on first page</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -149,7 +149,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Left margin:</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|labelLeftMarg">_Left margin:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargLeft:0.00cm</property>
                           </object>
@@ -183,7 +183,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">R_ight margin:</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|labelRightMarg">R_ight margin:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMargRight:0.00cm</property>
                           </object>
@@ -217,7 +217,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Spacing:</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|labelSpacing">_Spacing:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinSpacing:0.00cm</property>
                           </object>
@@ -247,7 +247,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="checkDynSpacing">
-                            <property name="label" translatable="yes">Use d_ynamic spacing</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|checkDynSpacing">Use d_ynamic spacing</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="hexpand">True</property>
@@ -268,7 +268,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Height:</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|labelHeight">_Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinHeight:0.00cm</property>
                             <property name="ellipsize">end</property>
@@ -299,7 +299,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="checkAutofit">
-                            <property name="label" translatable="yes">_AutoFit height</property>
+                            <property name="label" translatable="yes" context="headfootformatpage|checkAutofit">_AutoFit height</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -323,7 +323,7 @@
                             <property name="layout_style">start</property>
                             <child>
                               <object class="GtkButton" id="buttonMore">
-                                <property name="label" translatable="yes">More...</property>
+                                <property name="label" translatable="yes" context="headfootformatpage|buttonMore">More...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -336,7 +336,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="buttonEdit">
-                                <property name="label" translatable="yes">_Edit...</property>
+                                <property name="label" translatable="yes" context="headfootformatpage|buttonEdit">_Edit...</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_underline">True</property>
@@ -380,7 +380,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Header</property>
+                <property name="label" translatable="yes" context="headfootformatpage|labelHeaderFormat">Header</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -396,7 +396,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Footer</property>
+                <property name="label" translatable="yes" context="headfootformatpage|labelFooterFormat">Footer</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/imapdialog.ui b/svx/uiconfig/ui/imapdialog.ui
index a26e3afdad51..634919533f74 100644
--- a/svx/uiconfig/ui/imapdialog.ui
+++ b/svx/uiconfig/ui/imapdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkWindow" id="ImapDialog">
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">ImageMap Editor</property>
+    <property name="title" translatable="yes" context="imapdialog|ImapDialog">ImageMap Editor</property>
     <child>
       <object class="GtkBox" id="mainbox">
         <property name="visible">True</property>
@@ -29,7 +29,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_APPLY</property>
-                <property name="label" translatable="yes">Apply</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_APPLY">Apply</property>
                 <property name="icon_name">svx/res/id01.png</property>
               </object>
               <packing>
@@ -44,7 +44,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_OPEN</property>
-                <property name="label" translatable="yes">Open...</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_OPEN">Open...</property>
                 <property name="icon_name">svx/res/id02.png</property>
               </object>
               <packing>
@@ -59,7 +59,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_SAVEAS</property>
-                <property name="label" translatable="yes">Save...</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_SAVEAS">Save...</property>
                 <property name="icon_name">svx/res/id03.png</property>
               </object>
               <packing>
@@ -74,7 +74,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_CLOSE</property>
-                <property name="label" translatable="yes">Close</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_CLOSE">Close</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -88,7 +88,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_SELECT</property>
-                <property name="label" translatable="yes">Select</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_SELECT">Select</property>
                 <property name="icon_name">svx/res/id04.png</property>
               </object>
               <packing>
@@ -103,7 +103,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_RECT</property>
-                <property name="label" translatable="yes">Rectangle</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_RECT">Rectangle</property>
                 <property name="icon_name">svx/res/id05.png</property>
               </object>
               <packing>
@@ -118,7 +118,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_CIRCLE</property>
-                <property name="label" translatable="yes">Ellipse</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_CIRCLE">Ellipse</property>
                 <property name="icon_name">svx/res/id06.png</property>
               </object>
               <packing>
@@ -133,7 +133,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_POLY</property>
-                <property name="label" translatable="yes">Polygon</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_POLY">Polygon</property>
                 <property name="icon_name">svx/res/id07.png</property>
               </object>
               <packing>
@@ -148,7 +148,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_FREEPOLY</property>
-                <property name="label" translatable="yes">Freeform Polygon</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_FREEPOLY">Freeform Polygon</property>
                 <property name="icon_name">svx/res/id08.png</property>
               </object>
               <packing>
@@ -163,7 +163,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_POLYEDIT</property>
-                <property name="label" translatable="yes">Edit Points</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_POLYEDIT">Edit Points</property>
                 <property name="icon_name">svx/res/id030.png</property>
               </object>
               <packing>
@@ -178,7 +178,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_POLYMOVE</property>
-                <property name="label" translatable="yes">Move Points</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_POLYMOVE">Move Points</property>
                 <property name="icon_name">svx/res/id031.png</property>
               </object>
               <packing>
@@ -193,7 +193,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_POLYINSERT</property>
-                <property name="label" translatable="yes">Insert Points</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_POLYINSERT">Insert Points</property>
                 <property name="icon_name">svx/res/id032.png</property>
               </object>
               <packing>
@@ -208,7 +208,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_POLYDELETE</property>
-                <property name="label" translatable="yes">Delete Points</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_POLYDELETE">Delete Points</property>
                 <property name="icon_name">svx/res/id033.png</property>
               </object>
               <packing>
@@ -223,7 +223,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_UNDO</property>
-                <property name="label" translatable="yes">Undo </property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_UNDO">Undo </property>
                 <property name="icon_name">svx/res/id040.png</property>
               </object>
               <packing>
@@ -238,7 +238,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_REDO</property>
-                <property name="label" translatable="yes">Redo</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_REDO">Redo</property>
                 <property name="icon_name">svx/res/id041.png</property>
               </object>
               <packing>
@@ -253,7 +253,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_ACTIVE</property>
-                <property name="label" translatable="yes">Active</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_ACTIVE">Active</property>
                 <property name="icon_name">svx/res/id016.png</property>
               </object>
               <packing>
@@ -268,7 +268,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_MACRO</property>
-                <property name="label" translatable="yes">Macro...</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_MACRO">Macro...</property>
                 <property name="icon_name">svx/res/id018.png</property>
               </object>
               <packing>
@@ -283,7 +283,7 @@
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="action_name">TBI_PROPERTY</property>
-                <property name="label" translatable="yes">Properties...</property>
+                <property name="label" translatable="yes" context="imapdialog|TBI_PROPERTY">Properties...</property>
                 <property name="icon_name">svx/res/id019.png</property>
               </object>
               <packing>
@@ -309,7 +309,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Address:</property>
+                <property name="label" translatable="yes" context="imapdialog|urlft">Address:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -344,7 +344,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Frame:</property>
+                    <property name="label" translatable="yes" context="imapdialog|targetft">Frame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target</property>
                   </object>
@@ -399,7 +399,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Text:</property>
+                <property name="label" translatable="yes" context="imapdialog|textft">Text:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">text</property>
               </object>
diff --git a/svx/uiconfig/ui/imapmenu.ui b/svx/uiconfig/ui/imapmenu.ui
index 3f588d734ded..4a700a974ef9 100644
--- a/svx/uiconfig/ui/imapmenu.ui
+++ b/svx/uiconfig/ui/imapmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="url">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Description...</property>
+        <property name="label" translatable="yes" context="imapmenu|url">Description...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="macro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Macro...</property>
+        <property name="label" translatable="yes" context="imapmenu|macro">_Macro...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkCheckMenuItem" id="active">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Active</property>
+        <property name="label" translatable="yes" context="imapmenu|active">Active</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="arrange">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Arrange</property>
+        <property name="label" translatable="yes" context="imapmenu|arrange">_Arrange</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -49,7 +49,7 @@
               <object class="GtkMenuItem" id="front">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bring to Front</property>
+                <property name="label" translatable="yes" context="imapmenu|front">Bring to Front</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -57,7 +57,7 @@
               <object class="GtkMenuItem" id="forward">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bring _Forward</property>
+                <property name="label" translatable="yes" context="imapmenu|forward">Bring _Forward</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -65,7 +65,7 @@
               <object class="GtkMenuItem" id="backward">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Send Back_ward</property>
+                <property name="label" translatable="yes" context="imapmenu|backward">Send Back_ward</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -73,7 +73,7 @@
               <object class="GtkMenuItem" id="back">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Send to Back</property>
+                <property name="label" translatable="yes" context="imapmenu|back">_Send to Back</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -91,7 +91,7 @@
       <object class="GtkMenuItem" id="selectall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Select _All</property>
+        <property name="label" translatable="yes" context="imapmenu|selectall">Select _All</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -99,7 +99,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="imapmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/linkwarndialog.ui b/svx/uiconfig/ui/linkwarndialog.ui
index a35d70a1c0d9..7da928127f10 100644
--- a/svx/uiconfig/ui/linkwarndialog.ui
+++ b/svx/uiconfig/ui/linkwarndialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="LinkWarnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Confirm Linked Graphic</property>
+    <property name="title" translatable="yes" context="linkwarndialog|LinkWarnDialog">Confirm Linked Graphic</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">The file %FILENAME will not be stored along with your document, but only referenced as a link.</property>
-    <property name="secondary_text" translatable="yes">This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?</property>
+    <property name="text" translatable="yes" context="linkwarndialog|LinkWarnDialog">The file %FILENAME will not be stored along with your document, but only referenced as a link.</property>
+    <property name="secondary_text" translatable="yes" context="linkwarndialog|LinkWarnDialog">This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -24,7 +24,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Keep Link</property>
+                <property name="label" translatable="yes" context="linkwarndialog|ok">_Keep Link</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -40,7 +40,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">_Embed Graphic</property>
+                <property name="label" translatable="yes" context="linkwarndialog|cancel">_Embed Graphic</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -66,7 +66,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="ask">
-            <property name="label" translatable="yes">_Ask when linking a graphic</property>
+            <property name="label" translatable="yes" context="linkwarndialog|ask">_Ask when linking a graphic</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
diff --git a/svx/uiconfig/ui/mediaplayback.ui b/svx/uiconfig/ui/mediaplayback.ui
index 2209bb24333a..e8e6922729af 100644
--- a/svx/uiconfig/ui/mediaplayback.ui
+++ b/svx/uiconfig/ui/mediaplayback.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkGrid" id="MediaPlaybackPanel">
     <property name="visible">True</property>
@@ -19,7 +19,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Playback:</property>
+            <property name="label" translatable="yes" context="mediaplayback|label1">Playback:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -33,7 +33,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Seek:</property>
+            <property name="label" translatable="yes" context="mediaplayback|label2">Seek:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -47,7 +47,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Volume:</property>
+            <property name="label" translatable="yes" context="mediaplayback|label3">Volume:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -76,7 +76,7 @@
           <object class="GtkComboBox" id="zoombox">
             <property name="width_request">150</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">View</property>
+            <property name="tooltip_text" translatable="yes" context="mediaplayback|zoombox|tooltip_text">View</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
diff --git a/svx/uiconfig/ui/namespacedialog.ui b/svx/uiconfig/ui/namespacedialog.ui
index b32e3f5ab312..1b82c5d6a65f 100644
--- a/svx/uiconfig/ui/namespacedialog.ui
+++ b/svx/uiconfig/ui/namespacedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="NamespaceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Namespaces for Forms</property>
+    <property name="title" translatable="yes" context="namespacedialog|NamespaceDialog">Namespaces for Forms</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -103,7 +103,7 @@
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="add">
-                            <property name="label" translatable="yes">_Add...</property>
+                            <property name="label" translatable="yes" context="namespacedialog|add">_Add...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -117,7 +117,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="edit">
-                            <property name="label" translatable="yes">_Edit...</property>
+                            <property name="label" translatable="yes" context="namespacedialog|edit">_Edit...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
                               <object class="GtkLabel" id="prefix">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Prefix</property>
+                                <property name="label" translatable="yes" context="namespacedialog|prefix">Prefix</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -176,7 +176,7 @@
                               <object class="GtkLabel" id="url">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">URL</property>
+                                <property name="label" translatable="yes" context="namespacedialog|url">URL</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -218,7 +218,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Namespaces</property>
+                <property name="label" translatable="yes" context="namespacedialog|label1">Namespaces</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
index 97fa21c8123a..040f219e60af 100644
--- a/svx/uiconfig/ui/optgridpage.ui
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.01</property>
@@ -60,7 +60,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="usegridsnap">
-                    <property name="label" translatable="yes">_Snap to grid</property>
+                    <property name="label" translatable="yes" context="optgridpage|usegridsnap">_Snap to grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -75,7 +75,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="gridvisible">
-                    <property name="label" translatable="yes">_Visible grid</property>
+                    <property name="label" translatable="yes" context="optgridpage|gridvisible">_Visible grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -96,7 +96,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Grid</property>
+            <property name="label" translatable="yes" context="optgridpage|label1">Grid</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -168,7 +168,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">H_orizontal:</property>
+                        <property name="label" translatable="yes" context="optgridpage|flddrawx">H_orizontal:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mtrflddrawx:0.00cm</property>
                       </object>
@@ -182,7 +182,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Vertical:</property>
+                        <property name="label" translatable="yes" context="optgridpage|flddrawy">_Vertical:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mtrflddrawy:0.00cm</property>
                       </object>
@@ -193,7 +193,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="synchronize">
-                        <property name="label" translatable="yes">Synchronize a_xes</property>
+                        <property name="label" translatable="yes" context="optgridpage|synchronize">Synchronize a_xes</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Resolution</property>
+                <property name="label" translatable="yes" context="optgridpage|label2">Resolution</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -274,7 +274,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">space(s)</property>
+                            <property name="label" translatable="yes" context="optgridpage|label4">space(s)</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -309,7 +309,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">space(s)</property>
+                            <property name="label" translatable="yes" context="optgridpage|label5">space(s)</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -327,7 +327,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Horizont_al:</property>
+                        <property name="label" translatable="yes" context="optgridpage|divisionx">Horizont_al:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numflddivisionx</property>
                       </object>
@@ -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">V_ertical:</property>
+                        <property name="label" translatable="yes" context="optgridpage|divisiony">V_ertical:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numflddivisiony</property>
                       </object>
@@ -358,7 +358,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Subdivision</property>
+                <property name="label" translatable="yes" context="optgridpage|label3">Subdivision</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -403,7 +403,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="snaphelplines">
-                        <property name="label" translatable="yes">To snap lines</property>
+                        <property name="label" translatable="yes" context="optgridpage|snaphelplines">To snap lines</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -417,7 +417,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="snapborder">
-                        <property name="label" translatable="yes">To the _page margins</property>
+                        <property name="label" translatable="yes" context="optgridpage|snapborder">To the _page margins</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -432,7 +432,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="snapframe">
-                        <property name="label" translatable="yes">To object _frame</property>
+                        <property name="label" translatable="yes" context="optgridpage|snapframe">To object _frame</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -447,7 +447,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="snappoints">
-                        <property name="label" translatable="yes">To obje_ct points</property>
+                        <property name="label" translatable="yes" context="optgridpage|snappoints">To obje_ct points</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -482,7 +482,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Snap range:</property>
+                            <property name="label" translatable="yes" context="optgridpage|label7">_Snap range:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mtrfldsnaparea:0pixels</property>
                           </object>
@@ -505,7 +505,7 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Snap</property>
+                <property name="label" translatable="yes" context="optgridpage|label6">Snap</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -539,7 +539,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="ortho">
-                        <property name="label" translatable="yes">_When creating or moving objects</property>
+                        <property name="label" translatable="yes" context="optgridpage|ortho">_When creating or moving objects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -554,7 +554,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="bigortho">
-                        <property name="label" translatable="yes">_Extend edges</property>
+                        <property name="label" translatable="yes" context="optgridpage|bigortho">_Extend edges</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -591,7 +591,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="rotate">
-                            <property name="label" translatable="yes">When ro_tating:</property>
+                            <property name="label" translatable="yes" context="optgridpage|rotate">When ro_tating:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -625,7 +625,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Point reducti_on:</property>
+                            <property name="label" translatable="yes" context="optgridpage|label9">Point reducti_on:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mtrfldbezangle:0.00degrees</property>
                           </object>
@@ -648,7 +648,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Constrain Objects</property>
+                <property name="label" translatable="yes" context="optgridpage|label8">Constrain Objects</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/paralinespacingcontrol.ui b/svx/uiconfig/ui/paralinespacingcontrol.ui
index e5accdbfcca3..6fe71a841a13 100644
--- a/svx/uiconfig/ui/paralinespacingcontrol.ui
+++ b/svx/uiconfig/ui/paralinespacingcontrol.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">50</property>
@@ -63,7 +63,7 @@
         <property name="vexpand">True</property>
         <child>
           <object class="GtkButton" id="spacing_1">
-            <property name="label" translatable="yes">Spacing: 1</property>
+            <property name="label" translatable="yes" context="paralinespacingcontrol|spacing_1">Spacing: 1</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -81,7 +81,7 @@
         </child>
         <child>
           <object class="GtkButton" id="spacing_115">
-            <property name="label" translatable="yes">Spacing: 1.15</property>
+            <property name="label" translatable="yes" context="paralinespacingcontrol|spacing_115">Spacing: 1.15</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -99,7 +99,7 @@
         </child>
         <child>
           <object class="GtkButton" id="spacing_15">
-            <property name="label" translatable="yes">Spacing: 1.5</property>
+            <property name="label" translatable="yes" context="paralinespacingcontrol|spacing_15">Spacing: 1.5</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -117,7 +117,7 @@
         </child>
         <child>
           <object class="GtkButton" id="spacing_2">
-            <property name="label" translatable="yes">Spacing: 2</property>
+            <property name="label" translatable="yes" context="paralinespacingcontrol|spacing_2">Spacing: 2</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -160,7 +160,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Line Spacing:</property>
+                        <property name="label" translatable="yes" context="paralinespacingcontrol|label3">Line Spacing:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">line_dist</property>
                       </object>
@@ -179,14 +179,14 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">Single</item>
-                          <item translatable="yes">1.15 Lines</item>
-                          <item translatable="yes">1.5 Lines</item>
-                          <item translatable="yes">Double</item>
-                          <item translatable="yes">Proportional</item>
-                          <item translatable="yes">At least</item>
-                          <item translatable="yes">Leading</item>
-                          <item translatable="yes">Fixed</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">Single</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">1.15 Lines</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">1.5 Lines</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">Double</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">Proportional</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">At least</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">Leading</item>
+                          <item translatable="yes" context="paralinespacingcontrol|line_dist">Fixed</item>
                         </items>
                       </object>
                       <packing>
@@ -201,7 +201,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Value:</property>
+                        <property name="label" translatable="yes" context="paralinespacingcontrol|value_label">Value:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">grid1</property>
                       </object>
@@ -266,7 +266,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Value</property>
+                <property name="label" translatable="yes" context="paralinespacingcontrol|label2">Custom Value</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index 0e0cd5b45929..840018dfe775 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="ParaLRSpacingWindow">
@@ -34,7 +34,7 @@
               <object class="svxlo-SvxRelativeField" id="beforetextindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Before Text Indent</property>
+                <property name="tooltip_text" translatable="yes" context="paralrspacing|beforetextindent|tooltip_text">Before Text Indent</property>
                 <property name="invisible_char">•</property>
                 <property name="text">0</property>
                 <property name="progress_fraction">0.10000000000000001</property>
@@ -74,7 +74,7 @@
               <object class="svxlo-SvxRelativeField" id="aftertextindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">After Text Indent</property>
+                <property name="tooltip_text" translatable="yes" context="paralrspacing|aftertextindent|tooltip_text">After Text Indent</property>
                 <property name="invisible_char">•</property>
                 <property name="text">0</property>
               </object>
@@ -112,7 +112,7 @@
               <object class="svxlo-SvxRelativeField" id="firstlineindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">First Line Indent</property>
+                <property name="tooltip_text" translatable="yes" context="paralrspacing|firstlineindent|tooltip_text">First Line Indent</property>
                 <property name="invisible_char">•</property>
                 <property name="text">0</property>
               </object>
diff --git a/svx/uiconfig/ui/paraulspacing.ui b/svx/uiconfig/ui/paraulspacing.ui
index db62128f1a4f..cfab8baf587f 100644
--- a/svx/uiconfig/ui/paraulspacing.ui
+++ b/svx/uiconfig/ui/paraulspacing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -42,7 +42,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
+                <property name="tooltip_text" translatable="yes" context="paraulspacing|aboveparaspacing|tooltip_text">Above Paragraph Spacing</property>
                 <property name="invisible_char">•</property>
                 <property name="text">0</property>
                 <property name="adjustment">adjustment1</property>
@@ -83,7 +83,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
+                <property name="tooltip_text" translatable="yes" context="paraulspacing|belowparaspacing|tooltip_text">Below Paragraph Spacing</property>
                 <property name="invisible_char">•</property>
                 <property name="text">0</property>
                 <property name="adjustment">adjustment1</property>
diff --git a/svx/uiconfig/ui/passwd.ui b/svx/uiconfig/ui/passwd.ui
index d7e7fa8bfceb..5c6c3e669e19 100644
--- a/svx/uiconfig/ui/passwd.ui
+++ b/svx/uiconfig/ui/passwd.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Change Password</property>
+    <property name="title" translatable="yes" context="passwd|PasswordDialog">Change Password</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -101,7 +101,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Password:</property>
+                            <property name="label" translatable="yes" context="passwd|oldpassL">_Password:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">oldpassEntry</property>
                           </object>
@@ -132,7 +132,7 @@
                   <object class="GtkLabel" id="oldpass">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Old Password</property>
+                    <property name="label" translatable="yes" context="passwd|oldpass">Old Password</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -195,7 +195,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Pa_ssword:</property>
+                            <property name="label" translatable="yes" context="passwd|label4">Pa_ssword:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">newpassEntry</property>
                           </object>
@@ -209,7 +209,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Confi_rm:</property>
+                            <property name="label" translatable="yes" context="passwd|label5">Confi_rm:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">confirmpassEntry</property>
                           </object>
@@ -226,7 +226,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">New Password</property>
+                    <property name="label" translatable="yes" context="passwd|label2">New Password</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/svx/uiconfig/ui/presetmenu.ui b/svx/uiconfig/ui/presetmenu.ui
index c67b3de6c67a..3049ecf72b61 100644
--- a/svx/uiconfig/ui/presetmenu.ui
+++ b/svx/uiconfig/ui/presetmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename</property>
+        <property name="label" translatable="yes" context="presetmenu|rename">Rename</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes" context="presetmenu|delete">Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/profileexporteddialog.ui b/svx/uiconfig/ui/profileexporteddialog.ui
index b21c76a38e46..c26dccac2b4b 100644
--- a/svx/uiconfig/ui/profileexporteddialog.ui
+++ b/svx/uiconfig/ui/profileexporteddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="ProfileExportedDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Profile exported</property>
+    <property name="title" translatable="yes" context="profileexporteddialog|ProfileExportedDialog">Profile exported</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -37,7 +37,7 @@
             </child>
             <child>
               <object class="GtkButton" id="openfolder">
-                <property name="label" translatable="yes">Open Containing _Folder</property>
+                <property name="label" translatable="yes" context="profileexporteddialog|openfolder">Open Containing _Folder</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -61,7 +61,7 @@
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Your user profile has been exported as “libreoffice-profile.zip”.</property>
+            <property name="label" translatable="yes" context="profileexporteddialog|label">Your user profile has been exported as “libreoffice-profile.zip”.</property>
             <property name="wrap">True</property>
             <property name="max_width_chars">80</property>
             <property name="lines">2</property>
diff --git a/svx/uiconfig/ui/querydeletecontourdialog.ui b/svx/uiconfig/ui/querydeletecontourdialog.ui
index 20a178400614..f2d7c3d35c4c 100644
--- a/svx/uiconfig/ui/querydeletecontourdialog.ui
+++ b/svx/uiconfig/ui/querydeletecontourdialog.ui
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteContourDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete the contour?</property>
+    <property name="title" translatable="yes" context="querydeletecontourdialog|QueryDeleteContourDialog">Delete the contour?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Setting a new workspace will
+    <property name="text" translatable="yes" context="querydeletecontourdialog|QueryDeleteContourDialog">Setting a new workspace will
 cause the contour to be deleted.</property>
-    <property name="secondary_text" translatable="yes">Are you sure you want to continue?</property>
+    <property name="secondary_text" translatable="yes" context="querydeletecontourdialog|QueryDeleteContourDialog">Are you sure you want to continue?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui
index 9b28c595949e..024e704d8d44 100644
--- a/svx/uiconfig/ui/querydeleteobjectdialog.ui
+++ b/svx/uiconfig/ui/querydeleteobjectdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteObjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete this object?</property>
+    <property name="title" translatable="yes" context="querydeleteobjectdialog|QueryDeleteObjectDialog">Delete this object?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you really want to delete this object?</property>
+    <property name="text" translatable="yes" context="querydeleteobjectdialog|QueryDeleteObjectDialog">Do you really want to delete this object?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox4">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querydeletethemedialog.ui b/svx/uiconfig/ui/querydeletethemedialog.ui
index 7f51dcd69b79..a7eb54ab2d3e 100644
--- a/svx/uiconfig/ui/querydeletethemedialog.ui
+++ b/svx/uiconfig/ui/querydeletethemedialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteThemeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Delete this theme?</property>
+    <property name="title" translatable="yes" context="querydeletethemedialog|QueryDeleteThemeDialog">Delete this theme?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you really want to delete this theme?</property>
+    <property name="text" translatable="yes" context="querydeletethemedialog|QueryDeleteThemeDialog">Do you really want to delete this theme?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox2">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
index df117085d134..1d874646ad9b 100644
--- a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryModifyImageMapChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save ImageMap changes?</property>
+    <property name="title" translatable="yes" context="querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog">Save ImageMap changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">The ImageMap has been modified.</property>
-    <property name="secondary_text" translatable="yes">Do you want to save the changes?</property>
+    <property name="text" translatable="yes" context="querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog">The ImageMap has been modified.</property>
+    <property name="secondary_text" translatable="yes" context="querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog">Do you want to save the changes?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox5">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querynewcontourdialog.ui b/svx/uiconfig/ui/querynewcontourdialog.ui
index d186afc568b3..8dc1d1994cf8 100644
--- a/svx/uiconfig/ui/querynewcontourdialog.ui
+++ b/svx/uiconfig/ui/querynewcontourdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryNewContourDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create a new contour?</property>
+    <property name="title" translatable="yes" context="querynewcontourdialog|QueryNewContourDialog">Create a new contour?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to create a new contour?</property>
+    <property name="text" translatable="yes" context="querynewcontourdialog|QueryNewContourDialog">Do you want to create a new contour?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querysavecontchangesdialog.ui b/svx/uiconfig/ui/querysavecontchangesdialog.ui
index 5f4a63c2861b..91af4774429e 100644
--- a/svx/uiconfig/ui/querysavecontchangesdialog.ui
+++ b/svx/uiconfig/ui/querysavecontchangesdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveContourChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save contour changes?</property>
+    <property name="title" translatable="yes" context="querysavecontchangesdialog|QuerySaveContourChangesDialog">Save contour changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">The contour has been modified.</property>
-    <property name="secondary_text" translatable="yes">Do you want to save the changes?</property>
+    <property name="text" translatable="yes" context="querysavecontchangesdialog|QuerySaveContourChangesDialog">The contour has been modified.</property>
+    <property name="secondary_text" translatable="yes" context="querysavecontchangesdialog|QuerySaveContourChangesDialog">Do you want to save the changes?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
index 74f2ff193071..a74be0694b8d 100644
--- a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveImageMapChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save ImageMap changes?</property>
+    <property name="title" translatable="yes" context="querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog">Save ImageMap changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">The ImageMap has been modified.</property>
-    <property name="secondary_text" translatable="yes">Do you want to save the changes?</property>
+    <property name="text" translatable="yes" context="querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog">The ImageMap has been modified.</property>
+    <property name="secondary_text" translatable="yes" context="querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog">Do you want to save the changes?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox4">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
index 8fabbc4ff648..82bd731b9ea8 100644
--- a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
+++ b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryUnlinkGraphicsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Unlink the graphics?</property>
+    <property name="title" translatable="yes" context="queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog">Unlink the graphics?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">This graphic object is linked to the document.</property>
-    <property name="secondary_text" translatable="yes">Do you want to unlink the graphics in order to edit it?</property>
+    <property name="text" translatable="yes" context="queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog">This graphic object is linked to the document.</property>
+    <property name="secondary_text" translatable="yes" context="queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog">Do you want to unlink the graphics in order to edit it?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/redlinecontrol.ui b/svx/uiconfig/ui/redlinecontrol.ui
index 61a377bf1687..31fe905a24e3 100644
--- a/svx/uiconfig/ui/redlinecontrol.ui
+++ b/svx/uiconfig/ui/redlinecontrol.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkNotebook" id="RedlineControl">
     <property name="visible">True</property>
@@ -13,7 +13,7 @@
       <object class="GtkLabel" id="view">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">List</property>
+        <property name="label" translatable="yes" context="redlinecontrol|view">List</property>
       </object>
       <packing>
         <property name="tab_fill">False</property>
@@ -26,7 +26,7 @@
       <object class="GtkLabel" id="filter">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Filter</property>
+        <property name="label" translatable="yes" context="redlinecontrol|filter">Filter</property>
       </object>
       <packing>
         <property name="position">1</property>
diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
index 784c902d129c..785c583470c1 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">19851231</property>
@@ -28,7 +28,7 @@
     <property name="column_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="date">
-        <property name="label" translatable="yes">_Date:</property>
+        <property name="label" translatable="yes" context="redlinefilterpage|date">_Date:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -43,7 +43,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="author">
-        <property name="label" translatable="yes">_Author:</property>
+        <property name="label" translatable="yes" context="redlinefilterpage|author">_Author:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -58,7 +58,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="comment">
-        <property name="label" translatable="yes">C_omment:</property>
+        <property name="label" translatable="yes" context="redlinefilterpage|comment">C_omment:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -84,7 +84,7 @@
         <property name="invisible_char">•</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="commentedit-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Comment</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|commentedit-atkobject">Comment</property>
           </object>
         </child>
       </object>
@@ -95,7 +95,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="range">
-        <property name="label" translatable="yes">_Range:</property>
+        <property name="label" translatable="yes" context="redlinefilterpage|range">_Range:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -120,7 +120,7 @@
         </accessibility>
         <child internal-child="accessible">
           <object class="AtkObject" id="actionlist-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Action</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|actionlist-atkobject">Action</property>
           </object>
         </child>
       </object>
@@ -131,7 +131,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="action">
-        <property name="label" translatable="yes">A_ction:</property>
+        <property name="label" translatable="yes" context="redlinefilterpage|action">A_ction:</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
         </accessibility>
         <child internal-child="accessible">
           <object class="AtkObject" id="authorlist-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Author</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|authorlist-atkobject">Author</property>
           </object>
         </child>
       </object>
@@ -183,7 +183,7 @@
             </accessibility>
             <child internal-child="accessible">
               <object class="AtkObject" id="rangeedit-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Range</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|rangeedit-atkobject">Range</property>
               </object>
             </child>
           </object>
@@ -201,7 +201,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Set reference</property>
+            <property name="tooltip_text" translatable="yes" context="redlinefilterpage|dotdotdot|tooltip_text">Set reference</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -229,19 +229,19 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <items>
-              <item translatable="yes">earlier than</item>
-              <item translatable="yes">since</item>
-              <item translatable="yes">equal to</item>
-              <item translatable="yes">not equal to</item>
-              <item translatable="yes">between</item>
-              <item translatable="yes">since saving</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">earlier than</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">since</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">equal to</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">not equal to</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">between</item>
+              <item translatable="yes" context="redlinefilterpage|datecond">since saving</item>
             </items>
             <accessibility>
               <relation type="labelled-by" target="date"/>
             </accessibility>
             <child internal-child="accessible">
               <object class="AtkObject" id="datecond-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Date Condition</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|datecond-atkobject">Date Condition</property>
               </object>
             </child>
           </object>
@@ -263,7 +263,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">a_nd</property>
+                <property name="label" translatable="yes" context="redlinefilterpage|and">a_nd</property>
                 <property name="use_underline">True</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">1</property>
@@ -284,7 +284,7 @@
                 <property name="adjustment">adjustment1</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="startdate:yy:mm:dd-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Start Date</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|startdate-atkobject">Start Date</property>
                   </object>
                 </child>
               </object>
@@ -303,7 +303,7 @@
                 <property name="invisible_char">•</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="starttime:hh:mm-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Start Time</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|starttime-atkobject">Start Time</property>
                   </object>
                 </child>
               </object>
@@ -319,7 +319,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Set current time and date</property>
+                <property name="tooltip_text" translatable="yes" context="redlinefilterpage|startclock|tooltip_text">Set current time and date</property>
                 <property name="image">image1</property>
               </object>
               <packing>
@@ -338,7 +338,7 @@
                 <property name="adjustment">adjustment1</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="enddate:yy:mm:dd-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">End Date</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|enddate-atkobject">End Date</property>
                   </object>
                 </child>
               </object>
@@ -357,7 +357,7 @@
                 <property name="invisible_char">•</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="endtime:hh:mm-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">End Time</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|endtime-atkobject">End Time</property>
                   </object>
                 </child>
               </object>
@@ -373,7 +373,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Set current time and date</property>
+                <property name="tooltip_text" translatable="yes" context="redlinefilterpage|endclock|tooltip_text">Set current time and date</property>
                 <property name="image">image2</property>
               </object>
               <packing>
diff --git a/svx/uiconfig/ui/redlineviewpage.ui b/svx/uiconfig/ui/redlineviewpage.ui
index f7146f971e4e..aaba5a7ebc19 100644
--- a/svx/uiconfig/ui/redlineviewpage.ui
+++ b/svx/uiconfig/ui/redlineviewpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="RedlineViewPage">
@@ -18,7 +18,7 @@
           <object class="GtkLabel" id="action">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Action</property>
+            <property name="label" translatable="yes" context="redlineviewpage|action">Action</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -30,7 +30,7 @@
           <object class="GtkLabel" id="position">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="redlineviewpage|position">Position</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -42,7 +42,7 @@
           <object class="GtkLabel" id="author">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Author</property>
+            <property name="label" translatable="yes" context="redlineviewpage|author">Author</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -54,7 +54,7 @@
           <object class="GtkLabel" id="date">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Date</property>
+            <property name="label" translatable="yes" context="redlineviewpage|date">Date</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -66,7 +66,7 @@
           <object class="GtkLabel" id="comment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Comment</property>
+            <property name="label" translatable="yes" context="redlineviewpage|comment">Comment</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -89,7 +89,7 @@
         <property name="vexpand">True</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="changes-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Changes</property>
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlineviewpage|changes-atkobject">Changes</property>
           </object>
         </child>
         <child internal-child="selection">
diff --git a/svx/uiconfig/ui/rowsmenu.ui b/svx/uiconfig/ui/rowsmenu.ui
index 210add5c4389..55a309bacf0d 100644
--- a/svx/uiconfig/ui/rowsmenu.ui
+++ b/svx/uiconfig/ui/rowsmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,21 +9,21 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete Rows</property>
+        <property name="label" translatable="yes" context="rowsmenu|delete">Delete Rows</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="save">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Save Record</property>
+        <property name="label" translatable="yes" context="rowsmenu|save">Save Record</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="undo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Undo: Data entry</property>
+        <property name="label" translatable="yes" context="rowsmenu|undo">Undo: Data entry</property>
       </object>
     </child>
   </object>
diff --git a/svx/uiconfig/ui/rulermenu.ui b/svx/uiconfig/ui/rulermenu.ui
index 163f6b9497c6..b33bec2bd86d 100644
--- a/svx/uiconfig/ui/rulermenu.ui
+++ b/svx/uiconfig/ui/rulermenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkRadioMenuItem" id="mm">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Millimeter</property>
+        <property name="label" translatable="yes" context="rulermenu|mm">Millimeter</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkRadioMenuItem" id="cm">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Centimeter</property>
+        <property name="label" translatable="yes" context="rulermenu|cm">Centimeter</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkRadioMenuItem" id="m">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Meter</property>
+        <property name="label" translatable="yes" context="rulermenu|m">Meter</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkRadioMenuItem" id="km">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Kilometer</property>
+        <property name="label" translatable="yes" context="rulermenu|km">Kilometer</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkRadioMenuItem" id="in">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Inch</property>
+        <property name="label" translatable="yes" context="rulermenu|in">Inch</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -49,7 +49,7 @@
       <object class="GtkRadioMenuItem" id="ft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Foot</property>
+        <property name="label" translatable="yes" context="rulermenu|ft">Foot</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -57,7 +57,7 @@
       <object class="GtkRadioMenuItem" id="mile">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Miles</property>
+        <property name="label" translatable="yes" context="rulermenu|mile">Miles</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -65,7 +65,7 @@
       <object class="GtkRadioMenuItem" id="pt">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Point</property>
+        <property name="label" translatable="yes" context="rulermenu|pt">Point</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -73,7 +73,7 @@
       <object class="GtkRadioMenuItem" id="pc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Pica</property>
+        <property name="label" translatable="yes" context="rulermenu|pc">Pica</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -81,7 +81,7 @@
       <object class="GtkRadioMenuItem" id="ch">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Char</property>
+        <property name="label" translatable="yes" context="rulermenu|ch">Char</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -89,7 +89,7 @@
       <object class="GtkRadioMenuItem" id="line">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Line</property>
+        <property name="label" translatable="yes" context="rulermenu|line">Line</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index cb86c621d67e..2a0685709ed2 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkDialog" id="SafeModeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Safe Mode</property>
+    <property name="title" translatable="yes" context="safemodedialog|SafeModeDialog">Safe Mode</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_continue">
-                <property name="label" translatable="yes">_Continue in Safe Mode</property>
+                <property name="label" translatable="yes" context="safemodedialog|btn_continue">_Continue in Safe Mode</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
@@ -49,7 +49,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_restart">
-                <property name="label" translatable="yes">_Restart in Normal Mode</property>
+                <property name="label" translatable="yes" context="safemodedialog|btn_restart">_Restart in Normal Mode</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -63,7 +63,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_apply">
-                <property name="label" translatable="yes">_Apply Changes and Restart</property>
+                <property name="label" translatable="yes" context="safemodedialog|btn_apply">_Apply Changes and Restart</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -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">%PRODUCTNAME is now running in safe mode which temporarily disables your user configuration and extensions.
+            <property name="label" translatable="yes" context="safemodedialog|label1">%PRODUCTNAME is now running in safe mode which temporarily disables your user configuration and extensions.
 
 You can make one or more of the following changes to your user profile to return %PRODUCTNAME to a working state.
 
@@ -109,7 +109,7 @@ The proposed changes get more radical from top down so it is recommended to try
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkRadioButton" id="radio_restore">
-                <property name="label" translatable="yes">Restore from backup</property>
+                <property name="label" translatable="yes" context="safemodedialog|radio_restore">Restore from backup</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -133,7 +133,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="check_profilesafe_config">
-                    <property name="label" translatable="yes">Restore user configuration to the last known working state</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_profilesafe_config">Restore user configuration to the last known working state</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -148,7 +148,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_profilesafe_extensions">
-                    <property name="label" translatable="yes">Restore state of installed user extensions to the last known working state</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_profilesafe_extensions">Restore state of installed user extensions to the last known working state</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -170,7 +170,7 @@ The proposed changes get more radical from top down so it is recommended to try
             </child>
             <child>
               <object class="GtkRadioButton" id="radio_configure">
-                <property name="label" translatable="yes">Configure</property>
+                <property name="label" translatable="yes" context="safemodedialog|radio_configure">Configure</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -194,7 +194,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="check_disable_all_extensions">
-                    <property name="label" translatable="yes">Disable all user extensions</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_disable_all_extensions">Disable all user extensions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -209,7 +209,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_disable_hw_acceleration">
-                    <property name="label" translatable="yes">Disable hardware acceleration (OpenGL, OpenCL)</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_disable_hw_acceleration">Disable hardware acceleration (OpenGL, OpenCL)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -231,7 +231,7 @@ The proposed changes get more radical from top down so it is recommended to try
             </child>
             <child>
               <object class="GtkRadioButton" id="radio_extensions">
-                <property name="label" translatable="yes">Extensions</property>
+                <property name="label" translatable="yes" context="safemodedialog|radio_extensions">Extensions</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -254,7 +254,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="check_deinstall_user_extensions">
-                    <property name="label" translatable="yes">Uninstall all user extensions</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_deinstall_user_extensions">Uninstall all user extensions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -269,7 +269,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_reset_shared_extensions">
-                    <property name="label" translatable="yes">Reset state of shared extensions</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_reset_shared_extensions">Reset state of shared extensions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -284,7 +284,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_reset_bundled_extensions">
-                    <property name="label" translatable="yes">Reset state of bundled extensions</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_reset_bundled_extensions">Reset state of bundled extensions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -306,7 +306,7 @@ The proposed changes get more radical from top down so it is recommended to try
             </child>
             <child>
               <object class="GtkRadioButton" id="radio_reset">
-                <property name="label" translatable="yes">Reset to factory settings</property>
+                <property name="label" translatable="yes" context="safemodedialog|radio_reset">Reset to factory settings</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -329,7 +329,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="check_reset_customizations">
-                    <property name="label" translatable="yes">Reset settings and user interface modifications</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_reset_customizations">Reset settings and user interface modifications</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -344,7 +344,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="check_reset_whole_userprofile">
-                    <property name="label" translatable="yes">Reset entire user profile</property>
+                    <property name="label" translatable="yes" context="safemodedialog|check_reset_whole_userprofile">Reset entire user profile</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -386,7 +386,7 @@ The proposed changes get more radical from top down so it is recommended to try
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">If you experience problems that are not resolved by using safe mode, visit the following link to get help or report a bug.</property>
+                    <property name="label" translatable="yes" context="safemodedialog|label3">If you experience problems that are not resolved by using safe mode, visit the following link to get help or report a bug.</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -397,7 +397,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 </child>
                 <child>
                   <object class="GtkLinkButton" id="linkbutton_bugs">
-                    <property name="label" translatable="yes">Get Help</property>
+                    <property name="label" translatable="yes" context="safemodedialog|linkbutton_bugs">Get Help</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -413,7 +413,7 @@ The proposed changes get more radical from top down so it is recommended to try
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">You can also include relevant parts of your user profile in the bugreport (be aware it might contain personal data).</property>
+                    <property name="label" translatable="yes" context="safemodedialog|label4">You can also include relevant parts of your user profile in the bugreport (be aware it might contain personal data).</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -429,7 +429,7 @@ The proposed changes get more radical from top down so it is recommended to try
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkButton" id="btn_create_zip">
-                        <property name="label" translatable="yes">Create Zip Archive from User Profile</property>
+                        <property name="label" translatable="yes" context="safemodedialog|btn_create_zip">Create Zip Archive from User Profile</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -442,7 +442,7 @@ The proposed changes get more radical from top down so it is recommended to try
                     </child>
                     <child>
                       <object class="GtkLinkButton" id="linkbutton_profile">
-                        <property name="label" translatable="yes">Show User Profile</property>
+                        <property name="label" translatable="yes" context="safemodedialog|linkbutton_profile">Show User Profile</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -468,7 +468,7 @@ The proposed changes get more radical from top down so it is recommended to try
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_bottom">6</property>
-                <property name="label" translatable="yes">Advanced</property>
+                <property name="label" translatable="yes" context="safemodedialog|label2">Advanced</property>
               </object>
             </child>
           </object>
diff --git a/svx/uiconfig/ui/savemodifieddialog.ui b/svx/uiconfig/ui/savemodifieddialog.ui
index cb9a04d98361..8ad47b0b3925 100644
--- a/svx/uiconfig/ui/savemodifieddialog.ui
+++ b/svx/uiconfig/ui/savemodifieddialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveModifiedDialog">
     <property name="can_focus">False</property>
@@ -9,8 +9,8 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Do you want to save your changes?</property>
-    <property name="secondary_text" translatable="yes">The content of the current form has been modified.</property>
+    <property name="text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">Do you want to save your changes?</property>
+    <property name="secondary_text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">The content of the current form has been modified.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/svx/uiconfig/ui/selectionmenu.ui b/svx/uiconfig/ui/selectionmenu.ui
index a306b52bf73c..062ce6c79e2a 100644
--- a/svx/uiconfig/ui/selectionmenu.ui
+++ b/svx/uiconfig/ui/selectionmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkRadioMenuItem" id="standard">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Standard selection</property>
+        <property name="label" translatable="yes" context="selectionmenu|standard">Standard selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkRadioMenuItem" id="extending">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Extending selection</property>
+        <property name="label" translatable="yes" context="selectionmenu|extending">Extending selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkRadioMenuItem" id="adding">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Adding selection</property>
+        <property name="label" translatable="yes" context="selectionmenu|adding">Adding selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkRadioMenuItem" id="block">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Block selection</property>
+        <property name="label" translatable="yes" context="selectionmenu|block">Block selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 79bc5b65a520..e13e393c19ef 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -37,9 +37,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Fill:</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|filllabel|tooltip_text">Fill:</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Fill:</property>
+                <property name="label" translatable="yes" context="sidebararea|filllabel">_Fill:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -63,7 +63,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebararea|color|tooltip_text">Select the color to apply.</property>
                         <property name="action_name">.uno:FillColor</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -83,13 +83,13 @@
                   <object class="svxlo-SvxFillAttrBox" id="fillattr">
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the effect to apply.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebararea|fillattr|tooltip_text">Select the effect to apply.</property>
                     <accessibility>
                       <relation type="labelled-by" target="filllabel"/>
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="fillattr-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Hatching/Bitmap</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillattr-atkobject">Hatching/Bitmap</property>
                       </object>
                     </child>
                   </object>
@@ -103,7 +103,7 @@
                   <object class="svxcorelo-SvxColorListBox" id="fillgrad1">
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Fill gradient from.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad1|tooltip_text">Fill gradient from.</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -124,7 +124,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|fillstyle|tooltip_text">Select the fill type to apply.</property>
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
                 <accessibility>
@@ -132,7 +132,7 @@
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="fillstyle-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Fill Type</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillstyle-atkobject">Fill Type</property>
                   </object>
                 </child>
               </object>
@@ -147,7 +147,7 @@
               <object class="svxcorelo-SvxColorListBox" id="fillgrad2">
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Fill gradient to.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad2|tooltip_text">Fill gradient to.</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -164,18 +164,18 @@
                   <object class="GtkComboBoxText" id="gradientstyle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Select the gradient style.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebararea|gradientstyle|tooltip_text">Select the gradient style.</property>
                     <items>
-                      <item translatable="yes">Linear</item>
-                      <item translatable="yes">Axial</item>
-                      <item translatable="yes">Radial</item>
-                      <item translatable="yes">Ellipsoid</item>
-                      <item translatable="yes">Quadratic</item>
-                      <item translatable="yes">Square</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Linear</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Axial</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Radial</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Ellipsoid</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Quadratic</item>
+                      <item translatable="yes" context="sidebararea|gradientstyle">Square</item>
                     </items>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="gradientstyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Gradient Type</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradientstyle-atkobject">Gradient Type</property>
                       </object>
                     </child>
                   </object>
@@ -187,7 +187,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="bmpimport">
-                    <property name="label" translatable="yes">_Import</property>
+                    <property name="label" translatable="yes" context="sidebararea|bmpimport">_Import</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_underline">True</property>
@@ -209,11 +209,11 @@
             <child>
               <object class="GtkSpinButton" id="gradangle:0degrees">
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Select the gradient angle.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|gradangle|tooltip_text">Select the gradient angle.</property>
                 <property name="adjustment">adjustment2</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="gradangle:0degrees-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Gradient angle</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradangle-atkobject">Gradient angle</property>
                   </object>
                 </child>
               </object>
@@ -229,9 +229,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Transparency</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|transparencylabel|tooltip_text">Transparency</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Transparency:</property>
+                <property name="label" translatable="yes" context="sidebararea|transparencylabel">_Transparency:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -246,20 +246,20 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Select the type of transparency to apply.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|transtype|tooltip_text">Select the type of transparency to apply.</property>
                 <items>
-                  <item translatable="yes">None</item>
-                  <item translatable="yes">Solid</item>
-                  <item translatable="yes">Linear</item>
-                  <item translatable="yes">Axial</item>
-                  <item translatable="yes">Radial</item>
-                  <item translatable="yes">Ellipsoid</item>
-                  <item translatable="yes">Quadratic</item>
-                  <item translatable="yes">Square</item>
+                  <item translatable="yes" context="sidebararea|transtype">None</item>
+                  <item translatable="yes" context="sidebararea|transtype">Solid</item>
+                  <item translatable="yes" context="sidebararea|transtype">Linear</item>
+                  <item translatable="yes" context="sidebararea|transtype">Axial</item>
+                  <item translatable="yes" context="sidebararea|transtype">Radial</item>
+                  <item translatable="yes" context="sidebararea|transtype">Ellipsoid</item>
+                  <item translatable="yes" context="sidebararea|transtype">Quadratic</item>
+                  <item translatable="yes" context="sidebararea|transtype">Square</item>
                 </items>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="transtype-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Transparency Type</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|transtype-atkobject">Transparency Type</property>
                   </object>
                 </child>
               </object>
@@ -280,7 +280,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebararea|gradient|tooltip_text">Specify the variation of gradient transparency.</property>
                     <property name="hexpand">True</property>
                     <property name="action_name">.uno:sidebargradient</property>
                     <property name="use_underline">True</property>
@@ -317,7 +317,7 @@
               <object class="GtkScale" id="transparencyslider">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|transparencyslider|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="hexpand">True</property>
                 <property name="round_digits">1</property>
                 <property name="draw_value">False</property>
@@ -334,7 +334,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebararea|settransparency|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="max_length">100</property>
                 <property name="invisible_char">•</property>
                 <property name="secondary_icon_activatable">False</property>
@@ -343,7 +343,7 @@
                 <property name="numeric">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="settransparency:0%-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|settransparency-atkobject">Transparency</property>
                   </object>
                 </child>
               </object>
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
index dc93f7160174..b55effd07129 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="0to100adjustment">
     <property name="upper">100</property>
@@ -43,7 +43,7 @@
               <object class="GtkLabel" id="brightnesslabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Brightness:</property>
+                <property name="label" translatable="yes" context="sidebargraphic|brightnesslabel">_Brightness:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">setbrightness:%</property>
                 <property name="xalign">0</property>
@@ -58,7 +58,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the luminance of the graphic.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebargraphic|setbrightness|tooltip_text">Specify the luminance of the graphic.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
                 <property name="climb_rate">1</property>
@@ -67,7 +67,7 @@
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="setbrightness:%-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Brightness</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setbrightness-atkobject">Brightness</property>
                   </object>
                 </child>
               </object>
@@ -80,7 +80,7 @@
               <object class="GtkLabel" id="contrastlabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Contrast:</property>
+                <property name="label" translatable="yes" context="sidebargraphic|contrastlabel">_Contrast:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">setcontrast:%</property>
                 <property name="xalign">0</property>
@@ -95,7 +95,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebargraphic|setcontrast|tooltip_text">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
                 <property name="climb_rate">1</property>
@@ -104,7 +104,7 @@
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="setcontrast:%-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Contrast</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setcontrast-atkobject">Contrast</property>
                   </object>
                 </child>
               </object>
@@ -117,7 +117,7 @@
               <object class="GtkLabel" id="colorlmodelabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Color _mode:</property>
+                <property name="label" translatable="yes" context="sidebargraphic|colorlmodelabel">Color _mode:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">setcolormode</property>
                 <property name="xalign">0</property>
@@ -136,7 +136,7 @@
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="setcolormode-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Color mode</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setcolormode-atkobject">Color mode</property>
                   </object>
                 </child>
               </object>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="transparencylabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Transparency:</property>
+                <property name="label" translatable="yes" context="sidebargraphic|transparencylabel">_Transparency:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">settransparency:%</property>
                 <property name="xalign">0</property>
@@ -164,7 +164,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebargraphic|settransparency|tooltip_text">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">0to100adjustment</property>
                 <property name="climb_rate">1</property>
@@ -173,7 +173,7 @@
                 </accessibility>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="settransparency:%-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|settransparency-atkobject">Transparency</property>
                   </object>
                 </child>
               </object>
@@ -206,13 +206,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Red</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebargraphic|setred|tooltip_text">Red</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
                     <property name="climb_rate">1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="setred:%-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Red</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setred-atkobject">Red</property>
                       </object>
                     </child>
                   </object>
@@ -252,13 +252,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Green</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebargraphic|setgreen|tooltip_text">Green</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
                     <property name="climb_rate">1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="setgreen:%-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Green</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setgreen-atkobject">Green</property>
                       </object>
                     </child>
                   </object>
@@ -299,13 +299,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Blue</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebargraphic|setblue|tooltip_text">Blue</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
                     <property name="climb_rate">1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="setblue:%-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Blue</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setblue-atkobject">Blue</property>
                       </object>
                     </child>
                   </object>
@@ -345,7 +345,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebargraphic|setgamma|tooltip_text">Specify the gamma value that affects the brightness of the midtone values.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">gammaadjustment</property>
                     <property name="climb_rate">0.10000000000000001</property>
@@ -355,7 +355,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="setgamma:0-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Gamma value</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebargraphic|setgamma-atkobject">Gamma value</property>
                       </object>
                     </child>
                   </object>
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 9e0e01d7ac4a..b146b00cbdbd 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -37,11 +37,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|beginarrowstyle|tooltip_text">Select the style of the beginning arrowhead.</property>
                     <property name="hexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="beginarrowstyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Beginning Style</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|beginarrowstyle-atkobject">Beginning Style</property>
                       </object>
                     </child>
                   </object>
@@ -57,11 +57,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the line.</property>
                     <property name="hexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="linestyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Style</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|linestyle-atkobject">Style</property>
                       </object>
                     </child>
                   </object>
@@ -77,12 +77,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|endarrowstyle|tooltip_text">Select the style of the ending arrowhead.</property>
                     <property name="margin_right">6</property>
                     <property name="hexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="endarrowstyle-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Ending Style</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|endarrowstyle-atkobject">Ending Style</property>
                       </object>
                     </child>
                   </object>
@@ -110,7 +110,7 @@
                   <object class="GtkLabel" id="widthlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Width:</property>
+                    <property name="label" translatable="yes" context="sidebarline|widthlabel">_Width:</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -127,7 +127,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|width|tooltip_text">Select the width of the line.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="setwidth">
                         <property name="width_request">105</property>
@@ -156,7 +156,7 @@
                   <object class="GtkLabel" id="colorlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Color:</property>
+                    <property name="label" translatable="yes" context="sidebarline|colorlabel">_Color:</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -172,14 +172,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|color|tooltip_text">Select the color of the line.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="setcolor">
                         <property name="width_request">105</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarline|setcolor|tooltip_text">Select the color of the line.</property>
                         <property name="margin_left">20</property>
                         <property name="action_name">.uno:XLineColor</property>
                         <property name="use_underline">True</property>
@@ -201,7 +201,7 @@
                   <object class="GtkLabel" id="translabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Transparency:</property>
+                    <property name="label" translatable="yes" context="sidebarline|translabel">_Transparency:</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -217,7 +217,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarline|linetransparency|tooltip_text">Specify the transparency of the line.</property>
                     <property name="halign">start</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
@@ -227,7 +227,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="linetransparency:0%-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|linetransparency-atkobject">Transparency</property>
                       </object>
                     </child>
                   </object>
@@ -259,7 +259,7 @@
                       <object class="GtkLabel" id="cornerlabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Corner style:</property>
+                        <property name="label" translatable="yes" context="sidebarline|cornerlabel">_Corner style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">edgestyle</property>
                         <property name="xalign">0</property>
@@ -276,16 +276,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarline|edgestyle|tooltip_text">Select the style of the edge connections.</property>
                         <items>
-                          <item translatable="yes">Rounded</item>
-                          <item translatable="yes">- none -</item>
-                          <item translatable="yes">Mitered</item>
-                          <item translatable="yes">Beveled</item>
+                          <item translatable="yes" context="sidebarline|edgestyle">Rounded</item>
+                          <item translatable="yes" context="sidebarline|edgestyle">- none -</item>
+                          <item translatable="yes" context="sidebarline|edgestyle">Mitered</item>
+                          <item translatable="yes" context="sidebarline|edgestyle">Beveled</item>
                         </items>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="edgestyle-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Corner Style</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|edgestyle-atkobject">Corner Style</property>
                           </object>
                         </child>
                       </object>
@@ -300,7 +300,7 @@
                       <object class="GtkLabel" id="caplabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Ca_p style:</property>
+                        <property name="label" translatable="yes" context="sidebarline|caplabel">Ca_p style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">linecapstyle</property>
                         <property name="xalign">0</property>
@@ -317,15 +317,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarline|linecapstyle|tooltip_text">Select the style of the line caps.</property>
                         <items>
-                          <item translatable="yes">Flat</item>
-                          <item translatable="yes">Round</item>
-                          <item translatable="yes">Square</item>
+                          <item translatable="yes" context="sidebarline|linecapstyle">Flat</item>
+                          <item translatable="yes" context="sidebarline|linecapstyle">Round</item>
+                          <item translatable="yes" context="sidebarline|linecapstyle">Square</item>
                         </items>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="linecapstyle-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Cap Style</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="sidebarline|linecapstyle-atkobject">Cap Style</property>
                           </object>
                         </child>
                       </object>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 0e25e6937c18..1b332c21cf98 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.4"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -23,7 +23,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
+            <property name="tooltip_text" translatable="yes" context="sidebarparagraph|numberbullet|tooltip_text">Bullets and Numbering</property>
             <property name="show_arrow">False</property>
             <child>
               <object class="GtkMenuToolButton" id="bullet">
@@ -68,7 +68,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarparagraph|horizontalalignment|tooltip_text">Horizontal Alignment</property>
                 <property name="halign">start</property>
                 <property name="show_arrow">False</property>
                 <child>
@@ -169,7 +169,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarparagraph|verticalalignment|tooltip_text">Vertical Alignment</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
                 <property name="show_arrow">False</property>
@@ -235,7 +235,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">_Spacing:</property>
+                <property name="label" translatable="yes" context="sidebarparagraph|spacinglabel">_Spacing:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">paraspacing</property>
                 <property name="xalign">0</property>
@@ -251,7 +251,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Spacing</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarparagraph|paraspacing|tooltip_text">Spacing</property>
                 <property name="show_arrow">False</property>
                 <child>
                   <object class="GtkToolButton" id="paraspaceinc">
@@ -310,14 +310,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|aboveparaspacing|tooltip_text">Above Paragraph Spacing</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="text">0</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="aboveparaspacing-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Above Paragraph Spacing</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarparagraph|aboveparaspacing-atkobject">Above Paragraph Spacing</property>
                       </object>
                     </child>
                   </object>
@@ -360,14 +360,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|belowparaspacing|tooltip_text">Below Paragraph Spacing</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="text">0</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="belowparaspacing-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Below Paragraph Spacing</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarparagraph|belowparaspacing-atkobject">Below Paragraph Spacing</property>
                       </object>
                     </child>
                   </object>
@@ -396,7 +396,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Line Spacing</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|setlinespacing|tooltip_text">Line Spacing</property>
                     <property name="action_name">.uno:LineSpacing</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -429,7 +429,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">_Indent:</property>
+                <property name="label" translatable="yes" context="sidebarparagraph|indentlabel">_Indent:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">indent</property>
                 <property name="xalign">0</property>
@@ -445,14 +445,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarparagraph|indent|tooltip_text">Indent</property>
                 <property name="show_arrow">False</property>
                 <child>
                   <object class="GtkToolButton" id="increaseindent">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|increaseindent|tooltip_text">Increase Indent</property>
                     <property name="action_name">.uno:IncrementIndent</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -466,7 +466,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|decreaseindent|tooltip_text">Decrease Indent</property>
                     <property name="action_name">.uno:DecrementIndent</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -480,7 +480,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|hangingindent|tooltip_text">Switch to Hanging Indent</property>
                     <property name="action_name">.uno:HangingIndent</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -521,14 +521,14 @@
                   <object class="svxlo-SvxRelativeField" id="beforetextindent">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Before Text Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|beforetextindent|tooltip_text">Before Text Indent</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="text">0</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="beforetextindent-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Before Text Indent</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarparagraph|beforetextindent-atkobject">Before Text Indent</property>
                       </object>
                     </child>
                   </object>
@@ -570,14 +570,14 @@
                   <object class="svxlo-SvxRelativeField" id="aftertextindent">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">After Text Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|aftertextindent|tooltip_text">After Text Indent</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="text">0</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="aftertextindent-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">After Text Indent</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarparagraph|aftertextindent-atkobject">After Text Indent</property>
                       </object>
                     </child>
                   </object>
@@ -619,14 +619,14 @@
                   <object class="svxlo-SvxRelativeField" id="firstlineindent">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">First Line Indent</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarparagraph|firstlineindent|tooltip_text">First Line Indent</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="text">0</property>
                     <property name="adjustment">adjustment1</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="firstlineindent-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First Line Indent</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarparagraph|firstlineindent-atkobject">First Line Indent</property>
                       </object>
                     </child>
                   </object>
@@ -658,7 +658,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarparagraph|backgroundcolor|tooltip_text">Paragraph Background Color</property>
                 <property name="halign">end</property>
                 <child>
                   <object class="GtkMenuToolButton" id="parabkcolor">
diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui
index e67d65b25206..ffa066997ade 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="svx">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -39,7 +39,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position _X:</property>
+                    <property name="label" translatable="yes" context="sidebarpossize|horizontallabel">Position _X:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -54,7 +54,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter the value for the horizontal position.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|horizontalpos|tooltip_text">Enter the value for the horizontal position.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
                     <accessibility>
@@ -62,7 +62,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="horizontalpos:0in-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Horizontal</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarpossize|horizontalpos-atkobject">Horizontal</property>
                       </object>
                     </child>
                   </object>
@@ -79,7 +79,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position _Y:</property>
+                    <property name="label" translatable="yes" context="sidebarpossize|verticallabel">Position _Y:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -94,7 +94,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter the value for the vertical position.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|verticalpos|tooltip_text">Enter the value for the vertical position.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
                     <accessibility>
@@ -102,7 +102,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="verticalpos:0in-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Vertical</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarpossize|verticalpos-atkobject">Vertical</property>
                       </object>
                     </child>
                   </object>
@@ -119,7 +119,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Width:</property>
+                    <property name="label" translatable="yes" context="sidebarpossize|widthlabel">_Width:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -135,7 +135,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter a width for the selected object.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|selectwidth|tooltip_text">Enter a width for the selected object.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
                     <accessibility>
@@ -143,7 +143,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="selectwidth:0in-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarpossize|selectwidth-atkobject">Width</property>
                       </object>
                     </child>
                   </object>
@@ -160,7 +160,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">H_eight:</property>
+                    <property name="label" translatable="yes" context="sidebarpossize|heightlabel">H_eight:</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -176,7 +176,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Enter a height for the selected object.</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|selectheight|tooltip_text">Enter a height for the selected object.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
                     <accessibility>
@@ -184,7 +184,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="selectheight:0in-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Height</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarpossize|selectheight-atkobject">Height</property>
                       </object>
                     </child>
                   </object>
@@ -204,12 +204,12 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="ratio">
-                <property name="label" translatable="yes">_Keep ratio</property>
+                <property name="label" translatable="yes" context="sidebarpossize|ratio">_Keep ratio</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Maintain proportions when you resize the selected object.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpossize|ratio|tooltip_text">Maintain proportions when you resize the selected object.</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -225,7 +225,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Rotation:</property>
+                <property name="label" translatable="yes" context="sidebarpossize|rotationlabel">_Rotation:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -251,7 +251,7 @@
                     </accessibility>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="orientationcontrol-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Rotation</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="sidebarpossize|orientationcontrol-atkobject">Rotation</property>
                       </object>
                     </child>
                   </object>
@@ -273,7 +273,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
+                        <property name="tooltip_text" translatable="yes" context="sidebarpossize|rotation|tooltip_text">Select the angle for rotation.</property>
                         <property name="hexpand">True</property>
                         <property name="adjustment">adjustment1</property>
                       </object>
@@ -294,7 +294,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Flip:</property>
+                            <property name="label" translatable="yes" context="sidebarpossize|fliplabel">_Flip:</property>
                             <property name="use_underline">True</property>
                             <property name="justify">right</property>
                           </object>
@@ -317,7 +317,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Flip the selected object vertically.</property>
+                                <property name="tooltip_text" translatable="yes" context="sidebarpossize|flipvertical|tooltip_text">Flip the selected object vertically.</property>
                                 <property name="action_name">.uno:FlipVertical</property>
                                 <property name="use_underline">True</property>
                               </object>
@@ -331,7 +331,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Flip the selected object horizontally.</property>
+                                <property name="tooltip_text" translatable="yes" context="sidebarpossize|fliphorizontal|tooltip_text">Flip the selected object horizontally.</property>
                                 <property name="action_name">.uno:FlipHorizontal</property>
                                 <property name="use_underline">True</property>
                               </object>
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 31531ab823b1..e74be6a7d200 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -31,7 +31,7 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="SHOW_SHADOW">
-                <property name="label" translatable="yes">Enable</property>
+                <property name="label" translatable="yes" context="sidebarshadow|SHOW_SHADOW">Enable</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -55,7 +55,7 @@
                   <object class="GtkLabel" id="angle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Angle</property>
+                    <property name="label" translatable="yes" context="sidebarshadow|angle">Angle</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -66,7 +66,7 @@
                   <object class="GtkLabel" id="distance">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Distance</property>
+                    <property name="label" translatable="yes" context="sidebarshadow|distance">Distance</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -113,7 +113,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Transparency:</property>
+                    <property name="label" translatable="yes" context="sidebarshadow|transparency_label">Transparency:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -176,7 +176,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Color:</property>
+                    <property name="label" translatable="yes" context="sidebarshadow|color">Color:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/svx/uiconfig/ui/sidebarstylespanel.ui b/svx/uiconfig/ui/sidebarstylespanel.ui
index 79c40b01316a..60fee53d86c1 100644
--- a/svx/uiconfig/ui/sidebarstylespanel.ui
+++ b/svx/uiconfig/ui/sidebarstylespanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="SidebarStylesPanel">
     <property name="visible">True</property>
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui
index eb962bad41d5..90fa435718a5 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="SidebarTextPanel">
diff --git a/svx/uiconfig/ui/stylemenu.ui b/svx/uiconfig/ui/stylemenu.ui
index 8773fcfcf066..29c52a2f0f44 100644
--- a/svx/uiconfig/ui/stylemenu.ui
+++ b/svx/uiconfig/ui/stylemenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="update">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Update to Match Selection</property>
+        <property name="label" translatable="yes" context="stylemenu|update">Update to Match Selection</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit Style...</property>
+        <property name="label" translatable="yes" context="stylemenu|edit">Edit Style...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/textcharacterspacingcontrol.ui b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
index ede4262d1d3e..c78c7bace775 100644
--- a/svx/uiconfig/ui/textcharacterspacingcontrol.ui
+++ b/svx/uiconfig/ui/textcharacterspacingcontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-2</property>
@@ -70,7 +70,7 @@
         <property name="vexpand">True</property>
         <child>
           <object class="GtkButton" id="very_tight">
-            <property name="label" translatable="yes">Very Tight</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|very_tight">Very Tight</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -86,7 +86,7 @@
         </child>
         <child>
           <object class="GtkButton" id="tight">
-            <property name="label" translatable="yes">Tight</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|tight">Tight</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -102,7 +102,7 @@
         </child>
         <child>
           <object class="GtkButton" id="normal">
-            <property name="label" translatable="yes">Normal</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|normal">Normal</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -118,7 +118,7 @@
         </child>
         <child>
           <object class="GtkButton" id="loose">
-            <property name="label" translatable="yes">Loose</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|loose">Loose</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -155,7 +155,7 @@
                     <property name="hexpand">True</property>
                     <property name="invisible_char">●</property>
                     <property name="width_chars">0</property>
-                    <property name="text" translatable="yes">0,0</property>
+                    <property name="text" translatable="yes" context="textcharacterspacingcontrol|kerning">0,0</property>
                     <property name="adjustment">adjustment1</property>
                     <property name="digits">1</property>
                   </object>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Value</property>
+                <property name="label" translatable="yes" context="textcharacterspacingcontrol|label2">Custom Value</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -180,7 +180,7 @@
         </child>
         <child>
           <object class="GtkButton" id="very_loose">
-            <property name="label" translatable="yes">Very Loose</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|very_loose">Very Loose</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -196,7 +196,7 @@
         </child>
         <child>
           <object class="GtkButton" id="last_custom">
-            <property name="label" translatable="yes">Last Custom Value</property>
+            <property name="label" translatable="yes" context="textcharacterspacingcontrol|last_custom">Last Custom Value</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/svx/uiconfig/ui/textcontrolchardialog.ui b/svx/uiconfig/ui/textcontrolchardialog.ui
index 542f50a4c6ec..a1c76e4d0f61 100644
--- a/svx/uiconfig/ui/textcontrolchardialog.ui
+++ b/svx/uiconfig/ui/textcontrolchardialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TextControlCharacterPropertiesDialog">
     <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="textcontrolchardialog|TextControlCharacterPropertiesDialog">Character</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,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="textcontrolchardialog|font">Font</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,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="textcontrolchardialog|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="textcontrolchardialog|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/svx/uiconfig/ui/textcontrolparadialog.ui b/svx/uiconfig/ui/textcontrolparadialog.ui
index ab41f9403d03..92b0100f2e6c 100644
--- a/svx/uiconfig/ui/textcontrolparadialog.ui
+++ b/svx/uiconfig/ui/textcontrolparadialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TextControlParagraphPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph</property>
+    <property name="title" translatable="yes" context="textcontrolparadialog|TextControlParagraphPropertiesDialog">Paragraph</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="textcontrolparadialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="textcontrolparadialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="textcontrolparadialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="labelTP_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="textcontrolparadialog|labelTP_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/svx/uiconfig/ui/textunderlinecontrol.ui b/svx/uiconfig/ui/textunderlinecontrol.ui
index 19a8522546cf..421c7f62d96f 100644
--- a/svx/uiconfig/ui/textunderlinecontrol.ui
+++ b/svx/uiconfig/ui/textunderlinecontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="TextUnderlineControl">
     <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton" id="none">
-            <property name="label" translatable="yes">(Without)</property>
+            <property name="label" translatable="yes" context="textunderlinecontrol|none">(Without)</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -41,7 +41,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Single</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|single|tooltip_text">Single</property>
             <property name="image">image_spacing_1</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -58,7 +58,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Double</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|double|tooltip_text">Double</property>
             <property name="image">image_spacing_2</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -75,7 +75,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Bold</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|bold|tooltip_text">Bold</property>
             <property name="image">image_spacing_3</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -92,7 +92,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Dotted</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dot|tooltip_text">Dotted</property>
             <property name="image">image_spacing_4</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -109,7 +109,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Dotted (Bold)</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dotbold|tooltip_text">Dotted (Bold)</property>
             <property name="image">image_spacing_5</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -126,7 +126,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Dash</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dash|tooltip_text">Dash</property>
             <property name="image">image_spacing_6</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -143,7 +143,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Long Dash</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashlong|tooltip_text">Long Dash</property>
             <property name="image">image_spacing_7</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -160,7 +160,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Dot Dash</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashdot|tooltip_text">Dot Dash</property>
             <property name="image">image_spacing_8</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -177,7 +177,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Dot Dot Dash</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashdotdot|tooltip_text">Dot Dot Dash</property>
             <property name="image">image_spacing_9</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -194,7 +194,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Wave</property>
+            <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|wave|tooltip_text">Wave</property>
             <property name="image">image_spacing_10</property>
             <property name="relief">none</property>
             <property name="xalign">0</property>
@@ -208,7 +208,7 @@
         </child>
         <child>
           <object class="GtkButton" id="moreoptions">
-            <property name="label" translatable="yes">_More Options...</property>
+            <property name="label" translatable="yes" context="textunderlinecontrol|moreoptions">_More Options...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/svx/uiconfig/ui/xformspage.ui b/svx/uiconfig/ui/xformspage.ui
index ad51aea3f53f..964a7cf9c55e 100644
--- a/svx/uiconfig/ui/xformspage.ui
+++ b/svx/uiconfig/ui/xformspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="XFormsPage">
@@ -23,7 +23,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="action_name">TBI_ITEM_ADD</property>
-            <property name="label" translatable="yes">Add Item</property>
+            <property name="label" translatable="yes" context="xformspage|TBI_ITEM_ADD">Add Item</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -37,7 +37,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="action_name">TBI_ITEM_ADD_ELEMENT</property>
-            <property name="label" translatable="yes">Add Element</property>
+            <property name="label" translatable="yes" context="xformspage|TBI_ITEM_ADD_ELEMENT">Add Element</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -51,7 +51,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="action_name">TBI_ITEM_ADD_ATTRIBUTE</property>
-            <property name="label" translatable="yes">Add Attribute</property>
+            <property name="label" translatable="yes" context="xformspage|TBI_ITEM_ADD_ATTRIBUTE">Add Attribute</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -65,7 +65,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="action_name">TBI_ITEM_EDIT</property>
-            <property name="label" translatable="yes">Edit</property>
+            <property name="label" translatable="yes" context="xformspage|TBI_ITEM_EDIT">Edit</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -79,7 +79,7 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
             <property name="action_name">TBI_ITEM_REMOVE</property>
-            <property name="label" translatable="yes">Delete</property>
+            <property name="label" translatable="yes" context="xformspage|TBI_ITEM_REMOVE">Delete</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/xmlsecstatmenu.ui b/svx/uiconfig/ui/xmlsecstatmenu.ui
index c8b31350f431..6eed9b8f4b3c 100644
--- a/svx/uiconfig/ui/xmlsecstatmenu.ui
+++ b/svx/uiconfig/ui/xmlsecstatmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="signatures">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Digital Signatures...</property>
+        <property name="label" translatable="yes" context="xmlsecstatmenu|signatures">Digital Signatures...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/svx/uiconfig/ui/zoommenu.ui b/svx/uiconfig/ui/zoommenu.ui
index 3cc2c6c95beb..5431d6f646f5 100644
--- a/svx/uiconfig/ui/zoommenu.ui
+++ b/svx/uiconfig/ui/zoommenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="svx">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="page">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Entire Page</property>
+        <property name="label" translatable="yes" context="zoommenu|page">Entire Page</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="width">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Page Width</property>
+        <property name="label" translatable="yes" context="zoommenu|width">Page Width</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="optimal">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Optimal View</property>
+        <property name="label" translatable="yes" context="zoommenu|optimal">Optimal View</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="50">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">50%</property>
+        <property name="label" translatable="yes" context="zoommenu|50">50%</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkMenuItem" id="75">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">75%</property>
+        <property name="label" translatable="yes" context="zoommenu|75">75%</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -49,7 +49,7 @@
       <object class="GtkMenuItem" id="100">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">100%</property>
+        <property name="label" translatable="yes" context="zoommenu|100">100%</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -57,7 +57,7 @@
       <object class="GtkMenuItem" id="150">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">150%</property>
+        <property name="label" translatable="yes" context="zoommenu|150">150%</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -65,7 +65,7 @@
       <object class="GtkMenuItem" id="200">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">200%</property>
+        <property name="label" translatable="yes" context="zoommenu|200">200%</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/AllLangMoTarget_sw.mk b/sw/AllLangMoTarget_sw.mk
new file mode 100644
index 000000000000..60adfc3a5ed1
--- /dev/null
+++ b/sw/AllLangMoTarget_sw.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,sw))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
deleted file mode 100644
index 8094ae9a0490..000000000000
--- a/sw/AllLangResTarget_sw.mk
+++ /dev/null
@@ -1,109 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sw))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sw,\
-    sw/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
-
-$(eval $(call gb_SrsTarget_set_include,sw/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/core/undo \
-    -I$(SRCDIR)/sw/source/core/unocore \
-    -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/source/uibase/docvw \
-    -I$(SRCDIR)/sw/source/uibase/envelp \
-    -I$(SRCDIR)/sw/source/uibase/index \
-    -I$(SRCDIR)/sw/source/uibase/sidebar \
-    -I$(SRCDIR)/sw/source/ui/chrdlg \
-    -I$(SRCDIR)/sw/source/ui/config \
-    -I$(SRCDIR)/sw/source/ui/dbui \
-    -I$(SRCDIR)/sw/source/ui/dialog \
-    -I$(SRCDIR)/sw/source/ui/docvw \
-    -I$(SRCDIR)/sw/source/ui/envelp \
-    -I$(SRCDIR)/sw/source/ui/fldui \
-    -I$(SRCDIR)/sw/source/ui/fmtui \
-    -I$(SRCDIR)/sw/source/ui/frmdlg \
-    -I$(SRCDIR)/sw/source/ui/globdoc \
-    -I$(SRCDIR)/sw/source/ui/index \
-    -I$(SRCDIR)/sw/source/ui/lingu \
-    -I$(SRCDIR)/sw/source/ui/misc \
-    -I$(SRCDIR)/sw/source/ui/ribbar \
-    -I$(SRCDIR)/sw/source/ui/shells \
-    -I$(SRCDIR)/sw/source/ui/smartmenu \
-    -I$(SRCDIR)/sw/source/ui/table \
-    -I$(SRCDIR)/sw/source/ui/uiview \
-    -I$(SRCDIR)/sw/source/ui/utlui \
-    -I$(SRCDIR)/sw/source/ui/web \
-    -I$(SRCDIR)/sw/source/ui/wrtsh \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sw/res,\
-    sw/source/core/layout/pagefrm.src \
-    sw/source/core/undo/undo.src \
-    sw/source/core/unocore/unocore.src \
-    sw/source/uibase/dialog/regionsw.src \
-    sw/source/uibase/docvw/docvw.src \
-    sw/source/uibase/lingu/olmenu.src \
-    sw/source/uibase/ribbar/inputwin.src \
-    sw/source/uibase/ribbar/workctrl.src \
-    sw/source/uibase/uiview/view.src \
-    sw/source/uibase/utlui/attrdesc.src \
-    sw/source/uibase/utlui/navipi.src \
-    sw/source/uibase/utlui/initui.src \
-    sw/source/uibase/utlui/statusbar.src \
-    sw/source/uibase/wrtsh/wrtsh.src \
-    sw/source/uibase/utlui/unotools.src \
-    sw/source/uibase/dbui/mailmergechildwindow.src \
-    sw/source/ui/app/app.src \
-    sw/source/ui/app/error.src \
-    sw/source/ui/chrdlg/chrdlg.src \
-    sw/source/ui/config/optdlg.src \
-    sw/source/ui/config/optload.src \
-    sw/source/ui/dbui/dbui.src \
-    sw/source/ui/dbui/mailmergewizard.src \
-    sw/source/ui/dbui/mmaddressblockpage.src \
-    sw/source/ui/dbui/selectdbtabledialog.src \
-    sw/source/ui/dialog/dialog.src \
-    sw/source/ui/dochdl/dochdl.src \
-    sw/source/ui/docvw/annotation.src \
-    sw/source/ui/docvw/access.src \
-    sw/source/ui/envelp/envelp.src \
-    sw/source/ui/envelp/label.src \
-    sw/source/ui/envelp/labfmt.src \
-    sw/source/ui/fldui/fldui.src \
-    sw/source/ui/frmdlg/frmui.src \
-    sw/source/ui/globdoc/globdoc.src \
-    sw/source/ui/index/cnttab.src \
-    sw/source/ui/index/idxmrk.src \
-    sw/source/ui/misc/glossary.src \
-    sw/source/ui/misc/swruler.src \
-    sw/source/ui/shells/shells.src \
-    sw/source/ui/sidebar/PagePropertyPanel.src \
-    sw/source/ui/utlui/poolfmt.src \
-    sw/source/ui/utlui/utlui.src \
-    sw/source/ui/web/web.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 46b7693bc8ae..7c8e8a43c829 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -790,7 +790,4 @@ $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
     $$(INCLUDE) \
 ))
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sw,sw))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f40d1a7712e9..a614daf495fe 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
     sw/source/ui/dialog/ascfldlg \
     sw/source/ui/dialog/docstdlg \
     sw/source/ui/dialog/macassgn \
-    sw/source/ui/dialog/swdialmgr \
     sw/source/ui/dialog/swdlgfact \
     sw/source/ui/dialog/swmessdialog \
     sw/source/ui/dialog/swuiexp \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 54a43681bed3..4ea9bb840779 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -22,16 +22,11 @@ include $(SRCDIR)/sw/ooxmlexport_setup.mk
 $(eval $(call gb_Module_Module,sw))
 
 $(eval $(call gb_Module_add_targets,sw,\
-        CustomTarget_generated \
+	CustomTarget_generated \
 	Library_msword \
 	Library_sw \
 	Library_swd \
 	$(call gb_Helper_optional,DESKTOP,Library_swui) \
-))
-
-ifneq ($(OS),IOS)
-$(eval $(call gb_Module_add_l10n_targets,sw,\
-    AllLangResTarget_sw \
 	UIConfig_sglobal \
 	UIConfig_sweb \
 	UIConfig_swform \
@@ -40,6 +35,11 @@ $(eval $(call gb_Module_add_l10n_targets,sw,\
 	UIConfig_swxform \
 ))
 
+ifneq ($(OS),IOS)
+$(eval $(call gb_Module_add_l10n_targets,sw,\
+    AllLangMoTarget_sw \
+))
+
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
 $(eval $(call gb_Module_add_targets,sw,\
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
deleted file mode 100644
index def80d4e5456..000000000000
--- a/sw/inc/access.hrc
+++ /dev/null
@@ -1,63 +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_SW_INC_ACCESS_HRC
-#define INCLUDED_SW_INC_ACCESS_HRC
-
-#include "rcid.hrc"
-
-#define STR_ACCESS_DOC_NAME                     (RC_ACCESS_BEGIN + 1)
-#define STR_ACCESS_DOC_DESC                     (RC_ACCESS_BEGIN + 2)
-#define STR_ACCESS_HEADER_NAME                  (RC_ACCESS_BEGIN + 4)
-#define STR_ACCESS_HEADER_DESC                  (RC_ACCESS_BEGIN + 5)
-#define STR_ACCESS_FOOTER_NAME                  (RC_ACCESS_BEGIN + 6)
-#define STR_ACCESS_FOOTER_DESC                  (RC_ACCESS_BEGIN + 7)
-#define STR_ACCESS_FOOTNOTE_NAME                (RC_ACCESS_BEGIN + 8)
-#define STR_ACCESS_FOOTNOTE_DESC                (RC_ACCESS_BEGIN + 9)
-#define STR_ACCESS_ENDNOTE_NAME                 (RC_ACCESS_BEGIN + 10)
-#define STR_ACCESS_ENDNOTE_DESC                 (RC_ACCESS_BEGIN + 11)
-#define STR_ACCESS_TABLE_DESC                   (RC_ACCESS_BEGIN + 15)
-#define STR_ACCESS_PAGE_NAME                    (RC_ACCESS_BEGIN + 16)
-#define STR_ACCESS_PAGE_DESC                    (RC_ACCESS_BEGIN + 17)
-#define STR_ACCESS_ANNOTATION_AUTHOR_NAME       (RC_ACCESS_BEGIN + 18)
-#define STR_ACCESS_ANNOTATION_DATE_NAME         (RC_ACCESS_BEGIN + 19)
-#define STR_ACCESS_ANNOTATION_BUTTON_NAME       (RC_ACCESS_BEGIN + 20)
-#define STR_ACCESS_ANNOTATION_BUTTON_DESC       (RC_ACCESS_BEGIN + 21)
-
-#define STR_ACCESS_PREVIEW_DOC_NAME             (RC_ACCESS_BEGIN + 22)
-#define STR_ACCESS_PREVIEW_DOC_SUFFIX           (RC_ACCESS_BEGIN + 24)
-#define STR_ACCESS_DOC_WORDPROCESSING           (RC_ACCESS_BEGIN + 25)
-#define STR_ACCESS_COLUMN_WIDTH                 (RC_ACCESS_BEGIN + 27)
-#define STR_ACCESS_PAGESETUP_SPACING            (RC_ACCESS_BEGIN + 28)
-
-#define STR_ACCESS_TL_GLOBAL                    (RC_ACCESS_BEGIN + 30)
-#define STR_ACCESS_TL_CONTENT                   (RC_ACCESS_BEGIN + 31)
-#define STR_ACCESS_FORMULA_TYPE                 (RC_ACCESS_BEGIN + 32)
-#define STR_ACCESS_FORMULA_TEXT                 (RC_ACCESS_BEGIN + 33)
-#define STR_ACCESS_FORMULA_TOOLBAR              (RC_ACCESS_BEGIN + 34)
-
-#define ACCESS_ACT_END STR_ACCESS_FORMULA_TOOLBAR
-
-#if ACCESS_ACT_END > RC_ACCESS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc
new file mode 100644
index 000000000000..4761dd345406
--- /dev/null
+++ b/sw/inc/app.hrc
@@ -0,0 +1,93 @@
+/* -*- 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_SW_INC_APP_HRC
+#define INCLUDED_SW_INC_APP_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#include <svl/style.hxx>
+#include <sfx2/sfx.hrc>
+#include "swstyle.h"
+
+const std::pair<const char*, int> RID_PARAGRAPHSTYLEFAMILY[] =
+{
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "All Styles")          , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Hidden Styles")       , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Applied Styles")      , SFXSTYLEBIT_USED      },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Custom Styles")       , SFXSTYLEBIT_USERDEF   },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Automatic")           , SFXSTYLEBIT_AUTO      },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Text Styles")         , SWSTYLEBIT_TEXT       },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Chapter Styles")      , SWSTYLEBIT_CHAPTER    },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "List Styles")         , SWSTYLEBIT_LIST       },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Index Styles")        , SWSTYLEBIT_IDX        },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Special Styles")      , SWSTYLEBIT_EXTRA      },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "HTML Styles")         , SWSTYLEBIT_HTML       },
+    { NC_("RID_PARAGRAPHSTYLEFAMILY", "Conditional Styles")  , SWSTYLEBIT_CONDCOLL   },
+    { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_CHARACTERSTYLEFAMILY[] =
+{
+    { NC_("RID_CHARACTERSTYLEFAMILY", "All")             , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_CHARACTERSTYLEFAMILY", "Hidden Styles")   , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_CHARACTERSTYLEFAMILY", "Applied Styles")  , SFXSTYLEBIT_USED      },
+    { NC_("RID_CHARACTERSTYLEFAMILY", "Custom Styles")   , SFXSTYLEBIT_USERDEF   },
+    { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_FRAMESTYLEFAMILY[] =
+{
+    { NC_("RID_FRAMESTYLEFAMILY", "All")             , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_FRAMESTYLEFAMILY", "Hidden Styles")   , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_FRAMESTYLEFAMILY", "Applied Styles")  , SFXSTYLEBIT_USED      },
+    { NC_("RID_FRAMESTYLEFAMILY", "Custom Styles")   , SFXSTYLEBIT_USERDEF   },
+    { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] =
+{
+    { NC_("RID_PAGESTYLEFAMILY", "All")             , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles")   , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_PAGESTYLEFAMILY", "Applied Styles")  , SFXSTYLEBIT_USED      },
+    { NC_("RID_PAGESTYLEFAMILY", "Custom Styles")   , SFXSTYLEBIT_USERDEF   },
+    { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_LISTSTYLEFAMILY[] =
+{
+    { NC_("RID_LISTSTYLEFAMILY", "All")             , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_LISTSTYLEFAMILY", "Hidden Styles")   , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_LISTSTYLEFAMILY", "Applied Styles")  , SFXSTYLEBIT_USED      },
+    { NC_("RID_LISTSTYLEFAMILY", "Custom Styles")   , SFXSTYLEBIT_USERDEF   },
+    { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_TABLESTYLEFAMILY[] =
+{
+    { NC_("RID_TABLESTYLEFAMILY", "All")             , SFXSTYLEBIT_ALL_VISIBLE },
+    { NC_("RID_TABLESTYLEFAMILY", "Hidden Styles")   , SFXSTYLEBIT_HIDDEN    },
+    { NC_("RID_TABLESTYLEFAMILY", "Applied Styles")  , SFXSTYLEBIT_USED      },
+    { NC_("RID_TABLESTYLEFAMILY", "Custom Styles")   , SFXSTYLEBIT_USERDEF   },
+    { nullptr, 0 }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 370801df588b..2fb70a70e673 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -22,17 +22,8 @@
 
 #include "rcid.hrc"
 
-#define STR_ILLEGAL_PAGENUM     (RC_CHRDLG_BEGIN +  1)
-#define STR_TEXTCOLL_HEADER     (RC_CHRDLG_BEGIN +  2)
-
 #define DLG_SWDROPCAPS          (RC_CHRDLG_BEGIN + 11)
 
-#define CHRDLG_ACT_END  DLG_SWDROPCAPS
-
-#if CHRDLG_ACT_END > RC_CHRDLG_END
-#error Resource-Id overflow in #file, #line
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cnttab.hrc b/sw/inc/cnttab.hrc
new file mode 100644
index 000000000000..b25e7a53dcc7
--- /dev/null
+++ b/sw/inc/cnttab.hrc
@@ -0,0 +1,44 @@
+/* -*- 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_SW_INC_CNTTAB_HRC
+#define INCLUDED_SW_INC_CNTTAB_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RES_SRCTYPES[] =
+{
+    /* ids from tox.hxx
+    SwTOOElements::Math        = 0x01,
+    SwTOOElements::Chart       = 0x02,
+    TOO_IMAGE       = 0x04,
+    SwTOOElements::Calc        = 0x08,
+    SwTOOElements::DrawImpress= 0x10,
+    SwTOOElements::Other       = 0x80
+    */
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Math") ,  1},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Chart") , 2},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Calc") ,  8},
+    { NC_("RES_SRCTYPES", "%PRODUCTNAME Draw/%PRODUCTNAME Impress") ,    16},
+    { NC_("RES_SRCTYPES", "Other OLE Objects"),   128},
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index c858f5cdfc20..9459388d0e02 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -21,56 +21,6 @@
 
 #include "rcid.hrc"
 
-// Strings
-
-#define STR_COMCORE_READERROR               (RC_COMCORE_BEGIN + 0)
-#define STR_TABLE_DEFNAME                   (RC_COMCORE_BEGIN + 2)
-#define STR_GRAPHIC_DEFNAME                 (RC_COMCORE_BEGIN + 3)
-#define STR_OBJECT_DEFNAME                  (RC_COMCORE_BEGIN + 4)
-#define STR_FRAME_DEFNAME                   (RC_COMCORE_BEGIN + 5)
-#define STR_REGION_DEFNAME                  (RC_COMCORE_BEGIN + 6)
-#define STR_COMCORE_CANT_SHOW               (RC_COMCORE_BEGIN + 7)
-#define STR_NUMRULE_DEFNAME                 (RC_COMCORE_BEGIN + 10)
-#define STR_EMPTYPAGE                       (RC_COMCORE_BEGIN + 11)
-#define RID_SHELLRES_AUTOFMTSTRS            (RC_COMCORE_BEGIN + 12)
-#define STR_MULT_INTERACT_HYPH_WARN         (RC_COMCORE_BEGIN + 13)
-#define STR_HYPH_TITLE                      (RC_COMCORE_BEGIN + 16)
-#define STR_SHAPE_DEFNAME                   (RC_COMCORE_BEGIN + 17)
-
-#define STR_UNDO_REDLINE_INSERT             (RC_COMCORE_BEGIN + 19)
-#define STR_UNDO_REDLINE_DELETE             (RC_COMCORE_BEGIN + 20)
-#define STR_UNDO_REDLINE_FORMAT             (RC_COMCORE_BEGIN + 21)
-#define STR_UNDO_REDLINE_TABLE              (RC_COMCORE_BEGIN + 22)
-#define STR_UNDO_REDLINE_FMTCOLL            (RC_COMCORE_BEGIN + 23)
-#define STR_UNDO_REDLINE_PARAGRAPH_FORMAT   (RC_COMCORE_BEGIN + 24)
-#define STR_UNDO_REDLINE_TABLE_ROW_INSERT   (RC_COMCORE_BEGIN + 25)
-#define STR_UNDO_REDLINE_TABLE_ROW_DELETE   (RC_COMCORE_BEGIN + 26)
-#define STR_UNDO_REDLINE_TABLE_CELL_INSERT  (RC_COMCORE_BEGIN + 27)
-#define STR_UNDO_REDLINE_TABLE_CELL_DELETE  (RC_COMCORE_BEGIN + 28)
-#define STR_START_QUOTE                     (RC_COMCORE_BEGIN + 29)
-#define STR_END_QUOTE                       (RC_COMCORE_BEGIN + 30)
-#define STR_LDOTS                           (RC_COMCORE_BEGIN + 31)
-#define STR_YIELDS                          (RC_COMCORE_BEGIN + 32)
-#define STR_PARAGRAPHS                      (RC_COMCORE_BEGIN + 33)
-#define STR_MULTISEL                        (RC_COMCORE_BEGIN + 34)
-#define STR_N_REDLINES                      (RC_COMCORE_BEGIN + 35)
-#define STR_FIELD                           (RC_COMCORE_BEGIN + 36)
-
-#define STR_FRAME                           (RC_COMCORE_BEGIN + 37)
-#define STR_OLE                             (RC_COMCORE_BEGIN + 38)
-#define STR_MATH_FORMULA                    (RC_COMCORE_BEGIN + 39)
-#define STR_CHART                           (RC_COMCORE_BEGIN + 40)
-#define STR_NOTE                            (RC_COMCORE_BEGIN + 41)
-#define STR_REFERENCE                       (RC_COMCORE_BEGIN + 42)
-#define STR_SCRIPT                          (RC_COMCORE_BEGIN + 43)
-#define STR_AUTHORITY_ENTRY                 (RC_COMCORE_BEGIN + 44)
-#define STR_SPECIALCHAR                     (RC_COMCORE_BEGIN + 45)
-#define STR_FOOTNOTE                        (RC_COMCORE_BEGIN + 46)
-#define STR_GRAPHIC                         (RC_COMCORE_BEGIN + 47)
-#define STR_DRAWING_OBJECTS                 (RC_COMCORE_BEGIN + 48)
-#define STR_TABLE_NAME                      (RC_COMCORE_BEGIN + 49)
-#define STR_PARAGRAPH_UNDO                  (RC_COMCORE_BEGIN + 50)
-
 // defines for the Autoformat Redline Comments
 #define STR_AUTOFMTREDL_DEL_EMPTY_PARA          0
 #define STR_AUTOFMTREDL_USE_REPLACE             1
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index de79b0aba00c..d602c4f2d548 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -22,61 +22,7 @@
 
 #include "rcid.hrc"
 
-// Strings ------------------------------------------------------------------
-
-#define SA_ADDRESS_HEADER       (RC_DBUI_BEGIN + 1)
-#define STR_NOTASSIGNED         (RC_DBUI_BEGIN + 2)
-#define STR_FILTER_ALL          (RC_DBUI_BEGIN + 3)
-#define STR_FILTER_SXB          (RC_DBUI_BEGIN + 4)
-#define STR_FILTER_SXC          (RC_DBUI_BEGIN + 5)
-#define STR_FILTER_DBF          (RC_DBUI_BEGIN + 6)
-#define STR_FILTER_XLS          (RC_DBUI_BEGIN + 7)
-#define STR_FILTER_TXT          (RC_DBUI_BEGIN + 8)
-#define STR_FILTER_CSV          (RC_DBUI_BEGIN + 9)
-#define STR_FILTER_ALL_DATA     (RC_DBUI_BEGIN + 10)
-#define STR_FILTER_MDB          (RC_DBUI_BEGIN + 11)
-#define STR_FILTER_ACCDB        (RC_DBUI_BEGIN + 12)
-#define ST_SALUTATION           (RC_DBUI_BEGIN + 13)
-#define ST_PUNCTUATION          (RC_DBUI_BEGIN + 14)
-#define ST_TEXT                 (RC_DBUI_BEGIN + 15)
-#define RA_SALUTATION           (RC_DBUI_BEGIN + 16)
-#define STR_FILTER_SXW          (RC_DBUI_BEGIN + 17)
-#define RA_PUNCTUATION          (RC_DBUI_BEGIN + 18)
-#define ST_TITLE_MALE           (RC_DBUI_BEGIN + 19)
-#define ST_TITLE_FEMALE         (RC_DBUI_BEGIN + 20)
-#define ST_SALUTATIONELEMENTS   (RC_DBUI_BEGIN + 21)
-#define ST_INSERTSALUTATIONFIELD (RC_DBUI_BEGIN + 22)
-#define ST_REMOVESALUTATIONFIELD (RC_DBUI_BEGIN + 23)
-#define ST_DRAGSALUTATION       (RC_DBUI_BEGIN + 24)
-#define ST_TITLE_EDIT           (RC_DBUI_BEGIN + 25)
-#define STR_FILTER_DOC          (RC_DBUI_BEGIN + 26)
-#define ST_CONFIGUREMAIL        (RC_DBUI_BEGIN + 32)
-#define ST_FILTERNAME           (RC_DBUI_BEGIN + 33)
-#define ST_TYPE                 (RC_DBUI_BEGIN + 34)
-#define ST_NAME                 (RC_DBUI_BEGIN + 35)
-#define ST_TABLE                (RC_DBUI_BEGIN + 36)
-#define ST_QUERY                (RC_DBUI_BEGIN + 37)
-#define ST_SALUTATIONPREVIEW    (RC_DBUI_BEGIN + 38)
-#define ST_SALUTATIONMATCHING   (RC_DBUI_BEGIN + 39)
-#define ST_SALUTATIONELEMENT    (RC_DBUI_BEGIN + 40)
-#define ST_ADDRESSELEMENT       (RC_DBUI_BEGIN + 41)
-#define ST_MATCHESTO            (RC_DBUI_BEGIN + 42)
-#define ST_PREVIEW              (RC_DBUI_BEGIN + 43)
-#define ST_CONTINUE             (RC_DBUI_BEGIN + 44)
-#define ST_TASK                 (RC_DBUI_BEGIN + 45)
-#define ST_STATUS               (RC_DBUI_BEGIN + 46)
-#define ST_SENDINGTO            (RC_DBUI_BEGIN + 48)
-#define ST_COMPLETED            (RC_DBUI_BEGIN + 49)
-#define ST_FAILED               (RC_DBUI_BEGIN + 50)
-#define ST_STARTING             (RC_DBUI_BEGIN + 52)
-#define ST_DOCUMENTTYPE         (RC_DBUI_BEGIN + 53)
-#define ST_ADDRESSBLOCK         (RC_DBUI_BEGIN + 54)
-#define ST_GREETINGSLINE        (RC_DBUI_BEGIN + 55)
-#define ST_LAYOUT               (RC_DBUI_BEGIN + 56)
-#define ST_FINISH               (RC_DBUI_BEGIN + 57)
-#define ST_ADDRESSLIST          (RC_DBUI_BEGIN + 58)
-#define ST_EXCLUDE              (RC_DBUI_BEGIN + 59)
-#define ST_MMWTITLE             (RC_DBUI_BEGIN + 63)
+#define NC_(Context, String) (Context "\004" u8##String)
 
 // Elements -----------------------------------------------------------------
 #define MM_PART_TITLE                   0
@@ -94,6 +40,24 @@
 #define MM_PART_E_MAIL                  12
 #define MM_PART_GENDER                  13
 
+const std::pair<const char*, int> SA_ADDRESS_HEADER[] =
+{
+    { NC_("SA_ADDRESS_HEADER", "Title") ,                 MM_PART_TITLE           },
+    { NC_("SA_ADDRESS_HEADER", "First Name") ,            MM_PART_FIRSTNAME       },
+    { NC_("SA_ADDRESS_HEADER", "Last Name") ,             MM_PART_LASTNAME        },
+    { NC_("SA_ADDRESS_HEADER", "Company Name") ,          MM_PART_COMPANY         },
+    { NC_("SA_ADDRESS_HEADER", "Address Line 1") ,        MM_PART_ADDRESS_1       },
+    { NC_("SA_ADDRESS_HEADER", "Address Line 2") ,        MM_PART_ADDRESS_2       },
+    { NC_("SA_ADDRESS_HEADER", "City") ,                  MM_PART_CITY            },
+    { NC_("SA_ADDRESS_HEADER", "State") ,                 MM_PART_REGION          },
+    { NC_("SA_ADDRESS_HEADER", "ZIP") ,                   MM_PART_ZIP             },
+    { NC_("SA_ADDRESS_HEADER", "Country") ,               MM_PART_COUNTRY         },
+    { NC_("SA_ADDRESS_HEADER", "Telephone private") ,     MM_PART_PHONE_PRIVATE   },
+    { NC_("SA_ADDRESS_HEADER", "Telephone business") ,    MM_PART_PHONE_BUSINESS  },
+    { NC_("SA_ADDRESS_HEADER", "E-mail Address") ,        MM_PART_E_MAIL          },
+    { NC_("SA_ADDRESS_HEADER", "Gender"),                 MM_PART_GENDER          }
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 8da271a33bc3..eec75b2886de 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -22,33 +22,9 @@
 
 #include "rcid.hrc"
 
-// Dialogs
-
-#define STR_QUERY_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
-#define STR_SPELLING_COMPLETED  (RC_DIALOG_BEGIN + 12)
-
-// Strings
-
-#define STR_CLOSELINKMSG        (RC_DIALOG_BEGIN +  3)
-
-// Bereiche
-
-#define RC_REGIONSW_BEGIN       (RC_DIALOG_BEGIN + 60)
-//      RC_REGIONSW_END         (RC_DIALOG_BEGIN + 79)
-
-#define RC_MACASSGN_END         (RC_DIALOG_BEGIN + 89)
-//      RC_MACASSGN_END         (RC_DIALOG_BEGIN + 89)
-
 #define RC_DLG_ADDR             (RC_DIALOG_BEGIN + 90)
 #define RC_SWDLG_BACKGROUND     (RC_DIALOG_BEGIN + 91)
 #define RC_DLG_SWNUMFMTDLG      (RC_DIALOG_BEGIN + 92)
-// Ueberlaufpruefung
-
-#define DIALOG_ACT_END  RC_MACASSGN_END
-
-#if DIALOG_ACT_END > RC_DIALOG_END
-#error Resource-Ueberlauf in #file, #line
-#endif
 
 #endif
 
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
deleted file mode 100644
index 6b03f5e6c7f1..000000000000
--- a/sw/inc/dochdl.hrc
+++ /dev/null
@@ -1,45 +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_SW_INC_DOCHDL_HRC
-#define INCLUDED_SW_INC_DOCHDL_HRC
-
-#include "rcid.hrc"
-
-#define STR_NOGLOS                  (RC_DOCHDL_BEGIN + 1)
-
-#define STR_ERR_INSERT_GLOS         (RC_DOCHDL_BEGIN + 3)
-#define STR_CLPBRD_FORMAT_ERROR     (RC_DOCHDL_BEGIN + 4)
-
-#define STR_TABLE_TOO_LARGE         (RC_DOCHDL_BEGIN + 6)
-#define STR_NO_TABLE                (RC_DOCHDL_BEGIN + 7)
-#define STR_PRIVATETEXT             (RC_DOCHDL_BEGIN + 8)
-#define STR_PRIVATEGRAPHIC          (RC_DOCHDL_BEGIN + 9)
-#define STR_PRIVATEOLE              (RC_DOCHDL_BEGIN + 10)
-#define STR_DDEFORMAT               (RC_DOCHDL_BEGIN + 11)
-
-#define DOCHDL_ACT_END              STR_DDEFORMAT
-
-#if DOCHDL_ACT_END > RC_DOCHDL_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
deleted file mode 100644
index 5f483d1d8866..000000000000
--- a/sw/inc/envelp.hrc
+++ /dev/null
@@ -1,55 +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_SW_INC_ENVELP_HRC
-#define INCLUDED_SW_INC_ENVELP_HRC
-
-#include "rcid.hrc"
-
-// Bereiche -------------------------------------------------------------------
-
-#define RC_ENVLOP_BEGIN  (RC_ENVELP_BEGIN     )
-//      RC_ENVLOP_END    (RC_ENVELP_BEGIN +  9)
-
-//      RC_ENVFMT_BEGIN  (RC_ENVELP_BEGIN + 10)
-//      RC_ENVFMT_END    (RC_ENVELP_BEGIN + 19)
-
-#define RC_ENVPRT_BEGIN  (RC_ENVELP_BEGIN + 20)
-//      RC_ENVPRT_END    (RC_ENVELP_BEGIN + 39)
-
-#define RC_LABEL_BEGIN   (RC_ENVELP_BEGIN + 40)
-#define RC_LABEL_END     (RC_ENVELP_BEGIN + 49)
-
-#define RC_LABFMT_BEGIN  (RC_ENVELP_BEGIN + 50)
-#define RC_LABFMT_END    (RC_ENVELP_BEGIN + 62)
-
-// Strings --------------------------------------------------------------------
-
-#define STR_SENDER_TOKENS        (RC_ENVLOP_BEGIN + 69)
-// Ueberlaufpruefung ----------------------------------------------------------
-
-#define ENVELP_ACT_END  STR_SENDER_TOKENS
-
-#if ENVELP_ACT_END > STR_SENDER_TOKENS
-#error Resource-Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
new file mode 100644
index 000000000000..c89b11abd505
--- /dev/null
+++ b/sw/inc/error.hrc
@@ -0,0 +1,74 @@
+/* -*- 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_SW_INC_ERROR_HRC
+#define INCLUDED_SW_INC_ERROR_HRC
+
+#include "swerror.h"
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define ERR_CODE( class, err )  ErrCode(class | (sal_uInt32(err) - ERRCODE_AREA_SW))
+#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - WARN_SW_BASE))
+
+const ErrMsgCode RID_SW_ERRHDL[] =
+{
+    // Import-Errors
+    { NC_("RID_SW_ERRHDL", "File format error found.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Error reading file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Input file error.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) },
+    { NC_("RID_SW_ERRHDL", "This is not a %PRODUCTNAME Writer file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) },
+    { NC_("RID_SW_ERRHDL", "Unexpected end of file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) },
+    { NC_("RID_SW_ERRHDL", "Password-protected files cannot be opened.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) },
+    { NC_("RID_SW_ERRHDL", "This is not a valid WinWord6 file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) },
+    { NC_("RID_SW_ERRHDL", "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) },
+    { NC_("RID_SW_ERRHDL", "File format error found at $(ARG1)(row,col).") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) },
+    { NC_("RID_SW_ERRHDL", "File has been written in a newer version.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) },
+    { NC_("RID_SW_ERRHDL", "This is not a valid WinWord97 file."), ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) },
+    { NC_("RID_SW_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) },
+    // Export-Errors
+    { NC_("RID_SW_ERRHDL", "Error writing file.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Wrong AutoText document version.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) },
+    { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) },
+    // Import-/Export-Errors
+    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "$(ARG1) has changed.") , ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "$(ARG1) does not exist.") , ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Cells cannot be further split.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Additional columns cannot be inserted.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "The structure of a linked table cannot be modified.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) },
+
+    { NC_("RID_SW_ERRHDL", "No drawings could be read.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) },
+    { NC_("RID_SW_ERRHDL", "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) },
+    { NC_("RID_SW_ERRHDL", "Not all attributes could be read.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) },
+    { NC_("RID_SW_ERRHDL", "Not all attributes could be recorded.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) },
+    { NC_("RID_SW_ERRHDL", "Some OLE objects could only be loaded as images.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE ) },
+    { NC_("RID_SW_ERRHDL", "Some OLE objects could only be saved as images.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE ) },
+    { NC_("RID_SW_ERRHDL", "Document could not be completely loaded.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD ) },
+    { NC_("RID_SW_ERRHDL", "Document could not be completely saved.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD ) },
+    { NC_("RID_SW_ERRHDL", "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."), WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS) },
+    { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_WRITE_ERROR_FILE ) },
+    { NC_("RID_SW_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index b193ac886ff4..6489fafd4fe0 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -26,50 +26,6 @@
  --------------------------------------------------------------------*/
 
 #define STR_TYPE_BEGIN      RC_FLDDLG_BEGIN
-#define STR_DATEFLD         STR_TYPE_BEGIN
-#define STR_TIMEFLD         (STR_TYPE_BEGIN + 1)
-#define STR_FILENAMEFLD     (STR_TYPE_BEGIN + 2)
-#define STR_DBNAMEFLD       (STR_TYPE_BEGIN + 3)
-#define STR_CHAPTERFLD      (STR_TYPE_BEGIN + 4)
-#define STR_PAGENUMBERFLD   (STR_TYPE_BEGIN + 5)
-#define STR_DOCSTATFLD      (STR_TYPE_BEGIN + 6)
-#define STR_AUTHORFLD       (STR_TYPE_BEGIN + 7)
-#define STR_SETFLD          (STR_TYPE_BEGIN + 8)
-#define STR_GETFLD          (STR_TYPE_BEGIN + 9)
-#define STR_FORMELFLD       (STR_TYPE_BEGIN + 10)
-#define STR_HIDDENTXTFLD    (STR_TYPE_BEGIN + 11)
-#define STR_SETREFFLD       (STR_TYPE_BEGIN + 12)
-#define STR_GETREFFLD       (STR_TYPE_BEGIN + 13)
-#define STR_DDEFLD          (STR_TYPE_BEGIN + 14)
-#define STR_MACROFLD        (STR_TYPE_BEGIN + 15)
-#define STR_INPUTFLD        (STR_TYPE_BEGIN + 16)
-#define STR_HIDDENPARAFLD   (STR_TYPE_BEGIN + 17)
-#define STR_DOCINFOFLD      (STR_TYPE_BEGIN + 18)
-#define STR_DBFLD           (STR_TYPE_BEGIN + 19)
-#define STR_USERFLD         (STR_TYPE_BEGIN + 20)
-#define STR_POSTITFLD       (STR_TYPE_BEGIN + 21)
-#define STR_TEMPLNAMEFLD    (STR_TYPE_BEGIN + 22)
-#define STR_SEQFLD          (STR_TYPE_BEGIN + 23)
-#define STR_DBNEXTSETFLD    (STR_TYPE_BEGIN + 24)
-#define STR_DBNUMSETFLD     (STR_TYPE_BEGIN + 25)
-#define STR_DBSETNUMBERFLD  (STR_TYPE_BEGIN + 26)
-#define STR_CONDTXTFLD      (STR_TYPE_BEGIN + 27)
-#define STR_NEXTPAGEFLD     (STR_TYPE_BEGIN + 28)
-#define STR_PREVPAGEFLD     (STR_TYPE_BEGIN + 29)
-#define STR_EXTUSERFLD      (STR_TYPE_BEGIN + 30)
-
-#define STR_SETINPUTFLD     (STR_TYPE_BEGIN + 33)
-#define STR_USRINPUTFLD     (STR_TYPE_BEGIN + 34)
-#define STR_SETREFPAGEFLD   (STR_TYPE_BEGIN + 35)
-#define STR_GETREFPAGEFLD   (STR_TYPE_BEGIN + 36)
-#define STR_INTERNETFLD     (STR_TYPE_BEGIN + 37)
-#define STR_JUMPEDITFLD     (STR_TYPE_BEGIN + 38)
-#define STR_SCRIPTFLD       (STR_TYPE_BEGIN + 39)
-#define STR_AUTHORITY       (STR_TYPE_BEGIN + 40)
-#define STR_COMBINED_CHARS  (STR_TYPE_BEGIN + 41)
-#define STR_DROPDOWN        (STR_TYPE_BEGIN + 42)
-
-#define STR_CUSTOM          (STR_TYPE_BEGIN + 43)
 #define STR_TYPE_END        (STR_TYPE_BEGIN + 44)
 
 /*--------------------------------------------------------------------
@@ -77,50 +33,21 @@
  --------------------------------------------------------------------*/
 
 #define FLD_DATE_BEGIN      STR_TYPE_END
-#define FLD_DATE_FIX        FLD_DATE_BEGIN
-#define FLD_DATE_STD        (FLD_DATE_BEGIN + 1)
 #define FLD_DATE_END        (FLD_DATE_BEGIN + 2)
 
 #define FLD_TIME_BEGIN      FLD_DATE_END
-#define FLD_TIME_FIX        FLD_TIME_BEGIN
-#define FLD_TIME_STD        (FLD_TIME_BEGIN + 1)
 #define FLD_TIME_END        (FLD_TIME_BEGIN + 2)
 
 #define FLD_STAT_BEGIN      FLD_TIME_END
-#define FLD_STAT_PAGE       FLD_STAT_BEGIN
-#define FLD_STAT_PARA       (FLD_STAT_BEGIN + 1)
-#define FLD_STAT_WORD       (FLD_STAT_BEGIN + 2)
-#define FLD_STAT_CHAR       (FLD_STAT_BEGIN + 3)
-#define FLD_STAT_TABLE      (FLD_STAT_BEGIN + 4)
-#define FLD_STAT_GRF        (FLD_STAT_BEGIN + 5)
-#define FLD_STAT_OBJ        (FLD_STAT_BEGIN + 6)
 #define FLD_STAT_END        (FLD_STAT_BEGIN + 7)
 
 #define FLD_INPUT_BEGIN     FLD_STAT_END
-#define FLD_INPUT_TEXT      FLD_INPUT_BEGIN
 #define FLD_INPUT_END       (FLD_INPUT_BEGIN + 1)
 
 #define FLD_EU_BEGIN        FLD_INPUT_END
-#define FLD_EU_FIRMA        FLD_EU_BEGIN
-#define FLD_EU_VORNAME      (FLD_EU_BEGIN    + 1)
-#define FLD_EU_NAME         (FLD_EU_BEGIN    + 2)
-#define FLD_EU_ABK          (FLD_EU_BEGIN    + 3)
-#define FLD_EU_STRASSE      (FLD_EU_BEGIN    + 4)
-#define FLD_EU_LAND         (FLD_EU_BEGIN    + 5)
-#define FLD_EU_PLZ          (FLD_EU_BEGIN    + 6)
-#define FLD_EU_ORT          (FLD_EU_BEGIN    + 7)
-#define FLD_EU_TITEL        (FLD_EU_BEGIN    + 8)
-#define FLD_EU_POS          (FLD_EU_BEGIN    + 9)
-#define FLD_EU_TELPRIV      (FLD_EU_BEGIN    + 10)
-#define FLD_EU_TELFIRMA     (FLD_EU_BEGIN    + 11)
-#define FLD_EU_FAX          (FLD_EU_BEGIN    + 12)
-#define FLD_EU_EMAIL        (FLD_EU_BEGIN    + 13)
-#define FLD_EU_STATE        (FLD_EU_BEGIN    + 14)
 #define FLD_EU_END          (FLD_EU_BEGIN    + 15)
 
 #define FLD_PAGEREF_BEGIN   FLD_EU_END
-#define FLD_PAGEREF_OFF     FLD_PAGEREF_BEGIN
-#define FLD_PAGEREF_ON      (FLD_PAGEREF_BEGIN+1)
 #define FLD_PAGEREF_END     (FLD_PAGEREF_BEGIN+2)
 
 /*----------------------------------------------------------
@@ -129,125 +56,52 @@
 
 // Numbers
 #define FMT_NUM_BEGIN       (FLD_PAGEREF_END + 1)
-#define FMT_NUM_ABC         FMT_NUM_BEGIN
-#define FMT_NUM_SABC        (FMT_NUM_BEGIN  + 1)
-#define FMT_NUM_ABC_N       (FMT_NUM_BEGIN  + 2)
-#define FMT_NUM_SABC_N      (FMT_NUM_BEGIN  + 3)
-#define FMT_NUM_ROMAN       (FMT_NUM_BEGIN  + 4)
-#define FMT_NUM_SROMAN      (FMT_NUM_BEGIN  + 5)
-#define FMT_NUM_ARABIC      (FMT_NUM_BEGIN  + 6)
-#define FMT_NUM_PAGEDESC    (FMT_NUM_BEGIN  + 7)
-#define FMT_NUM_PAGESPECIAL (FMT_NUM_BEGIN  + 8)
 #define FMT_NUM_END         (FMT_NUM_BEGIN  + 9)
 
 // AuthorFormat
 #define FMT_AUTHOR_BEGIN    FMT_NUM_END
-#define FMT_AUTHOR_NAME     FMT_AUTHOR_BEGIN
-#define FMT_AUTHOR_SCUT     (FMT_AUTHOR_BEGIN + 1)
 #define FMT_AUTHOR_END      (FMT_AUTHOR_BEGIN + 2)
 
 // Set variable
 #define FMT_SETVAR_BEGIN    FMT_AUTHOR_END
-#define FMT_SETVAR_SYS      (FMT_SETVAR_BEGIN + 0)
-#define FMT_SETVAR_TEXT     (FMT_SETVAR_BEGIN + 1)
 #define FMT_SETVAR_END      (FMT_SETVAR_BEGIN + 2)
 
 // Get variable
 #define FMT_GETVAR_BEGIN    FMT_SETVAR_END
-#define FMT_GETVAR_TEXT     (FMT_GETVAR_BEGIN + 0)
-#define FMT_GETVAR_NAME     (FMT_GETVAR_BEGIN + 1)
 #define FMT_GETVAR_END      (FMT_GETVAR_BEGIN + 2)
 
 // Userfield
 #define FMT_USERVAR_BEGIN   FMT_GETVAR_END
-#define FMT_USERVAR_TEXT    (FMT_USERVAR_BEGIN + 0)
-#define FMT_USERVAR_CMD     (FMT_USERVAR_BEGIN + 1)
 #define FMT_USERVAR_END     (FMT_USERVAR_BEGIN + 2)
 
 // Database field
 #define FMT_DBFLD_BEGIN     FMT_USERVAR_END
-#define FMT_DBFLD_DB        (FMT_DBFLD_BEGIN + 0)
-#define FMT_DBFLD_SYS       (FMT_DBFLD_BEGIN + 1)
 #define FMT_DBFLD_END       (FMT_DBFLD_BEGIN + 2)
 
 //FileNameFormat
 // Attention, the last 4 formats do not exist in RTF (loss!)
 #define FMT_FF_BEGIN        FMT_DBFLD_END
-#define FMT_FF_NAME         FMT_FF_BEGIN
-#define FMT_FF_PATHNAME     (FMT_FF_BEGIN   + 1)
-#define FMT_FF_PATH         (FMT_FF_BEGIN   + 2)
-#define FMT_FF_NAME_NOEXT   (FMT_FF_BEGIN   + 3)
-#define FMT_FF_UI_NAME      (FMT_FF_BEGIN   + 4)
-#define FMT_FF_UI_RANGE     (FMT_FF_BEGIN   + 5)
 #define FMT_FF_END          (FMT_FF_BEGIN   + 6)
 
 // Registry-Format
 #define FMT_REG_BEGIN       FMT_FF_END
-#define FMT_REG_AUTHOR      FMT_REG_BEGIN
-#define FMT_REG_TIME        (FMT_REG_BEGIN  + 1)
-#define FMT_REG_DATE        (FMT_REG_BEGIN  + 2)
 #define FMT_REG_END         (FMT_REG_BEGIN  + 3)
 
 // Chapter
 #define FMT_CHAPTER_BEGIN   FMT_REG_END
-#define FMT_CHAPTER_NO      FMT_CHAPTER_BEGIN
-#define FMT_CHAPTER_NAME    (FMT_CHAPTER_BEGIN  + 1)
-#define FMT_CHAPTER_NAMENO  (FMT_CHAPTER_BEGIN  + 2)
-#define FMT_CHAPTER_NO_NOSEPARATOR  (FMT_CHAPTER_BEGIN  + 3)
 #define FMT_CHAPTER_END     (FMT_CHAPTER_BEGIN  + 4)
 
 // DDE-Formats
 #define FMT_DDE_BEGIN       FMT_CHAPTER_END
-#define FMT_DDE_NORMAL      FMT_DDE_BEGIN
-#define FMT_DDE_HOT         (FMT_DDE_BEGIN  + 1)
 #define FMT_DDE_END         (FMT_DDE_BEGIN  + 2)
 
 #define FMT_REF_BEGIN       FMT_DDE_END
-#define FMT_REF_PAGE        FMT_REF_BEGIN
-#define FMT_REF_CHAPTER     (FMT_REF_BEGIN  + 1)
-#define FMT_REF_TEXT        (FMT_REF_BEGIN  + 2)
-#define FMT_REF_UPDOWN      (FMT_REF_BEGIN  + 3)
-#define FMT_REF_PAGE_PGDSC  (FMT_REF_BEGIN  + 4)
-#define FMT_REF_ONLYNUMBER  (FMT_REF_BEGIN  + 5)
-#define FMT_REF_ONLYCAPTION     (FMT_REF_BEGIN  + 6)
-#define FMT_REF_ONLYSEQNO       (FMT_REF_BEGIN  + 7)
-#define FMT_REF_NUMBER          (FMT_REF_BEGIN  + 8)
-#define FMT_REF_NUMBER_NO_CONTEXT (FMT_REF_BEGIN  + 9)
-#define FMT_REF_NUMBER_FULL_CONTEXT (FMT_REF_BEGIN  + 10)
 #define FMT_REF_END             (FMT_REF_BEGIN  + 11)
 
 // Placeholder
 #define FMT_MARK_BEGIN      FMT_REF_END
-#define FMT_MARK_TEXT       FMT_MARK_BEGIN
-#define FMT_MARK_TABLE      (FMT_MARK_BEGIN + 1)
-#define FMT_MARK_FRAME      (FMT_MARK_BEGIN + 2)
-#define FMT_MARK_GRAFIC     (FMT_MARK_BEGIN + 3)
-#define FMT_MARK_OLE        (FMT_MARK_BEGIN + 4)
 #define FMT_MARK_END        (FMT_MARK_BEGIN + 5)
 
-/*--------------------------------------------------------------------
-   Global String-Resources
- --------------------------------------------------------------------*/
-
-#define STR_FLDUI               FMT_MARK_END
-#define STR_EXTRA               (STR_FLDUI + 2)
-
-/*--------------------------------------------------------------------
-    Additional Strings
- --------------------------------------------------------------------*/
-
-#define STR_COND                STR_EXTRA
-#define STR_TEXT                (STR_EXTRA  + 1)
-#define STR_DDE_CMD             (STR_EXTRA  + 2)
-#define STR_INSTEXT             (STR_EXTRA  + 3)
-#define STR_COMBCHRS_FT         (STR_EXTRA  + 4)
-#define STR_PROMPT              (STR_EXTRA  + 5)
-#define STR_MACNAME             (STR_EXTRA  + 6)
-#define STR_OFFSET              (STR_EXTRA  + 8)
-#define STR_VALUE               (STR_EXTRA  + 9)
-
-#define STR_FORMULA             (STR_EXTRA  + 12)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e8cd8d3f9653..7eafcd6a042c 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -22,145 +22,6 @@
 
 #include "rcid.hrc"
 
-// STRINGS -----------------------------------------------------------
-
-#define STR_DLLNOTFOUND             (RC_GLOBALS_BEGIN + 0)
-#define STR_LOAD_GLOBAL_DOC         (RC_GLOBALS_BEGIN + 2)
-
-#define STR_DOC_STAT                (RC_GLOBALS_BEGIN + 10)
-
-#define STR_PAGE                    (RC_GLOBALS_BEGIN + 14)
-#define STR_PAGE_COUNT              (RC_GLOBALS_BEGIN + 15)
-#define STR_PAGE_COUNT_CUSTOM       (RC_GLOBALS_BEGIN + 16)
-
-#define ST_SCRIPT_WESTERN           (RC_GLOBALS_BEGIN + 105)
-#define ST_SCRIPT_ASIAN             (RC_GLOBALS_BEGIN + 106)
-#define ST_SCRIPT_CTL               (RC_GLOBALS_BEGIN + 107)
-
-
-#define STR_PRINTOPTUI_PRODUCTNAME          (RC_GLOBALS_BEGIN + 120)
-#define STR_PRINTOPTUI_CONTENTS             (RC_GLOBALS_BEGIN + 121)
-#define STR_PRINTOPTUI_PAGE_BACKGROUND      (RC_GLOBALS_BEGIN + 122)
-#define STR_PRINTOPTUI_PICTURES             (RC_GLOBALS_BEGIN + 123)
-#define STR_PRINTOPTUI_HIDDEN               (RC_GLOBALS_BEGIN + 124)
-#define STR_PRINTOPTUI_TEXT_PLACEHOLDERS    (RC_GLOBALS_BEGIN + 125)
-#define STR_PRINTOPTUI_FORM_CONTROLS        (RC_GLOBALS_BEGIN + 126)
-#define STR_PRINTOPTUI_COLOR                (RC_GLOBALS_BEGIN + 127)
-#define STR_PRINTOPTUI_PRINT_BLACK          (RC_GLOBALS_BEGIN + 128)
-#define STR_PRINTOPTUI_PAGES_TEXT           (RC_GLOBALS_BEGIN + 129)
-#define STR_PRINTOPTUI_PRINT_BLANK          (RC_GLOBALS_BEGIN + 130)
-#define STR_PRINTOPTUI_ONLY_PAPER           (RC_GLOBALS_BEGIN + 131)
-#define STR_PRINTOPTUI_PRINT                (RC_GLOBALS_BEGIN + 132)
-#define STR_PRINTOPTUI_NONE                 (RC_GLOBALS_BEGIN + 133)
-#define STR_PRINTOPTUI_COMMENTS_ONLY        (RC_GLOBALS_BEGIN + 134)
-#define STR_PRINTOPTUI_PLACE_END            (RC_GLOBALS_BEGIN + 135)
-#define STR_PRINTOPTUI_PLACE_PAGE           (RC_GLOBALS_BEGIN + 136)
-#define STR_PRINTOPTUI_COMMENTS             (RC_GLOBALS_BEGIN + 137)
-#define STR_PRINTOPTUI_PAGE_SIDES           (RC_GLOBALS_BEGIN + 138)
-#define STR_PRINTOPTUI_ALL_PAGES            (RC_GLOBALS_BEGIN + 139)
-#define STR_PRINTOPTUI_BACK_PAGES           (RC_GLOBALS_BEGIN + 140)
-#define STR_PRINTOPTUI_FONT_PAGES           (RC_GLOBALS_BEGIN + 141)
-#define STR_PRINTOPTUI_INCLUDE              (RC_GLOBALS_BEGIN + 142)
-#define STR_PRINTOPTUI_BROCHURE             (RC_GLOBALS_BEGIN + 143)
-#define STR_PRINTOPTUI_LEFT_SCRIPT          (RC_GLOBALS_BEGIN + 144)
-#define STR_PRINTOPTUI_RIGHT_SCRIPT         (RC_GLOBALS_BEGIN + 145)
-#define STR_PRINTOPTUI_RANGE_COPIES         (RC_GLOBALS_BEGIN + 146)
-#define STR_PRINTOPTUI_ALLPAGES             (RC_GLOBALS_BEGIN + 147)
-#define STR_PRINTOPTUI_SOMEPAGES            (RC_GLOBALS_BEGIN + 148)
-#define STR_PRINTOPTUI_SELECTION            (RC_GLOBALS_BEGIN + 149)
-#define STR_PRINTOPTUI_PLACE_MARGINS        (RC_GLOBALS_BEGIN + 150)
-
-
-//EventStrings
-
-#define STR_EVENT_OBJECT_SELECT      ( RC_GLOBALS_BEGIN + 18 )
-#define STR_EVENT_START_INS_GLOSSARY ( RC_GLOBALS_BEGIN + 19 )
-#define STR_EVENT_END_INS_GLOSSARY   ( RC_GLOBALS_BEGIN + 20 )
-#define STR_EVENT_MOUSEOVER_OBJECT   ( RC_GLOBALS_BEGIN + 21 )
-#define STR_EVENT_MOUSECLICK_OBJECT  ( RC_GLOBALS_BEGIN + 22 )
-#define STR_EVENT_MOUSEOUT_OBJECT    ( RC_GLOBALS_BEGIN + 23 )
-#define STR_EVENT_IMAGE_LOAD         ( RC_GLOBALS_BEGIN + 24 )
-#define STR_EVENT_IMAGE_ABORT        ( RC_GLOBALS_BEGIN + 25 )
-#define STR_EVENT_IMAGE_ERROR        ( RC_GLOBALS_BEGIN + 26 )
-#define STR_EVENT_FRM_KEYINPUT_A     ( RC_GLOBALS_BEGIN + 27 )
-#define STR_EVENT_FRM_KEYINPUT_NOA   ( RC_GLOBALS_BEGIN + 28 )
-#define STR_EVENT_FRM_RESIZE         ( RC_GLOBALS_BEGIN + 29 )
-#define STR_EVENT_FRM_MOVE           ( RC_GLOBALS_BEGIN + 30 )
-
-// Strings for frame alignment in Popup
-#define STR_TOP_BASE                (RC_GLOBALS_BEGIN + 31)
-#define STR_BOTTOM_BASE             (RC_GLOBALS_BEGIN + 32)
-#define STR_CENTER_BASE             (RC_GLOBALS_BEGIN + 33)
-
-// free
-#define STR_BOOKMARK_DEF_NAME       (RC_GLOBALS_BEGIN + 35)
-#define STR_BOOKMARK_NAME           (RC_GLOBALS_BEGIN + 36)
-#define STR_BOOKMARK_TEXT           (RC_GLOBALS_BEGIN + 37)
-
-#define STR_LOAD_HTML_DOC           (RC_GLOBALS_BEGIN + 38)
-
-#define STR_JAVA_EDIT               (RC_GLOBALS_BEGIN + 39)
-
-#define STR_REMOVE_WARNING          (RC_GLOBALS_BEGIN + 40)
-
-#define SW_STR_NONE                 (RC_GLOBALS_BEGIN + 41)
-
-#define STR_CAPTION_BEGINNING       (RC_GLOBALS_BEGIN + 42)
-#define STR_CAPTION_END             (RC_GLOBALS_BEGIN + 43)
-#define STR_CAPTION_ABOVE           (RC_GLOBALS_BEGIN + 44)
-#define STR_CAPTION_BELOW           (RC_GLOBALS_BEGIN + 45)
-
-#define SW_STR_READONLY             (RC_GLOBALS_BEGIN + 46)
-
-#define STR_READONLY_PATH           (RC_GLOBALS_BEGIN + 47)
-
-// INFOBOX ------------------------------------------------------------
-
-#define STR_ERROR_CLPBRD_READ       (RC_GLOBALS_BEGIN + 50)
-
-// Strings for the context menu of the content tree
-#define STR_CONTEXT_FIRST            (RC_GLOBALS_BEGIN + 52)
-#define STR_OUTLINE_LEVEL            (STR_CONTEXT_FIRST + 0)
-#define STR_DRAGMODE                 (STR_CONTEXT_FIRST + 1)
-#define STR_HYPERLINK                (STR_CONTEXT_FIRST + 2)
-#define STR_LINK_REGION              (STR_CONTEXT_FIRST + 3)
-#define STR_COPY_REGION              (STR_CONTEXT_FIRST + 4)
-#define STR_DISPLAY                  (STR_CONTEXT_FIRST + 5)
-#define STR_ACTIVE_VIEW              (STR_CONTEXT_FIRST + 6)
-#define STR_STATUS_FIRST             (RC_GLOBALS_BEGIN + 59)
-#define STR_HIDDEN                   (STR_STATUS_FIRST + 0)
-#define STR_ACTIVE                   (STR_STATUS_FIRST + 1)
-#define STR_INACTIVE                 (STR_STATUS_FIRST + 2)
-#define STR_MISC                     (RC_GLOBALS_BEGIN + 62)
-#define STR_EDIT_ENTRY               STR_MISC
-#define STR_DELETE_ENTRY             (STR_MISC + 1)
-
-#define STR_GLOBAL_CONTEXT_FIRST     (STR_DELETE_ENTRY + 1)
-#define STR_UPDATE                   (STR_GLOBAL_CONTEXT_FIRST    )
-#define STR_EDIT_CONTENT             (STR_GLOBAL_CONTEXT_FIRST + 1)
-#define STR_EDIT_INSERT              (STR_GLOBAL_CONTEXT_FIRST + 2)
-#define STR_INDEX                    (STR_GLOBAL_CONTEXT_FIRST + 3)
-#define STR_FILE                     (STR_GLOBAL_CONTEXT_FIRST + 4)
-#define STR_NEW_FILE                 (STR_GLOBAL_CONTEXT_FIRST + 5)
-#define STR_INSERT_TEXT              (STR_GLOBAL_CONTEXT_FIRST + 6)
-#define STR_DELETE                   (STR_GLOBAL_CONTEXT_FIRST + 7)
-#define STR_UPDATE_SEL               (STR_GLOBAL_CONTEXT_FIRST + 8)
-#define STR_UPDATE_INDEX             (STR_GLOBAL_CONTEXT_FIRST + 9)
-#define STR_UPDATE_LINK              (STR_GLOBAL_CONTEXT_FIRST +10)
-#define STR_UPDATE_ALL               (STR_GLOBAL_CONTEXT_FIRST +11)
-#define STR_BROKEN_LINK              (STR_GLOBAL_CONTEXT_FIRST +12)
-#define STR_EDIT_LINK                (STR_GLOBAL_CONTEXT_FIRST +13)
-
-#define STR_REMOVE_INDEX             (STR_GLOBAL_CONTEXT_FIRST +30)
-#define STR_REMOVE_TBL_PROTECTION    (STR_GLOBAL_CONTEXT_FIRST +31)
-#define STR_RENAME                   (STR_GLOBAL_CONTEXT_FIRST +32)
-#define STR_READONLY_IDX             (STR_GLOBAL_CONTEXT_FIRST +33)
-#define STR_INVISIBLE                (STR_GLOBAL_CONTEXT_FIRST +34)
-
-#define STR_POSTIT_SHOW              (STR_GLOBAL_CONTEXT_FIRST +35)
-#define STR_POSTIT_HIDE              (STR_GLOBAL_CONTEXT_FIRST +36)
-#define STR_POSTIT_DELETE            (STR_GLOBAL_CONTEXT_FIRST +37)
-
 // ACC ---------------------------------------------------------------
 
 #define FN_CHAR_LEFT_SEL            (RC_GLOBALS_BEGIN + 1)
@@ -197,10 +58,6 @@
 #define DLG_SVXTEST_NUM_BULLET      (RC_GLOBALS_BEGIN +  79)
 //maximum: RC_GLOBALS_BEGIN +  120
 
-#if STR_DOC_STAT > RC_GLOBALS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
 #define SID_PREVIEWFLAG_TYPE        (RC_GLOBALS_BEGIN +  114)
 #define SID_FONTMODE_TYPE           (RC_GLOBALS_BEGIN +  115)
 #define SID_FAX_LIST                (RC_GLOBALS_BEGIN +  116)
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 0b528b48adba..4d008b9c2108 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -26,53 +26,8 @@
 
 #include "rcid.hrc"
 
-#define  STR_TITLE              (RC_INDEX_BEGIN + 6)
-#define  STR_ALPHA              (RC_INDEX_BEGIN + 7)
-#define  STR_LEVEL              (RC_INDEX_BEGIN + 8)
-
 #define  DLG_EDIT_AUTHMARK      (RC_INDEX_BEGIN + 12)
 
-#define  STR_IDXMRK_INSERT      (RC_INDEX_BEGIN + 13)
-#define  STR_IDXMRK_EDIT        (RC_INDEX_BEGIN + 14)
-#define  RES_SRCTYPES           (RC_INDEX_BEGIN + 15)
-
-#define  STR_AUTOMARK_TYPE      (RC_INDEX_BEGIN + 17)
-#define  STR_FILE_NOT_FOUND     (RC_INDEX_BEGIN + 18)
-#define  STR_QUERY_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
-#define  STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
-#define  STR_NOSORTKEY          (RC_INDEX_BEGIN + 21)
-#define  STR_NO_CHAR_STYLE      (RC_INDEX_BEGIN + 22)
-#define  STR_DELIM              (RC_INDEX_BEGIN + 23)
-#define  STR_BUTTON_TEXT_START  (RC_INDEX_BEGIN + 24)
-#define  STR_TOKEN_ENTRY_NO     (STR_BUTTON_TEXT_START)
-#define  STR_TOKEN_ENTRY_TEXT   (STR_BUTTON_TEXT_START + 1)
-#define  STR_TOKEN_ENTRY        (STR_BUTTON_TEXT_START + 2)
-#define  STR_TOKEN_TAB_STOP     (STR_BUTTON_TEXT_START + 3)
-#define  STR_TOKEN_TEXT         (STR_BUTTON_TEXT_START + 4)
-#define  STR_TOKEN_PAGE_NUMS    (STR_BUTTON_TEXT_START + 5)
-#define  STR_TOKEN_CHAPTER_INFO (STR_BUTTON_TEXT_START + 6)
-#define  STR_TOKEN_LINK_START   (STR_BUTTON_TEXT_START + 7)
-#define  STR_TOKEN_LINK_END     (STR_BUTTON_TEXT_START + 8)
-#define  STR_TOKEN_AUTHORITY    (STR_BUTTON_TEXT_START + 9)
-
-#define  STR_BUTTON_HELP_TEXT_START  (STR_TOKEN_AUTHORITY + 1)
-#define  STR_TOKEN_HELP_ENTRY_NO      (STR_BUTTON_HELP_TEXT_START)
-#define  STR_TOKEN_HELP_ENTRY_TEXT    (STR_BUTTON_HELP_TEXT_START + 1)
-#define  STR_TOKEN_HELP_ENTRY         (STR_BUTTON_HELP_TEXT_START + 2)
-#define  STR_TOKEN_HELP_TAB_STOP      (STR_BUTTON_HELP_TEXT_START + 3)
-#define  STR_TOKEN_HELP_TEXT          (STR_BUTTON_HELP_TEXT_START + 4)
-#define  STR_TOKEN_HELP_PAGE_NUMS     (STR_BUTTON_HELP_TEXT_START + 5)
-#define  STR_TOKEN_HELP_CHAPTER_INFO  (STR_BUTTON_HELP_TEXT_START + 6)
-#define  STR_TOKEN_HELP_LINK_START    (STR_BUTTON_HELP_TEXT_START + 7)
-#define  STR_TOKEN_HELP_LINK_END      (STR_BUTTON_HELP_TEXT_START + 8)
-#define  STR_TOKEN_HELP_AUTHORITY     (STR_BUTTON_HELP_TEXT_START + 9)
-
-#define  STR_CHARSTYLE                  (STR_TOKEN_HELP_AUTHORITY + 1)
-#define  STR_STRUCTURE                  (STR_TOKEN_HELP_AUTHORITY + 2)
-#define  STR_ADDITIONAL_ACCNAME_STRING1 (STR_TOKEN_HELP_AUTHORITY + 3)
-#define  STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
-#define  STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 2229c02b4ec5..be76b619db6e 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -43,10 +43,10 @@ extern void PageNumNotify( SwViewShell* pVwSh,
 enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
 extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
 
-SW_DLLPUBLIC void StartProgress    ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr );
+SW_DLLPUBLIC void StartProgress(const char* pMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr);
 SW_DLLPUBLIC void EndProgress      ( SwDocShell *pDocSh );
 SW_DLLPUBLIC void SetProgressState  ( long nPosition, SwDocShell *pDocShell );
-void SetProgressText   ( sal_uInt16 nMessId, SwDocShell *pDocShell );
+void SetProgressText(const char* pMessId, SwDocShell *pDocShell);
 void RescheduleProgress( SwDocShell *pDocShell );
 
 void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
diff --git a/cui/source/dialogs/multipat.src b/sw/inc/mmaddressblockpage.hrc
index 0dfc1107d3ec..3b5126d1d5c2 100644
--- a/cui/source/dialogs/multipat.src
+++ b/sw/inc/mmaddressblockpage.hrc
@@ -17,31 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cuires.hrc>
+#ifndef INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
+#define INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
 
-String RID_MULTIPATH_DBL_ERR
-{
-    Text [ en-US ] = "The path %1 already exists." ;
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String RID_SVXSTR_ARCHIVE_TITLE
+const char* RA_SALUTATION[] =
 {
-    Text [ en-US ] = "Select Archives" ;
+    NC_("RA_SALUTATION", "Dear"),
+    NC_("RA_SALUTATION", "Hello"),
+    NC_("RA_SALUTATION", "Hi")
 };
 
-String RID_SVXSTR_ARCHIVE_HEADLINE
+const char* RA_PUNCTUATION[] =
 {
-    Text [ en-US ] = "Archives" ;
+    NC_("RA_PUNCTUATION", ","),
+    NC_("RA_PUNCTUATION", ":"),
+    NC_("RA_PUNCTUATION", "!"),
+    NC_("RA_PUNCTUATION", "(none)")
 };
 
-String RID_SVXSTR_MULTIFILE_DBL_ERR
-{
-    Text [ en-US ] = "The file %1 already exists." ;
-};
-
-String RID_SVXSTR_ADD_IMAGE
-{
-    Text [ en-US ] = "Add Image" ;
-};
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/parawin.src b/sw/inc/optload.hrc
index 65e3085d4ce1..a3415c8e7c64 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/sw/inc/optload.hrc
@@ -17,16 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ForResId.hrc"
+#ifndef INCLUDED_SW_INC_OPTLOAD_HRC
+#define INCLUDED_SW_INC_OPTLOAD_HRC
 
-String STR_OPTIONAL
-{
-    Text [ en-US ] = "(optional)" ;
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String STR_REQUIRED
+const std::pair<const char*, FieldUnit> STR_ARR_METRIC[] =
 {
-    Text [ en-US ] = "(required)" ;
+    { NC_("STR_ARR_METRIC", "Millimeter") , FUNIT_MM },
+    { NC_("STR_ARR_METRIC", "Centimeter") , FUNIT_CM },
+    { NC_("STR_ARR_METRIC", "Meter") , FUNIT_M },
+    { NC_("STR_ARR_METRIC", "Kilometer") , FUNIT_KM },
+    { NC_("STR_ARR_METRIC", "Inch") , FUNIT_INCH },
+    { NC_("STR_ARR_METRIC", "Foot") , FUNIT_FOOT },
+    { NC_("STR_ARR_METRIC", "Miles") , FUNIT_MILE },
+    { NC_("STR_ARR_METRIC", "Pica") , FUNIT_PICA },
+    { NC_("STR_ARR_METRIC", "Point") , FUNIT_POINT },
+    { NC_("STR_ARR_METRIC", "Char") , FUNIT_CHAR },
+    { NC_("STR_ARR_METRIC", "Line") , FUNIT_LINE }
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index f45b2f48ecf0..29e6f0b6d0d8 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -491,8 +491,6 @@
 #include <paratr.hxx>
 #include <poolfmt.hxx>
 #include <reffld.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sax/fastattribs.hxx>
 #include <sax/fshelper.hxx>
 #include <sax/saxdllapi.h>
@@ -648,7 +646,6 @@
 #include <tools/mempool.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index d1999521ec5a..300402064265 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -390,8 +390,6 @@
 #include <prtopt.hxx>
 #include <redline.hxx>
 #include <reffld.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
@@ -522,7 +520,6 @@
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 21004e75191f..2fbefd48baf8 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -477,8 +477,6 @@
 #include <pam.hxx>
 #include <paratr.hxx>
 #include <poolfmt.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/Metadatable.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -580,7 +578,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 088d7c2922e1..9cbc82468cb9 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -334,7 +334,6 @@
 #include <ooo/vba/XCollection.hpp>
 #include <ooo/vba/XHelperInterface.hpp>
 #include <pam.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sfx2/dllapi.h>
 #include <svl/cenumitm.hxx>
 #include <svl/cintitem.hxx>
@@ -376,7 +375,6 @@
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
deleted file mode 100644
index 3cc6858d109c..000000000000
--- a/sw/inc/poolfmt.hrc
+++ /dev/null
@@ -1,288 +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_SW_INC_POOLFMT_HRC
-#define INCLUDED_SW_INC_POOLFMT_HRC
-
-#include "rcid.hrc"
-
-// The Formats
-
-// Drawing Templates:
-#define STR_POOLCHR_FOOTNOTE            (RC_POOLCHRFMT_BEGIN+  0)
-#define STR_POOLCHR_PAGENO              (RC_POOLCHRFMT_BEGIN+  1)
-#define STR_POOLCHR_LABEL               (RC_POOLCHRFMT_BEGIN+  2)
-#define STR_POOLCHR_DROPCAPS            (RC_POOLCHRFMT_BEGIN+  3)
-#define STR_POOLCHR_NUM_LEVEL           (RC_POOLCHRFMT_BEGIN+  4)
-#define STR_POOLCHR_BUL_LEVEL           (RC_POOLCHRFMT_BEGIN+  5)
-#define STR_POOLCHR_INET_NORMAL         (RC_POOLCHRFMT_BEGIN+  6)
-#define STR_POOLCHR_INET_VISIT          (RC_POOLCHRFMT_BEGIN+  7)
-#define STR_POOLCHR_JUMPEDIT            (RC_POOLCHRFMT_BEGIN+  8)
-#define STR_POOLCHR_TOXJUMP             (RC_POOLCHRFMT_BEGIN+  9)
-#define STR_POOLCHR_ENDNOTE             (RC_POOLCHRFMT_BEGIN+ 10)
-#define STR_POOLCHR_LINENUM             (RC_POOLCHRFMT_BEGIN+ 11)
-#define STR_POOLCHR_IDX_MAIN_ENTRY      (RC_POOLCHRFMT_BEGIN+ 12)
-#define STR_POOLCHR_FOOTNOTE_ANCHOR     (RC_POOLCHRFMT_BEGIN+ 13)
-#define STR_POOLCHR_ENDNOTE_ANCHOR      (RC_POOLCHRFMT_BEGIN+ 14)
-#define STR_POOLCHR_RUBYTEXT            (RC_POOLCHRFMT_BEGIN+ 15)
-#define STR_POOLCHR_VERT_NUM            (RC_POOLCHRFMT_BEGIN+ 16)
-
-#define STR_POOLCHR_HTML_EMPHASIS       (RC_POOLCHRFMT_HTML_BEGIN+  0)
-#define STR_POOLCHR_HTML_CITIATION      (RC_POOLCHRFMT_HTML_BEGIN+  1)
-#define STR_POOLCHR_HTML_STRONG         (RC_POOLCHRFMT_HTML_BEGIN+  2)
-#define STR_POOLCHR_HTML_CODE           (RC_POOLCHRFMT_HTML_BEGIN+  3)
-#define STR_POOLCHR_HTML_SAMPLE         (RC_POOLCHRFMT_HTML_BEGIN+  4)
-#define STR_POOLCHR_HTML_KEYBOARD       (RC_POOLCHRFMT_HTML_BEGIN+  5)
-#define STR_POOLCHR_HTML_VARIABLE       (RC_POOLCHRFMT_HTML_BEGIN+  6)
-#define STR_POOLCHR_HTML_DEFINSTANCE    (RC_POOLCHRFMT_HTML_BEGIN+  7)
-#define STR_POOLCHR_HTML_TELETYPE       (RC_POOLCHRFMT_HTML_BEGIN+  8)
-
-// Frame Templates:
-#define STR_POOLFRM_FRAME               (RC_POOLFRMFMT_BEGIN+  0)
-#define STR_POOLFRM_GRAPHIC             (RC_POOLFRMFMT_BEGIN+  1)
-#define STR_POOLFRM_OLE                 (RC_POOLFRMFMT_BEGIN+  2)
-#define STR_POOLFRM_FORMEL              (RC_POOLFRMFMT_BEGIN+  3)
-#define STR_POOLFRM_MARGINAL            (RC_POOLFRMFMT_BEGIN+  4)
-#define STR_POOLFRM_WATERSIGN           (RC_POOLFRMFMT_BEGIN+  5)
-#define STR_POOLFRM_LABEL               (RC_POOLFRMFMT_BEGIN+  6)
-
-// The Templates
-
-// Category Text
-#define STR_POOLCOLL_STANDARD           (RC_POOLCOLL_TEXT_BEGIN+  0)
-#define STR_POOLCOLL_TEXT               (RC_POOLCOLL_TEXT_BEGIN+  1)
-#define STR_POOLCOLL_TEXT_IDENT         (RC_POOLCOLL_TEXT_BEGIN+  2)
-#define STR_POOLCOLL_TEXT_NEGIDENT      (RC_POOLCOLL_TEXT_BEGIN+  3)
-#define STR_POOLCOLL_TEXT_MOVE          (RC_POOLCOLL_TEXT_BEGIN+  4)
-#define STR_POOLCOLL_GREETING           (RC_POOLCOLL_TEXT_BEGIN+  5)
-#define STR_POOLCOLL_SIGNATURE          (RC_POOLCOLL_TEXT_BEGIN+  6)
-#define STR_POOLCOLL_CONFRONTATION      (RC_POOLCOLL_TEXT_BEGIN+  7)
-#define STR_POOLCOLL_MARGINAL           (RC_POOLCOLL_TEXT_BEGIN+  8)
-
-    // Subcategory Headlines
-#define STR_POOLCOLL_HEADLINE_BASE      (RC_POOLCOLL_TEXT_BEGIN+  9)
-#define STR_POOLCOLL_HEADLINE1          (RC_POOLCOLL_TEXT_BEGIN+ 10)
-#define STR_POOLCOLL_HEADLINE2          (RC_POOLCOLL_TEXT_BEGIN+ 11)
-#define STR_POOLCOLL_HEADLINE3          (RC_POOLCOLL_TEXT_BEGIN+ 12)
-#define STR_POOLCOLL_HEADLINE4          (RC_POOLCOLL_TEXT_BEGIN+ 13)
-#define STR_POOLCOLL_HEADLINE5          (RC_POOLCOLL_TEXT_BEGIN+ 14)
-#define STR_POOLCOLL_HEADLINE6          (RC_POOLCOLL_TEXT_BEGIN+ 15)
-#define STR_POOLCOLL_HEADLINE7          (RC_POOLCOLL_TEXT_BEGIN+ 16)
-#define STR_POOLCOLL_HEADLINE8          (RC_POOLCOLL_TEXT_BEGIN+ 17)
-#define STR_POOLCOLL_HEADLINE9          (RC_POOLCOLL_TEXT_BEGIN+ 18)
-#define STR_POOLCOLL_HEADLINE10         (RC_POOLCOLL_TEXT_BEGIN+ 19)
-
-// Category Lists
-#define STR_POOLCOLL_NUMBUL_BASE        (RC_POOLCOLL_LISTS_BEGIN+  0)
-    // Subcategory Numbering
-#define STR_POOLCOLL_NUM_LEVEL1S        (RC_POOLCOLL_LISTS_BEGIN+  1)
-#define STR_POOLCOLL_NUM_LEVEL1         (RC_POOLCOLL_LISTS_BEGIN+  2)
-#define STR_POOLCOLL_NUM_LEVEL1E        (RC_POOLCOLL_LISTS_BEGIN+  3)
-#define STR_POOLCOLL_NUM_NONUM1         (RC_POOLCOLL_LISTS_BEGIN+  4)
-#define STR_POOLCOLL_NUM_LEVEL2S        (RC_POOLCOLL_LISTS_BEGIN+  5)
-#define STR_POOLCOLL_NUM_LEVEL2         (RC_POOLCOLL_LISTS_BEGIN+  6)
-#define STR_POOLCOLL_NUM_LEVEL2E        (RC_POOLCOLL_LISTS_BEGIN+  7)
-#define STR_POOLCOLL_NUM_NONUM2         (RC_POOLCOLL_LISTS_BEGIN+  8)
-#define STR_POOLCOLL_NUM_LEVEL3S        (RC_POOLCOLL_LISTS_BEGIN+  9)
-#define STR_POOLCOLL_NUM_LEVEL3         (RC_POOLCOLL_LISTS_BEGIN+ 10)
-#define STR_POOLCOLL_NUM_LEVEL3E        (RC_POOLCOLL_LISTS_BEGIN+ 11)
-#define STR_POOLCOLL_NUM_NONUM3         (RC_POOLCOLL_LISTS_BEGIN+ 12)
-#define STR_POOLCOLL_NUM_LEVEL4S        (RC_POOLCOLL_LISTS_BEGIN+ 13)
-#define STR_POOLCOLL_NUM_LEVEL4         (RC_POOLCOLL_LISTS_BEGIN+ 14)
-#define STR_POOLCOLL_NUM_LEVEL4E        (RC_POOLCOLL_LISTS_BEGIN+ 15)
-#define STR_POOLCOLL_NUM_NONUM4         (RC_POOLCOLL_LISTS_BEGIN+ 16)
-#define STR_POOLCOLL_NUM_LEVEL5S        (RC_POOLCOLL_LISTS_BEGIN+ 17)
-#define STR_POOLCOLL_NUM_LEVEL5         (RC_POOLCOLL_LISTS_BEGIN+ 18)
-#define STR_POOLCOLL_NUM_LEVEL5E        (RC_POOLCOLL_LISTS_BEGIN+ 19)
-#define STR_POOLCOLL_NUM_NONUM5         (RC_POOLCOLL_LISTS_BEGIN+ 20)
-
-    // Subcategory Enumeration
-#define STR_POOLCOLL_BUL_LEVEL1S        (RC_POOLCOLL_LISTS_BEGIN+ 21)
-#define STR_POOLCOLL_BUL_LEVEL1         (RC_POOLCOLL_LISTS_BEGIN+ 22)
-#define STR_POOLCOLL_BUL_LEVEL1E        (RC_POOLCOLL_LISTS_BEGIN+ 23)
-#define STR_POOLCOLL_BUL_NONUM1         (RC_POOLCOLL_LISTS_BEGIN+ 24)
-#define STR_POOLCOLL_BUL_LEVEL2S        (RC_POOLCOLL_LISTS_BEGIN+ 25)
-#define STR_POOLCOLL_BUL_LEVEL2         (RC_POOLCOLL_LISTS_BEGIN+ 26)
-#define STR_POOLCOLL_BUL_LEVEL2E        (RC_POOLCOLL_LISTS_BEGIN+ 27)
-#define STR_POOLCOLL_BUL_NONUM2         (RC_POOLCOLL_LISTS_BEGIN+ 28)
-#define STR_POOLCOLL_BUL_LEVEL3S        (RC_POOLCOLL_LISTS_BEGIN+ 29)
-#define STR_POOLCOLL_BUL_LEVEL3         (RC_POOLCOLL_LISTS_BEGIN+ 30)
-#define STR_POOLCOLL_BUL_LEVEL3E        (RC_POOLCOLL_LISTS_BEGIN+ 31)
-#define STR_POOLCOLL_BUL_NONUM3         (RC_POOLCOLL_LISTS_BEGIN+ 32)
-#define STR_POOLCOLL_BUL_LEVEL4S        (RC_POOLCOLL_LISTS_BEGIN+ 33)
-#define STR_POOLCOLL_BUL_LEVEL4         (RC_POOLCOLL_LISTS_BEGIN+ 34)
-#define STR_POOLCOLL_BUL_LEVEL4E        (RC_POOLCOLL_LISTS_BEGIN+ 35)
-#define STR_POOLCOLL_BUL_NONUM4         (RC_POOLCOLL_LISTS_BEGIN+ 36)
-#define STR_POOLCOLL_BUL_LEVEL5S        (RC_POOLCOLL_LISTS_BEGIN+ 37)
-#define STR_POOLCOLL_BUL_LEVEL5         (RC_POOLCOLL_LISTS_BEGIN+ 38)
-#define STR_POOLCOLL_BUL_LEVEL5E        (RC_POOLCOLL_LISTS_BEGIN+ 39)
-#define STR_POOLCOLL_BUL_NONUM5         (RC_POOLCOLL_LISTS_BEGIN+ 40)
-
-// Special Areas
-    // Subcategory Header
-#define STR_POOLCOLL_HEADER             (RC_POOLCOLL_EXTRA_BEGIN+  0)
-#define STR_POOLCOLL_HEADERL            (RC_POOLCOLL_EXTRA_BEGIN+  1)
-#define STR_POOLCOLL_HEADERR            (RC_POOLCOLL_EXTRA_BEGIN+  2)
-
-    // Subcategroy Footer
-#define STR_POOLCOLL_FOOTER             (RC_POOLCOLL_EXTRA_BEGIN+  3)
-#define STR_POOLCOLL_FOOTERL            (RC_POOLCOLL_EXTRA_BEGIN+  4)
-#define STR_POOLCOLL_FOOTERR            (RC_POOLCOLL_EXTRA_BEGIN+  5)
-
-    // Subcategroy Table
-#define STR_POOLCOLL_TABLE              (RC_POOLCOLL_EXTRA_BEGIN+  6)
-#define STR_POOLCOLL_TABLE_HDLN         (RC_POOLCOLL_EXTRA_BEGIN+  7)
-
-    // Subcategroy Labels
-#define STR_POOLCOLL_LABEL              (RC_POOLCOLL_EXTRA_BEGIN+  8)
-#define STR_POOLCOLL_LABEL_ABB          (RC_POOLCOLL_EXTRA_BEGIN+  9)
-#define STR_POOLCOLL_LABEL_TABLE        (RC_POOLCOLL_EXTRA_BEGIN+ 10)
-#define STR_POOLCOLL_LABEL_FRAME        (RC_POOLCOLL_EXTRA_BEGIN+ 11)
-
-    // Miscellaneous
-#define STR_POOLCOLL_FRAME              (RC_POOLCOLL_EXTRA_BEGIN+ 12)
-#define STR_POOLCOLL_FOOTNOTE           (RC_POOLCOLL_EXTRA_BEGIN+ 13)
-#define STR_POOLCOLL_JAKETADRESS        (RC_POOLCOLL_EXTRA_BEGIN+ 14)
-#define STR_POOLCOLL_SENDADRESS         (RC_POOLCOLL_EXTRA_BEGIN+ 15)
-#define STR_POOLCOLL_ENDNOTE            (RC_POOLCOLL_EXTRA_BEGIN+ 16)
-
-#define STR_POOLCOLL_LABEL_DRAWING      (RC_POOLCOLL_EXTRA_BEGIN+ 17)
-
-// Category Directories
-#define STR_POOLCOLL_REGISTER_BASE      (RC_POOLCOLL_REGISTER_BEGIN+  0)
-    // Subcategory Index-Directories
-#define STR_POOLCOLL_TOX_IDXH           (RC_POOLCOLL_REGISTER_BEGIN+  1)
-#define STR_POOLCOLL_TOX_IDX1           (RC_POOLCOLL_REGISTER_BEGIN+  2)
-#define STR_POOLCOLL_TOX_IDX2           (RC_POOLCOLL_REGISTER_BEGIN+  3)
-#define STR_POOLCOLL_TOX_IDX3           (RC_POOLCOLL_REGISTER_BEGIN+  4)
-#define STR_POOLCOLL_TOX_IDXBREAK       (RC_POOLCOLL_REGISTER_BEGIN+  5)
-
-    // Subcategory Tables of Contents
-#define STR_POOLCOLL_TOX_CNTNTH         (RC_POOLCOLL_REGISTER_BEGIN+  6)
-#define STR_POOLCOLL_TOX_CNTNT1         (RC_POOLCOLL_REGISTER_BEGIN+  7)
-#define STR_POOLCOLL_TOX_CNTNT2         (RC_POOLCOLL_REGISTER_BEGIN+  8)
-#define STR_POOLCOLL_TOX_CNTNT3         (RC_POOLCOLL_REGISTER_BEGIN+  9)
-#define STR_POOLCOLL_TOX_CNTNT4         (RC_POOLCOLL_REGISTER_BEGIN+ 10)
-#define STR_POOLCOLL_TOX_CNTNT5         (RC_POOLCOLL_REGISTER_BEGIN+ 11)
-
-    // Subcategory User-Directories:
-#define STR_POOLCOLL_TOX_USERH          (RC_POOLCOLL_REGISTER_BEGIN+ 12)
-#define STR_POOLCOLL_TOX_USER1          (RC_POOLCOLL_REGISTER_BEGIN+ 13)
-#define STR_POOLCOLL_TOX_USER2          (RC_POOLCOLL_REGISTER_BEGIN+ 14)
-#define STR_POOLCOLL_TOX_USER3          (RC_POOLCOLL_REGISTER_BEGIN+ 15)
-#define STR_POOLCOLL_TOX_USER4          (RC_POOLCOLL_REGISTER_BEGIN+ 16)
-#define STR_POOLCOLL_TOX_USER5          (RC_POOLCOLL_REGISTER_BEGIN+ 17)
-
-    // Subcategory Table of Contents more Levels 5 - 10
-#define STR_POOLCOLL_TOX_CNTNT6         (RC_POOLCOLL_REGISTER_BEGIN+ 18)
-#define STR_POOLCOLL_TOX_CNTNT7         (RC_POOLCOLL_REGISTER_BEGIN+ 19)
-#define STR_POOLCOLL_TOX_CNTNT8         (RC_POOLCOLL_REGISTER_BEGIN+ 20)
-#define STR_POOLCOLL_TOX_CNTNT9         (RC_POOLCOLL_REGISTER_BEGIN+ 21)
-#define STR_POOLCOLL_TOX_CNTNT10        (RC_POOLCOLL_REGISTER_BEGIN+ 22)
-
-// Illustrations Index
-#define STR_POOLCOLL_TOX_ILLUSH         (RC_POOLCOLL_REGISTER_BEGIN+ 23)
-#define STR_POOLCOLL_TOX_ILLUS1         (RC_POOLCOLL_REGISTER_BEGIN+ 24)
-
-//  Object Index
-#define STR_POOLCOLL_TOX_OBJECTH        (RC_POOLCOLL_REGISTER_BEGIN+ 25)
-#define STR_POOLCOLL_TOX_OBJECT1        (RC_POOLCOLL_REGISTER_BEGIN+ 26)
-
-//  Tables Index
-#define STR_POOLCOLL_TOX_TABLESH        (RC_POOLCOLL_REGISTER_BEGIN+ 27)
-#define STR_POOLCOLL_TOX_TABLES1        (RC_POOLCOLL_REGISTER_BEGIN+ 28)
-
-//  Index of Authorities
-#define STR_POOLCOLL_TOX_AUTHORITIESH   (RC_POOLCOLL_REGISTER_BEGIN+ 29)
-#define STR_POOLCOLL_TOX_AUTHORITIES1   (RC_POOLCOLL_REGISTER_BEGIN+ 30)
-
-    // Subcategory User-Directories more Levels 5 - 10
-#define STR_POOLCOLL_TOX_USER6          (RC_POOLCOLL_REGISTER_BEGIN+ 31)
-#define STR_POOLCOLL_TOX_USER7          (RC_POOLCOLL_REGISTER_BEGIN+ 32)
-#define STR_POOLCOLL_TOX_USER8          (RC_POOLCOLL_REGISTER_BEGIN+ 33)
-#define STR_POOLCOLL_TOX_USER9          (RC_POOLCOLL_REGISTER_BEGIN+ 34)
-#define STR_POOLCOLL_TOX_USER10         (RC_POOLCOLL_REGISTER_BEGIN+ 35)
-
-#define STR_POOLCOLL_TOX_CITATION       (RC_POOLCOLL_REGISTER_BEGIN+ 36)
-
-// Category Chapter/Document
-#define STR_POOLCOLL_DOC_TITEL          (RC_POOLCOLL_DOC_BEGIN+ 0)
-#define STR_POOLCOLL_DOC_SUBTITEL       (RC_POOLCOLL_DOC_BEGIN+ 1)
-
-// Category HTML-Templates
-#define STR_POOLCOLL_HTML_BLOCKQUOTE    (RC_POOLCOLL_HTML_BEGIN+  0)
-#define STR_POOLCOLL_HTML_PRE           (RC_POOLCOLL_HTML_BEGIN+  1)
-#define STR_POOLCOLL_HTML_HR            (RC_POOLCOLL_HTML_BEGIN+  2)
-#define STR_POOLCOLL_HTML_DD            (RC_POOLCOLL_HTML_BEGIN+  3)
-#define STR_POOLCOLL_HTML_DT            (RC_POOLCOLL_HTML_BEGIN+  4)
-
-// Page styles
-
-#define STR_POOLPAGE_STANDARD           (RC_POOLPAGEDESC_BEGIN+  0)
-#define STR_POOLPAGE_FIRST              (RC_POOLPAGEDESC_BEGIN+  1)
-#define STR_POOLPAGE_LEFT               (RC_POOLPAGEDESC_BEGIN+  2)
-#define STR_POOLPAGE_RIGHT              (RC_POOLPAGEDESC_BEGIN+  3)
-#define STR_POOLPAGE_JAKET              (RC_POOLPAGEDESC_BEGIN+  4)
-#define STR_POOLPAGE_REGISTER           (RC_POOLPAGEDESC_BEGIN+  5)
-#define STR_POOLPAGE_HTML               (RC_POOLPAGEDESC_BEGIN+  6)
-#define STR_POOLPAGE_FOOTNOTE           (RC_POOLPAGEDESC_BEGIN+  7)
-#define STR_POOLPAGE_ENDNOTE            (RC_POOLPAGEDESC_BEGIN+  8)
-#define STR_POOLPAGE_LANDSCAPE                  (RC_POOLPAGEDESC_BEGIN+  9)
-
-// Numbering styles
-
-#define STR_POOLNUMRULE_NUM1                (RC_POOLNUMRULE_BEGIN+  0)
-#define STR_POOLNUMRULE_NUM2                (RC_POOLNUMRULE_BEGIN+  1)
-#define STR_POOLNUMRULE_NUM3                (RC_POOLNUMRULE_BEGIN+  2)
-#define STR_POOLNUMRULE_NUM4                (RC_POOLNUMRULE_BEGIN+  3)
-#define STR_POOLNUMRULE_NUM5                (RC_POOLNUMRULE_BEGIN+  4)
-#define STR_POOLNUMRULE_BUL1                (RC_POOLNUMRULE_BEGIN+  5)
-#define STR_POOLNUMRULE_BUL2                (RC_POOLNUMRULE_BEGIN+  6)
-#define STR_POOLNUMRULE_BUL3                (RC_POOLNUMRULE_BEGIN+  7)
-#define STR_POOLNUMRULE_BUL4                (RC_POOLNUMRULE_BEGIN+  8)
-#define STR_POOLNUMRULE_BUL5                (RC_POOLNUMRULE_BEGIN+  9)
-//Solution:Define column item's accessible name ID.
-#define STR_COLUMN_VALUESET_ITEM0       (RC_POOLNUMRULE_BEGIN + 10 )
-#define STR_COLUMN_VALUESET_ITEM1       (RC_POOLNUMRULE_BEGIN + 11 )
-#define STR_COLUMN_VALUESET_ITEM2       (RC_POOLNUMRULE_BEGIN + 12 )
-#define STR_COLUMN_VALUESET_ITEM3       (RC_POOLNUMRULE_BEGIN + 13 )
-#define STR_COLUMN_VALUESET_ITEM4       (RC_POOLNUMRULE_BEGIN + 14 )
-
-// Table styles
-
-#define STR_TABSTYLE_DEFAULT            (RC_POOLTABSTYLE_BEGIN+  0)
-#define STR_TABSTYLE_3D                 (RC_POOLTABSTYLE_BEGIN+  1)
-#define STR_TABSTYLE_BLACK1             (RC_POOLTABSTYLE_BEGIN+  2)
-#define STR_TABSTYLE_BLACK2             (RC_POOLTABSTYLE_BEGIN+  3)
-#define STR_TABSTYLE_BLUE               (RC_POOLTABSTYLE_BEGIN+  4)
-#define STR_TABSTYLE_BROWN              (RC_POOLTABSTYLE_BEGIN+  5)
-#define STR_TABSTYLE_CURRENCY           (RC_POOLTABSTYLE_BEGIN+  6)
-#define STR_TABSTYLE_CURRENCY_3D        (RC_POOLTABSTYLE_BEGIN+  7)
-#define STR_TABSTYLE_CURRENCY_GRAY      (RC_POOLTABSTYLE_BEGIN+  8)
-#define STR_TABSTYLE_CURRENCY_LAVENDER  (RC_POOLTABSTYLE_BEGIN+  9)
-#define STR_TABSTYLE_CURRENCY_TURQUOISE (RC_POOLTABSTYLE_BEGIN+  10)
-#define STR_TABSTYLE_GRAY               (RC_POOLTABSTYLE_BEGIN+  11)
-#define STR_TABSTYLE_GREEN              (RC_POOLTABSTYLE_BEGIN+  12)
-#define STR_TABSTYLE_LAVENDER           (RC_POOLTABSTYLE_BEGIN+  13)
-#define STR_TABSTYLE_RED                (RC_POOLTABSTYLE_BEGIN+  14)
-#define STR_TABSTYLE_TURQUOISE          (RC_POOLTABSTYLE_BEGIN+  15)
-#define STR_TABSTYLE_YELLOW             (RC_POOLTABSTYLE_BEGIN+  16)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
deleted file mode 100644
index 787081d5be5b..000000000000
--- a/sw/inc/statstr.hrc
+++ /dev/null
@@ -1,41 +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_SW_INC_STATSTR_HRC
-#define INCLUDED_SW_INC_STATSTR_HRC
-
-#include "rcid.hrc"
-
-#define STR_STATSTR_W4WREAD           (RC_STATLIN_STR + 0)
-#define STR_STATSTR_W4WWRITE      (RC_STATLIN_STR + 1)
-#define STR_STATSTR_SWGREAD           (RC_STATLIN_STR + 2)
-#define STR_STATSTR_SWGWRITE      (RC_STATLIN_STR + 3)
-#define STR_STATSTR_REFORMAT        (RC_STATLIN_STR + 4)
-#define STR_STATSTR_AUTOFORMAT      (RC_STATLIN_STR + 5)
-#define STR_STATSTR_SEARCH          (RC_STATLIN_STR + 7)
-#define STR_STATSTR_LETTER          (RC_STATLIN_STR + 11)
-#define STR_STATSTR_SPELL           (RC_STATLIN_STR + 12)
-#define STR_STATSTR_HYPHEN          (RC_STATLIN_STR + 13)
-#define STR_STATSTR_TOX_INSERT      (RC_STATLIN_STR + 14)
-#define STR_STATSTR_TOX_UPDATE      (RC_STATLIN_STR + 15)
-#define STR_STATSTR_SUMMARY         (RC_STATLIN_STR + 16)
-#define STR_STATSTR_SWGPRTOLENOTIFY (RC_STATLIN_STR + 17)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
new file mode 100644
index 000000000000..7d85ccbda0d8
--- /dev/null
+++ b/sw/inc/strings.hrc
@@ -0,0 +1,1347 @@
+/* -*- 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_SW_INC_STRINGS_HRC
+#define INCLUDED_SW_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// Format names
+#define STR_POOLCHR_FOOTNOTE                    NC_("STR_POOLCHR_FOOTNOTE", "Footnote Characters")
+#define STR_POOLCHR_PAGENO                      NC_("STR_POOLCHR_PAGENO", "Page Number")
+#define STR_POOLCHR_LABEL                       NC_("STR_POOLCHR_LABEL", "Caption Characters")
+#define STR_POOLCHR_DROPCAPS                    NC_("STR_POOLCHR_DROPCAPS", "Drop Caps")
+#define STR_POOLCHR_NUM_LEVEL                   NC_("STR_POOLCHR_NUM_LEVEL", "Numbering Symbols")
+#define STR_POOLCHR_BUL_LEVEL                   NC_("STR_POOLCHR_BUL_LEVEL", "Bullets")
+#define STR_POOLCHR_INET_NORMAL                 NC_("STR_POOLCHR_INET_NORMAL", "Internet Link")
+#define STR_POOLCHR_INET_VISIT                  NC_("STR_POOLCHR_INET_VISIT", "Visited Internet Link")
+#define STR_POOLCHR_JUMPEDIT                    NC_("STR_POOLCHR_JUMPEDIT", "Placeholder")
+#define STR_POOLCHR_TOXJUMP                     NC_("STR_POOLCHR_TOXJUMP", "Index Link")
+#define STR_POOLCHR_ENDNOTE                     NC_("STR_POOLCHR_ENDNOTE", "Endnote Characters")
+#define STR_POOLPAGE_LANDSCAPE                  NC_("STR_POOLPAGE_LANDSCAPE", "Landscape")
+#define STR_POOLCHR_LINENUM                     NC_("STR_POOLCHR_LINENUM", "Line Numbering")
+#define STR_POOLCHR_IDX_MAIN_ENTRY              NC_("STR_POOLCHR_IDX_MAIN_ENTRY", "Main Index Entry")
+#define STR_POOLCHR_FOOTNOTE_ANCHOR             NC_("STR_POOLCHR_FOOTNOTE_ANCHOR", "Footnote Anchor")
+#define STR_POOLCHR_ENDNOTE_ANCHOR              NC_("STR_POOLCHR_ENDNOTE_ANCHOR", "Endnote Anchor")
+// Drawing templates for HTML
+#define STR_POOLCHR_HTML_EMPHASIS               NC_("STR_POOLCHR_HTML_EMPHASIS", "Emphasis")
+#define STR_POOLCHR_HTML_CITIATION              NC_("STR_POOLCHR_HTML_CITIATION", "Quotation")
+#define STR_POOLCHR_HTML_STRONG                 NC_("STR_POOLCHR_HTML_STRONG", "Strong Emphasis")
+#define STR_POOLCHR_HTML_CODE                   NC_("STR_POOLCHR_HTML_CODE", "Source Text")
+#define STR_POOLCHR_HTML_SAMPLE                 NC_("STR_POOLCHR_HTML_SAMPLE", "Example")
+#define STR_POOLCHR_HTML_KEYBOARD               NC_("STR_POOLCHR_HTML_KEYBOARD", "User Entry")
+#define STR_POOLCHR_HTML_VARIABLE               NC_("STR_POOLCHR_HTML_VARIABLE", "Variable")
+#define STR_POOLCHR_HTML_DEFINSTANCE            NC_("STR_POOLCHR_HTML_DEFINSTANCE", "Definition")
+#define STR_POOLCHR_HTML_TELETYPE               NC_("STR_POOLCHR_HTML_TELETYPE", "Teletype")
+// Border templates
+#define STR_POOLFRM_FRAME                       NC_("STR_POOLFRM_FRAME", "Frame")
+#define STR_POOLFRM_GRAPHIC                     NC_("STR_POOLFRM_GRAPHIC", "Graphics")
+#define STR_POOLFRM_OLE                         NC_("STR_POOLFRM_OLE", "OLE")
+#define STR_POOLFRM_FORMEL                      NC_("STR_POOLFRM_FORMEL", "Formula")
+#define STR_POOLFRM_MARGINAL                    NC_("STR_POOLFRM_MARGINAL", "Marginalia")
+#define STR_POOLFRM_WATERSIGN                   NC_("STR_POOLFRM_WATERSIGN", "Watermark")
+#define STR_POOLFRM_LABEL                       NC_("STR_POOLFRM_LABEL", "Labels")
+// Template names
+// tdf#107211 please don't change STANDARD, except back to "Default"
+#define STR_POOLCOLL_STANDARD                   NC_("STR_POOLCOLL_STANDARD", "Default Style")
+#define STR_POOLCOLL_TEXT                       NC_("STR_POOLCOLL_TEXT", "Text Body")
+#define STR_POOLCOLL_TEXT_IDENT                 NC_("STR_POOLCOLL_TEXT_IDENT", "First Line Indent")
+#define STR_POOLCOLL_TEXT_NEGIDENT              NC_("STR_POOLCOLL_TEXT_NEGIDENT", "Hanging Indent")
+#define STR_POOLCOLL_TEXT_MOVE                  NC_("STR_POOLCOLL_TEXT_MOVE", "Text Body Indent")
+#define STR_POOLCOLL_GREETING                   NC_("STR_POOLCOLL_GREETING", "Complimentary Close")
+#define STR_POOLCOLL_SIGNATURE                  NC_("STR_POOLCOLL_SIGNATURE", "Signature")
+#define STR_POOLCOLL_HEADLINE_BASE              NC_("STR_POOLCOLL_HEADLINE_BASE", "Heading")
+#define STR_POOLCOLL_NUMBUL_BASE                NC_("STR_POOLCOLL_NUMBUL_BASE", "List")
+#define STR_POOLCOLL_REGISTER_BASE              NC_("STR_POOLCOLL_REGISTER_BASE", "Index")
+#define STR_POOLCOLL_CONFRONTATION              NC_("STR_POOLCOLL_CONFRONTATION", "List Indent")
+#define STR_POOLCOLL_MARGINAL                   NC_("STR_POOLCOLL_MARGINAL", "Marginalia")
+#define STR_POOLCOLL_HEADLINE1                  NC_("STR_POOLCOLL_HEADLINE1", "Heading 1")
+#define STR_POOLCOLL_HEADLINE2                  NC_("STR_POOLCOLL_HEADLINE2", "Heading 2")
+#define STR_POOLCOLL_HEADLINE3                  NC_("STR_POOLCOLL_HEADLINE3", "Heading 3")
+#define STR_POOLCOLL_HEADLINE4                  NC_("STR_POOLCOLL_HEADLINE4", "Heading 4")
+#define STR_POOLCOLL_HEADLINE5                  NC_("STR_POOLCOLL_HEADLINE5", "Heading 5")
+#define STR_POOLCOLL_HEADLINE6                  NC_("STR_POOLCOLL_HEADLINE6", "Heading 6")
+#define STR_POOLCOLL_HEADLINE7                  NC_("STR_POOLCOLL_HEADLINE7", "Heading 7")
+#define STR_POOLCOLL_HEADLINE8                  NC_("STR_POOLCOLL_HEADLINE8", "Heading 8")
+#define STR_POOLCOLL_HEADLINE9                  NC_("STR_POOLCOLL_HEADLINE9", "Heading 9")
+#define STR_POOLCOLL_HEADLINE10                 NC_("STR_POOLCOLL_HEADLINE10", "Heading 10")
+#define STR_POOLCOLL_NUM_LEVEL1S                NC_("STR_POOLCOLL_NUM_LEVEL1S", "Numbering 1 Start")
+#define STR_POOLCOLL_NUM_LEVEL1                 NC_("STR_POOLCOLL_NUM_LEVEL1", "Numbering 1")
+#define STR_POOLCOLL_NUM_LEVEL1E                NC_("STR_POOLCOLL_NUM_LEVEL1E", "Numbering 1 End")
+#define STR_POOLCOLL_NUM_NONUM1                 NC_("STR_POOLCOLL_NUM_NONUM1", "Numbering 1 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL2S                NC_("STR_POOLCOLL_NUM_LEVEL2S", "Numbering 2 Start")
+#define STR_POOLCOLL_NUM_LEVEL2                 NC_("STR_POOLCOLL_NUM_LEVEL2", "Numbering 2")
+#define STR_POOLCOLL_NUM_LEVEL2E                NC_("STR_POOLCOLL_NUM_LEVEL2E", "Numbering 2 End")
+#define STR_POOLCOLL_NUM_NONUM2                 NC_("STR_POOLCOLL_NUM_NONUM2", "Numbering 2 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL3S                NC_("STR_POOLCOLL_NUM_LEVEL3S", "Numbering 3 Start")
+#define STR_POOLCOLL_NUM_LEVEL3                 NC_("STR_POOLCOLL_NUM_LEVEL3", "Numbering 3")
+#define STR_POOLCOLL_NUM_LEVEL3E                NC_("STR_POOLCOLL_NUM_LEVEL3E", "Numbering 3 End")
+#define STR_POOLCOLL_NUM_NONUM3                 NC_("STR_POOLCOLL_NUM_NONUM3", "Numbering 3 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL4S                NC_("STR_POOLCOLL_NUM_LEVEL4S", "Numbering 4 Start")
+#define STR_POOLCOLL_NUM_LEVEL4                 NC_("STR_POOLCOLL_NUM_LEVEL4", "Numbering 4")
+#define STR_POOLCOLL_NUM_LEVEL4E                NC_("STR_POOLCOLL_NUM_LEVEL4E", "Numbering 4 End")
+#define STR_POOLCOLL_NUM_NONUM4                 NC_("STR_POOLCOLL_NUM_NONUM4", "Numbering 4 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL5S                NC_("STR_POOLCOLL_NUM_LEVEL5S", "Numbering 5 Start")
+#define STR_POOLCOLL_NUM_LEVEL5                 NC_("STR_POOLCOLL_NUM_LEVEL5", "Numbering 5")
+#define STR_POOLCOLL_NUM_LEVEL5E                NC_("STR_POOLCOLL_NUM_LEVEL5E", "Numbering 5 End")
+#define STR_POOLCOLL_NUM_NONUM5                 NC_("STR_POOLCOLL_NUM_NONUM5", "Numbering 5 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL1S                NC_("STR_POOLCOLL_BUL_LEVEL1S", "List 1 Start")
+#define STR_POOLCOLL_BUL_LEVEL1                 NC_("STR_POOLCOLL_BUL_LEVEL1", "List 1")
+#define STR_POOLCOLL_BUL_LEVEL1E                NC_("STR_POOLCOLL_BUL_LEVEL1E", "List 1 End")
+#define STR_POOLCOLL_BUL_NONUM1                 NC_("STR_POOLCOLL_BUL_NONUM1", "List 1 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL2S                NC_("STR_POOLCOLL_BUL_LEVEL2S", "List 2 Start")
+#define STR_POOLCOLL_BUL_LEVEL2                 NC_("STR_POOLCOLL_BUL_LEVEL2", "List 2")
+#define STR_POOLCOLL_BUL_LEVEL2E                NC_("STR_POOLCOLL_BUL_LEVEL2E", "List 2 End")
+#define STR_POOLCOLL_BUL_NONUM2                 NC_("STR_POOLCOLL_BUL_NONUM2", "List 2 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL3S                NC_("STR_POOLCOLL_BUL_LEVEL3S", "List 3 Start")
+#define STR_POOLCOLL_BUL_LEVEL3                 NC_("STR_POOLCOLL_BUL_LEVEL3", "List 3")
+#define STR_POOLCOLL_BUL_LEVEL3E                NC_("STR_POOLCOLL_BUL_LEVEL3E", "List 3 End")
+#define STR_POOLCOLL_BUL_NONUM3                 NC_("STR_POOLCOLL_BUL_NONUM3", "List 3 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL4S                NC_("STR_POOLCOLL_BUL_LEVEL4S", "List 4 Start")
+#define STR_POOLCOLL_BUL_LEVEL4                 NC_("STR_POOLCOLL_BUL_LEVEL4", "List 4")
+#define STR_POOLCOLL_BUL_LEVEL4E                NC_("STR_POOLCOLL_BUL_LEVEL4E", "List 4 End")
+#define STR_POOLCOLL_BUL_NONUM4                 NC_("STR_POOLCOLL_BUL_NONUM4", "List 4 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL5S                NC_("STR_POOLCOLL_BUL_LEVEL5S", "List 5 Start")
+#define STR_POOLCOLL_BUL_LEVEL5                 NC_("STR_POOLCOLL_BUL_LEVEL5", "List 5")
+#define STR_POOLCOLL_BUL_LEVEL5E                NC_("STR_POOLCOLL_BUL_LEVEL5E", "List 5 End")
+#define STR_POOLCOLL_BUL_NONUM5                 NC_("STR_POOLCOLL_BUL_NONUM5", "List 5 Cont.")
+#define STR_POOLCOLL_HEADER                     NC_("STR_POOLCOLL_HEADER", "Header")
+#define STR_POOLCOLL_HEADERL                    NC_("STR_POOLCOLL_HEADERL", "Header Left")
+#define STR_POOLCOLL_HEADERR                    NC_("STR_POOLCOLL_HEADERR", "Header Right")
+#define STR_POOLCOLL_FOOTER                     NC_("STR_POOLCOLL_FOOTER", "Footer")
+#define STR_POOLCOLL_FOOTERL                    NC_("STR_POOLCOLL_FOOTERL", "Footer Left")
+#define STR_POOLCOLL_FOOTERR                    NC_("STR_POOLCOLL_FOOTERR", "Footer Right")
+#define STR_POOLCOLL_TABLE                      NC_("STR_POOLCOLL_TABLE", "Table Contents")
+#define STR_POOLCOLL_TABLE_HDLN                 NC_("STR_POOLCOLL_TABLE_HDLN", "Table Heading")
+#define STR_POOLCOLL_FRAME                      NC_("STR_POOLCOLL_FRAME", "Frame Contents")
+#define STR_POOLCOLL_FOOTNOTE                   NC_("STR_POOLCOLL_FOOTNOTE", "Footnote")
+#define STR_POOLCOLL_ENDNOTE                    NC_("STR_POOLCOLL_ENDNOTE", "Endnote")
+#define STR_POOLCOLL_LABEL                      NC_("STR_POOLCOLL_LABEL", "Caption")
+#define STR_POOLCOLL_LABEL_ABB                  NC_("STR_POOLCOLL_LABEL_ABB", "Illustration")
+#define STR_POOLCOLL_LABEL_TABLE                NC_("STR_POOLCOLL_LABEL_TABLE", "Table")
+#define STR_POOLCOLL_LABEL_FRAME                NC_("STR_POOLCOLL_LABEL_FRAME", "Text")
+#define STR_POOLCOLL_LABEL_DRAWING              NC_("STR_POOLCOLL_LABEL_DRAWING", "Drawing")
+#define STR_POOLCOLL_JAKETADRESS                NC_("STR_POOLCOLL_JAKETADRESS", "Addressee")
+#define STR_POOLCOLL_SENDADRESS                 NC_("STR_POOLCOLL_SENDADRESS", "Sender")
+#define STR_POOLCOLL_TOX_IDXH                   NC_("STR_POOLCOLL_TOX_IDXH", "Index Heading")
+#define STR_POOLCOLL_TOX_IDX1                   NC_("STR_POOLCOLL_TOX_IDX1", "Index 1")
+#define STR_POOLCOLL_TOX_IDX2                   NC_("STR_POOLCOLL_TOX_IDX2", "Index 2")
+#define STR_POOLCOLL_TOX_IDX3                   NC_("STR_POOLCOLL_TOX_IDX3", "Index 3")
+#define STR_POOLCOLL_TOX_IDXBREAK               NC_("STR_POOLCOLL_TOX_IDXBREAK", "Index Separator")
+#define STR_POOLCOLL_TOX_CNTNTH                 NC_("STR_POOLCOLL_TOX_CNTNTH", "Contents Heading")
+#define STR_POOLCOLL_TOX_CNTNT1                 NC_("STR_POOLCOLL_TOX_CNTNT1", "Contents 1")
+#define STR_POOLCOLL_TOX_CNTNT2                 NC_("STR_POOLCOLL_TOX_CNTNT2", "Contents 2")
+#define STR_POOLCOLL_TOX_CNTNT3                 NC_("STR_POOLCOLL_TOX_CNTNT3", "Contents 3")
+#define STR_POOLCOLL_TOX_CNTNT4                 NC_("STR_POOLCOLL_TOX_CNTNT4", "Contents 4")
+#define STR_POOLCOLL_TOX_CNTNT5                 NC_("STR_POOLCOLL_TOX_CNTNT5", "Contents 5")
+#define STR_POOLCOLL_TOX_CNTNT6                 NC_("STR_POOLCOLL_TOX_CNTNT6", "Contents 6")
+#define STR_POOLCOLL_TOX_CNTNT7                 NC_("STR_POOLCOLL_TOX_CNTNT7", "Contents 7")
+#define STR_POOLCOLL_TOX_CNTNT8                 NC_("STR_POOLCOLL_TOX_CNTNT8", "Contents 8")
+#define STR_POOLCOLL_TOX_CNTNT9                 NC_("STR_POOLCOLL_TOX_CNTNT9", "Contents 9")
+#define STR_POOLCOLL_TOX_CNTNT10                NC_("STR_POOLCOLL_TOX_CNTNT10", "Contents 10")
+#define STR_POOLCOLL_TOX_USERH                  NC_("STR_POOLCOLL_TOX_USERH", "User Index Heading")
+#define STR_POOLCOLL_TOX_USER1                  NC_("STR_POOLCOLL_TOX_USER1", "User Index 1")
+#define STR_POOLCOLL_TOX_USER2                  NC_("STR_POOLCOLL_TOX_USER2", "User Index 2")
+#define STR_POOLCOLL_TOX_USER3                  NC_("STR_POOLCOLL_TOX_USER3", "User Index 3")
+#define STR_POOLCOLL_TOX_USER4                  NC_("STR_POOLCOLL_TOX_USER4", "User Index 4")
+#define STR_POOLCOLL_TOX_USER5                  NC_("STR_POOLCOLL_TOX_USER5", "User Index 5")
+#define STR_POOLCOLL_TOX_USER6                  NC_("STR_POOLCOLL_TOX_USER6", "User Index 6")
+#define STR_POOLCOLL_TOX_USER7                  NC_("STR_POOLCOLL_TOX_USER7", "User Index 7")
+#define STR_POOLCOLL_TOX_USER8                  NC_("STR_POOLCOLL_TOX_USER8", "User Index 8")
+#define STR_POOLCOLL_TOX_USER9                  NC_("STR_POOLCOLL_TOX_USER9", "User Index 9")
+#define STR_POOLCOLL_TOX_USER10                 NC_("STR_POOLCOLL_TOX_USER10", "User Index 10")
+#define STR_POOLCOLL_TOX_CITATION               NC_("STR_POOLCOLL_TOX_CITATION", "Citation")
+#define STR_POOLCOLL_TOX_ILLUSH                 NC_("STR_POOLCOLL_TOX_ILLUSH", "Illustration Index Heading")
+#define STR_POOLCOLL_TOX_ILLUS1                 NC_("STR_POOLCOLL_TOX_ILLUS1", "Illustration Index 1")
+#define STR_POOLCOLL_TOX_OBJECTH                NC_("STR_POOLCOLL_TOX_OBJECTH", "Object Index Heading")
+#define STR_POOLCOLL_TOX_OBJECT1                NC_("STR_POOLCOLL_TOX_OBJECT1", "Object Index 1")
+#define STR_POOLCOLL_TOX_TABLESH                NC_("STR_POOLCOLL_TOX_TABLESH", "Table Index Heading")
+#define STR_POOLCOLL_TOX_TABLES1                NC_("STR_POOLCOLL_TOX_TABLES1", "Table Index 1")
+#define STR_POOLCOLL_TOX_AUTHORITIESH           NC_("STR_POOLCOLL_TOX_AUTHORITIESH", "Bibliography Heading")
+#define STR_POOLCOLL_TOX_AUTHORITIES1           NC_("STR_POOLCOLL_TOX_AUTHORITIES1", "Bibliography 1")
+// Document title style, not to be confused with Heading style
+#define STR_POOLCOLL_DOC_TITEL                  NC_("STR_POOLCOLL_DOC_TITEL", "Title")
+#define STR_POOLCOLL_DOC_SUBTITEL               NC_("STR_POOLCOLL_DOC_SUBTITEL", "Subtitle")
+#define STR_POOLCOLL_HTML_BLOCKQUOTE            NC_("STR_POOLCOLL_HTML_BLOCKQUOTE", "Quotations")
+#define STR_POOLCOLL_HTML_PRE                   NC_("STR_POOLCOLL_HTML_PRE", "Preformatted Text")
+#define STR_POOLCOLL_HTML_HR                    NC_("STR_POOLCOLL_HTML_HR", "Horizontal Line")
+#define STR_POOLCOLL_HTML_DD                    NC_("STR_POOLCOLL_HTML_DD", "List Contents")
+#define STR_POOLCOLL_HTML_DT                    NC_("STR_POOLCOLL_HTML_DT", "List Heading")
+//page style names
+#define STR_POOLPAGE_STANDARD                   NC_("STR_POOLPAGE_STANDARD", "Default Style")
+#define STR_POOLPAGE_FIRST                      NC_("STR_POOLPAGE_FIRST", "First Page")
+#define STR_POOLPAGE_LEFT                       NC_("STR_POOLPAGE_LEFT", "Left Page")
+#define STR_POOLPAGE_RIGHT                      NC_("STR_POOLPAGE_RIGHT", "Right Page")
+#define STR_POOLPAGE_JAKET                      NC_("STR_POOLPAGE_JAKET", "Envelope")
+#define STR_POOLPAGE_REGISTER                   NC_("STR_POOLPAGE_REGISTER", "Index")
+#define STR_POOLPAGE_HTML                       NC_("STR_POOLPAGE_HTML", "HTML")
+#define STR_POOLPAGE_FOOTNOTE                   NC_("STR_POOLPAGE_FOOTNOTE", "Footnote")
+#define STR_POOLPAGE_ENDNOTE                    NC_("STR_POOLPAGE_ENDNOTE", "Endnote")
+// Numbering rules
+#define STR_POOLNUMRULE_NUM1                    NC_("STR_POOLNUMRULE_NUM1", "Numbering 1")
+#define STR_POOLNUMRULE_NUM2                    NC_("STR_POOLNUMRULE_NUM2", "Numbering 2")
+#define STR_POOLNUMRULE_NUM3                    NC_("STR_POOLNUMRULE_NUM3", "Numbering 3")
+#define STR_POOLNUMRULE_NUM4                    NC_("STR_POOLNUMRULE_NUM4", "Numbering 4")
+#define STR_POOLNUMRULE_NUM5                    NC_("STR_POOLNUMRULE_NUM5", "Numbering 5")
+#define STR_POOLNUMRULE_BUL1                    NC_("STR_POOLNUMRULE_BUL1", "List 1")
+#define STR_POOLNUMRULE_BUL2                    NC_("STR_POOLNUMRULE_BUL2", "List 2")
+#define STR_POOLNUMRULE_BUL3                    NC_("STR_POOLNUMRULE_BUL3", "List 3")
+#define STR_POOLNUMRULE_BUL4                    NC_("STR_POOLNUMRULE_BUL4", "List 4")
+#define STR_POOLNUMRULE_BUL5                    NC_("STR_POOLNUMRULE_BUL5", "List 5")
+#define STR_POOLCHR_RUBYTEXT                    NC_("STR_POOLCHR_RUBYTEXT", "Rubies")
+#define STR_COLUMN_VALUESET_ITEM0               NC_("STR_COLUMN_VALUESET_ITEM0", "1 column")
+#define STR_COLUMN_VALUESET_ITEM1               NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size")
+#define STR_COLUMN_VALUESET_ITEM2               NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size")
+#define STR_COLUMN_VALUESET_ITEM3               NC_("STR_COLUMN_VALUESET_ITEM3", "2 columns with different size (left > right)")
+#define STR_COLUMN_VALUESET_ITEM4               NC_("STR_COLUMN_VALUESET_ITEM4", "2 columns with different size (left < right)")
+#define STR_POOLCHR_VERT_NUM                    NC_("STR_POOLCHR_VERT_NUM", "Vertical Numbering Symbols")
+// Table styles
+#define STR_TABSTYLE_DEFAULT                    NC_("STR_TABSTYLE_DEFAULT", "Default Style")
+#define STR_TABSTYLE_3D                         NC_("STR_TABSTYLE_3D", "3D")
+#define STR_TABSTYLE_BLACK1                     NC_("STR_TABSTYLE_BLACK1", "Black 1")
+#define STR_TABSTYLE_BLACK2                     NC_("STR_TABSTYLE_BLACK2", "Black 2")
+#define STR_TABSTYLE_BLUE                       NC_("STR_TABSTYLE_BLUE", "Blue")
+#define STR_TABSTYLE_BROWN                      NC_("STR_TABSTYLE_BROWN", "Brown")
+#define STR_TABSTYLE_CURRENCY                   NC_("STR_TABSTYLE_CURRENCY", "Currency")
+#define STR_TABSTYLE_CURRENCY_3D                NC_("STR_TABSTYLE_CURRENCY_3D", "Currency 3D")
+#define STR_TABSTYLE_CURRENCY_GRAY              NC_("STR_TABSTYLE_CURRENCY_GRAY", "Currency Gray")
+#define STR_TABSTYLE_CURRENCY_LAVENDER          NC_("STR_TABSTYLE_CURRENCY_LAVENDER", "Currency Lavender")
+#define STR_TABSTYLE_CURRENCY_TURQUOISE         NC_("STR_TABSTYLE_CURRENCY_TURQUOISE", "Currency Turquoise")
+#define STR_TABSTYLE_GRAY                       NC_("STR_TABSTYLE_GRAY", "Gray")
+#define STR_TABSTYLE_GREEN                      NC_("STR_TABSTYLE_GREEN", "Green")
+#define STR_TABSTYLE_LAVENDER                   NC_("STR_TABSTYLE_LAVENDER", "Lavender")
+#define STR_TABSTYLE_RED                        NC_("STR_TABSTYLE_RED", "Red")
+#define STR_TABSTYLE_TURQUOISE                  NC_("STR_TABSTYLE_TURQUOISE", "Turquoise")
+#define STR_TABSTYLE_YELLOW                     NC_("STR_TABSTYLE_YELLOW", "Yellow")
+
+#define STR_PARAGRAPHSTYLEFAMILY                NC_("STR_PARAGRAPHSTYLEFAMILY", "Paragraph Styles")
+#define STR_CHARACTERSTYLEFAMILY                NC_("STR_CHARACTERSTYLEFAMILY", "Character Styles")
+#define STR_FRAMESTYLEFAMILY                    NC_("STR_FRAMESTYLEFAMILY", "Frame Styles")
+#define STR_PAGESTYLEFAMILY                     NC_("STR_PAGESTYLEFAMILY", "Page Styles")
+#define STR_LISTSTYLEFAMILY                     NC_("STR_LISTSTYLEFAMILY", "List Styles")
+#define STR_TABLESTYLEFAMILY                    NC_("STR_TABLESTYLEFAMILY", "Table Styles")
+#define STR_ENV_TITLE                           NC_("STR_ENV_TITLE", "Envelope")
+#define STR_LAB_TITLE                           NC_("STR_LAB_TITLE", "Labels")
+// ShortName!!!
+#define STR_HUMAN_SWDOC_NAME                    NC_("STR_HUMAN_SWDOC_NAME", "Text")
+#define STR_WRITER_DOCUMENT_FULLTYPE            NC_("STR_WRITER_DOCUMENT_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Text Document")
+#define STR_CANTOPEN                            NC_("STR_CANTOPEN", "Cannot open document.")
+#define STR_CANTCREATE                          NC_("STR_CANTCREATE", "Can't create document.")
+#define STR_DLLNOTFOUND                         NC_("STR_DLLNOTFOUND", "Filter not found.")
+#define STR_LOAD_GLOBAL_DOC                     NC_("STR_LOAD_GLOBAL_DOC", "Name and Path of Master Document")
+#define STR_LOAD_HTML_DOC                       NC_("STR_LOAD_HTML_DOC", "Name and Path of the HTML Document")
+#define STR_JAVA_EDIT                           NC_("STR_JAVA_EDIT", "Edit Script")
+#define STR_REMOVE_WARNING                      NC_("STR_REMOVE_WARNING", "The following characters are not valid and have been removed: ")
+#define STR_BOOKMARK_DEF_NAME                   NC_("STR_BOOKMARK_DEF_NAME", "Bookmark")
+#define STR_BOOKMARK_NAME                       NC_("STR_BOOKMARK_NAME", "Name")
+#define STR_BOOKMARK_TEXT                       NC_("STR_BOOKMARK_TEXT", "Text")
+#define SW_STR_NONE                             NC_("SW_STR_NONE", "[None]")
+#define STR_CAPTION_BEGINNING                   NC_("STR_CAPTION_BEGINNING", "Start")
+#define STR_CAPTION_END                         NC_("STR_CAPTION_END", "End")
+#define STR_CAPTION_ABOVE                       NC_("STR_CAPTION_ABOVE", "Above")
+#define STR_CAPTION_BELOW                       NC_("STR_CAPTION_BELOW", "Below")
+#define SW_STR_READONLY                         NC_("SW_STR_READONLY", "read-only")
+#define STR_READONLY_PATH                       NC_("STR_READONLY_PATH", "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?")
+#define STR_DOC_STAT                            NC_("STR_DOC_STAT", "Statistics")
+// Statusbar-titles
+#define STR_STATSTR_W4WREAD                     NC_("STR_STATSTR_W4WREAD", "Importing document...")
+#define STR_STATSTR_W4WWRITE                    NC_("STR_STATSTR_W4WWRITE", "Exporting document...")
+#define STR_STATSTR_SWGREAD                     NC_("STR_STATSTR_SWGREAD", "Loading document...")
+#define STR_STATSTR_SWGWRITE                    NC_("STR_STATSTR_SWGWRITE", "Saving document...")
+#define STR_STATSTR_REFORMAT                    NC_("STR_STATSTR_REFORMAT", "Repagination...")
+#define STR_STATSTR_AUTOFORMAT                  NC_("STR_STATSTR_AUTOFORMAT", "Formatting document automatically...")
+#define STR_STATSTR_SEARCH                      NC_("STR_STATSTR_SEARCH", "Search...")
+#define STR_STATSTR_LETTER                      NC_("STR_STATSTR_LETTER", "Letter")
+#define STR_STATSTR_SPELL                       NC_("STR_STATSTR_SPELL", "Spellcheck...")
+#define STR_STATSTR_HYPHEN                      NC_("STR_STATSTR_HYPHEN", "Hyphenation...")
+#define STR_STATSTR_TOX_INSERT                  NC_("STR_STATSTR_TOX_INSERT", "Inserting Index...")
+#define STR_STATSTR_TOX_UPDATE                  NC_("STR_STATSTR_TOX_UPDATE", "Updating Index...")
+#define STR_STATSTR_SUMMARY                     NC_("STR_STATSTR_SUMMARY", "Creating abstract...")
+#define STR_STATSTR_SWGPRTOLENOTIFY             NC_("STR_STATSTR_SWGPRTOLENOTIFY", "Adapt Objects...")
+#define STR_TABLE_DEFNAME                       NC_("STR_TABLE_DEFNAME", "Table")
+#define STR_GRAPHIC_DEFNAME                     NC_("STR_GRAPHIC_DEFNAME", "Image")
+#define STR_OBJECT_DEFNAME                      NC_("STR_OBJECT_DEFNAME", "Object")
+#define STR_FRAME_DEFNAME                       NC_("STR_FRAME_DEFNAME", "Frame")
+#define STR_SHAPE_DEFNAME                       NC_("STR_SHAPE_DEFNAME", "Shape")
+#define STR_REGION_DEFNAME                      NC_("STR_REGION_DEFNAME", "Section")
+#define STR_NUMRULE_DEFNAME                     NC_("STR_NUMRULE_DEFNAME", "Numbering")
+#define STR_EMPTYPAGE                           NC_("STR_EMPTYPAGE", "blank page")
+#define STR_ABSTRACT_TITLE                      NC_("STR_ABSTRACT_TITLE", "Abstract: ")
+#define STR_FDLG_TEMPLATE_NAME                  NC_("STR_FDLG_TEMPLATE_NAME", "separated by: ")
+#define STR_FDLG_OUTLINE_LEVEL                  NC_("STR_FDLG_OUTLINE_LEVEL", "Outline: Level ")
+#define STR_FDLG_STYLE                          NC_("STR_FDLG_STYLE", "Style: ")
+#define STR_PAGEOFFSET                          NC_("STR_PAGEOFFSET", "Page number: ")
+#define STR_PAGEBREAK                           NC_("STR_PAGEBREAK", "Break before new page")
+#define STR_WESTERN_FONT                        NC_("STR_WESTERN_FONT", "Western text: ")
+#define STR_CJK_FONT                            NC_("STR_CJK_FONT", "Asian text: ")
+#define STR_REDLINE_UNKNOWN_AUTHOR              NC_("STR_REDLINE_UNKNOWN_AUTHOR", "Unknown Author")
+#define STR_DELETE_NOTE_AUTHOR                  NC_("STR_DELETE_NOTE_AUTHOR", "Delete ~All Comments by $1")
+#define STR_HIDE_NOTE_AUTHOR                    NC_("STR_HIDE_NOTE_AUTHOR", "H~ide All Comments by $1")
+#define STR_OUTLINE_NUMBERING                   NC_("STR_OUTLINE_NUMBERING", "Outline Numbering")
+#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION    NC_("STR_STATUSBAR_WORDCOUNT_NO_SELECTION", "%1 words, %2 characters")
+#define STR_STATUSBAR_WORDCOUNT                 NC_("STR_STATUSBAR_WORDCOUNT", "%1 words, %2 characters selected")
+#define STR_CONVERT_TEXT_TABLE                  NC_("STR_CONVERT_TEXT_TABLE", "Convert Text to Table")
+#define STR_ADD_AUTOFORMAT_TITLE                NC_("STR_ADD_AUTOFORMAT_TITLE", "Add AutoFormat")
+#define STR_ADD_AUTOFORMAT_LABEL                NC_("STR_ADD_AUTOFORMAT_LABEL", "Name")
+#define STR_DEL_AUTOFORMAT_TITLE                NC_("STR_DEL_AUTOFORMAT_TITLE", "Delete AutoFormat")
+#define STR_DEL_AUTOFORMAT_MSG                  NC_("STR_DEL_AUTOFORMAT_MSG", "The following AutoFormat entry will be deleted:")
+#define STR_RENAME_AUTOFORMAT_TITLE             NC_("STR_RENAME_AUTOFORMAT_TITLE", "Rename AutoFormat")
+#define STR_BTN_AUTOFORMAT_CLOSE                NC_("STR_BTN_AUTOFORMAT_CLOSE", "~Close")
+#define STR_JAN                                 NC_("STR_JAN", "Jan")
+#define STR_FEB                                 NC_("STR_FEB", "Feb")
+#define STR_MAR                                 NC_("STR_MAR", "Mar")
+#define STR_NORTH                               NC_("STR_NORTH", "North")
+#define STR_MID                                 NC_("STR_MID", "Mid")
+#define STR_SOUTH                               NC_("STR_SOUTH", "South")
+#define STR_SUM                                 NC_("STR_SUM", "Sum")
+#define STR_INVALID_AUTOFORMAT_NAME             NC_("STR_INVALID_AUTOFORMAT_NAME", "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name.")
+#define STR_NUMERIC                             NC_("STR_NUMERIC", "Numeric")
+#define STR_ROW                                 NC_("STR_ROW", "Rows")
+#define STR_COL                                 NC_("STR_COL", "Column")
+#define STR_AUTHMRK_EDIT                        NC_("STR_AUTHMRK_EDIT", "Edit Bibliography Entry")
+#define STR_AUTHMRK_INSERT                      NC_("STR_AUTHMRK_INSERT", "Insert Bibliography Entry")
+#define STR_ACCESS_PAGESETUP_SPACING            NC_("STR_ACCESS_PAGESETUP_SPACING", "Spacing between %1 and %2")
+#define STR_ACCESS_COLUMN_WIDTH                 NC_("STR_ACCESS_COLUMN_WIDTH", "Column %1 Width")
+#define STR_CAPTION_TABLE                       NC_("STR_CAPTION_TABLE", "%PRODUCTNAME Writer Table")
+#define STR_CAPTION_FRAME                       NC_("STR_CAPTION_FRAME", "%PRODUCTNAME Writer Frame")
+#define STR_CAPTION_GRAPHIC                     NC_("STR_CAPTION_GRAPHIC", "%PRODUCTNAME Writer Image")
+#define STR_CAPTION_OLE                         NC_("STR_CAPTION_OLE", "Other OLE Objects")
+#define STR_WRONG_TABLENAME                     NC_("STR_WRONG_TABLENAME", "The name of the table must not contain spaces.")
+#define STR_ERR_TABLE_MERGE                     NC_("STR_ERR_TABLE_MERGE", "Selected table cells are too complex to merge.")
+#define STR_SRTERR                              NC_("STR_SRTERR", "Cannot sort selection")
+
+// Miscellaneous
+#define STR_EVENT_OBJECT_SELECT                 NC_("STR_EVENT_OBJECT_SELECT", "Click object")
+#define STR_EVENT_START_INS_GLOSSARY            NC_("STR_EVENT_START_INS_GLOSSARY", "Before inserting AutoText")
+#define STR_EVENT_END_INS_GLOSSARY              NC_("STR_EVENT_END_INS_GLOSSARY", "After inserting AutoText")
+#define STR_EVENT_MOUSEOVER_OBJECT              NC_("STR_EVENT_MOUSEOVER_OBJECT", "Mouse over object")
+#define STR_EVENT_MOUSECLICK_OBJECT             NC_("STR_EVENT_MOUSECLICK_OBJECT", "Trigger hyperlink")
+#define STR_EVENT_MOUSEOUT_OBJECT               NC_("STR_EVENT_MOUSEOUT_OBJECT", "Mouse leaves object")
+#define STR_EVENT_IMAGE_LOAD                    NC_("STR_EVENT_IMAGE_LOAD", "Image loaded successfully")
+#define STR_EVENT_IMAGE_ABORT                   NC_("STR_EVENT_IMAGE_ABORT", "Image loading terminated")
+#define STR_EVENT_IMAGE_ERROR                   NC_("STR_EVENT_IMAGE_ERROR", "Could not load image")
+#define STR_EVENT_FRM_KEYINPUT_A                NC_("STR_EVENT_FRM_KEYINPUT_A", "Input of alphanumeric characters")
+#define STR_EVENT_FRM_KEYINPUT_NOA              NC_("STR_EVENT_FRM_KEYINPUT_NOA", "Input of non-alphanumeric characters")
+#define STR_EVENT_FRM_RESIZE                    NC_("STR_EVENT_FRM_RESIZE", "Resize frame")
+#define STR_EVENT_FRM_MOVE                      NC_("STR_EVENT_FRM_MOVE", "Move frame")
+#define STR_CONTENT_TYPE_OUTLINE                NC_("STR_CONTENT_TYPE_OUTLINE", "Headings")
+#define STR_CONTENT_TYPE_TABLE                  NC_("STR_CONTENT_TYPE_TABLE", "Tables")
+#define STR_CONTENT_TYPE_FRAME                  NC_("STR_CONTENT_TYPE_FRAME", "Text frames")
+#define STR_CONTENT_TYPE_GRAPHIC                NC_("STR_CONTENT_TYPE_GRAPHIC", "Images")
+#define STR_CONTENT_TYPE_OLE                    NC_("STR_CONTENT_TYPE_OLE", "OLE objects")
+#define STR_CONTENT_TYPE_BOOKMARK               NC_("STR_CONTENT_TYPE_BOOKMARK", "Bookmarks")
+#define STR_CONTENT_TYPE_REGION                 NC_("STR_CONTENT_TYPE_REGION", "Sections")
+#define STR_CONTENT_TYPE_URLFIELD               NC_("STR_CONTENT_TYPE_URLFIELD", "Hyperlinks")
+#define STR_CONTENT_TYPE_REFERENCE              NC_("STR_CONTENT_TYPE_REFERENCE", "References")
+#define STR_CONTENT_TYPE_INDEX                  NC_("STR_CONTENT_TYPE_INDEX", "Indexes")
+#define STR_CONTENT_TYPE_DRAWOBJECT             NC_("STR_CONTENT_TYPE_DRAWOBJECT", "Drawing objects")
+#define STR_CONTENT_TYPE_POSTIT                 NC_("STR_CONTENT_TYPE_POSTIT", "Comments")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING1          NC_("STR_IDXEXAMPLE_IDXTXT_HEADING1", "Heading 1")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY1            NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY1", "This is the content from the first chapter. This is a user directory entry.")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING11         NC_("STR_IDXEXAMPLE_IDXTXT_HEADING11", "Heading 1.1")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY11           NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY11", "This is the content from chapter 1.1. This is the entry for the table of contents.")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING12         NC_("STR_IDXEXAMPLE_IDXTXT_HEADING12", "Heading 1.2")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY12           NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY12", "This is the content from chapter 1.2. This keyword is a main entry.")
+#define STR_IDXEXAMPLE_IDXTXT_TABLE1            NC_("STR_IDXEXAMPLE_IDXTXT_TABLE1", "Table 1: This is table 1")
+#define STR_IDXEXAMPLE_IDXTXT_IMAGE1            NC_("STR_IDXEXAMPLE_IDXTXT_IMAGE1", "Image 1: This is image 1")
+#define STR_CONTENT_TYPE_SINGLE_OUTLINE         NC_("STR_CONTENT_TYPE_SINGLE_OUTLINE", "Heading")
+#define STR_CONTENT_TYPE_SINGLE_TABLE           NC_("STR_CONTENT_TYPE_SINGLE_TABLE", "Table")
+#define STR_CONTENT_TYPE_SINGLE_FRAME           NC_("STR_CONTENT_TYPE_SINGLE_FRAME", "Text frame")
+#define STR_CONTENT_TYPE_SINGLE_GRAPHIC         NC_("STR_CONTENT_TYPE_SINGLE_GRAPHIC", "Image")
+#define STR_CONTENT_TYPE_SINGLE_OLE             NC_("STR_CONTENT_TYPE_SINGLE_OLE", "OLE object")
+#define STR_CONTENT_TYPE_SINGLE_BOOKMARK        NC_("STR_CONTENT_TYPE_SINGLE_BOOKMARK", "Bookmark")
+#define STR_CONTENT_TYPE_SINGLE_REGION          NC_("STR_CONTENT_TYPE_SINGLE_REGION", "Section")
+#define STR_CONTENT_TYPE_SINGLE_URLFIELD        NC_("STR_CONTENT_TYPE_SINGLE_URLFIELD", "Hyperlink")
+#define STR_CONTENT_TYPE_SINGLE_REFERENCE       NC_("STR_CONTENT_TYPE_SINGLE_REFERENCE", "Reference")
+#define STR_CONTENT_TYPE_SINGLE_INDEX           NC_("STR_CONTENT_TYPE_SINGLE_INDEX", "Index")
+#define STR_CONTENT_TYPE_SINGLE_POSTIT          NC_("STR_CONTENT_TYPE_SINGLE_POSTIT", "Comment")
+#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT      NC_("STR_CONTENT_TYPE_SINGLE_DRAWOBJECT", "Draw object")
+#define STR_DEFINE_NUMBERFORMAT                 NC_("STR_DEFINE_NUMBERFORMAT", "Additional formats...")
+#define RID_STR_SYSTEM                          NC_("RID_STR_SYSTEM", "[System]")
+#define STR_MULT_INTERACT_HYPH_WARN             NC_("STR_MULT_INTERACT_HYPH_WARN", "The interactive hyphenation is already active\nin a different document")
+#define STR_HYPH_TITLE                          NC_("STR_HYPH_TITLE", "Hyphenation")
+
+// Undo
+#define STR_CANT_UNDO                           NC_("STR_CANT_UNDO", "not possible")
+#define STR_DELETE_UNDO                         NC_("STR_DELETE_UNDO", "Delete $1")
+#define STR_INSERT_UNDO                         NC_("STR_INSERT_UNDO", "Insert $1")
+#define STR_OVR_UNDO                            NC_("STR_OVR_UNDO", "Overwrite: $1")
+#define STR_SPLITNODE_UNDO                      NC_("STR_SPLITNODE_UNDO", "New Paragraph")
+#define STR_MOVE_UNDO                           NC_("STR_MOVE_UNDO", "Move")
+#define STR_INSATTR_UNDO                        NC_("STR_INSATTR_UNDO", "Apply attributes")
+#define STR_SETFMTCOLL_UNDO                     NC_("STR_SETFMTCOLL_UNDO", "Apply Styles: $1")
+#define STR_RESET_ATTR_UNDO                     NC_("STR_RESET_ATTR_UNDO", "Reset attributes")
+#define STR_INSFMT_ATTR_UNDO                    NC_("STR_INSFMT_ATTR_UNDO", "Change style: $1")
+#define STR_INSERT_DOC_UNDO                     NC_("STR_INSERT_DOC_UNDO", "Insert file")
+#define STR_INSERT_GLOSSARY                     NC_("STR_INSERT_GLOSSARY", "Insert AutoText")
+#define STR_DELBOOKMARK                         NC_("STR_DELBOOKMARK", "Delete bookmark: $1")
+#define STR_INSBOOKMARK                         NC_("STR_INSBOOKMARK", "Insert bookmark: $1")
+#define STR_SORT_TBL                            NC_("STR_SORT_TBL", "Sort table")
+#define STR_SORT_TXT                            NC_("STR_SORT_TXT", "Sort text")
+#define STR_INSTABLE_UNDO                       NC_("STR_INSTABLE_UNDO", "Insert table: $1$2$3")
+#define STR_TEXTTOTABLE_UNDO                    NC_("STR_TEXTTOTABLE_UNDO", "Convert text -> table")
+#define STR_TABLETOTEXT_UNDO                    NC_("STR_TABLETOTEXT_UNDO", "Convert table -> text")
+#define STR_COPY_UNDO                           NC_("STR_COPY_UNDO", "Copy: $1")
+#define STR_REPLACE_UNDO                        NC_("STR_REPLACE_UNDO", "Replace $1 $2 $3")
+#define STR_INSERT_PAGE_BREAK_UNDO              NC_("STR_INSERT_PAGE_BREAK_UNDO", "Insert page break")
+#define STR_INSERT_COLUMN_BREAK_UNDO            NC_("STR_INSERT_COLUMN_BREAK_UNDO", "Insert column break")
+#define STR_PLAY_MACRO_UNDO                     NC_("STR_PLAY_MACRO_UNDO", "Run macro")
+#define STR_INSERT_ENV_UNDO                     NC_("STR_INSERT_ENV_UNDO", "Insert Envelope")
+#define STR_DRAG_AND_COPY                       NC_("STR_DRAG_AND_COPY", "Copy: $1")
+#define STR_DRAG_AND_MOVE                       NC_("STR_DRAG_AND_MOVE", "Move: $1")
+#define STR_INSERT_CHART                        NC_("STR_INSERT_CHART", "Insert %PRODUCTNAME Chart")
+#define STR_INSERTFLY                           NC_("STR_INSERTFLY", "Insert frame")
+#define STR_DELETEFLY                           NC_("STR_DELETEFLY", "Delete frame")
+#define STR_AUTOFORMAT                          NC_("STR_AUTOFORMAT", "AutoFormat")
+#define STR_TABLEHEADLINE                       NC_("STR_TABLEHEADLINE", "Table heading")
+#define STR_REPLACE                             NC_("STR_REPLACE", "Replace: $1 $2 $3")
+#define STR_INSERTSECTION                       NC_("STR_INSERTSECTION", "Insert section")
+#define STR_DELETESECTION                       NC_("STR_DELETESECTION", "Delete section")
+#define STR_CHANGESECTION                       NC_("STR_CHANGESECTION", "Modify section")
+#define STR_CHANGESECTPASSWD                    NC_("STR_CHANGESECTPASSWD", "Change password protection")
+#define STR_CHANGEDEFATTR                       NC_("STR_CHANGEDEFATTR", "Modify default values")
+#define STR_REPLACE_STYLE                       NC_("STR_REPLACE_STYLE", "Replace style: $1 $2 $3")
+#define STR_DELETE_PAGE_BREAK                   NC_("STR_DELETE_PAGE_BREAK", "Delete page break")
+#define STR_TEXT_CORRECTION                     NC_("STR_TEXT_CORRECTION", "Text Correction")
+#define STR_OUTLINE_LR                          NC_("STR_OUTLINE_LR", "Promote/demote outline")
+#define STR_OUTLINE_UD                          NC_("STR_OUTLINE_UD", "Move outline")
+#define STR_INSNUM                              NC_("STR_INSNUM", "Insert numbering")
+#define STR_NUMUP                               NC_("STR_NUMUP", "Promote level")
+#define STR_NUMDOWN                             NC_("STR_NUMDOWN", "Demote level")
+#define STR_MOVENUM                             NC_("STR_MOVENUM", "Move paragraphs")
+#define STR_INSERTDRAW                          NC_("STR_INSERTDRAW", "Insert drawing object: $1")
+#define STR_NUMORNONUM                          NC_("STR_NUMORNONUM", "Number On/Off")
+#define STR_INC_LEFTMARGIN                      NC_("STR_INC_LEFTMARGIN", "Increase Indent")
+#define STR_DEC_LEFTMARGIN                      NC_("STR_DEC_LEFTMARGIN", "Decrease indent")
+#define STR_INSERTLABEL                         NC_("STR_INSERTLABEL", "Insert caption: $1")
+#define STR_SETNUMRULESTART                     NC_("STR_SETNUMRULESTART", "Restart numbering")
+#define STR_CHANGEFTN                           NC_("STR_CHANGEFTN", "Modify footnote")
+#define STR_ACCEPT_REDLINE                      NC_("STR_ACCEPT_REDLINE", "Accept change: $1")
+#define STR_REJECT_REDLINE                      NC_("STR_REJECT_REDLINE", "Reject change: $1")
+#define STR_SPLIT_TABLE                         NC_("STR_SPLIT_TABLE", "Split Table")
+#define STR_DONTEXPAND                          NC_("STR_DONTEXPAND", "Stop attribute")
+#define STR_AUTOCORRECT                         NC_("STR_AUTOCORRECT", "AutoCorrect")
+#define STR_MERGE_TABLE                         NC_("STR_MERGE_TABLE", "Merge table")
+#define STR_TRANSLITERATE                       NC_("STR_TRANSLITERATE", "Change Case")
+#define STR_DELNUM                              NC_("STR_DELNUM", "Delete numbering")
+#define STR_DRAWUNDO                            NC_("STR_DRAWUNDO", "Drawing objects: $1")
+#define STR_DRAWGROUP                           NC_("STR_DRAWGROUP", "Group draw objects")
+#define STR_DRAWUNGROUP                         NC_("STR_DRAWUNGROUP", "Ungroup drawing objects")
+#define STR_DRAWDELETE                          NC_("STR_DRAWDELETE", "Delete drawing objects")
+#define STR_REREAD                              NC_("STR_REREAD", "Replace Image")
+#define STR_DELGRF                              NC_("STR_DELGRF", "Delete Image")
+#define STR_DELOLE                              NC_("STR_DELOLE", "Delete object")
+#define STR_TABLE_ATTR                          NC_("STR_TABLE_ATTR", "Apply table attributes")
+#define STR_UNDO_TABLE_AUTOFMT                  NC_("STR_UNDO_TABLE_AUTOFMT", "AutoFormat Table")
+#define STR_UNDO_TABLE_INSCOL                   NC_("STR_UNDO_TABLE_INSCOL", "Insert Column")
+#define STR_UNDO_TABLE_INSROW                   NC_("STR_UNDO_TABLE_INSROW", "Insert Row")
+#define STR_UNDO_TABLE_DELBOX                   NC_("STR_UNDO_TABLE_DELBOX", "Delete row/column")
+#define STR_UNDO_COL_DELETE                     NC_("STR_UNDO_COL_DELETE", "Delete column")
+#define STR_UNDO_ROW_DELETE                     NC_("STR_UNDO_ROW_DELETE", "Delete row")
+#define STR_UNDO_TABLE_SPLIT                    NC_("STR_UNDO_TABLE_SPLIT", "Split Cells")
+#define STR_UNDO_TABLE_MERGE                    NC_("STR_UNDO_TABLE_MERGE", "Merge Cells")
+#define STR_TABLE_NUMFORMAT                     NC_("STR_TABLE_NUMFORMAT", "Format cell")
+#define STR_INSERT_TOX                          NC_("STR_INSERT_TOX", "Insert index/table")
+#define STR_CLEAR_TOX_RANGE                     NC_("STR_CLEAR_TOX_RANGE", "Remove index/table")
+#define STR_TABLE_TBLCPYTBL                     NC_("STR_TABLE_TBLCPYTBL", "Copy table")
+#define STR_TABLE_CPYTBL                        NC_("STR_TABLE_CPYTBL", "Copy table")
+#define STR_INS_FROM_SHADOWCRSR                 NC_("STR_INS_FROM_SHADOWCRSR", "Set cursor")
+#define STR_UNDO_CHAIN                          NC_("STR_UNDO_CHAIN", "Link text frames")
+#define STR_UNDO_UNCHAIN                        NC_("STR_UNDO_UNCHAIN", "Unlink text frames")
+#define STR_UNDO_FTNINFO                        NC_("STR_UNDO_FTNINFO", "Modify footnote options")
+#define STR_UNDO_ENDNOTEINFO                    NC_("STR_UNDO_ENDNOTEINFO", "Modify endnote settings")
+#define STR_UNDO_COMPAREDOC                     NC_("STR_UNDO_COMPAREDOC", "Compare Document")
+#define STR_UNDO_SETFLYFRMFMT                   NC_("STR_UNDO_SETFLYFRMFMT", "Apply frame style: $1")
+#define STR_UNDO_SETRUBYATTR                    NC_("STR_UNDO_SETRUBYATTR", "Ruby Setting")
+#define STR_UNDO_TMPAUTOCORR                    NC_("STR_UNDO_TMPAUTOCORR", "AutoCorrect")
+#define STR_INSERT_FOOTNOTE                     NC_("STR_INSERT_FOOTNOTE", "Insert footnote")
+#define STR_INSERT_URLBTN                       NC_("STR_INSERT_URLBTN", "insert URL button")
+#define STR_INSERT_URLTXT                       NC_("STR_INSERT_URLTXT", "Insert Hyperlink")
+#define STR_DELETE_INVISIBLECNTNT               NC_("STR_DELETE_INVISIBLECNTNT", "remove invisible content")
+#define STR_TOXCHANGE                           NC_("STR_TOXCHANGE", "Table/index changed")
+#define STR_START_QUOTE                         NC_("STR_START_QUOTE", "“")
+#define STR_END_QUOTE                           NC_("STR_END_QUOTE", "”")
+#define STR_LDOTS                               NC_("STR_LDOTS", "...")
+#define STR_MULTISEL                            NC_("STR_MULTISEL", "multiple selection")
+#define STR_TYPING_UNDO                         NC_("STR_TYPING_UNDO", "Typing: $1")
+#define STR_PASTE_CLIPBOARD_UNDO                NC_("STR_PASTE_CLIPBOARD_UNDO", "Paste clipboard")
+#define STR_YIELDS                              NC_("STR_YIELDS", "→")
+#define STR_OCCURRENCES_OF                      NC_("STR_OCCURRENCES_OF", "occurrences of")
+#define STR_UNDO_TABS                           NC_("STR_UNDO_TABS", "$1 tab(s)")
+#define STR_UNDO_NLS                            NC_("STR_UNDO_NLS", "$1 line break(s)")
+#define STR_UNDO_PAGEBREAKS                     NC_("STR_UNDO_PAGEBREAKS", "page break")
+#define STR_UNDO_COLBRKS                        NC_("STR_UNDO_COLBRKS", "column break")
+#define STR_UNDO_REDLINE_INSERT                 NC_("STR_UNDO_REDLINE_INSERT", "Insert $1")
+#define STR_UNDO_REDLINE_DELETE                 NC_("STR_UNDO_REDLINE_DELETE", "Delete $1")
+#define STR_UNDO_REDLINE_FORMAT                 NC_("STR_UNDO_REDLINE_FORMAT", "Attributes changed")
+#define STR_UNDO_REDLINE_TABLE                  NC_("STR_UNDO_REDLINE_TABLE", "Table changed")
+#define STR_UNDO_REDLINE_FMTCOLL                NC_("STR_UNDO_REDLINE_FMTCOLL", "Style changed")
+#define STR_UNDO_REDLINE_PARAGRAPH_FORMAT       NC_("STR_UNDO_REDLINE_PARAGRAPH_FORMAT", "Paragraph formatting changed")
+#define STR_UNDO_REDLINE_TABLE_ROW_INSERT       NC_("STR_UNDO_REDLINE_TABLE_ROW_INSERT", "Insert Row")
+#define STR_UNDO_REDLINE_TABLE_ROW_DELETE       NC_("STR_UNDO_REDLINE_TABLE_ROW_DELETE", "Delete Row")
+#define STR_UNDO_REDLINE_TABLE_CELL_INSERT      NC_("STR_UNDO_REDLINE_TABLE_CELL_INSERT", "Insert Cell")
+#define STR_UNDO_REDLINE_TABLE_CELL_DELETE      NC_("STR_UNDO_REDLINE_TABLE_CELL_DELETE", "Delete Cell")
+#define STR_N_REDLINES                          NC_("STR_N_REDLINES", "$1 changes")
+#define STR_UNDO_PAGEDESC                       NC_("STR_UNDO_PAGEDESC", "Change page style: $1")
+#define STR_UNDO_PAGEDESC_CREATE                NC_("STR_UNDO_PAGEDESC_CREATE", "Create page style: $1")
+#define STR_UNDO_PAGEDESC_DELETE                NC_("STR_UNDO_PAGEDESC_DELETE", "Delete page style: $1")
+#define STR_UNDO_PAGEDESC_RENAME                NC_("STR_UNDO_PAGEDESC_RENAME", "Rename page style: $1 $2 $3")
+#define STR_UNDO_HEADER_FOOTER                  NC_("STR_UNDO_HEADER_FOOTER", "Header/footer changed")
+#define STR_UNDO_FIELD                          NC_("STR_UNDO_FIELD", "Field changed")
+#define STR_UNDO_TXTFMTCOL_CREATE               NC_("STR_UNDO_TXTFMTCOL_CREATE", "Create paragraph style: $1")
+#define STR_UNDO_TXTFMTCOL_DELETE               NC_("STR_UNDO_TXTFMTCOL_DELETE", "Delete paragraph style: $1")
+#define STR_UNDO_TXTFMTCOL_RENAME               NC_("STR_UNDO_TXTFMTCOL_RENAME", "Rename paragraph style: $1 $2 $3")
+#define STR_UNDO_CHARFMT_CREATE                 NC_("STR_UNDO_CHARFMT_CREATE", "Create character style: $1")
+#define STR_UNDO_CHARFMT_DELETE                 NC_("STR_UNDO_CHARFMT_DELETE", "Delete character style: $1")
+#define STR_UNDO_CHARFMT_RENAME                 NC_("STR_UNDO_CHARFMT_RENAME", "Rename character style: $1 $2 $3")
+#define STR_UNDO_FRMFMT_CREATE                  NC_("STR_UNDO_FRMFMT_CREATE", "Create frame style: $1")
+#define STR_UNDO_FRMFMT_DELETE                  NC_("STR_UNDO_FRMFMT_DELETE", "Delete frame style: $1")
+#define STR_UNDO_FRMFMT_RENAME                  NC_("STR_UNDO_FRMFMT_RENAME", "Rename frame style: $1 $2 $3")
+#define STR_UNDO_NUMRULE_CREATE                 NC_("STR_UNDO_NUMRULE_CREATE", "Create numbering style: $1")
+#define STR_UNDO_NUMRULE_DELETE                 NC_("STR_UNDO_NUMRULE_DELETE", "Delete numbering style: $1")
+#define STR_UNDO_NUMRULE_RENAME                 NC_("STR_UNDO_NUMRULE_RENAME", "Rename numbering style: $1 $2 $3")
+#define STR_UNDO_BOOKMARK_RENAME                NC_("STR_UNDO_BOOKMARK_RENAME", "Rename bookmark: $1 $2 $3")
+#define STR_UNDO_INDEX_ENTRY_INSERT             NC_("STR_UNDO_INDEX_ENTRY_INSERT", "Insert index entry")
+#define STR_UNDO_INDEX_ENTRY_DELETE             NC_("STR_UNDO_INDEX_ENTRY_DELETE", "Delete index entry")
+#define STR_FIELD                               NC_("STR_FIELD", "field")
+/*undo: STR_PARAGRAPHS, string.text*/
+#define STR_PARAGRAPHS                          NC_("STR_PARAGRAPHS", "Paragraphs")
+#define STR_FRAME                               NC_("STR_FRAME", "frame")
+#define STR_OLE                                 NC_("STR_OLE", "OLE-object")
+#define STR_MATH_FORMULA                        NC_("STR_MATH_FORMULA", "formula")
+#define STR_CHART                               NC_("STR_CHART", "chart")
+#define STR_NOTE                                NC_("STR_NOTE", "comment")
+#define STR_REFERENCE                           NC_("STR_REFERENCE", "cross-reference")
+#define STR_SCRIPT                              NC_("STR_SCRIPT", "script")
+#define STR_AUTHORITY_ENTRY                     NC_("STR_AUTHORITY_ENTRY", "bibliography entry")
+#define STR_SPECIALCHAR                         NC_("STR_SPECIALCHAR", "special character")
+#define STR_FOOTNOTE                            NC_("STR_FOOTNOTE", "footnote")
+#define STR_GRAPHIC                             NC_("STR_GRAPHIC", "image")
+#define STR_DRAWING_OBJECTS                     NC_("STR_DRAWING_OBJECTS", "drawing object(s)")
+#define STR_TABLE_NAME                          NC_("STR_TABLE_NAME", "table: $1$2$3")
+#define STR_PARAGRAPH_UNDO                      NC_("STR_PARAGRAPH_UNDO", "paragraph")
+#define STR_UNDO_FLYFRMFMT_TITLE                NC_("STR_UNDO_FLYFRMFMT_TITLE", "Change object title of $1")
+#define STR_UNDO_FLYFRMFMT_DESCRITPTION         NC_("STR_UNDO_FLYFRMFMT_DESCRITPTION", "Change object description of $1")
+#define STR_UNDO_TBLSTYLE_CREATE                NC_("STR_UNDO_TBLSTYLE_CREATE", "Create table style: $1")
+#define STR_UNDO_TBLSTYLE_DELETE                NC_("STR_UNDO_TBLSTYLE_DELETE", "Delete table style: $1")
+#define STR_UNDO_TBLSTYLE_UPDATE                NC_("STR_UNDO_TBLSTYLE_UPDATE", "Update table style: $1")
+#define STR_UNDO_TABLE_DELETE                   NC_("STR_UNDO_TABLE_DELETE", "Delete table")
+
+#define STR_ACCESS_DOC_NAME                     NC_("STR_ACCESS_DOC_NAME", "Document view")
+#define STR_ACCESS_DOC_DESC                     NC_("STR_ACCESS_DOC_DESC", "Document view")
+#define STR_ACCESS_HEADER_NAME                  NC_("STR_ACCESS_HEADER_NAME", "Header $(ARG1)")
+#define STR_ACCESS_HEADER_DESC                  NC_("STR_ACCESS_HEADER_DESC", "Header page $(ARG1)")
+#define STR_ACCESS_FOOTER_NAME                  NC_("STR_ACCESS_FOOTER_NAME", "Footer $(ARG1)")
+#define STR_ACCESS_FOOTER_DESC                  NC_("STR_ACCESS_FOOTER_DESC", "Footer page $(ARG1)")
+#define STR_ACCESS_FOOTNOTE_NAME                NC_("STR_ACCESS_FOOTNOTE_NAME", "Footnote $(ARG1)")
+#define STR_ACCESS_FOOTNOTE_DESC                NC_("STR_ACCESS_FOOTNOTE_DESC", "Footnote $(ARG1)")
+#define STR_ACCESS_ENDNOTE_NAME                 NC_("STR_ACCESS_ENDNOTE_NAME", "Endnote $(ARG1)")
+#define STR_ACCESS_ENDNOTE_DESC                 NC_("STR_ACCESS_ENDNOTE_DESC", "Endnote $(ARG1)")
+#define STR_ACCESS_TABLE_DESC                   NC_("STR_ACCESS_TABLE_DESC", "$(ARG1) on page $(ARG2)")
+#define STR_ACCESS_PAGE_NAME                    NC_("STR_ACCESS_PAGE_NAME", "Page $(ARG1)")
+#define STR_ACCESS_PAGE_DESC                    NC_("STR_ACCESS_PAGE_DESC", "Page: $(ARG1)")
+#define STR_ACCESS_ANNOTATION_AUTHOR_NAME       NC_("STR_ACCESS_ANNOTATION_AUTHOR_NAME", "Author")
+#define STR_ACCESS_ANNOTATION_DATE_NAME         NC_("STR_ACCESS_ANNOTATION_DATE_NAME", "Date")
+#define STR_ACCESS_ANNOTATION_BUTTON_NAME       NC_("STR_ACCESS_ANNOTATION_BUTTON_NAME", "Actions")
+#define STR_ACCESS_ANNOTATION_BUTTON_DESC       NC_("STR_ACCESS_ANNOTATION_BUTTON_DESC", "Activate this button to open a list of actions which can be performed on this comment and other comments")
+#define STR_ACCESS_PREVIEW_DOC_NAME             NC_("STR_ACCESS_PREVIEW_DOC_NAME", "Document preview")
+#define STR_ACCESS_PREVIEW_DOC_SUFFIX           NC_("STR_ACCESS_PREVIEW_DOC_SUFFIX", "(Preview mode)")
+#define STR_ACCESS_DOC_WORDPROCESSING           NC_("STR_ACCESS_DOC_WORDPROCESSING", "%PRODUCTNAME Document")
+
+#define STR_COMCORE_READERROR                   NC_("STR_COMCORE_READERROR", "Read Error")
+#define STR_COMCORE_CANT_SHOW                   NC_("STR_COMCORE_CANT_SHOW", "Image cannot be displayed.")
+#define STR_ERROR_CLPBRD_READ                   NC_("STR_ERROR_CLPBRD_READ", "Error reading from the clipboard.")
+
+#define STR_COLUMN_BREAK                        NC_("STR_COLUMN_BREAK", "Manual Column Break")
+
+#define STR_CHART2_ROW_LABEL_TEXT               NC_("STR_CHART2_ROW_LABEL_TEXT", "Row %ROWNUMBER")
+#define STR_CHART2_COL_LABEL_TEXT               NC_("STR_CHART2_COL_LABEL_TEXT", "Column %COLUMNLETTER")
+#define STR_STYLE_FAMILY_CHARACTER              NC_("STR_STYLE_FAMILY_CHARACTER", "Character")
+#define STR_STYLE_FAMILY_PARAGRAPH              NC_("STR_STYLE_FAMILY_PARAGRAPH", "Paragraph")
+#define STR_STYLE_FAMILY_FRAME                  NC_("STR_STYLE_FAMILY_FRAME", "Frame")
+#define STR_STYLE_FAMILY_PAGE                   NC_("STR_STYLE_FAMILY_PAGE", "Pages")
+#define STR_STYLE_FAMILY_NUMBERING              NC_("STR_STYLE_FAMILY_NUMBERING", "Numbering")
+#define STR_STYLE_FAMILY_TABLE                  NC_("STR_STYLE_FAMILY_TABLE", "Table")
+#define STR_STYLE_FAMILY_CELL                   NC_("STR_STYLE_FAMILY_CELL", "Cell")
+
+#define ST_SCRIPT_ASIAN                         NC_("ST_SCRIPT_ASIAN", "Asian")
+#define ST_SCRIPT_CTL                           NC_("ST_SCRIPT_CTL", "CTL")
+#define ST_SCRIPT_WESTERN                       NC_("ST_SCRIPT_WESTERN", "Western")
+#define STR_PRINTOPTUI_PRODUCTNAME              NC_("STR_PRINTOPTUI_PRODUCTNAME", "%PRODUCTNAME %s")
+#define STR_PRINTOPTUI_CONTENTS                 NC_("STR_PRINTOPTUI_CONTENTS", "Contents")
+#define STR_PRINTOPTUI_PAGE_BACKGROUND          NC_("STR_PRINTOPTUI_PAGE_BACKGROUND", "Page ba~ckground")
+#define STR_PRINTOPTUI_PICTURES                 NC_("STR_PRINTOPTUI_PICTURES", "P~ictures and other graphic objects")
+#define STR_PRINTOPTUI_HIDDEN                   NC_("STR_PRINTOPTUI_HIDDEN", "Hidden te~xt")
+#define STR_PRINTOPTUI_TEXT_PLACEHOLDERS        NC_("STR_PRINTOPTUI_TEXT_PLACEHOLDERS", "~Text placeholders")
+#define STR_PRINTOPTUI_FORM_CONTROLS            NC_("STR_PRINTOPTUI_FORM_CONTROLS", "Form control~s")
+#define STR_PRINTOPTUI_COLOR                    NC_("STR_PRINTOPTUI_COLOR", "Color")
+#define STR_PRINTOPTUI_PRINT_BLACK              NC_("STR_PRINTOPTUI_PRINT_BLACK", "Print text in blac~k")
+#define STR_PRINTOPTUI_PAGES_TEXT               NC_("STR_PRINTOPTUI_PAGES_TEXT", "Pages")
+#define STR_PRINTOPTUI_PRINT_BLANK              NC_("STR_PRINTOPTUI_PRINT_BLANK", "Print ~automatically inserted blank pages")
+#define STR_PRINTOPTUI_ONLY_PAPER               NC_("STR_PRINTOPTUI_ONLY_PAPER", "~Use only paper tray from printer preferences")
+#define STR_PRINTOPTUI_PRINT                    NC_("STR_PRINTOPTUI_PRINT", "Print")
+#define STR_PRINTOPTUI_NONE                     NC_("STR_PRINTOPTUI_NONE", "None (document only)")
+#define STR_PRINTOPTUI_COMMENTS_ONLY            NC_("STR_PRINTOPTUI_COMMENTS_ONLY", "Comments only")
+#define STR_PRINTOPTUI_PLACE_END                NC_("STR_PRINTOPTUI_PLACE_END", "Place at end of document")
+#define STR_PRINTOPTUI_PLACE_PAGE               NC_("STR_PRINTOPTUI_PLACE_PAGE", "Place at end of page")
+#define STR_PRINTOPTUI_COMMENTS                 NC_("STR_PRINTOPTUI_COMMENTS", "~Comments")
+#define STR_PRINTOPTUI_PAGE_SIDES               NC_("STR_PRINTOPTUI_PAGE_SIDES", "Page sides")
+#define STR_PRINTOPTUI_ALL_PAGES                NC_("STR_PRINTOPTUI_ALL_PAGES", "All pages")
+#define STR_PRINTOPTUI_BACK_PAGES               NC_("STR_PRINTOPTUI_BACK_PAGES", "Back sides / left pages")
+#define STR_PRINTOPTUI_FONT_PAGES               NC_("STR_PRINTOPTUI_FONT_PAGES", "Front sides / right pages")
+#define STR_PRINTOPTUI_INCLUDE                  NC_("STR_PRINTOPTUI_INCLUDE", "Include")
+#define STR_PRINTOPTUI_BROCHURE                 NC_("STR_PRINTOPTUI_BROCHURE", "Broch~ure")
+#define STR_PRINTOPTUI_LEFT_SCRIPT              NC_("STR_PRINTOPTUI_LEFT_SCRIPT", "Left-to-right script")
+#define STR_PRINTOPTUI_RIGHT_SCRIPT             NC_("STR_PRINTOPTUI_RIGHT_SCRIPT", "Right-to-left script")
+#define STR_PRINTOPTUI_RANGE_COPIES             NC_("STR_PRINTOPTUI_RANGE_COPIES", "Range and copies")
+#define STR_PRINTOPTUI_ALLPAGES                 NC_("STR_PRINTOPTUI_ALLPAGES", "~All pages")
+#define STR_PRINTOPTUI_SOMEPAGES                NC_("STR_PRINTOPTUI_SOMEPAGES", "Pa~ges")
+#define STR_PRINTOPTUI_SELECTION                NC_("STR_PRINTOPTUI_SELECTION", "~Selection")
+#define STR_PRINTOPTUI_PLACE_MARGINS            NC_("STR_PRINTOPTUI_PLACE_MARGINS", "Place in margins")
+
+#define STR_FORMULA_CALC                        NC_("STR_FORMULA_CALC", "Functions")
+#define STR_FORMULA_CANCEL                      NC_("STR_FORMULA_CANCEL", "Cancel")
+#define STR_FORMULA_APPLY                       NC_("STR_FORMULA_APPLY", "Apply")
+#define STR_ACCESS_FORMULA_TOOLBAR              NC_("STR_ACCESS_FORMULA_TOOLBAR", "Formula Tool Bar")
+#define STR_ACCESS_FORMULA_TYPE                 NC_("STR_ACCESS_FORMULA_TYPE", "Formula Type")
+#define STR_ACCESS_FORMULA_TEXT                 NC_("STR_ACCESS_FORMULA_TEXT", "Formula Text")
+
+#define STR_ACCESS_TL_GLOBAL                    NC_("STR_ACCESS_TL_GLOBAL", "Global View")
+#define STR_ACCESS_TL_CONTENT                   NC_("STR_ACCESS_TL_CONTENT", "Content Navigation View")
+#define STR_OUTLINE_LEVEL                       NC_("STR_OUTLINE_LEVEL", "Outline Level")
+#define STR_DRAGMODE                            NC_("STR_DRAGMODE", "Drag Mode")
+#define STR_HYPERLINK                           NC_("STR_HYPERLINK", "Insert as Hyperlink")
+#define STR_LINK_REGION                         NC_("STR_LINK_REGION", "Insert as Link")
+#define STR_COPY_REGION                         NC_("STR_COPY_REGION", "Insert as Copy")
+#define STR_DISPLAY                             NC_("STR_DISPLAY", "Display")
+#define STR_ACTIVE_VIEW                         NC_("STR_ACTIVE_VIEW", "Active Window")
+#define STR_HIDDEN                              NC_("STR_HIDDEN", "hidden")
+#define STR_ACTIVE                              NC_("STR_ACTIVE", "active")
+#define STR_INACTIVE                            NC_("STR_INACTIVE", "inactive")
+#define STR_EDIT_ENTRY                          NC_("STR_EDIT_ENTRY", "Edit...")
+#define STR_UPDATE                              NC_("STR_UPDATE", "~Update")
+#define STR_EDIT_CONTENT                        NC_("STR_EDIT_CONTENT", "Edit")
+#define STR_EDIT_LINK                           NC_("STR_EDIT_LINK", "Edit link")
+#define STR_EDIT_INSERT                         NC_("STR_EDIT_INSERT", "Insert")
+#define STR_INDEX                               NC_("STR_INDEX", "~Index")
+#define STR_FILE                                NC_("STR_FILE", "File")
+#define STR_NEW_FILE                            NC_("STR_NEW_FILE", "New Document")
+#define STR_INSERT_TEXT                         NC_("STR_INSERT_TEXT", "Text")
+#define STR_DELETE                              NC_("STR_DELETE", "Delete")
+#define STR_DELETE_ENTRY                        NC_("STR_DELETE_ENTRY", "~Delete")
+#define STR_UPDATE_SEL                          NC_("STR_UPDATE_SEL", "Selection")
+#define STR_UPDATE_INDEX                        NC_("STR_UPDATE_INDEX", "Indexes")
+#define STR_UPDATE_LINK                         NC_("STR_UPDATE_LINK", "Links")
+#define STR_UPDATE_ALL                          NC_("STR_UPDATE_ALL", "All")
+#define STR_REMOVE_INDEX                        NC_("STR_REMOVE_INDEX", "~Remove Index")
+#define STR_REMOVE_TBL_PROTECTION               NC_("STR_REMOVE_TBL_PROTECTION", "~Unprotect")
+#define STR_INVISIBLE                           NC_("STR_INVISIBLE", "hidden")
+#define STR_BROKEN_LINK                         NC_("STR_BROKEN_LINK", "File not found: ")
+#define STR_RENAME                              NC_("STR_RENAME", "~Rename")
+#define STR_READONLY_IDX                        NC_("STR_READONLY_IDX", "Read-~only")
+#define STR_POSTIT_SHOW                         NC_("STR_POSTIT_SHOW", "Show All")
+#define STR_POSTIT_HIDE                         NC_("STR_POSTIT_HIDE", "Hide All")
+#define STR_POSTIT_DELETE                       NC_("STR_POSTIT_DELETE", "Delete All")
+
+#define STR_MARGIN_TOOLTIP_LEFT                 NC_("STR_MARGIN_TOOLTIP_LEFT", "Left: ")
+#define STR_MARGIN_TOOLTIP_RIGHT                NC_("STR_MARGIN_TOOLTIP_RIGHT", ". Right: ")
+#define STR_MARGIN_TOOLTIP_INNER                NC_("STR_MARGIN_TOOLTIP_INNER", "Inner: ")
+#define STR_MARGIN_TOOLTIP_OUTER                NC_("STR_MARGIN_TOOLTIP_OUTER", ". Outer: ")
+#define STR_MARGIN_TOOLTIP_TOP                  NC_("STR_MARGIN_TOOLTIP_TOP", ". Top: ")
+#define STR_MARGIN_TOOLTIP_BOT                  NC_("STR_MARGIN_TOOLTIP_BOT", ". Bottom: ")
+
+// Error calculator
+#define STR_POSTIT_PAGE                         NC_("STR_POSTIT_PAGE", "Page")
+#define STR_POSTIT_LINE                         NC_("STR_POSTIT_LINE", "Line")
+#define STR_POSTIT_AUTHOR                       NC_("STR_POSTIT_AUTHOR", "Author")
+#define STR_CALC_SYNTAX                         NC_("STR_CALC_SYNTAX", "** Syntax Error **")
+#define STR_CALC_ZERODIV                        NC_("STR_CALC_ZERODIV", "** Division by zero **")
+#define STR_CALC_BRACK                          NC_("STR_CALC_BRACK", "** Wrong use of brackets **")
+#define STR_CALC_POW                            NC_("STR_CALC_POW", "** Square function overflow **")
+#define STR_CALC_OVERFLOW                       NC_("STR_CALC_OVERFLOW", "** Overflow **")
+#define STR_CALC_DEFAULT                        NC_("STR_CALC_DEFAULT", "** Error **")
+#define STR_CALC_ERROR                          NC_("STR_CALC_ERROR", "** Expression is faulty **")
+#define STR_GETREFFLD_REFITEMNOTFOUND           NC_("STR_GETREFFLD_REFITEMNOTFOUND", "Error: Reference source not found")
+#define STR_TEMPLATE_NONE                       NC_("STR_TEMPLATE_NONE", "None")
+#define STR_FIELD_FIXED                         NC_("STR_FIELD_FIXED", "(fixed)")
+#define STR_DURATION_FORMAT                     NC_("STR_DURATION_FORMAT", " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6")
+#define STR_TOI                                 NC_("STR_TOI", "Alphabetical Index")
+#define STR_TOU                                 NC_("STR_TOU", "User-Defined")
+#define STR_TOC                                 NC_("STR_TOC", "Table of Contents")
+#define STR_TOX_AUTH                            NC_("STR_TOX_AUTH", "Bibliography")
+#define STR_TOX_CITATION                        NC_("STR_TOX_CITATION", "Citation")
+#define STR_TOX_TBL                             NC_("STR_TOX_TBL", "Index of Tables")
+#define STR_TOX_OBJ                             NC_("STR_TOX_OBJ", "Table of Objects")
+#define STR_TOX_ILL                             NC_("STR_TOX_ILL", "Illustration Index")
+#define STR_LINK_CTRL_CLICK                     NC_("STR_LINK_CTRL_CLICK", "%s-Click to follow link")
+#define STR_LINK_CLICK                          NC_("STR_LINK_CLICK", "Click to follow link")
+// SubType DocInfo
+#define FLD_DOCINFO_TITEL                       NC_("FLD_DOCINFO_TITEL", "Title")
+#define FLD_DOCINFO_THEMA                       NC_("FLD_DOCINFO_THEMA", "Subject")
+#define FLD_DOCINFO_KEYS                        NC_("FLD_DOCINFO_KEYS", "Keywords")
+#define FLD_DOCINFO_COMMENT                     NC_("FLD_DOCINFO_COMMENT", "Comments")
+#define FLD_DOCINFO_CREATE                      NC_("FLD_DOCINFO_CREATE", "Created")
+#define FLD_DOCINFO_CHANGE                      NC_("FLD_DOCINFO_CHANGE", "Modified")
+#define FLD_DOCINFO_PRINT                       NC_("FLD_DOCINFO_PRINT", "Last printed")
+#define FLD_DOCINFO_DOCNO                       NC_("FLD_DOCINFO_DOCNO", "Revision number")
+#define FLD_DOCINFO_EDIT                        NC_("FLD_DOCINFO_EDIT", "Total editing time")
+#define STR_PAGEDESC_NAME                       NC_("STR_PAGEDESC_NAME", "Convert $(ARG1)")
+#define STR_PAGEDESC_FIRSTNAME                  NC_("STR_PAGEDESC_FIRSTNAME", "First convert $(ARG1)")
+#define STR_PAGEDESC_FOLLOWNAME                 NC_("STR_PAGEDESC_FOLLOWNAME", "Next convert $(ARG1)")
+#define STR_AUTH_TYPE_ARTICLE                   NC_("STR_AUTH_TYPE_ARTICLE", "Article")
+#define STR_AUTH_TYPE_BOOK                      NC_("STR_AUTH_TYPE_BOOK", "Book")
+#define STR_AUTH_TYPE_BOOKLET                   NC_("STR_AUTH_TYPE_BOOKLET", "Brochures")
+#define STR_AUTH_TYPE_CONFERENCE                NC_("STR_AUTH_TYPE_CONFERENCE", "Conference proceedings")
+#define STR_AUTH_TYPE_INBOOK                    NC_("STR_AUTH_TYPE_INBOOK", "Book excerpt")
+#define STR_AUTH_TYPE_INCOLLECTION              NC_("STR_AUTH_TYPE_INCOLLECTION", "Book excerpt with title")
+#define STR_AUTH_TYPE_INPROCEEDINGS             NC_("STR_AUTH_TYPE_INPROCEEDINGS", "Conference proceedings")
+#define STR_AUTH_TYPE_JOURNAL                   NC_("STR_AUTH_TYPE_JOURNAL", "Journal")
+#define STR_AUTH_TYPE_MANUAL                    NC_("STR_AUTH_TYPE_MANUAL", "Techn. documentation")
+#define STR_AUTH_TYPE_MASTERSTHESIS             NC_("STR_AUTH_TYPE_MASTERSTHESIS", "Thesis")
+#define STR_AUTH_TYPE_MISC                      NC_("STR_AUTH_TYPE_MISC", "Miscellaneous")
+#define STR_AUTH_TYPE_PHDTHESIS                 NC_("STR_AUTH_TYPE_PHDTHESIS", "Dissertation")
+#define STR_AUTH_TYPE_PROCEEDINGS               NC_("STR_AUTH_TYPE_PROCEEDINGS", "Conference proceedings")
+#define STR_AUTH_TYPE_TECHREPORT                NC_("STR_AUTH_TYPE_TECHREPORT", "Research report")
+#define STR_AUTH_TYPE_UNPUBLISHED               NC_("STR_AUTH_TYPE_UNPUBLISHED", "Unpublished")
+#define STR_AUTH_TYPE_EMAIL                     NC_("STR_AUTH_TYPE_EMAIL", "E-mail")
+#define STR_AUTH_TYPE_WWW                       NC_("STR_AUTH_TYPE_WWW", "WWW document")
+#define STR_AUTH_TYPE_CUSTOM1                   NC_("STR_AUTH_TYPE_CUSTOM1", "User-defined1")
+#define STR_AUTH_TYPE_CUSTOM2                   NC_("STR_AUTH_TYPE_CUSTOM2", "User-defined2")
+#define STR_AUTH_TYPE_CUSTOM3                   NC_("STR_AUTH_TYPE_CUSTOM3", "User-defined3")
+#define STR_AUTH_TYPE_CUSTOM4                   NC_("STR_AUTH_TYPE_CUSTOM4", "User-defined4")
+#define STR_AUTH_TYPE_CUSTOM5                   NC_("STR_AUTH_TYPE_CUSTOM5", "User-defined5")
+#define STR_AUTH_FIELD_IDENTIFIER               NC_("STR_AUTH_FIELD_IDENTIFIER", "Short name")
+#define STR_AUTH_FIELD_AUTHORITY_TYPE           NC_("STR_AUTH_FIELD_AUTHORITY_TYPE", "Type")
+#define STR_AUTH_FIELD_ADDRESS                  NC_("STR_AUTH_FIELD_ADDRESS", "Address")
+#define STR_AUTH_FIELD_ANNOTE                   NC_("STR_AUTH_FIELD_ANNOTE", "Annotation")
+#define STR_AUTH_FIELD_AUTHOR                   NC_("STR_AUTH_FIELD_AUTHOR", "Author(s)")
+#define STR_AUTH_FIELD_BOOKTITLE                NC_("STR_AUTH_FIELD_BOOKTITLE", "Book title")
+#define STR_AUTH_FIELD_CHAPTER                  NC_("STR_AUTH_FIELD_CHAPTER", "Chapter")
+#define STR_AUTH_FIELD_EDITION                  NC_("STR_AUTH_FIELD_EDITION", "Edition")
+#define STR_AUTH_FIELD_EDITOR                   NC_("STR_AUTH_FIELD_EDITOR", "Editor")
+#define STR_AUTH_FIELD_HOWPUBLISHED             NC_("STR_AUTH_FIELD_HOWPUBLISHED", "Publication type")
+#define STR_AUTH_FIELD_INSTITUTION              NC_("STR_AUTH_FIELD_INSTITUTION", "Institution")
+#define STR_AUTH_FIELD_JOURNAL                  NC_("STR_AUTH_FIELD_JOURNAL", "Journal")
+#define STR_AUTH_FIELD_MONTH                    NC_("STR_AUTH_FIELD_MONTH", "Month")
+#define STR_AUTH_FIELD_NOTE                     NC_("STR_AUTH_FIELD_NOTE", "Note")
+#define STR_AUTH_FIELD_NUMBER                   NC_("STR_AUTH_FIELD_NUMBER", "Number")
+#define STR_AUTH_FIELD_ORGANIZATIONS            NC_("STR_AUTH_FIELD_ORGANIZATIONS", "Organization")
+#define STR_AUTH_FIELD_PAGES                    NC_("STR_AUTH_FIELD_PAGES", "Page(s)")
+#define STR_AUTH_FIELD_PUBLISHER                NC_("STR_AUTH_FIELD_PUBLISHER", "Publisher")
+#define STR_AUTH_FIELD_SCHOOL                   NC_("STR_AUTH_FIELD_SCHOOL", "University")
+#define STR_AUTH_FIELD_SERIES                   NC_("STR_AUTH_FIELD_SERIES", "Series")
+#define STR_AUTH_FIELD_TITLE                    NC_("STR_AUTH_FIELD_TITLE", "Title")
+#define STR_AUTH_FIELD_TYPE                     NC_("STR_AUTH_FIELD_TYPE", "Type of report")
+#define STR_AUTH_FIELD_VOLUME                   NC_("STR_AUTH_FIELD_VOLUME", "Volume")
+#define STR_AUTH_FIELD_YEAR                     NC_("STR_AUTH_FIELD_YEAR", "Year")
+#define STR_AUTH_FIELD_URL                      NC_("STR_AUTH_FIELD_URL", "URL")
+#define STR_AUTH_FIELD_CUSTOM1                  NC_("STR_AUTH_FIELD_CUSTOM1", "User-defined1")
+#define STR_AUTH_FIELD_CUSTOM2                  NC_("STR_AUTH_FIELD_CUSTOM2", "User-defined2")
+#define STR_AUTH_FIELD_CUSTOM3                  NC_("STR_AUTH_FIELD_CUSTOM3", "User-defined3")
+#define STR_AUTH_FIELD_CUSTOM4                  NC_("STR_AUTH_FIELD_CUSTOM4", "User-defined4")
+#define STR_AUTH_FIELD_CUSTOM5                  NC_("STR_AUTH_FIELD_CUSTOM5", "User-defined5")
+#define STR_AUTH_FIELD_ISBN                     NC_("STR_AUTH_FIELD_ISBN", "ISBN")
+
+#define STR_IDXMRK_EDIT                         NC_("STR_IDXMRK_EDIT", "Edit Index Entry")
+#define STR_IDXMRK_INSERT                       NC_("STR_IDXMRK_INSERT", "Insert Index Entry")
+#define STR_QUERY_CHANGE_AUTH_ENTRY             NC_("STR_QUERY_CHANGE_AUTH_ENTRY", "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?")
+
+#define STR_COMMENTS_LABEL                      NC_("STR_COMMENTS_LABEL", "Comments")
+#define STR_SHOW_COMMENTS                       NC_("STR_SHOW_COMMENTS", "Show comments")
+#define STR_HIDE_COMMENTS                       NC_("STR_HIDE_COMMENTS", "Hide comments")
+
+#define STR_DOUBLE_SHORTNAME                    NC_("STR_DOUBLE_SHORTNAME", "Shortcut name already exists. Please choose another name.")
+#define STR_QUERY_DELETE                        NC_("STR_QUERY_DELETE", "Delete AutoText?")
+#define STR_QUERY_DELETE_GROUP1                 NC_("STR_QUERY_DELETE_GROUP1", "Delete the category ")
+#define STR_QUERY_DELETE_GROUP2                 NC_("STR_QUERY_DELETE_GROUP2", "?")
+#define STR_GLOSSARY                            NC_("STR_GLOSSARY", "AutoText :")
+#define STR_SAVE_GLOSSARY                       NC_("STR_SAVE_GLOSSARY", "Save AutoText")
+#define STR_NO_GLOSSARIES                       NC_("STR_NO_GLOSSARIES", "There is no AutoText in this file.")
+#define STR_MY_AUTOTEXT                         NC_("STR_MY_AUTOTEXT", "My AutoText")
+
+#define STR_NOGLOS                              NC_("STR_NOGLOS", "AutoText for Shortcut '%1' not found.")
+#define STR_NO_TABLE                            NC_("STR_NO_TABLE", "A table with no rows or no cells cannot be inserted")
+#define STR_TABLE_TOO_LARGE                     NC_("STR_TABLE_TOO_LARGE", "The table cannot be inserted because it is too large")
+#define STR_ERR_INSERT_GLOS                     NC_("STR_ERR_INSERT_GLOS", "AutoText could not be created.")
+#define STR_CLPBRD_FORMAT_ERROR                 NC_("STR_CLPBRD_FORMAT_ERROR", "Requested clipboard format is not available.")
+#define STR_PRIVATETEXT                         NC_("STR_PRIVATETEXT", "%PRODUCTNAME Writer")
+#define STR_PRIVATEGRAPHIC                      NC_("STR_PRIVATEGRAPHIC", "Image [%PRODUCTNAME Writer]")
+#define STR_PRIVATEOLE                          NC_("STR_PRIVATEOLE", "Object [%PRODUCTNAME Writer]")
+#define STR_DDEFORMAT                           NC_("STR_DDEFORMAT", "DDE link")
+
+#define STR_DELETE_ALL_NOTES                    NC_("STR_DELETE_ALL_NOTES", "All Comments")
+#define STR_FORMAT_ALL_NOTES                    NC_("STR_FORMAT_ALL_NOTES", "All Comments")
+#define STR_DELETE_AUTHOR_NOTES                 NC_("STR_DELETE_AUTHOR_NOTES", "Comments by ")
+#define STR_NODATE                              NC_("STR_NODATE", "(no date)")
+#define STR_NOAUTHOR                            NC_("STR_NOAUTHOR", "(no author)")
+#define STR_REPLY                               NC_("STR_REPLY", "Reply to $1")
+
+#define ST_TITLE_EDIT                           NC_("ST_TITLE_EDIT", "Edit Address Block")
+#define ST_TITLE_MALE                           NC_("ST_TITLE_MALE", "Custom Salutation (Male Recipients)")
+#define ST_TITLE_FEMALE                         NC_("ST_TITLE_FEMALE", "Custom Salutation (Female Recipients)")
+#define ST_SALUTATIONELEMENTS                   NC_("ST_SALUTATIONELEMENTS", "Salutation e~lements")
+#define ST_INSERTSALUTATIONFIELD                NC_("ST_INSERTSALUTATIONFIELD", "Add to salutation")
+#define ST_REMOVESALUTATIONFIELD                NC_("ST_REMOVESALUTATIONFIELD", "Remove from salutation")
+#define ST_DRAGSALUTATION                       NC_("ST_DRAGSALUTATION", "1. ~Drag salutation elements into the box below")
+#define ST_SALUTATION                           NC_("ST_SALUTATION", "Salutation")
+#define ST_PUNCTUATION                          NC_("ST_PUNCTUATION", "Punctuation Mark")
+#define ST_TEXT                                 NC_("ST_TEXT", "Text")
+#define ST_SALUTATIONMATCHING                   NC_("ST_SALUTATIONMATCHING", "Assign the fields from your data source to match the salutation elements.")
+#define ST_SALUTATIONPREVIEW                    NC_("ST_SALUTATIONPREVIEW", "Salutation preview")
+#define ST_ADDRESSELEMENT                       NC_("ST_ADDRESSELEMENT", "Address elements")
+#define ST_SALUTATIONELEMENT                    NC_("ST_SALUTATIONELEMENT", "Salutation elements")
+#define ST_MATCHESTO                            NC_("ST_MATCHESTO", "Matches to field:")
+#define ST_PREVIEW                              NC_("ST_PREVIEW", "Preview")
+
+#define STR_NOTASSIGNED                         NC_("STR_NOTASSIGNED", " not yet matched ")
+#define STR_FILTER_ALL                          NC_("STR_FILTER_ALL", "All files")
+#define STR_FILTER_ALL_DATA                     NC_("STR_FILTER_ALL_DATA", "Address lists(*.*)")
+#define STR_FILTER_SXB                          NC_("STR_FILTER_SXB", "%PRODUCTNAME Base (*.odb)")
+#define STR_FILTER_SXC                          NC_("STR_FILTER_SXC", "%PRODUCTNAME Calc (*.ods;*.sxc)")
+#define STR_FILTER_SXW                          NC_("STR_FILTER_SXW", "%PRODUCTNAME Writer (*.odt;*.sxw)")
+#define STR_FILTER_DBF                          NC_("STR_FILTER_DBF", "dBase (*.dbf)")
+#define STR_FILTER_XLS                          NC_("STR_FILTER_XLS", "Microsoft Excel (*.xls;*.xlsx)")
+#define STR_FILTER_DOC                          NC_("STR_FILTER_DOC", "Microsoft Word (*.doc;*.docx)")
+#define STR_FILTER_TXT                          NC_("STR_FILTER_TXT", "Plain text (*.txt)")
+#define STR_FILTER_CSV                          NC_("STR_FILTER_CSV", "Text Comma Separated (*.csv)")
+#define STR_FILTER_MDB                          NC_("STR_FILTER_MDB", "Microsoft Access (*.mdb;*.mde)")
+#define STR_FILTER_ACCDB                        NC_("STR_FILTER_ACCDB", "Microsoft Access 2007 (*.accdb,*.accde)")
+#define ST_CONFIGUREMAIL                        NC_("ST_CONFIGUREMAIL", "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?")
+#define ST_FILTERNAME                           NC_("ST_FILTERNAME", "%PRODUCTNAME Address List (.csv)")
+
+#define ST_STARTING                             NC_("ST_STARTING", "Select starting document")
+#define ST_DOCUMENTTYPE                         NC_("ST_DOCUMENTTYPE", "Select document type")
+#define ST_ADDRESSBLOCK                         NC_("ST_ADDRESSBLOCK", "Insert address block")
+#define ST_ADDRESSLIST                          NC_("ST_ADDRESSLIST", "Select address list")
+#define ST_GREETINGSLINE                        NC_("ST_GREETINGSLINE", "Create salutation")
+#define ST_LAYOUT                               NC_("ST_LAYOUT", "Adjust layout")
+#define ST_EXCLUDE                              NC_("ST_EXCLUDE", "Exclude recipient")
+#define ST_FINISH                               NC_("ST_FINISH", "~Finish")
+#define ST_MMWTITLE                             NC_("ST_MMWTITLE", "Mail Merge Wizard")
+
+#define ST_NAME                                 NC_("ST_NAME", "Name")
+#define ST_TYPE                                 NC_("ST_TYPE", "Type")
+#define ST_TABLE                                NC_("ST_TABLE", "Table")
+#define ST_QUERY                                NC_("ST_QUERY", "Query")
+
+#define STR_QUERY_SPELL_CONTINUE                NC_("STR_QUERY_SPELL_CONTINUE", "Continue checking at beginning of document?")
+#define STR_SPELLING_COMPLETED                  NC_("STR_SPELLING_COMPLETED", "The spellcheck is complete.")
+
+/*--------------------------------------------------------------------
+    Description: strings for the types
+ --------------------------------------------------------------------*/
+// range document
+#define STR_DATEFLD                             NC_("STR_DATEFLD", "Date")
+#define STR_TIMEFLD                             NC_("STR_TIMEFLD", "Time")
+#define STR_FILENAMEFLD                         NC_("STR_FILENAMEFLD", "File name")
+#define STR_DBNAMEFLD                           NC_("STR_DBNAMEFLD", "Database Name")
+#define STR_CHAPTERFLD                          NC_("STR_CHAPTERFLD", "Chapter")
+#define STR_PAGENUMBERFLD                       NC_("STR_PAGENUMBERFLD", "Page numbers")
+#define STR_DOCSTATFLD                          NC_("STR_DOCSTATFLD", "Statistics")
+#define STR_AUTHORFLD                           NC_("STR_AUTHORFLD", "Author")
+#define STR_TEMPLNAMEFLD                        NC_("STR_TEMPLNAMEFLD", "Templates")
+#define STR_EXTUSERFLD                          NC_("STR_EXTUSERFLD", "Sender")
+// range functions
+#define STR_SETFLD                              NC_("STR_SETFLD", "Set variable")
+#define STR_GETFLD                              NC_("STR_GETFLD", "Show variable")
+#define STR_FORMELFLD                           NC_("STR_FORMELFLD", "Insert Formula")
+#define STR_INPUTFLD                            NC_("STR_INPUTFLD", "Input field")
+#define STR_SETINPUTFLD                         NC_("STR_SETINPUTFLD", "Input field (variable)")
+#define STR_USRINPUTFLD                         NC_("STR_USRINPUTFLD", "Input field (user)")
+#define STR_CONDTXTFLD                          NC_("STR_CONDTXTFLD", "Conditional text")
+#define STR_DDEFLD                              NC_("STR_DDEFLD", "DDE field")
+#define STR_MACROFLD                            NC_("STR_MACROFLD", "Execute macro")
+#define STR_SEQFLD                              NC_("STR_SEQFLD", "Number range")
+#define STR_SETREFPAGEFLD                       NC_("STR_SETREFPAGEFLD", "Set page variable")
+#define STR_GETREFPAGEFLD                       NC_("STR_GETREFPAGEFLD", "Show page variable")
+#define STR_INTERNETFLD                         NC_("STR_INTERNETFLD", "Load URL")
+#define STR_JUMPEDITFLD                         NC_("STR_JUMPEDITFLD", "Placeholder")
+#define STR_COMBINED_CHARS                      NC_("STR_COMBINED_CHARS", "Combine characters")
+#define STR_DROPDOWN                            NC_("STR_DROPDOWN", "Input list")
+// range references
+#define STR_SETREFFLD                           NC_("STR_SETREFFLD", "Set Reference")
+#define STR_GETREFFLD                           NC_("STR_GETREFFLD", "Insert Reference")
+//  range database
+#define STR_DBFLD                               NC_("STR_DBFLD", "Mail merge fields")
+#define STR_DBNEXTSETFLD                        NC_("STR_DBNEXTSETFLD", "Next record")
+#define STR_DBNUMSETFLD                         NC_("STR_DBNUMSETFLD", "Any record")
+#define STR_DBSETNUMBERFLD                      NC_("STR_DBSETNUMBERFLD", "Record number")
+#define STR_PREVPAGEFLD                         NC_("STR_PREVPAGEFLD", "Previous page")
+#define STR_NEXTPAGEFLD                         NC_("STR_NEXTPAGEFLD", "Next page")
+#define STR_HIDDENTXTFLD                        NC_("STR_HIDDENTXTFLD", "Hidden text")
+//  range user fields
+#define STR_USERFLD                             NC_("STR_USERFLD", "User Field")
+#define STR_POSTITFLD                           NC_("STR_POSTITFLD", "Note")
+#define STR_SCRIPTFLD                           NC_("STR_SCRIPTFLD", "Script")
+#define STR_AUTHORITY                           NC_("STR_AUTHORITY", "Bibliography entry")
+#define STR_HIDDENPARAFLD                       NC_("STR_HIDDENPARAFLD", "Hidden Paragraph")
+// range DocumentInfo
+#define STR_DOCINFOFLD                          NC_("STR_DOCINFOFLD", "DocInformation")
+/*--------------------------------------------------------------------
+    Description: SubCmd-Strings
+ --------------------------------------------------------------------*/
+#define FLD_DATE_STD                            NC_("FLD_DATE_STD", "Date")
+#define FLD_DATE_FIX                            NC_("FLD_DATE_FIX", "Date (fixed)")
+#define FLD_TIME_STD                            NC_("FLD_TIME_STD", "Time")
+#define FLD_TIME_FIX                            NC_("FLD_TIME_FIX", "Time (fixed)")
+//  SubCmd Statistic
+#define FLD_STAT_TABLE                          NC_("FLD_STAT_TABLE", "Tables")
+#define FLD_STAT_CHAR                           NC_("FLD_STAT_CHAR", "Characters")
+#define FLD_STAT_WORD                           NC_("FLD_STAT_WORD", "Words")
+#define FLD_STAT_PARA                           NC_("FLD_STAT_PARA", "Paragraphs")
+#define FLD_STAT_GRF                            NC_("FLD_STAT_GRF", "Image")
+#define FLD_STAT_OBJ                            NC_("FLD_STAT_OBJ", "Objects")
+#define FLD_STAT_PAGE                           NC_("FLD_STAT_PAGE", "Pages")
+//  SubCmd DDETypes
+#define FMT_DDE_HOT                             NC_("FMT_DDE_HOT", "DDE automatic")
+#define FMT_DDE_NORMAL                          NC_("FMT_DDE_NORMAL", "DDE manual")
+#define FLD_INPUT_TEXT                          NC_("FLD_INPUT_TEXT", "[Text]")
+
+/*--------------------------------------------------------------------
+    Description: SubType Extuser
+ --------------------------------------------------------------------*/
+#define FLD_EU_FIRMA                            NC_("FLD_EU_FIRMA", "Company")
+#define FLD_EU_VORNAME                          NC_("FLD_EU_VORNAME", "First Name")
+#define FLD_EU_NAME                             NC_("FLD_EU_NAME", "Last Name")
+#define FLD_EU_ABK                              NC_("FLD_EU_ABK", "Initials")
+#define FLD_EU_STRASSE                          NC_("FLD_EU_STRASSE", "Street")
+#define FLD_EU_LAND                             NC_("FLD_EU_LAND", "Country")
+#define FLD_EU_PLZ                              NC_("FLD_EU_PLZ", "Zip code")
+#define FLD_EU_ORT                              NC_("FLD_EU_ORT", "City")
+#define FLD_EU_TITEL                            NC_("FLD_EU_TITEL", "Title")
+#define FLD_EU_POS                              NC_("FLD_EU_POS", "Position")
+#define FLD_EU_TELPRIV                          NC_("FLD_EU_TELPRIV", "Tel. (Home)")
+#define FLD_EU_TELFIRMA                         NC_("FLD_EU_TELFIRMA", "Tel. (Work)")
+#define FLD_EU_FAX                              NC_("FLD_EU_FAX", "FAX")
+#define FLD_EU_EMAIL                            NC_("FLD_EU_EMAIL", "E-mail")
+#define FLD_EU_STATE                            NC_("FLD_EU_STATE", "State")
+#define FLD_PAGEREF_OFF                         NC_("FLD_PAGEREF_OFF", "off")
+#define FLD_PAGEREF_ON                          NC_("FLD_PAGEREF_ON", "on")
+/*--------------------------------------------------------------------
+    Description: path name
+ --------------------------------------------------------------------*/
+// Formate FileName
+#define FMT_FF_NAME                             NC_("FMT_FF_NAME", "File name")
+#define FMT_FF_NAME_NOEXT                       NC_("FMT_FF_NAME_NOEXT", "File name without extension")
+#define FMT_FF_PATHNAME                         NC_("FMT_FF_PATHNAME", "Path/File name")
+#define FMT_FF_PATH                             NC_("FMT_FF_PATH", "Path")
+#define FMT_FF_UI_NAME                          NC_("FMT_FF_UI_NAME", "Style")
+#define FMT_FF_UI_RANGE                         NC_("FMT_FF_UI_RANGE", "Category")
+/*--------------------------------------------------------------------
+    Description: format chapter
+ --------------------------------------------------------------------*/
+#define FMT_CHAPTER_NAME                        NC_("FMT_CHAPTER_NAME", "Chapter name")
+#define FMT_CHAPTER_NO                          NC_("FMT_CHAPTER_NO", "Chapter number")
+#define FMT_CHAPTER_NO_NOSEPARATOR              NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Chapter number without separator")
+#define FMT_CHAPTER_NAMENO                      NC_("FMT_CHAPTER_NAMENO", "Chapter number and name")
+/*--------------------------------------------------------------------
+    Description: formats
+ --------------------------------------------------------------------*/
+#define FMT_NUM_ABC                             NC_("FMT_NUM_ABC", "A B C")
+#define FMT_NUM_SABC                            NC_("FMT_NUM_SABC", "a b c")
+#define FMT_NUM_ABC_N                           NC_("FMT_NUM_ABC_N", "A .. AA .. AAA")
+#define FMT_NUM_SABC_N                          NC_("FMT_NUM_SABC_N", "a .. aa .. aaa")
+#define FMT_NUM_ROMAN                           NC_("FMT_NUM_ROMAN", "Roman (I II III)")
+#define FMT_NUM_SROMAN                          NC_("FMT_NUM_SROMAN", "Roman (i ii iii)")
+#define FMT_NUM_ARABIC                          NC_("FMT_NUM_ARABIC", "Arabic (1 2 3)")
+#define FMT_NUM_PAGEDESC                        NC_("FMT_NUM_PAGEDESC", "As Page Style")
+#define FMT_NUM_PAGESPECIAL                     NC_("FMT_NUM_PAGESPECIAL", "Text")
+/*--------------------------------------------------------------------
+    Description: Author
+ --------------------------------------------------------------------*/
+#define FMT_AUTHOR_NAME                         NC_("FMT_AUTHOR_NAME", "Name")
+#define FMT_AUTHOR_SCUT                         NC_("FMT_AUTHOR_SCUT", "Initials")
+/*--------------------------------------------------------------------
+    Description:   set variable
+ --------------------------------------------------------------------*/
+#define FMT_SETVAR_SYS                          NC_("FMT_SETVAR_SYS", "System")
+#define FMT_SETVAR_TEXT                         NC_("FMT_SETVAR_TEXT", "Text")
+#define FMT_GETVAR_NAME                         NC_("FMT_GETVAR_NAME", "Name")
+#define FMT_GETVAR_TEXT                         NC_("FMT_GETVAR_TEXT", "Text")
+#define FMT_USERVAR_CMD                         NC_("FMT_USERVAR_CMD", "Formula")
+#define FMT_USERVAR_TEXT                        NC_("FMT_USERVAR_TEXT", "Text")
+#define FMT_DBFLD_DB                            NC_("FMT_DBFLD_DB", "Database")
+#define FMT_DBFLD_SYS                           NC_("FMT_DBFLD_SYS", "System")
+/*--------------------------------------------------------------------
+    Description: storage fields
+ --------------------------------------------------------------------*/
+#define FMT_REG_AUTHOR                          NC_("FMT_REG_AUTHOR", "Author")
+#define FMT_REG_TIME                            NC_("FMT_REG_TIME", "Time")
+#define FMT_REG_DATE                            NC_("FMT_REG_DATE", "Date")
+/*--------------------------------------------------------------------
+    Description: formats references
+ --------------------------------------------------------------------*/
+#define FMT_REF_TEXT                            NC_("FMT_REF_TEXT", "Reference")
+#define FMT_REF_PAGE                            NC_("FMT_REF_PAGE", "Page")
+#define FMT_REF_CHAPTER                         NC_("FMT_REF_CHAPTER", "Chapter")
+#define FMT_REF_UPDOWN                          NC_("FMT_REF_UPDOWN", "Above/Below")
+#define FMT_REF_PAGE_PGDSC                      NC_("FMT_REF_PAGE_PGDSC", "As Page Style")
+#define FMT_REF_ONLYNUMBER                      NC_("FMT_REF_ONLYNUMBER", "Category and Number")
+#define FMT_REF_ONLYCAPTION                     NC_("FMT_REF_ONLYCAPTION", "Caption Text")
+#define FMT_REF_ONLYSEQNO                       NC_("FMT_REF_ONLYSEQNO", "Numbering")
+#define FMT_REF_NUMBER                          NC_("FMT_REF_NUMBER", "Number")
+#define FMT_REF_NUMBER_NO_CONTEXT               NC_("FMT_REF_NUMBER_NO_CONTEXT", "Number (no context)")
+#define FMT_REF_NUMBER_FULL_CONTEXT             NC_("FMT_REF_NUMBER_FULL_CONTEXT", "Number (full context)")
+/*--------------------------------------------------------------------
+    Description: placeholder
+ --------------------------------------------------------------------*/
+#define FMT_MARK_TEXT                           NC_("FMT_MARK_TEXT", "Text")
+#define FMT_MARK_TABLE                          NC_("FMT_MARK_TABLE", "Table")
+#define FMT_MARK_FRAME                          NC_("FMT_MARK_FRAME", "Frame")
+#define FMT_MARK_GRAFIC                         NC_("FMT_MARK_GRAFIC", "Image")
+#define FMT_MARK_OLE                            NC_("FMT_MARK_OLE", "Object")
+/*--------------------------------------------------------------------
+    Description:   ExchangeStrings for Edit/NameFT
+ --------------------------------------------------------------------*/
+#define STR_COND                                NC_("STR_COND", "~Condition")
+#define STR_TEXT                                NC_("STR_TEXT", "Then, Else")
+#define STR_DDE_CMD                             NC_("STR_DDE_CMD", "DDE Statement")
+#define STR_INSTEXT                             NC_("STR_INSTEXT", "Hidden t~ext")
+#define STR_MACNAME                             NC_("STR_MACNAME", "~Macro name")
+#define STR_PROMPT                              NC_("STR_PROMPT", "~Reference")
+#define STR_COMBCHRS_FT                         NC_("STR_COMBCHRS_FT", "Ch~aracters")
+#define STR_OFFSET                              NC_("STR_OFFSET", "O~ffset")
+#define STR_VALUE                               NC_("STR_VALUE", "Value")
+#define STR_FORMULA                             NC_("STR_FORMULA", "Formula")
+#define STR_CUSTOM_FIELD                        NC_("STR_CUSTOM_FIELD", "Custom")
+
+#define STR_CUSTOM_LABEL                        NC_("STR_CUSTOM_LABEL", "[User]")
+
+#define STR_HDIST                               NC_("STR_HDIST", "H. Pitch")
+#define STR_VDIST                               NC_("STR_VDIST", "V. Pitch")
+#define STR_WIDTH                               NC_("STR_WIDTH", "Width")
+#define STR_HEIGHT                              NC_("STR_HEIGHT", "Height")
+#define STR_LEFT                                NC_("STR_LEFT", "Left margin")
+#define STR_UPPER                               NC_("STR_UPPER", "Top margin")
+#define STR_COLS                                NC_("STR_COLS", "Columns")
+#define STR_ROWS                                NC_("STR_ROWS", "Rows")
+
+#define STR_SERVICE_UNAVAILABLE                 NC_("STR_SERVICE_UNAVAILABLE", "The following service is not available: ")
+
+#define STR_WORDCOUNT_HINT                      NC_("STR_WORDCOUNT_HINT", "Word and character count. Click to open Word Count dialog.")
+#define STR_VIEWLAYOUT_ONE                      NC_("STR_VIEWLAYOUT_ONE", "Single-page view")
+#define STR_VIEWLAYOUT_MULTI                    NC_("STR_VIEWLAYOUT_MULTI", "Multiple-page view")
+#define STR_VIEWLAYOUT_BOOK                     NC_("STR_VIEWLAYOUT_BOOK", "Book view")
+#define STR_BOOKCTRL_HINT                       NC_("STR_BOOKCTRL_HINT", "Page number in document. Click to open Navigator window or right-click for bookmark list.")
+#define STR_BOOKCTRL_HINT_EXTENDED              NC_("STR_BOOKCTRL_HINT_EXTENDED", "Page number in document (Page number on printed document). Click to open Navigator window.")
+#define STR_TMPLCTRL_HINT                       NC_("STR_TMPLCTRL_HINT", "Page Style. Right-click to change style or click to open Style dialog.")
+
+// Strings for textual attributes.
+#define STR_DROP_OVER                           NC_("STR_DROP_OVER", "Drop Caps over")
+#define STR_DROP_LINES                          NC_("STR_DROP_LINES", "rows")
+#define STR_NO_DROP_LINES                       NC_("STR_NO_DROP_LINES", "No Drop Caps")
+#define STR_NO_PAGEDESC                         NC_("STR_NO_PAGEDESC", "No page break")
+#define STR_NO_MIRROR                           NC_("STR_NO_MIRROR", "Don't mirror")
+#define STR_VERT_MIRROR                         NC_("STR_VERT_MIRROR", "Flip vertically")
+#define STR_HORI_MIRROR                         NC_("STR_HORI_MIRROR", "Flip horizontal")
+#define STR_BOTH_MIRROR                         NC_("STR_BOTH_MIRROR", "Horizontal and Vertical Flip")
+#define STR_MIRROR_TOGGLE                       NC_("STR_MIRROR_TOGGLE", "+ mirror horizontal on even pages")
+#define STR_CHARFMT                             NC_("STR_CHARFMT", "Character Style")
+#define STR_NO_CHARFMT                          NC_("STR_NO_CHARFMT", "No Character Style")
+#define STR_FOOTER                              NC_("STR_FOOTER", "Footer")
+#define STR_NO_FOOTER                           NC_("STR_NO_FOOTER", "No footer")
+#define STR_HEADER                              NC_("STR_HEADER", "Header")
+#define STR_NO_HEADER                           NC_("STR_NO_HEADER", "No header")
+#define STR_SURROUND_IDEAL                      NC_("STR_SURROUND_IDEAL", "Optimal wrap")
+#define STR_SURROUND_NONE                       NC_("STR_SURROUND_NONE", "No wrap")
+#define STR_SURROUND_THROUGH                    NC_("STR_SURROUND_THROUGH", "Through")
+#define STR_SURROUND_PARALLEL                   NC_("STR_SURROUND_PARALLEL", "Parallel wrap")
+#define STR_SURROUND_LEFT                       NC_("STR_SURROUND_LEFT", "Left wrap")
+#define STR_SURROUND_RIGHT                      NC_("STR_SURROUND_RIGHT", "Right wrap")
+#define STR_SURROUND_ANCHORONLY                 NC_("STR_SURROUND_ANCHORONLY", "(Anchor only)")
+#define STR_FRM_WIDTH                           NC_("STR_FRM_WIDTH", "Width:")
+#define STR_FRM_FIXEDHEIGHT                     NC_("STR_FRM_FIXEDHEIGHT", "Fixed height:")
+#define STR_FRM_MINHEIGHT                       NC_("STR_FRM_MINHEIGHT", "Min. height:")
+#define STR_FLY_AT_PARA                         NC_("STR_FLY_AT_PARA", "to paragraph")
+#define STR_FLY_AS_CHAR                         NC_("STR_FLY_AS_CHAR", "to character")
+#define STR_FLY_AT_PAGE                         NC_("STR_FLY_AT_PAGE", "to page")
+#define STR_POS_X                               NC_("STR_POS_X", "X Coordinate:")
+#define STR_POS_Y                               NC_("STR_POS_Y", "Y Coordinate:")
+#define STR_VERT_TOP                            NC_("STR_VERT_TOP", "at top")
+#define STR_VERT_CENTER                         NC_("STR_VERT_CENTER", "Centered vertically")
+#define STR_VERT_BOTTOM                         NC_("STR_VERT_BOTTOM", "at bottom")
+#define STR_LINE_TOP                            NC_("STR_LINE_TOP", "Top of line")
+#define STR_LINE_CENTER                         NC_("STR_LINE_CENTER", "Line centered")
+#define STR_LINE_BOTTOM                         NC_("STR_LINE_BOTTOM", "Bottom of line")
+#define STR_REGISTER_ON                         NC_("STR_REGISTER_ON", "Register-true")
+#define STR_REGISTER_OFF                        NC_("STR_REGISTER_OFF", "Not register-true")
+#define STR_HORI_RIGHT                          NC_("STR_HORI_RIGHT", "at the right")
+#define STR_HORI_CENTER                         NC_("STR_HORI_CENTER", "Centered horizontally")
+#define STR_HORI_LEFT                           NC_("STR_HORI_LEFT", "at the left")
+#define STR_HORI_INSIDE                         NC_("STR_HORI_INSIDE", "inside")
+#define STR_HORI_OUTSIDE                        NC_("STR_HORI_OUTSIDE", "outside")
+#define STR_HORI_FULL                           NC_("STR_HORI_FULL", "Full width")
+#define STR_COLUMNS                             NC_("STR_COLUMNS", "Columns")
+#define STR_LINE_WIDTH                          NC_("STR_LINE_WIDTH", "Separator Width:")
+#define STR_MAX_FTN_HEIGHT                      NC_("STR_MAX_FTN_HEIGHT", "Max. footnote area:")
+#define STR_EDIT_IN_READONLY                    NC_("STR_EDIT_IN_READONLY", "Editable in read-only document")
+#define STR_LAYOUT_SPLIT                        NC_("STR_LAYOUT_SPLIT", "Split")
+#define STR_NUMRULE_ON                          NC_("STR_NUMRULE_ON", "Numbering")
+#define STR_NUMRULE_OFF                         NC_("STR_NUMRULE_OFF", "no numbering")
+#define STR_CONNECT1                            NC_("STR_CONNECT1", "linked to ")
+#define STR_CONNECT2                            NC_("STR_CONNECT2", "and ")
+#define STR_LINECOUNT                           NC_("STR_LINECOUNT", "Count lines")
+#define STR_DONTLINECOUNT                       NC_("STR_DONTLINECOUNT", "don't count lines")
+#define STR_LINCOUNT_START                      NC_("STR_LINCOUNT_START", "restart line count with: ")
+#define STR_LUMINANCE                           NC_("STR_LUMINANCE", "Brightness: ")
+#define STR_CHANNELR                            NC_("STR_CHANNELR", "Red: ")
+#define STR_CHANNELG                            NC_("STR_CHANNELG", "Green: ")
+#define STR_CHANNELB                            NC_("STR_CHANNELB", "Blue: ")
+#define STR_CONTRAST                            NC_("STR_CONTRAST", "Contrast: ")
+#define STR_GAMMA                               NC_("STR_GAMMA", "Gamma: ")
+#define STR_TRANSPARENCY                        NC_("STR_TRANSPARENCY", "Transparency: ")
+#define STR_INVERT                              NC_("STR_INVERT", "Invert")
+#define STR_INVERT_NOT                          NC_("STR_INVERT_NOT", "do not invert")
+#define STR_DRAWMODE                            NC_("STR_DRAWMODE", "Graphics mode: ")
+#define STR_DRAWMODE_STD                        NC_("STR_DRAWMODE_STD", "Standard")
+#define STR_DRAWMODE_GREY                       NC_("STR_DRAWMODE_GREY", "Grayscales")
+#define STR_DRAWMODE_BLACKWHITE                 NC_("STR_DRAWMODE_BLACKWHITE", "Black & White")
+#define STR_DRAWMODE_WATERMARK                  NC_("STR_DRAWMODE_WATERMARK", "Watermark")
+#define STR_ROTATION                            NC_("STR_ROTATION", "Rotation")
+#define STR_GRID_NONE                           NC_("STR_GRID_NONE", "No grid")
+#define STR_GRID_LINES_ONLY                     NC_("STR_GRID_LINES_ONLY", "Grid (lines only)")
+#define STR_GRID_LINES_CHARS                    NC_("STR_GRID_LINES_CHARS", "Grid (lines and characters)")
+#define STR_FOLLOW_TEXT_FLOW                    NC_("STR_FOLLOW_TEXT_FLOW", "Follow text flow")
+#define STR_DONT_FOLLOW_TEXT_FLOW               NC_("STR_DONT_FOLLOW_TEXT_FLOW", "Do not follow text flow")
+#define STR_CONNECT_BORDER_ON                   NC_("STR_CONNECT_BORDER_ON", "Merge borders")
+#define STR_CONNECT_BORDER_OFF                  NC_("STR_CONNECT_BORDER_OFF", "Do not merge borders")
+
+#define ST_TBL                                  NC_("ST_TBL", "Table")
+#define ST_FRM                                  NC_("ST_FRM", "Text Frame")
+#define ST_PGE                                  NC_("ST_PGE", "Page")
+#define ST_DRW                                  NC_("ST_DRW", "Drawing")
+#define ST_CTRL                                 NC_("ST_CTRL", "Control")
+#define ST_REG                                  NC_("ST_REG", "Section")
+#define ST_BKM                                  NC_("ST_BKM", "Bookmark")
+#define ST_GRF                                  NC_("ST_GRF", "Graphics")
+#define ST_OLE                                  NC_("ST_OLE", "OLE object")
+#define ST_OUTL                                 NC_("ST_OUTL", "Headings")
+#define ST_SEL                                  NC_("ST_SEL", "Selection")
+#define ST_FTN                                  NC_("ST_FTN", "Footnote")
+#define ST_MARK                                 NC_("ST_MARK", "Reminder")
+#define ST_POSTIT                               NC_("ST_POSTIT", "Comment")
+#define ST_SRCH_REP                             NC_("ST_SRCH_REP", "Repeat search")
+#define ST_INDEX_ENTRY                          NC_("ST_INDEX_ENTRY", "Index entry")
+#define ST_TABLE_FORMULA                        NC_("ST_TABLE_FORMULA", "Table formula")
+#define ST_TABLE_FORMULA_ERROR                  NC_("ST_TABLE_FORMULA_ERROR", "Wrong table formula")
+// Strings for the quickhelp of the View-PgUp/Down-Buttons
+#define STR_IMGBTN_TBL_DOWN                     NC_("STR_IMGBTN_TBL_DOWN", "Next table")
+#define STR_IMGBTN_FRM_DOWN                     NC_("STR_IMGBTN_FRM_DOWN", "Next text frame")
+#define STR_IMGBTN_PGE_DOWN                     NC_("STR_IMGBTN_PGE_DOWN", "Next page")
+#define STR_IMGBTN_DRW_DOWN                     NC_("STR_IMGBTN_DRW_DOWN", "Next drawing")
+#define STR_IMGBTN_CTRL_DOWN                    NC_("STR_IMGBTN_CTRL_DOWN", "Next control")
+#define STR_IMGBTN_REG_DOWN                     NC_("STR_IMGBTN_REG_DOWN", "Next section")
+#define STR_IMGBTN_BKM_DOWN                     NC_("STR_IMGBTN_BKM_DOWN", "Next bookmark")
+#define STR_IMGBTN_GRF_DOWN                     NC_("STR_IMGBTN_GRF_DOWN", "Next graphic")
+#define STR_IMGBTN_OLE_DOWN                     NC_("STR_IMGBTN_OLE_DOWN", "Next OLE object")
+#define STR_IMGBTN_OUTL_DOWN                    NC_("STR_IMGBTN_OUTL_DOWN", "Next heading")
+#define STR_IMGBTN_SEL_DOWN                     NC_("STR_IMGBTN_SEL_DOWN", "Next selection")
+#define STR_IMGBTN_FTN_DOWN                     NC_("STR_IMGBTN_FTN_DOWN", "Next footnote")
+#define STR_IMGBTN_MARK_DOWN                    NC_("STR_IMGBTN_MARK_DOWN", "Next Reminder")
+#define STR_IMGBTN_POSTIT_DOWN                  NC_("STR_IMGBTN_POSTIT_DOWN", "Next Comment")
+#define STR_IMGBTN_SRCH_REP_DOWN                NC_("STR_IMGBTN_SRCH_REP_DOWN", "Continue search forward")
+#define STR_IMGBTN_INDEX_ENTRY_DOWN             NC_("STR_IMGBTN_INDEX_ENTRY_DOWN", "Next index entry")
+#define STR_IMGBTN_TBL_UP                       NC_("STR_IMGBTN_TBL_UP", "Previous table")
+#define STR_IMGBTN_FRM_UP                       NC_("STR_IMGBTN_FRM_UP", "Previous text frame")
+#define STR_IMGBTN_PGE_UP                       NC_("STR_IMGBTN_PGE_UP", "Previous page")
+#define STR_IMGBTN_DRW_UP                       NC_("STR_IMGBTN_DRW_UP", "Previous drawing")
+#define STR_IMGBTN_CTRL_UP                      NC_("STR_IMGBTN_CTRL_UP", "Previous control")
+#define STR_IMGBTN_REG_UP                       NC_("STR_IMGBTN_REG_UP", "Previous section")
+#define STR_IMGBTN_BKM_UP                       NC_("STR_IMGBTN_BKM_UP", "Previous bookmark")
+#define STR_IMGBTN_GRF_UP                       NC_("STR_IMGBTN_GRF_UP", "Previous graphic")
+#define STR_IMGBTN_OLE_UP                       NC_("STR_IMGBTN_OLE_UP", "Previous OLE object")
+#define STR_IMGBTN_OUTL_UP                      NC_("STR_IMGBTN_OUTL_UP", "Previous heading")
+#define STR_IMGBTN_SEL_UP                       NC_("STR_IMGBTN_SEL_UP", "Previous selection")
+#define STR_IMGBTN_FTN_UP                       NC_("STR_IMGBTN_FTN_UP", "Previous footnote")
+#define STR_IMGBTN_MARK_UP                      NC_("STR_IMGBTN_MARK_UP", "Previous Reminder")
+#define STR_IMGBTN_POSTIT_UP                    NC_("STR_IMGBTN_POSTIT_UP", "Previous Comment")
+#define STR_IMGBTN_SRCH_REP_UP                  NC_("STR_IMGBTN_SRCH_REP_UP", "Continue search backwards")
+#define STR_IMGBTN_INDEX_ENTRY_UP               NC_("STR_IMGBTN_INDEX_ENTRY_UP", "Previous index entry")
+#define STR_IMGBTN_TBLFML_UP                    NC_("STR_IMGBTN_TBLFML_UP", "Previous table formula")
+#define STR_IMGBTN_TBLFML_DOWN                  NC_("STR_IMGBTN_TBLFML_DOWN", "Next table formula")
+#define STR_IMGBTN_TBLFML_ERR_UP                NC_("STR_IMGBTN_TBLFML_ERR_UP", "Previous faulty table formula")
+#define STR_IMGBTN_TBLFML_ERR_DOWN              NC_("STR_IMGBTN_TBLFML_ERR_DOWN", "Next faulty table formula")
+
+#define STR_REDLINE_INSERT                      NC_("STR_REDLINE_INSERT", "Inserted")
+#define STR_REDLINE_DELETE                      NC_("STR_REDLINE_DELETE", "Deleted")
+#define STR_REDLINE_FORMAT                      NC_("STR_REDLINE_FORMAT", "Formatted")
+#define STR_REDLINE_TABLE                       NC_("STR_REDLINE_TABLE", "Table changed")
+#define STR_REDLINE_FMTCOLL                     NC_("STR_REDLINE_FMTCOLL", "Applied Paragraph Styles")
+#define STR_REDLINE_PARAGRAPH_FORMAT            NC_("STR_REDLINE_PARAGRAPH_FORMAT", "Paragraph formatting changed")
+#define STR_REDLINE_TABLE_ROW_INSERT            NC_("STR_REDLINE_TABLE_ROW_INSERT", "Row Inserted")
+#define STR_REDLINE_TABLE_ROW_DELETE            NC_("STR_REDLINE_TABLE_ROW_DELETE", "Row Deleted")
+#define STR_REDLINE_TABLE_CELL_INSERT           NC_("STR_REDLINE_TABLE_CELL_INSERT", "Cell Inserted")
+#define STR_REDLINE_TABLE_CELL_DELETE           NC_("STR_REDLINE_TABLE_CELL_DELETE", "Cell Deleted")
+#define STR_ENDNOTE                             NC_("STR_ENDNOTE", "Endnote: ")
+#define STR_FTNNOTE                             NC_("STR_FTNNOTE", "Footnote: ")
+#define STR_TABLE_COL_ADJUST                    NC_("STR_TABLE_COL_ADJUST", "Adjust table column")
+#define STR_TABLE_ROW_ADJUST                    NC_("STR_TABLE_ROW_ADJUST", "Adjust table row")
+#define STR_TABLE_SELECT_ALL                    NC_("STR_TABLE_SELECT_ALL", "Select whole table")
+#define STR_TABLE_SELECT_ROW                    NC_("STR_TABLE_SELECT_ROW", "Select table row")
+#define STR_TABLE_SELECT_COL                    NC_("STR_TABLE_SELECT_COL", "Select table column")
+#define STR_SMARTTAG_CLICK                      NC_("STR_SMARTTAG_CLICK", "%s-click to open Smart Tag menu")
+#define STR_HEADER_TITLE                        NC_("STR_HEADER_TITLE", "Header (%1)")
+#define STR_FIRST_HEADER_TITLE                  NC_("STR_FIRST_HEADER_TITLE", "First Page Header (%1)")
+#define STR_LEFT_HEADER_TITLE                   NC_("STR_LEFT_HEADER_TITLE", "Left Page Header (%1)")
+#define STR_RIGHT_HEADER_TITLE                  NC_("STR_RIGHT_HEADER_TITLE", "Right Page Header (%1)")
+#define STR_FOOTER_TITLE                        NC_("STR_FOOTER_TITLE", "Footer (%1)")
+#define STR_FIRST_FOOTER_TITLE                  NC_("STR_FIRST_FOOTER_TITLE", "First Page Footer (%1)")
+#define STR_LEFT_FOOTER_TITLE                   NC_("STR_LEFT_FOOTER_TITLE", "Left Page Footer (%1)")
+#define STR_RIGHT_FOOTER_TITLE                  NC_("STR_RIGHT_FOOTER_TITLE", "Right Page Footer (%1)")
+#define STR_DELETE_HEADER                       NC_("STR_DELETE_HEADER", "Delete Header...")
+#define STR_FORMAT_HEADER                       NC_("STR_FORMAT_HEADER", "Format Header...")
+#define STR_DELETE_FOOTER                       NC_("STR_DELETE_FOOTER", "Delete Footer...")
+#define STR_FORMAT_FOOTER                       NC_("STR_FORMAT_FOOTER", "Format Footer...")
+
+#define STR_GRFILTER_OPENERROR                  NC_("STR_GRFILTER_OPENERROR", "Image file cannot be opened")
+#define STR_GRFILTER_IOERROR                    NC_("STR_GRFILTER_IOERROR", "Image file cannot be read")
+#define STR_GRFILTER_FORMATERROR                NC_("STR_GRFILTER_FORMATERROR", "Unknown image format")
+#define STR_GRFILTER_VERSIONERROR               NC_("STR_GRFILTER_VERSIONERROR", "This image file version is not supported")
+#define STR_GRFILTER_FILTERERROR                NC_("STR_GRFILTER_FILTERERROR", "Image filter not found")
+#define STR_GRFILTER_TOOBIG                     NC_("STR_GRFILTER_TOOBIG", "Not enough memory to insert the image.")
+#define STR_INSERT_GRAPHIC                      NC_("STR_INSERT_GRAPHIC", "Insert Image")
+#define STR_REDLINE_COMMENT                     NC_("STR_REDLINE_COMMENT", "Comment: ")
+#define STR_REDLINE_INSERTED                    NC_("STR_REDLINE_INSERTED", "Insertion")
+#define STR_REDLINE_DELETED                     NC_("STR_REDLINE_DELETED", "Deletion")
+#define STR_REDLINE_AUTOFMT                     NC_("STR_REDLINE_AUTOFMT", "AutoCorrect")
+#define STR_REDLINE_FORMATED                    NC_("STR_REDLINE_FORMATED", "Formats")
+#define STR_REDLINE_TABLECHG                    NC_("STR_REDLINE_TABLECHG", "Table Changes")
+#define STR_REDLINE_FMTCOLLSET                  NC_("STR_REDLINE_FMTCOLLSET", "Applied Paragraph Styles")
+#define STR_REDLINE_TITLE                       NC_("STR_REDLINE_TITLE", "AutoCorrect")
+#define STR_REDLINE_MSG                         NC_("STR_REDLINE_MSG", "AutoCorrect completed.\nYou can accept or reject all changes,\nor accept or reject particular changes.")
+#define STR_REDLINE_ACCEPT_ALL                  NC_("STR_REDLINE_ACCEPT_ALL", "Accept All")
+#define STR_REDLINE_REJECT_ALL                  NC_("STR_REDLINE_REJECT_ALL", "Reject All")
+#define STR_REDLINE_EDIT                        NC_("STR_REDLINE_EDIT", "Edit Changes")
+#define STR_PAGE                                NC_("STR_PAGE", "Page ")
+#define STR_PAGE_COUNT                          NC_("STR_PAGE_COUNT", "Page %1 of %2")
+#define STR_PAGE_COUNT_CUSTOM                   NC_("STR_PAGE_COUNT_CUSTOM", "Page %1 of %2 (Page %3)")
+//Strings for gallery/background
+#define STR_SWBG_PARAGRAPH                      NC_("STR_SWBG_PARAGRAPH", "Paragraph")
+#define STR_SWBG_GRAPHIC                        NC_("STR_SWBG_GRAPHIC", "Image")
+#define STR_SWBG_OLE                            NC_("STR_SWBG_OLE", "OLE object")
+#define STR_SWBG_FRAME                          NC_("STR_SWBG_FRAME", "Frame")
+#define STR_SWBG_TABLE                          NC_("STR_SWBG_TABLE", "Table")
+#define STR_SWBG_TABLE_ROW                      NC_("STR_SWBG_TABLE_ROW", "Table row")
+#define STR_SWBG_TABLE_CELL                     NC_("STR_SWBG_TABLE_CELL", "Table cell")
+#define STR_SWBG_PAGE                           NC_("STR_SWBG_PAGE", "Page")
+#define STR_SWBG_HEADER                         NC_("STR_SWBG_HEADER", "Header")
+#define STR_SWBG_FOOTER                         NC_("STR_SWBG_FOOTER", "Footer")
+//End: strings for gallery/background
+
+#define STR_HUMAN_SWWEBDOC_NAME                 NC_("STR_HUMAN_SWWEBDOC_NAME", "HTML")
+#define STR_WRITER_WEBDOC_FULLTYPE              NC_("STR_WRITER_WEBDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION HTML Document")
+
+#define STR_TITLE                               NC_("STR_TITLE", "Title")
+#define STR_ALPHA                               NC_("STR_ALPHA", "Separator")
+#define STR_LEVEL                               NC_("STR_LEVEL", "Level ")
+#define STR_FILE_NOT_FOUND                      NC_("STR_FILE_NOT_FOUND", "The file, \"%1\" in the \"%2\" path could not be found.")
+#define STR_USER_DEFINED_INDEX                  NC_("STR_USER_DEFINED_INDEX", "User-Defined Index")
+#define STR_NOSORTKEY                           NC_("STR_NOSORTKEY", "<None>")
+#define STR_NO_CHAR_STYLE                       NC_("STR_NO_CHAR_STYLE", "<None>")
+#define STR_DELIM                               NC_("STR_DELIM", "S")
+#define STR_TOKEN_ENTRY_NO                      NC_("STR_TOKEN_ENTRY_NO", "E#")
+#define STR_TOKEN_ENTRY                         NC_("STR_TOKEN_ENTRY", "E")
+#define STR_TOKEN_TAB_STOP                      NC_("STR_TOKEN_TAB_STOP", "T")
+#define STR_TOKEN_PAGE_NUMS                     NC_("STR_TOKEN_PAGE_NUMS", "#")
+#define STR_TOKEN_CHAPTER_INFO                  NC_("STR_TOKEN_CHAPTER_INFO", "CI")
+#define STR_TOKEN_LINK_START                    NC_("STR_TOKEN_LINK_START", "LS")
+#define STR_TOKEN_LINK_END                      NC_("STR_TOKEN_LINK_END", "LE")
+#define STR_TOKEN_AUTHORITY                     NC_("STR_TOKEN_AUTHORITY", "A")
+#define STR_TOKEN_HELP_ENTRY_NO                 NC_("STR_TOKEN_HELP_ENTRY_NO", "Chapter number")
+#define STR_TOKEN_HELP_ENTRY                    NC_("STR_TOKEN_HELP_ENTRY", "Entry")
+#define STR_TOKEN_HELP_TAB_STOP                 NC_("STR_TOKEN_HELP_TAB_STOP", "Tab stop")
+#define STR_TOKEN_HELP_TEXT                     NC_("STR_TOKEN_HELP_TEXT", "Text")
+#define STR_TOKEN_HELP_PAGE_NUMS                NC_("STR_TOKEN_HELP_PAGE_NUMS", "Page number")
+#define STR_TOKEN_HELP_CHAPTER_INFO             NC_("STR_TOKEN_HELP_CHAPTER_INFO", "Chapter info")
+#define STR_TOKEN_HELP_LINK_START               NC_("STR_TOKEN_HELP_LINK_START", "Hyperlink start")
+#define STR_TOKEN_HELP_LINK_END                 NC_("STR_TOKEN_HELP_LINK_END", "Hyperlink end")
+#define STR_TOKEN_HELP_AUTHORITY                NC_("STR_TOKEN_HELP_AUTHORITY", "Bibliography entry: ")
+#define STR_CHARSTYLE                           NC_("STR_CHARSTYLE", "Character Style: ")
+#define STR_STRUCTURE                           NC_("STR_STRUCTURE", "Structure text")
+#define STR_ADDITIONAL_ACCNAME_STRING1          NC_("STR_ADDITIONAL_ACCNAME_STRING1", "Press Ctrl+Alt+A to move focus for more operations")
+#define STR_ADDITIONAL_ACCNAME_STRING2          NC_("STR_ADDITIONAL_ACCNAME_STRING2", "Press left or right arrow to choose the structure controls")
+#define STR_ADDITIONAL_ACCNAME_STRING3          NC_("STR_ADDITIONAL_ACCNAME_STRING3", "Press Ctrl+Alt+B to move focus back to the current structure control")
+#define STR_AUTOMARK_TYPE                       NC_("STR_AUTOMARK_TYPE", "Selection file for the alphabetical index (*.sdi)")
+
+/*-----------------------------------------------------------------------
+    Description: character alignment for frmsh.cxx - context menu
+ -----------------------------------------------------------------------*/
+#define STR_FRMUI_TOP_BASE                      NC_("STR_FRMUI_TOP_BASE", "Base line at ~top")
+#define STR_FRMUI_BOTTOM_BASE                   NC_("STR_FRMUI_BOTTOM_BASE", "~Base line at bottom")
+#define STR_FRMUI_CENTER_BASE                   NC_("STR_FRMUI_CENTER_BASE", "Base line ~centered")
+#define STR_FRMUI_LINE_TOP                      NC_("STR_FRMUI_LINE_TOP", "Top of line")
+#define STR_FRMUI_LINE_BOTTOM                   NC_("STR_FRMUI_LINE_BOTTOM", "Bottom of line")
+#define STR_FRMUI_LINE_CENTER                   NC_("STR_FRMUI_LINE_CENTER", "Center of line")
+#define STR_FRMUI_OLE_INSERT                    NC_("STR_FRMUI_OLE_INSERT", "Insert object")
+#define STR_FRMUI_OLE_EDIT                      NC_("STR_FRMUI_OLE_EDIT", "Edit object")
+#define STR_FRMUI_COLL_HEADER                   NC_("STR_FRMUI_COLL_HEADER", " (Template: ")
+#define STR_FRMUI_BORDER                        NC_("STR_FRMUI_BORDER", "Borders")
+#define STR_FRMUI_PATTERN                       NC_("STR_FRMUI_PATTERN", "Background")
+
+#define STR_TEXTCOLL_HEADER                     NC_("STR_TEXTCOLL_HEADER", "(Paragraph Style: ")
+#define STR_ILLEGAL_PAGENUM                     NC_("STR_ILLEGAL_PAGENUM", "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages.")
+
+#define STR_HUMAN_SWGLOBDOC_NAME                NC_("STR_HUMAN_SWGLOBDOC_NAME", "Master Document")
+#define STR_WRITER_GLOBALDOC_FULLTYPE           NC_("STR_WRITER_GLOBALDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Master Document")
+
+#define STR_QUERY_CONNECT                       NC_("STR_QUERY_CONNECT", "A file connection will delete the contents of the current section. Connect anyway?")
+#define STR_WRONG_PASSWORD                      NC_("STR_WRONG_PASSWORD", "The password entered is invalid.")
+#define STR_WRONG_PASSWD_REPEAT                 NC_("STR_WRONG_PASSWD_REPEAT", "The password has not been set.")
+
+#define STR_HYP_OK                              NC_("STR_HYP_OK", "Hyphenation completed")
+#define STR_LANGSTATUS_NONE                     NC_("STR_LANGSTATUS_NONE", "None (Do not check spelling)")
+#define STR_RESET_TO_DEFAULT_LANGUAGE           NC_("STR_RESET_TO_DEFAULT_LANGUAGE", "Reset to Default Language")
+#define STR_LANGSTATUS_MORE                     NC_("STR_LANGSTATUS_MORE", "More...")
+#define STR_IGNORE_SELECTION                    NC_("STR_IGNORE_SELECTION", "~Ignore")
+#define STR_EXPLANATION_LINK                    NC_("STR_EXPLANATION_LINK", "Explanations...")
+
+#define STR_QUERY_SPECIAL_FORCED                NC_("STR_QUERY_SPECIAL_FORCED", "Check special regions is deactivated. Check anyway?")
+#define STR_NO_MERGE_ENTRY                      NC_("STR_NO_MERGE_ENTRY", "Could not merge documents.")
+#define STR_ERR_SRCSTREAM                       NC_("STR_ERR_SRCSTREAM", "The source cannot be loaded.")
+#define STR_ERR_NO_FAX                          NC_("STR_ERR_NO_FAX", "No fax printer has been set under Tools/Options/%1/Print.")
+#define STR_WEBOPTIONS                          NC_("STR_WEBOPTIONS", "HTML document")
+#define STR_TEXTOPTIONS                         NC_("STR_TEXTOPTIONS", "Text document")
+#define STR_SCAN_NOSOURCE                       NC_("STR_SCAN_NOSOURCE", "Source not specified.")
+#define STR_NUM_LEVEL                           NC_("STR_NUM_LEVEL", "Level ")
+#define STR_NUM_OUTLINE                         NC_("STR_NUM_OUTLINE", "Outline ")
+#define STR_EDIT_FOOTNOTE                       NC_("STR_EDIT_FOOTNOTE", "Edit Footnote/Endnote")
+#define STR_NB_REPLACED                         NC_("STR_NB_REPLACED", "Search key replaced XX times.")
+#define STR_SRCVIEW_ROW                         NC_("STR_SRCVIEW_ROW", "Row ")
+#define STR_SRCVIEW_COL                         NC_("STR_SRCVIEW_COL", "Column ")
+#define STR_SAVEAS_SRC                          NC_("STR_SAVEAS_SRC", "~Export source...")
+#define STR_SAVEACOPY_SRC                       NC_("STR_SAVEACOPY_SRC", "~Export copy of source...")
+
+#define ST_CONTINUE                             NC_("ST_CONTINUE", "~Continue")
+#define ST_TASK                                 NC_("ST_TASK", "Task")
+#define ST_STATUS                               NC_("ST_STATUS", "Status")
+#define ST_SENDINGTO                            NC_("ST_SENDINGTO", "Sending to: %1")
+#define ST_COMPLETED                            NC_("ST_COMPLETED", "Successfully sent")
+#define ST_FAILED                               NC_("ST_FAILED", "Sending failed")
+
+#define STR_SENDER_TOKENS                       NC_("STR_SENDER_TOKENS", "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;")
+
+#define STR_TBL_FORMULA                         NC_("STR_TBL_FORMULA", "Text formula")
+
+#define STR_MENU_ZOOM                           NC_("STR_MENU_ZOOM", "~Zoom")
+#define STR_MENU_UP                             NC_("STR_MENU_UP", "~Upwards")
+#define STR_MENU_DOWN                           NC_("STR_MENU_DOWN", "Do~wnwards")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 5ad4445bebdc..71a67778d387 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_SWTYPES_HXX
 #define INCLUDED_SW_INC_SWTYPES_HXX
 #include <rtl/ustring.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/mapunit.hxx>
 #include <SwGetPoolIdFromName.hxx>
@@ -48,7 +47,6 @@ namespace utl{
 }
 
 class Size;
-class ResMgr;
 class SwPathFinder;
 class Graphic;
 class OutputDevice;
@@ -132,13 +130,8 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
 // fields before INIT_FLDTYPES.
 #define INIT_SEQ_FLDTYPES   4
 
-extern ResMgr* pSwResMgr;
-// defined in sw/source/uibase/app/swmodule.cxx for the sw library and in
-// sw/source/ui/dialog/swdialmgr.cxx for the swui library
-inline OUString SwResId(sal_uInt16 nId)
-{
-    return ResId(nId, *pSwResMgr);
-}
+// defined in sw/source/uibase/app/swmodule.cxx
+SW_DLLPUBLIC OUString SwResId(const char* pId);
 
 css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker();
 css::uno::Reference< css::linguistic2::XHyphenator >    GetHyphenator();
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 5ddc3ca23c1d..c7c3f3a9b80f 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -175,6 +175,8 @@ enum class SwUndoId
     CONFLICT
 };
 
+OUString GetUndoComment(SwUndoId eId);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unocore.hrc b/sw/inc/unocore.hrc
deleted file mode 100644
index ec63eb545603..000000000000
--- a/sw/inc/unocore.hrc
+++ /dev/null
@@ -1,43 +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_SW_INC_UNOCORE_HRC
-#define INCLUDED_SW_INC_UNOCORE_HRC
-
-#include "rcid.hrc"
-
-#define STR_CHART2_ROW_LABEL_TEXT           (RC_UNOCORE_BEGIN + 1)
-#define STR_CHART2_COL_LABEL_TEXT           (RC_UNOCORE_BEGIN + 2)
-#define STR_STYLE_FAMILY_CHARACTER          (RC_UNOCORE_BEGIN + 3)
-#define STR_STYLE_FAMILY_PARAGRAPH          (RC_UNOCORE_BEGIN + 4)
-#define STR_STYLE_FAMILY_FRAME              (RC_UNOCORE_BEGIN + 5)
-#define STR_STYLE_FAMILY_PAGE               (RC_UNOCORE_BEGIN + 6)
-#define STR_STYLE_FAMILY_NUMBERING          (RC_UNOCORE_BEGIN + 7)
-#define STR_STYLE_FAMILY_TABLE              (RC_UNOCORE_BEGIN + 8)
-#define STR_STYLE_FAMILY_CELL               (RC_UNOCORE_BEGIN + 9)
-
-#define UNOCORE_ACT_END                     STR_STYLE_FAMILY_CELL
-
-#if UNOCORE_ACT_END > RC_UNOCORE_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/utlui.hrc b/sw/inc/utlui.hrc
new file mode 100644
index 000000000000..4f9a7287bfd0
--- /dev/null
+++ b/sw/inc/utlui.hrc
@@ -0,0 +1,53 @@
+/* -*- 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_SW_INC_UTLUI_HRC
+#define INCLUDED_SW_INC_UTLUI_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_SHELLRES_AUTOFMTSTRS[] =
+{
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Remove empty paragraphs"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Use replacement table"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Correct TWo INitial CApitals"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Capitalize first letter of sentences"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace \"standard\" quotes with %1 \bcustom%2 quotes"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace Custom Styles"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Bullets replaced"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Automatic _underline_"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Automatic *bold*"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace 1/2 ... with ½ ..."),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "URL recognition"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace dashes"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace 1st... with 1^st..."),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Combine single line paragraphs"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body indent\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Hanging indent\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body indent\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Heading $(ARG1)\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Bullet\" or \"Numbering\" Style"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Combine paragraphs"),
+    NC_("RID_SHELLRES_AUTOFMTSTRS", "Add non breaking space")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index d630979c3e60..c59a0fa6c11e 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -20,7 +20,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 #include <test/bootstrapfixture.hxx>
 
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <swdll.hxx>
 #include "swtypes.hxx"
 #include "SwStyleNameMapper.hxx"
diff --git a/sw/sdi/swslots.hrc b/sw/sdi/swslots.hrc
index 88571635c87f..f8bba2c501d2 100644
--- a/sw/sdi/swslots.hrc
+++ b/sw/sdi/swslots.hrc
@@ -18,7 +18,6 @@
  */
 #include <editeng/memberids.hrc>
 #include <editeng/editids.hrc>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include "globals.hrc"
 #include "cmdid.h"
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 5bd02d5966ca..3d80e18e7476 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1407,16 +1407,11 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
     return bRet;
 }
 
-OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
-                                           const OUString *pArg1,
-                                           const OUString *pArg2 )
+OUString SwAccessibleContext::GetResource(const char* pResId,
+                                          const OUString *pArg1,
+                                          const OUString *pArg2)
 {
-    OUString sStr;
-    {
-        SolarMutexGuard aGuard;
-
-        sStr = SwResId( nResId );
-    }
+    OUString sStr = SwResId(pResId);
 
     if( pArg1 )
     {
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 4f19e24f7f78..2995cc192c3a 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -351,9 +351,9 @@ public:
     virtual bool SetSelectedState(bool bSeleted);
     bool  IsSeletedInDoc() { return m_isSelectedInDoc; }
 
-    static OUString GetResource( sal_uInt16 nResId,
-                                        const OUString *pArg1 = nullptr,
-                                        const OUString *pArg2 = nullptr );
+    static OUString GetResource(const char* pResId,
+                                const OUString *pArg1 = nullptr,
+                                const OUString *pArg2 = nullptr);
 };
 
 #endif
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 2f0ec4f42d16..5d1e5fccb111 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -32,7 +32,7 @@
 #include <doc.hxx>
 #include <accmap.hxx>
 #include <accdoc.hxx>
-#include "access.hrc"
+#include "strings.hrc"
 #include <pagefrm.hxx>
 
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 0d6e4bb02414..c01f6b0e902f 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -28,7 +28,7 @@
 #include <viewsh.hxx>
 #include <accmap.hxx>
 #include "accfootnote.hxx"
-#include "access.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -46,7 +46,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
         bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
         pFootnoteFrame )
 {
-    sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
+    const char* pResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
                                    : STR_ACCESS_FOOTNOTE_NAME;
 
     OUString sArg;
@@ -58,7 +58,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
         sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
-    SetName( GetResource( nResId, &sArg ) );
+    SetName(GetResource(pResId, &sArg));
 }
 
 SwAccessibleFootnote::~SwAccessibleFootnote()
@@ -71,7 +71,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
 
     ThrowIfDisposed();
 
-    sal_uInt16 nResId = AccessibleRole::END_NOTE == GetRole()
+    const char* pResId = AccessibleRole::END_NOTE == GetRole()
         ? STR_ACCESS_ENDNOTE_DESC
         : STR_ACCESS_FOOTNOTE_DESC ;
 
@@ -84,7 +84,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
         sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
     }
 
-    return GetResource( nResId, &sArg );
+    return GetResource(pResId, &sArg);
 }
 
 OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 714045be234c..24050ecfe622 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -24,7 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <hffrm.hxx>
 #include "accheaderfooter.hxx"
-#include "access.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -62,13 +62,13 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
 
     ThrowIfDisposed();
 
-    sal_uInt16 nResId = AccessibleRole::HEADER == GetRole()
+    const char* pResId = AccessibleRole::HEADER == GetRole()
         ? STR_ACCESS_HEADER_DESC
         : STR_ACCESS_FOOTER_DESC ;
 
     OUString sArg( GetFormattedPageNumber() );
 
-    return GetResource( nResId, &sArg );
+    return GetResource(pResId, &sArg);
 }
 
 OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 0a0337929ab4..1fa0503c6450 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -30,7 +30,7 @@
 #include <accmap.hxx>
 #include <acccontext.hxx>
 #include <accdoc.hxx>
-#include <access.hrc>
+#include <strings.hrc>
 #include <accpreview.hxx>
 #include <accpage.hxx>
 #include <accpara.hxx>
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index c53078f23359..c1ec931b9a51 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "accpage.hxx"
 
-#include "access.hrc"
+#include "strings.hrc"
 #include <pagefrm.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 3bba2d24c3a6..e687bca7a6f3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <breakit.hxx>
 #include <accpara.hxx>
-#include <access.hrc>
+#include <strings.hrc>
 #include <accportions.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index d66dbfb2216d..60169becadc7 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -23,8 +23,7 @@
 #include <txttypes.hxx>
 
 // for portion replacement in Special()
-#include "access.hrc"
-#include <tools/resid.hxx>
+#include "strings.hrc"
 #include "viewopt.hxx"
 
 // for GetWordBoundary(...), GetSentenceBoundary(...):
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 3b449d18d9b4..a3d74f730831 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "access.hrc"
+#include "strings.hrc"
 #include <accpreview.hxx>
 
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 8b9f6e7886b9..792ea4a41dcc 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -40,7 +40,7 @@
 #include <fesh.hxx>
 #include <accfrmobjslist.hxx>
 #include <accmap.hxx>
-#include <access.hrc>
+#include <strings.hrc>
 #include <acctable.hxx>
 
 #include <layfrm.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 951867b33f24..22bd71a54191 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -108,9 +108,10 @@
 #include <pam.hxx>
 #include <paratr.hxx>
 #include <proofreadingiterator.hxx>
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
 #include <rtl/instance.hxx>
 #include <svl/macitem.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/sdtaitm.hxx>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 05b1d54010b1..e8960beab045 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -60,7 +60,7 @@
 #include <IGrammarContact.hxx>
 #include <comphelper/flagguard.hxx>
 #include <globals.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <IDocumentLayoutAccess.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index d4ffd65bed88..6f59f3148750 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <swcrsr.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
@@ -25,7 +24,7 @@
 #include <pamtyp.hxx>
 #include <swundo.hxx>
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 
 /// parameters for a search for FormatCollections
 struct SwFindParaFormatColl : public SwFindParas
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 23e6a6b59f61..5f3a74c47e83 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -46,7 +46,7 @@
 #include <breakit.hxx>
 #include <vcl/msgbox.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <redline.hxx>
 #include <txatbase.hxx>
 #include <memory>
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index def58efd718b..9df69a4ee19a 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -40,7 +40,7 @@
 #include <scriptinfo.hxx>
 #include <mdiexp.hxx>
 #include <wrtsh.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <view.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 37455f42a410..4dafcf02ff62 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -27,7 +27,7 @@
 #include <dbfld.hxx>
 #include <reffld.hxx>
 #include <flddropdown.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <SwUndoField.hxx>
 #include <flddat.hxx>
 #include <cntfrm.hxx>
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 601a57db22fe..0baf6586c449 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -26,7 +26,7 @@
 #include <UndoRedline.hxx>
 #include <docary.hxx>
 #include <ndtxt.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <swmodule.hxx>
 #include <editsh.hxx>
 #include <vcl/layout.hxx>
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f29114005681..8b73457738dd 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <DocumentStylePoolManager.hxx>
+#include <SwStyleNameMapper.hxx>
 #include <doc.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentState.hxx>
@@ -58,6 +59,7 @@
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <rcid.hrc>
+#include <strings.hrc>
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
@@ -270,6 +272,271 @@ namespace
     }
 }
 
+static const char* STR_POOLCOLL_TEXT_ARY[] =
+{
+    // Category Text
+    STR_POOLCOLL_STANDARD,
+    STR_POOLCOLL_TEXT,
+    STR_POOLCOLL_TEXT_IDENT,
+    STR_POOLCOLL_TEXT_NEGIDENT,
+    STR_POOLCOLL_TEXT_MOVE,
+    STR_POOLCOLL_GREETING,
+    STR_POOLCOLL_SIGNATURE,
+    STR_POOLCOLL_CONFRONTATION,
+    STR_POOLCOLL_MARGINAL,
+    // Subcategory Headlines
+    STR_POOLCOLL_HEADLINE_BASE,
+    STR_POOLCOLL_HEADLINE1,
+    STR_POOLCOLL_HEADLINE2,
+    STR_POOLCOLL_HEADLINE3,
+    STR_POOLCOLL_HEADLINE4,
+    STR_POOLCOLL_HEADLINE5,
+    STR_POOLCOLL_HEADLINE6,
+    STR_POOLCOLL_HEADLINE7,
+    STR_POOLCOLL_HEADLINE8,
+    STR_POOLCOLL_HEADLINE9,
+    STR_POOLCOLL_HEADLINE10
+};
+
+static const char* STR_POOLCOLL_LISTS_ARY[]
+{
+    // Category Lists
+    STR_POOLCOLL_NUMBUL_BASE,
+    // Subcategory Numbering
+    STR_POOLCOLL_NUM_LEVEL1S,
+    STR_POOLCOLL_NUM_LEVEL1,
+    STR_POOLCOLL_NUM_LEVEL1E,
+    STR_POOLCOLL_NUM_NONUM1,
+    STR_POOLCOLL_NUM_LEVEL2S,
+    STR_POOLCOLL_NUM_LEVEL2,
+    STR_POOLCOLL_NUM_LEVEL2E,
+    STR_POOLCOLL_NUM_NONUM2,
+    STR_POOLCOLL_NUM_LEVEL3S,
+    STR_POOLCOLL_NUM_LEVEL3,
+    STR_POOLCOLL_NUM_LEVEL3E,
+    STR_POOLCOLL_NUM_NONUM3,
+    STR_POOLCOLL_NUM_LEVEL4S,
+    STR_POOLCOLL_NUM_LEVEL4,
+    STR_POOLCOLL_NUM_LEVEL4E,
+    STR_POOLCOLL_NUM_NONUM4,
+    STR_POOLCOLL_NUM_LEVEL5S,
+    STR_POOLCOLL_NUM_LEVEL5,
+    STR_POOLCOLL_NUM_LEVEL5E,
+    STR_POOLCOLL_NUM_NONUM5,
+
+    // Subcategory Enumeration
+    STR_POOLCOLL_BUL_LEVEL1S,
+    STR_POOLCOLL_BUL_LEVEL1,
+    STR_POOLCOLL_BUL_LEVEL1E,
+    STR_POOLCOLL_BUL_NONUM1,
+    STR_POOLCOLL_BUL_LEVEL2S,
+    STR_POOLCOLL_BUL_LEVEL2,
+    STR_POOLCOLL_BUL_LEVEL2E,
+    STR_POOLCOLL_BUL_NONUM2,
+    STR_POOLCOLL_BUL_LEVEL3S,
+    STR_POOLCOLL_BUL_LEVEL3,
+    STR_POOLCOLL_BUL_LEVEL3E,
+    STR_POOLCOLL_BUL_NONUM3,
+    STR_POOLCOLL_BUL_LEVEL4S,
+    STR_POOLCOLL_BUL_LEVEL4,
+    STR_POOLCOLL_BUL_LEVEL4E,
+    STR_POOLCOLL_BUL_NONUM4,
+    STR_POOLCOLL_BUL_LEVEL5S,
+    STR_POOLCOLL_BUL_LEVEL5,
+    STR_POOLCOLL_BUL_LEVEL5E,
+    STR_POOLCOLL_BUL_NONUM5
+};
+
+// Special Areas
+static const char* STR_POOLCOLL_EXTRA_ARY[]
+{
+    // Subcategory Header
+    STR_POOLCOLL_HEADER,
+    STR_POOLCOLL_HEADERL,
+    STR_POOLCOLL_HEADERR,
+    // Subcategroy Footer
+    STR_POOLCOLL_FOOTER,
+    STR_POOLCOLL_FOOTERL,
+    STR_POOLCOLL_FOOTERR,
+    // Subcategroy Table
+    STR_POOLCOLL_TABLE,
+    STR_POOLCOLL_TABLE_HDLN,
+    // Subcategroy Labels
+    STR_POOLCOLL_LABEL,
+    STR_POOLCOLL_LABEL_ABB,
+    STR_POOLCOLL_LABEL_TABLE,
+    STR_POOLCOLL_LABEL_FRAME,
+    // Miscellaneous
+    STR_POOLCOLL_FRAME,
+    STR_POOLCOLL_FOOTNOTE,
+    STR_POOLCOLL_JAKETADRESS,
+    STR_POOLCOLL_SENDADRESS,
+    STR_POOLCOLL_ENDNOTE,
+    STR_POOLCOLL_LABEL_DRAWING
+};
+
+static const char* STR_POOLCOLL_REGISTER_ARY[] =
+{
+    // Category Directories
+    STR_POOLCOLL_REGISTER_BASE,
+    // Subcategory Index-Directories
+    STR_POOLCOLL_TOX_IDXH,
+    STR_POOLCOLL_TOX_IDX1,
+    STR_POOLCOLL_TOX_IDX2,
+    STR_POOLCOLL_TOX_IDX3,
+    STR_POOLCOLL_TOX_IDXBREAK,
+    // Subcategory Tables of Contents
+    STR_POOLCOLL_TOX_CNTNTH,
+    STR_POOLCOLL_TOX_CNTNT1,
+    STR_POOLCOLL_TOX_CNTNT2,
+    STR_POOLCOLL_TOX_CNTNT3,
+    STR_POOLCOLL_TOX_CNTNT4,
+    STR_POOLCOLL_TOX_CNTNT5,
+    // Subcategory User-Directories:
+    STR_POOLCOLL_TOX_USERH,
+    STR_POOLCOLL_TOX_USER1,
+    STR_POOLCOLL_TOX_USER2,
+    STR_POOLCOLL_TOX_USER3,
+    STR_POOLCOLL_TOX_USER4,
+    STR_POOLCOLL_TOX_USER5,
+    // Subcategory Table of Contents more Levels 5 - 10
+    STR_POOLCOLL_TOX_CNTNT6,
+    STR_POOLCOLL_TOX_CNTNT7,
+    STR_POOLCOLL_TOX_CNTNT8,
+    STR_POOLCOLL_TOX_CNTNT9,
+    STR_POOLCOLL_TOX_CNTNT10,
+    // Illustrations Index
+    STR_POOLCOLL_TOX_ILLUSH,
+    STR_POOLCOLL_TOX_ILLUS1,
+    //  Object Index
+    STR_POOLCOLL_TOX_OBJECTH,
+    STR_POOLCOLL_TOX_OBJECT1,
+    //  Tables Index
+    STR_POOLCOLL_TOX_TABLESH,
+    STR_POOLCOLL_TOX_TABLES1,
+    //  Index of Authorities
+    STR_POOLCOLL_TOX_AUTHORITIESH,
+    STR_POOLCOLL_TOX_AUTHORITIES1,
+    // Subcategory User-Directories more Levels 5 - 10
+    STR_POOLCOLL_TOX_USER6,
+    STR_POOLCOLL_TOX_USER7,
+    STR_POOLCOLL_TOX_USER8,
+    STR_POOLCOLL_TOX_USER9,
+    STR_POOLCOLL_TOX_USER10
+};
+
+static const char* STR_POOLCOLL_DOC_ARY[] =
+{
+    // Category Chapter/Document
+    STR_POOLCOLL_DOC_TITEL,
+    STR_POOLCOLL_DOC_SUBTITEL
+};
+
+static const char* STR_POOLCOLL_HTML_ARY[] =
+{
+    // Category HTML-Templates
+    STR_POOLCOLL_HTML_BLOCKQUOTE,
+    STR_POOLCOLL_HTML_PRE,
+    STR_POOLCOLL_HTML_HR,
+    STR_POOLCOLL_HTML_DD,
+    STR_POOLCOLL_HTML_DT
+};
+
+static const char* STR_POOLCHR_ARY[] =
+{
+    STR_POOLCHR_FOOTNOTE,
+    STR_POOLCHR_PAGENO,
+    STR_POOLCHR_LABEL,
+    STR_POOLCHR_DROPCAPS,
+    STR_POOLCHR_NUM_LEVEL,
+    STR_POOLCHR_BUL_LEVEL,
+    STR_POOLCHR_INET_NORMAL,
+    STR_POOLCHR_INET_VISIT,
+    STR_POOLCHR_JUMPEDIT,
+    STR_POOLCHR_TOXJUMP,
+    STR_POOLCHR_ENDNOTE,
+    STR_POOLCHR_LINENUM,
+    STR_POOLCHR_IDX_MAIN_ENTRY,
+    STR_POOLCHR_FOOTNOTE_ANCHOR,
+    STR_POOLCHR_ENDNOTE_ANCHOR,
+    STR_POOLCHR_RUBYTEXT,
+    STR_POOLCHR_VERT_NUM
+};
+
+static const char* STR_POOLCHR_HTML_ARY[] =
+{
+    STR_POOLCHR_HTML_EMPHASIS,
+    STR_POOLCHR_HTML_CITIATION,
+    STR_POOLCHR_HTML_STRONG,
+    STR_POOLCHR_HTML_CODE,
+    STR_POOLCHR_HTML_SAMPLE,
+    STR_POOLCHR_HTML_KEYBOARD,
+    STR_POOLCHR_HTML_VARIABLE,
+    STR_POOLCHR_HTML_DEFINSTANCE,
+    STR_POOLCHR_HTML_TELETYPE
+};
+
+static const char* STR_POOLFRM_ARY[] =
+{
+    STR_POOLFRM_FRAME,
+    STR_POOLFRM_GRAPHIC,
+    STR_POOLFRM_OLE,
+    STR_POOLFRM_FORMEL,
+    STR_POOLFRM_MARGINAL,
+    STR_POOLFRM_WATERSIGN,
+    STR_POOLFRM_LABEL
+};
+
+static const char* STR_POOLPAGE_ARY[] =
+{
+    // Page styles
+    STR_POOLPAGE_STANDARD,
+    STR_POOLPAGE_FIRST,
+    STR_POOLPAGE_LEFT,
+    STR_POOLPAGE_RIGHT,
+    STR_POOLPAGE_JAKET,
+    STR_POOLPAGE_REGISTER,
+    STR_POOLPAGE_HTML,
+    STR_POOLPAGE_FOOTNOTE,
+    STR_POOLPAGE_ENDNOTE,
+    STR_POOLPAGE_LANDSCAPE
+};
+
+static const char* STR_POOLNUMRULE_NUM_ARY[] =
+{
+    // Numbering styles
+    STR_POOLNUMRULE_NUM1,
+    STR_POOLNUMRULE_NUM2,
+    STR_POOLNUMRULE_NUM3,
+    STR_POOLNUMRULE_NUM4,
+    STR_POOLNUMRULE_NUM5,
+    STR_POOLNUMRULE_BUL1,
+    STR_POOLNUMRULE_BUL2,
+    STR_POOLNUMRULE_BUL3,
+    STR_POOLNUMRULE_BUL4,
+    STR_POOLNUMRULE_BUL5
+};
+
+static const char* STR_TABSTYLE_ARY[] =
+{
+    STR_TABSTYLE_DEFAULT,
+    STR_TABSTYLE_3D,
+    STR_TABSTYLE_BLACK1,
+    STR_TABSTYLE_BLACK2,
+    STR_TABSTYLE_BLUE,
+    STR_TABSTYLE_BROWN,
+    STR_TABSTYLE_CURRENCY,
+    STR_TABSTYLE_CURRENCY_3D,
+    STR_TABSTYLE_CURRENCY_GRAY,
+    STR_TABSTYLE_CURRENCY_LAVENDER,
+    STR_TABSTYLE_CURRENCY_TURQUOISE,
+    STR_TABSTYLE_GRAY,
+    STR_TABSTYLE_GREEN,
+    STR_TABSTYLE_LAVENDER,
+    STR_TABSTYLE_RED,
+    STR_TABSTYLE_TURQUOISE,
+    STR_TABSTYLE_YELLOW
+};
 
 namespace sw
 {
@@ -303,26 +570,43 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
     }
 
     // Didn't find it until here -> create anew
-    sal_uInt16 nResId = 0;
-    if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
-        nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
+    const char* pResId = nullptr;
+    if (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END)
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_TEXT_ARY) == RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_TEXT_ARY[nId - RES_POOLCOLL_TEXT_BEGIN];
+    }
     else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
-        nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_LISTS_ARY) == RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_LISTS_ARY[nId - RES_POOLCOLL_LISTS_BEGIN];
+    }
     else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
-        nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_EXTRA_ARY) == RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_EXTRA_ARY[nId - RES_POOLCOLL_EXTRA_BEGIN];
+    }
     else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
-        nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_REGISTER_ARY) == RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_REGISTER_ARY[nId - RES_POOLCOLL_REGISTER_BEGIN];
+    }
     else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
-        nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_DOC_ARY) == RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_DOC_ARY[nId - RES_POOLCOLL_DOC_BEGIN];
+    }
     else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
-        nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
+    {
+        static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_HTML_ARY) == RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN, "### unexpected size!");
+        pResId = STR_POOLCOLL_HTML_ARY[nId - RES_POOLCOLL_HTML_BEGIN];
+    }
 
-    OSL_ENSURE( nResId, "Invalid Pool ID" );
-    if( !nResId )
-        return GetTextCollFromPool( RES_POOLCOLL_STANDARD );
+    OSL_ENSURE(pResId, "Invalid Pool ID");
+    if (!pResId)
+        return GetTextCollFromPool(RES_POOLCOLL_STANDARD);
 
-    ResId aResId( nResId + nId, *pSwResMgr );
-    OUString aNm( aResId );
+    OUString aNm(SwResId(pResId));
 
     // A Set for all to-be-set Attributes
     SwAttrSet aSet( m_rDoc.GetAttrPool(), aTextFormatCollSetRange );
@@ -1085,7 +1369,8 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
     SwFormat *pDeriveFormat = nullptr;
 
     SwFormatsBase* pArray[ 2 ];
-    sal_uInt16 nArrCnt = 1, nRCId = 0;
+    sal_uInt16 nArrCnt = 1;
+    const char* pRCId = nullptr;
     sal_uInt16* pWhichRange = nullptr;
 
     switch( nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
@@ -1094,12 +1379,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
         {
             pArray[0] = m_rDoc.GetCharFormats();
             pDeriveFormat = m_rDoc.GetDfltCharFormat();
-
-            if( nId > RES_POOLCHR_NORMAL_END )
-                nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN;
-            else
-                nRCId = RC_POOLCHRFMT_BEGIN - RES_POOLCHR_BEGIN;
-            pWhichRange =  aCharFormatSetRange;
+            pWhichRange = aCharFormatSetRange;
 
             // Fault: unknown Format, but a CharFormat
             //             -> return the first one
@@ -1108,6 +1388,11 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
                 OSL_ENSURE( false, "invalid Id" );
                 nId = RES_POOLCHR_BEGIN;
             }
+
+            if (nId > RES_POOLCHR_NORMAL_END)
+                pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
+            else
+                pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
         }
         break;
     case POOLGRP_FRAMEFMT:
@@ -1116,7 +1401,6 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
             pArray[1] = m_rDoc.GetSpzFrameFormats();
             pDeriveFormat = m_rDoc.GetDfltFrameFormat();
             nArrCnt = 2;
-            nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN;
             pWhichRange = aFrameFormatSetRange;
 
             // Fault: unknown Format, but a FrameFormat
@@ -1126,6 +1410,8 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
                 OSL_ENSURE( false, "invalid Id" );
                 nId = RES_POOLFRM_BEGIN;
             }
+
+            pRCId = STR_POOLFRM_ARY[nId - RES_POOLFRM_BEGIN];
         }
         break;
 
@@ -1134,7 +1420,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
         OSL_ENSURE( nId, "invalid Id" );
         return nullptr;
     }
-    OSL_ENSURE( nRCId, "invalid Id" );
+    OSL_ENSURE(pRCId, "invalid Id");
 
     while( nArrCnt-- )
         for( size_t n = 0; n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
@@ -1144,8 +1430,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
                 return pNewFormat;
             }
 
-    ResId aResId( nRCId + nId, *pSwResMgr );
-    OUString aNm( aResId );
+    OUString aNm(SwResId(pRCId));
     SwAttrSet aSet( m_rDoc.GetAttrPool(), pWhichRange );
 
     {
@@ -1391,8 +1676,8 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
 
     SwPageDesc* pNewPgDsc = nullptr;
     {
-        const ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr );
-        const OUString aNm( aResId );
+        static_assert(SAL_N_ELEMENTS(STR_POOLPAGE_ARY) == RES_POOLPAGE_END - RES_POOLPAGE_BEGIN, "### unexpected size!");
+        const OUString aNm(SwResId(STR_POOLPAGE_ARY[nId - RES_POOLPAGE_BEGIN]));
         const bool bIsModified = m_rDoc.getIDocumentState().IsModified();
 
         {
@@ -1564,8 +1849,8 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
         nId = RES_POOLNUMRULE_BEGIN;
     }
 
-    ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
-    OUString aNm( aResId );
+    static_assert(SAL_N_ELEMENTS(STR_POOLNUMRULE_NUM_ARY) == RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN, "### unexpected size!");
+    OUString aNm(SwResId(STR_POOLNUMRULE_NUM_ARY[nId - RES_POOLNUMRULE_BEGIN]));
 
     SwCharFormat *pNumCFormat = nullptr, *pBullCFormat = nullptr;
 
@@ -2218,5 +2503,113 @@ DocumentStylePoolManager::~DocumentStylePoolManager()
 
 }
 
+// Initialise UI names to 0
+std::vector<OUString> *SwStyleNameMapper::s_pTextUINameArray = nullptr,
+                *SwStyleNameMapper::s_pListsUINameArray = nullptr,
+                *SwStyleNameMapper::s_pExtraUINameArray = nullptr,
+                *SwStyleNameMapper::s_pRegisterUINameArray = nullptr,
+                *SwStyleNameMapper::s_pDocUINameArray = nullptr,
+                *SwStyleNameMapper::s_pHTMLUINameArray = nullptr,
+                *SwStyleNameMapper::s_pFrameFormatUINameArray = nullptr,
+                *SwStyleNameMapper::s_pChrFormatUINameArray = nullptr,
+                *SwStyleNameMapper::s_pHTMLChrFormatUINameArray = nullptr,
+                *SwStyleNameMapper::s_pPageDescUINameArray = nullptr,
+                *SwStyleNameMapper::s_pNumRuleUINameArray = nullptr,
+                *SwStyleNameMapper::s_pTableStyleUINameArray = nullptr,
+                *SwStyleNameMapper::s_pCellStyleUINameArray = nullptr;
+
+std::vector<OUString>*
+lcl_NewUINameArray(const char** pIds, const size_t nLen)
+{
+    std::vector<OUString> *const pNameArray = new std::vector<OUString>;
+    pNameArray->reserve(nLen);
+    for (size_t i = 0; i < nLen; ++i)
+        pNameArray->push_back(SwResId(pIds[i]));
+    return pNameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
+{
+    if (!s_pTextUINameArray)
+        s_pTextUINameArray = lcl_NewUINameArray(STR_POOLCOLL_TEXT_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_TEXT_ARY));
+    return *s_pTextUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
+{
+    if (!s_pListsUINameArray)
+        s_pListsUINameArray = lcl_NewUINameArray(STR_POOLCOLL_LISTS_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_LISTS_ARY));
+    return *s_pListsUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
+{
+    if (!s_pExtraUINameArray)
+        s_pExtraUINameArray = lcl_NewUINameArray(STR_POOLCOLL_EXTRA_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_EXTRA_ARY));
+    return *s_pExtraUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
+{
+    if (!s_pRegisterUINameArray)
+        s_pRegisterUINameArray = lcl_NewUINameArray(STR_POOLCOLL_REGISTER_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_REGISTER_ARY));
+    return *s_pRegisterUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
+{
+    if (!s_pDocUINameArray)
+        s_pDocUINameArray = lcl_NewUINameArray(STR_POOLCOLL_DOC_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_DOC_ARY));
+    return *s_pDocUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
+{
+    if (!s_pHTMLUINameArray)
+        s_pHTMLUINameArray = lcl_NewUINameArray(STR_POOLCOLL_HTML_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_HTML_ARY));
+    return *s_pHTMLUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
+{
+    if (!s_pFrameFormatUINameArray)
+        s_pFrameFormatUINameArray = lcl_NewUINameArray(STR_POOLFRM_ARY, SAL_N_ELEMENTS(STR_POOLFRM_ARY));
+    return *s_pFrameFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
+{
+    if (!s_pChrFormatUINameArray)
+        s_pChrFormatUINameArray = lcl_NewUINameArray(STR_POOLCHR_ARY, SAL_N_ELEMENTS(STR_POOLCHR_ARY));
+    return *s_pChrFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
+{
+    if (!s_pHTMLChrFormatUINameArray)
+        s_pHTMLChrFormatUINameArray = lcl_NewUINameArray(STR_POOLCHR_HTML_ARY, SAL_N_ELEMENTS(STR_POOLCHR_HTML_ARY));
+    return *s_pHTMLChrFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
+{
+    if (!s_pPageDescUINameArray)
+        s_pPageDescUINameArray = lcl_NewUINameArray(STR_POOLPAGE_ARY, SAL_N_ELEMENTS(STR_POOLPAGE_ARY));
+    return *s_pPageDescUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
+{
+    if (!s_pNumRuleUINameArray)
+        s_pNumRuleUINameArray = lcl_NewUINameArray(STR_POOLNUMRULE_NUM_ARY, SAL_N_ELEMENTS(STR_POOLNUMRULE_NUM_ARY));
+    return *s_pNumRuleUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray()
+{
+    if (!s_pTableStyleUINameArray)
+        s_pTableStyleUINameArray = lcl_NewUINameArray(STR_TABSTYLE_ARY, SAL_N_ELEMENTS(STR_TABSTYLE_ARY));
+    return *s_pTableStyleUINameArray;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6d3ae176c6fc..b430460b2c8e 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -21,7 +21,6 @@
 #include <tuple>
 
 #include <SwStyleNameMapper.hxx>
-#include <tools/resmgr.hxx>
 #include <poolfmt.hxx>
 #include <rcid.hrc>
 
@@ -29,23 +28,8 @@
 #include <stdlib.h>
 #endif
 
-extern ResMgr* pSwResMgr;
-// Initialise UI names to 0
-std::vector<OUString> *SwStyleNameMapper::s_pTextUINameArray = nullptr,
-                *SwStyleNameMapper::s_pListsUINameArray = nullptr,
-                *SwStyleNameMapper::s_pExtraUINameArray = nullptr,
-                *SwStyleNameMapper::s_pRegisterUINameArray = nullptr,
-                *SwStyleNameMapper::s_pDocUINameArray = nullptr,
-                *SwStyleNameMapper::s_pHTMLUINameArray = nullptr,
-                *SwStyleNameMapper::s_pFrameFormatUINameArray = nullptr,
-                *SwStyleNameMapper::s_pChrFormatUINameArray = nullptr,
-                *SwStyleNameMapper::s_pHTMLChrFormatUINameArray = nullptr,
-                *SwStyleNameMapper::s_pPageDescUINameArray = nullptr,
-                *SwStyleNameMapper::s_pNumRuleUINameArray = nullptr,
-                *SwStyleNameMapper::s_pTableStyleUINameArray = nullptr,
-                *SwStyleNameMapper::s_pCellStyleUINameArray = nullptr,
-
 // Initialise programmatic names to 0
+std::vector<OUString>
                 *SwStyleNameMapper::s_pTextProgNameArray = nullptr,
                 *SwStyleNameMapper::s_pListsProgNameArray = nullptr,
                 *SwStyleNameMapper::s_pExtraProgNameArray = nullptr,
@@ -343,20 +327,6 @@ const struct SwTableEntry TableStyleProgNameTable [] =
 #undef ENTRY
 
 std::vector<OUString>*
-lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd)
-{
-    std::vector<OUString> *const pNameArray = new std::vector<OUString>;
-    pNameArray->reserve(nEnd - nStt);
-    while( nStt < nEnd )
-    {
-        const ResId aRId( nStt, *pSwResMgr );
-        pNameArray->push_back(aRId);
-        ++nStt;
-    }
-    return pNameArray;
-}
-
-std::vector<OUString>*
 lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount)
 {
     std::vector<OUString> *const pProgNameArray = new std::vector<OUString>;
@@ -769,102 +739,6 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName(
     return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
 }
 
-const std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
-{
-    if (!s_pTextUINameArray)
-        s_pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN,
-            RC_POOLCOLL_TEXT_BEGIN + (RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN) );
-    return *s_pTextUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
-{
-    if (!s_pListsUINameArray)
-        s_pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN,
-            RC_POOLCOLL_LISTS_BEGIN + (RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN) );
-    return *s_pListsUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
-{
-    if (!s_pExtraUINameArray)
-        s_pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN,
-            RC_POOLCOLL_EXTRA_BEGIN + (RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN) );
-    return *s_pExtraUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
-{
-    if (!s_pRegisterUINameArray)
-        s_pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN,
-            RC_POOLCOLL_REGISTER_BEGIN + (RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN) );
-    return *s_pRegisterUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
-{
-    if (!s_pDocUINameArray)
-        s_pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN,
-            RC_POOLCOLL_DOC_BEGIN + (RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN) );
-    return *s_pDocUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
-{
-    if (!s_pHTMLUINameArray)
-        s_pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN,
-            RC_POOLCOLL_HTML_BEGIN + (RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN) );
-    return *s_pHTMLUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
-{
-    if (!s_pFrameFormatUINameArray)
-        s_pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
-            RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
-    return *s_pFrameFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
-{
-    if (!s_pChrFormatUINameArray)
-        s_pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
-            RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
-    return *s_pChrFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
-{
-    if (!s_pHTMLChrFormatUINameArray)
-        s_pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
-            RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
-    return *s_pHTMLChrFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
-{
-    if (!s_pPageDescUINameArray)
-        s_pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN,
-            RC_POOLPAGEDESC_BEGIN + (RES_POOLPAGE_END - RES_POOLPAGE_BEGIN) );
-    return *s_pPageDescUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
-{
-    if (!s_pNumRuleUINameArray)
-        s_pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN,
-            RC_POOLNUMRULE_BEGIN + (RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN) );
-    return *s_pNumRuleUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray()
-{
-    if (!s_pTableStyleUINameArray)
-        s_pTableStyleUINameArray = lcl_NewUINameArray( RC_POOLTABSTYLE_BEGIN,
-            RC_POOLTABSTYLE_BEGIN + (RES_POOLTABSTYLE_END - RES_POOLTABSTYLE_BEGIN) );
-    return *s_pTableStyleUINameArray;
-}
-
 /// returns an empty array because Cell Names aren't translated
 const std::vector<OUString>& SwStyleNameMapper::GetCellStyleUINameArray()
 {
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8ad76e78e847..12cc89584753 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -105,8 +105,8 @@
 #include <swbaslnk.hxx>
 #include <printdata.hxx>
 #include <cmdid.h>
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <SwUndoTOXChange.hxx>
 #include <unocrsr.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0f84d04324c3..baf6abfabcbd 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -53,7 +53,7 @@
 #include <fldbas.hxx>
 #include <swwait.hxx>
 #include <GetMetricVal.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <hints.hxx>
 #include <SwUndoPageDesc.hxx>
 #include <pagedeschint.hxx>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 80c96313eb31..1b4c1db454db 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -37,7 +37,7 @@
 #include <txtfrm.hxx>
 #include <breakit.hxx>
 #include <vcl/layout.hxx>
-#include "comcore.hrc"
+#include "strings.hrc"
 #include "editsh.hxx"
 #include <fmtfld.hxx>
 #include <docufld.hxx>
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index d27d6c9fce19..68e04619202a 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -59,7 +59,7 @@
 #include <authfld.hxx>
 #include <txtinet.hxx>
 #include <fmtcntnt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 
 #include <SwUndoField.hxx>
 #include <calbck.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 963b0aec3f56..574c30c9d76d 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -91,7 +91,7 @@
 #include <ftninfo.hxx>
 #include <pagedesc.hxx>
 #include <PostItMgr.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <tools/datetimeutils.hxx>
 
 #include <unoframe.hxx>
@@ -1276,7 +1276,7 @@ SwFlyFrameFormat* SwDoc::InsertDrawLabel(
     return pNewFormat;
 }
 
-static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, sal_uInt16 nDefStrId, RES_FMT eType)
+static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, const char* pDefStrId, RES_FMT eType)
 {
     if( pDoc->IsInMailMerge())
     {
@@ -1286,8 +1286,7 @@ static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, sal_uInt16 nDefStrId, RE
         return newName;
     }
 
-    ResId aId( nDefStrId, *pSwResMgr );
-    OUString aName( aId );
+    OUString aName(SwResId(pDefStrId));
     sal_Int32 nNmLen = aName.getLength();
 
     const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
@@ -1392,22 +1391,22 @@ void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName )
     OUString sName( rName );
     if( sName.isEmpty() || FindFlyByName( sName ) )
     {
-        sal_uInt16 nTyp = STR_FRAME_DEFNAME;
+        const char* pTyp = STR_FRAME_DEFNAME;
         const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx();
         if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
         {
             switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
             {
                 case SwNodeType::Grf:
-                    nTyp = STR_GRAPHIC_DEFNAME;
+                    pTyp = STR_GRAPHIC_DEFNAME;
                     break;
                 case SwNodeType::Ole:
-                    nTyp = STR_OBJECT_DEFNAME;
+                    pTyp = STR_OBJECT_DEFNAME;
                     break;
                 default: break;
             }
         }
-        sName = lcl_GetUniqueFlyName(this, nTyp, RES_FLYFRMFMT);
+        sName = lcl_GetUniqueFlyName(this, pTyp, RES_FLYFRMFMT);
     }
     rFormat.SetName( sName, true );
     getIDocumentState().SetModified();
@@ -1417,12 +1416,9 @@ void SwDoc::SetAllUniqueFlyNames()
 {
     sal_Int32 n, nFlyNum = 0, nGrfNum = 0, nOLENum = 0;
 
-    ResId nFrameId( STR_FRAME_DEFNAME, *pSwResMgr ),
-          nGrfId( STR_GRAPHIC_DEFNAME, *pSwResMgr ),
-          nOLEId( STR_OBJECT_DEFNAME, *pSwResMgr );
-    const OUString sFlyNm( nFrameId );
-    const OUString sGrfNm( nGrfId );
-    const OUString sOLENm( nOLEId );
+    const OUString sFlyNm(SwResId(STR_FRAME_DEFNAME));
+    const OUString sGrfNm(SwResId(STR_GRAPHIC_DEFNAME));
+    const OUString sOLENm(SwResId(STR_OBJECT_DEFNAME));
 
     if( 255 < ( n = GetSpzFrameFormats()->size() ))
         n = 255;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index dd833bb1af85..f2ef5223918e 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <hintids.hxx>
-#include <tools/resid.hxx>
 #include <editeng/lrspitem.hxx>
 #include <ftninfo.hxx>
 #include <ftnidx.hxx>
@@ -45,7 +44,7 @@
 #include <txtfrm.hxx>
 #include <pamtyp.hxx>
 #include <redline.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <editeng/adjustitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <frmatr.hxx>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 25ef47cb20bf..e5cf85c91a7b 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -54,7 +54,7 @@
 #include <viewsh.hxx>
 #include <viscrs.hxx>
 #include <rootfrm.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <unoport.hxx>
 #include <wrtsh.hxx>
 
@@ -974,9 +974,23 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData )
         pExtraData = nullptr;
 }
 
+static const char* STR_REDLINE_ARY[] =
+{
+    STR_UNDO_REDLINE_INSERT,
+    STR_UNDO_REDLINE_DELETE,
+    STR_UNDO_REDLINE_FORMAT,
+    STR_UNDO_REDLINE_TABLE,
+    STR_UNDO_REDLINE_FMTCOLL,
+    STR_UNDO_REDLINE_PARAGRAPH_FORMAT,
+    STR_UNDO_REDLINE_TABLE_ROW_INSERT,
+    STR_UNDO_REDLINE_TABLE_ROW_DELETE,
+    STR_UNDO_REDLINE_TABLE_CELL_INSERT,
+    STR_UNDO_REDLINE_TABLE_CELL_DELETE
+};
+
 OUString SwRedlineData::GetDescr() const
 {
-    return SwResId(STR_UNDO_REDLINE_INSERT + GetType());
+    return SwResId(STR_REDLINE_ARY[GetType()]);
 }
 
 sal_uInt32 SwRangeRedline::m_nLastId = 1;
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 811b0ceb1c7e..2b35ede3754c 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -64,7 +64,7 @@
 #include <poolfmt.hxx>
 #include <mdiexp.hxx>
 #include <swwait.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <accessibilityoptions.hxx>
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
@@ -961,22 +961,22 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr
             }
             else
             {
-                sal_uInt16 nResId = 0;
+                const char* pResId = nullptr;
 
                 if( GraphicType::NONE == rGrfObj.GetType() )
-                    nResId = STR_COMCORE_READERROR;
+                    pResId = STR_COMCORE_READERROR;
                 else if ( !rGrfObj.GetGraphic().IsSupportedGraphic() )
-                    nResId = STR_COMCORE_CANT_SHOW;
+                    pResId = STR_COMCORE_CANT_SHOW;
 
                 OUString aText;
-                if ( !nResId &&
+                if ( !pResId &&
                      (aText = pGrfNd->GetTitle()).isEmpty() &&
                      (!GetRealURL( *pGrfNd, aText ) || aText.isEmpty()))
                 {
-                    nResId = STR_COMCORE_READERROR;
+                    pResId = STR_COMCORE_READERROR;
                 }
-                if ( nResId )
-                    aText = SwResId( nResId );
+                if (pResId)
+                    aText = SwResId(pResId);
 
                 ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true );
             }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2a4485934f6c..78f14fc3c912 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -63,7 +63,7 @@
 #include <fmtcol.hxx>
 #include <ndtxt.hxx>
 #include <fmtline.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <GetMetricVal.hxx>
 #include <numrule.hxx>
 #include <swtable.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index c256f7599211..aa28328107fc 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <o3tl/make_unique.hxx>
-#include <tools/resid.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 403ccc69cdb6..6272761c0a17 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -20,7 +20,6 @@
 #include <hintids.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <svl/itemiter.hxx>
-#include <tools/resid.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <txtftn.hxx>
@@ -52,7 +51,7 @@
 #include <node2lay.hxx>
 #include <doctxm.hxx>
 #include <fmtftntx.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <viewsh.hxx>
 #include <txtfrm.hxx>
 #include <memory>
@@ -1359,7 +1358,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
         return newName;
     }
 
-    const OUString aName( ResId( STR_REGION_DEFNAME, *pSwResMgr ) );
+    const OUString aName(SwResId(STR_REGION_DEFNAME));
 
     SwSectionFormats::size_type nNum = 0;
     const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) + 2;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index efed71ca8367..2ad58d1081be 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -81,7 +81,7 @@
 #include <section.hxx>
 #include <frmtool.hxx>
 #include <node2lay.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include "docsh.hxx"
 #include <unochart.hxx>
 #include <node.hxx>
@@ -3914,8 +3914,7 @@ OUString SwDoc::GetUniqueTableName() const
         return newName;
     }
 
-    ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
-    const OUString aName( aId );
+    const OUString aName(SwResId(STR_TABLE_DEFNAME));
 
     const size_t nFlagSize = ( mpTableFrameFormatTable->size() / 8 ) + 2;
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 9e5a8e11bf20..54d8a5265d31 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -62,7 +62,7 @@
 #include <frmatr.hxx>
 #include <charatr.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <comcore.hrc>
 #include <numrule.hxx>
 
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2c235a30628b..0254f2633681 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -32,7 +32,7 @@
 #include <SwRewriter.hxx>
 #include <globals.hrc>
 
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <list>
 
 void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index cf20c8cb4ed0..e703b6725875 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -26,7 +26,7 @@
 
 #include <unoflatpara.hxx>
 
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <hintids.hxx>
 #include <linguistic/lngprops.hxx>
 #include <vcl/msgbox.hxx>
@@ -49,7 +49,7 @@
 #include <viscrs.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <cntfrm.hxx>
 #include <splargs.hxx>
 #include <redline.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 07bb4e869449..fd0fab3b7700 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -47,7 +47,7 @@
 #include <doctxm.hxx>
 #include <docary.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <bookmrk.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 498a5a1d44d9..2945f4d93fd8 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -25,8 +25,7 @@
 #include <o3tl/any.hxx>
 #include <o3tl/make_unique.hxx>
 #include <swtypes.hxx>
-#include <tools/resid.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <authfld.hxx>
 #include <expfld.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index aae7cacee181..e228308cd205 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -83,7 +83,7 @@
 #include <docsh.hxx>
 #include <unofldmid.h>
 #include <swunohelper.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 0eca840c2311..0fa69f428aec 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -44,7 +44,7 @@
 #include <expfld.hxx>
 #include <shellres.hxx>
 #include <calc.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <docary.hxx>
 #include <authfld.hxx>
 #include <calbck.hxx>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 41471f1a5204..cf64f41f7a43 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -51,8 +51,8 @@
 #include <SwStyleNameMapper.hxx>
 #include <shellres.hxx>
 #include <poolfmt.hxx>
-#include <poolfmt.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
 #include <calbck.hxx>
@@ -756,24 +756,24 @@ void SwGetRefField::ConvertProgrammaticToUIName()
         if(!pDoc->getIDocumentFieldsAccess().GetFieldType(SwFieldIds::SetExp, rPar1, false))
         {
             sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, SwGetPoolIdFromName::TxtColl );
-            sal_uInt16 nResId = USHRT_MAX;
+            const char* pResId = nullptr;
             switch( nPoolId )
             {
                 case RES_POOLCOLL_LABEL_ABB:
-                    nResId = STR_POOLCOLL_LABEL_ABB;
+                    pResId = STR_POOLCOLL_LABEL_ABB;
                 break;
                 case RES_POOLCOLL_LABEL_TABLE:
-                    nResId = STR_POOLCOLL_LABEL_TABLE;
+                    pResId = STR_POOLCOLL_LABEL_TABLE;
                 break;
                 case RES_POOLCOLL_LABEL_FRAME:
-                    nResId = STR_POOLCOLL_LABEL_FRAME;
+                    pResId = STR_POOLCOLL_LABEL_FRAME;
                 break;
                 case RES_POOLCOLL_LABEL_DRAWING:
-                    nResId = STR_POOLCOLL_LABEL_DRAWING;
+                    pResId = STR_POOLCOLL_LABEL_DRAWING;
                 break;
             }
-            if( nResId != USHRT_MAX )
-                SetPar1(SwResId( nResId ));
+            if (pResId)
+                SetPar1(SwResId(pResId));
         }
     }
 }
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index b31e2705d9bc..fd9d89c5625b 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -19,9 +19,8 @@
 
 #include <docufld.hxx>
 #include <unofldmid.h>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <o3tl/any.hxx>
-#include <tools/resid.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index c0967895e97c..27786a816da9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "hintids.hxx"
+#include <svx/strings.hrc>
 #include <svx/sdrobjectfilter.hxx>
 #include <svx/svddrgmt.hxx>
 #include <svx/svditer.hxx>
@@ -30,7 +31,6 @@
 #include <svx/sxciaitm.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
@@ -52,7 +52,7 @@
 #include <cmdid.h>
 #include <drawdoc.hxx>
 #include <textboxhelper.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <frmfmt.hxx>
 #include <frmatr.hxx>
 #include <fmtfsize.hxx>
@@ -110,14 +110,14 @@ using namespace com::sun::star;
 
 namespace {
 
-::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc )
+::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc)
 {
     ::basegfx::B2DPolyPolygon aRetval;
     XLineEndListRef pLineEndList = pDoc->GetLineEndList();
 
     if( pLineEndList.is() )
     {
-        OUString aArrowName( SvxResId(nResId) );
+        OUString aArrowName( SvxResId(pResId) );
         long nCount = pLineEndList->Count();
         long nIndex;
         for( nIndex = 0L; nIndex < nCount; nIndex++ )
diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc
deleted file mode 100644
index 09f5dc3fe147..000000000000
--- a/sw/source/core/inc/pagefrm.hrc
+++ /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/.
- */
-
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
-#define INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
-
-#include "rcid.hrc"
-
-#define STR_COLUMN_BREAK                    RC_PAGEFRM_BEGIN + 2
-
-// If you add resources, don't forget to update this
-#define PAGEFRM_ACT_END           STR_COLUMN_BREAK
-
-// Sanity check
-#if PAGEFRM_ACT_END > RC_PAGEFRM_END
-#error Not enough room for pagefrm resource in #file:#line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 27a36f4522af..2fc3dfcac906 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -71,7 +71,7 @@
 #include <editeng/brushitem.hxx>
 #include <svtools/grfmgr.hxx>
 #include <unomid.h>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <svx/svdundo.hxx>
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index a122bd5958d1..f49e8f8d6e74 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -30,7 +30,7 @@
 #include <swtable.hxx>
 #include <frmtool.hxx>
 #include <doc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <poolfmt.hxx>
@@ -349,6 +349,21 @@ void SwPageDesc::ChgFirstShare( bool bNew )
         m_eUse &= UseOnPage::NoFirstShare;
 }
 
+// Page styles
+static const char* STR_POOLPAGE[] =
+{
+    STR_POOLPAGE_STANDARD,
+    STR_POOLPAGE_FIRST,
+    STR_POOLPAGE_LEFT,
+    STR_POOLPAGE_RIGHT,
+    STR_POOLPAGE_JAKET,
+    STR_POOLPAGE_REGISTER,
+    STR_POOLPAGE_HTML,
+    STR_POOLPAGE_FOOTNOTE,
+    STR_POOLPAGE_ENDNOTE,
+    STR_POOLPAGE_LANDSCAPE
+};
+
 SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
 {
     const size_t nDCount = rDoc.GetPageDescCnt();
@@ -362,12 +377,12 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
         }
     }
 
-    for( sal_Int32 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
+    for (size_t i = 0; i <= SAL_N_ELEMENTS(STR_POOLPAGE); ++i)
     {
-        if (rName==SwResId(i))
+        if (rName == SwResId(STR_POOLPAGE[i]))
         {
             return rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast< sal_uInt16 >(
-                        i - RC_POOLPAGEDESC_BEGIN + RES_POOLPAGE_BEGIN) );
+                        i + RES_POOLPAGE_BEGIN) );
         }
     }
 
diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src
deleted file mode 100644
index 16b6d4ade8fb..000000000000
--- a/sw/source/core/layout/pagefrm.src
+++ /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/.
- */
-
-#include "pagefrm.hrc"
-
-String STR_COLUMN_BREAK
-{
-    Text [ en-US ] = "Manual Column Break" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2b45cba8fb22..a18a473467e0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -30,7 +30,7 @@
 #include <calbck.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtclds.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <swmodule.hxx>
 #include <rootfrm.hxx>
 #include <pagefrm.hxx>
@@ -78,7 +78,6 @@
 
 #include <svtools/borderhelper.hxx>
 
-#include "pagefrm.hrc"
 #include "bitmaps.hlst"
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 5f32ed3f6da0..d4299386f45c 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -51,7 +51,7 @@
 #include <sot/formats.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <svx/charthelper.hxx>
 #include <comphelper/threadpool.hxx>
 #include <atomic>
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index dfdfd9e5232b..6e133f1d0d54 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -37,7 +37,7 @@
 #include <docsh.hxx>
 #include <swunohelper.hxx>
 
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 
 /**
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx
index 674008bb165c..b30d8a41ebca 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -13,7 +13,7 @@
 #include "SwStyleNameMapper.hxx"
 #include "ndtxt.hxx"
 #include <o3tl/make_unique.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 
 #include <stdexcept>
 
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index b6baa1366d96..f35d49fd9799 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -17,14 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <txtatr.hxx>
 #include <ndtxt.hxx>
 #include <txttxmrk.hxx>
 #include <tox.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <paratr.hxx>
@@ -211,6 +210,91 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
 {
 }
 
+static const char* STR_POOLCOLL_TOX_ARY[] =
+{
+    // Subcategory Index-Directories
+    STR_POOLCOLL_TOX_IDXH,
+    STR_POOLCOLL_TOX_IDX1,
+    STR_POOLCOLL_TOX_IDX2,
+    STR_POOLCOLL_TOX_IDX3,
+    STR_POOLCOLL_TOX_IDXBREAK
+};
+
+static const char* STR_POOLCOLL_TOX_CNTNT_ARY[] =
+{
+    // Subcategory Tables of Contents
+    STR_POOLCOLL_TOX_CNTNTH,
+    STR_POOLCOLL_TOX_CNTNT1,
+    STR_POOLCOLL_TOX_CNTNT2,
+    STR_POOLCOLL_TOX_CNTNT3,
+    STR_POOLCOLL_TOX_CNTNT4,
+    STR_POOLCOLL_TOX_CNTNT5
+};
+
+static const char* STR_POOLCOLL_TOX_CNTNT_EXTRA_ARY[] =
+{
+    // Subcategory Table of Contents more Levels 5 - 10
+    STR_POOLCOLL_TOX_CNTNT6,
+    STR_POOLCOLL_TOX_CNTNT7,
+    STR_POOLCOLL_TOX_CNTNT8,
+    STR_POOLCOLL_TOX_CNTNT9,
+    STR_POOLCOLL_TOX_CNTNT10
+};
+
+static const char* STR_POOLCOLL_TOX_USER_ARY[] =
+{
+    // Subcategory User-Directories:
+    STR_POOLCOLL_TOX_USERH,
+    STR_POOLCOLL_TOX_USER1,
+    STR_POOLCOLL_TOX_USER2,
+    STR_POOLCOLL_TOX_USER3,
+    STR_POOLCOLL_TOX_USER4,
+    STR_POOLCOLL_TOX_USER5
+};
+
+static const char* STR_POOLCOLL_TOX_USER_EXTRA_ARY[] =
+{
+    // Subcategory User-Directories more Levels 5 - 10
+    STR_POOLCOLL_TOX_USER6,
+    STR_POOLCOLL_TOX_USER7,
+    STR_POOLCOLL_TOX_USER8,
+    STR_POOLCOLL_TOX_USER9,
+    STR_POOLCOLL_TOX_USER10
+};
+
+static const char* STR_POOLCOLL_TOX_ILLUS_ARY[] =
+{
+    // Illustrations Index
+    STR_POOLCOLL_TOX_ILLUSH,
+    STR_POOLCOLL_TOX_ILLUS1
+};
+
+static const char* STR_POOLCOLL_TOX_OBJECT_ARY[] =
+{
+    //  Object Index
+    STR_POOLCOLL_TOX_OBJECTH,
+    STR_POOLCOLL_TOX_OBJECT1
+};
+
+static const char* STR_POOLCOLL_TOX_TABLES_ARY[] =
+{
+    //  Tables Index
+    STR_POOLCOLL_TOX_TABLESH,
+    STR_POOLCOLL_TOX_TABLES1
+};
+
+static const char* STR_POOLCOLL_TOX_AUTHORITIES_ARY[] =
+{
+    //  Index of Authorities
+    STR_POOLCOLL_TOX_AUTHORITIESH,
+    STR_POOLCOLL_TOX_AUTHORITIES1
+};
+
+static const char* STR_POOLCOLL_TOX_CITATION_ARY[] =
+{
+    STR_POOLCOLL_TOX_CITATION
+};
+
 // Edit forms
 SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     : m_eType( eTyp ), m_nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )),
@@ -225,17 +309,17 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     // Keyword has 3 levels + headings+ separator
     // Indexes of tables, object illustrations and authorities consist of a heading and one level
 
-    sal_uInt16 nPoolId;
+    const char** pPoolId;
     switch( m_eType )
     {
-    case TOX_INDEX:         nPoolId = STR_POOLCOLL_TOX_IDXH;    break;
-    case TOX_USER:          nPoolId = STR_POOLCOLL_TOX_USERH;   break;
-    case TOX_CONTENT:       nPoolId = STR_POOLCOLL_TOX_CNTNTH;  break;
-    case TOX_ILLUSTRATIONS: nPoolId = STR_POOLCOLL_TOX_ILLUSH;  break;
-    case TOX_OBJECTS      : nPoolId = STR_POOLCOLL_TOX_OBJECTH; break;
-    case TOX_TABLES       : nPoolId = STR_POOLCOLL_TOX_TABLESH; break;
-    case TOX_AUTHORITIES  : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH;    break;
-    case TOX_CITATION  : nPoolId = STR_POOLCOLL_TOX_CITATION; break;
+    case TOX_INDEX:         pPoolId = STR_POOLCOLL_TOX_ARY;    break;
+    case TOX_USER:          pPoolId = STR_POOLCOLL_TOX_USER_ARY;   break;
+    case TOX_CONTENT:       pPoolId = STR_POOLCOLL_TOX_CNTNT_ARY;  break;
+    case TOX_ILLUSTRATIONS: pPoolId = STR_POOLCOLL_TOX_ILLUS_ARY;  break;
+    case TOX_OBJECTS      : pPoolId = STR_POOLCOLL_TOX_OBJECT_ARY; break;
+    case TOX_TABLES       : pPoolId = STR_POOLCOLL_TOX_TABLES_ARY; break;
+    case TOX_AUTHORITIES  : pPoolId = STR_POOLCOLL_TOX_AUTHORITIES_ARY;    break;
+    case TOX_CITATION  : pPoolId = STR_POOLCOLL_TOX_CITATION_ARY; break;
     default:
         OSL_ENSURE( false, "invalid TOXTyp");
         return ;
@@ -273,7 +357,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType)
         aTokens.push_back(SwFormToken(TOKEN_LINK_END));
 
-    SetTemplate( 0, SwResId( nPoolId++ ));
+    SetTemplate(0, SwResId(*pPoolId++));
 
     if(TOX_INDEX == m_eType)
     {
@@ -286,19 +370,20 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
                 aTmpTokens.push_back(aTmpToken);
 
                 SetPattern( i, aTmpTokens );
-                SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDXBREAK    ));
+                SetTemplate(i, SwResId(STR_POOLCOLL_TOX_IDXBREAK));
             }
             else
             {
                 SetPattern( i, aTokens );
-                SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDX1 + i - 2 ));
+                SetTemplate(i, SwResId(STR_POOLCOLL_TOX_ARY[i - 1]));
             }
         }
     }
     else
-        for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId )    // Number 0 is the title
+    {
+        for (sal_uInt16 i = 1; i < GetFormMax(); ++i, ++pPoolId)    // Number 0 is the title
         {
-            if(TOX_AUTHORITIES == m_eType)
+            if (TOX_AUTHORITIES == m_eType)
             {
                 SwFormTokens aAuthTokens;
                 lcl_FillAuthPattern(aAuthTokens, i);
@@ -308,13 +393,14 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
                 SetPattern( i, aTokens );
 
             if( TOX_CONTENT == m_eType && 6 == i )
-                nPoolId = STR_POOLCOLL_TOX_CNTNT6;
+                pPoolId = STR_POOLCOLL_TOX_CNTNT_EXTRA_ARY;
             else if( TOX_USER == m_eType && 6 == i )
-                nPoolId = STR_POOLCOLL_TOX_USER6;
-            else if( TOX_AUTHORITIES == m_eType )
-                nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1;
-            SetTemplate( i, SwResId( nPoolId ) );
+                pPoolId = STR_POOLCOLL_TOX_USER_EXTRA_ARY;
+            else if( TOX_AUTHORITIES == m_eType ) //reuse the same STR_POOLCOLL_TOX_AUTHORITIES1 id each time
+                pPoolId = STR_POOLCOLL_TOX_AUTHORITIES_ARY + 1;
+            SetTemplate(i, SwResId(*pPoolId));
         }
+    }
 }
 
 SwForm::SwForm(const SwForm& rForm)
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index e304e1092b49..14600c68af1b 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <editeng/unolingu.hxx>
@@ -40,7 +39,7 @@
 #include <authfld.hxx>
 #include <toxwrap.hxx>
 
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <numrule.hxx>
 #include <reffld.hxx>
 
@@ -517,12 +516,12 @@ TextAndReading SwTOXPara::GetText_Impl() const
                 return TextAndReading(pFly->GetName(), OUString());
 
             OSL_ENSURE( false, "Graphic/object without name" );
-            sal_uInt16 nId = SwTOXElement::Ole == eType
+            const char* pId = SwTOXElement::Ole == eType
                             ? STR_OBJECT_DEFNAME
                             : SwTOXElement::Graphic == eType
                                 ? STR_GRAPHIC_DEFNAME
                                 : STR_FRAME_DEFNAME;
-            return TextAndReading(SwResId( nId ), OUString());
+            return TextAndReading(SwResId(pId), OUString());
         }
         break;
     default: break;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 6b64fdc367f8..97f2ad1c8c39 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -54,7 +54,7 @@
 #include <doc.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <docsh.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <fntcap.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index aa599a7258cc..7464330bc407 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
-
 #include <poolfmt.hxx>
 #include <charfmt.hxx>
 #include <frmfmt.hxx>
@@ -29,7 +27,7 @@
 #include <fmtcol.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 
 SwUndoFormatCreate::SwUndoFormatCreate
 (SwUndoId nUndoId, SwFormat * _pNew, SwFormat * _pDerivedFrom, SwDoc * _pDoc)
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index 1b847bd2a336..7b86ffac2c15 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <swundo.hxx>
@@ -25,7 +24,7 @@
 #include <SwUndoPageDesc.hxx>
 #include <SwRewriter.hxx>
 #include <undobj.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <fmtcntnt.hxx>
 #include <fmthdft.hxx>
 
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 4c09fa2b1048..14dc0db77dd7 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -276,7 +276,7 @@ UndoManager::StartUndo(SwUndoId const i_eUndoId,
     assert(SwUndoId::END != eUndoId);
     OUString comment( (SwUndoId::START == eUndoId)
         ?   OUString("??")
-        :   SwResId(UNDO_BASE + (int)eUndoId) );
+        :   GetUndoComment(eUndoId) );
     if (pRewriter)
     {
         assert(SwUndoId::START != eUndoId);
@@ -324,7 +324,7 @@ UndoManager::EndUndo(SwUndoId eUndoId, SwRewriter const*const pRewriter)
             OSL_ENSURE((SwUndoId)pListAction->GetId() == eUndoId,
                     "EndUndo(): given ID different from StartUndo()");
             // comment set by caller of EndUndo
-            OUString comment = SwResId(UNDO_BASE + (int)eUndoId);
+            OUString comment = GetUndoComment(eUndoId);
             if (pRewriter)
             {
                 comment = pRewriter->Apply(comment);
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index f5cc213155a2..8a905217738c 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <rolbck.hxx>
-#include <tools/resid.hxx>
 #include <svl/itemiter.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <hints.hxx>
@@ -53,7 +52,7 @@
 #include <UndoCore.hxx>
 #include <IMark.hxx>
 #include <charfmt.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <undo.hrc>
 #include <bookmrk.hxx>
 #include <memory>
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index 7308e998070b..a6245b5db1a9 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -19,7 +19,7 @@
 
 #include <UndoBookmark.hxx>
 
-#include <comcore.hrc>
+#include <strings.hrc>
 #include "doc.hxx"
 #include "docary.hxx"
 #include "swundo.hxx"
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index dcde4a7fc246..fefa7469c949 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/app.hxx>
 #include <fldbas.hxx>
 #include <fmtfld.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <undo.hrc>
 #include <vector>
 
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 7e134d3491e7..bad7c896ce53 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -20,156 +20,5 @@
 #include <rcid.hrc>
 // Undo
 #define UNDO_BASE               (RC_WRTSH_BEGIN +  8)
-#define STR_CANT_UNDO           (UNDO_BASE      +  0)
-
-// im enun folgen hier START & END fuer die Klammerungen,
-
-// Id's fuer die Undo/Redo/Repeat faehigen "Funktionen"
-#define STR_DELETE_UNDO         (UNDO_BASE      + 3)
-#define STR_INSERT_UNDO         (UNDO_BASE      + 4)
-#define STR_OVR_UNDO            (UNDO_BASE      + 5)
-#define STR_SPLITNODE_UNDO      (UNDO_BASE      + 6)
-#define STR_INSATTR_UNDO        (UNDO_BASE      + 7)
-#define STR_SETFMTCOLL_UNDO     (UNDO_BASE      + 8)
-#define STR_RESET_ATTR_UNDO     (UNDO_BASE      + 9)
-#define STR_INSFMT_ATTR_UNDO    (UNDO_BASE      +10)
-#define STR_INSERT_DOC_UNDO     (UNDO_BASE      +11)
-#define STR_COPY_UNDO           (UNDO_BASE      +12)
-#define STR_INSTABLE_UNDO       (UNDO_BASE      +13)
-#define STR_TABLETOTEXT_UNDO    (UNDO_BASE      +14)
-#define STR_TEXTTOTABLE_UNDO    (UNDO_BASE      +15)
-#define STR_SORT_TXT            (UNDO_BASE      +16)
-#define STR_INSERTFLY           (UNDO_BASE      +17)
-#define STR_TABLEHEADLINE       (UNDO_BASE      +18)
-#define STR_INSERTSECTION       (UNDO_BASE      +19)
-#define STR_OUTLINE_LR          (UNDO_BASE      +20)
-#define STR_OUTLINE_UD          (UNDO_BASE      +21)
-#define STR_INSNUM              (UNDO_BASE      +22)
-#define STR_NUMUP               (UNDO_BASE      +23)
-#define STR_MOVENUM             (UNDO_BASE      +24)
-#define STR_INSERTDRAW          (UNDO_BASE      +25)
-#define STR_NUMORNONUM          (UNDO_BASE      +26)
-#define STR_INC_LEFTMARGIN      (UNDO_BASE      +27)
-#define STR_DEC_LEFTMARGIN      (UNDO_BASE      +28)
-#define STR_INSERTLABEL         (UNDO_BASE      +29)
-#define STR_SETNUMRULESTART     (UNDO_BASE      +30)
-#define STR_CHANGEFTN           (UNDO_BASE      +31)
-#define STR_REDLINE             (UNDO_BASE      +32)
-#define STR_ACCEPT_REDLINE      (UNDO_BASE      +33)
-#define STR_REJECT_REDLINE      (UNDO_BASE      +34)
-#define STR_SPLIT_TABLE         (UNDO_BASE      +35)
-#define STR_DONTEXPAND          (UNDO_BASE      +36)
-#define STR_AUTOCORRECT         (UNDO_BASE      +37)
-#define STR_MERGE_TABLE         (UNDO_BASE      +38)
-#define STR_TRANSLITERATE       (UNDO_BASE      +39)
-#define STR_PASTE_CLIPBOARD_UNDO    (UNDO_BASE      +40)
-#define STR_TYPING_UNDO             (UNDO_BASE      +41)
-
-#define STR_REPEAT_DUMMY_9      (UNDO_BASE      +45)
-// !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!
-#define CORE_REPEAT_END          STR_REPEAT_DUMMY_9// !!!! umsetzen !!!
-
-// Id's nur fuer die Undo/Redo faehigen "Funktionen"
-#define STR_MOVE_UNDO           (CORE_REPEAT_END      + 1)
-#define STR_INSERT_GLOSSARY     (CORE_REPEAT_END      + 2)
-#define STR_DELBOOKMARK         (CORE_REPEAT_END      + 3)
-#define STR_INSBOOKMARK         (CORE_REPEAT_END      + 4)
-#define STR_SORT_TBL            (CORE_REPEAT_END      + 5)
-#define STR_DELETEFLY           (CORE_REPEAT_END      + 6)
-#define STR_AUTOFORMAT          (CORE_REPEAT_END      + 7)
-#define STR_REPLACE             (CORE_REPEAT_END      + 8)
-#define STR_DELETESECTION       (CORE_REPEAT_END      + 9)
-#define STR_CHANGESECTION       (CORE_REPEAT_END      +10)
-#define STR_CHANGESECTPASSWD    (CORE_REPEAT_END      +11)
-#define STR_CHANGEDEFATTR       (CORE_REPEAT_END      +12)
-#define STR_DELNUM              (CORE_REPEAT_END      +13)
-#define STR_DRAWUNDO            (CORE_REPEAT_END      +14)
-#define STR_DRAWGROUP           (CORE_REPEAT_END      +15)
-#define STR_DRAWUNGROUP         (CORE_REPEAT_END      +16)
-#define STR_DRAWDELETE          (CORE_REPEAT_END      +17)
-#define STR_REREAD              (CORE_REPEAT_END      +18)
-#define STR_DELGRF              (CORE_REPEAT_END      +19)
-#define STR_DELOLE              (CORE_REPEAT_END      +20)
-#define STR_TABLE_ATTR          (CORE_REPEAT_END      +21)
-#define STR_TABLE_AUTOFMT       (CORE_REPEAT_END      +22)
-#define STR_TABLE_INSCOL        (CORE_REPEAT_END      +23)
-#define STR_TABLE_INSROW        (CORE_REPEAT_END      +24)
-#define STR_TABLE_DELBOX        (CORE_REPEAT_END      +25)
-#define STR_TABLE_SPLIT         (CORE_REPEAT_END      +26)
-#define STR_TABLE_MERGE         (CORE_REPEAT_END      +27)
-#define STR_TABLE_NUMFORMAT     (CORE_REPEAT_END      +28)
-#define STR_INSERT_TOX          (CORE_REPEAT_END      +29)
-#define STR_CLEAR_TOX_RANGE     (CORE_REPEAT_END      +30)
-#define STR_TABLE_TBLCPYTBL     (CORE_REPEAT_END      +31)
-#define STR_TABLE_CPYTBL        (CORE_REPEAT_END      +32)
-#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END      +33)
-#define STR_UNDO_CHAIN          (CORE_REPEAT_END      +34)
-#define STR_UNDO_UNCHAIN        (CORE_REPEAT_END      +35)
-#define STR_UNDO_FTNINFO        (CORE_REPEAT_END      +36)
-#define STR_UNDO_ENDNOTEINFO    (CORE_REPEAT_END      +37)
-#define STR_UNDO_COMPAREDOC     (CORE_REPEAT_END      +38)
-#define STR_UNDO_SETFLYFRMFMT   (CORE_REPEAT_END      +39)
-#define STR_UNDO_SETRUBYATTR    (CORE_REPEAT_END      +40)
-#define STR_UNDO_TMPAUTOCORR        (CORE_REPEAT_END      +41)
-#define STR_TOXCHANGE               (CORE_REPEAT_END      +42)
-#define STR_UNDO_PAGEDESC_CREATE    (CORE_REPEAT_END      +43)
-#define STR_UNDO_PAGEDESC           (CORE_REPEAT_END      +44)
-#define STR_UNDO_PAGEDESC_DELETE    (CORE_REPEAT_END      +45)
-#define STR_UNDO_HEADER_FOOTER      (CORE_REPEAT_END      +46) // #i7983#
-#define STR_UNDO_FIELD              (CORE_REPEAT_END      +47)
-#define STR_UNDO_TXTFMTCOL_CREATE           (CORE_REPEAT_END      +48)
-#define STR_UNDO_TXTFMTCOL_DELETE           (CORE_REPEAT_END      +49)
-#define STR_UNDO_TXTFMTCOL_RENAME           (CORE_REPEAT_END      +50)
-#define STR_UNDO_CHARFMT_CREATE             (CORE_REPEAT_END      +51)
-#define STR_UNDO_CHARFMT_DELETE             (CORE_REPEAT_END      +52)
-#define STR_UNDO_CHARFMT_RENAME             (CORE_REPEAT_END      +53)
-#define STR_UNDO_FRMFMT_CREATE              (CORE_REPEAT_END      +54)
-#define STR_UNDO_FRMFMT_DELETE              (CORE_REPEAT_END      +55)
-#define STR_UNDO_FRMFMT_RENAME              (CORE_REPEAT_END      +56)
-#define STR_UNDO_NUMRULE_CREATE             (CORE_REPEAT_END      +57)
-#define STR_UNDO_NUMRULE_DELETE             (CORE_REPEAT_END      +58)
-#define STR_UNDO_NUMRULE_RENAME             (CORE_REPEAT_END      +59)
-#define STR_UNDO_BOOKMARK_RENAME            (CORE_REPEAT_END      +60)
-#define STR_UNDO_INDEX_ENTRY_INSERT         (CORE_REPEAT_END      +61)
-#define STR_UNDO_INDEX_ENTRY_DELETE         (CORE_REPEAT_END      +62)
-#define STR_UNDO_COL_DELETE                 (CORE_REPEAT_END      +63)
-#define STR_UNDO_ROW_DELETE                 (CORE_REPEAT_END      +64)
-#define STR_UNDO_PAGEDESC_RENAME            (CORE_REPEAT_END      +65)
-#define STR_NUMDOWN                         (CORE_REPEAT_END      +66)
-#define STR_UNDO_FLYFRMFMT_TITLE                (CORE_REPEAT_END      +67)
-#define STR_UNDO_FLYFRMFMT_DESCRITPTION         (CORE_REPEAT_END      +68)
-#define STR_UNDO_TBLSTYLE_CREATE                (CORE_REPEAT_END      +69)
-#define STR_UNDO_TBLSTYLE_DELETE                (CORE_REPEAT_END      +70)
-#define STR_UNDO_TBLSTYLE_UPDATE                (CORE_REPEAT_END      +71)
-
-// !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!
-#define CORE_UNDO_END           STR_UNDO_TBLSTYLE_UPDATE// !!!! umsetzen !!!
-
-// UI-Undo Klammerungen
-#define UI_UNDO_BEGIN                   (CORE_UNDO_END + 1)
-#define STR_REPLACE_UNDO                (UI_UNDO_BEGIN)
-#define STR_INSERT_PAGE_BREAK_UNDO      (UI_UNDO_BEGIN + 1)
-#define STR_INSERT_COLUMN_BREAK_UNDO    (UI_UNDO_BEGIN + 2)
-#define STR_PLAY_MACRO_UNDO             (UI_UNDO_BEGIN + 3)
-#define STR_INSERT_ENV_UNDO             (UI_UNDO_BEGIN + 4)
-#define STR_DRAG_AND_COPY               (UI_UNDO_BEGIN + 5)
-#define STR_DRAG_AND_MOVE               (UI_UNDO_BEGIN + 6)
-#define STR_INSERT_CHART                (UI_UNDO_BEGIN + 7)
-#define STR_INSERT_FOOTNOTE             (UI_UNDO_BEGIN + 8)
-#define STR_INSERT_URLBTN               (UI_UNDO_BEGIN + 9)
-#define STR_INSERT_URLTXT               (UI_UNDO_BEGIN + 10)
-#define STR_DELETE_INVISIBLECNTNT       (UI_UNDO_BEGIN + 11)
-#define STR_REPLACE_STYLE               (UI_UNDO_BEGIN + 12)
-#define STR_DELETE_PAGE_BREAK           (UI_UNDO_BEGIN + 13)
-#define STR_TEXT_CORRECTION             (UI_UNDO_BEGIN + 14)
-#define STR_UNDO_TABLE_DELETE           (UI_UNDO_BEGIN + 15)
-#define UI_UNDO_END                     STR_UNDO_TABLE_DELETE
-
-#define UNDO_MORE_STRINGS_BEGIN         (UI_UNDO_END + 1)
-#define STR_OCCURRENCES_OF              (UNDO_MORE_STRINGS_BEGIN)
-#define STR_UNDO_TABS                   (UNDO_MORE_STRINGS_BEGIN + 1)
-#define STR_UNDO_NLS                    (UNDO_MORE_STRINGS_BEGIN + 2)
-#define STR_UNDO_PAGEBREAKS             (UNDO_MORE_STRINGS_BEGIN + 3)
-#define STR_UNDO_COLBRKS                (UNDO_MORE_STRINGS_BEGIN + 4)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
deleted file mode 100644
index 7c63b86af15f..000000000000
--- a/sw/source/core/undo/undo.src
+++ /dev/null
@@ -1,681 +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 <comcore.hrc>
-#include <undo.hrc>
-
- // Undo
-String STR_CANT_UNDO
-{
-    Text [ en-US ] = "not possible" ;
-};
-String STR_DELETE_UNDO
-{
-    Text [ en-US ] = "Delete $1" ;
-};
-String STR_INSERT_UNDO
-{
-    Text [ en-US ] = "Insert $1" ;
-};
-String STR_OVR_UNDO
-{
-    Text [ en-US ] = "Overwrite: $1" ;
-};
-String STR_SPLITNODE_UNDO
-{
-    Text [ en-US ] = "New Paragraph" ;
-};
-String STR_MOVE_UNDO
-{
-    Text [ en-US ] = "Move" ;
-};
-String STR_INSATTR_UNDO
-{
-    Text [ en-US ] = "Apply attributes" ;
-};
-String STR_SETFMTCOLL_UNDO
-{
-    Text [ en-US ] = "Apply Styles: $1" ;
-};
-String STR_RESET_ATTR_UNDO
-{
-    Text [ en-US ] = "Reset attributes" ;
-};
-String STR_INSFMT_ATTR_UNDO
-{
-    Text [ en-US ] = "Change style: $1" ;
-};
-String STR_INSERT_DOC_UNDO
-{
-    Text [ en-US ] = "Insert file" ;
-};
-String STR_INSERT_GLOSSARY
-{
-    Text [ en-US ] = "Insert AutoText" ;
-};
-String STR_DELBOOKMARK
-{
-    Text [ en-US ] = "Delete bookmark: $1" ;
-};
-String STR_INSBOOKMARK
-{
-    Text [ en-US ] = "Insert bookmark: $1" ;
-};
-String STR_SORT_TBL
-{
-    Text [ en-US ] = "Sort table" ;
-};
-String STR_SORT_TXT
-{
-    Text [ en-US ] = "Sort text" ;
-};
-String STR_INSTABLE_UNDO
-{
-    Text [ en-US ] = "Insert table: $1$2$3" ;
-};
-String STR_TEXTTOTABLE_UNDO
-{
-    Text [ en-US ] = "Convert text -> table" ;
-};
-String STR_TABLETOTEXT_UNDO
-{
-    Text [ en-US ] = "Convert table -> text" ;
-};
-String STR_COPY_UNDO
-{
-    Text [ en-US ] = "Copy: $1" ;
-};
-String STR_REPLACE_UNDO
-{
-    Text [ en-US ] = "Replace $1 $2 $3" ;
-};
-String STR_INSERT_PAGE_BREAK_UNDO
-{
-    Text [ en-US ] = "Insert page break" ;
-};
-String STR_INSERT_COLUMN_BREAK_UNDO
-{
-    Text [ en-US ] = "Insert column break" ;
-};
-String STR_PLAY_MACRO_UNDO
-{
-    Text [ en-US ] = "Run macro" ;
-};
-String STR_INSERT_ENV_UNDO
-{
-    Text [ en-US ] = "Insert Envelope" ;
-};
-String STR_DRAG_AND_COPY
-{
-    Text [ en-US ] = "Copy: $1" ;
-};
-String STR_DRAG_AND_MOVE
-{
-    Text [ en-US ] = "Move: $1" ;
-};
-String STR_INSERT_CHART
-{
-    Text [ en-US ] = "Insert %PRODUCTNAME Chart" ;
-};
-String STR_INSERTFLY
-{
-    Text [ en-US ] = "Insert frame" ;
-};
-String STR_DELETEFLY
-{
-    Text [ en-US ] = "Delete frame" ;
-};
-String STR_AUTOFORMAT
-{
-    Text [ en-US ] = "AutoFormat" ;
-};
-String STR_TABLEHEADLINE
-{
-    Text [ en-US ] = "Table heading" ;
-};
-String STR_REPLACE
-{
-    Text [ en-US ] = "Replace: $1 $2 $3" ;
-};
-String STR_INSERTSECTION
-{
-    Text [ en-US ] = "Insert section" ;
-};
-String STR_DELETESECTION
-{
-    Text [ en-US ] = "Delete section" ;
-};
-String STR_CHANGESECTION
-{
-    Text [ en-US ] = "Modify section" ;
-};
-String STR_CHANGESECTPASSWD
-{
-    Text [ en-US ] = "Change password protection" ;
-};
-String STR_CHANGEDEFATTR
-{
-    Text [ en-US ] = "Modify default values" ;
-};
-String STR_REPLACE_STYLE
-{
-    Text [ en-US ] = "Replace style: $1 $2 $3" ;
-};
-String STR_DELETE_PAGE_BREAK
-{
-    Text [ en-US ] = "Delete page break" ;
-};
-String STR_TEXT_CORRECTION
-{
-    Text [ en-US ] = "Text Correction" ;
-};
-String STR_OUTLINE_LR
-{
-    Text [ en-US ] = "Promote/demote outline" ;
-};
-String STR_OUTLINE_UD
-{
-    Text [ en-US ] = "Move outline" ;
-};
-String STR_INSNUM
-{
-    Text [ en-US ] = "Insert numbering" ;
-};
-String STR_NUMUP
-{
-    Text [ en-US ] = "Promote level" ;
-};
-String STR_NUMDOWN
-{
-    Text [ en-US ] = "Demote level" ;
-};
-String STR_MOVENUM
-{
-    Text [ en-US ] = "Move paragraphs" ;
-};
-String STR_INSERTDRAW
-{
-    Text [ en-US ] = "Insert drawing object: $1" ;
-};
-String STR_NUMORNONUM
-{
-    Text [ en-US ] = "Number On/Off" ;
-};
-String STR_INC_LEFTMARGIN
-{
-    Text [ en-US ] = "Increase Indent" ;
-};
-String STR_DEC_LEFTMARGIN
-{
-    Text [ en-US ] = "Decrease indent" ;
-};
-String STR_INSERTLABEL
-{
-    Text [ en-US ] = "Insert caption: $1" ;
-};
-String STR_SETNUMRULESTART
-{
-    Text [ en-US ] = "Restart numbering" ;
-};
-String STR_CHANGEFTN
-{
-    Text [ en-US ] = "Modify footnote" ;
-};
-String STR_REDLINE
-{
-    /* !! sollte NIE gebraucht/uebersetzt werden !! */
-};
-String STR_ACCEPT_REDLINE
-{
-    Text [ en-US ] = "Accept change: $1" ;
-};
-String STR_REJECT_REDLINE
-{
-    Text [ en-US ] = "Reject change: $1" ;
-};
-String STR_SPLIT_TABLE
-{
-    Text [ en-US ] = "Split Table" ;
-};
-String STR_DONTEXPAND
-{
-    Text [ en-US ] = "Stop attribute" ;
-};
-String STR_AUTOCORRECT
-{
-    Text [ en-US ] = "AutoCorrect" ;
-};
-String STR_MERGE_TABLE
-{
-    Text [ en-US ] = "Merge table";
-};
-
-String STR_TRANSLITERATE
-{
-    Text [ en-US ] = "Change Case";
-};
-
-String STR_DELNUM
-{
-    Text [ en-US ] = "Delete numbering" ;
-};
-String STR_DRAWUNDO
-{
-    Text [ en-US ] = "Drawing objects: $1" ;
-};
-String STR_DRAWGROUP
-{
-    Text [ en-US ] = "Group draw objects" ;
-};
-String STR_DRAWUNGROUP
-{
-    Text [ en-US ] = "Ungroup drawing objects" ;
-};
-String STR_DRAWDELETE
-{
-    Text [ en-US ] = "Delete drawing objects" ;
-};
-String STR_REREAD
-{
-    Text [ en-US ] = "Replace Image" ;
-};
-String STR_DELGRF
-{
-    Text [ en-US ] = "Delete Image" ;
-};
-String STR_DELOLE
-{
-    Text [ en-US ] = "Delete object" ;
-};
-String STR_TABLE_ATTR
-{
-    Text [ en-US ] = "Apply table attributes" ;
-};
-String STR_TABLE_AUTOFMT
-{
-    Text [ en-US ] = "AutoFormat Table" ;
-};
-String STR_TABLE_INSCOL
-{
-    Text [ en-US ] = "Insert Column" ;
-};
-String STR_TABLE_INSROW
-{
-    Text [ en-US ] = "Insert Row" ;
-};
-String STR_TABLE_DELBOX
-{
-    Text [ en-US ] = "Delete row/column" ;
-};
-String STR_UNDO_COL_DELETE
-{
-    Text [ en-US ] = "Delete column" ;
-};
-String STR_UNDO_ROW_DELETE
-{
-    Text [ en-US ] = "Delete row" ;
-};
-String STR_TABLE_SPLIT
-{
-    Text [ en-US ] = "Split Cells" ;
-};
-String STR_TABLE_MERGE
-{
-    Text [ en-US ] = "Merge Cells" ;
-};
-String STR_TABLE_NUMFORMAT
-{
-    Text [ en-US ] = "Format cell" ;
-};
-String STR_INSERT_TOX
-{
-    Text [ en-US ] = "Insert index/table" ;
-};
-String STR_CLEAR_TOX_RANGE
-{
-    Text [ en-US ] = "Remove index/table" ;
-};
-String STR_TABLE_TBLCPYTBL{
-    Text [ en-US ] = "Copy table" ;
-};
-String STR_TABLE_CPYTBL
-{
-    Text [ en-US ] = "Copy table" ;
-};
-String STR_INS_FROM_SHADOWCRSR
-{
-    Text [ en-US ] = "Set cursor" ;
-};
-String STR_UNDO_CHAIN
-{
-    Text [ en-US ] = "Link text frames" ;
-};
-String STR_UNDO_UNCHAIN
-{
-    Text [ en-US ] = "Unlink text frames" ;
-};
-String STR_UNDO_FTNINFO
-{
-    Text [ en-US ] = "Modify footnote options" ;
-};
-String STR_UNDO_ENDNOTEINFO
-{
-    Text [ en-US ] = "Modify endnote settings" ;
-};
-String STR_UNDO_COMPAREDOC
-{
-    Text [ en-US ] = "Compare Document" ;
-};
-String STR_UNDO_SETFLYFRMFMT
-{
-    Text [ en-US ] = "Apply frame style: $1" ;
-};
-String STR_UNDO_SETRUBYATTR
-{
-    Text [ en-US ] = "Ruby Setting";
-};
-String STR_UNDO_TMPAUTOCORR
-{
-    Text [ en-US ] = "AutoCorrect" ;
-};
-String STR_INSERT_FOOTNOTE
-{
-    Text [ en-US ] = "Insert footnote" ;
-};
-String STR_INSERT_URLBTN
-{
-    Text [ en-US ] = "insert URL button";
-};
-String STR_INSERT_URLTXT
-{
-    Text [ en-US ] = "Insert Hyperlink";
-};
-String STR_DELETE_INVISIBLECNTNT
-{
-    Text [ en-US ] = "remove invisible content";
-};
-String STR_TOXCHANGE
-{
-    Text [ en-US ] = "Table/index changed";
-};
-String STR_START_QUOTE
-{
-    Text [ en-US ] = "“";
-};
-String STR_END_QUOTE
-{
-    Text [ en-US ] = "”";
-};
-String STR_LDOTS
-{
-    Text [ en-US ] = "...";
-};
-String STR_MULTISEL
-{
-    Text [ en-US ] = "multiple selection";
-};
-String STR_TYPING_UNDO
-{
-    Text [ en-US ] = "Typing: $1";
-};
-String STR_PASTE_CLIPBOARD_UNDO
-{
-    Text [ en-US ] = "Paste clipboard";
-};
-String STR_YIELDS
-{
-    Text [ en-US ] = "→";
-};
-String STR_OCCURRENCES_OF
-{
-    Text [ en-US ] = "occurrences of";
-};
-String STR_UNDO_TABS
-{
-    Text [ en-US ] = "$1 tab(s)";
-};
-String STR_UNDO_NLS
-{
-    Text[ en-US ] = "$1 line break(s)";
-};
-String STR_UNDO_PAGEBREAKS
-{
-    Text[ en-US ] = "page break";
-};
-String STR_UNDO_COLBRKS
-{
-    Text[ en-US ] = "column break";
-};
-String STR_UNDO_REDLINE_INSERT
-{
-    Text [ en-US ] = "Insert $1";
-};
-String STR_UNDO_REDLINE_DELETE
-{
-    Text [ en-US ] = "Delete $1";
-};
-String STR_UNDO_REDLINE_FORMAT
-{
-    Text [ en-US ] = "Attributes changed";
-};
-String STR_UNDO_REDLINE_TABLE
-{
-    Text [ en-US ] = "Table changed";
-};
-String STR_UNDO_REDLINE_FMTCOLL
-{
-    Text [ en-US ] = "Style changed";
-};
-String STR_UNDO_REDLINE_PARAGRAPH_FORMAT
-{
-    Text [ en-US ] = "Paragraph formatting changed";
-};
-String STR_UNDO_REDLINE_TABLE_ROW_INSERT
-{
-    Text [ en-US ] = "Insert Row";
-};
-String STR_UNDO_REDLINE_TABLE_ROW_DELETE
-{
-    Text [ en-US ] = "Delete Row";
-};
-String STR_UNDO_REDLINE_TABLE_CELL_INSERT
-{
-    Text [ en-US ] = "Insert Cell";
-};
-String STR_UNDO_REDLINE_TABLE_CELL_DELETE
-{
-    Text [ en-US ] = "Delete Cell";
-};
-String STR_N_REDLINES
-{
-    Text [ en-US ] = "$1 changes";
-};
-String STR_UNDO_PAGEDESC
-{
-    Text [ en-US ] = "Change page style: $1";
-};
-String STR_UNDO_PAGEDESC_CREATE
-{
-    Text [ en-US ] = "Create page style: $1";
-};
-String STR_UNDO_PAGEDESC_DELETE
-{
-    Text [ en-US ] = "Delete page style: $1";
-};
-String STR_UNDO_PAGEDESC_RENAME
-{
-    Text [ en-US ] = "Rename page style: $1 $2 $3";
-};
-String STR_UNDO_HEADER_FOOTER
-{
-    Text [ en-US ] = "Header/footer changed";
-};
-String STR_UNDO_FIELD
-{
-    Text [ en-US ] = "Field changed";
-};
-String STR_UNDO_TXTFMTCOL_CREATE
-{
-    Text [ en-US ] = "Create paragraph style: $1";
-};
-String STR_UNDO_TXTFMTCOL_DELETE
-{
-    Text [ en-US ] = "Delete paragraph style: $1";
-};
-String STR_UNDO_TXTFMTCOL_RENAME
-{
-    Text [ en-US ] = "Rename paragraph style: $1 $2 $3";
-};
-String STR_UNDO_CHARFMT_CREATE
-{
-    Text [ en-US ] = "Create character style: $1";
-};
-String STR_UNDO_CHARFMT_DELETE
-{
-    Text [ en-US ] = "Delete character style: $1";
-};
-String STR_UNDO_CHARFMT_RENAME
-{
-    Text [ en-US ] = "Rename character style: $1 $2 $3";
-};
-String STR_UNDO_FRMFMT_CREATE
-{
-    Text [ en-US ] = "Create frame style: $1";
-};
-String STR_UNDO_FRMFMT_DELETE
-{
-    Text [ en-US ] = "Delete frame style: $1";
-};
-String STR_UNDO_FRMFMT_RENAME
-{
-    Text [ en-US ] = "Rename frame style: $1 $2 $3";
-};
-String STR_UNDO_NUMRULE_CREATE
-{
-    Text [ en-US ] = "Create numbering style: $1";
-};
-String STR_UNDO_NUMRULE_DELETE
-{
-    Text [ en-US ] = "Delete numbering style: $1";
-};
-String STR_UNDO_NUMRULE_RENAME
-{
-    Text [ en-US ] = "Rename numbering style: $1 $2 $3";
-};
-String STR_UNDO_BOOKMARK_RENAME
-{
-    Text[ en-US ] = "Rename bookmark: $1 $2 $3";
-};
-String STR_UNDO_INDEX_ENTRY_INSERT
-{
-    Text[ en-US ] = "Insert index entry";
-};
-String STR_UNDO_INDEX_ENTRY_DELETE
-{
-    Text[ en-US ] = "Delete index entry";
-};
-String STR_FIELD
-{
-    Text [ en-US ] = "field";
-};
-String STR_PARAGRAPHS
-{
-    Text [ en-US ] = "Paragraphs" ;
-};
-String STR_FRAME
-{
-    Text [ en-US ] = "frame";
-};
-String STR_OLE
-{
-    Text [ en-US ] = "OLE-object";
-};
-String STR_MATH_FORMULA
-{
-    Text [ en-US ] = "formula";
-};
-String STR_CHART
-{
-    Text [ en-US ] = "chart";
-};
-String STR_NOTE
-{
-    Text [ en-US ] = "comment";
-};
-String STR_REFERENCE
-{
-    Text [ en-US ] = "cross-reference";
-};
-String STR_SCRIPT
-{
-    Text [ en-US ] = "script";
-};
-String STR_AUTHORITY_ENTRY
-{
-    Text[ en-US ] = "bibliography entry";
-};
-String STR_SPECIALCHAR
-{
-    Text[ en-US ] = "special character";
-};
-String STR_FOOTNOTE
-{
-    Text[ en-US ] = "footnote";
-};
-String STR_GRAPHIC
-{
-    Text[ en-US ] = "image";
-};
-String STR_DRAWING_OBJECTS
-{
-    Text[ en-US ] = "drawing object(s)";
-};
-String STR_TABLE_NAME
-{
-    Text[ en-US ] = "table: $1$2$3";
-};
-String STR_PARAGRAPH_UNDO
-{
-    Text[ en-US ] = "paragraph";
-};
-String STR_UNDO_FLYFRMFMT_TITLE
-{
-    Text[ en-US ] = "Change object title of $1";
-};
-String STR_UNDO_FLYFRMFMT_DESCRITPTION
-{
-    Text[ en-US ] = "Change object description of $1";
-};
-String STR_UNDO_TBLSTYLE_CREATE
-{
-    Text[ en-US ] = "Create table style: $1";
-};
-String STR_UNDO_TBLSTYLE_DELETE
-{
-    Text[ en-US ] = "Delete table style: $1";
-};
-String STR_UNDO_TBLSTYLE_UPDATE
-{
-    Text[ en-US ] = "Update table style: $1";
-};
-String STR_UNDO_TABLE_DELETE
-{
-    Text [ en-US ] = "Delete table" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 9ad7a4d69748..cae440a08055 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -38,7 +38,7 @@
 #include <redline.hxx>
 #include <crossrefbookmark.hxx>
 #include <undo.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <docsh.hxx>
 #include <view.hxx>
 #include <o3tl/make_unique.hxx>
@@ -263,6 +263,174 @@ void SwUndo::RepeatImpl( ::sw::RepeatContext & )
 {
 }
 
+OUString GetUndoComment(SwUndoId eId)
+{
+    // Undo
+    const char* STR_UNDO_ARY[] =
+    {
+        STR_CANT_UNDO,
+        STR_DELETE_UNDO,
+        STR_INSERT_UNDO,
+        STR_OVR_UNDO,
+        STR_SPLITNODE_UNDO,
+        STR_MOVE_UNDO,
+        STR_INSATTR_UNDO,
+        STR_SETFMTCOLL_UNDO,
+        STR_RESET_ATTR_UNDO,
+        STR_INSFMT_ATTR_UNDO,
+        STR_INSERT_DOC_UNDO,
+        STR_INSERT_GLOSSARY,
+        STR_DELBOOKMARK,
+        STR_INSBOOKMARK,
+        STR_SORT_TBL,
+        STR_SORT_TXT,
+        STR_INSTABLE_UNDO,
+        STR_TEXTTOTABLE_UNDO,
+        STR_TABLETOTEXT_UNDO,
+        STR_COPY_UNDO,
+        STR_REPLACE_UNDO,
+        STR_INSERT_PAGE_BREAK_UNDO,
+        STR_INSERT_COLUMN_BREAK_UNDO,
+        STR_PLAY_MACRO_UNDO,
+        STR_INSERT_ENV_UNDO,
+        STR_DRAG_AND_COPY,
+        STR_DRAG_AND_MOVE,
+        STR_INSERT_CHART,
+        STR_INSERTFLY,
+        STR_DELETEFLY,
+        STR_AUTOFORMAT,
+        STR_TABLEHEADLINE,
+        STR_REPLACE,
+        STR_INSERTSECTION,
+        STR_DELETESECTION,
+        STR_CHANGESECTION,
+        STR_CHANGESECTPASSWD,
+        STR_CHANGEDEFATTR,
+        STR_REPLACE_STYLE,
+        STR_DELETE_PAGE_BREAK,
+        STR_TEXT_CORRECTION,
+        STR_OUTLINE_LR,
+        STR_OUTLINE_UD,
+        STR_INSNUM,
+        STR_NUMUP,
+        STR_NUMDOWN,
+        STR_MOVENUM,
+        STR_INSERTDRAW,
+        STR_NUMORNONUM,
+        STR_INC_LEFTMARGIN,
+        STR_DEC_LEFTMARGIN,
+        STR_INSERTLABEL,
+        STR_SETNUMRULESTART,
+        STR_CHANGEFTN,
+        nullptr, /* !! sollte NIE gebraucht/uebersetzt werden !! */
+        STR_ACCEPT_REDLINE,
+        STR_REJECT_REDLINE,
+        STR_SPLIT_TABLE,
+        STR_DONTEXPAND,
+        STR_AUTOCORRECT,
+        STR_MERGE_TABLE,
+        STR_TRANSLITERATE,
+        STR_DELNUM,
+        STR_DRAWUNDO,
+        STR_DRAWGROUP,
+        STR_DRAWUNGROUP,
+        STR_DRAWDELETE,
+        STR_REREAD,
+        STR_DELGRF,
+        STR_DELOLE,
+        STR_TABLE_ATTR,
+        STR_UNDO_TABLE_AUTOFMT,
+        STR_UNDO_TABLE_INSCOL,
+        STR_UNDO_TABLE_INSROW,
+        STR_UNDO_TABLE_DELBOX,
+        STR_UNDO_COL_DELETE,
+        STR_UNDO_ROW_DELETE,
+        STR_UNDO_TABLE_SPLIT,
+        STR_UNDO_TABLE_MERGE,
+        STR_TABLE_NUMFORMAT,
+        STR_INSERT_TOX,
+        STR_CLEAR_TOX_RANGE,
+        STR_TABLE_TBLCPYTBL,
+        STR_TABLE_CPYTBL,
+        STR_INS_FROM_SHADOWCRSR,
+        STR_UNDO_CHAIN,
+        STR_UNDO_UNCHAIN,
+        STR_UNDO_FTNINFO,
+        STR_UNDO_ENDNOTEINFO,
+        STR_UNDO_COMPAREDOC,
+        STR_UNDO_SETFLYFRMFMT,
+        STR_UNDO_SETRUBYATTR,
+        STR_UNDO_TMPAUTOCORR,
+        STR_INSERT_FOOTNOTE,
+        STR_INSERT_URLBTN,
+        STR_INSERT_URLTXT,
+        STR_DELETE_INVISIBLECNTNT,
+        STR_TOXCHANGE,
+        STR_START_QUOTE,
+        STR_END_QUOTE,
+        STR_LDOTS,
+        STR_MULTISEL,
+        STR_TYPING_UNDO,
+        STR_PASTE_CLIPBOARD_UNDO,
+        STR_YIELDS,
+        STR_OCCURRENCES_OF,
+        STR_UNDO_TABS,
+        STR_UNDO_NLS,
+        STR_UNDO_PAGEBREAKS,
+        STR_UNDO_COLBRKS,
+        STR_UNDO_REDLINE_INSERT,
+        STR_UNDO_REDLINE_DELETE,
+        STR_UNDO_REDLINE_FORMAT,
+        STR_UNDO_REDLINE_TABLE,
+        STR_UNDO_REDLINE_FMTCOLL,
+        STR_N_REDLINES,
+        STR_UNDO_PAGEDESC,
+        STR_UNDO_PAGEDESC_CREATE,
+        STR_UNDO_PAGEDESC_DELETE,
+        STR_UNDO_PAGEDESC_RENAME,
+        STR_UNDO_HEADER_FOOTER,
+        STR_UNDO_FIELD,
+        STR_UNDO_TXTFMTCOL_CREATE,
+        STR_UNDO_TXTFMTCOL_DELETE,
+        STR_UNDO_TXTFMTCOL_RENAME,
+        STR_UNDO_CHARFMT_CREATE,
+        STR_UNDO_CHARFMT_DELETE,
+        STR_UNDO_CHARFMT_RENAME,
+        STR_UNDO_FRMFMT_CREATE,
+        STR_UNDO_FRMFMT_DELETE,
+        STR_UNDO_FRMFMT_RENAME,
+        STR_UNDO_NUMRULE_CREATE,
+        STR_UNDO_NUMRULE_DELETE,
+        STR_UNDO_NUMRULE_RENAME,
+        STR_UNDO_BOOKMARK_RENAME,
+        STR_UNDO_INDEX_ENTRY_INSERT,
+        STR_UNDO_INDEX_ENTRY_DELETE,
+        STR_FIELD,
+        STR_PARAGRAPHS,
+        STR_FRAME,
+        STR_OLE,
+        STR_MATH_FORMULA,
+        STR_CHART,
+        STR_NOTE,
+        STR_REFERENCE,
+        STR_SCRIPT,
+        STR_AUTHORITY_ENTRY,
+        STR_SPECIALCHAR,
+        STR_FOOTNOTE,
+        STR_GRAPHIC,
+        STR_DRAWING_OBJECTS,
+        STR_TABLE_NAME,
+        STR_PARAGRAPH_UNDO,
+        STR_UNDO_FLYFRMFMT_TITLE,
+        STR_UNDO_FLYFRMFMT_DESCRITPTION,
+        STR_UNDO_TBLSTYLE_CREATE,
+        STR_UNDO_TBLSTYLE_DELETE,
+        STR_UNDO_TBLSTYLE_UPDATE,
+        STR_UNDO_TABLE_DELETE
+    };
+    return SwResId(STR_UNDO_ARY[(int)eId]);
+}
+
 OUString SwUndo::GetComment() const
 {
     OUString aResult;
@@ -271,7 +439,7 @@ OUString SwUndo::GetComment() const
     {
         if (! pComment)
         {
-            pComment.reset( new OUString(SwResId(UNDO_BASE + (int)GetId())) );
+            pComment.reset(new OUString(GetUndoComment(GetId())));
 
             SwRewriter aRewriter = GetRewriter();
 
@@ -282,7 +450,7 @@ OUString SwUndo::GetComment() const
     }
     else
     {
-        aResult = SwResId(UNDO_BASE + (int)GetId());
+        aResult = GetUndoComment(GetId());
 
         SwRewriter aRewriter = GetRewriter();
 
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index c9d311a3d782..bee8eafb76ed 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -54,7 +54,7 @@
 #include <acorrect.hxx>
 #include <dcontact.hxx>
 
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <undo.hrc>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index fe420faec1f6..d9db5e57d456 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <UndoOverwrite.hxx>
-#include <tools/resid.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <comphelper/processfactory.hxx>
@@ -33,7 +32,7 @@
 #include <rolbck.hxx>
 #include <acorrect.hxx>
 #include <docary.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <undo.hrc>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 2f08ed55d893..e4f23da63968 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -27,7 +27,7 @@
 #include <ndtxt.hxx>
 #include <UndoCore.hxx>
 #include <UndoDelete.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <rolbck.hxx>
 #include <redline.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a4e2df354c86..7c16abe9b9b3 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -60,7 +60,7 @@
 #include <node2lay.hxx>
 #include <tblrwcl.hxx>
 #include <fmtanchr.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <unochart.hxx>
 #include <calbck.hxx>
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 1d0c0200708b..841a0b0667c4 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -42,7 +42,7 @@
 #include <docsh.hxx>
 #include <ndole.hxx>
 #include <swtypes.hxx>
-#include <unocore.hrc>
+#include <strings.hrc>
 #include <docary.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
diff --git a/sw/source/core/unocore/unocore.src b/sw/source/core/unocore/unocore.src
deleted file mode 100644
index adb0cd87e7b6..000000000000
--- a/sw/source/core/unocore/unocore.src
+++ /dev/null
@@ -1,67 +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 <unocore.hrc>
-
-String STR_CHART2_ROW_LABEL_TEXT
-{
-    Text [ en-US ] = "Row %ROWNUMBER" ;
-};
-
-String STR_CHART2_COL_LABEL_TEXT
-{
-    Text [ en-US ] = "Column %COLUMNLETTER" ;
-};
-
-String STR_STYLE_FAMILY_CHARACTER
-{
-    Text [ en-US ] = "Character" ;
-};
-
-String STR_STYLE_FAMILY_PARAGRAPH
-{
-    Text [ en-US ] = "Paragraph" ;
-};
-
-String STR_STYLE_FAMILY_FRAME
-{
-    Text [ en-US ] = "Frame" ;
-};
-
-String STR_STYLE_FAMILY_PAGE
-{
-    Text [ en-US ] = "Pages" ;
-};
-
-String STR_STYLE_FAMILY_NUMBERING
-{
-    Text [ en-US ] = "Numbering" ;
-};
-
-String STR_STYLE_FAMILY_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-
-String STR_STYLE_FAMILY_CELL
-{
-    Text [ en-US ] = "Cell" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 92258723e11a..77f56b435dd1 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -76,7 +76,7 @@
 #include <chpfld.hxx>
 #include <flddropdown.hxx>
 #include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <pagedesc.hxx>
 #include <docary.hxx>
 #include <reffld.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 1d6b2d362409..59a6b9f93041 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -45,7 +45,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <docary.hxx>
 #include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <pagedesc.hxx>
 #include <fmtcntnt.hxx>
 #include <unomap.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index ce721dc05659..92248fc1c1f3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -54,7 +54,7 @@
 #include <fmtfld.hxx>
 #include <fmtpdsc.hxx>
 #include <pagedesc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <poolfmt.hxx>
 #include <edimp.hxx>
 #include <fchrfmt.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0de40a487554..f48471ced40b 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -22,7 +22,7 @@
 #include <swtypes.hxx>
 #include <cmdid.h>
 #include <hintids.hxx>
-#include "poolfmt.hrc"
+#include "strings.hrc"
 #include "poolfmt.hxx"
 #include <fmtcol.hxx>
 #include <unomap.hxx>
@@ -1270,6 +1270,20 @@ sal_Bool SwXNumberingRules::hasElements()
     return true;
 }
 
+static const char* STR_POOLCOLL_HEADLINE_ARY[]
+{
+    STR_POOLCOLL_HEADLINE1,
+    STR_POOLCOLL_HEADLINE2,
+    STR_POOLCOLL_HEADLINE3,
+    STR_POOLCOLL_HEADLINE4,
+    STR_POOLCOLL_HEADLINE5,
+    STR_POOLCOLL_HEADLINE6,
+    STR_POOLCOLL_HEADLINE7,
+    STR_POOLCOLL_HEADLINE8,
+    STR_POOLCOLL_HEADLINE9,
+    STR_POOLCOLL_HEADLINE10
+};
+
 uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
                 const SwNumRule& rNumRule, sal_Int32 nIndex) const
 {
@@ -1294,7 +1308,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
     if (pDocShell) // -> Chapter Numbering
     {
         // template name
-        OUString sValue(SwResId(STR_POOLCOLL_HEADLINE1 + nIndex));
+        OUString sValue(SwResId(STR_POOLCOLL_HEADLINE_ARY[nIndex]));
         const SwTextFormatColls* pColls = pDocShell->GetDoc()->GetTextFormatColls();
         const size_t nCount = pColls->size();
         for(size_t i = 0; i < nCount; ++i)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index e9a666bd7102..9be31a4c80ea 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -54,7 +54,7 @@
 #include <unotextbodyhf.hxx>
 #include <fmthdft.hxx>
 #include <fmtpdsc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <poolfmt.hxx>
 #include "unoevent.hxx"
 #include <fmtruby.hxx>
@@ -89,7 +89,6 @@
 #include <svx/xbtmpit.hxx>
 
 #include "ccoll.hxx"
-#include "unocore.hrc"
 
 #include <cassert>
 #include <memory>
@@ -108,17 +107,17 @@ namespace
         uno::Reference<beans::XPropertySetInfo> m_xPSInfo;
         SwGetPoolIdFromName m_aPoolId;
         OUString m_sName;
-        sal_uInt32 m_nResId;
+        const char* m_pResId;
         GetCountOrName_t m_fGetCountOrName;
         CreateStyle_t m_fCreateStyle;
         TranslateIndex_t m_fTranslateIndex;
-        StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType, SwGetPoolIdFromName aPoolId, OUString const& sName, sal_uInt32 nResId, GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle, TranslateIndex_t const & fTranslateIndex)
+        StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType, SwGetPoolIdFromName aPoolId, OUString const& sName, const char* pResId, GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle, TranslateIndex_t const & fTranslateIndex)
                 : m_eFamily(eFamily)
                 , m_nPropMapType(nPropMapType)
                 , m_xPSInfo(aSwMapProvider.GetPropertySet(nPropMapType)->getPropertySetInfo())
                 , m_aPoolId(aPoolId)
                 , m_sName(sName)
-                , m_nResId(nResId)
+                , m_pResId(pResId)
                 , m_fGetCountOrName(fGetCountOrName)
                 , m_fCreateStyle(fCreateStyle)
                 , m_fTranslateIndex(fTranslateIndex)
@@ -1044,7 +1043,7 @@ uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName
     if(sPropertyName != "DisplayName")
         throw beans::UnknownPropertyException( "unknown property: " + sPropertyName, static_cast<OWeakObject *>(this) );
     SolarMutexGuard aGuard;
-    return uno::makeAny(SwResId(m_rEntry.m_nResId));
+    return uno::makeAny(SwResId(m_rEntry.m_pResId));
 }
 
 
@@ -1514,6 +1513,24 @@ public:
     };
 };
 
+namespace
+{
+    const char* STR_POOLPAGE_ARY[] =
+    {
+        // Page styles
+        STR_POOLPAGE_STANDARD,
+        STR_POOLPAGE_FIRST,
+        STR_POOLPAGE_LEFT,
+        STR_POOLPAGE_RIGHT,
+        STR_POOLPAGE_JAKET,
+        STR_POOLPAGE_REGISTER,
+        STR_POOLPAGE_HTML,
+        STR_POOLPAGE_FOOTNOTE,
+        STR_POOLPAGE_ENDNOTE,
+        STR_POOLPAGE_LANDSCAPE
+    };
+}
+
 const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
 {
     if(!m_pOldPageDesc)
@@ -1524,11 +1541,11 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
 
         if(!m_pOldPageDesc)
         {
-            for(sal_uInt16 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
+            for (size_t i = 0; i < SAL_N_ELEMENTS(STR_POOLPAGE_ARY); ++i)
             {
-                if(SwResId(i) == m_rStyleName)
+                if (SwResId(STR_POOLPAGE_ARY[i]) == m_rStyleName)
                 {
-                    m_pOldPageDesc = m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast<sal_uInt16>(RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN));
+                    m_pOldPageDesc = m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_BEGIN + i);
                     break;
                 }
             }
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 0cc1ac469443..e02246ec403d 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -33,7 +33,7 @@
 #include <viewimp.hxx>
 #include <viewopt.hxx>
 #include <swregion.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <frmtool.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <printdata.hxx>
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 9155d7dccf3c..c795e73f2d8f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -20,6 +20,7 @@
 #include <printdata.hxx>
 
 #include <globals.hrc>
+#include <strings.hrc>
 #include <doc.hxx>
 #include <IDocumentDeviceAccess.hxx>
 #include <unotxdoc.hxx>
@@ -29,7 +30,6 @@
 
 #include <svl/languageoptions.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <tools/resary.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 6baeba639baa..22141173012b 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -33,7 +33,7 @@
 #include <accmap.hxx>
 
 #include <pagepreviewlayout.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <svx/svdundo.hxx>
 #include <comphelper/lok.hxx>
 #include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 079f764ea2b2..131ad107f67f 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -36,8 +36,8 @@
 #include <hints.hxx>
 #include <fntcache.hxx>
 
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a763e979ff88..74f43b47ca74 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -64,8 +64,8 @@
 #include <vcl/alpha.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <accessibilityoptions.hxx>
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <pagepreviewlayout.hxx>
 #include <sortedobjs.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 21ab2083f50c..97a437cda14d 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -61,7 +61,7 @@
 #include <pagedesc.hxx>
 #include <poolfmt.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <ptqueue.hxx>
 #include <tabfrm.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index aee455a34a31..9ae7f924fb19 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -40,7 +40,7 @@
 #include <pagedesc.hxx>
 #include <breakit.hxx>
 #include <swerror.h>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <mdiexp.hxx>
 #include <poolfmt.hxx>
 
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 7a23d1970fba..99567ff29172 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -29,7 +29,7 @@
 #include <frmfmt.hxx>
 #include <wrtasc.hxx>
 
-#include <statstr.hrc>
+#include <strings.hrc>
 
 SwASCWriter::SwASCWriter( const OUString& rFltNm )
 {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 93b6d5b609bf..7d86e4234a60 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -110,7 +110,7 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <css1atr.hxx>
 
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 155a8f6784ad..bc5759fb030d 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -69,7 +69,7 @@
 #include <htmlnum.hxx>
 #include <htmlfly.hxx>
 #include <swmodule.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <rtl/strbuf.hxx>
 #include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 987a060820cc..e20400036e23 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -87,7 +87,7 @@
 #include <svtools/imapobj.hxx>
 #include <tools/urlobj.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <fmtline.hxx>
 #include <fmtfsize.hxx>
 #include <comphelper/extract.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d7889c17f366..e5ed1e137ce3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -85,7 +85,7 @@
 #include <viewopt.hxx>
 #include <shellres.hxx>
 #include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <swtable.hxx>
 #include <fchrfmt.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 216284b09160..4513028f9765 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <comphelper/processfactory.hxx>
@@ -59,7 +59,7 @@
 #include <unotextrange.hxx>
 #include <swmodule.hxx>
 #include <SwXMLSectionList.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 
 #include <SwStyleNameMapper.hxx>
 #include <poolfmt.hxx>
@@ -73,6 +73,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <istyleaccess.hxx>
 
 #include <sfx2/DocumentMetadataAccess.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 61a7cddece3a..651b47a00c7d 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -36,6 +36,7 @@
 #include <svl/stritem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <pam.hxx>
 #include <doc.hxx>
 #include <docfunc.hxx>
@@ -48,7 +49,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <swerror.h>
 #include <wrtxml.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 
 #include <comphelper/documentconstants.hxx>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d05820fa1115..34fc6afeaa54 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -50,7 +50,7 @@
 #include <poolfmt.hxx>
 #include <ndtxt.hxx>
 #include <editsh.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include "xmlimp.hxx"
 #include "xmltexti.hxx"
 #include <xmloff/DocumentSettingsContext.hxx>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 1c43e5c4bffc..984d6177023a 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
deleted file mode 100644
index ab383e24ec29..000000000000
--- a/sw/source/ui/app/app.src
+++ /dev/null
@@ -1,577 +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 <svl/style.hrc>
-#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
-#include "cmdid.h"
-#include "access.hrc"
-#include "globals.hrc"
-#include "app.hrc"
-#include "statstr.hrc"
-#include "swstyle.h"
-#include "comcore.hrc"
-#include "shells.hrc"
-#include "helpid.h"
-
-String STR_PARAGRAPHSTYLEFAMILY
-{
-    Text [ en-US ] = "Paragraph Styles" ;
-};
-
-String STR_CHARACTERSTYLEFAMILY
-{
-    Text [ en-US ] = "Character Styles" ;
-};
-
-String STR_FRAMESTYLEFAMILY
-{
-    Text [ en-US ] = "Frame Styles" ;
-};
-
-String STR_PAGESTYLEFAMILY
-{
-    Text [ en-US ] = "Page Styles" ;
-};
-
-String STR_LISTSTYLEFAMILY
-{
-    Text [ en-US ] = "List Styles" ;
-};
-
-String STR_TABLESTYLEFAMILY
-{
-    Text [ en-US ] = "Table Styles" ;
-};
-
-StringArray RID_PARAGRAPHSTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All Styles"          ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"       ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"      ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"       ; SFXSTYLEBIT_USERDEF   ; > ;
-        < "Automatic"           ; SFXSTYLEBIT_AUTO      ; > ;
-        < "Text Styles"         ; SWSTYLEBIT_TEXT       ; > ;
-        < "Chapter Styles"      ; SWSTYLEBIT_CHAPTER    ; > ;
-        < "List Styles"         ; SWSTYLEBIT_LIST       ; > ;
-        < "Index Styles"        ; SWSTYLEBIT_IDX        ; > ;
-        < "Special Styles"      ; SWSTYLEBIT_EXTRA      ; > ;
-        < "HTML Styles"         ; SWSTYLEBIT_HTML       ; > ;
-        < "Conditional Styles"  ; SWSTYLEBIT_CONDCOLL   ; > ;
-    };
-};
-
-StringArray RID_CHARACTERSTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
-    };
-};
-
-StringArray RID_FRAMESTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
-    };
-};
-
-StringArray RID_PAGESTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
-    };
-};
-
-StringArray RID_LISTSTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
-    };
-};
-
-StringArray RID_TABLESTYLEFAMILY
-{
-    ItemList [ en-US ] =
-    {
-        < "All"             ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
-        < "Hidden Styles"   ; SFXSTYLEBIT_HIDDEN    ; > ;
-        < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
-        < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
-    };
-};
-
-String STR_ENV_TITLE
-{
-    Text [ en-US ] = "Envelope" ;
-};
-
-String STR_LAB_TITLE
-{
-    Text [ en-US ] = "Labels" ;
-};
-
- // ShortName!!!
-String STR_HUMAN_SWDOC_NAME
-{
-    Text [ en-US ] = "Text" ;
-};
-
-String STR_WRITER_DOCUMENT_FULLTYPE
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Text Document";
-};
-
-String STR_CANTOPEN
-{
-    Text [ en-US ] = "Cannot open document." ;
-};
-
-String STR_CANTCREATE
-{
-    Text [ en-US ] = "Can't create document.";
-};
-
-String STR_DLLNOTFOUND
-{
-    Text [ en-US ] = "Filter not found." ;
-};
-
-String STR_LOAD_GLOBAL_DOC
-{
-    Text [ en-US ] = "Name and Path of Master Document" ;
-};
-
-String STR_LOAD_HTML_DOC
-{
-    Text [ en-US ] = "Name and Path of the HTML Document" ;
-};
-
-String STR_JAVA_EDIT
-{
-    Text [ en-US ] = "Edit Script" ;
-};
-
-String STR_REMOVE_WARNING
-{
-    Text [ en-US ] = "The following characters are not valid and have been removed: ";
-};
-
-String STR_BOOKMARK_DEF_NAME
-{
-    Text [ en-US ] = "Bookmark";
-};
-
-String STR_BOOKMARK_NAME
-{
-    Text [ en-US ] = "Name";
-};
-
-String STR_BOOKMARK_TEXT
-{
-    Text [ en-US ] = "Text";
-};
-
-String SW_STR_NONE
-{
-    Text [ en-US ] = "[None]" ;
-};
-
-String STR_CAPTION_BEGINNING
-{
-    Text [ en-US ] = "Start" ;
-};
-
-String STR_CAPTION_END
-{
-    Text [ en-US ] = "End" ;
-};
-
-String STR_CAPTION_ABOVE
-{
-    Text [ en-US ] = "Above" ;
-};
-
-String STR_CAPTION_BELOW
-{
-    Text [ en-US ] = "Below" ;
-};
-
-String SW_STR_READONLY
-{
-    Text [ en-US ] = "read-only" ;
-};
-
-String STR_READONLY_PATH
-{
-    Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?";
-};
-
-String STR_DOC_STAT
-{
-    Text [ en-US ] = "Statistics" ;
-};
-
- // Statusbar-titles
-
-String STR_STATSTR_W4WREAD
-{
-    Text [ en-US ] = "Importing document..." ;
-};
-
-String STR_STATSTR_W4WWRITE
-{
-    Text [ en-US ] = "Exporting document..." ;
-};
-
-String STR_STATSTR_SWGREAD
-{
-    Text [ en-US ] = "Loading document..." ;
-};
-
-String STR_STATSTR_SWGWRITE
-{
-    Text [ en-US ] = "Saving document..." ;
-};
-
-String STR_STATSTR_REFORMAT
-{
-    Text [ en-US ] = "Repagination..." ;
-};
-
-String STR_STATSTR_AUTOFORMAT
-{
-    Text [ en-US ] = "Formatting document automatically..." ;
-};
-
-String STR_STATSTR_SEARCH
-{
-    Text [ en-US ] = "Search..." ;
-};
-
-String STR_STATSTR_LETTER
-{
-    Text [ en-US ] = "Letter" ;
-};
-
-String STR_STATSTR_SPELL
-{
-    Text [ en-US ] = "Spellcheck..." ;
-};
-
-String STR_STATSTR_HYPHEN
-{
-    Text [ en-US ] = "Hyphenation..." ;
-};
-
-String STR_STATSTR_TOX_INSERT
-{
-    Text [ en-US ] = "Inserting Index..." ;
-};
-
-String STR_STATSTR_TOX_UPDATE
-{
-    Text [ en-US ] = "Updating Index..." ;
-};
-
-String STR_STATSTR_SUMMARY
-{
-    Text [ en-US ] = "Creating abstract..." ;
-};
-
-String STR_STATSTR_SWGPRTOLENOTIFY
-{
-    Text [ en-US ] = "Adapt Objects...";
-};
-
-String STR_TABLE_DEFNAME
-{
-    Text [ en-US ] = "Table" ;
-};
-
-String STR_GRAPHIC_DEFNAME
-{
-    Text[ en-US ] = "Image" ;
-};
-
-String STR_OBJECT_DEFNAME
-{
-    Text [ en-US ] = "Object" ;
-};
-
-String STR_FRAME_DEFNAME
-{
-    Text [ en-US ] = "Frame" ;
-};
-
-String STR_SHAPE_DEFNAME
-{
-    Text [ en-US ] = "Shape" ;
-};
-
-String STR_REGION_DEFNAME
-{
-    Text [ en-US ] = "Section" ;
-};
-
-String STR_NUMRULE_DEFNAME
-{
-    Text [ en-US ] = "Numbering" ;
-};
-
-String STR_EMPTYPAGE
-{
-    Text [ en-US ] = "blank page" ;
-};
-
-String STR_ABSTRACT_TITLE
-{
-    Text [ en-US ] = "Abstract: " ;
-};
-
-String STR_FDLG_TEMPLATE_NAME
-{
-    Text [ en-US ] = "separated by: " ;
-};
-
-String STR_FDLG_OUTLINE_LEVEL
-{
-    Text [ en-US ] = "Outline: Level ";
-};
-
-String STR_FDLG_STYLE
-{
-    Text [ en-US ] = "Style: ";
-};
-
-String STR_PAGEOFFSET
-{
-    Text [ en-US ] = "Page number: " ;
-};
-
-String STR_PAGEBREAK
-{
-    Text [ en-US ] = "Break before new page" ;
-};
-
-String STR_WESTERN_FONT
-{
-    Text [ en-US ] = "Western text: ";
-};
-
-String STR_CJK_FONT
-{
-    Text [ en-US ] = "Asian text: ";
-};
-
-String STR_REDLINE_UNKNOWN_AUTHOR
-{
-    Text [ en-US ] = "Unknown Author";
-};
-
-String STR_DELETE_NOTE_AUTHOR
-{
-    Text [ en-US ] = "Delete ~All Comments by $1";
-};
-
-String STR_HIDE_NOTE_AUTHOR
-{
-    Text [ en-US ] = "H~ide All Comments by $1";
-};
-
-String STR_OUTLINE_NUMBERING
-{
-    Text [ en-US ] = "Outline Numbering";
-};
-
-String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
-{
-    Text [ en-US ] = "%1 words, %2 characters";
-};
-
-String STR_STATUSBAR_WORDCOUNT
-{
-    Text [ en-US ] = "%1 words, %2 characters selected";
-};
-
-String STR_CONVERT_TEXT_TABLE
-{
-    Text [ en-US ] = "Convert Text to Table" ;
-};
-
-String STR_ADD_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Add AutoFormat" ;
-};
-
-String STR_ADD_AUTOFORMAT_LABEL
-{
-    Text [ en-US ] = "Name" ;
-};
-
-String STR_DEL_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Delete AutoFormat" ;
-};
-
-String STR_DEL_AUTOFORMAT_MSG
-{
-    Text [ en-US ] = "The following AutoFormat entry will be deleted:" ;
-};
-
-String STR_RENAME_AUTOFORMAT_TITLE
-{
-    Text [ en-US ] = "Rename AutoFormat" ;
-};
-
-String STR_BTN_AUTOFORMAT_CLOSE
-{
-    Text [ en-US ] = "~Close" ;
-};
-
-String STR_JAN
-{
-    Text [ en-US ] = "Jan" ;
-};
-
-String STR_FEB
-{
-    Text [ en-US ] = "Feb" ;
-};
-
-String STR_MAR
-{
-    Text [ en-US ] = "Mar" ;
-};
-
-String STR_NORTH
-{
-    Text [ en-US ] = "North" ;
-};
-
-String STR_MID
-{
-    Text [ en-US ] = "Mid" ;
-};
-
-String STR_SOUTH
-{
-    Text [ en-US ] = "South" ;
-};
-
-String STR_SUM
-{
-    Text [ en-US ] = "Sum" ;
-};
-
-String STR_INVALID_AUTOFORMAT_NAME
-{
-    Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ;
-};
-
-String STR_NUMERIC
-{
-    Text [ en-US ] = "Numeric";
-};
-
-String STR_ROW
-{
-    Text [ en-US ] = "Rows" ;
-};
-
-String STR_COL
-{
-    Text [ en-US ] = "Column" ;
-};
-
-String STR_AUTHMRK_EDIT
-{
-
-    Text [ en-US ] = "Edit Bibliography Entry";
-};
-
-String STR_AUTHMRK_INSERT
-{
-
-    Text [ en-US ] = "Insert Bibliography Entry";
-};
-
-String STR_ACCESS_PAGESETUP_SPACING
-{
-    Text [ en-US ] = "Spacing between %1 and %2";
-};
-
-String STR_ACCESS_COLUMN_WIDTH
-{
-    Text [ en-US ] = "Column %1 Width";
-};
-
-String STR_CAPTION_TABLE
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer Table";
-};
-
-String STR_CAPTION_FRAME
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer Frame";
-};
-
-String STR_CAPTION_GRAPHIC
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer Image";
-};
-
-String STR_CAPTION_OLE
-{
-    Text [ en-US ] = "Other OLE Objects";
-};
-
-String STR_WRONG_TABLENAME
-{
-    Text [ en-US ] = "The name of the table must not contain spaces." ;
-};
-
-String STR_ERR_TABLE_MERGE
-{
-    Text [ en-US ] = "Selected table cells are too complex to merge." ;
-};
-
-String STR_SRTERR
-{
-    Text [ en-US ] = "Cannot sort selection" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
deleted file mode 100644
index 35d774455b5f..000000000000
--- a/sw/source/ui/app/error.src
+++ /dev/null
@@ -1,86 +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 "globals.hrc"
-#include "app.hrc"
-#include "swerror.h"
-#include "comcore.hrc"
-
-String STR_COMCORE_READERROR
-{
-    Text [ en-US ] = "Read Error" ;
-};
-String STR_COMCORE_CANT_SHOW
-{
-    Text [ en-US ] = "Image cannot be displayed." ;
-};
-
-String STR_ERROR_CLPBRD_READ
-{
-    Text [ en-US ] = "Error reading from the clipboard." ;
-};
-
-#define ERR_CODE( class, err )  (class | (err - ERRCODE_AREA_SW))
-#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE))
-
-StringArray RID_SW_ERRHDL
-{
-    ItemList [ en-US ] =
-    {
-        // Import-Errors
-        < "File format error found." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) ; >;
-        < "Error reading file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) ; >;
-        < "Input file error." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) ; >;
-        < "This is not a %PRODUCTNAME Writer file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) ; >;
-        < "Unexpected end of file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) ; >;
-        < "Password-protected files cannot be opened." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) ; >;
-        < "This is not a valid WinWord6 file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) ; >;
-        < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) ; >;
-        < "File format error found at $(ARG1)(row,col)." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >;
-        < "File has been written in a newer version." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) ; >;
-        < "This is not a valid WinWord97 file."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >;
-        // Export-Errors
-        < "Error writing file." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) ; >;
-        < "Wrong AutoText document version." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) ; >;
-        < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) ; >;
-        // Import-/Export-Errors
-        < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) ; >;
-        < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) ; >;
-        < "$(ARG1) has changed." ; ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) ; >;
-        < "$(ARG1) does not exist." ; ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) ; >;
-        < "Cells cannot be further split." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) ; >;
-        < "Additional columns cannot be inserted." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) ; >;
-        < "The structure of a linked table cannot be modified." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) ; >;
-
-        < "No drawings could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) ; >;
-        < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) ; >;
-        < "Not all attributes could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) ; >;
-        < "Not all attributes could be recorded." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) ; >;
-        < "Some OLE objects could only be loaded as images." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE ) ; >;
-        < "Some OLE objects could only be saved as images." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE ) ; >;
-        < "Document could not be completely loaded." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD ) ; >;
-        < "Document could not be completely saved." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD ) ; >;
-        < "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS) ; >;
-        < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_WRITE_ERROR_FILE ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 446524cbac0e..7ab97a220950 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -34,6 +34,7 @@
 #include <poolfmt.hxx>
 
 #include <chrdlg.hrc>
+#include <strings.hrc>
 #include <SwStyleNameMapper.hxx>
 
 void SwBreakDlg::Apply()
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 85e5155d4525..e2206072ed32 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -43,6 +43,7 @@
 
 #include <globals.hrc>
 #include <chrdlg.hrc>
+#include <strings.hrc>
 #include <chrdlgmodes.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
deleted file mode 100644
index 1e7a66c672d9..000000000000
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ /dev/null
@@ -1,31 +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 "chrdlg.hrc"
-
-String STR_TEXTCOLL_HEADER
-{
-    Text [ en-US ] = "(Paragraph Style: " ;
-};
-String STR_ILLEGAL_PAGENUM
-{
-    Text [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index e7a92eb8d293..0359fea82d63 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -25,6 +25,7 @@
 #include "view.hxx"
 #include "wrtsh.hxx"
 #include "globals.hrc"
+#include "strings.hrc"
 
 #include <vcl/metric.hxx>
 #include <vcl/settings.hxx>
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 19cb6729e59e..14605445d377 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -21,6 +21,7 @@
 #include "swtypes.hxx"
 #include "hintids.hxx"
 #include "globals.hrc"
+#include "strings.hrc"
 #include "helpid.h"
 #include <sfx2/objsh.hxx>
 #include <sfx2/htmlmode.hxx>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index bd57bdd2d30c..33b14a55b291 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -36,7 +36,7 @@
 #include "viewopt.hxx"
 #include <numpara.hxx>
 #include "chrdlg.hrc"
-#include "poolfmt.hrc"
+#include "strings.hrc"
 #include <svx/svxids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
deleted file mode 100644
index 2de8d4218158..000000000000
--- a/sw/source/ui/config/config.hrc
+++ /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 .
- */
-#ifndef INCLUDED_SW_SOURCE_UI_CONFIG_HRC
-#define INCLUDED_SW_SOURCE_UI_CONFIG_HRC
-
-#include "rcid.hrc"
-
-// strings for configuration
-
-#define STR_ARR_METRIC          (RC_CONFIG_BEGIN + 26)
-#define CONFIG_ACT_END          STR_ARR_METRIC
-
-#if CONFIG_ACT_END > RC_CONFIG_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index a5d2c436776e..3652ca979edf 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/mail/MailServiceProvider.hpp>
 #include <vcl/msgbox.hxx>
 #include <globals.hrc>
-#include <config.hrc>
 #include <dbui.hrc>
 #include "bitmaps.hlst"
 #include <helpid.h>
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
deleted file mode 100644
index 9f4173a9f8b6..000000000000
--- a/sw/source/ui/config/optdlg.src
+++ /dev/null
@@ -1,167 +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 .
- */
-/* StarView resource file */
-#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
-#include "globals.hrc"
-#include "config.hrc"
-#include "helpid.h"
-
-String ST_SCRIPT_ASIAN
-{
-    Text [ en-US ] = "Asian";
-};
-String ST_SCRIPT_CTL
-{
-    Text [ en-US ] = "CTL";
-};
-String ST_SCRIPT_WESTERN
-{
-    Text [ en-US ] = "Western";
-};
-
-String STR_PRINTOPTUI_PRODUCTNAME
-{
-    Text [ en-US ] = "%PRODUCTNAME %s";
-};
-String STR_PRINTOPTUI_CONTENTS
-{
-    Text [ en-US ] = "Contents";
-};
-String STR_PRINTOPTUI_PAGE_BACKGROUND
-{
-    Text [ en-US ] = "Page ba~ckground";
-};
-String STR_PRINTOPTUI_PICTURES
-{
-    Text [ en-US ] = "P~ictures and other graphic objects";
-};
-String STR_PRINTOPTUI_HIDDEN
-{
-    Text [ en-US ] = "Hidden te~xt";
-};
-String STR_PRINTOPTUI_TEXT_PLACEHOLDERS
-{
-    Text [ en-US ] = "~Text placeholders";
-};
-String STR_PRINTOPTUI_FORM_CONTROLS
-{
-    Text [ en-US ] = "Form control~s";
-};
-String STR_PRINTOPTUI_COLOR
-{
-    Text [ en-US ] = "Color";
-};
-String STR_PRINTOPTUI_PRINT_BLACK
-{
-    Text [ en-US ] = "Print text in blac~k";
-};
-String STR_PRINTOPTUI_PAGES_TEXT
-{
-    Text [ en-US ] = "Pages";
-};
-String STR_PRINTOPTUI_PRINT_BLANK
-{
-    Text [ en-US ] = "Print ~automatically inserted blank pages";
-};
-String STR_PRINTOPTUI_ONLY_PAPER
-{
-    Text [ en-US ] = "~Use only paper tray from printer preferences";
-};
-String STR_PRINTOPTUI_PRINT
-{
-    Text [ en-US ] = "Print";
-};
-String STR_PRINTOPTUI_NONE
-{
-    Text [ en-US ] = "None (document only)";
-};
-String STR_PRINTOPTUI_COMMENTS_ONLY
-{
-    Text [ en-US ] = "Comments only";
-};
-String STR_PRINTOPTUI_PLACE_END
-{
-    Text [ en-US ] = "Place at end of document";
-};
-String STR_PRINTOPTUI_PLACE_PAGE
-{
-    Text [ en-US ] = "Place at end of page";
-};
-String STR_PRINTOPTUI_COMMENTS
-{
-    Text [ en-US ] = "~Comments";
-};
-String STR_PRINTOPTUI_PAGE_SIDES
-{
-    Text [ en-US ] = "Page sides";
-};
-String STR_PRINTOPTUI_ALL_PAGES
-{
-    Text [ en-US ] = "All pages";
-};
-String STR_PRINTOPTUI_BACK_PAGES
-{
-    Text [ en-US ] = "Back sides / left pages";
-};
-String STR_PRINTOPTUI_FONT_PAGES
-{
-    Text [ en-US ] = "Front sides / right pages";
-};
-String STR_PRINTOPTUI_INCLUDE
-{
-    Text [ en-US ] = "Include";
-};
-String STR_PRINTOPTUI_BROCHURE
-{
-    Text [ en-US ] = "Broch~ure";
-};
-String STR_PRINTOPTUI_LEFT_SCRIPT
-{
-    Text [ en-US ] = "Left-to-right script";
-};
-String STR_PRINTOPTUI_RIGHT_SCRIPT
-{
-    Text [ en-US ] = "Right-to-left script";
-};
-String STR_PRINTOPTUI_RANGE_COPIES
-{
-    Text [ en-US ] = "Range and copies";
-};
-String STR_PRINTOPTUI_ALLPAGES
-{
-    Text [ en-US ] = "~All pages";
-};
-String STR_PRINTOPTUI_SOMEPAGES
-{
-    Text [ en-US ] = "Pa~ges";
-};
-String STR_PRINTOPTUI_SELECTION
-{
-    Text [ en-US ] = "~Selection";
-};
-String STR_PRINTOPTUI_PLACE_MARGINS
-{
-    Text [ en-US ] = "Place in margins";
-};
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index a994ee54484d..e22191afa640 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -31,6 +31,8 @@
 #include <view.hxx>
 
 #include "globals.hrc"
+#include "strings.hrc"
+#include "optload.hrc"
 #include "cmdid.h"
 
 #include "optload.hxx"
@@ -43,6 +45,7 @@
 
 #include <svtools/insdlg.hxx>
 #include <svtools/treelistentry.hxx>
+#include <tools/resary.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 
@@ -50,7 +53,6 @@
 #include <unotools/configmgr.hxx>
 #include <docsh.hxx>
 #include <app.hrc>
-#include <config.hrc>
 #include <SwStyleNameMapper.hxx>
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
@@ -62,6 +64,25 @@ using namespace ::com::sun::star;
 
 #include <svl/eitem.hxx>
 
+sal_uInt32 SwFieldUnitTable::Count()
+{
+    return SAL_N_ELEMENTS(STR_ARR_METRIC);
+}
+
+OUString SwFieldUnitTable::GetString(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return SwResId(STR_ARR_METRIC[nPos].first);
+    return OUString();
+}
+
+FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos)
+{
+    if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+        return STR_ARR_METRIC[nPos].second;
+    return FUNIT_NONE;
+}
+
 SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet)
     , m_pWrtShell(nullptr)
@@ -82,11 +103,10 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pShowStandardizedPageCount, "standardizedpageshow");
     get(m_pStandardizedPageSizeNF, "standardpagesize");
 
-    SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
-    for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+    for (sal_uInt32 i = 0; i < SwFieldUnitTable::Count(); ++i)
     {
-        const OUString sMetric = aMetricArr.GetStringByPos( i );
-        FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i );
+        const OUString sMetric = SwFieldUnitTable::GetString(i);
+        FieldUnit eFUnit = SwFieldUnitTable::GetValue(i);
 
         switch ( eFUnit )
         {
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
deleted file mode 100644
index 855acbb809bb..000000000000
--- a/sw/source/ui/config/optload.src
+++ /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 .
- */
-
-#include "config.hrc"
-
-StringArray STR_ARR_METRIC
-{
-    ItemList [ en-US ] =
-    {
-        < "Millimeter" ; FUNIT_MM ; > ;
-        < "Centimeter" ; FUNIT_CM ; > ;
-        < "Meter" ; FUNIT_M ; > ;
-        < "Kilometer" ; FUNIT_KM ; > ;
-        < "Inch" ; FUNIT_INCH ; > ;
-        < "Foot" ; FUNIT_FOOT ; > ;
-        < "Miles" ; FUNIT_MILE ; > ;
-        < "Pica" ; FUNIT_PICA ; > ;
-        < "Point" ; FUNIT_POINT ; > ;
-        < "Char" ; FUNIT_CHAR ; >;
-        < "Line" ; FUNIT_LINE ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index d608139bfee6..bc51b37bd194 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -45,7 +45,7 @@
 #include <crstate.hxx>
 #include <viewopt.hxx>
 #include <globals.hrc>
-#include <config.hrc>
+#include <strings.hrc>
 #include <swwrtshitem.hxx>
 #include <unomid.h>
 
@@ -73,6 +73,8 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 
+#include "optload.hxx"
+
 using namespace ::com::sun::star;
 
 namespace {
@@ -128,11 +130,10 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
         m_pVRulerRightCBox->Hide();
     m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
 
-    SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
-    for ( size_t i = 0; i < aMetricArr.Count(); ++i )
+    for (size_t i = 0; i < SwFieldUnitTable::Count(); ++i)
     {
-        const OUString sMetric = aMetricArr.GetStringByPos( i );
-        FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i );
+        const OUString sMetric = SwFieldUnitTable::GetString(i);
+        FieldUnit eFUnit = SwFieldUnitTable::GetValue(i);
 
         switch ( eFUnit )
         {
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index b5ca4fc4aabc..0fc38dd56497 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -29,7 +29,7 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/builderfactory.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
@@ -42,6 +42,7 @@
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <tools/urlobj.hxx>
 #include <dbui.hrc>
+#include <strings.hrc>
 #include <helpid.h>
 #include <unomid.h>
 
@@ -479,10 +480,10 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
     else
     {
         //database has to be created
-        const ResStringArray& rAddressHeader = rConfig.GetDefaultAddressHeaders();
-        const sal_uInt32 nCount = rAddressHeader.Count();
+        const std::vector<std::pair<OUString, int>>& rAddressHeader = rConfig.GetDefaultAddressHeaders();
+        const sal_uInt32 nCount = rAddressHeader.size();
         for(sal_uInt32 nHeader = 0; nHeader < nCount; ++nHeader)
-            m_pCSVData->aDBColumnHeaders.push_back( rAddressHeader.GetString(nHeader));
+            m_pCSVData->aDBColumnHeaders.push_back(rAddressHeader[nHeader].first);
         std::vector<OUString> aNewData;
         aNewData.insert(aNewData.begin(), nCount, OUString());
         m_pCSVData->aDBData.push_back(aNewData);
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 207da08081b4..1d2ce52cfe64 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -86,6 +86,7 @@
 #include <comphelper/uno3.hxx>
 #include "tabsh.hxx"
 #include "swabstdlg.hxx"
+#include "strings.hrc"
 #include "table.hrc"
 #include <unomid.h>
 #include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
deleted file mode 100644
index 019177e0f337..000000000000
--- a/sw/source/ui/dbui/dbui.src
+++ /dev/null
@@ -1,106 +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 "dbui.hrc"
-#include "helpid.h"
-
-StringArray SA_ADDRESS_HEADER
-{
-    ItemList [en-US]=
-    {
-        < "Title" ;                 MM_PART_TITLE           ;> ;
-        < "First Name" ;            MM_PART_FIRSTNAME       ;> ;
-        < "Last Name" ;             MM_PART_LASTNAME        ;> ;
-        < "Company Name" ;          MM_PART_COMPANY         ;> ;
-        < "Address Line 1" ;        MM_PART_ADDRESS_1       ;> ;
-        < "Address Line 2" ;        MM_PART_ADDRESS_2       ;> ;
-        < "City" ;                  MM_PART_CITY            ;> ;
-        < "State" ;                 MM_PART_REGION          ;> ;
-        < "ZIP" ;                   MM_PART_ZIP             ;> ;
-        < "Country" ;               MM_PART_COUNTRY         ;> ;
-        < "Telephone private" ;     MM_PART_PHONE_PRIVATE   ;> ;
-        < "Telephone business" ;    MM_PART_PHONE_BUSINESS  ;> ;
-        < "E-mail Address" ;        MM_PART_E_MAIL          ;> ;
-        < "Gender";                 MM_PART_GENDER          ;> ;
-    };
-};
-String STR_NOTASSIGNED
-{
-    Text[ en-US ] = " not yet matched ";
-};
-String STR_FILTER_ALL
-{
-    Text [ en-US ] = "All files" ;
-};
-String STR_FILTER_ALL_DATA
-{
-    Text [ en-US ] = "Address lists(*.*)" ;
-};
-String STR_FILTER_SXB
-{
-    Text [ en-US ] = "%PRODUCTNAME Base (*.odb)" ;
-};
-String STR_FILTER_SXC
-{
-    Text [ en-US ] = "%PRODUCTNAME Calc (*.ods;*.sxc)" ;
-};
-String STR_FILTER_SXW
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer (*.odt;*.sxw)" ;
-};
-String STR_FILTER_DBF
-{
-    Text [ en-US ] = "dBase (*.dbf)" ;
-};
-String STR_FILTER_XLS
-{
-    Text [ en-US ] = "Microsoft Excel (*.xls;*.xlsx)" ;
-};
-String STR_FILTER_DOC
-{
-    Text [ en-US ] = "Microsoft Word (*.doc;*.docx)" ;
-};
-String STR_FILTER_TXT
-{
-    Text [ en-US ] = "Plain text (*.txt)" ;
-};
-String STR_FILTER_CSV
-{
-    Text [ en-US ] = "Text Comma Separated (*.csv)" ;
-};
-String STR_FILTER_MDB
-{
-    Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ;
-};
-String STR_FILTER_ACCDB
-{
-    Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
-};
-
-String ST_CONFIGUREMAIL
-{
-    Text[ en-US ] = "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?";
-};
-
-String ST_FILTERNAME
-{
-    Text [ en-US ] = "%PRODUCTNAME Address List (.csv)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index cc6ba7230bf7..84820c20826f 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -26,6 +26,7 @@
 #include <mmconfigitem.hxx>
 #include <swabstdlg.hxx>
 #include <dbui.hrc>
+#include <strings.hrc>
 #include <view.hxx>
 #include <dbmgr.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
deleted file mode 100644
index 20651fd67962..000000000000
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ /dev/null
@@ -1,67 +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 <dbui.hrc>
-
-String ST_STARTING
-{
-    Text [ en-US ] = "Select starting document";
-};
-
-String ST_DOCUMENTTYPE
-{
-    Text [ en-US ] = "Select document type";
-};
-
-String ST_ADDRESSBLOCK
-{
-    Text [ en-US ] = "Insert address block";
-};
-
-String ST_ADDRESSLIST
-{
-    Text [ en-US ] = "Select address list";
-};
-
-String ST_GREETINGSLINE
-{
-    Text [ en-US ] = "Create salutation";
-};
-
-String ST_LAYOUT
-{
-    Text [ en-US ] = "Adjust layout";
-};
-
-String ST_EXCLUDE
-{
-    Text [ en-US ] = "Exclude recipient";
-};
-
-String ST_FINISH
-{
-    Text [ en-US ] = "~Finish";
-};
-
-String ST_MMWTITLE
-{
-    Text [ en-US ] = "Mail Merge Wizard";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 16a57ee05c80..b704f9d8c49f 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -35,7 +35,9 @@
 
 #include <vector>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <dbui.hrc>
+#include "mmaddressblockpage.hrc"
 #include <helpid.h>
 
 using namespace svt;
@@ -518,12 +520,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
         pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) );
         pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT));
         pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT)       );
-        ResStringArray aSalutArr(ResId(RA_SALUTATION, *pSwResMgr));
-        for(sal_uInt32 i = 0; i < aSalutArr.Count(); ++i)
-            m_aSalutations.push_back(aSalutArr.GetString(i));
-        ResStringArray aPunctArr(ResId(RA_PUNCTUATION, *pSwResMgr));
-        for(sal_uInt32 i = 0; i < aPunctArr.Count(); ++i)
-            m_aPunctuations.push_back(aPunctArr.GetString(i));
+        for (size_t i = 0; i < SAL_N_ELEMENTS(RA_SALUTATION); ++i)
+            m_aSalutations.push_back(SwResId(RA_SALUTATION[i]));
+        for (size_t i = 0; i < SAL_N_ELEMENTS(RA_PUNCTUATION); ++i)
+            m_aPunctuations.push_back(SwResId(RA_PUNCTUATION[i]));
         m_pDragED->SetText("            ");
         SetText(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE));
         m_pAddressElementsFT->SetText(SwResId(ST_SALUTATIONELEMENTS));
@@ -548,10 +548,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
         m_pUpIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
     }
 
-    const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
-    for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+    const std::vector<std::pair<OUString, int>>& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
+    for (size_t i = 0; i < rHeaders.size(); ++i)
     {
-        SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders.GetString( i ));
+        SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders[i].first);
         pEntry->SetUserData(reinterpret_cast<void*>((sal_IntPtr)i));
     }
     m_pOK->SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl));
@@ -878,7 +878,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
     long nHBHeight = m_aHeaderHB->CalcWindowSizePixel().Height();
 
     //get the name of the default headers
-    const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+    const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
     //get the actual data
     uno::Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY);
     //get the name of the actual columns
@@ -898,9 +898,9 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
     //fill the controls
     long nControlWidth = aOutputSize.Width() / 3;
     long nControlHeight = -1;
-    for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+    for (size_t i = 0; i < rHeaders.size(); ++i)
     {
-        const OUString rHeader = rHeaders.GetString( i );
+        const OUString rHeader = rHeaders[i].first;
         VclPtr<FixedText> pNewText = VclPtr<FixedText>::Create(m_aWindow.get(), WB_VCENTER);
         pNewText->SetText("<" + rHeader + ">");
         VclPtr<ListBox> pNewLB = VclPtr<ListBox>::Create(m_aWindow.get(), WB_DROPDOWN | WB_VCENTER | WB_TABSTOP);
@@ -967,7 +967,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
         pNewPreview->Show();
         pNewPreview->SetPosPixel(Point(2 * nControlWidth + 6, nMove));
     }
-    m_aVScroll->SetRange(Range(0, rHeaders.Count()));
+    m_aVScroll->SetRange(Range(0, rHeaders.size()));
     m_aVScroll->SetPageSize((aOutputSize.Height() - nHBHeight - m_nLBStartTopPos)/ m_nYOffset);
     m_aVScroll->EnableDrag();
     m_aVScroll->SetVisibleSize(m_aVScroll->GetPageSize());
@@ -1223,7 +1223,7 @@ void SwAssignFieldsDialog::dispose()
 uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments()
 {
     uno::Sequence< OUString > aAssignments(
-            m_rConfigItem.GetDefaultAddressHeaders().Count());
+            m_rConfigItem.GetDefaultAddressHeaders().size());
     OUString* pAssignments = aAssignments.getArray();
     sal_Int32 nIndex = 0;
     for(auto aLBIter = m_pFieldsControl->m_aMatches.begin();
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
deleted file mode 100644
index aa2f3555e811..000000000000
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ /dev/null
@@ -1,113 +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 <dbui.hrc>
-#include <helpid.h>
-
-String ST_TITLE_EDIT
-{
-    Text [ en-US ] = "Edit Address Block";
-};
-
-String ST_TITLE_MALE
-{
-    Text [ en-US ] = "Custom Salutation (Male Recipients)";
-};
-String ST_TITLE_FEMALE
-{
-    Text [ en-US ] = "Custom Salutation (Female Recipients)";
-};
-String  ST_SALUTATIONELEMENTS
-{
-    Text[ en-US ] = "Salutation e~lements" ;
-};
-String ST_INSERTSALUTATIONFIELD
-{
-    Text[ en-US ] = "Add to salutation";
-};
-String ST_REMOVESALUTATIONFIELD
-{
-    Text[ en-US ] = "Remove from salutation";
-};
-String ST_DRAGSALUTATION
-{
-    Text[ en-US ] = "1. ~Drag salutation elements into the box below" ;
-};
-String ST_SALUTATION
-{
-    Text[ en-US ] = "Salutation";
-};
-String ST_PUNCTUATION
-{
-    Text[ en-US ] = "Punctuation Mark";
-};
-String ST_TEXT
-{
-    Text[ en-US ] = "Text";
-};
-StringArray RA_SALUTATION
-{
-    ItemList [en-US]=
-    {
-        < "Dear" ; > ;
-        < "Hello" ; > ;
-        < "Hi" ; > ;
-    };
-};
-StringArray RA_PUNCTUATION
-{
-    ItemList [en-US]=
-    {
-        < "," ; > ;
-        < ":" ; > ;
-        < "!" ; > ;
-        < "(none)" ; > ;
-    };
-};
-
-String ST_SALUTATIONMATCHING
-{
-    Text[ en-US ] = "Assign the fields from your data source to match the salutation elements." ;
-};
-
-String ST_SALUTATIONPREVIEW
-{
-    Text[ en-US ] = "Salutation preview";
-};
-
-String ST_ADDRESSELEMENT
-{
-    Text[ en-US ] = "Address elements" ;
-};
-
-String ST_SALUTATIONELEMENT
-{
-    Text[ en-US ] = "Salutation elements" ;
-};
-
-String ST_MATCHESTO
-{
-    Text[ en-US ] = "Matches to field:" ;
-};
-
-String ST_PREVIEW
-{
-    Text[ en-US ] = "Preview" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 1edd167e825c..a7e7f47fc9f3 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -331,14 +331,14 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
         const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
         bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
 
-        const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+        const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
         Sequence< OUString> aAssignment =
                         rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
         const OUString* pAssignment = aAssignment.getConstArray();
         const OUString sCountryColumn(
             (aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty())
             ? aAssignment[MM_PART_COUNTRY]
-            : rHeaders.GetString(MM_PART_COUNTRY));
+            : rHeaders[MM_PART_COUNTRY].first);
 
         OUString sHideParagraphsExpression;
         SwAddressIterator aIter(aBlocks[0]);
@@ -349,11 +349,11 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
             {
                 OUString sConvertedColumn = aItem.sText;
                 for(sal_uInt32 nColumn = 0;
-                        nColumn < rHeaders.Count() &&
+                        nColumn < rHeaders.size() &&
                         nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
                                                                                     ++nColumn)
                 {
-                    if (rHeaders.GetString(nColumn) == aItem.sText &&
+                    if (rHeaders[nColumn].first == aItem.sText &&
                         !pAssignment[nColumn].isEmpty())
                     {
                         sConvertedColumn = pAssignment[nColumn];
@@ -557,7 +557,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                         aFieldMgr.InsertField( aData );
                     }
                     //now the text has to be inserted
-                    const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+                    const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
                     Sequence< OUString> aAssignment =
                                     rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
                     const OUString* pAssignment = aAssignment.getConstArray();
@@ -569,11 +569,11 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                         {
                             OUString sConvertedColumn = aItem.sText;
                             for(sal_uInt32 nColumn = 0;
-                                    nColumn < rHeaders.Count() &&
+                                    nColumn < rHeaders.size() &&
                                     nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
                                                                                                 ++nColumn)
                             {
-                                if (rHeaders.GetString(nColumn) == aItem.sText &&
+                                if (rHeaders[nColumn].first == aItem.sText &&
                                     !pAssignment[nColumn].isEmpty())
                                 {
                                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 03eaa93efb4b..6903eb6bfba0 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -22,6 +22,7 @@
 #include <mmconfigitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <dbui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <swtypes.hxx>
 
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 70770c5e98f2..ea064a57ef42 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -69,7 +69,7 @@
 #include <helpid.h>
 #include <doc.hxx>
 #include <sfx2/app.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <unomid.h>
 #include <comphelper/string.hxx>
 
@@ -458,8 +458,8 @@ void SwMMResultEmailDialog::FillInEmailSettings()
 
         m_pMailToLB->SelectEntryPos(0);
         // then select the right one - may not be available
-        const ResStringArray& rHeaders = xConfigItem->GetDefaultAddressHeaders();
-        OUString sEMailColumn = rHeaders.GetString( MM_PART_E_MAIL );
+        const std::vector<std::pair<OUString, int>>& rHeaders = xConfigItem->GetDefaultAddressHeaders();
+        OUString sEMailColumn = rHeaders[MM_PART_E_MAIL].first;
         Sequence< OUString> aAssignment = xConfigItem->GetColumnAssignment(xConfigItem->GetCurrentDBData());
         if (aAssignment.getLength() > MM_PART_E_MAIL && !aAssignment[MM_PART_E_MAIL].isEmpty())
             sEMailColumn = aAssignment[MM_PART_E_MAIL];
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 7da94798041f..f0e3f3a7c86e 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -32,6 +32,7 @@
 #include <unomid.h>
 
 #include <dbui.hrc>
+#include <strings.hrc>
 #include <helpid.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src
deleted file mode 100644
index a5c7e403c162..000000000000
--- a/sw/source/ui/dbui/selectdbtabledialog.src
+++ /dev/null
@@ -1,43 +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 <dbui.hrc>
-#include <helpid.h>
-
-String ST_NAME
-{
-    Text [ en-US ] = "Name";
-};
-
-String ST_TYPE
-{
-    Text [ en-US ] = "Type";
-};
-
-String ST_TABLE
-{
-    Text [ en-US ] = "Table";
-};
-
-String ST_QUERY
-{
-    Text [ en-US ] = "Query";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
deleted file mode 100644
index d30bcf8d73fb..000000000000
--- a/sw/source/ui/dialog/dialog.src
+++ /dev/null
@@ -1,30 +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 "dialog.hrc"
-
-String STR_QUERY_SPELL_CONTINUE
-{
-    Text [ en-US ] = "Continue checking at beginning of document?" ;
-};
-String STR_SPELLING_COMPLETED
-{
-    Text [ en-US ] = "The spellcheck is complete." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 0a38fa43b0b9..ebfcae266a42 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -31,6 +31,7 @@
 #include "swevent.hxx"
 #include "docsh.hxx"
 #include "globals.hrc"
+#include "strings.hrc"
 #include "view.hxx"
 #include <sfx2/viewfrm.hxx>
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 0840530fe608..06572ad3df92 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -28,10 +28,8 @@
 #include "dbui.hrc"
 #include "globals.hrc"
 #include "fldui.hrc"
-#include "envelp.hrc"
-#include "dochdl.hrc"
+#include "strings.hrc"
 #include <index.hrc>
-#include <../../uibase/dialog/regionsw.hrc>
 
 #include <wordcountdialog.hxx>
 #include "abstract.hxx"
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index b53ee82b5921..a54748b0c9ef 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -23,7 +23,6 @@
 #include "ascfldlg.hxx"
 #include "break.hxx"
 #include "convert.hxx"
-#include "dialmgr.hxx"
 #include "dbinsdlg.hxx"
 #include "DropDownFieldDialog.hxx"
 #include "fldtdlg.hxx"
@@ -53,8 +52,6 @@ namespace swui
     {
         if ( !pFactory )
             pFactory = new SwAbstractDialogFactory_Impl;
-        if ( !pSwResMgr)
-            SwDialogsResMgr::GetResMgr();
         return pFactory;
     }
 }
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index e04571585bd9..1aa953548264 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -54,8 +54,7 @@
 
 #include <helpid.h>
 #include <cmdid.h>
-#include <../../uibase/dialog/regionsw.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <globals.hrc>
 #include "bitmaps.hlst"
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
deleted file mode 100644
index e2de36634542..000000000000
--- a/sw/source/ui/dochdl/dochdl.src
+++ /dev/null
@@ -1,65 +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 "dochdl.hrc"
-#include "globals.hrc"
-
-String STR_NOGLOS
-{
-    Text [ en-US ] = "AutoText for Shortcut '%1' not found." ;
-};
-
-String STR_NO_TABLE
-{
-    Text [ en-US ] = "A table with no rows or no cells cannot be inserted";
-};
-
-String STR_TABLE_TOO_LARGE
-{
-    Text [ en-US ] = "The table cannot be inserted because it is too large";
-};
-
-String STR_ERR_INSERT_GLOS
-{
-    Text [ en-US ] = "AutoText could not be created." ;
-};
-
-String STR_CLPBRD_FORMAT_ERROR
-{
-    Text [ en-US ] = "Requested clipboard format is not available." ;
-};
-
-String STR_PRIVATETEXT
-{
-    Text [ en-US ] = "%PRODUCTNAME Writer" ;
-};
-String STR_PRIVATEGRAPHIC
-{
-    Text [ en-US ] = "Image [%PRODUCTNAME Writer]" ;
-};
-String STR_PRIVATEOLE
-{
-    Text [ en-US ] = "Object [%PRODUCTNAME Writer]" ;
-};
-String STR_DDEFORMAT
-{
-    Text [ en-US ] = "DDE link" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 2332d2a7e2aa..dd70fbdada59 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -21,7 +21,7 @@
 
 #include "selglos.hxx"
 
-#include "dochdl.hrc"
+#include "strings.hrc"
 #include <vcl/layout.hxx>
 
 SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName)
diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src
deleted file mode 100644
index 39cfd246a52d..000000000000
--- a/sw/source/ui/docvw/access.src
+++ /dev/null
@@ -1,104 +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 "access.hrc"
-
-String STR_ACCESS_DOC_NAME
-{
-    Text [ en-US ] = "Document view";
-};
-String STR_ACCESS_DOC_DESC
-{
-    Text [ en-US ] = "Document view";
-};
-String STR_ACCESS_HEADER_NAME
-{
-    Text [ en-US ] = "Header $(ARG1)";
-};
-String STR_ACCESS_HEADER_DESC
-{
-    Text [ en-US ] = "Header page $(ARG1)";
-};
-String STR_ACCESS_FOOTER_NAME
-{
-    Text [ en-US ] = "Footer $(ARG1)";
-};
-String STR_ACCESS_FOOTER_DESC
-{
-    Text [ en-US ] = "Footer page $(ARG1)";
-};
-String STR_ACCESS_FOOTNOTE_NAME
-{
-    Text [ en-US ] = "Footnote $(ARG1)";
-};
-String STR_ACCESS_FOOTNOTE_DESC
-{
-    Text [ en-US ] = "Footnote $(ARG1)";
-};
-String STR_ACCESS_ENDNOTE_NAME
-{
-    Text [ en-US ] = "Endnote $(ARG1)";
-};
-String STR_ACCESS_ENDNOTE_DESC
-{
-    Text [ en-US ] = "Endnote $(ARG1)";
-};
-String STR_ACCESS_TABLE_DESC
-{
-    Text [ en-US ] = "$(ARG1) on page $(ARG2)";
-};
-String STR_ACCESS_PAGE_NAME
-{
-    Text [ en-US ] = "Page $(ARG1)";
-};
-String STR_ACCESS_PAGE_DESC
-{
-    Text [ en-US ] = "Page: $(ARG1)";
-};
-String STR_ACCESS_ANNOTATION_AUTHOR_NAME
-{
-    Text [ en-US ] = "Author";
-};
-String STR_ACCESS_ANNOTATION_DATE_NAME
-{
-    Text [ en-US ] = "Date";
-};
-String STR_ACCESS_ANNOTATION_BUTTON_NAME
-{
-    Text [ en-US ] = "Actions";
-};
-String STR_ACCESS_ANNOTATION_BUTTON_DESC
-{
-    Text [ en-US ] = "Activate this button to open a list of actions which can be performed on this comment and other comments";
-};
-
-String STR_ACCESS_PREVIEW_DOC_NAME
-{
-    Text [ en-US ] = "Document preview";
-};
-String STR_ACCESS_PREVIEW_DOC_SUFFIX
-{
-    Text [ en-US ] = "(Preview mode)";
-};
-String STR_ACCESS_DOC_WORDPROCESSING
-{
-    Text [ en-US ] = "%PRODUCTNAME Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/annotation.src b/sw/source/ui/docvw/annotation.src
deleted file mode 100644
index c47afa14f364..000000000000
--- a/sw/source/ui/docvw/annotation.src
+++ /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/.
- *
- * 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 "annotation.hrc"
-#include "cmdid.h"
-
-String STR_DELETE_ALL_NOTES
-{
-    Text [ en-US ] = "All Comments" ;
-};
-
-String STR_FORMAT_ALL_NOTES
-{
-    Text [ en-US ] = "All Comments" ;
-};
-
-String STR_DELETE_AUTHOR_NOTES
-{
-    Text [ en-US ] = "Comments by " ;
-};
-
-String STR_NODATE
-{
-    Text [ en-US ] = "(no date)" ;
-};
-
-String STR_NOAUTHOR
-{
-    Text [ en-US ] = "(no author)" ;
-};
-
-String STR_REPLY
-{
-    Text [ en-US ] = "Reply to $1" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src
deleted file mode 100644
index c24421399c75..000000000000
--- a/sw/source/ui/envelp/envelp.src
+++ /dev/null
@@ -1,28 +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 "envelp.hrc"
-#include "globals.hrc"
-
-String STR_SENDER_TOKENS
-{
-    Text [ en-US ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
deleted file mode 100644
index b7123b1f4380..000000000000
--- a/sw/source/ui/envelp/label.src
+++ /dev/null
@@ -1,29 +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 "label.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-
-String STR_CUSTOM
-{
-    Text [ en-US ] = "[User]";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index eee6e2302ddb..804292b1749c 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -34,7 +34,7 @@
 #include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
-#include <../../uibase/envelp/label.hrc>
+#include <strings.hrc>
 #include <envimg.hxx>
 
 void SwLabRec::SetFromItem( const SwLabItem& rItem )
@@ -130,7 +130,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
     // Read user label from writer.cfg
     SwLabItem aItem(static_cast<const SwLabItem&>(rSet.Get( FN_LABEL )));
     std::unique_ptr<SwLabRec> pRec(new SwLabRec);
-    pRec->aMake = pRec->aType = SwResId( STR_CUSTOM );
+    pRec->aMake = pRec->aType = SwResId(STR_CUSTOM_LABEL);
     pRec->SetFromItem( aItem );
 
     bool bDouble = false;
@@ -201,7 +201,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont)
 {
     SwLabRec* pRec = nullptr;
     bool bFound = false;
-    const OUString sCustom(SwResId(STR_CUSTOM));
+    const OUString sCustom(SwResId(STR_CUSTOM_LABEL));
 
     const size_t nCount = Recs().size();
     for (size_t i = 0; i < nCount; ++i)
@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void)
     const size_t nCount   = GetParentSwLabDlg()->Recs().size();
     size_t nLstType = 0;
 
-    const OUString sCustom(SwResId(STR_CUSTOM));
+    const OUString sCustom(SwResId(STR_CUSTOM_LABEL));
     //insert the entries into the sorted list box
     for ( size_t i = 0; i < nCount; ++i )
     {
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index b9ff4bb54257..6474089ffd3b 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -32,8 +32,7 @@
 #include "labfmt.hxx"
 #include "uitool.hxx"
 
-#include "../../uibase/envelp/label.hrc"
-#include "labfmt.hrc"
+#include "strings.hrc"
 #include <unomid.h>
 
 using namespace utl;
@@ -503,7 +502,7 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem)
 {
     if (bModified)
     {
-        rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM);
+        rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM_LABEL);
 
         SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0];
         rItem.m_lHDist  = rRec.lHDist  = static_cast< long >(GETFLDVAL(*m_pHDistField ));
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
deleted file mode 100644
index 2aa9340b41a0..000000000000
--- a/sw/source/ui/envelp/labfmt.hrc
+++ /dev/null
@@ -1,46 +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_SW_SOURCE_UI_ENVELP_LABFMT_HRC
-#define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HRC
-
-#include "envelp.hrc"
-
-// global resources ********************************************************
-
-#define STR_HDIST    (RC_LABFMT_BEGIN +  1)
-#define STR_VDIST    (RC_LABFMT_BEGIN +  2)
-#define STR_WIDTH    (RC_LABFMT_BEGIN +  3)
-#define STR_HEIGHT   (RC_LABFMT_BEGIN +  4)
-#define STR_LEFT     (RC_LABFMT_BEGIN +  5)
-#define STR_UPPER    (RC_LABFMT_BEGIN +  6)
-#define STR_COLS     (RC_LABFMT_BEGIN +  7)
-#define STR_ROWS     (RC_LABFMT_BEGIN +  8)
-
-// overflow check ********************************************************
-
-#define LABFMT_ACT_END STR_ROWS
-
-#if LABFMT_ACT_END > RC_LABFMT_END
-#error Resource overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
deleted file mode 100644
index d72efc34ab7c..000000000000
--- a/sw/source/ui/envelp/labfmt.src
+++ /dev/null
@@ -1,55 +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 "labfmt.hrc"
-#include "helpid.h"
-
-String STR_HDIST
-{
-    Text [ en-US ] = "H. Pitch" ;
-};
-String STR_VDIST
-{
-    Text [ en-US ] = "V. Pitch" ;
-};
-String STR_WIDTH
-{
-    Text [ en-US ] = "Width" ;
-};
-String STR_HEIGHT
-{
-    Text [ en-US ] = "Height" ;
-};
-String STR_LEFT
-{
-    Text [ en-US ] = "Left margin" ;
-};
-String STR_UPPER
-{
-    Text [ en-US ] = "Top margin" ;
-};
-String STR_COLS
-{
-    Text [ en-US ] = "Columns" ;
-};
-String STR_ROWS
-{
-    Text [ en-US ] = "Rows" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index ac5c6b6b128c..3d694efd76f5 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -37,7 +37,6 @@
 #include <swmodule.hxx>
 #include <modcfg.hxx>
 #include <mailmergehelper.hxx>
-#include <envelp.hrc>
 #include <mailmrge.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index c72019ece137..3f57f26562d5 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -40,7 +40,7 @@
 
 #include <fldui.hrc>
 #include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 
 #include <unomid.h>
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 0295644857f3..8e587a072ada 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -27,6 +27,7 @@
 #include <helpid.h>
 #include <swtypes.hxx>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <fldbas.hxx>
 #include <docufld.hxx>
 #include <wrtsh.hxx>
@@ -160,7 +161,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
 
                     if( rProperties.getLength() )
                     {
-                        pInfo = m_pTypeTLB->InsertEntry( SwResId( STR_CUSTOM ) );
+                        pInfo = m_pTypeTLB->InsertEntry(SwResId(STR_CUSTOM_FIELD));
                         pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
 
                         for (sal_Int32 n=0; n < rProperties.getLength(); n++)
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 35c7df610a71..282103b90e12 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -21,6 +21,7 @@
 #include <flddat.hxx>
 #include <docufld.hxx>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <chpfld.hxx>
 #include <fldui.hrc>
 #include <flddok.hxx>
@@ -467,27 +468,27 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
     const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos));
     FillFormatLB(nTypeId);
 
-    sal_uInt32 nTextRes = 0;
+    const char* pTextRes = nullptr;
     switch (nTypeId)
     {
     case TYP_CHAPTERFLD:
-        nTextRes = STR_LEVEL;
+        pTextRes = STR_LEVEL;
         break;
 
     case TYP_PREVPAGEFLD:
     case TYP_NEXTPAGEFLD:
-        nTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
+        pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
                                         m_pFormatLB->GetSelectEntryPos() ))
                         ? STR_VALUE : STR_OFFSET;
         break;
 
     case TYP_PAGENUMBERFLD:
-        nTextRes = STR_OFFSET;
+        pTextRes = STR_OFFSET;
         break;
     }
 
-    if( nTextRes )
-        m_pValueFT->SetText( SwResId( nTextRes ));
+    if (pTextRes)
+        m_pValueFT->SetText(SwResId(pTextRes));
 }
 
 sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 5b5a1a3b280f..10843305d963 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -23,6 +23,7 @@
 #include <docsh.hxx>
 #include <swtypes.hxx>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <fldbas.hxx>
 #include <docufld.hxx>
 #include <view.hxx>
@@ -210,6 +211,15 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
     }
 }
 
+static const char* FMT_MARK_ARY[] =
+{
+    FMT_MARK_TEXT,
+    FMT_MARK_TABLE,
+    FMT_MARK_FRAME,
+    FMT_MARK_GRAFIC,
+    FMT_MARK_OLE
+};
+
 IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
 {
     // save old ListBoxPos
@@ -245,7 +255,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
         if (nSize)
         {
             if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD)
-                m_pFormatLB->SelectEntry(SwResId(FMT_MARK_BEGIN + GetCurField()->GetFormat()));
+                m_pFormatLB->SelectEntry(SwResId(FMT_MARK_ARY[GetCurField()->GetFormat()]));
 
             if (!m_pFormatLB->GetSelectEntryCount())
                 m_pFormatLB->SelectEntryPos(0);
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index bf4e837362ad..9813ad78930f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -28,6 +28,7 @@
 
 #include <fldui.hrc>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <SwNodeNum.hxx>
 #include <IDocumentMarkAccess.hxx>
 #include <ndtxt.hxx>
@@ -739,6 +740,36 @@ bool SwFieldRefPage::MatchSubstring( const OUString& rListString, const OUString
     return aListString.indexOf(aSubstr) >= 0;
 }
 
+enum FMT_REF_IDX
+{
+    FMT_REF_PAGE_IDX                = 0,
+    FMT_REF_CHAPTER_IDX             = 1,
+    FMT_REF_TEXT_IDX                = 2,
+    FMT_REF_UPDOWN_IDX              = 3,
+    FMT_REF_PAGE_PGDSC_IDX          = 4,
+    FMT_REF_ONLYNUMBER_IDX          = 5,
+    FMT_REF_ONLYCAPTION_IDX         = 6,
+    FMT_REF_ONLYSEQNO_IDX           = 7,
+    FMT_REF_NUMBER_IDX              = 8,
+    FMT_REF_NUMBER_NO_CONTEXT_IDX   = 9,
+    FMT_REF_NUMBER_FULL_CONTEXT_IDX = 10
+};
+
+static const char* FMT_REF_ARY[] =
+{
+    FMT_REF_PAGE,
+    FMT_REF_CHAPTER,
+    FMT_REF_TEXT,
+    FMT_REF_UPDOWN,
+    FMT_REF_PAGE_PGDSC,
+    FMT_REF_ONLYNUMBER,
+    FMT_REF_ONLYCAPTION,
+    FMT_REF_ONLYSEQNO,
+    FMT_REF_NUMBER,
+    FMT_REF_NUMBER_NO_CONTEXT,
+    FMT_REF_NUMBER_FULL_CONTEXT
+};
+
 sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 {
     OUString sOldSel;
@@ -765,7 +796,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
         case REFFLDFLAG_BOOKMARK:
         case REFFLDFLAG_FOOTNOTE:
         case REFFLDFLAG_ENDNOTE:
-            nSize = FMT_REF_PAGE_PGDSC - FMT_REF_BEGIN + 1;
+            nSize = FMT_REF_PAGE_PGDSC_IDX + 1;
             break;
 
         default:
@@ -773,7 +804,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 
             if ( REFFLDFLAG & nTypeId )
             {
-                nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1;
+                nSize = FMT_REF_ONLYSEQNO_IDX + 1;
             }
             else
             {
@@ -793,13 +824,13 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
     // #i83479#
     if ( bAddCrossRefFormats )
     {
-        sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN;
+        sal_uInt16 nFormat = FMT_REF_NUMBER_IDX;
         sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
         m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
-        nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN;
+        nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX;
         nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
         m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
-        nFormat = FMT_REF_NUMBER_FULL_CONTEXT - FMT_REF_BEGIN;
+        nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX;
         nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
         m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
         nSize += 3;
@@ -811,7 +842,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
         if (!IsFieldEdit())
             m_pFormatLB->SelectEntry(sOldSel);
         else
-            m_pFormatLB->SelectEntry(SwResId(FMT_REF_BEGIN + GetCurField()->GetFormat()));
+            m_pFormatLB->SelectEntry(SwResId(FMT_REF_ARY[GetCurField()->GetFormat()]));
 
         if (!m_pFormatLB->GetSelectEntryCount())
         {
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
deleted file mode 100644
index a3642cd4f9e7..000000000000
--- a/sw/source/ui/fldui/fldui.src
+++ /dev/null
@@ -1,609 +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 "index.hrc"
-#include "fldui.hrc"
-#include "helpid.h"
-
-/*--------------------------------------------------------------------
-    Description: strings for the types
- --------------------------------------------------------------------*/
-
- // range document
-
-String STR_DATEFLD
-{
-    Text [ en-US ] = "Date" ;
-};
-String STR_TIMEFLD
-{
-    Text [ en-US ] = "Time" ;
-};
-String STR_FILENAMEFLD
-{
-    Text [ en-US ] = "File name" ;
-};
-String STR_DBNAMEFLD
-{
-    Text [ en-US ] = "Database Name" ;
-};
-String STR_CHAPTERFLD
-{
-    Text [ en-US ] = "Chapter" ;
-};
-String STR_PAGENUMBERFLD
-{
-    Text [ en-US ] = "Page numbers" ;
-};
-String STR_DOCSTATFLD
-{
-    Text [ en-US ] = "Statistics" ;
-};
-String STR_AUTHORFLD
-{
-    Text [ en-US ] = "Author" ;
-};
-String STR_TEMPLNAMEFLD
-{
-    Text [ en-US ] = "Templates" ;
-};
-String STR_EXTUSERFLD
-{
-    Text [ en-US ] = "Sender" ;
-};
-
- // range functions
-
-String STR_SETFLD
-{
-    Text [ en-US ] = "Set variable" ;
-};
-String STR_GETFLD
-{
-    Text [ en-US ] = "Show variable" ;
-};
-String STR_FORMELFLD
-{
-    Text [ en-US ] = "Insert Formula" ;
-};
-String STR_INPUTFLD
-{
-    Text [ en-US ] = "Input field" ;
-};
-String STR_SETINPUTFLD
-{
-    Text [ en-US ] = "Input field (variable)" ;
-};
-String STR_USRINPUTFLD
-{
-    Text [ en-US ] = "Input field (user)" ;
-};
-String STR_CONDTXTFLD
-{
-    Text [ en-US ] = "Conditional text" ;
-};
-String STR_DDEFLD
-{
-    Text [ en-US ] = "DDE field" ;
-};
-String STR_MACROFLD
-{
-    Text [ en-US ] = "Execute macro" ;
-};
-String STR_SEQFLD
-{
-    Text [ en-US ] = "Number range" ;
-};
-String STR_SETREFPAGEFLD
-{
-    Text [ en-US ] = "Set page variable" ;
-};
-String STR_GETREFPAGEFLD
-{
-    Text [ en-US ] = "Show page variable" ;
-};
-String STR_INTERNETFLD
-{
-    Text [ en-US ] = "Load URL" ;
-};
-String STR_JUMPEDITFLD
-{
-    Text [ en-US ] = "Placeholder" ;
-};
-String STR_COMBINED_CHARS
-{
-    Text [ en-US ] = "Combine characters";
-};
-String STR_DROPDOWN
-{
-    Text [ en-US ] = "Input list" ;
-};
-
- // range references
-
-String STR_SETREFFLD
-{
-    Text [ en-US ] = "Set Reference" ;
-};
-String STR_GETREFFLD
-{
-    Text [ en-US ] = "Insert Reference" ;
-};
-
- //  range database
-
-String STR_DBFLD
-{
-    Text [ en-US ] = "Mail merge fields" ;
-};
-String STR_DBNEXTSETFLD
-{
-    Text [ en-US ] = "Next record" ;
-};
-String STR_DBNUMSETFLD
-{
-    Text [ en-US ] = "Any record" ;
-};
-String STR_DBSETNUMBERFLD
-{
-    Text [ en-US ] = "Record number" ;
-};
-String STR_PREVPAGEFLD
-{
-    Text [ en-US ] = "Previous page" ;
-};
-String STR_NEXTPAGEFLD
-{
-    Text [ en-US ] = "Next page" ;
-};
-String STR_HIDDENTXTFLD
-{
-    Text [ en-US ] = "Hidden text" ;
-};
-
- //  range user fields
-
-String STR_USERFLD
-{
-    Text [ en-US ] = "User Field" ;
-};
-String STR_POSTITFLD
-{
-    Text [ en-US ] = "Note" ;
-};
-String STR_SCRIPTFLD
-{
-    Text [ en-US ] = "Script" ;
-};
-String STR_AUTHORITY
-{
-    Text [ en-US ] = "Bibliography entry";
-};
-String STR_HIDDENPARAFLD
-{
-    Text [ en-US ] = "Hidden Paragraph" ;
-};
-
- // range DocumentInfo
-
-String STR_DOCINFOFLD
-{
-    Text [ en-US ] = "DocInformation" ;
-};
-/*--------------------------------------------------------------------
-    Description: SubCmd-Strings
- --------------------------------------------------------------------*/
-String FLD_DATE_STD
-{
-    Text [ en-US ] = "Date";
-};
-String FLD_DATE_FIX
-{
-    Text [ en-US ] = "Date (fixed)" ;
-};
-String FLD_TIME_STD
-{
-    Text [ en-US ] = "Time";
-};
-String FLD_TIME_FIX
-{
-    Text [ en-US ] = "Time (fixed)" ;
-};
-
- //  SubCmd Statistic
-
-String FLD_STAT_TABLE
-{
-    Text [ en-US ] = "Tables" ;
-};
-String FLD_STAT_CHAR
-{
-    Text [ en-US ] = "Characters" ;
-};
-String FLD_STAT_WORD
-{
-    Text [ en-US ] = "Words" ;
-};
-String FLD_STAT_PARA
-{
-    Text [ en-US ] = "Paragraphs" ;
-};
-String FLD_STAT_GRF
-{
-    Text [ en-US ] = "Image" ;
-};
-String FLD_STAT_OBJ
-{
-    Text [ en-US ] = "Objects" ;
-};
-String FLD_STAT_PAGE
-{
-    Text [ en-US ] = "Pages" ;
-};
- //  SubCmd DDETypes
-
-String FMT_DDE_HOT
-{
-    Text [ en-US ] = "DDE automatic" ;
-};
-String FMT_DDE_NORMAL
-{
-    Text [ en-US ] = "DDE manual" ;
-};
-String FLD_INPUT_TEXT
-{
-    Text = "[Text]" ;
-};
-/*--------------------------------------------------------------------
-    Description: SubType Extuser
- --------------------------------------------------------------------*/
-String FLD_EU_FIRMA
-{
-    Text [ en-US ] = "Company" ;
-};
-String FLD_EU_VORNAME
-{
-    Text [ en-US ] = "First Name" ;
-};
-String FLD_EU_NAME
-{
-    Text [ en-US ] = "Last Name" ;
-};
-String FLD_EU_ABK
-{
-    Text [ en-US ] = "Initials" ;
-};
-String FLD_EU_STRASSE
-{
-    Text [ en-US ] = "Street" ;
-};
-String FLD_EU_LAND
-{
-    Text [ en-US ] = "Country" ;
-};
-String FLD_EU_PLZ
-{
-    Text [ en-US ] = "Zip code" ;
-};
-String FLD_EU_ORT
-{
-    Text [ en-US ] = "City" ;
-};
-String FLD_EU_TITEL
-{
-    Text [ en-US ] = "Title" ;
-};
-String FLD_EU_POS
-{
-    Text [ en-US ] = "Position" ;
-};
-String FLD_EU_TELPRIV
-{
-    Text [ en-US ] = "Tel. (Home)" ;
-};
-String FLD_EU_TELFIRMA
-{
-    Text [ en-US ] = "Tel. (Work)" ;
-};
-String FLD_EU_FAX
-{
-    Text [ en-US ] = "FAX" ;
-};
-String FLD_EU_EMAIL
-{
-    Text [ en-US ] = "E-mail" ;
-};
-String FLD_EU_STATE
-{
-    Text [ en-US ] = "State" ;
-};
-String FLD_PAGEREF_OFF
-{
-    Text [ en-US ] = "off" ;
-};
-String FLD_PAGEREF_ON
-{
-    Text [ en-US ] = "on" ;
-};
-/*--------------------------------------------------------------------
-    Description: path name
- --------------------------------------------------------------------*/
- // Formate FileName
-String FMT_FF_NAME
-{
-    Text [ en-US ] = "File name" ;
-};
-String FMT_FF_NAME_NOEXT
-{
-    Text [ en-US ] = "File name without extension" ;
-};
-String FMT_FF_PATHNAME
-{
-    Text [ en-US ] = "Path/File name" ;
-};
-String FMT_FF_PATH
-{
-    Text [ en-US ] = "Path" ;
-};
-String FMT_FF_UI_NAME
-{
-    Text [ en-US ] = "Style" ;
-};
-String FMT_FF_UI_RANGE
-{
-    Text [ en-US ] = "Category" ;
-};
-/*--------------------------------------------------------------------
-    Description: format chapter
- --------------------------------------------------------------------*/
-String FMT_CHAPTER_NAME
-{
-    Text [ en-US ] = "Chapter name" ;
-};
-String FMT_CHAPTER_NO
-{
-    Text [ en-US ] = "Chapter number" ;
-};
-String FMT_CHAPTER_NO_NOSEPARATOR
-{
-    Text [ en-US ] = "Chapter number without separator" ;
-};
-String FMT_CHAPTER_NAMENO
-{
-    Text [ en-US ] = "Chapter number and name" ;
-};
-/*--------------------------------------------------------------------
-    Description: formats
- --------------------------------------------------------------------*/
-String FMT_NUM_ABC
-{
-    Text = "A B C" ;
-};
-String FMT_NUM_SABC
-{
-    Text = "a b c" ;
-};
-String FMT_NUM_ABC_N
-{
-    Text = "A .. AA .. AAA" ;
-};
-String FMT_NUM_SABC_N
-{
-    Text = "a .. aa .. aaa" ;
-};
-String FMT_NUM_ROMAN
-{
-    Text [ en-US ] = "Roman (I II III)" ;
-};
-String FMT_NUM_SROMAN
-{
-    Text [ en-US ] = "Roman (i ii iii)" ;
-};
-String FMT_NUM_ARABIC
-{
-    Text [ en-US ] = "Arabic (1 2 3)" ;
-};
-String FMT_NUM_PAGEDESC
-{
-    Text [ en-US ] = "As Page Style" ;
-};
-String FMT_NUM_PAGESPECIAL
-{
-    Text [ en-US ] = "Text" ;
-};
-/*--------------------------------------------------------------------
-    Description: Author
- --------------------------------------------------------------------*/
-String FMT_AUTHOR_NAME
-{
-    Text [ en-US ] = "Name" ;
-};
-String FMT_AUTHOR_SCUT
-{
-    Text [ en-US ] = "Initials" ;
-};
-/*--------------------------------------------------------------------
-    Description:   set variable
- --------------------------------------------------------------------*/
-String FMT_SETVAR_SYS
-{
-    Text [ en-US ] = "System" ;
-};
-String FMT_SETVAR_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String FMT_GETVAR_NAME
-{
-    Text [ en-US ] = "Name" ;
-};
-String FMT_GETVAR_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String FMT_USERVAR_CMD
-{
-    Text [ en-US ] = "Formula" ;
-};
-String FMT_USERVAR_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String FMT_DBFLD_DB
-{
-    Text [ en-US ] = "Database" ;
-};
-String FMT_DBFLD_SYS
-{
-    Text [ en-US ] = "System" ;
-};
-/*--------------------------------------------------------------------
-    Description: storage fields
- --------------------------------------------------------------------*/
-String FMT_REG_AUTHOR
-{
-    Text [ en-US ] = "Author" ;
-};
-String FMT_REG_TIME
-{
-    Text [ en-US ] = "Time" ;
-};
-String FMT_REG_DATE
-{
-    Text [ en-US ] = "Date" ;
-};
-/*--------------------------------------------------------------------
-    Description: formats references
- --------------------------------------------------------------------*/
-String FMT_REF_TEXT
-{
-    Text [ en-US ] = "Reference" ;
-};
-String FMT_REF_PAGE
-{
-    Text [ en-US ] = "Page" ;
-};
-String FMT_REF_CHAPTER
-{
-    Text [ en-US ] = "Chapter" ;
-};
-String FMT_REF_UPDOWN
-{
-    Text [ en-US ] = "Above/Below" ;
-};
-String FMT_REF_PAGE_PGDSC
-{
-    Text [ en-US ] = "As Page Style" ;
-};
-String FMT_REF_ONLYNUMBER
-{
-    Text [ en-US ] = "Category and Number" ;
-};
-String FMT_REF_ONLYCAPTION
-{
-    Text [ en-US ] = "Caption Text" ;
-};
-String FMT_REF_ONLYSEQNO
-{
-    Text [ en-US ] = "Numbering";
-};
-String FMT_REF_NUMBER
-{
-    Text [ en-US ] = "Number";
-};
-String FMT_REF_NUMBER_NO_CONTEXT
-{
-    Text [ en-US ] = "Number (no context)";
-};
-String FMT_REF_NUMBER_FULL_CONTEXT
-{
-    Text [ en-US ] = "Number (full context)";
-};
-/*--------------------------------------------------------------------
-    Description: placeholder
- --------------------------------------------------------------------*/
-String FMT_MARK_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String FMT_MARK_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-String FMT_MARK_FRAME
-{
-    Text [ en-US ] = "Frame" ;
-};
-String FMT_MARK_GRAFIC
-{
-    Text [ en-US ] = "Image" ;
-};
-String FMT_MARK_OLE
-{
-    Text [ en-US ] = "Object" ;
-};
-/*--------------------------------------------------------------------
-    Description:   ExchangeStrings for Edit/NameFT
- --------------------------------------------------------------------*/
-String STR_COND
-{
-    Text [ en-US ] = "~Condition" ;
-};
-String STR_TEXT
-{
-    Text [ en-US ] = "Then, Else" ;
-};
-String STR_DDE_CMD
-{
-    Text [ en-US ] = "DDE Statement" ;
-};
-String STR_INSTEXT
-{
-    Text [ en-US ] = "Hidden t~ext" ;
-};
-String STR_MACNAME
-{
-    Text [ en-US ] = "~Macro name" ;
-};
-String STR_PROMPT
-{
-    Text [ en-US ] = "~Reference" ;
-};
-String STR_COMBCHRS_FT
-{
-    Text [ en-US ] = "Ch~aracters";
-};
-String STR_OFFSET
-{
-    Text [ en-US ] = "O~ffset" ;
-};
-String STR_VALUE
-{
-    Text [ en-US ] = "Value" ;
-};
-String STR_FORMULA
-{
-    Text [ en-US ] = "Formula" ;
-};
-String STR_CUSTOM
-{
-    Text [ en-US ] = "Custom" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index a421c24d6e93..f6fe754e0e65 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -34,6 +34,7 @@
 #include <calc.hxx>
 #include <svl/zformat.hxx>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <fldui.hrc>
 
 #define USER_DATA_VERSION_1 "1"
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 6f0076ded866..c71cdbcb13a7 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -35,6 +35,7 @@
 
 #include <fldui.hrc>
 #include <globals.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 84431a85e5e6..7d6c16e23b02 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -24,6 +24,7 @@
 #include "hintids.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 #include <sfx2/htmlmode.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
@@ -58,12 +59,12 @@
 #include "prcntfld.hxx"
 #include "paratr.hxx"
 #include "frmui.hrc"
-#include "poolfmt.hrc"
+#include "strings.hrc"
 #include <section.hxx>
 #include <docary.hxx>
 #include <pagedesc.hxx>
 
-#include "access.hrc"
+#include "strings.hrc"
 
 //to match associated data in ColumnPage.ui
 #define LISTBOX_SELECTION       0
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 424cdf7d5c58..4a80bfb85f5b 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,6 +44,7 @@
 #include "initui.hxx"
 #include <frmui.hrc>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <SwStyleNameMapper.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 19d81ef64a44..1a7906ce2b4b 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -35,6 +35,7 @@
 
 #include <frmui.hrc>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <svx/svxdlg.hxx>
@@ -78,7 +79,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame*       pViewFrame,
 
     if(pStr)
     {
-        SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")");
+        SetText(GetText() + SwResId(STR_FRMUI_COLL_HEADER) + *pStr + ")");
     }
 
     m_nStdId = AddTabPage("type",  SwFramePage::Create, nullptr);
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index b6ffbe1dd6ab..4c914dd67a63 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -62,6 +62,7 @@
 #include <sal/macros.h>
 
 #include <frmui.hrc>
+#include <strings.hrc>
 #include <sfx2/filedlghelper.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
@@ -814,7 +815,7 @@ void SwFramePage::setOptimalFrameWidth()
     for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
         aI != aEnd; ++aI)
     {
-        m_pHorizontalDLB->InsertEntry(m_aFramePosString.GetString(*aI));
+        m_pHorizontalDLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
     }
 
     Size aBiggest(m_pHorizontalDLB->GetOptimalSize());
@@ -855,7 +856,7 @@ void SwFramePage::setOptimalRelWidth()
     for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
         aI != aEnd; ++aI)
     {
-        m_pHoriRelationLB->InsertEntry(m_aFramePosString.GetString(*aI));
+        m_pHoriRelationLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
     }
 
     Size aBiggest(m_pHoriRelationLB->GetOptimalSize());
@@ -956,9 +957,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
         else
         {
             if ( m_bNew )
-                SetText( SwResId(STR_OLE_INSERT));
+                SetText(SwResId(STR_FRMUI_OLE_INSERT));
             else
-                SetText( SwResId(STR_OLE_EDIT));
+                SetText(SwResId(STR_FRMUI_OLE_EDIT));
         }
     }
     else
@@ -974,8 +975,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
 
     const SwFormatFrameSize& rFrameSize = static_cast<const SwFormatFrameSize&>(rSet->Get(RES_FRM_SIZE));
 
-    m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
-    m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+    m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+    m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
     if (rFrameSize.GetWidthPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetWidthPercent() != 0)
     {
         //calculate the rerference value from the with and relative width values
@@ -987,8 +988,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
     else
         m_pRelWidthRelationLB->Disable();
 
-    m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
-    m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+    m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+    m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
     if (rFrameSize.GetHeightPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetHeightPercent() != 0)
     {
         //calculate the rerference value from the with and relative width values
@@ -1425,7 +1426,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap,
                                                      m_bIsVerticalFrame,
                                                      m_bIsVerticalL2R,
                                                      m_bIsInRightToLeft);
-            OUString sEntry(m_aFramePosString.GetString(eStrId));
+            OUString sEntry(SvxSwFramePosString::GetString(eStrId));
             if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
             {
                 // don't insert entries when frames are character bound
@@ -1490,7 +1491,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
                                                                 m_bIsVerticalFrame,
                                                                 m_bIsVerticalL2R,
                                                                 m_bIsInRightToLeft);
-                            const OUString sEntry = m_aFramePosString.GetString(sStrId1);
+                            const OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
                             sal_Int32 nPos = _rLB.InsertEntry(sEntry);
                             _rLB.SetEntryData(nPos, &rCharMap);
                             if (_pMap[nMapPos].nAlign == _nAlign)
@@ -1553,7 +1554,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
                                                                 m_bIsVerticalFrame,
                                                                 m_bIsVerticalL2R,
                                                                 m_bIsInRightToLeft);
-                            const OUString sEntry = m_aFramePosString.GetString(eStrId1);
+                            const OUString sEntry = SvxSwFramePosString::GetString(eStrId1);
                             sal_Int32 nPos = _rLB.InsertEntry(sEntry);
                             _rLB.SetEntryData(nPos, &rMap);
                             if (sSelEntry.isEmpty() && rMap.nRelation == _nRel)
@@ -1690,7 +1691,7 @@ sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox &rAlignLB )
             {
                 SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
 
-                OUString sEntry = m_aFramePosString.GetString(eResId);
+                OUString sEntry = SvxSwFramePosString::GetString(eResId);
                 sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry );
 
                 if (sEntry == sSelEntry)
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
deleted file mode 100644
index 1943fd85262a..000000000000
--- a/sw/source/ui/frmdlg/frmui.src
+++ /dev/null
@@ -1,69 +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 "frmui.hrc"
-
-/*-----------------------------------------------------------------------
-    Description: character alignment for frmsh.cxx - context menu
- -----------------------------------------------------------------------*/
-String STR_TOP_BASE
-{
-    Text [ en-US ] = "Base line at ~top" ;
-};
-String STR_BOTTOM_BASE
-{
-    Text [ en-US ] = "~Base line at bottom" ;
-};
-String STR_CENTER_BASE
-{
-    Text [ en-US ] = "Base line ~centered" ;
-};
-String STR_LINE_TOP
-{
-    Text [ en-US ] = "Top of line" ;
-};
-String STR_LINE_BOTTOM
-{
-    Text [ en-US ] = "Bottom of line" ;
-};
-String STR_LINE_CENTER
-{
-    Text [ en-US ] = "Center of line" ;
-};
-String STR_OLE_INSERT
-{
-    Text [ en-US ] = "Insert object" ;
-};
-String STR_OLE_EDIT
-{
-    Text [ en-US ] = "Edit object" ;
-};
-String STR_COLL_HEADER
-{
-    Text [ en-US ] = " (Template: " ;
-};
-String STR_FRMUI_BORDER
-{
-    Text [ en-US ] = "Borders" ;
-};
-String STR_FRMUI_PATTERN
-{
-    Text [ en-US ] = "Background" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index ca2e467ff638..d7be56794271 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -22,6 +22,7 @@
 #include "swtypes.hxx"
 #include "pattern.hxx"
 #include "frmui.hrc"
+#include "strings.hrc"
 
 SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index f0e95a46cd28..4e34b1b940ab 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -28,6 +28,7 @@
 #include "swtypes.hxx"
 #include "uiborder.hxx"
 #include "frmui.hrc"
+#include "strings.hrc"
 
 SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) :
     SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src
deleted file mode 100644
index 73039f72507d..000000000000
--- a/sw/source/ui/globdoc/globdoc.src
+++ /dev/null
@@ -1,31 +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 "globdoc.hrc"
-
-String STR_HUMAN_SWGLOBDOC_NAME
-{
-    Text [ en-US ] = "Master Document" ;
-};
-String STR_WRITER_GLOBALDOC_FULLTYPE
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Master Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 205be4835b8e..8b0ed87d09c2 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
 #include <com/sun/star/text/XTextSectionsSupplier.hpp>
 #include <com/sun/star/style/BreakType.hpp>
@@ -45,7 +45,7 @@
 #include <swmodule.hxx>
 
 #include <cmdid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <index.hrc>
 #include <globals.hrc>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e1ff6605bb51..19490c9551db 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -20,7 +20,7 @@
 #include <config_folders.h>
 
 #include <comphelper/string.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/help.hxx>
 #include <vcl/builderfactory.hxx>
@@ -53,7 +53,7 @@
 #include <cnttab.hxx>
 #include <swuicnttab.hxx>
 #include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <uitool.hxx>
 #include <fmtcol.hxx>
 #include <fldbas.hxx>
@@ -66,9 +66,10 @@
 
 #include <cmdid.h>
 #include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <index.hrc>
 #include <globals.hrc>
+#include <cnttab.hrc>
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <toxwrap.hxx>
@@ -779,7 +780,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void)
 SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
     : SfxTabPage(pParent, "TocIndexPage",
         "modules/swriter/ui/tocindexpage.ui", &rAttrSet)
-    , aFromNames(ResId(RES_SRCTYPES, *pSwResMgr))
     , pIndexRes(nullptr)
     , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
     , m_bWaitingInitialSettings(true)
@@ -848,11 +848,10 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
 
     sAddStyleContent = m_pAddStylesCB->GetText();
 
-    ResStringArray& rNames = aFromNames.GetNames();
-    for(sal_uInt32 i = 0; i < rNames.Count(); i++)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RES_SRCTYPES); i++)
     {
-        m_pFromObjCLB->InsertEntry(rNames.GetString(i));
-        m_pFromObjCLB->SetEntryData( i, reinterpret_cast<void*>(rNames.GetValue(i)) );
+        m_pFromObjCLB->InsertEntry(SwResId(RES_SRCTYPES[i].first));
+        m_pFromObjCLB->SetEntryData(i, reinterpret_cast<void*>(RES_SRCTYPES[i].second));
     }
 
     SetExchangeSupport();
@@ -1790,6 +1789,44 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
         SvTreeListBox::RequestHelp(rHEvt);
 }
 
+namespace
+{
+    const char* STR_AUTH_FIELD_ARY[] =
+    {
+        STR_AUTH_FIELD_IDENTIFIER,
+        STR_AUTH_FIELD_AUTHORITY_TYPE,
+        STR_AUTH_FIELD_ADDRESS,
+        STR_AUTH_FIELD_ANNOTE,
+        STR_AUTH_FIELD_AUTHOR,
+        STR_AUTH_FIELD_BOOKTITLE,
+        STR_AUTH_FIELD_CHAPTER,
+        STR_AUTH_FIELD_EDITION,
+        STR_AUTH_FIELD_EDITOR,
+        STR_AUTH_FIELD_HOWPUBLISHED,
+        STR_AUTH_FIELD_INSTITUTION,
+        STR_AUTH_FIELD_JOURNAL,
+        STR_AUTH_FIELD_MONTH,
+        STR_AUTH_FIELD_NOTE,
+        STR_AUTH_FIELD_NUMBER,
+        STR_AUTH_FIELD_ORGANIZATIONS,
+        STR_AUTH_FIELD_PAGES,
+        STR_AUTH_FIELD_PUBLISHER,
+        STR_AUTH_FIELD_SCHOOL,
+        STR_AUTH_FIELD_SERIES,
+        STR_AUTH_FIELD_TITLE,
+        STR_AUTH_FIELD_TYPE,
+        STR_AUTH_FIELD_VOLUME,
+        STR_AUTH_FIELD_YEAR,
+        STR_AUTH_FIELD_URL,
+        STR_AUTH_FIELD_CUSTOM1,
+        STR_AUTH_FIELD_CUSTOM2,
+        STR_AUTH_FIELD_CUSTOM3,
+        STR_AUTH_FIELD_CUSTOM4,
+        STR_AUTH_FIELD_CUSTOM5,
+        STR_AUTH_FIELD_ISBN
+    };
+}
+
 SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
     : SfxTabPage(pParent, "TocEntriesPage",
         "modules/swriter/ui/tocentriespage.ui", &rAttrSet)
@@ -1919,7 +1956,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt
     //fill the types in
     for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
     {
-        sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i));
+        sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i]));
         m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast< void * >(sal::static_int_cast< sal_uIntPtr >(i)));
     }
     sal_Int32 nPos = m_pFirstKeyLB->InsertEntry(sNoCharSortKey);
@@ -2255,7 +2292,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken)
 {
     //fill it into the ListBox
     sal_uInt32 nData = rToken.nAuthorityField;
-    sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + nData));
+    sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[nData]));
     m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData));
 }
 
@@ -2380,7 +2417,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void)
         m_pAuthFieldsLB->Clear();
         for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++)
         {
-            sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i));
+            sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i]));
             m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i));
         }
 
@@ -2675,6 +2712,34 @@ OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
     return sRet;
 }
 
+static const char* STR_TOKEN_ARY[] =
+{
+    STR_TOKEN_ENTRY_NO,
+    STR_TOKEN_ENTRY,    //mapped from original STR_TOKEN_ENTRY_TEXT,
+    STR_TOKEN_ENTRY,
+    STR_TOKEN_TAB_STOP,
+    nullptr,
+    STR_TOKEN_PAGE_NUMS,
+    STR_TOKEN_CHAPTER_INFO,
+    STR_TOKEN_LINK_START,
+    STR_TOKEN_LINK_END,
+    STR_TOKEN_AUTHORITY
+};
+
+static const char* STR_TOKEN_HELP_ARY[] =
+{
+    STR_TOKEN_HELP_ENTRY_NO,
+    STR_TOKEN_HELP_ENTRY,   // mapped from original STR_TOKEN_HELP_ENTRY_TEXT,
+    STR_TOKEN_HELP_ENTRY,
+    STR_TOKEN_HELP_TAB_STOP,
+    STR_TOKEN_HELP_TEXT,
+    STR_TOKEN_HELP_PAGE_NUMS,
+    STR_TOKEN_HELP_CHAPTER_INFO,
+    STR_TOKEN_HELP_LINK_START,
+    STR_TOKEN_HELP_LINK_END,
+    STR_TOKEN_HELP_AUTHORITY
+};
+
 SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
     : VclHBox(pParent)
     , m_pForm(nullptr)
@@ -2693,15 +2758,12 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
 
     for (sal_uInt32 i = 0; i < TOKEN_END; ++i)
     {
-        sal_uInt32 nTextId = STR_BUTTON_TEXT_START + i;
-        if( STR_TOKEN_ENTRY_TEXT == nTextId )
-            nTextId = STR_TOKEN_ENTRY;
-        m_aButtonTexts[i] = SwResId(nTextId);
+        const char* pTextId = STR_TOKEN_ARY[i];
+        if (pTextId)
+            m_aButtonTexts[i] = SwResId(pTextId);
 
-        sal_uInt32 nHelpId = STR_BUTTON_HELP_TEXT_START + i;
-        if(STR_TOKEN_HELP_ENTRY_TEXT == nHelpId)
-            nHelpId = STR_TOKEN_HELP_ENTRY;
-        m_aButtonHelpTexts[i] = SwResId(nHelpId);
+        const char* pHelpId = STR_TOKEN_HELP_ARY[i];
+        m_aButtonHelpTexts[i] = SwResId(pHelpId);
     }
 
     m_sAccessibleName = SwResId(STR_STRUCTURE);
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
deleted file mode 100644
index 82f561abb841..000000000000
--- a/sw/source/ui/index/cnttab.src
+++ /dev/null
@@ -1,186 +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 "index.hrc"
-#include "globals.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_ALPHA
-{
-    Text [ en-US ] = "Separator" ;
-};
-String STR_LEVEL
-{
-    Text [ en-US ] = "Level " ;
-};
-String STR_FILE_NOT_FOUND
-{
-    Text [ en-US ] = "The file, \"%1\" in the \"%2\" path could not be found.";
-};
-
-String STR_USER_DEFINED_INDEX
-{
-    Text [ en-US ] = "User-Defined Index";
-};
-
-String STR_NOSORTKEY
-{
-    Text [ en-US ] = "<None>";
-};
-
-String STR_NO_CHAR_STYLE
-{
-    Text [ en-US ] = "<None>";
-};
-
-String STR_DELIM
-{
-    Text [ en-US ] = "S";
-};
-
-String STR_TOKEN_ENTRY_NO
-{
-    Text [ en-US ] = "E#";
-};
-String STR_TOKEN_ENTRY
-{
-    Text [ en-US ] = "E";
-};
-String STR_TOKEN_TAB_STOP
-{
-    Text [ en-US ] = "T";
-};
-String STR_TOKEN_TEXT
-{
-    Text = "";
-    //unused
-};
-String STR_TOKEN_PAGE_NUMS
-{
-    Text [ en-US ] = "#";
-};
-String STR_TOKEN_CHAPTER_INFO
-{
-    Text [ en-US ] = "CI";
-};
-String STR_TOKEN_LINK_START
-{
-    Text [ en-US ] = "LS";
-};
-String STR_TOKEN_LINK_END
-{
-    Text [ en-US ] = "LE";
-};
-String STR_TOKEN_AUTHORITY
-{
-    Text [ en-US ] = "A";
-};
-String STR_TOKEN_HELP_ENTRY_NO
-{
-    Text [ en-US ] = "Chapter number";
-};
-String STR_TOKEN_HELP_ENTRY
-{
-    Text [ en-US ] = "Entry";
-};
-String STR_TOKEN_HELP_TAB_STOP
-{
-    Text [ en-US ] = "Tab stop";
-};
-String STR_TOKEN_HELP_TEXT
-{
-    Text [ en-US ] = "Text";
-};
-String STR_TOKEN_HELP_PAGE_NUMS
-{
-    Text [ en-US ] = "Page number";
-};
-String STR_TOKEN_HELP_CHAPTER_INFO
-{
-    Text [ en-US ] = "Chapter info";
-};
-String STR_TOKEN_HELP_LINK_START
-{
-    Text [ en-US ] = "Hyperlink start";
-};
-String STR_TOKEN_HELP_LINK_END
-{
-    Text [ en-US ] = "Hyperlink end";
-};
-String STR_TOKEN_HELP_AUTHORITY
-{
-    Text [ en-US ] = "Bibliography entry: ";
-};
-
-String STR_CHARSTYLE
-{
-    Text [ en-US ] = "Character Style: ";
-};
-
-StringArray RES_SRCTYPES
-{
-    /* ids from tox.hxx
-    SwTOOElements::Math        = 0x01,
-    SwTOOElements::Chart       = 0x02,
-    TOO_IMAGE       = 0x04,
-    SwTOOElements::Calc        = 0x08,
-    SwTOOElements::DrawImpress= 0x10,
-    SwTOOElements::Other       = 0x80
-    */
-    ItemList [ en-US ] =
-    {
-        < "%PRODUCTNAME Math" ;  1;> ;
-        < "%PRODUCTNAME Chart" ; 2;> ;
-        < "%PRODUCTNAME Calc" ;  8;> ;
-        < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
-        < "Other OLE Objects";   128;> ;
-    };
-};
-
-String STR_STRUCTURE
-{
-    Text [ en-US ] = "Structure text";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING1
-{
-    Text [ en-US ] = "Press Ctrl+Alt+A to move focus for more operations";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING2
-{
-    Text [ en-US ] = "Press left or right arrow to choose the structure controls";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING3
-{
-    Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control";
-};
-
-String STR_AUTOMARK_TYPE
-{
-    Text [ en-US ] = "Selection file for the alphabetical index (*.sdi)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
deleted file mode 100644
index 0519dbecc979..000000000000
--- a/sw/source/ui/index/idxmrk.src
+++ /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 .
- */
-
-#include <svtools/controldims.hrc>
-#include "index.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String STR_IDXMRK_EDIT
-{
-    Text [ en-US ] = "Edit Index Entry" ;
-};
-
-String STR_IDXMRK_INSERT
-{
-    Text [ en-US ] = "Insert Index Entry" ;
-};
-
-String STR_QUERY_CHANGE_AUTH_ENTRY
-{
-    Text [ en-US ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 91b2a360ead5..7e133a3d0217 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -51,7 +51,7 @@
 #include <swmodule.hxx>
 #include <fldmgr.hxx>
 #include <fldbas.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <swcont.hxx>
 #include <svl/cjkoptions.hxx>
 #include <ndtxt.hxx>
@@ -1428,6 +1428,44 @@ void SwAuthorMarkPane::Activate()
     m_pActionBT->Enable(!pSh->HasReadonlySel());
 }
 
+namespace
+{
+    const char* STR_AUTH_FIELD_ARY[] =
+    {
+        STR_AUTH_FIELD_IDENTIFIER,
+        STR_AUTH_FIELD_AUTHORITY_TYPE,
+        STR_AUTH_FIELD_ADDRESS,
+        STR_AUTH_FIELD_ANNOTE,
+        STR_AUTH_FIELD_AUTHOR,
+        STR_AUTH_FIELD_BOOKTITLE,
+        STR_AUTH_FIELD_CHAPTER,
+        STR_AUTH_FIELD_EDITION,
+        STR_AUTH_FIELD_EDITOR,
+        STR_AUTH_FIELD_HOWPUBLISHED,
+        STR_AUTH_FIELD_INSTITUTION,
+        STR_AUTH_FIELD_JOURNAL,
+        STR_AUTH_FIELD_MONTH,
+        STR_AUTH_FIELD_NOTE,
+        STR_AUTH_FIELD_NUMBER,
+        STR_AUTH_FIELD_ORGANIZATIONS,
+        STR_AUTH_FIELD_PAGES,
+        STR_AUTH_FIELD_PUBLISHER,
+        STR_AUTH_FIELD_SCHOOL,
+        STR_AUTH_FIELD_SERIES,
+        STR_AUTH_FIELD_TITLE,
+        STR_AUTH_FIELD_TYPE,
+        STR_AUTH_FIELD_VOLUME,
+        STR_AUTH_FIELD_YEAR,
+        STR_AUTH_FIELD_URL,
+        STR_AUTH_FIELD_CUSTOM1,
+        STR_AUTH_FIELD_CUSTOM2,
+        STR_AUTH_FIELD_CUSTOM3,
+        STR_AUTH_FIELD_CUSTOM4,
+        STR_AUTH_FIELD_CUSTOM5,
+        STR_AUTH_FIELD_ISBN
+    };
+}
+
 SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
         const OUString pFields[],
         SwWrtShell& rSh,
@@ -1458,14 +1496,14 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
 
         pFixedTexts[nIndex]->set_grid_left_attach(0);
         pFixedTexts[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow);
-        pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_START + aCurInfo.nToxField));
+        pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_ARY[aCurInfo.nToxField]));
         pFixedTexts[nIndex]->Show();
         pEdits[nIndex] = nullptr;
         if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField )
         {
             pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER);
-            for(int j = 0; j < AUTH_TYPE_END; j++)
-                pTypeListBox->InsertEntry(SwResId(STR_AUTH_TYPE_START + j));
+            for (int j = 0; j < AUTH_TYPE_END; j++)
+                pTypeListBox->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[j]));
             if(!pFields[aCurInfo.nToxField].isEmpty())
             {
                 pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32());
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index cf6e0786de28..2680d6f3bf5d 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -35,6 +35,7 @@
 #include "bookmark.hxx"
 #include "docsh.hxx"
 #include "globals.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7eaa028790ff..13a78ef7bc4b 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -36,6 +36,7 @@
 #include <swunohelper.hxx>
 
 #include <misc.hrc>
+#include <strings.hrc>
 
 #define PATH_CASE_SENSITIVE 0x01
 #define PATH_READONLY       0x02
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f1379fe97251..9976982ea2e8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -71,7 +71,7 @@
 
 #include <memory>
 
-#include "access.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
deleted file mode 100644
index 7d44cdfebc6b..000000000000
--- a/sw/source/ui/misc/glossary.src
+++ /dev/null
@@ -1,59 +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 "misc.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-#include "access.hrc"
-
-String STR_DOUBLE_SHORTNAME
-{
-    Text [ en-US ] = "Shortcut name already exists. Please choose another name." ;
-};
-String STR_QUERY_DELETE
-{
-    Text[ en-US ] = "Delete AutoText?" ;
-};
-String STR_QUERY_DELETE_GROUP1
-{
-    Text [ en-US ] = "Delete the category " ;
-};
-String STR_QUERY_DELETE_GROUP2
-{
-    Text [ en-US ] = "?" ;
-};
-String STR_GLOSSARY
-{
-    Text [ en-US ] = "AutoText :" ;
-};
-String STR_SAVE_GLOSSARY
-{
-    Text[ en-US ] = "Save AutoText";
-};
-String STR_NO_GLOSSARIES
-{
-    Text [ en-US ] = "There is no AutoText in this file.";
-};
-
-String STR_MY_AUTOTEXT
-{
-    Text[ en-US ] = "My AutoText";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index a8020dd42ff5..cad31b1e29cf 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -32,7 +32,7 @@
 #include "linenum.hxx"
 #include "uitool.hxx"
 #include <fmtline.hxx>
-#include "poolfmt.hrc"
+#include "strings.hrc"
 
 #include <IDocumentStylePoolAccess.hxx>
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index d3032c298a4c..1599249cc243 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -45,6 +45,7 @@
 #include <svtools/ctrlbox.hxx>
 #include <helpid.h>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <misc.hrc>
 #include <paratr.hxx>
 
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index f23964aa1378..bd2742abbb8c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -41,6 +41,7 @@
 #include <sfx2/objsh.hxx>
 
 #include <globals.hrc>
+#include <strings.hrc>
 #include <misc.hrc>
 #include <memory>
 
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index b33fedc9f169..470972e06429 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -38,6 +38,7 @@
 #include <wrtsh.hxx>
 #include <misc.hrc>
 #include <app.hrc>
+#include <strings.hrc>
 #include <swtable.hxx>
 #include <node.hxx>
 #include <tblsel.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index bfe7bdfdf8e1..f1a017cc97ff 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -35,7 +35,7 @@
 #include <helpid.h>
 #include <cmdid.h>
 #include <misc.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 
 #include <vector>
 #include <redlndlg.hxx>
diff --git a/sw/source/ui/misc/swruler.src b/sw/source/ui/misc/swruler.src
deleted file mode 100644
index 5299309ef58f..000000000000
--- a/sw/source/ui/misc/swruler.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/.
- */
-
-#include "misc.hrc"
-
-String STR_COMMENTS_LABEL
-{
-    Text [ en-US ] = "Comments" ;
-};
-
-String STR_SHOW_COMMENTS
-{
-    Text [ en-US ] = "Show comments" ;
-};
-
-String STR_HIDE_COMMENTS
-{
-    Text [ en-US ] = "Hide comments" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
deleted file mode 100644
index b573c47c5960..000000000000
--- a/sw/source/ui/shells/shells.src
+++ /dev/null
@@ -1,157 +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 <svx/svxids.hrc>
-#include "helpid.h"
-#include "shells.hrc"
-#include "globals.hrc"
-#include "cmdid.h"
-
-String STR_GRFILTER_OPENERROR
-{
-        Text [ en-US ] = "Image file cannot be opened" ;
-};
-String STR_GRFILTER_IOERROR
-{
-        Text [ en-US ] = "Image file cannot be read" ;
-};
-String STR_GRFILTER_FORMATERROR
-{
-        Text [ en-US ] = "Unknown image format" ;
-};
-String STR_GRFILTER_VERSIONERROR
-{
-        Text [ en-US ] = "This image file version is not supported" ;
-};
-String STR_GRFILTER_FILTERERROR
-{
-        Text [ en-US ] = "Image filter not found" ;
-};
-String STR_GRFILTER_TOOBIG
-{
-    Text [ en-US ] = "Not enough memory to insert the image." ;
-};
-String STR_INSERT_GRAPHIC
-{
-    Text [ en-US ] = "Insert Image" ;
-};
-String STR_REDLINE_COMMENT
-{
-        Text [ en-US ] = "Comment: " ;
-};
-String STR_REDLINE_INSERTED
-{
-        Text [ en-US ] = "Insertion" ;
-};
-String STR_REDLINE_DELETED
-{
-        Text [ en-US ] = "Deletion" ;
-};
-String STR_REDLINE_AUTOFMT
-{
-        Text [ en-US ] = "AutoCorrect";
-};
-
-String STR_REDLINE_FORMATED
-{
-        Text [ en-US ] = "Formats" ;
-};
-String STR_REDLINE_TABLECHG
-{
-        Text [ en-US ] = "Table Changes" ;
-};
-String STR_REDLINE_FMTCOLLSET
-{
-        Text [ en-US ] = "Applied Paragraph Styles";
-};
-String STR_REDLINE_TITLE
-{
-        Text [ en-US ] = "AutoCorrect";
-};
-String STR_REDLINE_MSG
-{
-        Text [ en-US ] = "AutoCorrect completed.\nYou can accept or reject all changes,\nor accept or reject particular changes.";
-};
-String STR_REDLINE_ACCEPT_ALL
-{
-        Text [ en-US ] = "Accept All";
-};
-String STR_REDLINE_REJECT_ALL
-{
-        Text [ en-US ] = "Reject All";
-};
-String STR_REDLINE_EDIT
-{
-        Text [ en-US ] = "Edit Changes";
-};
-String STR_PAGE
-{
-        Text [ en-US ] = "Page " ;
-};
-String STR_PAGE_COUNT
-{
-        Text [ en-US ] = "Page %1 of %2" ;
-};
-String STR_PAGE_COUNT_CUSTOM
-{
-        Text [ en-US ] = "Page %1 of %2 (Page %3)" ;
-};
- //Strings for gallery/background
-String STR_SWBG_PARAGRAPH
-{
-        Text [ en-US ] = "Paragraph" ;
-};
-String STR_SWBG_GRAPHIC
-{
-        Text [ en-US ] = "Image" ;
-};
-String STR_SWBG_OLE
-{
-        Text [ en-US ] = "OLE object" ;
-};
-String STR_SWBG_FRAME
-{
-        Text [ en-US ] = "Frame" ;
-};
-String STR_SWBG_TABLE
-{
-        Text [ en-US ] = "Table" ;
-};
-String STR_SWBG_TABLE_ROW
-{
-        Text [ en-US ] = "Table row" ;
-};
-String STR_SWBG_TABLE_CELL
-{
-        Text [ en-US ] = "Table cell" ;
-};
-String STR_SWBG_PAGE
-{
-        Text [ en-US ] = "Page" ;
-};
-String STR_SWBG_HEADER
-{
-        Text [ en-US ] = "Header" ;
-};
-String STR_SWBG_FOOTER
-{
-        Text [ en-US ] = "Footer" ;
-};
- //End: strings for gallery/background
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.src b/sw/source/ui/sidebar/PagePropertyPanel.src
deleted file mode 100644
index f1e244e3a4b6..000000000000
--- a/sw/source/ui/sidebar/PagePropertyPanel.src
+++ /dev/null
@@ -1,48 +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 "PropertyPanel.hrc"
-#include "helpid.h"
-
-String STR_MARGIN_TOOLTIP_LEFT
-{
-    Text [ en-US ] = "Left: ";
-};
-String STR_MARGIN_TOOLTIP_RIGHT
-{
-    Text [ en-US ] = ". Right: ";
-};
-String STR_MARGIN_TOOLTIP_INNER
-{
-    Text [ en-US ] = "Inner: ";
-};
-String STR_MARGIN_TOOLTIP_OUTER
-{
-    Text [ en-US ] = ". Outer: ";
-};
-String STR_MARGIN_TOOLTIP_TOP
-{
-    Text [ en-US ] = ". Top: ";
-};
-String STR_MARGIN_TOOLTIP_BOT
-{
-    Text [ en-US ] = ". Bottom: ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index d37c808cce8a..75d53c645107 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -32,6 +32,7 @@
 #include "tblafmt.hxx"
 
 #include "app.hrc"
+#include "strings.hrc"
 #include "table.hrc"
 #include "swabstdlg.hxx"
 #include <swuiexp.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b1f9298fd594..e4204208ce56 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -37,7 +37,7 @@
 #include <fmtrowsplt.hxx>
 #include <sfx2/htmlmode.hxx>
 
-#include "access.hrc"
+#include "strings.hrc"
 
 #include <docsh.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 5e5701f3ce80..0bb614d7d79a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -33,6 +33,7 @@
 #include <svtools/accessibilityoptions.hxx>
 #include <svx/framelinkarray.hxx>
 #include "app.hrc"
+#include "strings.hrc"
 #include "swmodule.hxx"
 #include "swtypes.hxx"
 #include "view.hxx"
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
deleted file mode 100644
index c0a876b64797..000000000000
--- a/sw/source/ui/utlui/poolfmt.src
+++ /dev/null
@@ -1,834 +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 "poolfmt.hrc"
-
- // Format names
-
-String STR_POOLCHR_FOOTNOTE
-{
-    Text [ en-US ] = "Footnote Characters" ;
-};
-String STR_POOLCHR_PAGENO
-{
-    Text [ en-US ] = "Page Number" ;
-};
-String STR_POOLCHR_LABEL
-{
-    Text [ en-US ] = "Caption Characters" ;
-};
-String STR_POOLCHR_DROPCAPS
-{
-    Text [ en-US ] = "Drop Caps" ;
-};
-String STR_POOLCHR_NUM_LEVEL
-{
-    Text [ en-US ] = "Numbering Symbols" ;
-};
-String STR_POOLCHR_BUL_LEVEL
-{
-    Text [ en-US ] = "Bullets" ;
-};
-String STR_POOLCHR_INET_NORMAL
-{
-    Text [ en-US ] = "Internet Link" ;
-};
-String STR_POOLCHR_INET_VISIT
-{
-    Text [ en-US ] = "Visited Internet Link" ;
-};
-String STR_POOLCHR_JUMPEDIT
-{
-    Text [ en-US ] = "Placeholder" ;
-};
-String STR_POOLCHR_TOXJUMP
-{
-    Text [ en-US ] = "Index Link" ;
-};
-String STR_POOLCHR_ENDNOTE
-{
-    Text [ en-US ] = "Endnote Characters" ;
-};
-String STR_POOLPAGE_LANDSCAPE
-{
-   Text [ en-US ] = "Landscape" ;
-};
-String STR_POOLCHR_LINENUM
-{
-    Text [ en-US ] = "Line Numbering" ;
-};
-String STR_POOLCHR_IDX_MAIN_ENTRY
-{
-    Text [ en-US ] = "Main Index Entry";
-};
-String STR_POOLCHR_FOOTNOTE_ANCHOR
-{
-    Text [ en-US ] = "Footnote Anchor";
-};
-String STR_POOLCHR_ENDNOTE_ANCHOR
-{
-    Text [ en-US ] = "Endnote Anchor";
-};
-
- // Drawing templates for HTML
-String STR_POOLCHR_HTML_EMPHASIS
-{
-    Text [ en-US ] = "Emphasis" ;
-};
-String STR_POOLCHR_HTML_CITIATION
-{
-    Text [ en-US ] = "Quotation" ;
-};
-String STR_POOLCHR_HTML_STRONG
-{
-    Text [ en-US ] = "Strong Emphasis" ;
-};
-String STR_POOLCHR_HTML_CODE
-{
-    Text [ en-US ] = "Source Text" ;
-};
-String STR_POOLCHR_HTML_SAMPLE
-{
-    Text [ en-US ] = "Example" ;
-};
-String STR_POOLCHR_HTML_KEYBOARD
-{
-    Text [ en-US ] = "User Entry" ;
-};
-String STR_POOLCHR_HTML_VARIABLE
-{
-    Text [ en-US ] = "Variable" ;
-};
-String STR_POOLCHR_HTML_DEFINSTANCE
-{
-    Text [ en-US ] = "Definition" ;
-};
-String STR_POOLCHR_HTML_TELETYPE
-{
-    Text [ en-US ] = "Teletype" ;
-};
-
-// Border templates
-String STR_POOLFRM_FRAME
-{
-    Text [ en-US ] = "Frame" ;
-};
-String STR_POOLFRM_GRAPHIC
-{
-    Text [ en-US ] = "Graphics" ;
-};
-String STR_POOLFRM_OLE
-{
-    Text [ en-US ] = "OLE" ;
-};
-String STR_POOLFRM_FORMEL
-{
-    Text [ en-US ] = "Formula" ;
-};
-String STR_POOLFRM_MARGINAL
-{
-    Text [ en-US ] = "Marginalia" ;
-};
-String STR_POOLFRM_WATERSIGN
-{
-    Text [ en-US ] = "Watermark" ;
-};
-String STR_POOLFRM_LABEL
-{
-    Text [ en-US ] = "Labels" ;
-};
-
- // Template names
-
-// tdf#107211 please don't change STANDARD, except back to "Default"
-String STR_POOLCOLL_STANDARD
-{
-    Text [ en-US ] = "Default Style" ;
-};
-String STR_POOLCOLL_TEXT
-{
-    Text [ en-US ] = "Text Body" ;
-};
-String STR_POOLCOLL_TEXT_IDENT
-{
-    Text [ en-US ] = "First Line Indent" ;
-};
-String STR_POOLCOLL_TEXT_NEGIDENT
-{
-    Text [ en-US ] = "Hanging Indent" ;
-};
-String STR_POOLCOLL_TEXT_MOVE
-{
-    Text [ en-US ] = "Text Body Indent" ;
-};
-String STR_POOLCOLL_GREETING
-{
-    Text [ en-US ] = "Complimentary Close" ;
-};
-String STR_POOLCOLL_SIGNATURE
-{
-    Text [ en-US ] = "Signature" ;
-};
-String STR_POOLCOLL_HEADLINE_BASE
-{
-    Text [ en-US ] = "Heading" ;
-};
-String STR_POOLCOLL_NUMBUL_BASE
-{
-    Text [ en-US ] = "List" ;
-};
-String STR_POOLCOLL_REGISTER_BASE
-{
-    Text [ en-US ] = "Index" ;
-};
-String STR_POOLCOLL_CONFRONTATION
-{
-    Text [ en-US ] = "List Indent" ;
-};
-String STR_POOLCOLL_MARGINAL
-{
-    Text [ en-US ] = "Marginalia" ;
-};
-String STR_POOLCOLL_HEADLINE1
-{
-    Text [ en-US ] = "Heading 1" ;
-};
-String STR_POOLCOLL_HEADLINE2
-{
-    Text [ en-US ] = "Heading 2" ;
-};
-String STR_POOLCOLL_HEADLINE3
-{
-    Text [ en-US ] = "Heading 3" ;
-};
-String STR_POOLCOLL_HEADLINE4
-{
-    Text [ en-US ] = "Heading 4" ;
-};
-String STR_POOLCOLL_HEADLINE5
-{
-    Text [ en-US ] = "Heading 5" ;
-};
-String STR_POOLCOLL_HEADLINE6
-{
-    Text [ en-US ] = "Heading 6" ;
-};
-String STR_POOLCOLL_HEADLINE7
-{
-    Text [ en-US ] = "Heading 7" ;
-};
-String STR_POOLCOLL_HEADLINE8
-{
-    Text [ en-US ] = "Heading 8" ;
-};
-String STR_POOLCOLL_HEADLINE9
-{
-    Text [ en-US ] = "Heading 9" ;
-};
-String STR_POOLCOLL_HEADLINE10
-{
-    Text [ en-US ] = "Heading 10" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1S
-{
-    Text [ en-US ] = "Numbering 1 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1
-{
-    Text [ en-US ] = "Numbering 1" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1E
-{
-    Text [ en-US ] = "Numbering 1 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM1
-{
-    Text [ en-US ] = "Numbering 1 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL2S
-{
-    Text [ en-US ] = "Numbering 2 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL2
-{
-    Text [ en-US ] = "Numbering 2" ;
-};
-String STR_POOLCOLL_NUM_LEVEL2E
-{
-    Text [ en-US ] = "Numbering 2 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM2
-{
-    Text [ en-US ] = "Numbering 2 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL3S
-{
-    Text [ en-US ] = "Numbering 3 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL3
-{
-    Text [ en-US ] = "Numbering 3" ;
-};
-String STR_POOLCOLL_NUM_LEVEL3E
-{
-    Text [ en-US ] = "Numbering 3 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM3
-{
-    Text [ en-US ] = "Numbering 3 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL4S
-{
-    Text [ en-US ] = "Numbering 4 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL4
-{
-    Text [ en-US ] = "Numbering 4" ;
-};
-String STR_POOLCOLL_NUM_LEVEL4E
-{
-    Text [ en-US ] = "Numbering 4 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM4
-{
-    Text [ en-US ] = "Numbering 4 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL5S
-{
-    Text [ en-US ] = "Numbering 5 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL5
-{
-    Text [ en-US ] = "Numbering 5" ;
-};
-String STR_POOLCOLL_NUM_LEVEL5E
-{
-    Text [ en-US ] = "Numbering 5 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM5
-{
-    Text [ en-US ] = "Numbering 5 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL1S
-{
-    Text [ en-US ] = "List 1 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL1
-{
-    Text [ en-US ] = "List 1" ;
-};
-String STR_POOLCOLL_BUL_LEVEL1E
-{
-    Text [ en-US ] = "List 1 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM1
-{
-    Text [ en-US ] = "List 1 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL2S
-{
-    Text [ en-US ] = "List 2 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL2
-{
-    Text [ en-US ] = "List 2" ;
-};
-String STR_POOLCOLL_BUL_LEVEL2E
-{
-    Text [ en-US ] = "List 2 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM2
-{
-    Text [ en-US ] = "List 2 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL3S
-{
-    Text [ en-US ] = "List 3 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL3
-{
-    Text [ en-US ] = "List 3" ;
-};
-String STR_POOLCOLL_BUL_LEVEL3E
-{
-    Text [ en-US ] = "List 3 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM3
-{
-    Text [ en-US ] = "List 3 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL4S
-{
-    Text [ en-US ] = "List 4 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL4
-{
-    Text [ en-US ] = "List 4" ;
-};
-String STR_POOLCOLL_BUL_LEVEL4E
-{
-    Text [ en-US ] = "List 4 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM4
-{
-    Text [ en-US ] = "List 4 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL5S
-{
-    Text [ en-US ] = "List 5 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL5
-{
-    Text [ en-US ] = "List 5" ;
-};
-String STR_POOLCOLL_BUL_LEVEL5E
-{
-    Text [ en-US ] = "List 5 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM5
-{
-    Text [ en-US ] = "List 5 Cont." ;
-};
-String STR_POOLCOLL_HEADER
-{
-    Text [ en-US ] = "Header" ;
-};
-String STR_POOLCOLL_HEADERL
-{
-    Text [ en-US ] = "Header Left" ;
-};
-String STR_POOLCOLL_HEADERR
-{
-    Text [ en-US ] = "Header Right" ;
-};
-String STR_POOLCOLL_FOOTER
-{
-    Text [ en-US ] = "Footer" ;
-};
-String STR_POOLCOLL_FOOTERL
-{
-    Text [ en-US ] = "Footer Left" ;
-};
-String STR_POOLCOLL_FOOTERR
-{
-    Text [ en-US ] = "Footer Right" ;
-};
-String STR_POOLCOLL_TABLE
-{
-    Text [ en-US ] = "Table Contents" ;
-};
-String STR_POOLCOLL_TABLE_HDLN
-{
-    Text [ en-US ] = "Table Heading" ;
-};
-String STR_POOLCOLL_FRAME
-{
-    Text [ en-US ] = "Frame Contents" ;
-};
-String STR_POOLCOLL_FOOTNOTE
-{
-    Text [ en-US ] = "Footnote" ;
-};
-String STR_POOLCOLL_ENDNOTE
-{
-    Text [ en-US ] = "Endnote" ;
-};
-String STR_POOLCOLL_LABEL
-{
-    Text [ en-US ] = "Caption" ;
-};
-String STR_POOLCOLL_LABEL_ABB
-{
-    Text [ en-US ] = "Illustration" ;
-};
-String STR_POOLCOLL_LABEL_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-String STR_POOLCOLL_LABEL_FRAME
-{
-    Text [ en-US ] = "Text" ;
-};
-String STR_POOLCOLL_LABEL_DRAWING
-{
-    Text [ en-US ] = "Drawing";
-};
-String STR_POOLCOLL_JAKETADRESS
-{
-    Text [ en-US ] = "Addressee" ;
-};
-String STR_POOLCOLL_SENDADRESS
-{
-    Text [ en-US ] = "Sender" ;
-};
-String STR_POOLCOLL_TOX_IDXH
-{
-    Text [ en-US ] = "Index Heading" ;
-};
-String STR_POOLCOLL_TOX_IDX1
-{
-    Text [ en-US ] = "Index 1" ;
-};
-String STR_POOLCOLL_TOX_IDX2
-{
-    Text [ en-US ] = "Index 2" ;
-};
-String STR_POOLCOLL_TOX_IDX3
-{
-    Text [ en-US ] = "Index 3" ;
-};
-String STR_POOLCOLL_TOX_IDXBREAK
-{
-    Text [ en-US ] = "Index Separator" ;
-};
-String STR_POOLCOLL_TOX_CNTNTH
-{
-    Text [ en-US ] = "Contents Heading" ;
-};
-String STR_POOLCOLL_TOX_CNTNT1
-{
-    Text [ en-US ] = "Contents 1" ;
-};
-String STR_POOLCOLL_TOX_CNTNT2
-{
-    Text [ en-US ] = "Contents 2" ;
-};
-String STR_POOLCOLL_TOX_CNTNT3
-{
-    Text [ en-US ] = "Contents 3" ;
-};
-String STR_POOLCOLL_TOX_CNTNT4
-{
-    Text [ en-US ] = "Contents 4" ;
-};
-String STR_POOLCOLL_TOX_CNTNT5
-{
-    Text [ en-US ] = "Contents 5" ;
-};
-String STR_POOLCOLL_TOX_CNTNT6
-{
-    Text [ en-US ] = "Contents 6" ;
-};
-String STR_POOLCOLL_TOX_CNTNT7
-{
-    Text [ en-US ] = "Contents 7" ;
-};
-String STR_POOLCOLL_TOX_CNTNT8
-{
-    Text [ en-US ] = "Contents 8" ;
-};
-String STR_POOLCOLL_TOX_CNTNT9
-{
-    Text [ en-US ] = "Contents 9" ;
-};
-String STR_POOLCOLL_TOX_CNTNT10
-{
-    Text [ en-US ] = "Contents 10" ;
-};
-String STR_POOLCOLL_TOX_USERH
-{
-    Text [ en-US ] = "User Index Heading" ;
-};
-String STR_POOLCOLL_TOX_USER1
-{
-    Text [ en-US ] = "User Index 1" ;
-};
-String STR_POOLCOLL_TOX_USER2
-{
-    Text [ en-US ] = "User Index 2" ;
-};
-String STR_POOLCOLL_TOX_USER3
-{
-    Text [ en-US ] = "User Index 3" ;
-};
-String STR_POOLCOLL_TOX_USER4
-{
-    Text [ en-US ] = "User Index 4" ;
-};
-String STR_POOLCOLL_TOX_USER5
-{
-    Text [ en-US ] = "User Index 5" ;
-};
-String STR_POOLCOLL_TOX_USER6
-{
-    Text [ en-US ] = "User Index 6" ;
-};
-String STR_POOLCOLL_TOX_USER7
-{
-    Text [ en-US ] = "User Index 7" ;
-};
-String STR_POOLCOLL_TOX_USER8
-{
-    Text [ en-US ] = "User Index 8" ;
-};
-String STR_POOLCOLL_TOX_USER9
-{
-    Text [ en-US ] = "User Index 9" ;
-};
-String STR_POOLCOLL_TOX_USER10
-{
-    Text [ en-US ] = "User Index 10" ;
-};
-String STR_POOLCOLL_TOX_CITATION
-{
-    Text [ en-US ] = "Citation" ;
-};
-String STR_POOLCOLL_TOX_ILLUSH
-{
-    Text [ en-US ] = "Illustration Index Heading";
-};
-String STR_POOLCOLL_TOX_ILLUS1
-{
-    Text [ en-US ] = "Illustration Index 1";
-};
-String STR_POOLCOLL_TOX_OBJECTH
-{
-    Text [ en-US ] = "Object Index Heading";
-};
-String STR_POOLCOLL_TOX_OBJECT1
-{
-    Text [ en-US ] = "Object Index 1";
-};
-String STR_POOLCOLL_TOX_TABLESH
-{
-    Text [ en-US ] = "Table Index Heading";
-};
-String STR_POOLCOLL_TOX_TABLES1
-{
-    Text [ en-US ] = "Table Index 1";
-};
-String STR_POOLCOLL_TOX_AUTHORITIESH
-{
-    Text [ en-US ] = "Bibliography Heading";
-};
-String STR_POOLCOLL_TOX_AUTHORITIES1
-{
-    Text [ en-US ] = "Bibliography 1";
-};
-
-String STR_POOLCOLL_DOC_TITEL
-{
-    Text [ en-US ] = "Title" ;
-    Text [ x-comment ] = "Document title style, not to be confused with Heading style" ;
-};
-String STR_POOLCOLL_DOC_SUBTITEL
-{
-    Text [ en-US ] = "Subtitle" ;
-};
-String STR_POOLCOLL_HTML_BLOCKQUOTE
-{
-    Text [ en-US ] = "Quotations" ;
-};
-String STR_POOLCOLL_HTML_PRE
-{
-    Text [ en-US ] = "Preformatted Text" ;
-};
-String STR_POOLCOLL_HTML_HR
-{
-    Text [ en-US ] = "Horizontal Line" ;
-};
-String STR_POOLCOLL_HTML_DD
-{
-    Text [ en-US ] = "List Contents" ;
-};
-String STR_POOLCOLL_HTML_DT
-{
-    Text [ en-US ] = "List Heading" ;
-};
-//page style names
-String STR_POOLPAGE_STANDARD
-{
-    Text [ en-US ] = "Default Style" ;
-};
-String STR_POOLPAGE_FIRST
-{
-    Text [ en-US ] = "First Page" ;
-};
-String STR_POOLPAGE_LEFT
-{
-    Text [ en-US ] = "Left Page" ;
-};
-String STR_POOLPAGE_RIGHT
-{
-    Text [ en-US ] = "Right Page" ;
-};
-String STR_POOLPAGE_JAKET
-{
-    Text [ en-US ] = "Envelope" ;
-};
-String STR_POOLPAGE_REGISTER
-{
-    Text [ en-US ] = "Index" ;
-};
-String STR_POOLPAGE_HTML
-{
-    Text [ en-US ] = "HTML" ;
-};
-String STR_POOLPAGE_FOOTNOTE
-{
-    Text [ en-US ] = "Footnote" ;
-};
-String STR_POOLPAGE_ENDNOTE
-{
-    Text [ en-US ] = "Endnote" ;
-};
-
-// Numbering rules
-
-String STR_POOLNUMRULE_NUM1
-{
-    Text [ en-US ] = "Numbering 1" ;
-};
-String STR_POOLNUMRULE_NUM2
-{
-    Text [ en-US ] = "Numbering 2" ;
-};
-String STR_POOLNUMRULE_NUM3
-{
-    Text [ en-US ] = "Numbering 3" ;
-};
-String STR_POOLNUMRULE_NUM4
-{
-    Text [ en-US ] = "Numbering 4" ;
-};
-String STR_POOLNUMRULE_NUM5
-{
-    Text [ en-US ] = "Numbering 5" ;
-};
-String STR_POOLNUMRULE_BUL1
-{
-    Text [ en-US ] = "List 1" ;
-};
-String STR_POOLNUMRULE_BUL2
-{
-    Text [ en-US ] = "List 2" ;
-};
-String STR_POOLNUMRULE_BUL3
-{
-    Text [ en-US ] = "List 3" ;
-};
-String STR_POOLNUMRULE_BUL4
-{
-    Text [ en-US ] = "List 4" ;
-};
-String STR_POOLNUMRULE_BUL5
-{
-    Text [ en-US ] = "List 5" ;
-};
-
-String STR_POOLCHR_RUBYTEXT
-{
-    Text [ en-US ] = "Rubies";
-};
-String STR_COLUMN_VALUESET_ITEM0
-{
-    Text [ en-US ] = "1 column";
-};
-String STR_COLUMN_VALUESET_ITEM1
-{
-    Text [ en-US ] = "2 columns with equal size";
-};
-String STR_COLUMN_VALUESET_ITEM2
-{
-    Text [ en-US ] = "3 columns with equal size";
-};
-String STR_COLUMN_VALUESET_ITEM3
-{
-    Text [ en-US ] = "2 columns with different size (left > right)";
-};
-String STR_COLUMN_VALUESET_ITEM4
-{
-    Text [ en-US ] = "2 columns with different size (left < right)";
-};
-String STR_POOLCHR_VERT_NUM
-{
-    Text [ en-US ] = "Vertical Numbering Symbols";
-};
-
-// Table styles
-
-String STR_TABSTYLE_DEFAULT
-{
-    Text [ en-US ] = "Default Style";
-};
-String STR_TABSTYLE_3D
-{
-    Text [ en-US ] = "3D";
-};
-String STR_TABSTYLE_BLACK1
-{
-    Text [ en-US ] = "Black 1";
-};
-String STR_TABSTYLE_BLACK2
-{
-    Text [ en-US ] = "Black 2";
-};
-String STR_TABSTYLE_BLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String STR_TABSTYLE_BROWN
-{
-    Text [ en-US ] = "Brown";
-};
-String STR_TABSTYLE_CURRENCY
-{
-    Text [ en-US ] = "Currency";
-};
-String STR_TABSTYLE_CURRENCY_3D
-{
-    Text [ en-US ] = "Currency 3D";
-};
-String STR_TABSTYLE_CURRENCY_GRAY
-{
-    Text [ en-US ] = "Currency Gray";
-};
-String STR_TABSTYLE_CURRENCY_LAVENDER
-{
-    Text [ en-US ] = "Currency Lavender";
-};
-String STR_TABSTYLE_CURRENCY_TURQUOISE
-{
-    Text [ en-US ] = "Currency Turquoise";
-};
-String STR_TABSTYLE_GRAY
-{
-    Text [ en-US ] = "Gray";
-};
-String STR_TABSTYLE_GREEN
-{
-    Text [ en-US ] = "Green";
-};
-String STR_TABSTYLE_LAVENDER
-{
-    Text [ en-US ] = "Lavender";
-};
-String STR_TABSTYLE_RED
-{
-    Text [ en-US ] = "Red";
-};
-String STR_TABSTYLE_TURQUOISE
-{
-    Text [ en-US ] = "Turquoise";
-};
-String STR_TABSTYLE_YELLOW
-{
-    Text [ en-US ] = "Yellow";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index c5002b382f33..e9b4fbb226de 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -20,8 +20,7 @@
 #include <swtypes.hxx>
 #include <globals.hrc>
 
-#include <utlui.hrc>
-#include <../../uibase/utlui/unotools.hrc>
+#include <strings.hrc>
 #include <unoprnms.hxx>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
deleted file mode 100644
index c8d54c7a109d..000000000000
--- a/sw/source/ui/utlui/utlui.src
+++ /dev/null
@@ -1,253 +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 "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-#include "comcore.hrc"
-
-StringArray RID_SHELLRES_AUTOFMTSTRS
-{
-    ItemList [ en-US ] =
-    {
-        < "Remove empty paragraphs" ; > ;
-        < "Use replacement table" ; > ;
-        < "Correct TWo INitial CApitals" ; > ;
-        < "Capitalize first letter of sentences" ; > ;
-        < "Replace \"standard\" quotes with %1 \bcustom%2 quotes" ; > ;
-        < "Replace Custom Styles" ; > ;
-        < "Bullets replaced"; > ;
-        < "Automatic _underline_"; > ;
-        < "Automatic *bold*"; > ;
-        < "Replace 1/2 ... with ½ ..." ; > ;
-        < "URL recognition" ; > ;
-        < "Replace dashes" ; > ;
-        < "Replace 1st... with 1^st..." ; > ;
-        < "Combine single line paragraphs"; > ;
-        < "Set \"Text body\" Style"; > ;
-        < "Set \"Text body indent\" Style"; > ;
-        < "Set \"Hanging indent\" Style"; > ;
-        < "Set \"Text body indent\" Style"; > ;
-        < "Set \"Heading $(ARG1)\" Style"; > ;
-        < "Set \"Bullet\" or \"Numbering\" Style"; > ;
-        < "Combine paragraphs"; > ;
-        < "Add non breaking space"; > ;
-    };
-};
-
-// Miscellaneous
-
-String STR_EVENT_OBJECT_SELECT
-{
-    Text [ en-US ] = "Click object" ;
-};
-String STR_EVENT_START_INS_GLOSSARY
-{
-    Text [ en-US ] = "Before inserting AutoText";
-};
-String STR_EVENT_END_INS_GLOSSARY
-{
-    Text [ en-US ] = "After inserting AutoText";
-};
-String STR_EVENT_MOUSEOVER_OBJECT
-{
-    Text [ en-US ] = "Mouse over object" ;
-};
-String STR_EVENT_MOUSECLICK_OBJECT
-{
-    Text [ en-US ] = "Trigger hyperlink" ;
-};
-String STR_EVENT_MOUSEOUT_OBJECT
-{
-    Text [ en-US ] = "Mouse leaves object" ;
-};
-String STR_EVENT_IMAGE_LOAD
-{
-    Text [ en-US ] = "Image loaded successfully" ;
-};
-String STR_EVENT_IMAGE_ABORT
-{
-    Text [ en-US ] = "Image loading terminated" ;
-};
-String STR_EVENT_IMAGE_ERROR
-{
-    Text [ en-US ] = "Could not load image" ;
-};
-String STR_EVENT_FRM_KEYINPUT_A
-{
-    Text [ en-US ] = "Input of alphanumeric characters" ;
-};
-String STR_EVENT_FRM_KEYINPUT_NOA
-{
-    Text [ en-US ] = "Input of non-alphanumeric characters" ;
-};
-String STR_EVENT_FRM_RESIZE
-{
-    Text [ en-US ] = "Resize frame" ;
-};
-String STR_EVENT_FRM_MOVE
-{
-    Text [ en-US ] = "Move frame" ;
-};
-String STR_CONTENT_TYPE_OUTLINE
-{
-    Text [ en-US ] = "Headings" ;
-};
-String STR_CONTENT_TYPE_TABLE
-{
-    Text [ en-US ] = "Tables" ;
-};
-String STR_CONTENT_TYPE_FRAME
-{
-    Text [ en-US ] = "Text frames" ;
-};
-String STR_CONTENT_TYPE_GRAPHIC
-{
-    Text [ en-US ] = "Images" ;
-};
-String STR_CONTENT_TYPE_OLE
-{
-    Text [ en-US ] = "OLE objects" ;
-};
-String STR_CONTENT_TYPE_BOOKMARK
-{
-    Text [ en-US ] = "Bookmarks" ;
-};
-String STR_CONTENT_TYPE_REGION
-{
-    Text [ en-US ] = "Sections" ;
-};
-String STR_CONTENT_TYPE_URLFIELD
-{
-    Text [ en-US ] = "Hyperlinks" ;
-};
-String STR_CONTENT_TYPE_REFERENCE
-{
-    Text [ en-US ] = "References" ;
-};
-String STR_CONTENT_TYPE_INDEX
-{
-    Text [ en-US ] = "Indexes" ;
-};
-String STR_CONTENT_TYPE_DRAWOBJECT
-{
-    Text [ en-US ] = "Drawing objects" ;
-};
-String STR_CONTENT_TYPE_POSTIT
-{
-    Text [ en-US ] = "Comments" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING1
-{
-    Text [ en-US ] = "Heading 1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY1
-{
-    Text [ en-US ] = "This is the content from the first chapter. This is a user directory entry." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING11
-{
-    Text [ en-US ] = "Heading 1.1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY11
-{
-    Text [ en-US ] = "This is the content from chapter 1.1. This is the entry for the table of contents." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING12
-{
-    Text [ en-US ] = "Heading 1.2" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY12
-{
-    Text [ en-US ] = "This is the content from chapter 1.2. This keyword is a main entry." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_TABLE1
-{
-    Text [ en-US ] = "Table 1: This is table 1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_IMAGE1
-{
-    Text [ en-US ] = "Image 1: This is image 1" ;
-};
-String STR_CONTENT_TYPE_SINGLE_OUTLINE
-{
-    Text [ en-US ] = "Heading" ;
-};
-String STR_CONTENT_TYPE_SINGLE_TABLE
-{
-    Text [ en-US ] = "Table" ;
-};
-String STR_CONTENT_TYPE_SINGLE_FRAME
-{
-    Text [ en-US ] = "Text frame" ;
-};
-String STR_CONTENT_TYPE_SINGLE_GRAPHIC
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_CONTENT_TYPE_SINGLE_OLE
-{
-    Text [ en-US ] = "OLE object" ;
-};
-String STR_CONTENT_TYPE_SINGLE_BOOKMARK
-{
-    Text [ en-US ] = "Bookmark" ;
-};
-String STR_CONTENT_TYPE_SINGLE_REGION
-{
-    Text [ en-US ] = "Section" ;
-};
-String STR_CONTENT_TYPE_SINGLE_URLFIELD
-{
-    Text [ en-US ] = "Hyperlink" ;
-};
-String STR_CONTENT_TYPE_SINGLE_REFERENCE
-{
-    Text [ en-US ] = "Reference" ;
-};
-String STR_CONTENT_TYPE_SINGLE_INDEX
-{
-    Text [ en-US ] = "Index" ;
-};
-String STR_CONTENT_TYPE_SINGLE_POSTIT
-{
-    Text [ en-US ] = "Comment" ;
-};
-String STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
-{
-    Text [ en-US ] = "Draw object" ;
-};
-String STR_DEFINE_NUMBERFORMAT
-{
-    Text [ en-US ] = "Additional formats..." ;
-};
-String RID_STR_SYSTEM
-{
-    Text [ en-US ] = "[System]";
-};
-String STR_MULT_INTERACT_HYPH_WARN
-{
-    Text [ en-US ] = "The interactive hyphenation is already active\nin a different document";
-};
-String STR_HYPH_TITLE
-{
-    Text [ en-US ] = "Hyphenation";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
deleted file mode 100644
index 9e3730b94d4a..000000000000
--- a/sw/source/ui/web/web.src
+++ /dev/null
@@ -1,36 +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 <svx/svxids.hrc>
-#include "globals.hrc"
-#include "cmdid.h"
-#include "web.hrc"
-#include "helpid.h"
-#include "cfgid.h"
-
-String STR_HUMAN_SWWEBDOC_NAME
-{
-    Text [ en-US ] = "HTML" ;
-};
-String STR_WRITER_WEBDOC_FULLTYPE
-{
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index de15a21570a6..0f863537e58b 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -63,9 +63,8 @@
 #include <cmdid.h>
 #include <globals.hrc>
 #include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include "swabstdlg.hxx"
-#include "envelp.hrc"
 #include "envimg.hxx"
 #include <appenv.hxx>
 
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 7df4f04e4677..40982c913be0 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -113,7 +113,7 @@ using namespace ::com::sun::star;
 #include "swslots.hxx"
 #include <cfgid.h>
 
-#include <shells.hrc>
+#include <strings.hrc>
 
 SFX_IMPL_INTERFACE(SwModule, SfxModule)
 
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index e463f6fef4db..1c4baa115dd9 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -66,9 +66,8 @@
 #include <poolfmt.hxx>
 
 #include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include "swabstdlg.hxx"
-#include "envelp.hrc"
 #include <misc.hrc>
 
 #include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 714b20cac102..9a5304e6cf48 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -99,6 +99,7 @@
 #include <helpid.h>
 #include <cmdid.h>
 #include <globals.hrc>
+#include <strings.hrc>
 #include <app.hrc>
 
 #include <cfgid.h>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index ab2e1f490ccc..0f33a225b974 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -105,7 +105,7 @@
 #include <globals.h>
 #include <helpid.h>
 #include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 #include <globals.hrc>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
@@ -916,7 +916,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
 
                     std::shared_ptr<const SfxFilter> pFlt;
-                    sal_uInt16 nStrId;
+                    const char* pStrId;
 
                     if( bCreateHtml )
                     {
@@ -924,14 +924,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         pFlt = SwIoSystem::GetFilterOfFormat(
                                 "HTML",
                                 SwWebDocShell::Factory().GetFilterContainer() );
-                        nStrId = STR_LOAD_HTML_DOC;
+                        pStrId = STR_LOAD_HTML_DOC;
                     }
                     else
                     {
                         // for Global-documents we now only offer the current one.
                         pFlt = SwGlobalDocShell::Factory().GetFilterContainer()->
                                     GetFilter4Extension( "odm"  );
-                        nStrId = STR_LOAD_GLOBAL_DOC;
+                        pStrId = STR_LOAD_GLOBAL_DOC;
                     }
 
                     if( pFlt )
@@ -1008,7 +1008,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             OSL_FAIL("control access failed");
                         }
 
-                        xFP->setTitle( SwResId( nStrId ));
+                        xFP->setTitle(SwResId(pStrId));
                         SvtPathOptions aPathOpt;
                         xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
                         if( ERRCODE_NONE == aDlgHelper.Execute())
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4419abf03cf2..abb574054460 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -19,7 +19,6 @@
 
 #include <hintids.hxx>
 
-#include <svx/dialogs.hrc>
 #include <i18nlangtag/mslangid.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index fb1a4328b12d..2d27a10a433f 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -52,6 +52,7 @@
 #include <cmdid.h>
 #include <swstyle.h>
 #include <app.hrc>
+#include <strings.hrc>
 #include <paratr.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index 44e4b9b1c036..fbc3340990ff 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -19,7 +19,6 @@
 
 #include <mdiexp.hxx>
 #include <sfx2/progress.hxx>
-#include <tools/resid.hxx>
 #include <docsh.hxx>
 #include <swmodule.hxx>
 #include "swtypes.hxx"
@@ -46,7 +45,7 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
     return nullptr;
 }
 
-void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
+void StartProgress( const char* pMessResId, long nStartValue, long nEndValue,
                     SwDocShell *pDocShell )
 {
     if( !SW_MOD()->IsEmbeddedLoadSave() )
@@ -64,7 +63,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
         {
             pProgress = new SwProgress;
             pProgress->pProgress = new SfxProgress( pDocShell,
-                                                    SwResId(nMessResId),
+                                                    SwResId(pMessResId),
                                                     nEndValue - nStartValue );
             pProgress->nStartCount = 1;
             pProgress->pDocShell = pDocShell;
@@ -117,13 +116,13 @@ void EndProgress( SwDocShell *pDocShell )
     }
 }
 
-void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell )
+void SetProgressText(const char* pId, SwDocShell *pDocShell)
 {
     if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
     {
         SwProgress *pProgress = lcl_SwFindProgress( pDocShell );
         if ( pProgress )
-            pProgress->pProgress->SetStateText( 0, SwResId(nId) );
+            pProgress->pProgress->SetStateText(0, SwResId(pId));
     }
 }
 
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index af1e91322a80..6017d3e17d90 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -22,7 +22,7 @@
 
 #include <svx/svdobj.hxx>
 
-#include "globdoc.hrc"
+#include "strings.hrc"
 
 #include <swdll.hxx>
 #include <wdocsh.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 4d03053de05e..2c6e0bc5d856 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -58,6 +58,7 @@
 #include <doc.hxx>
 #include <cmdid.h>
 #include <app.hrc>
+#include <strings.hrc>
 #include "helpid.h"
 #include <IDocumentLayoutAccess.hxx>
 
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 41b2712d87fb..0da9c3a8bff0 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -24,6 +24,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/ehdl.hxx>
+#include <tools/resmgr.hxx>
 #include <svx/ParaLineSpacingPopup.hxx>
 #include <svx/TextCharacterSpacingPopup.hxx>
 #include <svx/TextUnderlinePopup.hxx>
@@ -125,9 +126,10 @@
 #include <navsh.hxx>
 
 #include <app.hrc>
+#include <error.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <svx/xmlsecctrl.hxx>
-ResMgr *pSwResMgr = nullptr;
 bool     g_bNoInterrupt     = false;
 
 #include <sfx2/app.hxx>
@@ -144,7 +146,7 @@ using namespace ::com::sun::star::uno;
 SwModule::SwModule( SfxObjectFactory* pWebFact,
                     SfxObjectFactory* pFact,
                     SfxObjectFactory* pGlobalFact )
-    : SfxModule( ResMgr::CreateResMgr( "sw" ), {pWebFact, pFact, pGlobalFact} ),
+    : SfxModule( Translate::Create("sw", Application::GetSettings().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ),
     m_pModuleConfig(nullptr),
     m_pUsrPref(nullptr),
     m_pWebUsrPref(nullptr),
@@ -168,12 +170,11 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
     m_pXSelection( nullptr )
 {
     SetName( "StarWriter" );
-    pSwResMgr = GetResMgr();
     SvxErrorHandler::ensure();
     m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL,
                                      ErrCode(ERRCODE_AREA_SW),
                                      ErrCode(ERRCODE_AREA_SW_END),
-                                     pSwResMgr );
+                                     &GetResLocale() );
 
     m_pModuleConfig = new SwModuleOptions;
 
@@ -193,6 +194,12 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
         GetColorConfig();
     }
 }
+
+OUString SwResId(const char* pId)
+{
+    return Translate::get(pId, SW_MOD()->GetResLocale());
+}
+
 uno::Reference< scanner::XScannerManager2 > const &
 SwModule::GetScannerManager()
 {
@@ -405,32 +412,32 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies()
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
                                                     SwResId(STR_PARAGRAPHSTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_PARA)),
-                                                    ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr)));
+                                                    RID_PARAGRAPHSTYLEFAMILY, GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char,
                                                     SwResId(STR_CHARACTERSTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)),
-                                                    ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr)));
+                                                    RID_CHARACTERSTYLEFAMILY, GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame,
                                                     SwResId(STR_FRAMESTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)),
-                                                    ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr)));
+                                                    RID_FRAMESTYLEFAMILY, GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
                                                     SwResId(STR_PAGESTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
-                                                    ResId(RID_PAGESTYLEFAMILY, *pSwResMgr)));
+                                                    RID_PAGESTYLEFAMILY, GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
                                                     SwResId(STR_LISTSTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_LIST)),
-                                                    ResId(RID_LISTSTYLEFAMILY, *pSwResMgr)));
+                                                    RID_LISTSTYLEFAMILY, GetResLocale()));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table,
                                                     SwResId(STR_TABLESTYLEFAMILY),
                                                     Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)),
-                                                    ResId(RID_TABLESTYLEFAMILY, *pSwResMgr)));
+                                                    RID_TABLESTYLEFAMILY, GetResLocale()));
 
     return pStyleFamilies;
 }
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 3b78f4d064ae..24c79ddc2c79 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -27,7 +27,6 @@
 #include <sfx2/docfile.hxx>
 #include <svl/itemiter.hxx>
 
-#include <tools/resid.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <poolfmt.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index fc71c762dc18..60aeb83f28b5 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -81,7 +81,7 @@
 #include <swunohelper.hxx>
 #include <dbui.hrc>
 #include <globals.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
 #include <mmconfigitem.hxx>
 #include <sfx2/request.hxx>
 #include <hintids.hxx>
@@ -123,7 +123,6 @@
 #include <sal/log.hxx>
 #include <swabstdlg.hxx>
 #include <fmthdft.hxx>
-#include <envelp.hrc>
 #include <vector>
 #include <unomid.h>
 #include <section.hxx>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 7b7ce0362c0b..2641bfb9bd03 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -41,7 +41,7 @@
 #include <svtools/treelistentry.hxx>
 
 #include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 
 #include <unomid.h>
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
deleted file mode 100644
index 067a85b5c932..000000000000
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ /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/.
- *
- * 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 "dbui.hrc"
-#include "helpid.h"
-#include <cmdid.h>
-
-String     ST_CONTINUE
-{
-    Text[ en-US ] = "~Continue";
-};
-
-String ST_TASK
-{
-    Text[ en-US ] = "Task";
-};
-
-String ST_STATUS
-{
-    Text[ en-US ] = "Status";
-};
-
-String ST_SENDINGTO
-{
-    Text[ en-US ] = "Sending to: %1";
-};
-
-String ST_COMPLETED
-{
-    Text[ en-US ] = "Successfully sent";
-};
-
-String ST_FAILED
-{
-    Text[ en-US ] = "Sending failed";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 006ef49eabac..000e76a3a76b 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -41,6 +41,7 @@
 #include <sfx2/passwd.hxx>
 
 #include <dbui.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -463,7 +464,7 @@ OUString SwAddressPreview::FillData(
                     rConfigItem.GetColumnAssignment(
                                                 rConfigItem.GetCurrentDBData() );
     const OUString* pAssignment = aAssignment.getConstArray();
-    const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
+    const std::vector<std::pair<OUString, int>>& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
     OUString sAddress(rAddress);
     OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">";
 
@@ -473,7 +474,7 @@ OUString SwAddressPreview::FillData(
     OUString sCountryColumn;
     if( bSpecialReplacementForCountry )
     {
-        sCountryColumn = rDefHeaders.GetString(MM_PART_COUNTRY);
+        sCountryColumn = rDefHeaders[MM_PART_COUNTRY].first;
         Sequence< OUString> aSpecialAssignment =
                         rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
         if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength())
@@ -492,10 +493,10 @@ OUString SwAddressPreview::FillData(
             //find the appropriate assignment
             OUString sConvertedColumn = aItem.sText;
             for(sal_uInt32 nColumn = 0;
-                    nColumn < rDefHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+                    nColumn < rDefHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rDefHeaders.GetString(nColumn) == aItem.sText &&
+                if (rDefHeaders[nColumn].first == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 8a4a10f7a2eb..e1ad415c34db 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <dbui.hrc>
+#include <strings.hrc>
 #include <mmconfigitem.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 2adab839408d..2f66526a67b0 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -135,7 +135,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
 
     bool                                m_bIsEMailSupported;
 
-    ResStringArray                          m_AddressHeaderSA;
+    std::vector<std::pair<OUString, int>> m_AddressHeaderSA;
 
     //these addresses are not stored in the configuration
     std::vector< SwDocMergeInfo >           m_aMergeInfos;
@@ -200,12 +200,16 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
         m_bIsAuthentication(false),
 
         m_bIsEMailSupported(false),
-        m_AddressHeaderSA(ResId(SA_ADDRESS_HEADER, *pSwResMgr)),
         m_bUserSettingWereOverwritten(false),
         m_bIsAddressBlock_LastUserSetting(false),
         m_bIsGreetingLineInMail_LastUserSetting(false),
         m_bIsGreetingLine_LastUserSetting(false)
 {
+    for (size_t i = 0; i < SAL_N_ELEMENTS(SA_ADDRESS_HEADER); ++i)
+    {
+        m_AddressHeaderSA.push_back(std::make_pair(SwResId(SA_ADDRESS_HEADER[i].first), SA_ADDRESS_HEADER[i].second));
+    }
+
     const Sequence<OUString>& rNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(rNames);
     const Any* pValues = aValues.getConstArray();
@@ -378,20 +382,20 @@ static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
     return sNewName;
 }
 
-static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
+static void lcl_ConvertToNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders )
 {
     //convert the strings used for UI to numbers used for the configuration
     OUString sBlock(rBlock.replaceAll("\n", "\\n"));
-    for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+    for (size_t i = 0; i < rHeaders.size(); ++i)
     {
-        OUString sHeader = "<" + rHeaders.GetString( i ) + ">";
+        OUString sHeader = "<" + rHeaders[i].first + ">";
         OUString sReplace = "<" + OUStringLiteral1('0' + i) + ">";
         sBlock = sBlock.replaceAll(sHeader, sReplace);
     }
     rBlock = sBlock;
 }
 
-static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
+static void lcl_ConvertFromNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders)
 {
     //convert the numbers used for the configuration to strings used for UI to numbers
     //doesn't use ReplaceAll to prevent expansion of numbers inside of the headers
@@ -409,8 +413,8 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead
             {
                 sBlock += "<";
                 sal_uInt16 nHeader = cChar - '0';
-                if(nHeader < rHeaders.Count())
-                    sBlock += rHeaders.GetString( nHeader );
+                if(nHeader < rHeaders.size())
+                    sBlock += rHeaders[nHeader].first;
                 sBlock += ">";
             }
             else
@@ -737,7 +741,7 @@ void  SwMailMergeConfigItem::Commit()
         m_pImpl->Commit();
 }
 
-const ResStringArray&   SwMailMergeConfigItem::GetDefaultAddressHeaders() const
+const std::vector<std::pair<OUString, int>>&   SwMailMergeConfigItem::GetDefaultAddressHeaders() const
 {
     return m_pImpl->m_AddressHeaderSA;
 }
@@ -1162,8 +1166,8 @@ OUString     SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const
     Sequence< OUString> aAssignment = GetColumnAssignment( m_pImpl->m_aDBData );
     if(aAssignment.getLength() > sal::static_int_cast< sal_Int32, sal_uInt32>(nColumn) && !aAssignment[nColumn].isEmpty())
         sRet = aAssignment[nColumn];
-    else if(nColumn < m_pImpl->m_AddressHeaderSA.Count())
-        sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn);
+    else if(nColumn < m_pImpl->m_AddressHeaderSA.size())
+        sRet = m_pImpl->m_AddressHeaderSA[nColumn].first;
     return sRet;
 }
 
@@ -1206,7 +1210,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
         return false;
     uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
 
-    const ResStringArray& rHeaders = GetDefaultAddressHeaders();
+    const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders();
     Sequence< OUString> aAssignment =
                         GetColumnAssignment( GetCurrentDBData() );
     const OUString* pAssignment = aAssignment.getConstArray();
@@ -1222,10 +1226,10 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
         {
             OUString sConvertedColumn = aItem.sText;
             for(sal_uInt32 nColumn = 0;
-                    nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+                    nColumn < rHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rHeaders.GetString(nColumn) == aItem.sText &&
+                if (rHeaders[nColumn].first == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
@@ -1254,7 +1258,7 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
     uno::Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY );
     if(!xColsSupp.is())
         return false;
-    const ResStringArray& rHeaders = GetDefaultAddressHeaders();
+    const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders();
     uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
 
     Sequence< OUString> aAssignment =
@@ -1281,10 +1285,10 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
         {
             OUString sConvertedColumn = aItem.sText;
             for(sal_uInt32 nColumn = 0;
-                    nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+                    nColumn < rHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
                                                                                 ++nColumn)
             {
-                if (rHeaders.GetString(nColumn) == aItem.sText &&
+                if (rHeaders[nColumn].first == aItem.sText &&
                     !pAssignment[nColumn].isEmpty())
                 {
                     sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index f04020dabfbb..df1c4368a893 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -50,6 +50,7 @@
 #include <drawbase.hxx>
 #include <unotextrange.hxx>
 #include <dialog.hrc>
+#include <strings.hrc>
 #include <cmdid.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 6335665e2881..fd6777ab77b5 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -47,8 +47,7 @@
 #include <shellio.hxx>
 #include <helpid.h>
 #include <cmdid.h>
-#include <regionsw.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <globals.hrc>
 #include <sfx2/bindings.hxx>
 #include <sfx2/htmlmode.hxx>
diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
deleted file mode 100644
index fba4caf793c2..000000000000
--- a/sw/source/uibase/dialog/regionsw.hrc
+++ /dev/null
@@ -1,32 +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_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC
-
-#include "dialog.hrc"
-
-/* global resources */
-
-#define STR_QUERY_CONNECT       (RC_REGIONSW_BEGIN+10)
-#define STR_WRONG_PASSWORD      (RC_REGIONSW_BEGIN+11)
-#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
deleted file mode 100644
index 5692e71cb70a..000000000000
--- a/sw/source/uibase/dialog/regionsw.src
+++ /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 .
- */
-
-#include "regionsw.hrc"
-#include "cmdid.h"
-#include "globals.hrc"
-#include "helpid.h"
-
-String STR_QUERY_CONNECT
-{
-    Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
-};
-
-String STR_WRONG_PASSWORD
-{
-    Text [ en-US ] = "The password entered is invalid." ;
-};
-
-String STR_WRONG_PASSWD_REPEAT
-{
-    Text [ en-US ] = "The password has not been set." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 71b5c12b1a66..c674f397b1c3 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -44,7 +44,7 @@
 #include <swdtflvr.hxx>
 #include <docsh.hxx>
 
-#include <dochdl.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <frmmgr.hxx>
 #include <vcl/layout.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index be48f76e0df7..47ef669f8012 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -107,8 +107,7 @@
 #include <swerror.h>
 #include <SwCapObjType.hxx>
 #include <cmdid.h>
-#include <dochdl.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <sot/stg.hxx>
 #include <svx/svditer.hxx>
 #include <editeng/eeitem.hxx>
@@ -1613,7 +1612,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh )
 bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg )
 {
-    sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
+    const char* pResId = STR_CLPBRD_FORMAT_ERROR;
     bool bRet = false;
 
     MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1684,10 +1683,10 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
         SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCursor() );
         rSh.SaveTableBoxContent( &rInsPos );
         if( aReader.Read( *pRead ).IsError() )
-            nResId = STR_ERROR_CLPBRD_READ;
+            pResId = STR_ERROR_CLPBRD_READ;
         else
         {
-            nResId = 0;
+            pResId = nullptr;
             bRet = true;
         }
 
@@ -1696,15 +1695,15 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
             rSh.CallChgLnk();
     }
     else
-        nResId = STR_CLPBRD_FORMAT_ERROR;
+        pResId = STR_CLPBRD_FORMAT_ERROR;
 
     // Exist a SvMemoryStream? (data in the OUString and xStrm is empty)
     if( pStream && !xStrm.is() )
         delete pStream;
 
-    if( bMsg && nResId )
+    if (bMsg && pResId)
     {
-        ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(nResId), VclMessageType::Info)->Execute();
+        ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(pResId), VclMessageType::Info)->Execute();
     }
     return bRet;
 }
@@ -2895,19 +2894,19 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
     if( pClipboard )
     {
         aDesc = pClipboard->m_aObjDesc;
-        sal_uInt16 nResId;
+        const char* pResId;
         if( pClipboard->m_eBufferType & TransferBufferType::Document )
-            nResId = STR_PRIVATETEXT;
+            pResId = STR_PRIVATETEXT;
         else if( pClipboard->m_eBufferType & TransferBufferType::Graphic )
-            nResId = STR_PRIVATEGRAPHIC;
+            pResId = STR_PRIVATEGRAPHIC;
         else if( pClipboard->m_eBufferType == TransferBufferType::Ole )
-            nResId = STR_PRIVATEOLE;
+            pResId = STR_PRIVATEOLE;
         else
-            nResId = 0;
+            pResId = nullptr;
 
-        if( nResId )
+        if (pResId)
         {
-            if( STR_PRIVATEOLE == nResId || STR_PRIVATEGRAPHIC == nResId )
+            if (strcmp(STR_PRIVATEOLE, pResId) == 0 || strcmp(STR_PRIVATEGRAPHIC, pResId) == 0)
             {
                 // add SotClipboardFormatId::EMBED_SOURCE to the formats. This
                 // format display then the private format name.
@@ -2916,7 +2915,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
                 aFormats.insert( aFormats.begin(), aFlavorEx );
             }
             pDlg->SetObjName( pClipboard->m_aObjDesc.maClassName,
-                                SwResId( nResId ) );
+                                SwResId(pResId) );
             pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr );
         }
     }
@@ -2961,19 +2960,19 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh,
     SwTransferable *pClipboard = GetSwTransferable( rData );
     if( pClipboard )
     {
-        sal_uInt16 nResId;
+        const char* pResId;
         if( pClipboard->m_eBufferType & TransferBufferType::Document )
-            nResId = STR_PRIVATETEXT;
+            pResId = STR_PRIVATETEXT;
         else if( pClipboard->m_eBufferType & TransferBufferType::Graphic )
-            nResId = STR_PRIVATEGRAPHIC;
+            pResId = STR_PRIVATEGRAPHIC;
         else if( pClipboard->m_eBufferType == TransferBufferType::Ole )
-            nResId = STR_PRIVATEOLE;
+            pResId = STR_PRIVATEOLE;
         else
-            nResId = 0;
+            pResId = nullptr;
 
-        if( nResId )
-            rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE,
-                                        SwResId( nResId ) );
+        if (pResId)
+            rToFill.AddClipbrdFormat(SotClipboardFormatId::EMBED_SOURCE,
+                                       SwResId(pResId));
     }
     else
     {
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 1969ce7f9128..c3cc960961c2 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -19,9 +19,8 @@
 
 #include <AnnotationMenuButton.hxx>
 
-#include <annotation.hrc>
 #include <app.hrc>
-#include <access.hrc>
+#include <strings.hrc>
 
 #include <unotools/useroptions.hxx>
 
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index f20db12ab9a9..63b5c9e26296 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -22,7 +22,7 @@
 #include <AnnotationMenuButton.hxx>
 #include <PostItMgr.hxx>
 
-#include <annotation.hrc>
+#include <strings.hrc>
 #include <cmdid.h>
 
 #include <vcl/menu.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 0738fccd92d8..a43d402e3add 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -33,10 +33,9 @@
 #include <ShadowOverlayObject.hxx>
 #include <OverlayRanges.hxx>
 
-#include <annotation.hrc>
-#include <docvw.hrc>
+#include <strings.hrc>
 #include <app.hrc>
-#include <access.hrc>
+#include <strings.hrc>
 
 #include <viewopt.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 9d567d207236..38c0df3a7077 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -8,9 +8,9 @@
  */
 
 #include <app.hrc>
-#include <docvw.hrc>
+#include <strings.hrc>
 #include <globals.hrc>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 
 #include <cmdid.h>
 #include <DashedLine.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index fa1c78afe3af..02b5cfcf349f 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 
 #include <cmdid.h>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 1c23d54cb857..e55c14a343db 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -57,8 +57,8 @@
 #include <unotools/datetime.hxx>
 
 #include <swmodule.hxx>
-#include <annotation.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include "cmdid.h"
 
 #include <sfx2/request.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index c38b243a5880..6f518ffaa2c8 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -27,7 +27,7 @@
 #include <edtwin.hxx>
 
 #include <cmdid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
 
 #include <unotools/securityoptions.hxx>
 
@@ -111,19 +111,19 @@ void SidebarTextControl::LoseFocus()
 
 void SidebarTextControl::RequestHelp(const HelpEvent &rEvt)
 {
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     switch( mrSidebarWin.GetLayoutStatus() )
     {
-        case SwPostItHelper::INSERTED:  nResId = STR_REDLINE_INSERT; break;
-        case SwPostItHelper::DELETED:   nResId = STR_REDLINE_DELETE; break;
-        default: nResId = 0;
+        case SwPostItHelper::INSERTED:  pResId = STR_REDLINE_INSERT; break;
+        case SwPostItHelper::DELETED:   pResId = STR_REDLINE_DELETE; break;
+        default: pResId = nullptr;
     }
 
     SwContentAtPos aContentAtPos( IsAttrAtPos::Redline );
-    if ( nResId &&
+    if ( pResId &&
          mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) )
     {
-        OUString sText = SwResId( nResId ) + ": " +
+        OUString sText = SwResId(pResId) + ": " +
                         aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " +
                         GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() );
         Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText);
diff --git a/sw/source/uibase/docvw/annotation.hrc b/sw/source/uibase/docvw/annotation.hrc
deleted file mode 100644
index 9e1b8265c756..000000000000
--- a/sw/source/uibase/docvw/annotation.hrc
+++ /dev/null
@@ -1,41 +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_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC
-
-#include "rcid.hrc"
-
-#define STR_DELETE_ALL_NOTES            (RC_ANNOTATION_BEGIN +  3)
-#define STR_DELETE_AUTHOR_NOTES         (RC_ANNOTATION_BEGIN +  4)
-
-#define STR_NODATE                      (RC_ANNOTATION_BEGIN +  5)
-#define STR_NOAUTHOR                    (RC_ANNOTATION_BEGIN +  6)
-
-#define STR_REPLY                       (RC_ANNOTATION_BEGIN +  7)
-#define STR_FORMAT_ALL_NOTES            (RC_ANNOTATION_BEGIN +  8)
-
-#define ANNOTATION_ACT_END   STR_REPLY
-#if ANNOTATION_ACT_END > RC_ANNOTATION_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
deleted file mode 100644
index f98e300356fa..000000000000
--- a/sw/source/uibase/docvw/docvw.hrc
+++ /dev/null
@@ -1,67 +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_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC
-
-#include "rcid.hrc"
-
-#define STR_REDLINE_INSERT              (RC_DOCVW_BEGIN + 9)
-#define STR_REDLINE_DELETE              (RC_DOCVW_BEGIN + 10)
-#define STR_REDLINE_FORMAT              (RC_DOCVW_BEGIN + 11)
-#define STR_REDLINE_TABLE               (RC_DOCVW_BEGIN + 12)
-#define STR_REDLINE_FMTCOLL             (RC_DOCVW_BEGIN + 13)
-#define STR_REDLINE_PARAGRAPH_FORMAT    (RC_DOCVW_BEGIN + 14)
-#define STR_REDLINE_TABLE_ROW_INSERT    (RC_DOCVW_BEGIN + 15)
-#define STR_REDLINE_TABLE_ROW_DELETE    (RC_DOCVW_BEGIN + 16)
-#define STR_REDLINE_TABLE_CELL_INSERT   (RC_DOCVW_BEGIN + 17)
-#define STR_REDLINE_TABLE_CELL_DELETE   (RC_DOCVW_BEGIN + 18)
-#define STR_ENDNOTE                     (RC_DOCVW_BEGIN + 19)
-#define STR_FTNNOTE                     (RC_DOCVW_BEGIN + 20)
-
-#define STR_TABLE_COL_ADJUST            (RC_DOCVW_BEGIN + 21)
-#define STR_TABLE_ROW_ADJUST            (RC_DOCVW_BEGIN + 22)
-#define STR_TABLE_SELECT_ALL            (RC_DOCVW_BEGIN + 23)
-#define STR_TABLE_SELECT_ROW            (RC_DOCVW_BEGIN + 24)
-#define STR_TABLE_SELECT_COL            (RC_DOCVW_BEGIN + 25)
-
-#define STR_SMARTTAG_CLICK              (RC_DOCVW_BEGIN + 26)
-
-#define STR_HEADER_TITLE                (RC_DOCVW_BEGIN + 27)
-#define STR_FOOTER_TITLE                (RC_DOCVW_BEGIN + 28)
-#define STR_DELETE_HEADER               (RC_DOCVW_BEGIN + 29)
-#define STR_FORMAT_HEADER               (RC_DOCVW_BEGIN + 30)
-#define STR_DELETE_FOOTER               (RC_DOCVW_BEGIN + 31)
-#define STR_FORMAT_FOOTER               (RC_DOCVW_BEGIN + 32)
-#define STR_FIRST_HEADER_TITLE          (RC_DOCVW_BEGIN + 33)
-#define STR_LEFT_HEADER_TITLE           (RC_DOCVW_BEGIN + 34)
-#define STR_RIGHT_HEADER_TITLE          (RC_DOCVW_BEGIN + 35)
-#define STR_FIRST_FOOTER_TITLE          (RC_DOCVW_BEGIN + 36)
-#define STR_LEFT_FOOTER_TITLE           (RC_DOCVW_BEGIN + 37)
-#define STR_RIGHT_FOOTER_TITLE          (RC_DOCVW_BEGIN + 38)
-
-#define DOCVW_ACT_END   STR_RIGHT_FOOTER_TITLE
-
-#if DOCVW_ACT_END > RC_DOCVW_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
deleted file mode 100644
index 75f8738ac6c3..000000000000
--- a/sw/source/uibase/docvw/docvw.src
+++ /dev/null
@@ -1,159 +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 "docvw.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_REDLINE_INSERT
-{
-    Text [ en-US ] = "Inserted" ;
-};
-String STR_REDLINE_DELETE
-{
-    Text [ en-US ] = "Deleted" ;
-};
-String STR_REDLINE_FORMAT
-{
-    Text [ en-US ] = "Formatted" ;
-};
-String STR_REDLINE_TABLE
-{
-    Text [ en-US ] = "Table changed" ;
-};
-String STR_REDLINE_FMTCOLL
-{
-    Text [ en-US ] = "Applied Paragraph Styles";
-};
-String STR_REDLINE_PARAGRAPH_FORMAT
-{
-    Text [ en-US ] = "Paragraph formatting changed";
-};
-String STR_REDLINE_TABLE_ROW_INSERT
-{
-    Text [ en-US ] = "Row Inserted";
-};
-String STR_REDLINE_TABLE_ROW_DELETE
-{
-    Text [ en-US ] = "Row Deleted";
-};
-String STR_REDLINE_TABLE_CELL_INSERT
-{
-    Text [ en-US ] = "Cell Inserted";
-};
-String STR_REDLINE_TABLE_CELL_DELETE
-{
-    Text [ en-US ] = "Cell Deleted";
-};
-String STR_ENDNOTE
-{
-    Text [ en-US ] = "Endnote: " ;
-};
-String STR_FTNNOTE
-{
-    Text [ en-US ] = "Footnote: " ;
-};
-
-String STR_TABLE_COL_ADJUST
-{
-    Text [ en-US ] = "Adjust table column" ;
-};
-String STR_TABLE_ROW_ADJUST
-{
-    Text [ en-US ] = "Adjust table row" ;
-};
-String STR_TABLE_SELECT_ALL
-{
-    Text [ en-US ] = "Select whole table" ;
-};
-String STR_TABLE_SELECT_ROW
-{
-    Text [ en-US ] = "Select table row" ;
-};
-String STR_TABLE_SELECT_COL
-{
-    Text [ en-US ] = "Select table column" ;
-};
-
-String STR_SMARTTAG_CLICK
-{
-    Text [ en-US ] = "%s-click to open Smart Tag menu" ;
-};
-
-String STR_HEADER_TITLE
-{
-    Text [ en-US ] = "Header (%1)" ;
-};
-
-String STR_FIRST_HEADER_TITLE
-{
-    Text [ en-US ] = "First Page Header (%1)" ;
-};
-
-String STR_LEFT_HEADER_TITLE
-{
-    Text [ en-US ] = "Left Page Header (%1)" ;
-};
-
-String STR_RIGHT_HEADER_TITLE
-{
-    Text [ en-US ] = "Right Page Header (%1)" ;
-};
-
-String STR_FOOTER_TITLE
-{
-    Text [ en-US ] = "Footer (%1)" ;
-};
-
-String STR_FIRST_FOOTER_TITLE
-{
-    Text [ en-US ] = "First Page Footer (%1)" ;
-};
-
-String STR_LEFT_FOOTER_TITLE
-{
-    Text [ en-US ] = "Left Page Footer (%1)" ;
-};
-
-String STR_RIGHT_FOOTER_TITLE
-{
-    Text [ en-US ] = "Right Page Footer (%1)" ;
-};
-
-String STR_DELETE_HEADER
-{
-    Text [ en-US ] = "Delete Header..." ;
-};
-
-String STR_FORMAT_HEADER
-{
-    Text [ en-US ] = "Format Header..." ;
-};
-
-String STR_DELETE_FOOTER
-{
-    Text [ en-US ] = "Delete Footer..." ;
-};
-
-String STR_FORMAT_FOOTER
-{
-    Text [ en-US ] = "Format Footer..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 7a6dc4ab5bce..33a7ddeba68b 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -125,7 +125,7 @@
 
 #include <helpid.h>
 #include <cmdid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
 #include <uitool.hxx>
 #include <fmtfollowtextflow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 04152ea8efce..276c27441d35 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -56,8 +56,8 @@
 #include <txttxmrk.hxx>
 #include <uitool.hxx>
 #include <viewopt.hxx>
-#include <docvw.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 
 #include <PostItMgr.hxx>
 #include <fmtfld.hxx>
@@ -67,25 +67,25 @@
 
 static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
 {
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     switch( rRedl.GetType() )
     {
-    case nsRedlineType_t::REDLINE_INSERT:   nResId = STR_REDLINE_INSERT; break;
-    case nsRedlineType_t::REDLINE_DELETE:   nResId = STR_REDLINE_DELETE; break;
-    case nsRedlineType_t::REDLINE_FORMAT:   nResId = STR_REDLINE_FORMAT; break;
-    case nsRedlineType_t::REDLINE_TABLE:        nResId = STR_REDLINE_TABLE; break;
-    case nsRedlineType_t::REDLINE_FMTCOLL:  nResId = STR_REDLINE_FMTCOLL; break;
-    case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: nResId = STR_REDLINE_PARAGRAPH_FORMAT; break;
-    case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: nResId = STR_REDLINE_TABLE_ROW_INSERT; break;
-    case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: nResId = STR_REDLINE_TABLE_ROW_DELETE; break;
-    case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: nResId = STR_REDLINE_TABLE_CELL_INSERT; break;
-    case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: nResId = STR_REDLINE_TABLE_CELL_DELETE; break;
+    case nsRedlineType_t::REDLINE_INSERT:   pResId = STR_REDLINE_INSERT; break;
+    case nsRedlineType_t::REDLINE_DELETE:   pResId = STR_REDLINE_DELETE; break;
+    case nsRedlineType_t::REDLINE_FORMAT:   pResId = STR_REDLINE_FORMAT; break;
+    case nsRedlineType_t::REDLINE_TABLE:    pResId = STR_REDLINE_TABLE; break;
+    case nsRedlineType_t::REDLINE_FMTCOLL:  pResId = STR_REDLINE_FMTCOLL; break;
+    case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: pResId = STR_REDLINE_PARAGRAPH_FORMAT; break;
+    case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: pResId = STR_REDLINE_TABLE_ROW_INSERT; break;
+    case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: pResId = STR_REDLINE_TABLE_ROW_DELETE; break;
+    case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: pResId = STR_REDLINE_TABLE_CELL_INSERT; break;
+    case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: pResId = STR_REDLINE_TABLE_CELL_DELETE; break;
     }
 
     OUStringBuffer sBuf;
-    if( nResId )
+    if (pResId)
     {
-        sBuf.append(SwResId(nResId));
+        sBuf.append(SwResId(pResId));
         sBuf.append(": ");
         sBuf.append(rRedl.GetAuthorString());
         sBuf.append(" - ");
@@ -393,37 +393,37 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
         if( bContinue )
         {
             SwTab nTabCols = rSh.WhichMouseTabCol(aPos);
-            sal_uInt16 nTabRes = 0;
+            const char* pTabRes = nullptr;
             switch(nTabCols)
             {
                 case SwTab::COL_HORI:
                 case SwTab::COL_VERT:
-                    nTabRes = STR_TABLE_COL_ADJUST;
+                    pTabRes = STR_TABLE_COL_ADJUST;
                     break;
                 case SwTab::ROW_HORI:
                 case SwTab::ROW_VERT:
-                    nTabRes = STR_TABLE_ROW_ADJUST;
+                    pTabRes = STR_TABLE_ROW_ADJUST;
                     break;
                 // #i32329# Enhanced table selection
                 case SwTab::SEL_HORI:
                 case SwTab::SEL_HORI_RTL:
                 case SwTab::SEL_VERT:
-                    nTabRes = STR_TABLE_SELECT_ALL;
+                    pTabRes = STR_TABLE_SELECT_ALL;
                     break;
                 case SwTab::ROWSEL_HORI:
                 case SwTab::ROWSEL_HORI_RTL:
                 case SwTab::ROWSEL_VERT:
-                    nTabRes = STR_TABLE_SELECT_ROW;
+                    pTabRes = STR_TABLE_SELECT_ROW;
                     break;
                 case SwTab::COLSEL_HORI:
                 case SwTab::COLSEL_VERT:
-                    nTabRes = STR_TABLE_SELECT_COL;
+                    pTabRes = STR_TABLE_SELECT_COL;
                     break;
                 case SwTab::COL_NONE: break; // prevent compiler warning
             }
-            if(nTabRes)
+            if (pTabRes)
             {
-                sText = SwResId(nTabRes);
+                sText = SwResId(pTabRes);
                 Size aTextSize( GetTextWidth(sText), GetTextHeight());
                 tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize);
                 OUString sDisplayText(ClipLongToolTip(sText));
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 64f90004230e..591e655f6d7c 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -45,7 +45,7 @@
 
 #include <cmdid.h>
 #include <helpid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 56fbc75cae0e..0ee6d59a50ef 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -21,7 +21,6 @@
 #include <comphelper/string.hxx>
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
-#include <tools/resid.hxx>
 #include <sfx2/app.hxx>
 #include <editeng/paperinf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -29,9 +28,9 @@
 #include <swmodule.hxx>
 #include <swtypes.hxx>
 #include <envimg.hxx>
+#include "strings.hrc"
 
 #include <cmdid.h>
-#include <envelp.hrc>
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index ceeb44caf3d8..b95ff4100e23 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -21,7 +21,6 @@
 
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
-#include <tools/resid.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <unotools/useroptions.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 1237d50a3076..51b3f157e3b2 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -24,7 +24,7 @@
 #include "swmodule.hxx"
 #include "view.hxx"
 #include "edtwin.hxx"
-#include "label.hrc"
+#include "strings.hrc"
 
 #include "syncbtn.hxx"
 #include "swtypes.hxx"
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index f540d076c1a1..729d3c9cbcf5 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -35,12 +35,15 @@
 #include <comphelper/string.hxx>
 #include <editeng/unolingu.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <tools/resary.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/strarray.hxx>
 #include <basic/basmgr.hxx>
 #include <editeng/langitem.hxx>
 #include <svl/macitem.hxx>
@@ -74,6 +77,7 @@
 #include <fldmgr.hxx>
 #include <flddropdown.hxx>
 #include <fldui.hrc>
+#include <strings.hrc>
 #include <tox.hxx>
 #include <misc.hrc>
 #include <cnttab.hxx>
@@ -136,70 +140,214 @@ static const sal_uInt16 VF_COUNT = 1; // { 0 }
 static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD }
 static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT }
 
+static const char* FLD_EU_ARY[] =
+{
+    FLD_EU_FIRMA,
+    FLD_EU_VORNAME,
+    FLD_EU_NAME,
+    FLD_EU_ABK,
+    FLD_EU_STRASSE,
+    FLD_EU_LAND,
+    FLD_EU_PLZ,
+    FLD_EU_ORT,
+    FLD_EU_TITEL,
+    FLD_EU_POS,
+    FLD_EU_TELPRIV,
+    FLD_EU_TELFIRMA,
+    FLD_EU_FAX,
+    FLD_EU_EMAIL,
+    FLD_EU_STATE
+};
+
+static const char* FMT_AUTHOR_ARY[] =
+{
+    FMT_AUTHOR_NAME,
+    FMT_AUTHOR_SCUT
+};
+
+static const char* FLD_DATE_ARY[] =
+{
+    FLD_DATE_FIX,
+    FLD_DATE_STD,
+};
+
+static const char* FLD_TIME_ARY[] =
+{
+    FLD_TIME_FIX,
+    FLD_TIME_STD
+};
+
+static const char* FMT_NUM_ARY[] =
+{
+    FMT_NUM_ABC,
+    FMT_NUM_SABC,
+    FMT_NUM_ABC_N,
+    FMT_NUM_SABC_N,
+    FMT_NUM_ROMAN,
+    FMT_NUM_SROMAN,
+    FMT_NUM_ARABIC,
+    FMT_NUM_PAGEDESC,
+    FMT_NUM_PAGESPECIAL
+};
+
+static const char* FMT_FF_ARY[] =
+{
+    FMT_FF_NAME,
+    FMT_FF_PATHNAME,
+    FMT_FF_PATH,
+    FMT_FF_NAME_NOEXT,
+    FMT_FF_UI_NAME,
+    FMT_FF_UI_RANGE
+};
+
+static const char* FLD_STAT_ARY[] =
+{
+    FLD_STAT_PAGE,
+    FLD_STAT_PARA,
+    FLD_STAT_WORD,
+    FLD_STAT_CHAR,
+    FLD_STAT_TABLE,
+    FLD_STAT_GRF,
+    FLD_STAT_OBJ
+};
+
+static const char* FMT_CHAPTER_ARY[] =
+{
+    FMT_CHAPTER_NO,
+    FMT_CHAPTER_NAME,
+    FMT_CHAPTER_NAMENO,
+    FMT_CHAPTER_NO_NOSEPARATOR
+};
+
+static const char* FLD_INPUT_ARY[] =
+{
+    FLD_INPUT_TEXT
+};
+
+static const char* FMT_MARK_ARY[] =
+{
+    FMT_MARK_TEXT,
+    FMT_MARK_TABLE,
+    FMT_MARK_FRAME,
+    FMT_MARK_GRAFIC,
+    FMT_MARK_OLE
+};
+
+static const char* FMT_REF_ARY[] =
+{
+    FMT_REF_PAGE,
+    FMT_REF_CHAPTER,
+    FMT_REF_TEXT,
+    FMT_REF_UPDOWN,
+    FMT_REF_PAGE_PGDSC,
+    FMT_REF_ONLYNUMBER,
+    FMT_REF_ONLYCAPTION,
+    FMT_REF_ONLYSEQNO,
+    FMT_REF_NUMBER,
+    FMT_REF_NUMBER_NO_CONTEXT,
+    FMT_REF_NUMBER_FULL_CONTEXT
+};
+
+static const char* FMT_DBFLD_ARY[] =
+{
+    FMT_DBFLD_DB,
+    FMT_DBFLD_SYS
+};
+
+static const char* FMT_SETVAR_ARY[] =
+{
+    FMT_SETVAR_SYS,
+    FMT_SETVAR_TEXT
+};
+
+static const char* FMT_GETVAR_ARY[] =
+{
+    FMT_GETVAR_TEXT,
+    FMT_GETVAR_NAME
+};
+
+static const char* FMT_DDE_ARY[] =
+{
+    FMT_DDE_NORMAL,
+    FMT_DDE_HOT
+};
+
+static const char* FLD_PAGEREF_ARY[] =
+{
+    FLD_PAGEREF_OFF,
+    FLD_PAGEREF_ON
+};
+
+static const char* FMT_USERVAR_ARY[] =
+{
+    FMT_USERVAR_TEXT,
+    FMT_USERVAR_CMD
+};
+
 // field types and subtypes
 struct SwFieldPack
 {
-    sal_uInt16  nTypeId;
+    sal_uInt16   nTypeId;
 
-    sal_uInt16  nSubTypeStart;
-    sal_uInt16  nSubTypeEnd;
+    const char** pSubTypeResIds;
+    size_t       nSubTypeLength;
 
-    sal_uLong   nFormatBegin;
-    sal_uLong   nFormatEnd;
+    const char** pFormatResIds;
+    size_t       nFormatLength;
 };
 
 // strings and formats
 static const SwFieldPack aSwFields[] =
 {
     // Document
-    { TYP_EXTUSERFLD,       FLD_EU_BEGIN,       FLD_EU_END,     0,                  0 },
-    { TYP_AUTHORFLD,        0,                  0,              FMT_AUTHOR_BEGIN,   FMT_AUTHOR_END },
-    { TYP_DATEFLD,          FLD_DATE_BEGIN,     FLD_DATE_END,   0,                  0 },
-    { TYP_TIMEFLD,          FLD_TIME_BEGIN,     FLD_TIME_END,   0,                  0 },
-    { TYP_PAGENUMBERFLD,    0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END-1 },
-    { TYP_NEXTPAGEFLD,      0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END },
-    { TYP_PREVPAGEFLD,      0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END },
-    { TYP_FILENAMEFLD,      0,                  0,              FMT_FF_BEGIN,       FMT_FF_END },
-    { TYP_DOCSTATFLD,       FLD_STAT_BEGIN,     FLD_STAT_END,   FMT_NUM_BEGIN,      FMT_NUM_END-1 },
-
-    { TYP_CHAPTERFLD,       0,                  0,              FMT_CHAPTER_BEGIN,  FMT_CHAPTER_END },
-    { TYP_TEMPLNAMEFLD,     0,                  0,              FMT_FF_BEGIN,       FMT_FF_END },
+    { TYP_EXTUSERFLD,       FLD_EU_ARY,         SAL_N_ELEMENTS(FLD_EU_ARY),     nullptr,          0 },
+    { TYP_AUTHORFLD,        nullptr,            0,                              FMT_AUTHOR_ARY,   SAL_N_ELEMENTS(FMT_AUTHOR_ARY) },
+    { TYP_DATEFLD,          FLD_DATE_ARY,       SAL_N_ELEMENTS(FLD_DATE_ARY),   nullptr,          0 },
+    { TYP_TIMEFLD,          FLD_TIME_ARY,       SAL_N_ELEMENTS(FLD_TIME_ARY),   nullptr,          0 },
+    { TYP_PAGENUMBERFLD,    nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) -1 },
+    { TYP_NEXTPAGEFLD,      nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) },
+    { TYP_PREVPAGEFLD,      nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) },
+    { TYP_FILENAMEFLD,      nullptr,            0,                              FMT_FF_ARY,       SAL_N_ELEMENTS(FMT_FF_ARY) },
+    { TYP_DOCSTATFLD,       FLD_STAT_ARY,       SAL_N_ELEMENTS(FLD_STAT_ARY),   FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) -1 },
+
+    { TYP_CHAPTERFLD,       nullptr,            0,                              FMT_CHAPTER_ARY,  SAL_N_ELEMENTS(FMT_CHAPTER_ARY) },
+    { TYP_TEMPLNAMEFLD,     nullptr,            0,                              FMT_FF_ARY,       SAL_N_ELEMENTS(FMT_FF_ARY) },
 
     // Functions
-    { TYP_CONDTXTFLD,       0,                  0,              0,                  0 },
-    { TYP_DROPDOWN,         0,                  0,              0,                  0 },
-    { TYP_INPUTFLD,         FLD_INPUT_BEGIN,    FLD_INPUT_END,  0,                  0 },
-    { TYP_MACROFLD,         0,                  0,              0,                  0 },
-    { TYP_JUMPEDITFLD,      0,                  0,              FMT_MARK_BEGIN,     FMT_MARK_END },
-    { TYP_COMBINED_CHARS,   0,                  0,              0,                  0 },
-    { TYP_HIDDENTXTFLD,     0,                  0,              0,                  0 },
-    { TYP_HIDDENPARAFLD,    0,                  0,              0,                  0 },
+    { TYP_CONDTXTFLD,       nullptr,            0,                              nullptr,          0 },
+    { TYP_DROPDOWN,         nullptr,            0,                              nullptr,          0 },
+    { TYP_INPUTFLD,         FLD_INPUT_ARY,      SAL_N_ELEMENTS(FLD_INPUT_ARY),  nullptr,          0 },
+    { TYP_MACROFLD,         nullptr,            0,                              nullptr,          0 },
+    { TYP_JUMPEDITFLD,      nullptr,            0,                              FMT_MARK_ARY,     SAL_N_ELEMENTS(FMT_MARK_ARY) },
+    { TYP_COMBINED_CHARS,   nullptr,            0,                              nullptr,          0 },
+    { TYP_HIDDENTXTFLD,     nullptr,            0,                              nullptr,          0 },
+    { TYP_HIDDENPARAFLD,    nullptr,            0,                              nullptr,          0 },
 
     // Cross-References
-    { TYP_SETREFFLD,        0,                  0,              0,                  0 },
-    { TYP_GETREFFLD,        0,                  0,              FMT_REF_BEGIN,      FMT_REF_END },
+    { TYP_SETREFFLD,        nullptr,            0,                              nullptr,          0 },
+    { TYP_GETREFFLD,        nullptr,            0,                              FMT_REF_ARY,      SAL_N_ELEMENTS(FMT_REF_ARY) },
 
     // DocInformation
-    { TYP_DOCINFOFLD,       0,                  0,              FMT_REG_BEGIN,      FMT_REG_END },
+    { TYP_DOCINFOFLD,       nullptr,            0,                              FMT_REF_ARY,      SAL_N_ELEMENTS(FMT_REF_ARY) },
 
     // Database
-    { TYP_DBFLD,            0,                  0,              FMT_DBFLD_BEGIN,    FMT_DBFLD_END },
-    { TYP_DBNEXTSETFLD,     0,                  0,              0,                  0 },
-    { TYP_DBNUMSETFLD,      0,                  0,              0,                  0 },
-    { TYP_DBSETNUMBERFLD,   0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END-2 },
-    { TYP_DBNAMEFLD,        0,                  0,              0,                  0 },
+    { TYP_DBFLD,            nullptr,            0,                              FMT_DBFLD_ARY,    SAL_N_ELEMENTS(FMT_DBFLD_ARY) },
+    { TYP_DBNEXTSETFLD,     nullptr,            0,                              nullptr,          0 },
+    { TYP_DBNUMSETFLD,      nullptr,            0,                              nullptr,          0 },
+    { TYP_DBSETNUMBERFLD,   nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
+    { TYP_DBNAMEFLD,        nullptr,            0,                              nullptr,          0 },
 
     // Variables
-    { TYP_SETFLD,           0,                  0,              FMT_SETVAR_BEGIN,   FMT_SETVAR_END },
-
-    { TYP_GETFLD,           0,                  0,              FMT_GETVAR_BEGIN,   FMT_GETVAR_END },
-    { TYP_DDEFLD,           0,                  0,              FMT_DDE_BEGIN,      FMT_DDE_END },
-    { TYP_FORMELFLD,        0,                  0,              FMT_GETVAR_BEGIN,   FMT_GETVAR_END },
-    { TYP_INPUTFLD,         FLD_INPUT_BEGIN,    FLD_INPUT_END,  0,                  0 },
-    { TYP_SEQFLD,           0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END-2 },
-    { TYP_SETREFPAGEFLD,    FLD_PAGEREF_BEGIN,  FLD_PAGEREF_END,0,                  0 },
-    { TYP_GETREFPAGEFLD,    0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END-1 },
-    { TYP_USERFLD,          0,                  0,              FMT_USERVAR_BEGIN,  FMT_USERVAR_END }
+    { TYP_SETFLD,           nullptr,            0,                              FMT_SETVAR_ARY,   SAL_N_ELEMENTS(FMT_SETVAR_ARY) },
+
+    { TYP_GETFLD,           nullptr,            0,                              FMT_GETVAR_ARY,   SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
+    { TYP_DDEFLD,           nullptr,            0,                              FMT_DDE_ARY,      SAL_N_ELEMENTS(FMT_DDE_ARY) },
+    { TYP_FORMELFLD,        nullptr,            0,                              FMT_GETVAR_ARY,   SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
+    { TYP_INPUTFLD,         FLD_INPUT_ARY,      SAL_N_ELEMENTS(FLD_INPUT_ARY),  nullptr,          0 },
+    { TYP_SEQFLD,           nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
+    { TYP_SETREFPAGEFLD,    FLD_PAGEREF_ARY,    SAL_N_ELEMENTS(FLD_PAGEREF_ARY),nullptr,          0 },
+    { TYP_GETREFPAGEFLD,    nullptr,            0,                              FMT_NUM_ARY,      SAL_N_ELEMENTS(FMT_NUM_ARY) - 1 },
+    { TYP_USERFLD,          nullptr,            0,                              FMT_USERVAR_ARY,  SAL_N_ELEMENTS(FMT_USERVAR_ARY) }
 };
 
 // access to the shell
@@ -442,7 +590,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
             }
             case TYP_INPUTFLD:
             {
-                rToFill.push_back(SwResId(aSwFields[nPos].nSubTypeStart));
+                rToFill.push_back(SwResId(aSwFields[nPos].pSubTypeResIds[0]));
                 SAL_FALLTHROUGH; // move on at generic types
             }
             case TYP_DDEFLD:
@@ -497,7 +645,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                     if (nTypeId == TYP_DOCINFOFLD)
                         nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN;
                     else
-                        nCount = aSwFields[nPos].nSubTypeEnd - aSwFields[nPos].nSubTypeStart;
+                        nCount = aSwFields[nPos].nSubTypeLength;
 
                     for(sal_uInt16 i = 0; i < nCount; ++i)
                     {
@@ -505,12 +653,12 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                         if (nTypeId == TYP_DOCINFOFLD)
                         {
                             if ( i == DI_CUSTOM )
-                                sNew = SwResId( STR_CUSTOM );
+                                sNew = SwResId(STR_CUSTOM_FIELD);
                             else
                                 sNew = SwViewShell::GetShellRes()->aDocInfoLst[i];
                         }
                         else
-                            sNew = SwResId(aSwFields[nPos].nSubTypeStart + i);
+                            sNew = SwResId(aSwFields[nPos].pSubTypeResIds[i]);
 
                         rToFill.push_back(sNew);
                     }
@@ -528,45 +676,46 @@ sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const
     {
         const sal_uInt16 nPos = GetPos(nTypeId);
 
-        if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD))
+        if (nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD))
             return 0;
 
-        sal_uLong nStart = aSwFields[nPos].nFormatBegin;
-        sal_uLong nEnd   = aSwFields[nPos].nFormatEnd;
+        sal_uInt16 nCount = aSwFields[nPos].nFormatLength;
 
         if (nTypeId == TYP_FILENAMEFLD)
-            nEnd -= 2;  // no range or template
-
-        switch(nStart)
+            nCount -= 2;  // no range or template
+
+        const char** pStart = aSwFields[nPos].pFormatResIds;
+        if (!pStart)
+            return nCount;
+
+        if (strcmp(*pStart, FMT_GETVAR_ARY[0]) == 0 || strcmp(*pStart, FMT_SETVAR_ARY[0]) == 0)
+            return VF_COUNT;
+        else if (strcmp(*pStart, FMT_USERVAR_ARY[0]) == 0)
+            return VF_USR_COUNT;
+        else if (strcmp(*pStart, FMT_DBFLD_ARY[0]) == 0)
+            return VF_DB_COUNT;
+        else if (strcmp(*pStart, FMT_NUM_ARY[0]) == 0)
         {
-            case FMT_GETVAR_BEGIN:
-            case FMT_SETVAR_BEGIN:  return VF_COUNT;
-            case FMT_USERVAR_BEGIN: return VF_USR_COUNT;
-            case FMT_DBFLD_BEGIN:   return VF_DB_COUNT;
-            case FMT_NUM_BEGIN:
+            GetNumberingInfo();
+            if(xNumberingInfo.is())
             {
-                sal_uInt16 nCount = (sal_uInt16)(nEnd - nStart);
-                GetNumberingInfo();
-                if(xNumberingInfo.is())
+                Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+                const sal_Int16* pTypes = aTypes.getConstArray();
+                for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
                 {
-                    Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
-                    const sal_Int16* pTypes = aTypes.getConstArray();
-                    for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+                    sal_Int16 nCurrent = pTypes[nType];
+                    //skip all values below or equal to CHARS_LOWER_LETTER_N
+                    if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
                     {
-                        sal_Int16 nCurrent = pTypes[nType];
-                        //skip all values below or equal to CHARS_LOWER_LETTER_N
-                        if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
-                        {
-                            // #i28073# it's not necessarily a sorted sequence
-                            ++nCount;
-                        }
+                        // #i28073# it's not necessarily a sorted sequence
+                        ++nCount;
                     }
                 }
-                return nCount;
             }
-
+            return nCount;
         }
-        return (sal_uInt16)(nEnd - nStart);
+
+        return nCount;
     }
 }
 
@@ -576,42 +725,39 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
     const sal_uInt16 nPos = GetPos(nTypeId);
 
-    if(nPos == USHRT_MAX)
+    if (nPos == USHRT_MAX)
         return OUString();
 
-    sal_uLong nStart;
-
-    nStart = aSwFields[nPos].nFormatBegin;
+    const char** pStart = aSwFields[nPos].pFormatResIds;
+    if (!pStart)
+        return OUString();
 
     if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId)
         nFormatId &= ~FF_FIXED;     // mask out Fixed-Flag
 
-    if((nStart + nFormatId) < aSwFields[nPos].nFormatEnd)
-        return SwResId((sal_uInt16)(nStart + nFormatId));
+    if (nFormatId < aSwFields[nPos].nFormatLength)
+        return SwResId(pStart[nFormatId]);
 
     OUString aRet;
-    if( FMT_NUM_BEGIN == nStart)
+    if (strcmp(*pStart, FMT_NUM_ARY[0]))
     {
-        if(xNumberingInfo.is())
+        if (xNumberingInfo.is())
         {
-            ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
-
             Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
             const sal_Int16* pTypes = aTypes.getConstArray();
-            sal_Int32 nOffset = aSwFields[nPos].nFormatEnd - nStart;
             sal_Int32 nValidEntry = 0;
-            for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+            for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
             {
                 sal_Int16 nCurrent = pTypes[nType];
                 if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N &&
                         (nCurrent != (NumberingType::BITMAP | LINK_TOKEN)))
                 {
-                    if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
+                    if (nValidEntry == ((sal_Int32)nFormatId))
                     {
-                        sal_uInt32 n = aNames.FindIndex(pTypes[nType]);
+                        sal_uInt32 n = SvxNumberingTypeTable::FindIndex(pTypes[nType]);
                         if (n != RESARRAY_INDEX_NOTFOUND)
                         {
-                            aRet = aNames.GetString(n);
+                            aRet = SvxNumberingTypeTable::GetString(n);
                         }
                         else
                         {
@@ -634,74 +780,80 @@ sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) cons
     sal_uInt16 nId = (sal_uInt16)nFormatId;
     switch( nTypeId )
     {
-    case TYP_DOCINFOFLD:
-        switch( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
+        case TYP_DOCINFOFLD:
         {
-        case FMT_REG_AUTHOR:    nId = DI_SUB_AUTHOR;    break;
-        case FMT_REG_TIME:      nId = DI_SUB_TIME;      break;
-        case FMT_REG_DATE:      nId = DI_SUB_DATE;      break;
+            const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]);
+            if (sId == FMT_REG_AUTHOR)
+                nId = DI_SUB_AUTHOR;
+            else if (sId == FMT_REG_TIME)
+                nId = DI_SUB_TIME;
+            else if (sId == FMT_REG_DATE)
+                nId = DI_SUB_DATE;
+            break;
         }
-        break;
-
-    case TYP_PAGENUMBERFLD:
-    case TYP_NEXTPAGEFLD:
-    case TYP_PREVPAGEFLD:
-    case TYP_DOCSTATFLD:
-    case TYP_DBSETNUMBERFLD:
-    case TYP_SEQFLD:
-    case TYP_GETREFPAGEFLD:
-    {
-        sal_uInt16 nPos = GetPos( nTypeId );
-        sal_uLong nBegin = aSwFields[ nPos ].nFormatBegin;
-        sal_uLong nEnd = aSwFields[nPos].nFormatEnd;
-        if((nBegin + nFormatId) < nEnd)
+        case TYP_PAGENUMBERFLD:
+        case TYP_NEXTPAGEFLD:
+        case TYP_PREVPAGEFLD:
+        case TYP_DOCSTATFLD:
+        case TYP_DBSETNUMBERFLD:
+        case TYP_SEQFLD:
+        case TYP_GETREFPAGEFLD:
         {
-            switch( nBegin + nFormatId )
+            sal_uInt16 nPos = GetPos(nTypeId);
+            if (nFormatId < aSwFields[nPos].nFormatLength)
             {
-            case FMT_NUM_ABC:               nId = SVX_NUM_CHARS_UPPER_LETTER;   break;
-            case FMT_NUM_SABC:              nId = SVX_NUM_CHARS_LOWER_LETTER;   break;
-            case FMT_NUM_ROMAN:             nId = SVX_NUM_ROMAN_UPPER;          break;
-            case FMT_NUM_SROMAN:            nId = SVX_NUM_ROMAN_LOWER;          break;
-            case FMT_NUM_ARABIC:            nId = SVX_NUM_ARABIC;               break;
-            case FMT_NUM_PAGEDESC:          nId = SVX_NUM_PAGEDESC;             break;
-            case FMT_NUM_PAGESPECIAL:       nId = SVX_NUM_CHAR_SPECIAL;         break;
-            case FMT_NUM_ABC_N:             nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
-            case FMT_NUM_SABC_N:            nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+                const OString sId(aSwFields[nPos].pFormatResIds[nFormatId]);
+                if (sId == FMT_NUM_ABC)
+                    nId = SVX_NUM_CHARS_UPPER_LETTER;
+                else if (sId == FMT_NUM_SABC)
+                    nId = SVX_NUM_CHARS_LOWER_LETTER;
+                else if (sId == FMT_NUM_ROMAN)
+                    nId = SVX_NUM_ROMAN_UPPER;
+                else if (sId == FMT_NUM_SROMAN)
+                    nId = SVX_NUM_ROMAN_LOWER;
+                else if (sId == FMT_NUM_ARABIC)
+                    nId = SVX_NUM_ARABIC;
+                else if (sId == FMT_NUM_PAGEDESC)
+                    nId = SVX_NUM_PAGEDESC;
+                else if (sId == FMT_NUM_PAGESPECIAL)
+                    nId = SVX_NUM_CHAR_SPECIAL;
+                else if (sId == FMT_NUM_ABC_N)
+                    nId = SVX_NUM_CHARS_UPPER_LETTER_N;
+                else if (sId == FMT_NUM_SABC_N)
+                    nId = SVX_NUM_CHARS_LOWER_LETTER_N;
             }
-        }
-        else if(xNumberingInfo.is())
-        {
-            Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
-            const sal_Int16* pTypes = aTypes.getConstArray();
-            sal_Int32 nOffset = nEnd - nBegin;
-            sal_Int32 nValidEntry = 0;
-            for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+            else if (xNumberingInfo.is())
             {
-                sal_Int16 nCurrent = pTypes[nType];
-                if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+                Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+                const sal_Int16* pTypes = aTypes.getConstArray();
+                sal_Int32 nValidEntry = 0;
+                for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
                 {
-                    if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
+                    sal_Int16 nCurrent = pTypes[nType];
+                    if (nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
                     {
-                        nId = pTypes[nType];
-                        break;
+                        if (nValidEntry == ((sal_Int32)nFormatId))
+                        {
+                            nId = pTypes[nType];
+                            break;
+                        }
+                        ++nValidEntry;
                     }
-                    ++nValidEntry;
                 }
             }
+            break;
         }
-    }
-    break;
-    case TYP_DDEFLD:
-        switch ( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
+        case TYP_DDEFLD:
         {
-        case FMT_DDE_NORMAL:    nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL); break;
-        case FMT_DDE_HOT:       nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS); break;
+            const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]);
+            if (sId == FMT_DDE_NORMAL)
+                nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL);
+            else if (sId == FMT_DDE_HOT)
+                nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS);
+            break;
         }
-        break;
     }
-
     return nId;
-
 }
 
 // Traveling
@@ -1558,7 +1710,8 @@ LanguageType SwFieldMgr::GetCurrLanguage() const
 
 void SwFieldType::GetFieldName_()
 {
-    static const sal_uInt16 coFieldNms[] = {
+    static const char* coFieldNms[] =
+    {
         FLD_DATE_STD,
         FLD_TIME_STD,
         STR_FILENAMEFLD,
@@ -1602,15 +1755,15 @@ void SwFieldType::GetFieldName_()
         STR_AUTHORITY,
         STR_COMBINED_CHARS,
         STR_DROPDOWN,
-        STR_CUSTOM
+        STR_CUSTOM_FIELD
     };
 
     // insert infos for fields
     SwFieldType::s_pFieldNames = new std::vector<OUString>;
     SwFieldType::s_pFieldNames->reserve(SAL_N_ELEMENTS(coFieldNms));
-    for(sal_uInt16 i : coFieldNms)
+    for (const char* id : coFieldNms)
     {
-        const OUString aTmp(SwResId( i ));
+        const OUString aTmp(SwResId(id));
         SwFieldType::s_pFieldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp ));
     }
 }
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index f18c6c367e99..2eca08044016 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -25,7 +25,7 @@
 #include "swtypes.hxx"
 #include "shellio.hxx"
 #include "globdoc.hxx"
-#include "globdoc.hrc"
+#include "strings.hrc"
 #include "cfgid.h"
 
 // Description: Register all filters
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
deleted file mode 100644
index c337f0f63191..000000000000
--- a/sw/source/uibase/inc/app.hrc
+++ /dev/null
@@ -1,107 +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_SW_SOURCE_UIBASE_INC_APP_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_APP_HRC
-
-#include "rcid.hrc"
-
-#define STR_CANTCREATE                  (RC_APP_BEGIN + 4)
-#define STR_CANTOPEN                    (RC_APP_BEGIN + 5)
-
-#define STR_VERSION                     (RC_APP_BEGIN + 14)
-
-// Strings for regions in the configuration
-#define STR_PAGEOFFSET                  (RC_APP_BEGIN + 74)
-#define STR_PAGEBREAK                   (RC_APP_BEGIN + 75)
-#define STR_REDLINE_UNKNOWN_AUTHOR      (RC_APP_BEGIN + 76)
-#define STR_WESTERN_FONT                (RC_APP_BEGIN + 77)
-#define STR_CJK_FONT                    (RC_APP_BEGIN + 78)
-#define STR_DELETE_NOTE_AUTHOR          (RC_APP_BEGIN + 79)
-#define STR_HIDE_NOTE_AUTHOR            (RC_APP_BEGIN + 80)
-
-#define STR_ENV_TITLE                   (RC_APP_BEGIN + 91)
-#define STR_LAB_TITLE                   (RC_APP_BEGIN + 92)
-
-#define STR_HUMAN_SWDOC_NAME            (RC_APP_BEGIN + 93)
-
-#define RID_SW_ERRHDL                   (RC_APP_BEGIN + 95)
-
-#define STR_FDLG_TEMPLATE_NAME          (RC_APP_BEGIN + 2)
-
-#define STR_WRITER_DOCUMENT_FULLTYPE    (RC_APP_BEGIN + 100)
-#define STR_CONVERT_TEXT_TABLE          (RC_APP_BEGIN + 101)
-#define STR_ABSTRACT_TITLE              (RC_APP_BEGIN + 102)
-#define STR_OUTLINE_NUMBERING           (RC_APP_BEGIN + 104)
-#define STR_FDLG_OUTLINE_LEVEL          (RC_APP_BEGIN + 105)
-#define STR_FDLG_STYLE                  (RC_APP_BEGIN + 106)
-
-// Status bar strings
-#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110)
-#define STR_STATUSBAR_WORDCOUNT              (RC_APP_BEGIN + 111)
-
-#define STR_ADD_AUTOFORMAT_TITLE        (RC_APP_BEGIN + 112)
-#define STR_ADD_AUTOFORMAT_LABEL        (RC_APP_BEGIN + 113)
-#define STR_DEL_AUTOFORMAT_TITLE        (RC_APP_BEGIN + 114)
-#define STR_DEL_AUTOFORMAT_MSG          (RC_APP_BEGIN + 115)
-#define STR_RENAME_AUTOFORMAT_TITLE     (RC_APP_BEGIN + 116)
-#define STR_BTN_AUTOFORMAT_CLOSE        (RC_APP_BEGIN + 117)
-#define STR_INVALID_AUTOFORMAT_NAME     (RC_APP_BEGIN + 118)
-#define STR_JAN                         (RC_APP_BEGIN + 119)
-#define STR_FEB                         (RC_APP_BEGIN + 120)
-#define STR_MAR                         (RC_APP_BEGIN + 121)
-#define STR_NORTH                       (RC_APP_BEGIN + 122)
-#define STR_MID                         (RC_APP_BEGIN + 123)
-#define STR_SOUTH                       (RC_APP_BEGIN + 124)
-#define STR_SUM                         (RC_APP_BEGIN + 125)
-#define STR_NUMERIC                     (RC_APP_BEGIN + 126)
-#define STR_COL                         (RC_APP_BEGIN + 127)
-#define STR_ROW                         (RC_APP_BEGIN + 128)
-#define STR_AUTHMRK_EDIT                (RC_APP_BEGIN + 130)
-#define STR_AUTHMRK_INSERT              (RC_APP_BEGIN + 131)
-#define STR_CAPTION_TABLE               (RC_APP_BEGIN + 133)
-#define STR_CAPTION_FRAME               (RC_APP_BEGIN + 134)
-#define STR_CAPTION_GRAPHIC             (RC_APP_BEGIN + 135)
-#define STR_CAPTION_OLE                 (RC_APP_BEGIN + 136)
-#define STR_ERR_TABLE_MERGE             (RC_APP_BEGIN + 137)
-#define STR_WRONG_TABLENAME             (RC_APP_BEGIN + 138)
-#define STR_SRTERR                      (RC_APP_BEGIN + 139)
-
-#define STR_PARAGRAPHSTYLEFAMILY        (RC_APP_BEGIN + 140)
-#define STR_CHARACTERSTYLEFAMILY        (RC_APP_BEGIN + 141)
-#define STR_FRAMESTYLEFAMILY            (RC_APP_BEGIN + 142)
-#define STR_PAGESTYLEFAMILY             (RC_APP_BEGIN + 143)
-#define STR_LISTSTYLEFAMILY             (RC_APP_BEGIN + 144)
-#define STR_TABLESTYLEFAMILY            (RC_APP_BEGIN + 145)
-#define RID_PARAGRAPHSTYLEFAMILY        (RC_APP_BEGIN + 146)
-#define RID_CHARACTERSTYLEFAMILY        (RC_APP_BEGIN + 147)
-#define RID_FRAMESTYLEFAMILY            (RC_APP_BEGIN + 148)
-#define RID_PAGESTYLEFAMILY             (RC_APP_BEGIN + 149)
-#define RID_LISTSTYLEFAMILY             (RC_APP_BEGIN + 150)
-#define RID_TABLESTYLEFAMILY            (RC_APP_BEGIN + 151)
-
-#define APP_ACT_END                 RID_TABLESTYLEFAMILY
-
-#if APP_ACT_END > RC_APP_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index d9c63a78ba03..504edf633605 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -30,7 +30,6 @@
 #include "tox.hxx"
 #include <toxmgr.hxx>
 #include <svx/checklbx.hxx>
-#include <tools/resary.hxx>
 #include <svtools/treelistbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <svx/langbox.hxx>
@@ -64,18 +63,6 @@ struct CurTOXType
     CurTOXType (TOXTypes t) : eType (t), nIndex (0) {};
 };
 
-class SwOLENames
-{
-    ResStringArray aNamesAry;
-public:
-    SwOLENames(const ResId& rResId)
-        : aNamesAry(rResId)
-    {
-    }
-
-    ResStringArray& GetNames() { return aNamesAry;}
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 9aa04255aab4..aa7d0916a047 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -89,9 +89,6 @@ class SwFramePage: public SfxTabPage
     // example
     VclPtr<SvxSwFrameExample>  m_pExampleWN;
 
-    //'string provider'
-    SvxSwFramePosString m_aFramePosString;
-
     bool            m_bAtHorzPosModified;
     bool            m_bAtVertPosModified;
 
@@ -166,7 +163,7 @@ class SwFramePage: public SfxTabPage
                                const sal_Int16 _nRel,
                                ListBox& _rLB,
                                FixedText& _rFT );
-    sal_Int32       GetMapPos( const FrameMap *pMap, ListBox &rAlignLB );
+    static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox &rAlignLB);
     static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
     static sal_Int16 GetRelation(FrameMap *pMap, ListBox &rRelationLB);
     RndStdIds       GetAnchor();
diff --git a/sw/source/uibase/inc/frmui.hrc b/sw/source/uibase/inc/frmui.hrc
index 22fff4967fd8..6d8fbf133db1 100644
--- a/sw/source/uibase/inc/frmui.hrc
+++ b/sw/source/uibase/inc/frmui.hrc
@@ -25,29 +25,8 @@
 
 #define DLG_COLUMN              (RC_FRMDLG_BEGIN +  4)
 
-#define STR_FRMUI_BORDER        (RC_FRMDLG_BEGIN + 16)
-#define STR_FRMUI_PATTERN       (RC_FRMDLG_BEGIN + 17)
-
 #define MN_BACKGROUND           (RC_FRMDLG_BEGIN + 27)
 
-#define STR_FRMDLG_BEGIN        (RC_FRMDLG_BEGIN + 31)
-
-#define STR_COLUMN              (STR_FRMDLG_BEGIN + 17)
-
-#define STR_OLE_INSERT          (STR_FRMDLG_BEGIN + 45)
-#define STR_OLE_EDIT            (STR_FRMDLG_BEGIN + 46)
-#define STR_COLL_HEADER         (STR_FRMDLG_BEGIN + 47)
-
-#define STR_LINE_TOP            (STR_FRMDLG_BEGIN + 50)
-#define STR_LINE_BOTTOM         (STR_FRMDLG_BEGIN + 51)
-#define STR_LINE_CENTER         (STR_FRMDLG_BEGIN + 52)
-
-#define FRMDLG_ACT_END                  STR_LINE_CENTER
-
-#if FRMDLG_ACT_END > RC_FRMDLG_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
 #endif // FRMUI_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/globdoc.hrc b/sw/source/uibase/inc/globdoc.hrc
deleted file mode 100644
index 7be2d6b210a5..000000000000
--- a/sw/source/uibase/inc/globdoc.hrc
+++ /dev/null
@@ -1,36 +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_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC
-
-#include "rcid.hrc"
-
-#define STR_HUMAN_SWGLOBDOC_NAME                (RC_GLOBDOC_BEGIN + 2)
-#define STR_WRITER_GLOBALDOC_FULLTYPE           (RC_GLOBDOC_BEGIN + 5)
-
-#define GLOBDOC_ACT_END             STR_WRITER_GLOBALDOC_FULLTYPE
-
-#if GLOBDOC_ACT_END > RC_GLOBDOC_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index cfa41471db6f..c9189e5ac191 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -26,29 +26,6 @@
 
 #define DLG_TAB_OUTLINE             (RC_MISC_BEGIN + 29)
 
-#define STR_DOUBLE_SHORTNAME        (RC_MISC_BEGIN + 30)
-#define STR_QUERY_DELETE            (RC_MISC_BEGIN + 31)
-#define STR_QUERY_DELETE_GROUP1     (RC_MISC_BEGIN + 32)
-#define STR_QUERY_DELETE_GROUP2     (RC_MISC_BEGIN + 33)
-#define STR_NO_GLOSSARIES           (RC_MISC_BEGIN + 34)
-
-#define STR_GLOSSARY                (RC_MISC_BEGIN + 43)
-#define STR_CHANGE_START            (RC_MISC_BEGIN + 44)
-#define STR_CHANGE_END              (RC_MISC_BEGIN + 45)
-#define STR_SAVE_GLOSSARY           (RC_MISC_BEGIN + 46)
-
-#define STR_MY_AUTOTEXT             (RC_MISC_BEGIN + 64)
-
-#define STR_COMMENTS_LABEL          (RC_MISC_BEGIN + 65)
-#define STR_SHOW_COMMENTS           (RC_MISC_BEGIN + 66)
-#define STR_HIDE_COMMENTS           (RC_MISC_BEGIN + 67)
-
-#define MISC_ACT_END                STR_HIDE_COMMENTS
-
-#if MISC_ACT_END > RC_MISC_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 84b78faa9323..0e86af95eed2 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -22,9 +22,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <tools/resary.hxx>
 #include <memory>
 #include <set>
+#include <vector>
 #include <swdbdata.hxx>
 #include "swdllapi.h"
 #include "sharedconnection.hxx"
@@ -77,7 +77,7 @@ public:
 
     void Commit();
 
-    const ResStringArray& GetDefaultAddressHeaders() const;
+    const std::vector<std::pair<OUString, int>>& GetDefaultAddressHeaders() const;
 
     void SetCurrentConnection(
         css::uno::Reference< css::sdbc::XDataSource> const & xSource,
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 484c7f6318f0..b530f4557a30 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -35,6 +35,14 @@ class SwFieldMgr;
 class SvTreeListEntry;
 class SwWrtShell;
 
+class SwFieldUnitTable
+{
+public:
+    static OUString GetString(sal_uInt32 i);
+    static sal_uInt32 Count();
+    static FieldUnit GetValue(sal_uInt32 i);
+};
+
 class SwLoadOptPage : public SfxTabPage
 {
 private:
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
deleted file mode 100644
index 5a51a490e99e..000000000000
--- a/sw/source/uibase/inc/ribbar.hrc
+++ /dev/null
@@ -1,100 +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_SW_SOURCE_UIBASE_INC_RIBBAR_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_RIBBAR_HRC
-
-#include "rcid.hrc"
-
-#define STR_TBL_FORMULA                  (RC_RIBBAR_BEGIN +8)
-
-#define ST_TBL                      (RC_RIBBAR_BEGIN + 14)
-#define ST_FRM                      (RC_RIBBAR_BEGIN + 15)
-#define ST_PGE                      (RC_RIBBAR_BEGIN + 16)
-#define ST_DRW                      (RC_RIBBAR_BEGIN + 17)
-#define ST_CTRL                     (RC_RIBBAR_BEGIN + 18)
-#define ST_REG                      (RC_RIBBAR_BEGIN + 19)
-#define ST_BKM                      (RC_RIBBAR_BEGIN + 20)
-#define ST_GRF                      (RC_RIBBAR_BEGIN + 21)
-#define ST_OLE                      (RC_RIBBAR_BEGIN + 22)
-#define ST_OUTL                     (RC_RIBBAR_BEGIN + 23)
-#define ST_SEL                      (RC_RIBBAR_BEGIN + 24)
-#define ST_FTN                      (RC_RIBBAR_BEGIN + 25)
-#define ST_MARK                     (RC_RIBBAR_BEGIN + 26)
-#define ST_POSTIT                   (RC_RIBBAR_BEGIN + 27)
-#define ST_SRCH_REP                 (RC_RIBBAR_BEGIN + 28)
-#define ST_INDEX_ENTRY              (RC_RIBBAR_BEGIN + 29)
-#define ST_TABLE_FORMULA            (RC_RIBBAR_BEGIN + 30)
-#define ST_TABLE_FORMULA_ERROR      (RC_RIBBAR_BEGIN + 31)
-#define STR_FORMULA_CALC            (RC_RIBBAR_BEGIN + 32)
-#define STR_FORMULA_CANCEL          (RC_RIBBAR_BEGIN + 33)
-#define STR_FORMULA_APPLY           (RC_RIBBAR_BEGIN + 34)
-
-#define STR_IMGBTN_START            (RC_RIBBAR_BEGIN + 35)
-
-#define STR_IMGBTN_NEXT_DOWN        (STR_IMGBTN_START + 0)
-#define STR_IMGBTN_PREV_DOWN        (STR_IMGBTN_START + 1)
-#define STR_IMGBTN_TBL_DOWN         (STR_IMGBTN_START + 2)
-#define STR_IMGBTN_FRM_DOWN         (STR_IMGBTN_START + 3)
-#define STR_IMGBTN_PGE_DOWN         (STR_IMGBTN_START + 4)
-#define STR_IMGBTN_DRW_DOWN         (STR_IMGBTN_START + 5)
-#define STR_IMGBTN_CTRL_DOWN        (STR_IMGBTN_START + 6)
-#define STR_IMGBTN_REG_DOWN         (STR_IMGBTN_START + 7)
-#define STR_IMGBTN_BKM_DOWN         (STR_IMGBTN_START + 8)
-#define STR_IMGBTN_GRF_DOWN         (STR_IMGBTN_START + 9)
-#define STR_IMGBTN_OLE_DOWN         (STR_IMGBTN_START +10)
-#define STR_IMGBTN_OUTL_DOWN        (STR_IMGBTN_START +11)
-#define STR_IMGBTN_SEL_DOWN         (STR_IMGBTN_START +12)
-#define STR_IMGBTN_FTN_DOWN         (STR_IMGBTN_START +13)
-#define STR_IMGBTN_MARK_DOWN        (STR_IMGBTN_START +14)
-#define STR_IMGBTN_POSTIT_DOWN      (STR_IMGBTN_START +15)
-#define STR_IMGBTN_SRCH_REP_DOWN    (STR_IMGBTN_START +16)
-#define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17)
-#define STR_IMGBTN_TBLFML_DOWN      (STR_IMGBTN_START +18)
-#define STR_IMGBTN_TBLFML_ERR_DOWN  (STR_IMGBTN_START +19)
-
-#define STR_IMGBTN_NEXT_UP          (STR_IMGBTN_START +20)
-#define STR_IMGBTN_PREV_UP          (STR_IMGBTN_START +21)
-#define STR_IMGBTN_TBL_UP           (STR_IMGBTN_START +22)
-#define STR_IMGBTN_FRM_UP           (STR_IMGBTN_START +23)
-#define STR_IMGBTN_PGE_UP           (STR_IMGBTN_START +24)
-#define STR_IMGBTN_DRW_UP           (STR_IMGBTN_START +25)
-#define STR_IMGBTN_CTRL_UP          (STR_IMGBTN_START +26)
-#define STR_IMGBTN_REG_UP           (STR_IMGBTN_START +27)
-#define STR_IMGBTN_BKM_UP           (STR_IMGBTN_START +28)
-#define STR_IMGBTN_GRF_UP           (STR_IMGBTN_START +29)
-#define STR_IMGBTN_OLE_UP           (STR_IMGBTN_START +30)
-#define STR_IMGBTN_OUTL_UP          (STR_IMGBTN_START +31)
-#define STR_IMGBTN_SEL_UP           (STR_IMGBTN_START +32)
-#define STR_IMGBTN_FTN_UP           (STR_IMGBTN_START +33)
-#define STR_IMGBTN_MARK_UP          (STR_IMGBTN_START +34)
-#define STR_IMGBTN_POSTIT_UP        (STR_IMGBTN_START +35)
-#define STR_IMGBTN_SRCH_REP_UP      (STR_IMGBTN_START +36)
-#define STR_IMGBTN_INDEX_ENTRY_UP   (STR_IMGBTN_START +37)
-#define STR_IMGBTN_TBLFML_UP        (STR_IMGBTN_START +38)
-#define STR_IMGBTN_TBLFML_ERR_UP    (STR_IMGBTN_START +39)
-
-#define RC_RIBBAR_ACT_END           STR_IMGBTN_TBLFML_ERR_UP
-
-#if  RC_RIBBAR_ACT_END   >  RC_RIBBAR_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc
deleted file mode 100644
index 80a4b0118a01..000000000000
--- a/sw/source/uibase/inc/shells.hrc
+++ /dev/null
@@ -1,67 +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_SW_SOURCE_UIBASE_INC_SHELLS_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_SHELLS_HRC
-
-#include "rcid.hrc"
-
-#define STR_GRFILTER_OPENERROR     (RC_SHELLS_BEGIN +  1)
-#define STR_GRFILTER_IOERROR       (RC_SHELLS_BEGIN +  2)
-#define STR_GRFILTER_FORMATERROR   (RC_SHELLS_BEGIN +  3)
-#define STR_GRFILTER_VERSIONERROR  (RC_SHELLS_BEGIN +  4)
-#define STR_GRFILTER_FILTERERROR   (RC_SHELLS_BEGIN +  5)
-#define STR_GRFILTER_TOOBIG        (RC_SHELLS_BEGIN +  6)
-#define STR_INSERT_GRAPHIC         (RC_SHELLS_BEGIN +  7)
-#define STR_REDLINE_COMMENT        (RC_SHELLS_BEGIN + 11)
-#define STR_REDLINE_INSERTED       (RC_SHELLS_BEGIN + 12)
-#define STR_REDLINE_DELETED        (RC_SHELLS_BEGIN + 13)
-#define STR_REDLINE_FMTCOLLSET     (RC_SHELLS_BEGIN + 14)
-
-#define STR_SWBG_PARAGRAPH         (RC_SHELLS_BEGIN +  37)
-#define STR_SWBG_GRAPHIC           (RC_SHELLS_BEGIN +  38)
-#define STR_SWBG_OLE               (RC_SHELLS_BEGIN +  39)
-#define STR_SWBG_FRAME             (RC_SHELLS_BEGIN +  40)
-#define STR_SWBG_TABLE             (RC_SHELLS_BEGIN +  41)
-#define STR_SWBG_TABLE_ROW         (RC_SHELLS_BEGIN +  42)
-#define STR_SWBG_TABLE_CELL        (RC_SHELLS_BEGIN +  43)
-#define STR_SWBG_PAGE              (RC_SHELLS_BEGIN +  44)
-#define STR_SWBG_HEADER            (RC_SHELLS_BEGIN +  45)
-#define STR_SWBG_FOOTER            (RC_SHELLS_BEGIN +  46)
-
-
-#define STR_REDLINE_FORMATED       (RC_SHELLS_BEGIN + 50)
-#define STR_REDLINE_TABLECHG       (RC_SHELLS_BEGIN + 51)
-
-#define STR_REDLINE_TITLE           (RC_SHELLS_BEGIN + 52)
-#define STR_REDLINE_MSG             (RC_SHELLS_BEGIN + 53)
-#define STR_REDLINE_ACCEPT_ALL      (RC_SHELLS_BEGIN + 54)
-#define STR_REDLINE_REJECT_ALL      (RC_SHELLS_BEGIN + 55)
-#define STR_REDLINE_EDIT            (RC_SHELLS_BEGIN + 56)
-#define STR_REDLINE_AUTOFMT         (RC_SHELLS_BEGIN + 57)
-
-#define SHELLS_ACT_END              STR_REDLINE_AUTOFMT
-
-#if SHELLS_ACT_END > RC_SHELLS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index a74362bf8135..e3a9f29e3729 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
 
-#include <tools/resary.hxx>
-
 class SwWrtShell;
 class SwFormat;
 
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 632520ac0b0b..248985073902 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -175,7 +175,6 @@ class SwTOXSelectTabPage : public SfxTabPage
     VclPtr<MenuButton>     m_pAutoMarkPB;
 
     // object only
-    SwOLENames      aFromNames;
     VclPtr<SvxCheckListBox> m_pFromObjCLB;
     VclPtr<VclContainer>   m_pFromObjFrame;
 
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index f6bd26548917..adface937008 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/awt/XControl.hpp>
-#include <tools/resary.hxx>
 #include "swdllapi.h"
 
 class SwOneExampleFrame;
@@ -65,7 +64,6 @@ class SW_DLLPUBLIC SwOneExampleFrame
     Idle            m_aLoadedIdle;
     Link<SwOneExampleFrame&,void> m_aInitializedLink;
 
-    ResStringArray  m_aMenuRes;
     OUString        m_sArgumentURL;
 
     SwView*         m_pModuleView;
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
deleted file mode 100644
index 45b611814616..000000000000
--- a/sw/source/uibase/inc/utlui.hrc
+++ /dev/null
@@ -1,200 +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_SW_SOURCE_UIBASE_INC_UTLUI_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_UTLUI_HRC
-
-#include "rcid.hrc"
-
-#define RID_STR_SYSTEM              (RC_UTLUI_BEGIN + 2)
-
-// Strings in NumberFormatter-Listbox
-#define STR_DEFINE_NUMBERFORMAT                 (RC_UTLUI_BEGIN + 4)
-
-// names of content types                       (RC_UTLUI_BEGIN + 7)
-#define STR_CONTENT_TYPE_FIRST                  (RC_UTLUI_BEGIN + 8)
-#define STR_CONTENT_TYPE_OUTLINE                STR_CONTENT_TYPE_FIRST
-#define STR_CONTENT_TYPE_TABLE                  (RC_UTLUI_BEGIN + 9)
-#define STR_CONTENT_TYPE_FRAME                  (RC_UTLUI_BEGIN + 10)
-#define STR_CONTENT_TYPE_GRAPHIC                (RC_UTLUI_BEGIN + 11)
-#define STR_CONTENT_TYPE_OLE                    (RC_UTLUI_BEGIN + 12)
-#define STR_CONTENT_TYPE_BOOKMARK               (RC_UTLUI_BEGIN + 13)
-#define STR_CONTENT_TYPE_REGION                 (RC_UTLUI_BEGIN + 14)
-#define STR_CONTENT_TYPE_URLFIELD               (RC_UTLUI_BEGIN + 15)
-#define STR_CONTENT_TYPE_REFERENCE              (RC_UTLUI_BEGIN + 16)
-#define STR_CONTENT_TYPE_INDEX                  (RC_UTLUI_BEGIN + 17)
-#define STR_CONTENT_TYPE_POSTIT                 (RC_UTLUI_BEGIN + 18)
-#define STR_CONTENT_TYPE_DRAWOBJECT             (RC_UTLUI_BEGIN + 19)
-// Statusbar: Word count/Viewlayout/Page count
-#define STR_WORDCOUNT_HINT                      (RC_UTLUI_BEGIN + 20)
-#define STR_VIEWLAYOUT_ONE                      (RC_UTLUI_BEGIN + 21)
-#define STR_VIEWLAYOUT_MULTI                    (RC_UTLUI_BEGIN + 22)
-#define STR_VIEWLAYOUT_BOOK                     (RC_UTLUI_BEGIN + 23)
-#define STR_BOOKCTRL_HINT                       (RC_UTLUI_BEGIN + 24)
-#define STR_BOOKCTRL_HINT_EXTENDED              (RC_UTLUI_BEGIN + 25)
-#define STR_TMPLCTRL_HINT                       (RC_UTLUI_BEGIN + 26)
-#define STR_CONTENT_END                         (RC_UTLUI_BEGIN + 26)
-
-#define STR_CONTENT_TYPE_SINGLE_FIRST           (STR_CONTENT_END + 1)
-#define STR_CONTENT_TYPE_SINGLE_OUTLINE         (STR_CONTENT_TYPE_SINGLE_FIRST + 0)
-#define STR_CONTENT_TYPE_SINGLE_TABLE           (STR_CONTENT_TYPE_SINGLE_FIRST + 1)
-#define STR_CONTENT_TYPE_SINGLE_FRAME           (STR_CONTENT_TYPE_SINGLE_FIRST + 2)
-#define STR_CONTENT_TYPE_SINGLE_GRAPHIC         (STR_CONTENT_TYPE_SINGLE_FIRST + 3)
-#define STR_CONTENT_TYPE_SINGLE_OLE             (STR_CONTENT_TYPE_SINGLE_FIRST + 4)
-#define STR_CONTENT_TYPE_SINGLE_BOOKMARK        (STR_CONTENT_TYPE_SINGLE_FIRST + 5)
-#define STR_CONTENT_TYPE_SINGLE_REGION          (STR_CONTENT_TYPE_SINGLE_FIRST + 6)
-#define STR_CONTENT_TYPE_SINGLE_URLFIELD        (STR_CONTENT_TYPE_SINGLE_FIRST + 7)
-#define STR_CONTENT_TYPE_SINGLE_REFERENCE       (STR_CONTENT_TYPE_SINGLE_FIRST + 8)
-#define STR_CONTENT_TYPE_SINGLE_INDEX           (STR_CONTENT_TYPE_SINGLE_FIRST + 9)
-#define STR_CONTENT_TYPE_SINGLE_POSTIT          (STR_CONTENT_TYPE_SINGLE_FIRST + 10)
-#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT      (STR_CONTENT_TYPE_SINGLE_FIRST + 11)
-#define STR_CONTENT_SINGLE_END                  STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
-
-#define FLD_DOCINFO_BEGIN   (STR_CONTENT_SINGLE_END + 1)
-#define FLD_DOCINFO_TITEL   FLD_DOCINFO_BEGIN
-#define FLD_DOCINFO_THEMA   (FLD_DOCINFO_BEGIN + 1)
-#define FLD_DOCINFO_KEYS    (FLD_DOCINFO_BEGIN + 2)
-#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3)
-#define FLD_DOCINFO_CREATE  (FLD_DOCINFO_BEGIN + 4)
-#define FLD_DOCINFO_CHANGE  (FLD_DOCINFO_BEGIN + 5)
-#define FLD_DOCINFO_PRINT   (FLD_DOCINFO_BEGIN + 6)
-#define FLD_DOCINFO_DOCNO   (FLD_DOCINFO_BEGIN + 7)
-#define FLD_DOCINFO_EDIT    (FLD_DOCINFO_BEGIN + 8)
-#define FLD_DOCINFO_END     (FLD_DOCINFO_BEGIN + 9)
-
-#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END  + 1)
-
-#define STR_AUTH_TYPE_START     (FLD_DOCINFO_END  + 2)
-#define STR_AUTH_TYPE_ARTICLE       (STR_AUTH_TYPE_START + 0)
-#define STR_AUTH_TYPE_BOOK          (STR_AUTH_TYPE_START + 1)
-#define STR_AUTH_TYPE_BOOKLET       (STR_AUTH_TYPE_START + 2)
-#define STR_AUTH_TYPE_CONFERENCE    (STR_AUTH_TYPE_START + 3)
-#define STR_AUTH_TYPE_INBOOK        (STR_AUTH_TYPE_START + 4)
-#define STR_AUTH_TYPE_INCOLLECTION  (STR_AUTH_TYPE_START + 5)
-#define STR_AUTH_TYPE_INPROCEEDINGS (STR_AUTH_TYPE_START + 6)
-#define STR_AUTH_TYPE_JOURNAL       (STR_AUTH_TYPE_START + 7)
-#define STR_AUTH_TYPE_MANUAL        (STR_AUTH_TYPE_START + 8)
-#define STR_AUTH_TYPE_MASTERSTHESIS (STR_AUTH_TYPE_START + 9)
-#define STR_AUTH_TYPE_MISC          (STR_AUTH_TYPE_START + 10)
-#define STR_AUTH_TYPE_PHDTHESIS     (STR_AUTH_TYPE_START + 11)
-#define STR_AUTH_TYPE_PROCEEDINGS   (STR_AUTH_TYPE_START + 12)
-#define STR_AUTH_TYPE_TECHREPORT    (STR_AUTH_TYPE_START + 13)
-#define STR_AUTH_TYPE_UNPUBLISHED   (STR_AUTH_TYPE_START + 14)
-#define STR_AUTH_TYPE_EMAIL         (STR_AUTH_TYPE_START + 15)
-#define STR_AUTH_TYPE_WWW           (STR_AUTH_TYPE_START + 16)
-#define STR_AUTH_TYPE_CUSTOM1       (STR_AUTH_TYPE_START + 17)
-#define STR_AUTH_TYPE_CUSTOM2       (STR_AUTH_TYPE_START + 18)
-#define STR_AUTH_TYPE_CUSTOM3       (STR_AUTH_TYPE_START + 19)
-#define STR_AUTH_TYPE_CUSTOM4       (STR_AUTH_TYPE_START + 20)
-#define STR_AUTH_TYPE_CUSTOM5       (STR_AUTH_TYPE_START + 21)
-#define STR_AUTH_TYPE_END           (STR_AUTH_TYPE_CUSTOM5)
-
-#define STR_AUTH_FIELD_START            (STR_AUTH_TYPE_END + 1)
-#define STR_AUTH_FIELD_IDENTIFIER       (STR_AUTH_FIELD_START + 0)
-#define STR_AUTH_FIELD_AUTHORITY_TYPE   (STR_AUTH_FIELD_START + 1)
-#define STR_AUTH_FIELD_ADDRESS          (STR_AUTH_FIELD_START + 2)
-#define STR_AUTH_FIELD_ANNOTE           (STR_AUTH_FIELD_START + 3)
-#define STR_AUTH_FIELD_AUTHOR           (STR_AUTH_FIELD_START + 4)
-#define STR_AUTH_FIELD_BOOKTITLE        (STR_AUTH_FIELD_START + 5)
-#define STR_AUTH_FIELD_CHAPTER          (STR_AUTH_FIELD_START + 6)
-#define STR_AUTH_FIELD_EDITION          (STR_AUTH_FIELD_START + 7)
-#define STR_AUTH_FIELD_EDITOR           (STR_AUTH_FIELD_START + 8)
-#define STR_AUTH_FIELD_HOWPUBLISHED     (STR_AUTH_FIELD_START + 9)
-#define STR_AUTH_FIELD_INSTITUTION      (STR_AUTH_FIELD_START + 10)
-#define STR_AUTH_FIELD_JOURNAL          (STR_AUTH_FIELD_START + 11)
-#define STR_AUTH_FIELD_MONTH            (STR_AUTH_FIELD_START + 12)
-#define STR_AUTH_FIELD_NOTE             (STR_AUTH_FIELD_START + 13)
-#define STR_AUTH_FIELD_NUMBER           (STR_AUTH_FIELD_START + 14)
-#define STR_AUTH_FIELD_ORGANIZATIONS    (STR_AUTH_FIELD_START + 15)
-#define STR_AUTH_FIELD_PAGES            (STR_AUTH_FIELD_START + 16)
-#define STR_AUTH_FIELD_PUBLISHER        (STR_AUTH_FIELD_START + 17)
-#define STR_AUTH_FIELD_SCHOOL           (STR_AUTH_FIELD_START + 18)
-#define STR_AUTH_FIELD_SERIES           (STR_AUTH_FIELD_START + 19)
-#define STR_AUTH_FIELD_TITLE            (STR_AUTH_FIELD_START + 20)
-#define STR_AUTH_FIELD_TYPE             (STR_AUTH_FIELD_START + 21)
-#define STR_AUTH_FIELD_VOLUME           (STR_AUTH_FIELD_START + 22)
-#define STR_AUTH_FIELD_YEAR             (STR_AUTH_FIELD_START + 23)
-#define STR_AUTH_FIELD_URL              (STR_AUTH_FIELD_START + 24)
-#define STR_AUTH_FIELD_CUSTOM1          (STR_AUTH_FIELD_START + 25)
-#define STR_AUTH_FIELD_CUSTOM2          (STR_AUTH_FIELD_START + 26)
-#define STR_AUTH_FIELD_CUSTOM3          (STR_AUTH_FIELD_START + 27)
-#define STR_AUTH_FIELD_CUSTOM4          (STR_AUTH_FIELD_START + 28)
-#define STR_AUTH_FIELD_CUSTOM5          (STR_AUTH_FIELD_START + 29)
-#define STR_AUTH_FIELD_ISBN             (STR_AUTH_FIELD_START + 30)
-#define STR_AUTH_FIELD_END              (STR_AUTH_FIELD_ISBN)
-
-#define RES_FRMEX_MENU                  (STR_AUTH_FIELD_END + 1)
-
-#define UTLUI_ACT_END               RES_FRMEX_MENU
-
-#if UTLUI_ACT_END > RC_UTLUI_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#define STR_IDXEXAMPLE_IDXTXT_BEGIN             RC_IDXTXT_BEGIN
-#define STR_IDXEXAMPLE_IDXTXT_HEADING1          (STR_IDXEXAMPLE_IDXTXT_BEGIN + 1)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY1            (STR_IDXEXAMPLE_IDXTXT_BEGIN + 2)
-#define STR_IDXEXAMPLE_IDXTXT_HEADING11         (STR_IDXEXAMPLE_IDXTXT_BEGIN + 3)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY11           (STR_IDXEXAMPLE_IDXTXT_BEGIN + 4)
-#define STR_IDXEXAMPLE_IDXTXT_HEADING12         (STR_IDXEXAMPLE_IDXTXT_BEGIN + 5)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY12           (STR_IDXEXAMPLE_IDXTXT_BEGIN + 6)
-#define STR_IDXEXAMPLE_IDXTXT_TABLE1            (STR_IDXEXAMPLE_IDXTXT_BEGIN + 7)
-#define STR_IDXEXAMPLE_IDXTXT_IMAGE1            (STR_IDXEXAMPLE_IDXTXT_BEGIN + 8)
-#define STR_IDXEXAMPLE_IDXTXT_END               STR_IDXEXAMPLE_IDXTXT_IMAGE1
-
-#define RID_SW_SHELLRES_BEGIN                   (STR_IDXEXAMPLE_IDXTXT_IMAGE1 + 1)
-#define STR_POSTIT_PAGE                         (RID_SW_SHELLRES_BEGIN + 1)
-#define STR_POSTIT_AUTHOR                       (RID_SW_SHELLRES_BEGIN + 2)
-#define STR_CALC_SYNTAX                         (RID_SW_SHELLRES_BEGIN + 3)
-#define STR_CALC_ZERODIV                        (RID_SW_SHELLRES_BEGIN + 4)
-#define STR_CALC_BRACK                          (RID_SW_SHELLRES_BEGIN + 5)
-#define STR_CALC_POW                            (RID_SW_SHELLRES_BEGIN + 6)
-// empty
-#define STR_CALC_OVERFLOW                       (RID_SW_SHELLRES_BEGIN + 8)
-// empty
-#define STR_CALC_DEFAULT                        (RID_SW_SHELLRES_BEGIN + 10)
-#define STR_CALC_ERROR                          (RID_SW_SHELLRES_BEGIN + 11)
-// empty
-#define STR_TEMPLATE_NONE                       (RID_SW_SHELLRES_BEGIN + 15)
-#define STR_POSTIT_LINE                         (RID_SW_SHELLRES_BEGIN + 16)
-#define STR_FIELD_FIXED                         (RID_SW_SHELLRES_BEGIN + 17)
-#define STR_TOI                                 (RID_SW_SHELLRES_BEGIN + 18)
-#define STR_TOU                                 (RID_SW_SHELLRES_BEGIN + 19)
-#define STR_TOC                                 (RID_SW_SHELLRES_BEGIN + 20)
-#define STR_TOX_ILL                             (RID_SW_SHELLRES_BEGIN + 21)
-#define STR_TOX_OBJ                             (RID_SW_SHELLRES_BEGIN + 22)
-#define STR_TOX_TBL                             (RID_SW_SHELLRES_BEGIN + 23)
-#define STR_TOX_AUTH                            (RID_SW_SHELLRES_BEGIN + 24)
-#define STR_PAGEDESC_NAME                       (RID_SW_SHELLRES_BEGIN + 25)
-#define STR_PAGEDESC_FIRSTNAME                  (RID_SW_SHELLRES_BEGIN + 26)
-#define STR_PAGEDESC_FOLLOWNAME                 (RID_SW_SHELLRES_BEGIN + 27)
-#define STR_LINK_CTRL_CLICK                     (RID_SW_SHELLRES_BEGIN + 28)
-#define STR_LINK_CLICK                          (RID_SW_SHELLRES_BEGIN + 29)
-#define STR_GETREFFLD_REFITEMNOTFOUND           (RID_SW_SHELLRES_BEGIN + 30)
-#define STR_DURATION_FORMAT                     (RID_SW_SHELLRES_BEGIN + 31)
-#define STR_TOX_CITATION                        (RID_SW_SHELLRES_BEGIN + 32)
-#define RID_SW_SHELLRES_END                     STR_TOX_CITATION
-
-#if STR_IDXEXAMPLE_IDXTXT_END > RID_SW_SHELLRES_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc
deleted file mode 100644
index 7f8b46f90f93..000000000000
--- a/sw/source/uibase/inc/web.hrc
+++ /dev/null
@@ -1,36 +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_SW_SOURCE_UIBASE_INC_WEB_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_WEB_HRC
-
-#include "rcid.hrc"
-
-#define STR_HUMAN_SWWEBDOC_NAME                 (RC_WEB_BEGIN + 4)
-#define STR_WRITER_WEBDOC_FULLTYPE              (RC_WEB_BEGIN + 12)
-
-#define WEB_ACT_END                                     STR_WRITER_WEBDOC_FULLTYPE
-
-#if WEB_ACT_END > RC_WEB_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx
index c8c2a8adde65..da4506b7e53d 100644
--- a/sw/source/uibase/index/idxmrk.cxx
+++ b/sw/source/uibase/index/idxmrk.cxx
@@ -39,7 +39,7 @@
 #include <swmodule.hxx>
 #include <fldmgr.hxx>
 #include <fldbas.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <swcont.hxx>
 #include <svl/cjkoptions.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index a86628f57d44..ea1b73e65a12 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -31,6 +31,7 @@
 #include "hyp.hxx"
 #include "mdiexp.hxx"
 #include "olmenu.hrc"
+#include "strings.hrc"
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 629a89e5b4b5..8c5afcad5918 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -20,7 +20,7 @@
 #include "SwRewriter.hxx"
 #include "chrdlg.hrc"
 #include "cmdid.h"
-#include "comcore.hrc"
+#include "strings.hrc"
 #include "doc.hxx"
 #include "docsh.hxx"
 #include "edtwin.hxx"
diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc
index 79f8373c897f..03581e402b72 100644
--- a/sw/source/uibase/lingu/olmenu.hrc
+++ b/sw/source/uibase/lingu/olmenu.hrc
@@ -22,13 +22,6 @@
 
 #include "rcid.hrc"
 
-#define STR_HYP_OK                      (RC_LINGU_BEGIN + 3)
-#define STR_LANGSTATUS_NONE             (RC_LINGU_BEGIN + 6)
-#define STR_LANGSTATUS_MORE             (RC_LINGU_BEGIN + 7)
-#define STR_IGNORE_SELECTION            (RC_LINGU_BEGIN + 8)
-#define STR_RESET_TO_DEFAULT_LANGUAGE   (RC_LINGU_BEGIN + 9)
-#define STR_EXPLANATION_LINK            (RC_LINGU_BEGIN + 10)
-
 //! Don't change these values. You may break context menu modifying extensions!
 #define MN_IGNORE_SELECTION             201
 #define MN_SHORT_COMMENT                208
diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src
deleted file mode 100644
index ab73066c88e9..000000000000
--- a/sw/source/uibase/lingu/olmenu.src
+++ /dev/null
@@ -1,50 +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 .
- */
-/* StarView resource file */
-
-#include "olmenu.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_HYP_OK
-{
-    Text [ en-US ] = "Hyphenation completed" ;
-};
-String STR_LANGSTATUS_NONE
-{
-    Text [ en-US ] = "None (Do not check spelling)" ;
-};
-String STR_RESET_TO_DEFAULT_LANGUAGE
-{
-    Text [ en-US ] = "Reset to Default Language" ;
-};
-String STR_LANGSTATUS_MORE
-{
-    Text [ en-US ] = "More..." ;
-};
-String STR_IGNORE_SELECTION
-{
-    Text [ en-US ] = "~Ignore" ;
-};
-String STR_EXPLANATION_LINK
-{
-    Text [ en-US ] = "Explanations..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 6e678dd00bab..256afaa29a01 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -46,6 +46,7 @@
 #include <cmdid.h>
 #include <swerror.h>
 #include <misc.hrc>
+#include <strings.hrc>
 
 #define SwWebGlosDocShell
 #define SwGlosDocShell
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 38f836e9ea88..58ada01cda4d 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -29,6 +29,7 @@
 #include <editeng/numitem.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strarray.hxx>
 
 #include <unomid.h>
 
@@ -89,10 +90,10 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
             pTypes = aTypes.getConstArray();
         }
     }
-    ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
-    for(size_t i = 0; i < aNames.Count(); i++)
+
+    for(size_t i = 0; i < SvxNumberingTypeTable::Count(); i++)
     {
-        sal_IntPtr nValue = aNames.GetValue(i);
+        sal_IntPtr nValue = SvxNumberingTypeTable::GetValue(i);
         bool bInsert = true;
         sal_Int32 nPos = LISTBOX_APPEND;
         switch(nValue)
@@ -138,7 +139,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
         }
         if(bInsert)
         {
-            sal_Int32 nEntry = InsertEntry(aNames.GetString(i), nPos);
+            sal_Int32 nEntry = InsertEntry(SvxNumberingTypeTable::GetString(i), nPos);
             SetEntryData( nEntry, reinterpret_cast<void*>(nValue) );
         }
     }
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 71306a2d9432..350b5f0e6ebf 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -36,10 +36,10 @@
 #include <helpid.h>
 #include <cmdid.h>
 #include <misc.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 
 // -> #111827#
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <swundo.hxx>
 #include <SwRewriter.hxx>
 // <- #111827#
@@ -1093,27 +1093,27 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void)
 
             pDlg->HideAuthor();
 
-            sal_uInt16 nResId = 0;
+            const char* pResId = nullptr;
             switch( rRedline.GetType() )
             {
                 case nsRedlineType_t::REDLINE_INSERT:
-                    nResId = STR_REDLINE_INSERTED;
+                    pResId = STR_REDLINE_INSERTED;
                     break;
                 case nsRedlineType_t::REDLINE_DELETE:
-                    nResId = STR_REDLINE_DELETED;
+                    pResId = STR_REDLINE_DELETED;
                     break;
                 case nsRedlineType_t::REDLINE_FORMAT:
                 case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
-                    nResId = STR_REDLINE_FORMATED;
+                    pResId = STR_REDLINE_FORMATED;
                     break;
                 case nsRedlineType_t::REDLINE_TABLE:
-                    nResId = STR_REDLINE_TABLECHG;
+                    pResId = STR_REDLINE_TABLECHG;
                     break;
                 default:;//prevent warning
             }
             OUString sTitle(SwResId(STR_REDLINE_COMMENT));
-            if( nResId )
-                sTitle += SwResId( nResId );
+            if (pResId)
+                sTitle += SwResId(pResId);
             pDlg->SetText(sTitle);
 
             SwViewShell::SetCareWin(pDlg->GetWindow());
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 83d49b785c2e..6f1f6f3190ec 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -24,6 +24,7 @@
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 #include "misc.hrc"
+#include "strings.hrc"
 
 #define CONTROL_BORDER_WIDTH    1
 
@@ -256,12 +257,12 @@ void SwCommentRuler::Update()
 
 void SwCommentRuler::UpdateCommentHelpText()
 {
-    int nTooltipResId;
+    const char* pTooltipResId;
     if ( mpViewShell->GetPostItMgr()->ShowNotes() )
-        nTooltipResId = STR_HIDE_COMMENTS;
+        pTooltipResId = STR_HIDE_COMMENTS;
     else
-        nTooltipResId = STR_SHOW_COMMENTS;
-    SetQuickHelpText( SwResId( nTooltipResId ) );
+        pTooltipResId = STR_SHOW_COMMENTS;
+    SetQuickHelpText(SwResId(pTooltipResId));
 }
 
 // TODO Make Ruler return its central rectangle instead of margins.
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index f4a1078a6b99..1831acac18d1 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -36,7 +36,7 @@
 #include "swmodule.hxx"
 #include "swundo.hxx"
 #include <SwRewriter.hxx>
-#include "comcore.hrc"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 36df87eac29d..b7b89547aba9 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -42,14 +42,13 @@
 #include "cellatr.hxx"
 #include "edtwin.hxx"
 #include "helpid.h"
-#include "access.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 // Only for the UpdateRange: Delete the box in which the stacked cursor is positioned.
 #include "pam.hxx"
 
 #include "swundo.hxx"
-#include "ribbar.hrc"
 #include "dbui.hrc"
 
 #include <IDocumentContentOperations.hxx>
diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src
deleted file mode 100644
index 8f57dfb894d3..000000000000
--- a/sw/source/uibase/ribbar/inputwin.src
+++ /dev/null
@@ -1,63 +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 .
- */
-/* HelpID resource file */
-/* HelpID resource file */
-
-#include "cmdid.h"
-#include "helpid.h"
-#include "globals.hrc"
-#include "ribbar.hrc"
-#include "access.hrc"
-
-String STR_FORMULA_CALC
-{
-    Text [ en-US ] = "Functions" ;
-};
-
-String STR_FORMULA_CANCEL
-{
-    Text [ en-US ] = "Cancel" ;
-};
-
-String STR_FORMULA_APPLY
-{
-    Text [ en-US ] = "Apply" ;
-};
-
-String STR_ACCESS_FORMULA_TOOLBAR
-{
-    Text [ en-US ] = "Formula Tool Bar" ;
-};
-
-String STR_ACCESS_FORMULA_TYPE
-{
-    Text [ en-US ] = "Formula Type" ;
-};
-
-String STR_ACCESS_FORMULA_TEXT
-{
-    Text [ en-US ] = "Formula Text" ;
-};
-
-String STR_TBL_FORMULA
-{
-    Text [ en-US ] = "Text Formula" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index c9090674893b..d6c7d3c8643d 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -34,7 +34,7 @@
 #include <glosdoc.hxx>
 #include <gloslst.hxx>
 #include <workctrl.hxx>
-#include <ribbar.hrc>
+#include <strings.hrc>
 #include <cmdid.h>
 #include <helpid.h>
 #include <wrtsh.hxx>
@@ -48,6 +48,7 @@
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 
 // Size check
@@ -234,6 +235,77 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] =
     HID_NID_NEXT
 };
 
+static const char* aNavigationStrIds[ NAVI_ENTRIES ] =
+{
+    // -- first line
+    ST_TBL,
+    ST_FRM,
+    ST_GRF,
+    ST_OLE,
+    ST_PGE,
+    ST_OUTL,
+    ST_MARK,
+    ST_DRW,
+    ST_CTRL,
+    STR_IMGBTN_PGE_UP,
+    // -- second line
+    ST_REG,
+    ST_BKM,
+    ST_SEL,
+    ST_FTN,
+    ST_POSTIT,
+    ST_SRCH_REP,
+    ST_INDEX_ENTRY,
+    ST_TABLE_FORMULA,
+    ST_TABLE_FORMULA_ERROR,
+    STR_IMGBTN_PGE_DOWN
+};
+
+// these are global strings
+static const char* STR_IMGBTN_ARY[] =
+{
+    nullptr,
+    nullptr,
+    STR_IMGBTN_TBL_DOWN,
+    STR_IMGBTN_FRM_DOWN,
+    STR_IMGBTN_PGE_DOWN,
+    STR_IMGBTN_DRW_DOWN,
+    STR_IMGBTN_CTRL_DOWN,
+    STR_IMGBTN_REG_DOWN,
+    STR_IMGBTN_BKM_DOWN,
+    STR_IMGBTN_GRF_DOWN,
+    STR_IMGBTN_OLE_DOWN,
+    STR_IMGBTN_OUTL_DOWN,
+    STR_IMGBTN_SEL_DOWN,
+    STR_IMGBTN_FTN_DOWN,
+    STR_IMGBTN_MARK_DOWN,
+    STR_IMGBTN_POSTIT_DOWN,
+    STR_IMGBTN_SRCH_REP_DOWN,
+    STR_IMGBTN_INDEX_ENTRY_DOWN,
+    STR_IMGBTN_TBLFML_DOWN,
+    STR_IMGBTN_TBLFML_ERR_DOWN,
+    nullptr,
+    nullptr,
+    STR_IMGBTN_TBL_UP,
+    STR_IMGBTN_FRM_UP,
+    STR_IMGBTN_PGE_UP,
+    STR_IMGBTN_DRW_UP,
+    STR_IMGBTN_CTRL_UP,
+    STR_IMGBTN_REG_UP,
+    STR_IMGBTN_BKM_UP,
+    STR_IMGBTN_GRF_UP,
+    STR_IMGBTN_OLE_UP,
+    STR_IMGBTN_OUTL_UP,
+    STR_IMGBTN_SEL_UP,
+    STR_IMGBTN_FTN_UP,
+    STR_IMGBTN_MARK_UP,
+    STR_IMGBTN_POSTIT_UP,
+    STR_IMGBTN_SRCH_REP_UP,
+    STR_IMGBTN_INDEX_ENTRY_UP,
+    STR_IMGBTN_TBLFML_UP,
+    STR_IMGBTN_TBLFML_ERR_UP
+};
+
 SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent)
     : SfxPopupWindow(nId, pParent, "FloatingNavigation",
         "modules/swriter/ui/floatingnavigation.ui", rFrame)
@@ -249,34 +321,22 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >&
     for( i = 0; i < NID_COUNT; i++)
     {
         sal_uInt16 nNaviId = aNavigationInsertIds[i];
-        OUString sText;
-        ToolBoxItemBits  nTbxBits = ToolBoxItemBits::NONE;
-        if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
-        {
-            // -2, there's no string for Next/Prev
-            sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START;
-            sText = SwResId(nResStr);
+        ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE;
+        if ((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
             nTbxBits = ToolBoxItemBits::CHECKABLE;
-        }
-        else
-        {
-            if (nNaviId == NID_PREV)
-                sText = SwResId(STR_IMGBTN_PGE_UP);
-            else if (nNaviId == NID_NEXT)
-                sText = SwResId(STR_IMGBTN_PGE_DOWN);
-        }
-
         m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])),
-                              sText, nTbxBits);
+                              SwResId(aNavigationStrIds[i]), nTbxBits);
         m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]);
     }
 
     m_pToolBox->InsertBreak(NID_COUNT/2);
 
-    // these are global strings
-    for( i = 0; i < 2 * NID_COUNT; i++)
+    for (i = 0; i < SAL_N_ELEMENTS(STR_IMGBTN_ARY); ++i)
     {
-        sQuickHelp[i] = SwResId(STR_IMGBTN_START + i);
+        const char* id = STR_IMGBTN_ARY[i];
+        if (!id)
+            continue;
+        sQuickHelp[i] = SwResId(id);
     }
 
     sal_uInt16 nItemId = SwView::GetMoveType();
@@ -354,11 +414,11 @@ void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 
 OUString SwScrollNaviPopup::GetToolTip(bool bNext)
 {
-    sal_uInt16 nResId = STR_IMGBTN_START;
-    nResId += SwView::GetMoveType() - NID_START;
-    if(!bNext)
+    sal_uInt16 nResId = SwView::GetMoveType();
+    if (!bNext)
         nResId += NID_COUNT;
-    return SwResId(nResId);
+    const char* id = STR_IMGBTN_ARY[nResId];
+    return id ? SwResId(id): OUString();
 }
 
 class SwZoomBox_Impl : public ComboBox
@@ -387,18 +447,17 @@ SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
     SetHelpId(HID_PVIEW_ZOOM_LB);
     SetSizePixel(LogicToPixel(Size(30, 86), MapUnit::MapAppFont));
     EnableAutocomplete( false );
-    sal_uInt16 aZoomValues[] =
+    const char* aZoomValues[] =
     { RID_SVXSTR_ZOOM_25 , RID_SVXSTR_ZOOM_50 ,
       RID_SVXSTR_ZOOM_75 , RID_SVXSTR_ZOOM_100 ,
       RID_SVXSTR_ZOOM_150 , RID_SVXSTR_ZOOM_200 ,
       RID_SVXSTR_ZOOM_WHOLE_PAGE, RID_SVXSTR_ZOOM_PAGE_WIDTH ,
       RID_SVXSTR_ZOOM_OPTIMAL_VIEW };
-    for(sal_uInt16 aZoomValue : aZoomValues)
+    for(const char* pZoomValue : aZoomValues)
     {
-        OUString sEntry = SvxResId( aZoomValue );
+        OUString sEntry = SvxResId(pZoomValue);
         InsertEntry(sEntry);
     }
-
 }
 
 void    SwZoomBox_Impl::Select()
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
deleted file mode 100644
index 3e1d2236db26..000000000000
--- a/sw/source/uibase/ribbar/workctrl.src
+++ /dev/null
@@ -1,261 +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 <svx/svxids.hrc>
-#include "globals.hrc"
-#include "ribbar.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String ST_TBL
-{
-    Text [ en-US ] = "Table" ;
-};
-String ST_FRM
-{
-    Text [ en-US ] = "Text Frame" ;
-};
-String ST_PGE
-{
-    Text [ en-US ] = "Page" ;
-};
-String ST_DRW
-{
-    Text [ en-US ] = "Drawing" ;
-};
-String ST_CTRL
-{
-    Text [ en-US ] = "Control" ;
-};
-String ST_REG
-{
-    Text [ en-US ] = "Section" ;
-};
-String ST_BKM
-{
-    Text [ en-US ] = "Bookmark" ;
-};
-String ST_GRF
-{
-    Text [ en-US ] = "Graphics" ;
-};
-String ST_OLE
-{
-    Text [ en-US ] = "OLE object" ;
-};
-String ST_OUTL
-{
-    Text [ en-US ] = "Headings" ;
-};
-String ST_SEL
-{
-    Text [ en-US ] = "Selection" ;
-};
-String ST_FTN
-{
-    Text [ en-US ] = "Footnote" ;
-};
-String ST_MARK
-{
-    Text [ en-US ] = "Reminder" ;
-};
-String ST_POSTIT
-{
-    Text [ en-US ] = "Comment" ;
-};
-String ST_SRCH_REP
-{
-    Text [ en-US ] = "Repeat search" ;
-};
-String ST_INDEX_ENTRY
-{
-    Text [ en-US ] = "Index entry";
-};
-String ST_TABLE_FORMULA
-{
-    Text [ en-US ] = "Table formula";
-};
-String ST_TABLE_FORMULA_ERROR
-{
-    Text [ en-US ] = "Wrong table formula";
-};
-
-// Strings for the quickhelp of the View-PgUp/Down-Buttons
-
-String STR_IMGBTN_NEXT_DOWN
-{
-    Text = "" ;
-};
-String STR_IMGBTN_PREV_DOWN
-{
-    Text = "" ;
-};
-String STR_IMGBTN_TBL_DOWN
-{
-    Text [ en-US ] = "Next table" ;
-};
-String STR_IMGBTN_FRM_DOWN
-{
-    Text [ en-US ] = "Next text frame" ;
-};
-String STR_IMGBTN_PGE_DOWN
-{
-    Text [ en-US ] = "Next page" ;
-};
-String STR_IMGBTN_DRW_DOWN
-{
-    Text [ en-US ] = "Next drawing" ;
-};
-String STR_IMGBTN_CTRL_DOWN
-{
-    Text [ en-US ] = "Next control" ;
-};
-String STR_IMGBTN_REG_DOWN
-{
-    Text [ en-US ] = "Next section" ;
-};
-String STR_IMGBTN_BKM_DOWN
-{
-    Text [ en-US ] = "Next bookmark" ;
-};
-String STR_IMGBTN_GRF_DOWN
-{
-    Text [ en-US ] = "Next graphic" ;
-};
-String STR_IMGBTN_OLE_DOWN
-{
-    Text [ en-US ] = "Next OLE object" ;
-};
-String STR_IMGBTN_OUTL_DOWN
-{
-    Text [ en-US ] = "Next heading" ;
-};
-String STR_IMGBTN_SEL_DOWN
-{
-    Text [ en-US ] = "Next selection" ;
-};
-String STR_IMGBTN_FTN_DOWN
-{
-    Text [ en-US ] = "Next footnote" ;
-};
-String STR_IMGBTN_MARK_DOWN
-{
-    Text [ en-US ] = "Next Reminder" ;
-};
-String STR_IMGBTN_POSTIT_DOWN
-{
-    Text [ en-US ] = "Next Comment" ;
-};
-String STR_IMGBTN_SRCH_REP_DOWN
-{
-    Text [ en-US ] = "Continue search forward" ;
-};
-String STR_IMGBTN_INDEX_ENTRY_DOWN
-{
-    Text [ en-US ] = "Next index entry";
-};
-String STR_IMGBTN_NEXT_UP
-{
-    Text = "" ;
-};
-String STR_IMGBTN_PREV_UP
-{
-    Text = "" ;
-};
-String STR_IMGBTN_TBL_UP
-{
-    Text [ en-US ] = "Previous table" ;
-};
-String STR_IMGBTN_FRM_UP
-{
-    Text [ en-US ] = "Previous text frame" ;
-};
-String STR_IMGBTN_PGE_UP
-{
-    Text [ en-US ] = "Previous page" ;
-};
-String STR_IMGBTN_DRW_UP
-{
-    Text [ en-US ] = "Previous drawing" ;
-};
-String STR_IMGBTN_CTRL_UP
-{
-    Text [ en-US ] = "Previous control" ;
-};
-String STR_IMGBTN_REG_UP
-{
-    Text [ en-US ] = "Previous section" ;
-};
-String STR_IMGBTN_BKM_UP
-{
-    Text [ en-US ] = "Previous bookmark" ;
-};
-String STR_IMGBTN_GRF_UP
-{
-    Text [ en-US ] = "Previous graphic" ;
-};
-String STR_IMGBTN_OLE_UP
-{
-    Text [ en-US ] = "Previous OLE object" ;
-};
-String STR_IMGBTN_OUTL_UP
-{
-    Text [ en-US ] = "Previous heading" ;
-};
-String STR_IMGBTN_SEL_UP
-{
-    Text [ en-US ] = "Previous selection" ;
-};
-String STR_IMGBTN_FTN_UP
-{
-    Text [ en-US ] = "Previous footnote" ;
-};
-String STR_IMGBTN_MARK_UP
-{
-    Text [ en-US ] = "Previous Reminder" ;
-};
-String STR_IMGBTN_POSTIT_UP
-{
-    Text [ en-US ] = "Previous Comment" ;
-};
-String STR_IMGBTN_SRCH_REP_UP
-{
-    Text [ en-US ] = "Continue search backwards" ;
-};
-String STR_IMGBTN_INDEX_ENTRY_UP
-{
-    Text [ en-US ] = "Previous index entry";
-};
-String STR_IMGBTN_TBLFML_UP
-{
-    Text [ en-US ] = "Previous table formula";
-};
-String STR_IMGBTN_TBLFML_DOWN
-{
-    Text [ en-US ] = "Next table formula";
-};
-String STR_IMGBTN_TBLFML_ERR_UP
-{
-    Text [ en-US ] = "Previous faulty table formula";
-};
-String STR_IMGBTN_TBLFML_ERR_DOWN
-{
-    Text [ en-US ] = "Next faulty table formula";
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 2b432510ae08..bd55da92d18d 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -88,7 +88,7 @@
 
 #include <cmdid.h>
 #include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <breakit.hxx>
 #include "annotsh.hxx"
 #include "view.hxx"
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 5ef7c73dd101..e5196985f47f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -87,8 +87,8 @@
 #include <swwait.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
-#include <shells.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <globals.h>
 #include <unotxdoc.hxx>
 #include <fmtinfmt.hxx>
@@ -103,7 +103,7 @@
 #include <instable.hxx>
 #include <svx/fmshell.hxx>
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <unomid.h>
 #include <svx/galleryitem.hxx>
 #include <com/sun/star/gallery/GalleryItemType.hpp>
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 5be7208b3383..a3ef6109fece 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -35,7 +35,7 @@
 #include "globals.hrc"
 #include "drawbase.hxx"
 #include "beziersh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
 #define SwBezierShell
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 8a9b33502201..41c3e0627c0d 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -55,7 +55,7 @@
 #include "cmdid.h"
 #include "globals.hrc"
 #include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "drwbassh.hxx"
 #include "drawsh.hxx"
 
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index e56af623a61d..f9eeee21e137 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -40,7 +40,7 @@
 #include "cmdid.h"
 #include "globals.hrc"
 #include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "drwbassh.hxx"
 #include "drformsh.hxx"
 #include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 4c31ff70f659..b9a0b3bf3bdb 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -49,7 +49,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svditer.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 #define SwDrawBaseShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index aaf8c256861d..6744d94b2494 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -84,7 +84,7 @@
 #include <langhelper.hxx>
 #include <chrdlgmodes.hxx>
 #include <pardlg.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <string.h>
 #include <swdtflvr.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 9117bb622cf8..b7ae1f342e66 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -56,7 +56,7 @@
 #include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 
 #define SwDrawTextShell
 #include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 81ef6cf89e75..1e5bab8a6c78 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -73,7 +73,7 @@
 #include <cmdid.h>
 #include <cfgitems.hxx>
 #include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 #include "swabstdlg.hxx"
 #include "misc.hrc"
 
@@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                             {
                                 case SID_OBJECT_ALIGN_UP     :
                                 case FN_FRAME_ALIGN_VERT_TOP:
-                                    sNewLabel = SwResId(STR_TOP_BASE);
+                                    sNewLabel = SwResId(STR_FRMUI_TOP_BASE);
                                     break;
                                 case SID_OBJECT_ALIGN_MIDDLE :
                                 case FN_FRAME_ALIGN_VERT_CENTER:
-                                    sNewLabel = SwResId(STR_CENTER_BASE);
+                                    sNewLabel = SwResId(STR_FRMUI_CENTER_BASE);
                                     break;
                                 case SID_OBJECT_ALIGN_DOWN :
                                 case FN_FRAME_ALIGN_VERT_BOTTOM:
                                     if(!bHtmlMode)
-                                        sNewLabel = SwResId(STR_BOTTOM_BASE);
+                                        sNewLabel = SwResId(STR_FRMUI_BOTTOM_BASE);
                                     else
                                         rSet.DisableItem( nWhich );
                                 break;
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 5a7fa6afcc82..d52e03d489bd 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -63,7 +63,7 @@
 #include <usrpref.hxx>
 #include <edtwin.hxx>
 #include <swwait.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <svx/extedit.hxx>
 #include <svx/graphichelper.hxx>
 #include <doc.hxx>
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index 9c96068e8290..c5eec11bec03 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -24,7 +24,7 @@
 #include <textsh.hxx>
 #include <viewopt.hxx>
 #include <swundo.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <caption.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/htmlmode.hxx>
@@ -40,7 +40,7 @@
 #include <svx/svdpagv.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -50,7 +50,7 @@
 
 // -> #111827#
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 // <- #111827#
 
 using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index e0020792b613..2e6127ba6522 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -38,7 +38,7 @@
 #include "frmatr.hxx"
 #include "helpid.h"
 #include "globals.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "uinums.hxx"
 #include "listsh.hxx"
 #include "poolfmt.hxx"
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index f040a234db90..1e67a043dd40 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -54,7 +54,7 @@
 #include <usrpref.hxx>
 #include <edtwin.hxx>
 #include <swwait.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 
 #include <sfx2/objface.hxx>
 #include <vcl/EnumContext.hxx>
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index 073f22a7820c..abba5d41c97b 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -22,7 +22,7 @@
 #include "helpid.h"
 #include "globals.hrc"
 #include "navsh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
 #define SwNavigationShell
 #include "swslots.hxx"
 #include <unomid.h>
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index 9fe17add5af6..5fec60d3f947 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -30,7 +30,7 @@
 #include <olesh.hxx>
 
 #include <cmdid.h>
-#include <shells.hrc>
+#include <strings.hrc>
 
 #define SwOleShell
 #include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index b39292ede61c..4c7046985101 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -73,7 +73,7 @@
 
 #include <app.hrc>
 #include <dialog.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <cmdid.h>
 #include <globals.hrc>
 #include <helpid.h>
diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx
index 73da9c9b145f..da6a3621576c 100644
--- a/sw/source/uibase/shells/textdrw.cxx
+++ b/sw/source/uibase/shells/textdrw.cxx
@@ -32,7 +32,7 @@
 #include <swundo.hxx>
 #include <basesh.hxx>
 
-#include <poolfmt.hrc>
+#include <strings.hrc>
 
 #include <docsh.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 40fbf5a0b5dc..16408fe5e708 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -59,7 +59,7 @@
 #include <fldmgr.hxx>
 #include <uitool.hxx>
 #include <cmdid.h>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
 #include "swabstdlg.hxx"
@@ -80,30 +80,30 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline )
 {
     const OUString sTitle(SwResId(STR_REDLINE_COMMENT));
 
-    sal_uInt16 nResId = 0;
+    const char* pResId = nullptr;
     switch( pRedline->GetType() )
     {
         case nsRedlineType_t::REDLINE_INSERT:
-            nResId = STR_REDLINE_INSERTED;
+            pResId = STR_REDLINE_INSERTED;
             break;
         case nsRedlineType_t::REDLINE_DELETE:
-            nResId = STR_REDLINE_DELETED;
+            pResId = STR_REDLINE_DELETED;
             break;
         case nsRedlineType_t::REDLINE_FORMAT:
         case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
-            nResId = STR_REDLINE_FORMATED;
+            pResId = STR_REDLINE_FORMATED;
             break;
         case nsRedlineType_t::REDLINE_TABLE:
-            nResId = STR_REDLINE_TABLECHG;
+            pResId = STR_REDLINE_TABLECHG;
             break;
         case nsRedlineType_t::REDLINE_FMTCOLL:
-            nResId = STR_REDLINE_FMTCOLLSET;
+            pResId = STR_REDLINE_FMTCOLLSET;
             break;
         default:
             return sTitle;
     }
 
-    return sTitle + SwResId( nResId );
+    return sTitle + SwResId(pResId);
 }
 
 void SwTextShell::ExecField(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 2fb8186ac545..cea962a2408e 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -87,7 +87,7 @@
 #include <modcfg.hxx>
 #include <column.hxx>
 #include <edtwin.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <unochart.hxx>
 
@@ -98,7 +98,7 @@
 #include <vcl/EnumContext.hxx>
 #include <swslots.hxx>
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 508c50232003..84f5aff3bb62 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -82,9 +82,9 @@
 #include <redlndlg.hxx>
 #include "fldmgr.hxx"
 #include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <app.hrc>
-#include <web.hrc>
+#include <strings.hrc>
 #include "paratr.hxx"
 #include <vcl/svapp.hxx>
 #include <sfx2/app.hxx>
@@ -112,7 +112,7 @@
 #include <svx/nbdtmgfact.hxx>
 #include <svx/nbdtmg.hxx>
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <svx/svdmodel.hxx>
 #include <svx/drawitem.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index e3200b5e6890..3e76669345a1 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -47,7 +47,7 @@
 #include "swtypes.hxx"
 #include "cmdid.h"
 #include "swevent.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "textsh.hxx"
 #include "swabstdlg.hxx"
 #include "dbui.hrc"
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 647a733d93cd..9dd36e3a21e0 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -53,7 +53,7 @@
 
 #include <cmdid.h>
 #include <globals.h>
-#include <shells.hrc>
+#include <strings.hrc>
 #include <SwStyleNameMapper.hxx>
 #include "swabstdlg.hxx"
 #include "outline.hxx"
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index ec6a18a66948..b5c2930463fc 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -23,7 +23,7 @@
 #include <cstdlib>
 
 #include "PageMarginControl.hxx"
-#include "PropertyPanel.hrc"
+#include "strings.hrc"
 
 #include <editeng/sizeitem.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/sidebar/PropertyPanel.hrc b/sw/source/uibase/sidebar/PropertyPanel.hrc
deleted file mode 100644
index c705574d2051..000000000000
--- a/sw/source/uibase/sidebar/PropertyPanel.hrc
+++ /dev/null
@@ -1,33 +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_SW_SOURCE_UIBASE_SIDEBAR_PROPERTYPANEL_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PROPERTYPANEL_HRC
-
-#include "rcid.hrc"
-
-#define STR_MARGIN_TOOLTIP_LEFT             (RC_PROPERTYPANEL_BEGIN + 1)
-#define STR_MARGIN_TOOLTIP_RIGHT            (RC_PROPERTYPANEL_BEGIN + 2)
-#define STR_MARGIN_TOOLTIP_INNER            (RC_PROPERTYPANEL_BEGIN + 3)
-#define STR_MARGIN_TOOLTIP_OUTER            (RC_PROPERTYPANEL_BEGIN + 4)
-#define STR_MARGIN_TOOLTIP_TOP              (RC_PROPERTYPANEL_BEGIN + 5)
-#define STR_MARGIN_TOOLTIP_BOT              (RC_PROPERTYPANEL_BEGIN + 6)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 588fce60b723..101ef4ab5606 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -67,7 +67,7 @@
 #include <helpid.h>
 #include <cmdid.h>
 #include <globals.hrc>
-#include <view.hrc>
+#include <strings.hrc>
 
 #define SwPagePreview
 #include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 0dd88e045083..531fa4a25640 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -38,7 +38,7 @@
 #include <svl/whiter.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <svx/svxids.hrc>
 #include <svtools/htmlcfg.hxx>
@@ -73,9 +73,9 @@
 #include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
-#include <shells.hrc>
-#include <web.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index f3f951669ca9..df09349063b0 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -43,7 +43,7 @@
 #include <edtwin.hxx>
 #include <mmconfigitem.hxx>
 
-#include <view.hrc>
+#include <strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index da2bf45e39f5..400a14d4d1ff 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -86,8 +86,8 @@
 #include <barcfg.hxx>
 #include <pview.hxx>
 #include <swdtflvr.hxx>
-#include <view.hrc>
-#include <globdoc.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <frmui.hrc>
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
deleted file mode 100644
index a79adcc9aaf4..000000000000
--- a/sw/source/uibase/uiview/view.hrc
+++ /dev/null
@@ -1,60 +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_SW_SOURCE_UIBASE_UIVIEW_VIEW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEW_HRC
-
-#include "rcid.hrc"
-
-// STR
-
-#define STR_NUM_LEVEL               (RC_VIEW_BEGIN + 3)
-#define STR_NUM_OUTLINE             (RC_VIEW_BEGIN + 4)
-
-#define STR_EDIT_FOOTNOTE           (RC_VIEW_BEGIN + 14)
-
-#define STR_NB_REPLACED             (RC_VIEW_BEGIN + 20)
-#define STR_SCAN_NOSOURCE           (RC_VIEW_BEGIN + 21)
-
-#define STR_SRCVIEW_ROW             (RC_VIEW_BEGIN + 22)
-#define STR_SRCVIEW_COL             (RC_VIEW_BEGIN + 23)
-#define STR_SAVEAS_SRC              (RC_VIEW_BEGIN + 24)
-
-#define STR_NO_MERGE_ENTRY          (RC_VIEW_BEGIN + 25)
-
-#define STR_WEBOPTIONS              (RC_VIEW_BEGIN + 32)
-#define STR_TEXTOPTIONS             (RC_VIEW_BEGIN + 33)
-
-#define STR_SAVEACOPY_SRC           (RC_VIEW_BEGIN + 34)
-
-#define STR_ERR_NO_FAX              (RC_VIEW_BEGIN + 36)
-#define STR_ERR_SRCSTREAM           (RC_VIEW_BEGIN + 37)
-
-#define STR_QUERY_SPECIAL_FORCED    (RC_VIEW_BEGIN + 38)
-
-// Overflow checking
-
-#define VIEW_ACT_END        STR_EDIT_FOOTNOTE
-
-#if VIEW_ACT_END > RC_VIEW_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
deleted file mode 100644
index 165f5898c1af..000000000000
--- a/sw/source/uibase/uiview/view.src
+++ /dev/null
@@ -1,88 +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 <svx/svxids.hrc>
-#include "view.hrc"
-#include "shells.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String STR_QUERY_SPECIAL_FORCED
-{
-    Text [ en-US ] = "Check special regions is deactivated. Check anyway?" ;
-};
-String STR_NO_MERGE_ENTRY
-{
-    Text [ en-US ] = "Could not merge documents." ;
-};
-String STR_ERR_SRCSTREAM
-{
-    Text [ en-US ] = "The source cannot be loaded." ;
-};
-String STR_ERR_NO_FAX
-{
-    Text [ en-US ] = "No fax printer has been set under Tools/Options/%1/Print." ;
-};
-String STR_WEBOPTIONS
-{
-    Text [ en-US ] = "HTML document";
-};
-String STR_TEXTOPTIONS
-{
-    Text [ en-US ] = "Text document";
-};
-String STR_SCAN_NOSOURCE
-{
-    Text [ en-US ] = "Source not specified." ;
-};
-String STR_NUM_LEVEL
-{
-    Text [ en-US ] = "Level " ;
-};
-String STR_NUM_OUTLINE
-{
-    Text [ en-US ] = "Outline ";
-};
-String STR_EDIT_FOOTNOTE
-{
-    Text [ en-US ] = "Edit Footnote/Endnote" ;
-};
-String STR_NB_REPLACED
-{
-    Text [ en-US ] = "Search key replaced XX times." ;
-};
-String STR_SRCVIEW_ROW
-{
-    Text [ en-US ] = "Row " ;
-};
-String STR_SRCVIEW_COL
-{
-    Text [ en-US ] = "Column " ;
-};
-String STR_SAVEAS_SRC
-{
-    Text [ en-US ] = "~Export source..." ;
-};
-String STR_SAVEACOPY_SRC
-{
-    Text [ en-US ] = "~Export copy of source..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 18cdea0f2c0a..4ee436e9e47f 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -54,7 +54,7 @@
 #include "cmdid.h"
 #include "globdoc.hxx"
 #include "wview.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
 
 #define SwView
 #define Text
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 654716b85172..b663f884c55a 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -106,14 +106,14 @@
 #include <tabsh.hxx>
 #include <listsh.hxx>
 #include <cmdid.h>
-#include <comcore.hrc>
-#include <poolfmt.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <swerror.h>
 #include <globals.hrc>
-#include <shells.hrc>
-#include <web.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <app.hrc>
 #include <fmtclds.hxx>
 #include <helpid.h>
@@ -132,7 +132,6 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include "swabstdlg.hxx"
-#include <envelp.hrc>
 #include <fmthdft.hxx>
 #include <svx/ofaitem.hxx>
 #include <unomid.h>
@@ -467,27 +466,27 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
             rSh.SetFrameFormat( pFormat );
         }
 
-        sal_uInt32 nResId(0);
+        const char* pResId(nullptr);
         if( nError == ERRCODE_GRFILTER_OPENERROR )
-            nResId = STR_GRFILTER_OPENERROR;
+            pResId = STR_GRFILTER_OPENERROR;
         else if( nError == ERRCODE_GRFILTER_IOERROR )
-            nResId = STR_GRFILTER_IOERROR;
+            pResId = STR_GRFILTER_IOERROR;
         else if( nError ==ERRCODE_GRFILTER_FORMATERROR )
-            nResId = STR_GRFILTER_FORMATERROR;
+            pResId = STR_GRFILTER_FORMATERROR;
         else if( nError ==ERRCODE_GRFILTER_VERSIONERROR )
-            nResId = STR_GRFILTER_VERSIONERROR;
+            pResId = STR_GRFILTER_VERSIONERROR;
         else if( nError ==ERRCODE_GRFILTER_FILTERERROR )
-            nResId = STR_GRFILTER_FILTERERROR;
+            pResId = STR_GRFILTER_FILTERERROR;
         else if( nError ==ERRCODE_GRFILTER_TOOBIG )
-            nResId = STR_GRFILTER_TOOBIG;
+            pResId = STR_GRFILTER_TOOBIG;
 
         rSh.EndAction();
         rSh.UnlockPaint();
-        if( nResId )
+        if (pResId)
         {
             if( bShowError )
             {
-                ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId( nResId ), VclMessageType::Info);
+                ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId(pResId), VclMessageType::Info);
                 aInfoBox->Execute();
             }
             rReq.Ignore();
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index 4380835251e5..0269604c6b97 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -24,7 +24,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/stritem.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
 
 #include "view.hxx"
 #include "wrtsh.hxx"
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 1c632ad6793a..77a528e20498 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -39,7 +39,7 @@
 #include "frmui.hrc"
 #include "misc.hrc"
 
-#include "view.hrc"
+#include "strings.hrc"
 
 #include <memory>
 
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 35a6e34e765b..6f320809d07e 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -59,8 +59,8 @@
 #include <vcl/lstbox.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
-#include <comcore.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <hhcwrp.hxx>
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -426,7 +426,7 @@ void SwView::HyphenateDocument()
     }
 
     SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, OUString(), m_pEditWin,
-         RID_SVXERRCTX, &DIALOG_MGR() );
+         getRID_SVXERRCTX(), &SvxResLocale() );
 
     Reference< XHyphenator >  xHyph( ::GetHyphenator() );
     if (!xHyph.is())
@@ -548,7 +548,7 @@ void SwView::StartThesaurus()
         return;
 
     SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, OUString(), m_pEditWin,
-         RID_SVXERRCTX, &DIALOG_MGR() );
+         getRID_SVXERRCTX(), &SvxResLocale() );
 
     // Determine language
     LanguageType eLang = m_pWrtShell->GetCurLang();
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 82b2369df284..a141815d6cc7 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -45,8 +45,8 @@
 #include <wview.hxx>
 
 #include <cmdid.h>
-#include <view.hrc>
-#include <ribbar.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <helpid.h>
 #include <globals.hrc>
 
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index f73ea02ddca5..7be7a7aae6f4 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -57,7 +57,7 @@
 #include <IDocumentDeviceAccess.hxx>
 
 #include <globals.hrc>
-#include <view.hrc>
+#include <strings.hrc>
 #include <app.hrc>
 #include <swwrtshitem.hxx>
 #include "swabstdlg.hxx"
@@ -177,8 +177,8 @@ void SwView::ExecutePrint(SfxRequest& rReq)
             else
             {
                 ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SwResId(STR_ERR_NO_FAX), VclMessageType::Info);
-                sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
-                aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(nResNo)));
+                const char* pResId = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
+                aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(pResId)));
                 aInfoBox->Execute();
                 SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
                 GetViewFrame()->GetDispatcher()->ExecuteList(SID_SW_EDITOPTIONS,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 0c08d996dd27..f27f9bfa6f28 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -61,9 +61,9 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/string.hxx>
 
-#include <view.hrc>
+#include <strings.hrc>
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <IDocumentDrawModelAccess.hxx>
 #include <drawdoc.hxx>
 
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 83fd4ba778ba..aca79a13c678 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -102,7 +102,7 @@
 #include <docstat.hxx>
 #include <modcfg.hxx>
 #include <ndtxt.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <swcont.hxx>
 #include <unodefaults.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 0d6ba76eb06f..f2077c883be9 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -52,7 +52,7 @@
 #include <charfmt.hxx>
 #include <fmtcol.hxx>
 #include <tox.hxx>
-#include <attrdesc.hrc>
+#include <strings.hrc>
 #include <fmtftntx.hxx>
 #include <fmtfollowtextflow.hxx>
 #include <libxml/xmlwriter.h>
@@ -182,8 +182,8 @@ bool SwRegisterItem::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF;
-    rText = SwResId( nId );
+    const char* pId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF;
+    rText = SwResId(pId);
     return true;
 }
 
@@ -213,8 +213,8 @@ bool SwParaConnectBorderItem::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
-    rText = SwResId( nId );
+    const char* pId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
+    rText = SwResId(pId);
     return true;
 }
 
@@ -242,9 +242,9 @@ bool SwFormatFrameSize::GetPresentation
     }
     if ( ATT_VAR_SIZE != GetHeightSizeType() )
     {
-        const sal_uInt16 nId = ATT_FIX_SIZE == m_eFrameHeightType ?
+        const char* pId = ATT_FIX_SIZE == m_eFrameHeightType ?
                                 STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT;
-        rText = rText + ", " + SwResId( nId ) + " ";
+        rText = rText + ", " + SwResId(pId) + " ";
         if ( GetHeightPercent() )
         {
             rText = rText + unicode::formatPercent(GetHeightPercent(),
@@ -271,8 +271,8 @@ bool SwFormatHeader::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
-    rText = SwResId( nId );
+    const char* pId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
+    rText = SwResId(pId);
     return true;
 }
 
@@ -288,8 +288,8 @@ bool SwFormatFooter::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
-    rText = SwResId( nId );
+    const char* pId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
+    rText = SwResId(pId);
     return true;
 }
 
@@ -302,31 +302,31 @@ bool SwFormatSurround::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
     switch ( (css::text::WrapTextMode)GetValue() )
     {
         case css::text::WrapTextMode_NONE:
-            nId = STR_SURROUND_NONE;
+            pId = STR_SURROUND_NONE;
         break;
         case css::text::WrapTextMode_THROUGH:
-            nId = STR_SURROUND_THROUGH;
+            pId = STR_SURROUND_THROUGH;
         break;
         case css::text::WrapTextMode_PARALLEL:
-            nId = STR_SURROUND_PARALLEL;
+            pId = STR_SURROUND_PARALLEL;
         break;
         case css::text::WrapTextMode_DYNAMIC:
-            nId = STR_SURROUND_IDEAL;
+            pId = STR_SURROUND_IDEAL;
         break;
         case css::text::WrapTextMode_LEFT:
-            nId = STR_SURROUND_LEFT;
+            pId = STR_SURROUND_LEFT;
         break;
         case css::text::WrapTextMode_RIGHT:
-            nId = STR_SURROUND_RIGHT;
+            pId = STR_SURROUND_RIGHT;
         break;
         default:;//prevent warning
     }
-    if ( nId )
-        rText = SwResId( nId );
+    if (pId)
+        rText = SwResId(pId);
 
     if ( IsAnchorOnly() )
     {
@@ -346,7 +346,7 @@ bool SwFormatVertOrient::GetPresentation
     const IntlWrapper*        pIntl
 )   const
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
     switch ( GetVertOrient() )
     {
         case text::VertOrientation::NONE:
@@ -357,27 +357,27 @@ bool SwFormatVertOrient::GetPresentation
         }
         break;
         case text::VertOrientation::TOP:
-            nId = STR_VERT_TOP;
+            pId = STR_VERT_TOP;
             break;
         case text::VertOrientation::CENTER:
-            nId = STR_VERT_CENTER;
+            pId = STR_VERT_CENTER;
             break;
         case text::VertOrientation::BOTTOM:
-            nId = STR_VERT_BOTTOM;
+            pId = STR_VERT_BOTTOM;
             break;
         case text::VertOrientation::LINE_TOP:
-            nId = STR_LINE_TOP;
+            pId = STR_LINE_TOP;
             break;
         case text::VertOrientation::LINE_CENTER:
-            nId = STR_LINE_CENTER;
+            pId = STR_LINE_CENTER;
             break;
         case text::VertOrientation::LINE_BOTTOM:
-            nId = STR_LINE_BOTTOM;
+            pId = STR_LINE_BOTTOM;
             break;
         default:;//prevent warning
     }
-    if ( nId )
-        rText += SwResId( nId );
+    if (pId)
+        rText += SwResId(pId);
     return true;
 }
 
@@ -392,7 +392,7 @@ bool SwFormatHoriOrient::GetPresentation
     const IntlWrapper*        pIntl
 )   const
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
     switch ( GetHoriOrient() )
     {
         case text::HoriOrientation::NONE:
@@ -403,27 +403,27 @@ bool SwFormatHoriOrient::GetPresentation
         }
         break;
         case text::HoriOrientation::RIGHT:
-            nId = STR_HORI_RIGHT;
+            pId = STR_HORI_RIGHT;
         break;
         case text::HoriOrientation::CENTER:
-            nId = STR_HORI_CENTER;
+            pId = STR_HORI_CENTER;
         break;
         case text::HoriOrientation::LEFT:
-            nId = STR_HORI_LEFT;
+            pId = STR_HORI_LEFT;
         break;
         case text::HoriOrientation::INSIDE:
-            nId = STR_HORI_INSIDE;
+            pId = STR_HORI_INSIDE;
         break;
         case text::HoriOrientation::OUTSIDE:
-            nId = STR_HORI_OUTSIDE;
+            pId = STR_HORI_OUTSIDE;
         break;
         case text::HoriOrientation::FULL:
-            nId = STR_HORI_FULL;
+            pId = STR_HORI_FULL;
         break;
         default:;//prevent warning
     }
-    if ( nId )
-        rText += SwResId( nId );
+    if (pId)
+        rText += SwResId(pId);
     return true;
 }
 
@@ -438,22 +438,22 @@ bool SwFormatAnchor::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
     switch ( GetAnchorId() )
     {
         case RndStdIds::FLY_AT_PARA:
-            nId = STR_FLY_AT_PARA;
+            pId = STR_FLY_AT_PARA;
             break;
         case RndStdIds::FLY_AS_CHAR:
-            nId = STR_FLY_AS_CHAR;
+            pId = STR_FLY_AS_CHAR;
             break;
         case RndStdIds::FLY_AT_PAGE:
-            nId = STR_FLY_AT_PAGE;
+            pId = STR_FLY_AT_PAGE;
             break;
         default:;//prevent warning
     }
-    if ( nId )
-        rText += SwResId( nId );
+    if (pId)
+        rText += SwResId(pId);
     return true;
 }
 
@@ -646,22 +646,22 @@ bool SwTextGridItem::GetPresentation
     const IntlWrapper*  /*pIntl*/
 )   const
 {
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch ( GetGridType() )
     {
     case GRID_NONE :
-        nId = STR_GRID_NONE;
+        pId = STR_GRID_NONE;
         break;
     case GRID_LINES_ONLY :
-        nId = STR_GRID_LINES_ONLY;
+        pId = STR_GRID_LINES_ONLY;
         break;
     case GRID_LINES_CHARS :
-        nId = STR_GRID_LINES_CHARS;
+        pId = STR_GRID_LINES_CHARS;
         break;
     }
-    if ( nId )
-        rText += SwResId( nId );
+    if (pId)
+        rText += SwResId(pId);
     return true;
 }
 
@@ -683,18 +683,18 @@ bool SwMirrorGrf::GetPresentation(
     SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
     OUString& rText, const IntlWrapper* /*pIntl*/ ) const
 {
-    sal_uInt16 nId;
+    const char* pId;
     switch( GetValue() )
     {
-    case MirrorGraph::Dont:     nId = STR_NO_MIRROR;    break;
-    case MirrorGraph::Vertical: nId = STR_VERT_MIRROR;  break;
-    case MirrorGraph::Horizontal:  nId = STR_HORI_MIRROR;  break;
-    case MirrorGraph::Both: nId = STR_BOTH_MIRROR;  break;
-    default:                    nId = 0;    break;
+    case MirrorGraph::Dont:     pId = STR_NO_MIRROR;    break;
+    case MirrorGraph::Vertical: pId = STR_VERT_MIRROR;  break;
+    case MirrorGraph::Horizontal:  pId = STR_HORI_MIRROR;  break;
+    case MirrorGraph::Both:     pId = STR_BOTH_MIRROR;  break;
+    default:                    pId = nullptr;    break;
     }
-    if ( nId )
+    if (pId)
     {
-        rText = SwResId( nId );
+        rText = SwResId(pId);
         if (bGrfToggle)
             rText += SwResId( STR_MIRROR_TOGGLE );
     }
@@ -745,16 +745,16 @@ bool SwChannelGrf::GetPresentation(
 {
     if( SfxItemPresentation::Complete == ePres )
     {
-        sal_uInt16 nId;
+        const char* pId;
         switch ( Which() )
         {
-        case RES_GRFATR_CHANNELR:   nId = STR_CHANNELR; break;
-        case RES_GRFATR_CHANNELG:   nId = STR_CHANNELG; break;
-        case RES_GRFATR_CHANNELB:   nId = STR_CHANNELB; break;
-        default:                    nId = 0; break;
+        case RES_GRFATR_CHANNELR:   pId = STR_CHANNELR; break;
+        case RES_GRFATR_CHANNELG:   pId = STR_CHANNELG; break;
+        case RES_GRFATR_CHANNELB:   pId = STR_CHANNELB; break;
+        default:                    pId = nullptr; break;
         }
-        if( nId )
-            rText = SwResId( nId );
+        if (pId)
+            rText = SwResId(pId);
         else if( rText.getLength() )
             rText.clear();
     }
@@ -785,8 +785,8 @@ bool SwInvertGrf::GetPresentation(
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
     {
-        const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT;
-        rText = SwResId( nId );
+        const char* pId = GetValue() ? STR_INVERT : STR_INVERT_NOT;
+        rText = SwResId(pId);
     }
     return true;
 }
@@ -811,16 +811,16 @@ bool SwDrawModeGrf::GetPresentation(
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
     {
-        sal_uInt16 nId;
+        const char* pId;
         switch ( GetValue() )
         {
 
-        case GraphicDrawMode::Greys:     nId = STR_DRAWMODE_GREY; break;
-        case GraphicDrawMode::Mono:      nId = STR_DRAWMODE_BLACKWHITE; break;
-        case GraphicDrawMode::Watermark: nId = STR_DRAWMODE_WATERMARK; break;
-        default:                        nId = STR_DRAWMODE_STD; break;
+        case GraphicDrawMode::Greys:     pId = STR_DRAWMODE_GREY; break;
+        case GraphicDrawMode::Mono:      pId = STR_DRAWMODE_BLACKWHITE; break;
+        case GraphicDrawMode::Watermark: pId = STR_DRAWMODE_WATERMARK; break;
+        default:                         pId = STR_DRAWMODE_STD; break;
         }
-        rText = SwResId( STR_DRAWMODE ) + SwResId( nId );
+        rText = SwResId( STR_DRAWMODE ) + SwResId(pId);
     }
     return true;
 }
@@ -834,8 +834,8 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
     rText.clear();
     if( SfxItemPresentation::Complete == ePres )
     {
-        const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW;
-        rText = SwResId( nId );
+        const char* pId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW;
+        rText = SwResId(pId);
     }
     return true;
 }
diff --git a/sw/source/uibase/utlui/attrdesc.hrc b/sw/source/uibase/utlui/attrdesc.hrc
deleted file mode 100644
index 861f8215adb4..000000000000
--- a/sw/source/uibase/utlui/attrdesc.hrc
+++ /dev/null
@@ -1,112 +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_SW_SOURCE_UIBASE_UTLUI_ATTRDESC_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_ATTRDESC_HRC
-
-#include "rcid.hrc"
-
-#define STR_DROP_OVER                   (RC_ATTR_BEGIN + 1)
-#define STR_DROP_LINES                  (RC_ATTR_BEGIN + 2)
-#define STR_NO_DROP_LINES               (RC_ATTR_BEGIN + 3)
-#define STR_NO_PAGEDESC                 (RC_ATTR_BEGIN + 4)
-#define STR_NO_MIRROR                   (RC_ATTR_BEGIN + 5)
-#define STR_VERT_MIRROR                 (RC_ATTR_BEGIN + 6)
-#define STR_HORI_MIRROR                 (RC_ATTR_BEGIN + 7)
-#define STR_BOTH_MIRROR                 (RC_ATTR_BEGIN + 8)
-#define STR_CHARFMT                     (RC_ATTR_BEGIN + 9)
-#define STR_NO_CHARFMT                  (RC_ATTR_BEGIN + 10)
-#define STR_FOOTER                      (RC_ATTR_BEGIN + 11)
-#define STR_NO_FOOTER                   (RC_ATTR_BEGIN + 12)
-#define STR_HEADER                      (RC_ATTR_BEGIN + 13)
-#define STR_NO_HEADER                   (RC_ATTR_BEGIN + 14)
-#define STR_SURROUND_NONE               (RC_ATTR_BEGIN + 15)
-#define STR_SURROUND_THROUGH            (RC_ATTR_BEGIN + 16)
-#define STR_SURROUND_PARALLEL           (RC_ATTR_BEGIN + 17)
-#define STR_SURROUND_LEFT               (RC_ATTR_BEGIN + 19)
-#define STR_SURROUND_RIGHT              (RC_ATTR_BEGIN + 20)
-#define STR_FRM_WIDTH                   (RC_ATTR_BEGIN + 23)
-#define STR_FRM_FIXEDHEIGHT             (RC_ATTR_BEGIN + 24)
-#define STR_FRM_MINHEIGHT               (RC_ATTR_BEGIN + 25)
-#define STR_FLY_AT_PARA                 (RC_ATTR_BEGIN + 26)
-#define STR_FLY_AS_CHAR                 (RC_ATTR_BEGIN + 27)
-#define STR_FLY_AT_PAGE                 (RC_ATTR_BEGIN + 28)
-#define STR_POS_X                       (RC_ATTR_BEGIN + 29)
-#define STR_POS_Y                       (RC_ATTR_BEGIN + 30)
-#define STR_VERT_TOP                    (RC_ATTR_BEGIN + 31)
-#define STR_VERT_CENTER                 (RC_ATTR_BEGIN + 32)
-#define STR_VERT_BOTTOM                 (RC_ATTR_BEGIN + 33)
-#define STR_HORI_RIGHT                  (RC_ATTR_BEGIN + 34)
-#define STR_HORI_CENTER                 (RC_ATTR_BEGIN + 35)
-#define STR_HORI_LEFT                   (RC_ATTR_BEGIN + 36)
-#define STR_HORI_INSIDE                 (RC_ATTR_BEGIN + 37)
-#define STR_HORI_OUTSIDE                (RC_ATTR_BEGIN + 38)
-#define STR_HORI_FULL                   (RC_ATTR_BEGIN + 39)
-#define STR_COLUMNS                     (RC_ATTR_BEGIN + 40)
-#define STR_LINE_WIDTH                  (RC_ATTR_BEGIN + 41)
-#define STR_MAX_FTN_HEIGHT              (RC_ATTR_BEGIN + 42)
-#define STR_SURROUND_IDEAL              (RC_ATTR_BEGIN + 43)
-#define STR_LINE_TOP                    (RC_ATTR_BEGIN + 44)
-#define STR_LINE_CENTER                 (RC_ATTR_BEGIN + 45)
-#define STR_LINE_BOTTOM                 (RC_ATTR_BEGIN + 46)
-#define STR_REGISTER_ON                 (RC_ATTR_BEGIN + 47)
-#define STR_REGISTER_OFF                (RC_ATTR_BEGIN + 48)
-#define STR_SURROUND_ANCHORONLY         (RC_ATTR_BEGIN + 49)
-#define STR_EDIT_IN_READONLY            (RC_ATTR_BEGIN + 50)
-#define STR_LAYOUT_SPLIT                (RC_ATTR_BEGIN + 51)
-#define STR_NUMRULE_ON                  (RC_ATTR_BEGIN + 52)
-#define STR_NUMRULE_OFF                 (RC_ATTR_BEGIN + 53)
-#define STR_CONNECT1                    (RC_ATTR_BEGIN + 54)
-#define STR_CONNECT2                    (RC_ATTR_BEGIN + 55)
-#define STR_MIRROR_TOGGLE               (RC_ATTR_BEGIN + 56)
-#define STR_LINECOUNT                   (RC_ATTR_BEGIN + 57)
-#define STR_DONTLINECOUNT               (RC_ATTR_BEGIN + 58)
-#define STR_LINCOUNT_START              (RC_ATTR_BEGIN + 59)
-#define STR_LUMINANCE                   (RC_ATTR_BEGIN + 60)
-#define STR_CHANNELR                    (RC_ATTR_BEGIN + 61)
-#define STR_CHANNELG                    (RC_ATTR_BEGIN + 62)
-#define STR_CHANNELB                    (RC_ATTR_BEGIN + 63)
-#define STR_CONTRAST                    (RC_ATTR_BEGIN + 64)
-#define STR_GAMMA                       (RC_ATTR_BEGIN + 65)
-#define STR_TRANSPARENCY                (RC_ATTR_BEGIN + 66)
-#define STR_INVERT                      (RC_ATTR_BEGIN + 67)
-#define STR_INVERT_NOT                  (RC_ATTR_BEGIN + 68)
-#define STR_DRAWMODE                    (RC_ATTR_BEGIN + 69)
-#define STR_DRAWMODE_STD                (RC_ATTR_BEGIN + 70)
-#define STR_DRAWMODE_GREY               (RC_ATTR_BEGIN + 71)
-#define STR_DRAWMODE_BLACKWHITE         (RC_ATTR_BEGIN + 72)
-#define STR_DRAWMODE_WATERMARK          (RC_ATTR_BEGIN + 73)
-#define STR_ROTATION                    (RC_ATTR_BEGIN + 74)
-#define STR_GRID_NONE                   (RC_ATTR_BEGIN + 75)
-#define STR_GRID_LINES_ONLY             (RC_ATTR_BEGIN + 76)
-#define STR_GRID_LINES_CHARS            (RC_ATTR_BEGIN + 77)
-#define STR_FOLLOW_TEXT_FLOW            (RC_ATTR_BEGIN + 78)
-#define STR_DONT_FOLLOW_TEXT_FLOW       (RC_ATTR_BEGIN + 79)
-#define STR_CONNECT_BORDER_ON           (RC_ATTR_BEGIN + 80)
-#define STR_CONNECT_BORDER_OFF          (RC_ATTR_BEGIN + 81)
-
-#define ATTR_ACT_END                                    STR_CONNECT_BORDER_OFF
-
-#if ATTR_ACT_END > RC_ATTR_END
-#error Resource-Id overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/attrdesc.src b/sw/source/uibase/utlui/attrdesc.src
deleted file mode 100644
index 3bc55fa38e37..000000000000
--- a/sw/source/uibase/utlui/attrdesc.src
+++ /dev/null
@@ -1,351 +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 "globals.hrc"
-#include "attrdesc.hrc"
-
-// Strings for textual attributes.
-
-String STR_DROP_OVER
-{
-    Text [ en-US ] = "Drop Caps over" ;
-};
-String STR_DROP_LINES
-{
-    Text [ en-US ] = "rows" ;
-};
-String STR_NO_DROP_LINES
-{
-    Text [ en-US ] = "No Drop Caps" ;
-};
-String STR_NO_PAGEDESC
-{
-    Text [ en-US ] = "No page break" ;
-};
-String STR_NO_MIRROR
-{
-    Text [ en-US ] = "Don't mirror" ;
-};
-String STR_VERT_MIRROR
-{
-    Text [ en-US ] = "Flip vertically" ;
-};
-String STR_HORI_MIRROR
-{
-    Text [ en-US ] = "Flip horizontal" ;
-};
-String STR_BOTH_MIRROR
-{
-    Text [ en-US ] = "Horizontal and Vertical Flip" ;
-};
-String STR_MIRROR_TOGGLE
-{
-    Text [ en-US ] = "+ mirror horizontal on even pages" ;
-};
-String STR_CHARFMT
-{
-    Text [ en-US ] = "Character Style" ;
-};
-String STR_NO_CHARFMT
-{
-    Text [ en-US ] = "No Character Style" ;
-};
-String STR_FOOTER
-{
-    Text [ en-US ] = "Footer" ;
-};
-String STR_NO_FOOTER
-{
-    Text [ en-US ] = "No footer" ;
-};
-String STR_HEADER
-{
-    Text [ en-US ] = "Header" ;
-};
-String STR_NO_HEADER
-{
-    Text [ en-US ] = "No header" ;
-};
-String STR_SURROUND_IDEAL
-{
-    Text [ en-US ] = "Optimal wrap" ;
-};
-String STR_SURROUND_NONE
-{
-    Text [ en-US ] = "No wrap" ;
-};
-String STR_SURROUND_THROUGH
-{
-    Text [ en-US ] = "Through" ;
-};
-String STR_SURROUND_PARALLEL
-{
-    Text [ en-US ] = "Parallel wrap" ;
-};
-String STR_SURROUND_LEFT
-{
-    Text [ en-US ] = "Left wrap" ;
-};
-String STR_SURROUND_RIGHT
-{
-    Text [ en-US ] = "Right wrap" ;
-};
-String STR_SURROUND_ANCHORONLY
-{
-    Text [ en-US ] = "(Anchor only)" ;
-};
-String STR_FRM_WIDTH
-{
-    Text [ en-US ] = "Width:" ;
-};
-String STR_FRM_FIXEDHEIGHT
-{
-    Text [ en-US ] = "Fixed height:" ;
-};
-String STR_FRM_MINHEIGHT
-{
-    Text [ en-US ] = "Min. height:" ;
-};
-String STR_FLY_AT_PARA
-{
-    Text [ en-US ] = "to paragraph" ;
-};
-String STR_FLY_AS_CHAR
-{
-    Text [ en-US ] = "to character" ;
-};
-String STR_FLY_AT_PAGE
-{
-    Text [ en-US ] = "to page" ;
-};
-String STR_POS_X
-{
-    Text [ en-US ] = "X Coordinate:" ;
-};
-String STR_POS_Y
-{
-    Text [ en-US ] = "Y Coordinate:" ;
-};
-String STR_VERT_TOP
-{
-    Text [ en-US ] = "at top" ;
-};
-String STR_VERT_CENTER
-{
-    Text [ en-US ] = "Centered vertically" ;
-};
-String STR_VERT_BOTTOM
-{
-    Text [ en-US ] = "at bottom" ;
-};
-String STR_LINE_TOP
-{
-    Text [ en-US ] = "Top of line" ;
-};
-String STR_LINE_CENTER
-{
-    Text [ en-US ] = "Line centered" ;
-};
-String STR_LINE_BOTTOM
-{
-    Text [ en-US ] = "Bottom of line" ;
-};
-String STR_REGISTER_ON
-{
-    Text [ en-US ] = "Register-true" ;
-};
-String STR_REGISTER_OFF
-{
-    Text [ en-US ] = "Not register-true" ;
-};
-String STR_HORI_RIGHT
-{
-    Text [ en-US ] = "at the right" ;
-};
-String STR_HORI_CENTER
-{
-    Text [ en-US ] = "Centered horizontally" ;
-};
-String STR_HORI_LEFT
-{
-    Text [ en-US ] = "at the left" ;
-};
-String STR_HORI_INSIDE
-{
-    Text [ en-US ] = "inside" ;
-};
-String STR_HORI_OUTSIDE
-{
-    Text [ en-US ] = "outside" ;
-};
-String STR_HORI_FULL
-{
-    Text [ en-US ] = "Full width" ;
-};
-String STR_COLUMNS
-{
-    Text [ en-US ] = "Columns" ;
-};
-String STR_LINE_WIDTH
-{
-    Text [ en-US ] = "Separator Width:" ;
-};
-String STR_MAX_FTN_HEIGHT
-{
-    Text [ en-US ] = "Max. footnote area:" ;
-};
-String STR_EDIT_IN_READONLY
-{
-    Text [ en-US ] = "Editable in read-only document" ;
-};
-String STR_LAYOUT_SPLIT
-{
-    Text [ en-US ] = "Split" ;
-};
-String STR_NUMRULE_ON
-{
-    Text [ en-US ] = "Numbering" ;
-};
-String STR_NUMRULE_OFF
-{
-    Text [ en-US ] = "no numbering" ;
-};
-String STR_CONNECT1
-{
-    Text [ en-US ] = "linked to " ;
-};
-String STR_CONNECT2
-{
-    Text [ en-US ] = "and " ;
-};
-String STR_LINECOUNT
-{
-    Text [ en-US ] = "Count lines" ;
-};
-String STR_DONTLINECOUNT
-{
-    Text [ en-US ] = "don't count lines" ;
-};
-String STR_LINCOUNT_START
-{
-    Text [ en-US ] = "restart line count with: " ;
-};
-
-String STR_LUMINANCE
-{
-    Text [ en-US ] = "Brightness: ";
-};
-
-String STR_CHANNELR
-{
-    Text [ en-US ] = "Red: ";
-};
-
-String STR_CHANNELG
-{
-    Text [ en-US ] = "Green: ";
-};
-
-String STR_CHANNELB
-{
-    Text [ en-US ] = "Blue: ";
-};
-
-String STR_CONTRAST
-{
-    Text [ en-US ] = "Contrast: ";
-};
-
-String STR_GAMMA
-{
-    Text [ en-US ] = "Gamma: ";
-};
-
-String STR_TRANSPARENCY
-{
-    Text [ en-US ] = "Transparency: ";
-};
-
-String STR_INVERT
-{
-    Text [ en-US ] = "Invert";
-};
-String STR_INVERT_NOT
-{
-    Text [ en-US ] = "do not invert";
-};
-
-String STR_DRAWMODE
-{
-    Text [ en-US ] = "Graphics mode: ";
-};
-
-String STR_DRAWMODE_STD
-{
-    Text [ en-US ] = "Standard";
-};
-String STR_DRAWMODE_GREY
-{
-    Text [ en-US ] = "Grayscales";
-};
-String STR_DRAWMODE_BLACKWHITE
-{
-    Text [ en-US ] = "Black & White";
-};
-String STR_DRAWMODE_WATERMARK
-{
-    Text [ en-US ] = "Watermark";
-};
-String STR_ROTATION
-{
-    Text [ en-US ] = "Rotation";
-};
-
-String STR_GRID_NONE
-{
-    Text [ en-US ] = "No grid";
-};
-
-String STR_GRID_LINES_ONLY
-{
-    Text [ en-US ] = "Grid (lines only)";
-};
-
-String STR_GRID_LINES_CHARS
-{
-    Text [ en-US ] = "Grid (lines and characters)";
-};
-String STR_FOLLOW_TEXT_FLOW
-{
-    Text [ en-US ] = "Follow text flow";
-};
-String STR_DONT_FOLLOW_TEXT_FLOW
-{
-    Text [ en-US ] = "Do not follow text flow";
-};
-String STR_CONNECT_BORDER_ON
-{
-    Text [ en-US ] = "Merge borders";
-};
-String STR_CONNECT_BORDER_OFF
-{
-    Text [ en-US ] = "Do not merge borders";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 620bd42a8d3b..98d5de5488be 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -19,7 +19,7 @@
 
 #include "hintids.hxx"
 #include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 20c6ee6c028b..9d369a8eabe8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -57,9 +57,9 @@
 #include <unotxvw.hxx>
 #include <cmdid.h>
 #include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <misc.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
 #include <com/sun/star/text/XTextSectionsSupplier.hpp>
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
@@ -215,12 +215,44 @@ SwTOXBaseContent::~SwTOXBaseContent()
 {
 }
 
+static const char* STR_CONTENT_TYPE_ARY[] =
+{
+    STR_CONTENT_TYPE_OUTLINE,
+    STR_CONTENT_TYPE_TABLE,
+    STR_CONTENT_TYPE_FRAME,
+    STR_CONTENT_TYPE_GRAPHIC,
+    STR_CONTENT_TYPE_OLE,
+    STR_CONTENT_TYPE_BOOKMARK,
+    STR_CONTENT_TYPE_REGION,
+    STR_CONTENT_TYPE_URLFIELD,
+    STR_CONTENT_TYPE_REFERENCE,
+    STR_CONTENT_TYPE_INDEX,
+    STR_CONTENT_TYPE_POSTIT,
+    STR_CONTENT_TYPE_DRAWOBJECT
+};
+
+static const char* STR_CONTENT_TYPE_SINGLE_ARY[] =
+{
+    STR_CONTENT_TYPE_SINGLE_OUTLINE,
+    STR_CONTENT_TYPE_SINGLE_TABLE,
+    STR_CONTENT_TYPE_SINGLE_FRAME,
+    STR_CONTENT_TYPE_SINGLE_GRAPHIC,
+    STR_CONTENT_TYPE_SINGLE_OLE,
+    STR_CONTENT_TYPE_SINGLE_BOOKMARK,
+    STR_CONTENT_TYPE_SINGLE_REGION,
+    STR_CONTENT_TYPE_SINGLE_URLFIELD,
+    STR_CONTENT_TYPE_SINGLE_REFERENCE,
+    STR_CONTENT_TYPE_SINGLE_INDEX,
+    STR_CONTENT_TYPE_SINGLE_POSTIT,
+    STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
+};
+
 SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 nLevel) :
     SwTypeNumber(CTYPE_CTT),
     pWrtShell(pShell),
     pMember(nullptr),
-    sContentTypeName(SwResId(STR_CONTENT_TYPE_FIRST + (int)nType)),
-    sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_FIRST + (int)nType)),
+    sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[(int)nType])),
+    sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[(int)nType])),
     nMemberCount(0),
     nContentType(nType),
     nOutlineLevel(nLevel),
@@ -767,6 +799,38 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 
 }
 
+enum STR_CONTEXT_IDX
+{
+    IDX_STR_OUTLINE_LEVEL = 0,
+    IDX_STR_DRAGMODE = 1,
+    IDX_STR_HYPERLINK = 2,
+    IDX_STR_LINK_REGION = 3,
+    IDX_STR_COPY_REGION = 4,
+    IDX_STR_DISPLAY = 5,
+    IDX_STR_ACTIVE_VIEW = 6,
+    IDX_STR_HIDDEN = 7,
+    IDX_STR_ACTIVE = 8,
+    IDX_STR_INACTIVE = 9,
+    IDX_STR_EDIT_ENTRY = 10,
+    IDX_STR_DELETE_ENTRY = 11
+};
+
+static const char* STR_CONTEXT_ARY[] =
+{
+    STR_OUTLINE_LEVEL,
+    STR_DRAGMODE,
+    STR_HYPERLINK,
+    STR_LINK_REGION,
+    STR_COPY_REGION,
+    STR_DISPLAY,
+    STR_ACTIVE_VIEW,
+    STR_HIDDEN,
+    STR_ACTIVE,
+    STR_INACTIVE,
+    STR_EDIT_ENTRY,
+    STR_DELETE_ENTRY
+};
+
 SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     : SvTreeListBox(pParent)
     , m_xDialog(pDialog)
@@ -810,7 +874,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     }
     for (int i = 0; i < CONTEXT_COUNT; ++i)
     {
-        m_aContextStrings[i] = SwResId(i+STR_CONTEXT_FIRST);
+        m_aContextStrings[i] = SwResId(STR_CONTEXT_ARY[i]);
     }
     m_nActiveBlock = m_pConfig->GetActiveBlock();
     m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate));
@@ -1110,7 +1174,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
     for(int i=0; i < 3; ++i)
     {
         pSubPop2->InsertItem(i + 201, m_aContextStrings[
-                STR_HYPERLINK - STR_CONTEXT_FIRST + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
+                IDX_STR_HYPERLINK + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
     }
     pSubPop2->CheckItem(201 + static_cast<int>(GetParentWindow()->GetRegionDropMode()));
     // Insert the list of the open files
@@ -1123,7 +1187,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
         if(pView == pActiveView)
         {
             sInsert += "(";
-            sInsert += m_aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST];
+            sInsert += m_aContextStrings[IDX_STR_ACTIVE];
             sInsert += ")";
         }
         pSubPop3->InsertItem(nId, sInsert, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
@@ -1132,12 +1196,12 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
         pView = SwModule::GetNextView(pView);
         nId++;
     }
-    pSubPop3->InsertItem(nId++, m_aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
+    pSubPop3->InsertItem(nId++, m_aContextStrings[IDX_STR_ACTIVE_VIEW], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
     if(m_pHiddenShell)
     {
         OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle();
         sHiddenEntry += " ( ";
-        sHiddenEntry += m_aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST];
+        sHiddenEntry += m_aContextStrings[IDX_STR_HIDDEN];
         sHiddenEntry += " )";
         pSubPop3->InsertItem(nId, sHiddenEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
     }
@@ -1147,9 +1211,9 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
     else if (State::HIDDEN == m_eState)
         pSubPop3->CheckItem( nId );
 
-    pPop->InsertItem( 1, m_aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]);
-    pPop->InsertItem(2, m_aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]);
-    pPop->InsertItem(3, m_aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]);
+    pPop->InsertItem( 1, m_aContextStrings[IDX_STR_OUTLINE_LEVEL]);
+    pPop->InsertItem(2, m_aContextStrings[IDX_STR_DRAGMODE]);
+    pPop->InsertItem(3, m_aContextStrings[IDX_STR_DISPLAY]);
     // Now edit
     SvTreeListEntry* pEntry = nullptr;
     // Edit only if the shown content is coming from the current view.
@@ -1185,38 +1249,38 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
 
                 const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pEntry->GetUserData())->GetTOXBase();
                 if(!pBase->IsTOXBaseInReadonly())
-                    pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
                 pSubPop4->InsertItem(405, m_sReadonlyIdx);
 
                 pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase));
-                pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
             }
             else if(ContentTypeId::TABLE == nContentType && !bReadonly)
             {
                 bSubPop4 = true;
-                pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
                 pSubPop4->InsertItem(404, m_sUnprotTable);
                 bool bFull = false;
                 OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
                 bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
                 pSubPop4->EnableItem(403, !bFull );
                 pSubPop4->EnableItem(404, bProt );
-                pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
             }
             else if(bEditable || bDeletable)
             {
 
                 if(bEditable && bDeletable)
                 {
-                    pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
-                    pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
+                    pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
                     bSubPop4 = true;
                 }
                 else if(bEditable)
-                    pPop->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+                    pPop->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
                 else if(bDeletable)
                 {
-                    pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+                    pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
                 }
             }
             //Rename object
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 8e750f9cb53e..0413ec2e0fb0 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -53,8 +53,8 @@
 
 #include <cmdid.h>
 #include <helpid.h>
-#include <utlui.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 #include <globals.hrc>
 #include "bitmaps.hlst"
 #include "swabstdlg.hxx"
@@ -134,6 +134,42 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint&
         bValid = false;
 }
 
+enum GLOBAL_CONTEXT_IDX
+{
+    IDX_STR_UPDATE = 0,
+    IDX_STR_EDIT_CONTENT = 1,
+    IDX_STR_EDIT_INSERT = 2,
+    IDX_STR_INDEX = 3,
+    IDX_STR_FILE = 4,
+    IDX_STR_NEW_FILE = 5,
+    IDX_STR_INSERT_TEXT = 6,
+    IDX_STR_DELETE = 7,
+    IDX_STR_UPDATE_SEL = 8,
+    IDX_STR_UPDATE_INDEX = 9,
+    IDX_STR_UPDATE_LINK = 10,
+    IDX_STR_UPDATE_ALL = 11,
+    IDX_STR_BROKEN_LINK = 12,
+    IDX_STR_EDIT_LINK = 13
+};
+
+static const char* GLOBAL_CONTEXT_ARY[] =
+{
+    STR_UPDATE,
+    STR_EDIT_CONTENT,
+    STR_EDIT_INSERT,
+    STR_INDEX,
+    STR_FILE,
+    STR_NEW_FILE,
+    STR_INSERT_TEXT,
+    STR_DELETE,
+    STR_UPDATE_SEL,
+    STR_UPDATE_INDEX,
+    STR_UPDATE_LINK,
+    STR_UPDATE_ALL,
+    STR_BROKEN_LINK,
+    STR_EDIT_LINK
+};
+
 SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     : SvTreeListBox(pParent)
     , m_xDialog(pDialog)
@@ -153,9 +189,9 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     m_aUpdateTimer.SetTimeout(GLOBAL_UPDATE_TIMEOUT);
     m_aUpdateTimer.SetInvokeHandler(LINK(this, SwGlobalTree, Timeout));
     m_aUpdateTimer.Start();
-    for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++)
+    for (sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++)
     {
-        m_aContextStrings[i] = SwResId(i+ STR_GLOBAL_CONTEXT_FIRST);
+        m_aContextStrings[i] = SwResId(GLOBAL_CONTEXT_ARY[i]);
     }
     SetHelpId(HID_NAVIGATOR_GLOB_TREELIST);
     SelectHdl();
@@ -334,33 +370,33 @@ VclPtr<PopupMenu> SwGlobalTree::CreateContextMenu()
 
         for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
         {
-            pSubPop2->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+            pSubPop2->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] );
             pSubPop2->SetHelpId(i, aHelpForMenu[i]);
         }
         pSubPop2->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel));
 
-        pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[STR_INDEX  - STR_GLOBAL_CONTEXT_FIRST]);
+        pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[IDX_STR_INDEX]);
         pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]);
-        pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[STR_FILE   - STR_GLOBAL_CONTEXT_FIRST]);
+        pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[IDX_STR_FILE]);
         pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]);
-        pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[STR_NEW_FILE   - STR_GLOBAL_CONTEXT_FIRST]);
+        pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[IDX_STR_NEW_FILE]);
         pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]);
-        pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[STR_INSERT_TEXT   - STR_GLOBAL_CONTEXT_FIRST]);
+        pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[IDX_STR_INSERT_TEXT]);
         pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]);
 
-        pPop->InsertItem(CTX_UPDATE, m_aContextStrings[STR_UPDATE - STR_GLOBAL_CONTEXT_FIRST]);
+        pPop->InsertItem(CTX_UPDATE, m_aContextStrings[IDX_STR_UPDATE]);
         pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]);
-        pPop->InsertItem(CTX_EDIT, m_aContextStrings[STR_EDIT_CONTENT - STR_GLOBAL_CONTEXT_FIRST]);
+        pPop->InsertItem(CTX_EDIT, m_aContextStrings[IDX_STR_EDIT_CONTENT]);
         pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]);
         if(nEnableFlags&MenuEnableFlags::EditLink)
         {
-            pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[STR_EDIT_LINK - STR_GLOBAL_CONTEXT_FIRST]);
+            pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[IDX_STR_EDIT_LINK]);
             pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]);
         }
-        pPop->InsertItem(CTX_INSERT, m_aContextStrings[STR_EDIT_INSERT - STR_GLOBAL_CONTEXT_FIRST]);
+        pPop->InsertItem(CTX_INSERT, m_aContextStrings[IDX_STR_EDIT_INSERT]);
         pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]);
         pPop->InsertSeparator() ;
-        pPop->InsertItem(CTX_DELETE, m_aContextStrings[STR_DELETE - STR_GLOBAL_CONTEXT_FIRST]);
+        pPop->InsertItem(CTX_DELETE, m_aContextStrings[IDX_STR_DELETE]);
         pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]);
 
         //disabling if applicable
@@ -389,7 +425,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
         ScopedVclPtrInstance<PopupMenu> pMenu;
         for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; ++i)
         {
-            pMenu->InsertItem( i, m_aContextStrings[STR_INDEX  - STR_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
+            pMenu->InsertItem( i, m_aContextStrings[IDX_STR_INDEX + i - CTX_INSERT_ANY_INDEX] );
             pMenu->SetHelpId(i, aHelpForMenu[i] );
         }
         pMenu->EnableItem(CTX_INSERT_ANY_INDEX, bool(nEnableFlags & MenuEnableFlags::InsertIdx ));
@@ -407,7 +443,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
         ScopedVclPtrInstance<PopupMenu> pMenu;
         for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
         {
-            pMenu->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+            pMenu->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] );
             pMenu->SetHelpId(i, aHelpForMenu[i] );
         }
         pMenu->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel));
@@ -470,7 +506,7 @@ void     SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
                 const SwSection* pSect = pCont->GetSection();
                 OUString sEntry = pSect->GetLinkFileName().getToken(0, sfx2::cTokenSeparator);
                 if(!pSect->IsConnectFlag())
-                    sEntry = m_aContextStrings[STR_BROKEN_LINK - STR_GLOBAL_CONTEXT_FIRST] + sEntry;
+                    sEntry = m_aContextStrings[IDX_STR_BROKEN_LINK] + sEntry;
                 Point aEntryPos = GetEntryPosition( pEntry );
 
                 aEntryPos.X() = GetTabPos( pEntry, pTab );
@@ -660,7 +696,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData)
             {
                 case GLBLDOC_UNKNOWN:
                 {
-                    sEntry = m_aContextStrings[STR_INSERT_TEXT   - STR_GLOBAL_CONTEXT_FIRST];
+                    sEntry = m_aContextStrings[IDX_STR_INSERT_TEXT];
                 }
                 break;
                 case GLBLDOC_TOXBASE:
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 6f4f39f5c5b7..ea1d0205a67d 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-#include <utlui.hrc>
+#include <strings.hrc>
 
 #define STRING_DELIM (char)0x0A
 #define GLOS_TIMEOUT 30000   // update every 30 seconds
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index a64892fea6bf..97be35568e0c 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -19,7 +19,6 @@
 
 #include <config_features.h>
 
-#include <tools/resary.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <viewsh.hxx>
 #include <initui.hxx>
@@ -28,9 +27,9 @@
 #include <fldbas.hxx>
 #include <glosdoc.hxx>
 #include <gloslst.hxx>
-
-#include <utlui.hrc>
 #include <comcore.hrc>
+#include <strings.hrc>
+#include <utlui.hrc>
 #include <authfld.hxx>
 #include <dbmgr.hxx>
 #include <unotools/syslocale.hxx>
@@ -173,6 +172,19 @@ void InitUI()
     SwEditWin::InitStaticData();
 }
 
+static const char* FLD_DOCINFO_ARY[] =
+{
+    FLD_DOCINFO_TITEL,
+    FLD_DOCINFO_THEMA,
+    FLD_DOCINFO_KEYS,
+    FLD_DOCINFO_COMMENT,
+    FLD_DOCINFO_CREATE,
+    FLD_DOCINFO_CHANGE,
+    FLD_DOCINFO_PRINT,
+    FLD_DOCINFO_DOCNO,
+    FLD_DOCINFO_EDIT
+};
+
 ShellResource::ShellResource()
     : aPostItAuthor( SwResId( STR_POSTIT_AUTHOR ) ),
     aPostItPage( SwResId( STR_POSTIT_PAGE ) ),
@@ -207,8 +219,6 @@ ShellResource::ShellResource()
     sPageDescFollowName(    SwResId(STR_PAGEDESC_FOLLOWNAME)),
     sPageDescName(          SwResId(STR_PAGEDESC_NAME))
 {
-    const sal_uInt16 nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
-
     vcl::KeyCode aCode( KEY_SPACE );
     vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
     OUString aModStr( aModifiedCode.GetName() );
@@ -216,8 +226,8 @@ ShellResource::ShellResource()
     aModStr = aModStr.replaceAll("+", "");
     aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr);
 
-    for(sal_uInt16 i = 0; i < nCount; ++i)
-        aDocInfoLst.push_back(SwResId(FLD_DOCINFO_BEGIN + i));
+    for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_DOCINFO_ARY); ++i)
+        aDocInfoLst.push_back(SwResId(FLD_DOCINFO_ARY[i]));
 }
 
 OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode)
@@ -266,11 +276,10 @@ void ShellResource::GetAutoFormatNameLst_() const
     pAutoFormatNameLst.reset( new std::vector<OUString> );
     pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END);
 
-    ResStringArray aStringArray(ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr));
-    assert(aStringArray.Count() == STR_AUTOFMTREDL_END);
+    assert(SAL_N_ELEMENTS(RID_SHELLRES_AUTOFMTSTRS) == STR_AUTOFMTREDL_END);
     for (sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n)
     {
-        OUString p(aStringArray.GetString(n));
+        OUString p(SwResId(RID_SHELLRES_AUTOFMTSTRS[n]));
         if (STR_AUTOFMTREDL_TYPO == n)
         {
             const SvtSysLocale aSysLocale;
@@ -282,26 +291,90 @@ void ShellResource::GetAutoFormatNameLst_() const
     }
 }
 
+namespace
+{
+    const char* STR_AUTH_FIELD_ARY[] =
+    {
+        STR_AUTH_FIELD_IDENTIFIER,
+        STR_AUTH_FIELD_AUTHORITY_TYPE,
+        STR_AUTH_FIELD_ADDRESS,
+        STR_AUTH_FIELD_ANNOTE,
+        STR_AUTH_FIELD_AUTHOR,
+        STR_AUTH_FIELD_BOOKTITLE,
+        STR_AUTH_FIELD_CHAPTER,
+        STR_AUTH_FIELD_EDITION,
+        STR_AUTH_FIELD_EDITOR,
+        STR_AUTH_FIELD_HOWPUBLISHED,
+        STR_AUTH_FIELD_INSTITUTION,
+        STR_AUTH_FIELD_JOURNAL,
+        STR_AUTH_FIELD_MONTH,
+        STR_AUTH_FIELD_NOTE,
+        STR_AUTH_FIELD_NUMBER,
+        STR_AUTH_FIELD_ORGANIZATIONS,
+        STR_AUTH_FIELD_PAGES,
+        STR_AUTH_FIELD_PUBLISHER,
+        STR_AUTH_FIELD_SCHOOL,
+        STR_AUTH_FIELD_SERIES,
+        STR_AUTH_FIELD_TITLE,
+        STR_AUTH_FIELD_TYPE,
+        STR_AUTH_FIELD_VOLUME,
+        STR_AUTH_FIELD_YEAR,
+        STR_AUTH_FIELD_URL,
+        STR_AUTH_FIELD_CUSTOM1,
+        STR_AUTH_FIELD_CUSTOM2,
+        STR_AUTH_FIELD_CUSTOM3,
+        STR_AUTH_FIELD_CUSTOM4,
+        STR_AUTH_FIELD_CUSTOM5,
+        STR_AUTH_FIELD_ISBN
+    };
+}
+
 OUString SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType)
 {
     if(!pAuthFieldNameList)
     {
         pAuthFieldNameList = new std::vector<OUString>;
         pAuthFieldNameList->reserve(AUTH_FIELD_END);
-        for(sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
-            pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_START + i));
+        for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
+            pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_ARY[i]));
     }
     return (*pAuthFieldNameList)[static_cast< sal_uInt16 >(eType)];
 }
 
+static const char* STR_AUTH_TYPE_ARY[] =
+{
+    STR_AUTH_TYPE_ARTICLE,
+    STR_AUTH_TYPE_BOOK,
+    STR_AUTH_TYPE_BOOKLET,
+    STR_AUTH_TYPE_CONFERENCE,
+    STR_AUTH_TYPE_INBOOK,
+    STR_AUTH_TYPE_INCOLLECTION,
+    STR_AUTH_TYPE_INPROCEEDINGS,
+    STR_AUTH_TYPE_JOURNAL,
+    STR_AUTH_TYPE_MANUAL,
+    STR_AUTH_TYPE_MASTERSTHESIS,
+    STR_AUTH_TYPE_MISC,
+    STR_AUTH_TYPE_PHDTHESIS,
+    STR_AUTH_TYPE_PROCEEDINGS,
+    STR_AUTH_TYPE_TECHREPORT,
+    STR_AUTH_TYPE_UNPUBLISHED,
+    STR_AUTH_TYPE_EMAIL,
+    STR_AUTH_TYPE_WWW,
+    STR_AUTH_TYPE_CUSTOM1,
+    STR_AUTH_TYPE_CUSTOM2,
+    STR_AUTH_TYPE_CUSTOM3,
+    STR_AUTH_TYPE_CUSTOM4,
+    STR_AUTH_TYPE_CUSTOM5
+};
+
 OUString SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
 {
     if(!pAuthFieldTypeList)
     {
         pAuthFieldTypeList = new std::vector<OUString>;
         pAuthFieldTypeList->reserve(AUTH_TYPE_END);
-        for(sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i)
-            pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_START + i));
+        for (sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i)
+            pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_ARY[i]));
     }
     return (*pAuthFieldTypeList)[static_cast< sal_uInt16 >(eType)];
 }
diff --git a/sw/source/uibase/utlui/initui.src b/sw/source/uibase/utlui/initui.src
deleted file mode 100644
index 05899f35bb92..000000000000
--- a/sw/source/uibase/utlui/initui.src
+++ /dev/null
@@ -1,394 +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 "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-
-// Error calculator
-
-String STR_POSTIT_PAGE
-{
-    Text [ en-US ] = "Page" ;
-};
-String STR_POSTIT_LINE
-{
-    Text [ en-US ] = "Line" ;
-};
-String STR_POSTIT_AUTHOR
-{
-    Text [ en-US ] = "Author" ;
-};
-String STR_CALC_SYNTAX
-{
-    Text [ en-US ] = "** Syntax Error **" ;
-};
-String STR_CALC_ZERODIV
-{
-    Text [ en-US ] = "** Division by zero **" ;
-};
-String STR_CALC_BRACK
-{
-    Text [ en-US ] = "** Wrong use of brackets **" ;
-};
-String STR_CALC_POW
-{
-    Text [ en-US ] = "** Square function overflow **" ;
-};
-String STR_CALC_OVERFLOW
-{
-    Text [ en-US ] = "** Overflow **" ;
-};
-String STR_CALC_DEFAULT
-{
-    Text [ en-US ] = "** Error **" ;
-};
-String STR_CALC_ERROR
-{
-    Text [ en-US ] = "** Expression is faulty **" ;
-};
-String STR_GETREFFLD_REFITEMNOTFOUND
-{
-    Text [ en-US ] = "Error: Reference source not found" ;
-};
-String STR_TEMPLATE_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String STR_FIELD_FIXED
-{
-    Text [ en-US ] = "(fixed)" ;
-};
-String STR_DURATION_FORMAT
-{
-    Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
-};
-String STR_TOI
-{
-    Text [ en-US ] = "Alphabetical Index" ;
-};
-
-String STR_TOU
-{
-    Text [ en-US ] = "User-Defined" ;
-};
-
-String STR_TOC
-{
-    Text [ en-US ] = "Table of Contents" ;
-};
-
-String STR_TOX_AUTH
-{
-    Text [ en-US ] = "Bibliography";
-};
-
-String STR_TOX_CITATION
-{
-    Text [ en-US ] = "Citation";
-};
-
-String STR_TOX_TBL
-{
-    Text [ en-US ] = "Index of Tables";
-};
-String STR_TOX_OBJ
-{
-    Text [ en-US ] = "Table of Objects";
-};
-String STR_TOX_ILL
-{
-    Text [ en-US ] = "Illustration Index";
-};
-String STR_LINK_CTRL_CLICK
-{
-    Text [ en-US ] = "%s-Click to follow link";
-};
-String STR_LINK_CLICK
-{
-    Text [ en-US ] = "Click to follow link";
-};
-
- // SubType DocInfo
-
-String FLD_DOCINFO_TITEL
-{
-    Text [ en-US ] = "Title" ;
-};
-String FLD_DOCINFO_THEMA
-{
-    Text [ en-US ] = "Subject" ;
-};
-String FLD_DOCINFO_KEYS
-{
-    Text [ en-US ] = "Keywords" ;
-};
-String FLD_DOCINFO_COMMENT
-{
-    Text [ en-US ] = "Comments" ;
-};
-String FLD_DOCINFO_CREATE
-{
-    Text [ en-US ] = "Created" ;
-};
-String FLD_DOCINFO_CHANGE
-{
-    Text [ en-US ] = "Modified" ;
-};
-String FLD_DOCINFO_PRINT
-{
-    Text [ en-US ] = "Last printed" ;
-};
-String FLD_DOCINFO_DOCNO
-{
-    Text [ en-US ] = "Revision number" ;
-};
-String FLD_DOCINFO_EDIT
-{
-    Text [ en-US ] = "Total editing time" ;
-};
-
-String STR_PAGEDESC_NAME
-{
-    Text [ en-US ] = "Convert $(ARG1)";
-};
-String STR_PAGEDESC_FIRSTNAME
-{
-    Text [ en-US ] = "First convert $(ARG1)";
-};
-String STR_PAGEDESC_FOLLOWNAME
-{
-    Text [ en-US ] = "Next convert $(ARG1)";
-};
-
-String STR_AUTH_TYPE_ARTICLE
-{
-    Text [ en-US ] = "Article";
-};
-String STR_AUTH_TYPE_BOOK
-{
-    Text [ en-US ] = "Book";
-};
-String STR_AUTH_TYPE_BOOKLET
-{
-    Text [ en-US ] = "Brochures";
-};
-String STR_AUTH_TYPE_CONFERENCE
-{
-    Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_INBOOK
-{
-    Text [ en-US ] = "Book excerpt";
-};
-String STR_AUTH_TYPE_INCOLLECTION
-{
-    Text [ en-US ] = "Book excerpt with title";
-};
-String STR_AUTH_TYPE_INPROCEEDINGS
-{
-    Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_JOURNAL
-{
-    Text [ en-US ] = "Journal";
-};
-String STR_AUTH_TYPE_MANUAL
-{
-    Text [ en-US ] = "Techn. documentation";
-};
-String STR_AUTH_TYPE_MASTERSTHESIS
-{
-    Text [ en-US ] = "Thesis";
-};
-String STR_AUTH_TYPE_MISC
-{
-    Text [ en-US ] = "Miscellaneous";
-};
-String STR_AUTH_TYPE_PHDTHESIS
-{
-    Text [ en-US ] = "Dissertation";
-};
-String STR_AUTH_TYPE_PROCEEDINGS
-{
-    Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_TECHREPORT
-{
-    Text [ en-US ] = "Research report";
-};
-String STR_AUTH_TYPE_UNPUBLISHED
-{
-    Text [ en-US ] = "Unpublished";
-};
-String STR_AUTH_TYPE_EMAIL
-{
-    Text [ en-US ] = "E-mail";
-};
-String STR_AUTH_TYPE_WWW
-{
-    Text [ en-US ] = "WWW document";
-};
-String STR_AUTH_TYPE_CUSTOM1
-{
-    Text [ en-US ] = "User-defined1";
-};
-String STR_AUTH_TYPE_CUSTOM2
-{
-    Text [ en-US ] = "User-defined2";
-};
-String STR_AUTH_TYPE_CUSTOM3
-{
-    Text [ en-US ] = "User-defined3";
-};
-String STR_AUTH_TYPE_CUSTOM4
-{
-    Text [ en-US ] = "User-defined4";
-};
-String STR_AUTH_TYPE_CUSTOM5
-{
-    Text [ en-US ] = "User-defined5";
-};
-
-String STR_AUTH_FIELD_IDENTIFIER
-{
-    Text [ en-US ] = "Short name";
-};
-String STR_AUTH_FIELD_AUTHORITY_TYPE
-{
-    Text [ en-US ] = "Type";
-};
-String STR_AUTH_FIELD_ADDRESS
-{
-    Text [ en-US ] = "Address";
-};
-String STR_AUTH_FIELD_ANNOTE
-{
-    Text [ en-US ] = "Annotation";
-};
-String STR_AUTH_FIELD_AUTHOR
-{
-    Text [ en-US ] = "Author(s)";
-};
-String STR_AUTH_FIELD_BOOKTITLE
-{
-    Text [ en-US ] = "Book title";
-};
-String STR_AUTH_FIELD_CHAPTER
-{
-    Text [ en-US ] = "Chapter";
-};
-String STR_AUTH_FIELD_EDITION
-{
-    Text [ en-US ] = "Edition";
-};
-String STR_AUTH_FIELD_EDITOR
-{
-    Text [ en-US ] = "Editor";
-};
-String STR_AUTH_FIELD_HOWPUBLISHED
-{
-    Text [ en-US ] = "Publication type";
-};
-String STR_AUTH_FIELD_INSTITUTION
-{
-    Text [ en-US ] = "Institution";
-};
-String STR_AUTH_FIELD_JOURNAL
-{
-    Text [ en-US ] = "Journal";
-};
-String STR_AUTH_FIELD_MONTH
-{
-    Text [ en-US ] = "Month";
-};
-String STR_AUTH_FIELD_NOTE
-{
-    Text [ en-US ] = "Note";
-};
-String STR_AUTH_FIELD_NUMBER
-{
-    Text [ en-US ] = "Number";
-};
-String STR_AUTH_FIELD_ORGANIZATIONS
-{
-    Text [ en-US ] = "Organization";
-};
-String STR_AUTH_FIELD_PAGES
-{
-    Text [ en-US ] = "Page(s)";
-};
-String STR_AUTH_FIELD_PUBLISHER
-{
-    Text [ en-US ] = "Publisher";
-};
-String STR_AUTH_FIELD_SCHOOL
-{
-    Text [ en-US ] = "University";
-};
-String STR_AUTH_FIELD_SERIES
-{
-    Text [ en-US ] = "Series";
-};
-String STR_AUTH_FIELD_TITLE
-{
-    Text [ en-US ] = "Title";
-};
-String STR_AUTH_FIELD_TYPE
-{
-    Text [ en-US ] = "Type of report";
-};
-String STR_AUTH_FIELD_VOLUME
-{
-    Text [ en-US ] = "Volume";
-};
-String STR_AUTH_FIELD_YEAR
-{
-    Text [ en-US ] = "Year";
-};
-String STR_AUTH_FIELD_URL
-{
-    Text [ en-US ] = "URL";
-};
-String STR_AUTH_FIELD_CUSTOM1
-{
-    Text [ en-US ] = "User-defined1";
-};
-String STR_AUTH_FIELD_CUSTOM2
-{
-    Text [ en-US ] = "User-defined2";
-};
-String STR_AUTH_FIELD_CUSTOM3
-{
-    Text [ en-US ] = "User-defined3";
-};
-String STR_AUTH_FIELD_CUSTOM4
-{
-    Text [ en-US ] = "User-defined4";
-};
-String STR_AUTH_FIELD_CUSTOM5
-{
-    Text [ en-US ] = "User-defined5";
-};
-String STR_AUTH_FIELD_ISBN
-{
-    Text [ en-US ] = "ISBN";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 8675c490610e..63ba6dd99860 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -49,10 +49,8 @@
 #include <sfx2/app.hxx>
 #include <cmdid.h>
 #include <helpid.h>
-#include <ribbar.hrc>
-#include <utlui.hrc>
 
-#include "access.hrc"
+#include "strings.hrc"
 #include "globals.hrc"
 #include "bitmaps.hlst"
 
@@ -582,6 +580,13 @@ void SwNavigationPI::ZoomIn()
     m_aContentToolBox->CheckItem(m_aContentToolBox->GetItemId("listbox"), false);
 }
 
+enum StatusIndex
+{
+    IDX_STR_HIDDEN = 0,
+    IDX_STR_ACTIVE = 1,
+    IDX_STR_INACTIVE = 2
+};
+
 SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
                                vcl::Window* pParent)
     : PanelLayout(pParent, "NavigatorPanel", "modules/swriter/ui/navigatorpanel.ui", nullptr)
@@ -651,10 +656,27 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
         m_aContentToolBox->HideItem(m_aContentToolBox->GetItemId("toggle"));
     }
 
+    const char* REGIONNAME_ARY[] =
+    {
+        STR_HYPERLINK,
+        STR_LINK_REGION,
+        STR_COPY_REGION
+    };
+
+    const char* REGIONMODE_ARY[] =
+    {
+        STR_HIDDEN,
+        STR_ACTIVE,
+        STR_INACTIVE
+    };
+
+    static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == SAL_N_ELEMENTS(REGIONMODE_ARY), "### unexpected size!");
+    static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == static_cast<sal_uInt16>(RegionMode::EMBEDDED) + 1, "### unexpected size!");
+
     for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); ++i)
     {
-        m_aContextArr[i] = SwResId(STR_HYPERLINK + i);
-        m_aStatusArr[i] = SwResId(STR_STATUS_FIRST + i);
+        m_aContextArr[i] = SwResId(REGIONNAME_ARY[i]);
+        m_aStatusArr[i] = SwResId(REGIONMODE_ARY[i]);
     }
 
     m_aStatusArr[3] = SwResId(STR_ACTIVE_VIEW);
@@ -931,10 +953,10 @@ void SwNavigationPI::UpdateListBox()
             if (pView == pActView)
             {
                 nAct = nCount;
-                sEntry += m_aStatusArr[STR_ACTIVE - STR_STATUS_FIRST];
+                sEntry += m_aStatusArr[IDX_STR_ACTIVE];
             }
             else
-                sEntry += m_aStatusArr[STR_INACTIVE - STR_STATUS_FIRST];
+                sEntry += m_aStatusArr[IDX_STR_INACTIVE];
             sEntry += ")";
             m_aDocListBox->InsertEntry(sEntry);
 
@@ -953,7 +975,7 @@ void SwNavigationPI::UpdateListBox()
         OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView().
                                         GetDocShell()->GetTitle();
         sEntry += " (";
-        sEntry += m_aStatusArr[STR_HIDDEN - STR_STATUS_FIRST];
+        sEntry += m_aStatusArr[IDX_STR_HIDDEN];
         sEntry += ")";
         m_aDocListBox->InsertEntry(sEntry);
         bDisable = false;
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
deleted file mode 100644
index 29d820afd1ec..000000000000
--- a/sw/source/uibase/utlui/navipi.src
+++ /dev/null
@@ -1,171 +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 "cmdid.h"
-#include "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-#include "access.hrc"
-
-String STR_ACCESS_TL_GLOBAL
-{
-    Text [ en-US ] = "Global View";
-};
-String STR_ACCESS_TL_CONTENT
-{
-    Text [ en-US ] = "Content Navigation View";
-};
-String STR_OUTLINE_LEVEL
-{
-    Text [ en-US ] = "Outline Level" ;
-};
-String STR_DRAGMODE
-{
-    Text [ en-US ] = "Drag Mode" ;
-};
-String STR_HYPERLINK
-{
-    Text [ en-US ] = "Insert as Hyperlink" ;
-};
-String STR_LINK_REGION
-{
-    Text [ en-US ] = "Insert as Link" ;
-};
-String STR_COPY_REGION
-{
-    Text [ en-US ] = "Insert as Copy" ;
-};
-String STR_DISPLAY
-{
-    Text [ en-US ] = "Display" ;
-};
-String STR_ACTIVE_VIEW
-{
-    Text [ en-US ] = "Active Window" ;
-};
-String STR_HIDDEN
-{
-    Text [ en-US ] = "hidden" ;
-};
-String STR_ACTIVE
-{
-    Text [ en-US ] = "active" ;
-};
-String STR_INACTIVE
-{
-    Text [ en-US ] = "inactive" ;
-};
-String STR_EDIT_ENTRY
-{
-    Text [ en-US ] = "Edit..." ;
-};
-String STR_UPDATE
-{
-    Text [ en-US ] = "~Update" ;
-};
-String STR_EDIT_CONTENT
-{
-    Text [ en-US ] = "Edit" ;
-};
-String STR_EDIT_LINK
-{
-    Text [ en-US ] = "Edit link";
-};
-String STR_EDIT_INSERT
-{
-    Text [ en-US ] = "Insert" ;
-};
-String STR_INDEX
-{
-    Text [ en-US ] = "~Index";
-};
-String STR_FILE
-{
-    Text [ en-US ] = "File" ;
-};
-String STR_NEW_FILE
-{
-    Text [ en-US ] = "New Document" ;
-};
-String STR_INSERT_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String STR_DELETE
-{
-    Text [ en-US ] = "Delete" ;
-};
-String STR_DELETE_ENTRY
-{
-    Text [ en-US ] = "~Delete" ;
-};
-String STR_UPDATE_SEL
-{
-    Text [ en-US ] = "Selection" ;
-};
-String STR_UPDATE_INDEX
-{
-    Text [ en-US ] = "Indexes" ;
-};
-String STR_UPDATE_LINK
-{
-    Text [ en-US ] = "Links" ;
-};
-String STR_UPDATE_ALL
-{
-    Text [ en-US ] = "All" ;
-};
-String STR_REMOVE_INDEX
-{
-    Text [ en-US ] = "~Remove Index" ;
-};
-String STR_REMOVE_TBL_PROTECTION
-{
-    Text [ en-US ] = "~Unprotect" ;
-};
-String STR_INVISIBLE
-{
-    Text [ en-US ] = "hidden";
-};
-String STR_BROKEN_LINK
-{
-    Text [ en-US ] = "File not found: ";
-};
-String STR_RENAME
-{
-    Text [ en-US ] = "~Rename";
-};
-String STR_READONLY_IDX
-{
-    Text [ en-US ] = "Read-~only";
-};
-String STR_POSTIT_SHOW
-{
-    Text [ en-US ] = "Show All";
-};
-String STR_POSTIT_HIDE
-{
-    Text [ en-US ] = "Hide All";
-};
-String STR_POSTIT_DELETE
-{
-    Text [ en-US ] = "Delete All";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 47aaa7b5fa7e..0d70c3498b4d 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -36,7 +36,7 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <numfmtlb.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "swabstdlg.hxx"
 #include "dialog.hrc"
 #include <unomid.h>
diff --git a/sw/source/uibase/utlui/statusbar.src b/sw/source/uibase/utlui/statusbar.src
deleted file mode 100644
index 558da31c838a..000000000000
--- a/sw/source/uibase/utlui/statusbar.src
+++ /dev/null
@@ -1,43 +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 <utlui.hrc>
-
-String STR_WORDCOUNT_HINT
-{
-    Text [ en-US ] = "Word and character count. Click to open Word Count dialog.";
-};
-String STR_VIEWLAYOUT_ONE
-{
-    Text [ en-US ] = "Single-page view";
-};
-
-String STR_VIEWLAYOUT_MULTI
-{
-    Text [ en-US ] = "Multiple-page view";
-};
-
-String STR_VIEWLAYOUT_BOOK
-{
-    Text [ en-US ] = "Book view";
-};
-String STR_BOOKCTRL_HINT
-{
-    Text [ en-US ] = "Page number in document. Click to open Navigator window or right-click for bookmark list.";
-};
-String STR_BOOKCTRL_HINT_EXTENDED
-{
-    Text [ en-US ] = "Page number in document (Page number on printed document). Click to open Navigator window.";
-};
-String STR_TMPLCTRL_HINT
-{
-    Text [ en-US ] = "Page Style. Right-click to change style or click to open Style dialog.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index f0ba0f192bd6..eadc0895fe41 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -24,7 +24,7 @@
 #include <vcl/status.hxx>
 
 #include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 
 #include "wrtsh.hxx"
 #include "view.hxx"
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index e7656572ed60..ad4fefb2167c 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -24,8 +24,7 @@
 #include "cmdid.h"
 #include "uiitems.hxx"
 
-#include "utlui.hrc"
-#include "attrdesc.hrc"
+#include "strings.hrc"
 #include <unomid.h>
 #include <numrule.hxx>
 
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 5202958bb997..425ac1e75609 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -69,7 +69,7 @@
 
 #include <cmdid.h>
 #include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include <doc.hxx>
 #include <docary.hxx>
 #include <charfmt.hxx>
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 92660f8c2fc8..852211444930 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -21,8 +21,7 @@
 #include <globals.hrc>
 #include <misc.hrc>
 
-#include <utlui.hrc>
-#include <unotools.hrc>
+#include <strings.hrc>
 #include <unotools.hxx>
 #include <unoprnms.hxx>
 #include <i18nutil/unicode.hxx>
@@ -67,7 +66,6 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
                                         const OUString* pURL ) :
     m_aTopWindow(VclPtr<SwFrameCtrlWindow>::Create(&rWin, this)),
     m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded"),
-    m_aMenuRes(ResId(RES_FRMEX_MENU, *pSwResMgr)),
     m_pModuleView(SW_MOD()->GetView()),
     m_nStyleFlags(nFlags),
     m_bIsInitialized(false),
@@ -448,14 +446,14 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
 {
     ScopedVclPtrInstance<PopupMenu> aPop;
 
-    aPop->InsertItem(ITEM_UP,   m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_UP)));
-    aPop->InsertItem(ITEM_DOWN, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_DOWN)));
+    aPop->InsertItem(ITEM_UP,   SwResId(STR_MENU_UP));
+    aPop->InsertItem(ITEM_DOWN, SwResId(STR_MENU_DOWN));
 
     Link<Menu*,bool> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
     aPop->SetSelectHdl(aSelLk);
     if(EX_SHOW_ONLINE_LAYOUT == m_nStyleFlags)
     {
-        aPop->InsertItem(ITEM_ZOOM, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_ZOOM)));
+        aPop->InsertItem(ITEM_ZOOM, SwResId(STR_MENU_ZOOM));
 
         uno::Reference< view::XViewSettingsSupplier >  xSettings(m_xController, uno::UNO_QUERY);
         uno::Reference< beans::XPropertySet >  xViewProps = xSettings->getViewSettings();
diff --git a/sw/source/uibase/utlui/unotools.hrc b/sw/source/uibase/utlui/unotools.hrc
deleted file mode 100644
index a4caaab0a186..000000000000
--- a/sw/source/uibase/utlui/unotools.hrc
+++ /dev/null
@@ -1,28 +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_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC
-
-#define ST_MENU_ZOOM        1
-#define ST_MENU_UP          2
-#define ST_MENU_DOWN        3
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/unotools.src b/sw/source/uibase/utlui/unotools.src
deleted file mode 100644
index 0ae74dd0b6da..000000000000
--- a/sw/source/uibase/utlui/unotools.src
+++ /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/.
- *
- * 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 "unotools.hrc"
-#include <utlui.hrc>
-#include <globals.hrc>
-#include <helpid.h>
-
-String STR_SERVICE_UNAVAILABLE
-{
-    Text [ en-US ] = "The following service is not available: ";
-};
-
-StringArray RES_FRMEX_MENU
-{
-    ItemList [ en-US ] =
-    {
-        < "~Zoom" ;  ST_MENU_ZOOM; > ;
-        < "~Upwards" ;  ST_MENU_UP; > ;
-        < "Do~wnwards" ;  ST_MENU_DOWN; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index abda424dbf8f..106a7083f5d3 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -23,7 +23,7 @@
 #include <vcl/image.hxx>
 #include <svl/eitem.hxx>
 #include <svx/viewlayoutitem.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "bitmaps.hlst"
 #include <swtypes.hxx>
 
diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx
index 559fded1dcfa..9d59c7dc5c13 100644
--- a/sw/source/uibase/utlui/wordcountctrl.cxx
+++ b/sw/source/uibase/utlui/wordcountctrl.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
 #include "wordcountctrl.hxx"
 #include <svl/stritem.hxx>
 
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index c0574d174213..c03fd4d6c22a 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -31,7 +31,7 @@
 
 #include "shellio.hxx"
 #include "wdocsh.hxx"
-#include "web.hrc"
+#include "strings.hrc"
 
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 6c6d883c6610..5e7451f5eb80 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -29,8 +29,8 @@
 #include "cmdid.h"
 #include "wformsh.hxx"
 #include "globals.hrc"
-#include "web.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
 
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 05b84404f8d0..16f78c3bf234 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -26,8 +26,8 @@
 #include "view.hxx"
 #include "wfrmsh.hxx"
 #include "globals.hrc"
-#include "shells.hrc"
-#include "web.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
 
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 6959a2599dab..7db82aae2457 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -29,9 +29,9 @@
 #include "swmodule.hxx"
 #include "uitool.hxx"
 #include "docsh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "globals.hrc"
-#include "web.hrc"
+#include "strings.hrc"
 #include "wgrfsh.hxx"
 
 #include <sfx2/request.hxx>
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 57a698ba949f..7e4c4c2fffd1 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -27,7 +27,7 @@
 #include "wrtsh.hxx"
 #include "swmodule.hxx"
 #include "globals.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "uinums.hxx"
 #include "wlistsh.hxx"
 
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 6e4b7a44a58c..0382a898e6d6 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -26,8 +26,8 @@
 #include "view.hxx"
 #include "helpid.h"
 #include "globals.hrc"
-#include "web.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
 #include "wolesh.hxx"
 #include "cmdid.h"
 
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index feae57da5d2d..499fd907244a 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -27,7 +27,7 @@
 #include "globals.hrc"
 #include "uitool.hxx"
 #include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
 #include "table.hrc"
 #include "wrtsh.hxx"
 #include "wtabsh.hxx"
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 5a5e47a963ea..c7c102811907 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -30,8 +30,8 @@
 #include "wtextsh.hxx"
 #include "basesh.hxx"
 #include "globals.hrc"
-#include "shells.hrc"
-#include "web.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 869f2e5ae82f..a1297d62bde4 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -57,8 +57,8 @@
 
 #include <wview.hxx>
 #include <wdocsh.hxx>
-#include <web.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
 
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/wrtsh/wrtsh.src b/sw/source/uibase/wrtsh/wrtsh.src
deleted file mode 100644
index 3b605ff7f224..000000000000
--- a/sw/source/uibase/wrtsh/wrtsh.src
+++ /dev/null
@@ -1,21 +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 "wrtsh.hrc"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 42cf14b8385c..9be63a7ca364 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -93,7 +93,7 @@
 
 // -> #111827#
 #include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
 // <- #111827#
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 2b904b5858f0..dec13a188e5c 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/resid.hxx>
 #include <sfx2/app.hxx>
 #include <svl/slstitm.hxx>
 #include <wrtsh.hxx>
@@ -25,7 +24,7 @@
 #include <IDocumentUndoRedo.hxx>
 #include <swdtflvr.hxx>
 #include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <wrtsh.hrc>
 #include <sfx2/sfx.hrc>
 
@@ -97,21 +96,21 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
 OUString SwWrtShell::GetDoString( DoType eDoType ) const
 {
     OUString aUndoStr;
-    sal_uInt16 nResStr = STR_UNDO;
+    const char* pResStr = STR_UNDO;
     switch( eDoType )
     {
     case UNDO:
-        nResStr = STR_UNDO;
+        pResStr = STR_UNDO;
         (void)GetLastUndoInfo(&aUndoStr, nullptr, &m_rView);
         break;
     case REDO:
-        nResStr = STR_REDO;
+        pResStr = STR_REDO;
         (void)GetFirstRedoInfo(&aUndoStr, nullptr, &m_rView);
         break;
     default:;//prevent warning
     }
 
-    return  SvtResId(nResStr) + aUndoStr;
+    return SvtResId(pResStr) + aUndoStr;
 }
 
 void SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) const
diff --git a/sw/uiconfig/swriter/ui/abstractdialog.ui b/sw/uiconfig/swriter/ui/abstractdialog.ui
index b3b4ea64c588..5a217d02091b 100644
--- a/sw/uiconfig/swriter/ui/abstractdialog.ui
+++ b/sw/uiconfig/swriter/ui/abstractdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -18,7 +18,7 @@
   <object class="GtkDialog" id="AbstractDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create AutoAbstract</property>
+    <property name="title" translatable="yes" context="abstractdialog|AbstractDialog">Create AutoAbstract</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -111,7 +111,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Included outline levels</property>
+                        <property name="label" translatable="yes" context="abstractdialog|label2">Included outline levels</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -127,7 +127,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Paragraphs per level</property>
+                        <property name="label" translatable="yes" context="abstractdialog|label3">Paragraphs per level</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -143,7 +143,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">The abstract contains the selected number of paragraphs from the included outline levels.</property>
+                        <property name="label" translatable="yes" context="abstractdialog|label4">The abstract contains the selected number of paragraphs from the included outline levels.</property>
                         <property name="use_underline">True</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">52</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Properties</property>
+                <property name="label" translatable="yes" context="abstractdialog|label1">Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/addentrydialog.ui b/sw/uiconfig/swriter/ui/addentrydialog.ui
index 44f68ca951e4..993e4625f94c 100644
--- a/sw/uiconfig/swriter/ui/addentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/addentrydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkDialog" id="AddEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Add Element</property>
+    <property name="title" translatable="yes" context="addentrydialog|AddEntryDialog">Add Element</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="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Element Name</property>
+                <property name="label" translatable="yes" context="addentrydialog|label1">Element Name</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/addressblockdialog.ui b/sw/uiconfig/swriter/ui/addressblockdialog.ui
index 1de46e6afb5e..6a1dd4f0a4e6 100644
--- a/sw/uiconfig/swriter/ui/addressblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/addressblockdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AddressBlockDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Address Block</property>
+    <property name="title" translatable="yes" context="addressblockdialog|AddressBlockDialog">New Address Block</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Address _elements</property>
+                <property name="label" translatable="yes" context="addressblockdialog|addressesft">Address _elements</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">addresses:border</property>
               </object>
@@ -112,7 +112,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">1. Drag address elements here</property>
+                <property name="label" translatable="yes" context="addressblockdialog|addressdestft">1. Drag address elements here</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">addressdest:border</property>
               </object>
@@ -136,7 +136,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Move up</property>
+                    <property name="tooltip_text" translatable="yes" context="addressblockdialog|up|tooltip_text">Move up</property>
                     <property name="image">image3</property>
                   </object>
                   <packing>
@@ -151,7 +151,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Move left</property>
+                    <property name="tooltip_text" translatable="yes" context="addressblockdialog|left|tooltip_text">Move left</property>
                     <property name="image">image2</property>
                   </object>
                   <packing>
@@ -166,7 +166,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Move right</property>
+                    <property name="tooltip_text" translatable="yes" context="addressblockdialog|right|tooltip_text">Move right</property>
                     <property name="image">image1</property>
                   </object>
                   <packing>
@@ -181,7 +181,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Move down</property>
+                    <property name="tooltip_text" translatable="yes" context="addressblockdialog|down|tooltip_text">Move down</property>
                     <property name="image">image4</property>
                   </object>
                   <packing>
@@ -219,7 +219,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Preview</property>
+                <property name="label" translatable="yes" context="addressblockdialog|label3">Preview</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">addrpreview:border</property>
               </object>
@@ -235,7 +235,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">2. Customi_ze salutation</property>
+                <property name="label" translatable="yes" context="addressblockdialog|customft">2. Customi_ze salutation</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">custom</property>
               </object>
@@ -307,7 +307,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Remove from address</property>
+                    <property name="tooltip_text" translatable="yes" context="addressblockdialog|fromaddr|tooltip_text">Remove from address</property>
                     <property name="image">image6</property>
                   </object>
                   <packing>
@@ -407,7 +407,7 @@
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Add to address</property>
+    <property name="tooltip_text" translatable="yes" context="addressblockdialog|image5|tooltip_text">Add to address</property>
     <property name="stock">gtk-go-forward</property>
   </object>
   <object class="GtkImage" id="image6">
diff --git a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
index 91025162d2c5..2aef2237f140 100644
--- a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
+++ b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">A document with the name '%1' already exists.</property>
+    <property name="text" translatable="yes" context="alreadyexistsdialog|textbuffer1">A document with the name '%1' already exists.</property>
   </object>
   <object class="GtkTextBuffer" id="textbuffer2">
-    <property name="text" translatable="yes">Please save this document under a different name.</property>
+    <property name="text" translatable="yes" context="alreadyexistsdialog|textbuffer2">Please save this document under a different name.</property>
   </object>
   <object class="GtkDialog" id="AlreadyExistsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">File already exists</property>
+    <property name="title" translatable="yes" context="alreadyexistsdialog|AlreadyExistsDialog">File already exists</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -123,7 +123,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">New document name:</property>
+                    <property name="label" translatable="yes" context="alreadyexistsdialog|label1">New document name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">edit</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/annotationmenu.ui b/sw/uiconfig/swriter/ui/annotationmenu.ui
index 0f8cc62e89fe..900dbc49148e 100644
--- a/sw/uiconfig/swriter/ui/annotationmenu.ui
+++ b/sw/uiconfig/swriter/ui/annotationmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="reply">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Reply</property>
+        <property name="label" translatable="yes" context="annotationmenu|reply">Reply</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete _Comment</property>
+        <property name="label" translatable="yes" context="annotationmenu|delete">Delete _Comment</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="deleteby">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete _All Comments by $1</property>
+        <property name="label" translatable="yes" context="annotationmenu|deleteby">Delete _All Comments by $1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="deleteall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete All Comments</property>
+        <property name="label" translatable="yes" context="annotationmenu|deleteall">_Delete All Comments</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="formatall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Format All Comments...</property>
+        <property name="label" translatable="yes" context="annotationmenu|formatall">Format All Comments...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/asciifilterdialog.ui b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
index 7230cae7fedb..806e561fdcfc 100644
--- a/sw/uiconfig/swriter/ui/asciifilterdialog.ui
+++ b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AsciiFilterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">ASCII Filter Options</property>
+    <property name="title" translatable="yes" context="asciifilterdialog|AsciiFilterDialog">ASCII Filter Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -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">_Character set</property>
+                        <property name="label" translatable="yes" context="asciifilterdialog|label2">_Character set</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">charset</property>
                       </object>
@@ -110,7 +110,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Default fonts</property>
+                        <property name="label" translatable="yes" context="asciifilterdialog|fontft">Default fonts</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">font</property>
                       </object>
@@ -126,7 +126,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Lan_guage</property>
+                        <property name="label" translatable="yes" context="asciifilterdialog|languageft">Lan_guage</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">language</property>
                       </object>
@@ -142,7 +142,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Paragraph break</property>
+                        <property name="label" translatable="yes" context="asciifilterdialog|label5">_Paragraph break</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -201,7 +201,7 @@
                         <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkRadioButton" id="crlf">
-                            <property name="label" translatable="yes">_CR &amp; LF</property>
+                            <property name="label" translatable="yes" context="asciifilterdialog|crlf">_CR &amp; LF</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -219,7 +219,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="cr">
-                            <property name="label" translatable="yes">C_R</property>
+                            <property name="label" translatable="yes" context="asciifilterdialog|cr">C_R</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -237,7 +237,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="lf">
-                            <property name="label" translatable="yes">_LF</property>
+                            <property name="label" translatable="yes" context="asciifilterdialog|lf">_LF</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -269,7 +269,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Properties</property>
+                <property name="label" translatable="yes" context="asciifilterdialog|label1">Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/asksearchdialog.ui b/sw/uiconfig/swriter/ui/asksearchdialog.ui
index 2fc387aa84f7..acde35107de1 100644
--- a/sw/uiconfig/swriter/ui/asksearchdialog.ui
+++ b/sw/uiconfig/swriter/ui/asksearchdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AskSearchDialog">
     <property name="can_focus">False</property>
@@ -9,7 +9,7 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">To proceed with this action, you must first turn off the "undo" function. Do you want to turn off the "undo" function?</property>
+    <property name="text" translatable="yes" context="asksearchdialog|AskSearchDialog">To proceed with this action, you must first turn off the "undo" function. Do you want to turn off the "undo" function?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
index 0362569a66bd..a5803eb11b9a 100644
--- a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AssignFieldsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Match Fields</property>
+    <property name="title" translatable="yes" context="assignfieldsdialog|AssignFieldsDialog">Match Fields</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Assign the fields from your data source to match the address elements.</property>
+                <property name="label" translatable="yes" context="assignfieldsdialog|MATCHING_LABEL">Assign the fields from your data source to match the address elements.</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">FIELDS:border</property>
               </object>
@@ -108,7 +108,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Address block preview</property>
+                <property name="label" translatable="yes" context="assignfieldsdialog|PREVIEW_LABEL">Address block preview</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">PREVIEW:border</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 9eda33c9fd1e..4164aec11b35 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -16,7 +16,7 @@
   <object class="GtkDialog" id="AssignStylesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Assign Styles</property>
+    <property name="title" translatable="yes" context="assignstylesdialog|AssignStylesDialog">Assign Styles</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -121,7 +121,7 @@
                                 <property name="image">image1</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="left-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Left</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|left-atkobject">Left</property>
                                   </object>
                                 </child>
                               </object>
@@ -139,7 +139,7 @@
                                 <property name="image">image2</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="right-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Right</property>
+                                    <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|right-atkobject">Right</property>
                                   </object>
                                 </child>
                               </object>
@@ -187,7 +187,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Not applied</property>
+                        <property name="label" translatable="yes" context="assignstylesdialog|notapplied">Not applied</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -204,7 +204,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Styles</property>
+                <property name="label" translatable="yes" context="assignstylesdialog|label3">Styles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/attachnamedialog.ui b/sw/uiconfig/swriter/ui/attachnamedialog.ui
index 164f247b135a..7cbe758f548c 100644
--- a/sw/uiconfig/swriter/ui/attachnamedialog.ui
+++ b/sw/uiconfig/swriter/ui/attachnamedialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">You did not specify a new name for the attachment.</property>
+    <property name="text" translatable="yes" context="attachnamedialog|textbuffer1">You did not specify a new name for the attachment.</property>
   </object>
   <object class="GtkTextBuffer" id="textbuffer2">
-    <property name="text" translatable="yes">If you would like to provide one, please type it now.</property>
+    <property name="text" translatable="yes" context="attachnamedialog|textbuffer2">If you would like to provide one, please type it now.</property>
   </object>
   <object class="GtkDialog" id="AttachNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No Attachment Name</property>
+    <property name="title" translatable="yes" context="attachnamedialog|AttachNameDialog">No Attachment Name</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -135,7 +135,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="attachnamedialog|label1">Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">edit</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
index 207a2710ccb8..d4ccd9a66071 100644
--- a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
+++ b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="AuthenticationSettingsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Server Authentication</property>
+    <property name="title" translatable="yes" context="authenticationsettingsdialog|AuthenticationSettingsDialog">Server Authentication</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -85,7 +85,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="authentication">
-                <property name="label" translatable="yes">The outgoing mail server (SMTP) requires au_thentication</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|authentication">The outgoing mail server (SMTP) requires au_thentication</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -101,7 +101,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="separateauthentication:wrap">
-                <property name="label" translatable="yes">The outgoing mail server (SMTP) requires _separate authentication</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|separateauthentication">The outgoing mail server (SMTP) requires _separate authentication</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Outgoing mail server:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|label1">Outgoing mail server:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -151,7 +151,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_User name:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|username_label">_User name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">username</property>
               </object>
@@ -180,7 +180,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Password:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|outpassword_label">_Password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">outpassword</property>
               </object>
@@ -191,7 +191,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="smtpafterpop:wrap">
-                <property name="label" translatable="yes">The outgoing mail server uses the same authentication as the _incoming mail server</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|smtpafterpop">The outgoing mail server uses the same authentication as the _incoming mail server</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -214,7 +214,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Incoming mail server:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|label2">Incoming mail server:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -241,7 +241,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Server _name:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|server_label">Server _name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">server</property>
               </object>
@@ -268,7 +268,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">P_ort:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|port_label">P_ort:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">port</property>
               </object>
@@ -283,7 +283,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Type:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|label3">Type:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -292,7 +292,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="pop3">
-                <property name="label" translatable="yes">_POP3</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|pop3">_POP3</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -309,7 +309,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="imap">
-                <property name="label" translatable="yes">_IMAP</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|imap">_IMAP</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -357,7 +357,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Us_er name:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|inusername_label">Us_er name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">inusername</property>
               </object>
@@ -372,7 +372,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">24</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Pass_word:</property>
+                <property name="label" translatable="yes" context="authenticationsettingsdialog|inpassword_label">Pass_word:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">inpassword</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index ee7cf04593bd..8c048f163319 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AutoFormatTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">AutoFormat</property>
+    <property name="title" translatable="yes" context="autoformattable|AutoFormatTableDialog">AutoFormat</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -92,7 +92,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rename">
-                <property name="label" translatable="yes">Rename</property>
+                <property name="label" translatable="yes" context="autoformattable|rename">Rename</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -184,7 +184,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="autoformattable|label1">Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -217,7 +217,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="numformatcb">
-                            <property name="label" translatable="yes">Number format</property>
+                            <property name="label" translatable="yes" context="autoformattable|numformatcb">Number format</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -234,7 +234,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="bordercb">
-                            <property name="label" translatable="yes">Borders</property>
+                            <property name="label" translatable="yes" context="autoformattable|bordercb">Borders</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -251,7 +251,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="fontcb">
-                            <property name="label" translatable="yes">Font</property>
+                            <property name="label" translatable="yes" context="autoformattable|fontcb">Font</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -268,7 +268,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="patterncb">
-                            <property name="label" translatable="yes">Pattern</property>
+                            <property name="label" translatable="yes" context="autoformattable|patterncb">Pattern</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -285,7 +285,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="alignmentcb">
-                            <property name="label" translatable="yes">Alignment</property>
+                            <property name="label" translatable="yes" context="autoformattable|alignmentcb">Alignment</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -311,7 +311,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Formatting</property>
+                    <property name="label" translatable="yes" context="autoformattable|label2">Formatting</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index d62ddb636511..95d675252965 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="AutoTextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">AutoText</property>
+    <property name="title" translatable="yes" context="autotext|AutoTextDialog">AutoText</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="insert">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="autotext|insert">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -64,7 +64,7 @@
             </child>
             <child>
               <object class="GtkButton" id="autotext:editmenu">
-                <property name="label" translatable="yes">AutoTe_xt</property>
+                <property name="label" translatable="yes" context="autotext|autotext">AutoTe_xt</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -78,7 +78,7 @@
             </child>
             <child>
               <object class="GtkButton" id="categories">
-                <property name="label" translatable="yes">Cat_egories...</property>
+                <property name="label" translatable="yes" context="autotext|categories">Cat_egories...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -92,7 +92,7 @@
             </child>
             <child>
               <object class="GtkButton" id="path">
-                <property name="label" translatable="yes">_Path...</property>
+                <property name="label" translatable="yes" context="autotext|path">_Path...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -139,7 +139,7 @@
                         <property name="column_spacing">18</property>
                         <child>
                           <object class="GtkCheckButton" id="relfile">
-                            <property name="label" translatable="yes">_File system</property>
+                            <property name="label" translatable="yes" context="autotext|relfile">_File system</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -154,7 +154,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="relnet">
-                            <property name="label" translatable="yes">Inter_net</property>
+                            <property name="label" translatable="yes" context="autotext|relnet">Inter_net</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -175,7 +175,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Save Links Relative To</property>
+                    <property name="label" translatable="yes" context="autotext|label1">Save Links Relative To</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -202,7 +202,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="inserttip">
-                        <property name="label" translatable="yes">_Display remainder of name as suggestion while typing</property>
+                        <property name="label" translatable="yes" context="autotext|inserttip">_Display remainder of name as suggestion while typing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -227,7 +227,7 @@
                           <object class="GtkLabel" id="nameft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Name:</property>
+                            <property name="label" translatable="yes" context="autotext|nameft">Name:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">name</property>
                           </object>
@@ -240,7 +240,7 @@
                           <object class="GtkLabel" id="shortnameft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Shortcut:</property>
+                            <property name="label" translatable="yes" context="autotext|shortnameft">Shortcut:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">shortname</property>
                           </object>
@@ -295,7 +295,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="category-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="autotext|category-atkobject">Category</property>
                           </object>
                         </child>
                       </object>
@@ -380,7 +380,7 @@
       <object class="GtkMenuItem" id="new">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_New</property>
+        <property name="label" translatable="yes" context="autotext|new">_New</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -388,7 +388,7 @@
       <object class="GtkMenuItem" id="newtext">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">New (text only)</property>
+        <property name="label" translatable="yes" context="autotext|newtext">New (text only)</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -396,7 +396,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="autotext|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -404,7 +404,7 @@
       <object class="GtkMenuItem" id="replace">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Replace</property>
+        <property name="label" translatable="yes" context="autotext|replace">Replace</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -412,7 +412,7 @@
       <object class="GtkMenuItem" id="replacetext">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rep_lace (text only)</property>
+        <property name="label" translatable="yes" context="autotext|replacetext">Rep_lace (text only)</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -420,7 +420,7 @@
       <object class="GtkMenuItem" id="rename">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Rename...</property>
+        <property name="label" translatable="yes" context="autotext|rename">Rename...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -428,7 +428,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="autotext|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -442,7 +442,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit</property>
+        <property name="label" translatable="yes" context="autotext|edit">_Edit</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -456,7 +456,7 @@
       <object class="GtkMenuItem" id="macro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Macro...</property>
+        <property name="label" translatable="yes" context="autotext|macro">_Macro...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -470,7 +470,7 @@
       <object class="GtkMenuItem" id="import">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Import...</property>
+        <property name="label" translatable="yes" context="autotext|import">_Import...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index 685f148626a2..eb41a50a02fa 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="BibliographyEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Bibliography Entry</property>
+    <property name="title" translatable="yes" context="bibliographyentry|BibliographyEntryDialog">Insert Bibliography Entry</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="insert">
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="bibliographyentry|insert">Insert</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
@@ -32,7 +32,7 @@
             </child>
             <child>
               <object class="GtkButton" id="modify">
-                <property name="label" translatable="yes">Apply</property>
+                <property name="label" translatable="yes" context="bibliographyentry|modify">Apply</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
@@ -134,7 +134,7 @@
                         <property name="can_focus">False</property>
                         <property name="margin_top">12</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Author</property>
+                        <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -151,7 +151,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Title</property>
+                        <property name="label" translatable="yes" context="bibliographyentry|label3">Title</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -182,7 +182,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="bibliographyentry|label5">Short name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entrylb</property>
                       </object>
@@ -221,7 +221,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="frombibliography">
-                        <property name="label" translatable="yes">From bibliography database</property>
+                        <property name="label" translatable="yes" context="bibliographyentry|frombibliography">From bibliography database</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -239,7 +239,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fromdocument">
-                        <property name="label" translatable="yes">From document content</property>
+                        <property name="label" translatable="yes" context="bibliographyentry|fromdocument">From document content</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -276,7 +276,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="bibliographyentry|label1">Entry</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 8d37037fbe1f..d9ed93e13136 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="BulletsAndNumberingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Bullets and Numbering</property>
+    <property name="title" translatable="yes" context="bulletsandnumbering|BulletsAndNumberingDialog">Bullets and Numbering</property>
     <property name="resizable">False</property>
     <property name="window_position">mouse</property>
     <property name="type_hint">dialog</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="user">
-                <property name="label" translatable="yes">_Remove</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|user">_Remove</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -79,7 +79,7 @@
             </child>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label" translatable="yes">Reset</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|reset">Reset</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="bullets">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bullets</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|bullets">Bullets</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="singlenum">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|singlenum">Numbering</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="outlinenum">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Outline</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|outlinenum">Outline</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="graphics">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|graphics">Image</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|position">Position</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="customize">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Customize</property>
+                <property name="label" translatable="yes" context="bulletsandnumbering|customize">Customize</property>
               </object>
               <packing>
                 <property name="position">5</property>
diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui
index 7b03005c983f..ca0bf788a508 100644
--- a/sw/uiconfig/swriter/ui/businessdatapage.ui
+++ b/sw/uiconfig/swriter/ui/businessdatapage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="BusinessDataPage">
     <property name="visible">True</property>
@@ -25,7 +25,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Company:</property>
+                <property name="label" translatable="yes" context="businessdatapage|label5">Company:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">company</property>
               </object>
@@ -39,7 +39,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Slogan:</property>
+                <property name="label" translatable="yes" context="businessdatapage|streetft">Slogan:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">slogan</property>
               </object>
@@ -53,7 +53,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Co_untry/state:</property>
+                <property name="label" translatable="yes" context="businessdatapage|countryft">Co_untry/state:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">country</property>
               </object>
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Position:</property>
+                <property name="label" translatable="yes" context="businessdatapage|label8">Position:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">position</property>
               </object>
@@ -81,12 +81,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Fa_x:</property>
+                <property name="label" translatable="yes" context="businessdatapage|phoneft">Fa_x:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">fax</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="phoneft-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+                    <property name="AtkObject::accessible-description" translatable="yes" context="businessdatapage|phoneft-atkobject">Home telephone number</property>
                   </object>
                 </child>
               </object>
@@ -100,7 +100,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Homepage/e-mail:</property>
+                <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/e-mail:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -123,7 +123,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="company-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -153,7 +153,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="position-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|position-atkobject">Title</property>
                       </object>
                     </child>
                   </object>
@@ -182,7 +182,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="fax-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|fax-atkobject">Home telephone number</property>
                       </object>
                     </child>
                   </object>
@@ -213,7 +213,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="url-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|url-atkobject">FAX number</property>
                       </object>
                     </child>
                   </object>
@@ -231,7 +231,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="email-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|email-atkobject">email address</property>
                       </object>
                     </child>
                   </object>
@@ -251,7 +251,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Company 2nd line:</property>
+                <property name="label" translatable="yes" context="businessdatapage|eastnameft">Company 2nd line:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">company2</property>
               </object>
@@ -274,7 +274,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="company2-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company2-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -294,7 +294,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Zip/city:</property>
+                <property name="label" translatable="yes" context="businessdatapage|icityft">_Zip/city:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">izip</property>
               </object>
@@ -317,7 +317,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="icity-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">City</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|icity-atkobject">City</property>
                       </object>
                     </child>
                   </object>
@@ -335,7 +335,7 @@
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="izip-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|izip-atkobject">Zip code</property>
                       </object>
                     </child>
                   </object>
@@ -417,7 +417,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Phone/mobile:</property>
+                <property name="label" translatable="yes" context="businessdatapage|titleft1">Phone/mobile:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">position</property>
               </object>
@@ -441,7 +441,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="phone-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|phone-atkobject">Title</property>
                       </object>
                     </child>
                   </object>
@@ -459,7 +459,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="mobile-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|mobile-atkobject">Position</property>
                       </object>
                     </child>
                   </object>
@@ -479,7 +479,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Street:</property>
+                <property name="label" translatable="yes" context="businessdatapage|streetft1">Street:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">street</property>
               </object>
@@ -520,7 +520,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Business Data</property>
+        <property name="label" translatable="yes" context="businessdatapage|label1">Business Data</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
index 8a30a7d4462d..bce632b6d45e 100644
--- a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="CannotSaveLabelDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Cannot Add Label</property>
+    <property name="title" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Cannot Add Label</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">Cannot add label</property>
-    <property name="secondary_text" translatable="yes">Predefined labels cannot be overwritten, use another name.</property>
+    <property name="text" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Cannot add label</property>
+    <property name="secondary_text" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Predefined labels cannot be overwritten, use another name.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/captiondialog.ui b/sw/uiconfig/swriter/ui/captiondialog.ui
index 24a6b70740cb..2e9786f1b92d 100644
--- a/sw/uiconfig/swriter/ui/captiondialog.ui
+++ b/sw/uiconfig/swriter/ui/captiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CaptionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Caption</property>
+    <property name="title" translatable="yes" context="captiondialog|CaptionDialog">Caption</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui b/sw/uiconfig/swriter/ui/captionoptions.ui
index de50adc0cce5..93b22a42ff31 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -9,17 +9,17 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Category first</col>
+        <col id="0" translatable="yes" context="captionoptions|liststore1">Category first</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Numbering first</col>
+        <col id="0" translatable="yes" context="captionoptions|liststore1">Numbering first</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="CaptionOptionsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Caption Options</property>
+    <property name="title" translatable="yes" context="captionoptions|CaptionOptionsDialog">Caption Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Level:</property>
+                            <property name="label" translatable="yes" context="captionoptions|label5">_Level:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">level</property>
                           </object>
@@ -96,7 +96,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Separator:</property>
+                            <property name="label" translatable="yes" context="captionoptions|label6">_Separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">separator</property>
                           </object>
@@ -113,7 +113,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Numbering Captions by Chapter</property>
+                    <property name="label" translatable="yes" context="captionoptions|label1">Numbering Captions by Chapter</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -151,7 +151,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Character style:</property>
+                            <property name="label" translatable="yes" context="captionoptions|label4">Character style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">style</property>
                           </object>
@@ -173,7 +173,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="border_and_shadow">
-                            <property name="label" translatable="yes">_Apply border and shadow</property>
+                            <property name="label" translatable="yes" context="captionoptions|border_and_shadow">_Apply border and shadow</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -196,7 +196,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Category and Frame Format</property>
+                    <property name="label" translatable="yes" context="captionoptions|label2">Category and Frame Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -234,7 +234,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Caption order:</property>
+                            <property name="label" translatable="yes" context="captionoptions|label7">Caption order:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">caption_order</property>
                           </object>
@@ -263,7 +263,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Caption</property>
+                    <property name="label" translatable="yes" context="captionoptions|label3">Caption</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/cardformatpage.ui b/sw/uiconfig/swriter/ui/cardformatpage.ui
index 2f5752f40ee0..15dbf1d26735 100644
--- a/sw/uiconfig/swriter/ui/cardformatpage.ui
+++ b/sw/uiconfig/swriter/ui/cardformatpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkFrame" id="CardFormatPage">
@@ -35,7 +35,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">AutoText - Section</property>
+                        <property name="label" translatable="yes" context="cardformatpage|label2">AutoText - Section</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">autotext</property>
                       </object>
@@ -119,7 +119,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Content</property>
+        <property name="label" translatable="yes" context="cardformatpage|label1">Content</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui
index eb4df8baf9c2..306c82c079bf 100644
--- a/sw/uiconfig/swriter/ui/cardmediumpage.ui
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -60,7 +60,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="address">
-                            <property name="label" translatable="yes">Address</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|address">Address</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -79,7 +79,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Label text:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label2">Label text:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">textview:border</property>
                           </object>
@@ -139,7 +139,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Database:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label4">Database:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">database</property>
                           </object>
@@ -177,7 +177,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Table:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label7">Table:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">table</property>
                           </object>
@@ -215,7 +215,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Database field:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label8">Database field:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">field</property>
                           </object>
@@ -252,7 +252,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Insert</property>
+                    <property name="tooltip_text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property>
                     <property name="valign">center</property>
                     <property name="image">image1</property>
                   </object>
@@ -269,7 +269,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Inscription</property>
+            <property name="label" translatable="yes" context="cardmediumpage|label6">Inscription</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -316,7 +316,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="continuous">
-                            <property name="label" translatable="yes">_Continuous</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|continuous">_Continuous</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -332,7 +332,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="sheet">
-                            <property name="label" translatable="yes">_Sheet</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|sheet">_Sheet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -365,7 +365,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Brand:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label5">Brand:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">brand</property>
                           </object>
@@ -379,7 +379,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Type:</property>
+                            <property name="label" translatable="yes" context="cardmediumpage|label3">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">type</property>
                           </object>
@@ -453,7 +453,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Format</property>
+            <property name="label" translatable="yes" context="cardmediumpage|label1">Format</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/ccdialog.ui b/sw/uiconfig/swriter/ui/ccdialog.ui
index e75de2ad03ac..bc3af681da8b 100644
--- a/sw/uiconfig/swriter/ui/ccdialog.ui
+++ b/sw/uiconfig/swriter/ui/ccdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CCDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Copy To</property>
+    <property name="title" translatable="yes" context="ccdialog|CCDialog">Copy To</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Cc:</property>
+                        <property name="label" translatable="yes" context="ccdialog|label2">_Cc:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">cc</property>
                       </object>
@@ -111,7 +111,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Bcc:</property>
+                        <property name="label" translatable="yes" context="ccdialog|label3">_Bcc:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bcc</property>
                       </object>
@@ -125,7 +125,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Note: Separate e-mail addresses with a semicolon (;).</property>
+                        <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate e-mail addresses with a semicolon (;).</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Send a Copy of This Mail To...</property>
+                <property name="label" translatable="yes" context="ccdialog|label1">Send a Copy of This Mail To...</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui
index 0efad8cc3f91..d77f5dfb9094 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CharacterPropertiesDialog">
     <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="characterproperties|CharacterPropertiesDialog">Character</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,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="characterproperties|font">Font</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,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="characterproperties|fonteffects">Font Effects</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="characterproperties|position">Position</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="asianlayout">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Layout</property>
+                <property name="label" translatable="yes" context="characterproperties|asianlayout">Asian Layout</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="hyperlink">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hyperlink</property>
+                <property name="label" translatable="yes" context="characterproperties|hyperlink">Hyperlink</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="characterproperties|background">Highlighting</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="characterproperties|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui
index c69e10c31226..6f01366e37f6 100644
--- a/sw/uiconfig/swriter/ui/charurlpage.ui
+++ b/sw/uiconfig/swriter/ui/charurlpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="CharURLPage">
     <property name="visible">True</property>
@@ -32,7 +32,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">URL:</property>
+                    <property name="label" translatable="yes" context="charurlpage|label36">URL:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">urled</property>
                   </object>
@@ -46,7 +46,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Name:</property>
+                    <property name="label" translatable="yes" context="charurlpage|label37">Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">nameed</property>
                   </object>
@@ -60,7 +60,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Text:</property>
+                    <property name="label" translatable="yes" context="charurlpage|textft">Text:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">texted</property>
                   </object>
@@ -74,7 +74,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Target frame:</property>
+                    <property name="label" translatable="yes" context="charurlpage|label39">Target frame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">targetfrmlb</property>
                   </object>
@@ -85,7 +85,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="eventpb">
-                    <property name="label" translatable="yes">Events...</property>
+                    <property name="label" translatable="yes" context="charurlpage|eventpb">Events...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -135,7 +135,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="urlpb">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes" context="charurlpage|urlpb">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -185,7 +185,7 @@
           <object class="GtkLabel" id="label32">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Hyperlink</property>
+            <property name="label" translatable="yes" context="charurlpage|label32">Hyperlink</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -221,7 +221,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Visited links:</property>
+                    <property name="label" translatable="yes" context="charurlpage|label34">Visited links:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">visitedlb</property>
                   </object>
@@ -235,7 +235,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Unvisited links:</property>
+                    <property name="label" translatable="yes" context="charurlpage|label10">Unvisited links:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">unvisitedlb</property>
                   </object>
@@ -272,7 +272,7 @@
           <object class="GtkLabel" id="label33">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Character Styles</property>
+            <property name="label" translatable="yes" context="charurlpage|label33">Character Styles</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui b/sw/uiconfig/swriter/ui/columndialog.ui
index 62f964254849..3de459d5a0c7 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ColumnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Columns</property>
+    <property name="title" translatable="yes" context="columndialog|ColumnDialog">Columns</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index 9ff9a5f8bf67..bd701dddb4a7 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -56,15 +56,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left-to-right</col>
+        <col id="0" translatable="yes" context="columnpage|liststore1">Left-to-right</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right-to-left</col>
+        <col id="0" translatable="yes" context="columnpage|liststore1">Right-to-left</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Use superordinate object settings</col>
+        <col id="0" translatable="yes" context="columnpage|liststore1">Use superordinate object settings</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -78,23 +78,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Selection</col>
+        <col id="0" translatable="yes" context="columnpage|liststore2">Selection</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Current Section</col>
+        <col id="0" translatable="yes" context="columnpage|liststore2">Current Section</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Selected section</col>
+        <col id="0" translatable="yes" context="columnpage|liststore2">Selected section</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Frame</col>
+        <col id="0" translatable="yes" context="columnpage|liststore2">Frame</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Page Style: </col>
+        <col id="0" translatable="yes" context="columnpage|liststore2">Page Style: </col>
         <col id="1">3</col>
       </row>
     </data>
@@ -131,7 +131,7 @@
                   <object class="GtkLabel" id="columnft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Column:</property>
+                    <property name="label" translatable="yes" context="columnpage|columnft">Column:</property>
                     <property name="xalign">1</property>
                     <accessibility>
                       <relation type="label-for" target="back"/>
@@ -192,7 +192,7 @@
                   <object class="GtkLabel" id="widthft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Width:</property>
+                    <property name="label" translatable="yes" context="columnpage|widthft">Width:</property>
                     <property name="xalign">1</property>
                     <accessibility>
                       <relation type="label-for" target="width3mf:0.00cm"/>
@@ -263,7 +263,7 @@
                   <object class="GtkLabel" id="distft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Spacing:</property>
+                    <property name="label" translatable="yes" context="columnpage|distft">Spacing:</property>
                     <property name="xalign">1</property>
                     <accessibility>
                       <relation type="label-for" target="spacing1mf:0.00cm"/>
@@ -324,7 +324,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="autowidth">
-                    <property name="label" translatable="yes">Auto_Width</property>
+                    <property name="label" translatable="yes" context="columnpage|autowidth">Auto_Width</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -397,7 +397,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Width and Spacing</property>
+            <property name="label" translatable="yes" context="columnpage|label4">Width and Spacing</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -434,7 +434,7 @@
                   <object class="GtkLabel" id="linestyleft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">St_yle:</property>
+                    <property name="label" translatable="yes" context="columnpage|linestyleft">St_yle:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">linestylelb</property>
                     <property name="xalign">1</property>
@@ -448,7 +448,7 @@
                   <object class="GtkLabel" id="linewidthft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Width:</property>
+                    <property name="label" translatable="yes" context="columnpage|linewidthft">_Width:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">linewidthmf:0.00pt</property>
                     <property name="xalign">1</property>
@@ -462,7 +462,7 @@
                   <object class="GtkLabel" id="lineheightft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">H_eight:</property>
+                    <property name="label" translatable="yes" context="columnpage|lineheightft">H_eight:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">linewidthmf:0.00pt</property>
                     <property name="xalign">1</property>
@@ -476,7 +476,7 @@
                   <object class="GtkLabel" id="lineposft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Position:</property>
+                    <property name="label" translatable="yes" context="columnpage|lineposft">_Position:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">lineposlb</property>
                     <property name="xalign">1</property>
@@ -502,9 +502,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <items>
-                      <item translatable="yes">Top</item>
-                      <item translatable="yes">Centered</item>
-                      <item translatable="yes">Bottom</item>
+                      <item translatable="yes" context="columnpage|lineposlb">Top</item>
+                      <item translatable="yes" context="columnpage|lineposlb">Centered</item>
+                      <item translatable="yes" context="columnpage|lineposlb">Bottom</item>
                     </items>
                   </object>
                   <packing>
@@ -552,7 +552,7 @@
                   <object class="GtkLabel" id="linecolorft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Color:</property>
+                    <property name="label" translatable="yes" context="columnpage|linecolorft">_Color:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">colorlb</property>
                     <property name="xalign">1</property>
@@ -576,7 +576,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Separator Line</property>
+            <property name="label" translatable="yes" context="columnpage|label11">Separator Line</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -628,7 +628,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Columns:</property>
+                            <property name="label" translatable="yes" context="columnpage|label3">Columns:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">colsnf</property>
                             <property name="xalign">1</property>
@@ -663,7 +663,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="balance">
-                            <property name="label" translatable="yes">Evenly distribute contents _to all columns</property>
+                            <property name="label" translatable="yes" context="columnpage|balance">Evenly distribute contents _to all columns</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="no_show_all">True</property>
@@ -697,7 +697,7 @@
                               <object class="GtkLabel" id="applytoft">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">_Apply to:</property>
+                                <property name="label" translatable="yes" context="columnpage|applytoft">_Apply to:</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">1</property>
                               </object>
@@ -721,7 +721,7 @@
                               <object class="GtkLabel" id="textdirectionft">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="label" translatable="yes">Text _direction:</property>
+                                <property name="label" translatable="yes" context="columnpage|textdirectionft">Text _direction:</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">1</property>
                               </object>
@@ -777,7 +777,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
+                <property name="label" translatable="yes" context="columnpage|label2">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui
index 7b0e474b0c48..651c4be61a4c 100644
--- a/sw/uiconfig/swriter/ui/columnwidth.ui
+++ b/sw/uiconfig/swriter/ui/columnwidth.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="ColumnWidthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Column Width</property>
+    <property name="title" translatable="yes" context="columnwidth|ColumnWidthDialog">Column Width</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -99,7 +99,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Column:</property>
+                        <property name="label" translatable="yes" context="columnwidth|label2">Column:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">column</property>
                       </object>
@@ -113,7 +113,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Width:</property>
+                        <property name="label" translatable="yes" context="columnwidth|label3">Width:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">width:0mm</property>
                       </object>
@@ -155,7 +155,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Width</property>
+                <property name="label" translatable="yes" context="columnwidth|label1">Width</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui
index f357c89fd69e..188992d424ab 100644
--- a/sw/uiconfig/swriter/ui/conditionpage.ui
+++ b/sw/uiconfig/swriter/ui/conditionpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="ConditionPage">
@@ -36,7 +36,7 @@
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="condstyle">
-                    <property name="label" translatable="yes">_Conditional Style</property>
+                    <property name="label" translatable="yes" context="conditionpage|condstyle">_Conditional Style</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
@@ -60,7 +60,7 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Conte_xt</property>
+                    <property name="label" translatable="yes" context="conditionpage|contextft">Conte_xt</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -75,7 +75,7 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Applied Styles</property>
+                    <property name="label" translatable="yes" context="conditionpage|usedft">Applied Styles</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -89,7 +89,7 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Paragraph Styles</property>
+                    <property name="label" translatable="yes" context="conditionpage|styleft">_Paragraph Styles</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -196,34 +196,34 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">Table Header</item>
-                          <item translatable="yes">Table</item>
-                          <item translatable="yes">Frame</item>
-                          <item translatable="yes">Section</item>
-                          <item translatable="yes">Footnote</item>
-                          <item translatable="yes">Endnote</item>
-                          <item translatable="yes">Header</item>
-                          <item translatable="yes">Footer</item>
-                          <item translatable="yes"> 1st Outline Level</item>
-                          <item translatable="yes"> 2nd Outline Level</item>
-                          <item translatable="yes"> 3rd Outline Level</item>
-                          <item translatable="yes"> 4th Outline Level</item>
-                          <item translatable="yes"> 5th Outline Level</item>
-                          <item translatable="yes"> 6th Outline Level</item>
-                          <item translatable="yes"> 7th Outline Level</item>
-                          <item translatable="yes"> 8th Outline Level</item>
-                          <item translatable="yes"> 9th Outline Level</item>
-                          <item translatable="yes">10th Outline Level</item>
-                          <item translatable="yes"> 1st Numbering Level</item>
-                          <item translatable="yes"> 2nd Numbering Level</item>
-                          <item translatable="yes"> 3rd Numbering Level</item>
-                          <item translatable="yes"> 4th Numbering Level</item>
-                          <item translatable="yes"> 5th Numbering Level</item>
-                          <item translatable="yes"> 6th Numbering Level</item>
-                          <item translatable="yes"> 7th Numbering Level</item>
-                          <item translatable="yes"> 8th Numbering Level</item>
-                          <item translatable="yes"> 9th Numbering Level</item>
-                          <item translatable="yes">10th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter">Table Header</item>
+                          <item translatable="yes" context="conditionpage|filter">Table</item>
+                          <item translatable="yes" context="conditionpage|filter">Frame</item>
+                          <item translatable="yes" context="conditionpage|filter">Section</item>
+                          <item translatable="yes" context="conditionpage|filter">Footnote</item>
+                          <item translatable="yes" context="conditionpage|filter">Endnote</item>
+                          <item translatable="yes" context="conditionpage|filter">Header</item>
+                          <item translatable="yes" context="conditionpage|filter">Footer</item>
+                          <item translatable="yes" context="conditionpage|filter"> 1st Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 2nd Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 3rd Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 4th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 5th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 6th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 7th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 8th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 9th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter">10th Outline Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 1st Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 2nd Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 3rd Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 4th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 5th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 6th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 7th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 8th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter"> 9th Numbering Level</item>
+                          <item translatable="yes" context="conditionpage|filter">10th Numbering Level</item>
                         </items>
                       </object>
                       <packing>
@@ -248,7 +248,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="label" translatable="yes" context="conditionpage|label11">Options</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 21379c1b8e67..79802c1d3d5a 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="ConvertTextTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Convert Table to Text</property>
+    <property name="title" translatable="yes" context="converttexttable|ConvertTextTableDialog">Convert Table to Text</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -109,13 +109,13 @@
                             <property name="can_focus">True</property>
                             <property name="invisible_char">●</property>
                             <property name="width_chars">1</property>
-                            <property name="text" translatable="yes">,</property>
+                            <property name="text" translatable="yes" context="converttexttable|othered">,</property>
                             <accessibility>
                               <relation type="labelled-by" target="other"/>
                             </accessibility>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="othered-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Symbol</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="converttexttable|othered-atkobject">Symbol</property>
                               </object>
                             </child>
                           </object>
@@ -126,7 +126,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="other">
-                            <property name="label" translatable="yes">Other:</property>
+                            <property name="label" translatable="yes" context="converttexttable|other">Other:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -145,7 +145,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="semicolons">
-                            <property name="label" translatable="yes">Semicolons</property>
+                            <property name="label" translatable="yes" context="converttexttable|semicolons">Semicolons</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="paragraph">
-                            <property name="label" translatable="yes">Paragraph</property>
+                            <property name="label" translatable="yes" context="converttexttable|paragraph">Paragraph</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -178,7 +178,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="tabs">
-                            <property name="label" translatable="yes">Tabs</property>
+                            <property name="label" translatable="yes" context="converttexttable|tabs">Tabs</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -197,7 +197,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="keepcolumn">
-                            <property name="label" translatable="yes">Equal width for all columns</property>
+                            <property name="label" translatable="yes" context="converttexttable|keepcolumn">Equal width for all columns</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="xalign">0</property>
@@ -218,7 +218,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Separate Text At</property>
+                    <property name="label" translatable="yes" context="converttexttable|label1">Separate Text At</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -251,7 +251,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="headingcb">
-                            <property name="label" translatable="yes">Heading</property>
+                            <property name="label" translatable="yes" context="converttexttable|headingcb">Heading</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -265,7 +265,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="repeatheading">
-                            <property name="label" translatable="yes">Repeat heading</property>
+                            <property name="label" translatable="yes" context="converttexttable|repeatheading">Repeat heading</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -281,7 +281,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="dontsplitcb">
-                            <property name="label" translatable="yes">Don't split table</property>
+                            <property name="label" translatable="yes" context="converttexttable|dontsplitcb">Don't split table</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -295,7 +295,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="bordercb">
-                            <property name="label" translatable="yes">Border</property>
+                            <property name="label" translatable="yes" context="converttexttable|bordercb">Border</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -319,7 +319,7 @@
                               <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">The first </property>
+                                <property name="label" translatable="yes" context="converttexttable|label3">The first </property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">repeatheadersb</property>
                               </object>
@@ -332,7 +332,7 @@
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">rows</property>
+                                <property name="label" translatable="yes" context="converttexttable|label4">rows</property>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
@@ -362,7 +362,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="autofmt">
-                            <property name="label" translatable="yes">AutoFormat...</property>
+                            <property name="label" translatable="yes" context="converttexttable|autofmt">AutoFormat...</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                           </object>
@@ -379,7 +379,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="converttexttable|label2">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/createaddresslist.ui b/sw/uiconfig/swriter/ui/createaddresslist.ui
index 2b64922d6469..24edb49a12ec 100644
--- a/sw/uiconfig/swriter/ui/createaddresslist.ui
+++ b/sw/uiconfig/swriter/ui/createaddresslist.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="CreateAddressList">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">New Address List</property>
+    <property name="title" translatable="yes" context="createaddresslist|CreateAddressList">New Address List</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -93,7 +93,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Address Information</property>
+                    <property name="label" translatable="yes" context="createaddresslist|ADDRESS_INFORMATION">Address Information</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">CONTAINER</property>
                   </object>
@@ -127,7 +127,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Sho_w entry number</property>
+                        <property name="label" translatable="yes" context="createaddresslist|VIEW_ENTRIES">Sho_w entry number</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">grid2</property>
                       </object>
@@ -146,7 +146,7 @@
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkButton" id="START">
-                            <property name="label" translatable="yes">|&lt;</property>
+                            <property name="label" translatable="yes" context="createaddresslist|START">|&lt;</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -159,7 +159,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="PREV">
-                            <property name="label" translatable="yes">&lt;</property>
+                            <property name="label" translatable="yes" context="createaddresslist|PREV">&lt;</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -172,7 +172,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="END">
-                            <property name="label" translatable="yes">&gt;|</property>
+                            <property name="label" translatable="yes" context="createaddresslist|END">&gt;|</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -185,7 +185,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="NEXT">
-                            <property name="label" translatable="yes">&gt;</property>
+                            <property name="label" translatable="yes" context="createaddresslist|NEXT">&gt;</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -236,7 +236,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="NEW">
-                    <property name="label" translatable="yes">_New</property>
+                    <property name="label" translatable="yes" context="createaddresslist|NEW">_New</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -251,7 +251,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="DELETE">
-                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="label" translatable="yes" context="createaddresslist|DELETE">_Delete</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -266,7 +266,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="FIND">
-                    <property name="label" translatable="yes">_Find...</property>
+                    <property name="label" translatable="yes" context="createaddresslist|FIND">_Find...</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -281,7 +281,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="CUSTOMIZE">
-                    <property name="label" translatable="yes">C_ustomize...</property>
+                    <property name="label" translatable="yes" context="createaddresslist|CUSTOMIZE">C_ustomize...</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/createauthorentry.ui b/sw/uiconfig/swriter/ui/createauthorentry.ui
index 196c845a042a..a89a5b5848d2 100644
--- a/sw/uiconfig/swriter/ui/createauthorentry.ui
+++ b/sw/uiconfig/swriter/ui/createauthorentry.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CreateAuthorEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Define Bibliography Entry</property>
+    <property name="title" translatable="yes" context="createauthorentry|CreateAuthorEntryDialog">Define Bibliography Entry</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -186,7 +186,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Entry Data</property>
+                <property name="label" translatable="yes" context="createauthorentry|label1">Entry Data</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/createautomarkdialog.ui b/sw/uiconfig/swriter/ui/createautomarkdialog.ui
index 62fe05f84aea..e672075ba82a 100644
--- a/sw/uiconfig/swriter/ui/createautomarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/createautomarkdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CreateAutomarkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Concordance File</property>
+    <property name="title" translatable="yes" context="createautomarkdialog|CreateAutomarkDialog">Edit Concordance File</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -98,7 +98,7 @@
                           <object class="GtkLabel" id="searchterm">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Search term</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|searchterm">Search term</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -110,7 +110,7 @@
                           <object class="GtkLabel" id="alternative">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Alternative entry</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|alternative">Alternative entry</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -122,7 +122,7 @@
                           <object class="GtkLabel" id="key1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">1st key</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|key1">1st key</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -134,7 +134,7 @@
                           <object class="GtkLabel" id="key2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">2nd key</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|key2">2nd key</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -146,7 +146,7 @@
                           <object class="GtkLabel" id="comment">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Comment</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|comment">Comment</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -158,7 +158,7 @@
                           <object class="GtkLabel" id="casesensitive">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Match case</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|casesensitive">Match case</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -170,7 +170,7 @@
                           <object class="GtkLabel" id="wordonly">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Word only</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|wordonly">Word only</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -182,7 +182,7 @@
                           <object class="GtkLabel" id="yes">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Yes</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|yes">Yes</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -194,7 +194,7 @@
                           <object class="GtkLabel" id="no">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">No</property>
+                            <property name="label" translatable="yes" context="createautomarkdialog|no">No</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -220,7 +220,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Entries</property>
+                <property name="label" translatable="yes" context="createautomarkdialog|label1">Entries</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
index e7637dc1e7b9..e2706af2772b 100644
--- a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
+++ b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="CustomizeAddrListDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Customize Address List</property>
+    <property name="title" translatable="yes" context="customizeaddrlistdialog|CustomizeAddrListDialog">Customize Address List</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="add">
-                    <property name="label" translatable="yes">_Add...</property>
+                    <property name="label" translatable="yes" context="customizeaddrlistdialog|add">_Add...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -125,7 +125,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="rename">
-                    <property name="label" translatable="yes">_Rename...</property>
+                    <property name="label" translatable="yes" context="customizeaddrlistdialog|rename">_Rename...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -155,7 +155,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">A_ddress list elements:</property>
+                    <property name="label" translatable="yes" context="customizeaddrlistdialog|label1">A_ddress list elements:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">treeview:border</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
index 925c3788fc9d..378d919ee2cc 100644
--- a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
+++ b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DataSourcesUnavailableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create a New Data Source?</property>
+    <property name="title" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">Create a New Data Source?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">ok-cancel</property>
-    <property name="text" translatable="yes">No data sources are available. Create a new one?</property>
-    <property name="secondary_text" translatable="yes">No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields.</property>
+    <property name="text" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">No data sources are available. Create a new one?</property>
+    <property name="secondary_text" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/dropcapspage.ui b/sw/uiconfig/swriter/ui/dropcapspage.ui
index cec9e09e81fe..31d36de81a56 100644
--- a/sw/uiconfig/swriter/ui/dropcapspage.ui
+++ b/sw/uiconfig/swriter/ui/dropcapspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentFLD_DISTANCE">
@@ -53,7 +53,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_SWITCH">
-                        <property name="label" translatable="yes">_Display drop caps</property>
+                        <property name="label" translatable="yes" context="dropcapspage|checkCB_SWITCH">_Display drop caps</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -69,7 +69,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_WORD">
-                        <property name="label" translatable="yes">_Whole word</property>
+                        <property name="label" translatable="yes" context="dropcapspage|checkCB_WORD">_Whole word</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -88,7 +88,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Number of _characters:</property>
+                        <property name="label" translatable="yes" context="dropcapspage|labelFT_DROPCAPS">Number of _characters:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinFLD_DROPCAPS</property>
                       </object>
@@ -102,7 +102,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Lines:</property>
+                        <property name="label" translatable="yes" context="dropcapspage|labelTXT_LINES">_Lines:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinFLD_LINES</property>
                       </object>
@@ -116,7 +116,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Space to text:</property>
+                        <property name="label" translatable="yes" context="dropcapspage|labelTXT_DISTANCE">_Space to text:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">spinFLD_DISTANCE:0cm</property>
                       </object>
@@ -173,7 +173,7 @@
               <object class="GtkLabel" id="labelFL_SETTING">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
+                <property name="label" translatable="yes" context="dropcapspage|labelFL_SETTING">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -208,7 +208,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Text:</property>
+                        <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEXT">_Text:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entryEDT_TEXT</property>
                       </object>
@@ -222,7 +222,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Character st_yle:</property>
+                        <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEMPLATE">Character st_yle:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">comboBOX_TEMPLATE</property>
                       </object>
@@ -261,7 +261,7 @@
               <object class="GtkLabel" id="labelFL_CONTENT">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Contents</property>
+                <property name="label" translatable="yes" context="dropcapspage|labelFL_CONTENT">Contents</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index e92303f47f6d..5feb9343356c 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="DropdownFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Choose Item: </property>
+    <property name="title" translatable="yes" context="dropdownfielddialog|DropdownFieldDialog">Choose Item: </property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -155,7 +155,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Edit</property>
+                <property name="label" translatable="yes" context="dropdownfielddialog|label1">Edit</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui b/sw/uiconfig/swriter/ui/editcategories.ui
index f630cb4f656d..c756a1d7b88a 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="EditCategoriesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Categories</property>
+    <property name="title" translatable="yes" context="editcategories|EditCategoriesDialog">Edit Categories</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rename">
-                <property name="label" translatable="yes">_Rename</property>
+                <property name="label" translatable="yes" context="editcategories|rename">_Rename</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -124,7 +124,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Selection list</property>
+                <property name="label" translatable="yes" context="editcategories|label3">Selection list</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">group</property>
               </object>
@@ -141,7 +141,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="label" translatable="yes">label</property>
+                <property name="label" translatable="yes" context="editcategories|group">label</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -168,7 +168,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Path</property>
+                <property name="label" translatable="yes" context="editcategories|label2">Path</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">pathlb</property>
               </object>
@@ -184,7 +184,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Category</property>
+                <property name="label" translatable="yes" context="editcategories|label1">Category</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui
index ca6a041a59e6..d04111f8ab24 100644
--- a/sw/uiconfig/swriter/ui/editfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/editfielddialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
@@ -14,7 +14,7 @@
   <object class="GtkDialog" id="EditFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Fields</property>
+    <property name="title" translatable="yes" context="editfielddialog|EditFieldDialog">Edit Fields</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -111,7 +111,7 @@
             </child>
             <child>
               <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes">_Edit</property>
+                <property name="label" translatable="yes" context="editfielddialog|edit">_Edit</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui
index e95c32499baa..355464d1ff45 100644
--- a/sw/uiconfig/swriter/ui/editsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="EditSectionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Edit Sections</property>
+    <property name="title" translatable="yes" context="editsectiondialog|EditSectionDialog">Edit Sections</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -50,7 +50,7 @@
             </child>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">_Options...</property>
+                <property name="label" translatable="yes" context="editsectiondialog|options">_Options...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -165,7 +165,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Section</property>
+                    <property name="label" translatable="yes" context="editsectiondialog|label1">Section</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -208,7 +208,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="link">
-                                <property name="label" translatable="yes">_Link</property>
+                                <property name="label" translatable="yes" context="editsectiondialog|link">_Link</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -225,7 +225,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="dde">
-                                <property name="label" translatable="yes">DD_E</property>
+                                <property name="label" translatable="yes" context="editsectiondialog|dde">DD_E</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -255,7 +255,7 @@
                                     <property name="column_spacing">12</property>
                                     <child>
                                       <object class="GtkButton" id="file">
-                                        <property name="label" translatable="yes">Browse...</property>
+                                        <property name="label" translatable="yes" context="editsectiondialog|file">Browse...</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
@@ -283,7 +283,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Section</property>
+                                        <property name="label" translatable="yes" context="editsectiondialog|sectionft">_Section</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">section</property>
                                       </object>
@@ -321,7 +321,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_File name</property>
+                                            <property name="label" translatable="yes" context="editsectiondialog|filenameft">_File name</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">filename</property>
                                           </object>
@@ -336,7 +336,7 @@
                                             <property name="can_focus">False</property>
                                             <property name="no_show_all">True</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">DDE _Command</property>
+                                            <property name="label" translatable="yes" context="editsectiondialog|ddeft">DDE _Command</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">filename</property>
                                           </object>
@@ -368,7 +368,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Link</property>
+                        <property name="label" translatable="yes" context="editsectiondialog|label8">Link</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -405,7 +405,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="protect">
-                                <property name="label" translatable="yes">_Protected</property>
+                                <property name="label" translatable="yes" context="editsectiondialog|protect">_Protected</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -433,7 +433,7 @@
                                     <property name="column_spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="withpassword">
-                                        <property name="label" translatable="yes">Wit_h password</property>
+                                        <property name="label" translatable="yes" context="editsectiondialog|withpassword">Wit_h password</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -452,7 +452,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="password">
-                                        <property name="label" translatable="yes">Password...</property>
+                                        <property name="label" translatable="yes" context="editsectiondialog|password">Password...</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
@@ -482,7 +482,7 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Write Protection</property>
+                        <property name="label" translatable="yes" context="editsectiondialog|label6">Write Protection</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -519,7 +519,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="hide">
-                                <property name="label" translatable="yes">Hide</property>
+                                <property name="label" translatable="yes" context="editsectiondialog|hide">Hide</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -551,7 +551,7 @@
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_With Condition</property>
+                                        <property name="label" translatable="yes" context="editsectiondialog|conditionft">_With Condition</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">condition</property>
                                       </object>
@@ -589,7 +589,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Hide</property>
+                        <property name="label" translatable="yes" context="editsectiondialog|label4">Hide</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -625,7 +625,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="editinro">
-                                <property name="label" translatable="yes">E_ditable in read-only document</property>
+                                <property name="label" translatable="yes" context="editsectiondialog|editinro">E_ditable in read-only document</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -648,7 +648,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Properties</property>
+                        <property name="label" translatable="yes" context="editsectiondialog|label9">Properties</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui
index 28f4af5f24a5..553fd69fd853 100644
--- a/sw/uiconfig/swriter/ui/endnotepage.ui
+++ b/sw/uiconfig/swriter/ui/endnotepage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -37,7 +37,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Numbering</property>
+                    <property name="label" translatable="yes" context="endnotepage|label19">Numbering</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -51,7 +51,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Before</property>
+                    <property name="label" translatable="yes" context="endnotepage|label22">Before</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -65,7 +65,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Start at</property>
+                    <property name="label" translatable="yes" context="endnotepage|offset">Start at</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -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">After</property>
+                    <property name="label" translatable="yes" context="endnotepage|label25">After</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -156,7 +156,7 @@
           <object class="GtkLabel" id="label26">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Autonumbering</property>
+            <property name="label" translatable="yes" context="endnotepage|label26">Autonumbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -198,7 +198,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Paragraph</property>
+                        <property name="label" translatable="yes" context="endnotepage|label20">Paragraph</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -212,7 +212,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Page</property>
+                        <property name="label" translatable="yes" context="endnotepage|pagestyleft">Page</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -253,7 +253,7 @@
               <object class="GtkLabel" id="label23">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Styles</property>
+                <property name="label" translatable="yes" context="endnotepage|label23">Styles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -290,7 +290,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Text area</property>
+                        <property name="label" translatable="yes" context="endnotepage|label27">Text area</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -304,7 +304,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Endnote area</property>
+                        <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -345,7 +345,7 @@
               <object class="GtkLabel" id="label29">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Character Styles</property>
+                <property name="label" translatable="yes" context="endnotepage|label29">Character Styles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/envaddresspage.ui b/sw/uiconfig/swriter/ui/envaddresspage.ui
index 75f08f1e814c..e2f9e160dae7 100644
--- a/sw/uiconfig/swriter/ui/envaddresspage.ui
+++ b/sw/uiconfig/swriter/ui/envaddresspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="image1">
@@ -58,7 +58,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Addr_essee</property>
+                <property name="label" translatable="yes" context="envaddresspage|label2">Addr_essee</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">addredit:border</property>
               </object>
@@ -95,7 +95,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Database</property>
+                    <property name="label" translatable="yes" context="envaddresspage|label4">Database</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">database</property>
                   </object>
@@ -141,7 +141,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Table</property>
+                    <property name="label" translatable="yes" context="envaddresspage|label7">Table</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">table</property>
                   </object>
@@ -187,7 +187,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Database field</property>
+                    <property name="label" translatable="yes" context="envaddresspage|label8">Database field</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">field</property>
                   </object>
@@ -234,7 +234,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Insert</property>
+            <property name="tooltip_text" translatable="yes" context="envaddresspage|insert|tooltip_text">Insert</property>
             <property name="valign">center</property>
             <property name="image">image1</property>
           </object>
@@ -294,7 +294,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="sender">
-                <property name="label" translatable="yes">_Sender</property>
+                <property name="label" translatable="yes" context="envaddresspage|sender">_Sender</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -342,7 +342,7 @@
             <property name="can_focus">False</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="preview-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="envaddresspage|preview-atkobject">Preview</property>
               </object>
             </child>
           </object>
diff --git a/sw/uiconfig/swriter/ui/envdialog.ui b/sw/uiconfig/swriter/ui/envdialog.ui
index 0a6a21ca90a2..3e10eabb31c8 100644
--- a/sw/uiconfig/swriter/ui/envdialog.ui
+++ b/sw/uiconfig/swriter/ui/envdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="EnvDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Envelope</property>
+    <property name="title" translatable="yes" context="envdialog|EnvDialog">Envelope</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_New Document</property>
+                <property name="label" translatable="yes" context="envdialog|ok">_New Document</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -33,7 +33,7 @@
             </child>
             <child>
               <object class="GtkButton" id="user">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="envdialog|user">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -47,7 +47,7 @@
             </child>
             <child>
               <object class="GtkButton" id="modify">
-                <property name="label" translatable="yes">_Modify</property>
+                <property name="label" translatable="yes" context="envdialog|modify">_Modify</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
@@ -122,7 +122,7 @@
               <object class="GtkLabel" id="envelope">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Envelope</property>
+                <property name="label" translatable="yes" context="envdialog|envelope">Envelope</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="format">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Format</property>
+                <property name="label" translatable="yes" context="envdialog|format">Format</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="printer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Printer</property>
+                <property name="label" translatable="yes" context="envdialog|printer">Printer</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui b/sw/uiconfig/swriter/ui/envformatpage.ui
index 9cdb8dac821d..18bd37a693ca 100644
--- a/sw/uiconfig/swriter/ui/envformatpage.ui
+++ b/sw/uiconfig/swriter/ui/envformatpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="EnvFormatPage">
@@ -86,7 +86,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">12</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">from left</property>
+                                    <property name="label" translatable="yes" context="envformatpage|label5">from left</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">leftaddr:0.00cm</property>
                                   </object>
@@ -115,7 +115,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">12</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">from top</property>
+                                    <property name="label" translatable="yes" context="envformatpage|label6">from top</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">topaddr:0.00cm</property>
                                   </object>
@@ -152,7 +152,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Format</property>
+                                <property name="label" translatable="yes" context="envformatpage|label7">Format</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">addredit:editmenu</property>
                               </object>
@@ -165,7 +165,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="addredit:editmenu">
-                                <property name="label" translatable="yes">Edit</property>
+                                <property name="label" translatable="yes" context="envformatpage|addredit">Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -199,7 +199,7 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="envformatpage|label4">Position</property>
                   </object>
                 </child>
               </object>
@@ -210,7 +210,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Addressee</property>
+            <property name="label" translatable="yes" context="envformatpage|label1">Addressee</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -305,7 +305,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">12</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">from left</property>
+                                    <property name="label" translatable="yes" context="envformatpage|label8">from left</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">leftsender:0.00cm</property>
                                   </object>
@@ -334,7 +334,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">12</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">from top</property>
+                                    <property name="label" translatable="yes" context="envformatpage|label9">from top</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">topsender:0.00cm</property>
                                   </object>
@@ -371,7 +371,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Format</property>
+                                <property name="label" translatable="yes" context="envformatpage|label10">Format</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">senderedit:editmenu</property>
                               </object>
@@ -384,7 +384,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="senderedit:editmenu">
-                                <property name="label" translatable="yes">Edit</property>
+                                <property name="label" translatable="yes" context="envformatpage|senderedit">Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -418,7 +418,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="envformatpage|label11">Position</property>
                   </object>
                 </child>
               </object>
@@ -429,7 +429,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Sender</property>
+            <property name="label" translatable="yes" context="envformatpage|label2">Sender</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -475,7 +475,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">F_ormat</property>
+                        <property name="label" translatable="yes" context="envformatpage|label12">F_ormat</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">format</property>
                       </object>
@@ -491,7 +491,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Width</property>
+                        <property name="label" translatable="yes" context="envformatpage|label13">_Width</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">width:0.00cm</property>
                       </object>
@@ -507,7 +507,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Height</property>
+                        <property name="label" translatable="yes" context="envformatpage|label14">_Height</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">height:0.00cm</property>
                       </object>
@@ -580,7 +580,7 @@
                     <property name="can_focus">False</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="preview-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="envformatpage|preview-atkobject">Preview</property>
                       </object>
                     </child>
                   </object>
@@ -599,7 +599,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Size</property>
+            <property name="label" translatable="yes" context="envformatpage|label3">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -632,7 +632,7 @@
       <object class="GtkMenuItem" id="character">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">C_haracter...</property>
+        <property name="label" translatable="yes" context="envformatpage|character">C_haracter...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -640,7 +640,7 @@
       <object class="GtkMenuItem" id="paragraph">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">P_aragraph...</property>
+        <property name="label" translatable="yes" context="envformatpage|paragraph">P_aragraph...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/envprinterpage.ui b/sw/uiconfig/swriter/ui/envprinterpage.ui
index c86fe107d8b9..938957c7b3fa 100644
--- a/sw/uiconfig/swriter/ui/envprinterpage.ui
+++ b/sw/uiconfig/swriter/ui/envprinterpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
@@ -32,7 +32,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="top">
-                    <property name="label" translatable="yes">_Print from top</property>
+                    <property name="label" translatable="yes" context="envprinterpage|top">_Print from top</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="bottom">
-                    <property name="label" translatable="yes">Print from _bottom</property>
+                    <property name="label" translatable="yes" context="envprinterpage|bottom">Print from _bottom</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -72,7 +72,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Shift right</property>
+                    <property name="label" translatable="yes" context="envprinterpage|label3">_Shift right</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -87,7 +87,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Shift _down</property>
+                    <property name="label" translatable="yes" context="envprinterpage|label4">Shift _down</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -135,9 +135,9 @@
                       <object class="GtkToolButton" id="horileft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Horizontal Left</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|horileft|tooltip_text">Horizontal Left</property>
                         <property name="action_name">horileft</property>
-                        <property name="label" translatable="yes">Horizontal Left</property>
+                        <property name="label" translatable="yes" context="envprinterpage|horileft">Horizontal Left</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -149,9 +149,9 @@
                       <object class="GtkToolButton" id="horicenter">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Horizontal Center</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|horicenter|tooltip_text">Horizontal Center</property>
                         <property name="action_name">horicenter</property>
-                        <property name="label" translatable="yes">Horizontal Center</property>
+                        <property name="label" translatable="yes" context="envprinterpage|horicenter">Horizontal Center</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -163,9 +163,9 @@
                       <object class="GtkToolButton" id="horiright">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Horizontal Right</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|horiright|tooltip_text">Horizontal Right</property>
                         <property name="action_name">horiright</property>
-                        <property name="label" translatable="yes">Horizontal Right</property>
+                        <property name="label" translatable="yes" context="envprinterpage|horiright">Horizontal Right</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -177,9 +177,9 @@
                       <object class="GtkToolButton" id="vertleft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Vertical Left</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleft|tooltip_text">Vertical Left</property>
                         <property name="action_name">vertleft</property>
-                        <property name="label" translatable="yes">Vertical Left</property>
+                        <property name="label" translatable="yes" context="envprinterpage|vertleft">Vertical Left</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -191,9 +191,9 @@
                       <object class="GtkToolButton" id="vertcenter">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Vertical Center</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenter|tooltip_text">Vertical Center</property>
                         <property name="action_name">vertcenter</property>
-                        <property name="label" translatable="yes">Vertical Center</property>
+                        <property name="label" translatable="yes" context="envprinterpage|vertcenter">Vertical Center</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -205,9 +205,9 @@
                       <object class="GtkToolButton" id="vertright">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Vertical Right</property>
+                        <property name="tooltip_text" translatable="yes" context="envprinterpage|vertright|tooltip_text">Vertical Right</property>
                         <property name="action_name">vertright</property>
-                        <property name="label" translatable="yes">Vertical Right</property>
+                        <property name="label" translatable="yes" context="envprinterpage|vertright">Vertical Right</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -231,7 +231,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Envelope Orientation</property>
+            <property name="label" translatable="yes" context="envprinterpage|label1">Envelope Orientation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -266,7 +266,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkButton" id="setup">
-                    <property name="label" translatable="yes">Setup...</property>
+                    <property name="label" translatable="yes" context="envprinterpage|setup">Setup...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -285,7 +285,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Printer Name</property>
+                    <property name="label" translatable="yes" context="envprinterpage|printername">Printer Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">setup</property>
                   </object>
@@ -304,7 +304,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Current Printer</property>
+            <property name="label" translatable="yes" context="envprinterpage|label2">Current Printer</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index ffa2fc09790d..699494f8a8a6 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ExchangeDatabasesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Exchange Databases</property>
+    <property name="title" translatable="yes" context="exchangedatabases|ExchangeDatabasesDialog">Exchange Databases</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="define">
-                <property name="label" translatable="yes">Define</property>
+                <property name="label" translatable="yes" context="exchangedatabases|define">Define</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -103,7 +103,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Databases in Use</property>
+                            <property name="label" translatable="yes" context="exchangedatabases|label5">Databases in Use</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">inuselb:border</property>
                           </object>
@@ -119,7 +119,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Available Databases</property>
+                            <property name="label" translatable="yes" context="exchangedatabases|label6">_Available Databases</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">availablelb:border</property>
                           </object>
@@ -132,7 +132,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="browse">
-                            <property name="label" translatable="yes">Browse...</property>
+                            <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -153,7 +153,7 @@
                             <property name="margin_top">12</property>
                             <property name="margin_bottom">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.
+                            <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.
 Use the browse button to select a database file.</property>
                             <property name="wrap">True</property>
                             <property name="max_width_chars">72</property>
@@ -204,7 +204,7 @@ Use the browse button to select a database file.</property>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Exchange Databases</property>
+                    <property name="label" translatable="yes" context="exchangedatabases|label1">Exchange Databases</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -226,7 +226,7 @@ Use the browse button to select a database file.</property>
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Database applied to document:</property>
+                    <property name="label" translatable="yes" context="exchangedatabases|label2">Database applied to document:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/fielddialog.ui b/sw/uiconfig/swriter/ui/fielddialog.ui
index d495ec11a14e..d8e262f3ce24 100644
--- a/sw/uiconfig/swriter/ui/fielddialog.ui
+++ b/sw/uiconfig/swriter/ui/fielddialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="FieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Fields</property>
+    <property name="title" translatable="yes" context="fielddialog|FieldDialog">Fields</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="fielddialog|ok">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -94,7 +94,7 @@
               <object class="GtkLabel" id="document">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Document</property>
+                <property name="label" translatable="yes" context="fielddialog|document">Document</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -107,7 +107,7 @@
               <object class="GtkLabel" id="ref">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Cross-references</property>
+                <property name="label" translatable="yes" context="fielddialog|ref">Cross-references</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -121,7 +121,7 @@
               <object class="GtkLabel" id="functions">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Functions</property>
+                <property name="label" translatable="yes" context="fielddialog|functions">Functions</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="docinfo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">DocInformation</property>
+                <property name="label" translatable="yes" context="fielddialog|docinfo">DocInformation</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -149,7 +149,7 @@
               <object class="GtkLabel" id="variables">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Variables</property>
+                <property name="label" translatable="yes" context="fielddialog|variables">Variables</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -163,7 +163,7 @@
               <object class="GtkLabel" id="database">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Database</property>
+                <property name="label" translatable="yes" context="fielddialog|database">Database</property>
               </object>
               <packing>
                 <property name="position">5</property>
diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui b/sw/uiconfig/swriter/ui/findentrydialog.ui
index cedcf3841fe5..10752635a563 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="FindEntryDialog">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Find Entry</property>
+    <property name="title" translatable="yes" context="findentrydialog|FindEntryDialog">Find Entry</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_ind</property>
+                    <property name="label" translatable="yes" context="findentrydialog|label1">F_ind</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry</property>
                   </object>
@@ -128,7 +128,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="findin">
-                    <property name="label" translatable="yes">Find _only in</property>
+                    <property name="label" translatable="yes" context="findentrydialog|findin">Find _only in</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui
index 7261c8f71ce4..2f94d84eb4f9 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="FieldDbPage">
@@ -54,7 +54,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Type</property>
+                    <property name="label" translatable="yes" context="flddbpage|label1">_Type</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -83,7 +83,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Condition</property>
+                        <property name="label" translatable="yes" context="flddbpage|label5">_Condition</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">condition</property>
                       </object>
@@ -142,7 +142,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Record number</property>
+                        <property name="label" translatable="yes" context="flddbpage|label4">Record number</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">recnumber</property>
                       </object>
@@ -215,7 +215,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Database s_election</property>
+                    <property name="label" translatable="yes" context="flddbpage|label2">Database s_election</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -240,7 +240,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Add database file</property>
+                    <property name="label" translatable="yes" context="flddbpage|browseft">Add database file</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">browse</property>
                   </object>
@@ -253,7 +253,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browse">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes" context="flddbpage|browse">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -294,7 +294,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="fromdatabasecb">
-                            <property name="label" translatable="yes">From database</property>
+                            <property name="label" translatable="yes" context="flddbpage|fromdatabasecb">From database</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -312,7 +312,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="userdefinedcb">
-                            <property name="label" translatable="yes">User-defined</property>
+                            <property name="label" translatable="yes" context="flddbpage|userdefinedcb">User-defined</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -386,7 +386,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="flddbpage|label3">Format</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index 01311517bf53..3c0f97ba365d 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="FieldDocInfoPage">
@@ -39,7 +39,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Type</property>
+            <property name="label" translatable="yes" context="flddocinfopage|label1">_Type</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -85,7 +85,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">S_elect</property>
+            <property name="label" translatable="yes" context="flddocinfopage|label2">S_elect</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -135,7 +135,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="fixed">
-                    <property name="label" translatable="yes">_Fixed content</property>
+                    <property name="label" translatable="yes" context="flddocinfopage|fixed">_Fixed content</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">F_ormat</property>
+            <property name="label" translatable="yes" context="flddocinfopage|label3">F_ormat</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -180,16 +180,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Author</col>
+        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Author</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Time</col>
+        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Time</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date</col>
+        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date Time Author</col>
+        <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date Time Author</col>
       </row>
     </data>
   </object>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index ccef32327f50..997f0ddde355 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -47,7 +47,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Type</property>
+            <property name="label" translatable="yes" context="flddocumentpage|label1">_Type</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -92,7 +92,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">S_elect</property>
+            <property name="label" translatable="yes" context="flddocumentpage|label2">S_elect</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -176,7 +176,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">F_ormat</property>
+                <property name="label" translatable="yes" context="flddocumentpage|label3">F_ormat</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -193,7 +193,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="fixed">
-            <property name="label" translatable="yes">_Fixed content</property>
+            <property name="label" translatable="yes" context="flddocumentpage|fixed">_Fixed content</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
@@ -218,7 +218,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Level</property>
+                <property name="label" translatable="yes" context="flddocumentpage|levelft">Level</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">level</property>
               </object>
@@ -263,7 +263,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Offs_et in days</property>
+                <property name="label" translatable="yes" context="flddocumentpage|daysft">Offs_et in days</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">offset</property>
               </object>
@@ -279,7 +279,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Offs_et in minutes</property>
+                <property name="label" translatable="yes" context="flddocumentpage|minutesft">Offs_et in minutes</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">offset</property>
               </object>
@@ -308,7 +308,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Value</property>
+                <property name="label" translatable="yes" context="flddocumentpage|valueft">_Value</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 6c76662e152c..3891217eff2b 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="FieldFuncPage">
@@ -39,7 +39,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Type</property>
+            <property name="label" translatable="yes" context="fldfuncpage|label1">_Type</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -86,7 +86,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">S_elect</property>
+            <property name="label" translatable="yes" context="fldfuncpage|label4">S_elect</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -132,7 +132,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">F_ormat</property>
+            <property name="label" translatable="yes" context="fldfuncpage|label2">F_ormat</property>
             <property name="use_underline">True</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -154,7 +154,7 @@
         <property name="hexpand">True</property>
         <child>
           <object class="GtkButton" id="macro">
-            <property name="label" translatable="yes">_Macro...</property>
+            <property name="label" translatable="yes" context="fldfuncpage|macro">_Macro...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -179,7 +179,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Value</property>
+                <property name="label" translatable="yes" context="fldfuncpage|valueft">_Value</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">value</property>
               </object>
@@ -223,7 +223,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Na_me</property>
+                <property name="label" translatable="yes" context="fldfuncpage|nameft">Na_me</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">name</property>
               </object>
@@ -268,7 +268,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Then</property>
+                <property name="label" translatable="yes" context="fldfuncpage|cond1ft">Then</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">cond1</property>
               </object>
@@ -312,7 +312,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Else</property>
+                <property name="label" translatable="yes" context="fldfuncpage|cond2ft">Else</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">cond2</property>
               </object>
@@ -362,7 +362,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">It_em</property>
+                    <property name="label" translatable="yes" context="fldfuncpage|itemft">It_em</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">item</property>
                   </object>
@@ -422,7 +422,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Items on _list</property>
+                    <property name="label" translatable="yes" context="fldfuncpage|listitemft">Items on _list</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">listitems:border</property>
                   </object>
@@ -474,7 +474,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="up">
-                        <property name="label" translatable="yes">Move _Up</property>
+                        <property name="label" translatable="yes" context="fldfuncpage|up">Move _Up</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -488,7 +488,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="down">
-                        <property name="label" translatable="yes">Move Do_wn</property>
+                        <property name="label" translatable="yes" context="fldfuncpage|down">Move Do_wn</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -518,7 +518,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Na_me</property>
+                        <property name="label" translatable="yes" context="fldfuncpage|listnameft">Na_me</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">listname</property>
                       </object>
@@ -583,16 +583,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Author</col>
+        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Author</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Time</col>
+        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Time</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date</col>
+        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date Time Author</col>
+        <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date Time Author</col>
       </row>
     </data>
   </object>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui
index 618eecb0127b..0ce297a808a3 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststore1">
@@ -10,19 +10,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Bookmarks</col>
+        <col id="0" translatable="yes" context="fldrefpage|liststore1">Bookmarks</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Footnotes</col>
+        <col id="0" translatable="yes" context="fldrefpage|liststore1">Footnotes</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Endnotes</col>
+        <col id="0" translatable="yes" context="fldrefpage|liststore1">Endnotes</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Headings</col>
+        <col id="0" translatable="yes" context="fldrefpage|liststore1">Headings</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Numbered Paragraphs</col>
+        <col id="0" translatable="yes" context="fldrefpage|liststore1">Numbered Paragraphs</col>
       </row>
     </data>
   </object>
@@ -78,7 +78,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Type</property>
+                    <property name="label" translatable="yes" context="fldrefpage|label1">_Type</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -123,7 +123,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Insert _reference to</property>
+                    <property name="label" translatable="yes" context="fldrefpage|label3">Insert _reference to</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -166,7 +166,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">5</property>
-                        <property name="label" translatable="yes">Selection</property>
+                        <property name="label" translatable="yes" context="fldrefpage|label4">Selection</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -192,7 +192,7 @@
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
                     <property name="shadow_type">out</property>
-                    <property name="placeholder_text" translatable="yes">Filter Selection</property>
+                    <property name="placeholder_text" translatable="yes" context="fldrefpage|filter">Filter Selection</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -266,7 +266,7 @@
                     <property name="visible">False</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">S_election</property>
+                    <property name="label" translatable="yes" context="fldrefpage|label2">S_election</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -293,7 +293,7 @@
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Value</property>
+                    <property name="label" translatable="yes" context="fldrefpage|valueft">_Value</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">value</property>
                   </object>
@@ -320,7 +320,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Na_me</property>
+                    <property name="label" translatable="yes" context="fldrefpage|nameft">Na_me</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 7e8dc99344d8..c463621447fc 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="FieldVarPage">
@@ -49,7 +49,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Type</property>
+                <property name="label" translatable="yes" context="fldvarpage|label1">_Type</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -74,7 +74,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Na_me</property>
+                <property name="label" translatable="yes" context="fldvarpage|nameft">Na_me</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -151,7 +151,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">S_elect</property>
+                <property name="label" translatable="yes" context="fldvarpage|label2">S_elect</property>
                 <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -176,7 +176,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Value</property>
+                <property name="label" translatable="yes" context="fldvarpage|valueft">_Value</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -294,7 +294,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">F_ormat</property>
+                    <property name="label" translatable="yes" context="fldvarpage|label3">F_ormat</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -310,7 +310,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="invisible">
-                <property name="label" translatable="yes">Invisi_ble</property>
+                <property name="label" translatable="yes" context="fldvarpage|invisible">Invisi_ble</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -349,7 +349,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Level</property>
+                            <property name="label" translatable="yes" context="fldvarpage|label5">_Level</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -364,7 +364,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Separator</property>
+                            <property name="label" translatable="yes" context="fldvarpage|separatorft">_Separator</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">separator</property>
                           </object>
@@ -382,7 +382,7 @@
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
                             <items>
-                              <item translatable="yes">None</item>
+                              <item translatable="yes" context="fldvarpage|level">None</item>
                             </items>
                           </object>
                           <packing>
@@ -399,7 +399,7 @@
                             <property name="max_length">1</property>
                             <property name="invisible_char">•</property>
                             <property name="width_chars">2</property>
-                            <property name="text" translatable="yes">.</property>
+                            <property name="text" translatable="yes" context="fldvarpage|separator">.</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -417,7 +417,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Numbering by Chapter</property>
+                    <property name="label" translatable="yes" context="fldvarpage|label4">Numbering by Chapter</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -455,7 +455,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Apply</property>
+                    <property name="tooltip_text" translatable="yes" context="fldvarpage|apply|tooltip_text">Apply</property>
                     <property name="action_name">apply</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">svx/res/nu01.png</property>
@@ -470,7 +470,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Delete</property>
+                    <property name="tooltip_text" translatable="yes" context="fldvarpage|delete|tooltip_text">Delete</property>
                     <property name="action_name">delete</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">svx/res/nu02.png</property>
@@ -525,16 +525,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Author</col>
+        <col id="0" translatable="yes" context="fldvarpage|liststore1">Author</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Time</col>
+        <col id="0" translatable="yes" context="fldvarpage|liststore1">Time</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date</col>
+        <col id="0" translatable="yes" context="fldvarpage|liststore1">Date</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Date Time Author</col>
+        <col id="0" translatable="yes" context="fldvarpage|liststore1">Date Time Author</col>
       </row>
     </data>
   </object>
diff --git a/sw/uiconfig/swriter/ui/floatingnavigation.ui b/sw/uiconfig/swriter/ui/floatingnavigation.ui
index 0f310a3b1a2e..e62f96cae2ca 100644
--- a/sw/uiconfig/swriter/ui/floatingnavigation.ui
+++ b/sw/uiconfig/swriter/ui/floatingnavigation.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingNavigation">
     <property name="visible">True</property>
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Navigation</property>
+    <property name="title" translatable="yes" context="floatingnavigation|FloatingNavigation">Navigation</property>
     <property name="resizable">False</property>
     <property name="type_hint">utility</property>
     <child>
diff --git a/sw/uiconfig/swriter/ui/floatingsync.ui b/sw/uiconfig/swriter/ui/floatingsync.ui
index b6b24a5ab21d..709bad962199 100644
--- a/sw/uiconfig/swriter/ui/floatingsync.ui
+++ b/sw/uiconfig/swriter/ui/floatingsync.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="FloatingSync">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Synchronize</property>
+    <property name="title" translatable="yes" context="floatingsync|FloatingSync">Synchronize</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">utility</property>
     <property name="deletable">False</property>
@@ -20,7 +20,7 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkButton" id="sync">
-            <property name="label" translatable="yes">Synchronize Labels</property>
+            <property name="label" translatable="yes" context="floatingsync|sync">Synchronize Labels</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/footendnotedialog.ui b/sw/uiconfig/swriter/ui/footendnotedialog.ui
index caaf21287b79..f4c981f35090 100644
--- a/sw/uiconfig/swriter/ui/footendnotedialog.ui
+++ b/sw/uiconfig/swriter/ui/footendnotedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FootEndnoteDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Footnotes/Endnotes Settings</property>
+    <property name="title" translatable="yes" context="footendnotedialog|FootEndnoteDialog">Footnotes/Endnotes Settings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
               <object class="GtkLabel" id="footnotes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footnotes</property>
+                <property name="label" translatable="yes" context="footendnotedialog|footnotes">Footnotes</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="endnotes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Endnotes</property>
+                <property name="label" translatable="yes" context="footendnotedialog|endnotes">Endnotes</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index ba212099e4a4..155df780f653 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -63,7 +63,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="maxheightpage">
-                    <property name="label" translatable="yes">_Not larger than page area</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|maxheightpage">_Not larger than page area</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -83,7 +83,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="maxheight">
-                    <property name="label" translatable="yes">Maximum footnote _height</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|maxheight">Maximum footnote _height</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Space to text</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label3">Space to text</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spacetotext:0.00cm</property>
                   </object>
@@ -170,7 +170,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Footnote Area</property>
+            <property name="label" translatable="yes" context="footnoteareapage|label1">Footnote Area</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -210,7 +210,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Position</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label4">_Position</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">position</property>
                   </object>
@@ -227,7 +227,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Style</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label5">_Style</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">style</property>
                   </object>
@@ -244,7 +244,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Thickness</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label6">_Thickness</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">thickness:0.00pt</property>
                   </object>
@@ -261,7 +261,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Color</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label7">_Color</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">color</property>
                   </object>
@@ -278,7 +278,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Length</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label8">_Length</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">length:0%</property>
                   </object>
@@ -295,7 +295,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Spacing to footnote contents</property>
+                    <property name="label" translatable="yes" context="footnoteareapage|label9">_Spacing to footnote contents</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">spacingtocontents:0.00cm</property>
                   </object>
@@ -315,9 +315,9 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Left</item>
-                      <item translatable="yes">Centered</item>
-                      <item translatable="yes">Right</item>
+                      <item translatable="yes" context="footnoteareapage|position">Left</item>
+                      <item translatable="yes" context="footnoteareapage|position">Centered</item>
+                      <item translatable="yes" context="footnoteareapage|position">Right</item>
                     </items>
                   </object>
                   <packing>
@@ -414,7 +414,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Separator Line</property>
+            <property name="label" translatable="yes" context="footnoteareapage|label2">Separator Line</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index 96ce210ef410..12eaed120092 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,13 +17,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Per page</col>
+        <col id="0" translatable="yes" context="footnotepage|liststore1">Per page</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Per chapter</col>
+        <col id="0" translatable="yes" context="footnotepage|liststore1">Per chapter</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Per document</col>
+        <col id="0" translatable="yes" context="footnotepage|liststore1">Per document</col>
       </row>
     </data>
   </object>
@@ -55,7 +55,7 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Numbering</property>
+                    <property name="label" translatable="yes" context="footnotepage|label6">Numbering</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -69,7 +69,7 @@
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Counting</property>
+                    <property name="label" translatable="yes" context="footnotepage|label7">Counting</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -83,7 +83,7 @@
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Before</property>
+                    <property name="label" translatable="yes" context="footnotepage|label8">Before</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -97,7 +97,7 @@
                   <object class="GtkLabel" id="pos">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position</property>
+                    <property name="label" translatable="yes" context="footnotepage|pos">Position</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -111,7 +111,7 @@
                   <object class="GtkLabel" id="offset">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Start at</property>
+                    <property name="label" translatable="yes" context="footnotepage|offset">Start at</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -125,7 +125,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">After</property>
+                    <property name="label" translatable="yes" context="footnotepage|label11">After</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -137,7 +137,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="pospagecb">
-                    <property name="label" translatable="yes">End of page</property>
+                    <property name="label" translatable="yes" context="footnotepage|pospagecb">End of page</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="posdoccb">
-                    <property name="label" translatable="yes">End of document</property>
+                    <property name="label" translatable="yes" context="footnotepage|posdoccb">End of document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -277,7 +277,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Autonumbering</property>
+            <property name="label" translatable="yes" context="footnotepage|label3">Autonumbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -318,7 +318,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Paragraph</property>
+                        <property name="label" translatable="yes" context="footnotepage|label4">Paragraph</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -332,7 +332,7 @@
                       <object class="GtkLabel" id="pagestyleft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Page</property>
+                        <property name="label" translatable="yes" context="footnotepage|pagestyleft">Page</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -374,7 +374,7 @@
               <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Styles</property>
+                <property name="label" translatable="yes" context="footnotepage|label12">Styles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -410,7 +410,7 @@
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Text area</property>
+                        <property name="label" translatable="yes" context="footnotepage|label15">Text area</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -424,7 +424,7 @@
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Footnote area</property>
+                        <property name="label" translatable="yes" context="footnotepage|label16">Footnote area</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -466,7 +466,7 @@
               <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Character Styles</property>
+                <property name="label" translatable="yes" context="footnotepage|label13">Character Styles</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -510,7 +510,7 @@
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">End of footnote</property>
+                    <property name="label" translatable="yes" context="footnotepage|label17">End of footnote</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -524,7 +524,7 @@
                   <object class="GtkLabel" id="label18">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Start of next page</property>
+                    <property name="label" translatable="yes" context="footnotepage|label18">Start of next page</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -574,7 +574,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Continuation Notice</property>
+            <property name="label" translatable="yes" context="footnotepage|label5">Continuation Notice</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
index f3b8501af5d7..301a47e21e22 100644
--- a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
+++ b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -46,7 +46,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="ftnntnum">
-                        <property name="label" translatable="yes">_Restart numbering</property>
+                        <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnum">_Restart numbering</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -89,7 +89,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Start at:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnoffset_label">_Start at:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">ftnoffset</property>
                           </object>
@@ -110,7 +110,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="ftnntnumfmt">
-                        <property name="label" translatable="yes">Custom _format</property>
+                        <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnumfmt">Custom _format</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -154,7 +154,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Aft_er:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnsuffix_label">Aft_er:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">ftnsuffix</property>
                           </object>
@@ -199,7 +199,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">24</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Be_fore:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnprefix_label">Be_fore:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">ftnprefix</property>
                           </object>
@@ -228,7 +228,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="ftnntattextend">
-                    <property name="label" translatable="yes">Collec_t at end of text</property>
+                    <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntattextend">Collec_t at end of text</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -252,7 +252,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Footnotes</property>
+            <property name="label" translatable="yes" context="footnotesendnotestabpage|label1">Footnotes</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -289,7 +289,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="endntattextend">
-                    <property name="label" translatable="yes">C_ollect at end of section</property>
+                    <property name="label" translatable="yes" context="footnotesendnotestabpage|endntattextend">C_ollect at end of section</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -315,7 +315,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="endntnum">
-                        <property name="label" translatable="yes">_Restart numbering</property>
+                        <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnum">_Restart numbering</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -358,7 +358,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Start at:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|endoffset_label">_Start at:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">endoffset</property>
                           </object>
@@ -379,7 +379,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="endntnumfmt">
-                        <property name="label" translatable="yes">_Custom format</property>
+                        <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnumfmt">_Custom format</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -423,7 +423,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Aft_er:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|endsuffix_label">Aft_er:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">endsuffix</property>
                           </object>
@@ -468,7 +468,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">24</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Be_fore:</property>
+                            <property name="label" translatable="yes" context="footnotesendnotestabpage|endprefix_label">Be_fore:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">endprefix</property>
                           </object>
@@ -503,7 +503,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Endnotes</property>
+            <property name="label" translatable="yes" context="footnotesendnotestabpage|label2">Endnotes</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/formatsectiondialog.ui b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
index c0273b4ff3d0..912105d0fa89 100644
--- a/sw/uiconfig/swriter/ui/formatsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FormatSectionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Options</property>
+    <property name="title" translatable="yes" context="formatsectiondialog|FormatSectionDialog">Options</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -98,7 +98,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="formatsectiondialog|columns">Columns</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="indents">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents</property>
+                <property name="label" translatable="yes" context="formatsectiondialog|indents">Indents</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="formatsectiondialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -139,7 +139,7 @@
               <object class="GtkLabel" id="notes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footnotes/Endnotes</property>
+                <property name="label" translatable="yes" context="formatsectiondialog|notes">Footnotes/Endnotes</property>
               </object>
               <packing>
                 <property name="position">3</property>
diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui
index b1a2abf0b234..cd20025f9545 100644
--- a/sw/uiconfig/swriter/ui/formattablepage.ui
+++ b/sw/uiconfig/swriter/ui/formattablepage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">99.989999999999995</property>
@@ -58,7 +58,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Name</property>
+                            <property name="label" translatable="yes" context="formattablepage|nameft">_Name</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">name</property>
                           </object>
@@ -74,7 +74,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">W_idth</property>
+                            <property name="label" translatable="yes" context="formattablepage|widthft">W_idth</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">widthmf:0.00cm</property>
                           </object>
@@ -105,7 +105,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="relwidth">
-                                <property name="label" translatable="yes">Relati_ve</property>
+                                <property name="label" translatable="yes" context="formattablepage|relwidth">Relati_ve</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="label45">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Properties</property>
+                    <property name="label" translatable="yes" context="formattablepage|label45">Properties</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -191,7 +191,7 @@
                             <property name="xalign">0</property>
                             <property name="yalign">0.50999999046325684</property>
                             <property name="xpad">1</property>
-                            <property name="label" translatable="yes">Lef_t</property>
+                            <property name="label" translatable="yes" context="formattablepage|leftft">Lef_t</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">leftmf:0.00cm</property>
                           </object>
@@ -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">Ri_ght</property>
+                            <property name="label" translatable="yes" context="formattablepage|rightft">Ri_ght</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">rightmf:0.00cm</property>
                           </object>
@@ -225,7 +225,7 @@
                             <property name="xalign">0</property>
                             <property name="xpad">1</property>
                             <property name="ypad">1</property>
-                            <property name="label" translatable="yes">_Above</property>
+                            <property name="label" translatable="yes" context="formattablepage|aboveft">_Above</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">abovemf:0.00cm</property>
                           </object>
@@ -242,7 +242,7 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="xpad">1</property>
-                            <property name="label" translatable="yes">_Below</property>
+                            <property name="label" translatable="yes" context="formattablepage|belowft">_Below</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">belowmf:0.00cm</property>
                           </object>
@@ -325,7 +325,7 @@
                   <object class="GtkLabel" id="label46">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Spacing</property>
+                    <property name="label" translatable="yes" context="formattablepage|label46">Spacing</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -367,7 +367,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="full">
-                        <property name="label" translatable="yes">A_utomatic</property>
+                        <property name="label" translatable="yes" context="formattablepage|full">A_utomatic</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -385,7 +385,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="left">
-                        <property name="label" translatable="yes">_Left</property>
+                        <property name="label" translatable="yes" context="formattablepage|left">_Left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -403,7 +403,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fromleft">
-                        <property name="label" translatable="yes">_From left</property>
+                        <property name="label" translatable="yes" context="formattablepage|fromleft">_From left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -421,7 +421,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="right">
-                        <property name="label" translatable="yes">R_ight</property>
+                        <property name="label" translatable="yes" context="formattablepage|right">R_ight</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -440,7 +440,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="center">
-                        <property name="label" translatable="yes">_Center</property>
+                        <property name="label" translatable="yes" context="formattablepage|center">_Center</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -458,7 +458,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="free">
-                        <property name="label" translatable="yes">_Manual</property>
+                        <property name="label" translatable="yes" context="formattablepage|free">_Manual</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -483,7 +483,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xpad">1</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="formattablepage|label43">Alignment</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -527,7 +527,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Text _direction</property>
+                    <property name="label" translatable="yes" context="formattablepage|label53">Text _direction</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">textdirection</property>
                   </object>
@@ -559,7 +559,7 @@
           <object class="GtkLabel" id="label44">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Properties </property>
+            <property name="label" translatable="yes" context="formattablepage|label44">Properties </property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -583,15 +583,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left-to-right</col>
+        <col id="0" translatable="yes" context="formattablepage|liststore1">Left-to-right</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right-to-left</col>
+        <col id="0" translatable="yes" context="formattablepage|liststore1">Right-to-left</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Use superordinate object settings</col>
+        <col id="0" translatable="yes" context="formattablepage|liststore1">Use superordinate object settings</col>
         <col id="1">4</col>
       </row>
     </data>
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui
index b0d5a6b86e38..cbb6932bdb79 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="FrameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Frame</property>
+    <property name="title" translatable="yes" context="framedialog|FrameDialog">Frame</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="type">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="framedialog|type">Type</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="framedialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="wrap">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Wrap</property>
+                <property name="label" translatable="yes" context="framedialog|wrap">Wrap</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="hyperlink">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hyperlink</property>
+                <property name="label" translatable="yes" context="framedialog|hyperlink">Hyperlink</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="framedialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="framedialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="framedialog|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="framedialog|columns">Columns</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -208,7 +208,7 @@
               <object class="GtkLabel" id="macro">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Macro</property>
+                <property name="label" translatable="yes" context="framedialog|macro">Macro</property>
               </object>
               <packing>
                 <property name="position">8</property>
diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui
index ad22ac5563d4..95ea41a1b8c9 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="liststore">
     <columns>
@@ -11,15 +11,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Top</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore">Top</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Centered</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore">Centered</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore">Bottom</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -33,23 +33,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left-to-right</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore1">Left-to-right</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right-to-left</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore1">Right-to-left</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right-to-left (vertical)</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore1">Right-to-left (vertical)</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Left-to-right (vertical)</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore1">Left-to-right (vertical)</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Use superordinate object settings</col>
+        <col id="0" translatable="yes" context="frmaddpage|liststore1">Use superordinate object settings</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -119,7 +119,7 @@
                   <object class="GtkLabel" id="name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Name:</property>
+                    <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                     <property name="xalign">0</property>
@@ -133,7 +133,7 @@
                   <object class="GtkLabel" id="altname_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Alternative (Text only):</property>
+                    <property name="label" translatable="yes" context="frmaddpage|altname_label">_Alternative (Text only):</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">altname</property>
                     <property name="xalign">0</property>
@@ -149,7 +149,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item translatable="yes">&lt;None&gt;</item>
+                      <item translatable="yes" context="frmaddpage|prev">&lt;None&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -163,7 +163,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item translatable="yes">&lt;None&gt;</item>
+                      <item translatable="yes" context="frmaddpage|next">&lt;None&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -175,7 +175,7 @@
                   <object class="GtkLabel" id="prev_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Previous link:</property>
+                    <property name="label" translatable="yes" context="frmaddpage|prev_label">_Previous link:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">prev</property>
                     <property name="xalign">0</property>
@@ -189,7 +189,7 @@
                   <object class="GtkLabel" id="next_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Next link:</property>
+                    <property name="label" translatable="yes" context="frmaddpage|next_label">_Next link:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">next</property>
                     <property name="xalign">0</property>
@@ -203,7 +203,7 @@
                   <object class="GtkLabel" id="description_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Description:</property>
+                    <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                   </object>
@@ -239,7 +239,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Names</property>
+            <property name="label" translatable="yes" context="frmaddpage|label1">Names</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -278,7 +278,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Vertical alignment</property>
+                        <property name="label" translatable="yes" context="frmaddpage|label2">_Vertical alignment</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -305,7 +305,7 @@
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Content Alignment</property>
+                <property name="label" translatable="yes" context="frmaddpage|label7">Content Alignment</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -341,7 +341,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="protectcontent">
-                        <property name="label" translatable="yes">_Contents</property>
+                        <property name="label" translatable="yes" context="frmaddpage|protectcontent">_Contents</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -356,7 +356,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="protectframe">
-                        <property name="label" translatable="yes">P_osition</property>
+                        <property name="label" translatable="yes" context="frmaddpage|protectframe">P_osition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -371,7 +371,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="protectsize">
-                        <property name="label" translatable="yes">_Size</property>
+                        <property name="label" translatable="yes" context="frmaddpage|protectsize">_Size</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -392,7 +392,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Protect</property>
+                <property name="label" translatable="yes" context="frmaddpage|label8">Protect</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -437,7 +437,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="editinreadonly">
-                    <property name="label" translatable="yes">_Editable in read-only document</property>
+                    <property name="label" translatable="yes" context="frmaddpage|editinreadonly">_Editable in read-only document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -452,7 +452,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printframe">
-                    <property name="label" translatable="yes">Prin_t</property>
+                    <property name="label" translatable="yes" context="frmaddpage|printframe">Prin_t</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -477,7 +477,7 @@
                       <object class="GtkLabel" id="textflow_label">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">_Text direction:</property>
+                        <property name="label" translatable="yes" context="frmaddpage|textflow_label">_Text direction:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">textflow</property>
                         <property name="xalign">0</property>
@@ -512,7 +512,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Properties</property>
+            <property name="label" translatable="yes" context="frmaddpage|label3">Properties</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui
index 405723938d57..6fd3ca326498 100644
--- a/sw/uiconfig/swriter/ui/frmtypepage.ui
+++ b/sw/uiconfig/swriter/ui/frmtypepage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -72,7 +72,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="autowidth">
-                            <property name="label" translatable="yes">AutoSize</property>
+                            <property name="label" translatable="yes" context="frmtypepage|autowidth">AutoSize</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -98,7 +98,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Width (at least)</property>
+                                <property name="label" translatable="yes" context="frmtypepage|autowidthft">_Width (at least)</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">width:0.00cm</property>
                               </object>
@@ -114,7 +114,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Width</property>
+                                <property name="label" translatable="yes" context="frmtypepage|widthft">_Width</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">width:0.00cm</property>
                               </object>
@@ -140,7 +140,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="relwidth">
-                                <property name="label" translatable="yes">Relat_ive to</property>
+                                <property name="label" translatable="yes" context="frmtypepage|relwidth">Relat_ive to</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -207,7 +207,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="autoheight">
-                            <property name="label" translatable="yes">AutoSize</property>
+                            <property name="label" translatable="yes" context="frmtypepage|autoheight">AutoSize</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -233,7 +233,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">H_eight (at least)</property>
+                                <property name="label" translatable="yes" context="frmtypepage|autoheightft">H_eight (at least)</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">height:0.00cm</property>
                               </object>
@@ -249,7 +249,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">H_eight</property>
+                                <property name="label" translatable="yes" context="frmtypepage|heightft">H_eight</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">height:0.00cm</property>
                               </object>
@@ -275,7 +275,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="relheight">
-                                <property name="label" translatable="yes">Re_lative to</property>
+                                <property name="label" translatable="yes" context="frmtypepage|relheight">Re_lative to</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -320,7 +320,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="ratio">
-                        <property name="label" translatable="yes">_Keep ratio</property>
+                        <property name="label" translatable="yes" context="frmtypepage|ratio">_Keep ratio</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -337,7 +337,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="origsize">
-                        <property name="label" translatable="yes">_Original Size</property>
+                        <property name="label" translatable="yes" context="frmtypepage|origsize">_Original Size</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="no_show_all">True</property>
@@ -359,7 +359,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Size</property>
+                <property name="label" translatable="yes" context="frmtypepage|label2">Size</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -421,7 +421,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="topage">
-                        <property name="label" translatable="yes">To _page</property>
+                        <property name="label" translatable="yes" context="frmtypepage|topage">To _page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -440,7 +440,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="topara">
-                        <property name="label" translatable="yes">To paragrap_h</property>
+                        <property name="label" translatable="yes" context="frmtypepage|topara">To paragrap_h</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -458,7 +458,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="tochar">
-                        <property name="label" translatable="yes">To cha_racter</property>
+                        <property name="label" translatable="yes" context="frmtypepage|tochar">To cha_racter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -476,7 +476,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="aschar">
-                        <property name="label" translatable="yes">_As character</property>
+                        <property name="label" translatable="yes" context="frmtypepage|aschar">_As character</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -494,7 +494,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="toframe">
-                        <property name="label" translatable="yes">To _frame</property>
+                        <property name="label" translatable="yes" context="frmtypepage|toframe">To _frame</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -518,7 +518,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Anchor</property>
+                <property name="label" translatable="yes" context="frmtypepage|label1">Anchor</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -563,7 +563,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Hori_zontal</property>
+                    <property name="label" translatable="yes" context="frmtypepage|horiposft">Hori_zontal</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">horipos</property>
                   </object>
@@ -579,7 +579,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">b_y</property>
+                    <property name="label" translatable="yes" context="frmtypepage|horibyft">b_y</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">byhori:0.00cm</property>
                   </object>
@@ -595,7 +595,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">by</property>
+                    <property name="label" translatable="yes" context="frmtypepage|vertbyft">by</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">byvert:0.00cm</property>
                   </object>
@@ -611,7 +611,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_to</property>
+                    <property name="label" translatable="yes" context="frmtypepage|horitoft">_to</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">horianchor</property>
                   </object>
@@ -671,7 +671,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Vertical</property>
+                    <property name="label" translatable="yes" context="frmtypepage|vertposft">_Vertical</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">vertpos</property>
                   </object>
@@ -717,7 +717,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">t_o</property>
+                    <property name="label" translatable="yes" context="frmtypepage|verttoft">t_o</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">vertanchor</property>
                   </object>
@@ -744,7 +744,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="mirror">
-                    <property name="label" translatable="yes">_Mirror on even pages</property>
+                    <property name="label" translatable="yes" context="frmtypepage|mirror">_Mirror on even pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -762,7 +762,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="followtextflow">
-                    <property name="label" translatable="yes">Follow text flow</property>
+                    <property name="label" translatable="yes" context="frmtypepage|followtextflow">Follow text flow</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -786,7 +786,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes" context="frmtypepage|label11">Position</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/frmurlpage.ui b/sw/uiconfig/swriter/ui/frmurlpage.ui
index 761596c896d2..31d798c88b86 100644
--- a/sw/uiconfig/swriter/ui/frmurlpage.ui
+++ b/sw/uiconfig/swriter/ui/frmurlpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="FrameURLPage">
     <property name="visible">True</property>
@@ -63,7 +63,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_URL:</property>
+                    <property name="label" translatable="yes" context="frmurlpage|url_label">_URL:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">url</property>
                   </object>
@@ -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">_Name:</property>
+                    <property name="label" translatable="yes" context="frmurlpage|name_label">_Name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">name</property>
                   </object>
@@ -95,7 +95,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Frame:</property>
+                    <property name="label" translatable="yes" context="frmurlpage|frame_label">_Frame:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">frame</property>
                   </object>
@@ -113,7 +113,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="search">
-                        <property name="label" translatable="yes">_Browse...</property>
+                        <property name="label" translatable="yes" context="frmurlpage|search">_Browse...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -168,7 +168,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Link to</property>
+            <property name="label" translatable="yes" context="frmurlpage|label1">Link to</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -207,7 +207,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="server">
-                    <property name="label" translatable="yes">_Server-side image map</property>
+                    <property name="label" translatable="yes" context="frmurlpage|server">_Server-side image map</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -225,7 +225,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="client">
-                    <property name="label" translatable="yes">_Client-side image map</property>
+                    <property name="label" translatable="yes" context="frmurlpage|client">_Client-side image map</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -249,7 +249,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Image Map</property>
+            <property name="label" translatable="yes" context="frmurlpage|label2">Image Map</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/gotopagedialog.ui b/sw/uiconfig/swriter/ui/gotopagedialog.ui
index 211acaf79816..bdfd2cbd8ef6 100644
--- a/sw/uiconfig/swriter/ui/gotopagedialog.ui
+++ b/sw/uiconfig/swriter/ui/gotopagedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="GotoPageDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Go to Page</property>
+    <property name="title" translatable="yes" context="gotopagedialog|GotoPageDialog">Go to Page</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -68,7 +68,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">of $1</property>
+                <property name="label" translatable="yes" context="gotopagedialog|page_count">of $1</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -94,7 +94,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Page:</property>
+                <property name="label" translatable="yes" context="gotopagedialog|page_label">Page:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/sw/uiconfig/swriter/ui/headerfootermenu.ui b/sw/uiconfig/swriter/ui/headerfootermenu.ui
index 2a775010ff0d..be7661876209 100644
--- a/sw/uiconfig/swriter/ui/headerfootermenu.ui
+++ b/sw/uiconfig/swriter/ui/headerfootermenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -16,7 +16,7 @@
       <object class="GtkMenuItem" id="borderback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Border and Background...</property>
+        <property name="label" translatable="yes" context="headerfootermenu|borderback">Border and Background...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/indentpage.ui b/sw/uiconfig/swriter/ui/indentpage.ui
index df4079e83c4e..c7da89123e1e 100644
--- a/sw/uiconfig/swriter/ui/indentpage.ui
+++ b/sw/uiconfig/swriter/ui/indentpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkAdjustment" id="adjustment1">
@@ -49,7 +49,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Before section</property>
+                        <property name="label" translatable="yes" context="indentpage|label1">_Before section</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">_After section</property>
+                        <property name="label" translatable="yes" context="indentpage|label3">_After section</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -113,7 +113,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indent</property>
+                <property name="label" translatable="yes" context="indentpage|label2">Indent</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -142,7 +142,7 @@
                 <property name="valign">start</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="preview-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="indentpage|preview-atkobject">Example</property>
                   </object>
                 </child>
               </object>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui
index ff439e3f7184..4c77aaf66a41 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -43,7 +43,7 @@
   <object class="GtkDialog" id="IndexEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Index Entry</property>
+    <property name="title" translatable="yes" context="indexentry|IndexEntryDialog">Insert Index Entry</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -56,7 +56,7 @@
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="insert">
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="indexentry|insert">Insert</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
@@ -232,7 +232,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Index</property>
+                        <property name="label" translatable="yes" context="indexentry|typeft">Index</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">typecb</property>
                         <property name="xalign">0</property>
@@ -258,7 +258,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">New User-defined Index</property>
+                        <property name="tooltip_text" translatable="yes" context="indexentry|new|tooltip_text">New User-defined Index</property>
                         <property name="image">image1</property>
                         <accessibility>
                           <relation type="member-of" target="label1"/>
@@ -274,7 +274,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Entry</property>
+                        <property name="label" translatable="yes" context="indexentry|label3">Entry</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entryed</property>
                         <property name="xalign">0</property>
@@ -290,7 +290,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">1st key</property>
+                        <property name="label" translatable="yes" context="indexentry|key1ft">1st key</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">key1cb</property>
                         <property name="xalign">0</property>
@@ -306,7 +306,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">2nd key</property>
+                        <property name="label" translatable="yes" context="indexentry|key2ft">2nd key</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">key2cb</property>
                         <property name="xalign">0</property>
@@ -321,7 +321,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Level</property>
+                        <property name="label" translatable="yes" context="indexentry|levelft">Level</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">levelnf</property>
                         <property name="xalign">0</property>
@@ -347,7 +347,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="mainentrycb">
-                        <property name="label" translatable="yes">Main entry</property>
+                        <property name="label" translatable="yes" context="indexentry|mainentrycb">Main entry</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -362,7 +362,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="applytoallcb">
-                        <property name="label" translatable="yes">Apply to all similar texts</property>
+                        <property name="label" translatable="yes" context="indexentry|applytoallcb">Apply to all similar texts</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -377,7 +377,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="searchcasesensitivecb">
-                        <property name="label" translatable="yes">Match case</property>
+                        <property name="label" translatable="yes" context="indexentry|searchcasesensitivecb">Match case</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -393,7 +393,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="searchcasewordonlycb">
-                        <property name="label" translatable="yes">Whole words only</property>
+                        <property name="label" translatable="yes" context="indexentry|searchcasewordonlycb">Whole words only</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -413,7 +413,7 @@
                         <property name="no_show_all">True</property>
                         <property name="margin_left">12</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="label" translatable="yes" context="indexentry|phonetic0ft">Phonetic reading</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">phonetic0ed</property>
                         <property name="xalign">0</property>
@@ -429,7 +429,7 @@
                         <property name="no_show_all">True</property>
                         <property name="margin_left">12</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="label" translatable="yes" context="indexentry|phonetic1ft">Phonetic reading</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">phonetic1ed</property>
                         <property name="xalign">0</property>
@@ -445,7 +445,7 @@
                         <property name="no_show_all">True</property>
                         <property name="margin_left">12</property>
                         <property name="margin_right">6</property>
-                        <property name="label" translatable="yes">Phonetic reading</property>
+                        <property name="label" translatable="yes" context="indexentry|phonetic2ft">Phonetic reading</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">phonetic2ed</property>
                         <property name="xalign">0</property>
@@ -531,7 +531,7 @@
                       <object class="GtkButton" id="sync">
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Update entry from selection</property>
+                        <property name="tooltip_text" translatable="yes" context="indexentry|sync|tooltip_text">Update entry from selection</property>
                         <property name="image">image6</property>
                       </object>
                       <packing>
@@ -594,7 +594,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="indexentry|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/infonotfounddialog.ui b/sw/uiconfig/swriter/ui/infonotfounddialog.ui
index d420d10d0350..d72fa13ea00a 100644
--- a/sw/uiconfig/swriter/ui/infonotfounddialog.ui
+++ b/sw/uiconfig/swriter/ui/infonotfounddialog.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="InfoNotFoundDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Find</property>
+    <property name="title" translatable="yes" context="infonotfounddialog|InfoNotFoundDialog">Find</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">Search key not found.</property>
+    <property name="text" translatable="yes" context="infonotfounddialog|InfoNotFoundDialog">Search key not found.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
index f94720fd065f..e4aa997f110f 100644
--- a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
+++ b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="InfoReadonlyDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Read-Only Content</property>
+    <property name="title" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">Read-Only Content</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">Write-protected content cannot be changed.</property>
-    <property name="secondary_text" translatable="yes">No modifications will be accepted.</property>
+    <property name="text" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">Write-protected content cannot be changed.</property>
+    <property name="secondary_text" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">No modifications will be accepted.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui b/sw/uiconfig/swriter/ui/inputfielddialog.ui
index a46bbb9dffe4..fb599676ce36 100644
--- a/sw/uiconfig/swriter/ui/inputfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InputFieldDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Input Field</property>
+    <property name="title" translatable="yes" context="inputfielddialog|InputFieldDialog">Input Field</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -151,7 +151,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Edit</property>
+                <property name="label" translatable="yes" context="inputfielddialog|label1">Edit</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/inputwinmenu.ui b/sw/uiconfig/swriter/ui/inputwinmenu.ui
index 5a1b3080e62a..0dc3c8d8b42f 100644
--- a/sw/uiconfig/swriter/ui/inputwinmenu.ui
+++ b/sw/uiconfig/swriter/ui/inputwinmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="sum">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sum</property>
+        <property name="label" translatable="yes" context="inputwinmenu|sum">Sum</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="round">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Round</property>
+        <property name="label" translatable="yes" context="inputwinmenu|round">Round</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="phd">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Percent</property>
+        <property name="label" translatable="yes" context="inputwinmenu|phd">Percent</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="sqrt">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Square Root</property>
+        <property name="label" translatable="yes" context="inputwinmenu|sqrt">Square Root</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkMenuItem" id="pow">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Power</property>
+        <property name="label" translatable="yes" context="inputwinmenu|pow">Power</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -49,7 +49,7 @@
       <object class="GtkMenuItem" id="operators">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Operators</property>
+        <property name="label" translatable="yes" context="inputwinmenu|operators">Operators</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -59,7 +59,7 @@
               <object class="GtkMenuItem" id="|">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List Separator</property>
+                <property name="label" translatable="yes" context="inputwinmenu||">List Separator</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -67,7 +67,7 @@
               <object class="GtkMenuItem" id="eq">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Equal</property>
+                <property name="label" translatable="yes" context="inputwinmenu|eq">Equal</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -75,7 +75,7 @@
               <object class="GtkMenuItem" id="neq">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Not Equal</property>
+                <property name="label" translatable="yes" context="inputwinmenu|neq">Not Equal</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -83,7 +83,7 @@
               <object class="GtkMenuItem" id="leq">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Less Than or Equal</property>
+                <property name="label" translatable="yes" context="inputwinmenu|leq">Less Than or Equal</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -91,7 +91,7 @@
               <object class="GtkMenuItem" id="geq">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Greater Than or Equal</property>
+                <property name="label" translatable="yes" context="inputwinmenu|geq">Greater Than or Equal</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -99,7 +99,7 @@
               <object class="GtkMenuItem" id="l">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Less</property>
+                <property name="label" translatable="yes" context="inputwinmenu|l">Less</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -107,7 +107,7 @@
               <object class="GtkMenuItem" id="g">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Greater</property>
+                <property name="label" translatable="yes" context="inputwinmenu|g">Greater</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -121,7 +121,7 @@
               <object class="GtkMenuItem" id="or">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Boolean Or</property>
+                <property name="label" translatable="yes" context="inputwinmenu|or">Boolean Or</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -129,7 +129,7 @@
               <object class="GtkMenuItem" id="xor">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Boolean Xor</property>
+                <property name="label" translatable="yes" context="inputwinmenu|xor">Boolean Xor</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -137,7 +137,7 @@
               <object class="GtkMenuItem" id="and">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Boolean And</property>
+                <property name="label" translatable="yes" context="inputwinmenu|and">Boolean And</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -145,7 +145,7 @@
               <object class="GtkMenuItem" id="not">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Boolean Not</property>
+                <property name="label" translatable="yes" context="inputwinmenu|not">Boolean Not</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -157,7 +157,7 @@
       <object class="GtkMenuItem" id="statistics">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Statistical Functions</property>
+        <property name="label" translatable="yes" context="inputwinmenu|statistics">Statistical Functions</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -167,7 +167,7 @@
               <object class="GtkMenuItem" id="mean">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Mean</property>
+                <property name="label" translatable="yes" context="inputwinmenu|mean">Mean</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -175,7 +175,7 @@
               <object class="GtkMenuItem" id="min">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Minimum</property>
+                <property name="label" translatable="yes" context="inputwinmenu|min">Minimum</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -183,7 +183,7 @@
               <object class="GtkMenuItem" id="max">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Maximum</property>
+                <property name="label" translatable="yes" context="inputwinmenu|max">Maximum</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -195,7 +195,7 @@
       <object class="GtkMenuItem" id="functions">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Functions</property>
+        <property name="label" translatable="yes" context="inputwinmenu|functions">Functions</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -205,7 +205,7 @@
               <object class="GtkMenuItem" id="sin">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sine</property>
+                <property name="label" translatable="yes" context="inputwinmenu|sin">Sine</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -213,7 +213,7 @@
               <object class="GtkMenuItem" id="cos">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Cosine</property>
+                <property name="label" translatable="yes" context="inputwinmenu|cos">Cosine</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -221,7 +221,7 @@
               <object class="GtkMenuItem" id="tag">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tangent</property>
+                <property name="label" translatable="yes" context="inputwinmenu|tag">Tangent</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -229,7 +229,7 @@
               <object class="GtkMenuItem" id="asin">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Arcsine</property>
+                <property name="label" translatable="yes" context="inputwinmenu|asin">Arcsine</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -237,7 +237,7 @@
               <object class="GtkMenuItem" id="acos">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Arccosine</property>
+                <property name="label" translatable="yes" context="inputwinmenu|acos">Arccosine</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -245,7 +245,7 @@
               <object class="GtkMenuItem" id="atan">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Arctangent</property>
+                <property name="label" translatable="yes" context="inputwinmenu|atan">Arctangent</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/sw/uiconfig/swriter/ui/insertautotextdialog.ui b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
index 9a491e89c412..8c818fc16e13 100644
--- a/sw/uiconfig/swriter/ui/insertautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertAutoTextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert AutoText</property>
+    <property name="title" translatable="yes" context="insertautotextdialog|InsertAutoTextDialog">Insert AutoText</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -101,7 +101,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Autotexts for Shortcut </property>
+                <property name="label" translatable="yes" context="insertautotextdialog|label1">Autotexts for Shortcut </property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index 412dfe620be1..f9b9a7ddb879 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertBookmarkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Bookmark</property>
+    <property name="title" translatable="yes" context="insertbookmark|InsertBookmarkDialog">Bookmark</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -37,7 +37,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="insert">
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes" context="insertbookmark|insert">Insert</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
@@ -119,7 +119,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="rename">
-                    <property name="label" translatable="yes">Rename</property>
+                    <property name="label" translatable="yes" context="insertbookmark|rename">Rename</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -132,7 +132,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="delete">
-                    <property name="label" translatable="yes">Delete</property>
+                    <property name="label" translatable="yes" context="insertbookmark|delete">Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -145,7 +145,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="goto">
-                    <property name="label" translatable="yes">Go to</property>
+                    <property name="label" translatable="yes" context="insertbookmark|goto">Go to</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 942ca58b0d1d..1a163aa803dc 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">9999</property>
@@ -15,14 +15,14 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">[None]</col>
+        <col id="0" translatable="yes" context="insertbreak|liststore1">[None]</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="BreakDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Break</property>
+    <property name="title" translatable="yes" context="insertbreak|BreakDialog">Insert Break</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -107,7 +107,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="linerb">
-                        <property name="label" translatable="yes">Line break</property>
+                        <property name="label" translatable="yes" context="insertbreak|linerb">Line break</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="columnrb">
-                        <property name="label" translatable="yes">Column break</property>
+                        <property name="label" translatable="yes" context="insertbreak|columnrb">Column break</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -141,7 +141,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="pagerb">
-                        <property name="label" translatable="yes">Page break</property>
+                        <property name="label" translatable="yes" context="insertbreak|pagerb">Page break</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -161,7 +161,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_top">6</property>
-                        <property name="label" translatable="yes">Style:</property>
+                        <property name="label" translatable="yes" context="insertbreak|styleft">Style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">stylelb</property>
                         <property name="xalign">0</property>
@@ -186,7 +186,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="pagenumcb">
-                        <property name="label" translatable="yes">Change page number</property>
+                        <property name="label" translatable="yes" context="insertbreak|pagenumcb">Change page number</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -212,7 +212,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="pagenumsb-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Change page number</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="insertbreak|pagenumsb-atkobject">Change page number</property>
                           </object>
                         </child>
                       </object>
@@ -230,7 +230,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="insertbreak|label1">Type</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index 9cdac6abf6de..ceea97277ba4 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="InsertCaptionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Caption</property>
+    <property name="title" translatable="yes" context="insertcaption|InsertCaptionDialog">Insert Caption</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -48,7 +48,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Caption</property>
+                    <property name="label" translatable="yes" context="insertcaption|label1">Caption</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -86,7 +86,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Numbering:</property>
+                            <property name="label" translatable="yes" context="insertcaption|numbering_label">Numbering:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numbering</property>
                           </object>
@@ -100,7 +100,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Separator:</property>
+                            <property name="label" translatable="yes" context="insertcaption|separator_label">Separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">separator_edit</property>
                           </object>
@@ -114,7 +114,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Position:</property>
+                            <property name="label" translatable="yes" context="insertcaption|position_label">Position:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">position</property>
                           </object>
@@ -140,7 +140,7 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="invisible_char">•</property>
-                            <property name="text" translatable="yes">: </property>
+                            <property name="text" translatable="yes" context="insertcaption|separator_edit">: </property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -152,7 +152,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Numbering separator:</property>
+                            <property name="label" translatable="yes" context="insertcaption|num_separator">Numbering separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">num_separator_edit</property>
                           </object>
@@ -167,7 +167,7 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="invisible_char">•</property>
-                            <property name="text" translatable="yes">. </property>
+                            <property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -190,7 +190,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Category:</property>
+                            <property name="label" translatable="yes" context="insertcaption|label4">Category:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">category</property>
                           </object>
@@ -223,7 +223,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Properties</property>
+                    <property name="label" translatable="yes" context="insertcaption|label2">Properties</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -261,7 +261,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Preview</property>
+                    <property name="label" translatable="yes" context="insertcaption|label3">Preview</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -332,7 +332,7 @@
             </child>
             <child>
               <object class="GtkButton" id="auto">
-                <property name="label" translatable="yes">Auto...</property>
+                <property name="label" translatable="yes" context="insertcaption|auto">Auto...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -345,7 +345,7 @@
             </child>
             <child>
               <object class="GtkButton" id="options">
-                <property name="label" translatable="yes">Options...</property>
+                <property name="label" translatable="yes" context="insertcaption|options">Options...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -388,7 +388,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">[None]</col>
+        <col id="0" translatable="yes" context="insertcaption|liststore1">[None]</col>
       </row>
     </data>
   </object>
diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
index 59b863b5d0e8..a1fe06e5fcf9 100644
--- a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="image1">
@@ -31,7 +31,7 @@
   <object class="GtkDialog" id="InsertDbColumnsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Database Columns</property>
+    <property name="title" translatable="yes" context="insertdbcolumnsdialog|InsertDbColumnsDialog">Insert Database Columns</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -113,7 +113,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Insert data as:</property>
+                    <property name="label" translatable="yes" context="insertdbcolumnsdialog|label1">Insert data as:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">grid3</property>
                   </object>
@@ -130,7 +130,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="astable">
-                        <property name="label" translatable="yes">T_able</property>
+                        <property name="label" translatable="yes" context="insertdbcolumnsdialog|astable">T_able</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -147,7 +147,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="asfields">
-                        <property name="label" translatable="yes">_Fields</property>
+                        <property name="label" translatable="yes" context="insertdbcolumnsdialog|asfields">_Fields</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -163,7 +163,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="astext">
-                        <property name="label" translatable="yes">_Text</property>
+                        <property name="label" translatable="yes" context="insertdbcolumnsdialog|astext">_Text</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Database _columns</property>
+                            <property name="label" translatable="yes" context="insertdbcolumnsdialog|label4">Database _columns</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">box2</property>
                           </object>
@@ -230,7 +230,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Tab_le column(s)</property>
+                            <property name="label" translatable="yes" context="insertdbcolumnsdialog|tablecolft">Tab_le column(s)</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">tablecols:border</property>
                           </object>
@@ -467,7 +467,7 @@
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="tableheading">
-                                <property name="label" translatable="yes">Insert table heading</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableheading">Insert table heading</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -482,7 +482,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="columnname">
-                                <property name="label" translatable="yes">Apply column _name</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|columnname">Apply column _name</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -499,7 +499,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="rowonly">
-                                <property name="label" translatable="yes">Create row only</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|rowonly">Create row only</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -516,7 +516,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="tableformat">
-                                <property name="label" translatable="yes">Pr_operties...</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableformat">Pr_operties...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -529,7 +529,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="autoformat">
-                                <property name="label" translatable="yes">Aut_oFormat...</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|autoformat">Aut_oFormat...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -545,7 +545,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Paragraph _style:</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|parastylelabel">Paragraph _style:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">parastyle</property>
                               </object>
@@ -584,7 +584,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="fromdatabase">
-                                <property name="label" translatable="yes">From _database</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|fromdatabase">From _database</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -601,7 +601,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="userdefined">
-                                <property name="label" translatable="yes">_User-defined</property>
+                                <property name="label" translatable="yes" context="insertdbcolumnsdialog|userdefined">_User-defined</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -646,7 +646,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="insertdbcolumnsdialog|label3">Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index fb71d0a1b537..8a3979a5a55a 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="InsertFootnoteDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Footnote/Endnote</property>
+    <property name="title" translatable="yes" context="insertfootnote|InsertFootnoteDialog">Insert Footnote/Endnote</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -140,7 +140,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="automatic">
-                            <property name="label" translatable="yes">Automatic</property>
+                            <property name="label" translatable="yes" context="insertfootnote|automatic">Automatic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="character">
-                            <property name="label" translatable="yes">Character</property>
+                            <property name="label" translatable="yes" context="insertfootnote|character">Character</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -190,7 +190,7 @@
                             </accessibility>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="characterentry-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Character</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="insertfootnote|characterentry-atkobject">Character</property>
                               </object>
                             </child>
                           </object>
@@ -201,7 +201,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="choosecharacter">
-                            <property name="label" translatable="yes">Choose…</property>
+                            <property name="label" translatable="yes" context="insertfootnote|choosecharacter">Choose…</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -221,7 +221,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Numbering</property>
+                    <property name="label" translatable="yes" context="insertfootnote|label1">Numbering</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -254,7 +254,7 @@
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="footnote">
-                            <property name="label" translatable="yes">Footnote</property>
+                            <property name="label" translatable="yes" context="insertfootnote|footnote">Footnote</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -272,7 +272,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="endnote">
-                            <property name="label" translatable="yes">Endnote</property>
+                            <property name="label" translatable="yes" context="insertfootnote|endnote">Endnote</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -295,7 +295,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Type</property>
+                    <property name="label" translatable="yes" context="insertfootnote|label2">Type</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/insertscript.ui b/sw/uiconfig/swriter/ui/insertscript.ui
index e609ceea3cdd..8d825ec1c4e7 100644
--- a/sw/uiconfig/swriter/ui/insertscript.ui
+++ b/sw/uiconfig/swriter/ui/insertscript.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="InsertScriptDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Script</property>
+    <property name="title" translatable="yes" context="insertscript|InsertScriptDialog">Insert Script</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -33,7 +33,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Script type:</property>
+                <property name="label" translatable="yes" context="insertscript|label1">Script type:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -45,7 +45,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">•</property>
-                <property name="text" translatable="yes">JavaScript</property>
+                <property name="text" translatable="yes" context="insertscript|scripttype">JavaScript</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -55,7 +55,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="url">
-                <property name="label" translatable="yes">URL:</property>
+                <property name="label" translatable="yes" context="insertscript|url">URL:</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -83,7 +83,7 @@
             </child>
             <child>
               <object class="GtkButton" id="browse">
-                <property name="label" translatable="yes">Browse…</property>
+                <property name="label" translatable="yes" context="insertscript|browse">Browse…</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -96,7 +96,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="text">
-                <property name="label" translatable="yes">Text:</property>
+                <property name="label" translatable="yes" context="insertscript|text">Text:</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/insertsectiondialog.ui b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
index c98a5ea9296e..d77039761b31 100644
--- a/sw/uiconfig/swriter/ui/insertsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="InsertSectionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Section</property>
+    <property name="title" translatable="yes" context="insertsectiondialog|InsertSectionDialog">Insert Section</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Insert</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|ok">_Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="section">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Section</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|section">Section</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|columns">Columns</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="indents">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|indents">Indents</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="notes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footnotes/Endnotes</property>
+                <property name="label" translatable="yes" context="insertsectiondialog|notes">Footnotes/Endnotes</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index b0f6ffb5fd69..f02c02f1d992 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="InsertTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Insert Table</property>
+    <property name="title" translatable="yes" context="inserttable|InsertTableDialog">Insert Table</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -25,7 +25,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="inserttable|ok">Insert</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -120,7 +120,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Name:</property>
+                            <property name="label" translatable="yes" context="inserttable|label3">_Name:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">nameedit</property>
                             <property name="xalign">0</property>
@@ -134,7 +134,7 @@
                           <object class="GtkLabel" id="3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Columns:</property>
+                            <property name="label" translatable="yes" context="inserttable|3">_Columns:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">colspin</property>
                             <property name="xalign">0</property>
@@ -163,7 +163,7 @@
                           <object class="GtkLabel" id="4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Rows:</property>
+                            <property name="label" translatable="yes" context="inserttable|4">_Rows:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">rowspin</property>
                             <property name="xalign">1</property>
@@ -196,7 +196,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">General</property>
+                    <property name="label" translatable="yes" context="inserttable|label1">General</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -229,7 +229,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="headercb">
-                            <property name="label" translatable="yes">Hea_ding</property>
+                            <property name="label" translatable="yes" context="inserttable|headercb">Hea_ding</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -244,7 +244,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="repeatcb">
-                            <property name="label" translatable="yes">Repeat heading rows on new _pages</property>
+                            <property name="label" translatable="yes" context="inserttable|repeatcb">Repeat heading rows on new _pages</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -262,7 +262,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="bordercb">
-                            <property name="label" translatable="yes">_Border</property>
+                            <property name="label" translatable="yes" context="inserttable|bordercb">_Border</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -278,7 +278,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="dontsplitcb">
-                            <property name="label" translatable="yes">Don’t _split table over pages</property>
+                            <property name="label" translatable="yes" context="inserttable|dontsplitcb">Don’t _split table over pages</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -317,7 +317,7 @@
                               <object class="GtkLabel" id="repeatheaderafter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Heading ro_ws:</property>
+                                <property name="label" translatable="yes" context="inserttable|repeatheaderafter">Heading ro_ws:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">repeatheaderspin</property>
                               </object>
@@ -334,7 +334,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="autoformat">
-                            <property name="label" translatable="yes">Auto_Format</property>
+                            <property name="label" translatable="yes" context="inserttable|autoformat">Auto_Format</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -356,7 +356,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="inserttable|label2">Options</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/labeldialog.ui b/sw/uiconfig/swriter/ui/labeldialog.ui
index 5b76b4488068..04d47b715e36 100644
--- a/sw/uiconfig/swriter/ui/labeldialog.ui
+++ b/sw/uiconfig/swriter/ui/labeldialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LabelDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Labels</property>
+    <property name="title" translatable="yes" context="labeldialog|LabelDialog">Labels</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -19,7 +19,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_New Document</property>
+                <property name="label" translatable="yes" context="labeldialog|ok">_New Document</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="medium">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Medium</property>
+                <property name="label" translatable="yes" context="labeldialog|medium">Medium</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="labels">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Labels</property>
+                <property name="label" translatable="yes" context="labeldialog|labels">Labels</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="cards">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Business Cards</property>
+                <property name="label" translatable="yes" context="labeldialog|cards">Business Cards</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="private">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Private</property>
+                <property name="label" translatable="yes" context="labeldialog|private">Private</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="business">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Business</property>
+                <property name="label" translatable="yes" context="labeldialog|business">Business</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="format">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Format</property>
+                <property name="label" translatable="yes" context="labeldialog|format">Format</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="labeldialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/labelformatpage.ui b/sw/uiconfig/swriter/ui/labelformatpage.ui
index 2ed1680b0ac2..22d4d1b5569d 100644
--- a/sw/uiconfig/swriter/ui/labelformatpage.ui
+++ b/sw/uiconfig/swriter/ui/labelformatpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -26,7 +26,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Hori_zontal pitch:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label1">Hori_zontal pitch:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">hori:0.00cm</property>
           </object>
@@ -40,7 +40,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Vertical pitch:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label2">_Vertical pitch:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">vert:0.00cm</property>
           </object>
@@ -54,7 +54,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Width:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label3">_Width:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">width:0.00cm</property>
           </object>
@@ -68,7 +68,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Height:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label4">_Height:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">height:0.00cm</property>
           </object>
@@ -82,7 +82,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Left margin:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label5">_Left margin:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">left:0.00cm</property>
           </object>
@@ -96,7 +96,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Top margin:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label6">_Top margin:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">top:0.00cm</property>
           </object>
@@ -110,7 +110,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Columns:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label7">_Columns:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">cols</property>
           </object>
@@ -124,7 +124,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">R_ows:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label8">R_ows:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">rows</property>
           </object>
@@ -138,7 +138,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">P_age width:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label9">P_age width:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">pagewidth:0.00cm</property>
           </object>
@@ -152,7 +152,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pa_ge height:</property>
+            <property name="label" translatable="yes" context="labelformatpage|label10">Pa_ge height:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">pageheight:0.00cm</property>
           </object>
@@ -163,7 +163,7 @@
         </child>
         <child>
           <object class="GtkButton" id="save">
-            <property name="label" translatable="yes">_Save...</property>
+            <property name="label" translatable="yes" context="labelformatpage|save">_Save...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/labeloptionspage.ui b/sw/uiconfig/swriter/ui/labeloptionspage.ui
index bee63612aded..9930e2adcbe5 100644
--- a/sw/uiconfig/swriter/ui/labeloptionspage.ui
+++ b/sw/uiconfig/swriter/ui/labeloptionspage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -34,7 +34,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="entirepage">
-                    <property name="label" translatable="yes">_Entire page</property>
+                    <property name="label" translatable="yes" context="labeloptionspage|entirepage">_Entire page</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -53,7 +53,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="singlelabel">
-                    <property name="label" translatable="yes">_Single label</property>
+                    <property name="label" translatable="yes" context="labeloptionspage|singlelabel">_Single label</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -85,7 +85,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Colu_mn</property>
+                            <property name="label" translatable="yes" context="labeloptionspage|label4">Colu_mn</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">cols</property>
                           </object>
@@ -128,7 +128,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Ro_w</property>
+                            <property name="label" translatable="yes" context="labeloptionspage|label5">Ro_w</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">rows</property>
                           </object>
@@ -171,7 +171,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="synchronize">
-                    <property name="label" translatable="yes">Synchroni_ze contents</property>
+                    <property name="label" translatable="yes" context="labeloptionspage|synchronize">Synchroni_ze contents</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -194,7 +194,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Distribute</property>
+            <property name="label" translatable="yes" context="labeloptionspage|label1">Distribute</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -229,7 +229,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkButton" id="setup">
-                    <property name="label" translatable="yes">Setup...</property>
+                    <property name="label" translatable="yes" context="labeloptionspage|setup">Setup...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -248,7 +248,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Printer Name</property>
+                    <property name="label" translatable="yes" context="labeloptionspage|printername">Printer Name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">setup</property>
                   </object>
@@ -267,7 +267,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Printer</property>
+            <property name="label" translatable="yes" context="labeloptionspage|label2">Printer</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui
index b37239aa85b3..102ba25c4ccc 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="intervaladjustment">
@@ -23,16 +23,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="linenumbering|positionstore">Left</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="linenumbering|positionstore">Right</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Inner</col>
+        <col id="0" translatable="yes" context="linenumbering|positionstore">Inner</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Outer</col>
+        <col id="0" translatable="yes" context="linenumbering|positionstore">Outer</col>
       </row>
     </data>
   </object>
@@ -45,7 +45,7 @@
   <object class="GtkDialog" id="LineNumberingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Line Numbering</property>
+    <property name="title" translatable="yes" context="linenumbering|LineNumberingDialog">Line Numbering</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -116,7 +116,7 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="shownumbering">
-                <property name="label" translatable="yes">Show numbering</property>
+                <property name="label" translatable="yes" context="linenumbering|shownumbering">Show numbering</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -159,7 +159,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Character style:</property>
+                                <property name="label" translatable="yes" context="linenumbering|characterstyle">Character style:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">styledropdown</property>
                               </object>
@@ -173,7 +173,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Format:</property>
+                                <property name="label" translatable="yes" context="linenumbering|format">Format:</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -185,7 +185,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Position:</property>
+                                <property name="label" translatable="yes" context="linenumbering|position">Position:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">positiondropdown</property>
                               </object>
@@ -199,7 +199,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Spacing:</property>
+                                <property name="label" translatable="yes" context="linenumbering|spacing">Spacing:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">spacingspin:0.00cm</property>
                               </object>
@@ -213,7 +213,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Interval:</property>
+                                <property name="label" translatable="yes" context="linenumbering|interval">Interval:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">intervalspin</property>
                               </object>
@@ -298,7 +298,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">lines</property>
+                                    <property name="label" translatable="yes" context="linenumbering|intervallines">lines</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -321,7 +321,7 @@
                       <object class="GtkLabel" id="view">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">View</property>
+                        <property name="label" translatable="yes" context="linenumbering|view">View</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -362,7 +362,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Text:</property>
+                                    <property name="label" translatable="yes" context="linenumbering|text">Text:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">textentry</property>
                                   </object>
@@ -376,7 +376,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Every:</property>
+                                    <property name="label" translatable="yes" context="linenumbering|every">Every:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">linesspin</property>
                                   </object>
@@ -403,7 +403,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">lines</property>
+                                    <property name="label" translatable="yes" context="linenumbering|lines">lines</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -430,7 +430,7 @@
                           <object class="GtkLabel" id="separator">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Separator</property>
+                            <property name="label" translatable="yes" context="linenumbering|separator">Separator</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -463,7 +463,7 @@
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="blanklines">
-                                    <property name="label" translatable="yes">Blank lines</property>
+                                    <property name="label" translatable="yes" context="linenumbering|blanklines">Blank lines</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -479,7 +479,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="linesintextframes">
-                                    <property name="label" translatable="yes">Lines in text frames</property>
+                                    <property name="label" translatable="yes" context="linenumbering|linesintextframes">Lines in text frames</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -494,7 +494,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="showfooterheadernumbering">
-                                    <property name="label" translatable="yes">Include header and footer</property>
+                                    <property name="label" translatable="yes" context="linenumbering|showfooterheadernumbering">Include header and footer</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -509,7 +509,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="restarteverynewpage">
-                                    <property name="label" translatable="yes">Restart every new page</property>
+                                    <property name="label" translatable="yes" context="linenumbering|restarteverynewpage">Restart every new page</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -531,7 +531,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="ypad">1</property>
-                            <property name="label" translatable="yes">Count</property>
+                            <property name="label" translatable="yes" context="linenumbering|count">Count</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 0d452812f239..2544a7dcf051 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -82,7 +82,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Your name:</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|displayname_label">_Your name:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">displayname</property>
                   </object>
@@ -96,7 +96,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_E-mail address:</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|address_label">_E-mail address:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">address</property>
                   </object>
@@ -107,7 +107,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="replytocb">
-                    <property name="label" translatable="yes">Send replies to _different e-mail address</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different e-mail address</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -126,7 +126,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">_Reply address:</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|replyto_label">_Reply address:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">replyto</property>
                   </object>
@@ -143,7 +143,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">User Information</property>
+            <property name="label" translatable="yes" context="mailconfigpage|label1">User Information</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -181,7 +181,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="secure">
-                    <property name="label" translatable="yes">_Use secure connection (SSL)</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|secure">_Use secure connection (SSL)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -219,7 +219,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">_Server name:</property>
+                        <property name="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">server</property>
                       </object>
@@ -233,7 +233,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">_Port:</property>
+                        <property name="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">port</property>
                       </object>
@@ -271,7 +271,7 @@
                     <property name="layout_style">center</property>
                     <child>
                       <object class="GtkButton" id="serverauthentication">
-                        <property name="label" translatable="yes">Ser_ver Authentication…</property>
+                        <property name="label" translatable="yes" context="mailconfigpage|serverauthentication">Ser_ver Authentication…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -297,7 +297,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Outgoing Server (SMTP) Settings</property>
+            <property name="label" translatable="yes" context="mailconfigpage|label2">Outgoing Server (SMTP) Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -319,7 +319,7 @@
         <property name="layout_style">center</property>
         <child>
           <object class="GtkButton" id="test">
-            <property name="label" translatable="yes">_Test Settings</property>
+            <property name="label" translatable="yes" context="mailconfigpage|test">_Test Settings</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui
index 05fce81e1121..bc6bfbd90701 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -9,7 +9,7 @@
   <object class="GtkDialog" id="MailmergeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Mail Merge</property>
+    <property name="title" translatable="yes" context="mailmerge|MailmergeDialog">Mail Merge</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -128,7 +128,7 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="all">
-                                <property name="label" translatable="yes">_All</property>
+                                <property name="label" translatable="yes" context="mailmerge|all">_All</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -146,7 +146,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="selected">
-                                <property name="label" translatable="yes">_Selected records</property>
+                                <property name="label" translatable="yes" context="mailmerge|selected">_Selected records</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -169,7 +169,7 @@
                                 <property name="spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="rbfrom">
-                                    <property name="label" translatable="yes">_From:</property>
+                                    <property name="label" translatable="yes" context="mailmerge|rbfrom">_From:</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -203,7 +203,7 @@
                                   <object class="GtkLabel" id="label3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_To:</property>
+                                    <property name="label" translatable="yes" context="mailmerge|label3">_To:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">to</property>
                                   </object>
@@ -242,7 +242,7 @@
                       <object class="GtkLabel" id="recordslabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Records</property>
+                        <property name="label" translatable="yes" context="mailmerge|recordslabel">Records</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -282,7 +282,7 @@
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="printer">
-                                    <property name="label" translatable="yes">_Printer</property>
+                                    <property name="label" translatable="yes" context="mailmerge|printer">_Printer</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -300,7 +300,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="electronic">
-                                    <property name="label" translatable="yes">_Electronic</property>
+                                    <property name="label" translatable="yes" context="mailmerge|electronic">_Electronic</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -318,7 +318,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="file">
-                                    <property name="label" translatable="yes">File</property>
+                                    <property name="label" translatable="yes" context="mailmerge|file">File</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -342,7 +342,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="singlejobs">
-                                <property name="label" translatable="yes">_Single print jobs</property>
+                                <property name="label" translatable="yes" context="mailmerge|singlejobs">_Single print jobs</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -391,7 +391,7 @@
                                                 <property name="column_spacing">6</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="generate">
-                                                    <property name="label" translatable="yes">Generate file name from _database</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|generate">Generate file name from _database</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -412,7 +412,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Field:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|fieldlabel">Field:</property>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">0</property>
@@ -425,7 +425,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">_Path:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|pathlabel">_Path:</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="mnemonic_widget">path</property>
                                                   </object>
@@ -440,7 +440,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">F_ile format:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="mnemonic_widget">fileformat</property>
                                                   </object>
@@ -503,7 +503,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">_Subject:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|subjectlabel">_Subject:</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="mnemonic_widget">subject</property>
                                                   </object>
@@ -531,7 +531,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Attachments:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property>
                                                     <property name="mnemonic_widget">attachments</property>
                                                   </object>
                                                   <packing>
@@ -573,7 +573,7 @@
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
                                                     <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">Mail format:</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">0</property>
@@ -593,7 +593,7 @@
                                                 </child>
                                                 <child>
                                                   <object class="GtkCheckButton" id="html">
-                                                    <property name="label" translatable="yes">HTM_L</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|html">HTM_L</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
@@ -610,7 +610,7 @@
                                                 </child>
                                                 <child>
                                                   <object class="GtkCheckButton" id="rtf">
-                                                    <property name="label" translatable="yes">RT_F</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|rtf">RT_F</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
@@ -627,7 +627,7 @@
                                                 </child>
                                                 <child>
                                                   <object class="GtkCheckButton" id="swriter">
-                                                    <property name="label" translatable="yes">%PRODUCTNAME Writer</property>
+                                                    <property name="label" translatable="yes" context="mailmerge|swriter">%PRODUCTNAME Writer</property>
                                                     <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
@@ -677,7 +677,7 @@
                                             <property name="spacing">6</property>
                                             <child>
                                               <object class="GtkRadioButton" id="singledocument">
-                                                <property name="label" translatable="yes">S_ave as single document</property>
+                                                <property name="label" translatable="yes" context="mailmerge|singledocument">S_ave as single document</property>
                                                 <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
@@ -695,7 +695,7 @@
                                             </child>
                                             <child>
                                               <object class="GtkRadioButton" id="individualdocuments">
-                                                <property name="label" translatable="yes">Sa_ve as individual documents</property>
+                                                <property name="label" translatable="yes" context="mailmerge|individualdocuments">Sa_ve as individual documents</property>
                                                 <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
@@ -721,7 +721,7 @@
                                   <object class="GtkLabel" id="savemergeddoclabel">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Save Merged Document</property>
+                                    <property name="label" translatable="yes" context="mailmerge|savemergeddoclabel">Save Merged Document</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
@@ -742,7 +742,7 @@
                       <object class="GtkLabel" id="outputlabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Output</property>
+                        <property name="label" translatable="yes" context="mailmerge|outputlabel">Output</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sw/uiconfig/swriter/ui/mailmergedialog.ui b/sw/uiconfig/swriter/ui/mailmergedialog.ui
index 2de61acbe95c..8ec1e747630c 100644
--- a/sw/uiconfig/swriter/ui/mailmergedialog.ui
+++ b/sw/uiconfig/swriter/ui/mailmergedialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MailMergeDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Mail Merge</property>
+    <property name="title" translatable="yes" context="mailmergedialog|MailMergeDialog">Mail Merge</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="document">
-                        <property name="label" translatable="yes">From this _document</property>
+                        <property name="label" translatable="yes" context="mailmergedialog|document">From this _document</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="template">
-                        <property name="label" translatable="yes">From a _template</property>
+                        <property name="label" translatable="yes" context="mailmergedialog|template">From a _template</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -133,7 +133,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Create</property>
+                <property name="label" translatable="yes" context="mailmergedialog|label1">Create</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui b/sw/uiconfig/swriter/ui/managechangessidebar.ui
index 1cb777a04c4a..486cf4f1a1e9 100644
--- a/sw/uiconfig/swriter/ui/managechangessidebar.ui
+++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="ManageChangesPanel">
     <property name="visible">True</property>
@@ -45,7 +45,7 @@
                 <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkButton" id="accept">
-                    <property name="label" translatable="yes">_Accept</property>
+                    <property name="label" translatable="yes" context="managechangessidebar|accept">_Accept</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="reject">
-                    <property name="label" translatable="yes">_Reject</property>
+                    <property name="label" translatable="yes" context="managechangessidebar|reject">_Reject</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -77,7 +77,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="acceptall">
-                    <property name="label" translatable="yes">A_ccept All</property>
+                    <property name="label" translatable="yes" context="managechangessidebar|acceptall">A_ccept All</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -93,7 +93,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="rejectall">
-                    <property name="label" translatable="yes">R_eject All</property>
+                    <property name="label" translatable="yes" context="managechangessidebar|rejectall">R_eject All</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -156,14 +156,14 @@
       <object class="GtkMenuItem" id="writeredit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit Comment...</property>
+        <property name="label" translatable="yes" context="managechangessidebar|writeredit">Edit Comment...</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="writersort">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Sort By</property>
+        <property name="label" translatable="yes" context="managechangessidebar|writersort">Sort By</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -173,7 +173,7 @@
               <object class="GtkRadioMenuItem" id="writeraction">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Action</property>
+                <property name="label" translatable="yes" context="managechangessidebar|writeraction">Action</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -181,7 +181,7 @@
               <object class="GtkRadioMenuItem" id="writerauthor">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Author</property>
+                <property name="label" translatable="yes" context="managechangessidebar|writerauthor">Author</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -189,7 +189,7 @@
               <object class="GtkRadioMenuItem" id="writerdate">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Date</property>
+                <property name="label" translatable="yes" context="managechangessidebar|writerdate">Date</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -197,7 +197,7 @@
               <object class="GtkRadioMenuItem" id="writerdesc">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Comment</property>
+                <property name="label" translatable="yes" context="managechangessidebar|writerdesc">Comment</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -205,7 +205,7 @@
               <object class="GtkRadioMenuItem" id="writerposition">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Document Position</property>
+                <property name="label" translatable="yes" context="managechangessidebar|writerposition">Document Position</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
diff --git a/sw/uiconfig/swriter/ui/mergeconnectdialog.ui b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
index 71a8cc11cadb..da09f324c1d2 100644
--- a/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
+++ b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MergeConnectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Source Connection</property>
+    <property name="title" translatable="yes" context="mergeconnectdialog|MergeConnectDialog">Data Source Connection</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="existing">
-                        <property name="label" translatable="yes">_Use existing</property>
+                        <property name="label" translatable="yes" context="mergeconnectdialog|existing">_Use existing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="new">
-                        <property name="label" translatable="yes">_Create new connection</property>
+                        <property name="label" translatable="yes" context="mergeconnectdialog|new">_Create new connection</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property>
+                        <property name="label" translatable="yes" context="mergeconnectdialog|label2">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">52</property>
                       </object>
@@ -150,7 +150,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Connect</property>
+                <property name="label" translatable="yes" context="mergeconnectdialog|label1">Connect</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/mergetabledialog.ui b/sw/uiconfig/swriter/ui/mergetabledialog.ui
index 9d5ceacaaea7..b2a066776818 100644
--- a/sw/uiconfig/swriter/ui/mergetabledialog.ui
+++ b/sw/uiconfig/swriter/ui/mergetabledialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MergeTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Merge Tables</property>
+    <property name="title" translatable="yes" context="mergetabledialog|MergeTableDialog">Merge Tables</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkRadioButton" id="prev">
-                        <property name="label" translatable="yes">Join with _previous table</property>
+                        <property name="label" translatable="yes" context="mergetabledialog|prev">Join with _previous table</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -106,7 +106,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="next">
-                        <property name="label" translatable="yes">Join with _next table</property>
+                        <property name="label" translatable="yes" context="mergetabledialog|next">Join with _next table</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -130,7 +130,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Mode</property>
+                <property name="label" translatable="yes" context="mergetabledialog|label1">Mode</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
index 76d8980b363e..b9dadcae621e 100644
--- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
+++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="image1">
@@ -59,7 +59,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkButton" id="addresslist">
-                            <property name="label" translatable="yes">Select A_ddress List...</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|addresslist">Select A_ddress List...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -74,7 +74,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="differentlist">
-                            <property name="label" translatable="yes">Select Different A_ddress List...</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|differentlist">Select Different A_ddress List...</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="no_show_all">True</property>
@@ -100,7 +100,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Current address list: %1</property>
+                        <property name="label" translatable="yes" context="mmaddressblockpage|currentaddress">Current address list: %1</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -122,7 +122,7 @@
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Select the address list containing the address data you want to use. This data is needed to create the address block.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|label2">Select the address list containing the address data you want to use. This data is needed to create the address block.</property>
                             <property name="wrap">True</property>
                             <property name="max_width_chars">56</property>
                           </object>
@@ -139,7 +139,7 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">1.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|label3">1.</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -172,7 +172,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkButton" id="assign">
-                        <property name="label" translatable="yes">Match _Fields...</property>
+                        <property name="label" translatable="yes" context="mmaddressblockpage|assign">Match _Fields...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -199,7 +199,7 @@
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Match the field name used in the mail merge to the column headers in your data source.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|label4">Match the field name used in the mail merge to the column headers in your data source.</property>
                             <property name="wrap">True</property>
                             <property name="max_width_chars">56</property>
                           </object>
@@ -216,7 +216,7 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">3.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|settingsft1">3.</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -255,7 +255,7 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">2.</property>
+                        <property name="label" translatable="yes" context="mmaddressblockpage|settingsft">2.</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -266,7 +266,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="address">
-                        <property name="label" translatable="yes">_This document shall contain an address block</property>
+                        <property name="label" translatable="yes" context="mmaddressblockpage|address">_This document shall contain an address block</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -304,7 +304,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkButton" id="settings">
-                                    <property name="label" translatable="yes">_More...</property>
+                                    <property name="label" translatable="yes" context="mmaddressblockpage|settings">_More...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -342,7 +342,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="hideempty">
-                                <property name="label" translatable="yes">_Suppress lines with just empty fields</property>
+                                <property name="label" translatable="yes" context="mmaddressblockpage|hideempty">_Suppress lines with just empty fields</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -420,7 +420,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Preview Previous Address Block</property>
+                                    <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|prev|tooltip_text">Preview Previous Address Block</property>
                                     <property name="image">image1</property>
                                   </object>
                                   <packing>
@@ -435,7 +435,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="tooltip_text" translatable="yes">Preview Next Address Block</property>
+                                    <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|next|tooltip_text">Preview Next Address Block</property>
                                     <property name="image">image2</property>
                                   </object>
                                   <packing>
@@ -451,7 +451,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
                                     <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">Document: %1</property>
+                                    <property name="label" translatable="yes" context="mmaddressblockpage|documentindex">Document: %1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -491,7 +491,7 @@
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">Check if the address data matches correctly.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|label6">Check if the address data matches correctly.</property>
                             <property name="wrap">True</property>
                             <property name="max_width_chars">56</property>
                           </object>
@@ -508,7 +508,7 @@
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">4.</property>
+                            <property name="label" translatable="yes" context="mmaddressblockpage|settingsft2">4.</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -541,7 +541,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insert Address Block</property>
+            <property name="label" translatable="yes" context="mmaddressblockpage|label1">Insert Address Block</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
index 6572c8ce965c..43cc183b1f66 100644
--- a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MMCreatingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Mail Merge</property>
+    <property name="title" translatable="yes" context="mmcreatingdialog|MMCreatingDialog">Mail Merge</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -49,7 +49,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Status:</property>
+                <property name="label" translatable="yes" context="mmcreatingdialog|label1">Status:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -63,7 +63,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Progress:</property>
+                <property name="label" translatable="yes" context="mmcreatingdialog|label2">Progress:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -77,7 +77,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Creating documents...</property>
+                <property name="label" translatable="yes" context="mmcreatingdialog|label3">Creating documents...</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -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">%X of %Y</property>
+                <property name="label" translatable="yes" context="mmcreatingdialog|progress">%X of %Y</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/mmlayoutpage.ui b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
index 1d7eac2c47dd..cd00c937a249 100644
--- a/sw/uiconfig/swriter/ui/mmlayoutpage.ui
+++ b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">999.99000000000001</property>
@@ -71,7 +71,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_From top</property>
+                                        <property name="label" translatable="yes" context="mmlayoutpage|label6">_From top</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">top:0.00cm</property>
                                       </object>
@@ -86,7 +86,7 @@
                                       <object class="GtkSpinButton" id="top:0.00cm">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="text" translatable="yes">2.00</property>
+                                        <property name="text" translatable="yes" context="mmlayoutpage|top">2.00</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="digits">2</property>
                                         <property name="value">2</property>
@@ -113,7 +113,7 @@
                                     <property name="row_spacing">6</property>
                                     <child>
                                       <object class="GtkCheckButton" id="align">
-                                        <property name="label" translatable="yes">Align to text body</property>
+                                        <property name="label" translatable="yes" context="mmlayoutpage|align">Align to text body</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                                                 <property name="can_focus">False</property>
                                                 <property name="margin_left">12</property>
                                                 <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">From _left</property>
+                                                <property name="label" translatable="yes" context="mmlayoutpage|leftft">From _left</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="mnemonic_widget">left:0.00cm</property>
                                               </object>
@@ -202,7 +202,7 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Address Block Position</property>
+                            <property name="label" translatable="yes" context="mmlayoutpage|label2">Address Block Position</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -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">Move</property>
+                                    <property name="label" translatable="yes" context="mmlayoutpage|label4">Move</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">up</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">Move</property>
+                                    <property name="label" translatable="yes" context="mmlayoutpage|label5">Move</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">down</property>
                                   </object>
@@ -268,7 +268,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="up">
-                                    <property name="label" translatable="yes">_Up</property>
+                                    <property name="label" translatable="yes" context="mmlayoutpage|up">_Up</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -283,7 +283,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="down">
-                                    <property name="label" translatable="yes">_Down</property>
+                                    <property name="label" translatable="yes" context="mmlayoutpage|down">_Down</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -304,7 +304,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Salutation Position</property>
+                            <property name="label" translatable="yes" context="mmlayoutpage|label3">Salutation Position</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -344,7 +344,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Zoom</property>
+                            <property name="label" translatable="yes" context="mmlayoutpage|label7">_Zoom</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">zoom</property>
                           </object>
@@ -360,7 +360,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <items>
-                              <item translatable="yes">Entire page</item>
+                              <item translatable="yes" context="mmlayoutpage|zoom">Entire page</item>
                             </items>
                           </object>
                           <packing>
@@ -412,7 +412,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Adjust Layout of Address Block and Salutation</property>
+            <property name="label" translatable="yes" context="mmlayoutpage|label1">Adjust Layout of Address Block and Salutation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmmailbody.ui b/sw/uiconfig/swriter/ui/mmmailbody.ui
index 936e09a4521f..fefe074dc481 100644
--- a/sw/uiconfig/swriter/ui/mmmailbody.ui
+++ b/sw/uiconfig/swriter/ui/mmmailbody.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MailBodyDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">E-Mail Message</property>
+    <property name="title" translatable="yes" context="mmmailbody|MailBodyDialog">E-Mail Message</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Write your message here</property>
+                    <property name="label" translatable="yes" context="mmmailbody|bodyft">Write your message here</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">bodymle:border</property>
                   </object>
@@ -129,7 +129,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="greeting">
-                    <property name="label" translatable="yes">This e-mail should contain a salutation</property>
+                    <property name="label" translatable="yes" context="mmmailbody|greeting">This e-mail should contain a salutation</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -161,7 +161,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">General salutation</property>
+                            <property name="label" translatable="yes" context="mmmailbody|generalft">General salutation</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">general</property>
                           </object>
@@ -216,7 +216,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Address list field indicating a female recipient</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|femalefi">Address list field indicating a female recipient</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">0</property>
@@ -230,7 +230,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Female</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|femaleft">_Female</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">female</property>
                                       </object>
@@ -246,7 +246,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Male</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|maleft">_Male</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">male</property>
                                       </object>
@@ -262,7 +262,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Field name</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|femalecolft">Field name</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
@@ -277,7 +277,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Field value</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|femalefieldft">Field value</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
@@ -289,7 +289,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="newfemale">
-                                        <property name="label" translatable="yes">_New...</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|newfemale">_New...</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -306,7 +306,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="newmale">
-                                        <property name="label" translatable="yes">N_ew...</property>
+                                        <property name="label" translatable="yes" context="mmmailbody|newmale">N_ew...</property>
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -401,7 +401,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="personalized">
-                                <property name="label" translatable="yes">Insert personalized salutation</property>
+                                <property name="label" translatable="yes" context="mmmailbody|personalized">Insert personalized salutation</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
index 2f5512bcfcb6..7a92cac91c42 100644
--- a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
+++ b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="MMOutputTypePage">
     <property name="visible">True</property>
@@ -42,7 +42,7 @@
                     <property name="vexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property>
+                    <property name="label" translatable="yes" context="mmoutputtypepage|letterft">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">72</property>
                   </object>
@@ -59,7 +59,7 @@
                     <property name="vexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
+                    <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">72</property>
                   </object>
@@ -75,7 +75,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="letter">
-                        <property name="label" translatable="yes">_Letter</property>
+                        <property name="label" translatable="yes" context="mmoutputtypepage|letter">_Letter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -91,7 +91,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="email">
-                        <property name="label" translatable="yes">_E-mail message</property>
+                        <property name="label" translatable="yes" context="mmoutputtypepage|email">_E-mail message</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -131,7 +131,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">What Type of Document Do You Want to Create?</property>
+            <property name="label" translatable="yes" context="mmoutputtypepage|label1">What Type of Document Do You Want to Create?</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
index 61494dffc87a..f268741b5554 100644
--- a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -11,23 +11,23 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">OpenDocument Text</col>
+        <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">OpenDocument Text</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Adobe PDF-Document</col>
+        <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Adobe PDF-Document</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Microsoft Word Document</col>
+        <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Microsoft Word Document</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">HTML Message</col>
+        <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">HTML Message</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Plain Text</col>
+        <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Plain Text</col>
         <col id="1">5</col>
       </row>
     </data>
@@ -35,7 +35,7 @@
   <object class="GtkDialog" id="MMResultEmailDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">E-Mail merged document</property>
+    <property name="title" translatable="yes" context="mmresultemaildialog|MMResultEmailDialog">E-Mail merged document</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -48,7 +48,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Send Documents</property>
+                <property name="label" translatable="yes" context="mmresultemaildialog|ok">Send Documents</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -130,7 +130,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">T_o</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|mailtoft">T_o</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mailto</property>
                           </object>
@@ -152,7 +152,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="copyto">
-                            <property name="label" translatable="yes">_Copy to...</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|copyto">_Copy to...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -168,7 +168,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">S_ubject</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|subjectft">S_ubject</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">subject</property>
                           </object>
@@ -193,7 +193,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Sen_d as</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|sendasft">Sen_d as</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">sendas</property>
                           </object>
@@ -216,7 +216,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="sendassettings">
-                            <property name="label" translatable="yes">Pr_operties...</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|sendassettings">Pr_operties...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -262,7 +262,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Name of the a_ttachment</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|attachft">Name of the a_ttachment</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">attach</property>
                           </object>
@@ -281,7 +281,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">E-Mail options</property>
+                <property name="label" translatable="yes" context="mmresultemaildialog|label2">E-Mail options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -313,7 +313,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="sendallrb">
-                        <property name="label" translatable="yes">S_end all documents</property>
+                        <property name="label" translatable="yes" context="mmresultemaildialog|sendallrb">S_end all documents</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -336,7 +336,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="fromrb">
-                            <property name="label" translatable="yes">_From</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|fromrb">_From</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -357,7 +357,7 @@
                           <object class="GtkLabel" id="toft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_To</property>
+                            <property name="label" translatable="yes" context="mmresultemaildialog|toft">_To</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">to-nospin</property>
                           </object>
@@ -406,7 +406,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Send records</property>
+                <property name="label" translatable="yes" context="mmresultemaildialog|label1">Send records</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
index a19a207e9576..8c7de923923a 100644
--- a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MMResultPrintDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Print merged document</property>
+    <property name="title" translatable="yes" context="mmresultprintdialog|MMResultPrintDialog">Print merged document</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Print Documents</property>
+                <property name="label" translatable="yes" context="mmresultprintdialog|ok">Print Documents</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -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">_Printer</property>
+                        <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">printers</property>
                       </object>
@@ -116,7 +116,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="printersettings">
-                        <property name="label" translatable="yes">P_roperties...</property>
+                        <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -135,7 +135,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Printer options</property>
+                <property name="label" translatable="yes" context="mmresultprintdialog|label2">Printer options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -171,7 +171,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="printallrb">
-                            <property name="label" translatable="yes">Print _all documents</property>
+                            <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -196,7 +196,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="fromrb">
-                            <property name="label" translatable="yes">_From</property>
+                            <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -217,7 +217,7 @@
                           <object class="GtkLabel" id="toft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_To</property>
+                            <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">to-nospin</property>
                           </object>
@@ -268,7 +268,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Print records</property>
+                <property name="label" translatable="yes" context="mmresultprintdialog|label1">Print records</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
index db75e4846709..82e6028dc093 100644
--- a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MMResultSaveDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save merged document</property>
+    <property name="title" translatable="yes" context="mmresultsavedialog|MMResultSaveDialog">Save merged document</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -18,7 +18,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Save Documents</property>
+                <property name="label" translatable="yes" context="mmresultsavedialog|ok">Save Documents</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -91,7 +91,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="singlerb">
-                        <property name="label" translatable="yes">S_ave as a single large document</property>
+                        <property name="label" translatable="yes" context="mmresultsavedialog|singlerb">S_ave as a single large document</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -108,7 +108,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="individualrb">
-                        <property name="label" translatable="yes">Sa_ve as individual documents</property>
+                        <property name="label" translatable="yes" context="mmresultsavedialog|individualrb">Sa_ve as individual documents</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkRadioButton" id="fromrb">
-                            <property name="label" translatable="yes">_From</property>
+                            <property name="label" translatable="yes" context="mmresultsavedialog|fromrb">_From</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -150,7 +150,7 @@
                           <object class="GtkLabel" id="toft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_To</property>
+                            <property name="label" translatable="yes" context="mmresultsavedialog|toft">_To</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">to-nospin</property>
                           </object>
@@ -198,7 +198,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Save As options</property>
+                <property name="label" translatable="yes" context="mmresultsavedialog|label2">Save As options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmsalutationpage.ui b/sw/uiconfig/swriter/ui/mmsalutationpage.ui
index 265438b5dd3b..30b38a25d335 100644
--- a/sw/uiconfig/swriter/ui/mmsalutationpage.ui
+++ b/sw/uiconfig/swriter/ui/mmsalutationpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="MMSalutationPage">
@@ -46,7 +46,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Preview</property>
+                        <property name="label" translatable="yes" context="mmsalutationpage|previewft">Preview</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">preview:border</property>
                       </object>
@@ -67,7 +67,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkButton" id="assign">
-                            <property name="label" translatable="yes">_Match fields...</property>
+                            <property name="label" translatable="yes" context="mmsalutationpage|assign">_Match fields...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -105,7 +105,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Preview Previous Address Block</property>
+                                <property name="tooltip_text" translatable="yes" context="mmsalutationpage|prev|tooltip_text">Preview Previous Address Block</property>
                                 <property name="image">image1</property>
                               </object>
                               <packing>
@@ -120,7 +120,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Preview Next Address Block</property>
+                                <property name="tooltip_text" translatable="yes" context="mmsalutationpage|next|tooltip_text">Preview Next Address Block</property>
                                 <property name="image">image2</property>
                               </object>
                               <packing>
@@ -136,7 +136,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Document: %1</property>
+                                <property name="label" translatable="yes" context="mmsalutationpage|documentindex">Document: %1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -177,7 +177,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="greeting">
-                        <property name="label" translatable="yes">This document should contain a salutation</property>
+                        <property name="label" translatable="yes" context="mmsalutationpage|greeting">This document should contain a salutation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -208,7 +208,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">General salutation</property>
+                                <property name="label" translatable="yes" context="mmsalutationpage|generalft">General salutation</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">general</property>
                               </object>
@@ -263,7 +263,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Address list field indicating a female recipient</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|femalefi">Address list field indicating a female recipient</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -277,7 +277,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Female</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|femaleft">_Female</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">female</property>
                                           </object>
@@ -293,7 +293,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Male</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|maleft">_Male</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">male</property>
                                           </object>
@@ -309,7 +309,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Field name</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|femalecolft">Field name</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">femalecol</property>
                                           </object>
@@ -325,7 +325,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Field value</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|femalefieldft">Field value</property>
                                             <property name="use_underline">True</property>
                                             <property name="mnemonic_widget">femalefield</property>
                                           </object>
@@ -338,7 +338,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="newfemale">
-                                            <property name="label" translatable="yes">_New...</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|newfemale">_New...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -354,7 +354,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="newmale">
-                                            <property name="label" translatable="yes">N_ew...</property>
+                                            <property name="label" translatable="yes" context="mmsalutationpage|newmale">N_ew...</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
@@ -448,7 +448,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="personalized">
-                                    <property name="label" translatable="yes">Insert personalized salutation</property>
+                                    <property name="label" translatable="yes" context="mmsalutationpage|personalized">Insert personalized salutation</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -496,7 +496,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Create a Salutation</property>
+            <property name="label" translatable="yes" context="mmsalutationpage|label1">Create a Salutation</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui b/sw/uiconfig/swriter/ui/mmselectpage.ui
index 99edd71ebc5f..88ea69bea87a 100644
--- a/sw/uiconfig/swriter/ui/mmselectpage.ui
+++ b/sw/uiconfig/swriter/ui/mmselectpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="MMSelectPage">
     <property name="visible">True</property>
@@ -28,7 +28,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="currentdoc">
-                    <property name="label" translatable="yes">Use the current _document</property>
+                    <property name="label" translatable="yes" context="mmselectpage|currentdoc">Use the current _document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="newdoc">
-                    <property name="label" translatable="yes">Create a ne_w document</property>
+                    <property name="label" translatable="yes" context="mmselectpage|newdoc">Create a ne_w document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="loaddoc">
-                    <property name="label" translatable="yes">Start from _existing document</property>
+                    <property name="label" translatable="yes" context="mmselectpage|loaddoc">Start from _existing document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -78,7 +78,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="template">
-                    <property name="label" translatable="yes">Start from a t_emplate</property>
+                    <property name="label" translatable="yes" context="mmselectpage|template">Start from a t_emplate</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -95,7 +95,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="recentdoc">
-                    <property name="label" translatable="yes">Start fro_m a recently saved starting document</property>
+                    <property name="label" translatable="yes" context="mmselectpage|recentdoc">Start fro_m a recently saved starting document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -122,7 +122,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browsedoc">
-                    <property name="label" translatable="yes">B_rowse...</property>
+                    <property name="label" translatable="yes" context="mmselectpage|browsedoc">B_rowse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -137,7 +137,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="browsetemplate">
-                    <property name="label" translatable="yes">B_rowse...</property>
+                    <property name="label" translatable="yes" context="mmselectpage|browsetemplate">B_rowse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -158,7 +158,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Select Starting Document for the Mail Merge</property>
+            <property name="label" translatable="yes" context="mmselectpage|label1">Select Starting Document for the Mail Merge</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui
index 69e62b346f41..d53421211188 100644
--- a/sw/uiconfig/swriter/ui/mmsendmails.ui
+++ b/sw/uiconfig/swriter/ui/mmsendmails.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="SendMailsDialog">
@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sending E-mail messages</property>
+    <property name="title" translatable="yes" context="mmsendmails|SendMailsDialog">Sending E-mail messages</property>
     <property name="type_hint">dock</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -23,7 +23,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="stop">
-                <property name="label" translatable="yes">_Stop</property>
+                <property name="label" translatable="yes" context="mmsendmails|stop">_Stop</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -87,7 +87,7 @@
                         <property name="halign">start</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">The connection to the outgoing mail server has been established</property>
+                        <property name="label" translatable="yes" context="mmsendmails|label3">The connection to the outgoing mail server has been established</property>
                       </object>
                     </child>
                   </object>
@@ -96,7 +96,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Connection status</property>
+                    <property name="label" translatable="yes" context="mmsendmails|label1">Connection status</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -147,7 +147,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">%1 of %2 e-mails sent</property>
+                                <property name="label" translatable="yes" context="mmsendmails|transferstatus">%1 of %2 e-mails sent</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -163,7 +163,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes">Sending paused</property>
+                                <property name="label" translatable="yes" context="mmsendmails|paused">Sending paused</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -198,7 +198,7 @@
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes">E-mails not sent: %1</property>
+                            <property name="label" translatable="yes" context="mmsendmails|errorstatus">E-mails not sent: %1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -226,7 +226,7 @@
                               <object class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Details</property>
+                                <property name="label" translatable="yes" context="mmsendmails|label5">Details</property>
                                 <property name="use_underline">True</property>
                               </object>
                             </child>
@@ -245,7 +245,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Transfer status</property>
+                    <property name="label" translatable="yes" context="mmsendmails|label2">Transfer status</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index a8810b20748e..599e1eb7798e 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="NavigatorPanel">
     <property name="visible">True</property>
@@ -31,7 +31,7 @@
                   <object class="GtkToolButton" id="contenttoggle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Toggle Master View</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|contenttoggle|tooltip_text">Toggle Master View</property>
                     <property name="action_name">toggle</property>
                     <property name="icon_name">sw/res/sc20244.png</property>
                   </object>
@@ -44,7 +44,7 @@
                   <object class="GtkMenuToolButton" id="navigation">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Navigation</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|navigation|tooltip_text">Navigation</property>
                     <property name="action_name">navigation</property>
                     <property name="icon_name">sw/res/sc20249.png</property>
                   </object>
@@ -57,7 +57,7 @@
                   <object class="GtkToolButton" id="back">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Back</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|back|tooltip_text">Back</property>
                     <property name="action_name">back</property>
                     <property name="icon_name">sw/res/sc20186.png</property>
                   </object>
@@ -70,7 +70,7 @@
                   <object class="GtkToolButton" id="forward">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Forward</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|forward|tooltip_text">Forward</property>
                     <property name="action_name">forward</property>
                     <property name="icon_name">sw/res/sc20175.png</property>
                   </object>
@@ -83,7 +83,7 @@
                   <object class="GtkToolButton" id="dragmode">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Drag Mode</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|dragmode|tooltip_text">Drag Mode</property>
                     <property name="action_name">dragmode</property>
                     <property name="icon_name">sw/res/sc20235.png</property>
                   </object>
@@ -106,7 +106,7 @@
                   <object class="GtkToolButton" id="chapterup">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Promote Chapter</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|chapterup|tooltip_text">Promote Chapter</property>
                     <property name="action_name">up</property>
                     <property name="icon_name">sw/res/sc20174.png</property>
                   </object>
@@ -119,7 +119,7 @@
                   <object class="GtkToolButton" id="chapterdown">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Demote Chapter</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|chapterdown|tooltip_text">Demote Chapter</property>
                     <property name="action_name">down</property>
                     <property name="icon_name">sw/res/sc20171.png</property>
                   </object>
@@ -132,7 +132,7 @@
                   <object class="GtkToolButton" id="listbox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">List Box On/Off</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|listbox|tooltip_text">List Box On/Off</property>
                     <property name="action_name">listbox</property>
                     <property name="icon_name">sw/res/sc20233.png</property>
                   </object>
@@ -145,7 +145,7 @@
                   <object class="GtkToolButton" id="root">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Content Navigation View</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|root|tooltip_text">Content Navigation View</property>
                     <property name="action_name">root</property>
                     <property name="icon_name">sw/res/sc20234.png</property>
                   </object>
@@ -168,7 +168,7 @@
                   <object class="GtkToolButton" id="reminder">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Set Reminder</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|reminder|tooltip_text">Set Reminder</property>
                     <property name="action_name">reminder</property>
                     <property name="icon_name">sw/res/sc20183.png</property>
                   </object>
@@ -191,7 +191,7 @@
                   <object class="GtkToolButton" id="header">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Header</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|header|tooltip_text">Header</property>
                     <property name="action_name">header</property>
                     <property name="icon_name">sw/res/sc20179.png</property>
                   </object>
@@ -204,7 +204,7 @@
                   <object class="GtkToolButton" id="footer">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Footer</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|footer|tooltip_text">Footer</property>
                     <property name="action_name">footer</property>
                     <property name="icon_name">sw/res/sc20177.png</property>
                   </object>
@@ -217,7 +217,7 @@
                   <object class="GtkToolButton" id="anchor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Anchor&lt;-&gt;Text</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|anchor|tooltip_text">Anchor&lt;-&gt;Text</property>
                     <property name="action_name">anchor</property>
                     <property name="icon_name">sw/res/sc20182.png</property>
                   </object>
@@ -240,7 +240,7 @@
                   <object class="GtkMenuToolButton" id="headings">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Heading Levels Shown</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|headings|tooltip_text">Heading Levels Shown</property>
                     <property name="action_name">headings</property>
                     <property name="icon_name">sw/res/sc20236.png</property>
                   </object>
@@ -263,7 +263,7 @@
                   <object class="GtkToolButton" id="promote">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Promote Level</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|promote|tooltip_text">Promote Level</property>
                     <property name="action_name">promote</property>
                     <property name="icon_name">sw/res/sc20172.png</property>
                   </object>
@@ -276,7 +276,7 @@
                   <object class="GtkToolButton" id="demote">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Demote Level</property>
+                    <property name="tooltip_text" translatable="yes" context="navigatorpanel|demote|tooltip_text">Demote Level</property>
                     <property name="action_name">demote</property>
                     <property name="icon_name">sw/res/sc20173.png</property>
                   </object>
@@ -301,10 +301,10 @@
           <object class="GtkComboBox" id="documents">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Document</property>
+            <property name="tooltip_text" translatable="yes" context="navigatorpanel|documents|tooltip_text">Document</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="documents-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Active Window</property>
+                <property name="AtkObject::accessible-name" translatable="yes" context="navigatorpanel|documents-atkobject">Active Window</property>
               </object>
             </child>
           </object>
@@ -338,7 +338,7 @@
               <object class="GtkToolButton" id="globaltoggle">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Toggle Master View</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|globaltoggle|tooltip_text">Toggle Master View</property>
                 <property name="action_name">toggle</property>
                 <property name="icon_name">sw/res/sc20244.png</property>
               </object>
@@ -361,7 +361,7 @@
               <object class="GtkToolButton" id="edit">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Edit</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|edit|tooltip_text">Edit</property>
                 <property name="action_name">edit</property>
                 <property name="icon_name">sw/res/sc20245.png</property>
               </object>
@@ -374,7 +374,7 @@
               <object class="GtkToolButton" id="update">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Update</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|update|tooltip_text">Update</property>
                 <property name="action_name">update</property>
                 <property name="icon_name">sw/res/sc20246.png</property>
               </object>
@@ -387,7 +387,7 @@
               <object class="GtkToolButton" id="insert">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Insert</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|insert|tooltip_text">Insert</property>
                 <property name="action_name">insert</property>
                 <property name="icon_name">sw/res/sc20247.png</property>
               </object>
@@ -410,7 +410,7 @@
               <object class="GtkToolButton" id="save">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Save Contents as well</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|save|tooltip_text">Save Contents as well</property>
                 <property name="action_name">save</property>
                 <property name="icon_name">sw/res/sc20248.png</property>
               </object>
@@ -433,7 +433,7 @@
               <object class="GtkToolButton" id="moveup">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Move Up</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|moveup|tooltip_text">Move Up</property>
                 <property name="action_name">up</property>
                 <property name="icon_name">sw/res/sc20174.png</property>
               </object>
@@ -446,7 +446,7 @@
               <object class="GtkToolButton" id="movedown">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Move Down</property>
+                <property name="tooltip_text" translatable="yes" context="navigatorpanel|movedown|tooltip_text">Move Down</property>
                 <property name="action_name">down</property>
                 <property name="icon_name">sw/res/sc20171.png</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/newuserindexdialog.ui b/sw/uiconfig/swriter/ui/newuserindexdialog.ui
index bec0c5dbd8e2..239900e4f744 100644
--- a/sw/uiconfig/swriter/ui/newuserindexdialog.ui
+++ b/sw/uiconfig/swriter/ui/newuserindexdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="NewUserIndexDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Create New User-defined Index</property>
+    <property name="title" translatable="yes" context="newuserindexdialog|NewUserIndexDialog">Create New User-defined Index</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Name</property>
+                        <property name="label" translatable="yes" context="newuserindexdialog|label2">_Name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entry</property>
                       </object>
@@ -129,7 +129,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">New User Index</property>
+                <property name="label" translatable="yes" context="newuserindexdialog|label1">New User Index</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 1ae754d6c47d..8925ff32fb73 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -448,7 +448,7 @@
               <object class="GtkLabel" id="FileLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar|FileLabel">File</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -580,7 +580,7 @@
                   <object class="sfxlo-DropdownBox" id="FontSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Font</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|FontSection|tooltip_text">Font</property>
                     <property name="valign">center</property>
                     <property name="orientation">vertical</property>
                     <child>
@@ -866,7 +866,7 @@
                   <object class="sfxlo-DropdownBox" id="FontSection2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Font</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|FontSection2|tooltip_text">Font</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box77">
@@ -975,7 +975,7 @@
                   <object class="sfxlo-DropdownBox" id="OutlineSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Outline</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|OutlineSection|tooltip_text">Outline</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box8">
@@ -1004,7 +1004,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|numberbullet|tooltip_text">Bullets and Numbering</property>
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="bullet">
@@ -1057,7 +1057,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|level|tooltip_text">Horizontal Alignment</property>
                                 <property name="halign">start</property>
                                 <property name="show_arrow">False</property>
                                 <child>
@@ -1143,7 +1143,7 @@
                   <object class="sfxlo-DropdownBox" id="AlignmentSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Alignment</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|AlignmentSection|tooltip_text">Alignment</property>
                     <child>
                       <object class="GtkBox" id="box5">
                         <property name="visible">True</property>
@@ -1170,7 +1170,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|verticalalignment1|tooltip_text">Vertical Alignment</property>
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="show_arrow">False</property>
@@ -1221,7 +1221,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                                <property name="tooltip_text" translatable="yes" context="notebookbar|horizontalalignment|tooltip_text">Horizontal Alignment</property>
                                 <property name="halign">start</property>
                                 <property name="show_arrow">False</property>
                                 <child>
@@ -1360,7 +1360,7 @@
                   <object class="sfxlo-DropdownBox" id="SpacingSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Spacing</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|SpacingSection|tooltip_text">Spacing</property>
                     <child>
                       <object class="GtkBox" id="box31">
                         <property name="visible">True</property>
@@ -1392,14 +1392,14 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Indent</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|indent|tooltip_text">Indent</property>
                                     <child>
                                       <object class="GtkToolButton" id="increaseindent1">
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                                        <property name="tooltip_text" translatable="yes" context="notebookbar|increaseindent1|tooltip_text">Increase Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:IncrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -1415,7 +1415,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
-                                        <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                                        <property name="tooltip_text" translatable="yes" context="notebookbar|decreaseindent1|tooltip_text">Decrease Indent</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:DecrementIndent</property>
                                         <property name="use_underline">True</property>
@@ -1437,7 +1437,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_text" translatable="yes">Indent</property>
+                                    <property name="tooltip_text" translatable="yes" context="notebookbar|controlcodes|tooltip_text">Indent</property>
                                     <child>
                                       <object class="GtkToolButton" id="ControlCodes">
                                         <property name="use_action_appearance">False</property>
@@ -1545,7 +1545,7 @@
                   <object class="sfxlo-DropdownBox" id="StyleSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Style</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|StyleSection|tooltip_text">Style</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box9">
@@ -1676,7 +1676,7 @@
                   <object class="sfxlo-DropdownBox" id="FindSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Find</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|FindSection|tooltip_text">Find</property>
                     <child>
                       <object class="GtkBox" id="box95">
                         <property name="visible">True</property>
@@ -1731,7 +1731,7 @@
                   <object class="sfxlo-DropdownBox" id="FindSection1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Find</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|FindSection1|tooltip_text">Find</property>
                     <child>
                       <object class="GtkBox" id="box18">
                         <property name="visible">True</property>
@@ -1796,7 +1796,7 @@
               <object class="GtkLabel" id="HomeLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Home</property>
+                <property name="label" translatable="yes" context="notebookbar|HomeLabel">Home</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-any"/>
@@ -1817,7 +1817,7 @@
                   <object class="sfxlo-DropdownBox" id="BreakSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Break</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|BreakSection|tooltip_text">Break</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box14">
@@ -1976,13 +1976,13 @@
                   <object class="sfxlo-DropdownBox" id="box70">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Gallery</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|box70|tooltip_text">Gallery</property>
                     <child>
                       <object class="vcllo-SmallButton" id="Gallery">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Open Clip Art and Media Gallery</property>
+                        <property name="tooltip_text" translatable="yes" context="notebookbar|Gallery|tooltip_text">Open Clip Art and Media Gallery</property>
                         <property name="action_name">.uno:Gallery</property>
                         <property name="image">GalleryImg</property>
                         <property name="relief">none</property>
@@ -2026,7 +2026,7 @@
                   <object class="sfxlo-DropdownBox" id="box69">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Symbol</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|box69|tooltip_text">Symbol</property>
                     <child>
                       <object class="vcllo-SmallButton" id="InsertSymbol">
                         <property name="visible">True</property>
@@ -2058,7 +2058,7 @@
                   <object class="sfxlo-DropdownBox" id="box17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Basic</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|box17|tooltip_text">Basic</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box83">
@@ -2086,7 +2086,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Insert Audio or Video</property>
+                            <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property>
                             <property name="action_name">.uno:InsertAVMedia</property>
                             <property name="relief">none</property>
                             <property name="xalign">0</property>
@@ -2118,7 +2118,7 @@
                   <object class="sfxlo-DropdownBox" id="ShapesSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Shapes</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|ShapesSection|tooltip_text">Shapes</property>
                     <child>
                       <object class="GtkBox" id="box81">
                         <property name="visible">True</property>
@@ -2412,7 +2412,7 @@
                   <object class="sfxlo-DropdownBox" id="LinksSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Links</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|LinksSection|tooltip_text">Links</property>
                     <child>
                       <object class="GtkBox" id="box200">
                         <property name="visible">True</property>
@@ -2486,7 +2486,7 @@
                   <object class="sfxlo-DropdownBox" id="TextSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Text</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|TextSection|tooltip_text">Text</property>
                     <child>
                       <object class="GtkBox" id="box109">
                         <property name="visible">True</property>
@@ -2522,7 +2522,7 @@
                         </child>
                         <child>
                           <object class="vcllo-SmallButton" id="FontWork">
-                            <property name="label" translatable="yes">Fontwork</property>
+                            <property name="label" translatable="yes" context="notebookbar|FontWork">Fontwork</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -2604,7 +2604,7 @@
                   <object class="sfxlo-DropdownBox" id="FieldsSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Fields</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|FieldsSection|tooltip_text">Fields</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box82">
@@ -2693,7 +2693,7 @@
               <object class="GtkLabel" id="InsertLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insert</property>
+                <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -2863,7 +2863,7 @@
                   <object class="sfxlo-DropdownBox" id="box15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Setup</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|box15|tooltip_text">Setup</property>
                     <child>
                       <object class="GtkBox" id="box29">
                         <property name="visible">True</property>
@@ -3061,7 +3061,7 @@
               <object class="GtkLabel" id="LayoutLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page layout</property>
+                <property name="label" translatable="yes" context="notebookbar|LayoutLabel">Page layout</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -3439,7 +3439,7 @@
               <object class="GtkLabel" id="ReferencesLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">References</property>
+                <property name="label" translatable="yes" context="notebookbar|ReferencesLabel">References</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -3931,7 +3931,7 @@
               <object class="GtkLabel" id="ReviewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Review</property>
+                <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -3947,7 +3947,7 @@
                   <object class="sfxlo-DropdownBox" id="PageViewSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Page View</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|PageViewSection|tooltip_text">Page View</property>
                     <child>
                       <object class="GtkBox" id="box122">
                         <property name="visible">True</property>
@@ -4041,7 +4041,7 @@
                   <object class="sfxlo-DropdownBox" id="DocumentAreaElementsSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Document Area Elements</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|DocumentAreaElementsSection|tooltip_text">Document Area Elements</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkBox" id="box22">
@@ -4196,7 +4196,7 @@
                   <object class="sfxlo-DropdownBox" id="ZoomSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Zoom</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|ZoomSection|tooltip_text">Zoom</property>
                     <child>
                       <object class="GtkBox" id="box">
                         <property name="visible">True</property>
@@ -4329,7 +4329,7 @@
               <object class="GtkLabel" id="ViewLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">View</property>
+                <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -4907,7 +4907,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Indent</property>
+                            <property name="tooltip_text" translatable="yes" context="notebookbar|formattable|tooltip_text">Indent</property>
                             <child>
                               <object class="GtkMenuToolButton" id="FrameLineColor">
                                 <property name="use_action_appearance">False</property>
@@ -4949,7 +4949,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Indent</property>
+                            <property name="tooltip_text" translatable="yes" context="notebookbar|formattable1|tooltip_text">Indent</property>
                             <child>
                               <object class="GtkMenuToolButton" id="SetBorderStyle">
                                 <property name="use_action_appearance">False</property>
@@ -5012,7 +5012,7 @@
               <object class="GtkLabel" id="TableLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Table</property>
+                <property name="label" translatable="yes" context="notebookbar|TableLabel">Table</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Table"/>
@@ -5031,11 +5031,11 @@
                   <object class="sfxlo-DropdownBox" id="BasicsSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Basics</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|BasicsSection|tooltip_text">Basics</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="vcllo-SmallButton" id="GraphicDialog">
-                        <property name="label" translatable="yes">Properties</property>
+                        <property name="label" translatable="yes" context="notebookbar|GraphicDialog">Properties</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -5065,11 +5065,11 @@
                   <object class="sfxlo-DropdownBox" id="SizeSection">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Basics</property>
+                    <property name="tooltip_text" translatable="yes" context="notebookbar|SizeSection|tooltip_text">Basics</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="vcllo-SmallButton" id="Crop1">
-                        <property name="label" translatable="yes">Crop</property>
+                        <property name="label" translatable="yes" context="notebookbar|Crop1">Crop</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -5697,7 +5697,7 @@
               <object class="GtkLabel" id="ImageLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="context-Graphic"/>
@@ -5714,7 +5714,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="vcllo-SmallButton" id="LineFormat">
-                    <property name="label" translatable="yes">Line</property>
+                    <property name="label" translatable="yes" context="notebookbar|LineFormat">Line</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -5732,7 +5732,7 @@
                 </child>
                 <child>
                   <object class="vcllo-SmallButton" id="AreaFormat">
-                    <property name="label" translatable="yes">Area</property>
+                    <property name="label" translatable="yes" context="notebookbar|AreaFormat">Area</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -5863,7 +5863,7 @@
               <object class="GtkLabel" id="ShapeLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shape / Textbox</property>
+                <property name="label" translatable="yes" context="notebookbar|ShapeLabel">Shape / Textbox</property>
                 <style>
                   <class name="context-Draw"/>
                 </style>
@@ -5892,7 +5892,7 @@
                         <property name="can_focus">False</property>
                         <property name="is_important">True</property>
                         <property name="action_name">.uno:AnchorMenu</property>
-                        <property name="label" translatable="yes">Anchor</property>
+                        <property name="label" translatable="yes" context="notebookbar|AnchorMenu">Anchor</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -6421,7 +6421,7 @@
               <object class="GtkLabel" id="FrameLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Frame / OLE</property>
+                <property name="label" translatable="yes" context="notebookbar|FrameLabel">Frame / OLE</property>
                 <style>
                   <class name="context-Frame"/>
                   <class name="context-OLE"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index e61ac3e21bcd..d03f31bda2dd 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -1149,7 +1149,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MenuBar</property>
-        <property name="label" translatable="yes">Menubar</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD1">Menubar</property>
       </object>
     </child>
     <child>
@@ -3090,7 +3090,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MenuBar</property>
-        <property name="label" translatable="yes">Menubar</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD">Menubar</property>
       </object>
     </child>
     <child>
@@ -3849,7 +3849,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
-                            <property name="label" translatable="yes">_File</property>
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -3988,7 +3988,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
-                            <property name="label" translatable="yes">_Edit</property>
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -4127,7 +4127,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
-                                    <property name="label" translatable="yes">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -4302,7 +4302,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat">
-                                    <property name="label" translatable="yes">F_ormat</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -4552,7 +4552,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph">
-                                    <property name="label" translatable="yes">_Paragraph</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -4721,7 +4721,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
-                                    <property name="label" translatable="yes">_Insert</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -4866,7 +4866,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference">
-                                <property name="label" translatable="yes">Reference_s</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|referenceb">Reference_s</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -4970,7 +4970,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
-                                    <property name="label" translatable="yes">_Review</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5081,7 +5081,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
-                                    <property name="label" translatable="yes">_View</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5181,7 +5181,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
-                                    <property name="label" translatable="yes">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5356,7 +5356,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="formatt:MenuFormat">
-                                    <property name="label" translatable="yes">F_ormat</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5571,7 +5571,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragrapht:MenuParagraph">
-                                    <property name="label" translatable="yes">_Paragraph</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5696,7 +5696,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="tableT:MenuTable">
-                                    <property name="label" translatable="yes">T_able</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|tableT">T_able</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5832,7 +5832,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="merged:MenuMerge">
-                                    <property name="label" translatable="yes">_Merge</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|merged">_Merge</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -5954,7 +5954,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="rowscolumnst:MenuRowsColumns">
-                                    <property name="label" translatable="yes">R_ows</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">R_ows</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6079,7 +6079,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="selectt:MenuSelect">
-                                    <property name="label" translatable="yes">Selec_t</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|selectt">Selec_t</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6190,7 +6190,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="calculatet:MenuCalculate">
-                                    <property name="label" translatable="yes">_Calc</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|calculatet">_Calc</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6325,7 +6325,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
-                                    <property name="label" translatable="yes">_Graphic</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6440,7 +6440,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="colorb:MenuColor">
-                                    <property name="label" translatable="yes">C_olor</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6757,7 +6757,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange">
-                                    <property name="label" translatable="yes">_Arrange</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6917,7 +6917,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="GridB:MenuGrid">
-                                    <property name="label" translatable="yes">_Grid</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -7037,7 +7037,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage">
-                                <property name="label" translatable="yes">_Language</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -7163,7 +7163,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="revieb:MenuReviews">
-                                    <property name="label" translatable="yes">_Review</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_Review</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -7313,7 +7313,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments">
-                                <property name="label" translatable="yes">_Comments</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -7413,7 +7413,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare">
-                                <property name="label" translatable="yes">Com_pare</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -7513,7 +7513,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="viewA:MenuView">
-                                <property name="label" translatable="yes">_View</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_View</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -7697,7 +7697,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit">
-                                    <property name="label" translatable="yes">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -7913,7 +7913,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="drawb:MenuDraw">
-                                    <property name="label" translatable="yes">D_raw</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8140,7 +8140,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="arrangeD:MenuArrange">
-                                    <property name="label" translatable="yes">_Arrange</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8276,7 +8276,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="Grid:MenuGrid">
-                                    <property name="label" translatable="yes">_Grid</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8385,7 +8385,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="viewDrawb:MenuGroup">
-                                    <property name="label" translatable="yes">Grou_p</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8493,7 +8493,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="3Db:Menu3D">
-                                    <property name="label" translatable="yes">3_D</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8676,7 +8676,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="oleB:MenuOLE">
-                                    <property name="label" translatable="yes">F_rame</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8883,7 +8883,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="arrangeO:MenuArrange">
-                                    <property name="label" translatable="yes">_Arrange</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_Arrange</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -8992,7 +8992,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="GridO:MenuGrid">
-                                    <property name="label" translatable="yes">_Grid</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9102,7 +9102,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="viewO:MenuView">
-                                    <property name="label" translatable="yes">_View</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9207,7 +9207,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphstyles:MenuStyle">
-                                    <property name="label" translatable="yes">_Styles</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9382,7 +9382,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="formats:MenuFormat">
-                                    <property name="label" translatable="yes">F_ormat</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">F_ormat</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9643,7 +9643,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="paragraphs:MenuParagraph">
-                                    <property name="label" translatable="yes">_Paragraph</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphs">_Paragraph</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9802,7 +9802,7 @@
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="viewc:MenuView">
-                                    <property name="label" translatable="yes">_View</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewc">_View</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9912,7 +9912,7 @@
                         </child>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
-                            <property name="label" translatable="yes">_Menu</property>
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -9967,7 +9967,7 @@
                         </child>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
-                            <property name="label" translatable="yes">_Tools</property>
+                            <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 6119ee57497c..0fec03e9dde2 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkMenu" id="Menu3D">
@@ -3047,7 +3047,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:MenuBar</property>
-        <property name="label" translatable="yes">Menubar</property>
+        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menubarD">Menubar</property>
       </object>
     </child>
     <child>
@@ -3785,7 +3785,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
-                                <property name="label" translatable="yes">_File</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_File</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -4007,7 +4007,7 @@
                             <property name="can_focus">False</property>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
-                                <property name="label" translatable="yes">_Edit</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -4203,7 +4203,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
-                                        <property name="label" translatable="yes">_Styles</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">_Styles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -4487,7 +4487,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat">
-                                        <property name="label" translatable="yes">F_ormat</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -4838,7 +4838,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph">
-                                        <property name="label" translatable="yes">_Paragraph</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5074,7 +5074,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
-                                        <property name="label" translatable="yes">_Insert</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5299,7 +5299,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference">
-                                        <property name="label" translatable="yes">Referen_ce</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referenceb">Referen_ce</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5497,7 +5497,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
-                                        <property name="label" translatable="yes">_Review</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5695,7 +5695,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
-                                        <property name="label" translatable="yes">_View</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -5953,7 +5953,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
-                                        <property name="label" translatable="yes">_Graphic</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -6383,7 +6383,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange">
-                                        <property name="label" translatable="yes">_Arrange</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrange">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -6556,7 +6556,7 @@
                                 </child>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="colorb:MenuColor">
-                                    <property name="label" translatable="yes">C_olor</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -6807,7 +6807,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="GridB:MenuGrid">
-                                        <property name="label" translatable="yes">_Grid</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -6981,7 +6981,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
-                                        <property name="label" translatable="yes">_Styles</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">_Styles</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -7265,7 +7265,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="formatt:MenuFormat">
-                                        <property name="label" translatable="yes">F_ormat</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatt">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -7616,7 +7616,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragrapht:MenuParagraph">
-                                        <property name="label" translatable="yes">_Paragraph</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragrapht">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -7840,7 +7840,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="tabled:MenuTable">
-                                        <property name="label" translatable="yes">T_able</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -8035,7 +8035,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="rowscolumnst:MenuRowsColumns">
-                                        <property name="label" translatable="yes">R_ows</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -8233,7 +8233,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="merged:MenuMerge">
-                                        <property name="label" translatable="yes">_Merge</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|merged">_Merge</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -8469,7 +8469,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="selectt:MenuSelect">
-                                        <property name="label" translatable="yes">Sele_ct</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|selectt">Sele_ct</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -8695,7 +8695,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="calculatet:MenuCalculate">
-                                        <property name="label" translatable="yes">_Calc</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -8920,7 +8920,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="referencet:MenuReference">
-                                        <property name="label" translatable="yes">Referen_ce</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referencet">Referen_ce</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -9053,7 +9053,7 @@
                                 </child>
                                 <child>
                                   <object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage">
-                                    <property name="label" translatable="yes">_Language</property>
+                                    <property name="label" translatable="yes" context="notebookbar_groupedbar_full|languageb">_Language</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -9278,7 +9278,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="revieb:MenuReviews">
-                                        <property name="label" translatable="yes">_Review</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|revieb">_Review</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -9490,7 +9490,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments">
-                                        <property name="label" translatable="yes">_Comments</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|commentsb">_Comments</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -9692,7 +9692,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare">
-                                        <property name="label" translatable="yes">Com_pare</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|compareb">Com_pare</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -9890,7 +9890,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="viewa:MenuView">
-                                        <property name="label" translatable="yes">_View</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewa">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -10332,7 +10332,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="drawb:MenuDraw">
-                                        <property name="label" translatable="yes">D_raw</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -10702,7 +10702,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit">
-                                        <property name="label" translatable="yes">_Edit</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -10929,7 +10929,7 @@
                                         <property name="orientation">vertical</property>
                                         <child>
                                           <object class="svtlo-ManagedMenuButton" id="wrapb:MenuWrap">
-                                            <property name="label" translatable="yes">Wrap</property>
+                                            <property name="label" translatable="yes" context="notebookbar_groupedbar_full|wrapb">Wrap</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
@@ -10943,7 +10943,7 @@
                                         </child>
                                         <child>
                                           <object class="svtlo-ManagedMenuButton" id="alignb:MenuAlign">
-                                            <property name="label" translatable="yes">Align</property>
+                                            <property name="label" translatable="yes" context="notebookbar_groupedbar_full|alignb">Align</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
@@ -10975,7 +10975,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="arrangedrawb:MenuArrange">
-                                        <property name="label" translatable="yes">_Arrange</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -11139,7 +11139,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="GridDrawB:MenuGrid">
-                                        <property name="label" translatable="yes">_View</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -11337,7 +11337,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="viewDrawb:MenuGroup">
-                                        <property name="label" translatable="yes">Grou_p</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -11513,7 +11513,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="3Db:Menu3D">
-                                        <property name="label" translatable="yes">3_D</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -11821,7 +11821,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="formatd:MenuFormat">
-                                        <property name="label" translatable="yes">F_ormat</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -12087,7 +12087,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="paragraphTextb:MenuParagraph">
-                                        <property name="label" translatable="yes">_Paragraph</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -12312,7 +12312,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="viewd:MenuView">
-                                        <property name="label" translatable="yes">_View</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewd">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -12462,7 +12462,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="insertTextb:MenuInsert">
-                                        <property name="label" translatable="yes">_Insert</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextb">_Insert</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -12892,7 +12892,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="media:MenuArrange">
-                                        <property name="label" translatable="yes">_Media</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_Media</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -13129,7 +13129,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="oleB:MenuOLE">
-                                        <property name="label" translatable="yes">F_rame</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">F_rame</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -13559,7 +13559,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="arrageOLE:MenuArrange">
-                                        <property name="label" translatable="yes">_Arrange</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrageOLE">_Arrange</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -13722,7 +13722,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="OleGridB:MenuGrid">
-                                        <property name="label" translatable="yes">_Grid</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|OleGridB">_Grid</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -13920,7 +13920,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="svtlo-ManagedMenuButton" id="viewf:MenuView">
-                                        <property name="label" translatable="yes">_View</property>
+                                        <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewf">_View</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -14067,7 +14067,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
-                                <property name="label" translatable="yes">_Menu</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -14119,7 +14119,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
-                                <property name="label" translatable="yes">_Tools</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -14173,7 +14173,7 @@
                             </child>
                             <child>
                               <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
-                                <property name="label" translatable="yes">_Help</property>
+                                <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index fb41e3de7e96..1834d35de197 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="imagestyledefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestyledefault">Default</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="imagestylegray">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Grayscale</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylegray">Grayscale</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="imagestylebw">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Black and White</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylebw">Black and White</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -55,7 +55,7 @@
       <object class="GtkMenuItem" id="imagestylewater">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Watermark</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylewater">Watermark</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -69,7 +69,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionbc20m">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">-20% Brightness &amp; Contrast</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionbc20m">-20% Brightness &amp; Contrast</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -77,7 +77,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionb20m">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">-20% Brightness</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionb20m">-20% Brightness</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -85,7 +85,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionc20m">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">-20% Contrast</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionc20m">-20% Contrast</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -93,7 +93,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectiondefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">0% Brightness &amp; Contrast</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectiondefault">0% Brightness &amp; Contrast</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -101,7 +101,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionb20p">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">+20% Brightness</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionb20p">+20% Brightness</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -109,7 +109,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionc20p">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">+20% Contrast</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionc20p">+20% Contrast</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -117,7 +117,7 @@
       <object class="GtkMenuItem" id="imagestylecorrectionbc20p">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">+20% Brightness &amp; Contrast</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionbc20p">+20% Brightness &amp; Contrast</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -131,7 +131,7 @@
       <object class="GtkMenuItem" id="imagestylecolorred">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Colorize Red</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorred">Colorize Red</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -139,7 +139,7 @@
       <object class="GtkMenuItem" id="imagestylecolorblue">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Colorize Blue</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorblue">Colorize Blue</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -147,7 +147,7 @@
       <object class="GtkMenuItem" id="imagestylecolorgreen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Colorize Green</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorgreen">Colorize Green</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -155,7 +155,7 @@
       <object class="GtkMenuItem" id="imagestylecolororange">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Colorize Orange</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolororange">Colorize Orange</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -183,7 +183,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HyperlinkDialog</property>
-        <property name="label" translatable="yes">Hyperlink</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|hyperlink">Hyperlink</property>
       </object>
     </child>
     <child>
@@ -197,7 +197,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertFootnote</property>
-        <property name="label" translatable="yes">Footnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|footnote">Footnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -206,7 +206,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertEndnote</property>
-        <property name="label" translatable="yes">Endnote</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|endnote">Endnote</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -221,7 +221,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertBookmark</property>
-        <property name="label" translatable="yes">Bookmark</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|bookmark">Bookmark</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -230,7 +230,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertReferenceField</property>
-        <property name="label" translatable="yes">Cross-Reference</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|crossreference">Cross-Reference</property>
       </object>
     </child>
   </object>
@@ -314,7 +314,7 @@
       <object class="GtkMenuItem" id="paradefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default Paragraph</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|paradefault">Default Paragraph</property>
         <property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -323,7 +323,7 @@
       <object class="GtkMenuItem" id="title">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Title</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|title">Title</property>
         <property name="action_name">.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -332,7 +332,7 @@
       <object class="GtkMenuItem" id="heading1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Heading 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|heading1">Heading 1</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -341,7 +341,7 @@
       <object class="GtkMenuItem" id="heading2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Heading 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|heading2">Heading 2</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -350,7 +350,7 @@
       <object class="GtkMenuItem" id="heading3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Heading 3</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|heading3">Heading 3</property>
         <property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -365,7 +365,7 @@
       <object class="GtkMenuItem" id="chardefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default Character</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|chardefault">Default Character</property>
         <property name="action_name">.uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -374,7 +374,7 @@
       <object class="GtkMenuItem" id="italic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Emphasis</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|italic">Emphasis</property>
         <property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -383,7 +383,7 @@
       <object class="GtkMenuItem" id="bold">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Strong Emphasis</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|bold">Strong Emphasis</property>
         <property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
         <property name="use_underline">True</property>
       </object>
@@ -401,7 +401,7 @@
       <object class="GtkMenuItem" id="tablestylenone">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestylenone">None</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -409,7 +409,7 @@
       <object class="GtkMenuItem" id="tablestyledefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Default</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyledefault">Default</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -417,7 +417,7 @@
       <object class="GtkMenuItem" id="tablestyle1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 1</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle1">Style 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -425,7 +425,7 @@
       <object class="GtkMenuItem" id="tablestyle2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 2</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle2">Style 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -433,7 +433,7 @@
       <object class="GtkMenuItem" id="tablestyle3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 3</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle3">Style 3</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -441,7 +441,7 @@
       <object class="GtkMenuItem" id="tablestyle4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Style 4</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|tablestyle4">Style 4</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -468,7 +468,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsBefore</property>
-        <property name="label" translatable="yes">Insert Rows Above</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenuaddup">Insert Rows Above</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -477,7 +477,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:InsertRowsAfter</property>
-        <property name="label" translatable="yes">Insert Rows Below</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenuadddown">Insert Rows Below</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -492,7 +492,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DeleteRows</property>
-        <property name="label" translatable="yes">Delete Rows</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenudel">Delete Rows</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -501,7 +501,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:EntireRow</property>
-        <property name="label" translatable="yes">Select Rows</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenuselect">Select Rows</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -516,7 +516,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetRowHeight</property>
-        <property name="label" translatable="yes">Row Height...</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenuheight">Row Height...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -525,7 +525,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetOptimalRowHeight</property>
-        <property name="label" translatable="yes">Optimal Row Height</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenuoptimalrow">Optimal Row Height</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -534,7 +534,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:DistributeRows</property>
-        <property name="label" translatable="yes">Distribute Rows Evenly</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|rowmenudistribute">Distribute Rows Evenly</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -733,7 +733,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">File</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|filegrouplabel">File</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -886,7 +886,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Clipboard</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|clipboardgrouplabel">Clipboard</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -932,7 +932,7 @@
                 <property name="spacing">3</property>
                 <child>
                   <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:stylemenu">
-                    <property name="label" translatable="yes">Style</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|paragraphstyleb">Style</property>
                     <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -1445,7 +1445,7 @@
                 <property name="height_request">15</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text</property>
+                <property name="label" translatable="yes" context="notebookbar_groups|formatgrouplabel">Text</property>
                 <attributes>
                   <attribute name="font-desc" value="Noto Sans 9"/>
                   <attribute name="style" value="italic"/>
@@ -1570,7 +1570,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="linksb:linksmenu">
-                            <property name="label" translatable="yes">Links</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|linksb">Links</property>
                             <property name="height_request">26</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1613,7 +1613,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="is_important">True</property>
                                 <property name="action_name">.uno:BasicShapes</property>
-                                <property name="label" translatable="yes">Shapes</property>
+                                <property name="label" translatable="yes" context="notebookbar_groups|shapesb">Shapes</property>
                               </object>
                               <packing>
                                 <property name="expand">True</property>
@@ -1719,7 +1719,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Insert</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|insertgrouplabel">Insert</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -1755,7 +1755,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="tablestyleb:tablemenu">
-                        <property name="label" translatable="yes">Style</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|tablestyleb">Style</property>
                         <property name="width_request">70</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
@@ -1777,7 +1777,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="tablerowsb:trowmenu">
-                            <property name="label" translatable="yes">Rows</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|tablerowsb">Rows</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1795,7 +1795,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="tablecolumnsb:tcolumnmenu">
-                            <property name="label" translatable="yes">Columns</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|tablecolumnsb">Columns</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1999,7 +1999,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Table</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|tablegrouplabel">Table</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -2035,7 +2035,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="imagestyleb:imagestylemenu">
-                        <property name="label" translatable="yes">Style</property>
+                        <property name="label" translatable="yes" context="notebookbar_groups|imagestyleb">Style</property>
                         <property name="width_request">70</property>
                         <property name="height_request">78</property>
                         <property name="visible">True</property>
@@ -2076,7 +2076,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="resetb">
-                            <property name="label" translatable="yes">Reset</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|resetb">Reset</property>
                             <property name="height_request">36</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2123,7 +2123,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="wrapb:wrapmenu">
-                            <property name="label" translatable="yes">Wrap</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|wrapb">Wrap</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2140,7 +2140,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="lockb">
-                            <property name="label" translatable="yes">Lock</property>
+                            <property name="label" translatable="yes" context="notebookbar_groups|lockb">Lock</property>
                             <property name="height_request">24</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -2186,7 +2186,7 @@
                     <property name="height_request">15</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Image</property>
+                    <property name="label" translatable="yes" context="notebookbar_groups|imagegrouplabel">Image</property>
                     <attributes>
                       <attribute name="font-desc" value="Noto Sans 9"/>
                       <attribute name="style" value="italic"/>
@@ -2244,7 +2244,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOff</property>
-        <property name="label" translatable="yes">None</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapoff">None</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2253,7 +2253,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapIdeal</property>
-        <property name="label" translatable="yes">Optimal</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapideal">Optimal</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2262,7 +2262,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapOn</property>
-        <property name="label" translatable="yes">Parallel</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapon">Parallel</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2271,7 +2271,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapLeft</property>
-        <property name="label" translatable="yes">Before</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapleft">Before</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2280,7 +2280,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapRight</property>
-        <property name="label" translatable="yes">After</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapright">After</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2289,7 +2289,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapThrough</property>
-        <property name="label" translatable="yes">Through</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapthrough">Through</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2304,7 +2304,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:WrapContour</property>
-        <property name="label" translatable="yes">Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|wrapcontour">Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -2313,7 +2313,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ContourDialog</property>
-        <property name="label" translatable="yes">Edit Contour</property>
+        <property name="label" translatable="yes" context="notebookbar_groups|contourdialog">Edit Contour</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 5e88dd458961..7266c9019dbc 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -470,7 +470,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                <property name="tooltip_text" translatable="yes" context="notebookbar_single|halignment|tooltip_text">Horizontal Alignment</property>
                 <property name="halign">start</property>
                 <property name="show_arrow">False</property>
                 <child>
@@ -593,7 +593,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes" context="notebookbar_single|outlineindent|tooltip_text">Indent</property>
                 <property name="show_arrow">False</property>
                 <child>
                   <object class="GtkMenuToolButton" id="bullet">
@@ -675,7 +675,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes" context="notebookbar_single|insert|tooltip_text">Indent</property>
                 <property name="show_arrow">False</property>
                 <child>
                   <object class="GtkMenuToolButton" id="table">
diff --git a/sw/uiconfig/swriter/ui/numberingnamedialog.ui b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
index 12b2b0eecc93..62073958d01d 100644
--- a/sw/uiconfig/swriter/ui/numberingnamedialog.ui
+++ b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -8,38 +8,38 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Untitled 1</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 2</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 3</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 4</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 5</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 5</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 6</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 7</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 7</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 8</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Untitled 9</col>
+        <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 9</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="NumberingNameDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save As</property>
+    <property name="title" translatable="yes" context="numberingnamedialog|NumberingNameDialog">Save As</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -165,7 +165,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Format</property>
+                <property name="label" translatable="yes" context="numberingnamedialog|label1">Format</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui
index ca0f0951dc4f..4969d202e024 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustmentNF_RESTART_PARA">
     <property name="lower">1</property>
@@ -47,7 +47,7 @@
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Outline level:</property>
+                    <property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</property>
                   </object>
@@ -65,17 +65,17 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Body text</item>
-                      <item translatable="yes">Level 1</item>
-                      <item translatable="yes">Level 2</item>
-                      <item translatable="yes">Level 3</item>
-                      <item translatable="yes">Level 4</item>
-                      <item translatable="yes">Level 5</item>
-                      <item translatable="yes">Level 6</item>
-                      <item translatable="yes">Level 7</item>
-                      <item translatable="yes">Level 8</item>
-                      <item translatable="yes">Level 9</item>
-                      <item translatable="yes">Level 10</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Body text</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 2</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 3</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 4</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 5</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 6</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 7</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 8</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 9</item>
+                      <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 10</item>
                     </items>
                   </object>
                   <packing>
@@ -92,7 +92,7 @@
           <object class="GtkLabel" id="labelOutline">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Outline</property>
+            <property name="label" translatable="yes" context="numparapage|labelOutline">Outline</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -139,7 +139,7 @@
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Numbering style:</property>
+                        <property name="label" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">_Numbering style:</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -156,7 +156,7 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item translatable="yes">None</item>
+                          <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item>
                         </items>
                       </object>
                       <packing>
@@ -167,7 +167,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="editnumstyle">
-                        <property name="label" translatable="yes">Edit Style</property>
+                        <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -186,7 +186,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_NEW_START">
-                    <property name="label" translatable="yes">R_estart at this paragraph</property>
+                    <property name="label" translatable="yes" context="numparapage|checkCB_NEW_START">R_estart at this paragraph</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
@@ -217,7 +217,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START">
-                            <property name="label" translatable="yes">S_tart with:</property>
+                            <property name="label" translatable="yes" context="numparapage|checkCB_NUMBER_NEW_START">S_tart with:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -274,7 +274,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Numbering</property>
+            <property name="label" translatable="yes" context="numparapage|label2">Numbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -310,7 +310,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_COUNT_PARA">
-                    <property name="label" translatable="yes">_Include this paragraph in line numbering</property>
+                    <property name="label" translatable="yes" context="numparapage|checkCB_COUNT_PARA">_Include this paragraph in line numbering</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -328,7 +328,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_RESTART_PARACOUNT">
-                    <property name="label" translatable="yes">Rest_art at this paragraph</property>
+                    <property name="label" translatable="yes" context="numparapage|checkCB_RESTART_PARACOUNT">Rest_art at this paragraph</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -364,7 +364,7 @@
                             <property name="halign">start</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Start with:</property>
+                            <property name="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinNF_RESTART_PARA</property>
                           </object>
@@ -412,7 +412,7 @@
           <object class="GtkLabel" id="labelLINE_NUMBERING">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Line Numbering</property>
+            <property name="label" translatable="yes" context="numparapage|labelLINE_NUMBERING">Line Numbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui
index 9da95fabd50f..e63f95d2036a 100644
--- a/sw/uiconfig/swriter/ui/objectdialog.ui
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ObjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Object</property>
+    <property name="title" translatable="yes" context="objectdialog|ObjectDialog">Object</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="type">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="objectdialog|type">Type</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="objectdialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="wrap">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Wrap</property>
+                <property name="label" translatable="yes" context="objectdialog|wrap">Wrap</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="hyperlink">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hyperlink</property>
+                <property name="label" translatable="yes" context="objectdialog|hyperlink">Hyperlink</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="objectdialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="objectdialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="objectdialog|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="macro">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Macro</property>
+                <property name="label" translatable="yes" context="objectdialog|macro">Macro</property>
               </object>
               <packing>
                 <property name="position">7</property>
diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index ae859ac8d7c5..e3a2b8315cab 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkBox" id="OptCaptionPage">
@@ -47,7 +47,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Category:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|label7">Category:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">category</property>
                           </object>
@@ -61,7 +61,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Numbering:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|numberingft">_Numbering:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numbering</property>
                           </object>
@@ -75,7 +75,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Numbering separator:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|numseparatorft">Numbering separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">numseparator</property>
                           </object>
@@ -89,7 +89,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Separator:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|separatorft">Separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">separator</property>
                           </object>
@@ -103,7 +103,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Position:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|label18">Position:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">position</property>
                           </object>
@@ -144,7 +144,7 @@
                             <property name="valign">center</property>
                             <property name="hexpand">True</property>
                             <property name="invisible_char">•</property>
-                            <property name="text" translatable="yes">. </property>
+                            <property name="text" translatable="yes" context="optcaptionpage|numseparator">. </property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -189,7 +189,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Caption</property>
+                    <property name="label" translatable="yes" context="optcaptionpage|label2">Caption</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -227,7 +227,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Level:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|label4">Level:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">level</property>
                           </object>
@@ -241,7 +241,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Separator:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|label6">Separator:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">chapseparator</property>
                           </object>
@@ -270,7 +270,7 @@
                             <property name="valign">center</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">None</item>
+                              <item translatable="yes" context="optcaptionpage|level">None</item>
                             </items>
                           </object>
                           <packing>
@@ -286,7 +286,7 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Numbering Captions by Chapter</property>
+                    <property name="label" translatable="yes" context="optcaptionpage|label11">Numbering Captions by Chapter</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -324,7 +324,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Character style:</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|label3">Character style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">charstyle</property>
                           </object>
@@ -339,7 +339,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <items>
-                              <item translatable="yes">None</item>
+                              <item translatable="yes" context="optcaptionpage|charstyle">None</item>
                             </items>
                           </object>
                           <packing>
@@ -349,7 +349,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="applyborder">
-                            <property name="label" translatable="yes">Apply border and shadow</property>
+                            <property name="label" translatable="yes" context="optcaptionpage|applyborder">Apply border and shadow</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -371,7 +371,7 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Category and Frame Format</property>
+                    <property name="label" translatable="yes" context="optcaptionpage|label10">Category and Frame Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -423,7 +423,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Add captions automatically
+                    <property name="label" translatable="yes" context="optcaptionpage|label1">Add captions automatically
 when inserting:</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -466,8 +466,8 @@ when inserting:</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <items>
-                          <item translatable="yes">Category first</item>
-                          <item translatable="yes">Numbering first</item>
+                          <item translatable="yes" context="optcaptionpage|captionorder">Category first</item>
+                          <item translatable="yes" context="optcaptionpage|captionorder">Numbering first</item>
                         </items>
                       </object>
                     </child>
@@ -477,7 +477,7 @@ when inserting:</property>
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Caption Order</property>
+                    <property name="label" translatable="yes" context="optcaptionpage|label13">Caption Order</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/optcomparison.ui b/sw/uiconfig/swriter/ui/optcomparison.ui
index 4b519933edff..ad262be62dae 100644
--- a/sw/uiconfig/swriter/ui/optcomparison.ui
+++ b/sw/uiconfig/swriter/ui/optcomparison.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -33,7 +33,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="auto">
-                    <property name="label" translatable="yes">A_uto</property>
+                    <property name="label" translatable="yes" context="optcomparison|auto">A_uto</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -52,7 +52,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="byword">
-                    <property name="label" translatable="yes">By w_ord</property>
+                    <property name="label" translatable="yes" context="optcomparison|byword">By w_ord</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="bycharacter">
-                    <property name="label" translatable="yes">By _character</property>
+                    <property name="label" translatable="yes" context="optcomparison|bycharacter">By _character</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -93,7 +93,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Compare Documents</property>
+            <property name="label" translatable="yes" context="optcomparison|label1">Compare Documents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -126,7 +126,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="ignore">
-                    <property name="label" translatable="yes">Ignore _pieces of length</property>
+                    <property name="label" translatable="yes" context="optcomparison|ignore">Ignore _pieces of length</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -143,7 +143,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="useRSID">
-                    <property name="label" translatable="yes">Take it into account when comparing</property>
+                    <property name="label" translatable="yes" context="optcomparison|useRSID">Take it into account when comparing</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -176,7 +176,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="storeRSID">
-                    <property name="label" translatable="yes">Store it when changing the document</property>
+                    <property name="label" translatable="yes" context="optcomparison|storeRSID">Store it when changing the document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -204,7 +204,7 @@
           <object class="GtkLabel" id="setting">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Random number to improve accuracy of document comparison</property>
+            <property name="label" translatable="yes" context="optcomparison|setting">Random number to improve accuracy of document comparison</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index c391925553bf..9a1847feaada 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="OptCompatPage">
@@ -53,21 +53,21 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes">Use printer metrics for document formatting</item>
-                      <item translatable="yes">Add spacing between paragraphs and tables (in current document)</item>
-                      <item translatable="yes">Add paragraph and table spacing at tops of pages (in current document)</item>
-                      <item translatable="yes">Use OpenOffice.org 1.1 tabstop formatting</item>
-                      <item translatable="yes">Do not add leading (extra space) between lines of text</item>
-                      <item translatable="yes">Use OpenOffice.org 1.1 line spacing</item>
-                      <item translatable="yes">Add paragraph and table spacing at bottom of table cells</item>
-                      <item translatable="yes">Use OpenOffice.org 1.1 object positioning</item>
-                      <item translatable="yes">Use OpenOffice.org 1.1 text wrapping around objects</item>
-                      <item translatable="yes">Consider wrapping style when positioning objects</item>
-                      <item translatable="yes">Expand word space on lines with manual line breaks in justified paragraphs</item>
-                      <item translatable="yes">Protect form</item>
-                      <item translatable="yes">MS Word-compatible trailing blanks</item>
-                      <item translatable="yes">Use LibreOffice 4.3 anchoring paint order (in current document)</item>
-                      <item translatable="yes">&lt;User settings&gt;</item>
+                      <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
+                      <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables (in current document)</item>
+                      <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages (in current document)</item>
+                      <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
+                      <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item>
+                      <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item>
+                      <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item>
+                      <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item>
+                      <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item>
+                      <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item>
+                      <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item>
+                      <item translatable="yes" context="optcompatpage|format">Protect form</item>
+                      <item translatable="yes" context="optcompatpage|format">MS Word-compatible trailing blanks</item>
+                      <item translatable="yes" context="optcompatpage|format">Use LibreOffice 4.3 anchoring paint order (in current document)</item>
+                      <item translatable="yes" context="optcompatpage|format">&lt;User settings&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -79,7 +79,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="default">
-                    <property name="label" translatable="yes">Use as _Default</property>
+                    <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -101,7 +101,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Compatibility options for %DOCNAME</property>
+            <property name="label" translatable="yes" context="optcompatpage|label11">Compatibility options for %DOCNAME</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/optfonttabpage.ui b/sw/uiconfig/swriter/ui/optfonttabpage.ui
index 4786251a18b6..85fb577726b4 100644
--- a/sw/uiconfig/swriter/ui/optfonttabpage.ui
+++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="OptFontTabPage">
@@ -100,7 +100,7 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Font</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|font_label">Font</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -114,7 +114,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Size</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|size_label">_Size</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">standardheight</property>
                   </object>
@@ -130,7 +130,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">De_fault:</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|default_label">De_fault:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">standardbox</property>
                   </object>
@@ -146,7 +146,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Headin_g:</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|heading_label">Headin_g:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">titlebox</property>
                   </object>
@@ -162,7 +162,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_List:</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|list_label">_List:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">listbox</property>
                   </object>
@@ -178,7 +178,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">C_aption:</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|caption_label">C_aption:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">labelbox</property>
                   </object>
@@ -194,7 +194,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Index:</property>
+                    <property name="label" translatable="yes" context="optfonttabpage|index_label">_Index:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">idxbox</property>
                   </object>
@@ -316,7 +316,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Basic Fonts (%1)</property>
+            <property name="label" translatable="yes" context="optfonttabpage|label1">Basic Fonts (%1)</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -340,7 +340,7 @@
         <property name="layout_style">start</property>
         <child>
           <object class="GtkButton" id="standard">
-            <property name="label" translatable="yes">_Default</property>
+            <property name="label" translatable="yes" context="optfonttabpage|standard">_Default</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui
index 84bba183cc1c..5188c75959e8 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="OptFormatAidsPage">
     <property name="visible">True</property>
@@ -41,7 +41,7 @@
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="paragraph">
-                            <property name="label" translatable="yes">Pa_ragraph end</property>
+                            <property name="label" translatable="yes" context="optformataidspage|paragraph">Pa_ragraph end</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -56,7 +56,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="hyphens">
-                            <property name="label" translatable="yes">Soft h_yphens</property>
+                            <property name="label" translatable="yes" context="optformataidspage|hyphens">Soft h_yphens</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -71,7 +71,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="spaces">
-                            <property name="label" translatable="yes">Spac_es</property>
+                            <property name="label" translatable="yes" context="optformataidspage|spaces">Spac_es</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -86,7 +86,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="nonbreak">
-                            <property name="label" translatable="yes">Non-breaking s_paces</property>
+                            <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -101,7 +101,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="tabs">
-                            <property name="label" translatable="yes">Ta_bs</property>
+                            <property name="label" translatable="yes" context="optformataidspage|tabs">Ta_bs</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -116,7 +116,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="break">
-                            <property name="label" translatable="yes">Brea_ks</property>
+                            <property name="label" translatable="yes" context="optformataidspage|break">Brea_ks</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="GtkCheckButton" id="hiddentext">
-                            <property name="label" translatable="yes">Hidden text</property>
+                            <property name="label" translatable="yes" context="optformataidspage|hiddentext">Hidden text</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -145,7 +145,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="hiddentextfield">
-                            <property name="label" translatable="yes">Fields: Hidden te_xt</property>
+                            <property name="label" translatable="yes" context="optformataidspage|hiddentextfield">Fields: Hidden te_xt</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -160,7 +160,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="hiddenparafield">
-                            <property name="label" translatable="yes">Fields: Hidden p_aragraphs</property>
+                            <property name="label" translatable="yes" context="optformataidspage|hiddenparafield">Fields: Hidden p_aragraphs</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -248,7 +248,7 @@
                   <object class="GtkLabel" id="displayfl">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Display of</property>
+                    <property name="label" translatable="yes" context="optformataidspage|displayfl">Display of</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -280,7 +280,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="mathbaseline">
-                            <property name="label" translatable="yes">Math baseline alignment</property>
+                            <property name="label" translatable="yes" context="optformataidspage|mathbaseline">Math baseline alignment</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -300,7 +300,7 @@
                   <object class="GtkLabel" id="layoutopt">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Layout Assistance</property>
+                    <property name="label" translatable="yes" context="optformataidspage|layoutopt">Layout Assistance</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -344,7 +344,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="cursoronoff">
-                            <property name="label" translatable="yes">_Direct cursor</property>
+                            <property name="label" translatable="yes" context="optformataidspage|cursoronoff">_Direct cursor</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -361,7 +361,7 @@
                           <object class="GtkLabel" id="fillmode">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Insert</property>
+                            <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
@@ -383,7 +383,7 @@
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="fillmargin">
-                                    <property name="label" translatable="yes">Para_graph alignment</property>
+                                    <property name="label" translatable="yes" context="optformataidspage|fillmargin">Para_graph alignment</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -399,7 +399,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="fillindent">
-                                    <property name="label" translatable="yes">_Left paragraph margin</property>
+                                    <property name="label" translatable="yes" context="optformataidspage|fillindent">_Left paragraph margin</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -415,7 +415,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="filltab">
-                                    <property name="label" translatable="yes">_Tabs</property>
+                                    <property name="label" translatable="yes" context="optformataidspage|filltab">_Tabs</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -431,7 +431,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="filltabandspace">
-                                    <property name="label" translatable="yes">Tabs a_nd spaces</property>
+                                    <property name="label" translatable="yes" context="optformataidspage|filltabandspace">Tabs a_nd spaces</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -447,7 +447,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="fillspace">
-                                    <property name="label" translatable="yes">_Spaces</property>
+                                    <property name="label" translatable="yes" context="optformataidspage|fillspace">_Spaces</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -477,7 +477,7 @@
                   <object class="GtkLabel" id="cursorlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Direct Cursor</property>
+                    <property name="label" translatable="yes" context="optformataidspage|cursorlabel">Direct Cursor</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -509,7 +509,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="cursorinprot">
-                            <property name="label" translatable="yes">Enable cursor</property>
+                            <property name="label" translatable="yes" context="optformataidspage|cursorinprot">Enable cursor</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -529,7 +529,7 @@
                   <object class="GtkLabel" id="cursoropt">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Protected Areas</property>
+                    <property name="label" translatable="yes" context="optformataidspage|cursoropt">Protected Areas</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui
index a41f7ecc6264..49670d618046 100644
--- a/sw/uiconfig/swriter/ui/optgeneralpage.ui
+++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment-sps">
     <property name="lower">1</property>
@@ -56,7 +56,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="always">
-                            <property name="label" translatable="yes">_Always</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|always">_Always</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -73,7 +73,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="onrequest">
-                            <property name="label" translatable="yes">_On request</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -89,7 +89,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="never">
-                            <property name="label" translatable="yes">_Never</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|never">_Never</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Update Links when Loading</property>
+                    <property name="label" translatable="yes" context="optgeneralpage|label1">Update Links when Loading</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -143,7 +143,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="updatefields">
-                            <property name="label" translatable="yes">_Fields</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|updatefields">_Fields</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="updatecharts">
-                            <property name="label" translatable="yes">_Charts</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|updatecharts">_Charts</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -179,7 +179,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Automatically Update</property>
+                    <property name="label" translatable="yes" context="optgeneralpage|label2">Automatically Update</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -225,7 +225,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Measurement unit:</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|label5">_Measurement unit:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">metric</property>
                           </object>
@@ -250,7 +250,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Tab stops:</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|tablabel">_Tab stops:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">tab:0.00cm</property>
                           </object>
@@ -288,7 +288,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="usecharunit">
-                            <property name="label" translatable="yes">_Enable char unit</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|usecharunit">_Enable char unit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -304,7 +304,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="squaremode">
-                            <property name="label" translatable="yes">_Use square page mode for text grid</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|squaremode">_Use square page mode for text grid</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -332,7 +332,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
+                <property name="label" translatable="yes" context="optgeneralpage|label3">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -375,7 +375,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Additional separators:</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|label7">_Additional separators:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">wordcount</property>
                           </object>
@@ -409,7 +409,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="standardizedpageshow">
-                            <property name="label" translatable="yes">Show standardized page count</property>
+                            <property name="label" translatable="yes" context="optgeneralpage|standardizedpageshow">Show standardized page count</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -437,7 +437,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Characters per standardized page:</property>
+                                    <property name="label" translatable="yes" context="optgeneralpage|labelstandardpages">Characters per standardized page:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">standardpagesize</property>
                                   </object>
@@ -483,7 +483,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Word Count</property>
+                <property name="label" translatable="yes" context="optgeneralpage|label4">Word Count</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui
index 9febbd1447a1..4962e493af86 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="OptRedLinePage">
@@ -36,7 +36,7 @@
                   <object class="GtkLabel" id="insert_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Attributes:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|insert_label">_Attributes:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">insert</property>
                     <property name="xalign">0</property>
@@ -50,7 +50,7 @@
                   <object class="GtkLabel" id="insertcolor_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Co_lor:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|insertcolor_label">Co_lor:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">insertcolor</property>
                     <property name="xalign">0</property>
@@ -66,17 +66,17 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <items>
-                      <item translatable="yes">[None]</item>
-                      <item translatable="yes">Bold</item>
-                      <item translatable="yes">Italic</item>
-                      <item translatable="yes">Underlined</item>
-                      <item translatable="yes">Underlined: double</item>
-                      <item translatable="yes">Strikethrough</item>
-                      <item translatable="yes">Uppercase</item>
-                      <item translatable="yes">Lowercase</item>
-                      <item translatable="yes">Small caps</item>
-                      <item translatable="yes">Title font</item>
-                      <item translatable="yes">Background color</item>
+                      <item translatable="yes" context="optredlinepage|insert">[None]</item>
+                      <item translatable="yes" context="optredlinepage|insert">Bold</item>
+                      <item translatable="yes" context="optredlinepage|insert">Italic</item>
+                      <item translatable="yes" context="optredlinepage|insert">Underlined</item>
+                      <item translatable="yes" context="optredlinepage|insert">Underlined: double</item>
+                      <item translatable="yes" context="optredlinepage|insert">Strikethrough</item>
+                      <item translatable="yes" context="optredlinepage|insert">Uppercase</item>
+                      <item translatable="yes" context="optredlinepage|insert">Lowercase</item>
+                      <item translatable="yes" context="optredlinepage|insert">Small caps</item>
+                      <item translatable="yes" context="optredlinepage|insert">Title font</item>
+                      <item translatable="yes" context="optredlinepage|insert">Background color</item>
                     </items>
                   </object>
                   <packing>
@@ -91,7 +91,7 @@
                     <property name="valign">center</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="insertcolor-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Color of Insertions</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|insertcolor-atkobject">Color of Insertions</property>
                       </object>
                     </child>
                   </object>
@@ -105,7 +105,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="text" translatable="yes">Insert</property>
+                    <property name="text" translatable="yes" context="optredlinepage|insertedpreview">Insert</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -121,7 +121,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insertions</property>
+            <property name="label" translatable="yes" context="optredlinepage|label2">Insertions</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -160,7 +160,7 @@
                   <object class="GtkLabel" id="deleted_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Attri_butes:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|deleted_label">Attri_butes:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">deleted</property>
                     <property name="xalign">0</property>
@@ -174,7 +174,7 @@
                   <object class="GtkLabel" id="deletedcolor_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Col_or:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|deletedcolor_label">Col_or:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">deletedcolor</property>
                     <property name="xalign">0</property>
@@ -202,7 +202,7 @@
                     <property name="valign">center</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="deletedcolor-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Color of Deletions</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|deletedcolor-atkobject">Color of Deletions</property>
                       </object>
                     </child>
                   </object>
@@ -216,7 +216,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="text" translatable="yes">Delete</property>
+                    <property name="text" translatable="yes" context="optredlinepage|deletedpreview">Delete</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -232,7 +232,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Deletions</property>
+            <property name="label" translatable="yes" context="optredlinepage|label3">Deletions</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -271,7 +271,7 @@
                   <object class="GtkLabel" id="changed_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Attrib_utes:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|changed_label">Attrib_utes:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">changed</property>
                     <property name="xalign">0</property>
@@ -285,7 +285,7 @@
                   <object class="GtkLabel" id="changedcolor_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Colo_r:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|changedcolor_label">Colo_r:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">changedcolor</property>
                     <property name="xalign">0</property>
@@ -313,7 +313,7 @@
                     <property name="valign">center</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changedcolor-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Color of Changed Attributes</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|changedcolor-atkobject">Color of Changed Attributes</property>
                       </object>
                     </child>
                   </object>
@@ -327,7 +327,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="text" translatable="yes">Attributes</property>
+                    <property name="text" translatable="yes" context="optredlinepage|changedpreview">Attributes</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -343,7 +343,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Changed Attributes</property>
+            <property name="label" translatable="yes" context="optredlinepage|label4">Changed Attributes</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -385,7 +385,7 @@
                     <property name="valign">center</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="markcolor-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Color of Mark</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|markcolor-atkobject">Color of Mark</property>
                       </object>
                     </child>
                   </object>
@@ -398,7 +398,7 @@
                   <object class="GtkLabel" id="markpos_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Mar_k:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|markpos_label">Mar_k:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">markpos</property>
                     <property name="xalign">0</property>
@@ -412,7 +412,7 @@
                   <object class="GtkLabel" id="markcolor_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Color:</property>
+                    <property name="label" translatable="yes" context="optredlinepage|markcolor_label">_Color:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">markcolor</property>
                     <property name="xalign">0</property>
@@ -440,11 +440,11 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <items>
-                      <item translatable="yes">[None]</item>
-                      <item translatable="yes">Left margin</item>
-                      <item translatable="yes">Right margin</item>
-                      <item translatable="yes">Outer margin</item>
-                      <item translatable="yes">Inner margin</item>
+                      <item translatable="yes" context="optredlinepage|markpos">[None]</item>
+                      <item translatable="yes" context="optredlinepage|markpos">Left margin</item>
+                      <item translatable="yes" context="optredlinepage|markpos">Right margin</item>
+                      <item translatable="yes" context="optredlinepage|markpos">Outer margin</item>
+                      <item translatable="yes" context="optredlinepage|markpos">Inner margin</item>
                     </items>
                   </object>
                   <packing>
@@ -460,7 +460,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Lines Changed</property>
+            <property name="label" translatable="yes" context="optredlinepage|label5">Lines Changed</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
index 041fcf4fd2d8..a022c4a882dc 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment">
     <property name="lower">0.25</property>
@@ -43,7 +43,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="header">
-                        <property name="label" translatable="yes">H_eading</property>
+                        <property name="label" translatable="yes" context="opttablepage|header">H_eading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -58,7 +58,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="repeatheader">
-                        <property name="label" translatable="yes">Re_peat on each page</property>
+                        <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -74,7 +74,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="dontsplit">
-                        <property name="label" translatable="yes">_Do not split</property>
+                        <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -89,7 +89,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="border">
-                        <property name="label" translatable="yes">B_order</property>
+                        <property name="label" translatable="yes" context="opttablepage|border">B_order</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">New Table Defaults</property>
+                <property name="label" translatable="yes" context="opttablepage|label1">New Table Defaults</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -146,7 +146,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="numformatting">
-                        <property name="label" translatable="yes">_Number recognition</property>
+                        <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -161,7 +161,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="numfmtformatting">
-                        <property name="label" translatable="yes">N_umber format recognition</property>
+                        <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -177,7 +177,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="numalignment">
-                        <property name="label" translatable="yes">_Alignment</property>
+                        <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -199,7 +199,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Input in Tables</property>
+                <property name="label" translatable="yes" context="opttablepage|label2">Input in Tables</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -253,7 +253,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Behavior of rows/columns</property>
+                        <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -263,7 +263,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fix">
-                        <property name="label" translatable="yes">_Fixed</property>
+                        <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -281,7 +281,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="fixprop">
-                        <property name="label" translatable="yes">Fi_xed, proportional</property>
+                        <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -299,7 +299,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="var">
-                        <property name="label" translatable="yes">_Variable</property>
+                        <property name="label" translatable="yes" context="opttablepage|var">_Variable</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -321,7 +321,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Changes affect the adjacent area only</property>
+                        <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property>
                         <property name="wrap">True</property>
                         <property name="wrap_mode">char</property>
                         <property name="max_width_chars">50</property>
@@ -337,7 +337,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Changes affect the entire table</property>
+                        <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">50</property>
                       </object>
@@ -352,7 +352,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Changes affect the table size</property>
+                        <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property>
                         <property name="wrap">True</property>
                         <property name="max_width_chars">50</property>
                       </object>
@@ -388,7 +388,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Move cells</property>
+                            <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -430,7 +430,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Row:</property>
+                            <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">rowmove:0.00cm</property>
                           </object>
@@ -445,7 +445,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Column:</property>
+                            <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">colmove:0.00cm</property>
                           </object>
@@ -504,7 +504,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Ro_w:</property>
+                            <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">rowinsert:0.00cm</property>
                           </object>
@@ -519,7 +519,7 @@
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Colu_mn:</property>
+                            <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">colinsert:0.00cm</property>
                           </object>
@@ -533,7 +533,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Insert cell</property>
+                            <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -562,7 +562,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Keyboard Handling</property>
+            <property name="label" translatable="yes" context="opttablepage|label3">Keyboard Handling</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/opttestpage.ui b/sw/uiconfig/swriter/ui/opttestpage.ui
index 50eef2a387dc..830dbe77fe67 100644
--- a/sw/uiconfig/swriter/ui/opttestpage.ui
+++ b/sw/uiconfig/swriter/ui/opttestpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptTestPage">
     <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 06520a2932f5..2db1e358c82d 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="OutlineNumberingDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Chapter Numbering</property>
+    <property name="title" translatable="yes" context="outlinenumbering|OutlineNumberingDialog">Chapter Numbering</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="user">
-                <property name="label" translatable="yes">_Format</property>
+                <property name="label" translatable="yes" context="outlinenumbering|user">_Format</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -112,7 +112,7 @@
               <object class="GtkLabel" id="numbering">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering</property>
+                <property name="label" translatable="yes" context="outlinenumbering|numbering">Numbering</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -125,7 +125,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="outlinenumbering|position">Position</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -156,7 +156,7 @@
       <object class="GtkMenuItem" id="form1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 1</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form1">Untitled 1</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -164,7 +164,7 @@
       <object class="GtkMenuItem" id="form2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 2</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form2">Untitled 2</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -172,7 +172,7 @@
       <object class="GtkMenuItem" id="form3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 3</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form3">Untitled 3</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -180,7 +180,7 @@
       <object class="GtkMenuItem" id="form4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 4</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form4">Untitled 4</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -188,7 +188,7 @@
       <object class="GtkMenuItem" id="form5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 5</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form5">Untitled 5</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -196,7 +196,7 @@
       <object class="GtkMenuItem" id="form6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 6</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form6">Untitled 6</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -204,7 +204,7 @@
       <object class="GtkMenuItem" id="form7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 7</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form7">Untitled 7</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -212,7 +212,7 @@
       <object class="GtkMenuItem" id="form8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 8</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form8">Untitled 8</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -220,7 +220,7 @@
       <object class="GtkMenuItem" id="form9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Untitled 9</property>
+        <property name="label" translatable="yes" context="outlinenumbering|form9">Untitled 9</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -234,7 +234,7 @@
       <object class="GtkMenuItem" id="saveas">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Save _As...</property>
+        <property name="label" translatable="yes" context="outlinenumbering|saveas">Save _As...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 32791ceb630b..72f2ba4d6db4 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -49,7 +49,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Level</property>
+            <property name="label" translatable="yes" context="outlinenumberingpage|label1">Level</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">level:border</property>
             <attributes>
@@ -93,7 +93,7 @@
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Paragraph style:</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">style</property>
                       </object>
@@ -119,7 +119,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Number:</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|label4">Number:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numbering</property>
                       </object>
@@ -133,7 +133,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Character style:</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">charstyle</property>
                       </object>
@@ -147,7 +147,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Show sublevels:</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sublevelsnf</property>
                       </object>
@@ -161,7 +161,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Separator</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|label7">Separator</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -247,7 +247,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Before:</property>
+                            <property name="label" translatable="yes" context="outlinenumberingpage|label8">Before:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">prefix</property>
                           </object>
@@ -268,7 +268,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">After:</property>
+                            <property name="label" translatable="yes" context="outlinenumberingpage|label9">After:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">suffix</property>
                           </object>
@@ -284,7 +284,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Start at:</property>
+                        <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">startat</property>
                       </object>
@@ -321,7 +321,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Numbering</property>
+            <property name="label" translatable="yes" context="outlinenumberingpage|label2">Numbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index 0cabf215d928..177fb1ca0cc3 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -21,13 +21,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Left</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Left</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Centered</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Centered</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Right</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Right</col>
       </row>
     </data>
   </object>
@@ -38,13 +38,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Tab stop</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Tab stop</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Space</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Space</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Nothing</col>
+        <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Nothing</col>
       </row>
     </data>
   </object>
@@ -86,7 +86,7 @@
           <object class="GtkLabel" id="1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Level</property>
+            <property name="label" translatable="yes" context="outlinepositionpage|1">Level</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -134,7 +134,7 @@
                       <object class="GtkLabel" id="numalign">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Numbering alignment:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|numalign">Numbering alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numalignlb</property>
                         <property name="xalign">1</property>
@@ -159,7 +159,7 @@
                       <object class="GtkLabel" id="numdist">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Minimum space between
+                        <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between
 numbering and text:</property>
                         <property name="use_underline">True</property>
                         <property name="justify">right</property>
@@ -188,7 +188,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="numberingwidth">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Width of numbering:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numberingwidthmf:0.00cm</property>
                         <property name="xalign">1</property>
@@ -213,7 +213,7 @@ numbering and text:</property>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="relative">
-                        <property name="label" translatable="yes">Relative</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -230,7 +230,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="indent">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Indent:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">indentmf:0.00cm</property>
                         <property name="xalign">1</property>
@@ -257,7 +257,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="indentat">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Indent at:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|indentat">Indent at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">indentatmf:0.00cm</property>
                         <property name="xalign">1</property>
@@ -283,7 +283,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="num2align">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Numbering alignment:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|num2align">Numbering alignment:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">num2alignlb</property>
                         <property name="xalign">1</property>
@@ -307,7 +307,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="alignedat">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Aligned at:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">alignedatmf:0.00cm</property>
                         <property name="xalign">1</property>
@@ -333,7 +333,7 @@ numbering and text:</property>
                       <object class="GtkLabel" id="at">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Tab stop at:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">atmf:0.00cm</property>
                         <property name="xalign">1</property>
@@ -371,7 +371,7 @@ numbering and text:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Numbering followed by:</property>
+                        <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Numbering followed by:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numfollowedbylb</property>
                         <property name="xalign">1</property>
@@ -392,7 +392,7 @@ numbering and text:</property>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position and Spacing</property>
+                <property name="label" translatable="yes" context="outlinepositionpage|label10">Position and Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -414,7 +414,7 @@ numbering and text:</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">Default</property>
+                <property name="label" translatable="yes" context="outlinepositionpage|standard">Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagebreakmenu.ui b/sw/uiconfig/swriter/ui/pagebreakmenu.ui
index b528891a221d..23c39e286015 100644
--- a/sw/uiconfig/swriter/ui/pagebreakmenu.ui
+++ b/sw/uiconfig/swriter/ui/pagebreakmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit Page Break...</property>
+        <property name="label" translatable="yes" context="pagebreakmenu|edit">Edit Page Break...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Delete Page Break</property>
+        <property name="label" translatable="yes" context="pagebreakmenu|delete">Delete Page Break</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
index c61992e9c271..ee742d05a37a 100644
--- a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkImage" id="image_column1">
     <property name="visible">True</property>
@@ -73,7 +73,7 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton" id="column1">
-            <property name="label" translatable="yes">1 Column</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column1">1 Column</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column1</property>
@@ -88,7 +88,7 @@
         </child>
         <child>
           <object class="GtkButton" id="column2">
-            <property name="label" translatable="yes">2 Columns</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column2">2 Columns</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column2</property>
@@ -103,7 +103,7 @@
         </child>
         <child>
           <object class="GtkButton" id="column3">
-            <property name="label" translatable="yes">3 Columns</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column3">3 Columns</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column3</property>
@@ -118,7 +118,7 @@
         </child>
         <child>
           <object class="GtkButton" id="columnleft">
-            <property name="label" translatable="yes">Left</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|columnleft">Left</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_columnleft</property>
@@ -133,7 +133,7 @@
         </child>
         <child>
           <object class="GtkButton" id="columnright">
-            <property name="label" translatable="yes">Right</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|columnright">Right</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_columnright</property>
@@ -148,7 +148,7 @@
         </child>
         <child>
           <object class="GtkButton" id="column1L">
-            <property name="label" translatable="yes">1 Column</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column1L">1 Column</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column1L</property>
@@ -163,7 +163,7 @@
         </child>
         <child>
           <object class="GtkButton" id="column2L">
-            <property name="label" translatable="yes">2 Columns</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column2L">2 Columns</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column2L</property>
@@ -178,7 +178,7 @@
         </child>
         <child>
           <object class="GtkButton" id="column3L">
-            <property name="label" translatable="yes">3 Columns</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|column3L">3 Columns</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_column3L</property>
@@ -193,7 +193,7 @@
         </child>
         <child>
           <object class="GtkButton" id="columnleftL">
-            <property name="label" translatable="yes">Left</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|columnleftL">Left</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_columnleftL</property>
@@ -208,7 +208,7 @@
         </child>
         <child>
           <object class="GtkButton" id="columnrightL">
-            <property name="label" translatable="yes">Right</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|columnrightL">Right</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">image_columnrightL</property>
@@ -223,11 +223,11 @@
         </child>
         <child>
           <object class="GtkButton" id="moreoptions">
-            <property name="label" translatable="yes">_More Options</property>
+            <property name="label" translatable="yes" context="pagecolumncontrol|moreoptions">_More Options</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">More Options</property>
+            <property name="tooltip_text" translatable="yes" context="pagecolumncontrol|moreoptions|tooltip_text">More Options</property>
             <property name="relief">none</property>
             <property name="use_underline">True</property>
             <property name="always_show_image">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
index dc0d3e745297..a5603c9f625f 100644
--- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui
+++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkGrid" id="PageFooterPanel">
     <property name="visible">True</property>
@@ -40,7 +40,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">Margins:</property>
+                <property name="label" translatable="yes" context="pagefooterpanel|margins">Margins:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -57,7 +57,7 @@
         <child>
           <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="label" translatable="yes" context="pagefooterpanel|customlabel">Custom</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -69,7 +69,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Spacing:</property>
+            <property name="label" translatable="yes" context="pagefooterpanel|spacing">Spacing:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -81,7 +81,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Same Content:</property>
+            <property name="label" translatable="yes" context="pagefooterpanel|samecontent">Same Content:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/pageformatpanel.ui b/sw/uiconfig/swriter/ui/pageformatpanel.ui
index 232d42c8fe1f..bfdc38ffcbbc 100644
--- a/sw/uiconfig/swriter/ui/pageformatpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageformatpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="PageFormatPanel">
@@ -20,7 +20,7 @@
           <object class="GtkLabel" id="size">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Size:</property>
+            <property name="label" translatable="yes" context="pageformatpanel|size">Size:</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -32,7 +32,7 @@
           <object class="GtkLabel" id="width">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Width:</property>
+            <property name="label" translatable="yes" context="pageformatpanel|width">Width:</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -44,7 +44,7 @@
           <object class="GtkLabel" id="height">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Height:</property>
+            <property name="label" translatable="yes" context="pageformatpanel|height">Height:</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -56,7 +56,7 @@
           <object class="GtkLabel" id="orientation">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Orientation:</property>
+            <property name="label" translatable="yes" context="pageformatpanel|orientation">Orientation:</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -69,7 +69,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Paper Width</property>
+            <property name="tooltip_text" translatable="yes" context="pageformatpanel|paperwidth|tooltip_text">Paper Width</property>
             <property name="hexpand">True</property>
             <property name="invisible_char">•</property>
             <property name="text">0</property>
@@ -84,7 +84,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">Paper Height</property>
+            <property name="tooltip_text" translatable="yes" context="pageformatpanel|paperheight|tooltip_text">Paper Height</property>
             <property name="hexpand">True</property>
             <property name="invisible_char">•</property>
             <property name="text">0</property>
@@ -100,8 +100,8 @@
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <items>
-              <item translatable="yes">Portrait</item>
-              <item translatable="yes">Landscape</item>
+              <item translatable="yes" context="pageformatpanel|paperorientation">Portrait</item>
+              <item translatable="yes" context="pageformatpanel|paperorientation">Landscape</item>
             </items>
           </object>
           <packing>
@@ -124,7 +124,7 @@
           <object class="GtkLabel" id="margin">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Margins:</property>
+            <property name="label" translatable="yes" context="pageformatpanel|margin">Margins:</property>
             <property name="xalign">1</property>
           </object>
           <packing>
@@ -137,14 +137,14 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">None</item>
-              <item translatable="yes">Narrow</item>
-              <item translatable="yes">Moderate</item>
-              <item translatable="yes">Normal 0.75"</item>
-              <item translatable="yes">Normal 1"</item>
-              <item translatable="yes">Normal 1.25"</item>
-              <item translatable="yes">Wide</item>
-              <item translatable="yes">Mirrored</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">None</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Narrow</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Moderate</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Normal 0.75"</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Normal 1"</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Normal 1.25"</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Wide</item>
+              <item translatable="yes" context="pageformatpanel|marginLB">Mirrored</item>
             </items>
           </object>
           <packing>
@@ -155,7 +155,7 @@
         <child>
           <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="label" translatable="yes" context="pageformatpanel|customlabel">Custom</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
index d3a63d03e35b..f15242ea107e 100644
--- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkGrid" id="PageHeaderPanel">
     <property name="visible">True</property>
@@ -40,7 +40,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">Margins:</property>
+                <property name="label" translatable="yes" context="pageheaderpanel|margins">Margins:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -57,7 +57,7 @@
         <child>
           <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="label" translatable="yes" context="pageheaderpanel|customlabel">Custom</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -69,7 +69,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Spacing:</property>
+            <property name="label" translatable="yes" context="pageheaderpanel|spacing">Spacing:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -81,7 +81,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="label" translatable="yes">Same Content:</property>
+            <property name="label" translatable="yes" context="pageheaderpanel|samecontent">Same Content:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 43a67f7c5a18..aaaae2d9227c 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">9999</property>
@@ -78,7 +78,7 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton" id="narrow">
-            <property name="label" translatable="yes">Narrow</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|narrow">Narrow</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">narrowImg</property>
@@ -93,7 +93,7 @@
         </child>
         <child>
           <object class="GtkButton" id="normal">
-            <property name="label" translatable="yes">Normal</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|normal">Normal</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">normalImg</property>
@@ -109,7 +109,7 @@
         </child>
         <child>
           <object class="GtkButton" id="wide">
-            <property name="label" translatable="yes">Wide</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|wide">Wide</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">wideImg</property>
@@ -124,7 +124,7 @@
         </child>
         <child>
           <object class="GtkButton" id="mirrored">
-            <property name="label" translatable="yes">Mirrored</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|mirrored">Mirrored</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">mirrore</property>
@@ -139,7 +139,7 @@
         </child>
         <child>
           <object class="GtkButton" id="last">
-            <property name="label" translatable="yes">Last Custom Value</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|last">Last Custom Value</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">lastImg</property>
@@ -154,7 +154,7 @@
         </child>
         <child>
           <object class="GtkButton" id="narrowL">
-            <property name="label" translatable="yes">Narrow</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|narrowL">Narrow</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">narrowLImg</property>
@@ -169,7 +169,7 @@
         </child>
         <child>
           <object class="GtkButton" id="normalL">
-            <property name="label" translatable="yes">Normal</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|normalL">Normal</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">normalLImg</property>
@@ -185,7 +185,7 @@
         </child>
         <child>
           <object class="GtkButton" id="wideL">
-            <property name="label" translatable="yes">Wide</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|wideL">Wide</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">wideLImg</property>
@@ -200,7 +200,7 @@
         </child>
         <child>
           <object class="GtkButton" id="mirroredL">
-            <property name="label" translatable="yes">Mirrored</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|mirroredL">Mirrored</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">mirroredLImg</property>
@@ -215,7 +215,7 @@
         </child>
         <child>
           <object class="GtkButton" id="lastL">
-            <property name="label" translatable="yes">Last Custom Value</property>
+            <property name="label" translatable="yes" context="pagemargincontrol|lastL">Last Custom Value</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="image">lastLImg</property>
@@ -249,7 +249,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Top</property>
+                        <property name="label" translatable="yes" context="pagemargincontrol|label4">_Top</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                       </object>
@@ -262,7 +262,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Bottom</property>
+                        <property name="label" translatable="yes" context="pagemargincontrol|label5">_Bottom</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                       </object>
@@ -279,7 +279,7 @@
                           <object class="GtkLabel" id="leftLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Left</property>
+                            <property name="label" translatable="yes" context="pagemargincontrol|leftLabel">_Left</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -293,7 +293,7 @@
                           <object class="GtkLabel" id="innerLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">I_nner</property>
+                            <property name="label" translatable="yes" context="pagemargincontrol|innerLabel">I_nner</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -317,7 +317,7 @@
                           <object class="GtkLabel" id="rightLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Right</property>
+                            <property name="label" translatable="yes" context="pagemargincontrol|rightLabel">_Right</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -331,7 +331,7 @@
                           <object class="GtkLabel" id="outerLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">O_uter</property>
+                            <property name="label" translatable="yes" context="pagemargincontrol|outerLabel">O_uter</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -407,7 +407,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom</property>
+                <property name="label" translatable="yes" context="pagemargincontrol|label1">Custom</property>
               </object>
             </child>
           </object>
diff --git a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
index c2026b634975..55d409ca3a82 100644
--- a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
+++ b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkImage" id="image_landscape">
     <property name="visible">True</property>
@@ -33,7 +33,7 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton" id="portrait">
-            <property name="label" translatable="yes">Portrait</property>
+            <property name="label" translatable="yes" context="pageorientationcontrol|portrait">Portrait</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -49,7 +49,7 @@
         </child>
         <child>
           <object class="GtkButton" id="landscape">
-            <property name="label" translatable="yes">Landscape</property>
+            <property name="label" translatable="yes" context="pageorientationcontrol|landscape">Landscape</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagesizecontrol.ui b/sw/uiconfig/swriter/ui/pagesizecontrol.ui
index f2d0b4c82ea5..3f7edb904e5f 100644
--- a/sw/uiconfig/swriter/ui/pagesizecontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagesizecontrol.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkImage" id="image_portrait7">
     <property name="visible">True</property>
@@ -48,11 +48,11 @@
         </child>
         <child>
           <object class="GtkButton" id="moreoptions">
-            <property name="label" translatable="yes">_More Options</property>
+            <property name="label" translatable="yes" context="pagesizecontrol|moreoptions">_More Options</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">More Options</property>
+            <property name="tooltip_text" translatable="yes" context="pagesizecontrol|moreoptions|tooltip_text">More Options</property>
             <property name="image">image_portrait7</property>
             <property name="relief">none</property>
             <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index a9f0817b6d4c..950320acfd58 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkListStore" id="liststorePageLayout">
@@ -12,19 +12,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Right and left</col>
+        <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Right and left</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Mirrored</col>
+        <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Mirrored</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Only right</col>
+        <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Only right</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Only left</col>
+        <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Only left</col>
         <col id="1">0</col>
       </row>
     </data>
@@ -48,7 +48,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Number:</property>
+            <property name="label" translatable="yes" context="pagestylespanel|numberslabel">Number:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -62,7 +62,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Background:</property>
+            <property name="label" translatable="yes" context="pagestylespanel|backgroundlabel">Background:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -88,7 +88,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Layout:</property>
+            <property name="label" translatable="yes" context="pagestylespanel|layoutlabel">Layout:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -116,7 +116,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Columns:</property>
+            <property name="label" translatable="yes" context="pagestylespanel|columnlabel">Columns:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -130,11 +130,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">1 Column</item>
-              <item translatable="yes">2 Columns</item>
-              <item translatable="yes">3 Columns</item>
-              <item translatable="yes">Left</item>
-              <item translatable="yes">Right</item>
+              <item translatable="yes" context="pagestylespanel|columnbox">1 Column</item>
+              <item translatable="yes" context="pagestylespanel|columnbox">2 Columns</item>
+              <item translatable="yes" context="pagestylespanel|columnbox">3 Columns</item>
+              <item translatable="yes" context="pagestylespanel|columnbox">Left</item>
+              <item translatable="yes" context="pagestylespanel|columnbox">Right</item>
             </items>
           </object>
           <packing>
@@ -211,7 +211,7 @@
         <child>
           <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="label" translatable="yes" context="pagestylespanel|customlabel">Custom</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui
index 24106cf47c0c..21994f5387b3 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ParagraphPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph</property>
+    <property name="title" translatable="yes" context="paradialog|ParagraphPropertiesDialog">Paragraph</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="labelTP_PARA_STD">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.4699999988079071</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ALIGN">Alignment</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -126,7 +126,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0.46000000834465027</property>
-                <property name="label" translatable="yes">Text Flow</property>
+                <property name="label" translatable="yes" context="paradialog|textflow">Text Flow</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="labelTP_PARA_ASIAN">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_PARA_ASIAN">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="labelTP_NUMPARA">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Outline &amp; Numbering</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_NUMPARA">Outline &amp; Numbering</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="labelTP_TABULATOR">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_TABULATOR">Tabs</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="labelTP_DROPCAPS">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Drop Caps</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_DROPCAPS">Drop Caps</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="labelTP_BORDER">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="paradialog|labelTP_BORDER">Borders</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="paradialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -224,7 +224,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="paradialog|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui
index 35671391ec8a..d3bae3d90707 100644
--- a/sw/uiconfig/swriter/ui/picturedialog.ui
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PictureDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Image</property>
+    <property name="title" translatable="yes" context="picturedialog|PictureDialog">Image</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="type">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="picturedialog|type">Type</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="picturedialog|options">Options</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="wrap">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Wrap</property>
+                <property name="label" translatable="yes" context="picturedialog|wrap">Wrap</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="hyperlink">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hyperlink</property>
+                <property name="label" translatable="yes" context="picturedialog|hyperlink">Hyperlink</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="picture">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="picturedialog|picture">Image</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -166,7 +166,7 @@
               <object class="GtkLabel" id="crop">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Crop</property>
+                <property name="label" translatable="yes" context="picturedialog|crop">Crop</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -180,7 +180,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="picturedialog|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -194,7 +194,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="picturedialog|area">Area</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -208,7 +208,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="picturedialog|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -222,7 +222,7 @@
               <object class="GtkLabel" id="macro">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Macro</property>
+                <property name="label" translatable="yes" context="picturedialog|macro">Macro</property>
               </object>
               <packing>
                 <property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui
index 7a78470e5654..b710ae9d92b5 100644
--- a/sw/uiconfig/swriter/ui/picturepage.ui
+++ b/sw/uiconfig/swriter/ui/picturepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="PicturePage">
@@ -29,7 +29,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkButton" id="browse">
-                    <property name="label" translatable="yes">Browse...</property>
+                    <property name="label" translatable="yes" context="picturepage|browse">Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -56,7 +56,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_File name</property>
+                    <property name="label" translatable="yes" context="picturepage|label1">_File name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry</property>
                   </object>
@@ -74,7 +74,7 @@
           <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Link</property>
+            <property name="label" translatable="yes" context="picturepage|label11">Link</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -109,7 +109,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="vert">
-                    <property name="label" translatable="yes">_Vertically</property>
+                    <property name="label" translatable="yes" context="picturepage|vert">_Vertically</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="hori">
-                    <property name="label" translatable="yes">Hori_zontally</property>
+                    <property name="label" translatable="yes" context="picturepage|hori">Hori_zontally</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="allpages">
-                    <property name="label" translatable="yes">On all pages</property>
+                    <property name="label" translatable="yes" context="picturepage|allpages">On all pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -156,7 +156,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="leftpages">
-                    <property name="label" translatable="yes">On left pages</property>
+                    <property name="label" translatable="yes" context="picturepage|leftpages">On left pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -172,7 +172,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="rightpages">
-                    <property name="label" translatable="yes">On right pages</property>
+                    <property name="label" translatable="yes" context="picturepage|rightpages">On right pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -228,7 +228,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Flip</property>
+            <property name="label" translatable="yes" context="picturepage|label2">Flip</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/previewzoomdialog.ui b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
index f0a4b1b36c85..c08c40ffa0a0 100644
--- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui
+++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -18,7 +18,7 @@
   <object class="GtkDialog" id="PreviewZoomDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Multiple Pages</property>
+    <property name="title" translatable="yes" context="previewzoomdialog|PreviewZoomDialog">Multiple Pages</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -98,7 +98,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Rows</property>
+                <property name="label" translatable="yes" context="previewzoomdialog|label1">_Rows</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">rows</property>
               </object>
@@ -114,7 +114,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Columns</property>
+                <property name="label" translatable="yes" context="previewzoomdialog|label2">_Columns</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">cols</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui
index 9dd00f3713a4..3bec5094d6f6 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
@@ -27,7 +27,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="pagebackground">
-                    <property name="label" translatable="yes">Page background</property>
+                    <property name="label" translatable="yes" context="printeroptions|pagebackground">Page background</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -43,7 +43,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="pictures">
-                    <property name="label" translatable="yes">Images and other graphic objects</property>
+                    <property name="label" translatable="yes" context="printeroptions|pictures">Images and other graphic objects</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -59,7 +59,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="hiddentext">
-                    <property name="label" translatable="yes">Hidden text</property>
+                    <property name="label" translatable="yes" context="printeroptions|hiddentext">Hidden text</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -75,7 +75,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="placeholders">
-                    <property name="label" translatable="yes">Text placeholders</property>
+                    <property name="label" translatable="yes" context="printeroptions|placeholders">Text placeholders</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -91,7 +91,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="formcontrols">
-                    <property name="label" translatable="yes">Form controls</property>
+                    <property name="label" translatable="yes" context="printeroptions|formcontrols">Form controls</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -113,7 +113,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Contents</property>
+            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -140,7 +140,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="textinblack">
-                <property name="label" translatable="yes">Print text in black</property>
+                <property name="label" translatable="yes" context="printeroptions|textinblack">Print text in black</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -155,7 +155,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Color</property>
+            <property name="label" translatable="yes" context="printeroptions|label5">Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -182,7 +182,7 @@
             <property name="left_padding">12</property>
             <child>
               <object class="GtkCheckButton" id="autoblankpages">
-                <property name="label" translatable="yes">Print automatically inserted blank pages</property>
+                <property name="label" translatable="yes" context="printeroptions|autoblankpages">Print automatically inserted blank pages</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -197,7 +197,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Pages</property>
+            <property name="label" translatable="yes" context="printeroptions|label6">Pages</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/printmergedialog.ui b/sw/uiconfig/swriter/ui/printmergedialog.ui
index a092e26e8bd4..8a4a29aa0fcd 100644
--- a/sw/uiconfig/swriter/ui/printmergedialog.ui
+++ b/sw/uiconfig/swriter/ui/printmergedialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="PrintMergeDialog">
     <property name="can_focus">False</property>
@@ -9,7 +9,7 @@
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
-    <property name="text" translatable="yes">Your document contains address database fields. Do you want to print a form letter?</property>
+    <property name="text" translatable="yes" context="printmergedialog|PrintMergeDialog">Your document contains address database fields. Do you want to print a form letter?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/printmonitordialog.ui b/sw/uiconfig/swriter/ui/printmonitordialog.ui
index d6a7e0a2fae6..527943e37708 100644
--- a/sw/uiconfig/swriter/ui/printmonitordialog.ui
+++ b/sw/uiconfig/swriter/ui/printmonitordialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="PrintMonitorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Print monitor</property>
+    <property name="title" translatable="yes" context="printmonitordialog|PrintMonitorDialog">Print monitor</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -49,7 +49,7 @@
               <object class="GtkLabel" id="alttitle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Save-Monitor</property>
+                <property name="label" translatable="yes" context="printmonitordialog|alttitle">Save-Monitor</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -72,7 +72,7 @@
               <object class="GtkLabel" id="printing">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">is being prepared for printing on</property>
+                <property name="label" translatable="yes" context="printmonitordialog|printing">is being prepared for printing on</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -84,7 +84,7 @@
               <object class="GtkLabel" id="saving">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">is being saved to</property>
+                <property name="label" translatable="yes" context="printmonitordialog|saving">is being saved to</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui
index 255cbea7864f..74a721acbc4d 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="PrintOptionsPage">
     <property name="visible">True</property>
@@ -34,7 +34,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="graphics">
-                        <property name="label" translatable="yes">_Images and objects</property>
+                        <property name="label" translatable="yes" context="printoptionspage|graphics">_Images and objects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -51,7 +51,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="formcontrols">
-                        <property name="label" translatable="yes">Form control_s</property>
+                        <property name="label" translatable="yes" context="printoptionspage|formcontrols">Form control_s</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -68,7 +68,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="background">
-                        <property name="label" translatable="yes">Page ba_ckground</property>
+                        <property name="label" translatable="yes" context="printoptionspage|background">Page ba_ckground</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -85,7 +85,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="inblack">
-                        <property name="label" translatable="yes">Print text in blac_k</property>
+                        <property name="label" translatable="yes" context="printoptionspage|inblack">Print text in blac_k</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -102,7 +102,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hiddentext">
-                        <property name="label" translatable="yes">Hidden te_xt</property>
+                        <property name="label" translatable="yes" context="printoptionspage|hiddentext">Hidden te_xt</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -119,7 +119,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="textplaceholder">
-                        <property name="label" translatable="yes">Text _placeholder</property>
+                        <property name="label" translatable="yes" context="printoptionspage|textplaceholder">Text _placeholder</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -142,7 +142,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Contents</property>
+                <property name="label" translatable="yes" context="printoptionspage|label2">Contents</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -176,7 +176,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="leftpages">
-                        <property name="label" translatable="yes">_Left pages</property>
+                        <property name="label" translatable="yes" context="printoptionspage|leftpages">_Left pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -193,7 +193,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rightpages">
-                        <property name="label" translatable="yes">_Right pages</property>
+                        <property name="label" translatable="yes" context="printoptionspage|rightpages">_Right pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -210,7 +210,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="brochure">
-                        <property name="label" translatable="yes">Broch_ure</property>
+                        <property name="label" translatable="yes" context="printoptionspage|brochure">Broch_ure</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -227,7 +227,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rtl">
-                        <property name="label" translatable="yes">Right to Left</property>
+                        <property name="label" translatable="yes" context="printoptionspage|rtl">Right to Left</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -251,7 +251,7 @@
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Pages</property>
+                <property name="label" translatable="yes" context="printoptionspage|label10">Pages</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -284,7 +284,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="none">
-                        <property name="label" translatable="yes">_None</property>
+                        <property name="label" translatable="yes" context="printoptionspage|none">_None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -302,7 +302,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="only">
-                        <property name="label" translatable="yes">Comments _only</property>
+                        <property name="label" translatable="yes" context="printoptionspage|only">Comments _only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -320,7 +320,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="end">
-                        <property name="label" translatable="yes">End of docu_ment</property>
+                        <property name="label" translatable="yes" context="printoptionspage|end">End of docu_ment</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -338,7 +338,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="endpage">
-                        <property name="label" translatable="yes">_End of page</property>
+                        <property name="label" translatable="yes" context="printoptionspage|endpage">_End of page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -356,7 +356,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="inmargins">
-                        <property name="label" translatable="yes">In margins</property>
+                        <property name="label" translatable="yes" context="printoptionspage|inmargins">In margins</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -380,7 +380,7 @@
               <object class="GtkLabel" id="4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Comments</property>
+                <property name="label" translatable="yes" context="printoptionspage|4">Comments</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -427,7 +427,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Fax</property>
+                        <property name="label" translatable="yes" context="printoptionspage|label5">_Fax</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">fax</property>
                       </object>
@@ -460,7 +460,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="blankpages">
-                    <property name="label" translatable="yes">Print _automatically inserted blank pages</property>
+                    <property name="label" translatable="yes" context="printoptionspage|blankpages">Print _automatically inserted blank pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -477,7 +477,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="papertray">
-                    <property name="label" translatable="yes">_Paper tray from printer settings</property>
+                    <property name="label" translatable="yes" context="printoptionspage|papertray">_Paper tray from printer settings</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -500,7 +500,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Other</property>
+            <property name="label" translatable="yes" context="printoptionspage|label1">Other</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui
index a6b5b45c73b5..56fa33916651 100644
--- a/sw/uiconfig/swriter/ui/privateuserpage.ui
+++ b/sw/uiconfig/swriter/ui/privateuserpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkFrame" id="PrivateUserPage">
     <property name="visible">True</property>
@@ -25,7 +25,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">First/last _name/initials:</property>
+                <property name="label" translatable="yes" context="privateuserpage|nameft">First/last _name/initials:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">firstname</property>
               </object>
@@ -39,7 +39,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Street:</property>
+                <property name="label" translatable="yes" context="privateuserpage|streetft">_Street:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">street</property>
               </object>
@@ -53,7 +53,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Co_untry/state:</property>
+                <property name="label" translatable="yes" context="privateuserpage|countryft">Co_untry/state:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">country</property>
               </object>
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Title/profession:</property>
+                <property name="label" translatable="yes" context="privateuserpage|titleft">_Title/profession:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">title</property>
               </object>
@@ -81,12 +81,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Fa_x:</property>
+                <property name="label" translatable="yes" context="privateuserpage|phoneft">Fa_x:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">fax</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="phoneft-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+                    <property name="AtkObject::accessible-description" translatable="yes" context="privateuserpage|phoneft-atkobject">Home telephone number</property>
                   </object>
                 </child>
               </object>
@@ -100,7 +100,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Homepage/e-mail:</property>
+                <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/e-mail:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -123,7 +123,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="firstname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -141,7 +141,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="lastname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -159,7 +159,7 @@
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="shortname-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname-atkobject">Initials</property>
                       </object>
                     </child>
                   </object>
@@ -189,7 +189,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="title-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|title-atkobject">Title</property>
                       </object>
                     </child>
                   </object>
@@ -207,7 +207,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="job-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|job-atkobject">Position</property>
                       </object>
                     </child>
                   </object>
@@ -236,7 +236,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="fax-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|fax-atkobject">Home telephone number</property>
                       </object>
                     </child>
                   </object>
@@ -267,7 +267,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="url-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|url-atkobject">FAX number</property>
                       </object>
                     </child>
                   </object>
@@ -285,7 +285,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="email-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|email-atkobject">email address</property>
                       </object>
                     </child>
                   </object>
@@ -305,7 +305,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">First/last _name/initials 2:</property>
+                <property name="label" translatable="yes" context="privateuserpage|eastnameft">First/last _name/initials 2:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">firstname2</property>
               </object>
@@ -328,7 +328,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="firstname2-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname2-atkobject">Last name</property>
                       </object>
                     </child>
                   </object>
@@ -346,7 +346,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="lastname2-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname2-atkobject">First name</property>
                       </object>
                     </child>
                   </object>
@@ -364,7 +364,7 @@
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="shortname2-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname2-atkobject">Initials</property>
                       </object>
                     </child>
                   </object>
@@ -384,7 +384,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Zip/city:</property>
+                <property name="label" translatable="yes" context="privateuserpage|icityft">_Zip/city:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">izip</property>
               </object>
@@ -407,7 +407,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="icity-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">City</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|icity-atkobject">City</property>
                       </object>
                     </child>
                   </object>
@@ -425,7 +425,7 @@
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="izip-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|izip-atkobject">Zip code</property>
                       </object>
                     </child>
                   </object>
@@ -507,7 +507,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Phone/mobile:</property>
+                <property name="label" translatable="yes" context="privateuserpage|titleft1">Phone/mobile:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">title</property>
               </object>
@@ -531,7 +531,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="phone-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|phone-atkobject">Title</property>
                       </object>
                     </child>
                   </object>
@@ -549,7 +549,7 @@
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="mobile-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|mobile-atkobject">Position</property>
                       </object>
                     </child>
                   </object>
@@ -572,7 +572,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Private Data</property>
+        <property name="label" translatable="yes" context="privateuserpage|label1">Private Data</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
diff --git a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
index e48485d56990..290e8364978c 100644
--- a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
+++ b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryContinueBeginDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Continue at the beginning?</property>
+    <property name="title" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">Continue at the beginning?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to continue at the beginning?</property>
-    <property name="secondary_text" translatable="yes">%PRODUCTNAME Writer has searched to the end of the document.</property>
+    <property name="text" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">Do you want to continue at the beginning?</property>
+    <property name="secondary_text" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">%PRODUCTNAME Writer has searched to the end of the document.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
index 4d597f0b1fb0..590bab521aed 100644
--- a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
+++ b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryContinueEndDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Continue at the end?</property>
+    <property name="title" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">Continue at the end?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to continue at the end?</property>
-    <property name="secondary_text" translatable="yes">%PRODUCTNAME Writer has searched to the beginning of the document.</property>
+    <property name="text" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">Do you want to continue at the end?</property>
+    <property name="secondary_text" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">%PRODUCTNAME Writer has searched to the beginning of the document.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
index 51d4375b7201..953172780740 100644
--- a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
+++ b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="QueryDefaultCompatDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Use as default?</property>
+    <property name="title" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">Use as default?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to change the compatibility options of the default template?</property>
-    <property name="secondary_text" translatable="yes">This will affect all new documents based on the default template.</property>
+    <property name="text" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">Do you want to change the compatibility options of the default template?</property>
+    <property name="secondary_text" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">This will affect all new documents based on the default template.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
index 5a59828acea7..85c4c9d588f9 100644
--- a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
+++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryRotateIntoStandardOrientationDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Rotate into standard orientation?</property>
+    <property name="title" translatable="yes" context="queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog">Rotate into standard orientation?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">This image is rotated. Would you like to rotate it into standard orientation?</property>
+    <property name="text" translatable="yes" context="queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog">This image is rotated. Would you like to rotate it into standard orientation?</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox4">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
index ed2185c0c5b4..b0b829cc7444 100644
--- a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="QuerySaveLabelDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save label?</property>
+    <property name="title" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">Save label?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">A label named "%1 / %2" already exists. Do you want to replace it?</property>
-    <property name="secondary_text" translatable="yes">A label already exists with brand "%1" and type "%2". Replacing it will overwrite its contents.</property>
+    <property name="text" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">A label named "%1 / %2" already exists. Do you want to replace it?</property>
+    <property name="secondary_text" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">A label already exists with brand "%1" and type "%2". Replacing it will overwrite its contents.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
index bb6d20c088c6..9fb6638d686b 100644
--- a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
+++ b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryShowChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Show changes?</property>
+    <property name="title" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">Show changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Do you want to show changes to avoid delays?</property>
-    <property name="secondary_text" translatable="yes">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</property>
+    <property name="text" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">Do you want to show changes to avoid delays?</property>
+    <property name="secondary_text" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/readonlymenu.ui b/sw/uiconfig/swriter/ui/readonlymenu.ui
index 91891ee30d7b..fd425bd06154 100644
--- a/sw/uiconfig/swriter/ui/readonlymenu.ui
+++ b/sw/uiconfig/swriter/ui/readonlymenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="openurl">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Open</property>
+        <property name="label" translatable="yes" context="readonlymenu|openurl">_Open</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="opendoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Open in New Window</property>
+        <property name="label" translatable="yes" context="readonlymenu|opendoc">Open in New Window</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit</property>
+        <property name="label" translatable="yes" context="readonlymenu|edit">_Edit</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkCheckMenuItem" id="selection">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Select Text</property>
+        <property name="label" translatable="yes" context="readonlymenu|selection">Select Text</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -41,7 +41,7 @@
       <object class="GtkMenuItem" id="reload">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Re_load</property>
+        <property name="label" translatable="yes" context="readonlymenu|reload">Re_load</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -49,7 +49,7 @@
       <object class="GtkMenuItem" id="reloadframe">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Reload Frame</property>
+        <property name="label" translatable="yes" context="readonlymenu|reloadframe">Reload Frame</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -57,7 +57,7 @@
       <object class="GtkCheckMenuItem" id="html">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">HT_ML Source</property>
+        <property name="label" translatable="yes" context="readonlymenu|html">HT_ML Source</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -71,7 +71,7 @@
       <object class="GtkMenuItem" id="backward">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Backwards</property>
+        <property name="label" translatable="yes" context="readonlymenu|backward">Backwards</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -79,7 +79,7 @@
       <object class="GtkMenuItem" id="forward">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Forward</property>
+        <property name="label" translatable="yes" context="readonlymenu|forward">_Forward</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -93,7 +93,7 @@
       <object class="GtkMenuItem" id="savegraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Save Image...</property>
+        <property name="label" translatable="yes" context="readonlymenu|savegraphic">Save Image...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -101,7 +101,7 @@
       <object class="GtkMenuItem" id="graphictogallery">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add Image</property>
+        <property name="label" translatable="yes" context="readonlymenu|graphictogallery">Add Image</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -111,7 +111,7 @@
               <object class="GtkMenuItem" id="graphicaslink">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">As Link</property>
+                <property name="label" translatable="yes" context="readonlymenu|graphicaslink">As Link</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -119,7 +119,7 @@
               <object class="GtkMenuItem" id="graphicascopy">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Copy</property>
+                <property name="label" translatable="yes" context="readonlymenu|graphicascopy">Copy</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -137,7 +137,7 @@
       <object class="GtkMenuItem" id="savebackground">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Save Background...</property>
+        <property name="label" translatable="yes" context="readonlymenu|savebackground">Save Background...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -181,7 +181,7 @@
       <object class="GtkMenuItem" id="copylink">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Copy _Link</property>
+        <property name="label" translatable="yes" context="readonlymenu|copylink">Copy _Link</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -189,7 +189,7 @@
       <object class="GtkMenuItem" id="copygraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Copy _Image</property>
+        <property name="label" translatable="yes" context="readonlymenu|copygraphic">Copy _Image</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -203,7 +203,7 @@
       <object class="GtkMenuItem" id="loadgraphic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Load Image</property>
+        <property name="label" translatable="yes" context="readonlymenu|loadgraphic">Load Image</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -211,7 +211,7 @@
       <object class="GtkCheckMenuItem" id="imagesoff">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Image Off</property>
+        <property name="label" translatable="yes" context="readonlymenu|imagesoff">Image Off</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -225,7 +225,7 @@
       <object class="GtkCheckMenuItem" id="fullscreen">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Leave Full-Screen Mode</property>
+        <property name="label" translatable="yes" context="readonlymenu|fullscreen">Leave Full-Screen Mode</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -239,7 +239,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="readonlymenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/renameautotextdialog.ui b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
index 88423f44a176..7f153a6cb67a 100644
--- a/sw/uiconfig/swriter/ui/renameautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="RenameAutoTextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Rename AutoText</property>
+    <property name="title" translatable="yes" context="renameautotextdialog|RenameAutoTextDialog">Rename AutoText</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -74,7 +74,7 @@
                     <property name="can_focus">False</property>
                     <property name="double_buffered">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Na_me</property>
+                    <property name="label" translatable="yes" context="renameautotextdialog|label2">Na_me</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">oldname</property>
                   </object>
@@ -91,7 +91,7 @@
                     <property name="can_focus">False</property>
                     <property name="double_buffered">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_New</property>
+                    <property name="label" translatable="yes" context="renameautotextdialog|label3">_New</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">newname</property>
                   </object>
@@ -156,7 +156,7 @@
                     <property name="can_focus">False</property>
                     <property name="double_buffered">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Short_cut</property>
+                    <property name="label" translatable="yes" context="renameautotextdialog|label4">Short_cut</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">oldsc</property>
                   </object>
@@ -173,7 +173,7 @@
                     <property name="can_focus">False</property>
                     <property name="double_buffered">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Shortcut</property>
+                    <property name="label" translatable="yes" context="renameautotextdialog|label5">_Shortcut</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">newsc</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/renameentrydialog.ui b/sw/uiconfig/swriter/ui/renameentrydialog.ui
index 59a0e3e5a524..1e6ef1aae4fa 100644
--- a/sw/uiconfig/swriter/ui/renameentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/renameentrydialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkDialog" id="RenameEntryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Rename Element</property>
+    <property name="title" translatable="yes" context="renameentrydialog|RenameEntryDialog">Rename Element</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Element Name</property>
+                <property name="label" translatable="yes" context="renameentrydialog|label1">Element Name</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/renameobjectdialog.ui b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
index 624bcd3ab39f..2063e3d3676f 100644
--- a/sw/uiconfig/swriter/ui/renameobjectdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="RenameObjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Rename object: </property>
+    <property name="title" translatable="yes" context="renameobjectdialog|RenameObjectDialog">Rename object: </property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">New name</property>
+                        <property name="label" translatable="yes" context="renameobjectdialog|label2">New name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">entry</property>
                       </object>
@@ -129,7 +129,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Change Name</property>
+                <property name="label" translatable="yes" context="renameobjectdialog|label1">Change Name</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/rowheight.ui b/sw/uiconfig/swriter/ui/rowheight.ui
index 860ae1bde7b7..457e660a03d5 100644
--- a/sw/uiconfig/swriter/ui/rowheight.ui
+++ b/sw/uiconfig/swriter/ui/rowheight.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.01</property>
@@ -11,7 +11,7 @@
   <object class="GtkDialog" id="RowHeightDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Row Height</property>
+    <property name="title" translatable="yes" context="rowheight|RowHeightDialog">Row Height</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -108,7 +108,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fit">
-                        <property name="label" translatable="yes">_Fit to size</property>
+                        <property name="label" translatable="yes" context="rowheight|fit">_Fit to size</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -130,7 +130,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Height</property>
+                <property name="label" translatable="yes" context="rowheight|label1">Height</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/saveashtmldialog.ui b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
index a6c65c1564a6..61655b95a96f 100644
--- a/sw/uiconfig/swriter/ui/saveashtmldialog.ui
+++ b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveAsHTMLDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save as HTML?</property>
+    <property name="title" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">Save as HTML?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
     <property name="buttons">yes-no</property>
-    <property name="text" translatable="yes">Would you like to save the document as HTML?</property>
-    <property name="secondary_text" translatable="yes">The source code can only be displayed if the document is saved in HTML format.</property>
+    <property name="text" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">Would you like to save the document as HTML?</property>
+    <property name="secondary_text" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">The source code can only be displayed if the document is saved in HTML format.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/savelabeldialog.ui b/sw/uiconfig/swriter/ui/savelabeldialog.ui
index bd3bfd7eca18..1f04358c1b51 100644
--- a/sw/uiconfig/swriter/ui/savelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/savelabeldialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="SaveLabelDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Save Label Format</property>
+    <property name="title" translatable="yes" context="savelabeldialog|SaveLabelDialog">Save Label Format</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -92,7 +92,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Brand</property>
+                        <property name="label" translatable="yes" context="savelabeldialog|label2">Brand</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="xalign">0</property>
-                        <property name="label" translatable="yes">T_ype</property>
+                        <property name="label" translatable="yes" context="savelabeldialog|label3">T_ype</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -160,7 +160,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="savelabeldialog|label1">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/sectionpage.ui b/sw/uiconfig/swriter/ui/sectionpage.ui
index cd5476a502b3..08ed7c67f00b 100644
--- a/sw/uiconfig/swriter/ui/sectionpage.ui
+++ b/sw/uiconfig/swriter/ui/sectionpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="SectionPage">
@@ -48,7 +48,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">New Section</property>
+            <property name="label" translatable="yes" context="sectionpage|label4">New Section</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -89,7 +89,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="link">
-                        <property name="label" translatable="yes">_Link</property>
+                        <property name="label" translatable="yes" context="sectionpage|link">_Link</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -105,7 +105,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="dde">
-                        <property name="label" translatable="yes">DD_E</property>
+                        <property name="label" translatable="yes" context="sectionpage|dde">DD_E</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
@@ -126,7 +126,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Section</property>
+                        <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">sectionname</property>
                       </object>
@@ -179,7 +179,7 @@
                             <property name="sensitive">False</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_File name</property>
+                            <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">filename</property>
                           </object>
@@ -194,7 +194,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">DDE _command</property>
+                            <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">filename</property>
                           </object>
@@ -212,7 +212,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="selectfile">
-                        <property name="label" translatable="yes">Browse...</property>
+                        <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">True</property>
@@ -235,7 +235,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Link</property>
+                <property name="label" translatable="yes" context="sectionpage|label1">Link</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -270,7 +270,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="protect">
-                        <property name="label" translatable="yes">_Protect</property>
+                        <property name="label" translatable="yes" context="sectionpage|protect">_Protect</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -286,7 +286,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="selectpassword">
-                        <property name="label" translatable="yes">Password...</property>
+                        <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -299,7 +299,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="withpassword">
-                        <property name="label" translatable="yes">Wit_h password</property>
+                        <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -322,7 +322,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Write Protection</property>
+                <property name="label" translatable="yes" context="sectionpage|label2">Write Protection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -370,7 +370,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hide">
-                        <property name="label" translatable="yes">H_ide</property>
+                        <property name="label" translatable="yes" context="sectionpage|hide">H_ide</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -390,7 +390,7 @@
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_With Condition</property>
+                        <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">withcond</property>
                       </object>
@@ -407,7 +407,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hide</property>
+                <property name="label" translatable="yes" context="sectionpage|label3">Hide</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -435,7 +435,7 @@
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkCheckButton" id="editable">
-                    <property name="label" translatable="yes">E_ditable in read-only document</property>
+                    <property name="label" translatable="yes" context="sectionpage|editable">E_ditable in read-only document</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -450,7 +450,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Properties</property>
+                <property name="label" translatable="yes" context="sectionpage|label5">Properties</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/selectaddressdialog.ui b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
index fe47ea840efd..9a3dabc0915d 100644
--- a/sw/uiconfig/swriter/ui/selectaddressdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SelectAddressDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Address List</property>
+    <property name="title" translatable="yes" context="selectaddressdialog|SelectAddressDialog">Select Address List</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -83,7 +83,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'.</property>
+                <property name="label" translatable="yes" context="selectaddressdialog|desc">Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">52</property>
               </object>
@@ -105,7 +105,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Your recipients are currently selected from:</property>
+                    <property name="label" translatable="yes" context="selectaddressdialog|label2">Your recipients are currently selected from:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -122,7 +122,7 @@
                     <property name="layout_style">start</property>
                     <child>
                       <object class="GtkButton" id="add">
-                        <property name="label" translatable="yes">_Add...</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|add">_Add...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -136,7 +136,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="create">
-                        <property name="label" translatable="yes">_Create...</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|create">_Create...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -150,7 +150,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="filter">
-                        <property name="label" translatable="yes">_Filter...</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|filter">_Filter...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -164,7 +164,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="edit">
-                        <property name="label" translatable="yes">_Edit...</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|edit">_Edit...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -178,7 +178,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="changetable">
-                        <property name="label" translatable="yes">Change _Table...</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|changetable">Change _Table...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -222,7 +222,7 @@
                       <object class="GtkLabel" id="name">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Name</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|name">Name</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -233,7 +233,7 @@
                       <object class="GtkLabel" id="table">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Table</property>
+                        <property name="label" translatable="yes" context="selectaddressdialog|table">Table</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -250,7 +250,7 @@
                   <object class="GtkLabel" id="connecting">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Connecting to data source...</property>
+                    <property name="label" translatable="yes" context="selectaddressdialog|connecting">Connecting to data source...</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/selectautotextdialog.ui b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
index 255996cdac3d..eafb49a103ab 100644
--- a/sw/uiconfig/swriter/ui/selectautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="SelectAutoTextDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select AutoText:</property>
+    <property name="title" translatable="yes" context="selectautotextdialog|SelectAutoTextDialog">Select AutoText:</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -98,7 +98,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">AutoText - Group</property>
+                <property name="label" translatable="yes" context="selectautotextdialog|label1">AutoText - Group</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/selectblockdialog.ui b/sw/uiconfig/swriter/ui/selectblockdialog.ui
index 728067ec31ce..de201b80d8f7 100644
--- a/sw/uiconfig/swriter/ui/selectblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectblockdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SelectBlockDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Address Block</property>
+    <property name="title" translatable="yes" context="selectblockdialog|SelectBlockDialog">Select Address Block</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="new">
-                    <property name="label" translatable="yes">_New...</property>
+                    <property name="label" translatable="yes" context="selectblockdialog|new">_New...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -101,7 +101,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="edit">
-                    <property name="label" translatable="yes">_Edit...</property>
+                    <property name="label" translatable="yes" context="selectblockdialog|edit">_Edit...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -115,7 +115,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="delete">
-                    <property name="label" translatable="yes">_Delete</property>
+                    <property name="label" translatable="yes" context="selectblockdialog|delete">_Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -139,7 +139,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Select your preferred address block</property>
+                <property name="label" translatable="yes" context="selectblockdialog|label1">_Select your preferred address block</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">preview:border</property>
               </object>
@@ -168,7 +168,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="never">
-                            <property name="label" translatable="yes">N_ever include the country/region</property>
+                            <property name="label" translatable="yes" context="selectblockdialog|never">N_ever include the country/region</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -184,7 +184,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="always">
-                            <property name="label" translatable="yes">_Always include the country/region</property>
+                            <property name="label" translatable="yes" context="selectblockdialog|always">_Always include the country/region</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -200,7 +200,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="dependent">
-                            <property name="label" translatable="yes">Only _include the country/region if it is not:</property>
+                            <property name="label" translatable="yes" context="selectblockdialog|dependent">Only _include the country/region if it is not:</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -242,7 +242,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Address Block Settings</property>
+                    <property name="label" translatable="yes" context="selectblockdialog|label2">Address Block Settings</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/selectindexdialog.ui b/sw/uiconfig/swriter/ui/selectindexdialog.ui
index 101ee5490519..dad042183584 100644
--- a/sw/uiconfig/swriter/ui/selectindexdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectindexdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectIndexDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Index Markings</property>
+    <property name="title" translatable="yes" context="selectindexdialog|SelectIndexDialog">Index Markings</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -113,7 +113,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="selectindexdialog|label1">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/selecttabledialog.ui b/sw/uiconfig/swriter/ui/selecttabledialog.ui
index cb50b56de899..f15d88620869 100644
--- a/sw/uiconfig/swriter/ui/selecttabledialog.ui
+++ b/sw/uiconfig/swriter/ui/selecttabledialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SelectTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Table</property>
+    <property name="title" translatable="yes" context="selecttabledialog|SelectTableDialog">Select Table</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -88,7 +88,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">The file you have selected contains more than one table. Please select the table containing the address list you want to use.</property>
+                <property name="label" translatable="yes" context="selecttabledialog|select">The file you have selected contains more than one table. Please select the table containing the address list you want to use.</property>
                 <property name="use_underline">True</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">90</property>
@@ -124,7 +124,7 @@
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="preview">
-                    <property name="label" translatable="yes">_Preview</property>
+                    <property name="label" translatable="yes" context="selecttabledialog|preview">_Preview</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarpage.ui b/sw/uiconfig/swriter/ui/sidebarpage.ui
index 0dc1da007e24..8806b2039b87 100644
--- a/sw/uiconfig/swriter/ui/sidebarpage.ui
+++ b/sw/uiconfig/swriter/ui/sidebarpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="PagePropertyPanel">
@@ -28,7 +28,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Orientation</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpage|orientation|tooltip_text">Orientation</property>
                 <property name="action_name">.uno:Orientation</property>
                 <property name="use_underline">True</property>
               </object>
@@ -54,7 +54,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Size</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpage|size|tooltip_text">Size</property>
                 <property name="action_name">.uno:AttributePageSize</property>
                 <property name="label" translatable="no">toolbutton3</property>
                 <property name="use_underline">True</property>
@@ -82,7 +82,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Columns</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpage|column|tooltip_text">Columns</property>
                 <property name="action_name">.uno:PageColumnType</property>
                 <property name="label" translatable="no">toolbutton4</property>
                 <property name="use_underline">True</property>
@@ -109,7 +109,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Margin</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarpage|margin|tooltip_text">Margin</property>
                 <property name="action_name">.uno:PageMargin</property>
                 <property name="label" translatable="no">toolbutton2</property>
                 <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
index fc64564fea38..6cce471490da 100644
--- a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
+++ b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkGrid" id="StylePresetsPanel">
diff --git a/sw/uiconfig/swriter/ui/sidebartheme.ui b/sw/uiconfig/swriter/ui/sidebartheme.ui
index ec0d850db52f..51c4b5a5cb98 100644
--- a/sw/uiconfig/swriter/ui/sidebartheme.ui
+++ b/sw/uiconfig/swriter/ui/sidebartheme.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
 
@@ -24,7 +24,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Fonts</property>
+                <property name="label" translatable="yes" context="sidebartheme|label1">Fonts</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -50,7 +50,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Colors</property>
+                <property name="label" translatable="yes" context="sidebartheme|label2">Colors</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index c846adfdc5c4..ba51a212b7ba 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="WrapPropertyPanel">
     <property name="visible">True</property>
@@ -26,14 +26,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">None</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonnone|tooltip_text">None</property>
                 <property name="action_name">.uno:WrapOff</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonnone-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">None</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonnone-atkobject">None</property>
                   </object>
                 </child>
               </object>
@@ -49,14 +49,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Parallel</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonparallel|tooltip_text">Parallel</property>
                 <property name="action_name">.uno:WrapOn</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonparallel-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Parallel</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonparallel-atkobject">Parallel</property>
                   </object>
                 </child>
               </object>
@@ -72,14 +72,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Optimal</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonoptimal|tooltip_text">Optimal</property>
                 <property name="action_name">.uno:WrapIdeal</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonoptimal-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Optimal</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonoptimal-atkobject">Optimal</property>
                   </object>
                 </child>
               </object>
@@ -95,14 +95,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Before</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonbefore|tooltip_text">Before</property>
                 <property name="action_name">.uno:WrapLeft</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonbefore-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Before</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonbefore-atkobject">Before</property>
                   </object>
                 </child>
               </object>
@@ -118,14 +118,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">After</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonafter|tooltip_text">After</property>
                 <property name="action_name">.uno:WrapRight</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonafter-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">After</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonafter-atkobject">After</property>
                   </object>
                 </child>
               </object>
@@ -141,14 +141,14 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Through</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonthrough|tooltip_text">Through</property>
                 <property name="action_name">.uno:WrapThrough</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="buttonthrough-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Through</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonthrough-atkobject">Through</property>
                   </object>
                 </child>
               </object>
@@ -172,11 +172,11 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="enablecontour">
-                <property name="label" translatable="yes">Enable Contour</property>
+                <property name="label" translatable="yes" context="sidebarwrap|enablecontour">Enable Contour</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Click to automatically trim unnecessary parts of the image</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|enablecontour|tooltip_text">Click to automatically trim unnecessary parts of the image</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -188,11 +188,11 @@
             </child>
             <child>
               <object class="GtkButton" id="editcontour">
-                <property name="label" translatable="yes">Edit Contour</property>
+                <property name="label" translatable="yes" context="sidebarwrap|editcontour">Edit Contour</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Edit the trimmed area of the image</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|editcontour|tooltip_text">Edit the trimmed area of the image</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -216,7 +216,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spacing:</property>
+                <property name="label" translatable="yes" context="sidebarwrap|label1">Spacing:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -228,7 +228,7 @@
               <object class="svxcorelo-SpacingListBox" id="spacingLB">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Set the amount of space between the image and surrounding text</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarwrap|spacingLB|tooltip_text">Set the amount of space between the image and surrounding text</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -246,7 +246,7 @@
         <child>
           <object class="GtkLabel" id="customlabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Custom</property>
+            <property name="label" translatable="yes" context="sidebarwrap|customlabel">Custom</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index d7091b9c4615..5a44489a59ce 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
   <object class="GtkDialog" id="SortDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Sort</property>
+    <property name="title" translatable="yes" context="sortdialog|SortDialog">Sort</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -108,7 +108,7 @@
                           <object class="GtkLabel" id="column">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Column</property>
+                            <property name="label" translatable="yes" context="sortdialog|column">Column</property>
                             <accessibility>
                               <relation type="label-for" target="colsb1"/>
                               <relation type="label-for" target="colsb2"/>
@@ -124,7 +124,7 @@
                           <object class="GtkLabel" id="keytype">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Key type</property>
+                            <property name="label" translatable="yes" context="sortdialog|keytype">Key type</property>
                             <accessibility>
                               <relation type="label-for" target="typelb1"/>
                               <relation type="label-for" target="typelb2"/>
@@ -140,7 +140,7 @@
                           <object class="GtkLabel" id="order">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Order</property>
+                            <property name="label" translatable="yes" context="sortdialog|order">Order</property>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
@@ -154,7 +154,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="up1">
-                                <property name="label" translatable="yes">Ascending</property>
+                                <property name="label" translatable="yes" context="sortdialog|up1">Ascending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -174,7 +174,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="down1">
-                                <property name="label" translatable="yes">Descending</property>
+                                <property name="label" translatable="yes" context="sortdialog|down1">Descending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -204,7 +204,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="up2">
-                                <property name="label" translatable="yes">Ascending</property>
+                                <property name="label" translatable="yes" context="sortdialog|up2">Ascending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -223,7 +223,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="down2">
-                                <property name="label" translatable="yes">Descending</property>
+                                <property name="label" translatable="yes" context="sortdialog|down2">Descending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -253,7 +253,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="up3">
-                                <property name="label" translatable="yes">Ascending</property>
+                                <property name="label" translatable="yes" context="sortdialog|up3">Ascending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -272,7 +272,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="down3">
-                                <property name="label" translatable="yes">Descending</property>
+                                <property name="label" translatable="yes" context="sortdialog|down3">Descending</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -297,7 +297,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="key1">
-                            <property name="label" translatable="yes">Key 1</property>
+                            <property name="label" translatable="yes" context="sortdialog|key1">Key 1</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -313,7 +313,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="key2">
-                            <property name="label" translatable="yes">Key 2</property>
+                            <property name="label" translatable="yes" context="sortdialog|key2">Key 2</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -328,7 +328,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="key3">
-                            <property name="label" translatable="yes">Key 3</property>
+                            <property name="label" translatable="yes" context="sortdialog|key3">Key 3</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -405,7 +405,7 @@
                             </accessibility>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="typelb1-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb1-atkobject">Key type</property>
                               </object>
                             </child>
                           </object>
@@ -428,7 +428,7 @@
                             </accessibility>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="typelb2-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb2-atkobject">Key type</property>
                               </object>
                             </child>
                           </object>
@@ -449,7 +449,7 @@
                             </accessibility>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="typelb3-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+                                <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb3-atkobject">Key type</property>
                               </object>
                             </child>
                           </object>
@@ -469,7 +469,7 @@
                   <object class="GtkLabel" id="1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sort Criteria</property>
+                    <property name="label" translatable="yes" context="sortdialog|1">Sort Criteria</property>
                     <property name="xalign">0.56000000238418579</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -509,7 +509,7 @@
                             <property name="row_spacing">10</property>
                             <child>
                               <object class="GtkRadioButton" id="columns">
-                                <property name="label" translatable="yes">Columns</property>
+                                <property name="label" translatable="yes" context="sortdialog|columns">Columns</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -525,7 +525,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="rows">
-                                <property name="label" translatable="yes">Rows</property>
+                                <property name="label" translatable="yes" context="sortdialog|rows">Rows</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -547,7 +547,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Direction</property>
+                        <property name="label" translatable="yes" context="sortdialog|label3">Direction</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -580,7 +580,7 @@
                             <property name="row_spacing">10</property>
                             <child>
                               <object class="GtkRadioButton" id="tabs">
-                                <property name="label" translatable="yes">Tabs</property>
+                                <property name="label" translatable="yes" context="sortdialog|tabs">Tabs</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -597,7 +597,7 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="character">
-                                <property name="label" translatable="yes">Character </property>
+                                <property name="label" translatable="yes" context="sortdialog|character">Character </property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -638,7 +638,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="delimpb">
-                                    <property name="label" translatable="yes">Select...</property>
+                                    <property name="label" translatable="yes" context="sortdialog|delimpb">Select...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -666,7 +666,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Separator</property>
+                        <property name="label" translatable="yes" context="sortdialog|label4">Separator</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -716,7 +716,7 @@
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Language</property>
+                        <property name="label" translatable="yes" context="sortdialog|label1">Language</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -742,7 +742,7 @@
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="matchcase">
-                            <property name="label" translatable="yes">Match case</property>
+                            <property name="label" translatable="yes" context="sortdialog|matchcase">Match case</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -756,7 +756,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Setting</property>
+                        <property name="label" translatable="yes" context="sortdialog|label2">Setting</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/sw/uiconfig/swriter/ui/spellmenu.ui b/sw/uiconfig/swriter/ui/spellmenu.ui
index 91c09f776374..9a5ac11f8ad2 100644
--- a/sw/uiconfig/swriter/ui/spellmenu.ui
+++ b/sw/uiconfig/swriter/ui/spellmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="ignoreall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">I_gnore All</property>
+        <property name="label" translatable="yes" context="spellmenu|ignoreall">I_gnore All</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="addmenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add to Dictionary</property>
+        <property name="label" translatable="yes" context="spellmenu|addmenu">_Add to Dictionary</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu">
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="add">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Add to Dictionary</property>
+        <property name="label" translatable="yes" context="spellmenu|add">_Add to Dictionary</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -52,7 +52,7 @@
       <object class="GtkMenuItem" id="correctmenu">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Always correct _to</property>
+        <property name="label" translatable="yes" context="spellmenu|correctmenu">Always correct _to</property>
         <child type="submenu">
           <object class="GtkMenu">
             <property name="visible">True</property>
@@ -78,7 +78,7 @@
       <object class="GtkMenuItem" id="langselection">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Set Language for Selection</property>
+        <property name="label" translatable="yes" context="spellmenu|langselection">Set Language for Selection</property>
         <child type="submenu">
           <object class="GtkMenu">
             <property name="visible">True</property>
@@ -91,7 +91,7 @@
       <object class="GtkMenuItem" id="langpara">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Set Language for Paragraph</property>
+        <property name="label" translatable="yes" context="spellmenu|langpara">Set Language for Paragraph</property>
         <child type="submenu">
           <object class="GtkMenu">
             <property name="visible">True</property>
@@ -110,7 +110,7 @@
       <object class="GtkMenuItem" id="accept">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Accept Change</property>
+        <property name="label" translatable="yes" context="spellmenu|accept">Accept Change</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -118,7 +118,7 @@
       <object class="GtkMenuItem" id="reject">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Reject Change</property>
+        <property name="label" translatable="yes" context="spellmenu|reject">Reject Change</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -126,7 +126,7 @@
       <object class="GtkMenuItem" id="next">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Next Change</property>
+        <property name="label" translatable="yes" context="spellmenu|next">Next Change</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -134,7 +134,7 @@
       <object class="GtkMenuItem" id="prev">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Previous Change</property>
+        <property name="label" translatable="yes" context="spellmenu|prev">Previous Change</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui
index a10c5f191b2f..7d657af84638 100644
--- a/sw/uiconfig/swriter/ui/splittable.ui
+++ b/sw/uiconfig/swriter/ui/splittable.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="SplitTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Split Table</property>
+    <property name="title" translatable="yes" context="splittable|SplitTableDialog">Split Table</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="copyheading">
-                        <property name="label" translatable="yes">Copy heading</property>
+                        <property name="label" translatable="yes" context="splittable|copyheading">Copy heading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -105,7 +105,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="customheadingapplystyle">
-                        <property name="label" translatable="yes">Custom heading (apply Style)</property>
+                        <property name="label" translatable="yes" context="splittable|customheadingapplystyle">Custom heading (apply Style)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -122,7 +122,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="customheading">
-                        <property name="label" translatable="yes">Custom heading</property>
+                        <property name="label" translatable="yes" context="splittable|customheading">Custom heading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -139,7 +139,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="noheading">
-                        <property name="label" translatable="yes">No heading</property>
+                        <property name="label" translatable="yes" context="splittable|noheading">No heading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Mode</property>
+                <property name="label" translatable="yes" context="splittable|label1">Mode</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
index b6a042b1d7d4..2b60092c347d 100644
--- a/sw/uiconfig/swriter/ui/statisticsinfopage.ui
+++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="StatisticsInfoPage">
     <property name="visible">True</property>
@@ -13,7 +13,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Pages:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label4">Pages:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nopages</property>
       </object>
@@ -27,7 +27,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Tables:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label5">Tables:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">notables</property>
       </object>
@@ -41,7 +41,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Images:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label6">Images:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nogrfs</property>
       </object>
@@ -55,7 +55,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">OLE objects:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label31">OLE objects:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nooles</property>
       </object>
@@ -69,7 +69,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Paragraphs:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label32">Paragraphs:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">noparas</property>
       </object>
@@ -83,7 +83,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Words:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label33">Words:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nowords</property>
       </object>
@@ -97,7 +97,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Characters:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label34">Characters:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nochars</property>
       </object>
@@ -111,7 +111,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Characters excluding spaces:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|label35">Characters excluding spaces:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nocharsexspaces</property>
       </object>
@@ -125,7 +125,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
-        <property name="label" translatable="yes">Lines:</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|lineft">Lines:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nolines</property>
       </object>
@@ -245,7 +245,7 @@
     </child>
     <child>
       <object class="GtkButton" id="update">
-        <property name="label" translatable="yes">Update</property>
+        <property name="label" translatable="yes" context="statisticsinfopage|update">Update</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/stringinput.ui b/sw/uiconfig/swriter/ui/stringinput.ui
index d764c60e515b..55e0b05fb798 100644
--- a/sw/uiconfig/swriter/ui/stringinput.ui
+++ b/sw/uiconfig/swriter/ui/stringinput.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="StringInputDialog">
     <property name="can_focus">False</property>
@@ -66,7 +66,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="label" translatable="yes" context="stringinput|name">Name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">edit</property>
                 <attributes>
diff --git a/sw/uiconfig/swriter/ui/subjectdialog.ui b/sw/uiconfig/swriter/ui/subjectdialog.ui
index 52b972a0333e..42c4eadb9618 100644
--- a/sw/uiconfig/swriter/ui/subjectdialog.ui
+++ b/sw/uiconfig/swriter/ui/subjectdialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">You did not specify a subject for this message.</property>
+    <property name="text" translatable="yes" context="subjectdialog|textbuffer1">You did not specify a subject for this message.</property>
   </object>
   <object class="GtkTextBuffer" id="textbuffer2">
-    <property name="text" translatable="yes">If you would like to provide one, please type it now.</property>
+    <property name="text" translatable="yes" context="subjectdialog|textbuffer2">If you would like to provide one, please type it now.</property>
   </object>
   <object class="GtkDialog" id="SubjectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">No Subject</property>
+    <property name="title" translatable="yes" context="subjectdialog|SubjectDialog">No Subject</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -135,7 +135,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Subject:</property>
+                    <property name="label" translatable="yes" context="subjectdialog|label1">Subject:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">edit</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 457074e4b3ad..e78f7f071c7a 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">56</property>
@@ -33,7 +33,7 @@
     <property name="row_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="adaptwidth">
-        <property name="label" translatable="yes">Adapt table _width</property>
+        <property name="label" translatable="yes" context="tablecolumnpage|adaptwidth">Adapt table _width</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -48,7 +48,7 @@
     </child>
     <child>
       <object class="GtkCheckButton" id="adaptcolumns">
-        <property name="label" translatable="yes">Ad_just columns proportionally</property>
+        <property name="label" translatable="yes" context="tablecolumnpage|adaptcolumns">Ad_just columns proportionally</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
@@ -70,7 +70,7 @@
           <object class="GtkLabel" id="spaceft">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Remaining space:</property>
+            <property name="label" translatable="yes" context="tablecolumnpage|spaceft">Remaining space:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">space-nospin:0.00cm</property>
           </object>
@@ -131,7 +131,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width2:0.0cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 2 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width2-atkobject">Column 2 Width</property>
                       </object>
                     </child>
                   </object>
@@ -152,7 +152,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width3:0.00cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 3 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width3-atkobject">Column 3 Width</property>
                       </object>
                     </child>
                   </object>
@@ -173,7 +173,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width4:0.00cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 4 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width4-atkobject">Column 4 Width</property>
                       </object>
                     </child>
                   </object>
@@ -194,7 +194,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width5:0.00cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 5 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width5-atkobject">Column 5 Width</property>
                       </object>
                     </child>
                   </object>
@@ -215,7 +215,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width6:0.00cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 6 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width6-atkobject">Column 6 Width</property>
                       </object>
                     </child>
                   </object>
@@ -321,7 +321,7 @@
                     <property name="digits">2</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="width1:0.00cm-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">Column 1 Width</property>
+                        <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property>
                       </object>
                     </child>
                   </object>
@@ -367,7 +367,7 @@
           <object class="GtkLabel" id="label26">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Column Width</property>
+            <property name="label" translatable="yes" context="tablecolumnpage|label26">Column Width</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/tablepreviewdialog.ui b/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
index fc03a3691b80..194d431ab4eb 100644
--- a/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
+++ b/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TablePreviewDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Mail Merge Recipients</property>
+    <property name="title" translatable="yes" context="tablepreviewdialog|TablePreviewDialog">Mail Merge Recipients</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -48,7 +48,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">The list below shows the contents of: %1</property>
+            <property name="label" translatable="yes" context="tablepreviewdialog|description">The list below shows the contents of: %1</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index f44d8cc04743..367822bb15bf 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TablePropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Table Properties</property>
+    <property name="title" translatable="yes" context="tableproperties|TablePropertiesDialog">Table Properties</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="table">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Table</property>
+                <property name="label" translatable="yes" context="tableproperties|table">Table</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="textflow">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Flow</property>
+                <property name="label" translatable="yes" context="tableproperties|textflow">Text Flow</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -124,7 +124,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="tableproperties|columns">Columns</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -138,7 +138,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="tableproperties|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -152,7 +152,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Background</property>
+                <property name="label" translatable="yes" context="tableproperties|background">Background</property>
               </object>
               <packing>
                 <property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index 4cbc99c06bc2..3220a8b9bb76 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">9999</property>
@@ -22,15 +22,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Horizontal</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Vertical</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Vertical</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Use superordinate object settings</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</col>
         <col id="1">4</col>
       </row>
     </data>
@@ -44,15 +44,15 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Top</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Centered</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Centered</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bottom</col>
+        <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Bottom</col>
         <col id="1">2</col>
       </row>
     </data>
@@ -94,7 +94,7 @@
                     <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="break">
-                        <property name="label" translatable="yes">_Break</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|break">_Break</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="page">
-                        <property name="label" translatable="yes">_Page</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|page">_Page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -129,7 +129,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="column">
-                        <property name="label" translatable="yes">Col_umn</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|column">Col_umn</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="before">
-                        <property name="label" translatable="yes">Be_fore</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|before">Be_fore</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -168,7 +168,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="after">
-                        <property name="label" translatable="yes">_After</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|after">_After</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -200,7 +200,7 @@
                     <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkCheckButton" id="pagestyle">
-                        <property name="label" translatable="yes">With Page St_yle</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|pagestyle">With Page St_yle</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -221,7 +221,7 @@
                       <object class="GtkCheckButton" id="pagenoft">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Page _number</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -255,7 +255,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="pagestylelb-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">With Page Style</property>
+                            <property name="AtkObject::accessible-name" translatable="yes" context="tabletextflowpage|pagestylelb-atkobject">With Page Style</property>
                           </object>
                         </child>
                       </object>
@@ -272,7 +272,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="split">
-                    <property name="label" translatable="yes">Allow _table to split across pages and columns</property>
+                    <property name="label" translatable="yes" context="tabletextflowpage|split">Allow _table to split across pages and columns</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -287,7 +287,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="splitrow">
-                    <property name="label" translatable="yes">Allow row to break a_cross pages and columns</property>
+                    <property name="label" translatable="yes" context="tabletextflowpage|splitrow">Allow row to break a_cross pages and columns</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -304,7 +304,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="keep">
-                    <property name="label" translatable="yes">_Keep with next paragraph</property>
+                    <property name="label" translatable="yes" context="tabletextflowpage|keep">_Keep with next paragraph</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -326,7 +326,7 @@
                       <object class="GtkLabel" id="label40">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Text _orientation</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|label40">Text _orientation</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">textdirection</property>
                       </object>
@@ -359,7 +359,7 @@
                     <property name="column_spacing">24</property>
                     <child>
                       <object class="GtkCheckButton" id="headline">
-                        <property name="label" translatable="yes">R_epeat heading</property>
+                        <property name="label" translatable="yes" context="tabletextflowpage|headline">R_epeat heading</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -381,7 +381,7 @@
                           <object class="GtkLabel" id="label38">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">The first </property>
+                            <property name="label" translatable="yes" context="tabletextflowpage|label38">The first </property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">repeatheadernf</property>
                           </object>
@@ -394,7 +394,7 @@
                           <object class="GtkLabel" id="label39">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">rows</property>
+                            <property name="label" translatable="yes" context="tabletextflowpage|label39">rows</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -433,7 +433,7 @@
           <object class="GtkLabel" id="label35">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Text Flow</property>
+            <property name="label" translatable="yes" context="tabletextflowpage|label35">Text Flow</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -466,7 +466,7 @@
                   <object class="GtkLabel" id="label41">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Vertical alignment</property>
+                    <property name="label" translatable="yes" context="tabletextflowpage|label41">_Vertical alignment</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">vertorient</property>
                   </object>
@@ -494,7 +494,7 @@
           <object class="GtkLabel" id="label36">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Alignment</property>
+            <property name="label" translatable="yes" context="tabletextflowpage|label36">Alignment</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui
index 9b3da4119e22..ca502941bdfb 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog1">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Character Style</property>
+    <property name="title" translatable="yes" context="templatedialog1|TemplateDialog1">Character Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -94,7 +94,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">_Standard</property>
+                <property name="label" translatable="yes" context="templatedialog1|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog1|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -140,7 +140,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="templatedialog1|font">Font</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="fonteffect">
                 <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="templatedialog1|fonteffect">Font Effects</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="templatedialog1|position">Position</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="asianlayout">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Layout</property>
+                <property name="label" translatable="yes" context="templatedialog1|asianlayout">Asian Layout</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="templatedialog1|background">Highlighting</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="templatedialog1|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui
index a9cba6d9f130..4fb764798d7e 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog16">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Numbering Style</property>
+    <property name="title" translatable="yes" context="templatedialog16|TemplateDialog16">Numbering Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -113,7 +113,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog16|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -126,7 +126,7 @@
               <object class="GtkLabel" id="bullets">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bullets</property>
+                <property name="label" translatable="yes" context="templatedialog16|bullets">Bullets</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="numbering">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Numbering Style</property>
+                <property name="label" translatable="yes" context="templatedialog16|numbering">Numbering Style</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="outline">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Outline</property>
+                <property name="label" translatable="yes" context="templatedialog16|outline">Outline</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="graphics">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Image</property>
+                <property name="label" translatable="yes" context="templatedialog16|graphics">Image</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="templatedialog16|position">Position</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="customize">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Customize</property>
+                <property name="label" translatable="yes" context="templatedialog16|customize">Customize</property>
               </object>
               <packing>
                 <property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 017cbd3db74b..1a2f2c251a40 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog2">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Paragraph Style</property>
+    <property name="title" translatable="yes" context="templatedialog2|TemplateDialog2">Paragraph Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -94,7 +94,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">_Standard</property>
+                <property name="label" translatable="yes" context="templatedialog2|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog2|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="indents">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Indents &amp; Spacing</property>
+                <property name="label" translatable="yes" context="templatedialog2|indents">Indents &amp; Spacing</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Alignment</property>
+                <property name="label" translatable="yes" context="templatedialog2|alignment">Alignment</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="textflow">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Flow</property>
+                <property name="label" translatable="yes" context="templatedialog2|textflow">Text Flow</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="asiantypo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Typography</property>
+                <property name="label" translatable="yes" context="templatedialog2|asiantypo">Asian Typography</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -196,7 +196,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="templatedialog2|font">Font</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="fonteffect">
                 <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="templatedialog2|fonteffect">Font Effects</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -224,7 +224,7 @@
               <object class="GtkLabel" id="position">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Position</property>
+                <property name="label" translatable="yes" context="templatedialog2|position">Position</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -238,7 +238,7 @@
               <object class="GtkLabel" id="asianlayout">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Asian Layout</property>
+                <property name="label" translatable="yes" context="templatedialog2|asianlayout">Asian Layout</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -252,7 +252,7 @@
               <object class="GtkLabel" id="highlighting">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Highlighting</property>
+                <property name="label" translatable="yes" context="templatedialog2|highlighting">Highlighting</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -265,7 +265,7 @@
               <object class="GtkLabel" id="outline">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Outline &amp; Numbering</property>
+                <property name="label" translatable="yes" context="templatedialog2|outline">Outline &amp; Numbering</property>
               </object>
               <packing>
                 <property name="position">9</property>
@@ -279,7 +279,7 @@
               <object class="GtkLabel" id="tabs">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Tabs</property>
+                <property name="label" translatable="yes" context="templatedialog2|tabs">Tabs</property>
               </object>
               <packing>
                 <property name="position">10</property>
@@ -293,7 +293,7 @@
               <object class="GtkLabel" id="dropcaps">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Drop Caps</property>
+                <property name="label" translatable="yes" context="templatedialog2|dropcaps">Drop Caps</property>
               </object>
               <packing>
                 <property name="position">11</property>
@@ -307,7 +307,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="templatedialog2|area">Area</property>
               </object>
               <packing>
                 <property name="position">12</property>
@@ -321,7 +321,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="templatedialog2|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">13</property>
@@ -335,7 +335,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="templatedialog2|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">14</property>
@@ -349,7 +349,7 @@
               <object class="GtkLabel" id="condition">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Condition</property>
+                <property name="label" translatable="yes" context="templatedialog2|condition">Condition</property>
               </object>
               <packing>
                 <property name="position">15</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 18e13789f5a1..acfff8009383 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog4">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Frame Style</property>
+    <property name="title" translatable="yes" context="templatedialog4|TemplateDialog4">Frame Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -94,7 +94,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label" translatable="yes">_Standard</property>
+                <property name="label" translatable="yes" context="templatedialog4|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -127,7 +127,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog4|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="type">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Type</property>
+                <property name="label" translatable="yes" context="templatedialog4|type">Type</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="options">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="templatedialog4|options">Options</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="wrap">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Wrap</property>
+                <property name="label" translatable="yes" context="templatedialog4|wrap">Wrap</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="templatedialog4|area">Area</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="templatedialog4|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="templatedialog4|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -224,7 +224,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="templatedialog4|columns">Columns</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -238,7 +238,7 @@
               <object class="GtkLabel" id="macros">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Macro</property>
+                <property name="label" translatable="yes" context="templatedialog4|macros">Macro</property>
               </object>
               <packing>
                 <property name="position">8</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 27c035b74cf2..232e0609e7e7 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TemplateDialog8">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Page Style</property>
+    <property name="title" translatable="yes" context="templatedialog8|TemplateDialog8">Page Style</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -113,7 +113,7 @@
               <object class="GtkLabel" id="organizer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Organizer</property>
+                <property name="label" translatable="yes" context="templatedialog8|organizer">Organizer</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -126,7 +126,7 @@
               <object class="GtkLabel" id="page">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page</property>
+                <property name="label" translatable="yes" context="templatedialog8|page">Page</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -140,7 +140,7 @@
               <object class="GtkLabel" id="area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Area</property>
+                <property name="label" translatable="yes" context="templatedialog8|area">Area</property>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -154,7 +154,7 @@
               <object class="GtkLabel" id="transparence">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Transparency</property>
+                <property name="label" translatable="yes" context="templatedialog8|transparence">Transparency</property>
               </object>
               <packing>
                 <property name="position">3</property>
@@ -168,7 +168,7 @@
               <object class="GtkLabel" id="header">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Header</property>
+                <property name="label" translatable="yes" context="templatedialog8|header">Header</property>
               </object>
               <packing>
                 <property name="position">4</property>
@@ -182,7 +182,7 @@
               <object class="GtkLabel" id="footer">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footer</property>
+                <property name="label" translatable="yes" context="templatedialog8|footer">Footer</property>
               </object>
               <packing>
                 <property name="position">5</property>
@@ -196,7 +196,7 @@
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Borders</property>
+                <property name="label" translatable="yes" context="templatedialog8|borders">Borders</property>
               </object>
               <packing>
                 <property name="position">6</property>
@@ -210,7 +210,7 @@
               <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Columns</property>
+                <property name="label" translatable="yes" context="templatedialog8|columns">Columns</property>
               </object>
               <packing>
                 <property name="position">7</property>
@@ -224,7 +224,7 @@
               <object class="GtkLabel" id="footnotes">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Footnote</property>
+                <property name="label" translatable="yes" context="templatedialog8|footnotes">Footnote</property>
               </object>
               <packing>
                 <property name="position">8</property>
@@ -238,7 +238,7 @@
               <object class="GtkLabel" id="textgrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Text Grid</property>
+                <property name="label" translatable="yes" context="templatedialog8|textgrid">Text Grid</property>
               </object>
               <packing>
                 <property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui b/sw/uiconfig/swriter/ui/testmailsettings.ui
index 697dbe7e54e7..1f4ce77fd1ba 100644
--- a/sw/uiconfig/swriter/ui/testmailsettings.ui
+++ b/sw/uiconfig/swriter/ui/testmailsettings.ui
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings</property>
+    <property name="text" translatable="yes" context="testmailsettings|textbuffer1">%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings</property>
   </object>
   <object class="GtkDialog" id="TestMailSettings">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Test Account Settings</property>
+    <property name="title" translatable="yes" context="testmailsettings|TestMailSettings">Test Account Settings</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -121,7 +121,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Establish network connection</property>
+                        <property name="label" translatable="yes" context="testmailsettings|establish">Establish network connection</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -133,7 +133,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Find outgoing mail server</property>
+                        <property name="label" translatable="yes" context="testmailsettings|find">Find outgoing mail server</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -145,7 +145,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Successful</property>
+                        <property name="label" translatable="yes" context="testmailsettings|result1">Successful</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -157,7 +157,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Failed</property>
+                        <property name="label" translatable="yes" context="testmailsettings|result2">Failed</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -172,7 +172,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">%PRODUCTNAME is testing the e-mail account settings...</property>
+                <property name="label" translatable="yes" context="testmailsettings|label8">%PRODUCTNAME is testing the e-mail account settings...</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -238,7 +238,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Errors</property>
+                <property name="label" translatable="yes" context="testmailsettings|label1">Errors</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index a0f575fa39f6..80a8dd783d46 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentCHARSPERLINE">
@@ -53,7 +53,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="radioRB_NOGRID">
-                        <property name="label" translatable="yes">No grid</property>
+                        <property name="label" translatable="yes" context="textgridpage|radioRB_NOGRID">No grid</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -69,7 +69,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioRB_LINESGRID">
-                        <property name="label" translatable="yes">Grid (lines only)</property>
+                        <property name="label" translatable="yes" context="textgridpage|radioRB_LINESGRID">Grid (lines only)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -84,7 +84,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radioRB_CHARSGRID">
-                        <property name="label" translatable="yes">Grid (lines and characters)</property>
+                        <property name="label" translatable="yes" context="textgridpage|radioRB_CHARSGRID">Grid (lines and characters)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -99,7 +99,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_SNAPTOCHARS">
-                        <property name="label" translatable="yes">_Snap to characters</property>
+                        <property name="label" translatable="yes" context="textgridpage|checkCB_SNAPTOCHARS">_Snap to characters</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -144,7 +144,7 @@
           <object class="GtkLabel" id="labelGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Grid</property>
+            <property name="label" translatable="yes" context="textgridpage|labelGrid">Grid</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -194,7 +194,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Characters per line:</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_CHARSPERLINE">Characters per line:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinNF_CHARSPERLINE</property>
                           </object>
@@ -220,7 +220,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">(1-45)</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_CHARRANGE">(1-45)</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -233,7 +233,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Lines per page:</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_LINESPERPAGE">Lines per page:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinNF_LINESPERPAGE</property>
                           </object>
@@ -262,7 +262,7 @@
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="ypad">4</property>
-                            <property name="label" translatable="yes">(1-48)</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_LINERANGE">(1-48)</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -300,7 +300,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Character _width:</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_CHARWIDTH">Character _width:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMF_CHARWIDTH:0pt</property>
                           </object>
@@ -314,7 +314,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Max. Ruby text size:</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_RUBYSIZE">Max. Ruby text size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMF_RUBYSIZE:0pt</property>
                           </object>
@@ -340,7 +340,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Max. base text size:</property>
+                            <property name="label" translatable="yes" context="textgridpage|labelFT_TEXTSIZE">Max. base text size:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spinMF_TEXTSIZE:0pt</property>
                           </object>
@@ -376,7 +376,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_RUBYBELOW">
-                    <property name="label" translatable="yes">Ruby text below/left from base text</property>
+                    <property name="label" translatable="yes" context="textgridpage|checkCB_RUBYBELOW">Ruby text below/left from base text</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -399,7 +399,7 @@
           <object class="GtkLabel" id="labelGridLayout">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Grid Layout</property>
+            <property name="label" translatable="yes" context="textgridpage|labelGridLayout">Grid Layout</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -432,7 +432,7 @@
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_DISPLAY">
-                    <property name="label" translatable="yes">Display grid</property>
+                    <property name="label" translatable="yes" context="textgridpage|checkCB_DISPLAY">Display grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -447,7 +447,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="checkCB_PRINT">
-                    <property name="label" translatable="yes">Print grid</property>
+                    <property name="label" translatable="yes" context="textgridpage|checkCB_PRINT">Print grid</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -466,7 +466,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Grid color:</property>
+                    <property name="label" translatable="yes" context="textgridpage|labelFT_COLOR">Grid color:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">listLB_COLOR</property>
                   </object>
@@ -501,7 +501,7 @@
           <object class="GtkLabel" id="labelFL_DISPLAY">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Grid Display</property>
+            <property name="label" translatable="yes" context="textgridpage|labelFL_DISPLAY">Grid Display</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 42aeaf7e623e..3a4477f4fac5 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -12,7 +12,7 @@
   <object class="GtkDialog" id="DLG_TITLEPAGE">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Title Page</property>
+    <property name="title" translatable="yes" context="titlepage|DLG_TITLEPAGE">Title Page</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -106,7 +106,7 @@
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Number of title pages:</property>
+                            <property name="label" translatable="yes" context="titlepage|label6">Number of title pages:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">NF_PAGE_COUNT</property>
                           </object>
@@ -120,7 +120,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Place title pages at:</property>
+                            <property name="label" translatable="yes" context="titlepage|label7">Place title pages at:</property>
                             <accessibility>
                               <relation type="label-for" target="RB_DOCUMENT_START"/>
                               <relation type="label-for" target="RB_PAGE_START"/>
@@ -170,7 +170,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES">
-                            <property name="label" translatable="yes">Converting existing pages to title pages</property>
+                            <property name="label" translatable="yes" context="titlepage|RB_USE_EXISTING_PAGES">Converting existing pages to title pages</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -188,7 +188,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES">
-                            <property name="label" translatable="yes">Insert new title pages</property>
+                            <property name="label" translatable="yes" context="titlepage|RB_INSERT_NEW_PAGES">Insert new title pages</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -206,7 +206,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="RB_DOCUMENT_START">
-                            <property name="label" translatable="yes">Document start</property>
+                            <property name="label" translatable="yes" context="titlepage|RB_DOCUMENT_START">Document start</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -226,7 +226,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="RB_PAGE_START">
-                            <property name="label" translatable="yes">Page</property>
+                            <property name="label" translatable="yes" context="titlepage|RB_PAGE_START">Page</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -257,7 +257,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Make Title Pages</property>
+                    <property name="label" translatable="yes" context="titlepage|label1">Make Title Pages</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -290,7 +290,7 @@
                         <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkCheckButton" id="CB_RESTART_NUMBERING">
-                            <property name="label" translatable="yes">Reset page numbering after title pages</property>
+                            <property name="label" translatable="yes" context="titlepage|CB_RESTART_NUMBERING">Reset page numbering after title pages</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -317,7 +317,7 @@
                                   <object class="GtkLabel" id="FT_PAGE_COUNT">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Page number:</property>
+                                    <property name="label" translatable="yes" context="titlepage|FT_PAGE_COUNT">Page number:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
                                   </object>
@@ -354,7 +354,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER">
-                            <property name="label" translatable="yes">Set page number for first title page</property>
+                            <property name="label" translatable="yes" context="titlepage|CB_SET_PAGE_NUMBER">Set page number for first title page</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -381,7 +381,7 @@
                                   <object class="GtkLabel" id="FT_PAGE_PAGES">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Page number:</property>
+                                    <property name="label" translatable="yes" context="titlepage|FT_PAGE_PAGES">Page number:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
                                   </object>
@@ -424,7 +424,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Page Numbering</property>
+                    <property name="label" translatable="yes" context="titlepage|label2">Page Numbering</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -458,7 +458,7 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Style:</property>
+                            <property name="label" translatable="yes" context="titlepage|label4">_Style:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_PAGE_PROPERTIES</property>
                           </object>
@@ -481,7 +481,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="PB_PAGE_PROPERTIES">
-                            <property name="label" translatable="yes">Edit...</property>
+                            <property name="label" translatable="yes" context="titlepage|PB_PAGE_PROPERTIES">Edit...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -500,7 +500,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Edit Page Properties</property>
+                    <property name="label" translatable="yes" context="titlepage|label3">Edit Page Properties</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui
index d90952818a15..024a69ca046d 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="TocDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Table of Contents, Index or Bibliography</property>
+    <property name="title" translatable="yes" context="tocdialog|TocDialog">Table of Contents, Index or Bibliography</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -79,7 +79,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="showexample">
-                <property name="label" translatable="yes">Preview</property>
+                <property name="label" translatable="yes" context="tocdialog|showexample">Preview</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -116,7 +116,7 @@
                 <property name="can_focus">False</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="example-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+                    <property name="AtkObject::accessible-name" translatable="yes" context="tocdialog|example-atkobject">Preview</property>
                   </object>
                 </child>
               </object>
@@ -139,7 +139,7 @@
                   <object class="GtkLabel" id="index">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Type</property>
+                    <property name="label" translatable="yes" context="tocdialog|index">Type</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -152,7 +152,7 @@
                   <object class="GtkLabel" id="entries">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Entries</property>
+                    <property name="label" translatable="yes" context="tocdialog|entries">Entries</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -166,7 +166,7 @@
                   <object class="GtkLabel" id="styles">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Styles</property>
+                    <property name="label" translatable="yes" context="tocdialog|styles">Styles</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
@@ -180,7 +180,7 @@
                   <object class="GtkLabel" id="columns">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Columns</property>
+                    <property name="label" translatable="yes" context="tocdialog|columns">Columns</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
@@ -194,7 +194,7 @@
                   <object class="GtkLabel" id="background">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Background</property>
+                    <property name="label" translatable="yes" context="tocdialog|background">Background</property>
                   </object>
                   <packing>
                     <property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index e4fa94bd16b4..848b2852f84a 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -93,7 +93,7 @@
                   <object class="GtkLabel" id="levelft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Level</property>
+                    <property name="label" translatable="yes" context="tocentriespage|levelft">_Level</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -109,7 +109,7 @@
                   <object class="GtkLabel" id="typeft">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">_Type</property>
+                    <property name="label" translatable="yes" context="tocentriespage|typeft">_Type</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -165,7 +165,7 @@
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Structure:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|label4">_Structure:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">token</property>
                                 <property name="xalign">0</property>
@@ -177,7 +177,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="all">
-                                <property name="label" translatable="yes">_All</property>
+                                <property name="label" translatable="yes" context="tocentriespage|all">_All</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -217,7 +217,7 @@
                               <object class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Character style:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|label5">Character style:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">charstyle</property>
                                 <property name="xalign">0</property>
@@ -229,7 +229,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="edit">
-                                <property name="label" translatable="yes">_Edit...</property>
+                                <property name="label" translatable="yes" context="tocentriespage|edit">_Edit...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -256,7 +256,7 @@
                               <object class="GtkLabel" id="fillcharft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Fill character:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|fillcharft">Fill character:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">fillchar</property>
                                 <property name="xalign">0</property>
@@ -288,7 +288,7 @@
                               <object class="GtkLabel" id="tabstopposft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Tab stop position:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|tabstopposft">Tab stop position:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">tabstoppos:0.00cm</property>
                                 <property name="xalign">0</property>
@@ -315,7 +315,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="alignright">
-                                <property name="label" translatable="yes">Align right</property>
+                                <property name="label" translatable="yes" context="tocentriespage|alignright">Align right</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -332,7 +332,7 @@
                               <object class="GtkLabel" id="chapterentryft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Chapter entry:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|chapterentryft">Chapter entry:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">chapterentry</property>
                                 <property name="xalign">0</property>
@@ -349,9 +349,9 @@
                                 <property name="valign">center</property>
                                 <property name="hexpand">True</property>
                                 <items>
-                                  <item translatable="yes">Number range only</item>
-                                  <item translatable="yes">Description only</item>
-                                  <item translatable="yes">Number range and description</item>
+                                  <item translatable="yes" context="tocentriespage|chapterentry">Number range only</item>
+                                  <item translatable="yes" context="tocentriespage|chapterentry">Description only</item>
+                                  <item translatable="yes" context="tocentriespage|chapterentry">Number range and description</item>
                                 </items>
                               </object>
                               <packing>
@@ -363,7 +363,7 @@
                               <object class="GtkLabel" id="entryoutlinelevelft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Evaluate up to level:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|entryoutlinelevelft">Evaluate up to level:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">entryoutlinelevel</property>
                                 <property name="xalign">0</property>
@@ -391,7 +391,7 @@
                               <object class="GtkLabel" id="numberformatft">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Format:</property>
+                                <property name="label" translatable="yes" context="tocentriespage|numberformatft">Format:</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">numberformat</property>
                                 <property name="xalign">0</property>
@@ -408,8 +408,8 @@
                                 <property name="valign">center</property>
                                 <property name="hexpand">True</property>
                                 <items>
-                                  <item translatable="yes">Number</item>
-                                  <item translatable="yes">Number without separator</item>
+                                  <item translatable="yes" context="tocentriespage|numberformat">Number</item>
+                                  <item translatable="yes" context="tocentriespage|numberformat">Number without separator</item>
                                 </items>
                               </object>
                               <packing>
@@ -461,7 +461,7 @@
                                 <property name="layout_style">spread</property>
                                 <child>
                                   <object class="GtkButton" id="insert">
-                                    <property name="label" translatable="yes">_Insert</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|insert">_Insert</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -475,7 +475,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="remove">
-                                    <property name="label" translatable="yes">_Remove</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|remove">_Remove</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -489,7 +489,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="chapterno">
-                                    <property name="label" translatable="yes">Chapter No.</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|chapterno">Chapter No.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -503,7 +503,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="entrytext">
-                                    <property name="label" translatable="yes">Entry Text</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|entrytext">Entry Text</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -516,7 +516,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="tabstop">
-                                    <property name="label" translatable="yes">Tab Stop</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|tabstop">Tab Stop</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -530,7 +530,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="chapterinfo">
-                                    <property name="label" translatable="yes">_Chapter Info</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|chapterinfo">_Chapter Info</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -544,7 +544,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="pageno">
-                                    <property name="label" translatable="yes">Page No.</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|pageno">Page No.</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -558,7 +558,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="hyperlink">
-                                    <property name="label" translatable="yes">H_yperlink</property>
+                                    <property name="label" translatable="yes" context="tocentriespage|hyperlink">H_yperlink</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -591,7 +591,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Structure and Formatting</property>
+                    <property name="label" translatable="yes" context="tocentriespage|label1">Structure and Formatting</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -626,7 +626,7 @@
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkCheckButton" id="reltostyle">
-                            <property name="label" translatable="yes">Tab position relati_ve to paragraph style indent</property>
+                            <property name="label" translatable="yes" context="tocentriespage|reltostyle">Tab position relati_ve to paragraph style indent</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -642,7 +642,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="commasep">
-                            <property name="label" translatable="yes">Key separated by commas</property>
+                            <property name="label" translatable="yes" context="tocentriespage|commasep">Key separated by commas</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -658,7 +658,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="alphadelim">
-                            <property name="label" translatable="yes">Alphabetical delimiter</property>
+                            <property name="label" translatable="yes" context="tocentriespage|alphadelim">Alphabetical delimiter</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -676,7 +676,7 @@
                           <object class="GtkLabel" id="mainstyleft">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Character style for main entries:</property>
+                            <property name="label" translatable="yes" context="tocentriespage|mainstyleft">Character style for main entries:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">mainstyle</property>
                             <property name="xalign">0</property>
@@ -704,7 +704,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Format</property>
+                    <property name="label" translatable="yes" context="tocentriespage|label3">Format</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -738,7 +738,7 @@
                         <property name="column_spacing">18</property>
                         <child>
                           <object class="GtkRadioButton" id="sortpos">
-                            <property name="label" translatable="yes">Document _position</property>
+                            <property name="label" translatable="yes" context="tocentriespage|sortpos">Document _position</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -755,7 +755,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="sortcontents">
-                            <property name="label" translatable="yes">_Content</property>
+                            <property name="label" translatable="yes" context="tocentriespage|sortcontents">_Content</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -777,7 +777,7 @@
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sort by</property>
+                    <property name="label" translatable="yes" context="tocentriespage|label14">Sort by</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -814,7 +814,7 @@
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_1:</property>
+                            <property name="label" translatable="yes" context="tocentriespage|label15">_1:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -838,7 +838,7 @@
                           <object class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_2:</property>
+                            <property name="label" translatable="yes" context="tocentriespage|label16">_2:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -850,7 +850,7 @@
                           <object class="GtkLabel" id="label17">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_3:</property>
+                            <property name="label" translatable="yes" context="tocentriespage|label17">_3:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -887,7 +887,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Ascending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|up1cb|tooltip_text">Ascending</property>
                             <property name="image">image1</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
@@ -904,7 +904,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Descending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|down1cb|tooltip_text">Descending</property>
                             <property name="image">image2</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -921,7 +921,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Ascending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|up2cb|tooltip_text">Ascending</property>
                             <property name="image">image3</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -938,7 +938,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Ascending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|up3cb|tooltip_text">Ascending</property>
                             <property name="image">image4</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -955,7 +955,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Descending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|down2cb|tooltip_text">Descending</property>
                             <property name="image">image5</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -972,7 +972,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Descending</property>
+                            <property name="tooltip_text" translatable="yes" context="tocentriespage|down3cb|tooltip_text">Descending</property>
                             <property name="image">image6</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -991,7 +991,7 @@
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Sort Keys</property>
+                    <property name="label" translatable="yes" context="tocentriespage|label13">Sort Keys</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 59056608f0cb..02e8e756f958 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -17,7 +17,7 @@
       <object class="GtkMenuItem" id="open">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Open</property>
+        <property name="label" translatable="yes" context="tocindexpage|open">Open</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -25,7 +25,7 @@
       <object class="GtkMenuItem" id="new">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_New...</property>
+        <property name="label" translatable="yes" context="tocindexpage|new">_New...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -33,7 +33,7 @@
       <object class="GtkMenuItem" id="edit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Edit...</property>
+        <property name="label" translatable="yes" context="tocindexpage|edit">_Edit...</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,31 +47,31 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Table of Contents</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Table of Contents</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Alphabetical Index</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Alphabetical Index</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Illustration Index</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Illustration Index</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Index of Tables</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Index of Tables</col>
         <col id="1">8</col>
       </row>
       <row>
-        <col id="0" translatable="yes">User-Defined</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">User-Defined</col>
         <col id="1">16</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Table of Objects</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Table of Objects</col>
         <col id="1">32</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Bibliography</col>
+        <col id="0" translatable="yes" context="tocindexpage|liststore1">Bibliography</col>
         <col id="1">64</col>
       </row>
     </data>
@@ -108,7 +108,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Title:</property>
+                    <property name="label" translatable="yes" context="tocindexpage|mainstyleft">_Title:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">title</property>
                   </object>
@@ -134,7 +134,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Type:</property>
+                    <property name="label" translatable="yes" context="tocindexpage|typeft">Type:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">type</property>
                   </object>
@@ -157,7 +157,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="readonly">
-                    <property name="label" translatable="yes">Protected against manual changes</property>
+                    <property name="label" translatable="yes" context="tocindexpage|readonly">Protected against manual changes</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -180,7 +180,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Type and Title</property>
+            <property name="label" translatable="yes" context="tocindexpage|label3">Type and Title</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -223,7 +223,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">For:</property>
+                        <property name="label" translatable="yes" context="tocindexpage|mainstyleft2">For:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">scope</property>
                       </object>
@@ -237,8 +237,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <items>
-                          <item translatable="yes">Entire document</item>
-                          <item translatable="yes">Chapter</item>
+                          <item translatable="yes" context="tocindexpage|scope">Entire document</item>
+                          <item translatable="yes" context="tocindexpage|scope">Chapter</item>
                         </items>
                       </object>
                       <packing>
@@ -262,7 +262,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Evaluate up to level:</property>
+                        <property name="label" translatable="yes" context="tocindexpage|levelft">Evaluate up to level:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">level</property>
                       </object>
@@ -297,7 +297,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Create Index or Table of Contents</property>
+            <property name="label" translatable="yes" context="tocindexpage|label1">Create Index or Table of Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -338,7 +338,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="fromheadings">
-                        <property name="label" translatable="yes">Outline</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromheadings">Outline</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -354,7 +354,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="indexmarks">
-                        <property name="label" translatable="yes">Inde_x marks</property>
+                        <property name="label" translatable="yes" context="tocindexpage|indexmarks">Inde_x marks</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -370,7 +370,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fromtables">
-                        <property name="label" translatable="yes">Tables</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromtables">Tables</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -385,7 +385,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fromframes">
-                        <property name="label" translatable="yes">Te_xt frames</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromframes">Te_xt frames</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -400,7 +400,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fromgraphics">
-                        <property name="label" translatable="yes">Graphics</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromgraphics">Graphics</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -415,7 +415,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fromoles">
-                        <property name="label" translatable="yes">OLE objects</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromoles">OLE objects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -430,7 +430,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="uselevel">
-                        <property name="label" translatable="yes">Use level from source chapter</property>
+                        <property name="label" translatable="yes" context="tocindexpage|uselevel">Use level from source chapter</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -459,7 +459,7 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="addstylescb">
-                                <property name="label" translatable="yes">_Additional styles</property>
+                                <property name="label" translatable="yes" context="tocindexpage|addstylescb">_Additional styles</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -475,7 +475,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="stylescb">
-                                <property name="label" translatable="yes">Styl_es</property>
+                                <property name="label" translatable="yes" context="tocindexpage|stylescb">Styl_es</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="no_show_all">True</property>
@@ -498,7 +498,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="styles">
-                            <property name="label" translatable="yes">Assign styles...</property>
+                            <property name="label" translatable="yes" context="tocindexpage|styles">Assign styles...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -544,7 +544,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkRadioButton" id="captions">
-                        <property name="label" translatable="yes">Captions</property>
+                        <property name="label" translatable="yes" context="tocindexpage|captions">Captions</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -559,7 +559,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="objnames">
-                        <property name="label" translatable="yes">Object names</property>
+                        <property name="label" translatable="yes" context="tocindexpage|objnames">Object names</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="no_show_all">True</property>
@@ -583,7 +583,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Category:</property>
+                            <property name="label" translatable="yes" context="tocindexpage|categoryft">Category:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">lang</property>
                           </object>
@@ -607,7 +607,7 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Display:</property>
+                            <property name="label" translatable="yes" context="tocindexpage|displayft">Display:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">lang</property>
                           </object>
@@ -621,9 +621,9 @@
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <items>
-                              <item translatable="yes">References</item>
-                              <item translatable="yes">Category and Number</item>
-                              <item translatable="yes">Caption Text</item>
+                              <item translatable="yes" context="tocindexpage|display">References</item>
+                              <item translatable="yes" context="tocindexpage|display">Category and Number</item>
+                              <item translatable="yes" context="tocindexpage|display">Caption Text</item>
                             </items>
                           </object>
                           <packing>
@@ -652,7 +652,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Create From</property>
+            <property name="label" translatable="yes" context="tocindexpage|label2">Create From</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -695,7 +695,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Create From the Following Objects</property>
+            <property name="label" translatable="yes" context="tocindexpage|label6">Create From the Following Objects</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -734,7 +734,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Brackets:</property>
+                    <property name="label" translatable="yes" context="tocindexpage|mainstyleft9">_Brackets:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">brackets</property>
                   </object>
@@ -745,7 +745,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="numberentries">
-                    <property name="label" translatable="yes">_Number entries</property>
+                    <property name="label" translatable="yes" context="tocindexpage|numberentries">_Number entries</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -765,11 +765,11 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item translatable="yes">[none]</item>
-                      <item translatable="yes">[]</item>
-                      <item translatable="yes">()</item>
-                      <item translatable="yes">{}</item>
-                      <item translatable="yes">&lt;&gt;</item>
+                      <item translatable="yes" context="tocindexpage|brackets">[none]</item>
+                      <item translatable="yes" context="tocindexpage|brackets">[]</item>
+                      <item translatable="yes" context="tocindexpage|brackets">()</item>
+                      <item translatable="yes" context="tocindexpage|brackets">{}</item>
+                      <item translatable="yes" context="tocindexpage|brackets">&lt;&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -785,7 +785,7 @@
           <object class="GtkLabel" id="label7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Formatting of the Entries</property>
+            <property name="label" translatable="yes" context="tocindexpage|label7">Formatting of the Entries</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -827,7 +827,7 @@
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkCheckButton" id="combinesame">
-                        <property name="label" translatable="yes">Combine identical entries</property>
+                        <property name="label" translatable="yes" context="tocindexpage|combinesame">Combine identical entries</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -842,7 +842,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="useff">
-                        <property name="label" translatable="yes">Combine identical entries with p or _pp</property>
+                        <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with p or _pp</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -858,7 +858,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="usedash">
-                        <property name="label" translatable="yes">Combine with -</property>
+                        <property name="label" translatable="yes" context="tocindexpage|usedash">Combine with -</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -874,7 +874,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="casesens">
-                        <property name="label" translatable="yes">Case sensitive</property>
+                        <property name="label" translatable="yes" context="tocindexpage|casesens">Case sensitive</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -890,7 +890,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="initcaps">
-                        <property name="label" translatable="yes">AutoCapitalize entries</property>
+                        <property name="label" translatable="yes" context="tocindexpage|initcaps">AutoCapitalize entries</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -905,7 +905,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="keyasentry">
-                        <property name="label" translatable="yes">Keys as separate entries</property>
+                        <property name="label" translatable="yes" context="tocindexpage|keyasentry">Keys as separate entries</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -920,7 +920,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fromfile">
-                        <property name="label" translatable="yes">_Concordance file</property>
+                        <property name="label" translatable="yes" context="tocindexpage|fromfile">_Concordance file</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -935,7 +935,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="file:filemenu">
-                        <property name="label" translatable="yes">_File</property>
+                        <property name="label" translatable="yes" context="tocindexpage|file">_File</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -956,7 +956,7 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="tocindexpage|label5">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -999,7 +999,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Language:</property>
+                            <property name="label" translatable="yes" context="tocindexpage|mainstyleft3">Language:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">lang</property>
                           </object>
@@ -1034,7 +1034,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Key type:</property>
+                            <property name="label" translatable="yes" context="tocindexpage|mainstyleft5">Key type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">keytype</property>
                           </object>
@@ -1067,7 +1067,7 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Sort</property>
+                <property name="label" translatable="yes" context="tocindexpage|label4">Sort</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/sw/uiconfig/swriter/ui/tocstylespage.ui b/sw/uiconfig/swriter/ui/tocstylespage.ui
index f957634bb395..71aad339def3 100644
--- a/sw/uiconfig/swriter/ui/tocstylespage.ui
+++ b/sw/uiconfig/swriter/ui/tocstylespage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="TocStylesPage">
     <property name="visible">True</property>
@@ -36,7 +36,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Levels</property>
+                    <property name="label" translatable="yes" context="tocstylespage|label1">_Levels</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">levels:border</property>
                   </object>
@@ -52,7 +52,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Paragraph _Styles</property>
+                    <property name="label" translatable="yes" context="tocstylespage|label2">Paragraph _Styles</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">styles:border</property>
                   </object>
@@ -114,7 +114,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="default">
-                    <property name="label" translatable="yes">_Default</property>
+                    <property name="label" translatable="yes" context="tocstylespage|default">_Default</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -131,7 +131,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="edit">
-                    <property name="label" translatable="yes">_Edit</property>
+                    <property name="label" translatable="yes" context="tocstylespage|edit">_Edit</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -176,7 +176,7 @@
           <object class="GtkLabel" id="labelGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Assignment</property>
+            <property name="label" translatable="yes" context="tocstylespage|labelGrid">Assignment</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/sw/uiconfig/swriter/ui/tokenwidget.ui b/sw/uiconfig/swriter/ui/tokenwidget.ui
index e7642693b569..6be60f4915e1 100644
--- a/sw/uiconfig/swriter/ui/tokenwidget.ui
+++ b/sw/uiconfig/swriter/ui/tokenwidget.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 9105ee10260a..f63f7428c3e5 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="ViewOptionsPage">
     <property name="visible">True</property>
@@ -39,7 +39,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkCheckButton" id="helplines">
-                            <property name="label" translatable="yes">Helplines _While Moving</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|helplines">Helplines _While Moving</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -62,7 +62,7 @@
                   <object class="GtkLabel" id="guideslabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Guides</property>
+                    <property name="label" translatable="yes" context="viewoptionspage|guideslabel">Guides</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -94,7 +94,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="graphics">
-                            <property name="label" translatable="yes">_Images and objects</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|graphics">_Images and objects</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -111,7 +111,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="tables">
-                            <property name="label" translatable="yes">_Tables</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|tables">_Tables</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -128,7 +128,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="drawings">
-                            <property name="label" translatable="yes">Dra_wings and controls</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|drawings">Dra_wings and controls</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -145,7 +145,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="fieldcodes">
-                            <property name="label" translatable="yes">_Field codes</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|fieldcodes">_Field codes</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -162,7 +162,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="comments">
-                            <property name="label" translatable="yes">_Comments</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|comments">_Comments</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -185,7 +185,7 @@
                   <object class="GtkLabel" id="displaylabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Display</property>
+                    <property name="label" translatable="yes" context="viewoptionspage|displaylabel">Display</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -231,7 +231,7 @@
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="smoothscroll">
-                            <property name="label" translatable="yes">S_mooth scroll</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|smoothscroll">S_mooth scroll</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -253,7 +253,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="vruler">
-                                <property name="label" translatable="yes">Verti_cal ruler</property>
+                                <property name="label" translatable="yes" context="viewoptionspage|vruler">Verti_cal ruler</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -294,7 +294,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="vrulerright">
-                                <property name="label" translatable="yes">Right-aligned</property>
+                                <property name="label" translatable="yes" context="viewoptionspage|vrulerright">Right-aligned</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -314,7 +314,7 @@
                               <object class="GtkLabel" id="hruler">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Hori_zontal ruler</property>
+                                <property name="label" translatable="yes" context="viewoptionspage|hruler">Hori_zontal ruler</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">hrulercombobox</property>
                                 <property name="ellipsize">end</property>
@@ -342,7 +342,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">View</property>
+                    <property name="label" translatable="yes" context="viewoptionspage|label3">View</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -388,7 +388,7 @@
                           <object class="GtkLabel" id="measureunitlabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Measurement unit</property>
+                            <property name="label" translatable="yes" context="viewoptionspage|measureunitlabel">Measurement unit</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -405,7 +405,7 @@
                   <object class="GtkLabel" id="settingslabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Settings</property>
+                    <property name="label" translatable="yes" context="viewoptionspage|settingslabel">Settings</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
diff --git a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
index 6b6fc159d42c..97919f266e9d 100644
--- a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
+++ b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="WarnDataSourceDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Data Source Not Found</property>
+    <property name="title" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">Data Source Not Found</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
-    <property name="text" translatable="yes">The data source “%1” was not found.</property>
-    <property name="secondary_text" translatable="yes">The connection to the data source could not be established. Please check the connection settings.</property>
+    <property name="text" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">The data source “%1” was not found.</property>
+    <property name="secondary_text" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">The connection to the data source could not be established. Please check the connection settings.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="check">
-                <property name="label" translatable="yes">Check Connection Settings...</property>
+                <property name="label" translatable="yes" context="warndatasourcedialog|check">Check Connection Settings...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/warnemaildialog.ui b/sw/uiconfig/swriter/ui/warnemaildialog.ui
index bacd9434eec8..fb5234175815 100644
--- a/sw/uiconfig/swriter/ui/warnemaildialog.ui
+++ b/sw/uiconfig/swriter/ui/warnemaildialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.6"/>
   <object class="GtkMessageDialog" id="WarnEmailDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">E-Mails could not be sent</property>
+    <property name="title" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-Mails could not be sent</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">E-mails could not be sent</property>
-    <property name="secondary_text" translatable="yes">The following error occurred:</property>
+    <property name="text" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-mails could not be sent</property>
+    <property name="secondary_text" translatable="yes" context="warnemaildialog|WarnEmailDialog">The following error occurred:</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 85602acbdbc2..1dcc43bffae4 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="angle_adj">
@@ -16,7 +16,7 @@
   <object class="GtkDialog" id="WatermarkDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Watermark</property>
+    <property name="title" translatable="yes" context="watermarkdialog|WatermarkDialog">Watermark</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Text</property>
+                    <property name="label" translatable="yes" context="watermarkdialog|TextLabel">Text</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -115,7 +115,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Font</property>
+                    <property name="label" translatable="yes" context="watermarkdialog|FontLabel">Font</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -127,7 +127,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Angle</property>
+                    <property name="label" translatable="yes" context="watermarkdialog|AngleLabel">Angle</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -139,7 +139,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Transparency</property>
+                    <property name="label" translatable="yes" context="watermarkdialog|TransparencyLabel">Transparency</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -151,7 +151,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Color</property>
+                    <property name="label" translatable="yes" context="watermarkdialog|ColorLabel">Color</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index 9d9e8dc51a79..84291abcf274 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="WordCountDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Word Count</property>
+    <property name="title" translatable="yes" context="wordcount|WordCountDialog">Word Count</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -69,7 +69,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Words</property>
+                <property name="label" translatable="yes" context="wordcount|label1">Words</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -83,7 +83,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Characters including spaces</property>
+                <property name="label" translatable="yes" context="wordcount|label2">Characters including spaces</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -97,7 +97,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Characters excluding spaces</property>
+                <property name="label" translatable="yes" context="wordcount|label3">Characters excluding spaces</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -162,7 +162,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Selection</property>
+                <property name="label" translatable="yes" context="wordcount|label9">Selection</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -179,7 +179,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Document</property>
+                <property name="label" translatable="yes" context="wordcount|label10">Document</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -247,7 +247,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Asian characters and Korean syllables</property>
+                <property name="label" translatable="yes" context="wordcount|cjkcharsft">Asian characters and Korean syllables</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -295,7 +295,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">Standardized pages</property>
+                <property name="label" translatable="yes" context="wordcount|standardizedpages">Standardized pages</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/wrapdialog.ui b/sw/uiconfig/swriter/ui/wrapdialog.ui
index 9a3f00a76cf6..7baf3c9e20df 100644
--- a/sw/uiconfig/swriter/ui/wrapdialog.ui
+++ b/sw/uiconfig/swriter/ui/wrapdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="WrapDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Wrap</property>
+    <property name="title" translatable="yes" context="wrapdialog|WrapDialog">Wrap</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui
index 7309c891fc39..fba954baa714 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">99.989999999999995</property>
@@ -44,7 +44,7 @@
                     <property name="halign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="after">
-                        <property name="label" translatable="yes">After</property>
+                        <property name="label" translatable="yes" context="wrappage|after">After</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -101,7 +101,7 @@
                     <property name="halign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="before">
-                        <property name="label" translatable="yes">Before</property>
+                        <property name="label" translatable="yes" context="wrappage|before">Before</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -158,7 +158,7 @@
                     <property name="halign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="none">
-                        <property name="label" translatable="yes">_None</property>
+                        <property name="label" translatable="yes" context="wrappage|none">_None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -216,7 +216,7 @@
                     <property name="halign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="optimal">
-                        <property name="label" translatable="yes">_Optimal</property>
+                        <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -273,7 +273,7 @@
                     <property name="valign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="through">
-                        <property name="label" translatable="yes">Thro_ugh</property>
+                        <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -318,7 +318,7 @@
                     <property name="halign">center</property>
                     <child>
                       <object class="GtkRadioButton" id="parallel">
-                        <property name="label" translatable="yes">_Parallel</property>
+                        <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -377,7 +377,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Settings</property>
+            <property name="label" translatable="yes" context="wrappage|label1">Settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -425,7 +425,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">L_eft:</property>
+                        <property name="label" translatable="yes" context="wrappage|label4">L_eft:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">left:0.00cm</property>
                       </object>
@@ -439,7 +439,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="wrappage|label5">_Right:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">right:0.00cm</property>
                       </object>
@@ -453,7 +453,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Top:</property>
+                        <property name="label" translatable="yes" context="wrappage|label6">_Top:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">top:0.00cm</property>
                       </object>
@@ -467,7 +467,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="wrappage|label7">_Bottom:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bottom:0.00cm</property>
                       </object>
@@ -536,7 +536,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spacing</property>
+                <property name="label" translatable="yes" context="wrappage|label2">Spacing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -573,7 +573,7 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="anchoronly">
-                        <property name="label" translatable="yes">_First paragraph</property>
+                        <property name="label" translatable="yes" context="wrappage|anchoronly">_First paragraph</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -588,7 +588,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="transparent">
-                        <property name="label" translatable="yes">In bac_kground</property>
+                        <property name="label" translatable="yes" context="wrappage|transparent">In bac_kground</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -603,7 +603,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="outline">
-                        <property name="label" translatable="yes">_Contour</property>
+                        <property name="label" translatable="yes" context="wrappage|outline">_Contour</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -618,7 +618,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="outside">
-                        <property name="label" translatable="yes">Outside only</property>
+                        <property name="label" translatable="yes" context="wrappage|outside">Outside only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -639,7 +639,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Options</property>
+                <property name="label" translatable="yes" context="wrappage|label3">Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx
index ed090eab62bb..8be40094d84c 100644
--- a/test/source/setupvcl.cxx
+++ b/test/source/setupvcl.cxx
@@ -65,7 +65,6 @@ void test::setUpVcl() {
     else
         locale = "en-US";
 
-    ResMgr::SetDefaultLocale(LanguageTag(locale));
     SvtSysLocaleOptions localOptions;
     localOptions.SetLocaleConfigString(locale);
     localOptions.SetUILocaleConfigString(locale);
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 86c24fdbb984..f24d4a5851a4 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -69,8 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/memtools/unqidx \
     tools/source/misc/cpuid \
     tools/source/misc/extendapplicationenvironment \
-    tools/source/rc/rc \
-    tools/source/rc/resary \
     tools/source/rc/resmgr \
     tools/source/ref/globname \
     tools/source/ref/pstm \
@@ -96,6 +94,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,tl,\
 
 $(eval $(call gb_Library_use_externals,tl,\
 	boost_headers \
+	boost_locale \
 	zlib \
 ))
 
diff --git a/tools/inc/pch/precompiled_tl.hxx b/tools/inc/pch/precompiled_tl.hxx
index c906f41f3e52..c986b4c5b79f 100644
--- a/tools/inc/pch/precompiled_tl.hxx
+++ b/tools/inc/pch/precompiled_tl.hxx
@@ -75,7 +75,6 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/toolsdllapi.h>
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
deleted file mode 100644
index 2b972a8145f9..000000000000
--- a/tools/source/rc/rc.cxx
+++ /dev/null
@@ -1,67 +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 <string.h>
-#include <rtl/ustring.hxx>
-#include <tools/date.hxx>
-#include <tools/time.hxx>
-#include <tools/rcid.h>
-#include <tools/resmgr.hxx>
-
-OUString ResId::toString() const
-{
-    SetRT( RSC_STRING );
-
-    ResMgr* pResMgr = GetResMgr();
-
-    if ( !pResMgr || !pResMgr->GetResource( *this ) )
-    {
-        OUString sRet;
-
-#if OSL_DEBUG_LEVEL > 0
-        sRet = "<resource id "
-            + OUString::number(static_cast<sal_Int32>(GetId()))
-            + " not found>";
-#endif
-
-        if( pResMgr )
-            pResMgr->PopContext();
-
-        return sRet;
-    }
-
-    // String loading
-    RSHEADER_TYPE * pResHdr = static_cast<RSHEADER_TYPE*>(pResMgr->GetClass());
-
-    sal_Int32 nStringLen = rtl_str_getLength( reinterpret_cast<char*>(pResHdr+1) );
-    OUString sRet(reinterpret_cast<char*>(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8);
-
-    sal_uInt32 nSize = sizeof( RSHEADER_TYPE )
-        + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1;
-    nSize += nSize % 2;
-    pResMgr->Increment( nSize );
-
-    ResHookProc pImplResHookProc = ResMgr::GetReadStringHook();
-    if ( pImplResHookProc )
-        sRet = pImplResHookProc(sRet);
-    return sRet;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
deleted file mode 100644
index 078b5a63b8f7..000000000000
--- a/tools/source/rc/resary.cxx
+++ /dev/null
@@ -1,107 +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 <tools/resary.hxx>
-#include <tools/resmgr.hxx>
-#include <tools/rcid.h>
-
-#include <vector>
-
-namespace {
-
-struct ImplResStringItem
-{
-    OUString m_aStr;
-    sal_IntPtr m_nValue;
-
-    ImplResStringItem( const OUString& rStr, long nValue = 0 ) :
-        m_aStr(rStr),
-        m_nValue(nValue)
-    { }
-};
-
-}
-
-struct ResStringArray::Impl
-{
-    std::vector<ImplResStringItem> m_aStrings;
-};
-
-ResStringArray::ResStringArray( const ResId& rResId ) :
-    mpImpl(new Impl)
-{
-    rResId.SetRT( RSC_STRINGARRAY );
-    ResMgr* pMgr = rResId.GetResMgr();
-    if( pMgr && pMgr->GetResource( rResId ) )
-    {
-        pMgr->GetClass();
-        pMgr->Increment( sizeof( RSHEADER_TYPE ) );
-        const sal_uInt32 nItems = pMgr->ReadLong();
-        if ( nItems )
-        {
-            mpImpl->m_aStrings.reserve( nItems );
-            for ( sal_uInt32 i = 0; i < nItems; i++ )
-            {
-                // load string
-                mpImpl->m_aStrings.push_back(ImplResStringItem(pMgr->ReadString()));
-
-                // load value
-                mpImpl->m_aStrings[i].m_nValue = pMgr->ReadLong();
-            }
-        }
-    }
-}
-
-ResStringArray::~ResStringArray()
-{
-}
-
-OUString ResStringArray::GetString( sal_uInt32 nIndex ) const
-{
-    return (nIndex < mpImpl->m_aStrings.size()) ? mpImpl->m_aStrings[nIndex].m_aStr : OUString();
-}
-
-sal_IntPtr ResStringArray::GetValue( sal_uInt32 nIndex ) const
-{
-    return (nIndex < mpImpl->m_aStrings.size()) ? mpImpl->m_aStrings[nIndex].m_nValue : -1;
-}
-
-sal_uInt32 ResStringArray::Count() const
-{
-    return sal_uInt32(mpImpl->m_aStrings.size());
-}
-
-sal_uInt32 ResStringArray::FindIndex( sal_IntPtr nValue ) const
-{
-    const sal_uInt32 nItems = mpImpl->m_aStrings.size();
-    for ( sal_uInt32 i = 0; i < nItems; i++ )
-    {
-        if (mpImpl->m_aStrings[i].m_nValue == nValue)
-            return i;
-    }
-    return RESARRAY_INDEX_NOTFOUND;
-}
-
-sal_uInt32 ResStringArray::AddItem( const OUString& rString, sal_IntPtr nValue )
-{
-    mpImpl->m_aStrings.push_back(ImplResStringItem(rString, nValue));
-    return mpImpl->m_aStrings.size();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 4876794bd6e4..293a78d24ab9 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -30,13 +30,13 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/rcid.h>
 #include <osl/endian.h>
 #include <osl/process.h>
 #include <osl/thread.h>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <osl/signal.h>
+#include <rtl/crc.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
@@ -44,7 +44,9 @@
 #include <rtl/bootstrap.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <tools/simplerm.hxx>
+
+#include <boost/locale.hpp>
+#include <boost/locale/gnu_gettext.hpp>
 
 #include <algorithm>
 #include <list>
@@ -53,1317 +55,97 @@
 #include <unordered_map>
 #include <memory>
 
-using namespace osl;
-
-// for thread safety
-static osl::Mutex* pResMgrMutex = nullptr;
-
-static osl::Mutex& getResMgrMutex()
-{
-    if( !pResMgrMutex )
-    {
-        osl::Guard<osl::Mutex> aGuard( *osl::Mutex::getGlobalMutex() );
-        if( ! pResMgrMutex )
-            pResMgrMutex = new osl::Mutex();
-    }
-    return *pResMgrMutex;
-}
-
-struct ImpContent;
-
-// seem to need this to put a std::pair<RESOURCE_TYPE,sal_uInt32> into a std::unordered_set ??
-namespace std
-{
-    template <>
-    struct hash< std::pair<RESOURCE_TYPE,sal_uInt32> >
-    {
-        size_t operator()(const std::pair<RESOURCE_TYPE,sal_uInt32> & x) const
-        {
-            return sal_uInt32(x.first) * 31 + x.second;
-        }
-    };
-}
-class InternalResMgr
-{
-    friend class ResMgr;
-    friend class SimpleResMgr;
-    friend class ResMgrContainer;
-
-    ImpContent *                    pContent;
-    sal_uInt32                      nOffCorrection;
-    sal_uInt8 *                     pStringBlock;
-    SvStream *                      pStm;
-    bool                            bEqual2Content;
-    sal_uInt32                      nEntries;
-    OUString                        aFileName;
-    OUString                        aPrefix;
-    OUString                        aResName;
-    bool                            bSingular;
-    LanguageTag                     aLocale;
-    std::unique_ptr<std::unordered_set<std::pair<RESOURCE_TYPE,sal_uInt32>>> pResUseDump;
-
-                            InternalResMgr( const OUString& rFileURL,
-                                            const OUString& aPrefix,
-                                            const OUString& aResName,
-                                            const LanguageTag& rLocale );
-    bool                    Create();
-
-    bool                    IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const;
-    void *                  LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
-                                           void **pResHandle );
-public:
-    static void             FreeGlobalRes( void const *, void * );
-                            ~InternalResMgr();
-};
-
-class ResMgrContainer
-{
-    static ResMgrContainer*     pOneInstance;
-
-    struct ContainerElement
-    {
-        InternalResMgr* pResMgr;
-        OUString        aFileURL;
-        int             nRefCount;
-        int             nLoadCount;
-
-        ContainerElement() :
-            pResMgr( nullptr ),
-            nRefCount( 0 ),
-            nLoadCount( 0 )
-            {}
-    };
-
-    std::unordered_map< OUString, ContainerElement, OUStringHash> m_aResFiles;
-    LanguageTag     m_aDefLocale;
-
-    ResMgrContainer() : m_aDefLocale( LANGUAGE_SYSTEM) { init(); }
-    ~ResMgrContainer();
-
-    void init();
-
-public:
-    static ResMgrContainer& get();
-    static void release();
-
-    InternalResMgr* getResMgr( const OUString& rPrefix,
-                               LanguageTag& rLocale,
-                               bool bForceNewInstance = false
-                               );
-    InternalResMgr* getNextFallback( InternalResMgr* pResMgr );
-
-    void freeResMgr( InternalResMgr* pResMgr );
-
-    void setDefLocale( const LanguageTag& rLocale )
-    { m_aDefLocale = rLocale; }
-    const LanguageTag& getDefLocale() const
-    { return m_aDefLocale; }
-};
-
-ResMgrContainer* ResMgrContainer::pOneInstance = nullptr;
-
-ResMgrContainer& ResMgrContainer::get()
-{
-    if( ! pOneInstance )
-        pOneInstance = new ResMgrContainer();
-    return *pOneInstance;
-}
-
-ResMgrContainer::~ResMgrContainer()
-{
-    for( std::pair< OUString, ContainerElement > const & rPair : m_aResFiles )
-    {
-        SAL_INFO("tools.rc", "Resource file " << rPair.second.aFileURL << " loaded " << rPair.second.nLoadCount << " times");
-        delete rPair.second.pResMgr;
-    }
-}
-
-void ResMgrContainer::release()
-{
-    delete pOneInstance;
-    pOneInstance = nullptr;
-}
-
-void ResMgrContainer::init()
-{
-    assert( m_aResFiles.empty() );
-
-    // get resource path
-    OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_RESOURCE_FOLDER "/");
-    rtl::Bootstrap::expandMacros(uri); //TODO: detect failure
-
-    // collect all possible resource files
-    Directory aDir( uri );
-    if( aDir.open() == FileBase::E_None )
-    {
-        DirectoryItem aItem;
-        while( aDir.getNextItem( aItem ) == FileBase::E_None )
-        {
-            FileStatus aStatus(osl_FileStatus_Mask_FileName);
-            if( aItem.getFileStatus( aStatus ) == FileBase::E_None )
-            {
-                OUString aFileName = aStatus.getFileName();
-                if( ! aFileName.endsWithIgnoreAsciiCase( ".res" ) )
-                    continue;
-                OUString aResName = aFileName.copy( 0, aFileName.getLength() - strlen(".res") );
-                if( aResName.isEmpty() )
-                    continue;
-                assert( m_aResFiles.find( aResName ) == m_aResFiles.end() );
-                m_aResFiles[ aResName ].aFileURL = uri + aFileName;
-                SAL_INFO(
-                    "tools.rc",
-                    "ResMgrContainer: " << aResName << " -> "
-                        << m_aResFiles[ aResName ].aFileURL );
-            }
-        }
-    }
-    else
-        SAL_WARN( "tools.rc", "opening dir " << uri << " failed" );
-
-    // set default language
-    LanguageType nLang = MsLangId::getSystemUILanguage();
-    m_aDefLocale.reset( nLang);
-}
-
 namespace
 {
-    bool isAlreadyPureenUS(const LanguageTag &rLocale)
-    {
-        return ( rLocale.getLanguageType() == LANGUAGE_ENGLISH_US );
-    }
-}
-
-InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
-                                            LanguageTag& rLocale,
-                                            bool bForceNewInstance
-                                            )
-{
-    LanguageTag aLocale( rLocale );
-    std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end();
-
-    ::std::vector< OUString > aFallbacks( aLocale.getFallbackStrings( true));
-    if (!isAlreadyPureenUS( aLocale))
-        aFallbacks.push_back( "en-US");     // last resort if all fallbacks fail
-
-    for (::std::vector< OUString >::const_iterator fb( aFallbacks.begin()); fb != aFallbacks.end(); ++fb)
-    {
-        OUString aSearch( rPrefix + *fb );
-        it = m_aResFiles.find( aSearch );
-        if( it != m_aResFiles.end() )
-        {
-            // ensure InternalResMgr existence
-            if( ! it->second.pResMgr )
-            {
-                InternalResMgr* pImp =
-                    new InternalResMgr( it->second.aFileURL, rPrefix, it->first, aLocale );
-                if( ! pImp->Create() )
-                {
-                    delete pImp;
-                    continue;
-                }
-                it->second.pResMgr = pImp;
-            }
-            break;
-        }
-    }
-    // try if there is anything with this prefix at all
-    if( it == m_aResFiles.end() )
-    {
-        aLocale.reset( LANGUAGE_SYSTEM);
-        it = m_aResFiles.find( rPrefix );
-        if( it == m_aResFiles.end() )
-        {
-            for( it = m_aResFiles.begin(); it != m_aResFiles.end(); ++it )
-            {
-                if( it->first.matchIgnoreAsciiCase( rPrefix ) )
-                {
-                    // ensure InternalResMgr existence
-                    if( ! it->second.pResMgr )
-                    {
-                        InternalResMgr* pImp =
-                            new InternalResMgr( it->second.aFileURL,
-                                                rPrefix,
-                                                it->first,
-                                                aLocale );
-                        if( ! pImp->Create() )
-                        {
-                            delete pImp;
-                            continue;
-                        }
-                        it->second.pResMgr = pImp;
-                    }
-                    // try to guess locale
-                    sal_Int32 nIndex = rPrefix.getLength();
-                    if (nIndex < it->first.getLength())
-                        aLocale.reset( it->first.copy( nIndex));
-                    else
-                    {
-                        SAL_WARN( "tools.rc", "ResMgrContainer::getResMgr: it->first " <<
-                                it->first << " shorter than prefix " << rPrefix);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-    // give up
-    if( it == m_aResFiles.end() )
-    {
-        OUString sURL = rPrefix + rLocale.getBcp47() + ".res";
-        if ( m_aResFiles.find(sURL) == m_aResFiles.end() )
-        {
-            m_aResFiles[ sURL ].aFileURL = sURL;
-            return getResMgr(rPrefix,rLocale,bForceNewInstance);
-        } // if ( m_aResFiles.find(sURL) == m_aResFiles.end() )
-        return nullptr;
-    }
-
-    rLocale = aLocale;
-    // at this point it->second.pResMgr must be filled either by creating a new one
-    // (then the refcount is still 0) or because we already had one
-    InternalResMgr* pImp = it->second.pResMgr;
-
-    if( it->second.nRefCount == 0 )
-        it->second.nLoadCount++;
-
-    // for SimpleResMgr
-    if( bForceNewInstance )
-    {
-        if( it->second.nRefCount == 0 )
-        {
-            // shortcut: the match algorithm already created the InternalResMgr
-            // take it instead of creating yet another one
-            it->second.pResMgr = nullptr;
-            pImp->bSingular = true;
-        }
-        else
-        {
-            pImp = new InternalResMgr( it->second.aFileURL, rPrefix, it->first, aLocale );
-            pImp->bSingular = true;
-            if( !pImp->Create() )
-            {
-                delete pImp;
-                pImp = nullptr;
-            }
-            else
-                it->second.nLoadCount++;
-        }
-    }
-    else
-        it->second.nRefCount++;
-
-    return pImp;
-}
-
-InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr )
-{
-    /* TODO-BCP47: this is nasty, but the previous code simply stripped a
-     * locale's variant and country in subsequent calls to end up with language
-     * only and then fallback to en-US if all failed, so this is at least
-     * equivalent if not better. Maybe this method could be changed to get
-     * passed / remember a fallback list and an index within to pick the next.
-     * */
-
-    ::std::vector< OUString > aFallbacks( pMgr->aLocale.getFallbackStrings( true));
-    // The first is the locale itself, use next fallback or en-US.
-    /* TODO: what happens if the chain is "en-US", "en" -> "en-US", ...
-     * This was already an issue with the previous code. */
-    LanguageTag aLocale( ((aFallbacks.size() > 1) ? aFallbacks[1] : OUString( "en-US")));
-    InternalResMgr* pNext = getResMgr( pMgr->aPrefix, aLocale, pMgr->bSingular );
-    // prevent recursion
-    if( pNext == pMgr || ( pNext && pNext->aResName == pMgr->aResName ) )
-    {
-        if( pNext->bSingular )
-            delete pNext;
-        pNext = nullptr;
-    }
-    return pNext;
-}
-
-void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr )
-{
-    if( pResMgr->bSingular )
-        delete pResMgr;
-    else
-    {
-        std::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it =
-        m_aResFiles.find( pResMgr->aResName );
-        if( it != m_aResFiles.end() )
-        {
-            DBG_ASSERT( it->second.nRefCount > 0, "InternalResMgr freed too often" );
-            if( it->second.nRefCount > 0 )
-                it->second.nRefCount--;
-            if( it->second.nRefCount == 0 )
-            {
-                delete it->second.pResMgr;
-                it->second.pResMgr = nullptr;
-            }
-        }
-    }
-}
-
-struct ImpContent
-{
-    RESOURCE_TYPE nType;
-    sal_uInt32    nId;
-    sal_uInt32    nOffset;
-};
-
-struct ImpContentLessCompare
-{
-    bool operator() (const ImpContent& rLhs, const ImpContent& rRhs) const
+    OUString createFromUtf8(const char* data, size_t size)
     {
-        sal_uInt64 const lhs((static_cast<sal_uInt64>(rLhs.nType.get()) << 32) | rLhs.nId);
-        sal_uInt64 const rhs((static_cast<sal_uInt64>(rRhs.nType.get()) << 32) | rRhs.nId);
-        return lhs < rhs;
+        OUString aTarget;
+        bool bSuccess = rtl_convertStringToUString(&aTarget.pData,
+                                                   data,
+                                                   size,
+                                                   RTL_TEXTENCODING_UTF8,
+                                                   RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR|RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR|RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR);
+        (void) bSuccess;
+        assert(bSuccess);
+        return aTarget;
     }
-};
-
-static ResHookProc pImplResHookProc = nullptr;
-
-InternalResMgr::InternalResMgr( const OUString& rFileURL,
-                                const OUString& rPrefix,
-                                const OUString& rResName,
-                                const LanguageTag& rLocale )
-    : pContent( nullptr )
-    , nOffCorrection( 0 )
-    , pStringBlock( nullptr )
-    , pStm( nullptr )
-    , bEqual2Content( true )
-    , nEntries( 0 )
-    , aFileName( rFileURL )
-    , aPrefix( rPrefix )
-    , aResName( rResName )
-    , bSingular( false )
-    , aLocale( rLocale )
-{
-}
 
-InternalResMgr::~InternalResMgr()
-{
-    rtl_freeMemory(pContent);
-    rtl_freeMemory(pStringBlock);
-    delete pStm;
-
-#ifdef DBG_UTIL
-    if( pResUseDump )
+    OString genKeyId(const OString& rGenerator)
     {
-        const sal_Char* pLogFile = getenv( "STAR_RESOURCE_LOGGING" );
-        if ( pLogFile )
+        sal_uInt32 nCRC = rtl_crc32(0, rGenerator.getStr(), rGenerator.getLength());
+        // Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs
+        static const char sSymbols[] =
+            "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
+        char sKeyId[6];
+        for (short nKeyInd = 0; nKeyInd < 5; ++nKeyInd)
         {
-            SvFileStream aStm( OUString::createFromAscii( pLogFile ), StreamMode::WRITE );
-            aStm.Seek( STREAM_SEEK_TO_END );
-            OStringBuffer aLine("FileName: ");
-            aLine.append(OUStringToOString(aFileName,
-                RTL_TEXTENCODING_UTF8));
-            aStm.WriteLine(aLine.makeStringAndClear());
-
-            for( auto const & rPair : *pResUseDump )
-            {
-                aLine.append("Type/Id: ");
-                aLine.append((sal_Int64)sal_uInt32(rPair.first));
-                aLine.append('/');
-                aLine.append((sal_Int64)rPair.second);
-                aStm.WriteLine(aLine.makeStringAndClear());
-            }
+            sKeyId[nKeyInd] = sSymbols[(nCRC & 63) % strlen(sSymbols)];
+            nCRC >>= 6;
         }
+        sKeyId[5] = '\0';
+        return OString(sKeyId);
     }
-#endif
 }
 
-bool InternalResMgr::Create()
+namespace Translate
 {
-    ResMgrContainer::get();
-    bool bDone = false;
-
-    pStm = new SvFileStream( aFileName, StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE );
-    if( pStm->GetError() == ERRCODE_NONE )
+    std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale)
     {
-        sal_Int32   lContLen = 0;
-
-        pStm->Seek( STREAM_SEEK_TO_END );
-        /*
-        if( ( pInternalResMgr->pHead = (RSHEADER_TYPE *)mmap( 0, nResourceFileSize,
-                                                        PROT_READ, MAP_PRIVATE,
-                                                        fRes, 0 ) ) != (RSHEADER_TYPE *)-1)
-                                                        */
-        pStm->SeekRel( - (int)sizeof( lContLen ) );
-        pStm->ReadBytes( &lContLen, sizeof( lContLen ) );
-        // file is bigendian but SvStreamEndian not set, swab to the right endian
-        lContLen = ResMgr::GetLong( &lContLen );
-        pStm->SeekRel( -lContLen );
-        // allocate stored ImpContent data (12 bytes per unit)
-        sal_uInt8* pContentBuf = static_cast<sal_uInt8*>(rtl_allocateMemory( lContLen ));
-        pStm->ReadBytes( pContentBuf, lContLen );
-        // allocate ImpContent space (sizeof(ImpContent) per unit, not necessarily 12)
-        pContent = static_cast<ImpContent *>(rtl_allocateMemory( sizeof(ImpContent)*lContLen/12 ));
-        // Shorten to number of ImpContent
-        nEntries = (sal_uInt32)lContLen / 12;
-        bEqual2Content = true;
-        bool bSorted = true;
-        if( nEntries )
-        {
-#ifdef DBG_UTIL
-            const sal_Char* pLogFile = getenv( "STAR_RESOURCE_LOGGING" );
-            if ( pLogFile )
-            {
-                pResUseDump.reset( new std::unordered_set<std::pair<RESOURCE_TYPE, sal_uInt32>> );
-                for( sal_uInt32 i = 0; i < nEntries; ++i )
-                    pResUseDump->insert({pContent[i].nType, pContent[i].nId});
-            }
-#endif
-            // swap the content to the right endian
-            pContent[0].nType = RESOURCE_TYPE(ResMgr::GetLong( pContentBuf ));
-            pContent[0].nId = ResMgr::GetLong( pContentBuf + 4);
-            pContent[0].nOffset = ResMgr::GetLong( pContentBuf + 8 );
-            sal_uInt32 nCount = nEntries - 1;
-            for( sal_uInt32 i = 0,j=1; i < nCount; ++i,++j )
-            {
-                // swap the content to the right endian
-                pContent[j].nType = RESOURCE_TYPE(ResMgr::GetLong( pContentBuf + (12*j) ));
-                pContent[j].nId = ResMgr::GetLong( pContentBuf + (12*j) + 4 );
-                pContent[j].nOffset = ResMgr::GetLong( pContentBuf + (12*j) + 8 );
-                if( std::tie(pContent[i].nType, pContent[i].nId) >= std::tie(pContent[j].nType, pContent[j].nId) )
-                    bSorted = false;
-                if( pContent[i].nId == pContent[j].nId
-                    && pContent[i].nOffset >= pContent[j].nOffset )
-                    bEqual2Content = false;
-            }
-        }
-        rtl_freeMemory( pContentBuf );
-        OSL_ENSURE( bSorted, "content not sorted" );
-        OSL_ENSURE( bEqual2Content, "resource structure wrong" );
-        if( !bSorted )
-            ::std::sort(pContent,pContent+nEntries,ImpContentLessCompare());
-            //  qsort( pContent, nEntries, sizeof( ImpContent ), Compare );
-
-        bDone = true;
+        boost::locale::generator gen;
+        gen.characters(boost::locale::char_facet);
+        gen.categories(boost::locale::message_facet | boost::locale::information_facet);
+        OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
+        rtl::Bootstrap::expandMacros(uri);
+        OUString path;
+        osl::File::getSystemPathFromFileURL(uri, path);
+        gen.add_messages_path(OUStringToOString(path, osl_getThreadTextEncoding()).getStr());
+        gen.add_messages_domain(pPrefixName);
+        OString sIdentifier = rLocale.getGlibcLocaleString(".UTF-8").toUtf8();
+        return gen(sIdentifier.getStr());
     }
 
-    return bDone;
-}
-
-
-bool InternalResMgr::IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const
-{
-    // search beginning of string
-    ImpContent aValue;
-    aValue.nType = nRT;
-    aValue.nId = nId;
-    ImpContent * pFind = ::std::lower_bound(pContent,
-                                            pContent + nEntries,
-                                            aValue,
-                                            ImpContentLessCompare());
-    return (pFind != (pContent + nEntries)) && (pFind->nType == aValue.nType) && (pFind->nId == aValue.nId);
-}
-
-
-void* InternalResMgr::LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId,
-                                     void **pResHandle )
-{
-#ifdef DBG_UTIL
-    if( pResUseDump )
-        pResUseDump->erase( { nRT, nId } );
-#endif
-    // search beginning of string
-    ImpContent aValue;
-    aValue.nType = nRT;
-    aValue.nId = nId;
-    ImpContent* pEnd = (pContent + nEntries);
-    ImpContent* pFind = ::std::lower_bound( pContent,
-                                            pEnd,
-                                            aValue,
-                                            ImpContentLessCompare());
-    if( pFind && (pFind != pEnd) && (pFind->nType == aValue.nType) && (pFind->nId == aValue.nId) )
+    OUString get(const char* pContextAndId, const std::locale &loc)
     {
-        if( nRT == RSC_STRING && bEqual2Content )
-        {
-            // string optimization
-            if( !pStringBlock )
-            {
-                // search beginning of string
-                ImpContent * pFirst = pFind;
-                ImpContent * pLast = pFirst;
-                while( pFirst > pContent && (pFirst -1)->nType == RSC_STRING )
-                    --pFirst;
-                while( pLast < pEnd && pLast->nType == RSC_STRING )
-                    ++pLast;
-                nOffCorrection = pFirst->nOffset;
-                sal_uInt32 nSize;
-                --pLast;
-                pStm->Seek( pLast->nOffset );
-                RSHEADER_TYPE aHdr;
-                pStm->ReadBytes( &aHdr, sizeof( aHdr ) );
-                nSize = pLast->nOffset + aHdr.GetGlobOff() - nOffCorrection;
-                pStringBlock = static_cast<sal_uInt8*>(rtl_allocateMemory( nSize ));
-                pStm->Seek( pFirst->nOffset );
-                pStm->ReadBytes( pStringBlock, nSize );
-            }
-            *pResHandle = pStringBlock;
-            return pStringBlock + pFind->nOffset - nOffCorrection;
-        } // if( nRT == RSC_STRING && bEqual2Content )
+        OString sContext;
+        const char *pId = strchr(pContextAndId, '\004');
+        if (!pId)
+            pId = pContextAndId;
         else
         {
-            *pResHandle = nullptr;
-            RSHEADER_TYPE aHeader;
-            pStm->Seek( pFind->nOffset );
-            pStm->ReadBytes( &aHeader, sizeof( RSHEADER_TYPE ) );
-            void * pRes = rtl_allocateMemory( aHeader.GetGlobOff() );
-            memcpy( pRes, &aHeader, sizeof( RSHEADER_TYPE ) );
-            pStm->ReadBytes(static_cast<sal_uInt8*>(pRes) + sizeof(RSHEADER_TYPE),
-                        aHeader.GetGlobOff() - sizeof( RSHEADER_TYPE ) );
-            return pRes;
+            sContext = OString(pContextAndId, pId - pContextAndId);
+            ++pId;
         }
-    } // if( pFind && (pFind != pEnd) && (pFind->nTypeAndId == nValue) )
-    *pResHandle = nullptr;
-    return nullptr;
-}
-
-void InternalResMgr::FreeGlobalRes( void const * pResHandle, void * pResource )
-{
-    if ( !pResHandle )
-        // Free allocated resource
-        rtl_freeMemory(pResource);
-}
-
-#ifdef DBG_UTIL
 
-OUString GetTypeRes_Impl( const ResId& rTypeId )
-{
-    // Return on resource errors
-    static bool bInUse = false;
-    OUString aTypStr(OUString::number(rTypeId.GetId()));
-
-    if ( !bInUse )
-    {
-        bInUse = true;
-
-        ResId aResId( sal_uInt32(RSCVERSION_ID), *rTypeId.GetResMgr() );
-        aResId.SetRT( RSC_VERSIONCONTROL );
-
-        if ( rTypeId.GetResMgr()->GetResource( aResId ) )
+        //if its a key id locale, generate it here
+        if (std::use_facet<boost::locale::info>(loc).language() == "qtz")
         {
-            rTypeId.SetRT( RSC_STRING );
-            if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) )
-            {
-                aTypStr = rTypeId;
-                // Set class pointer to the end
-                rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) );
-            }
+            OString sKeyId(genKeyId(OString(pContextAndId).replace('\004', '|')));
+            return OUString::fromUtf8(sKeyId) + OUStringLiteral1(0x2016) + createFromUtf8(pId, strlen(pId));
         }
-        bInUse = false;
-    }
-
-    return aTypStr;
-}
-
-void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
-                            RESOURCE_TYPE nRT, sal_uInt32 nId,
-                            std::vector< ImpRCStack >& rResStack, int nDepth )
-{
-    // create a separate ResMgr with its own stack
-    // first get a second reference of the InternalResMgr
-    InternalResMgr* pImp =
-        ResMgrContainer::get().getResMgr( pResMgr->pImpRes->aPrefix,
-                                          pResMgr->pImpRes->aLocale,
-                                          true );
-
-    ResMgr* pNewResMgr = new ResMgr( pImp );
-
-    OString aFilename(OUStringToOString(pResMgr->GetFileName(),
-        RTL_TEXTENCODING_UTF8));
-    OStringBuffer aStr(pMessage);
-    aStr.append(aFilename);
-    aStr.append('\n');
 
-    aStr.append("    Class: ");
-    aStr.append(OUStringToOString(GetTypeRes_Impl(ResId((sal_uInt32)nRT, *pNewResMgr)),
-        RTL_TEXTENCODING_UTF8));
-    aStr.append(", Id: ");
-    aStr.append(static_cast<sal_Int32>(nId));
-    aStr.append(". ");
-
-    aStr.append("    Resource Stack:");
-    while( nDepth > 0 )
-    {
-        aStr.append(" [ Class: ");
-        aStr.append(OUStringToOString(GetTypeRes_Impl(
-            ResId((sal_uInt32)rResStack[nDepth].pResource->GetRT(), *pNewResMgr)),
-            RTL_TEXTENCODING_UTF8));
-        aStr.append(", Id: ");
-        aStr.append(static_cast<sal_Int32>(
-            rResStack[nDepth].pResource->GetId()));
-        aStr.append("]");
-        nDepth--;
+        //otherwise translate it
+        const std::string ret = boost::locale::pgettext(sContext.getStr(), pId, loc);
+        return ExpandVariables(createFromUtf8(ret.data(), ret.size()));
     }
 
-    // clean up
-    delete pNewResMgr;
-
-    OSL_FAIL(aStr.getStr());
-}
-
-#endif
+    static ResHookProc pImplResHookProc = nullptr;
 
-static void RscException_Impl()
-{
-    switch ( osl_raiseSignal( OSL_SIGNAL_USER_RESOURCEFAILURE, const_cast<char *>("") ) )
+    OUString ExpandVariables(const OUString& rString)
     {
-    case osl_Signal_ActCallNextHdl:
-        abort();
-
-    case osl_Signal_ActIgnore:
-        return;
-
-    case osl_Signal_ActAbortApp:
-        abort();
-
-    default:
-    case osl_Signal_ActKillApp:
-        exit(-1);
-    }
-}
-
-void ImpRCStack::Init( const Resource* pObj, sal_uInt32 Id )
-{
-    pResource       = nullptr;
-    pClassRes       = nullptr;
-    Flags           = RCFlags::NONE;
-    aResHandle      = nullptr;
-    pResObj         = pObj;
-    if ( !(Id & RSC_DONTRELEASE) )
-        Flags      |= RCFlags::AUTORELEASE;
-}
-
-void ImpRCStack::Clear()
-{
-    pResource       = nullptr;
-    pClassRes       = nullptr;
-    Flags           = RCFlags::NONE;
-    aResHandle      = nullptr;
-    pResObj         = nullptr;
-}
-
-static RSHEADER_TYPE* LocalResource( const ImpRCStack* pStack,
-                                     RESOURCE_TYPE nRTType,
-                                     sal_uInt32 nId )
-{
-    // Returns position of the resource if found or NULL otherwise
-
-    if ( pStack->pResource && pStack->pClassRes )
-    {
-        RSHEADER_TYPE*  pTmp;   // Pointer to child resource
-        RSHEADER_TYPE*  pEnd;   // Pointer to the end of this resource
-        pTmp = reinterpret_cast<RSHEADER_TYPE*>
-               (reinterpret_cast<sal_uInt8*>(pStack->pResource) + pStack->pResource->GetLocalOff());
-        pEnd = reinterpret_cast<RSHEADER_TYPE*>
-               (reinterpret_cast<sal_uInt8*>(pStack->pResource) + pStack->pResource->GetGlobOff());
-        while ( pTmp != pEnd )
-        {
-            if ( pTmp->GetRT() == nRTType && pTmp->GetId() == nId )
-                return pTmp;
-            pTmp = reinterpret_cast<RSHEADER_TYPE*>(reinterpret_cast<sal_uInt8*>(pTmp) + pTmp->GetGlobOff());
-        }
+        if (pImplResHookProc)
+            return pImplResHookProc(rString);
+        return rString;
     }
 
-    return nullptr;
-}
-
-void* ResMgr::pEmptyBuffer = nullptr;
-
-void* ResMgr::getEmptyBuffer()
-{
-    if( ! pEmptyBuffer )
-        pEmptyBuffer = rtl_allocateZeroMemory( 1024 );
-    return pEmptyBuffer;
-}
-
-void ResMgr::DestroyAllResMgr()
-{
+    void SetReadStringHook( ResHookProc pProc )
     {
-        osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-        if( pEmptyBuffer )
-        {
-            rtl_freeMemory( pEmptyBuffer );
-            pEmptyBuffer = nullptr;
-        }
-        ResMgrContainer::release();
+        pImplResHookProc = pProc;
     }
-    delete pResMgrMutex;
-    pResMgrMutex = nullptr;
-}
-
-void ResMgr::Init( const OUString& rFileName )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
 
-    if ( !pImpRes )
+    ResHookProc GetReadStringHook()
     {
-        SAL_WARN( "tools.rc", "Resourcefile not found: " << rFileName);
-        RscException_Impl();
-    }
-#ifdef DBG_UTIL
-    else
-    {
-        void* aResHandle = nullptr;     // Helper variable for resource handles
-        void* pVoid;              // Pointer on the resource
-
-        pVoid = pImpRes->LoadGlobalRes( RSC_VERSIONCONTROL, RSCVERSION_ID,
-                                        &aResHandle );
-        if ( pVoid )
-            InternalResMgr::FreeGlobalRes( aResHandle, pVoid );
-        else
-        {
-            SAL_WARN("tools.rc", "Wrong version: " << pImpRes->aFileName);
-        }
-    }
-#endif
-    nCurStack = -1;
-    aStack.clear();
-    pFallbackResMgr = pOriginalResMgr = nullptr;
-    incStack();
-}
-
-ResMgr::ResMgr( InternalResMgr * pImpMgr )
-{
-    pImpRes = pImpMgr;
-    Init( pImpMgr->aFileName );
-}
-
-ResMgr::~ResMgr()
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    ResMgrContainer::get().freeResMgr( pImpRes );
-
-    // clean up possible left rc stack frames
-    while( nCurStack > 0 )
-    {
-        if( ( aStack[nCurStack].Flags & (RCFlags::GLOBAL | RCFlags::NOTFOUND) ) == RCFlags::GLOBAL )
-            InternalResMgr::FreeGlobalRes( aStack[nCurStack].aResHandle,
-                                    aStack[nCurStack].pResource );
-        nCurStack--;
-    }
-}
-
-void ResMgr::incStack()
-{
-    nCurStack++;
-    if( nCurStack >= int(aStack.size()) )
-        aStack.push_back( ImpRCStack() );
-    aStack[nCurStack].Clear();
-
-    DBG_ASSERT( nCurStack < 32, "Resource stack unreasonably large" );
-}
-
-void ResMgr::decStack()
-{
-    DBG_ASSERT( nCurStack > 0, "resource stack underrun  !" );
-    if( (aStack[nCurStack].Flags & RCFlags::FALLBACK_UP) )
-    {
-        nCurStack--;
-        // warning: this will delete *this, see below
-        pOriginalResMgr->decStack();
-    }
-    else
-    {
-        ImpRCStack& rTop = aStack[nCurStack];
-        if( (rTop.Flags & RCFlags::FALLBACK_DOWN) )
-        {
-            #if OSL_DEBUG_LEVEL > 1
-            SAL_INFO("tools", "returning from fallback " << pFallbackResMgr->GetFileName() );
-            #endif
-            delete pFallbackResMgr;
-            pFallbackResMgr = nullptr;
-        }
-        nCurStack--;
-    }
-}
-
-bool ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    bool            bAvailable = false;
-    RSHEADER_TYPE*  pClassRes = rId.GetpResource();
-    RESOURCE_TYPE   nRT = rId.GetRT();
-    sal_uInt32      nId = rId.GetId();
-    const ResMgr*   pMgr = rId.GetResMgr();
-
-    if ( !pMgr )
-        pMgr = this;
-
-    if( pMgr->pFallbackResMgr )
-    {
-        ResId aId( rId );
-        aId.ClearResMgr();
-        return pMgr->pFallbackResMgr->IsAvailable( aId, pResObj );
-    }
-
-    if ( !pResObj || pResObj == pMgr->aStack[pMgr->nCurStack].pResObj )
-    {
-        if ( !pClassRes )
-            pClassRes = LocalResource( &pMgr->aStack[pMgr->nCurStack], nRT, nId );
-        if ( pClassRes )
-        {
-            if ( pClassRes->GetRT() == nRT )
-                bAvailable = true;
-        }
-    }
-
-    if ( !pClassRes )
-        bAvailable = pMgr->pImpRes->IsGlobalAvailable( nRT, nId );
-
-    return bAvailable;
-}
-
-void* ResMgr::GetClass()
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-        return pFallbackResMgr->GetClass();
-
-    return aStack[nCurStack].pClassRes;
-}
-
-bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-    {
-        ResId aId( rId );
-        aId.ClearResMgr();
-        return pFallbackResMgr->GetResource( aId, pResObj );
-    }
-
-    ResMgr* pMgr = rId.GetResMgr();
-    if ( pMgr && (this != pMgr) )
-        return pMgr->GetResource( rId, pResObj );
-
-    // normally Increment will pop the context; this is
-    // not possible in RCFlags::NOTFOUND case, so pop a frame here
-    ImpRCStack* pTop = &aStack[nCurStack];
-    if( (pTop->Flags & RCFlags::NOTFOUND) )
-    {
-        decStack();
-    }
-
-    RSHEADER_TYPE*  pClassRes = rId.GetpResource();
-    RESOURCE_TYPE   nRT = rId.GetRT();
-    sal_uInt32      nId = rId.GetId();
-
-    incStack();
-    pTop = &aStack[nCurStack];
-    pTop->Init( pResObj, nId |
-                (rId.IsAutoRelease() ? 0 : RSC_DONTRELEASE) );
-
-    if ( pClassRes )
-    {
-        if ( pClassRes->GetRT() == nRT )
-            pTop->pClassRes = pClassRes;
-        else
-        {
-#ifdef DBG_UTIL
-            RscError_Impl( "Different class and resource type!",
-                           this, nRT, nId, aStack, nCurStack-1 );
-#endif
-            pTop->Flags |= RCFlags::NOTFOUND;
-            pTop->pClassRes = getEmptyBuffer();
-            pTop->pResource = static_cast<RSHEADER_TYPE*>(pTop->pClassRes);
-            return false;
-        }
-    }
-    else
-    {
-        OSL_ENSURE( nCurStack > 0, "stack of 1 to shallow" );
-        pTop->pClassRes = LocalResource( &aStack[nCurStack-1], nRT, nId );
-    }
-
-    if ( pTop->pClassRes )
-        // local Resource, not a system Resource
-        pTop->pResource = static_cast<RSHEADER_TYPE *>(pTop->pClassRes);
-    else
-    {
-        pTop->pClassRes = pImpRes->LoadGlobalRes( nRT, nId, &pTop->aResHandle );
-        if ( pTop->pClassRes )
-        {
-            pTop->Flags |= RCFlags::GLOBAL;
-            pTop->pResource = static_cast<RSHEADER_TYPE *>(pTop->pClassRes);
-        }
-        else
-        {
-            // try to get a fallback resource
-            pFallbackResMgr = CreateFallbackResMgr( rId, pResObj );
-            if( pFallbackResMgr )
-            {
-                pTop->Flags |= RCFlags::FALLBACK_DOWN;
-#ifdef DBG_UTIL
-                OStringBuffer aMess("found resource ");
-                aMess.append(static_cast<sal_Int32>(nId));
-                aMess.append(" in fallback ");
-                aMess.append(OUStringToOString(
-                    pFallbackResMgr->GetFileName(),
-                    osl_getThreadTextEncoding()));
-                aMess.append('\n');
-                RscError_Impl(aMess.getStr(),
-                              this, nRT, nId, aStack, nCurStack-1);
-#endif
-            }
-            else
-            {
-                #ifdef DBG_UTIL
-                RscError_Impl( "Cannot load resource! ",
-                              this, nRT, nId, aStack, nCurStack-1 );
-                #endif
-                pTop->Flags |= RCFlags::NOTFOUND;
-                pTop->pClassRes = getEmptyBuffer();
-                pTop->pResource = static_cast<RSHEADER_TYPE*>(pTop->pClassRes);
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-void ResMgr::PopContext( const Resource* pResObj )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-    {
-        pFallbackResMgr->PopContext( pResObj );
-        return;
-    }
-
-    if ( nCurStack > 0 )
-    {
-        ImpRCStack* pTop = &aStack[nCurStack];
-        // free resource
-        if( (pTop->Flags & (RCFlags::GLOBAL | RCFlags::NOTFOUND)) == RCFlags::GLOBAL )
-            // free global resource if resource is foreign
-            InternalResMgr::FreeGlobalRes( pTop->aResHandle, pTop->pResource );
-        decStack();
-    }
-}
-
-sal_Int32 ResMgr::GetLong( void const * pLong )
-{
-    return ((*(static_cast<const sal_uInt8*>(pLong) + 0) << 24) |
-            (*(static_cast<const sal_uInt8*>(pLong) + 1) << 16) |
-            (*(static_cast<const sal_uInt8*>(pLong) + 2) <<  8) |
-            (*(static_cast<const sal_uInt8*>(pLong) + 3) <<  0)   );
-}
-
-sal_uInt32 ResMgr::GetStringWithoutHook( OUString& rStr, const sal_uInt8* pStr )
-{
-    sal_uInt32 nLen=0;
-    sal_uInt32 nRet = GetStringSize( pStr, nLen );
-    const sal_Char* str = reinterpret_cast< const sal_Char* >( pStr );
-    OUString aString( str, strlen( str ), RTL_TEXTENCODING_UTF8,
-                       RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
-                       RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
-                       RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-    rStr = aString;
-    return nRet;
-}
-
-sal_uInt32 ResMgr::GetString( OUString& rStr, const sal_uInt8* pStr )
-{
-    OUString aString;
-    sal_uInt32 nRet =  GetStringWithoutHook( aString, pStr );
-    if ( pImplResHookProc )
-        aString = pImplResHookProc( aString );
-    rStr = aString;
-    return nRet;
-}
-
-sal_uInt32 ResMgr::GetStringSize( const sal_uInt8* pStr, sal_uInt32& nLen )
-{
-    nLen = static_cast< sal_uInt32 >( strlen( reinterpret_cast<const char*>(pStr) ) );
-    return GetStringSize( nLen );
-}
-
-void* ResMgr::Increment( sal_uInt32 nSize )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-        return pFallbackResMgr->Increment( nSize );
-
-    ImpRCStack& rStack = aStack[nCurStack];
-    if( (rStack.Flags & RCFlags::NOTFOUND) )
-        return rStack.pClassRes;
-
-    sal_uInt8* pClassRes = static_cast<sal_uInt8*>(rStack.pClassRes) + nSize;
-
-    rStack.pClassRes = pClassRes;
-
-    RSHEADER_TYPE* pRes = rStack.pResource;
-
-    sal_uInt32 nLocalOff = pRes->GetLocalOff();
-    if ( (pRes->GetGlobOff() == nLocalOff) &&
-         ((reinterpret_cast<char*>(pRes) + nLocalOff) == rStack.pClassRes) &&
-         (rStack.Flags & RCFlags::AUTORELEASE))
-    {
-        PopContext( rStack.pResObj );
-    }
-
-    return pClassRes;
-}
-
-ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource* pResource )
-{
-    ResMgr *pFallback = nullptr;
-    if( nCurStack > 0 )
-    {
-        // get the next fallback level in resource file scope
-        InternalResMgr* pRes = ResMgrContainer::get().getNextFallback( pImpRes );
-        if( pRes )
-        {
-            // check that the fallback locale is not already in the chain of
-            // fallbacks - prevent fallback loops
-            ResMgr* pResMgr = this;
-            while( pResMgr && (pResMgr->pImpRes->aLocale != pRes->aLocale))
-            {
-                pResMgr = pResMgr->pOriginalResMgr;
-            }
-            if( pResMgr )
-            {
-                // found a recursion, no fallback possible
-                ResMgrContainer::get().freeResMgr( pRes );
-                return nullptr;
-            }
-            SAL_INFO("tools.rc", "trying fallback: " << pRes->aFileName );
-            pFallback = new ResMgr( pRes );
-            pFallback->pOriginalResMgr = this;
-            // try to recreate the resource stack
-            bool bHaveStack = true;
-            for( int i = 1; i < nCurStack; i++ )
-            {
-                if( !aStack[i].pResource )
-                {
-                    bHaveStack = false;
-                    break;
-                }
-                ResId aId( aStack[i].pResource->GetId(), *pFallbackResMgr );
-                aId.SetRT( aStack[i].pResource->GetRT() );
-                if( !pFallback->GetResource( aId ) )
-                {
-                    bHaveStack = false;
-                    break;
-                }
-            }
-            if( bHaveStack )
-            {
-                ResId aId( rId.GetId(), *pFallback );
-                aId.SetRT( rId.GetRT() );
-                if( !pFallback->GetResource( aId, pResource ) )
-                    bHaveStack = false;
-                else
-                    pFallback->aStack[pFallback->nCurStack].Flags |= RCFlags::FALLBACK_UP;
-            }
-            if( !bHaveStack )
-            {
-                delete pFallback;
-                pFallback = nullptr;
-            }
-        }
-    }
-    return pFallback;
-}
-
-ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName,
-                              const LanguageTag& _aLocale )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
-
-    LanguageTag aLocale = _aLocale;
-    if( aLocale.isSystemLocale() )
-        aLocale = ResMgrContainer::get().getDefLocale();
-
-    InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, aLocale );
-    return pImp ? new ResMgr( pImp ) : nullptr;
-}
-
-ResMgr* ResMgr::SearchCreateResMgr(
-    const sal_Char* pPrefixName,
-    LanguageTag& rLocale )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
-
-    if( rLocale.isSystemLocale() )
-        rLocale = ResMgrContainer::get().getDefLocale();
-
-    InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, rLocale );
-    return pImp ? new ResMgr( pImp ) : nullptr;
-}
-
-sal_Int32 ResMgr::ReadLong()
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-        return pFallbackResMgr->ReadLong();
-
-    sal_Int32 n = GetLong( GetClass() );
-    Increment( sizeof( sal_Int32 ) );
-    return n;
-}
-
-OUString ResMgr::ReadStringWithoutHook()
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
-    if( pFallbackResMgr )
-        return pFallbackResMgr->ReadStringWithoutHook();
-
-    OUString aRet;
-
-    const ImpRCStack& rTop = aStack[nCurStack];
-    if( (rTop.Flags & RCFlags::NOTFOUND) )
-    {
-        #if OSL_DEBUG_LEVEL > 0
-        aRet = "<resource not found>";
-        #endif
-    }
-    else
-        Increment( GetStringWithoutHook( aRet, static_cast<const sal_uInt8*>(GetClass()) ) );
-
-    return aRet;
-}
-
-OUString ResMgr::ExpandVariables(const OUString& rString)
-{
-    if (pImplResHookProc)
-        return pImplResHookProc(rString);
-    return rString;
-}
-
-OUString ResMgr::ReadString()
-{
-    return ExpandVariables(ReadStringWithoutHook());
-}
-
-void ResMgr::SetReadStringHook( ResHookProc pProc )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-    pImplResHookProc = pProc;
-}
-
-ResHookProc ResMgr::GetReadStringHook()
-{
-    return pImplResHookProc;
-}
-
-void ResMgr::SetDefaultLocale( const LanguageTag& rLocale )
-{
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-    ResMgrContainer::get().setDefLocale( rLocale );
-}
-
-const OUString& ResMgr::GetFileName() const
-{
-    return pImpRes->aFileName;
-}
-
-SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName,
-                            const LanguageTag& rLocale )
-{
-    OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
-    LanguageTag aLocale( rLocale );
-
-    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-    if( aLocale.isSystemLocale() )
-        aLocale = ResMgrContainer::get().getDefLocale();
-
-    m_pResImpl.reset(ResMgrContainer::get().getResMgr( aPrefix, aLocale, true ));
-    DBG_ASSERT( m_pResImpl, "SimpleResMgr::SimpleResMgr : have no impl class !" );
-}
-
-SimpleResMgr::~SimpleResMgr()
-{
-}
-
-SimpleResMgr* SimpleResMgr::Create(const sal_Char* pPrefixName, const LanguageTag& rLocale)
-{
-    return new SimpleResMgr(pPrefixName, rLocale);
-}
-
-bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId )
-{
-    osl::MutexGuard aGuard(m_aAccessSafety);
-
-    if ( ( RSC_STRING != _resourceType ) && ( RSC_RESOURCE != _resourceType ) )
-        return false;
-
-    DBG_ASSERT( m_pResImpl, "SimpleResMgr::IsAvailable: have no impl class !" );
-    return m_pResImpl->IsGlobalAvailable( _resourceType, _resourceId );
-}
-
-OUString SimpleResMgr::ReadString( sal_uInt32 nId )
-{
-    osl::MutexGuard aGuard(m_aAccessSafety);
-
-    DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadString : have no impl class !" );
-    // perhaps constructed with an invalid filename ?
-
-    OUString sReturn;
-    if ( !m_pResImpl )
-        return sReturn;
-
-    void* pResHandle = nullptr;
-    InternalResMgr* pFallback = m_pResImpl.get();
-    RSHEADER_TYPE* pResHeader = static_cast<RSHEADER_TYPE*>(m_pResImpl->LoadGlobalRes( RSC_STRING, nId, &pResHandle ));
-    if ( !pResHeader )
-    {
-        osl::Guard<osl::Mutex> aGuard2( getResMgrMutex() );
-
-        // try fallback
-        while( ! pResHandle && pFallback )
-        {
-            InternalResMgr* pOldFallback = pFallback;
-            pFallback = ResMgrContainer::get().getNextFallback( pFallback );
-            if( pOldFallback != m_pResImpl.get() )
-                ResMgrContainer::get().freeResMgr( pOldFallback );
-            if( pFallback )
-            {
-                // handle possible recursion
-                if( pFallback->aLocale != m_pResImpl->aLocale )
-                {
-                    pResHeader = static_cast<RSHEADER_TYPE*>(pFallback->LoadGlobalRes( RSC_STRING, nId, &pResHandle ));
-                }
-                else
-                {
-                    ResMgrContainer::get().freeResMgr( pFallback );
-                    pFallback = nullptr;
-                }
-            }
-        }
-        if( ! pResHandle )
-            // no such resource
-            return sReturn;
-    }
-
-    // sal_uIntPtr nLen = pResHeader->GetLocalOff() - sizeof(RSHEADER_TYPE);
-    ResMgr::GetString( sReturn, reinterpret_cast<sal_uInt8*>(pResHeader+1) );
-
-    // not necessary with the current implementation which holds the string table permanently, but to be sure ....
-    // note: pFallback cannot be NULL here and is either the fallback or m_pResImpl
-    InternalResMgr::FreeGlobalRes( pResHeader, pResHandle );
-    if( m_pResImpl.get() != pFallback )
-    {
-        osl::Guard<osl::Mutex> aGuard2( getResMgrMutex() );
-
-        ResMgrContainer::get().freeResMgr( pFallback );
+        return pImplResHookProc;
     }
-    return sReturn;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/lang/Locale.idl b/udkapi/com/sun/star/lang/Locale.idl
index c1a4c5d24e76..da1d3b3004a9 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -40,11 +40,6 @@ module com {  module sun {  module star {  module lang {
     the com::sun::star::resource::XLocale::getAvailableLocales() method to ask for the
     locales it supports.</p>
 
-    <p> <strong>Note:</strong> When you ask for a resource for a
-    particular locale, you get the best available match, not necessarily
-    precisely what you asked for. For more information, see
-    com::sun::star::resource::XResourceBundle.</p>
-
     <p> Each implementation that performs locale-sensitive operations
     allows you to get all the available objects of that type. Use the
     com::sun::star::resource::XLocale interface to set the locale. </p>
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 1e1195aa9ecd..cb1f718fca44 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -34,65 +34,41 @@ namespace utl
     class OComponentResModuleImpl
     {
     private:
-        ResMgr*         m_pResources;
-        bool            m_bInitialized;
-        OString  m_sResFilePrefix;
+        std::locale     m_aLocale;
+        bool            m_bLocaleInitialized;
+        OString         m_sResFilePrefix;
+        LanguageTag     m_aLanguage;
 
         OComponentResModuleImpl(const OComponentResModuleImpl&) = delete;
         OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) = delete;
 
     public:
-        explicit OComponentResModuleImpl( const OString& _rResFilePrefix )
-            :m_pResources( nullptr )
-            ,m_bInitialized( false )
-            ,m_sResFilePrefix( _rResFilePrefix )
+        explicit OComponentResModuleImpl(const OString& _rResFilePrefix, const LanguageTag& rLanguage)
+            : m_bLocaleInitialized( false )
+            , m_sResFilePrefix( _rResFilePrefix )
+            , m_aLanguage( rLanguage )
         {
         }
 
-        ~OComponentResModuleImpl()
-        {
-            freeResManager();
-        }
-
-        /** releases our resource manager
-        */
-        void freeResManager();
-
         /** retrieves our resource manager
         */
-        ResMgr* getResManager();
+        const std::locale& getResLocale();
     };
 
-    void OComponentResModuleImpl::freeResManager()
-    {
-        delete m_pResources;
-        m_pResources = nullptr;
-        m_bInitialized = false;
-    }
-
-    ResMgr* OComponentResModuleImpl::getResManager()
+    const std::locale& OComponentResModuleImpl::getResLocale()
     {
-        if ( !m_pResources && !m_bInitialized )
+        if (!m_bLocaleInitialized)
         {
-            // create a manager with a fixed prefix
-            OString aMgrName = m_sResFilePrefix;
-
-            m_pResources = ResMgr::CreateResMgr( aMgrName.getStr() );
-            OSL_ENSURE( m_pResources,
-                    OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " )
-                .append(aMgrName)
-                .append(")!").getStr() );
-
-            m_bInitialized = true;
+            m_aLocale = Translate::Create(m_sResFilePrefix.getStr(), m_aLanguage);
+            m_bLocaleInitialized = true;
         }
-        return m_pResources;
+        return m_aLocale;
     }
 
     //= OComponentResourceModule
-
-    OComponentResourceModule::OComponentResourceModule( const OString& _rResFilePrefix )
+    OComponentResourceModule::OComponentResourceModule(const OString& _rResFilePrefix, const LanguageTag& rLanguage)
         :BaseClass()
-        ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix ) )
+        ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix, rLanguage ) )
     {
     }
 
@@ -100,16 +76,10 @@ namespace utl
     {
     }
 
-    ResMgr* OComponentResourceModule::getResManager()
+    const std::locale& OComponentResourceModule::getResLocale()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
-        return m_pImpl->getResManager();
-    }
-
-    void OComponentResourceModule::onLastClient()
-    {
-        m_pImpl->freeResManager();
-        BaseClass::onLastClient();
+        return m_pImpl->getResLocale();
     }
 
 } // namespace utl
diff --git a/uui/AllLangMoTarget_uui.mk b/uui/AllLangMoTarget_uui.mk
new file mode 100644
index 000000000000..47d037f7ed4b
--- /dev/null
+++ b/uui/AllLangMoTarget_uui.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,uui))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
deleted file mode 100644
index fe59c93c6201..000000000000
--- a/uui/AllLangResTarget_uui.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_AllLangResTarget_AllLangResTarget,uui))
-
-$(eval $(call gb_AllLangResTarget_add_srs,uui,\
-	uui/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,uui/res))
-
-$(eval $(call gb_SrsTarget_set_include,uui/res,\
-	-I$(SRCDIR)/uui/source \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_SrsTarget_add_files,uui/res,\
-	uui/source/alreadyopen.src \
-	uui/source/filechanged.src \
-	uui/source/ids.src \
-	uui/source/lockfailed.src \
-	uui/source/lockcorrupt.src \
-	uui/source/nameclashdlg.src \
-	uui/source/openlocked.src \
-	uui/source/passworddlg.src \
-	uui/source/passworderrs.src \
-	uui/source/trylater.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index 6a2096b86632..7cef0e1da345 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,uui))
 
+$(eval $(call gb_Library_set_include,uui,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/uui/inc \
+))
+
 $(eval $(call gb_Library_set_componentfile,uui,uui/util/uui))
 
 $(eval $(call gb_Library_use_external,uui,boost_headers))
@@ -29,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,uui,\
 	i18nlangtag \
 	svl \
 	svt \
+	svx \
 	tk \
 	tl \
 	utl \
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index 436efbfcb09c..e86ec3b1ca63 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,uui))
 
 $(eval $(call gb_Module_add_targets,uui,\
 	Library_uui \
+	UIConfig_uui \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,uui,\
-	AllLangResTarget_uui \
-	UIConfig_uui \
+	AllLangMoTarget_uui \
 ))
 
 # screenshots
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
new file mode 100644
index 000000000000..2156b63bd1b6
--- /dev/null
+++ b/uui/inc/ids.hrc
@@ -0,0 +1,174 @@
+/* -*- 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_UUI_INC_IDS_HRC
+#define INCLUDED_UUI_INC_IDS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, ErrCode> RID_UUI_ERRHDL[] =
+{
+    { NC_("RID_UUI_ERRHDL", "The operation executed on $(ARG1) was aborted."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ABORT) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Access to $(ARG1) was denied."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ACCESSDENIED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) already exists."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ALREADYEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Target already exists."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_TARGETALREADYEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "You are about to save/export a password protected basic library containing module(s) \n$(ARG1)\nwhich are too large to store in binary format. If you wish users that don't have access to the library password to be able to run macros in those module(s) you must split those modules into a number of smaller modules. Do you wish to continue to save/export this library?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_MODULESIZEEXCEEDED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The data from $(ARG1) has an incorrect checksum."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BADCRC) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The object $(ARG1) cannot be created in directory $(ARG2)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTCREATE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Data of $(ARG1) could not be read."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTREAD) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The seek operation on $(ARG1) could not be performed."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTSEEK) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The tell operation on $(ARG1) could not be performed."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTTELL) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Data for $(ARG1) could not be written."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTWRITE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Action impossible: $(ARG1) is the current directory."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CURRENTDIR) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is not ready."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Action impossible: $(ARG1) and $(ARG2) are different devices (drives)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTSAMEDEVICE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "General input/output error while accessing $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_GENERAL) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "An attempt was made to access $(ARG1) in an invalid way."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDACCESS) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) contains invalid characters."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDCHAR) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The device (drive) $(ARG1) is invalid."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDDEVICE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The data from $(ARG1) has an invalid length."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDLENGTH) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) was started with an invalid parameter."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDPARAMETER) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation cannot be performed because $(ARG1) contains wildcards."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ISWILDCARD) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Error during shared access to $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_LOCKVIOLATION) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) contains misplaced characters."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_MISPLACEDCHAR) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The name $(ARG1) contains too many characters."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NAMETOOLONG) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) does not exist."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The path $(ARG1) does not exist."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTSPATH) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) is not supported on this operating system."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTSUPPORTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is not a directory."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTADIRECTORY) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is not a file."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTAFILE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "There is no space left on device $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_OUTOFSPACE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot be performed because too many files are already open."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_TOOMANYOPENFILES) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot be performed because there is no more memory available."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_OUTOFMEMORY) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot continue because more data is pending."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_PENDING) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) cannot be copied into itself."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_RECURSIVE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Unknown input/output error while accessing $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_UNKNOWN) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is write protected."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRITEPROTECTED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is not in the correct format."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRONGFORMAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The version of $(ARG1) is not correct."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRONGVERSION) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Drive $(ARG1) does not exist."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS_VOLUME) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Folder $(ARG1) does not exist."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS_FOLDER) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The installed Java version is not supported."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The installed Java version $(ARG1) is not supported."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_VERSION) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The installed Java version is not supported, at least version $(ARG1) is required."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_MIN) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_VERSION_MIN) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The data associated with the partnership is corrupted."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_BADPARTNERSHIP) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The data associated with the partnership $(ARG1) is corrupted."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_BADPARTNERSHIP_NAME) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Volume $(ARG1) is not ready."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_VOLUME) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is not ready; please insert a storage medium."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_REMOVABLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Volume $(ARG1) is not ready; please insert a storage medium."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Please insert disk $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGMEDIUM) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The object cannot be created in directory $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTCREATE_NONAME) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "%PRODUCTNAME cannot keep files from being overwritten when this transmission protocol is used. Do you want to continue anyway?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n\nThe corruption could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the repaired document.\nExecution of macros is disabled for this document.\n\nShould %PRODUCTNAME repair the file?\n"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BROKENPACKAGE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The file '$(ARG1)' could not be repaired and therefore cannot be opened."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BROKENPACKAGE_CANTREPAIR) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Configuration data in '$(ARG1)' is corrupted. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The personal configuration file '$(ARG1)' is corrupted and must be deleted to continue. Some of your personal settings may be lost.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BACKENDMISSING) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the missing configuration data?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BACKENDMISSING_WITHRECOVER) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The form contains invalid data. Do you still want to continue?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is locked by another user. Currently, another write access to this file cannot be granted."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCKED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is locked by yourself. Currently, another write access to this file cannot be granted."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCKED_SELF) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is currently not locked by yourself."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_NOT_LOCKED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "The previously obtained lock for file $(ARG1) has expired.\nThis can happen due to problems on the server managing the file lock. It cannot be guaranteed that write operations on this file will not overwrite changes done by other users!"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCK_EXPIRED) & ERRCODE_RES_MASK) },
+    { NC_("RID_UUI_ERRHDL", "Unable to verify the identity of $(ARG1) site.\n\nBefore accepting this certificate, you should examine this site's certificate carefully. Are you willing to accept this certificate for the purpose of identifying the Web site $(ARG1)?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED)) },
+    { NC_("RID_UUI_ERRHDL", "$(ARG1) is a site that uses a security certificate to encrypt data during transmission, but its certificate expired on $(ARG2).\n\nYou should check to make sure that your computer's time is correct."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_EXPIRED_1)) },
+    { NC_("RID_UUI_ERRHDL", "You have attempted to establish a connection with $(ARG1). However, the security certificate presented belongs to $(ARG2). It is possible, though unlikely, that someone may be trying to intercept your communication with this web site.\n\nIf you suspect the certificate shown does not belong to $(ARG1), please cancel the connection and notify the site administrator.\n\nWould you like to continue anyway?"),
+      ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_DOMAINMISMATCH_1)) },
+    { NC_("RID_UUI_ERRHDL", "The certificate could not be validated. You should examine this site's certificate carefully.\n\nIf you suspect the certificate shown, please cancel the connection and notify the site administrator."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_INVALID_1)) },
+    { NC_("RID_UUI_ERRHDL", "Security Warning: Domain Name Mismatch"),
+      ErrCode(TITLE_UUI_SSLWARN_DOMAINMISMATCH) },
+    { NC_("RID_UUI_ERRHDL", "Security Warning: Server Certificate Expired"),
+      ErrCode(TITLE_UUI_SSLWARN_EXPIRED) },
+    { NC_("RID_UUI_ERRHDL", "Security Warning: Server Certificate Invalid"),
+      ErrCode(TITLE_UUI_SSLWARN_INVALID) },
+    { NC_("RID_UUI_ERRHDL", "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1)."),
+      ErrCode(sal_uInt32(ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY) & ERRCODE_RES_MASK) },
+    { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/ids.hrc b/uui/inc/ids.hxx
index d019907c8d65..cccd0d36923e 100644
--- a/uui/source/ids.hrc
+++ b/uui/inc/ids.hxx
@@ -17,60 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UUI_IDS_HRC
-#define UUI_IDS_HRC
+#ifndef INCLUDED_UUI_INC_IDS_HXX
+#define INCLUDED_UUI_INC_IDS_HXX
 
-#include <svl/solar.hrc>
 #include <vcl/errcode.hxx>
 
-#define RID_KEEP_PASSWORD                               (RID_UUI_START +  0)
-#define RID_SAVE_PASSWORD                               (RID_UUI_START +  1)
-#define STR_ERROR_PASSWORDS_NOT_IDENTICAL               (RID_UUI_START + 13)
-#define STR_ERROR_MASTERPASSWORD_WRONG                  (RID_UUI_START + 14)
-// RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
-
-#define RID_UUI_ERRHDL                                  (RID_UUI_START + 20)
-#define STR_ERROR_SIMPLE_PASSWORD_WRONG                 (RID_UUI_START + 23)
-#define STR_ERROR_PASSWORD_TO_OPEN_WRONG                (RID_UUI_START + 24)
-#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG              (RID_UUI_START + 25)
-#define STR_UNKNOWNUSER                                 (RID_UUI_START + 31)
-#define STR_OPENLOCKED_TITLE                            (RID_UUI_START + 32)
-#define STR_OPENLOCKED_MSG                              (RID_UUI_START + 33)
-#define STR_OPENLOCKED_OPENREADONLY_BTN                 (RID_UUI_START + 34)
-#define STR_OPENLOCKED_OPENCOPY_BTN                     (RID_UUI_START + 35)
-#define STR_FILECHANGED_TITLE                           (RID_UUI_START + 36)
-#define STR_FILECHANGED_MSG                             (RID_UUI_START + 37)
-#define STR_FILECHANGED_SAVEANYWAY_BTN                  (RID_UUI_START + 38)
-#define STR_ALREADYOPEN_TITLE                           (RID_UUI_START + 39)
-#define STR_ALREADYOPEN_MSG                             (RID_UUI_START + 40)
-#define STR_ALREADYOPEN_READONLY_BTN                    (RID_UUI_START + 41)
-#define STR_ALREADYOPEN_OPEN_BTN                        (RID_UUI_START + 42)
-#define STR_LOCKFAILED_TITLE                            (RID_UUI_START + 43)
-#define STR_LOCKFAILED_MSG                              (RID_UUI_START + 44)
-#define STR_LOCKFAILED_OPENREADONLY_BTN                 (RID_UUI_START + 45)
-#define STR_LOCKCORRUPT_TITLE                           (RID_UUI_START + 46)
-#define STR_LOCKCORRUPT_MSG                             (RID_UUI_START + 47)
-#define STR_LOCKCORRUPT_OPENREADONLY_BTN                (RID_UUI_START + 48)
-#define STR_TRYLATER_TITLE                              (RID_UUI_START + 49)
-#define STR_TRYLATER_MSG                                (RID_UUI_START + 50)
-#define STR_TRYLATER_RETRYSAVING_BTN                    (RID_UUI_START + 51)
-#define STR_TRYLATER_SAVEAS_BTN                         (RID_UUI_START + 52)
-#define STR_ALREADYOPEN_SAVE_MSG                        (RID_UUI_START + 53)
-#define STR_ALREADYOPEN_RETRY_SAVE_BTN                  (RID_UUI_START + 54)
-#define STR_ALREADYOPEN_SAVE_BTN                        (RID_UUI_START + 55)
-
-#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE         (RID_UUI_START + 56)
-#define STR_ENTER_PASSWORD_TO_OPEN                      (RID_UUI_START + 57)
-#define STR_ENTER_PASSWORD_TO_MODIFY                    (RID_UUI_START + 58)
-#define STR_RENAME_OR_REPLACE                           (RID_UUI_START + 59)
-#define STR_NAME_CLASH_RENAME_ONLY                      (RID_UUI_START + 60)
-#define STR_SAME_NAME_USED                              (RID_UUI_START + 61)
-#define STR_ENTER_SIMPLE_PASSWORD                       (RID_UUI_START + 62)
-#define STR_CONFIRM_SIMPLE_PASSWORD                     (RID_UUI_START + 63)
-#define STR_TITLE_CREATE_PASSWORD                       (RID_UUI_START + 64)
-#define STR_TITLE_ENTER_PASSWORD                        (RID_UUI_START + 65)
-#define STR_PASSWORD_MISMATCH                           (RID_UUI_START + 66)
-
 #define ERRCODE_UUI_IO_ABORT                                    ErrCode(ERRCODE_AREA_UUI + 0)
 #define ERRCODE_UUI_IO_ACCESSDENIED                             ErrCode(ERRCODE_AREA_UUI + 1)
 #define ERRCODE_UUI_IO_ALREADYEXISTS                            ErrCode(ERRCODE_AREA_UUI + 2)
@@ -151,6 +102,6 @@
 #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1)
 #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
 
-#endif // UUI_IDS_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
new file mode 100644
index 000000000000..760402c1d57b
--- /dev/null
+++ b/uui/inc/strings.hrc
@@ -0,0 +1,80 @@
+/* -*- 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_UUI_INC_STRINGS_HRC
+#define INCLUDED_UUI_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_ENTER_PASSWORD_TO_OPEN              NC_("STR_ENTER_PASSWORD_TO_OPEN", "Enter password to open file: \n")
+#define STR_ENTER_PASSWORD_TO_MODIFY            NC_("STR_ENTER_PASSWORD_TO_MODIFY", "Enter password to modify file: \n")
+#define STR_ENTER_SIMPLE_PASSWORD               NC_("STR_ENTER_SIMPLE_PASSWORD", "Enter password: ")
+#define STR_CONFIRM_SIMPLE_PASSWORD             NC_("STR_CONFIRM_SIMPLE_PASSWORD", "Confirm password: ")
+#define STR_TITLE_CREATE_PASSWORD               NC_("STR_TITLE_CREATE_PASSWORD", "Set Password")
+#define STR_TITLE_ENTER_PASSWORD                NC_("STR_TITLE_ENTER_PASSWORD", "Enter Password")
+#define STR_PASSWORD_MISMATCH                   NC_("STR_PASSWORD_MISMATCH", "The confirmation password did not match the password. Set the password again by entering the same password in both boxes.")
+
+#define STR_ALREADYOPEN_TITLE                   NC_("STR_ALREADYOPEN_TITLE", "Document in Use")
+#define STR_ALREADYOPEN_MSG                     NC_("STR_ALREADYOPEN_MSG", "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n\nOpen document read-only, or ignore own file locking and open the document for editing.\n\n")
+#define STR_ALREADYOPEN_READONLY_BTN            NC_("STR_ALREADYOPEN_READONLY_BTN", "Open ~Read-Only")
+#define STR_ALREADYOPEN_OPEN_BTN                NC_("STR_ALREADYOPEN_OPEN_BTN", "~Open")
+#define STR_ALREADYOPEN_SAVE_MSG                NC_("STR_ALREADYOPEN_SAVE_MSG", "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n\nClose document on other system and retry saving or ignore own file locking and save current document.\n\n")
+#define STR_ALREADYOPEN_RETRY_SAVE_BTN          NC_("STR_ALREADYOPEN_RETRY_SAVE_BTN", "~Retry Saving")
+#define STR_ALREADYOPEN_SAVE_BTN                NC_("STR_ALREADYOPEN_SAVE_BTN", "~Save")
+
+#define RID_KEEP_PASSWORD                       NC_("RID_KEEP_PASSWORD", "~Remember password until end of session")
+#define RID_SAVE_PASSWORD                       NC_("RID_SAVE_PASSWORD", "~Remember password")
+#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE NC_("STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE", "Non-Encrypted Streams")
+
+#define STR_LOCKFAILED_TITLE                    NC_("STR_LOCKFAILED_TITLE", "Document Could Not Be Locked")
+#define STR_LOCKFAILED_MSG                      NC_("STR_LOCKFAILED_MSG", "The lock file could not be created for exclusive access by %PRODUCTNAME, due to missing permission to create a lock file on that file location or lack of free disk space.")
+#define STR_LOCKFAILED_OPENREADONLY_BTN         NC_("STR_LOCKFAILED_OPENREADONLY_BTN", "Open ~Read-Only")
+
+#define STR_OPENLOCKED_TITLE                    NC_("STR_OPENLOCKED_TITLE", "Document in Use")
+#define STR_OPENLOCKED_MSG                      NC_("STR_OPENLOCKED_MSG", "Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document read-only or open a copy of the document for editing.\n\n")
+#define STR_OPENLOCKED_OPENREADONLY_BTN         NC_("STR_OPENLOCKED_OPENREADONLY_BTN", "Open ~Read-Only")
+#define STR_OPENLOCKED_OPENCOPY_BTN             NC_("STR_OPENLOCKED_OPENCOPY_BTN", "Open ~Copy")
+#define STR_UNKNOWNUSER                         NC_("STR_UNKNOWNUSER", "Unknown User")
+
+#define STR_FILECHANGED_TITLE                   NC_("STR_FILECHANGED_TITLE", "Document Has Been Changed by Others")
+#define STR_FILECHANGED_MSG                     NC_("STR_FILECHANGED_MSG", "The file has been changed since it was opened for editing in %PRODUCTNAME. Saving your version of the document will overwrite changes made by others.\n\nDo you want to save anyway?\n\n")
+#define STR_FILECHANGED_SAVEANYWAY_BTN          NC_("STR_FILECHANGED_SAVEANYWAY_BTN", "~Save Anyway")
+
+#define STR_TRYLATER_TITLE                      NC_("STR_TRYLATER_TITLE", "Document in Use")
+#define STR_TRYLATER_MSG                        NC_("STR_TRYLATER_MSG", "Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nTry again later to save document or save a copy of that document.\n\n")
+#define STR_TRYLATER_RETRYSAVING_BTN            NC_("STR_TRYLATER_RETRYSAVING_BTN", "~Retry Saving")
+#define STR_TRYLATER_SAVEAS_BTN                 NC_("STR_TRYLATER_SAVEAS_BTN", "~Save As...")
+
+#define STR_RENAME_OR_REPLACE                   NC_("STR_RENAME_OR_REPLACE", "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.")
+#define STR_NAME_CLASH_RENAME_ONLY              NC_("STR_NAME_CLASH_RENAME_ONLY", "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.")
+#define STR_SAME_NAME_USED                      NC_("STR_SAME_NAME_USED", "Please provide a different file name!")
+
+#define STR_ERROR_PASSWORD_TO_OPEN_WRONG        NC_("STR_ERROR_PASSWORD_TO_OPEN_WRONG", "The password is incorrect. The file cannot be opened.")
+#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG      NC_("STR_ERROR_PASSWORD_TO_MODIFY_WRONG", "The password is incorrect. The file cannot be modified.")
+#define STR_ERROR_MASTERPASSWORD_WRONG          NC_("STR_ERROR_MASTERPASSWORD_WRONG", "The master password is incorrect.")
+#define STR_ERROR_SIMPLE_PASSWORD_WRONG         NC_("STR_ERROR_SIMPLE_PASSWORD_WRONG", "The password is incorrect.")
+#define STR_ERROR_PASSWORDS_NOT_IDENTICAL       NC_("STR_ERROR_PASSWORDS_NOT_IDENTICAL", "The password confirmation does not match.")
+
+#define STR_LOCKCORRUPT_TITLE                   NC_("STR_LOCKCORRUPT_TITLE", "Lock file is corrupted")
+#define STR_LOCKCORRUPT_MSG                     NC_("STR_LOCKCORRUPT_MSG", "The lock file is corrupted and probably empty. Opening the document read-only and closing it again removes the corrupted lock file.")
+#define STR_LOCKCORRUPT_OPENREADONLY_BTN        NC_("STR_LOCKCORRUPT_OPENREADONLY_BTN", "Open ~Read-Only")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 353fa3c7959b..9445fc4b0fa0 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -17,28 +17,29 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "alreadyopen.hxx"
+#include <tools/resmgr.hxx>
 
-AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) :
+AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, const std::locale& rLocale, const OUString& aMessage, bool bIsStoring ) :
     MessBox(pParent, 0,
-            ResId(STR_ALREADYOPEN_TITLE, *pResMgr).toString(),
+            Translate::get(STR_ALREADYOPEN_TITLE, rLocale),
             aMessage )
 {
     SetImage( QueryBox::GetStandardImage() );
 
     if ( bIsStoring )
     {
-        AddButton( ResId(STR_ALREADYOPEN_RETRY_SAVE_BTN, *pResMgr).toString(), RET_YES,
+        AddButton( Translate::get(STR_ALREADYOPEN_RETRY_SAVE_BTN, rLocale), RET_YES,
                 ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
-        AddButton( ResId(STR_ALREADYOPEN_SAVE_BTN, *pResMgr).toString(), RET_NO);
+        AddButton( Translate::get(STR_ALREADYOPEN_SAVE_BTN, rLocale), RET_NO);
         AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
     }
     else
     {
-        AddButton( ResId(STR_ALREADYOPEN_READONLY_BTN, *pResMgr).toString(), RET_YES,
+        AddButton( Translate::get(STR_ALREADYOPEN_READONLY_BTN, rLocale), RET_YES,
                 ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
-        AddButton( ResId(STR_ALREADYOPEN_OPEN_BTN, *pResMgr).toString(), RET_NO);
+        AddButton( Translate::get(STR_ALREADYOPEN_OPEN_BTN, rLocale), RET_NO);
         AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
     }
 
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index badca91b90af..809044bc120e 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
@@ -24,7 +24,7 @@
 class AlreadyOpenQueryBox : public MessBox
 {
 public:
-    AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring );
+    AlreadyOpenQueryBox( vcl::Window* pParent, const std::locale& rResLocale, const OUString& aMessage, bool bIsStoring );
     virtual ~AlreadyOpenQueryBox() override;
 };
 
diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
deleted file mode 100644
index 6bcca248d9ef..000000000000
--- a/uui/source/alreadyopen.src
+++ /dev/null
@@ -1,51 +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 "ids.hrc"
-
-String STR_ALREADYOPEN_TITLE
-{
-    Text [ en-US ] = "Document in Use";
-};
-String STR_ALREADYOPEN_MSG
-{
-    Text [ en-US ] = "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n\nOpen document read-only, or ignore own file locking and open the document for editing.\n\n";
-};
-String STR_ALREADYOPEN_READONLY_BTN
-{
-    Text [ en-US ] = "Open ~Read-Only";
-};
-String STR_ALREADYOPEN_OPEN_BTN
-{
-    Text [ en-US ] = "~Open";
-};
-String STR_ALREADYOPEN_SAVE_MSG
-{
-    Text [ en-US ] = "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n\nClose document on other system and retry saving or ignore own file locking and save current document.\n\n";
-};
-String STR_ALREADYOPEN_RETRY_SAVE_BTN
-{
-    Text [ en-US ] = "~Retry Saving";
-};
-String STR_ALREADYOPEN_SAVE_BTN
-{
-    Text [ en-US ] = "~Save";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 33b5dee6b777..7fefdba84f08 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -17,22 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include "strings.hrc"
+#include <tools/resmgr.hxx>
 #include "filechanged.hxx"
 
-FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) :
+FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, const std::locale& rLocale ) :
     MessBox(pParent, 0,
-            ResId(STR_FILECHANGED_TITLE, *pResMgr).toString(),
+            Translate::get(STR_FILECHANGED_TITLE, rLocale),
             OUString() )
 {
     SetImage( QueryBox::GetStandardImage() );
 
-    AddButton(ResId(STR_FILECHANGED_SAVEANYWAY_BTN, *pResMgr).toString(), RET_YES,
+    AddButton(Translate::get(STR_FILECHANGED_SAVEANYWAY_BTN, rLocale), RET_YES,
             ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
     AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
 
     SetButtonHelpText( RET_YES, OUString() );
-    SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString());
+    SetMessText(Translate::get(STR_FILECHANGED_MSG, rLocale));
 }
 
 FileChangedQueryBox::~FileChangedQueryBox()
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index 5fe447b19c3e..f15e1ced340d 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
@@ -24,7 +24,7 @@
 class FileChangedQueryBox : public MessBox
 {
 public:
-    FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr );
+    FileChangedQueryBox( vcl::Window* pParent, const std::locale& pResLocale );
     virtual ~FileChangedQueryBox() override;
 };
 
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
deleted file mode 100644
index ebc37bf72dd6..000000000000
--- a/uui/source/filechanged.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 "ids.hrc"
-
-String STR_FILECHANGED_TITLE
-{
-    Text [ en-US ] = "Document Has Been Changed by Others";
-};
-String STR_FILECHANGED_MSG
-{
-    Text [ en-US ] = "The file has been changed since it was opened for editing in %PRODUCTNAME. Saving your version of the document will overwrite changes made by others.\n\nDo you want to save anyway?\n\n";
-};
-String STR_FILECHANGED_SAVEANYWAY_BTN
-{
-    Text [ en-US ] = "~Save Anyway";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 0b49946563cd..42c870de403a 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -19,7 +19,7 @@
 
 #include "fltdlg.hxx"
 
-#include "ids.hrc"
+#include "ids.hxx"
 
 #include <com/sun/star/util/XStringWidth.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 1a8fe8686289..bf1392e90f0f 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -34,6 +34,7 @@
 
 #include <osl/diagnose.h>
 #include <rtl/digest.h>
+#include <tools/resmgr.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/msgbox.hxx>
@@ -41,7 +42,7 @@
 #include <vcl/svapp.hxx>
 
 #include "authfallbackdlg.hxx"
-#include "ids.hrc"
+#include "strings.hrc"
 #include "getcontinuations.hxx"
 #include "passwordcontainer.hxx"
 #include "loginerr.hxx"
@@ -100,12 +101,12 @@ executeLoginDialog(
 
         if (bSavePassword)
         {
-            std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
+            std::locale aLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
             xDialog->SetSavePasswordText(
-                ResId(rInfo.GetIsRememberPersistent()
+                Translate::get(rInfo.GetIsRememberPersistent()
                           ? RID_SAVE_PASSWORD
                           : RID_KEEP_PASSWORD,
-                      *xManager.get()));
+                      aLocale));
 
             xDialog->SetSavePassword(rInfo.GetIsRememberPassword());
         }
@@ -413,11 +414,11 @@ executeMasterPasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
+        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
             ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog(
-                pParent, xManager.get());
+                pParent, aResLocale);
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
             aMaster = OUStringToOString(
@@ -426,7 +427,7 @@ executeMasterPasswordDialog(
         else
         {
             ScopedVclPtrInstance< MasterPasswordDialog > xDialog(
-                pParent, nMode, xManager.get());
+                pParent, nMode, aResLocale);
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel);
             aMaster = OUStringToOString(
@@ -511,12 +512,12 @@ executePasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
+        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
             if (bIsSimplePasswordRequest)
             {
-                ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, xManager.get(), aDocName,
+                ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, aResLocale, aDocName,
                     bIsPasswordToModify, bIsSimplePasswordRequest);
                 xDialog->SetMinLen(0);
 
@@ -539,7 +540,7 @@ executePasswordDialog(
         }
         else // enter password or reenter password
         {
-            ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, xManager.get(), aDocName,
+            ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, aResLocale, aDocName,
                 bIsPasswordToModify, bIsSimplePasswordRequest);
             xDialog->SetMinLen(0);
 
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index b1a3acb331a3..5818b24220eb 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -26,9 +26,12 @@
 #include <com/sun/star/task/XInteractionRetry.hpp>
 
 #include <vcl/errinf.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
+#include <svx/svxerr.hxx>
 #include <svx/dialogs.hrc>
+#include <tools/resmgr.hxx>
 
+#include "ids.hxx"
 #include "ids.hrc"
 #include "getcontinuations.hxx"
 
@@ -152,9 +155,9 @@ UUIInteractionHelper::handleErrorHandlerRequest(
     {
         enum Source { SOURCE_DEFAULT, SOURCE_SVX, SOURCE_UUI };
         static char const * const aManager[3] = { "svt", "svx", "uui" };
-        static sal_uInt16 const aId[3]
-            = { RID_ERRHDL,
-                RID_SVXERRCODE,
+        static const ErrMsgCode* const aId[3]
+            = { getRID_ERRHDL(),
+                getRID_SVXERRCODE(),
                 RID_UUI_ERRHDL };
         ErrCode nErrorId = nErrorCode.IgnoreWarning();
         Source eSource = nErrorId < ErrCode(ERRCODE_AREA_SVX) ?
@@ -164,13 +167,9 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             SOURCE_SVX :
             SOURCE_UUI;
 
-        SolarMutexGuard aGuard;
-        std::unique_ptr< ResMgr > xManager;
-        xManager.reset(ResMgr::CreateResMgr(aManager[eSource]));
-        if (!xManager.get())
-            return;
-        ResId aResId(aId[eSource], *xManager.get());
-        if (!ErrorResource(aResId).getString(nErrorCode, aMessage))
+        std::locale aResLocale = Translate::Create(aManager[eSource], Application::GetSettings().GetUILanguageTag());
+        ErrorResource aErrorResource(aId[eSource], aResLocale);
+        if (!aErrorResource.getString(nErrorCode, aMessage))
             return;
     }
 
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index 15db83ee26ec..e11ed64c901f 100644
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <comphelper/fileurl.hxx>
 
-#include "ids.hrc"
+#include "ids.hxx"
 
 #include "iahndl.hxx"
 
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index d5ca16f95a96..927351727129 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -30,10 +30,11 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 
+#include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "getcontinuations.hxx"
 #include "openlocked.hxx"
 #include "trylater.hxx"
@@ -73,9 +74,7 @@ handleLockedDocumentRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        if (!xManager.get())
-            return;
+        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
 
         OUString aMessage;
         std::vector< OUString > aArguments;
@@ -86,41 +85,40 @@ handleLockedDocumentRequest_(
         {
             aArguments.push_back( !aInfo.isEmpty()
                                   ? aInfo
-                                  : ResId( STR_UNKNOWNUSER,
-                                               *xManager.get() ).toString() );
-            aMessage = ResId(STR_OPENLOCKED_MSG, *xManager.get()).toString();
+                                  : Translate::get( STR_UNKNOWNUSER, aResLocale) );
+            aMessage = Translate::get(STR_OPENLOCKED_MSG, aResLocale);
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            ScopedVclPtrInstance< OpenLockedQueryBox > xDialog(pParent, xManager.get(), aMessage);
+            ScopedVclPtrInstance< OpenLockedQueryBox > xDialog(pParent, aResLocale, aMessage);
             nResult = xDialog->Execute();
         }
         else if ( nMode == UUI_DOC_SAVE_LOCK )
         {
             aArguments.push_back( !aInfo.isEmpty()
                                   ? aInfo
-                                  : ResId( STR_UNKNOWNUSER,
-                                               *xManager.get() ).toString() );
-            aMessage = ResId(STR_TRYLATER_MSG, *xManager.get()).toString();
+                                  : Translate::get( STR_UNKNOWNUSER,
+                                               aResLocale ) );
+            aMessage = Translate::get(STR_TRYLATER_MSG, aResLocale);
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
-            ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage );
+            ScopedVclPtrInstance< TryLaterQueryBox > xDialog(pParent, aResLocale, aMessage);
             nResult = xDialog->Execute();
         }
         else if ( nMode == UUI_DOC_OWN_LOAD_LOCK ||
                   nMode == UUI_DOC_OWN_SAVE_LOCK )
         {
             aArguments.push_back( aInfo );
-            aMessage = ResId(nMode == UUI_DOC_OWN_SAVE_LOCK
+            aMessage = Translate::get(nMode == UUI_DOC_OWN_SAVE_LOCK
                                           ? STR_ALREADYOPEN_SAVE_MSG
                                           : STR_ALREADYOPEN_MSG,
-                                      *xManager.get() ).toString();
+                                      aResLocale );
             aMessage = UUIInteractionHelper::replaceMessageWithArguments(
                 aMessage, aArguments );
 
             ScopedVclPtrInstance< AlreadyOpenQueryBox > xDialog( pParent,
-                                         xManager.get(),
+                                         aResLocale,
                                          aMessage,
                                          nMode == UUI_DOC_OWN_SAVE_LOCK );
             nResult = xDialog->Execute();
@@ -155,11 +153,8 @@ handleChangedByOthersRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        if (!xManager.get())
-            return;
-
-        ScopedVclPtrInstance< FileChangedQueryBox > xDialog(pParent, xManager.get());
+        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+        ScopedVclPtrInstance< FileChangedQueryBox > xDialog(pParent, aResLocale);
         sal_Int32 nResult = xDialog->Execute();
 
         if ( nResult == RET_YES )
@@ -194,24 +189,21 @@ handleLockFileProblemRequest_(
     try
     {
         SolarMutexGuard aGuard;
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        if (!xManager.get())
-            return;
+        std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
 
         sal_Int32 nResult;
 
         if (nWhichDlg == UUI_DOC_CreateErrDlg)
         {
-            ScopedVclPtrInstance< LockFailedQueryBox > xDialog(pParent, xManager.get());
+            ScopedVclPtrInstance< LockFailedQueryBox > xDialog(pParent, aResLocale);
             nResult = xDialog->Execute();
         }
         else
         {
-            ScopedVclPtrInstance< LockCorruptQueryBox > xDialog(pParent, xManager.get());
+            ScopedVclPtrInstance< LockCorruptQueryBox > xDialog(pParent, aResLocale);
             nResult = xDialog->Execute();
         }
 
-
         if ( nResult == RET_OK )
             xApprove->select();
         else
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 2937b0ee3d81..c835cdeb1f04 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -31,9 +31,11 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/zforlist.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
+#include "ids.hxx"
 #include "ids.hrc"
 #include "getcontinuations.hxx"
 #include "sslwarndlg.hxx"
@@ -153,17 +155,14 @@ executeUnknownAuthDialog(
         std::vector< OUString > aArguments;
         aArguments.push_back( getContentPart( rXCert->getSubjectName()) );
 
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        if (xManager.get())
+        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        ErrorResource aErrorResource(RID_UUI_ERRHDL, aResLocale);
+
+        if (aErrorResource.getString(ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED, aMessage))
         {
-            ResId aResId(RID_UUI_ERRHDL, *xManager.get());
-            if (ErrorResource(aResId).getString(
-                    ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED, aMessage))
-            {
-                aMessage = UUIInteractionHelper::replaceMessageWithArguments(
-                    aMessage, aArguments );
-                xDialog->setDescriptionText( aMessage );
-            }
+            aMessage = UUIInteractionHelper::replaceMessageWithArguments(
+                aMessage, aArguments );
+            xDialog->setDescriptionText( aMessage );
         }
 
         return static_cast<bool>(xDialog->Execute());
@@ -214,26 +213,23 @@ executeSSLWarnDialog(
                 break;
         }
 
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
+        std::locale aResLocale(Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        ErrorResource aErrorResource(RID_UUI_ERRHDL, aResLocale);
+
+        if (aErrorResource.getString(
+                ErrCode(ERRCODE_AREA_UUI_UNKNOWNAUTH + failure + DESCRIPTION_1),
+                aMessage_1))
+        {
+            aMessage_1 = UUIInteractionHelper::replaceMessageWithArguments(
+                aMessage_1, aArguments_1 );
+            xDialog->setDescription1Text( aMessage_1 );
+        }
 
-        if (xManager.get())
+        OUString aTitle;
+        if (aErrorResource.getString(
+            ErrCode(ERRCODE_AREA_UUI_UNKNOWNAUTH + failure + TITLE), aTitle))
         {
-            ResId aResId(RID_UUI_ERRHDL, *xManager.get());
-            if (ErrorResource(aResId).getString(
-                    ErrCode(sal_uInt32(ERRCODE_AREA_UUI_UNKNOWNAUTH) + failure + DESCRIPTION_1),
-                    aMessage_1))
-            {
-                aMessage_1 = UUIInteractionHelper::replaceMessageWithArguments(
-                    aMessage_1, aArguments_1 );
-                xDialog->setDescription1Text( aMessage_1 );
-            }
-
-            OUString aTitle;
-            if (ErrorResource(aResId).getString(
-                ErrCode(sal_uInt32(ERRCODE_AREA_UUI_UNKNOWNAUTH) + failure + TITLE), aTitle))
-            {
-                xDialog->SetText(aTitle);
-            }
+            xDialog->SetText(aTitle);
         }
 
         return static_cast<bool>(xDialog->Execute());
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index e7938b121db2..cb24ce840f04 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -61,7 +61,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <osl/conditn.hxx>
-#include <tools/rcid.h>
+#include <tools/resmgr.hxx>
 #include <vcl/errinf.hxx>
 #include <osl/thread.hxx>
 #include <tools/diagnose_ex.h>
@@ -76,7 +76,9 @@
 #include <typelib/typedescription.hxx>
 #include <unotools/confignode.hxx>
 
+#include "ids.hxx"
 #include "ids.hrc"
+#include "strings.hrc"
 
 #include "getcontinuations.hxx"
 #include "secmacrowarnings.hxx"
@@ -996,11 +998,8 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *p
                                                                   OUString & rProposedNewName,
                                                                   bool bAllowOverwrite )
 {
-    std::unique_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) );
-    if ( !xManager.get() )
-        return ABORT;
-
-    ScopedVclPtrInstance<NameClashDialog> aDialog(pParent, xManager.get(), rTargetFolderURL,
+    std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
+    ScopedVclPtrInstance<NameClashDialog> aDialog(pParent, aResLocale, rTargetFolderURL,
                                                   rClashingName, rProposedNewName, bAllowOverwrite);
 
     NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog->Execute();
@@ -1101,12 +1100,10 @@ UUIInteractionHelper::handleGenericErrorRequest(
             OUString aErrorString;
             ErrorHandler::GetErrorString( nErrorCode, aErrorString );
 
-            std::unique_ptr< ResMgr > xManager(
-                ResMgr::CreateResMgr( "uui" ) );
+            std::locale aResLocale = Translate::Create("uui", Application::GetSettings().GetUILanguageTag());
             OUString aTitle( utl::ConfigManager::getProductName() );
 
-            OUString aErrTitle = ResId( STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE,
-                *xManager.get() ).toString();
+            OUString aErrTitle = Translate::get(STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE, aResLocale);
 
             if ( !aTitle.isEmpty() && !aErrTitle.isEmpty() )
                 aTitle += " - " ;
@@ -1197,13 +1194,8 @@ UUIInteractionHelper::handleBrokenPackageRequest(
 
     OUString aMessage;
     {
-        SolarMutexGuard aGuard;
-        std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
-        if (!xManager.get())
-            return;
-
-        ResId aResId( RID_UUI_ERRHDL, *xManager.get() );
-        if ( !ErrorResource(aResId).getString(nErrorCode, aMessage) )
+        ErrorResource aErrorResource(RID_UUI_ERRHDL, Translate::Create("uui", Application::GetSettings().GetUILanguageTag()));
+        if (!aErrorResource.getString(nErrorCode, aMessage))
             return;
     }
 
@@ -1257,19 +1249,18 @@ UUIInteractionHelper::handleBrokenPackageRequest(
     }
 }
 
-
 // ErrorResource Implementation
-
-
-bool
-ErrorResource::getString(ErrCode nErrorCode, OUString &rString)
-    const
+bool ErrorResource::getString(ErrCode nErrorCode, OUString &rString) const
 {
-    sal_uInt32 nIdx = m_aStringArray.FindIndex(nErrorCode.GetRest());
-    if (nIdx == RESARRAY_INDEX_NOTFOUND)
-        return false;
-    rString = m_aStringArray.GetString(nIdx);
-    return true;
+    for (const std::pair<const char*, ErrCode>* pStringArray = m_pStringArray; pStringArray->first != nullptr; ++pStringArray)
+    {
+        if (ErrCode(nErrorCode.GetRest()) == pStringArray->second)
+        {
+            rString = Translate::get(pStringArray->first, m_rResLocale);
+            return true;
+        }
+    }
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 558951b3ef90..5b1fda3e38c5 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/task/InteractionClassification.hpp>
 
 #include <vcl/errcode.hxx>
-#include <tools/resary.hxx>
 #include <tools/wintypes.hxx>
 
 #include <unordered_map>
@@ -248,10 +247,14 @@ private:
 
 class ErrorResource
 {
-    ResStringArray m_aStringArray;
+    const std::pair<const char*, ErrCode>* m_pStringArray;
+    const std::locale& m_rResLocale;
 public:
-    explicit ErrorResource(ResId& rResId) : m_aStringArray(rResId) {}
-
+    explicit ErrorResource(const std::pair<const char*, ErrCode>* pStringArray, const std::locale& rResLocale)
+        : m_pStringArray(pStringArray)
+        , m_rResLocale(rResLocale)
+    {
+    }
     bool getString(ErrCode nErrorCode, OUString &rString) const;
 };
 
diff --git a/uui/source/ids.src b/uui/source/ids.src
deleted file mode 100644
index 82f5191b19c1..000000000000
--- a/uui/source/ids.src
+++ /dev/null
@@ -1,256 +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 "ids.hrc"
-
-String RID_KEEP_PASSWORD
-{
-    Text [ en-US ] = "~Remember password until end of session";
-};
-
-String RID_SAVE_PASSWORD
-{
-    Text [ en-US ] = "~Remember password";
-};
-
-String STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE
-{
-    Text [ en-US ] = "Non-Encrypted Streams" ;
-};
-
-StringArray RID_UUI_ERRHDL
-{
-    ItemList [ en-US ] =
-    {
-        < "The operation executed on $(ARG1) was aborted." ;
-          (ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK) ; >;
-
-        < "Access to $(ARG1) was denied." ;
-          (ERRCODE_UUI_IO_ACCESSDENIED & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) already exists.";
-          (ERRCODE_UUI_IO_ALREADYEXISTS & ERRCODE_RES_MASK) ; >;
-
-        < "Target already exists." ;
-          (ERRCODE_UUI_IO_TARGETALREADYEXISTS & ERRCODE_RES_MASK) ; >;
-
-        < "You are about to save/export a password protected basic library containing module(s) \n$(ARG1)\nwhich are too large to store in binary format. If you wish users that don't have access to the library password to be able to run macros in those module(s) you must split those modules into a number of smaller modules. Do you wish to continue to save/export this library?"  ;
-          (ERRCODE_UUI_IO_MODULESIZEEXCEEDED & ERRCODE_RES_MASK) ; >;
-
-        < "The data from $(ARG1) has an incorrect checksum." ;
-          (ERRCODE_UUI_IO_BADCRC & ERRCODE_RES_MASK) ; >;
-
-        < "The object $(ARG1) cannot be created in directory $(ARG2)." ;
-          (ERRCODE_UUI_IO_CANTCREATE & ERRCODE_RES_MASK) ; >;
-
-        < "Data of $(ARG1) could not be read." ;
-          (ERRCODE_UUI_IO_CANTREAD & ERRCODE_RES_MASK) ; >;
-
-        < "The seek operation on $(ARG1) could not be performed." ;
-          (ERRCODE_UUI_IO_CANTSEEK & ERRCODE_RES_MASK) ; >;
-
-        < "The tell operation on $(ARG1) could not be performed." ;
-          (ERRCODE_UUI_IO_CANTTELL & ERRCODE_RES_MASK) ; >;
-
-        < "Data for $(ARG1) could not be written." ;
-          (ERRCODE_UUI_IO_CANTWRITE & ERRCODE_RES_MASK) ; >;
-
-        < "Action impossible: $(ARG1) is the current directory." ;
-          (ERRCODE_UUI_IO_CURRENTDIR & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is not ready." ;
-          (ERRCODE_UUI_IO_NOTREADY & ERRCODE_RES_MASK) ; >;
-
-        < "Action impossible: $(ARG1) and $(ARG2) are different devices (drives)." ;
-          (ERRCODE_UUI_IO_NOTSAMEDEVICE & ERRCODE_RES_MASK) ; >;
-
-        < "General input/output error while accessing $(ARG1)." ;
-          (ERRCODE_UUI_IO_GENERAL & ERRCODE_RES_MASK) ; >;
-
-        < "An attempt was made to access $(ARG1) in an invalid way." ;
-          (ERRCODE_UUI_IO_INVALIDACCESS & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) contains invalid characters." ;
-          (ERRCODE_UUI_IO_INVALIDCHAR & ERRCODE_RES_MASK) ; >;
-
-        < "The device (drive) $(ARG1) is invalid." ;
-          (ERRCODE_UUI_IO_INVALIDDEVICE & ERRCODE_RES_MASK) ; >;
-
-        < "The data from $(ARG1) has an invalid length." ;
-          (ERRCODE_UUI_IO_INVALIDLENGTH & ERRCODE_RES_MASK) ; >;
-
-        < "The operation on $(ARG1) was started with an invalid parameter." ;
-          (ERRCODE_UUI_IO_INVALIDPARAMETER & ERRCODE_RES_MASK) ; >;
-
-        < "The operation cannot be performed because $(ARG1) contains wildcards." ;
-          (ERRCODE_UUI_IO_ISWILDCARD & ERRCODE_RES_MASK) ; >;
-
-        < "Error during shared access to $(ARG1)." ;
-          (ERRCODE_UUI_IO_LOCKVIOLATION & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) contains misplaced characters." ;
-          (ERRCODE_UUI_IO_MISPLACEDCHAR & ERRCODE_RES_MASK) ; >;
-
-        < "The name $(ARG1) contains too many characters." ;
-          (ERRCODE_UUI_IO_NAMETOOLONG & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) does not exist." ;
-          (ERRCODE_UUI_IO_NOTEXISTS & ERRCODE_RES_MASK) ; >;
-
-        < "The path $(ARG1) does not exist." ;
-          (ERRCODE_UUI_IO_NOTEXISTSPATH & ERRCODE_RES_MASK) ; >;
-
-        < "The operation on $(ARG1) is not supported on this operating system." ;
-          (ERRCODE_UUI_IO_NOTSUPPORTED & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is not a directory." ;
-          (ERRCODE_UUI_IO_NOTADIRECTORY & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is not a file." ;
-          (ERRCODE_UUI_IO_NOTAFILE & ERRCODE_RES_MASK) ; >;
-
-        < "There is no space left on device $(ARG1)." ;
-          (ERRCODE_UUI_IO_OUTOFSPACE & ERRCODE_RES_MASK) ; >;
-
-        < "The operation on $(ARG1) cannot be performed because too many files are already open." ;
-          (ERRCODE_UUI_IO_TOOMANYOPENFILES & ERRCODE_RES_MASK) ; >;
-
-        < "The operation on $(ARG1) cannot be performed because there is no more memory available." ;
-          (ERRCODE_UUI_IO_OUTOFMEMORY & ERRCODE_RES_MASK) ; >;
-
-        < "The operation on $(ARG1) cannot continue because more data is pending." ;
-          (ERRCODE_UUI_IO_PENDING & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) cannot be copied into itself." ;
-          (ERRCODE_UUI_IO_RECURSIVE & ERRCODE_RES_MASK) ; >;
-
-        < "Unknown input/output error while accessing $(ARG1)." ;
-          (ERRCODE_UUI_IO_UNKNOWN & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is write protected." ;
-          (ERRCODE_UUI_IO_WRITEPROTECTED & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is not in the correct format." ;
-          (ERRCODE_UUI_IO_WRONGFORMAT & ERRCODE_RES_MASK) ; >;
-
-        < "The version of $(ARG1) is not correct." ;
-          (ERRCODE_UUI_IO_WRONGVERSION & ERRCODE_RES_MASK) ; >;
-
-        < "Drive $(ARG1) does not exist." ;
-          (ERRCODE_UUI_IO_NOTEXISTS_VOLUME & ERRCODE_RES_MASK) ; >;
-
-        < "Folder $(ARG1) does not exist." ;
-          (ERRCODE_UUI_IO_NOTEXISTS_FOLDER & ERRCODE_RES_MASK) ; >;
-
-        < "The installed Java version is not supported." ;
-          (ERRCODE_UUI_WRONGJAVA & ERRCODE_RES_MASK) ; >;
-
-        < "The installed Java version $(ARG1) is not supported." ;
-          (ERRCODE_UUI_WRONGJAVA_VERSION & ERRCODE_RES_MASK) ; >;
-
-        < "The installed Java version is not supported, at least version $(ARG1) is required." ;
-          (ERRCODE_UUI_WRONGJAVA_MIN & ERRCODE_RES_MASK) ; >;
-
-        < "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required." ;
-          (ERRCODE_UUI_WRONGJAVA_VERSION_MIN & ERRCODE_RES_MASK) ; >;
-
-        < "The data associated with the partnership is corrupted." ;
-          (ERRCODE_UUI_BADPARTNERSHIP & ERRCODE_RES_MASK) ; >;
-
-        < "The data associated with the partnership $(ARG1) is corrupted." ;
-          (ERRCODE_UUI_BADPARTNERSHIP_NAME & ERRCODE_RES_MASK) ; >;
-
-        < "Volume $(ARG1) is not ready." ;
-          (ERRCODE_UUI_IO_NOTREADY_VOLUME & ERRCODE_RES_MASK) ; >;
-
-        < "$(ARG1) is not ready; please insert a storage medium." ;
-          (ERRCODE_UUI_IO_NOTREADY_REMOVABLE & ERRCODE_RES_MASK) ; >;
-
-        < "Volume $(ARG1) is not ready; please insert a storage medium." ;
-          (ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE & ERRCODE_RES_MASK) ; >;
-
-        < "Please insert disk $(ARG1)." ;
-          (ERRCODE_UUI_WRONGMEDIUM & ERRCODE_RES_MASK) ; >;
-
-        < "The object cannot be created in directory $(ARG1)." ;
-          (ERRCODE_UUI_IO_CANTCREATE_NONAME & ERRCODE_RES_MASK) ; >;
-
-        < "%PRODUCTNAME cannot keep files from being overwritten when this transmission protocol is used. Do you want to continue anyway?" ;
-          (ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE & ERRCODE_RES_MASK) ; >;
-
-        < "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n\nThe corruption could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the repaired document.\nExecution of macros is disabled for this document.\n\nShould %PRODUCTNAME repair the file?\n" ;
-          (ERRCODE_UUI_IO_BROKENPACKAGE & ERRCODE_RES_MASK) ; >;
-
-        < "The file '$(ARG1)' could not be repaired and therefore cannot be opened." ;
-          (ERRCODE_UUI_IO_BROKENPACKAGE_CANTREPAIR & ERRCODE_RES_MASK) ; >;
-
-        < "Configuration data in '$(ARG1)' is corrupted. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?" ;
-          (ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE & ERRCODE_RES_MASK) ; >;
-
-        < "The personal configuration file '$(ARG1)' is corrupted and must be deleted to continue. Some of your personal settings may be lost.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?" ;
-          (ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE & ERRCODE_RES_MASK) ; >;
-
-        < "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly." ;
-          (ERRCODE_UUI_CONFIGURATION_BACKENDMISSING & ERRCODE_RES_MASK) ; >;
-
-        < "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the missing configuration data?" ;
-          (ERRCODE_UUI_CONFIGURATION_BACKENDMISSING_WITHRECOVER & ERRCODE_RES_MASK) ; >;
-
-        < "The form contains invalid data. Do you still want to continue?" ;
-          (ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA & ERRCODE_RES_MASK) ; >;
-
-        < "The file $(ARG1) is locked by another user. Currently, another write access to this file cannot be granted." ;
-          (ERRCODE_UUI_LOCKING_LOCKED & ERRCODE_RES_MASK) ; >;
-
-        < "The file $(ARG1) is locked by yourself. Currently, another write access to this file cannot be granted." ;
-          (ERRCODE_UUI_LOCKING_LOCKED_SELF & ERRCODE_RES_MASK) ; >;
-
-        < "The file $(ARG1) is currently not locked by yourself." ;
-          (ERRCODE_UUI_LOCKING_NOT_LOCKED & ERRCODE_RES_MASK) ; >;
-
-        < "The previously obtained lock for file $(ARG1) has expired.\nThis can happen due to problems on the server managing the file lock. It cannot be guaranteed that write operations on this file will not overwrite changes done by other users!" ;
-          (ERRCODE_UUI_LOCKING_LOCK_EXPIRED & ERRCODE_RES_MASK) ; >;
-
-        < "Unable to verify the identity of $(ARG1) site.\n\nBefore accepting this certificate, you should examine this site's certificate carefully. Are you willing to accept this certificate for the purpose of identifying the Web site $(ARG1)?" ;
-          (ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED) ; >;
-
-        < "$(ARG1) is a site that uses a security certificate to encrypt data during transmission, but its certificate expired on $(ARG2).\n\nYou should check to make sure that your computer's time is correct." ;
-          (ERRCODE_UUI_SSLWARN_EXPIRED_1) ; >;
-
-        < "You have attempted to establish a connection with $(ARG1). However, the security certificate presented belongs to $(ARG2). It is possible, though unlikely, that someone may be trying to intercept your communication with this web site.\n\nIf you suspect the certificate shown does not belong to $(ARG1), please cancel the connection and notify the site administrator.\n\nWould you like to continue anyway?" ;
-          (ERRCODE_UUI_SSLWARN_DOMAINMISMATCH_1) ; >;
-
-        < "The certificate could not be validated. You should examine this site's certificate carefully.\n\nIf you suspect the certificate shown, please cancel the connection and notify the site administrator." ;
-          (ERRCODE_UUI_SSLWARN_INVALID_1) ; >;
-
-        < "Security Warning: Domain Name Mismatch" ;
-          (TITLE_UUI_SSLWARN_DOMAINMISMATCH) ; >;
-
-        < "Security Warning: Server Certificate Expired" ;
-          (TITLE_UUI_SSLWARN_EXPIRED) ; >;
-
-        < "Security Warning: Server Certificate Invalid" ;
-          (TITLE_UUI_SSLWARN_INVALID) ; >;
-
-        < "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1)." ;
-          (ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY & ERRCODE_RES_MASK) ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index a22ad863ccc0..9230dc80e890 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -17,24 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include "ids.hxx"
+#include "strings.hrc"
 #include "lockcorrupt.hxx"
-
+#include <tools/resmgr.hxx>
 #include <vcl/button.hxx>
 
-LockCorruptQueryBox::LockCorruptQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) :
-    MessBox(pParent, 0,
-            ResId(STR_LOCKCORRUPT_TITLE, *pResMgr).toString(),
-            OUString() )
+LockCorruptQueryBox::LockCorruptQueryBox(vcl::Window* pParent, const std::locale& rResLocale)
+    : MessBox(pParent, 0, Translate::get(STR_LOCKCORRUPT_TITLE, rResLocale), OUString())
 {
     SetImage( ErrorBox::GetStandardImage() );
 
-    AddButton(ResId(STR_LOCKCORRUPT_OPENREADONLY_BTN, *pResMgr).toString(), RET_OK,
+    AddButton(Translate::get(STR_LOCKCORRUPT_OPENREADONLY_BTN, rResLocale), RET_OK,
         ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
 
     AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
 
-    SetMessText(ResId(STR_LOCKCORRUPT_MSG, *pResMgr ).toString());
+    SetMessText(Translate::get(STR_LOCKCORRUPT_MSG, rResLocale));
 }
 
 LockCorruptQueryBox::~LockCorruptQueryBox()
diff --git a/uui/source/lockcorrupt.hxx b/uui/source/lockcorrupt.hxx
index b83d94084d8c..425117144e14 100644
--- a/uui/source/lockcorrupt.hxx
+++ b/uui/source/lockcorrupt.hxx
@@ -24,7 +24,7 @@
 class LockCorruptQueryBox : public MessBox
 {
 public:
-    LockCorruptQueryBox( vcl::Window* pParent, ResMgr* pResMgr );
+    LockCorruptQueryBox(vcl::Window* pParent, const std::locale& rResLocale);
     virtual ~LockCorruptQueryBox() override;
 };
 
diff --git a/uui/source/lockcorrupt.src b/uui/source/lockcorrupt.src
deleted file mode 100644
index a588882aa196..000000000000
--- a/uui/source/lockcorrupt.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 "ids.hrc"
-
-String STR_LOCKCORRUPT_TITLE
-{
-    Text [ en-US ] = "Lock file is corrupted";
-};
-String STR_LOCKCORRUPT_MSG
-{
-    Text [ en-US ] = "The lock file is corrupted and probably empty. Opening the document read-only and closing it again removes the corrupted lock file.";
-};
-String STR_LOCKCORRUPT_OPENREADONLY_BTN
-{
-    Text [ en-US ] = "Open ~Read-Only";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 63ad3a76f2a0..4b829e9af568 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -17,24 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "lockfailed.hxx"
-
+#include <tools/resmgr.hxx>
 #include <vcl/button.hxx>
 
-LockFailedQueryBox::LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) :
-    MessBox(pParent, 0,
-            ResId(STR_LOCKFAILED_TITLE, *pResMgr).toString(),
-            OUString() )
+LockFailedQueryBox::LockFailedQueryBox(vcl::Window* pParent, const std::locale& rResLocale)
+    : MessBox(pParent, 0, Translate::get(STR_LOCKFAILED_TITLE, rResLocale), OUString())
 {
     SetImage( ErrorBox::GetStandardImage() );
 
-    AddButton(ResId(STR_LOCKFAILED_OPENREADONLY_BTN, *pResMgr).toString(), RET_OK,
+    AddButton(Translate::get(STR_LOCKFAILED_OPENREADONLY_BTN, rResLocale), RET_OK,
         ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
 
     AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
 
-    SetMessText(ResId(STR_LOCKFAILED_MSG, *pResMgr ).toString());
+    SetMessText(Translate::get(STR_LOCKFAILED_MSG, rResLocale));
 }
 
 LockFailedQueryBox::~LockFailedQueryBox()
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index 09499d88a6b9..5cf9ceda1ee7 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
@@ -24,7 +24,7 @@
 class LockFailedQueryBox : public MessBox
 {
 public:
-    LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr );
+    LockFailedQueryBox(vcl::Window* pParent, const std::locale& rResLocale);
     virtual ~LockFailedQueryBox() override;
 };
 
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
deleted file mode 100644
index 5fa7ba5b3482..000000000000
--- a/uui/source/lockfailed.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 "ids.hrc"
-
-String STR_LOCKFAILED_TITLE
-{
-    Text [ en-US ] = "Document Could Not Be Locked";
-};
-String STR_LOCKFAILED_MSG
-{
-    Text [ en-US ] = "The lock file could not be created for exclusive access by %PRODUCTNAME, due to missing permission to create a lock file on that file location or lack of free disk space.";
-};
-String STR_LOCKFAILED_OPENREADONLY_BTN
-{
-    Text [ en-US ] = "Open ~Read-Only";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 76465d96a6b5..659f3bd6b090 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -21,8 +21,7 @@
 #include <vcl/msgbox.hxx>
 #include "logindlg.hxx"
 
-#include "ids.hrc"
-#include <tools/resid.hxx>
+#include "strings.hrc"
 #include <osl/file.hxx>
 
 #ifdef UNX
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 1064d140df6e..58e6a736a316 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <sal/macros.h>
+#include <tools/resmgr.hxx>
 #include <vcl/layout.hxx>
-
-#include "ids.hrc"
+#include "strings.hrc"
 #include "masterpasscrtdlg.hxx"
 
 // MasterPasswordCreateDialog---------------------------------------------------
@@ -38,7 +38,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void)
         EndDialog( RET_OK );
     else
     {
-        OUString aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
+        OUString aErrorMsg(Translate::get(STR_ERROR_PASSWORDS_NOT_IDENTICAL, rResLocale));
         ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg);
         aErrorBox->Execute();
         m_pEDMasterPasswordCrt->SetText( OUString() );
@@ -47,9 +47,9 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void)
     }
 }
 
-MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, ResMgr* pResMgr)
+MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, const std::locale& rLocale)
     : ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui")
-    , pResourceMgr(pResMgr)
+    , rResLocale(rLocale)
 {
     get(m_pEDMasterPasswordCrt, "password1");
     get(m_pEDMasterPasswordRepeat, "password2");
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 01931eb4f89f..d0c29b541bf2 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -40,14 +40,14 @@ private:
     DECL_LINK(EditHdl_Impl, Edit&, void);
 
 public:
-    MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr );
+    MasterPasswordCreateDialog(vcl::Window* pParent, const std::locale& rLocale);
     virtual ~MasterPasswordCreateDialog() override;
     virtual void dispose() override;
 
     OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); }
 
 private:
-    ResMgr*                                         pResourceMgr;
+    const std::locale&          rResLocale;
 };
 
 #endif // INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 625d307583c9..3afe239cd039 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/resmgr.hxx>
 #include <vcl/layout.hxx>
-
-#include "ids.hrc"
+#include "strings.hrc"
 #include "masterpassworddlg.hxx"
 
 // MasterPasswordDialog---------------------------------------------------
@@ -35,17 +35,17 @@ MasterPasswordDialog::MasterPasswordDialog
 (
     vcl::Window*                                pParent,
     css::task::PasswordRequestMode              aDialogMode,
-    ResMgr*                                     pResMgr
+    const std::locale&                          rLocale
 )
     : ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui")
     , nDialogMode(aDialogMode)
-    , pResourceMgr(pResMgr)
+    , rResLocale(rLocale)
 {
     get(m_pEDMasterPassword, "password");
     get(m_pOKBtn, "ok");
     if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        OUString aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr ));
+        OUString aErrorMsg(Translate::get(STR_ERROR_MASTERPASSWORD_WRONG, rResLocale));
         ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg);
         aErrorBox->Execute();
     }
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 525d588d7003..cb27bfd3b865 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -35,7 +35,7 @@ class MasterPasswordDialog : public ModalDialog
     DECL_LINK(OKHdl_Impl, Button*, void);
 
 public:
-    MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
+    MasterPasswordDialog(vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, const std::locale& rLocale);
     virtual ~MasterPasswordDialog() override;
     virtual void dispose() override;
 
@@ -43,7 +43,7 @@ public:
 
 private:
     css::task::PasswordRequestMode     nDialogMode;
-    ResMgr*                            pResourceMgr;
+    const std::locale&                 rResLocale;
 };
 
 #endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 43a7351bdcb9..2d5f1f0ed24b 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -17,10 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/layout.hxx>
 #include <osl/file.hxx>
+#include <tools/resmgr.hxx>
+#include <vcl/layout.hxx>
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "nameclashdlg.hxx"
 
 // NameClashDialog ---------------------------------------------------------
@@ -47,7 +48,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void )
 }
 
 
-NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
+NameClashDialog::NameClashDialog( vcl::Window* pParent, const std::locale& rResLocale,
                                   OUString const & rTargetFolderURL,
                                   OUString const & rClashingName,
                                   OUString const & rProposedNewName,
@@ -69,11 +70,11 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
     OUString aInfo;
     if ( bAllowOverwrite )
     {
-        aInfo = ResId(STR_RENAME_OR_REPLACE, *pResMgr).toString();
+        aInfo = Translate::get(STR_RENAME_OR_REPLACE, rResLocale);
     }
     else
     {
-        aInfo = ResId(STR_NAME_CLASH_RENAME_ONLY, *pResMgr).toString();
+        aInfo = Translate::get(STR_NAME_CLASH_RENAME_ONLY, rResLocale);
         m_pBtnOverwrite->Hide();
     }
 
@@ -81,7 +82,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
     if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) )
         aPath = rTargetFolderURL;
 
-    maSameName = ResId(STR_SAME_NAME_USED, *pResMgr).toString();
+    maSameName = Translate::get(STR_SAME_NAME_USED, rResLocale);
 
     aInfo = aInfo.replaceFirst( "%NAME", rClashingName );
     aInfo = aInfo.replaceFirst( "%FOLDER", aPath );
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index 3fb37ea1cdc5..9b357b3803e6 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -42,7 +42,7 @@ class NameClashDialog : public ModalDialog
     DECL_LINK( ButtonHdl_Impl, Button *, void );
 
 public:
-    NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
+    NameClashDialog( vcl::Window* pParent, const std::locale& rLocale,
                      OUString const & rTargetFolderURL,
                      OUString const & rClashingName,
                      OUString const & rProposedNewName,
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
deleted file mode 100644
index 615b83adc996..000000000000
--- a/uui/source/nameclashdlg.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 "ids.hrc"
-
-String STR_RENAME_OR_REPLACE
-{
-    Text [ en-US ] = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.";
-};
-
-String STR_NAME_CLASH_RENAME_ONLY
-{
-    Text [ en-US ] = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.";
-};
-
-String STR_SAME_NAME_USED
-{
-    Text [ en-US ] = "Please provide a different file name!";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 4de71b54c2ca..1808a405995d 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -17,20 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "openlocked.hxx"
+#include <tools/resmgr.hxx>
 
-OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
+OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, const std::locale& rResLocale, const OUString& aMessage ) :
     MessBox(pParent, 0,
-            ResId(STR_OPENLOCKED_TITLE, *pResMgr).toString(),
+            Translate::get(STR_OPENLOCKED_TITLE, rResLocale),
             aMessage )
 {
     SetImage( QueryBox::GetStandardImage() );
 
-    AddButton(ResId(STR_OPENLOCKED_OPENREADONLY_BTN, *pResMgr).toString(), RET_YES,
+    AddButton(Translate::get(STR_OPENLOCKED_OPENREADONLY_BTN, rResLocale), RET_YES,
             ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
 
-    AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO);
+    AddButton(Translate::get(STR_OPENLOCKED_OPENCOPY_BTN, rResLocale), RET_NO);
 
     AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
     SetButtonHelpText( RET_YES, OUString() );
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 40c50e403e00..8584c45c2c7e 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -24,7 +24,7 @@
 class OpenLockedQueryBox : public MessBox
 {
 public:
-    OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
+    OpenLockedQueryBox(vcl::Window* pParent, const std::locale& rResLocale, const OUString& rMessage);
     virtual ~OpenLockedQueryBox() override;
 };
 
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
deleted file mode 100644
index 2e30dbf646b5..000000000000
--- a/uui/source/openlocked.src
+++ /dev/null
@@ -1,43 +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 "ids.hrc"
-
-String STR_OPENLOCKED_TITLE
-{
-    Text [ en-US ] = "Document in Use";
-};
-String STR_OPENLOCKED_MSG
-{
-    Text [ en-US ] = "Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document read-only or open a copy of the document for editing.\n\n";
-};
-String STR_OPENLOCKED_OPENREADONLY_BTN
-{
-    Text [ en-US ] = "Open ~Read-Only";
-};
-String STR_OPENLOCKED_OPENCOPY_BTN
-{
-    Text [ en-US ] = "Open ~Copy";
-};
-String STR_UNKNOWNUSER
-{
-    Text [ en-US ] = "Unknown User";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 4a403bea6370..aa1fd0e53cb5 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -18,21 +18,22 @@
  */
 
 #include "passworddlg.hxx"
-#include "ids.hrc"
+#include "strings.hrc"
 
+#include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
 using namespace ::com::sun::star;
 
 PasswordDialog::PasswordDialog(vcl::Window* _pParent,
-    task::PasswordRequestMode nDlgMode, ResMgr * pResMgr,
+    task::PasswordRequestMode nDlgMode, const std::locale& rLocale,
     const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
     : ModalDialog(_pParent, "PasswordDialog", "uui/ui/password.ui")
     , nMinLen(1)
-    , aPasswdMismatch(ResId(STR_PASSWORD_MISMATCH, *pResMgr))
+    , aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rLocale))
     , nDialogMode(nDlgMode)
-    , pResourceMgr(pResMgr)
+    , rResLocale(rLocale)
 {
     get(m_pFTPassword, "newpassFT");
     get(m_pEDPassword, "newpassEntry");
@@ -42,15 +43,15 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
 
     if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
-        const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
-        OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString());
+        const char* pOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const char* pErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : pOpenToModifyErrStrId;
+        OUString aErrorMsg(Translate::get(pErrStrId, rResLocale));
         ScopedVclPtrInstance< MessageDialog > aErrorBox(GetParent(), aErrorMsg);
         aErrorBox->Execute();
     }
 
     // default settings for enter password or reenter passwd...
-    OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString());
+    OUString aTitle(Translate::get(STR_TITLE_ENTER_PASSWORD, rResLocale));
     m_pFTConfirmPassword->Hide();
     m_pEDConfirmPassword->Hide();
     m_pFTConfirmPassword->Enable( false );
@@ -59,9 +60,9 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
     // settings for create password
     if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE)
     {
-        aTitle = ResId(STR_TITLE_CREATE_PASSWORD, *pResourceMgr).toString();
+        aTitle = Translate::get(STR_TITLE_CREATE_PASSWORD, rResLocale);
 
-        m_pFTConfirmPassword->SetText(ResId(STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr).toString());
+        m_pFTConfirmPassword->SetText(Translate::get(STR_CONFIRM_SIMPLE_PASSWORD, rResLocale));
 
         m_pFTConfirmPassword->Show();
         m_pEDConfirmPassword->Show();
@@ -71,8 +72,8 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
 
     SetText( aTitle );
 
-    sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
-    OUString aMessage(ResId(nStrId, *pResourceMgr).toString());
+    const char* pStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
+    OUString aMessage(Translate::get(pStrId, rResLocale));
     INetURLObject url(aDocURL);
     aMessage += url.HasError()
         ? aDocURL : url.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
@@ -81,7 +82,7 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
     if (bIsSimplePasswordRequest)
     {
         DBG_ASSERT( aDocURL.isEmpty(), "A simple password request should not have a document URL! Use document password request instead." );
-        m_pFTPassword->SetText(ResId(STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr).toString());
+        m_pFTPassword->SetText(Translate::get(STR_ENTER_SIMPLE_PASSWORD, rResLocale));
     }
 
     m_pOKBtn->SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) );
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index dc63370832ff..fc067db250ba 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -42,8 +42,8 @@ class PasswordDialog : public ModalDialog
     DECL_LINK(OKHdl_Impl, Button*, void);
 
 public:
-    PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
-            bool bOpenToModify, bool bIsSimplePasswordRequest );
+    PasswordDialog(vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, const std::locale& rLocale, const OUString& aDocURL,
+                   bool bOpenToModify, bool bIsSimplePasswordRequest);
     virtual ~PasswordDialog() override;
     virtual void dispose() override;
 
@@ -52,7 +52,7 @@ public:
 
 private:
     css::task::PasswordRequestMode     nDialogMode;
-    ResMgr*                            pResourceMgr;
+    const std::locale&                 rResLocale;
 };
 
 #endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
deleted file mode 100644
index 93d3d5ee18b0..000000000000
--- a/uui/source/passworddlg.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 "ids.hrc"
-
-String STR_ENTER_PASSWORD_TO_OPEN
-{
-    Text [ en-US ] = "Enter password to open file: \n";
-};
-
-String STR_ENTER_PASSWORD_TO_MODIFY
-{
-    Text [ en-US ] = "Enter password to modify file: \n";
-};
-
-String STR_ENTER_SIMPLE_PASSWORD
-{
-    Text [ en-US ] = "Enter password: ";
-};
-
-String STR_CONFIRM_SIMPLE_PASSWORD
-{
-    Text [ en-US ] = "Confirm password: ";
-};
-
-String STR_TITLE_CREATE_PASSWORD
-{
-    Text [ en-US ] = "Set Password";
-};
-
-String STR_TITLE_ENTER_PASSWORD
-{
-    Text [ en-US ] = "Enter Password";
-};
-
-String STR_PASSWORD_MISMATCH
-{
-    Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
deleted file mode 100644
index ae92de07e717..000000000000
--- a/uui/source/passworderrs.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 "ids.hrc"
-
-String STR_ERROR_PASSWORD_TO_OPEN_WRONG
-{
-    Text [ en-US ] = "The password is incorrect. The file cannot be opened.";
-};
-
-String STR_ERROR_PASSWORD_TO_MODIFY_WRONG
-{
-    Text [ en-US ] = "The password is incorrect. The file cannot be modified.";
-};
-
-String STR_ERROR_MASTERPASSWORD_WRONG
-{
-    Text [ en-US ] = "The master password is incorrect.";
-};
-
-String STR_ERROR_SIMPLE_PASSWORD_WRONG
-{
-    Text [ en-US ] = "The password is incorrect.";
-};
-
-String STR_ERROR_PASSWORDS_NOT_IDENTICAL
-{
-    Text [ en-US ] = "The password confirmation does not match.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 47b8bdd58a14..1641a3a59ef7 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star::security;
 
-#include "ids.hrc"
 #include "secmacrowarnings.hxx"
 
 using namespace ::com::sun::star;
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 162df6553831..6803f67d1749 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/msgbox.hxx>
 
-#include "ids.hrc"
+#include "ids.hxx"
 #include "sslwarndlg.hxx"
 
 #include <comphelper/processfactory.hxx>
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 90688a95e2a3..de5ca390580d 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -17,19 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ids.hrc"
+#include <tools/resmgr.hxx>
+#include "strings.hrc"
 #include "trylater.hxx"
 
-TryLaterQueryBox::TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
-    MessBox(pParent, 0,
-            ResId(STR_TRYLATER_TITLE, *pResMgr).toString(),
-            aMessage )
+TryLaterQueryBox::TryLaterQueryBox(vcl::Window* pParent, const std::locale& rResLocale, const OUString& aMessage)
+    : MessBox(pParent, 0, Translate::get(STR_TRYLATER_TITLE, rResLocale), aMessage)
 {
     SetImage( QueryBox::GetStandardImage() );
 
-    AddButton(ResId(STR_TRYLATER_RETRYSAVING_BTN, *pResMgr).toString(), RET_YES,
+    AddButton(Translate::get(STR_TRYLATER_RETRYSAVING_BTN, rResLocale), RET_YES,
             ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
-    AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO);
+    AddButton(Translate::get(STR_TRYLATER_SAVEAS_BTN, rResLocale), RET_NO);
     AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
 
     SetButtonHelpText( RET_YES, OUString() );
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index 961cbe5f3a14..23d0a0c78841 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
@@ -24,7 +24,7 @@
 class TryLaterQueryBox : public MessBox
 {
 public:
-    TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
+    TryLaterQueryBox(vcl::Window* pParent, const std::locale& rLocale, const OUString& aMessage);
     virtual ~TryLaterQueryBox() override;
 };
 
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
deleted file mode 100644
index 0b02b391bb6e..000000000000
--- a/uui/source/trylater.src
+++ /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/.
- *
- * 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 "ids.hrc"
-
-String STR_TRYLATER_TITLE
-{
-    Text [ en-US ] = "Document in Use";
-};
-String STR_TRYLATER_MSG
-{
-    Text [ en-US ] = "Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nTry again later to save document or save a copy of that document.\n\n";
-};
-String STR_TRYLATER_RETRYSAVING_BTN
-{
-    Text [ en-US ] = "~Retry Saving";
-};
-String STR_TRYLATER_SAVEAS_BTN
-{
-    Text [ en-US ] = "~Save As...";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 291d618c9276..1f7230ab6e55 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/msgbox.hxx>
 
-#include "ids.hrc"
+#include "strings.hrc"
 #include "unknownauthdlg.hxx"
 #include <comphelper/processfactory.hxx>
 
diff --git a/uui/uiconfig/ui/authfallback.ui b/uui/uiconfig/ui/authfallback.ui
index f7a0b58ed0ee..edd074ade47e 100644
--- a/uui/uiconfig/ui/authfallback.ui
+++ b/uui/uiconfig/ui/authfallback.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="AuthFallbackDlg">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Authentication Code</property>
+    <property name="title" translatable="yes" context="authfallback|AuthFallbackDlg">Authentication Code</property>
     <property name="default_width">400</property>
     <property name="default_height">270</property>
     <property name="type_hint">dialog</property>
@@ -127,7 +127,7 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Enter the 6 digit PIN:</property>
+                    <property name="label" translatable="yes" context="authfallback|label1">Enter the 6 digit PIN:</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
diff --git a/uui/uiconfig/ui/filterselect.ui b/uui/uiconfig/ui/filterselect.ui
index 7053bbde59fa..b2843c627eee 100644
--- a/uui/uiconfig/ui/filterselect.ui
+++ b/uui/uiconfig/ui/filterselect.ui
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="uui">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="FilterSelectDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Filter Selection</property>
+    <property name="title" translatable="yes" context="filterselect|FilterSelectDialog">Filter Selection</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/uui/uiconfig/ui/logindialog.ui b/uui/uiconfig/ui/logindialog.ui
index 806d8f582fd3..be927fe941df 100644
--- a/uui/uiconfig/ui/logindialog.ui
+++ b/uui/uiconfig/ui/logindialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="LoginDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Authentication Required</property>
+    <property name="title" translatable="yes" context="logindialog|LoginDialog">Authentication Required</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -77,7 +77,7 @@
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkCheckButton" id="syscreds">
-                <property name="label" translatable="yes">_Use system credentials</property>
+                <property name="label" translatable="yes" context="logindialog|syscreds">_Use system credentials</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -93,7 +93,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="remember">
-                <property name="label" translatable="yes">_Remember password</property>
+                <property name="label" translatable="yes" context="logindialog|remember">_Remember password</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -124,7 +124,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">A_ccount:</property>
+                <property name="label" translatable="yes" context="logindialog|accountft">A_ccount:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">accounted</property>
               </object>
@@ -138,7 +138,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Pass_word:</property>
+                <property name="label" translatable="yes" context="logindialog|passwordft">Pass_word:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">passworded</property>
               </object>
@@ -177,7 +177,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_User name:</property>
+                <property name="label" translatable="yes" context="logindialog|nameft">_User name:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nameed</property>
               </object>
@@ -191,7 +191,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Path:</property>
+                <property name="label" translatable="yes" context="logindialog|pathft">_Path:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">pathed</property>
               </object>
@@ -219,7 +219,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="pathbtn">
-                    <property name="label" translatable="yes">_Browse…</property>
+                    <property name="label" translatable="yes" context="logindialog|pathbtn">_Browse…</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -241,7 +241,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter user name and password for:
+                <property name="label" translatable="yes" context="logindialog|loginrealm">Enter user name and password for:
 “%2” on %1</property>
               </object>
               <packing>
@@ -255,7 +255,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Wrong user name and password for:
+                <property name="label" translatable="yes" context="logindialog|wrongloginrealm">Wrong user name and password for:
 “%2” on %1</property>
               </object>
               <packing>
@@ -269,7 +269,7 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Wrong user name and password for:
+                <property name="label" translatable="yes" context="logindialog|wrongrequestinfo">Wrong user name and password for:
 %1</property>
               </object>
               <packing>
@@ -283,7 +283,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Enter user name and password for:
+                <property name="label" translatable="yes" context="logindialog|requestinfo">Enter user name and password for:
 %1</property>
               </object>
               <packing>
@@ -297,7 +297,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Message from server:</property>
+                <property name="label" translatable="yes" context="logindialog|errorft">Message from server:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">errorinfo</property>
               </object>
diff --git a/uui/uiconfig/ui/macrowarnmedium.ui b/uui/uiconfig/ui/macrowarnmedium.ui
index a9c49c3f5804..702ef79d9067 100644
--- a/uui/uiconfig/ui/macrowarnmedium.ui
+++ b/uui/uiconfig/ui/macrowarnmedium.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <!-- interface-requires gtk+ 3.0 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MacroWarnMedium">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME - Security Warning</property>
+    <property name="title" translatable="yes" context="macrowarnmedium|MacroWarnMedium">%PRODUCTNAME - Security Warning</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -22,7 +22,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">_Enable Macros</property>
+                <property name="label" translatable="yes" context="macrowarnmedium|ok">_Enable Macros</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -36,7 +36,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">_Disable Macros</property>
+                <property name="label" translatable="yes" context="macrowarnmedium|cancel">_Disable Macros</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -124,7 +124,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">The document contains document macros signed by:</property>
+                    <property name="label" translatable="yes" context="macrowarnmedium|descr1Label">The document contains document macros signed by:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -138,7 +138,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">The document contains document macros.</property>
+                    <property name="label" translatable="yes" context="macrowarnmedium|descr1aLabel">The document contains document macros.</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -165,7 +165,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="viewSignsButton">
-                        <property name="label" translatable="yes">_View Signatures…</property>
+                        <property name="label" translatable="yes" context="macrowarnmedium|viewSignsButton">_View Signatures…</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -193,7 +193,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros.</property>
+                    <property name="label" translatable="yes" context="macrowarnmedium|descr2Label">Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">62</property>
                   </object>
@@ -205,7 +205,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="alwaysTrustCheckbutton">
-                    <property name="label" translatable="yes">_Always trust macros from this source</property>
+                    <property name="label" translatable="yes" context="macrowarnmedium|alwaysTrustCheckbutton">_Always trust macros from this source</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/uui/uiconfig/ui/masterpassworddlg.ui b/uui/uiconfig/ui/masterpassworddlg.ui
index 67093dbed575..9dc6b3672c8d 100644
--- a/uui/uiconfig/ui/masterpassworddlg.ui
+++ b/uui/uiconfig/ui/masterpassworddlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MasterPasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Enter Master Password</property>
+    <property name="title" translatable="yes" context="masterpassworddlg|MasterPasswordDialog">Enter Master Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -83,7 +83,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0.54000002145767212</property>
-                <property name="label" translatable="yes">_Enter password:</property>
+                <property name="label" translatable="yes" context="masterpassworddlg|label1">_Enter password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password</property>
               </object>
diff --git a/uui/uiconfig/ui/password.ui b/uui/uiconfig/ui/password.ui
index d3cbe5a3de52..7413d150914c 100644
--- a/uui/uiconfig/ui/password.ui
+++ b/uui/uiconfig/ui/password.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Set Password</property>
+    <property name="title" translatable="yes" context="password|PasswordDialog">Set Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui
index 7d008edb0c2e..ba7d181de538 100644
--- a/uui/uiconfig/ui/setmasterpassworddlg.ui
+++ b/uui/uiconfig/ui/setmasterpassworddlg.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SetMasterPasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Set Master Password</property>
+    <property name="title" translatable="yes" context="setmasterpassworddlg|SetMasterPasswordDialog">Set Master Password</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
+                <property name="label" translatable="yes" context="setmasterpassworddlg|label1">Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">62</property>
               </object>
@@ -97,7 +97,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Enter password:</property>
+                <property name="label" translatable="yes" context="setmasterpassworddlg|label2">_Enter password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password1</property>
               </object>
@@ -125,7 +125,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Reenter password:</property>
+                <property name="label" translatable="yes" context="setmasterpassworddlg|label3">_Reenter password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">password2</property>
               </object>
@@ -154,7 +154,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive.</property>
+                <property name="label" translatable="yes" context="setmasterpassworddlg|label4">Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">62</property>
               </object>
diff --git a/uui/uiconfig/ui/simplenameclash.ui b/uui/uiconfig/ui/simplenameclash.ui
index 32b42ecb5ff6..5ef8a553bc5c 100644
--- a/uui/uiconfig/ui/simplenameclash.ui
+++ b/uui/uiconfig/ui/simplenameclash.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SimpleNameClashDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">File Exists</property>
+    <property name="title" translatable="yes" context="simplenameclash|SimpleNameClashDialog">File Exists</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -34,7 +34,7 @@
             </child>
             <child>
               <object class="GtkButton" id="replace">
-                <property name="label" translatable="yes">Replace</property>
+                <property name="label" translatable="yes" context="simplenameclash|replace">Replace</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -48,7 +48,7 @@
             </child>
             <child>
               <object class="GtkButton" id="rename">
-                <property name="label" translatable="yes">Rename</property>
+                <property name="label" translatable="yes" context="simplenameclash|rename">Rename</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
diff --git a/uui/uiconfig/ui/sslwarndialog.ui b/uui/uiconfig/ui/sslwarndialog.ui
index 4e01aa2528af..e93112399ac0 100644
--- a/uui/uiconfig/ui/sslwarndialog.ui
+++ b/uui/uiconfig/ui/sslwarndialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SSLWarnDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Security Warning: </property>
+    <property name="title" translatable="yes" context="sslwarndialog|SSLWarnDialog">Security Warning: </property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -21,7 +21,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label" translatable="yes">Continue</property>
+                <property name="label" translatable="yes" context="sslwarndialog|ok">Continue</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -35,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Cancel Connection</property>
+                <property name="label" translatable="yes" context="sslwarndialog|cancel">Cancel Connection</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -49,7 +49,7 @@
             </child>
             <child>
               <object class="GtkButton" id="view">
-                <property name="label" translatable="yes">View Certificate</property>
+                <property name="label" translatable="yes" context="sslwarndialog|view">View Certificate</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/uui/uiconfig/ui/unknownauthdialog.ui b/uui/uiconfig/ui/unknownauthdialog.ui
index b41ae1b5fec8..9988e57b9e13 100644
--- a/uui/uiconfig/ui/unknownauthdialog.ui
+++ b/uui/uiconfig/ui/unknownauthdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="uui">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="UnknownAuthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Website Certified by an Unknown Authority</property>
+    <property name="title" translatable="yes" context="unknownauthdialog|UnknownAuthDialog">Website Certified by an Unknown Authority</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -77,7 +77,7 @@
             <property name="row_spacing">6</property>
             <child>
               <object class="GtkRadioButton" id="accept">
-                <property name="label" translatable="yes">Accept this certificate temporarily for this session</property>
+                <property name="label" translatable="yes" context="unknownauthdialog|accept">Accept this certificate temporarily for this session</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -94,7 +94,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reject">
-                <property name="label" translatable="yes">Do not accept this certificate and do not connect to this Web site</property>
+                <property name="label" translatable="yes" context="unknownauthdialog|reject">Do not accept this certificate and do not connect to this Web site</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkButton" id="examine">
-                <property name="label" translatable="yes">Examine Certificate…</property>
+                <property name="label" translatable="yes" context="unknownauthdialog|examine">Examine Certificate…</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index 0debc1add30d..ec5ebf2e2085 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -283,8 +283,6 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
@@ -323,7 +321,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx
index 6f01d1c89cf7..07f17e30a714 100644
--- a/vbahelper/inc/pch/precompiled_vbahelper.hxx
+++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx
@@ -114,8 +114,6 @@
 #include <cppuhelper/weakref.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
 #include <sfx2/XmlIdRegistry.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/objsh.hxx>
@@ -131,7 +129,6 @@
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/toolsdllapi.h>
 #include <tools/wintypes.hxx>
diff --git a/vcl/AllLangMoTarget_vcl.mk b/vcl/AllLangMoTarget_vcl.mk
new file mode 100644
index 000000000000..784cbe5cff39
--- /dev/null
+++ b/vcl/AllLangMoTarget_vcl.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,vcl))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
deleted file mode 100644
index b12b29c9b1a5..000000000000
--- a/vcl/AllLangResTarget_vcl.mk
+++ /dev/null
@@ -1,47 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl))
-
-$(eval $(call gb_AllLangResTarget_add_srs,vcl,\
-    vcl/source/src \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
-
-$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
-    vcl/source/src/app.src \
-    vcl/source/src/btntext.src \
-    vcl/source/src/helptext.src \
-    vcl/source/src/menu.src \
-    vcl/source/src/print.src \
-    vcl/source/src/stdtext.src \
-    vcl/source/src/units.src \
-    vcl/source/src/fpicker.src \
-    vcl/source/edit/textundo.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4ce2c5aab41b..6b40a48d8783 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -721,9 +721,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
 $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
 endif
 
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,vcl,vcl))
-
 ifeq ($(OS),WNT)
 # HACK: dependency on icon themes so running unit tests don't
 # prevent delivering these by having open file handles on WNT
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index eb5681278951..218cae68efc1 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_Module,vcl))
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vcl \
 	Package_opengl \
+    UIConfig_vcl \
 	$(if $(filter WNT,$(OS)), \
 		Package_opengl_blacklist ) \
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
@@ -51,8 +52,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 endif
 
 $(eval $(call gb_Module_add_l10n_targets,vcl,\
-    AllLangResTarget_vcl \
-    UIConfig_vcl \
+    AllLangMoTarget_vcl \
 ))
 
 ifeq ($(USING_X11),TRUE)
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index f51afc873b91..e70c049faf0a 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -266,7 +266,6 @@
 #include <opengl/texture.hxx>
 #include <opengl/zone.hxx>
 #include <outdata.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <svdata.hxx>
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
@@ -282,7 +281,6 @@
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
-#include <tools/resid.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
new file mode 100644
index 000000000000..b1b3d47c7be3
--- /dev/null
+++ b/vcl/inc/print.hrc
@@ -0,0 +1,70 @@
+/* -*- 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_VCL_INC_PRINT_HRC
+#define INCLUDED_VCL_INC_PRINT_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_STR_PAPERNAMES[] =
+{
+    // To translators: This is the first entry of a sequence of paper size names
+    NC_("RID_STR_PAPERNAMES", "A0"),
+    NC_("RID_STR_PAPERNAMES", "A1"),
+    NC_("RID_STR_PAPERNAMES", "A2"),
+    NC_("RID_STR_PAPERNAMES", "A3"),
+    NC_("RID_STR_PAPERNAMES", "A4"),
+    NC_("RID_STR_PAPERNAMES", "A5"),
+    NC_("RID_STR_PAPERNAMES", "B4 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B5 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "Letter"),
+    NC_("RID_STR_PAPERNAMES", "Legal"),
+    NC_("RID_STR_PAPERNAMES", "Tabloid"),
+    NC_("RID_STR_PAPERNAMES", "User Defined"),
+    NC_("RID_STR_PAPERNAMES", "B6 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "C4 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C5 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C6 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C6/5 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "DL Envelope"),
+    NC_("RID_STR_PAPERNAMES", "Dia Slide"),
+    NC_("RID_STR_PAPERNAMES", "C"),
+    NC_("RID_STR_PAPERNAMES", "D"),
+    NC_("RID_STR_PAPERNAMES", "E"),
+    NC_("RID_STR_PAPERNAMES", "Executive"),
+    NC_("RID_STR_PAPERNAMES", "Long Bond"),
+    NC_("RID_STR_PAPERNAMES", "#8 (Monarch) Envelope"),
+    NC_("RID_STR_PAPERNAMES", "#6 3/4 (Personal) Envelope"),
+    NC_("RID_STR_PAPERNAMES", "#9 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "#10 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "#11 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "#12 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "16 Kai"),
+    NC_("RID_STR_PAPERNAMES", "32 Kai"),
+    NC_("RID_STR_PAPERNAMES", "Big 32 Kai"),
+    NC_("RID_STR_PAPERNAMES", "B4 (JIS)"),
+    NC_("RID_STR_PAPERNAMES", "B5 (JIS)"),
+    NC_("RID_STR_PAPERNAMES", "B6 (JIS)"),
+    // To translators: This is the last entry of the sequence of paper size names
+    NC_("RID_STR_PAPERNAMES", "Japanese Postcard")
+};
+
+#endif // INCLUDED_VCL_INC_PRINT_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldlg.src b/vcl/inc/printaccessoryview.hrc
index 5f1a23ce7699..e47ac03eb5cc 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/vcl/inc/printaccessoryview.hrc
@@ -17,21 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <basidesh.hrc>
+#ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
+#define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
-String RID_STR_EXPORTPACKAGE
-{
-    Text [ en-US ] = "Export library as extension";
-};
+#define NC_(Context, String) (Context "\004" u8##String)
 
-String RID_STR_EXPORTBASIC
+const char* SV_PRINT_NATIVE_STRINGS[] =
 {
-    Text [ en-US ] = "Export as BASIC library";
+    NC_("SV_PRINT_NATIVE_STRINGS", "Preview"),
+    NC_("SV_PRINT_NATIVE_STRINGS", "Page number"),
+    NC_("SV_PRINT_NATIVE_STRINGS", "Number of pages"),
+    NC_("SV_PRINT_NATIVE_STRINGS", "More"),
+    NC_("SV_PRINT_NATIVE_STRINGS", "Print selection only")
 };
 
-String RID_STR_PACKAGE_BUNDLE
-{
-    Text [ en-US ] = "Extension";
-};
+#endif // INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
new file mode 100644
index 000000000000..cd2f31c1da13
--- /dev/null
+++ b/vcl/inc/strings.hrc
@@ -0,0 +1,143 @@
+/* -*- 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_VCL_INC_STRINGS_HRC
+#define INCLUDED_VCL_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define SV_RESID_STRING_NOSELECTIONPOSSIBLE          NC_("SV_RESID_STRING_NOSELECTIONPOSSIBLE", "<No selection possible>")
+
+#define SV_MENU_MAC_SERVICES                         NC_("SV_MENU_MAC_SERVICES", "Services")
+#define SV_MENU_MAC_HIDEAPP                          NC_("SV_MENU_MAC_HIDEAPP", "Hide %PRODUCTNAME")
+#define SV_MENU_MAC_HIDEALL                          NC_("SV_MENU_MAC_HIDEALL", "Hide Others")
+#define SV_MENU_MAC_SHOWALL                          NC_("SV_MENU_MAC_SHOWALL", "Show All")
+#define SV_MENU_MAC_QUITAPP                          NC_("SV_MENU_MAC_QUITAPP", "Quit %PRODUCTNAME")
+
+#define SV_HELPTEXT_CLOSE                            NC_("SV_HELPTEXT_CLOSE", "Close")
+#define SV_HELPTEXT_MINIMIZE                         NC_("SV_HELPTEXT_MINIMIZE", "Minimize")
+#define SV_HELPTEXT_MAXIMIZE                         NC_("SV_HELPTEXT_MAXIMIZE", "Maximize")
+#define SV_HELPTEXT_RESTORE                          NC_("SV_HELPTEXT_RESTORE", "Restore")
+#define SV_HELPTEXT_ROLLDOWN                         NC_("SV_HELPTEXT_ROLLDOWN", "Drop down")
+#define SV_HELPTEXT_ROLLUP                           NC_("SV_HELPTEXT_ROLLUP", "Roll up")
+#define SV_HELPTEXT_HELP                             NC_("SV_HELPTEXT_HELP", "Help")
+#define SV_HELPTEXT_SCREENSHOT                       NC_("SV_HELPTEXT_SCREENSHOT", "Take and annotate a screenshot")
+#define SV_HELPTEXT_FADEIN                           NC_("SV_HELPTEXT_FADEIN", "Show")
+#define SV_HELPTEXT_FADEOUT                          NC_("SV_HELPTEXT_FADEOUT", "Hide")
+#define SV_HELPTEXT_CLOSEDOCUMENT                    NC_("SV_HELPTEXT_CLOSEDOCUMENT", "Close Document")
+
+// To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
+#define SV_BUTTONTEXT_OK                             NC_("SV_BUTTONTEXT_OK", "~OK")
+// To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
+#define SV_BUTTONTEXT_CANCEL                         NC_("SV_BUTTONTEXT_CANCEL", "~Cancel")
+// To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
+#define SV_BUTTONTEXT_OK_NOMNEMONIC                  NC_("SV_BUTTONTEXT_OK_NOMNEMONIC", "OK")
+// To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
+#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC              NC_("SV_BUTTONTEXT_CANCEL_NOMNEMONIC", "Cancel")
+#define SV_BUTTONTEXT_YES                            NC_("SV_BUTTONTEXT_YES", "~Yes")
+#define SV_BUTTONTEXT_NO                             NC_("SV_BUTTONTEXT_NO", "~No")
+#define SV_BUTTONTEXT_RETRY                          NC_("SV_BUTTONTEXT_RETRY", "~Retry")
+#define SV_BUTTONTEXT_HELP                           NC_("SV_BUTTONTEXT_HELP", "~Help")
+#define SV_BUTTONTEXT_CLOSE                          NC_("SV_BUTTONTEXT_CLOSE", "~Close")
+#define SV_BUTTONTEXT_MORE                           NC_("SV_BUTTONTEXT_MORE", "~More")
+#define SV_BUTTONTEXT_IGNORE                         NC_("SV_BUTTONTEXT_IGNORE", "~Ignore")
+#define SV_BUTTONTEXT_ABORT                          NC_("SV_BUTTONTEXT_ABORT", "~Abort")
+#define SV_BUTTONTEXT_LESS                           NC_("SV_BUTTONTEXT_LESS", "~Less")
+#define SV_BUTTONTEXT_RESET                          NC_("SV_BUTTONTEXT_RESET", "R~eset")
+#define SV_BUTTONTEXT_ADD                            NC_("SV_BUTTONTEXT_ADD", "~Add")
+#define SV_BUTTONTEXT_DELETE                         NC_("SV_BUTTONTEXT_DELETE", "~Delete")
+#define SV_BUTTONTEXT_REMOVE                         NC_("SV_BUTTONTEXT_REMOVE", "~Remove")
+#define SV_BUTTONTEXT_NEW                            NC_("SV_BUTTONTEXT_NEW", "~New")
+#define SV_BUTTONTEXT_EDIT                           NC_("SV_BUTTONTEXT_EDIT", "~Edit")
+#define SV_BUTTONTEXT_APPLY                          NC_("SV_BUTTONTEXT_APPLY", "~Apply")
+#define SV_BUTTONTEXT_SAVE                           NC_("SV_BUTTONTEXT_SAVE", "~Save")
+#define SV_BUTTONTEXT_UNDO                           NC_("SV_BUTTONTEXT_UNDO", "~Undo")
+#define SV_BUTTONTEXT_PASTE                          NC_("SV_BUTTONTEXT_PASTE", "~Paste")
+#define SV_BUTTONTEXT_NEXT                           NC_("SV_BUTTONTEXT_NEXT", "~Next")
+#define SV_BUTTONTEXT_GO_UP                          NC_("SV_BUTTONTEXT_GO_UP", "~Up")
+#define SV_BUTTONTEXT_GO_DOWN                        NC_("SV_BUTTONTEXT_GO_DOWN", "Do~wn")
+#define SV_BUTTONTEXT_CLEAR                          NC_("SV_BUTTONTEXT_CLEAR", "~Clear")
+#define SV_BUTTONTEXT_OPEN                           NC_("SV_BUTTONTEXT_OPEN", "~Open")
+#define SV_BUTTONTEXT_PLAY                           NC_("SV_BUTTONTEXT_PLAY", "~Play")
+#define SV_BUTTONTEXT_FIND                           NC_("SV_BUTTONTEXT_FIND", "~Find")
+#define SV_BUTTONTEXT_STOP                           NC_("SV_BUTTONTEXT_STOP", "~Stop")
+#define SV_BUTTONTEXT_CONNECT                        NC_("SV_BUTTONTEXT_CONNECT", "C~onnect")
+#define SV_BUTTONTEXT_SCREENSHOT                     NC_("SV_BUTTONTEXT_SCREENSHOT", "~Screenshot")
+
+#define SV_STDTEXT_SERVICENOTAVAILABLE               NC_("SV_STDTEXT_SERVICENOTAVAILABLE", "The component (%s) could not be loaded.\nPlease start setup with the repair option.")
+
+#define SV_STDTEXT_DONTASKAGAIN                      NC_("SV_STDTEXT_DONTASKAGAIN", "Do not show this question again.")
+#define SV_STDTEXT_DONTWARNAGAIN                     NC_("SV_STDTEXT_DONTWARNAGAIN", "Do not show warning again.")
+
+#define SV_STDTEXT_ABOUT                             NC_("SV_STDTEXT_ABOUT", "About %PRODUCTNAME")
+#define SV_STDTEXT_PREFERENCES                       NC_("SV_STDTEXT_PREFERENCES", "Preferences...")
+#define SV_STDTEXT_ALLFILETYPES                      NC_("SV_STDTEXT_ALLFILETYPES", "Any type")
+
+#define STR_FPICKER_AUTO_EXTENSION                   NC_("STR_FPICKER_AUTO_EXTENSION", "~Automatic file name extension")
+#define STR_FPICKER_PASSWORD                         NC_("STR_FPICKER_PASSWORD", "Save with pass~word")
+#define STR_FPICKER_FILTER_OPTIONS                   NC_("STR_FPICKER_FILTER_OPTIONS", "~Edit filter settings")
+#define STR_FPICKER_READONLY                         NC_("STR_FPICKER_READONLY", "~Read-only")
+#define STR_FPICKER_INSERT_AS_LINK                   NC_("STR_FPICKER_INSERT_AS_LINK", "Insert as ~Link")
+#define STR_FPICKER_SHOW_PREVIEW                     NC_("STR_FPICKER_SHOW_PREVIEW", "Pr~eview")
+#define STR_FPICKER_PLAY                             NC_("STR_FPICKER_PLAY", "~Play")
+#define STR_FPICKER_VERSION                          NC_("STR_FPICKER_VERSION", "~Version:")
+#define STR_FPICKER_TEMPLATES                        NC_("STR_FPICKER_TEMPLATES", "S~tyles:")
+#define STR_FPICKER_IMAGE_TEMPLATE                   NC_("STR_FPICKER_IMAGE_TEMPLATE", "Frame Style: ")
+#define STR_FPICKER_SELECTION                        NC_("STR_FPICKER_SELECTION", "~Selection")
+#define STR_FPICKER_FOLDER_DEFAULT_TITLE             NC_("STR_FPICKER_FOLDER_DEFAULT_TITLE", "Select Path")
+#define STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION       NC_("STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION", "Please select a folder.")
+#define STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY    NC_("STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY", "A file named \"$filename$\" already exists. Do you want to replace it?")
+#define STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY  NC_("STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY", "The file already exists in \"$dirname$\". Replacing it will overwrite its contents.")
+#define STR_FPICKER_ALLFORMATS                       NC_("STR_FPICKER_ALLFORMATS", "All Formats")
+#define STR_FPICKER_OPEN                             NC_("STR_FPICKER_OPEN", "Open")
+#define STR_FPICKER_SAVE                             NC_("STR_FPICKER_SAVE", "Save")
+#define STR_FPICKER_TYPE                             NC_("STR_FPICKER_TYPE", "File ~type")
+
+#define SV_ACCESSERROR_NO_FONTS                      NC_("SV_ACCESSERROR_NO_FONTS", "No fonts could be found on the system.")
+
+#define SV_PRINT_NOPAGES                             NC_("SV_PRINT_NOPAGES", "No pages")
+#define SV_PRINT_TOFILE_TXT                          NC_("SV_PRINT_TOFILE_TXT", "Print to File...")
+#define SV_PRINT_DEFPRT_TXT                          NC_("SV_PRINT_DEFPRT_TXT", "Default printer")
+#define SV_PRINT_PRINTPREVIEW_TXT                    NC_("SV_PRINT_PRINTPREVIEW_TXT", "Print preview")
+#define SV_PRINT_QUERYFAXNUMBER_TXT                  NC_("SV_PRINT_QUERYFAXNUMBER_TXT", "Please enter the fax number")
+#define SV_PRINT_INVALID_TXT                         NC_("SV_PRINT_INVALID_TXT", "<ignore>")
+#define SV_PRINT_CUSTOM_TXT                          NC_("SV_PRINT_CUSTOM_TXT", "Custom")
+
+#define SV_EDIT_WARNING_STR                          NC_("SV_EDIT_WARNING_STR", "The inserted text exceeded the maximum length of this text field. The text was truncated.")
+
+#define SV_APP_CPUTHREADS                            NC_("SV_APP_CPUTHREADS", "CPU threads: ")
+#define SV_APP_OSVERSION                             NC_("SV_APP_OSVERSION", "OS: ")
+#define SV_APP_UIRENDER                              NC_("SV_APP_UIRENDER", "UI render: ")
+#define SV_APP_GL                                    NC_("SV_APP_GL", "GL")
+#define SV_APP_DEFAULT                               NC_("SV_APP_DEFAULT", "default")
+
+#define SV_MSGBOX_INFO                               NC_("SV_MSGBOX_INFO", "Information")
+#define SV_MSGBOX_WARNING                            NC_("SV_MSGBOX_WARNING", "Warning")
+#define SV_MSGBOX_ERROR                              NC_("SV_MSGBOX_ERROR", "Error")
+#define SV_MSGBOX_QUERY                              NC_("SV_MSGBOX_QUERY", "Confirmation")
+
+#define STR_TEXTUNDO_DELPARA                         NC_("STR_TEXTUNDO_DELPARA", "delete line")
+#define STR_TEXTUNDO_CONNECTPARAS                    NC_("STR_TEXTUNDO_CONNECTPARAS", "delete multiple lines")
+#define STR_TEXTUNDO_SPLITPARA                       NC_("STR_TEXTUNDO_SPLITPARA", "insert multiple lines")
+#define STR_TEXTUNDO_INSERTCHARS                     NC_("STR_TEXTUNDO_INSERTCHARS", "insert '$1'")
+#define STR_TEXTUNDO_REMOVECHARS                     NC_("STR_TEXTUNDO_REMOVECHARS", "delete '$1'")
+
+#endif // INCLUDED_VCL_INC_STRINGS_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeMode.src b/vcl/inc/strings.hxx
index 2de389e72471..45e9b2af4310 100644
--- a/svx/source/dialog/SafeMode.src
+++ b/vcl/inc/strings.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <svx/dialogs.hrc>
+#ifndef INCLUDED_VCL_INC_STRINGS_HXX
+#define INCLUDED_VCL_INC_STRINGS_HXX
 
-String RID_SVXSTR_SAFEMODE_ZIP_FAILURE
-{
-    Text[en-US] = "The zip file could not be created.";
-};
+#define SV_APP_VCLBACKEND "VCL: "
+
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 8c07cf9ffff1..3501d2c25d45 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -48,7 +48,6 @@ struct ImplHotKey;
 struct ImplEventHook;
 struct ImplSchedulerData;
 class Point;
-class ResMgr;
 class ImplAccelManager;
 class PhysicalFontCollection;
 class ImplFontCache;
@@ -337,7 +336,8 @@ struct ImplSVData
     bool                    mbDeInit = false;               // Is VCL deinitializing
     SalI18NImeStatus*       mpImeStatus = nullptr;          // interface to ime status window
     SalSystem*              mpSalSystem = nullptr;          // SalSystem interface
-    ResMgr*                 mpResMgr = nullptr;             // SV-Resource-Manager
+    bool                    mbResLocaleSet = false;         // SV-Resource-Manager
+    std::locale             maResLocale;                    // Resource locale
     ImplSchedulerContext    maSchedCtx;                     // indepen data for class Scheduler
     ImplSVAppData           maAppData;                      // indepen data for class Application
     ImplSVGDIData           maGDIData;                      // indepen data for Output classes
@@ -364,8 +364,8 @@ struct ImplSVData
 void        ImplDeInitSVData();
 VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultWindow();
 VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultContextWindow();
-VCL_PLUGIN_PUBLIC ResMgr*     ImplGetResMgr();
-VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
+VCL_PLUGIN_PUBLIC const std::locale& ImplGetResLocale();
+VCL_PLUGIN_PUBLIC OUString VclResId(const char* pId);
 DockingManager*     ImplGetDockingManager();
 BlendFrameCache*    ImplGetBlendFrameCache();
 
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
deleted file mode 100644
index b4d4cca62529..000000000000
--- a/vcl/inc/svids.hrc
+++ /dev/null
@@ -1,140 +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_VCL_INC_SVIDS_HRC
-#define INCLUDED_VCL_INC_SVIDS_HRC
-
-#define RID_STR_PAPERNAMES                           1080
-
-#define SV_RESID_STRING_NOSELECTIONPOSSIBLE          2001
-
-#define SV_MENU_MAC_SERVICES                         2002
-#define SV_MENU_MAC_HIDEAPP                          2003
-#define SV_MENU_MAC_HIDEALL                          2004
-#define SV_MENU_MAC_SHOWALL                          2005
-#define SV_MENU_MAC_QUITAPP                          2006
-
-#define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT           1
-#define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE          2
-
-#define SV_PRINT_NATIVE_STRINGS                      2050
-
-#define SV_HELPTEXT_CLOSE                           10000
-#define SV_HELPTEXT_MINIMIZE                        10001
-#define SV_HELPTEXT_MAXIMIZE                        10002
-#define SV_HELPTEXT_RESTORE                         10003
-#define SV_HELPTEXT_ROLLDOWN                        10004
-#define SV_HELPTEXT_ROLLUP                          10005
-#define SV_HELPTEXT_HELP                            10006
-#define SV_HELPTEXT_SCREENSHOT                      10007
-#define SV_HELPTEXT_FADEIN                          10008
-#define SV_HELPTEXT_FADEOUT                         10009
-#define SV_HELPTEXT_CLOSEDOCUMENT                   10012
-
-#define SV_BUTTONTEXT_OK                            10100
-#define SV_BUTTONTEXT_CANCEL                        10101
-#define SV_BUTTONTEXT_YES                           10102
-#define SV_BUTTONTEXT_NO                            10103
-#define SV_BUTTONTEXT_RETRY                         10104
-#define SV_BUTTONTEXT_HELP                          10105
-#define SV_BUTTONTEXT_CLOSE                         10106
-#define SV_BUTTONTEXT_MORE                          10107
-#define SV_BUTTONTEXT_IGNORE                        10108
-#define SV_BUTTONTEXT_ABORT                         10109
-#define SV_BUTTONTEXT_LESS                          10110
-#define SV_BUTTONTEXT_RESET                         10111
-#define SV_BUTTONTEXT_ADD                           10112
-#define SV_BUTTONTEXT_DELETE                        10113
-#define SV_BUTTONTEXT_REMOVE                        10114
-#define SV_BUTTONTEXT_NEW                           10115
-#define SV_BUTTONTEXT_EDIT                          10116
-#define SV_BUTTONTEXT_APPLY                         10117
-#define SV_BUTTONTEXT_SAVE                          10118
-#define SV_BUTTONTEXT_OK_NOMNEMONIC                 10119
-#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC             10120
-#define SV_BUTTONTEXT_UNDO                          10121
-#define SV_BUTTONTEXT_PASTE                         10122
-#define SV_BUTTONTEXT_NEXT                          10123
-#define SV_BUTTONTEXT_GO_UP                         10124
-#define SV_BUTTONTEXT_GO_DOWN                       10125
-#define SV_BUTTONTEXT_CLEAR                         10126
-#define SV_BUTTONTEXT_OPEN                          10127
-#define SV_BUTTONTEXT_PLAY                          10128
-#define SV_BUTTONTEXT_FIND                          10129
-#define SV_BUTTONTEXT_STOP                          10130
-#define SV_BUTTONTEXT_CONNECT                       10131
-#define SV_BUTTONTEXT_SCREENSHOT                    10132
-
-#define SV_STDTEXT_SERVICENOTAVAILABLE              10210
-
-#define SV_STDTEXT_DONTASKAGAIN                     10212
-#define SV_STDTEXT_DONTWARNAGAIN                    10213
-#define SV_STDTEXT_ABOUT                            10214
-#define SV_STDTEXT_PREFERENCES                      10215
-#define SV_STDTEXT_ALLFILETYPES                     10217
-
-#define STR_FPICKER_AUTO_EXTENSION                  10300
-#define STR_FPICKER_PASSWORD                        10301
-#define STR_FPICKER_FILTER_OPTIONS                  10302
-#define STR_FPICKER_READONLY                        10303
-#define STR_FPICKER_INSERT_AS_LINK                  10304
-#define STR_FPICKER_SHOW_PREVIEW                    10305
-#define STR_FPICKER_PLAY                            10306
-#define STR_FPICKER_VERSION                         10307
-#define STR_FPICKER_TEMPLATES                       10308
-#define STR_FPICKER_IMAGE_TEMPLATE                  10309
-#define STR_FPICKER_SELECTION                       10310
-#define STR_FPICKER_FOLDER_DEFAULT_TITLE            10311
-#define STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION      10312
-#define STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY   10313
-#define STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY 10314
-#define STR_FPICKER_ALLFORMATS                      10315
-#define STR_FPICKER_OPEN                            10316
-#define STR_FPICKER_SAVE                            10317
-#define STR_FPICKER_TYPE                            10318
-
-#define SV_ACCESSERROR_NO_FONTS                     10510
-
-#define SV_PRINT_NOPAGES                            10609
-#define SV_PRINT_TOFILE_TXT                         10610
-#define SV_PRINT_DEFPRT_TXT                         10611
-#define SV_PRINT_PRINTPREVIEW_TXT                   10612
-#define SV_PRINT_QUERYFAXNUMBER_TXT                 10615
-#define SV_PRINT_INVALID_TXT                        10616
-#define SV_PRINT_CUSTOM_TXT                         10617
-
-#define SV_EDIT_WARNING_STR                         10650
-
-#define SV_FUNIT_STRINGS                            10700
-
-#define SV_APP_CPUTHREADS                           10800
-#define SV_APP_OSVERSION                            10801
-#define SV_APP_UIRENDER                             10802
-#define SV_APP_GL                                   10803
-#define SV_APP_DEFAULT                              10804
-#define SV_APP_VCLBACKEND                           10805
-
-#define SV_MSGBOX_INFO                              10900
-#define SV_MSGBOX_WARNING                           10901
-#define SV_MSGBOX_ERROR                             10902
-#define SV_MSGBOX_QUERY                             10903
-
-#endif // INCLUDED_VCL_INC_SVIDS_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/units.hrc b/vcl/inc/units.hrc
new file mode 100644
index 000000000000..3fc58eca0270
--- /dev/null
+++ b/vcl/inc/units.hrc
@@ -0,0 +1,58 @@
+/* -*- 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_VCL_INC_UNITS_HRC
+#define INCLUDED_VCL_INC_UNITS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+std::pair<const char*, FieldUnit> SV_FUNIT_STRINGS[] =
+{
+    // To translators: This is the first entry of a sequence of measurement unit names
+    { NC_("SV_FUNIT_STRINGS", "mm"), FUNIT_MM },
+    { NC_("SV_FUNIT_STRINGS", "cm"), FUNIT_CM },
+    { NC_("SV_FUNIT_STRINGS", "m"), FUNIT_M },
+    { NC_("SV_FUNIT_STRINGS", "km"), FUNIT_KM },
+    { NC_("SV_FUNIT_STRINGS", "twips"), FUNIT_TWIP },
+    { NC_("SV_FUNIT_STRINGS", "twip"), FUNIT_TWIP },
+    { NC_("SV_FUNIT_STRINGS", "pt"), FUNIT_POINT },
+    { NC_("SV_FUNIT_STRINGS", "pc"), FUNIT_PICA },
+    { NC_("SV_FUNIT_STRINGS", "\""), FUNIT_INCH },
+    { NC_("SV_FUNIT_STRINGS", "in"), FUNIT_INCH },
+    { NC_("SV_FUNIT_STRINGS", "inch"), FUNIT_INCH },
+    { NC_("SV_FUNIT_STRINGS", "'"), FUNIT_FOOT },
+    { NC_("SV_FUNIT_STRINGS", "ft"), FUNIT_FOOT },
+    { NC_("SV_FUNIT_STRINGS", "foot"), FUNIT_FOOT },
+    { NC_("SV_FUNIT_STRINGS", "feet"), FUNIT_FOOT },
+    { NC_("SV_FUNIT_STRINGS", "miles"), FUNIT_MILE },
+    { NC_("SV_FUNIT_STRINGS", "mile"), FUNIT_MILE },
+    { NC_("SV_FUNIT_STRINGS", "ch"), FUNIT_CHAR },
+    { NC_("SV_FUNIT_STRINGS", "line"), FUNIT_LINE },
+    { NC_("SV_FUNIT_STRINGS", "pixels"), FUNIT_PIXEL },
+    { NC_("SV_FUNIT_STRINGS", "pixel"), FUNIT_PIXEL },
+    /* To translators: degree */
+    { NC_("SV_FUNIT_STRINGS", "°"), FUNIT_DEGREE },
+    { NC_("SV_FUNIT_STRINGS", "sec"), FUNIT_SECOND },
+    // To translators: This is the last entry of the sequence of measurement unit names
+    { NC_("SV_FUNIT_STRINGS", "ms"), FUNIT_MILLISECOND }
+};
+
+#endif // INCLUDED_VCL_INC_UNITS_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 2e73957b4024..3cfe816ce704 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -19,8 +19,6 @@
 
 #include "sal/config.h"
 
-#include "tools/resary.hxx"
-
 #include <vcl/print.hxx>
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
@@ -33,7 +31,8 @@
 #include "quartz/utils.h"
 
 #include "svdata.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
+#include "printaccessoryview.hrc"
 
 #include "com/sun/star/i18n/XBreakIterator.hpp"
 #include "com/sun/star/i18n/WordType.hpp"
@@ -156,31 +155,29 @@ class ControllerProperties
     std::vector< NSObject* >            maViews;
     int                                 mnNextTag;
     sal_Int32                           mnLastPageCount;
-    ResStringArray                      maLocalizedStrings;
     AquaPrintPanelAccessoryController*  mpAccessoryController;
 
 public:
     ControllerProperties( AquaPrintPanelAccessoryController* i_pAccessoryController )
     : mnNextTag( 0 )
     , mnLastPageCount( [i_pAccessoryController printerController]->getFilteredPageCount() )
-    , maLocalizedStrings( VclResId( SV_PRINT_NATIVE_STRINGS ) )
     , mpAccessoryController( i_pAccessoryController )
     {
-        assert( maLocalizedStrings.Count() >= 5 && "resources not found" );
+        assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5 && "resources not found" );
     }
 
     rtl::OUString getMoreString()
     {
-        return maLocalizedStrings.Count() >= 4
-               ? maLocalizedStrings.GetString( 3 )
-               : OUString( "More" );
+        return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 4
+               ? VclResId(SV_PRINT_NATIVE_STRINGS[3])
+               : OUString("More");
     }
 
     rtl::OUString getPrintSelectionString()
     {
-        return maLocalizedStrings.Count() >= 5
-               ? maLocalizedStrings.GetString( 4 )
-               : OUString( "Print selection only" );
+        return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5
+               ? VclResId(SV_PRINT_NATIVE_STRINGS[4])
+               : OUString("Print selection only");
     }
 
     int addNameTag( const rtl::OUString& i_rPropertyName )
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index d943c82064bc..abab89f1dee7 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -36,7 +36,7 @@
 #include "osx/salframe.h"
 #include "osx/a11ywrapper.h"
 #include "quartz/utils.h"
-#include "svids.hrc"
+#include "strings.hrc"
 #include "window.h"
 
 namespace {
@@ -117,106 +117,102 @@ static void initAppMenu()
     {
         bOnce = false;
 
-        ResMgr* pMgr = ImplGetResMgr();
-        if( pMgr )
+        // get the main menu
+        NSMenu* pMainMenu = [NSApp mainMenu];
+        if( pMainMenu != nil )
         {
-            // get the main menu
-            NSMenu* pMainMenu = [NSApp mainMenu];
-            if( pMainMenu != nil )
+            // create the action selector
+            pMainMenuSelector = [[MainMenuSelector alloc] init];
+
+            // get the proper submenu
+            NSMenu* pAppMenu = [[pMainMenu itemAtIndex: 0] submenu];
+            if( pAppMenu )
             {
-                // create the action selector
-                pMainMenuSelector = [[MainMenuSelector alloc] init];
+                // insert about entry
+                OUString aAbout(VclResId(SV_STDTEXT_ABOUT));
+                NSString* pString = CreateNSString( aAbout );
+                NSMenuItem* pNewItem = [pAppMenu insertItemWithTitle: pString
+                                                 action: @selector(showAbout:)
+                                                 keyEquivalent: @""
+                                                 atIndex: 0];
+                if (pString)
+                    [pString release];
+                if( pNewItem )
+                {
+                    [pNewItem setTarget: pMainMenuSelector];
+                    [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 1];
+                }
 
-                // get the proper submenu
-                NSMenu* pAppMenu = [[pMainMenu itemAtIndex: 0] submenu];
-                if( pAppMenu )
+                // insert preferences entry
+                OUString aPref(VclResId(SV_STDTEXT_PREFERENCES));
+                pString = CreateNSString( aPref );
+                pNewItem = [pAppMenu insertItemWithTitle: pString
+                                     action: @selector(showPreferences:)
+                                     keyEquivalent: @","
+                                     atIndex: 2];
+                if (pString)
+                    [pString release];
+                if( pNewItem )
                 {
-                    // insert about entry
-                    OUString aAbout( ResId( SV_STDTEXT_ABOUT, *pMgr ) );
-                    NSString* pString = CreateNSString( aAbout );
-                    NSMenuItem* pNewItem = [pAppMenu insertItemWithTitle: pString
-                                                     action: @selector(showAbout:)
-                                                     keyEquivalent: @""
-                                                     atIndex: 0];
-                    if (pString)
-                        [pString release];
-                    if( pNewItem )
-                    {
-                        [pNewItem setTarget: pMainMenuSelector];
-                        [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 1];
-                    }
-
-                    // insert preferences entry
-                    OUString aPref( ResId( SV_STDTEXT_PREFERENCES, *pMgr ) );
-                    pString = CreateNSString( aPref );
-                    pNewItem = [pAppMenu insertItemWithTitle: pString
-                                         action: @selector(showPreferences:)
-                                         keyEquivalent: @","
-                                         atIndex: 2];
-                    if (pString)
-                        [pString release];
-                    if( pNewItem )
-                    {
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    // 'NSCommandKeyMask' is deprecated: first deprecated in macOS 10.12
-                        [pNewItem setKeyEquivalentModifierMask: NSCommandKeyMask];
+// 'NSCommandKeyMask' is deprecated: first deprecated in macOS 10.12
+                    [pNewItem setKeyEquivalentModifierMask: NSCommandKeyMask];
 SAL_WNODEPRECATED_DECLARATIONS_POP
-                        [pNewItem setTarget: pMainMenuSelector];
-                        [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 3];
-                    }
-
-                    // WARNING: ultra ugly code ahead
-
-                    // rename standard entries
-                    // rename "Services"
-                    pNewItem = [pAppMenu itemAtIndex: 4];
-                    if( pNewItem )
-                    {
-                        pString = CreateNSString( OUString( ResId( SV_MENU_MAC_SERVICES, *pMgr ) ) );
-                        [pNewItem  setTitle: pString];
-                        if( pString )
-                            [pString release];
-                    }
-
-                    // rename "Hide NewApplication"
-                    pNewItem = [pAppMenu itemAtIndex: 6];
-                    if( pNewItem )
-                    {
-                        pString = CreateNSString( OUString( ResId( SV_MENU_MAC_HIDEAPP, *pMgr ) ) );
-                        [pNewItem  setTitle: pString];
-                        if( pString )
-                            [pString release];
-                    }
-
-                    // rename "Hide Others"
-                    pNewItem = [pAppMenu itemAtIndex: 7];
-                    if( pNewItem )
-                    {
-                        pString = CreateNSString( OUString( ResId( SV_MENU_MAC_HIDEALL, *pMgr ) ) );
-                        [pNewItem  setTitle: pString];
-                        if( pString )
-                            [pString release];
-                    }
-
-                    // rename "Show all"
-                    pNewItem = [pAppMenu itemAtIndex: 8];
-                    if( pNewItem )
-                    {
-                        pString = CreateNSString( OUString( ResId( SV_MENU_MAC_SHOWALL, *pMgr ) ) );
-                        [pNewItem  setTitle: pString];
-                        if( pString )
-                            [pString release];
-                    }
-
-                    // rename "Quit NewApplication"
-                    pNewItem = [pAppMenu itemAtIndex: 10];
-                    if( pNewItem )
-                    {
-                        pString = CreateNSString( OUString( ResId( SV_MENU_MAC_QUITAPP, *pMgr ) ) );
-                        [pNewItem  setTitle: pString];
-                        if( pString )
-                            [pString release];
-                    }
+                    [pNewItem setTarget: pMainMenuSelector];
+                    [pAppMenu insertItem: [NSMenuItem separatorItem] atIndex: 3];
+                }
+
+                // WARNING: ultra ugly code ahead
+
+                // rename standard entries
+                // rename "Services"
+                pNewItem = [pAppMenu itemAtIndex: 4];
+                if( pNewItem )
+                {
+                    pString = CreateNSString(VclResId(SV_MENU_MAC_SERVICES));
+                    [pNewItem  setTitle: pString];
+                    if( pString )
+                        [pString release];
+                }
+
+                // rename "Hide NewApplication"
+                pNewItem = [pAppMenu itemAtIndex: 6];
+                if( pNewItem )
+                {
+                    pString = CreateNSString(VclResId(SV_MENU_MAC_HIDEAPP));
+                    [pNewItem  setTitle: pString];
+                    if( pString )
+                        [pString release];
+                }
+
+                // rename "Hide Others"
+                pNewItem = [pAppMenu itemAtIndex: 7];
+                if( pNewItem )
+                {
+                    pString = CreateNSString(VclResId(SV_MENU_MAC_HIDEALL));
+                    [pNewItem  setTitle: pString];
+                    if( pString )
+                        [pString release];
+                }
+
+                // rename "Show all"
+                pNewItem = [pAppMenu itemAtIndex: 8];
+                if( pNewItem )
+                {
+                    pString = CreateNSString(VclResId(SV_MENU_MAC_SHOWALL));
+                    [pNewItem  setTitle: pString];
+                    if( pString )
+                        [pString release];
+                }
+
+                // rename "Quit NewApplication"
+                pNewItem = [pAppMenu itemAtIndex: 10];
+                if( pNewItem )
+                {
+                    pString = CreateNSString(VclResId(SV_MENU_MAC_QUITAPP));
+                    [pNewItem  setTitle: pString];
+                    if( pString )
+                        [pString release];
                 }
             }
         }
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index e7870ef79bd3..7051aeedeb44 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -26,7 +26,7 @@
 #include "osx/salinst.h"
 #include "quartz/utils.h"
 
-#include "svids.hrc"
+#include "strings.hrc"
 
 AquaSalSystem::~AquaSalSystem()
 {
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index a75f5ddd89f2..20851b3e7b41 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="vcl">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="dialog1">
     <property name="can_focus">False</property>
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index fde6acb7264f..2e549e539db4 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -20,14 +20,13 @@
 #include <vcl/layout.hxx>
 #include <vcl/stdtext.hxx>
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <svdata.hxx>
 
 void ShowServiceNotAvailableError(vcl::Window* pParent,
     const OUString& rServiceName, bool bError)
 {
-    OUString aText  = OUString(VclResId(SV_STDTEXT_SERVICENOTAVAILABLE)).
-        replaceAll("%s", rServiceName);
+    OUString aText = VclResId(SV_STDTEXT_SERVICENOTAVAILABLE).replaceAll("%s", rServiceName);
     ScopedVclPtrInstance< MessageDialog > aBox( pParent, aText, bError ? VclMessageType::Error : VclMessageType::Warning );
     aBox->Execute();
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 5cd0594c684c..40a424169448 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -64,7 +64,8 @@
 #include "displayconnectiondispatch.hxx"
 #include "window.h"
 #include "accmgr.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
+#include "strings.hxx"
 #if OSL_DEBUG_LEVEL > 0
 #include "schedulerimpl.hxx"
 #endif
@@ -675,18 +676,15 @@ void Application::SetSettings( const AllSettings& rSettings )
     {
         InitSettings(pSVData);
         *pSVData->maAppData.mpSettings = rSettings;
-        ResMgr::SetDefaultLocale( rSettings.GetUILanguageTag() );
     }
     else
     {
         AllSettings aOldSettings = *pSVData->maAppData.mpSettings;
-        if( aOldSettings.GetUILanguageTag().getLanguageType() != rSettings.GetUILanguageTag().getLanguageType() &&
-                pSVData->mpResMgr )
+        if (aOldSettings.GetUILanguageTag().getLanguageType() != rSettings.GetUILanguageTag().getLanguageType() &&
+                pSVData->mbResLocaleSet)
         {
-            delete pSVData->mpResMgr;
-            pSVData->mpResMgr = nullptr;
+            pSVData->mbResLocaleSet = false;
         }
-        ResMgr::SetDefaultLocale( rSettings.GetUILanguageTag() );
         *pSVData->maAppData.mpSettings = rSettings;
         AllSettingsFlags nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings );
         if ( bool(nChangeFlags) )
@@ -1192,7 +1190,7 @@ OUString Application::GetHWOSConfInfo()
 
 #ifdef LINUX
     // Only linux has different backends, so don't show blank for others.
-    aDetails.append( VclResId(SV_APP_VCLBACKEND) );
+    aDetails.append( SV_APP_VCLBACKEND );
     aDetails.append( GetToolkitName() );
     aDetails.append( "; " );
 #endif
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 6ea821411e36..9c1e119ded7a 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -22,8 +22,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <rtl/process.h>
-#include <tools/resary.hxx>
 #include <tools/gen.hxx>
+#include <tools/resmgr.hxx>
 #include <uno/current_context.hxx>
 
 #include <vcl/button.hxx>
@@ -46,12 +46,14 @@
 #include "window.h"
 #include "salimestatus.hxx"
 #include "salsys.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
+#include "units.hrc"
 
 #include "com/sun/star/accessibility/MSAAService.hpp"
 
 #include "officecfg/Office/Common.hxx"
 
+#include <config_folders.h>
 #include <config_features.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLContext.hxx>
@@ -159,36 +161,20 @@ vcl::Window *ImplGetDefaultContextWindow()
     return pSVData->mpDefaultWin;
 }
 
-ResMgr* ImplGetResMgr()
+const std::locale& ImplGetResLocale()
 {
     ImplSVData* pSVData = ImplGetSVData();
-    if ( !pSVData->mpResMgr )
+    if (!pSVData->mbResLocaleSet)
     {
-        LanguageTag aLocale( Application::GetSettings().GetUILanguageTag());
-        pSVData->mpResMgr = ResMgr::SearchCreateResMgr( "vcl", aLocale );
-
-        static bool bMessageOnce = false;
-        if( !pSVData->mpResMgr && ! bMessageOnce )
-        {
-            bMessageOnce = true;
-            const char pMsg[] =
-                "Missing vcl resource. This indicates that files vital to localization are missing. "
-                "You might have a corrupt installation.";
-            SAL_WARN("vcl", "" << pMsg);
-            ScopedVclPtrInstance< MessageDialog > aBox( nullptr, pMsg );
-            aBox->Execute();
-        }
+        pSVData->maResLocale = Translate::Create("vcl", Application::GetSettings().GetUILanguageTag());
+        pSVData->mbResLocaleSet = true;
     }
-    return pSVData->mpResMgr;
+    return pSVData->maResLocale;
 }
 
-ResId VclResId( sal_Int32 nId )
+OUString VclResId(const char* pId)
 {
-    ResMgr* pMgr = ImplGetResMgr();
-    if( ! pMgr )
-        throw std::bad_alloc();
-
-    return ResId( nId, *pMgr );
+    return Translate::get(pId, ImplGetResLocale());
 }
 
 FieldUnitStringList* ImplGetFieldUnits()
@@ -196,18 +182,13 @@ FieldUnitStringList* ImplGetFieldUnits()
     ImplSVData* pSVData = ImplGetSVData();
     if( ! pSVData->maCtrlData.mpFieldUnitStrings )
     {
-        ResMgr* pResMgr = ImplGetResMgr();
-        if( pResMgr )
+        sal_uInt32 nUnits = SAL_N_ELEMENTS(SV_FUNIT_STRINGS);
+        pSVData->maCtrlData.mpFieldUnitStrings = new FieldUnitStringList;
+        pSVData->maCtrlData.mpFieldUnitStrings->reserve( nUnits );
+        for (sal_uInt32 i = 0; i < nUnits; i++)
         {
-            ResStringArray aUnits( ResId (SV_FUNIT_STRINGS, *pResMgr) );
-            sal_uInt32 nUnits = aUnits.Count();
-            pSVData->maCtrlData.mpFieldUnitStrings = new FieldUnitStringList;
-            pSVData->maCtrlData.mpFieldUnitStrings->reserve( nUnits );
-            for( sal_uInt32 i = 0; i < nUnits; i++ )
-            {
-                std::pair< OUString, FieldUnit > aElement( aUnits.GetString(i), static_cast<FieldUnit>(aUnits.GetValue(i)) );
-                pSVData->maCtrlData.mpFieldUnitStrings->push_back( aElement );
-            }
+            std::pair<OUString, FieldUnit> aElement(VclResId(SV_FUNIT_STRINGS[i].first), SV_FUNIT_STRINGS[i].second);
+            pSVData->maCtrlData.mpFieldUnitStrings->push_back( aElement );
         }
     }
     return pSVData->maCtrlData.mpFieldUnitStrings;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b51bfbe8870a..58a5260d4e6b 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -574,14 +574,6 @@ void DeInitVCL()
     delete pSVData->maGDIData.mpScreenFontCache;
     pSVData->maGDIData.mpScreenFontCache = nullptr;
 
-    if ( pSVData->mpResMgr )
-    {
-        delete pSVData->mpResMgr;
-        pSVData->mpResMgr = nullptr;
-    }
-
-    ResMgr::DestroyAllResMgr();
-
     // destroy all Sal interfaces before destroying the instance
     // and thereby unloading the plugin
     delete pSVData->mpSalSystem;
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index d0b00e1d8b07..39a7d2fb1a3e 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index aed5ef25a4ef..bf0432c2e143 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -37,7 +37,7 @@
 #include <vcl/vclstatuslistener.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <window.h>
@@ -122,46 +122,32 @@ void Button::Click()
     ImplCallEventListenersAndHandler( VclEventId::ButtonClick, [this] () { maClickHdl.Call(this); } );
 }
 
-OUString Button::GetStandardText( StandardButtonType eButton )
+OUString Button::GetStandardText(StandardButtonType eButton)
 {
-    static struct
+    static const char* aResIdAry[static_cast<int>(StandardButtonType::Count)] =
     {
-        sal_uInt32 nResId;
-        const char* pDefText;
-    } aResIdAry[static_cast<int>(StandardButtonType::Count)] =
-    {
-        { SV_BUTTONTEXT_OK, "~OK" },
-        { SV_BUTTONTEXT_CANCEL, "~Cancel" },
-        { SV_BUTTONTEXT_YES, "~Yes" },
-        { SV_BUTTONTEXT_NO, "~No" },
-        { SV_BUTTONTEXT_RETRY, "~Retry" },
-        { SV_BUTTONTEXT_HELP, "~Help" },
-        { SV_BUTTONTEXT_CLOSE, "~Close" },
-        { SV_BUTTONTEXT_MORE, "~More" },
-        { SV_BUTTONTEXT_IGNORE, "~Ignore" },
-        { SV_BUTTONTEXT_ABORT, "~Abort" },
-        { SV_BUTTONTEXT_LESS, "~Less" }
-    };
-
-    ResMgr* pResMgr = ImplGetResMgr();
-
-    if (!pResMgr)
-    {
-        OString aT( aResIdAry[(sal_uInt16)eButton].pDefText );
-        return OStringToOUString(aT, RTL_TEXTENCODING_ASCII_US);
-    }
-
-    sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
+        // http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
+        // Under windows we don't want accelerators on ok/cancel but do on other
+        // buttons
 #ifdef _WIN32
-    // http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
-    // Under windows we don't want accelerators on ok/cancel but do on other
-    // buttons
-    if (nResId == SV_BUTTONTEXT_OK)
-        nResId = SV_BUTTONTEXT_OK_NOMNEMONIC;
-    else if (nResId == SV_BUTTONTEXT_CANCEL)
-        nResId = SV_BUTTONTEXT_CANCEL_NOMNEMONIC;
+        SV_BUTTONTEXT_OK_NOMNEMONIC,
+        SV_BUTTONTEXT_CANCEL_NOMNEMONIC,
+#else
+        SV_BUTTONTEXT_OK,
+        SV_BUTTONTEXT_CANCEL,
 #endif
-    return ResId(nResId, *pResMgr);
+        SV_BUTTONTEXT_YES,
+        SV_BUTTONTEXT_NO,
+        SV_BUTTONTEXT_RETRY,
+        SV_BUTTONTEXT_HELP,
+        SV_BUTTONTEXT_CLOSE,
+        SV_BUTTONTEXT_MORE,
+        SV_BUTTONTEXT_IGNORE,
+        SV_BUTTONTEXT_ABORT,
+        SV_BUTTONTEXT_LESS,
+    };
+
+    return VclResId(aResIdAry[(sal_uInt16)eButton]);
 }
 
 bool Button::SetModeImage( const Image& rImage )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index dd289eff827f..69cc50abf549 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -30,7 +30,7 @@
 
 #include <window.h>
 #include <svdata.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
 #include <controldata.hxx>
 
 #include <com/sun/star/i18n/BreakIterator.hpp>
@@ -775,12 +775,8 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > const & Edit::ImplGetInpu
 
 void Edit::ShowTruncationWarning( vcl::Window* pParent )
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-    {
-        ScopedVclPtrInstance< MessageDialog > aBox( pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VclMessageType::Warning );
-        aBox->Execute();
-    }
+    ScopedVclPtrInstance< MessageDialog > aBox(pParent, VclResId(SV_EDIT_WARNING_STR), VclMessageType::Warning);
+    aBox->Execute();
 }
 
 bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index c92d8b95c78d..1256472fb8de 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -29,7 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "svids.hrc"
+#include "strings.hrc"
 #include "svdata.hxx"
 
 #include "i18nutil/unicode.hxx"
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index f3d1942eabd6..f1ff32a111ba 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/event.hxx>
 #include <vcl/imgctrl.hxx>
-#include <tools/rcid.h>
 
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 1899000f7d90..251ba7498343 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rcid.h>
 #include <vcl/event.hxx>
 #include <vcl/spin.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d35551011eaf..746c6c0acc4e 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -31,8 +31,8 @@
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/builderfactory.hxx>
+#include <strings.hrc>
 #include <bitmaps.hlst>
-#include <svids.hrc>
 
 #include "controldata.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 191aa2954290..d8527af48095 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -19,7 +19,7 @@
 
 #include "textundo.hxx"
 #include "textund2.hxx"
-#include "textundo.hrc"
+#include "strings.hrc"
 
 #include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
@@ -27,8 +27,6 @@
 #include <textdoc.hxx>
 #include <textdat2.hxx>
 #include <svdata.hxx>
-#include <tools/resid.hxx>
-
 
 namespace
 {
@@ -185,7 +183,7 @@ void TextUndoDelPara::Redo()
 
 OUString TextUndoDelPara::GetComment () const
 {
-    return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr());
+    return VclResId(STR_TEXTUNDO_DELPARA);
 }
 
 TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nPos )
@@ -213,7 +211,7 @@ void TextUndoConnectParas::Redo()
 
 OUString TextUndoConnectParas::GetComment () const
 {
-    return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr());
+    return VclResId(STR_TEXTUNDO_CONNECTPARAS);
 }
 
 TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nPos )
@@ -241,7 +239,7 @@ void TextUndoSplitPara::Redo()
 
 OUString TextUndoSplitPara::GetComment () const
 {
-    return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr());
+    return VclResId(STR_TEXTUNDO_SPLITPARA);
 }
 
 TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr )
@@ -290,7 +288,7 @@ OUString TextUndoInsertChars::GetComment () const
     // multiple lines?
     OUString sText(maText);
     Shorten(sText);
-    return OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+    return VclResId(STR_TEXTUNDO_INSERTCHARS).replaceAll("$1", sText);
 }
 
 TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr )
@@ -320,7 +318,7 @@ OUString TextUndoRemoveChars::GetComment () const
     // multiple lines?
     OUString sText(maText);
     Shorten(sText);
-    return OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+    return VclResId(STR_TEXTUNDO_REMOVECHARS).replaceAll("$1", sText);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textundo.hrc b/vcl/source/edit/textundo.hrc
deleted file mode 100644
index ff67473b3612..000000000000
--- a/vcl/source/edit/textundo.hrc
+++ /dev/null
@@ -1,31 +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 VCL_TEXTUNDO_HRC
-#define VCL_TEXTUNDO_HRC
-
-#define STR_TEXTUNDO_DELPARA                 3000
-#define STR_TEXTUNDO_CONNECTPARAS            3001
-#define STR_TEXTUNDO_SPLITPARA               3002
-#define STR_TEXTUNDO_INSERTCHARS             3003
-#define STR_TEXTUNDO_REMOVECHARS             3004
-
-#endif // VCL_TEXTUNDO_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textundo.src b/vcl/source/edit/textundo.src
deleted file mode 100644
index 13c4ba89d010..000000000000
--- a/vcl/source/edit/textundo.src
+++ /dev/null
@@ -1,43 +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 "textundo.hrc"
-
-String STR_TEXTUNDO_DELPARA
-{
-    Text [en-US] = "delete line";
-};
-String STR_TEXTUNDO_CONNECTPARAS
-{
-    Text [en-US] = "delete multiple lines";
-};
-String STR_TEXTUNDO_SPLITPARA
-{
-    Text [en-US] = "insert multiple lines";
-};
-String STR_TEXTUNDO_INSERTCHARS
-{
-    Text [en-US] = "insert '$1'";
-};
-String STR_TEXTUNDO_REMOVECHARS
-{
-    Text [en-US] = "delete '$1'";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index d699a74658aa..de47bad4b50e 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -27,7 +27,7 @@
 #include <svl/undo.hxx>
 #include <svl/lstner.hxx>
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index a3bf2ad6d5b1..b72d10882e22 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -22,7 +22,6 @@
 
 #include <o3tl/any.hxx>
 #include <tools/debug.hxx>
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 #include <tools/stream.hxx>
 #include <vcl/ImageTree.hxx>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 85c35dc3e0cb..5a3d1c2c4c70 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/types.h>
 
-#include <tools/resary.hxx>
 #include <tools/helpers.hxx>
 
 #include <vcl/virdev.hxx>
@@ -33,7 +32,8 @@
 #include "salptype.hxx"
 #include "salprn.hxx"
 #include "svdata.hxx"
-#include "svids.hrc"
+#include "print.hrc"
+#include "strings.hrc"
 #include "jobset.h"
 #include "outdev.h"
 #include "PhysicalFontCollection.hxx"
@@ -1496,24 +1496,20 @@ OUString Printer::GetPaperName( Paper ePaper )
     if( ! pSVData->mpPaperNames )
     {
         pSVData->mpPaperNames = new std::unordered_map< int, OUString >;
-        if( ImplGetResMgr() )
+        static const int PaperIndex[] =
         {
-            ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) );
-            static const int PaperIndex[] =
-            {
-                PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5,
-                PAPER_B4_ISO, PAPER_B5_ISO, PAPER_LETTER, PAPER_LEGAL, PAPER_TABLOID,
-                PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5, PAPER_ENV_C6, PAPER_ENV_C65,
-                PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_C, PAPER_D, PAPER_E,
-                PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL,
-                PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16,
-                PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS, PAPER_B6_JIS,
-                PAPER_POSTCARD_JP
-            };
-            OSL_ENSURE( sal_uInt32(SAL_N_ELEMENTS(PaperIndex)) == aPaperStrings.Count(), "localized paper name count wrong" );
-            for( int i = 0; i < int(SAL_N_ELEMENTS(PaperIndex)); i++ )
-                (*pSVData->mpPaperNames)[PaperIndex[i]] = aPaperStrings.GetString(i);
-        }
+            PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5,
+            PAPER_B4_ISO, PAPER_B5_ISO, PAPER_LETTER, PAPER_LEGAL, PAPER_TABLOID,
+            PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5, PAPER_ENV_C6, PAPER_ENV_C65,
+            PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_C, PAPER_D, PAPER_E,
+            PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL,
+            PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16,
+            PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS, PAPER_B6_JIS,
+            PAPER_POSTCARD_JP
+        };
+        assert(SAL_N_ELEMENTS(PaperIndex) == SAL_N_ELEMENTS(RID_STR_PAPERNAMES) && "localized paper name count wrong");
+        for (size_t i = 0; i < SAL_N_ELEMENTS(PaperIndex); ++i)
+            (*pSVData->mpPaperNames)[PaperIndex[i]] = VclResId(RID_STR_PAPERNAMES[i]);
     }
 
     std::unordered_map<int,OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index aa28092c38bc..e70c4d02dd82 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -32,7 +32,7 @@
 #include "svdata.hxx"
 #include "salinst.hxx"
 #include "salprn.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 9bcb8c26022f..01bacb88f443 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -34,7 +34,7 @@
 
 #include "PhysicalFontCollection.hxx"
 
-#include "svids.hrc"
+#include "strings.hrc"
 
 FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
 {
@@ -981,14 +981,10 @@ void OutputDevice::ImplInitFontList() const
             if( !mpFontCollection->Count() )
             {
                 OUString aError( "Application error: no fonts and no vcl resource found on your system" );
-                ResMgr* pMgr = ImplGetResMgr();
-                if( pMgr )
-                {
-                    OUString aResStr(ResId(SV_ACCESSERROR_NO_FONTS, *pMgr));
-                    if( !aResStr.isEmpty() )
-                        aError = aResStr;
-                }
-                Application::Abort( aError );
+                OUString aResStr(VclResId(SV_ACCESSERROR_NO_FONTS));
+                if (!aResStr.isEmpty())
+                    aError = aResStr;
+                Application::Abort(aError);
             }
         }
     }
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
deleted file mode 100644
index 9579dedb5489..000000000000
--- a/vcl/source/src/app.src
+++ /dev/null
@@ -1,42 +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 "svids.hrc"
-
-String SV_APP_CPUTHREADS
-{
-    Text [en-US] = "CPU threads: ";
-};
-
-String SV_APP_OSVERSION
-{
-    Text [en-US] = "OS: ";
-};
-
-String SV_APP_UIRENDER
-{
-    Text [en-US] = "UI render: ";
-};
-
-String SV_APP_GL
-{
-    Text [en-US] = "GL";
-};
-
-String SV_APP_DEFAULT
-{
-    Text [ en-US ] = "default";
-};
-
-String SV_APP_VCLBACKEND
-{
-    Text [ en-US ] = "VCL: ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
deleted file mode 100644
index 7d7cb4d11be5..000000000000
--- a/vcl/source/src/btntext.src
+++ /dev/null
@@ -1,194 +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 <svids.hrc>
-
-//http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
-//Special OK/Cancel handling
-
-String SV_BUTTONTEXT_OK
-{
-    Text [ x-comment ] = "This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string";
-    Text [ en-US ] = "~OK";
-};
-
-String SV_BUTTONTEXT_CANCEL
-{
-    Text [ x-comment ] = "This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string";
-    Text [ en-US ] = "~Cancel";
-};
-
-String SV_BUTTONTEXT_OK_NOMNEMONIC
-{
-    Text [ x-comment ] = "This is used on buttons for Windows, there should be no ~ mnemonic in this string";
-    Text [ en-US ] = "OK";
-};
-
-String SV_BUTTONTEXT_CANCEL_NOMNEMONIC
-{
-    Text [ x-comment ] = "This is used on buttons for Windows, there should be no ~ mnemonic in this string";
-    Text [ en-US ] = "Cancel";
-};
-
-String SV_BUTTONTEXT_YES
-{
-    Text [ en-US ] = "~Yes";
-};
-
-String SV_BUTTONTEXT_NO
-{
-    Text [ en-US ] = "~No";
-};
-
-String SV_BUTTONTEXT_RETRY
-{
-    Text [ en-US ] = "~Retry";
-};
-
-String SV_BUTTONTEXT_HELP
-{
-    Text [ en-US ] = "~Help";
-};
-
-String SV_BUTTONTEXT_CLOSE
-{
-    Text [ en-US ] = "~Close";
-};
-
-String SV_BUTTONTEXT_MORE
-{
-    Text [ en-US ] = "~More";
-};
-
-String SV_BUTTONTEXT_LESS
-{
-    Text [ en-US ] = "~Less";
-};
-
-String SV_BUTTONTEXT_IGNORE
-{
-    Text [ en-US ] = "~Ignore";
-};
-
-String SV_BUTTONTEXT_ABORT
-{
-    Text [ en-US ] = "~Abort";
-};
-
-String SV_BUTTONTEXT_RESET
-{
-    Text [ en-US ] = "R~eset";
-};
-
-String SV_BUTTONTEXT_ADD
-{
-    Text [ en-US ] = "~Add";
-};
-
-String SV_BUTTONTEXT_DELETE
-{
-    Text [ en-US ] = "~Delete";
-};
-
-String SV_BUTTONTEXT_REMOVE
-{
-    Text [ en-US ] = "~Remove";
-};
-
-String SV_BUTTONTEXT_NEW
-{
-    Text [ en-US ] = "~New";
-};
-
-String SV_BUTTONTEXT_EDIT
-{
-    Text [ en-US ] = "~Edit";
-};
-
-String SV_BUTTONTEXT_APPLY
-{
-    Text [ en-US ] = "~Apply";
-};
-
-String SV_BUTTONTEXT_SAVE
-{
-    Text [ en-US ] = "~Save";
-};
-
-String SV_BUTTONTEXT_OPEN
-{
-    Text [ en-US ] = "~Open";
-};
-
-String SV_BUTTONTEXT_UNDO
-{
-    Text [ en-US ] = "~Undo" ;
-};
-
-String SV_BUTTONTEXT_PASTE
-{
-    Text [ en-US ] = "~Paste" ;
-};
-
-String SV_BUTTONTEXT_NEXT
-{
-    Text [ en-US ] = "~Next" ;
-};
-
-String SV_BUTTONTEXT_GO_UP
-{
-    Text [ en-US ] = "~Up" ;
-};
-
-String SV_BUTTONTEXT_GO_DOWN
-{
-    Text [ en-US ] = "Do~wn" ;
-};
-
-String SV_BUTTONTEXT_CLEAR
-{
-    Text [ en-US ] = "~Clear" ;
-};
-
-String SV_BUTTONTEXT_PLAY
-{
-    Text [ en-US ] = "~Play" ;
-};
-
-String SV_BUTTONTEXT_FIND
-{
-    Text [ en-US ] = "~Find" ;
-};
-
-String SV_BUTTONTEXT_STOP
-{
-    Text [ en-US ] = "~Stop" ;
-};
-
-String SV_BUTTONTEXT_CONNECT
-{
-    Text [ en-US ] = "C~onnect" ;
-};
-
-String SV_BUTTONTEXT_SCREENSHOT
-{
-    Text [ en-US ] = "~Screenshot" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/fpicker.src b/vcl/source/src/fpicker.src
deleted file mode 100644
index 73e404c9e6c0..000000000000
--- a/vcl/source/src/fpicker.src
+++ /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/.
- *
- * 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 <svids.hrc>
-
-String STR_FPICKER_AUTO_EXTENSION
-{
-    Text [ en-US ] = "~Automatic file name extension" ;
-};
-
-String STR_FPICKER_PASSWORD
-{
-    Text [ en-US ] = "Save with pass~word" ;
-};
-
-String STR_FPICKER_FILTER_OPTIONS
-{
-    Text [ en-US ] = "~Edit filter settings";
-};
-
-String STR_FPICKER_READONLY
-{
-    Text [ en-US ] = "~Read-only" ;
-};
-
-String STR_FPICKER_INSERT_AS_LINK
-{
-    Text [ en-US ] = "Insert as ~Link" ;
-};
-
-String STR_FPICKER_SHOW_PREVIEW
-{
-    Text [ en-US ] = "Pr~eview" ;
-};
-
-String STR_FPICKER_PLAY
-{
-    Text [ en-US ] = "~Play" ;
-};
-
-String STR_FPICKER_VERSION
-{
-    Text [ en-US ] = "~Version:";
-};
-
-String STR_FPICKER_TEMPLATES
-{
-    Text [ en-US ] = "S~tyles:" ;
-};
-
-String STR_FPICKER_IMAGE_TEMPLATE
-{
-    Text [ en-US ] = "Frame Style: ";
-};
-
-String STR_FPICKER_SELECTION
-{
-    Text [ en-US ] = "~Selection" ;
-};
-
-String STR_FPICKER_FOLDER_DEFAULT_TITLE
-{
-    Text [ en-US ] = "Select Path" ;
-};
-
-String STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION
-{
-    Text [ en-US ] = "Please select a folder.";
-};
-
-String STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY
-{
-    Text [ en-US ] = "A file named \"$filename$\" already exists. Do you want to replace it?" ;
-};
-
-String STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY
-{
-    Text [ en-US ] = "The file already exists in \"$dirname$\". Replacing it will overwrite its contents." ;
-};
-
-String STR_FPICKER_ALLFORMATS
-{
-    Text [ en-US ] = "All Formats" ;
-};
-
-String STR_FPICKER_OPEN
-{
-    Text [ en-US ] = "Open" ;
-};
-
-String STR_FPICKER_SAVE
-{
-    Text [ en-US ] = "Save" ;
-};
-
-String STR_FPICKER_TYPE
-{
-    Text [ en-US ] = "File ~type" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
deleted file mode 100644
index 2dcb27a4940c..000000000000
--- a/vcl/source/src/helptext.src
+++ /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 .
- */
-
-#include <svids.hrc>
-
-String SV_HELPTEXT_CLOSE
-{
-    Text [ en-US ] = "Close";
-};
-String SV_HELPTEXT_CLOSEDOCUMENT
-{
-    Text [ en-US ] = "Close Document";
-};
-String SV_HELPTEXT_MINIMIZE
-{
-    Text [ en-US ] = "Minimize";
-};
-
-String SV_HELPTEXT_MAXIMIZE
-{
-    Text [ en-US ] = "Maximize";
-};
-
-String SV_HELPTEXT_RESTORE
-{
-    Text [ en-US ] = "Restore";
-};
-
-String SV_HELPTEXT_ROLLDOWN
-{
-    Text [ en-US ] = "Drop down";
-};
-
-String SV_HELPTEXT_ROLLUP
-{
-    Text [ en-US ] = "Roll up";
-};
-
-String SV_HELPTEXT_HELP
-{
-    Text [ en-US ] = "Help";
-};
-
-String SV_HELPTEXT_SCREENSHOT
-{
-    Text [ en-US ] = "Take and annotate a screenshot";
-};
-
-String SV_HELPTEXT_FADEIN
-{
-    Text [ en-US ] = "Show";
-};
-
-String SV_HELPTEXT_FADEOUT
-{
-    Text [ en-US ] = "Hide";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
deleted file mode 100644
index dd97a69590ed..000000000000
--- a/vcl/source/src/menu.src
+++ /dev/null
@@ -1,52 +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 <svids.hrc>
-
-String SV_RESID_STRING_NOSELECTIONPOSSIBLE
-{
-    Text [ en-US ] = "<No selection possible>";
-};
-
-String SV_MENU_MAC_SERVICES
-{
-    Text [ en-US ] = "Services";
-};
-
-String SV_MENU_MAC_HIDEAPP
-{
-    Text [ en-US ] = "Hide %PRODUCTNAME";
-};
-
-String SV_MENU_MAC_HIDEALL
-{
-    Text [ en-US ] = "Hide Others";
-};
-
-String SV_MENU_MAC_SHOWALL
-{
-    Text [ en-US ] = "Show All";
-};
-
-String SV_MENU_MAC_QUITAPP
-{
-    Text [ en-US ] = "Quit %PRODUCTNAME";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
deleted file mode 100644
index 160602f6e72e..000000000000
--- a/vcl/source/src/print.src
+++ /dev/null
@@ -1,113 +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 "svids.hrc"
-
-StringArray SV_PRINT_NATIVE_STRINGS
-{
-    ItemList [en-US] =
-    {
-        < "Preview"; >;
-        < "Page number"; >;
-        < "Number of pages"; >;
-        < "More"; >;
-        < "Print selection only"; >;
-    };
-};
-
-StringArray RID_STR_PAPERNAMES
-{
-    ItemList [en-US] =
-    {
-        < "A0"; >;
-        < "A1"; >;
-        < "A2"; >;
-        < "A3"; >;
-        < "A4"; >;
-        < "A5"; >;
-        < "B4 (ISO)"; >;
-        < "B5 (ISO)"; >;
-        < "Letter"; >;
-        < "Legal"; >;
-        < "Tabloid"; >;
-        < "User Defined"; >;
-        < "B6 (ISO)"; >;
-        < "C4 Envelope"; >;
-        < "C5 Envelope"; >;
-        < "C6 Envelope"; >;
-        < "C6/5 Envelope"; >;
-        < "DL Envelope"; >;
-        < "Dia Slide"; >;
-        < "C"; >;
-        < "D"; >;
-        < "E"; >;
-        < "Executive"; >;
-        < "Long Bond"; >;
-        < "#8 (Monarch) Envelope"; >;
-        < "#6 3/4 (Personal) Envelope"; >;
-        < "#9 Envelope"; >;
-        < "#10 Envelope"; >;
-        < "#11 Envelope"; >;
-        < "#12 Envelope"; >;
-        < "16 Kai"; >;
-        < "32 Kai"; >;
-        < "Big 32 Kai"; >;
-        < "B4 (JIS)"; >;
-        < "B5 (JIS)"; >;
-        < "B6 (JIS)"; >;
-        < "Japanese Postcard"; >;
-    };
-};
-
-String SV_PRINT_NOPAGES
-{
-    Text [en-US] = "No pages";
-};
-
-String SV_PRINT_TOFILE_TXT
-{
-    Text [en-US] = "Print to File...";
-};
-
-String SV_PRINT_DEFPRT_TXT
-{
-    Text [en-US] = "Default printer";
-};
-
-String SV_PRINT_PRINTPREVIEW_TXT
-{
-    Text [en-US] = "Print preview";
-};
-
-String SV_PRINT_QUERYFAXNUMBER_TXT
-{
-    Text [ en-US ] = "Please enter the fax number";
-};
-
-String SV_PRINT_INVALID_TXT
-{
-    Text [ en-US ] = "<ignore>";
-};
-
-String SV_PRINT_CUSTOM_TXT
-{
-    Text [ en-US ] = "Custom";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
deleted file mode 100644
index d97c43ecc1eb..000000000000
--- a/vcl/source/src/stdtext.src
+++ /dev/null
@@ -1,82 +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 <svids.hrc>
-
-String SV_STDTEXT_SERVICENOTAVAILABLE
-{
-    Text [ en-US ] = "The component (%s) could not be loaded.\nPlease start setup with the repair option.";
-};
-
-String SV_STDTEXT_DONTASKAGAIN
-{
-    Text [ en-US ] = "Do not show this question again.";
-};
-
-String SV_STDTEXT_DONTWARNAGAIN
-{
-    Text [ en-US ] = "Do not show warning again.";
-};
-
-String SV_ACCESSERROR_NO_FONTS
-{
-    Text [ en-US ] = "No fonts could be found on the system.";
-};
-
-String SV_STDTEXT_ABOUT
-{
-    Text [ en-US ] = "About %PRODUCTNAME";
-};
-
-String SV_STDTEXT_PREFERENCES
-{
-    Text [ en-US ] = "Preferences...";
-};
-
-String SV_EDIT_WARNING_STR
-{
-    Text [en-US] = "The inserted text exceeded the maximum length of this text field. The text was truncated.";
-};
-
-String SV_STDTEXT_ALLFILETYPES
-{
-    Text [en-US] = "Any type";
-};
-
-String SV_MSGBOX_INFO
-{
-    Text [en-US] = "Information";
-};
-
-String SV_MSGBOX_WARNING
-{
-    Text [en-US] = "Warning";
-};
-
-String SV_MSGBOX_ERROR
-{
-    Text [en-US] = "Error";
-};
-
-String SV_MSGBOX_QUERY
-{
-    Text [en-US] = "Confirmation";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
deleted file mode 100644
index 5de62091d2c4..000000000000
--- a/vcl/source/src/units.src
+++ /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/.
- *
- * 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 <svids.hrc>
-
-StringArray SV_FUNIT_STRINGS
-{
-    ItemList [ en-US ] =
-    {
-        < "mm" ; FUNIT_MM ; > ;
-        < "cm" ; FUNIT_CM ; > ;
-        < "m" ; FUNIT_M ; > ;
-        < "km" ; FUNIT_KM ; > ;
-        < "twips" ; FUNIT_TWIP ; > ;
-        < "twip" ; FUNIT_TWIP ; > ;
-        < "pt" ; FUNIT_POINT ; > ;
-        < "pc" ; FUNIT_PICA ; > ;
-        < "\"" ; FUNIT_INCH ; > ;
-        < "in" ; FUNIT_INCH ; > ;
-        < "inch" ; FUNIT_INCH ; > ;
-        < "'" ; FUNIT_FOOT ; > ;
-        < "ft" ; FUNIT_FOOT ; > ;
-        < "foot" ; FUNIT_FOOT ; > ;
-        < "feet" ; FUNIT_FOOT ; > ;
-        < "miles" ; FUNIT_MILE ; > ;
-        < "mile" ; FUNIT_MILE ; > ;
-        < "ch" ; FUNIT_CHAR ; > ;
-        < "line" ; FUNIT_LINE ; > ;
-        < "pixels" ; FUNIT_PIXEL ; > ;
-        < "pixel" ; FUNIT_PIXEL ; > ;
-        < "°" ; FUNIT_DEGREE ; > ;
-        < "sec" ; FUNIT_SECOND ; > ;
-        < "ms" ; FUNIT_MILLISECOND ; > ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 7f48267a9499..ef11bca638a1 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <svdata.hxx>
 #include <brdwin.hxx>
 #include <window.h>
@@ -293,37 +293,37 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData const * pDat
                                               const Point& rPos,
                                               tools::Rectangle& rHelpRect )
 {
-    sal_uInt16 nHelpId = 0;
+    const char* pHelpId = nullptr;
     OUString aHelpStr;
     BorderWindowHitTest nHitTest = ImplHitTest( pData, rPos );
     if ( nHitTest != BorderWindowHitTest::NONE )
     {
         if ( nHitTest & BorderWindowHitTest::Close )
         {
-            nHelpId     = SV_HELPTEXT_CLOSE;
+            pHelpId     = SV_HELPTEXT_CLOSE;
             rHelpRect   = pData->maCloseRect;
         }
         else if ( nHitTest & BorderWindowHitTest::Roll )
         {
             if ( pData->mpBorderWindow->mbRollUp )
-                nHelpId = SV_HELPTEXT_ROLLDOWN;
+                pHelpId = SV_HELPTEXT_ROLLDOWN;
             else
-                nHelpId = SV_HELPTEXT_ROLLUP;
+                pHelpId = SV_HELPTEXT_ROLLUP;
             rHelpRect   = pData->maRollRect;
         }
         else if ( nHitTest & BorderWindowHitTest::Dock )
         {
-            nHelpId     = SV_HELPTEXT_MAXIMIZE;
+            pHelpId     = SV_HELPTEXT_MAXIMIZE;
             rHelpRect   = pData->maDockRect;
         }
         else if ( nHitTest & BorderWindowHitTest::Hide )
         {
-            nHelpId     = SV_HELPTEXT_MINIMIZE;
+            pHelpId     = SV_HELPTEXT_MINIMIZE;
             rHelpRect   = pData->maHideRect;
         }
         else if ( nHitTest & BorderWindowHitTest::Help )
         {
-            nHelpId     = SV_HELPTEXT_HELP;
+            pHelpId     = SV_HELPTEXT_HELP;
             rHelpRect   = pData->maHelpRect;
         }
         else if ( nHitTest & BorderWindowHitTest::Title )
@@ -341,8 +341,8 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData const * pDat
         }
     }
 
-    if( nHelpId && ImplGetResMgr() )
-        aHelpStr = ResId(nHelpId, *ImplGetResMgr());
+    if (pHelpId)
+        aHelpStr = VclResId(pHelpId);
 
     return aHelpStr;
 }
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e869039f666d..bc4b3047cfa0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -13,7 +13,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/module.hxx>
 #include <sal/log.hxx>
-#include <unotools/configmgr.hxx>
+#include <tools/resmgr.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
@@ -39,10 +39,10 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <svdata.hxx>
 #include <bitmaps.hlst>
-#include <svids.hrc>
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
 #include <desktop/crashreport.hxx>
+#include "strings.hrc"
 
 #ifdef DISABLE_DYNLOADING
 #include <dlfcn.h>
@@ -101,68 +101,6 @@ namespace
     void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap, const css::uno::Reference<css::frame::XFrame>& rFrame);
 }
 
-void VclBuilder::loadTranslations(const LanguageTag &rLanguageTag, const OUString& rUri)
-{
-    /* FIXME-BCP47: support language tags with
-     * LanguageTag::getFallbackStrings() ? */
-    for (int i = rLanguageTag.getCountry().isEmpty() ? 1 : 0; i < 2; ++i)
-    {
-        OUStringBuffer aTransBuf;
-        sal_Int32 nLastSlash = rUri.lastIndexOf('/');
-        if (nLastSlash != -1)
-            aTransBuf.append(rUri.copy(0, nLastSlash));
-        else
-        {
-            aTransBuf.append('.');
-            nLastSlash = 0;
-        }
-        aTransBuf.append("/res/");
-        OUString sLang(rLanguageTag.getLanguage());
-        switch (i)
-        {
-            case 0:
-                sLang = sLang + "-" + rLanguageTag.getCountry();
-                break;
-            default:
-                break;
-        }
-        aTransBuf.append(sLang);
-        aTransBuf.append(".zip");
-        sal_Int32 nEndName = rUri.lastIndexOf('.');
-        if (nEndName == -1)
-            nEndName = rUri.getLength();
-        OUString sZippedFile(rUri.copy(nLastSlash + 1, nEndName - nLastSlash - 1) + "/" + sLang + ".ui");
-        try
-        {
-            css::uno::Reference<css::packages::zip::XZipFileAccess2> xNameAccess =
-                css::packages::zip::ZipFileAccess::createWithURL(
-                        comphelper::getProcessComponentContext(), aTransBuf.makeStringAndClear());
-            if (!xNameAccess.is())
-                continue;
-            css::uno::Reference<css::io::XInputStream> xInputStream(xNameAccess->getByName(sZippedFile), css::uno::UNO_QUERY);
-            if (!xInputStream.is())
-                continue;
-            OStringBuffer sStr;
-            for (;;)
-            {
-                sal_Int32 const size = 2048;
-                css::uno::Sequence< sal_Int8 > data(size);
-                sal_Int32 n = xInputStream->readBytes(data, size);
-                sStr.append(reinterpret_cast<const sal_Char *>(data.getConstArray()), n);
-                if (n < size)
-                    break;
-            }
-
-            xmlreader::XmlReader reader(sStr.getStr(), sStr.getLength());
-            handleTranslations(reader);
-            break;
-        }
-        catch (const css::uno::Exception &)
-        {
-        }
-    }
-}
-
 #if defined SAL_LOG_WARN
 namespace
 {
@@ -183,7 +121,7 @@ namespace
 VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const css::uno::Reference<css::frame::XFrame>& rFrame)
     : m_sID(sID)
     , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
-    , m_pStringReplace(ResMgr::GetReadStringHook())
+    , m_pStringReplace(Translate::GetReadStringHook())
     , m_pParent(pParent)
     , m_bToplevelParentFound(false)
     , m_pParserState(new ParserState)
@@ -201,11 +139,6 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
 
     OUString sUri = sUIDir + sUIFile;
 
-    const LanguageTag& rLanguageTag = Application::GetSettings().GetUILanguageTag();
-    bool bEN_US = (rLanguageTag.getBcp47() == "en-US");
-    if (!bEN_US)
-        loadTranslations(rLanguageTag, sUri);
-
     try
     {
         xmlreader::XmlReader reader(sUri);
@@ -544,55 +477,6 @@ void VclBuilder::disposeBuilder()
     m_pParent.clear();
 }
 
-void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
-{
-    xmlreader::Span name;
-    int nsId;
-
-    OString sID, sProperty;
-
-    while(true)
-    {
-        xmlreader::XmlReader::Result res = reader.nextItem(
-            xmlreader::XmlReader::Text::Raw, &name, &nsId);
-
-        if (res == xmlreader::XmlReader::Result::Begin)
-        {
-            if (name.equals("e"))
-            {
-                while (reader.nextAttribute(&nsId, &name))
-                {
-                    if (name.equals("g"))
-                    {
-                        name = reader.getAttributeValue(false);
-                        sID = OString(name.begin, name.length);
-                        sal_Int32 nDelim = sID.indexOf(':');
-                        if (nDelim != -1)
-                            sID = sID.copy(nDelim);
-                    }
-                    else if (name.equals("i"))
-                    {
-                        name = reader.getAttributeValue(false);
-                        sProperty = OString(name.begin, name.length);
-                    }
-                }
-            }
-        }
-
-        if (res == xmlreader::XmlReader::Result::Text && !sID.isEmpty())
-        {
-            OString sTranslation(name.begin, name.length);
-            m_pParserState->m_aTranslations[sID][sProperty] = sTranslation;
-        }
-
-        if (res == xmlreader::XmlReader::Result::End)
-            sID.clear();
-
-        if (res == xmlreader::XmlReader::Result::Done)
-            break;
-    }
-}
-
 OUString VclBuilder::extractCustomProperty(VclBuilder::stringmap &rMap)
 {
     OUString sCustomProperty;
@@ -2186,6 +2070,19 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader)
             {
                 handlePacking(pCurrentChild, pParent, reader);
             }
+            else if (name.equals("interface"))
+            {
+                while (reader.nextAttribute(&nsId, &name))
+                {
+                    if (name.equals("domain"))
+                    {
+                        name = reader.getAttributeValue(false);
+                        sType = OString(name.begin, name.length);
+                        m_pParserState->m_aResLocale = Translate::Create(sType.getStr(), Application::GetSettings().GetUILanguageTag());
+                    }
+                }
+                ++nLevel;
+            }
             else
                 ++nLevel;
         }
@@ -2275,7 +2172,7 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM
         rMap[sProperty] = OUString::fromUtf8(sValue);
 }
 
-void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex)
+void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 /*nRowIndex*/)
 {
     int nLevel = 1;
 
@@ -2298,8 +2195,8 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
             if (name.equals("col"))
             {
                 bool bTranslated = false;
-                OString sValue;
                 sal_uInt32 nId = 0;
+                OString sContext;
 
                 while (reader.nextAttribute(&nsId, &name))
                 {
@@ -2310,20 +2207,33 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
                     }
                     else if (nId == 0 && name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::number(nRowIndex));
-                        bTranslated = !sValue.isEmpty();
+                        bTranslated = true;
+                    }
+                    else if (name.equals("context"))
+                    {
+                        name = reader.getAttributeValue(false);
+                        sContext = OString(name.begin, name.length);
                     }
                 }
 
                 reader.nextItem(
                     xmlreader::XmlReader::Text::Raw, &name, &nsId);
 
-                if (!bTranslated)
-                    sValue = OString(name.begin, name.length);
+                OString sValue = OString(name.begin, name.length);
+                OUString sFinalValue;
+                if (bTranslated)
+                {
+                    if (!sContext.isEmpty())
+                        sValue = sContext + "\004" + sValue;
+                    sFinalValue = Translate::get(sValue.getStr(), m_pParserState->m_aResLocale);
+                }
+                else
+                    sFinalValue = OUString::fromUtf8(sValue);
+
 
                 if (aRow.size() < nId+1)
                     aRow.resize(nId+1);
-                aRow[nId] = OUString::fromUtf8(sValue);
+                aRow[nId] = sFinalValue;
             }
         }
 
@@ -2420,7 +2330,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
     }
 }
 
-std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const OString & rID)
+std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const OString & /*rID*/)
 {
     int nLevel = 1;
 
@@ -2444,30 +2354,39 @@ std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, cons
             if (name.equals("item"))
             {
                 bool bTranslated = false;
-                OString sValue;
+                OString sContext;
 
                 while (reader.nextAttribute(&nsId, &name))
                 {
                     if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
                     {
-                        sValue = getTranslation(rID, OString::number(nItemIndex));
-                        bTranslated = !sValue.isEmpty();
+                        bTranslated = true;
+                    }
+                    else if (name.equals("context"))
+                    {
+                        name = reader.getAttributeValue(false);
+                        sContext = OString(name.begin, name.length);
                     }
                 }
 
                 reader.nextItem(
                     xmlreader::XmlReader::Text::Raw, &name, &nsId);
 
-                if (!bTranslated)
-                    sValue = OString(name.begin, name.length);
-
-                if (m_pStringReplace)
+                OString sValue = OString(name.begin, name.length);
+                OUString sFinalValue;
+                if (bTranslated)
                 {
-                    OUString sTmp = (*m_pStringReplace)(OStringToOUString(sValue, RTL_TEXTENCODING_UTF8));
-                    sValue = OUStringToOString(sTmp, RTL_TEXTENCODING_UTF8);
+                    if (!sContext.isEmpty())
+                        sValue = sContext + "\004" + sValue;
+                    sFinalValue = Translate::get(sValue.getStr(), m_pParserState->m_aResLocale);
                 }
+                else
+                    sFinalValue = OUString::fromUtf8(sValue);
 
-                aItems.push_back(OUString::fromUtf8(sValue));
+                if (m_pStringReplace)
+                    sFinalValue = (*m_pStringReplace)(sFinalValue);
+
+                aItems.push_back(sFinalValue);
                 ++nItemIndex;
             }
         }
@@ -3184,26 +3103,12 @@ OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader)
     return aRet;
 }
 
-OString VclBuilder::getTranslation(const OString &rID, const OString &rProperty) const
-{
-    Translations::const_iterator aWidgetFind = m_pParserState->m_aTranslations.find(rID);
-    if (aWidgetFind != m_pParserState->m_aTranslations.end())
-    {
-        const WidgetTranslations &rWidgetTranslations = aWidgetFind->second;
-        WidgetTranslations::const_iterator aPropertyFind = rWidgetTranslations.find(rProperty);
-        if (aPropertyFind != rWidgetTranslations.end())
-            return aPropertyFind->second;
-    }
-    return OString();
-}
-
-void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rMap)
+void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString & /*rID*/, stringmap &rMap)
 {
     xmlreader::Span name;
     int nsId;
 
-    OString sProperty;
-    OString sValue;
+    OString sProperty, sContext;
 
     bool bTranslated = false;
 
@@ -3214,30 +3119,35 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
             name = reader.getAttributeValue(false);
             sProperty = OString(name.begin, name.length);
         }
+        else if (name.equals("context"))
+        {
+            name = reader.getAttributeValue(false);
+            sContext = OString(name.begin, name.length);
+        }
         else if (name.equals("translatable") && reader.getAttributeValue(false).equals("yes"))
         {
-            sValue = getTranslation(rID, sProperty);
-            bTranslated = !sValue.isEmpty();
+            bTranslated = true;
         }
-
     }
 
     reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId);
-    if (!bTranslated)
-        sValue = OString(name.begin, name.length);
+    OString sValue = OString(name.begin, name.length);
+    OUString sFinalValue;
+    if (bTranslated)
+    {
+        if (!sContext.isEmpty())
+            sValue = sContext + "\004" + sValue;
+        sFinalValue = Translate::get(sValue.getStr(), m_pParserState->m_aResLocale);
+    }
+    else
+        sFinalValue = OUString::fromUtf8(sValue);
 
     if (!sProperty.isEmpty())
     {
         sProperty = sProperty.replace('_', '-');
         if (m_pStringReplace)
-        {
-            OUString sTmp = (*m_pStringReplace)(OStringToOUString(sValue, RTL_TEXTENCODING_UTF8));
-            rMap[sProperty] = sTmp;
-        }
-        else
-        {
-            rMap[sProperty] = OUString::fromUtf8(sValue);
-        }
+            sFinalValue = (*m_pStringReplace)(sFinalValue);
+        rMap[sProperty] = sFinalValue;
     }
 }
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 212dc4e4d600..af95cdcdd827 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -21,7 +21,7 @@
 #include <vcl/abstdlg.hxx>
 
 #include "svdata.hxx"
-#include <svids.hrc>
+#include <strings.hrc>
 
 VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle)
     : Window(WindowType::CONTAINER)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index ad2c18a9cac0..4d87a2e37421 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -43,7 +43,7 @@
 
 #include <salinst.hxx>
 #include <svdata.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
 #include <window.h>
 #include <salmenu.hxx>
 #include <salframe.hxx>
@@ -2798,21 +2798,17 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R
     sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount();
     if ( !nVisibleEntries )
     {
-        ResMgr* pResMgr = ImplGetResMgr();
-        if( pResMgr )
-        {
-            OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
+        OUString aTmpEntryText(VclResId(SV_RESID_STRING_NOSELECTIONPOSSIBLE));
 
-            MenuItemData* pData = NbcInsertItem(0xFFFF, MenuItemBits::NONE, aTmpEntryText, nullptr, 0xFFFF, OString());
-            size_t nPos = 0;
-            pData = pItemList->GetData( pData->nId, nPos );
-            assert(pData);
-            if (pData)
-            {
-                pData->bIsTemporary = true;
-            }
-            ImplCallEventListeners(VclEventId::MenuSubmenuChanged, nPos);
+        MenuItemData* pData = NbcInsertItem(0xFFFF, MenuItemBits::NONE, aTmpEntryText, nullptr, 0xFFFF, OString());
+        size_t nPos = 0;
+        pData = pItemList->GetData( pData->nId, nPos );
+        assert(pData);
+        if (pData)
+        {
+            pData->bIsTemporary = true;
         }
+        ImplCallEventListeners(VclEventId::MenuSubmenuChanged, nPos);
     }
 
     VclPtrInstance<MenuFloatingWindow> pWin( this, pW, WB_BORDER | WB_SYSTEMWINDOW );
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 9daad8bee15d..58d97a1fba8f 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -28,7 +28,7 @@
 #include <salframe.hxx>
 #include <salmenu.hxx>
 #include <svdata.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <window.h>
 
@@ -125,29 +125,24 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
     SetMBWHideAccel(true);
     SetMBWMenuKey(false);
 
-    ResMgr* pResMgr = ImplGetResMgr();
+    BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC);
+    aCloseBtn->maImage = Image(aBitmap);
 
-    if(pResMgr)
-    {
-        BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC);
-        aCloseBtn->maImage = Image(aBitmap);
-
-        aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT);
-        aCloseBtn->SetBackground();
-        aCloseBtn->SetPaintTransparent(true);
-        aCloseBtn->SetParentClipMode(ParentClipMode::NoClip);
+    aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT);
+    aCloseBtn->SetBackground();
+    aCloseBtn->SetPaintTransparent(true);
+    aCloseBtn->SetParentClipMode(ParentClipMode::NoClip);
 
-        aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage);
-        aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl));
-        aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl));
-        aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr));
+    aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage);
+    aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl));
+    aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl));
+    aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, VclResId(SV_HELPTEXT_CLOSEDOCUMENT));
 
-        aFloatBtn->SetSymbol( SymbolType::FLOAT );
-        aFloatBtn->SetQuickHelpText( ResId(SV_HELPTEXT_RESTORE, *pResMgr) );
+    aFloatBtn->SetSymbol( SymbolType::FLOAT );
+    aFloatBtn->SetQuickHelpText(VclResId(SV_HELPTEXT_RESTORE));
 
-        aHideBtn->SetSymbol( SymbolType::HIDE );
-        aHideBtn->SetQuickHelpText( ResId(SV_HELPTEXT_MINIMIZE, *pResMgr) );
-    }
+    aHideBtn->SetSymbol( SymbolType::HIDE );
+    aHideBtn->SetQuickHelpText(VclResId(SV_HELPTEXT_MINIMIZE));
 
     ImplInitStyleSettings();
 
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 6fc2380b0361..cc344a433bda 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 #include <vcl/image.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/menu.hxx>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 297c06dd0c4e..e2bbde0e7c99 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <brdwin.hxx>
@@ -394,11 +394,7 @@ Image InfoBox::GetStandardImage()
 
 OUString InfoBox::GetStandardText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        return ResId(SV_MSGBOX_INFO, *pResMgr);
-
-    return Application::GetDisplayName();
+    return VclResId(SV_MSGBOX_INFO);
 }
 
 WarningBox::WarningBox( vcl::Window* pParent, WinBits nStyle,
@@ -414,9 +410,7 @@ WarningBox::WarningBox( vcl::Window* pParent, WinBits nStyle,
 
 void WarningBox::SetDefaultCheckBoxText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr);
+    maCheckBoxText = VclResId(SV_STDTEXT_DONTWARNAGAIN);
 }
 
 Image WarningBox::GetStandardImage()
@@ -427,11 +421,7 @@ Image WarningBox::GetStandardImage()
 
 OUString WarningBox::GetStandardText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        return ResId(SV_MSGBOX_WARNING, *pResMgr);
-
-    return Application::GetDisplayName();
+    return VclResId(SV_MSGBOX_WARNING);
 }
 
 ErrorBox::ErrorBox( vcl::Window* pParent, const OUString& rMessage ) :
@@ -472,11 +462,7 @@ Image ErrorBox::GetStandardImage()
 
 OUString ErrorBox::GetStandardText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        return ResId(SV_MSGBOX_ERROR, *pResMgr);
-
-    return Application::GetDisplayName();
+    return VclResId(SV_MSGBOX_ERROR);
 }
 
 QueryBox::QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) :
@@ -491,9 +477,7 @@ QueryBox::QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessa
 
 void QueryBox::SetDefaultCheckBoxText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr);
+    maCheckBoxText = VclResId(SV_STDTEXT_DONTASKAGAIN);
 }
 
 Image QueryBox::GetStandardImage()
@@ -504,11 +488,7 @@ Image QueryBox::GetStandardImage()
 
 OUString QueryBox::GetStandardText()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( pResMgr )
-        return ResId(SV_MSGBOX_QUERY, *pResMgr);
-
-    return Application::GetDisplayName();
+    return VclResId(SV_MSGBOX_QUERY);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c8c340343453..6c1d48550e92 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -19,7 +19,7 @@
 
 #include "printdlg.hxx"
 #include "svdata.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 #include <vcl/print.hxx>
@@ -1464,6 +1464,9 @@ void PrintDialog::updateNupFromPages()
     updateNup();
 }
 
+#define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT           1
+#define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE          2
+
 void PrintDialog::updateNup()
 {
     int nRows         = int(maNUpPage.mpNupRowsEdt->GetValue());
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 04ac25328c07..f90e22b79d9e 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -20,7 +20,7 @@
 #include <limits.h>
 #include <tools/time.hxx>
 
-#include <svids.hrc>
+#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <scrwnd.hxx>
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 18c82e76b782..4314a48d53b6 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include <tools/debug.hxx>
-#include <tools/rcid.h>
 
 #include <vcl/event.hxx>
 #include <vcl/wall.hxx>
@@ -31,10 +30,10 @@
 #include <vcl/splitwin.hxx>
 #include <vcl/settings.hxx>
 
-#include <rsc/rsc-vcl-shared-types.hxx>
+#include <vcl/vclenum.hxx>
 
 #include <svdata.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
 
 
 #define SPLITWIN_SPLITSIZE              4
@@ -2325,20 +2324,20 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
     {
         Point       aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
         tools::Rectangle   aHelpRect;
-        sal_uInt16      nHelpResId = 0;
+        const char* pHelpResId = nullptr;
 
         ImplGetFadeInRect( aHelpRect, true );
         if ( aHelpRect.IsInside( aMousePosPixel ) )
-            nHelpResId = SV_HELPTEXT_FADEIN;
+            pHelpResId = SV_HELPTEXT_FADEIN;
         else
         {
             ImplGetFadeOutRect( aHelpRect );
             if ( aHelpRect.IsInside( aMousePosPixel ) )
-                nHelpResId = SV_HELPTEXT_FADEOUT;
+                pHelpResId = SV_HELPTEXT_FADEOUT;
         }
 
         // get rectangle
-        if ( nHelpResId )
+        if (pHelpResId)
         {
             Point aPt = OutputToScreenPixel( aHelpRect.TopLeft() );
             aHelpRect.Left()   = aPt.X();
@@ -2348,10 +2347,7 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
             aHelpRect.Bottom() = aPt.Y();
 
             // get and draw text
-            OUString aStr;
-            ResMgr* pResMgr = ImplGetResMgr();
-            if( pResMgr )
-                aStr = ResId( nHelpResId, *pResMgr );
+            OUString aStr = VclResId(pHelpResId);
             if ( rHEvt.GetMode() & HelpEventMode::BALLOON )
                 Help::ShowBalloon( this, aHelpRect.Center(), aHelpRect, aStr );
             else
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index a11f8d78b826..d6825cf2b26c 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rcid.h>
-
 #include <vcl/dockwin.hxx>
 #include <vcl/taskpanelist.hxx>
 
diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui b/vcl/uiconfig/ui/cupspassworddialog.ui
index 3e047a30bb39..f4fb757209bb 100644
--- a/vcl/uiconfig/ui/cupspassworddialog.ui
+++ b/vcl/uiconfig/ui/cupspassworddialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="CUPSPasswordDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Authentication Request</property>
+    <property name="title" translatable="yes" context="cupspassworddialog|CUPSPasswordDialog">Authentication Request</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -67,7 +67,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_User:</property>
+                <property name="label" translatable="yes" context="cupspassworddialog|label1">_User:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">user</property>
               </object>
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Password:</property>
+                <property name="label" translatable="yes" context="cupspassworddialog|label2">_Password:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">pass</property>
               </object>
@@ -95,7 +95,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Please enter your authentication data for server “%s”</property>
+                <property name="label" translatable="yes" context="cupspassworddialog|text">Please enter your authentication data for server “%s”</property>
                 <property name="use_underline">True</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">56</property>
diff --git a/vcl/uiconfig/ui/editmenu.ui b/vcl/uiconfig/ui/editmenu.ui
index 9798605c8491..288a672555b2 100644
--- a/vcl/uiconfig/ui/editmenu.ui
+++ b/vcl/uiconfig/ui/editmenu.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkMenu" id="menu">
     <property name="visible">True</property>
@@ -9,7 +9,7 @@
       <object class="GtkMenuItem" id="undo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Undo</property>
+        <property name="label" translatable="yes" context="editmenu|undo">_Undo</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -23,7 +23,7 @@
       <object class="GtkMenuItem" id="cut">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Cu_t</property>
+        <property name="label" translatable="yes" context="editmenu|cut">Cu_t</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -31,7 +31,7 @@
       <object class="GtkMenuItem" id="copy">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Copy</property>
+        <property name="label" translatable="yes" context="editmenu|copy">_Copy</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -39,7 +39,7 @@
       <object class="GtkMenuItem" id="paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Paste</property>
+        <property name="label" translatable="yes" context="editmenu|paste">_Paste</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -47,7 +47,7 @@
       <object class="GtkMenuItem" id="delete">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Delete</property>
+        <property name="label" translatable="yes" context="editmenu|delete">_Delete</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -61,7 +61,7 @@
       <object class="GtkMenuItem" id="selectall">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Select _All</property>
+        <property name="label" translatable="yes" context="editmenu|selectall">Select _All</property>
         <property name="use_underline">True</property>
         <accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
       </object>
@@ -70,7 +70,7 @@
       <object class="GtkMenuItem" id="specialchar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Special Character...</property>
+        <property name="label" translatable="yes" context="editmenu|specialchar">_Special Character...</property>
         <property name="use_underline">True</property>
         <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
       </object>
diff --git a/vcl/uiconfig/ui/errornocontentdialog.ui b/vcl/uiconfig/ui/errornocontentdialog.ui
index abe2be57400b..9dca59ed8f19 100644
--- a/vcl/uiconfig/ui/errornocontentdialog.ui
+++ b/vcl/uiconfig/ui/errornocontentdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="ErrorNoContentDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME</property>
+    <property name="title" translatable="yes" context="errornocontentdialog|ErrorNoContentDialog">%PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">There are no pages to be printed.</property>
-    <property name="secondary_text" translatable="yes">Please check your document for ranges relevant to printing.</property>
+    <property name="text" translatable="yes" context="errornocontentdialog|ErrorNoContentDialog">There are no pages to be printed.</property>
+    <property name="secondary_text" translatable="yes" context="errornocontentdialog|ErrorNoContentDialog">Please check your document for ranges relevant to printing.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/vcl/uiconfig/ui/errornoprinterdialog.ui b/vcl/uiconfig/ui/errornoprinterdialog.ui
index 207f62331b6a..9032b011bccf 100644
--- a/vcl/uiconfig/ui/errornoprinterdialog.ui
+++ b/vcl/uiconfig/ui/errornoprinterdialog.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="ErrorNoPrinterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME</property>
+    <property name="title" translatable="yes" context="errornoprinterdialog|ErrorNoPrinterDialog">%PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes">No default printer found.</property>
-    <property name="secondary_text" translatable="yes">Please choose a printer and try again.</property>
+    <property name="text" translatable="yes" context="errornoprinterdialog|ErrorNoPrinterDialog">No default printer found.</property>
+    <property name="secondary_text" translatable="yes" context="errornoprinterdialog|ErrorNoPrinterDialog">Please choose a printer and try again.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 50a86b55b658..3f216832c057 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
-<interface>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -43,31 +43,31 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">1</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">1</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">2</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">2</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">4</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">4</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">6</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">6</col>
         <col id="1">6</col>
       </row>
       <row>
-        <col id="0" translatable="yes">9</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">9</col>
         <col id="1">9</col>
       </row>
       <row>
-        <col id="0" translatable="yes">16</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">16</col>
         <col id="1">16</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Custom</col>
+        <col id="0" translatable="yes" context="printdialog|liststore1">Custom</col>
         <col id="1">65535</col>
       </row>
     </data>
@@ -79,16 +79,16 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">left to right, then down</col>
+        <col id="0" translatable="yes" context="printdialog|liststore2">left to right, then down</col>
       </row>
       <row>
-        <col id="0" translatable="yes">top to bottom, then right</col>
+        <col id="0" translatable="yes" context="printdialog|liststore2">top to bottom, then right</col>
       </row>
       <row>
-        <col id="0" translatable="yes">top to bottom, then left</col>
+        <col id="0" translatable="yes" context="printdialog|liststore2">top to bottom, then left</col>
       </row>
       <row>
-        <col id="0" translatable="yes">right to left, then down</col>
+        <col id="0" translatable="yes" context="printdialog|liststore2">right to left, then down</col>
       </row>
     </data>
   </object>
@@ -99,20 +99,20 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Automatic</col>
+        <col id="0" translatable="yes" context="printdialog|liststore3">Automatic</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Portrait</col>
+        <col id="0" translatable="yes" context="printdialog|liststore3">Portrait</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Landscape</col>
+        <col id="0" translatable="yes" context="printdialog|liststore3">Landscape</col>
       </row>
     </data>
   </object>
   <object class="GtkDialog" id="PrintDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Print</property>
+    <property name="title" translatable="yes" context="printdialog|PrintDialog">Print</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -230,7 +230,7 @@
                       <object class="GtkLabel" id="totalnumpages">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">/ %n</property>
+                        <property name="label" translatable="yes" context="printdialog|totalnumpages">/ %n</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -329,8 +329,8 @@
                                           <object class="GtkLabel" id="label7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|label7">Status:</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Status:</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -341,8 +341,8 @@
                                           <object class="GtkLabel" id="label8">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|label8">Location:</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Location:</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -353,8 +353,8 @@
                                           <object class="GtkLabel" id="label9">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|label9">Comment:</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Comment:</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -365,8 +365,8 @@
                                           <object class="GtkLabel" id="status">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|status">Default printer</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Default printer</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -377,8 +377,8 @@
                                           <object class="GtkLabel" id="location">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|location">Place</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Place</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -389,8 +389,8 @@
                                           <object class="GtkLabel" id="comment">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes" context="printdialog|comment">Long printer name</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Long printer name</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
@@ -403,7 +403,7 @@
                                       <object class="GtkLabel" id="label6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Details</property>
+                                        <property name="label" translatable="yes" context="printdialog|label6">Details</property>
                                       </object>
                                     </child>
                                   </object>
@@ -414,7 +414,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="setup">
-                                    <property name="label" translatable="yes">Properties...</property>
+                                    <property name="label" translatable="yes" context="printdialog|setup">Properties...</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -450,7 +450,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Printer</property>
+                            <property name="label" translatable="yes" context="printdialog|label5">Printer</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -490,7 +490,7 @@
                                       <object class="GtkLabel" id="label14">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Number of copies</property>
+                                        <property name="label" translatable="yes" context="printdialog|label14">Number of copies</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">copycount</property>
                                       </object>
@@ -528,7 +528,7 @@
                                     <property name="spacing">12</property>
                                     <child>
                                       <object class="GtkCheckButton" id="collate">
-                                        <property name="label" translatable="yes">Collate</property>
+                                        <property name="label" translatable="yes" context="printdialog|collate">Collate</property>
                                         <property name="visible">True</property>
                                         <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
@@ -585,7 +585,7 @@
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkRadioButton" id="printallsheets">
-                                        <property name="label" translatable="yes">All sheets</property>
+                                        <property name="label" translatable="yes" context="printdialog|printallsheets">All sheets</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -602,7 +602,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="printselectedsheets">
-                                        <property name="label" translatable="yes">Selected sheets</property>
+                                        <property name="label" translatable="yes" context="printdialog|printselectedsheets">Selected sheets</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -618,7 +618,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="printselectedcells">
-                                        <property name="label" translatable="yes">Selected cells</property>
+                                        <property name="label" translatable="yes" context="printdialog|printselectedcells">Selected cells</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -643,8 +643,8 @@
                                   <object class="GtkLabel" id="fromwhich">
                                     <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
+                                    <property name="label" translatable="yes" context="printdialog|fromwhich">From which print</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">From which print</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -661,7 +661,7 @@
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkRadioButton" id="printallpages">
-                                        <property name="label" translatable="yes">All pages</property>
+                                        <property name="label" translatable="yes" context="printdialog|printallpages">All pages</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -682,7 +682,7 @@
                                         <property name="spacing">12</property>
                                         <child>
                                           <object class="GtkRadioButton" id="printpages">
-                                            <property name="label" translatable="yes">Pages</property>
+                                            <property name="label" translatable="yes" context="printdialog|printpages">Pages</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="no_show_all">True</property>
@@ -717,7 +717,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="printselection">
-                                        <property name="label" translatable="yes">Selection</property>
+                                        <property name="label" translatable="yes" context="printdialog|printselection">Selection</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="no_show_all">True</property>
@@ -733,7 +733,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reverseorder">
-                                        <property name="label" translatable="yes">Print in reverse page order</property>
+                                        <property name="label" translatable="yes" context="printdialog|reverseorder">Print in reverse page order</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -765,7 +765,7 @@
                           <object class="GtkLabel" id="label13">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Range and Copies</property>
+                            <property name="label" translatable="yes" context="printdialog|label13">Range and Copies</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -798,7 +798,7 @@
                                   <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Comments</property>
+                                    <property name="label" translatable="yes" context="printdialog|label16">Comments</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">writercomments</property>
                                   </object>
@@ -827,7 +827,7 @@
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Print</property>
+                            <property name="label" translatable="yes" context="printdialog|label15">Print</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -866,7 +866,7 @@
                                       <object class="GtkLabel" id="label10">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Document</property>
+                                        <property name="label" translatable="yes" context="printdialog|label10">Document</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">impressdocument</property>
                                       </object>
@@ -903,7 +903,7 @@
                                       <object class="GtkLabel" id="label12">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Slides per page</property>
+                                        <property name="label" translatable="yes" context="printdialog|label12">Slides per page</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">slidesperpage</property>
                                       </object>
@@ -928,7 +928,7 @@
                                       <object class="GtkLabel" id="label19">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Order</property>
+                                        <property name="label" translatable="yes" context="printdialog|label19">Order</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">slidesperpageorder</property>
                                       </object>
@@ -964,7 +964,7 @@
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Print</property>
+                            <property name="label" translatable="yes" context="printdialog|label11">Print</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -982,7 +982,7 @@
                 <child type="tab">
                   <object class="GtkLabel" id="label1">
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">General</property>
+                    <property name="label" translatable="yes" context="printdialog|label1">General</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -1006,7 +1006,7 @@
                   <object class="GtkLabel" id="customlabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">custom</property>
+                    <property name="label" translatable="yes" context="printdialog|customlabel">custom</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -1056,7 +1056,7 @@
                                     <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkRadioButton" id="pagespersheetbtn">
-                                        <property name="label" translatable="yes">Pages per sheet</property>
+                                        <property name="label" translatable="yes" context="printdialog|pagespersheetbtn">Pages per sheet</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
@@ -1089,7 +1089,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="brochure">
-                                    <property name="label" translatable="yes">Brochure</property>
+                                    <property name="label" translatable="yes" context="printdialog|brochure">Brochure</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1109,7 +1109,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="margin_left">12</property>
-                                    <property name="label" translatable="yes">Pages</property>
+                                    <property name="label" translatable="yes" context="printdialog|pagestxt">Pages</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">pagecols</property>
                                   </object>
@@ -1124,7 +1124,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="margin_left">12</property>
-                                    <property name="label" translatable="yes">Margin</property>
+                                    <property name="label" translatable="yes" context="printdialog|sheetmargintxt1">Margin</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">sheetmarginsb:0mm</property>
                                   </object>
@@ -1139,7 +1139,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="margin_left">12</property>
-                                    <property name="label" translatable="yes">Orientation</property>
+                                    <property name="label" translatable="yes" context="printdialog|orientationtxt">Orientation</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">orientationlb</property>
                                   </object>
@@ -1154,7 +1154,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="margin_left">12</property>
-                                    <property name="label" translatable="yes">Distance</property>
+                                    <property name="label" translatable="yes" context="printdialog|pagemargintxt1">Distance</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">pagemarginsb:0mm</property>
                                   </object>
@@ -1241,7 +1241,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">by</property>
+                                    <property name="label" translatable="yes" context="printdialog|by">by</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">pagerows</property>
                                   </object>
@@ -1255,7 +1255,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">between pages</property>
+                                    <property name="label" translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -1268,7 +1268,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
-                                    <property name="label" translatable="yes">to sheet border</property>
+                                    <property name="label" translatable="yes" context="printdialog|sheetmargintxt2">to sheet border</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -1278,7 +1278,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="bordercb">
-                                    <property name="label" translatable="yes">Draw a border around each page</property>
+                                    <property name="label" translatable="yes" context="printdialog|bordercb">Draw a border around each page</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -1299,7 +1299,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
                                     <property name="margin_left">12</property>
-                                    <property name="label" translatable="yes">Order</property>
+                                    <property name="label" translatable="yes" context="printdialog|ordertxt">Order</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">orderlb</property>
                                   </object>
@@ -1338,7 +1338,7 @@
                           <object class="GtkLabel" id="label18">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Layout</property>
+                            <property name="label" translatable="yes" context="printdialog|label18">Layout</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -1372,7 +1372,7 @@
                                   <object class="GtkLabel" id="label17">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Include</property>
+                                    <property name="label" translatable="yes" context="printdialog|label17">Include</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">brochureinclude</property>
                                   </object>
@@ -1401,7 +1401,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Page Sides</property>
+                            <property name="label" translatable="yes" context="printdialog|label3">Page Sides</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -1423,7 +1423,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Page Layout</property>
+                    <property name="label" translatable="yes" context="printdialog|label2">Page Layout</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
@@ -1450,7 +1450,7 @@
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="singleprintjob">
-                                <property name="label" translatable="yes">Create single print jobs for collated output</property>
+                                <property name="label" translatable="yes" context="printdialog|singleprintjob">Create single print jobs for collated output</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -1464,7 +1464,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="printpaperfromsetup">
-                                <property name="label" translatable="yes">Use only paper tray from printer preferences</property>
+                                <property name="label" translatable="yes" context="printdialog|printpaperfromsetup">Use only paper tray from printer preferences</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="xalign">0</property>
@@ -1477,7 +1477,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="papersizefromsetup">
-                                <property name="label" translatable="yes">Use only paper size from printer preferences</property>
+                                <property name="label" translatable="yes" context="printdialog|papersizefromsetup">Use only paper size from printer preferences</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -1498,7 +1498,7 @@
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Options</property>
+                        <property name="label" translatable="yes" context="printdialog|label21">Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1513,7 +1513,7 @@
                   <object class="GtkLabel" id="label20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Options</property>
+                    <property name="label" translatable="yes" context="printdialog|label20">Options</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
diff --git a/vcl/uiconfig/ui/printerdevicepage.ui b/vcl/uiconfig/ui/printerdevicepage.ui
index 0670414c6958..5cc0732ec026 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -11,27 +11,27 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Automatic : %s</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">Automatic : %s</col>
         <col id="1">0</col>
       </row>
       <row>
-        <col id="0" translatable="yes">PostScript (Level from driver)</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">PostScript (Level from driver)</col>
         <col id="1">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">PostScript Level 1</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 1</col>
         <col id="1">2</col>
       </row>
       <row>
-        <col id="0" translatable="yes">PostScript Level 2</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 2</col>
         <col id="1">3</col>
       </row>
       <row>
-        <col id="0" translatable="yes">PostScript Level 3</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">PostScript Level 3</col>
         <col id="1">4</col>
       </row>
       <row>
-        <col id="0" translatable="yes">PDF</col>
+        <col id="0" translatable="yes" context="printerdevicepage|liststore1">PDF</col>
         <col id="1">10</col>
       </row>
     </data>
@@ -50,7 +50,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">_Option:</property>
+        <property name="label" translatable="yes" context="printerdevicepage|label7">_Option:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">options:border</property>
       </object>
@@ -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">Current _value:</property>
+        <property name="label" translatable="yes" context="printerdevicepage|label8">Current _value:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">values:border</property>
       </object>
@@ -137,7 +137,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Color _depth:</property>
+            <property name="label" translatable="yes" context="printerdevicepage|label11">Color _depth:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">colordepth</property>
           </object>
@@ -151,7 +151,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Co_lor:</property>
+            <property name="label" translatable="yes" context="printerdevicepage|label10">Co_lor:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">colorspace</property>
           </object>
@@ -165,7 +165,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Printer language _type:</property>
+            <property name="label" translatable="yes" context="printerdevicepage|label9">Printer language _type:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">level</property>
           </object>
@@ -191,9 +191,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">From driver</item>
-              <item translatable="yes">Color</item>
-              <item translatable="yes">Grayscale</item>
+              <item translatable="yes" context="printerdevicepage|colorspace">From driver</item>
+              <item translatable="yes" context="printerdevicepage|colorspace">Color</item>
+              <item translatable="yes" context="printerdevicepage|colorspace">Grayscale</item>
             </items>
           </object>
           <packing>
@@ -206,8 +206,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <items>
-              <item translatable="yes">8 Bit</item>
-              <item translatable="yes">24 Bit</item>
+              <item translatable="yes" context="printerdevicepage|colordepth">8 Bit</item>
+              <item translatable="yes" context="printerdevicepage|colordepth">24 Bit</item>
             </items>
           </object>
           <packing>
diff --git a/vcl/uiconfig/ui/printerpaperpage.ui b/vcl/uiconfig/ui/printerpaperpage.ui
index dc6b044b006b..90d72859708d 100644
--- a/vcl/uiconfig/ui/printerpaperpage.ui
+++ b/vcl/uiconfig/ui/printerpaperpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="PrinterPaperPage">
     <property name="visible">True</property>
@@ -17,7 +17,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Paper size:</property>
+        <property name="label" translatable="yes" context="printerpaperpage|paperft">_Paper size:</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
@@ -30,7 +30,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Orientation:</property>
+        <property name="label" translatable="yes" context="printerpaperpage|label4">_Orientation:</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
@@ -43,7 +43,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">_Duplex:</property>
+        <property name="label" translatable="yes" context="printerpaperpage|duplexft">_Duplex:</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
@@ -56,7 +56,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">1</property>
-        <property name="label" translatable="yes">Paper tray:</property>
+        <property name="label" translatable="yes" context="printerpaperpage|slotft">Paper tray:</property>
         <property name="use_underline">True</property>
       </object>
       <packing>
@@ -79,8 +79,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <items>
-          <item translatable="yes">Portrait</item>
-          <item translatable="yes">Landscape</item>
+          <item translatable="yes" context="printerpaperpage|orientlb">Portrait</item>
+          <item translatable="yes" context="printerpaperpage|orientlb">Landscape</item>
         </items>
       </object>
       <packing>
diff --git a/vcl/uiconfig/ui/printerpropertiesdialog.ui b/vcl/uiconfig/ui/printerpropertiesdialog.ui
index bae99ac01813..a75e06278cb1 100644
--- a/vcl/uiconfig/ui/printerpropertiesdialog.ui
+++ b/vcl/uiconfig/ui/printerpropertiesdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PrinterPropertiesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Properties of %s</property>
+    <property name="title" translatable="yes" context="printerpropertiesdialog|PrinterPropertiesDialog">Properties of %s</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -68,7 +68,7 @@
               <object class="GtkLabel" id="paper">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Paper</property>
+                <property name="label" translatable="yes" context="printerpropertiesdialog|paper">Paper</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -82,7 +82,7 @@
               <object class="GtkLabel" id="device">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Device</property>
+                <property name="label" translatable="yes" context="printerpropertiesdialog|device">Device</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/vcl/uiconfig/ui/printprogressdialog.ui b/vcl/uiconfig/ui/printprogressdialog.ui
index 4f60fefdb689..3490b3a2c969 100644
--- a/vcl/uiconfig/ui/printprogressdialog.ui
+++ b/vcl/uiconfig/ui/printprogressdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="PrintProgressDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Printing</property>
+    <property name="title" translatable="yes" context="printprogressdialog|PrintProgressDialog">Printing</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -51,7 +51,7 @@
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page %p of %n</property>
+                <property name="label" translatable="yes" context="printprogressdialog|label">Page %p of %n</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/vcl/uiconfig/ui/querydialog.ui b/vcl/uiconfig/ui/querydialog.ui
index b86de6511972..a6e294002a83 100644
--- a/vcl/uiconfig/ui/querydialog.ui
+++ b/vcl/uiconfig/ui/querydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="vcl">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="QueryDialog">
     <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="querydialog|QueryDialog">New Data Type</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 40a12e5e6aa1..d400e1d8178b 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -47,7 +47,7 @@
 #include <vcl/pdfwriter.hxx>
 #include "printerinfomanager.hxx"
 #include <vcl/settings.hxx>
-#include "svids.hrc"
+#include "strings.hrc"
 #include "saldatabasic.hxx"
 #include "unx/genprn.h"
 #include "unx/geninst.h"
diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx
index 02684af1e765..4d24260e8fbd 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -19,7 +19,7 @@
 
 #include "prtsetup.hxx"
 #include "svdata.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 8140019c7e27..e176045ddba2 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -66,7 +66,7 @@
 #include <com/sun/star/uno/Exception.hpp>
 
 #include "svdata.hxx"
-#include "svids.hrc"
+#include "strings.hrc"
 #include "bitmaps.hlst"
 #include "impbmp.hxx"
 
diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx
index c4da0258b8c6..349247c9235a 100644
--- a/vcl/unx/gtk/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include "svids.hrc"
+#include "strings.hrc"
 #include "svdata.hxx"
 #include "gtk/fpicker/SalGtkPicker.hxx"
 
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 static const struct
 {
     sal_Int32 ctrlId;
-    sal_Int16 resId;
+    const char *resId;
 } CtrlIdToResIdTable[] = {
     { CHECKBOX_AUTOEXTENSION,                   STR_FPICKER_AUTO_EXTENSION },
     { CHECKBOX_PASSWORD,                        STR_FPICKER_PASSWORD },
@@ -57,30 +57,23 @@ static const struct
     { FILE_PICKER_FILE_TYPE,                    STR_FPICKER_TYPE }
 };
 
-static sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
+static const char* CtrlIdToResId( sal_Int32 aControlId )
 {
     for (auto & i : CtrlIdToResIdTable)
     {
         if ( i.ctrlId == aControlId )
             return i.resId;
     }
-    return -1;
+    return nullptr;
 }
 
 OUString SalGtkPicker::getResString( sal_Int32 aId )
 {
     OUString aResString;
-    try
-    {
-        // translate the control id to a resource id
-        sal_Int16 aResId = CtrlIdToResId( aId );
-        if ( aResId > -1 )
-            aResString = ResId(aResId, *ImplGetResMgr());
-    }
-    catch(...)
-    {
-    }
-
+    // translate the control id to a resource id
+    const char *pResId = CtrlIdToResId( aId );
+    if (pResId)
+        aResString = VclResId(pResId);
     return aResString.replace('~', '_');
 }
 
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 0e2e572de0f3..e64f68266d01 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -56,7 +56,8 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <impbmp.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include <sal/macros.h>
 
 #include <basegfx/range/b2ibox.hxx>
@@ -633,15 +634,14 @@ gboolean ensure_dbus_setup( gpointer data )
             gdk_x11_window_set_utf8_property( gdkWindow, "_GTK_APP_MENU_OBJECT_PATH", "/org/libreoffice/menus/appmenu" );
 
         //app menu, to-do translations, block normal menus when active, honor use appmenu settings
-        ResMgr* pMgr = ImplGetResMgr();
-        if( pMgr && !bDesktopIsUnity )
+        if (!bDesktopIsUnity )
         {
             GMenu *menu = g_menu_new ();
             GMenuItem* item;
 
             GMenu *firstsubmenu = g_menu_new ();
 
-            OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr),
+            OString sNew(OUStringToOString(VclResId(SV_BUTTONTEXT_NEW),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sNew.getStr(), "app.New");
@@ -653,7 +653,7 @@ gboolean ensure_dbus_setup( gpointer data )
 
             GMenu *secondsubmenu = g_menu_new ();
 
-            OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr),
+            OString sPreferences(OUStringToOString(VclResId(SV_STDTEXT_PREFERENCES),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sPreferences.getStr(), "app.OptionsTreeDialog");
@@ -665,21 +665,21 @@ gboolean ensure_dbus_setup( gpointer data )
 
             GMenu *thirdsubmenu = g_menu_new ();
 
-            OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr),
+            OString sHelp(OUStringToOString(VclResId(SV_BUTTONTEXT_HELP),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sHelp.getStr(), "app.HelpIndex");
             g_menu_append_item( thirdsubmenu, item );
             g_object_unref(item);
 
-            OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr),
+            OString sAbout(OUStringToOString(VclResId(SV_STDTEXT_ABOUT),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sAbout.getStr(), "app.About");
             g_menu_append_item( thirdsubmenu, item );
             g_object_unref(item);
 
-            OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr),
+            OString sQuit(OUStringToOString(VclResId(SV_MENU_MAC_QUITAPP),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sQuit.getStr(), "app.Quit");
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 716be616af0b..6f16984ba6d0 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -23,7 +23,7 @@
 
 #include <sal/log.hxx>
 #include <window.h>
-#include <svids.hrc>
+#include <strings.hrc>
 
 static bool bUnityMode = false;
 
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5b746b623aaa..a329001fe471 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -64,7 +64,8 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <impbmp.hxx>
-#include <svids.hrc>
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include <sal/macros.h>
 
 #include <basegfx/range/b2ibox.hxx>
@@ -656,15 +657,14 @@ gboolean ensure_dbus_setup( gpointer data )
         pSalFrame->m_nHudAwarenessId = hud_awareness_register( pSessionBus, aDBusMenubarPath, hud_activated, pSalFrame, nullptr, nullptr );
 
         //app menu, to-do translations, block normal menus when active, honor use appmenu settings
-        ResMgr* pMgr = ImplGetResMgr();
-        if( pMgr && !bDesktopIsUnity )
+        if (!bDesktopIsUnity)
         {
             GMenu *menu = g_menu_new ();
             GMenuItem* item;
 
             GMenu *firstsubmenu = g_menu_new ();
 
-            OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr),
+            OString sNew(OUStringToOString(VclResId(SV_BUTTONTEXT_NEW),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sNew.getStr(), "app.New");
@@ -676,7 +676,7 @@ gboolean ensure_dbus_setup( gpointer data )
 
             GMenu *secondsubmenu = g_menu_new ();
 
-            OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr),
+            OString sPreferences(OUStringToOString(VclResId(SV_STDTEXT_PREFERENCES),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sPreferences.getStr(), "app.OptionsTreeDialog");
@@ -688,21 +688,21 @@ gboolean ensure_dbus_setup( gpointer data )
 
             GMenu *thirdsubmenu = g_menu_new ();
 
-            OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr),
+            OString sHelp(OUStringToOString(VclResId(SV_BUTTONTEXT_HELP),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sHelp.getStr(), "app.HelpIndex");
             g_menu_append_item( thirdsubmenu, item );
             g_object_unref(item);
 
-            OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr),
+            OString sAbout(OUStringToOString(VclResId(SV_STDTEXT_ABOUT),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sAbout.getStr(), "app.About");
             g_menu_append_item( thirdsubmenu, item );
             g_object_unref(item);
 
-            OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr),
+            OString sQuit(OUStringToOString(VclResId(SV_MENU_MAC_QUITAPP),
                 RTL_TEXTENCODING_UTF8).replaceFirst("~", "_"));
 
             item = g_menu_item_new(sQuit.getStr(), "app.Quit");
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 9d719bebe032..c43e559147bd 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <vcl/fpicker.hrc>
+#include <fpicker/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/syswin.hxx>
@@ -58,7 +58,7 @@
 
 #include "unx/geninst.h"
 
-#include "svids.hrc"
+#include "strings.hrc"
 
 // The dialog should check whether LO also supports the protocol
 // provided by KIO, and KFileWidget::dirOperator() is only 4.3+ .
@@ -508,20 +508,14 @@ OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
     return toOUString(label);
 }
 
-QString KDE4FilePicker::getResString( sal_Int16 aRedId )
+QString KDE4FilePicker::getResString(const char *pResId)
 {
     QString aResString;
 
-    if( aRedId < 0 )
+    if (pResId == nullptr)
         return aResString;
 
-    try
-    {
-        aResString = toQString(ResId(aRedId, *ImplGetResMgr()));
-    }
-    catch(...)
-    {
-    }
+    aResString = toQString(VclResId(pResId));
 
     return aResString.replace('~', '&');
 }
@@ -529,7 +523,7 @@ QString KDE4FilePicker::getResString( sal_Int16 aRedId )
 void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
 {
     QWidget* widget = nullptr;
-    sal_Int32 resId = -1;
+    const char* resId = nullptr;
 
     switch (controlId)
     {
@@ -723,7 +717,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 
     _dialog->setOperationMode( operationMode );
 
-    sal_Int16 resId = -1;
+    const char *resId = nullptr;
     switch (_dialog->operationMode())
     {
     case KFileDialog::Opening:
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 96d94a9868e2..fb714a50b704 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -243,7 +243,7 @@ private:
     //add a custom control widget to the file dialog
     void addCustomControl(sal_Int16 controlId);
 
-    static QString getResString( sal_Int16 aRedId );
+    static QString getResString(const char* pRedId);
 
 private Q_SLOTS:
     void cleanupProxy();
diff --git a/vcl/win/window/keynames.cxx b/vcl/win/window/keynames.cxx
index 89cbe02f581f..c6c41001c07e 100644
--- a/vcl/win/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
@@ -26,7 +26,7 @@
 #include <windows.h>
 
 // Use unique ;) names to avoid clashes with the KEY_* (especially
-// KEY_SHIFT) from <rsc/rsc-vcl-shared-types.hxx>
+// KEY_SHIFT) from <vcl/vclenum.hxx>
 
 #define PAPUGA_KEY_ESC         0x10000
 #define PAPUGA_KEY_BACK        0xE0000
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
index 8ee963919832..1eb14246294c 100644
--- a/winaccessibility/Library_winaccessibility.mk
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,winaccessibility,\
 	winaccessibility/source/service/AccTreeEventListener \
 	winaccessibility/source/service/AccTopWindowListener \
 	winaccessibility/source/service/msaaservice_impl \
-	winaccessibility/source/service/AccResource \
 ))
 
 $(eval $(call gb_Library_use_externals,winaccessibility,\
diff --git a/winaccessibility/inc/AccResource.hxx b/winaccessibility/inc/AccResource.hxx
deleted file mode 100644
index 1eade13f70c9..000000000000
--- a/winaccessibility/inc/AccResource.hxx
+++ /dev/null
@@ -1,66 +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_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
-#define INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
-
-#include <rtl/ustring.hxx>
-
-class SimpleResMgr;
-
-#define ACC_RES_STRING(id) ResourceManager::loadString(id)
-
-
-//= ResourceManager
-//= handling resources within the FormLayer library
-
-class ResourceManager
-{
-    static SimpleResMgr*    m_pImpl;
-
-private:
-    // no instantiation allowed
-    ResourceManager()
-    { }
-    ~ResourceManager()
-    { }
-
-    // we'll instantiate one static member of the following class, which, in its dtor,
-    // ensures that m_pImpl will be deleted
-    class EnsureDelete
-    {
-    public:
-        EnsureDelete()
-        { }
-        ~EnsureDelete();
-    };
-    friend class EnsureDelete;
-
-protected:
-    static void ensureImplExists();
-
-public:
-    /** loads the string with the specified resource id from the FormLayer resource file
-    */
-    static ::rtl::OUString loadString(sal_uInt16 _nResId);
-};
-
-#endif // INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index a80db3bd2d0b..1ac198ea89f4 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -32,7 +32,6 @@
 
 #include "AccObject.hxx"
 #include "AccEventListener.hxx"
-#include "AccResource.hxx"
 
 #if defined __clang__
 #pragma clang diagnostic push
diff --git a/winaccessibility/source/service/AccResource.cxx b/winaccessibility/source/service/AccResource.cxx
deleted file mode 100644
index a7575de38d7c..000000000000
--- a/winaccessibility/source/service/AccResource.cxx
+++ /dev/null
@@ -1,74 +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 "AccResource.hxx"
-
-#include <tools/simplerm.hxx>
-
-// ---- needed as long as we have no contexts for components ---
-#include <vcl/svapp.hxx>
-
-
-//= ResourceManager
-
-SimpleResMgr* ResourceManager::m_pImpl = nullptr;
-
-
-ResourceManager::EnsureDelete::~EnsureDelete()
-{
-    delete ResourceManager::m_pImpl;
-}
-
-
-void ResourceManager::ensureImplExists()
-{
-    //Comment the following code because the acc resource is not necessary now. Can open them if necessary
-    /*
-    if (m_pImpl)
-        return;
-
-    LanguageType nType = Application::GetSettings().GetUILanguage();
-
-    ByteString sFileName("winaccessibility");
-    sFileName += ByteString::CreateFromInt32( (sal_Int32)SOLARUPD );
-
-    m_pImpl = SimpleResMgr::Create(sFileName.GetBuffer(), nType);
-
-    if (m_pImpl)
-    {
-        // no that we have a impl class make sure it's deleted on unloading the library
-        static ResourceManager::EnsureDelete    s_aDeleteTheImplClas;
-    }
-  */
-}
-
-
-::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
-{
-    ::rtl::OUString sReturn;
-
-    ensureImplExists();
-    if (m_pImpl)
-        sReturn = m_pImpl->ReadString(_nResId);
-
-    return sReturn;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wizards/AllLangMoTarget_wiz.mk b/wizards/AllLangMoTarget_wiz.mk
new file mode 100644
index 000000000000..661689da1235
--- /dev/null
+++ b/wizards/AllLangMoTarget_wiz.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,wiz))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,wiz,wizards))
+
+# vim: set noet sw=4 ts=4:
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
deleted file mode 100644
index 0cef370808c5..000000000000
--- a/wizards/AllLangResTarget_dbw.mk
+++ /dev/null
@@ -1,32 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbw))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dbw,\
-	dbw/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbw/res))
-
-$(eval $(call gb_SrsTarget_add_files,dbw/res,\
-	wizards/source/formwizard/dbwizres.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index c7bec56c3e38..ccc8b3c7422a 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,wizards,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,wizards,\
-	AllLangResTarget_dbw \
+	AllLangMoTarget_wiz \
 ))
 
 ifeq ($(ENABLE_JAVA),TRUE)
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index 577fe6e50a80..578555c6c5eb 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Pyuno_Pyuno,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizard
 
 $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\
     __init__.py \
+    common/strings.hrc \
     common/ConfigGroup.py \
     common/ConfigSet.py \
     common/Configuration.py \
@@ -21,7 +22,6 @@ $(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\
     common/NumberFormatter.py \
     common/Properties.py \
     common/PropertyNames.py \
-    common/Resource.py \
     common/SystemDialog.py \
     common/IRenderer.py \
     common/UCB.py \
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index f89afdb9c1d3..991b05f0459d 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -27,7 +27,7 @@ class AgendaWizardDialog(WizardDialog):
         super(AgendaWizardDialog,self).__init__(xmsf, HID )
 
         #Load Resources
-        self.resources = AgendaWizardDialogResources(self.oWizardResource)
+        self.resources = AgendaWizardDialogResources()
 
         #set dialog properties...
         self.setDialogProperties(True, 210, True, 200, 52, 1, 1,
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index f10587a94d3a..b1d53de6b4f6 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -18,209 +18,120 @@
 
 class AgendaWizardDialogResources(object):
 
-    RID_AGENDAWIZARDDIALOG_START = 5000
-    RID_AGENDAWIZARDROADMAP_START = 5049
-    RID_COMMON_START = 500
     SECTION_ITEMS = "AGENDA_ITEMS"
     SECTION_TOPICS = "AGENDA_TOPICS"
     SECTION_MINUTES_ALL = "MINUTES_ALL"
     SECTION_MINUTES = "MINUTES"
 
-    def __init__(self, oWizardResource):
-        self.resAgendaWizardDialog_title = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 1)
-        self.resoptMakeChanges_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 2)
-        self.reslblTemplateName_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 3)
-        self.reslblTemplatePath_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 4)
-        self.reslblProceed_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 5)
-        self.reslblTitle1_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 6)
-        self.reslblTitle3_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 7)
-        self.reslblTitle2_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 8)
-        self.reslblTitle4_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 9)
-        self.reslblTitle5_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 10)
-        self.reslblTitle6_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 11)
-        self.reschkMinutes_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 12)
-        self.reslblHelp1_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 13)
-        self.reslblTime_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 14)
-        self.reslblTitle_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 15)
-        self.reslblLocation_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 16)
-        self.reslblHelp2_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 17)
-        self.resbtnTemplatePath_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 18)
-        self.resoptCreateAgenda_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 19)
-        self.reslblHelp6_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 20)
-        self.reslblTopic_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 21)
-        self.reslblResponsible_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 22)
-        self.reslblDuration_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 23)
-        self.reschkConvenedBy_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 24)
-        self.reschkPresiding_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 25)
-        self.reschkNoteTaker_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 26)
-        self.reschkTimekeeper_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 27)
-        self.reschkAttendees_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 28)
-        self.reschkObservers_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 29)
-        self.reschkResourcePersons_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 30)
-        self.reslblHelp4_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 31)
-        self.reschkMeetingTitle_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 32)
-        self.reschkRead_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 33)
-        self.reschkBring_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 34)
-        self.reschkNotes_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 35)
-        self.reslblHelp3_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 36)
-        self.reslblDate_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 38)
-        self.reslblHelpPg6_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 39)
-        self.reslblPageDesign_value = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 40)
-        self.resDefaultFilename = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 41)
+    def __init__(self):
+        import imp, os
+        imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+        import strings
+
+        self.resAgendaWizardDialog_title = strings.RID_AGENDAWIZARDDIALOG_START_1
+        self.resoptMakeChanges_value = strings.RID_AGENDAWIZARDDIALOG_START_2
+        self.reslblTemplateName_value = strings.RID_AGENDAWIZARDDIALOG_START_3
+        self.reslblTemplatePath_value = strings.RID_AGENDAWIZARDDIALOG_START_4
+        self.reslblProceed_value = strings.RID_AGENDAWIZARDDIALOG_START_5
+        self.reslblTitle1_value = strings.RID_AGENDAWIZARDDIALOG_START_6
+        self.reslblTitle3_value = strings.RID_AGENDAWIZARDDIALOG_START_7
+        self.reslblTitle2_value = strings.RID_AGENDAWIZARDDIALOG_START_8
+        self.reslblTitle4_value = strings.RID_AGENDAWIZARDDIALOG_START_9
+        self.reslblTitle5_value = strings.RID_AGENDAWIZARDDIALOG_START_10
+        self.reslblTitle6_value = strings.RID_AGENDAWIZARDDIALOG_START_11
+        self.reschkMinutes_value = strings.RID_AGENDAWIZARDDIALOG_START_12
+        self.reslblHelp1_value = strings.RID_AGENDAWIZARDDIALOG_START_13
+        self.reslblTime_value = strings.RID_AGENDAWIZARDDIALOG_START_14
+        self.reslblTitle_value = strings.RID_AGENDAWIZARDDIALOG_START_15
+        self.reslblLocation_value = strings.RID_AGENDAWIZARDDIALOG_START_16
+        self.reslblHelp2_value = strings.RID_AGENDAWIZARDDIALOG_START_17
+        self.resbtnTemplatePath_value = strings.RID_AGENDAWIZARDDIALOG_START_18
+        self.resoptCreateAgenda_value = strings.RID_AGENDAWIZARDDIALOG_START_19
+        self.reslblHelp6_value = strings.RID_AGENDAWIZARDDIALOG_START_20
+        self.reslblTopic_value = strings.RID_AGENDAWIZARDDIALOG_START_21
+        self.reslblResponsible_value = strings.RID_AGENDAWIZARDDIALOG_START_22
+        self.reslblDuration_value = strings.RID_AGENDAWIZARDDIALOG_START_23
+        self.reschkConvenedBy_value = strings.RID_AGENDAWIZARDDIALOG_START_24
+        self.reschkPresiding_value = strings.RID_AGENDAWIZARDDIALOG_START_25
+        self.reschkNoteTaker_value = strings.RID_AGENDAWIZARDDIALOG_START_26
+        self.reschkTimekeeper_value = strings.RID_AGENDAWIZARDDIALOG_START_27
+        self.reschkAttendees_value = strings.RID_AGENDAWIZARDDIALOG_START_28
+        self.reschkObservers_value = strings.RID_AGENDAWIZARDDIALOG_START_29
+        self.reschkResourcePersons_value = strings.RID_AGENDAWIZARDDIALOG_START_30
+        self.reslblHelp4_value = strings.RID_AGENDAWIZARDDIALOG_START_31
+        self.reschkMeetingTitle_value = strings.RID_AGENDAWIZARDDIALOG_START_32
+        self.reschkRead_value = strings.RID_AGENDAWIZARDDIALOG_START_33
+        self.reschkBring_value = strings.RID_AGENDAWIZARDDIALOG_START_34
+        self.reschkNotes_value = strings.RID_AGENDAWIZARDDIALOG_START_35
+        self.reslblHelp3_value = strings.RID_AGENDAWIZARDDIALOG_START_36
+        self.reslblDate_value = strings.RID_AGENDAWIZARDDIALOG_START_38
+        self.reslblHelpPg6_value = strings.RID_AGENDAWIZARDDIALOG_START_39
+        self.reslblPageDesign_value = strings.RID_AGENDAWIZARDDIALOG_START_40
+        self.resDefaultFilename = strings.RID_AGENDAWIZARDDIALOG_START_41
         self.resDefaultFilename = self.resDefaultFilename[:-4] + ".ott"
-        self.resDefaultTitle = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 42)
-        self.resErrSaveTemplate = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 43)
-        self.resPlaceHolderTitle = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 44)
-        self.resPlaceHolderDate = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 45)
-        self.resPlaceHolderTime = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 46)
-        self.resPlaceHolderLocation = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 47)
-        self.resPlaceHolderHint = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 48)
-        self.resErrOpenTemplate = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 56)
-        self.itemMeetingType = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 57)
-        self.itemBring = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 58)
-        self.itemRead = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 59)
-        self.itemNote = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 60)
-        self.itemCalledBy = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 61)
-        self.itemFacilitator = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 62)
-        self.itemAttendees = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 63)
-        self.itemNotetaker = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 64)
-        self.itemTimekeeper = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 65)
-        self.itemObservers = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 66)
-        self.itemResource = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 67)
-        self.resButtonInsert = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 68)
-        self.resButtonRemove = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 69)
-        self.resButtonUp = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 70)
-        self.resButtonDown = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
+        self.resDefaultTitle = strings.RID_AGENDAWIZARDDIALOG_START_42
+        self.resErrSaveTemplate = strings.RID_AGENDAWIZARDDIALOG_START_43
+        self.resPlaceHolderTitle = strings.RID_AGENDAWIZARDDIALOG_START_44
+        self.resPlaceHolderDate = strings.RID_AGENDAWIZARDDIALOG_START_45
+        self.resPlaceHolderTime = strings.RID_AGENDAWIZARDDIALOG_START_46
+        self.resPlaceHolderLocation = strings.RID_AGENDAWIZARDDIALOG_START_47
+        self.resPlaceHolderHint = strings.RID_AGENDAWIZARDDIALOG_START_48
+        self.resErrOpenTemplate = strings.RID_AGENDAWIZARDDIALOG_START_56
+        self.itemMeetingType = strings.RID_AGENDAWIZARDDIALOG_START_57
+        self.itemBring = strings.RID_AGENDAWIZARDDIALOG_START_58
+        self.itemRead = strings.RID_AGENDAWIZARDDIALOG_START_59
+        self.itemNote = strings.RID_AGENDAWIZARDDIALOG_START_60
+        self.itemCalledBy = strings.RID_AGENDAWIZARDDIALOG_START_61
+        self.itemFacilitator = strings.RID_AGENDAWIZARDDIALOG_START_62
+        self.itemAttendees = strings.RID_AGENDAWIZARDDIALOG_START_63
+        self.itemNotetaker = strings.RID_AGENDAWIZARDDIALOG_START_64
+        self.itemTimekeeper = strings.RID_AGENDAWIZARDDIALOG_START_65
+        self.itemObservers = strings.RID_AGENDAWIZARDDIALOG_START_66
+        self.itemResource = strings.RID_AGENDAWIZARDDIALOG_START_67
+        self.resButtonInsert = strings.RID_AGENDAWIZARDDIALOG_START_68
+        self.resButtonRemove = strings.RID_AGENDAWIZARDDIALOG_START_69
+        self.resButtonUp = strings.RID_AGENDAWIZARDDIALOG_START_70
+        self.resButtonDown = strings.RID_AGENDAWIZARDDIALOG_START_71
 
         #Create a dictionary for localised string in the template
         self.dictConstants = {
-        "#datetitle#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 72),
-        "#timetitle#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 73),
-        "#locationtitle#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 74),
-        "#topics#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 75),
-        "#num.#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 76),
-        "#topicheader#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 77),
-        "#responsibleheader#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 78),
-        "#timeheader#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 79),
-        "#additional-information#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 80),
-        "#minutes-for#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 81),
-        "#discussion#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 82),
-        "#conclusion#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 83),
-        "#to-do#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 84),
-        "#responsible-party#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 85),
-        "#deadline#" : oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 86)}
+        "#datetitle#" : strings.RID_AGENDAWIZARDDIALOG_START_72,
+        "#timetitle#" : strings.RID_AGENDAWIZARDDIALOG_START_73,
+        "#locationtitle#" : strings.RID_AGENDAWIZARDDIALOG_START_74,
+        "#topics#" : strings.RID_AGENDAWIZARDDIALOG_START_75,
+        "#num.#" : strings.RID_AGENDAWIZARDDIALOG_START_76,
+        "#topicheader#" : strings.RID_AGENDAWIZARDDIALOG_START_77,
+        "#responsibleheader#" : strings.RID_AGENDAWIZARDDIALOG_START_78,
+        "#timeheader#" : strings.RID_AGENDAWIZARDDIALOG_START_79,
+        "#additional-information#" : strings.RID_AGENDAWIZARDDIALOG_START_80,
+        "#minutes-for#" : strings.RID_AGENDAWIZARDDIALOG_START_81,
+        "#discussion#" : strings.RID_AGENDAWIZARDDIALOG_START_82,
+        "#conclusion#" : strings.RID_AGENDAWIZARDDIALOG_START_83,
+        "#to-do#" : strings.RID_AGENDAWIZARDDIALOG_START_84,
+        "#responsible-party#" : strings.RID_AGENDAWIZARDDIALOG_START_85,
+        "#deadline#" : strings.RID_AGENDAWIZARDDIALOG_START_86}
 
         #Create a dictionary for localising the page design
         self.dictPageDesign = {
-        "Blue" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 87),
-        "Classic" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 88),
-        "Colorful" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 89),
-        "Elegant" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 90),
-        "Green" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 91),
-        "Grey" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 92),
-        "Modern" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 93),
-        "Orange" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 94),
-        "Red" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 95),
-        "Simple" : oWizardResource.getResText(
-                AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 96)}
+        "Blue" : strings.RID_AGENDAWIZARDDIALOG_START_87,
+        "Classic" : strings.RID_AGENDAWIZARDDIALOG_START_88,
+        "Colorful" : strings.RID_AGENDAWIZARDDIALOG_START_89,
+        "Elegant" : strings.RID_AGENDAWIZARDDIALOG_START_90,
+        "Green" : strings.RID_AGENDAWIZARDDIALOG_START_91,
+        "Grey" : strings.RID_AGENDAWIZARDDIALOG_START_92,
+        "Modern" : strings.RID_AGENDAWIZARDDIALOG_START_93,
+        "Orange" : strings.RID_AGENDAWIZARDDIALOG_START_94,
+        "Red" : strings.RID_AGENDAWIZARDDIALOG_START_95,
+        "Simple" : strings.RID_AGENDAWIZARDDIALOG_START_96}
 
         #Common Resources
-        self.resOverwriteWarning = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_COMMON_START + 19)
-        self.resTemplateDescription = oWizardResource.getResText(
-            AgendaWizardDialogResources.RID_COMMON_START + 20)
+        self.resOverwriteWarning = strings.RID_COMMON_START_19
+        self.resTemplateDescription = strings.RID_COMMON_START_20
 
         self.RoadmapLabels = []
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 1))
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 2))
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 3))
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 4))
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 5))
-        self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 6))
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_50)
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_51)
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_52)
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_53)
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_54)
+        self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_55)
diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.py b/wizards/com/sun/star/wizards/common/NoValidPathException.py
index 861e273a82f2..07794852710f 100644
--- a/wizards/com/sun/star/wizards/common/NoValidPathException.py
+++ b/wizards/com/sun/star/wizards/common/NoValidPathException.py
@@ -22,6 +22,8 @@ class NoValidPathException(Exception):
         # TODO: NEVER open a dialog in an exception
         from .SystemDialog import SystemDialog
         if xMSF:
-            SystemDialog.showErrorBox(xMSF,
-                "dbwizres", "dbw", 521) #OfficePathnotavailable
+            import imp, os
+            imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+            import strings
+            SystemDialog.showErrorBox(xMSF, strings.RID_COMMON_START_21) #OfficePathnotavailable
 
diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py
deleted file mode 100644
index 4d3c29e48770..000000000000
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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 .
-#
-import traceback
-#import uno before importing from VclWindowPeerAttribute
-import uno
-from com.sun.star.awt.VclWindowPeerAttribute import OK
-
-class Resource(object):
-
-    def __init__(self, _xMSF, _Module):
-        self.xMSF = _xMSF
-        self.Module = _Module
-        try:
-            xResource = self.xMSF.createInstanceWithArguments(
-                "org.libreoffice.resource.ResourceIndexAccess", (self.Module,))
-            if xResource is None:
-                raise Exception ("could not initialize ResourceIndexAccess")
-
-            self.xStringIndexAccess = xResource.getByName("String")
-
-            if self.xStringIndexAccess is None:
-                raise Exception ("could not initialize xStringIndexAccess")
-
-        except Exception:
-            traceback.print_exc()
-            self.showCommonResourceError(self.xMSF)
-
-    def getResText(self, nID):
-        try:
-            return self.xStringIndexAccess.getByIndex(nID)
-        except Exception:
-            traceback.print_exc()
-            raise ValueError("Resource with ID not " + str(nID) + " not found")
-
-    @classmethod
-    def showCommonResourceError(self, xMSF):
-        from .SystemDialog import SystemDialog
-        sError = "The files required could not be found.\n" + \
-            "Please start the LibreOffice Setup and choose 'Repair'."
-        SystemDialog.showMessageBox(xMSF, "ErrorBox", OK, sError)
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index e1bb6bfda37f..2450208f8402 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -162,11 +162,7 @@ class SystemDialog(object):
             return None
 
     @classmethod
-    def showErrorBox(self, xMSF, ResName, ResPrefix,
-            ResID, AddTag=None, AddString=None):
-        from .Resource import Resource
-        oResource = Resource(xMSF, ResPrefix)
-        sErrorMessage = oResource.getResText(ResID)
+    def showErrorBox(self, xMSF, sErrorMessage, AddTag=None, AddString=None):
         sErrorMessage = sErrorMessage.replace("%PRODUCTNAME", "LibreOffice" )
         sErrorMessage = sErrorMessage.replace(str(13), "<BR>")
         if AddTag and AddString:
diff --git a/wizards/com/sun/star/wizards/common/strings.hrc b/wizards/com/sun/star/wizards/common/strings.hrc
new file mode 100644
index 000000000000..fc43b334342c
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -0,0 +1,312 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+import gettext
+import uno
+import unohelper
+
+localeDir = "$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR"
+
+gettext.bindtextdomain('wiz', unohelper.fileUrlToSystemPath(
+    uno.getComponentContext().getByName(
+        "/singletons/com.sun.star.util.theMacroExpander").expandMacros(localeDir)))
+
+gettext.textdomain('wiz')
+
+def NC_(context, string):
+    return gettext.gettext(string)
+
+# common section
+RID_COMMON_START_0                      = NC_("RID_COMMON_START_0", "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk.")
+RID_COMMON_START_1                      = NC_("RID_COMMON_START_1", "The text document could not be created.<BR>Please check if the module 'PRODUCTNAME Writer' is installed.")
+RID_COMMON_START_2                      = NC_("RID_COMMON_START_2", "The spreadsheet could not be created.<BR>Please check if the module 'PRODUCTNAME Calc' is installed.")
+RID_COMMON_START_3                      = NC_("RID_COMMON_START_3", "The presentation could not be created.<BR>Please check if the module 'PRODUCTNAME Impress' is installed.")
+RID_COMMON_START_4                      = NC_("RID_COMMON_START_4", "The drawing could not be created.<BR>Please check if the module 'PRODUCTNAME Draw' is installed.")
+RID_COMMON_START_5                      = NC_("RID_COMMON_START_5", "The formula could not be created.<BR>Please check if the module 'PRODUCTNAME Math' is installed.")
+RID_COMMON_START_6                      = NC_("RID_COMMON_START_6", "The files required could not be found.<BR>Please start the %PRODUCTNAME Setup and choose 'Repair'.")
+RID_COMMON_START_7                      = NC_("RID_COMMON_START_7", "The file '<PATH>' already exists.<BR><BR>Would you like to overwrite the existing file?")
+RID_COMMON_START_8                      = NC_("RID_COMMON_START_8", "Yes")
+RID_COMMON_START_9                      = NC_("RID_COMMON_START_9", "Yes to All")
+RID_COMMON_START_10                     = NC_("RID_COMMON_START_10", "No")
+RID_COMMON_START_11                     = NC_("RID_COMMON_START_11", "Cancel")
+RID_COMMON_START_12                     = NC_("RID_COMMON_START_12", "~Finish")
+RID_COMMON_START_13                     = NC_("RID_COMMON_START_13", "< ~Back")
+RID_COMMON_START_14                     = NC_("RID_COMMON_START_14", "~Next >")
+RID_COMMON_START_15                     = NC_("RID_COMMON_START_15", "~Help")
+RID_COMMON_START_16                     = NC_("RID_COMMON_START_16", "Steps")
+RID_COMMON_START_17                     = NC_("RID_COMMON_START_17", "Close")
+RID_COMMON_START_18                     = NC_("RID_COMMON_START_18", "OK")
+RID_COMMON_START_19                     = NC_("RID_COMMON_START_19", "The file already exists. Do you want to overwrite it?")
+RID_COMMON_START_20                     = NC_("RID_COMMON_START_20", "Template created via <wizard_name> on <current_date>.")
+RID_COMMON_START_21                     = NC_("RID_COMMON_START_21", "The wizard could not be run, because important files were not found.\nUnder 'Tools - Options - %PRODUCTNAME - Paths' click the 'Default' button to reset the paths to the original default settings.\nThen run the wizard again.")
+
+# LETTER WIZARD RESOURCES
+RID_LETTERWIZARDDIALOG_START_1 =        NC_("RID_LETTERWIZARDDIALOG_START_1", "Letter Wizard")
+RID_LETTERWIZARDDIALOG_START_2 =        NC_("RID_LETTERWIZARDDIALOG_START_2", "Label9")
+RID_LETTERWIZARDDIALOG_START_3 =        NC_("RID_LETTERWIZARDDIALOG_START_3", "~Business letter")
+RID_LETTERWIZARDDIALOG_START_4 =        NC_("RID_LETTERWIZARDDIALOG_START_4", "~Formal personal letter")
+RID_LETTERWIZARDDIALOG_START_5 =        NC_("RID_LETTERWIZARDDIALOG_START_5", "~Personal letter")
+RID_LETTERWIZARDDIALOG_START_6 =        NC_("RID_LETTERWIZARDDIALOG_START_6", "~Use letterhead paper with pre-printed elements")
+RID_LETTERWIZARDDIALOG_START_7 =        NC_("RID_LETTERWIZARDDIALOG_START_7", "~Logo")
+RID_LETTERWIZARDDIALOG_START_8 =        NC_("RID_LETTERWIZARDDIALOG_START_8", "Return address")
+RID_LETTERWIZARDDIALOG_START_9 =        NC_("RID_LETTERWIZARDDIALOG_START_9", "~Include footer")
+RID_LETTERWIZARDDIALOG_START_10 =       NC_("RID_LETTERWIZARDDIALOG_START_10", "~Return address in envelope window")
+RID_LETTERWIZARDDIALOG_START_11 =       NC_("RID_LETTERWIZARDDIALOG_START_11", "~Logo")
+RID_LETTERWIZARDDIALOG_START_12 =       NC_("RID_LETTERWIZARDDIALOG_START_12", "~Return address in envelope window")
+RID_LETTERWIZARDDIALOG_START_13 =       NC_("RID_LETTERWIZARDDIALOG_START_13", "Letter Signs")
+RID_LETTERWIZARDDIALOG_START_14 =       NC_("RID_LETTERWIZARDDIALOG_START_14", "S~ubject line")
+RID_LETTERWIZARDDIALOG_START_15 =       NC_("RID_LETTERWIZARDDIALOG_START_15", "Salu~tation")
+RID_LETTERWIZARDDIALOG_START_16 =       NC_("RID_LETTERWIZARDDIALOG_START_16", "Fold ~marks")
+RID_LETTERWIZARDDIALOG_START_17 =       NC_("RID_LETTERWIZARDDIALOG_START_17", "~Complimentary close")
+RID_LETTERWIZARDDIALOG_START_18 =       NC_("RID_LETTERWIZARDDIALOG_START_18", "~Footer")
+RID_LETTERWIZARDDIALOG_START_19 =       NC_("RID_LETTERWIZARDDIALOG_START_19", "~Use user data for return address")
+RID_LETTERWIZARDDIALOG_START_20 =       NC_("RID_LETTERWIZARDDIALOG_START_20", "~New sender address:")
+RID_LETTERWIZARDDIALOG_START_21 =       NC_("RID_LETTERWIZARDDIALOG_START_21", "Use placeholders for ~recipient's address")
+RID_LETTERWIZARDDIALOG_START_22 =       NC_("RID_LETTERWIZARDDIALOG_START_22", "Use address database for ~mail merge")
+RID_LETTERWIZARDDIALOG_START_23 =       NC_("RID_LETTERWIZARDDIALOG_START_23", "Include ~only on second and following pages")
+RID_LETTERWIZARDDIALOG_START_24 =       NC_("RID_LETTERWIZARDDIALOG_START_24", "~Include page number")
+RID_LETTERWIZARDDIALOG_START_25 =       NC_("RID_LETTERWIZARDDIALOG_START_25", "Letter Template")
+RID_LETTERWIZARDDIALOG_START_26 =       NC_("RID_LETTERWIZARDDIALOG_START_26", "Create a ~letter from this template")
+RID_LETTERWIZARDDIALOG_START_27 =       NC_("RID_LETTERWIZARDDIALOG_START_27", "Make ~manual changes to this letter template")
+RID_LETTERWIZARDDIALOG_START_28 =       NC_("RID_LETTERWIZARDDIALOG_START_28", "Page design")
+RID_LETTERWIZARDDIALOG_START_29 =       NC_("RID_LETTERWIZARDDIALOG_START_29", "Page design")
+RID_LETTERWIZARDDIALOG_START_30 =       NC_("RID_LETTERWIZARDDIALOG_START_30", "Page design")
+RID_LETTERWIZARDDIALOG_START_31 =       NC_("RID_LETTERWIZARDDIALOG_START_31", "This wizard helps you to create a letter template. You can then use the template as the basis for writing letters as often as desired.")
+RID_LETTERWIZARDDIALOG_START_32 =       NC_("RID_LETTERWIZARDDIALOG_START_32", "~Height:")
+RID_LETTERWIZARDDIALOG_START_33 =       NC_("RID_LETTERWIZARDDIALOG_START_33", "~Width:")
+RID_LETTERWIZARDDIALOG_START_34 =       NC_("RID_LETTERWIZARDDIALOG_START_34", "S~pacing to left margin:")
+RID_LETTERWIZARDDIALOG_START_35 =       NC_("RID_LETTERWIZARDDIALOG_START_35", "Spacing ~to top margin:")
+RID_LETTERWIZARDDIALOG_START_36 =       NC_("RID_LETTERWIZARDDIALOG_START_36", "Height:")
+RID_LETTERWIZARDDIALOG_START_37 =       NC_("RID_LETTERWIZARDDIALOG_START_37", "Width:")
+RID_LETTERWIZARDDIALOG_START_38 =       NC_("RID_LETTERWIZARDDIALOG_START_38", "S~pacing to left margin:")
+RID_LETTERWIZARDDIALOG_START_39 =       NC_("RID_LETTERWIZARDDIALOG_START_39", "Spacing ~to top margin:")
+RID_LETTERWIZARDDIALOG_START_40 =       NC_("RID_LETTERWIZARDDIALOG_START_40", "Height:")
+RID_LETTERWIZARDDIALOG_START_42 =       NC_("RID_LETTERWIZARDDIALOG_START_42", "Sender's address")
+RID_LETTERWIZARDDIALOG_START_43 =       NC_("RID_LETTERWIZARDDIALOG_START_43", "Name:")
+RID_LETTERWIZARDDIALOG_START_44 =       NC_("RID_LETTERWIZARDDIALOG_START_44", "Street:")
+RID_LETTERWIZARDDIALOG_START_45 =       NC_("RID_LETTERWIZARDDIALOG_START_45", "ZIP code/State/City:")
+RID_LETTERWIZARDDIALOG_START_46 =       NC_("RID_LETTERWIZARDDIALOG_START_46", "Recipient's address")
+RID_LETTERWIZARDDIALOG_START_47 =       NC_("RID_LETTERWIZARDDIALOG_START_47", "Footer")
+RID_LETTERWIZARDDIALOG_START_48 =       NC_("RID_LETTERWIZARDDIALOG_START_48", "This wizard creates a letter template which enables you to create multiple letters with the same layout and settings.")
+RID_LETTERWIZARDDIALOG_START_49 =       NC_("RID_LETTERWIZARDDIALOG_START_49", "To create another new letter out of the template just navigate to the template location and double-click it.")
+RID_LETTERWIZARDDIALOG_START_50 =       NC_("RID_LETTERWIZARDDIALOG_START_50", "Template name:")
+RID_LETTERWIZARDDIALOG_START_51 =       NC_("RID_LETTERWIZARDDIALOG_START_51", "Location and file name:")
+RID_LETTERWIZARDDIALOG_START_52 =       NC_("RID_LETTERWIZARDDIALOG_START_52", "How do you want to proceed?")
+RID_LETTERWIZARDDIALOG_START_53 =       NC_("RID_LETTERWIZARDDIALOG_START_53", "Please choose the type of letter and page design")
+RID_LETTERWIZARDDIALOG_START_54 =       NC_("RID_LETTERWIZARDDIALOG_START_54", "Select the items to be printed")
+RID_LETTERWIZARDDIALOG_START_55 =       NC_("RID_LETTERWIZARDDIALOG_START_55", "Specify items already on your letterhead paper")
+RID_LETTERWIZARDDIALOG_START_56 =       NC_("RID_LETTERWIZARDDIALOG_START_56", "Specify the sender and recipient information")
+RID_LETTERWIZARDDIALOG_START_57 =       NC_("RID_LETTERWIZARDDIALOG_START_57", "Fill in the information you would like in the footer")
+RID_LETTERWIZARDDIALOG_START_58 =       NC_("RID_LETTERWIZARDDIALOG_START_58", "Please specify last settings")
+RID_LETTERWIZARDDIALOG_START_59 =       NC_("RID_LETTERWIZARDDIALOG_START_59", "Subject:")
+RID_LETTERWIZARDDIALOG_START_60 =       NC_("RID_LETTERWIZARDDIALOG_START_60", "Elegant")
+RID_LETTERWIZARDDIALOG_START_61 =       NC_("RID_LETTERWIZARDDIALOG_START_61", "Modern")
+RID_LETTERWIZARDDIALOG_START_62 =       NC_("RID_LETTERWIZARDDIALOG_START_62", "Office")
+RID_LETTERWIZARDDIALOG_START_63 =       NC_("RID_LETTERWIZARDDIALOG_START_63", "Bottle")
+RID_LETTERWIZARDDIALOG_START_64 =       NC_("RID_LETTERWIZARDDIALOG_START_64", "Mail")
+RID_LETTERWIZARDDIALOG_START_65 =       NC_("RID_LETTERWIZARDDIALOG_START_65", "Marine")
+RID_LETTERWIZARDDIALOG_START_66 =       NC_("RID_LETTERWIZARDDIALOG_START_66", "Red Line")
+
+# Letter Wizard Greeting Start
+RID_LETTERWIZARDSALUTATION_START_1 =    NC_("RID_LETTERWIZARDSALUTATION_START_1", "To Whom it May Concern")
+RID_LETTERWIZARDSALUTATION_START_2 =    NC_("RID_LETTERWIZARDSALUTATION_START_2", "Dear Sir or Madam")
+RID_LETTERWIZARDSALUTATION_START_3 =    NC_("RID_LETTERWIZARDSALUTATION_START_3", "Hello")
+
+# Letter Wizard Greeting Start
+RID_LETTERWIZARDGREETING_START_1 =      NC_("RID_LETTERWIZARDGREETING_START_1", "Sincerely")
+RID_LETTERWIZARDGREETING_START_2 =      NC_("RID_LETTERWIZARDGREETING_START_2", "Best regards")
+RID_LETTERWIZARDGREETING_START_3 =      NC_("RID_LETTERWIZARDGREETING_START_3", "Cheers")
+
+# Letter Wizard Roadmap Start
+RID_LETTERWIZARDROADMAP_START_1 =       NC_("RID_LETTERWIZARDROADMAP_START_1", "Page design")
+RID_LETTERWIZARDROADMAP_START_2 =       NC_("RID_LETTERWIZARDROADMAP_START_2", "Letterhead layout")
+RID_LETTERWIZARDROADMAP_START_3 =       NC_("RID_LETTERWIZARDROADMAP_START_3", "Printed items")
+RID_LETTERWIZARDROADMAP_START_4 =       NC_("RID_LETTERWIZARDROADMAP_START_4", "Recipient and sender")
+RID_LETTERWIZARDROADMAP_START_5 =       NC_("RID_LETTERWIZARDROADMAP_START_5", "Footer")
+RID_LETTERWIZARDROADMAP_START_6 =       NC_("RID_LETTERWIZARDROADMAP_START_6", "Name and location")
+
+# FAX WIZARD RESOURCES
+RID_FAXWIZARDDIALOG_START_1     =       NC_("RID_FAXWIZARDDIALOG_START_1", "Fax Wizard")
+RID_FAXWIZARDDIALOG_START_2     =       NC_("RID_FAXWIZARDDIALOG_START_2", "Label9")
+RID_FAXWIZARDDIALOG_START_3     =       NC_("RID_FAXWIZARDDIALOG_START_3", "~Business Fax")
+RID_FAXWIZARDDIALOG_START_4     =       NC_("RID_FAXWIZARDDIALOG_START_4", "~Personal Fax")
+RID_FAXWIZARDDIALOG_START_5     =       NC_("RID_FAXWIZARDDIALOG_START_5", "~Logo")
+RID_FAXWIZARDDIALOG_START_6     =       NC_("RID_FAXWIZARDDIALOG_START_6", "S~ubject line")
+RID_FAXWIZARDDIALOG_START_7     =       NC_("RID_FAXWIZARDDIALOG_START_7", "S~alutation")
+RID_FAXWIZARDDIALOG_START_8     =       NC_("RID_FAXWIZARDDIALOG_START_8", "~Complimentary close")
+RID_FAXWIZARDDIALOG_START_9     =       NC_("RID_FAXWIZARDDIALOG_START_9", "~Footer")
+RID_FAXWIZARDDIALOG_START_10    =       NC_("RID_FAXWIZARDDIALOG_START_10", "~Use user data for return address")
+RID_FAXWIZARDDIALOG_START_11    =       NC_("RID_FAXWIZARDDIALOG_START_11", "~New return address")
+RID_FAXWIZARDDIALOG_START_12    =       NC_("RID_FAXWIZARDDIALOG_START_12", "My Fax Template")
+RID_FAXWIZARDDIALOG_START_13    =       NC_("RID_FAXWIZARDDIALOG_START_13", "Create a ~fax from this template")
+RID_FAXWIZARDDIALOG_START_14    =       NC_("RID_FAXWIZARDDIALOG_START_14", "Make ~manual changes to this fax template")
+RID_FAXWIZARDDIALOG_START_15    =       NC_("RID_FAXWIZARDDIALOG_START_15", "Page design")
+RID_FAXWIZARDDIALOG_START_16    =       NC_("RID_FAXWIZARDDIALOG_START_16", "Page design")
+RID_FAXWIZARDDIALOG_START_17    =       NC_("RID_FAXWIZARDDIALOG_START_17", "This wizard helps you to create a fax template. The template can then be used to create a fax whenever needed.")
+RID_FAXWIZARDDIALOG_START_18    =       NC_("RID_FAXWIZARDDIALOG_START_18", "Return address")
+RID_FAXWIZARDDIALOG_START_19    =       NC_("RID_FAXWIZARDDIALOG_START_19", "Name:")
+RID_FAXWIZARDDIALOG_START_20    =       NC_("RID_FAXWIZARDDIALOG_START_20", "Street:")
+RID_FAXWIZARDDIALOG_START_21    =       NC_("RID_FAXWIZARDDIALOG_START_21", "ZIP code/State/City:")
+RID_FAXWIZARDDIALOG_START_22    =       NC_("RID_FAXWIZARDDIALOG_START_22", "Footer")
+RID_FAXWIZARDDIALOG_START_23    =       NC_("RID_FAXWIZARDDIALOG_START_23", "This wizard creates a fax template which enables you to create multiple faxes with the same layout and settings.")
+RID_FAXWIZARDDIALOG_START_24    =       NC_("RID_FAXWIZARDDIALOG_START_24", "To create another new fax out of the template, go to the location where you saved the template and double-click the file.")
+RID_FAXWIZARDDIALOG_START_25    =       NC_("RID_FAXWIZARDDIALOG_START_25", "Template Name:")
+RID_FAXWIZARDDIALOG_START_26    =       NC_("RID_FAXWIZARDDIALOG_START_26", "Location and file name:")
+RID_FAXWIZARDDIALOG_START_27    =       NC_("RID_FAXWIZARDDIALOG_START_27", "What do you want to do next?")
+RID_FAXWIZARDDIALOG_START_28    =       NC_("RID_FAXWIZARDDIALOG_START_28", "Choose the type of fax and a page design")
+RID_FAXWIZARDDIALOG_START_29    =       NC_("RID_FAXWIZARDDIALOG_START_29", "Select items to include in the fax template")
+RID_FAXWIZARDDIALOG_START_30    =       NC_("RID_FAXWIZARDDIALOG_START_30", "Specify sender and recipient information")
+RID_FAXWIZARDDIALOG_START_31    =       NC_("RID_FAXWIZARDDIALOG_START_31", "Enter text for the footer")
+RID_FAXWIZARDDIALOG_START_32    =       NC_("RID_FAXWIZARDDIALOG_START_32", "Choose a name and save the template")
+RID_FAXWIZARDDIALOG_START_33    =       NC_("RID_FAXWIZARDDIALOG_START_33", "Include ~only on second and following pages")
+RID_FAXWIZARDDIALOG_START_34    =       NC_("RID_FAXWIZARDDIALOG_START_34", "~Include page number")
+RID_FAXWIZARDDIALOG_START_35    =       NC_("RID_FAXWIZARDDIALOG_START_35", "~Date")
+RID_FAXWIZARDDIALOG_START_36    =       NC_("RID_FAXWIZARDDIALOG_START_36", "~Type of message")
+RID_FAXWIZARDDIALOG_START_37    =       NC_("RID_FAXWIZARDDIALOG_START_37", "Fax Number:")
+RID_FAXWIZARDDIALOG_START_38    =       NC_("RID_FAXWIZARDDIALOG_START_38", "Use placeholders for ~recipient's address")
+RID_FAXWIZARDDIALOG_START_39    =       NC_("RID_FAXWIZARDDIALOG_START_39", "Use address database for ~mail merge")
+RID_FAXWIZARDDIALOG_START_40    =       NC_("RID_FAXWIZARDDIALOG_START_40", "~New return address")
+RID_FAXWIZARDDIALOG_START_41    =       NC_("RID_FAXWIZARDDIALOG_START_41", "To:")
+RID_FAXWIZARDDIALOG_START_42    =       NC_("RID_FAXWIZARDDIALOG_START_42", "From:")
+RID_FAXWIZARDDIALOG_START_43    =       NC_("RID_FAXWIZARDDIALOG_START_43", "Fax:")
+RID_FAXWIZARDDIALOG_START_44    =       NC_("RID_FAXWIZARDDIALOG_START_44", "Tel:")
+RID_FAXWIZARDDIALOG_START_45    =       NC_("RID_FAXWIZARDDIALOG_START_45", "E-mail:")
+RID_FAXWIZARDDIALOG_START_46    =       NC_("RID_FAXWIZARDDIALOG_START_46", "This template consists of")
+RID_FAXWIZARDDIALOG_START_47    =       NC_("RID_FAXWIZARDDIALOG_START_47", "page")
+RID_FAXWIZARDDIALOG_START_48    =       NC_("RID_FAXWIZARDDIALOG_START_48", "Please inform us if transmission errors occur.")
+RID_FAXWIZARDDIALOG_START_49    =       NC_("RID_FAXWIZARDDIALOG_START_49", "Bottle")
+RID_FAXWIZARDDIALOG_START_50    =       NC_("RID_FAXWIZARDDIALOG_START_50", "Lines")
+RID_FAXWIZARDDIALOG_START_51    =       NC_("RID_FAXWIZARDDIALOG_START_51", "Marine")
+RID_FAXWIZARDDIALOG_START_52    =       NC_("RID_FAXWIZARDDIALOG_START_52", "Classic Fax")
+RID_FAXWIZARDDIALOG_START_53    =       NC_("RID_FAXWIZARDDIALOG_START_53", "Classic Fax from Private")
+RID_FAXWIZARDDIALOG_START_54    =       NC_("RID_FAXWIZARDDIALOG_START_54", "Modern Fax")
+RID_FAXWIZARDDIALOG_START_55    =       NC_("RID_FAXWIZARDDIALOG_START_55", "Modern Fax from Private")
+RID_FAXWIZARDDIALOG_START_56    =       NC_("RID_FAXWIZARDDIALOG_START_56", "Fax")
+
+# Fax Wizard Communication Start
+RID_FAXWIZARDCOMMUNICATION_START_1 =    NC_("RID_FAXWIZARDCOMMUNICATION_START_1", "Important Information!")
+RID_FAXWIZARDCOMMUNICATION_START_2 =    NC_("RID_FAXWIZARDCOMMUNICATION_START_2", "For your information")
+RID_FAXWIZARDCOMMUNICATION_START_3 =    NC_("RID_FAXWIZARDCOMMUNICATION_START_3", "News!")
+
+# Fax Wizard Salutation Start
+RID_FAXWIZARDSALUTATION_START_1 =       NC_("RID_FAXWIZARDSALUTATION_START_1", "To whom it may concern,")
+RID_FAXWIZARDSALUTATION_START_2 =       NC_("RID_FAXWIZARDSALUTATION_START_2", "Dear Sir or Madam,")
+RID_FAXWIZARDSALUTATION_START_3 =       NC_("RID_FAXWIZARDSALUTATION_START_3", "Hello,")
+RID_FAXWIZARDSALUTATION_START_4 =       NC_("RID_FAXWIZARDSALUTATION_START_4", "Hi,")
+
+# Fax Wizard Greeting Start
+RID_FAXWIZARDGREETING_START_1 =         NC_("RID_FAXWIZARDGREETING_START_1", "Sincerely")
+RID_FAXWIZARDGREETING_START_2 =         NC_("RID_FAXWIZARDGREETING_START_2", "Yours faithfully")
+RID_FAXWIZARDGREETING_START_3 =         NC_("RID_FAXWIZARDGREETING_START_3", "Regards")
+RID_FAXWIZARDGREETING_START_4 =         NC_("RID_FAXWIZARDGREETING_START_4", "Love")
+
+# Fax Wizard Roadmap Start
+RID_FAXWIZARDROADMAP_START_1 =          NC_("RID_FAXWIZARDROADMAP_START_1", "Page design")
+RID_FAXWIZARDROADMAP_START_2 =          NC_("RID_FAXWIZARDROADMAP_START_2", "Items to include")
+RID_FAXWIZARDROADMAP_START_3 =          NC_("RID_FAXWIZARDROADMAP_START_3", "Sender and Recipient")
+RID_FAXWIZARDROADMAP_START_4 =          NC_("RID_FAXWIZARDROADMAP_START_4", "Footer")
+RID_FAXWIZARDROADMAP_START_5 =          NC_("RID_FAXWIZARDROADMAP_START_5", "Name and location")
+
+# AGENDA WIZARD RESOURCES
+RID_AGENDAWIZARDDIALOG_START_1 =        NC_("RID_AGENDAWIZARDDIALOG_START_1", "Agenda Wizard")
+RID_AGENDAWIZARDDIALOG_START_2 =        NC_("RID_AGENDAWIZARDDIALOG_START_2", "Make ~manual changes to this agenda template")
+RID_AGENDAWIZARDDIALOG_START_3 =        NC_("RID_AGENDAWIZARDDIALOG_START_3", "Template name:")
+RID_AGENDAWIZARDDIALOG_START_4 =        NC_("RID_AGENDAWIZARDDIALOG_START_4", "Location and file name:")
+RID_AGENDAWIZARDDIALOG_START_5 =        NC_("RID_AGENDAWIZARDDIALOG_START_5", "What do you want to do next?")
+RID_AGENDAWIZARDDIALOG_START_6 =        NC_("RID_AGENDAWIZARDDIALOG_START_6", "Please choose the page design for the agenda")
+RID_AGENDAWIZARDDIALOG_START_7 =        NC_("RID_AGENDAWIZARDDIALOG_START_7", "Please select the headings you wish to include in your agenda template")
+RID_AGENDAWIZARDDIALOG_START_8 =        NC_("RID_AGENDAWIZARDDIALOG_START_8", "Please enter general information for the event")
+RID_AGENDAWIZARDDIALOG_START_9 =        NC_("RID_AGENDAWIZARDDIALOG_START_9", "Please specify items for the agenda")
+RID_AGENDAWIZARDDIALOG_START_10 =       NC_("RID_AGENDAWIZARDDIALOG_START_10", "Please select the names you wish to include in your agenda template")
+RID_AGENDAWIZARDDIALOG_START_11 =       NC_("RID_AGENDAWIZARDDIALOG_START_11", "Choose a name and save the template")
+RID_AGENDAWIZARDDIALOG_START_12 =       NC_("RID_AGENDAWIZARDDIALOG_START_12", "Include form for recording minutes")
+RID_AGENDAWIZARDDIALOG_START_13 =       NC_("RID_AGENDAWIZARDDIALOG_START_13", "This wizard helps you to create an agenda template. The template can then be used to create an agenda whenever needed.")
+RID_AGENDAWIZARDDIALOG_START_14 =       NC_("RID_AGENDAWIZARDDIALOG_START_14", "Time:")
+RID_AGENDAWIZARDDIALOG_START_15 =       NC_("RID_AGENDAWIZARDDIALOG_START_15", "Name:")
+RID_AGENDAWIZARDDIALOG_START_16 =       NC_("RID_AGENDAWIZARDDIALOG_START_16", "Location:")
+RID_AGENDAWIZARDDIALOG_START_17 =       NC_("RID_AGENDAWIZARDDIALOG_START_17", "Placeholders will be used in empty fields. You can replace placeholders with text later.")
+RID_AGENDAWIZARDDIALOG_START_18 =       NC_("RID_AGENDAWIZARDDIALOG_START_18", "...")
+RID_AGENDAWIZARDDIALOG_START_19 =       NC_("RID_AGENDAWIZARDDIALOG_START_19", "Create an ~agenda from this template")
+RID_AGENDAWIZARDDIALOG_START_20 =       NC_("RID_AGENDAWIZARDDIALOG_START_20", "To create a new agenda out of the template, go to the location where you saved the template and double-click the file.")
+RID_AGENDAWIZARDDIALOG_START_21 =       NC_("RID_AGENDAWIZARDDIALOG_START_21", "Agenda item")
+RID_AGENDAWIZARDDIALOG_START_22 =       NC_("RID_AGENDAWIZARDDIALOG_START_22", "Responsible")
+RID_AGENDAWIZARDDIALOG_START_23 =       NC_("RID_AGENDAWIZARDDIALOG_START_23", "Duration")
+RID_AGENDAWIZARDDIALOG_START_24 =       NC_("RID_AGENDAWIZARDDIALOG_START_24", "Meeting called by")
+RID_AGENDAWIZARDDIALOG_START_25 =       NC_("RID_AGENDAWIZARDDIALOG_START_25", "Chairperson")
+RID_AGENDAWIZARDDIALOG_START_26 =       NC_("RID_AGENDAWIZARDDIALOG_START_26", "Minute keeper")
+RID_AGENDAWIZARDDIALOG_START_27 =       NC_("RID_AGENDAWIZARDDIALOG_START_27", "Moderator")
+RID_AGENDAWIZARDDIALOG_START_28 =       NC_("RID_AGENDAWIZARDDIALOG_START_28", "Attendees")
+RID_AGENDAWIZARDDIALOG_START_29 =       NC_("RID_AGENDAWIZARDDIALOG_START_29", "Observers")
+RID_AGENDAWIZARDDIALOG_START_30 =       NC_("RID_AGENDAWIZARDDIALOG_START_30", "Facility personnel")
+RID_AGENDAWIZARDDIALOG_START_31 =       NC_("RID_AGENDAWIZARDDIALOG_START_31", "The agenda template will include placeholders for the names of the selected people. When creating an agenda from the template, you can replace these placeholder with the appropriate names.")
+RID_AGENDAWIZARDDIALOG_START_32 =       NC_("RID_AGENDAWIZARDDIALOG_START_32", "Type of meeting")
+RID_AGENDAWIZARDDIALOG_START_33 =       NC_("RID_AGENDAWIZARDDIALOG_START_33", "Please read")
+RID_AGENDAWIZARDDIALOG_START_34 =       NC_("RID_AGENDAWIZARDDIALOG_START_34", "Please bring")
+RID_AGENDAWIZARDDIALOG_START_35 =       NC_("RID_AGENDAWIZARDDIALOG_START_35", "Notes")
+RID_AGENDAWIZARDDIALOG_START_36 =       NC_("RID_AGENDAWIZARDDIALOG_START_36", "The agenda template will include placeholders for the selected items.")
+RID_AGENDAWIZARDDIALOG_START_38 =       NC_("RID_AGENDAWIZARDDIALOG_START_38", "Date:")
+RID_AGENDAWIZARDDIALOG_START_39 =       NC_("RID_AGENDAWIZARDDIALOG_START_39", "This wizard creates an agenda template which enables you to create multiple agendas with the same layout and settings.")
+RID_AGENDAWIZARDDIALOG_START_40 =       NC_("RID_AGENDAWIZARDDIALOG_START_40", "Page design:")
+RID_AGENDAWIZARDDIALOG_START_41 =       NC_("RID_AGENDAWIZARDDIALOG_START_41", "myAgendaTemplate.stw")
+RID_AGENDAWIZARDDIALOG_START_42 =       NC_("RID_AGENDAWIZARDDIALOG_START_42", "My Agenda Template")
+RID_AGENDAWIZARDDIALOG_START_43 =       NC_("RID_AGENDAWIZARDDIALOG_START_43", "An unexpected error occurred while saving the agenda template.")
+RID_AGENDAWIZARDDIALOG_START_44 =       NC_("RID_AGENDAWIZARDDIALOG_START_44", "Name")
+RID_AGENDAWIZARDDIALOG_START_45 =       NC_("RID_AGENDAWIZARDDIALOG_START_45", "Date")
+RID_AGENDAWIZARDDIALOG_START_46 =       NC_("RID_AGENDAWIZARDDIALOG_START_46", "Time")
+RID_AGENDAWIZARDDIALOG_START_47 =       NC_("RID_AGENDAWIZARDDIALOG_START_47", "Location")
+RID_AGENDAWIZARDDIALOG_START_48 =       NC_("RID_AGENDAWIZARDDIALOG_START_48", "Click to replace this text")
+RID_AGENDAWIZARDDIALOG_START_50 =       NC_("RID_AGENDAWIZARDDIALOG_START_50", "Page design")
+RID_AGENDAWIZARDDIALOG_START_51 =       NC_("RID_AGENDAWIZARDDIALOG_START_51", "General information")
+RID_AGENDAWIZARDDIALOG_START_52 =       NC_("RID_AGENDAWIZARDDIALOG_START_52", "Headings to include")
+RID_AGENDAWIZARDDIALOG_START_53 =       NC_("RID_AGENDAWIZARDDIALOG_START_53", "Names")
+RID_AGENDAWIZARDDIALOG_START_54 =       NC_("RID_AGENDAWIZARDDIALOG_START_54", "Agenda items")
+RID_AGENDAWIZARDDIALOG_START_55 =       NC_("RID_AGENDAWIZARDDIALOG_START_55", "Name and location")
+RID_AGENDAWIZARDDIALOG_START_56 =       NC_("RID_AGENDAWIZARDDIALOG_START_56", "An unexpected error occurred while opening the agenda template.")
+RID_AGENDAWIZARDDIALOG_START_57 =       NC_("RID_AGENDAWIZARDDIALOG_START_57", "Type of meeting")
+RID_AGENDAWIZARDDIALOG_START_58 =       NC_("RID_AGENDAWIZARDDIALOG_START_58", "Please bring")
+RID_AGENDAWIZARDDIALOG_START_59 =       NC_("RID_AGENDAWIZARDDIALOG_START_59", "Please read")
+RID_AGENDAWIZARDDIALOG_START_60 =       NC_("RID_AGENDAWIZARDDIALOG_START_60", "Notes")
+RID_AGENDAWIZARDDIALOG_START_61 =       NC_("RID_AGENDAWIZARDDIALOG_START_61", "Meeting called by")
+RID_AGENDAWIZARDDIALOG_START_62 =       NC_("RID_AGENDAWIZARDDIALOG_START_62", "Chairperson")
+RID_AGENDAWIZARDDIALOG_START_63 =       NC_("RID_AGENDAWIZARDDIALOG_START_63", "Attendees")
+RID_AGENDAWIZARDDIALOG_START_64 =       NC_("RID_AGENDAWIZARDDIALOG_START_64", "Minute keeper")
+RID_AGENDAWIZARDDIALOG_START_65 =       NC_("RID_AGENDAWIZARDDIALOG_START_65", "Moderator")
+RID_AGENDAWIZARDDIALOG_START_66 =       NC_("RID_AGENDAWIZARDDIALOG_START_66", "Observers")
+RID_AGENDAWIZARDDIALOG_START_67 =       NC_("RID_AGENDAWIZARDDIALOG_START_67", "Facility personnel")
+RID_AGENDAWIZARDDIALOG_START_68 =       NC_("RID_AGENDAWIZARDDIALOG_START_68", "Insert")
+RID_AGENDAWIZARDDIALOG_START_69 =       NC_("RID_AGENDAWIZARDDIALOG_START_69", "Remove")
+RID_AGENDAWIZARDDIALOG_START_70 =       NC_("RID_AGENDAWIZARDDIALOG_START_70", "Move up")
+RID_AGENDAWIZARDDIALOG_START_71 =       NC_("RID_AGENDAWIZARDDIALOG_START_71", "Move down")
+RID_AGENDAWIZARDDIALOG_START_72 =       NC_("RID_AGENDAWIZARDDIALOG_START_72", "Date:")
+RID_AGENDAWIZARDDIALOG_START_73 =       NC_("RID_AGENDAWIZARDDIALOG_START_73", "Time:")
+RID_AGENDAWIZARDDIALOG_START_74 =       NC_("RID_AGENDAWIZARDDIALOG_START_74", "Location:")
+RID_AGENDAWIZARDDIALOG_START_75 =       NC_("RID_AGENDAWIZARDDIALOG_START_75", "Topics")
+RID_AGENDAWIZARDDIALOG_START_76 =       NC_("RID_AGENDAWIZARDDIALOG_START_76", "Num.")
+RID_AGENDAWIZARDDIALOG_START_77 =       NC_("RID_AGENDAWIZARDDIALOG_START_77", "Topic")
+RID_AGENDAWIZARDDIALOG_START_78 =       NC_("RID_AGENDAWIZARDDIALOG_START_78", "Responsible")
+RID_AGENDAWIZARDDIALOG_START_79 =       NC_("RID_AGENDAWIZARDDIALOG_START_79", "Time")
+RID_AGENDAWIZARDDIALOG_START_80 =       NC_("RID_AGENDAWIZARDDIALOG_START_80", "Additional information")
+RID_AGENDAWIZARDDIALOG_START_81 =       NC_("RID_AGENDAWIZARDDIALOG_START_81", "Minutes for")
+RID_AGENDAWIZARDDIALOG_START_82 =       NC_("RID_AGENDAWIZARDDIALOG_START_82", "Discussion:")
+RID_AGENDAWIZARDDIALOG_START_83 =       NC_("RID_AGENDAWIZARDDIALOG_START_83", "Conclusion:")
+RID_AGENDAWIZARDDIALOG_START_84 =       NC_("RID_AGENDAWIZARDDIALOG_START_84", "To do:")
+RID_AGENDAWIZARDDIALOG_START_85 =       NC_("RID_AGENDAWIZARDDIALOG_START_85", "Responsible party:")
+RID_AGENDAWIZARDDIALOG_START_86 =       NC_("RID_AGENDAWIZARDDIALOG_START_86", "Deadline:")
+RID_AGENDAWIZARDDIALOG_START_87 =       NC_("RID_AGENDAWIZARDDIALOG_START_87", "Blue")
+RID_AGENDAWIZARDDIALOG_START_88 =       NC_("RID_AGENDAWIZARDDIALOG_START_88", "Classic")
+RID_AGENDAWIZARDDIALOG_START_89 =       NC_("RID_AGENDAWIZARDDIALOG_START_89", "Colorful")
+RID_AGENDAWIZARDDIALOG_START_90 =       NC_("RID_AGENDAWIZARDDIALOG_START_90", "Elegant")
+RID_AGENDAWIZARDDIALOG_START_91 =       NC_("RID_AGENDAWIZARDDIALOG_START_91", "Green")
+RID_AGENDAWIZARDDIALOG_START_92 =       NC_("RID_AGENDAWIZARDDIALOG_START_92", "Grey")
+RID_AGENDAWIZARDDIALOG_START_93 =       NC_("RID_AGENDAWIZARDDIALOG_START_93", "Modern")
+RID_AGENDAWIZARDDIALOG_START_94 =       NC_("RID_AGENDAWIZARDDIALOG_START_94", "Orange")
+RID_AGENDAWIZARDDIALOG_START_95 =       NC_("RID_AGENDAWIZARDDIALOG_START_95", "Red")
+RID_AGENDAWIZARDDIALOG_START_96 =       NC_("RID_AGENDAWIZARDDIALOG_START_96", "Simple")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index b67e4005ac98..6c8d4a40fac0 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -27,7 +27,7 @@ class FaxWizardDialog(WizardDialog):
         super(FaxWizardDialog,self).__init__(xmsf, HIDMAIN )
 
         #Load Resources
-        self.resources = FaxWizardDialogResources(self.oWizardResource)
+        self.resources = FaxWizardDialogResources()
 
         #set dialog properties...
         self.setDialogProperties(True, 210, True, 104, 52, 1, 1,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index c274635ba5c0..6ee89bf9b680 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -18,158 +18,97 @@
 
 class FaxWizardDialogResources(object):
 
-    RID_FAXWIZARDDIALOG_START = 3200
-    RID_FAXWIZARDCOMMUNICATION_START = 3270
-    RID_FAXWIZARDGREETING_START = 3280
-    RID_FAXWIZARDSALUTATION_START = 3290
-    RID_FAXWIZARDROADMAP_START = 3300
-    RID_RID_COMMON_START = 500
+    def __init__(self):
+        import imp, os
+        imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+        import strings
 
-    def __init__(self, oWizardResource):
-
-        self.resFaxWizardDialog_title = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
-        self.resoptBusinessFax_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 3)
-        self.resoptPrivateFax_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 4)
-        self.reschkUseLogo_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 5)
-        self.reschkUseSubject_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 6)
-        self.reschkUseSalutation_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 7)
-        self.reschkUseGreeting_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 8)
-        self.reschkUseFooter_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 9)
-        self.resoptSenderPlaceholder_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 10)
-        self.resoptSenderDefine_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 11)
-        self.restxtTemplateName_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 12)
-        self.resoptCreateFax_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 13)
-        self.resoptMakeChanges_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 14)
-        self.reslblBusinessStyle_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 15)
-        self.reslblPrivateStyle_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 16)
-        self.reslblIntroduction_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 17)
-        self.reslblSenderAddress_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 18)
-        self.reslblSenderName_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 19)
-        self.reslblSenderStreet_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 20)
-        self.reslblPostCodeCity_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 21)
-        self.reslblFooter_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 22)
-        self.reslblFinalExplanation1_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 23)
-        self.reslblFinalExplanation2_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 24)
-        self.reslblTemplateName_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 25)
-        self.reslblTemplatePath_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 26)
-        self.reslblProceed_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 27)
-        self.reslblTitle1_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 28)
-        self.reslblTitle3_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 29)
-        self.reslblTitle4_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 30)
-        self.reslblTitle5_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 31)
-        self.reslblTitle6_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 32)
-        self.reschkFooterNextPages_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 33)
-        self.reschkFooterPageNumbers_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 34)
-        self.reschkUseDate_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 35)
-        self.reschkUseCommunicationType_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 36)
-        self.resLabel1_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 37)
-        self.resoptReceiverPlaceholder_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 38)
-        self.resoptReceiverDatabase_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
-        self.resLabel2_value = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
+        self.resFaxWizardDialog_title = strings.RID_FAXWIZARDDIALOG_START_1
+        self.resoptBusinessFax_value = strings.RID_FAXWIZARDDIALOG_START_3
+        self.resoptPrivateFax_value = strings.RID_FAXWIZARDDIALOG_START_4
+        self.reschkUseLogo_value = strings.RID_FAXWIZARDDIALOG_START_5
+        self.reschkUseSubject_value = strings.RID_FAXWIZARDDIALOG_START_6
+        self.reschkUseSalutation_value = strings.RID_FAXWIZARDDIALOG_START_7
+        self.reschkUseGreeting_value = strings.RID_FAXWIZARDDIALOG_START_8
+        self.reschkUseFooter_value = strings.RID_FAXWIZARDDIALOG_START_9
+        self.resoptSenderPlaceholder_value = strings.RID_FAXWIZARDDIALOG_START_10
+        self.resoptSenderDefine_value = strings.RID_FAXWIZARDDIALOG_START_11
+        self.restxtTemplateName_value = strings.RID_FAXWIZARDDIALOG_START_12
+        self.resoptCreateFax_value = strings.RID_FAXWIZARDDIALOG_START_13
+        self.resoptMakeChanges_value = strings.RID_FAXWIZARDDIALOG_START_14
+        self.reslblBusinessStyle_value = strings.RID_FAXWIZARDDIALOG_START_15
+        self.reslblPrivateStyle_value = strings.RID_FAXWIZARDDIALOG_START_16
+        self.reslblIntroduction_value = strings.RID_FAXWIZARDDIALOG_START_17
+        self.reslblSenderAddress_value = strings.RID_FAXWIZARDDIALOG_START_18
+        self.reslblSenderName_value = strings.RID_FAXWIZARDDIALOG_START_19
+        self.reslblSenderStreet_value = strings.RID_FAXWIZARDDIALOG_START_20
+        self.reslblPostCodeCity_value = strings.RID_FAXWIZARDDIALOG_START_21
+        self.reslblFooter_value = strings.RID_FAXWIZARDDIALOG_START_22
+        self.reslblFinalExplanation1_value = strings.RID_FAXWIZARDDIALOG_START_23
+        self.reslblFinalExplanation2_value = strings.RID_FAXWIZARDDIALOG_START_24
+        self.reslblTemplateName_value = strings.RID_FAXWIZARDDIALOG_START_25
+        self.reslblTemplatePath_value = strings.RID_FAXWIZARDDIALOG_START_26
+        self.reslblProceed_value = strings.RID_FAXWIZARDDIALOG_START_27
+        self.reslblTitle1_value = strings.RID_FAXWIZARDDIALOG_START_28
+        self.reslblTitle3_value = strings.RID_FAXWIZARDDIALOG_START_29
+        self.reslblTitle4_value = strings.RID_FAXWIZARDDIALOG_START_30
+        self.reslblTitle5_value = strings.RID_FAXWIZARDDIALOG_START_31
+        self.reslblTitle6_value = strings.RID_FAXWIZARDDIALOG_START_32
+        self.reschkFooterNextPages_value = strings.RID_FAXWIZARDDIALOG_START_33
+        self.reschkFooterPageNumbers_value = strings.RID_FAXWIZARDDIALOG_START_34
+        self.reschkUseDate_value = strings.RID_FAXWIZARDDIALOG_START_35
+        self.reschkUseCommunicationType_value = strings.RID_FAXWIZARDDIALOG_START_36
+        self.resLabel1_value = strings.RID_FAXWIZARDDIALOG_START_37
+        self.resoptReceiverPlaceholder_value = strings.RID_FAXWIZARDDIALOG_START_38
+        self.resoptReceiverDatabase_value = strings.RID_FAXWIZARDDIALOG_START_39
+        self.resLabel2_value = strings.RID_FAXWIZARDDIALOG_START_40
 
         #Create a Dictionary for the constants values.
         self.dictConstants = {
-        "#to#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 41),
-        "#from#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 42),
-        "#faxconst#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 43),
-        "#telconst#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 44),
-        "#emailconst#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 45),
-        "#consist1#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 46),
-        "#consist2#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47),
-        "#consist3#" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)}
+        "#to#" : strings.RID_FAXWIZARDDIALOG_START_41,
+        "#from#" : strings.RID_FAXWIZARDDIALOG_START_42,
+        "#faxconst#" : strings.RID_FAXWIZARDDIALOG_START_43,
+        "#telconst#" : strings.RID_FAXWIZARDDIALOG_START_44,
+        "#emailconst#" : strings.RID_FAXWIZARDDIALOG_START_45,
+        "#consist1#" : strings.RID_FAXWIZARDDIALOG_START_46,
+        "#consist2#" : strings.RID_FAXWIZARDDIALOG_START_47,
+        "#consist3#" : strings.RID_FAXWIZARDDIALOG_START_48}
 
         #Create a dictionary for localising the private template
         self.dictPrivateTemplate = {
-        "Bottle" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
-        "Fax" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 56),
-        "Lines" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
-        "Marine" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)}
+        "Bottle" : strings.RID_FAXWIZARDDIALOG_START_49,
+        "Fax" : strings.RID_FAXWIZARDDIALOG_START_56,
+        "Lines" : strings.RID_FAXWIZARDDIALOG_START_50,
+        "Marine" : strings.RID_FAXWIZARDDIALOG_START_51}
 
         #Create a dictionary for localising the business template
         self.dictBusinessTemplate = {
-        "Classic Fax" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52),
-        "Classic Fax from Private" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 53),
-        "Modern Fax" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54),
-        "Modern Fax from Private" : oWizardResource.getResText(
-            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)}
+        "Classic Fax" : strings.RID_FAXWIZARDDIALOG_START_52,
+        "Classic Fax from Private" : strings.RID_FAXWIZARDDIALOG_START_53,
+        "Modern Fax" : strings.RID_FAXWIZARDDIALOG_START_54,
+        "Modern Fax from Private" : strings.RID_FAXWIZARDDIALOG_START_55}
 
         #Common Resources
-        self.resOverwriteWarning = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_RID_COMMON_START + 19)
-        self.resTemplateDescription = oWizardResource.getResText(
-            FaxWizardDialogResources.RID_RID_COMMON_START + 20)
+        self.resOverwriteWarning = strings.RID_COMMON_START_19
+        self.resTemplateDescription = strings.RID_COMMON_START_20
 
         self.RoadmapLabels = []
-        self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 1))
-        self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 2))
-        self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 3))
-        self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 4))
-        self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 5))
+        self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_1)
+        self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_2)
+        self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_3)
+        self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_4)
+        self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_5)
         self.SalutationLabels = []
-        self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 1))
-        self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 2))
-        self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 3))
-        self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 4))
+        self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_1)
+        self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_2)
+        self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_3)
+        self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_4)
         self.GreetingLabels = []
-        self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 1))
-        self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 2))
-        self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 3))
-        self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 4))
+        self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_1)
+        self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_2)
+        self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_3)
+        self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_4)
         self.CommunicationLabels = []
-        self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 1))
-        self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 2))
-        self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 3))
+        self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_1)
+        self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_2)
+        self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_3)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 5d7c2e39eabf..0208de833f56 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -28,7 +28,7 @@ class LetterWizardDialog(WizardDialog):
         super(LetterWizardDialog, self).__init__(xmsf, HIDMAIN )
 
         #Load Resources
-        self.resources = LetterWizardDialogResources(self.oWizardResource)
+        self.resources = LetterWizardDialogResources()
         
         #set dialog properties...        
         self.setDialogProperties(True, 210, True, 104, 52, 1, 1, 
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index fb5fd2732065..34a82cfd552b 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -18,240 +18,108 @@
 
 class LetterWizardDialogResources(object):
 
-    RID_LETTERWIZARDDIALOG_START = 3000
-    RID_LETTERWIZARDGREETING_START = 3080
-    RID_LETTERWIZARDSALUTATION_START = 3090
-    RID_LETTERWIZARDROADMAP_START = 3100
-    RID_RID_COMMON_START = 500
+    def __init__(self):
+        import imp, os
+        imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+        import strings
 
-    def __init__(self, oWizardResource):
-
-        self.resLetterWizardDialog_title = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 1)
-        self.resLabel9_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 2)
-        self.resoptBusinessLetter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 3)
-        self.resoptPrivOfficialLetter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 4)
-        self.resoptPrivateLetter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 5)
-        self.reschkBusinessPaper_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 6)
-        self.reschkPaperCompanyLogo_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 7)
-        self.reschkPaperCompanyAddress_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 8)
-        self.reschkPaperFooter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 9)
-        self.reschkCompanyReceiver_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 10)
-        self.reschkUseLogo_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 11)
-        self.reschkUseAddressReceiver_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 12)
-        self.reschkUseSigns_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 13)
-        self.reschkUseSubject_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 14)
-        self.reschkUseSalutation_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 15)
-        self.reschkUseBendMarks_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 16)
-        self.reschkUseGreeting_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 17)
-        self.reschkUseFooter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 18)
-        self.resoptSenderPlaceholder_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 19)
-        self.resoptSenderDefine_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 20)
-        self.resoptReceiverPlaceholder_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 21)
-        self.resoptReceiverDatabase_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 22)
-        self.reschkFooterNextPages_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 23)
-        self.reschkFooterPageNumbers_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 24)
-        self.restxtTemplateName_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 25)
-        self.resoptCreateLetter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 26)
-        self.resoptMakeChanges_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 27)
-        self.reslblBusinessStyle_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 28)
-        self.reslblPrivOfficialStyle_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 29)
-        self.reslblPrivateStyle_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 30)
-        self.reslblIntroduction_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 31)
-        self.reslblLogoHeight_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 32)
-        self.reslblLogoWidth_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 33)
-        self.reslblLogoX_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 34)
-        self.reslblLogoY_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 35)
-        self.reslblAddressHeight_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 36)
-        self.reslblAddressWidth_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 37)
-        self.reslblAddressX_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 38)
-        self.reslblAddressY_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 39)
-        self.reslblFooterHeight_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 40)
-        self.reslblSenderAddress_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 42)
-        self.reslblSenderName_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 43)
-        self.reslblSenderStreet_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 44)
-        self.reslblPostCodeCity_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 45)
-        self.reslblReceiverAddress_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 46)
-        self.reslblFooter_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 47)
-        self.reslblFinalExplanation1_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 48)
-        self.reslblFinalExplanation2_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 49)
-        self.reslblTemplateName_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 50)
-        self.reslblTemplatePath_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 51)
-        self.reslblProceed_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 52)
-        self.reslblTitle1_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 53)
-        self.reslblTitle3_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 54)
-        self.reslblTitle2_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 55)
-        self.reslblTitle4_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 56)
-        self.reslblTitle5_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 57)
-        self.reslblTitle6_value = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 58)
+        self.resLetterWizardDialog_title = strings.RID_LETTERWIZARDDIALOG_START_1
+        self.resLabel9_value = strings.RID_LETTERWIZARDDIALOG_START_2
+        self.resoptBusinessLetter_value = strings.RID_LETTERWIZARDDIALOG_START_3
+        self.resoptPrivOfficialLetter_value = strings.RID_LETTERWIZARDDIALOG_START_4
+        self.resoptPrivateLetter_value = strings.RID_LETTERWIZARDDIALOG_START_5
+        self.reschkBusinessPaper_value = strings.RID_LETTERWIZARDDIALOG_START_6
+        self.reschkPaperCompanyLogo_value = strings.RID_LETTERWIZARDDIALOG_START_7
+        self.reschkPaperCompanyAddress_value = strings.RID_LETTERWIZARDDIALOG_START_8
+        self.reschkPaperFooter_value = strings.RID_LETTERWIZARDDIALOG_START_9
+        self.reschkCompanyReceiver_value = strings.RID_LETTERWIZARDDIALOG_START_10
+        self.reschkUseLogo_value = strings.RID_LETTERWIZARDDIALOG_START_11
+        self.reschkUseAddressReceiver_value = strings.RID_LETTERWIZARDDIALOG_START_12
+        self.reschkUseSigns_value = strings.RID_LETTERWIZARDDIALOG_START_13
+        self.reschkUseSubject_value = strings.RID_LETTERWIZARDDIALOG_START_14
+        self.reschkUseSalutation_value = strings.RID_LETTERWIZARDDIALOG_START_15
+        self.reschkUseBendMarks_value = strings.RID_LETTERWIZARDDIALOG_START_16
+        self.reschkUseGreeting_value = strings.RID_LETTERWIZARDDIALOG_START_17
+        self.reschkUseFooter_value = strings.RID_LETTERWIZARDDIALOG_START_18
+        self.resoptSenderPlaceholder_value = strings.RID_LETTERWIZARDDIALOG_START_19
+        self.resoptSenderDefine_value = strings.RID_LETTERWIZARDDIALOG_START_20
+        self.resoptReceiverPlaceholder_value = strings.RID_LETTERWIZARDDIALOG_START_21
+        self.resoptReceiverDatabase_value = strings.RID_LETTERWIZARDDIALOG_START_22
+        self.reschkFooterNextPages_value = strings.RID_LETTERWIZARDDIALOG_START_23
+        self.reschkFooterPageNumbers_value = strings.RID_LETTERWIZARDDIALOG_START_24
+        self.restxtTemplateName_value = strings.RID_LETTERWIZARDDIALOG_START_25
+        self.resoptCreateLetter_value = strings.RID_LETTERWIZARDDIALOG_START_26
+        self.resoptMakeChanges_value = strings.RID_LETTERWIZARDDIALOG_START_27
+        self.reslblBusinessStyle_value = strings.RID_LETTERWIZARDDIALOG_START_28
+        self.reslblPrivOfficialStyle_value = strings.RID_LETTERWIZARDDIALOG_START_29
+        self.reslblPrivateStyle_value = strings.RID_LETTERWIZARDDIALOG_START_30
+        self.reslblIntroduction_value = strings.RID_LETTERWIZARDDIALOG_START_31
+        self.reslblLogoHeight_value = strings.RID_LETTERWIZARDDIALOG_START_32
+        self.reslblLogoWidth_value = strings.RID_LETTERWIZARDDIALOG_START_33
+        self.reslblLogoX_value = strings.RID_LETTERWIZARDDIALOG_START_34
+        self.reslblLogoY_value = strings.RID_LETTERWIZARDDIALOG_START_35
+        self.reslblAddressHeight_value = strings.RID_LETTERWIZARDDIALOG_START_36
+        self.reslblAddressWidth_value = strings.RID_LETTERWIZARDDIALOG_START_37
+        self.reslblAddressX_value = strings.RID_LETTERWIZARDDIALOG_START_38
+        self.reslblAddressY_value = strings.RID_LETTERWIZARDDIALOG_START_39
+        self.reslblFooterHeight_value = strings.RID_LETTERWIZARDDIALOG_START_40
+        self.reslblSenderAddress_value = strings.RID_LETTERWIZARDDIALOG_START_42
+        self.reslblSenderName_value = strings.RID_LETTERWIZARDDIALOG_START_43
+        self.reslblSenderStreet_value = strings.RID_LETTERWIZARDDIALOG_START_44
+        self.reslblPostCodeCity_value = strings.RID_LETTERWIZARDDIALOG_START_45
+        self.reslblReceiverAddress_value = strings.RID_LETTERWIZARDDIALOG_START_46
+        self.reslblFooter_value = strings.RID_LETTERWIZARDDIALOG_START_47
+        self.reslblFinalExplanation1_value = strings.RID_LETTERWIZARDDIALOG_START_48
+        self.reslblFinalExplanation2_value = strings.RID_LETTERWIZARDDIALOG_START_49
+        self.reslblTemplateName_value = strings.RID_LETTERWIZARDDIALOG_START_50
+        self.reslblTemplatePath_value = strings.RID_LETTERWIZARDDIALOG_START_51
+        self.reslblProceed_value = strings.RID_LETTERWIZARDDIALOG_START_52
+        self.reslblTitle1_value = strings.RID_LETTERWIZARDDIALOG_START_53
+        self.reslblTitle3_value = strings.RID_LETTERWIZARDDIALOG_START_54
+        self.reslblTitle2_value = strings.RID_LETTERWIZARDDIALOG_START_55
+        self.reslblTitle4_value = strings.RID_LETTERWIZARDDIALOG_START_56
+        self.reslblTitle5_value = strings.RID_LETTERWIZARDDIALOG_START_57
+        self.reslblTitle6_value = strings.RID_LETTERWIZARDDIALOG_START_58
 
         #Create a Dictionary for the constants values.
         self.dictConstants = {
-        "#subjectconst#" : oWizardResource.getResText(
-            LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 59)}
+        "#subjectconst#" : strings.RID_LETTERWIZARDDIALOG_START_59}
 
         #Create a dictionary for localising the business templates
         self.dictBusinessTemplate = {
-        "Elegant" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
-        "Modern" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
-        "Office" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
+        "Elegant" : strings.RID_LETTERWIZARDDIALOG_START_60,
+        "Modern" : strings.RID_LETTERWIZARDDIALOG_START_61,
+        "Office" : strings.RID_LETTERWIZARDDIALOG_START_62}
 
         #Create a dictionary for localising the official templates
         self.dictOfficialTemplate = {
-        "Elegant" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
-        "Modern" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
-        "Office" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
+        "Elegant" : strings.RID_LETTERWIZARDDIALOG_START_60,
+        "Modern" : strings.RID_LETTERWIZARDDIALOG_START_61,
+        "Office" : strings.RID_LETTERWIZARDDIALOG_START_62}
 
         #Create a dictionary for localising the private templates
         self.dictPrivateTemplate = {
-        "Bottle" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 63),
-        "Mail" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 64),
-        "Marine" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 65),
-        "Red Line" : oWizardResource.getResText(
-                LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 66)}
+        "Bottle" : strings.RID_LETTERWIZARDDIALOG_START_63,
+        "Mail" : strings.RID_LETTERWIZARDDIALOG_START_64,
+        "Marine" : strings.RID_LETTERWIZARDDIALOG_START_65,
+        "Red Line" : strings.RID_LETTERWIZARDDIALOG_START_66}
 
         #Common Resources
-        self.resOverwriteWarning = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_RID_COMMON_START + 19)
-        self.resTemplateDescription = \
-            oWizardResource.getResText(
-                LetterWizardDialogResources.RID_RID_COMMON_START + 20)
+        self.resOverwriteWarning = strings.RID_COMMON_START_19
+        self.resTemplateDescription = strings.RID_COMMON_START_20
 
         self.RoadmapLabels = []
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 1))
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 2))
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 3))
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 4))
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 5))
-        self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 6))
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_1)
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_2)
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_3)
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_4)
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_5)
+        self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_6)
         self.SalutationLabels = []
-        self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 1))
-        self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 2))
-        self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 3))
+        self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_1)
+        self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_2)
+        self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_3)
         self.GreetingLabels = []
-        self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 1))
-        self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 2))
-        self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 3))
+        self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_1)
+        self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_2)
+        self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_3)
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.py b/wizards/com/sun/star/wizards/ui/UIConsts.py
index f1d7b048c07c..e5a4e25e29df 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.py
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.py
@@ -17,7 +17,6 @@
 #
 class UIConsts():
 
-    RID_COMMON = 500
     INVISIBLESTEP = 99
     INFOIMAGEURL = "private:graphicrepository/dbaccess/res/exinfo.png"
 
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index e107c63d442d..7603d6bad436 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -20,7 +20,6 @@ import traceback
 from abc import ABCMeta, abstractmethod
 from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
     ItemListenerProcAdapter
-from ..common.Resource import Resource
 from ..common.HelpIds import HelpIds
 from ..common.FileAccess import FileAccess
 
@@ -29,6 +28,10 @@ from com.sun.star.frame import TerminationVetoException
 from com.sun.star.awt.PushButtonType import HELP, STANDARD
 from com.sun.star.awt.FontWeight import BOLD
 
+import imp, os
+imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+import strings
+
 class WizardDialog(UnoDialog2):
 
     __metaclass__ = ABCMeta
@@ -60,7 +63,6 @@ class WizardDialog(UnoDialog2):
         self.nOldStep = 1
         self.nMaxStep = 1
         self.bTerminateListenermustberemoved = True
-        self.oWizardResource = Resource(xMSF, "dbw")
         self.oRoadmap = None
         self.terminateListener = None
 
@@ -161,10 +163,13 @@ class WizardDialog(UnoDialog2):
             xRoadmapControl.addItemListener(
                 ItemListenerProcAdapter(method))
 
-            self.oRoadmap.Text = \
-                self.oWizardResource.getResText(UIConsts.RID_COMMON + 16)
+            self.oRoadmap.Text = strings.RID_COMMON_START_16
         except NoSuchMethodException:
-            Resource.showCommonResourceError(xMSF)
+            from com.sun.star.awt.VclWindowPeerAttribute import OK
+            from .SystemDialog import SystemDialog
+            sError = "The files required could not be found.\n" + \
+                "Please start the LibreOffice Setup and choose 'Repair'."
+            SystemDialog.showMessageBox(xMSF, "ErrorBox", OK, sError)
         except Exception:
             traceback.print_exc()
 
@@ -272,26 +277,26 @@ class WizardDialog(UnoDialog2):
                     PropertyNames.PROPERTY_TABINDEX,
                     PropertyNames.PROPERTY_WIDTH),
                 (True, iButtonHeight,
-                    self.oWizardResource.getResText(UIConsts.RID_COMMON + 15),
+                    strings.RID_COMMON_START_15,
                     iHelpPosX, iBtnPosY,
                     uno.Any("short",HELP), iCurStep,
                     uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
             self.insertButton("btnWizardBack",
                 WizardDialog.__BACK_ACTION_PERFORMED, propNames,
                 (False, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 2),
-                    self.oWizardResource.getResText(UIConsts.RID_COMMON + 13),
+                    strings.RID_COMMON_START_13,
                     iBackPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
                     uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
             self.insertButton("btnWizardNext",
                 WizardDialog.__NEXT_ACTION_PERFORMED, propNames,
                 (True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 3),
-                    self.oWizardResource.getResText(UIConsts.RID_COMMON + 14),
+                    strings.RID_COMMON_START_14,
                     iNextPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
                     uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
             self.insertButton("btnWizardFinish",
                 WizardDialog.__FINISH_ACTION_PERFORMED, propNames,
                 (True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 4),
-                    self.oWizardResource.getResText(UIConsts.RID_COMMON + 12),
+                    strings.RID_COMMON_START_12,
                         iFinishPosX, iBtnPosY, uno.Any("short",STANDARD),
                         iCurStep,
                         uno.Any("short",(curtabindex + 1)),
@@ -299,7 +304,7 @@ class WizardDialog(UnoDialog2):
             self.insertButton("btnWizardCancel",
                 WizardDialog.__CANCEL_ACTION_PERFORMED, propNames,
                 (True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 5),
-                    self.oWizardResource.getResText(UIConsts.RID_COMMON + 11),
+                    strings.RID_COMMON_START_11,
                     iCancelPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
                     uno.Any("short",(curtabindex + 1)),
                     iButtonWidth), self)
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
deleted file mode 100644
index b4352fc8d4c9..000000000000
--- a/wizards/source/formwizard/dbwizres.src
+++ /dev/null
@@ -1,1351 +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_COMMON_START					500
-
-#define RID_LETTERWIZARDDIALOG_START		3000
-#define RID_LETTERWIZARDGREETING_START	3080
-#define RID_LETTERWIZARDSALUTATION_START	3090
-#define RID_LETTERWIZARDROADMAP_START	3100
-
-#define RID_FAXWIZARDDIALOG_START			3200
-#define RID_FAXWIZARDCOMMUNICATION_START	3270
-#define RID_FAXWIZARDGREETING_START		3280
-#define RID_FAXWIZARDSALUTATION_START		3290
-#define RID_FAXWIZARDROADMAP_START		3300
-
-// agenda wizard
-
-#define RID_AGENDAWIZARDDIALOG_START              5000
-
-String RID_COMMON_START + 0
-{
-    Text [ en-US ] = "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk.";
-};
-
-String RID_COMMON_START + 1
-{
-    Text [ en-US] = "The text document could not be created.<BR>Please check if the module 'PRODUCTNAME Writer' is installed.";
-};
-
-String RID_COMMON_START + 2
-{
-    Text [ en-US] = "The spreadsheet could not be created.<BR>Please check if the module 'PRODUCTNAME Calc' is installed.";
-};
-
-String RID_COMMON_START + 3
-{
-    Text [ en-US] = "The presentation could not be created.<BR>Please check if the module 'PRODUCTNAME Impress' is installed.";
-};
-
-String RID_COMMON_START + 4
-{
-    Text [ en-US] = "The drawing could not be created.<BR>Please check if the module 'PRODUCTNAME Draw' is installed.";
-};
-
-String RID_COMMON_START + 5
-{
-    Text [ en-US] = "The formula could not be created.<BR>Please check if the module 'PRODUCTNAME Math' is installed.";
-};
-
-String RID_COMMON_START + 6
-{
-    Text [ en-US] = "The files required could not be found.<BR>Please start the %PRODUCTNAME Setup and choose 'Repair'.";
-};
-
-String RID_COMMON_START + 7
-{
-    Text [ en-US] = "The file '<PATH>' already exists.<BR><BR>Would you like to overwrite the existing file?";
-};
-
-String RID_COMMON_START + 8
-{
-    Text [ en-US] = "Yes";
-};
-
-String RID_COMMON_START + 9
-{
-    Text [ en-US] = "Yes to All";
-};
-
-String RID_COMMON_START + 10
-{
-    Text [ en-US] = "No";
-};
-
-String RID_COMMON_START + 11
-{
-    Text [ en-US] = "Cancel";
-};
-
-String RID_COMMON_START + 12
-{
-    Text [ en-US] = "~Finish";
-};
-
-String RID_COMMON_START + 13
-{
-    Text [ en-US] = "< ~Back";
-};
-
-String RID_COMMON_START + 14
-{
-    Text [ en-US] = "~Next >";
-};
-
-String RID_COMMON_START + 15
-{
-    Text [ en-US ] = "~Help";
-};
-
-String RID_COMMON_START + 16
-{
-    Text [ en-US] = "Steps";
-};
-
-String RID_COMMON_START + 17
-{
-    Text [ en-US] = "Close";
-};
-
-String RID_COMMON_START + 18
-{
-    Text [ en-US] = "OK";
-};
-
-String RID_COMMON_START + 19
-{
-    Text [ en-US] = "The file already exists. Do you want to overwrite it?";
-};
-
-String RID_COMMON_START + 20
-{
-    Text [ en-US] = "Template created via <wizard_name> on <current_date>.";
-};
-
-String RID_COMMON_START + 21
-{
-    Text [ en-US] = "The wizard could not be run, because important files were not found.\nUnder 'Tools - Options - %PRODUCTNAME - Paths' click the 'Default' button to reset the paths to the original default settings.\nThen run the wizard again.";
-};
-
-// end of common section
-
-// LETTER WIZARD RESOURCES
-
-String RID_LETTERWIZARDDIALOG_START + 1
-{
-    Text [ en-US] = "Letter Wizard";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 2
-{
-    Text [ en-US] = "Label9";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 3
-{
-    Text [ en-US] = "~Business letter";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 4
-{
-    Text [ en-US] = "~Formal personal letter";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 5
-{
-    Text [ en-US] = "~Personal letter";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 6
-{
-    Text [ en-US] = "~Use letterhead paper with pre-printed elements";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 7
-{
-    Text [ en-US] = "~Logo";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 8
-{
-    Text [ en-US] = "Return address";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 9
-{
-    Text [ en-US] = "~Include footer";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 10
-{
-    Text [ en-US] = "~Return address in envelope window";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 11
-{
-    Text [ en-US] = "~Logo";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 12
-{
-    Text [ en-US] = "~Return address in envelope window";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 13
-{
-    Text [ en-US] = "Letter Signs";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 14
-{
-    Text [ en-US] = "S~ubject line";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 15
-{
-    Text [ en-US] = "Salu~tation";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 16
-{
-    Text [ en-US] = "Fold ~marks";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 17
-{
-    Text [ en-US] = "~Complimentary close";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 18
-{
-    Text [ en-US] = "~Footer";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 19
-{
-    Text [ en-US] = "~Use user data for return address";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 20
-{
-    Text [ en-US] = "~New sender address:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 21
-{
-    Text [ en-US] = "Use placeholders for ~recipient's address";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 22
-{
-    Text [ en-US] = "Use address database for ~mail merge";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 23
-{
-    Text [ en-US] = "Include ~only on second and following pages";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 24
-{
-    Text [ en-US] = "~Include page number";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 25
-{
-    Text [ en-US] = "Letter Template";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 26
-{
-    Text [ en-US] = "Create a ~letter from this template";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 27
-{
-    Text [ en-US] = "Make ~manual changes to this letter template";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 28
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 29
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 30
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 31
-{
-    Text [ en-US] = "This wizard helps you to create a letter template. You can then use the template as the basis for writing letters as often as desired.";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 32
-{
-    Text [ en-US] = "~Height:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 33
-{
-    Text [ en-US] = "~Width:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 34
-{
-    Text [ en-US] = "S~pacing to left margin:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 35
-{
-    Text [ en-US] = "Spacing ~to top margin:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 36
-{
-    Text [ en-US] = "Height:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 37
-{
-    Text [ en-US] = "Width:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 38
-{
-    Text [ en-US] = "S~pacing to left margin:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 39
-{
-    Text [ en-US] = "Spacing ~to top margin:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 40
-{
-    Text [ en-US] = "Height:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 42
-{
-    Text [ en-US] = "Sender's address";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 43
-{
-    Text [ en-US] = "Name:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 44
-{
-    Text [ en-US] = "Street:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 45
-{
-    Text [ en-US] = "ZIP code/State/City:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 46
-{
-    Text [ en-US] = "Recipient's address";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 47
-{
-    Text [ en-US] = "Footer";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 48
-{
-    Text [ en-US] = "This wizard creates a letter template which enables you to create multiple letters with the same layout and settings.";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 49
-{
-    Text [ en-US] = "To create another new letter out of the template just navigate to the template location and double-click it.";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 50
-{
-    Text [ en-US] = "Template name:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 51
-{
-    Text [ en-US] = "Location and file name:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 52
-{
-    Text [ en-US] = "How do you want to proceed?";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 53
-{
-    Text [ en-US] = "Please choose the type of letter and page design";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 54
-{
-    Text [ en-US] = "Select the items to be printed";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 55
-{
-    Text [ en-US] = "Specify items already on your letterhead paper";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 56
-{
-    Text [ en-US] = "Specify the sender and recipient information";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 57
-{
-    Text [ en-US] = "Fill in the information you would like in the footer";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 58
-{
-    Text [ en-US] = "Please specify last settings";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 59
-{
-    Text [ en-US] = "Subject:";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 60
-{
-    Text [ en-US] = "Elegant";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 61
-{
-    Text [ en-US] = "Modern";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 62
-{
-    Text [ en-US] = "Office";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 63
-{
-    Text [ en-US] = "Bottle";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 64
-{
-    Text [ en-US] = "Mail";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 65
-{
-    Text [ en-US] = "Marine";
-};
-
-String RID_LETTERWIZARDDIALOG_START + 66
-{
-    Text [ en-US] = "Red Line";
-};
-
-// Letter Wizard Greeting Start
-String RID_LETTERWIZARDSALUTATION_START + 1
-{
-    Text [ en-US] = "To Whom it May Concern";
-};
-
-String RID_LETTERWIZARDSALUTATION_START + 2
-{
-    Text [ en-US] = "Dear Sir or Madam";
-};
-
-String RID_LETTERWIZARDSALUTATION_START + 3
-{
-    Text [ en-US] = "Hello";
-};
-
-// Letter Wizard Greeting Start
-String RID_LETTERWIZARDGREETING_START + 1
-{
-    Text [ en-US] = "Sincerely";
-};
-
-String RID_LETTERWIZARDGREETING_START + 2
-{
-    Text [ en-US] = "Best regards";
-};
-
-String RID_LETTERWIZARDGREETING_START + 3
-{
-    Text [ en-US] = "Cheers";
-};
-
-// Letter Wizard Roadmap Start
-String RID_LETTERWIZARDROADMAP_START + 1
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_LETTERWIZARDROADMAP_START + 2
-{
-    Text [ en-US] = "Letterhead layout";
-};
-
-String RID_LETTERWIZARDROADMAP_START + 3
-{
-    Text [ en-US] = "Printed items";
-};
-
-String RID_LETTERWIZARDROADMAP_START + 4
-{
-    Text [ en-US] = "Recipient and sender";
-};
-
-String RID_LETTERWIZARDROADMAP_START + 5
-{
-    Text [ en-US] = "Footer";
-};
-
-String RID_LETTERWIZARDROADMAP_START + 6
-{
-    Text [ en-US] = "Name and location";
-};
-
-// FAX WIZARD RESOURCES
-
-String RID_FAXWIZARDDIALOG_START + 1
-{
-    Text [ en-US] = "Fax Wizard";
-};
-
-String RID_FAXWIZARDDIALOG_START + 2
-{
-    Text [ en-US] = "Label9";
-};
-
-String RID_FAXWIZARDDIALOG_START + 3
-{
-    Text [ en-US] = "~Business Fax";
-};
-
-String RID_FAXWIZARDDIALOG_START + 4
-{
-    Text [ en-US] = "~Personal Fax";
-};
-
-String RID_FAXWIZARDDIALOG_START + 5
-{
-    Text [ en-US] = "~Logo";
-};
-
-String RID_FAXWIZARDDIALOG_START + 6
-{
-    Text [ en-US] = "S~ubject line";
-};
-
-String RID_FAXWIZARDDIALOG_START + 7
-{
-    Text [ en-US] = "S~alutation";
-};
-
-String RID_FAXWIZARDDIALOG_START + 8
-{
-    Text [ en-US] = "~Complimentary close";
-};
-
-String RID_FAXWIZARDDIALOG_START + 9
-{
-    Text [ en-US] = "~Footer";
-};
-
-String RID_FAXWIZARDDIALOG_START + 10
-{
-    Text [ en-US] = "~Use user data for return address";
-};
-
-String RID_FAXWIZARDDIALOG_START + 11
-{
-    Text [ en-US] = "~New return address";
-};
-
-String RID_FAXWIZARDDIALOG_START + 12
-{
-    Text [ en-US] = "My Fax Template";
-};
-
-String RID_FAXWIZARDDIALOG_START + 13
-{
-    Text [ en-US] = "Create a ~fax from this template";
-};
-
-String RID_FAXWIZARDDIALOG_START + 14
-{
-    Text [ en-US] = "Make ~manual changes to this fax template";
-};
-
-String RID_FAXWIZARDDIALOG_START + 15
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_FAXWIZARDDIALOG_START + 16
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_FAXWIZARDDIALOG_START + 17
-{
-    Text [ en-US] = "This wizard helps you to create a fax template. The template can then be used to create a fax whenever needed.";
-};
-
-String RID_FAXWIZARDDIALOG_START + 18
-{
-    Text [ en-US] = "Return address";
-};
-
-String RID_FAXWIZARDDIALOG_START + 19
-{
-    Text [ en-US] = "Name:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 20
-{
-    Text [ en-US] = "Street:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 21
-{
-    Text [ en-US] = "ZIP code/State/City:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 22
-{
-    Text [ en-US] = "Footer";
-};
-
-String RID_FAXWIZARDDIALOG_START + 23
-{
-    Text [ en-US] = "This wizard creates a fax template which enables you to create multiple faxes with the same layout and settings.";
-};
-
-String RID_FAXWIZARDDIALOG_START + 24
-{
-    Text [ en-US] = "To create another new fax out of the template, go to the location where you saved the template and double-click the file.";
-};
-
-String RID_FAXWIZARDDIALOG_START + 25
-{
-    Text [ en-US] = "Template Name:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 26
-{
-    Text [ en-US] = "Location and file name:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 27
-{
-    Text [ en-US] = "What do you want to do next?";
-};
-
-String RID_FAXWIZARDDIALOG_START + 28
-{
-    Text [ en-US] = "Choose the type of fax and a page design";
-};
-
-String RID_FAXWIZARDDIALOG_START + 29
-{
-    Text [ en-US] = "Select items to include in the fax template";
-};
-
-String RID_FAXWIZARDDIALOG_START + 30
-{
-    Text [ en-US] = "Specify sender and recipient information";
-};
-
-String RID_FAXWIZARDDIALOG_START + 31
-{
-    Text [ en-US] = "Enter text for the footer";
-};
-
-String RID_FAXWIZARDDIALOG_START + 32
-{
-    Text [ en-US] = "Choose a name and save the template";
-};
-
-String RID_FAXWIZARDDIALOG_START + 33
-{
-    Text [ en-US] = "Include ~only on second and following pages";
-};
-
-String RID_FAXWIZARDDIALOG_START + 34
-{
-    Text [ en-US] = "~Include page number";
-};
-
-String RID_FAXWIZARDDIALOG_START + 35
-{
-    Text [ en-US] = "~Date";
-};
-
-String RID_FAXWIZARDDIALOG_START + 36
-{
-    Text [ en-US] = "~Type of message";
-};
-
-String RID_FAXWIZARDDIALOG_START + 37
-{
-    Text [ en-US] = "Fax Number:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 38
-{
-    Text [ en-US] = "Use placeholders for ~recipient's address";
-};
-
-String RID_FAXWIZARDDIALOG_START + 39
-{
-    Text [ en-US] = "Use address database for ~mail merge";
-};
-
-String RID_FAXWIZARDDIALOG_START + 40
-{
-    Text [ en-US] = "~New return address";
-};
-
-String RID_FAXWIZARDDIALOG_START + 41
-{
-    Text [ en-US] = "To:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 42
-{
-    Text [ en-US] = "From:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 43
-{
-    Text [ en-US] = "Fax:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 44
-{
-    Text [ en-US] = "Tel:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 45
-{
-    Text [ en-US] = "E-mail:";
-};
-
-String RID_FAXWIZARDDIALOG_START + 46
-{
-    Text [ en-US] = "This template consists of";
-};
-
-String RID_FAXWIZARDDIALOG_START + 47
-{
-    Text [ en-US] = "page";
-};
-
-String RID_FAXWIZARDDIALOG_START + 48
-{
-    Text [ en-US] = "Please inform us if transmission errors occur.";
-};
-
-String RID_FAXWIZARDDIALOG_START + 49
-{
-    Text [ en-US] = "Bottle";
-};
-
-String RID_FAXWIZARDDIALOG_START + 50
-{
-    Text [ en-US] = "Lines";
-};
-
-String RID_FAXWIZARDDIALOG_START + 51
-{
-    Text [ en-US] = "Marine";
-};
-
-String RID_FAXWIZARDDIALOG_START + 52
-{
-    Text [ en-US] = "Classic Fax";
-};
-
-String RID_FAXWIZARDDIALOG_START + 53
-{
-    Text [ en-US] = "Classic Fax from Private";
-};
-
-String RID_FAXWIZARDDIALOG_START + 54
-{
-    Text [ en-US] = "Modern Fax";
-};
-
-String RID_FAXWIZARDDIALOG_START + 55
-{
-    Text [ en-US] = "Modern Fax from Private";
-};
-
-String RID_FAXWIZARDDIALOG_START + 56
-{
-    Text [ en-US] = "Fax";
-};
-
-// Fax Wizard Communication Start
-String RID_FAXWIZARDCOMMUNICATION_START + 1
-{
-    Text [ en-US] = "Important Information!";
-};
-
-String RID_FAXWIZARDCOMMUNICATION_START + 2
-{
-    Text [ en-US] = "For your information";
-};
-
-String RID_FAXWIZARDCOMMUNICATION_START + 3
-{
-    Text [ en-US] = "News!";
-};
-
-// Fax Wizard Salutation Start
-String RID_FAXWIZARDSALUTATION_START + 1
-{
-    Text [ en-US] = "To whom it may concern,";
-};
-
-String RID_FAXWIZARDSALUTATION_START + 2
-{
-    Text [ en-US] = "Dear Sir or Madam,";
-};
-
-String RID_FAXWIZARDSALUTATION_START + 3
-{
-    Text [ en-US] = "Hello,";
-};
-
-String RID_FAXWIZARDSALUTATION_START + 4
-{
-    Text [ en-US] = "Hi,";
-};
-
-// Fax Wizard Greeting Start
-String RID_FAXWIZARDGREETING_START + 1
-{
-    Text [ en-US] = "Sincerely";
-};
-
-String RID_FAXWIZARDGREETING_START + 2
-{
-    Text [ en-US] = "Yours faithfully";
-};
-
-String RID_FAXWIZARDGREETING_START + 3
-{
-    Text [ en-US] = "Regards";
-};
-
-String RID_FAXWIZARDGREETING_START + 4
-{
-    Text [ en-US] = "Love";
-};
-
-// Fax Wizard Roadmap Start
-String RID_FAXWIZARDROADMAP_START + 1
-{
-    Text [ en-US] = "Page design";
-};
-
-String RID_FAXWIZARDROADMAP_START + 2
-{
-    Text [ en-US] = "Items to include";
-};
-
-String RID_FAXWIZARDROADMAP_START + 3
-{
-    Text [ en-US] = "Sender and Recipient";
-};
-
-String RID_FAXWIZARDROADMAP_START + 4
-{
-    Text [ en-US] = "Footer";
-};
-
-String RID_FAXWIZARDROADMAP_START + 5
-{
-    Text [ en-US] = "Name and location";
-};
-
-// AGENDA WIZARD RESOURCES
-String RID_AGENDAWIZARDDIALOG_START +1
-{
-    Text [en-US ] = "Agenda Wizard";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +2
-{
-    Text [en-US ] = "Make ~manual changes to this agenda template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +3
-{
-    Text [en-US ] = "Template name:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START + 4
-{
-    Text [en-US ] = "Location and file name:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +5
-{
-    Text [en-US ] = "What do you want to do next?";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +6
-{
-    Text [en-US ] = "Please choose the page design for the agenda";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +7
-{
-    Text [en-US ] = "Please select the headings you wish to include in your agenda template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +8
-{
-    Text [en-US ] = "Please enter general information for the event";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +9
-{
-    Text [en-US ] = "Please specify items for the agenda";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +10
-{
-    Text [en-US ] = "Please select the names you wish to include in your agenda template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +11
-{
-    Text [en-US ] = "Choose a name and save the template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +12
-{
-    Text [en-US ] = "Include form for recording minutes";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +13
-{
-    Text [en-US ] = "This wizard helps you to create an agenda template. The template can then be used to create an agenda whenever needed.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +14
-{
-    Text [en-US ] = "Time:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +15
-{
-    Text [en-US ] = "Name:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START + 16
-{
-    Text [en-US ] = "Location:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +17
-{
-    Text [en-US ] = "Placeholders will be used in empty fields. You can replace placeholders with text later.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +18
-{
-    Text [en-US ] = "...";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +19
-{
-    Text [en-US ] = "Create an ~agenda from this template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +20
-{
-    Text [en-US ] = "To create a new agenda out of the template, go to the location where you saved the template and double-click the file.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +21
-{
-    Text [en-US ] = "Agenda item";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +22
-{
-    Text [en-US ] = "Responsible";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +23
-{
-    Text [en-US ] = "Duration";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +24
-{
-    Text [en-US ] = "Meeting called by";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +25
-{
-    Text [en-US ] = "Chairperson";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +26
-{
-    Text [en-US ] = "Minute keeper";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +27
-{
-    Text [en-US ] = "Moderator";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +28
-{
-    Text [en-US ] = "Attendees";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +29
-{
-    Text [en-US ] = "Observers";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +30
-{
-    Text [en-US ] = "Facility personnel";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +31
-{
-    Text [en-US ] = "The agenda template will include placeholders for the names of the selected people. When creating an agenda from the template, you can replace these placeholder with the appropriate names.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +32
-{
-    Text [en-US ] = "Type of meeting";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +33
-{
-    Text [en-US ] = "Please read";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +34
-{
-    Text [en-US ] = "Please bring";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +35
-{
-    Text [en-US ] = "Notes";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +36
-{
-    Text [en-US ] = "The agenda template will include placeholders for the selected items.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +38
-{
-    Text [en-US ] = "Date:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +39
-{
-    Text [en-US ] = "This wizard creates an agenda template which enables you to create multiple agendas with the same layout and settings.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +40
-{
-    Text [en-US ] = "Page design:";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +41
-{
-    Text [en-US ] = "myAgendaTemplate.stw";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +42
-{
-    Text [en-US ] = "My Agenda Template";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +43
-{
-    Text [en-US ] = "An unexpected error occurred while saving the agenda template.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +44
-{
-    Text [en-US ] = "Name";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +45
-{
-    Text [en-US ] = "Date";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +46
-{
-    Text [en-US ] = "Time";
-};
-
-String RID_AGENDAWIZARDDIALOG_START + 47
-{
-    Text [en-US ] = "Location";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +48
-{
-    Text [en-US ] = "Click to replace this text";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +50
-{
-    Text [en-US ] = "Page design";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +51
-{
-    Text [en-US ] = "General information";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +52
-{
-    Text [en-US ] = "Headings to include";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +53
-{
-    Text [en-US ] = "Names";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +54
-{
-    Text [en-US ] = "Agenda items";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +55
-{
-    Text [en-US ] = "Name and location";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +56
-{
-    Text [en-US ] = "An unexpected error occurred while opening the agenda template.";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +57
-{
-    Text [en-US ] = "Type of meeting";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +58
-{
-    Text [en-US ] = "Please bring";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +59
-{
-    Text [en-US ] = "Please read";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +60
-{
-    Text [en-US ] = "Notes";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +61
-{
-    Text [en-US ] = "Meeting called by";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +62
-{
-    Text [en-US ] = "Chairperson";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +63
-{
-    Text [en-US ] = "Attendees";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +64
-{
-    Text [en-US ] = "Minute keeper";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +65
-{
-    Text [en-US ] = "Moderator";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +66
-{
-    Text [en-US ] = "Observers";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +67
-{
-    Text [en-US ] = "Facility personnel";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +68
-{
-    Text [en-US ] = "Insert";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +69
-{
-    Text [en-US ] = "Remove";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +70
-{
-    Text [en-US ] = "Move up";
-};
-
-String RID_AGENDAWIZARDDIALOG_START +71
-{
-    Text [en-US ] = "Move down";
-};
-String RID_AGENDAWIZARDDIALOG_START +72
-{
-    Text [en-US ] = "Date:";
-};
-String RID_AGENDAWIZARDDIALOG_START +73
-{
-    Text [en-US ] = "Time:";
-};
-String RID_AGENDAWIZARDDIALOG_START +74
-{
-    Text [en-US ] = "Location:";
-};
-String RID_AGENDAWIZARDDIALOG_START +75
-{
-    Text [en-US ] = "Topics";
-};
-String RID_AGENDAWIZARDDIALOG_START +76
-{
-    Text [en-US ] = "Num.";
-};
-String RID_AGENDAWIZARDDIALOG_START +77
-{
-    Text [en-US ] = "Topic";
-};
-String RID_AGENDAWIZARDDIALOG_START +78
-{
-    Text [en-US ] = "Responsible";
-};
-String RID_AGENDAWIZARDDIALOG_START +79
-{
-    Text [en-US ] = "Time";
-};
-String RID_AGENDAWIZARDDIALOG_START +80
-{
-    Text [en-US ] = "Additional information";
-};
-String RID_AGENDAWIZARDDIALOG_START +81
-{
-    Text [en-US ] = "Minutes for";
-};
-String RID_AGENDAWIZARDDIALOG_START +82
-{
-    Text [en-US ] = "Discussion:";
-};
-String RID_AGENDAWIZARDDIALOG_START +83
-{
-    Text [en-US ] = "Conclusion:";
-};
-String RID_AGENDAWIZARDDIALOG_START +84
-{
-    Text [en-US ] = "To do:";
-};
-String RID_AGENDAWIZARDDIALOG_START +85
-{
-    Text [en-US ] = "Responsible party:";
-};
-String RID_AGENDAWIZARDDIALOG_START +86
-{
-    Text [en-US ] = "Deadline:";
-};
-String RID_AGENDAWIZARDDIALOG_START +87
-{
-    Text [en-US ] = "Blue";
-};
-String RID_AGENDAWIZARDDIALOG_START +88
-{
-    Text [en-US ] = "Classic";
-};
-String RID_AGENDAWIZARDDIALOG_START +89
-{
-    Text [en-US ] = "Colorful";
-};
-String RID_AGENDAWIZARDDIALOG_START +90
-{
-    Text [en-US ] = "Elegant";
-};
-String RID_AGENDAWIZARDDIALOG_START +91
-{
-    Text [en-US ] = "Green";
-};
-String RID_AGENDAWIZARDDIALOG_START +92
-{
-    Text [en-US ] = "Grey";
-};
-String RID_AGENDAWIZARDDIALOG_START +93
-{
-    Text [en-US ] = "Modern";
-};
-String RID_AGENDAWIZARDDIALOG_START +94
-{
-    Text [en-US ] = "Orange";
-};
-String RID_AGENDAWIZARDDIALOG_START +95
-{
-    Text [en-US ] = "Red";
-};
-String RID_AGENDAWIZARDDIALOG_START +96
-{
-    Text [en-US ] = "Simple";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index d1b47172283c..460affd28e07 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -306,7 +306,7 @@ Dim aArgs(5) as Any
 	oResSrv = getProcessServiceManager().createInstanceWithArguments( &quot;com.sun.star.resource.StringResourceWithLocation&quot;, aArgs() )
 	If (IsNull(oResSrv)) then
 		InitResources = FALSE
-		MsgBox(&quot;could not initialize ResourceIndexAccess&quot;)
+		MsgBox(&quot;could not initialize StringResourceWithLocation&quot;)
 	Else
 		InitResources = TRUE
 	End If
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index c970f8999cc0..0ba0b03dcb8f 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -31,7 +31,8 @@
 #include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 
 #include <iostream>
 #include <memory>
@@ -307,8 +308,7 @@ OUString GraphicNamingHelper::NameGraphic(const OUString& rTemplate)
     if (aRet.isEmpty())
     {
         // Empty template: then auto-generate a unique name.
-        std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
-        OUString aPrefix(ResId(STR_ObjNameSingulGRAF, *pResMgr));
+        OUString aPrefix(SvxResId(STR_ObjNameSingulGRAF));
         aRet += aPrefix + OUString::number(++m_nCounter);
     }
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index c32243636077..c4eda1d02186 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -36,7 +36,8 @@
 #include <tools/resmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 #include <comphelper/sequence.hxx>
 #include <unotools/mediadescriptor.hxx>
 
@@ -460,8 +461,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
                     // We want to care about the progress if we know the estimated paragraph count and we have given a status indicator as well.
                     // Set the end position only here, so later it's enough to check if that is non-zero in incrementProgress().
                     mnProgressEndPos = nValue;
-                    static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-                    OUString aDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr));
+                    OUString aDocLoad(SvxResId(RID_SVXSTR_DOC_LOAD));
                     mxStatusIndicator->start(aDocLoad, mnProgressEndPos);
                     mnPercentSize = mnProgressEndPos / 100;
                 }
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 42df67cbd160..027217008ac8 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -11,7 +11,8 @@
 #include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 #include <rtl/strbuf.hxx>
 #include <rtfskipdestination.hxx>
 #include <rtl/character.hxx>
@@ -66,8 +67,7 @@ RTFError RTFTokenizer::resolveParse()
 
     if (m_xStatusIndicator.is())
     {
-        static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-        OUString sDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr));
+        OUString sDocLoad(SvxResId(RID_SVXSTR_DOC_LOAD));
 
         sal_uInt64 const nCurrentPos = Strm().Tell();
         sal_uInt64 const nEndPos = nCurrentPos + Strm().remainingSize();
diff --git a/writerperfect/AllLangMoTarget_wpt.mk b/writerperfect/AllLangMoTarget_wpt.mk
new file mode 100644
index 000000000000..433bb66e8b9e
--- /dev/null
+++ b/writerperfect/AllLangMoTarget_wpt.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,wpt))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,wpt,writerperfect))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/AllLangResTarget_writerperfect.mk b/writerperfect/AllLangResTarget_writerperfect.mk
deleted file mode 100644
index bca319cd1ea3..000000000000
--- a/writerperfect/AllLangResTarget_writerperfect.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,writerperfect))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,writerperfect,writerperfect))
-
-$(eval $(call gb_AllLangResTarget_add_srs,writerperfect,\
-	writerperfect/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,writerperfect/res))
-
-$(eval $(call gb_SrsTarget_set_include,writerperfect/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/writerperfect/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,writerperfect/res,\
-    writerperfect/source/common/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index 7f95b28ffdb7..8f96421d68ab 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -34,7 +34,4 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_draw,\
 	writerperfect/qa/unit/WpftDrawFilterTest \
 ))
 
-$(call gb_CppunitTest_get_target,writerperfect_draw): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index e257fb4f4f09..b2cf95a5dbb2 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -34,7 +34,4 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_impress,\
 	writerperfect/qa/unit/WpftImpressFilterTest \
 ))
 
-$(call gb_CppunitTest_get_target,writerperfect_impress): \
-    $(call gb_AllLangResTarget_get_target,sd)
-
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 0b862086f5a9..b2102c54b987 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
 	Library_wpftimpress \
 	Library_wpftwriter \
 	Library_writerperfect \
+	UIConfig_writerperfect \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,writerperfect,\
-	AllLangResTarget_writerperfect \
-	UIConfig_writerperfect \
+	AllLangMoTarget_wpt \
 ))
 
 $(eval $(call gb_Module_add_check_targets,writerperfect,\
diff --git a/writerperfect/inc/WPFTResMgr.hxx b/writerperfect/inc/WPFTResMgr.hxx
index 54de1e4f0e06..ccc75246b102 100644
--- a/writerperfect/inc/WPFTResMgr.hxx
+++ b/writerperfect/inc/WPFTResMgr.hxx
@@ -5,16 +5,16 @@
 
 #include "writerperfectdllapi.h"
 
-#include <tools/resid.hxx>
+#include <tools/resmgr.hxx>
 
-struct WRITERPERFECT_DLLPUBLIC WPFTResMgr
+struct WRITERPERFECT_DLLPUBLIC WPFTResLocale
 {
-    static ResMgr &GetResMgr();
+    static std::locale& GetResLocale();
 };
 
-inline OUString WpResId(sal_uInt16 nId)
+inline OUString WpResId(const char* pId)
 {
-    return ResId(nId, WPFTResMgr::GetResMgr());
+    return Translate::get(pId, WPFTResLocale::GetResLocale());
 }
 
 #endif
diff --git a/writerperfect/inc/strings.hrc b/writerperfect/inc/strings.hrc
index e18214f511df..9f9b60d8bee8 100644
--- a/writerperfect/inc/strings.hrc
+++ b/writerperfect/inc/strings.hrc
@@ -10,15 +10,15 @@
 #ifndef INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 #define INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 
-#define RES_START   1000
+#define NC_(Context, String) (Context "\004" u8##String)
 
-#define STR_ENCODING_DIALOG_TITLE                (RES_START + 1)
-#define STR_ENCODING_DIALOG_TITLE_MSWORKS        (RES_START + 2)
-#define STR_ENCODING_DIALOG_TITLE_MSWRITE        (RES_START + 3)
-#define STR_ENCODING_DIALOG_TITLE_DOSWORD        (RES_START + 4)
-#define STR_ENCODING_DIALOG_TITLE_LOTUS          (RES_START + 5)
-#define STR_ENCODING_DIALOG_TITLE_SYMPHONY       (RES_START + 6)
-#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO     (RES_START + 7)
+#define STR_ENCODING_DIALOG_TITLE               NC_("STR_ENCODING_DIALOG_TITLE", "Import file")
+#define STR_ENCODING_DIALOG_TITLE_MSWORKS       NC_("STR_ENCODING_DIALOG_TITLE_MSWORKS", "Import MS Works file")
+#define STR_ENCODING_DIALOG_TITLE_MSWRITE       NC_("STR_ENCODING_DIALOG_TITLE_MSWRITE", "Import MS Write file")
+#define STR_ENCODING_DIALOG_TITLE_DOSWORD       NC_("STR_ENCODING_DIALOG_TITLE_DOSWORD", "Import MS Word for DOS file")
+#define STR_ENCODING_DIALOG_TITLE_LOTUS         NC_("STR_ENCODING_DIALOG_TITLE_LOTUS", "Import Lotus file")
+#define STR_ENCODING_DIALOG_TITLE_SYMPHONY      NC_("STR_ENCODING_DIALOG_TITLE_SYMPHONY", "Import Symphony file")
+#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO    NC_("STR_ENCODING_DIALOG_TITLE_QUATTROPRO", "Import Quattro Pro file")
 
 #endif
 
diff --git a/writerperfect/source/common/WPFTResMgr.cxx b/writerperfect/source/common/WPFTResMgr.cxx
index 9cc22f365140..c207d25ffca9 100644
--- a/writerperfect/source/common/WPFTResMgr.cxx
+++ b/writerperfect/source/common/WPFTResMgr.cxx
@@ -2,14 +2,13 @@
 
 #include "WPFTResMgr.hxx"
 
-#include <tools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-ResMgr &WPFTResMgr::GetResMgr()
+std::locale &WPFTResLocale::GetResLocale()
 {
-    static ResMgr *const pResMgr(ResMgr::CreateResMgr("writerperfect", Application::GetSettings().GetUILanguageTag()));
-    return *pResMgr;
+    static std::locale loc(Translate::Create("wpt", Application::GetSettings().GetUILanguageTag()));
+    return loc;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/common/strings.src b/writerperfect/source/common/strings.src
deleted file mode 100644
index fb9b0bad0e35..000000000000
--- a/writerperfect/source/common/strings.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/.
- */
-
-#include "strings.hrc"
-
-String STR_ENCODING_DIALOG_TITLE
-{
-    Text[en-US] = "Import file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_MSWORKS
-{
-    Text[en-US] = "Import MS Works file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_MSWRITE
-{
-    Text[en-US] = "Import MS Write file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_DOSWORD
-{
-    Text[en-US] = "Import MS Word for DOS file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_LOTUS
-{
-    Text[en-US] = "Import Lotus file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_SYMPHONY
-{
-    Text[en-US] = "Import Symphony file";
-};
-
-String STR_ENCODING_DIALOG_TITLE_QUATTROPRO
-{
-    Text[en-US] = "Import Quattro Pro file";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
index 40d2652f0f09..d18340269df1 100644
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
+++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="wpt">
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkDialog" id="WPFTEncodingDialog">
     <property name="can_focus">False</property>
@@ -60,7 +60,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">_Character set:</property>
+            <property name="label" translatable="yes" context="wpftencodingdialog|label">_Character set:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">comboboxtext</property>
           </object>
diff --git a/xmlsecurity/AllLangMoTarget_xsc.mk b/xmlsecurity/AllLangMoTarget_xsc.mk
new file mode 100644
index 000000000000..90b80207cee3
--- /dev/null
+++ b/xmlsecurity/AllLangMoTarget_xsc.mk
@@ -0,0 +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_AllLangMoTarget_AllLangMoTarget,xsc))
+
+$(eval $(call gb_AllLangMoTarget_set_polocation,xsc,xmlsecurity))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk
deleted file mode 100644
index d2fce602fd8d..000000000000
--- a/xmlsecurity/AllLangResTarget_xsec.mk
+++ /dev/null
@@ -1,32 +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,xmlsec))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,xmlsec,xmlsecurity))
-
-$(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\
-	xmlsec/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res))
-
-$(eval $(call gb_SrsTarget_set_include,xmlsec/res,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/xmlsecurity/inc \
-	-I$(SRCDIR)/xmlsecurity/source/dialogs \
-))
-
-$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
-	xmlsecurity/source/dialogs/certificateviewer.src \
-	xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
-	xmlsecurity/source/component/warnbox.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index b14729ffc405..23435b0512a9 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	Library_xmlsecurity \
 	Library_xsec_fw \
 	Library_xsec_xmlsec \
+	UIConfig_xmlsec \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
@@ -25,8 +26,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
-	AllLangResTarget_xsec \
-	UIConfig_xmlsec \
+	AllLangMoTarget_xsc \
 ))
 
 # failing
diff --git a/xmlsecurity/inc/global.hrc b/xmlsecurity/inc/global.hrc
deleted file mode 100644
index 00dfdd33cc58..000000000000
--- a/xmlsecurity/inc/global.hrc
+++ /dev/null
@@ -1,29 +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_XMLSECURITY_INC_GLOBAL_HRC
-#define INCLUDED_XMLSECURITY_INC_GLOBAL_HRC
-
-// global resource ids
-
-#define RID_XMLSECWB_NO_MOZILLA_PROFILE     1013
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 07008a0b5181..3bfbe07dabc5 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -252,7 +252,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
 #include <sot/formats.hxx>
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <svtools/accessibletableprovider.hxx>
@@ -278,7 +277,6 @@
 #include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
-#include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/xmlsecurity/inc/resourcemanager.hxx b/xmlsecurity/inc/resourcemanager.hxx
index 659c65bc0431..cba9e7061f98 100644
--- a/xmlsecurity/inc/resourcemanager.hxx
+++ b/xmlsecurity/inc/resourcemanager.hxx
@@ -34,7 +34,7 @@ class LocaleDataWrapper;
 
 namespace XmlSec
 {
-    ResMgr*         GetResMgr();
+    const std::locale& GetResLocale();
 
     const LocaleDataWrapper&    GetLocaleData();
     DateTime        GetDateTime( const css::util::DateTime& _rDT );
@@ -51,9 +51,9 @@ namespace XmlSec
     OUString        GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF );
 }
 
-inline OUString XsResId(sal_uInt16 nId)
+inline OUString XsResId(const char* pId)
 {
-    return ResId(nId, *XmlSec::GetResMgr());
+    return Translate::get(pId, XmlSec::GetResLocale());
 }
 
 #endif
diff --git a/xmlsecurity/inc/strings.hrc b/xmlsecurity/inc/strings.hrc
new file mode 100644
index 000000000000..b572082ec6cf
--- /dev/null
+++ b/xmlsecurity/inc/strings.hrc
@@ -0,0 +1,58 @@
+/* -*- 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_XMLSECURITY_INC_STRINGS_HRC
+#define INCLUDED_XMLSECURITY_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_CERTIFICATE_NOT_VALIDATED               NC_("STR_CERTIFICATE_NOT_VALIDATED", "The certificate could not be validated.")
+#define STR_HEADERBAR                               NC_("STR_HEADERBAR", "Field\tValue")
+#define STR_VERSION                                 NC_("STR_VERSION", "Version")
+#define STR_SERIALNUM                               NC_("STR_SERIALNUM", "Serial Number")
+#define STR_ISSUER                                  NC_("STR_ISSUER", "Issuer")
+#define STR_VALIDFROM                               NC_("STR_VALIDFROM", "Valid From")
+#define STR_VALIDTO                                 NC_("STR_VALIDTO", "Valid to")
+#define STR_SUBJECT                                 NC_("STR_SUBJECT", "Subject")
+#define STR_SUBJECT_PUBKEY_ALGO                     NC_("STR_SUBJECT_PUBKEY_ALGO", "Subject Algorithm")
+#define STR_SUBJECT_PUBKEY_VAL                      NC_("STR_SUBJECT_PUBKEY_VAL", "Public Key")
+#define STR_SIGNATURE_ALGO                          NC_("STR_SIGNATURE_ALGO", "Signature Algorithm")
+#define STR_USE                                     NC_("STR_USE", "Certificate Use")
+#define STR_THUMBPRINT_SHA1                         NC_("STR_THUMBPRINT_SHA1", "Thumbprint SHA1")
+#define STR_THUMBPRINT_MD5                          NC_("STR_THUMBPRINT_MD5", "Thumbprint MD5")
+
+#define STR_XMLSECDLG_OLD_ODF_FORMAT                NC_("STR_XMLSECDLG_OLD_ODF_FORMAT", "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. " \
+                                                       "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. " \
+                                                       "Thus no signatures can be added or removed to this document.\n\n" \
+                                                       "Save document in ODF 1.2 format and add all desired signatures again.")
+#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN NC_("STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN", "Adding or removing a macro signature will remove all document signatures.\n" \
+                                                       "Do you really want to continue?")
+#define STR_XMLSECDLG_QUERY_REALLYREMOVE            NC_("STR_XMLSECDLG_QUERY_REALLYREMOVE", "Document signature cannot be restored, once removed.\n" \
+                                                       "Do you really want to remove selected signature?")
+
+#define STR_XMLSECDLG_SIGNING_FAILED                NC_("STR_XMLSECDLG_SIGNING_FAILED", "An error occurred while adding the signature.")
+#define STR_XMLSECDLG_NO_CERT_MANAGER               NC_("STR_XMLSECDLG_NO_CERT_MANAGER", "Could not find any certificate manager.")
+#define STR_XMLSECDLG_NO_CERT_FOUND                 NC_("STR_XMLSECDLG_NO_CERT_FOUND", "Could not find the certificate.")
+
+#define RID_XMLSECWB_NO_MOZILLA_PROFILE             NC_("RID_XMLSECWB_NO_MOZILLA_PROFILE", "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation.")
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index f092a7370ff3..6449ed254787 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -25,7 +25,7 @@
 #include <certificateviewer.hxx>
 #include <macrosecurity.hxx>
 #include <biginteger.hxx>
-#include <global.hrc>
+#include <strings.hrc>
 #include <pdfsignaturehelper.hxx>
 #include <sax/tools/converter.hxx>
 
diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src
deleted file mode 100644
index 38f090ce6f6c..000000000000
--- a/xmlsecurity/source/component/warnbox.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 <global.hrc>
-
-String RID_XMLSECWB_NO_MOZILLA_PROFILE
-{
-    Text [ en-US ] = "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index e4afcacf4714..1b7d94b5bdd7 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -29,8 +29,9 @@
 #include <unotools/datetime.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "dialogs.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
+#include "svtools/controldims.hxx"
 #include "bitmaps.hlst"
 
 #include <vcl/settings.hxx>
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
deleted file mode 100644
index a3820fc59117..000000000000
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ /dev/null
@@ -1,92 +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 "dialogs.hrc"
-
-String STR_CERTIFICATE_NOT_VALIDATED
-{
-    Text [ en-US ] = "The certificate could not be validated.";
-};
-
-String STR_HEADERBAR
-{
-    Text [ en-US ] = "Field\tValue";
-};
-
-String STR_VERSION
-{
-    Text [ en-US ] = "Version";
-};
-
-String STR_SERIALNUM
-{
-    Text [ en-US ] = "Serial Number";
-};
-
-String STR_ISSUER
-{
-    Text [ en-US ] = "Issuer";
-};
-
-String STR_VALIDFROM
-{
-    Text [ en-US ] = "Valid From";
-};
-
-String STR_VALIDTO
-{
-    Text [ en-US ] = "Valid to";
-};
-
-String STR_SUBJECT
-{
-    Text [ en-US ] = "Subject";
-};
-
-String STR_SUBJECT_PUBKEY_ALGO
-{
-    Text [ en-US ] = "Subject Algorithm";
-};
-
-String STR_SUBJECT_PUBKEY_VAL
-{
-    Text [ en-US ] = "Public Key";
-};
-
-String STR_SIGNATURE_ALGO
-{
-    Text [ en-US ] = "Signature Algorithm";
-};
-
-String STR_USE
-{
-    Text [ en-US ] = "Certificate Use";
-};
-
-String STR_THUMBPRINT_SHA1
-{
-    Text [ en-US ] = "Thumbprint SHA1";
-};
-
-String STR_THUMBPRINT_MD5
-{
-    Text [ en-US ] = "Thumbprint MD5";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
deleted file mode 100644
index a0abefacb401..000000000000
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ /dev/null
@@ -1,45 +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_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC
-#define INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC
-
-#include <svtools/controldims.hrc>
-#include <global.hrc>
-
-#define STR_HEADERBAR                   256
-#define STR_VERSION                     257
-#define STR_SERIALNUM                   258
-#define STR_ISSUER                      259
-#define STR_VALIDFROM                   260
-#define STR_VALIDTO                     261
-#define STR_SUBJECT                     262
-#define STR_SUBJECT_PUBKEY_ALGO         263
-#define STR_SUBJECT_PUBKEY_VAL          264
-#define STR_SIGNATURE_ALGO              266
-#define STR_THUMBPRINT_SHA1             267
-#define STR_THUMBPRINT_MD5              268
-#define STR_USE                         271
-
-// --------- tab page Certificate viewer - General ---------
-#define STR_CERTIFICATE_NOT_VALIDATED   269
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 85edf4391561..2b79174c615f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -49,8 +49,7 @@
 #include <tools/time.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "dialogs.hrc"
-#include "digitalsignaturesdialog.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
 
 #include <vcl/layout.hxx>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
deleted file mode 100644
index c56c26da96d1..000000000000
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ /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/.
- *
- * 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_DIGITALSIGNATURESDIALOG_HRC
-#define INCLUDED_DIGITALSIGNATURESDIALOG_HRC
-
-//global.hrc in inc starts at 1000
-#define RID_DIGITALSIGNATUREDLG_START                 2000
-
-#define STR_XMLSECDLG_OLD_ODF_FORMAT     RID_DIGITALSIGNATUREDLG_START
-#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1)
-#define STR_XMLSECDLG_QUERY_REALLYREMOVE (RID_DIGITALSIGNATUREDLG_START + 2)
-#define STR_XMLSECDLG_SIGNING_FAILED (RID_DIGITALSIGNATUREDLG_START + 3)
-#define STR_XMLSECDLG_NO_CERT_MANAGER (RID_DIGITALSIGNATUREDLG_START + 4)
-#define STR_XMLSECDLG_NO_CERT_FOUND (RID_DIGITALSIGNATUREDLG_START + 5)
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
deleted file mode 100644
index a01f7d1a33b6..000000000000
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ /dev/null
@@ -1,59 +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 "dialogs.hrc"
-#include "digitalsignaturesdialog.hrc"
-
-String STR_XMLSECDLG_OLD_ODF_FORMAT
-{
-    Text [ en-US ] =
-        "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
-        "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
-        "Thus no signatures can be added or removed to this document.\n\n"
-        "Save document in ODF 1.2 format and add all desired signatures again.";
-};
-
-String STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN
-{
-    Text [ en-US ] = "Adding or removing a macro signature will remove all document signatures.\n"
-        "Do you really want to continue?";
-};
-
-String STR_XMLSECDLG_QUERY_REALLYREMOVE
-{
-    Text [ en-US ] = "Document signature cannot be restored, once removed.\n"
-        "Do you really want to remove selected signature?";
-};
-
-String STR_XMLSECDLG_SIGNING_FAILED
-{
-    Text [ en-US ] = "An error occurred while adding the signature.";
-};
-
-String STR_XMLSECDLG_NO_CERT_MANAGER
-{
-    Text [ en-US ] = "Could not find any certificate manager.";
-};
-
-String STR_XMLSECDLG_NO_CERT_FOUND
-{
-    Text [ en-US ] = "Could not find the certificate.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 63a112361280..7616d5fd9992 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -41,7 +41,7 @@
 
 #include <vcl/msgbox.hxx>
 
-#include "dialogs.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 5b04868e52a1..9296c02a89d4 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -32,13 +32,10 @@ using namespace std;
 
 namespace XmlSec
 {
-    static ResMgr*          pResMgr = nullptr;
-
-    ResMgr* GetResMgr()
+    const std::locale& GetResLocale()
     {
-        if (!pResMgr)
-            pResMgr = ResMgr::CreateResMgr("xmlsec");
-        return pResMgr;
+        static const std::locale loc = Translate::Create("xsc", Application::GetSettings().GetUILanguageTag());
+        return loc;
     }
 
     const LocaleDataWrapper&    GetLocaleData()
diff --git a/xmlsecurity/uiconfig/ui/certdetails.ui b/xmlsecurity/uiconfig/ui/certdetails.ui
index 75fec82e52f9..ae9a27bd7438 100644
--- a/xmlsecurity/uiconfig/ui/certdetails.ui
+++ b/xmlsecurity/uiconfig/ui/certdetails.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="xsc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="CertDetails">
diff --git a/xmlsecurity/uiconfig/ui/certgeneral.ui b/xmlsecurity/uiconfig/ui/certgeneral.ui
index 3bf3792a54de..b570b32348a6 100644
--- a/xmlsecurity/uiconfig/ui/certgeneral.ui
+++ b/xmlsecurity/uiconfig/ui/certgeneral.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkBox" id="box1">
     <property name="visible">True</property>
@@ -29,7 +29,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Certificate Information</property>
+            <property name="label" translatable="yes" context="certgeneral|label1">Certificate Information</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -67,7 +67,7 @@
         <property name="margin_right">36</property>
         <property name="margin_bottom">108</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">This certificate is validated.</property>
+        <property name="label" translatable="yes" context="certgeneral|hintnotrust">This certificate is validated.</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -100,7 +100,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Issued to: </property>
+            <property name="label" translatable="yes" context="certgeneral|issued_to">Issued to: </property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -127,7 +127,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Issued by: </property>
+            <property name="label" translatable="yes" context="certgeneral|issued_by">Issued by: </property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -153,7 +153,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Valid from:</property>
+            <property name="label" translatable="yes" context="certgeneral|valid_from">Valid from:</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -184,7 +184,7 @@
               <object class="GtkLabel" id="privatekey">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">You have a private key that corresponds to this certificate.</property>
+                <property name="label" translatable="yes" context="certgeneral|privatekey">You have a private key that corresponds to this certificate.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -204,7 +204,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Valid to:</property>
+            <property name="label" translatable="yes" context="certgeneral|valid_to">Valid to:</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/xmlsecurity/uiconfig/ui/certpage.ui b/xmlsecurity/uiconfig/ui/certpage.ui
index a1207161e9bf..c6e3e71d752a 100644
--- a/xmlsecurity/uiconfig/ui/certpage.ui
+++ b/xmlsecurity/uiconfig/ui/certpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.0 on Thu Jan 30 10:32:36 2014 -->
-<interface>
+<interface domain="xsc">
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="CertPage">
@@ -23,7 +23,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Certification path</property>
+            <property name="label" translatable="yes" context="certpage|label1">Certification path</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">signatures:border</property>
           </object>
@@ -36,7 +36,7 @@
         </child>
         <child>
           <object class="GtkButton" id="viewcert">
-            <property name="label" translatable="yes">View Certificate...</property>
+            <property name="label" translatable="yes" context="certpage|viewcert">View Certificate...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -87,7 +87,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Certification status</property>
+            <property name="label" translatable="yes" context="certpage|label2">Certification status</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">status:border</property>
           </object>
@@ -124,7 +124,7 @@
       <object class="GtkLabel" id="certok">
         <property name="can_focus">False</property>
         <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">The certificate is OK.</property>
+        <property name="label" translatable="yes" context="certpage|certok">The certificate is OK.</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -136,7 +136,7 @@
       <object class="GtkLabel" id="certnotok">
         <property name="can_focus">False</property>
         <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">The certificate could not be validated.</property>
+        <property name="label" translatable="yes" context="certpage|certnotok">The certificate could not be validated.</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index 487bebdf8764..84924a6ebdda 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="DigitalSignaturesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Digital Signatures</property>
+    <property name="title" translatable="yes" context="digitalsignaturesdialog|DigitalSignaturesDialog">Digital Signatures</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -67,7 +67,7 @@
               <object class="GtkLabel" id="dochint">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">The following have signed the document content: </property>
+                <property name="label" translatable="yes" context="digitalsignaturesdialog|dochint">The following have signed the document content: </property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -99,7 +99,7 @@
                 <property name="layout_style">spread</property>
                 <child>
                   <object class="GtkButton" id="view">
-                    <property name="label" translatable="yes">View Certificate...</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|view">View Certificate...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -112,7 +112,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="sign">
-                    <property name="label" translatable="yes">Sign Document...</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|sign">Sign Document...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
@@ -126,7 +126,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="remove">
-                    <property name="label" translatable="yes">Remove</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|remove">Remove</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -139,7 +139,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="start_certmanager">
-                    <property name="label" translatable="yes">Start Certificate Manager...</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|start_certmanager">Start Certificate Manager...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -167,7 +167,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Signed by </property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|signed">Signed by </property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -179,7 +179,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Digital ID issued by </property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|issued">Digital ID issued by </property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -191,7 +191,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Date</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|date">Date</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -202,7 +202,7 @@
                   <object class="GtkLabel" id="description">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Description</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|description">Description</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -213,7 +213,7 @@
                   <object class="GtkLabel" id="type">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Signature type</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|type">Signature type</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
@@ -230,7 +230,7 @@
               <object class="GtkLabel" id="macrohint">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">The following have signed the document macro:</property>
+                <property name="label" translatable="yes" context="digitalsignaturesdialog|macrohint">The following have signed the document macro:</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -242,7 +242,7 @@
               <object class="GtkLabel" id="packagehint">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">The following have signed this package:</property>
+                <property name="label" translatable="yes" context="digitalsignaturesdialog|packagehint">The following have signed this package:</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -260,7 +260,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">The signatures in this document are valid</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|validft">The signatures in this document are valid</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -284,7 +284,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">The signatures in this document are invalid</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|invalidft">The signatures in this document are invalid</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -297,7 +297,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Not all parts of the document are signed</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|oldsignatureft">Not all parts of the document are signed</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -310,7 +310,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Certificate could not be validated</property>
+                    <property name="label" translatable="yes" context="digitalsignaturesdialog|notvalidatedft">Certificate could not be validated</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -359,7 +359,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="adescompliant">
-                <property name="label" translatable="yes">Use AdES-compliant signature when there is a choice</property>
+                <property name="label" translatable="yes" context="digitalsignaturesdialog|adescompliant">Use AdES-compliant signature when there is a choice</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
index 9a4c17cb39a3..4b4d3b41f521 100644
--- a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
+++ b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="MacroSecurityDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Macro Security</property>
+    <property name="title" translatable="yes" context="macrosecuritydialog|MacroSecurityDialog">Macro Security</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -97,7 +97,7 @@
               <object class="GtkLabel" id="SecurityLevelPage">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Security Level</property>
+                <property name="label" translatable="yes" context="macrosecuritydialog|SecurityLevelPage">Security Level</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
               <object class="GtkLabel" id="SecurityTrustPage">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Trusted Sources</property>
+                <property name="label" translatable="yes" context="macrosecuritydialog|SecurityTrustPage">Trusted Sources</property>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
index 78674f0f6704..32260fec6225 100644
--- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="SecurityLevelPage">
     <property name="visible">True</property>
@@ -11,7 +11,7 @@
     <property name="row_homogeneous">True</property>
     <child>
       <object class="GtkRadioButton" id="low:wrap">
-        <property name="label" translatable="yes">_Low (not recommended).
+        <property name="label" translatable="yes" context="securitylevelpage|low">_Low (not recommended).
 All macros will be executed without confirmation.
 Use this setting only if you are certain that all documents that will be opened are safe.</property>
         <property name="visible">True</property>
@@ -29,7 +29,7 @@ Use this setting only if you are certain that all documents that will be opened
     </child>
     <child>
       <object class="GtkRadioButton" id="med:wrap">
-        <property name="label" translatable="yes">_Medium.
+        <property name="label" translatable="yes" context="securitylevelpage|med">_Medium.
 Confirmation required before executing macros from untrusted sources.</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -46,7 +46,7 @@ Confirmation required before executing macros from untrusted sources.</property>
     </child>
     <child>
       <object class="GtkRadioButton" id="high:wrap">
-        <property name="label" translatable="yes">H_igh.
+        <property name="label" translatable="yes" context="securitylevelpage|high">H_igh.
 Only signed macros from trusted sources are allowed to run.
 Unsigned macros are disabled.</property>
         <property name="visible">True</property>
@@ -65,7 +65,7 @@ Unsigned macros are disabled.</property>
     </child>
     <child>
       <object class="GtkRadioButton" id="vhigh:wrap">
-        <property name="label" translatable="yes">_Very high.
+        <property name="label" translatable="yes" context="securitylevelpage|vhigh">_Very high.
 Only macros from trusted file locations are allowed to run.
 All other macros, regardless whether signed or not, are disabled.</property>
         <property name="visible">True</property>
diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
index 9e464d23c459..5e0a8472f594 100644
--- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="xsc">
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="SecurityTrustPage">
     <property name="visible">True</property>
@@ -40,7 +40,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="viewcert">
-                        <property name="label" translatable="yes">_View...</property>
+                        <property name="label" translatable="yes" context="securitytrustpage|viewcert">_View...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -83,7 +83,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Issued to</property>
+                        <property name="label" translatable="yes" context="securitytrustpage|to">Issued to</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -97,7 +97,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Issued by</property>
+                        <property name="label" translatable="yes" context="securitytrustpage|by">Issued by</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -111,7 +111,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Expiration date</property>
+                        <property name="label" translatable="yes" context="securitytrustpage|date">Expiration date</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -169,7 +169,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Trusted Certificates</property>
+            <property name="label" translatable="yes" context="securitytrustpage|label3">Trusted Certificates</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -212,7 +212,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Document macros are always executed if they have been opened from one of the following locations.</property>
+                    <property name="label" translatable="yes" context="securitytrustpage|label8">Document macros are always executed if they have been opened from one of the following locations.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">56</property>
                   </object>
@@ -231,7 +231,7 @@
                     <property name="layout_style">end</property>
                     <child>
                       <object class="GtkButton" id="addfile">
-                        <property name="label" translatable="yes">A_dd...</property>
+                        <property name="label" translatable="yes" context="securitytrustpage|addfile">A_dd...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -318,7 +318,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Trusted File Locations</property>
+            <property name="label" translatable="yes" context="securitytrustpage|label4">Trusted File Locations</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 57494738eda0..ac6c253dabdd 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SelectCertificateDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Select Certificate</property>
+    <property name="title" translatable="yes" context="selectcertificatedialog|SelectCertificateDialog">Select Certificate</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -89,7 +89,7 @@
                   <object class="GtkLabel" id="issuedto">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Issued to  </property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|issuedto">Issued to  </property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -100,7 +100,7 @@
                   <object class="GtkLabel" id="issuedby">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Issued by</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|issuedby">Issued by</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -111,7 +111,7 @@
                   <object class="GtkLabel" id="usage">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Certificate usage</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|usage">Certificate usage</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -122,7 +122,7 @@
                   <object class="GtkLabel" id="expiration">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Expiration date</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|expiration">Expiration date</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -133,7 +133,7 @@
                   <object class="GtkLabel" id="type">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Type</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|type">Type</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
@@ -145,42 +145,42 @@
                   <object class="GtkLabel" id="STR_DIGITAL_SIGNATURE">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Digital signature</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_DIGITAL_SIGNATURE">Digital signature</property>
                   </object>
                   <object class="GtkLabel" id="STR_NON_REPUDIATION">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Non-repudiation</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_NON_REPUDIATION">Non-repudiation</property>
                   </object>
                   <object class="GtkLabel" id="STR_KEY_ENCIPHERMENT">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Key encipherment</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_ENCIPHERMENT">Key encipherment</property>
                   </object>
                   <object class="GtkLabel" id="STR_DATA_ENCIPHERMENT">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Data encipherment</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_DATA_ENCIPHERMENT">Data encipherment</property>
                   </object>
                   <object class="GtkLabel" id="STR_KEY_AGREEMENT">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Key Agreement</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_AGREEMENT">Key Agreement</property>
                   </object>
                   <object class="GtkLabel" id="STR_KEY_CERT_SIGN">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Certificate signature verification</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_KEY_CERT_SIGN">Certificate signature verification</property>
                   </object>
                   <object class="GtkLabel" id="STR_CRL_SIGN">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">CRL signature verification</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_CRL_SIGN">CRL signature verification</property>
                   </object>
                   <object class="GtkLabel" id="STR_ENCIPHER_ONLY">
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Only for encipherment</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|STR_ENCIPHER_ONLY">Only for encipherment</property>
                   </object>
                 </child>
               </object>
@@ -195,7 +195,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="ypad">1</property>
-                <property name="label" translatable="yes">Select the certificate you want to use for signing:</property>
+                <property name="label" translatable="yes" context="selectcertificatedialog|label1">Select the certificate you want to use for signing:</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -219,7 +219,7 @@
             </child>
             <child>
               <object class="GtkButton" id="viewcert">
-                <property name="label" translatable="yes">View Certificate...</property>
+                <property name="label" translatable="yes" context="selectcertificatedialog|viewcert">View Certificate...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Description:</property>
+                    <property name="label" translatable="yes" context="selectcertificatedialog|label2">Description:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/xmlsecurity/uiconfig/ui/viewcertdialog.ui b/xmlsecurity/uiconfig/ui/viewcertdialog.ui
index 8507d85c0fcc..c9464f9cf3e1 100644
--- a/xmlsecurity/uiconfig/ui/viewcertdialog.ui
+++ b/xmlsecurity/uiconfig/ui/viewcertdialog.ui
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="xsc">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="ViewCertDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">View Certificate</property>
+    <property name="title" translatable="yes" context="viewcertdialog|ViewCertDialog">View Certificate</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -69,7 +69,7 @@
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">General</property>
+                <property name="label" translatable="yes" context="viewcertdialog|general">General</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -82,7 +82,7 @@
               <object class="GtkLabel" id="details">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Details</property>
+                <property name="label" translatable="yes" context="viewcertdialog|details">Details</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -96,7 +96,7 @@
               <object class="GtkLabel" id="path">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Certification Path</property>
+                <property name="label" translatable="yes" context="viewcertdialog|path">Certification Path</property>
               </object>
               <packing>
                 <property name="position">2</property>